From bb1914a1ab2acbe6d1b8c26f382badd126dcb8bc Mon Sep 17 00:00:00 2001 From: Default email Date: Tue, 29 Dec 2020 10:07:52 -0500 Subject: [PATCH] Project import generated by Copybara. GitOrigin-RevId: 733e537a8ad76fd355b6f501127f7d0eb8861775 --- .../.github/workflows/editorconfig.yml | 22 +- .../.github/workflows/rebase-staging.yml | 56 ++ .../nixpkgs/maintainers/maintainer-list.nix | 12 + .../nixpkgs/nixos/modules/security/acme.xml | 2 +- .../modules/services/hardware/throttled.nix | 6 + .../modules/services/hardware/trezord.nix | 2 +- .../monitoring/prometheus/default.nix | 140 ++++ .../modules/services/web-apps/zabbix.nix | 16 +- .../services/x11/display-managers/sddm.nix | 173 ++-- .../services/x11/window-managers/xmonad.nix | 58 +- third_party/nixpkgs/nixos/tests/loki.nix | 4 +- .../applications/audio/espeak-ng/default.nix | 7 +- .../pkgs/applications/audio/mopidy/tunein.nix | 7 +- .../applications/audio/mp3gain/default.nix | 18 +- .../audio/pavucontrol/default.nix | 13 +- .../applications/audio/pt2-clone/default.nix | 4 +- .../applications/audio/redoflacs/default.nix | 4 +- .../pkgs/applications/audio/sc68/default.nix | 39 + .../ledger-live-desktop/default.nix | 4 +- .../applications/editors/eclipse/plugins.nix | 2 +- .../editors/vscode/update-vscode.sh | 8 + .../editors/vscode/update-vscodium.sh | 20 +- .../applications/editors/vscode/vscode.nix | 6 +- .../applications/editors/vscode/vscodium.nix | 14 +- .../graphics/darktable/default.nix | 4 +- .../pkgs/applications/misc/dasel/default.nix | 11 + .../applications/misc/electrum/default.nix | 6 +- .../applications/misc/gallery-dl/default.nix | 4 +- .../pkgs/applications/misc/gpxsee/default.nix | 6 +- .../misc/gpxsee/fix-qttranslations-path.diff | 16 +- .../applications/misc/koreader/default.nix | 6 +- .../pkgs/applications/misc/mwic/default.nix | 2 +- .../misc/terminal-typeracer/default.nix | 34 + .../pkgs/applications/misc/upwork/default.nix | 6 +- .../applications/misc/variety/default.nix | 71 +- .../browsers/firefox-bin/beta_sources.nix | 770 +++++++++--------- .../browsers/firefox-bin/release_sources.nix | 770 +++++++++--------- .../networking/browsers/firefox/packages.nix | 4 +- .../networking/browsers/palemoon/default.nix | 24 +- .../networking/cluster/qbec/default.nix | 6 +- .../instant-messengers/linphone/default.nix | 5 +- .../instant-messengers/neochat/default.nix | 63 +- .../instant-messengers/rambox/pro.nix | 8 +- .../skypeforlinux/default.nix | 4 + .../instant-messengers/spectral/default.nix | 40 - .../networking/mailreaders/aerc/default.nix | 6 +- .../mailreaders/aerc/runtime-sharedir.patch | 5 +- .../mailreaders/thunderbird/default.nix | 3 +- .../science/astronomy/kstars/default.nix | 18 +- .../science/astronomy/kstars/fs-fixes.patch | 59 ++ .../science/astronomy/kstars/indi-fix.patch | 50 -- .../science/math/bcal/default.nix | 9 +- .../robotics/mission-planner/default.nix | 59 ++ .../terminal-emulators/xterm/default.nix | 4 +- .../git-and-tools/default.nix | 2 + .../git-and-tools/ghr/default.nix | 30 + .../git-and-tools/gitstatus/default.nix | 6 +- .../version-management/gitea/default.nix | 4 +- .../version-management/redmine/default.nix | 7 +- .../virtualization/charliecloud/default.nix | 4 +- .../virtualization/containerd/default.nix | 37 +- .../virtualization/docker/default.nix | 2 + .../window-managers/i3/balance-workspace.nix | 23 + .../nixpkgs/pkgs/data/fonts/iosevka/bin.nix | 2 +- .../pkgs/data/fonts/iosevka/variants.nix | 42 +- .../data/fonts/jetbrains-mono/default.nix | 6 +- .../pkgs/data/fonts/meslo-lgs-nf/default.nix | 26 + .../pkgs/data/icons/luna-icons/default.nix | 4 +- .../data/icons/papirus-icon-theme/default.nix | 4 +- .../pkgs/data/themes/sweet/default.nix | 30 +- .../desktops/gnome-3/games/iagno/default.nix | 9 - .../xfce/applications/mousepad/default.nix | 1 + .../xfce/applications/orage/default.nix | 30 +- .../pkgs/desktops/xfce/core/xfwm4/default.nix | 4 +- .../pkgs/desktops/xfce/mkXfceDerivation.nix | 14 +- .../panel-plugins/xfce4-namebar-plugin.nix | 37 +- .../xfce4-whiskermenu-plugin/default.nix | 1 + .../compilers/crystal/build-package.nix | 71 +- .../compilers/crystal/crystal2nix.cr | 42 - .../compilers/crystal/crystal2nix.nix | 22 - .../compilers/crystal2nix/default.nix | 36 + .../compilers/crystal2nix/shards.nix | 14 + .../compilers/gcc-arm-embedded/10/default.nix | 53 ++ .../compilers/gcc-arm-embedded/6/default.nix | 10 +- .../compilers/gcc-arm-embedded/7/default.nix | 10 +- .../compilers/gcc-arm-embedded/8/default.nix | 10 +- .../compilers/gcc-arm-embedded/9/default.nix | 10 +- .../interpreters/lua-5/default.nix | 13 + .../interpreters/lua-5/liblua.so.patch | 60 ++ .../development/libraries/CGAL/default.nix | 4 +- .../libraries/KQuickImageEdit/default.nix | 22 - .../development/libraries/a52dec/default.nix | 15 +- .../development/libraries/bcg729/default.nix | 30 +- .../libraries/bctoolbox/default.nix | 6 +- .../development/libraries/belcard/default.nix | 2 +- .../libraries/belle-sip/default.nix | 8 +- .../development/libraries/belr/default.nix | 10 +- .../development/libraries/bzrtp/default.nix | 6 +- .../development/libraries/flite/default.nix | 24 +- .../libraries/intel-media-driver/default.nix | 4 +- .../libraries/kquickimageedit/default.nix | 19 + .../libraries/liblinphone/default.nix | 2 +- .../libraries/libmesode/default.nix | 37 +- .../libraries/libraspberrypi/default.nix | 41 +- .../development/libraries/oatpp/default.nix | 29 + .../development/libraries/ortp/default.nix | 2 +- .../libraries/pcaudiolib/default.nix | 10 +- .../qtstyleplugin-kvantum-qt4/default.nix | 4 +- .../development/libraries/sonic/default.nix | 24 +- .../libraries/stellarsolver/default.nix | 30 + .../development/libraries/utf8cpp/default.nix | 4 +- .../development/misc/rpiboot/unstable.nix | 20 +- .../ocaml-modules/camlzip/default.nix | 31 +- .../python-modules/asyncssh/default.nix | 4 +- .../python-modules/boto3/default.nix | 4 +- .../python-modules/botocore/default.nix | 4 +- .../python-modules/gpy/default.nix | 41 +- .../python-modules/mypy/default.nix | 39 +- .../python-modules/paramz/default.nix | 8 +- .../python-modules/pydantic/default.nix | 15 +- .../python-modules/pykka/default.nix | 28 +- .../python-modules/pyscreenshot/default.nix | 4 +- .../python-modules/pysychonaut/default.nix | 28 + .../tools/build-managers/dub/default.nix | 23 +- .../build-managers/sbt-extras/default.nix | 6 +- .../tools/build-managers/shards/default.nix | 20 +- .../development/tools/lazygit/default.nix | 5 +- .../tools/misc/circleci-cli/default.nix | 6 +- .../tools/misc/mdctags/default.nix | 22 + .../development/tools/misc/rtss/default.nix | 22 + .../tools/misc/terracognita/default.nix | 7 +- .../tools/quicktemplate/default.nix | 14 +- .../development/tools/quicktemplate/deps.nix | 12 - .../pkgs/development/tools/statik/default.nix | 22 +- .../development/web/lucky-cli/default.nix | 5 +- .../pkgs/development/web/lucky-cli/shard.lock | 15 +- .../pkgs/development/web/lucky-cli/shards.nix | 16 +- .../nixpkgs/pkgs/games/banner/default.nix | 15 +- .../pkgs/games/cataclysm-dda/stable.nix | 4 +- .../nixpkgs/pkgs/games/mindustry/default.nix | 25 +- .../nixpkgs/pkgs/misc/beep/default.nix | 30 +- .../pkgs/misc/ptouch-print/default.nix | 34 + .../pkgs/misc/tmux-plugins/default.nix | 4 + .../pkgs/misc/vim-plugins/generated.nix | 24 + .../pkgs/misc/vim-plugins/vim-plugin-names | 2 + .../pkgs/os-specific/linux/atop/default.nix | 20 +- .../linux/displaylink/99-displaylink.rules | 1 + .../os-specific/linux/displaylink/default.nix | 30 +- .../linux/displaylink/udev-installer.patch | 18 - .../firmware/raspberrypi-wireless/default.nix | 14 +- .../linux/firmware/raspberrypi/default.nix | 13 +- .../linux/firmware/raspberrypi/tools.nix | 37 - .../os-specific/linux/kernel/linux-4.14.nix | 4 +- .../os-specific/linux/kernel/linux-4.4.nix | 4 +- .../os-specific/linux/kernel/linux-4.9.nix | 4 +- .../os-specific/linux/kernel/linux-5.10.nix | 4 +- .../os-specific/linux/kernel/linux-lqx.nix | 25 + .../os-specific/linux/kernel/linux-rpi.nix | 12 +- .../linux/kernel/linux-testing.nix | 6 +- .../os-specific/linux/kernel/linux-zen.nix | 1 + .../os-specific/linux/radeontop/default.nix | 6 +- .../linux/raspberrypi-eeprom/default.nix | 12 +- .../os-specific/linux/usbguard/default.nix | 2 +- .../servers/http/tomcat/tomcat-native.nix | 4 +- .../pkgs/servers/mattermost/matterircd.nix | 4 +- .../pkgs/servers/mautrix-whatsapp/default.nix | 6 +- .../pkgs/servers/monitoring/loki/default.nix | 22 +- .../pkgs/servers/roundcube/default.nix | 4 +- .../nixpkgs/pkgs/servers/trezord/default.nix | 2 +- .../nixpkgs/pkgs/servers/unifi/default.nix | 14 +- .../servers/web-apps/hedgedoc/default.nix | 4 +- .../servers/web-apps/hedgedoc/package.json | 4 +- .../pkgs/servers/web-apps/hedgedoc/yarn.lock | 67 +- .../pkgs/servers/web-apps/hedgedoc/yarn.nix | 72 +- .../nixpkgs/pkgs/shells/ion/default.nix | 6 +- .../pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +- .../pkgs/tools/X11/xwallpaper/default.nix | 3 +- .../pkgs/tools/admin/awscli/default.nix | 4 +- .../pkgs/tools/admin/chamber/default.nix | 14 +- .../pkgs/tools/audio/aucdtect/default.nix | 33 - .../pkgs/tools/backup/duplicity/default.nix | 4 +- .../use-installed-scripts-in-test.patch | 18 +- .../nixpkgs/pkgs/tools/misc/agedu/default.nix | 10 +- .../pkgs/tools/misc/barman/default.nix | 4 +- .../pkgs/tools/misc/calamares/default.nix | 17 +- .../nixpkgs/pkgs/tools/misc/clac/default.nix | 15 +- .../nixpkgs/pkgs/tools/misc/hdf4/default.nix | 3 + .../pkgs/tools/misc/youtube-dl/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/zalgo/default.nix | 25 + .../pkgs/tools/networking/cjdns/default.nix | 6 +- .../pkgs/tools/networking/kapp/default.nix | 23 + .../pkgs/tools/networking/qrcp/default.nix | 4 +- .../pkgs/tools/security/dnsx/default.nix | 31 + .../pkgs/tools/security/ffuf/default.nix | 34 + .../pkgs/tools/security/gau/default.nix | 29 + .../pkgs/tools/security/gospider/default.nix | 33 + .../pkgs/tools/security/httpx/default.nix | 30 + .../pkgs/tools/security/nuclei/default.nix | 36 + .../tools/security/onlykey-cli/default.nix | 24 + .../tools/typesetting/lowdown/default.nix | 4 +- .../nixpkgs/pkgs/top-level/aliases.nix | 4 + .../nixpkgs/pkgs/top-level/all-packages.nix | 79 +- .../nixpkgs/pkgs/top-level/perl-packages.nix | 5 + .../pkgs/top-level/python-packages.nix | 2 + 204 files changed, 3288 insertions(+), 1916 deletions(-) create mode 100644 third_party/nixpkgs/.github/workflows/rebase-staging.yml create mode 100644 third_party/nixpkgs/pkgs/applications/audio/sc68/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/terminal-typeracer/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/instant-messengers/spectral/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/fs-fixes.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/indi-fix.patch create mode 100644 third_party/nixpkgs/pkgs/applications/science/robotics/mission-planner/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/ghr/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/window-managers/i3/balance-workspace.nix create mode 100644 third_party/nixpkgs/pkgs/data/fonts/meslo-lgs-nf/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/crystal/crystal2nix.cr delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/crystal/crystal2nix.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/crystal2nix/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/crystal2nix/shards.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/10/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/interpreters/lua-5/liblua.so.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/KQuickImageEdit/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/kquickimageedit/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/oatpp/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/stellarsolver/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pysychonaut/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/misc/mdctags/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/misc/rtss/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/quicktemplate/deps.nix create mode 100644 third_party/nixpkgs/pkgs/misc/ptouch-print/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/displaylink/99-displaylink.rules delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/displaylink/udev-installer.patch delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/audio/aucdtect/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/zalgo/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/kapp/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/dnsx/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/ffuf/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/gau/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/gospider/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/httpx/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/onlykey-cli/default.nix diff --git a/third_party/nixpkgs/.github/workflows/editorconfig.yml b/third_party/nixpkgs/.github/workflows/editorconfig.yml index be7a4ba02b..6935d0bbd2 100644 --- a/third_party/nixpkgs/.github/workflows/editorconfig.yml +++ b/third_party/nixpkgs/.github/workflows/editorconfig.yml @@ -8,13 +8,22 @@ on: jobs: tests: runs-on: ubuntu-latest + if: github.repository_owner == 'NixOS' steps: + - name: Get list of changed files from PR + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + echo 'PR_DIFF<> $GITHUB_ENV + gh api \ + repos/NixOS/nixpkgs/pulls/${{github.event.number}}/files --paginate \ + | jq '.[] | select(.status != "removed") | .filename' \ + >> $GITHUB_ENV + echo 'EOF' >> $GITHUB_ENV - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - uses: technote-space/get-diff-action@v4.0.0 + if: env.PR_DIFF - name: Fetch editorconfig-checker - if: env.GIT_DIFF + if: env.PR_DIFF env: ECC_VERSION: "2.2.0" ECC_URL: "https://github.com/editorconfig-checker/editorconfig-checker/releases/download" @@ -23,7 +32,6 @@ jobs: tar xzf ec-linux-amd64.tar.gz && \ mv ./bin/ec-linux-amd64 ./bin/editorconfig-checker - name: Checking EditorConfig - if: env.GIT_DIFF + if: env.PR_DIFF run: | - ./bin/editorconfig-checker -disable-indent-size \ - ${{ env.GIT_DIFF }} + echo "$PR_DIFF" | xargs ./bin/editorconfig-checker -disable-indent-size diff --git a/third_party/nixpkgs/.github/workflows/rebase-staging.yml b/third_party/nixpkgs/.github/workflows/rebase-staging.yml new file mode 100644 index 0000000000..8214787778 --- /dev/null +++ b/third_party/nixpkgs/.github/workflows/rebase-staging.yml @@ -0,0 +1,56 @@ +on: + issue_comment: + types: + - created + +# This action allows people with write access to the repo to rebase a PRs base branch from +# master to staging by commenting `/rebase-staging` on the PR while avoiding CODEOWNER notifications. + +jobs: + rebase: + runs-on: ubuntu-latest + if: github.repository_owner == 'NixOS' && github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase-staging') + steps: + - uses: scherermichael-oss/action-has-permission@1.0.6 + id: check-write-access + with: + required-permission: write + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: check base branch is master + if: steps.check-write-access.outputs.has-permission + run: | + if [ "$(curl https://api.github.com/repos/NixOS/nixpkgs/pulls/${{ github.event.issue.number }} | jq -r '.base.ref')" != "master" ]; then + echo "This action only works when the current base branch is master." + exit 1 + fi + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + if: steps.check-write-access.outputs.has-permission + - name: rebase pull request + if: steps.check-write-access.outputs.has-permission + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULL_REQUEST: ${{ github.event.issue.number }} + run: | + git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" + git config --global user.name "github-actions[bot]" + git fetch origin + gh pr checkout "$PULL_REQUEST" + git rebase \ + --onto="$(git merge-base origin/master origin/staging)" \ + "HEAD~$(git rev-list --count HEAD ^master)" + git push --force + curl \ + -X POST \ + -H "Accept: application/vnd.github.v3+json" \ + -H "Authorization: token $GITHUB_TOKEN" \ + -d '{ "base": "staging" }' \ + "https://api.github.com/repos/NixOS/nixpkgs/pulls/$PULL_REQUEST" + - uses: peter-evans/create-or-update-comment@v1 + if: ${{ failure() }} + with: + issue-number: ${{ github.event.issue.number }} + body: | + [Failed to rebase on `staging`](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}) diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index cef2e8f4de..93c6422744 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -7333,6 +7333,12 @@ githubId = 14829269; name = "Ram Kromberg"; }; + ranfdev = { + email = "ranfdev@gmail.com"; + name = "Lorenzo Miglietta"; + github = "ranfdev"; + githubId = 23294184; + }; rardiol = { email = "ricardo.ardissone@gmail.com"; github = "rardiol"; @@ -9794,6 +9800,12 @@ githubId = 1322201; name = "Yochai"; }; + yoctocell = { + email = "public@yoctocell.xyz"; + github = "yoctocell"; + githubId = 40352765; + name = "Yoctocell"; + }; yorickvp = { email = "yorickvanpelt@gmail.com"; github = "yorickvp"; diff --git a/third_party/nixpkgs/nixos/modules/security/acme.xml b/third_party/nixpkgs/nixos/modules/security/acme.xml index 517162d1a7..f248112917 100644 --- a/third_party/nixpkgs/nixos/modules/security/acme.xml +++ b/third_party/nixpkgs/nixos/modules/security/acme.xml @@ -268,7 +268,7 @@ chmod 400 /var/lib/secrets/certs.secret It is possible that your account credentials file may become corrupt and need - to be regnerated. In this scenario lego will produce the error JWS verification error. + to be regenerated. In this scenario lego will produce the error JWS verification error. The solution is to simply delete the associated accounts file and re-run the affected service(s). diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/throttled.nix b/third_party/nixpkgs/nixos/modules/services/hardware/throttled.nix index 7617c4492d..1905eb565c 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/throttled.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/throttled.nix @@ -26,5 +26,11 @@ in { if cfg.extraConfig != "" then pkgs.writeText "lenovo_fix.conf" cfg.extraConfig else "${pkgs.throttled}/etc/lenovo_fix.conf"; + + # Kernel 5.9 spams warnings whenever userspace writes to CPU MSRs. + # See https://github.com/erpalma/throttled/issues/215 + boot.kernelParams = + optional (versionAtLeast config.boot.kernelPackages.kernel.version "5.9") + "msr.allow_writes=on"; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/trezord.nix b/third_party/nixpkgs/nixos/modules/services/hardware/trezord.nix index 2594ac7437..8c609bbf82 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/trezord.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/trezord.nix @@ -47,7 +47,7 @@ in { services.udev.packages = [ pkgs.trezor-udev-rules ]; systemd.services.trezord = { - description = "TREZOR Bridge"; + description = "Trezor Bridge"; after = [ "systemd-udev-settle.service" "network.target" ]; wantedBy = [ "multi-user.target" ]; path = []; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix index 7242895710..ace62342c9 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix @@ -32,6 +32,8 @@ let (pkgs.writeText "prometheus.rules" (concatStringsSep "\n" cfg.rules)) ]); scrape_configs = filterValidPrometheus cfg.scrapeConfigs; + remote_write = filterValidPrometheus cfg.remoteWrite; + remote_read = filterValidPrometheus cfg.remoteRead; alerting = { inherit (cfg) alertmanagers; }; @@ -101,6 +103,126 @@ let }; }; + promTypes.remote_read = types.submodule { + options = { + url = mkOption { + type = types.str; + description = '' + ServerName extension to indicate the name of the server. + http://tools.ietf.org/html/rfc4366#section-3.1 + ''; + }; + remote_timeout = mkDefOpt types.str "30s" '' + Timeout for requests to the remote write endpoint. + ''; + relabel_configs = mkOpt (types.listOf promTypes.relabel_config) '' + List of remote write relabel configurations. + List of relabel configurations. + ''; + name = mkOpt types.string '' + Name of the remote write config, which if specified must be unique among remote write configs. + The name will be used in metrics and logging in place of a generated value to help users distinguish between + remote write configs. + ''; + basic_auth = mkOpt (types.submodule { + options = { + username = mkOption { + type = types.str; + description = '' + HTTP username + ''; + }; + password = mkOpt types.str "HTTP password"; + password_file = mkOpt types.str "HTTP password file"; + }; + }) '' + Sets the `Authorization` header on every remote write request with the + configured username and password. + password and password_file are mutually exclusive. + ''; + bearer_token = mkOpt types.str '' + Sets the `Authorization` header on every remote write request with + the configured bearer token. It is mutually exclusive with `bearer_token_file`. + ''; + bearer_token_file = mkOpt types.str '' + Sets the `Authorization` header on every remote write request with the bearer token + read from the configured file. It is mutually exclusive with `bearer_token`. + ''; + tls_config = mkOpt promTypes.tls_config '' + Configures the remote write request's TLS settings. + ''; + proxy_url = mkOpt types.str "Optional Proxy URL."; + metadata_config = { + send = mkDefOpt types.bool "true" '' + Whether metric metadata is sent to remote storage or not. + ''; + send_interval = mkDefOpt types.str "1m" '' + How frequently metric metadata is sent to remote storage. + ''; + }; + }; + }; + + promTypes.remote_write = types.submodule { + options = { + url = mkOption { + type = types.str; + description = '' + ServerName extension to indicate the name of the server. + http://tools.ietf.org/html/rfc4366#section-3.1 + ''; + }; + remote_timeout = mkDefOpt types.str "30s" '' + Timeout for requests to the remote write endpoint. + ''; + relabel_configs = mkOpt (types.listOf promTypes.relabel_config) '' + List of remote write relabel configurations. + List of relabel configurations. + ''; + name = mkOpt types.string '' + Name of the remote write config, which if specified must be unique among remote write configs. + The name will be used in metrics and logging in place of a generated value to help users distinguish between + remote write configs. + ''; + basic_auth = mkOpt (types.submodule { + options = { + username = mkOption { + type = types.str; + description = '' + HTTP username + ''; + }; + password = mkOpt types.str "HTTP password"; + password_file = mkOpt types.str "HTTP password file"; + }; + }) '' + Sets the `Authorization` header on every remote write request with the + configured username and password. + password and password_file are mutually exclusive. + ''; + bearer_token = mkOpt types.str '' + Sets the `Authorization` header on every remote write request with + the configured bearer token. It is mutually exclusive with `bearer_token_file`. + ''; + bearer_token_file = mkOpt types.str '' + Sets the `Authorization` header on every remote write request with the bearer token + read from the configured file. It is mutually exclusive with `bearer_token`. + ''; + tls_config = mkOpt promTypes.tls_config '' + Configures the remote write request's TLS settings. + ''; + proxy_url = mkOpt types.str "Optional Proxy URL."; + metadata_config = { + send = mkDefOpt types.bool "true" '' + Whether metric metadata is sent to remote storage or not. + ''; + send_interval = mkDefOpt types.str "1m" '' + How frequently metric metadata is sent to remote storage. + ''; + }; + }; + }; + promTypes.scrape_config = types.submodule { options = { job_name = mkOption { @@ -580,6 +702,24 @@ in { ''; }; + remoteRead = mkOption { + type = types.listOf promTypes.remote_read; + default = []; + description = '' + Parameters of the endpoints to query from. + See the official documentation for more information. + ''; + }; + + remoteWrite = mkOption { + type = types.listOf promTypes.remote_write; + default = []; + description = '' + Parameters of the endpoints to send samples to. + See the official documentation for more information. + ''; + }; + rules = mkOption { type = types.listOf types.str; default = []; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/zabbix.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/zabbix.nix index 0071951283..e94861a90b 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/zabbix.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/zabbix.nix @@ -3,7 +3,7 @@ let inherit (lib) mkDefault mkEnableOption mkForce mkIf mkMerge mkOption types; - inherit (lib) literalExample mapAttrs optionalString; + inherit (lib) literalExample mapAttrs optionalString versionAtLeast; cfg = config.services.zabbixWeb; fpm = config.services.phpfpm.pools.zabbix; @@ -28,6 +28,8 @@ let $ZBX_SERVER_PORT = '${toString cfg.server.port}'; $ZBX_SERVER_NAME = '''; $IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG; + + ${cfg.extraConfig} ''; in @@ -143,6 +145,14 @@ in ''; }; + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Additional configuration to be copied verbatim into zabbix.conf.php. + ''; + }; + }; }; @@ -150,6 +160,10 @@ in config = mkIf cfg.enable { + services.zabbixWeb.extraConfig = optionalString ((versionAtLeast config.system.stateVersion "20.09") && (versionAtLeast cfg.package.version "5.0.0")) '' + $DB['DOUBLE_IEEE754'] = 'true'; + ''; + systemd.tmpfiles.rules = [ "d '${stateDir}' 0750 ${user} ${group} - -" "d '${stateDir}/session' 0750 ${user} ${config.services.httpd.group} - -" diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix index 23b4d8ffb1..116994db1c 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix @@ -1,9 +1,7 @@ { config, lib, pkgs, ... }: with lib; - let - xcfg = config.services.xserver; dmcfg = xcfg.displayManager; cfg = dmcfg.sddm; @@ -11,87 +9,86 @@ let sddm = pkgs.libsForQt5.sddm; - xserverWrapper = pkgs.writeScript "xserver-wrapper" '' - #!/bin/sh + iniFmt = pkgs.formats.ini { }; + + xserverWrapper = pkgs.writeShellScript "xserver-wrapper" '' ${concatMapStrings (n: "export ${n}=\"${getAttr n xEnv}\"\n") (attrNames xEnv)} exec systemd-cat -t xserver-wrapper ${dmcfg.xserverBin} ${toString dmcfg.xserverArgs} "$@" ''; - Xsetup = pkgs.writeScript "Xsetup" '' - #!/bin/sh + Xsetup = pkgs.writeShellScript "Xsetup" '' ${cfg.setupScript} ${dmcfg.setupCommands} ''; - Xstop = pkgs.writeScript "Xstop" '' - #!/bin/sh + Xstop = pkgs.writeShellScript "Xstop" '' ${cfg.stopScript} ''; - cfgFile = pkgs.writeText "sddm.conf" '' - [General] - HaltCommand=/run/current-system/systemd/bin/systemctl poweroff - RebootCommand=/run/current-system/systemd/bin/systemctl reboot - ${optionalString cfg.autoNumlock '' - Numlock=on - ''} + defaultConfig = { + General = { + HaltCommand = "/run/current-system/systemd/bin/systemctl poweroff"; + RebootCommand = "/run/current-system/systemd/bin/systemctl reboot"; + Numlock = if cfg.autoNumlock then "on" else "none"; # on, off none + }; - [Theme] - Current=${cfg.theme} - ThemeDir=/run/current-system/sw/share/sddm/themes - FacesDir=/run/current-system/sw/share/sddm/faces + Theme = { + Current = cfg.theme; + ThemeDir = "/run/current-system/sw/share/sddm/themes"; + FacesDir = "/run/current-system/sw/share/sddm/faces"; + }; - [Users] - MaximumUid=${toString config.ids.uids.nixbld} - HideUsers=${concatStringsSep "," dmcfg.hiddenUsers} - HideShells=/run/current-system/sw/bin/nologin + Users = { + MaximumUid = config.ids.uids.nixbld; + HideUsers = concatStringsSep "," dmcfg.hiddenUsers; + HideShells = "/run/current-system/sw/bin/nologin"; + }; - [X11] - MinimumVT=${toString (if xcfg.tty != null then xcfg.tty else 7)} - ServerPath=${xserverWrapper} - XephyrPath=${pkgs.xorg.xorgserver.out}/bin/Xephyr - SessionCommand=${dmcfg.sessionData.wrapper} - SessionDir=${dmcfg.sessionData.desktops}/share/xsessions - XauthPath=${pkgs.xorg.xauth}/bin/xauth - DisplayCommand=${Xsetup} - DisplayStopCommand=${Xstop} - EnableHidpi=${boolToString cfg.enableHidpi} + X11 = { + MinimumVT = if xcfg.tty != null then xcfg.tty else 7; + ServerPath = toString xserverWrapper; + XephyrPath = "${pkgs.xorg.xorgserver.out}/bin/Xephyr"; + SessionCommand = toString dmcfg.sessionData.wrapper; + SessionDir = "${dmcfg.sessionData.desktops}/share/xsessions"; + XauthPath = "${pkgs.xorg.xauth}/bin/xauth"; + DisplayCommand = toString Xsetup; + DisplayStopCommand = toString Xstop; + EnableHiDPI = cfg.enableHidpi; + }; - [Wayland] - EnableHidpi=${boolToString cfg.enableHidpi} - SessionDir=${dmcfg.sessionData.desktops}/share/wayland-sessions + Wayland = { + EnableHiDPI = cfg.enableHidpi; + SessionDir = "${dmcfg.sessionData.desktops}/share/wayland-sessions"; + }; + } // lib.optionalAttrs dmcfg.autoLogin.enable { + Autologin = { + User = dmcfg.autoLogin.user; + Session = autoLoginSessionName; + Relogin = cfg.autoLogin.relogin; + }; + }; - ${optionalString dmcfg.autoLogin.enable '' - [Autologin] - User=${dmcfg.autoLogin.user} - Session=${autoLoginSessionName}.desktop - Relogin=${boolToString cfg.autoLogin.relogin} - ''} + cfgFile = + iniFmt.generate "sddm.conf" (lib.recursiveUpdate defaultConfig cfg.settings); - ${cfg.extraConfig} - ''; - - autoLoginSessionName = dmcfg.sessionData.autologinSession; + autoLoginSessionName = + "${dmcfg.sessionData.autologinSession}.desktop"; in { imports = [ - (mkRemovedOptionModule [ "services" "xserver" "displayManager" "sddm" "themes" ] + (mkRemovedOptionModule + [ "services" "xserver" "displayManager" "sddm" "themes" ] "Set the option `services.xserver.displayManager.sddm.package' instead.") - (mkRenamedOptionModule [ "services" "xserver" "displayManager" "sddm" "autoLogin" "enable" ] [ - "services" - "xserver" - "displayManager" - "autoLogin" - "enable" - ]) - (mkRenamedOptionModule [ "services" "xserver" "displayManager" "sddm" "autoLogin" "user" ] [ - "services" - "xserver" - "displayManager" - "autoLogin" - "user" - ]) + (mkRenamedOptionModule + [ "services" "xserver" "displayManager" "sddm" "autoLogin" "enable" ] + [ "services" "xserver" "displayManager" "autoLogin" "enable" ]) + (mkRenamedOptionModule + [ "services" "xserver" "displayManager" "sddm" "autoLogin" "user" ] + [ "services" "xserver" "displayManager" "autoLogin" "user" ]) + (mkRemovedOptionModule + [ "services" "xserver" "displayManager" "sddm" "extraConfig" ] + "Set the option `services.xserver.displayManager.sddm.settings' instead.") ]; options = { @@ -110,22 +107,22 @@ in default = true; description = '' Whether to enable automatic HiDPI mode. - - - Versions up to 0.17 are broken so this only works from 0.18 onwards. ''; }; - extraConfig = mkOption { - type = types.lines; - default = ""; + settings = mkOption { + type = iniFmt.type; + default = { }; example = '' - [Autologin] - User=john - Session=plasma.desktop + { + Autologin = { + User = "john"; + Session = "plasma.desktop"; + }; + } ''; description = '' - Extra lines appended to the configuration of SDDM. + Extra settings merged in and overwritting defaults in sddm.conf. ''; }; @@ -168,28 +165,38 @@ in }; # Configuration for automatic login specific to SDDM - autoLogin.relogin = mkOption { - type = types.bool; - default = false; - description = '' - If true automatic login will kick in again on session exit (logout), otherwise it - will only log in automatically when the display-manager is started. - ''; + autoLogin = { + relogin = mkOption { + type = types.bool; + default = false; + description = '' + If true automatic login will kick in again on session exit (logout), otherwise it + will only log in automatically when the display-manager is started. + ''; + }; + + minimumUid = mkOption { + type = types.ints.u16; + default = 1000; + description = '' + Minimum user ID for auto-login user. + ''; + }; }; - }; - }; config = mkIf cfg.enable { assertions = [ - { assertion = xcfg.enable; + { + assertion = xcfg.enable; message = '' SDDM requires services.xserver.enable to be true ''; } - { assertion = dmcfg.autoLogin.enable -> autoLoginSessionName != null; + { + assertion = dmcfg.autoLogin.enable -> autoLoginSessionName != null; message = '' SDDM auto-login requires that services.xserver.displayManager.defaultSession is set. ''; @@ -230,7 +237,7 @@ in sddm-autologin.text = '' auth requisite pam_nologin.so - auth required pam_succeed_if.so uid >= 1000 quiet + auth required pam_succeed_if.so uid >= ${toString cfg.autoLogin.minimumUid} quiet auth required pam_permit.so account include sddm diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/xmonad.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/xmonad.nix index b9013ca1ff..2bb4827be9 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/xmonad.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/xmonad.nix @@ -5,25 +5,37 @@ let inherit (lib) mkOption mkIf optionals literalExample; cfg = config.services.xserver.windowManager.xmonad; + ghcWithPackages = cfg.haskellPackages.ghcWithPackages; + packages = self: cfg.extraPackages self ++ + optionals cfg.enableContribAndExtras + [ self.xmonad-contrib self.xmonad-extras ]; + xmonad-vanilla = pkgs.xmonad-with-packages.override { - ghcWithPackages = cfg.haskellPackages.ghcWithPackages; - packages = self: cfg.extraPackages self ++ - optionals cfg.enableContribAndExtras - [ self.xmonad-contrib self.xmonad-extras ]; + inherit ghcWithPackages packages; }; - xmonad-config = pkgs.writers.writeHaskellBin "xmonad" { - ghc = cfg.haskellPackages.ghc; - libraries = [ cfg.haskellPackages.xmonad ] ++ - cfg.extraPackages cfg.haskellPackages ++ - optionals cfg.enableContribAndExtras - (with cfg.haskellPackages; [ xmonad-contrib xmonad-extras ]); - inherit (cfg) ghcArgs; - } cfg.config; + xmonad-config = + let + xmonadAndPackages = self: [ self.xmonad ] ++ packages self; + xmonadEnv = ghcWithPackages xmonadAndPackages; + configured = pkgs.writers.writeHaskellBin "xmonad" { + ghc = cfg.haskellPackages.ghc; + libraries = xmonadAndPackages cfg.haskellPackages; + inherit (cfg) ghcArgs; + } cfg.config; + in + pkgs.runCommandLocal "xmonad" { + nativeBuildInputs = [ pkgs.makeWrapper ]; + } '' + install -D ${xmonadEnv}/share/man/man1/xmonad.1.gz $out/share/man/man1/xmonad.1.gz + makeWrapper ${configured}/bin/xmonad $out/bin/xmonad \ + --set NIX_GHC "${xmonadEnv}/bin/ghc" \ + --set XMONAD_XMESSAGE "${pkgs.xorg.xmessage}/bin/xmessage" + ''; xmonad = if (cfg.config != null) then xmonad-config else xmonad-vanilla; in { - meta.maintainers = with maintainers; [ lassulus xaverdh ]; + meta.maintainers = with maintainers; [ lassulus xaverdh ivanbrennan ]; options = { services.xserver.windowManager.xmonad = { @@ -72,13 +84,13 @@ in { This setup is then analogous to other (non-NixOS) linux distributions. If you do set this option, you likely want to use "launch" as your - entry point for xmonad (as in the example), to avoid xmonads + entry point for xmonad (as in the example), to avoid xmonad's recompilation logic on startup. Doing so will render the default "mod+q" restart key binding dysfunctional though, because that attempts to call your binary with the "--restart" command line option, unless you implement that yourself. You way mant to bind "mod+q" to (restart "xmonad" True) instead, which will just restart - xmonad from PATH. This allows e.g. switching to the new xmonad binary, + xmonad from PATH. This allows e.g. switching to the new xmonad binary after rebuilding your system with nixos-rebuild. If you actually want to run xmonad with a config specified here, but @@ -91,6 +103,7 @@ in { example = '' import XMonad import XMonad.Util.EZConfig (additionalKeys) + import Control.Monad (when) import Text.Printf (printf) import System.Posix.Process (executeFile) import System.Info (arch,os) @@ -99,16 +112,21 @@ in { compiledConfig = printf "xmonad-%s-%s" arch os - compileRestart = whenX (recompile True) . catchIO $ do - dir <- getXMonadDataDir - args <- getArgs - executeFile (dir compiledConfig) False args Nothing + compileRestart resume = + whenX (recompile True) $ + when resume writeStateToFile + *> catchIO + ( do + dir <- getXMonadDataDir + args <- getArgs + executeFile (dir compiledConfig) False args Nothing + ) main = launch defaultConfig { modMask = mod4Mask -- Use Super instead of Alt , terminal = "urxvt" } `additionalKeys` - [ ( (mod4Mask,xK_r), compileRestart ) + [ ( (mod4Mask,xK_r), compileRestart True) , ( (mod4Mask,xK_q), restart "xmonad" True ) ] ''; }; diff --git a/third_party/nixpkgs/nixos/tests/loki.nix b/third_party/nixpkgs/nixos/tests/loki.nix index bede775b7d..0c6dff3fdf 100644 --- a/third_party/nixpkgs/nixos/tests/loki.nix +++ b/third_party/nixpkgs/nixos/tests/loki.nix @@ -46,7 +46,9 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: machine.wait_for_open_port(9080) machine.succeed("echo 'Loki Ingestion Test' > /var/log/testlog") # should not have access to journal unless specified - machine.fail("systemctl show --property=SupplementaryGroups promtail | grep -q systemd-journal") + machine.fail( + "systemctl show --property=SupplementaryGroups promtail | grep -q systemd-journal" + ) machine.wait_until_succeeds( "${pkgs.grafana-loki}/bin/logcli --addr='http://localhost:3100' query --no-labels '{job=\"varlogs\",filename=\"/var/log/testlog\"}' | grep -q 'Loki Ingestion Test'" ) diff --git a/third_party/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix b/third_party/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix index 32cec811d0..a284be4383 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/espeak-ng/default.nix @@ -21,15 +21,16 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; - postInstall = '' + postInstall = lib.optionalString stdenv.isLinux '' patchelf --set-rpath "$(patchelf --print-rpath $out/bin/espeak-ng)" $out/bin/speak-ng ''; meta = with stdenv.lib; { description = "Open source speech synthesizer that supports over 70 languages, based on eSpeak"; - homepage = src.meta.homepage; + homepage = "https://github.com/espeak-ng/espeak-ng"; + changelog = "https://github.com/espeak-ng/espeak-ng/blob/${version}/CHANGELOG.md"; license = licenses.gpl3; maintainers = with maintainers; [ aske ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/tunein.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/tunein.nix index 9ab0323205..90deea7c02 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/tunein.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/tunein.nix @@ -2,21 +2,18 @@ python3Packages.buildPythonApplication rec { pname = "mopidy-tunein"; - version = "1.0.0"; + version = "1.0.2"; src = python3Packages.fetchPypi { inherit version; pname = "Mopidy-TuneIn"; - sha256 = "0insasf4w8ajsqjh5zmax7pkzmrk1p245vh4y8ddicldj45p6qfj"; + sha256 = "1mvfhka8wi835yk9869yn3b6mdkfwqkylp14vpjkbm42d0kj4lkc"; }; propagatedBuildInputs = [ mopidy ]; - # tests fail with "ValueError: Namespace Gst not available" in mopidy itself - doCheck = false; - pythonImportsCheck = [ "mopidy_tunein.tunein" ]; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/audio/mp3gain/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mp3gain/default.nix index f2b4564c7c..9bf0b5b8f6 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mp3gain/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mp3gain/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, mpg123 }: +{ stdenv, fetchurl, fetchpatch, unzip, mpg123 }: stdenv.mkDerivation { name = "mp3gain-1.6.2"; @@ -11,17 +11,25 @@ stdenv.mkDerivation { sourceRoot = "."; + patches = [ + (fetchpatch { + name = "0001-fix-security-bugs.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-sound/mp3gain/files/mp3gain-1.6.2-CVE-2019-18359-plus.patch?id=36f8689f7903548f5d89827a6e7bdf70a9882cee"; + sha256 = "10n53wm0xynlcxqlnaqfgamjzcpfz41q1jlg0bhw4kq1kzhs4yyw"; + }) + ]; + buildFlags = [ "OSTYPE=linux" ]; installPhase = '' install -vD mp3gain "$out/bin/mp3gain" ''; - meta = { + meta = with stdenv.lib; { description = "Lossless mp3 normalizer with statistical analysis"; homepage = "http://mp3gain.sourceforge.net/"; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.devhell ]; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = with maintainers; [ devhell ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix index 301e44168d..f0a0956f66 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix @@ -1,5 +1,5 @@ -{ fetchurl, stdenv, pkgconfig, intltool, libpulseaudio, gtkmm3 -, libcanberra-gtk3, gnome3, wrapGAppsHook }: +{ fetchurl, fetchpatch, stdenv, pkgconfig, intltool, libpulseaudio, +gtkmm3 , libcanberra-gtk3, gnome3, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "pavucontrol"; @@ -10,6 +10,15 @@ stdenv.mkDerivation rec { sha256 = "1qhlkl3g8d7h72xjskii3g1l7la2cavwp69909pzmbi2jyn5pi4g"; }; + patches = [ + # Can be removed with the next version bump + # https://gitlab.freedesktop.org/pulseaudio/pavucontrol/-/merge_requests/20 + (fetchpatch { + name = "streamwidget-fix-drop-down-wayland.patch"; + url = "https://gitlab.freedesktop.org/pulseaudio/pavucontrol/-/commit/ae278b8643cf1089f66df18713c8154208d9a505.patch"; + sha256 = "066vhxjz6gmi2sp2n4pa1cdsxjnq6yml5js094g5n7ld34p84dpj"; + })]; + buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3 gnome3.adwaita-icon-theme ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix index bc89505a1f..6fb2fb9687 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.26_fix"; + version = "1.27"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "1ikhgagniiq4irsy8i3g64m6cl61lnfvs163n8gs4hm426yckyb8"; + sha256 = "1hg36pfzgdbhd5bkzi3cpn6v39q8xis2jk7w6qm615r587393pwd"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/redoflacs/default.nix b/third_party/nixpkgs/pkgs/applications/audio/redoflacs/default.nix index 140b163e25..879acdf3a1 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/redoflacs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/redoflacs/default.nix @@ -5,8 +5,6 @@ , installShellFiles , flac , sox -, withAucdtect ? false -, aucdtect ? null }: stdenv.mkDerivation rec { @@ -36,7 +34,7 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/redoflacs \ - --prefix PATH : ${stdenv.lib.makeBinPath ([ flac sox ] ++ lib.optional withAucdtect aucdtect)} + --prefix PATH : ${stdenv.lib.makeBinPath ([ flac sox ])} ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/audio/sc68/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sc68/default.nix new file mode 100644 index 0000000000..683aa9c36b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/sc68/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, fetchsvn +, pkg-config +, which +, autoconf +, automake +, libtool +, hexdump +, libao +, zlib +, curl +}: + +stdenv.mkDerivation rec { + pname = "sc68"; + version = "unstable-2020-05-18"; + + src = fetchsvn { + url = "svn://svn.code.sf.net/p/sc68/code/"; + rev = "693"; + sha256 = "0liz5yjwiy41y160ag83zz9s5l8mk72fscxgvjv9g5qf4gwffnfa"; + }; + + preConfigure = "tools/svn-bootstrap.sh"; + + enableParallelBuilding = true; + + nativeBuildInputs = [ pkg-config which autoconf automake libtool hexdump ]; + + buildInputs = [ libao zlib curl ]; + + meta = with stdenv.lib; { + description = "Atari ST and Amiga music player"; + homepage = "http://sc68.atari.org/project.html"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 4c64c595fe..bb2fc89339 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.18.0"; + version = "2.19.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "19sx9n5mij68v07vy65h1c16rgbpll3kagr437cjb7r95k3nk2zn"; + sha256 = "13z4v64z58b8fxph3rgjqy1z1y2agmarfr8cihlkf0ndssicasdl"; }; appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix b/third_party/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix index 0b58bc2106..04b8a1de15 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix @@ -260,7 +260,7 @@ rec { src = fetchzip { stripRoot = false; url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/10.1/${name}/${name}.zip"; - sha256 = "q0O6OE2u0bdz1+nOkzXDrrOOzoEbVaXnejx4lX7uZgk="; + sha256 = "1hbswcar3a5cw20mwrj82w9pvpkvvj6jrvqqf1lincva0r5sl7h8"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/update-vscode.sh b/third_party/nixpkgs/pkgs/applications/editors/vscode/update-vscode.sh index 4974eb7e43..cb1400f048 100755 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/update-vscode.sh +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/update-vscode.sh @@ -27,3 +27,11 @@ sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODE_LINUX_SHA256}\"/" VSCODE_DARWIN_URL="https://vscode-update.azurewebsites.net/${VSCODE_VER}/darwin/stable" VSCODE_DARWIN_SHA256=$(nix-prefetch-url ${VSCODE_DARWIN_URL}) sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODE_DARWIN_SHA256}\"/" "$ROOT/vscode.nix" + +VSCODE_LINUX_AARCH64_URL="https://vscode-update.azurewebsites.net/${VSCODE_VER}/linux-arm64/stable" +VSCODE_LINUX_AARCH64_SHA256=$(nix-prefetch-url ${VSCODE_LINUX_AARCH64_URL}) +sed -i "s/aarch64-linux = \".\{52\}\"/aarch64-linux = \"${VSCODE_LINUX_AARCH64_SHA256}\"/" "$ROOT/vscode.nix" + +VSCODE_LINUX_ARMV7L_URL="https://vscode-update.azurewebsites.net/${VSCODE_VER}/linux-armhf/stable" +VSCODE_LINUX_ARMV7L_SHA256=$(nix-prefetch-url ${VSCODE_LINUX_ARMV7L_URL}) +sed -i "s/armv7l-linux = \".\{52\}\"/armv7l-linux = \"${VSCODE_LINUX_ARMV7L_SHA256}\"/" "$ROOT/vscode.nix" diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/update-vscodium.sh b/third_party/nixpkgs/pkgs/applications/editors/vscode/update-vscodium.sh index 5df4cafdee..79c6b497ec 100755 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/update-vscodium.sh +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/update-vscodium.sh @@ -19,10 +19,18 @@ fi VSCODIUM_VER=$(curl -Ls -w %{url_effective} -o /dev/null https://github.com/VSCodium/vscodium/releases/latest | awk -F'/' '{print $NF}') sed -i "s/version = \".*\"/version = \"${VSCODIUM_VER}\"/" "$ROOT/vscodium.nix" -VSCODIUM_LINUX_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-x64-${VSCODIUM_VER}.tar.gz" -VSCODIUM_LINUX_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_URL}) -sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODIUM_LINUX_SHA256}\"/" "$ROOT/vscodium.nix" +VSCODIUM_LINUX_X64_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-x64-${VSCODIUM_VER}.tar.gz" +VSCODIUM_LINUX_X64_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_X64_URL}) +sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODIUM_LINUX_X64_SHA256}\"/" "$ROOT/vscodium.nix" -VSCODIUM_DARWIN_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-darwin-x64-${VSCODIUM_VER}.zip" -VSCODIUM_DARWIN_SHA256=$(nix-prefetch-url ${VSCODIUM_DARWIN_URL}) -sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODIUM_DARWIN_SHA256}\"/" "$ROOT/vscodium.nix" +VSCODIUM_DARWIN_X64_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-darwin-x64-${VSCODIUM_VER}.zip" +VSCODIUM_DARWIN_X64_SHA256=$(nix-prefetch-url ${VSCODIUM_DARWIN_X64_URL}) +sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODIUM_DARWIN_X64_SHA256}\"/" "$ROOT/vscodium.nix" + +VSCODIUM_LINUX_AARCH64_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-arm64-${VSCODIUM_VER}.tar.gz" +VSCODIUM_LINUX_AARCH64_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_AARCH64_URL}) +sed -i "s/aarch64-linux = \".\{52\}\"/aarch64-linux = \"${VSCODIUM_LINUX_AARCH64_SHA256}\"/" "$ROOT/vscodium.nix" + +VSCODIUM_LINUX_ARMV7L_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-armhf-${VSCODIUM_VER}.tar.gz" +VSCODIUM_LINUX_ARMV7L_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_ARMV7L_URL}) +sed -i "s/armv7l-linux = \".\{52\}\"/armv7l-linux = \"${VSCODIUM_LINUX_ARMV7L_SHA256}\"/" "$ROOT/vscodium.nix" diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index 8f04e6b178..911b497e8f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -6,6 +6,8 @@ let plat = { x86_64-linux = "linux-x64"; x86_64-darwin = "darwin"; + aarch64-linux = "linux-arm64"; + armv7l-linux = "linux-armhf"; }.${system}; archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; @@ -13,6 +15,8 @@ let sha256 = { x86_64-linux = "1kbjbqb03yapz7067q589gaa7d6cqaipj7hmp1l3nh0bmggzsc4c"; x86_64-darwin = "1qgadm52c5lzkvgvqrz0n8brm4qbjg8hf1dk6a2ynqhqjxcwbj4r"; + aarch64-linux = "0i3yl9rx9h7qkl3k9qk6gg35nhz737qzzbvzvdwkqjaacsbpfgf8"; + armv7l-linux = "19iz2bxcq6y8sklr6zcnbp47kki9l00x3nvr213lkk3kj08l0afv"; }.${system}; in callPackage ./generic.nix rec { @@ -52,6 +56,6 @@ in downloadPage = "https://code.visualstudio.com/Updates"; license = licenses.unfree; maintainers = with maintainers; [ eadwu synthetica ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "armv7l-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix index b8ca7e3f26..018cd71075 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix @@ -6,18 +6,24 @@ let plat = { x86_64-linux = "linux-x64"; x86_64-darwin = "darwin"; + aarch64-linux = "linux-arm64"; + armv7l-linux = "linux-armhf"; }.${system}; archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0hn4pqmabz3qf3bbqnn1fz7fcgzdkp2lwr2yzgmx8hhh3cff8bnb"; - x86_64-darwin = "1x3wx0d99ihyya0n89qclc3jlhh0m72hs8hj7l0h3z6zmh6q2vzv"; + x86_64-linux = "1ckg279vvg8h1n8ippa9vlyw4vk3frinb6fvvi47zggs31168m7b"; + x86_64-darwin = "168g34v2b8r1pdbnqrs0c0k9aa60n5rspixziywnq7m61i23nlgd"; + aarch64-linux = "1cd4sg6k7sqmj3yzmprq1rz928bvc3zrch8agfd8zfap1d6nfaal"; + armv7l-linux = "0f8z4lws027dyqhcrkzm9rvifwid5m0icprg0xk01l7y18n3q923"; }.${system}; sourceRoot = { x86_64-linux = "."; x86_64-darwin = ""; + aarch64-linux = "."; + armv7l-linux = "."; }.${system}; in callPackage ./generic.nix rec { @@ -27,7 +33,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.51.1"; + version = "1.52.1"; pname = "vscodium"; executableName = "codium"; @@ -55,6 +61,6 @@ in downloadPage = "https://github.com/VSCodium/vscodium/releases"; license = licenses.mit; maintainers = with maintainers; [ synthetica turion ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "armv7l-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix index 71c2de08a5..27d4a4ab0e 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { - version = "3.2.1"; + version = "3.4.0"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "035rvqmw386hm0jpi14lf4dnpr5rjkalzjkyprqh42nwi3m86dkf"; + sha256 = "6dd3de1f5ea9f94af92838c0be5ff30fdaa599aa1d737dcb562f9e0b2b2dbdda"; }; nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix index 073983fa35..8853ff266a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix @@ -20,6 +20,17 @@ buildGoModule rec { -ldflags=-s -w -X github.com/tomwright/dasel/internal.Version=${version} ''; + doInstallCheck = true; + installCheckPhase = '' + if [[ "$("$out/bin/${pname}" --version)" == "${pname} version ${version}" ]]; then + echo "" | $out/bin/dasel put object -p yaml -t string -t int "my.favourites" colour=red number=3 | grep -q red + echo '${pname} smoke check passed' + else + echo '${pname} smoke check failed' + return 1 + fi + ''; + meta = with stdenv.lib; { description = "Query and update data structures from the command line"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix b/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix index 3322fbee71..ac963c890d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix @@ -19,7 +19,7 @@ }: let - version = "4.0.7"; + version = "4.0.9"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.0" @@ -35,7 +35,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "06vcbj9p96d8v4xjlygzr74lqllb9adn8k0racajzq61ijb0imi2"; + sha256 = "0cmdyfabllw4wnpqpdxp3l6hjnm0cvkwxn0z8ph4x54sf4zq9iz3"; extraPostFetch = '' mv $out ./all @@ -50,7 +50,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "0k5xf97ga3ixd02g1y6v84hbxd8yhvpj5iz2rhxs8wfnkfwibzh4"; + sha256 = "1fvjiagi78f32nxgr2rx8jas8hxfvpp1c8fpfcalvykmlhdc2gva"; }; postUnpack = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix index 906c458fba..398cec3a2b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.16.0"; + version = "1.16.1"; src = fetchPypi { inherit pname version; - sha256 = "35df7605a21a05c3290f4324289fd6f584029f4135a8220dec7d490c4e742a1c"; + sha256 = "51d789aac43013e25c1fad553f214cb1f43b1ae02e0651b640f102c5b9280aea"; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix index a081076ac8..5374a18b15 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "7.37"; + version = "8.0"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "0fpb43smh0kwic5pdxs46c0hkqj8g084h72pa024x1my6w12y9b8"; + sha256 = "01ggakpzmiwkqdzc9xqc93xmynd53kzpwl99q3l9z2hpqyzlnj2a"; }; patches = (substituteAll { @@ -37,7 +37,7 @@ mkDerivation rec { ''; homepage = "https://www.gpxsee.org/"; changelog = "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ womfoo sikmir ]; platforms = with platforms; linux ++ darwin; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/fix-qttranslations-path.diff b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/fix-qttranslations-path.diff index 3b546338d2..757d9b8c65 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/fix-qttranslations-path.diff +++ b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/fix-qttranslations-path.diff @@ -1,18 +1,18 @@ diff --git i/src/GUI/app.cpp w/src/GUI/app.cpp -index 10e84d5..1e0abbe 100644 +index 37e9d3f..d4a065c 100644 --- i/src/GUI/app.cpp +++ w/src/GUI/app.cpp -@@ -34,11 +34,10 @@ App::App(int &argc, char **argv) : QApplication(argc, argv) - installTranslator(gpxsee); +@@ -35,11 +35,10 @@ App::App(int &argc, char **argv) : QApplication(argc, argv) + installTranslator(gpxsee); QTranslator *qt = new QTranslator(this); -#if defined(Q_OS_WIN32) || defined(Q_OS_MAC) +#if defined(Q_OS_WIN32) - qt->load(QLocale::system(), "qt", "_", ProgramPaths::translationsDir()); + if (qt->load(QLocale::system(), "qt", "_", ProgramPaths::translationsDir())) #else // Q_OS_WIN32 || Q_OS_MAC -- qt->load(QLocale::system(), "qt", "_", QLibraryInfo::location( -- QLibraryInfo::TranslationsPath)); -+ qt->load(QLocale::system(), "qt", "_", QLatin1String("@qttranslations@/translations")); +- if (qt->load(QLocale::system(), "qt", "_", QLibraryInfo::location( +- QLibraryInfo::TranslationsPath))) ++ if (qt->load(QLocale::system(), "qt", "_", QLatin1String("@qttranslations@/translations"))) #endif // Q_OS_WIN32 || Q_OS_MAC - installTranslator(qt); + installTranslator(qt); diff --git a/third_party/nixpkgs/pkgs/applications/misc/koreader/default.nix b/third_party/nixpkgs/pkgs/applications/misc/koreader/default.nix index 4ffd3f6fbf..e870986a50 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/koreader/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/koreader/default.nix @@ -11,12 +11,12 @@ let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; }; in stdenv.mkDerivation rec { pname = "koreader"; - version = "2020.11"; + version = "2020.12"; src = fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - sha256 = "15nw8kyjyhqlr742gkpzn1b9906rdm6cssnc6jbbph5pjdlzspc4"; + sha256 = "0x97mm7h8kr1jps0hzdgl9irakma85ikrhzr18wc1plmffgv6kwm"; }; sourceRoot = "."; @@ -47,6 +47,6 @@ in stdenv.mkDerivation rec { "An ebook reader application supporting PDF, DjVu, EPUB, FB2 and many more formats, running on Cervantes, Kindle, Kobo, PocketBook and Android devices"; platforms = intersectLists platforms.x86_64 platforms.linux; license = licenses.agpl3; - maintainers = [ maintainers.contrun ]; + maintainers = with maintainers; [ contrun neonfuz]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/mwic/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mwic/default.nix index 3be02e7c41..dffc27bd40 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mwic/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mwic/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = with pythonPackages; [ pyenchant regex ]; postFixup = '' - buildPythonPath "$out" + wrapPythonPrograms ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/terminal-typeracer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/terminal-typeracer/default.nix new file mode 100644 index 0000000000..fa68703e8c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/terminal-typeracer/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, fetchFromGitLab +, rustPlatform +, pkg-config +, openssl +, sqlite +, libiconv +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "terminal-typeracer"; + version = "2.0.2"; + + src = fetchFromGitLab { + owner = "ttyperacer"; + repo = pname; + rev = "v${version}"; + sha256 = "187xrqxalk2gxa22ki5q092llvliddrsc68cg4dvvy2xzq254jfy"; + }; + + cargoSha256 = "0ky8m23fjjbv7fr9776fjczpg0d43jxwnjxjpwz56jpynwnihfkl"; + + buildInputs = [ openssl sqlite ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + nativeBuildInputs = [ pkg-config ]; + + meta = with stdenv.lib; { + description = "An open source terminal based version of Typeracer written in rust"; + homepage = "https://gitlab.com/ttyperacer/terminal-typeracer"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ yoctocell ]; + platforms = platforms.x86_64; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/upwork/default.nix b/third_party/nixpkgs/pkgs/applications/misc/upwork/default.nix index 5d4247f386..18c2bc129c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/upwork/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/upwork/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "upwork"; - version = "5.4.7.1"; + version = "5.4.9.6"; src = fetchurl { - url = "https://updates-desktopapp.upwork.com/binaries/v5_4_7_1_81f361962c74427d/${pname}_5.4.7.1_amd64.deb"; - sha256 = "c443724d37bca942ca126b8b207846a5adb94a92ff9490370f2fe055feee347b"; + url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_4_9_6_2565cdd0547940a2/${pname}_${version}_amd64.deb"; + sha256 = "ff6246b3b4a1ed79cc9bca2934652fefb40bdac4b7e95997f3a46e354ce52456"; }; dontWrapGApps = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/variety/default.nix b/third_party/nixpkgs/pkgs/applications/misc/variety/default.nix index 4241f91532..2366d04b9c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/variety/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/variety/default.nix @@ -1,31 +1,28 @@ -{ - fehSupport ? false, feh -, imagemagickSupport ? true, imagemagick -, stdenv -, lib +{ stdenv, lib, fetchFromGitHub , python37Packages -, fetchFromGitHub +, fehSupport ? false, feh +, imagemagickSupport ? true, imagemagick , intltool , gtk3 , gexiv2 , libnotify -, wrapGAppsHook , gobject-introspection , hicolor-icon-theme , librsvg +, wrapGAppsHook }: with python37Packages; buildPythonApplication rec { pname = "variety"; - version = "0.7.2-96-g3afe3ab"; + version = "0.8.5"; src = fetchFromGitHub { owner = "varietywalls"; repo = "variety"; - rev = "3afe3abf725e5db2aec0db575a17c9907ab20de1"; - sha256 = "10vw0202dwrwi497nsbq077v4qd3qn5b8cmkfcsgbvvjwlz7ldm5"; + rev = version; + sha256 = "sha256-6dLz4KXavXwnk5GizBH46d2EHMHPjRo0WnnUuVMtI1M="; }; nativeBuildInputs = [ intltool wrapGAppsHook ]; @@ -43,31 +40,43 @@ buildPythonApplication rec { --replace /bin/bash ${stdenv.shell} ''; - propagatedBuildInputs = - [ gtk3 - gexiv2 - libnotify - beautifulsoup4 - lxml - pycairo - pygobject3 - configobj - pillow - setuptools - requests - httplib2 - dbus-python - gobject-introspection - hicolor-icon-theme - librsvg - ] - ++ lib.optional fehSupport feh + propagatedBuildInputs = [ + beautifulsoup4 + configobj + dbus-python + gexiv2 + gobject-introspection + gtk3 + hicolor-icon-theme + httplib2 + libnotify + librsvg + lxml + pillow + pycairo + pygobject3 + requests + setuptools + ] ++ lib.optional fehSupport feh ++ lib.optional imagemagickSupport imagemagick; meta = with lib; { - description = "A wallpaper manager for Linux systems. It supports numerous desktops and wallpaper sources, including local files and online services: Flickr, Wallhaven, Unsplash, and more"; homepage = "https://github.com/varietywalls/variety"; + description = "A wallpaper manager for Linux systems"; + longDescription = '' + Variety is a wallpaper manager for Linux systems. It supports numerous + desktops and wallpaper sources, including local files and online services: + Flickr, Wallhaven, Unsplash, and more. + + Where supported, Variety sits as a tray icon to allow easy pausing and + resuming. Otherwise, its desktop entry menu provides a similar set of + options. + + Variety also includes a range of image effects, such as oil painting and + blur, as well as options to layer quotes and a clock onto the background. + ''; license = licenses.gpl3; - maintainers = [ maintainers.zfnmxt ]; + maintainers = with maintainers; [ AndersonTorres zfnmxt ]; + platforms = with platforms; linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 7115b68282..9bf5e837bf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,965 +1,965 @@ { - version = "85.0b2"; + version = "85.0b4"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ach/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ach/firefox-85.0b4.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "628cf83823cf28f48b9c69b9c1d5c966b3525802f8883759c66872b6a851aa05"; + sha256 = "04d5c5b64e906438122cfcd13c6a06d58bb1c0a2d2eaf66f52f91e103a5534ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/af/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/af/firefox-85.0b4.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "1206089088cc4cf88dba63b50b71c365db44fc7a9052868e4c7900222a3df6a0"; + sha256 = "57bdfd3e6efe3c667ddb4c1e2421c191eedc407f578ee307b1ed916815726837"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/an/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/an/firefox-85.0b4.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "7b11406db06ef3c77ae06dff1d911a797bda7bc348e141e2e9f7e3a1cea75d81"; + sha256 = "7ceb815590071691a3faa6f1d8215963b48c54c220c512499fb9642efc1492d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ar/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ar/firefox-85.0b4.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "9222a3eec3abab949c96d9e32073f32148da9069670a6577fc06aed7c64fe1a1"; + sha256 = "ce8b25f9ba3d21e87f660a17a90e770417e658f7280d0e41d0a5ff41164a2d43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ast/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ast/firefox-85.0b4.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "6dd5f9ae82d04e139eeddac7d938e78d1409ebc781fb4e27a399bf41939a21b6"; + sha256 = "a220440bebd1c1179e6e2a483ae148ada05f86c3c5d68946bb3b14d301301a78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/az/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/az/firefox-85.0b4.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "490d98a746c45446e237f84af894768fd0c78ed6d4937eec086e1fce8101890c"; + sha256 = "b79a3e03d476d3667c28ed83dd84fb375013597d58e9e13f431eba13b509422f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/be/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/be/firefox-85.0b4.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "ce25d9eeba02850693bb8df813af694c00192abd64b9420bb422ef1b704cf26c"; + sha256 = "c8e00ae8a6d66a427212c1323a0f4860c25058c1d27fc0d3bb56612f0f2b785e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/bg/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/bg/firefox-85.0b4.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "027021477cda6f203500d725146db27b3ff3ca4ea38991b74be65a68659163a6"; + sha256 = "cc63fb7773dfe6a9b84a7ddd80873c6f8fab3b0f12e15a0db862bac9006d86c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/bn/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/bn/firefox-85.0b4.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "38465864ae3694fd810bfeb8077d90fc2dde1a1b6a97fea9ef413b48bbe4b6e8"; + sha256 = "9fdd2e50b1fd74a3cabe55c23ca44253e9b5a2791461a2f15713cab6f4700e6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/br/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/br/firefox-85.0b4.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "d42480e934cf4ea14ab8f1cba15c95749efae727c52908a77f5f076865a40024"; + sha256 = "44d99c74041f227252989570c9fe1dc2a1519e195e6386d0dc78fbf43ec41e88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/bs/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/bs/firefox-85.0b4.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "36e50b4abad8d9cdd6b281135467f639268670d857cd0f86bb827fdba70d5ab4"; + sha256 = "7c3b4beb800c8e023fbc5655e6435b11f6ebf11c3d82a5b6a1df76df682f0666"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ca-valencia/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ca-valencia/firefox-85.0b4.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "45433be09e4b01efe768c9178d26d68cd7fbab0505d7f6ccce230718fee5ea7f"; + sha256 = "b0676d544d8d2cc6c37a192adcd4e61038106c0e84066e68895642afc8e158a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ca/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ca/firefox-85.0b4.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "147993df562fbaec1a07ab634b8db112883d0d37c7c021804b8c000dc2549454"; + sha256 = "8f170b9356761ec175be3f417df624a78e939af931376f52d36f19b019c05338"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/cak/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/cak/firefox-85.0b4.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "126b7154f9e943b922a5a5284e9eb51b2569f5494431f6273b7c32a8d1c6a9f2"; + sha256 = "ca966b90035591d3e5f886814664d2f203bc0b65e781f46566a51269811efcdd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/cs/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/cs/firefox-85.0b4.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "152bb5937e5baab421f60bdaa27c948f37c0a55da0d05175c7689e8fa50ed6e6"; + sha256 = "31e19d69e03821c646d21969b48e5ba01c52b2d5d2538f7bd7e7b93c9a6f7bb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/cy/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/cy/firefox-85.0b4.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "d294f03b0791b42bb944e3338a6d5d488005524e192ed36ba9e6306af72d084e"; + sha256 = "dfe3974d2328fa535b79f3e18d699b8d62a053efd0248cc88d1152ff92604166"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/da/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/da/firefox-85.0b4.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "baa162dbe4bd9830f06225d247fd771e328a3a50b6583accd407d06a757fbe1a"; + sha256 = "86ba3d548eb3a6408b9234c382389c0fb5907c98eeab25cc39e810727570d2ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/de/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/de/firefox-85.0b4.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "c9f7d9e2af245b63e88ae36bf095495fbd6cb3c852d79a8ca41db2159c243c01"; + sha256 = "1cb610280c07e7af82df2dd283a6d35c1f63afe6f11a0fd7797efc4128ad126a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/dsb/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/dsb/firefox-85.0b4.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "a474a5404b8142bface3eee5008a87c4015c9762a76bc9a1a8caa0f26a5b7ba7"; + sha256 = "555300937cd2d6e25085d5d3f4b699704ba3630ba4ce667a9ed3d67a9c9f5143"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/el/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/el/firefox-85.0b4.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "19a60bc3baecbe1ba2d4e0d6fc60a60ad6b792a3024ab6226729983dc530c1a7"; + sha256 = "b2bf744cbe21d23a1ed16310fe552197b129964a75aca4fc1c3759fb59782d7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/en-CA/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/en-CA/firefox-85.0b4.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "d35de987f9e686679e7feed27fd99b73478f19f000a3004ea40d67e6598ce5f2"; + sha256 = "422cbea99fd390c31868b0cf0e6bc8344cca9dc9540dd58b8b315f519a3c53cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/en-GB/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/en-GB/firefox-85.0b4.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "120926431e18449e1b422037d491245792e4f62e8a9d0b38df25e16b485dbaa9"; + sha256 = "a996f6ea769ad846a69ab692b967ea23c4de461a922add22864fce6f97d04e30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/en-US/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/en-US/firefox-85.0b4.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "f1b26bf2d9e62f86c36b7de154f014e5ea893e1674986f1cb59f2711cf6663f4"; + sha256 = "aefbbe66cd209bdd9a1720562127560212f257229b799c45de5feb4173f10232"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/eo/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/eo/firefox-85.0b4.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "3eca3b6ac4b952c508445bd0783804d5dc76a8f6d7492ae9d65bad0060f242a2"; + sha256 = "8237d0bdc5a0ed6873c4178a20e77bb2c86f833f02e6872852d8e35e36978459"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/es-AR/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/es-AR/firefox-85.0b4.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "3c67f7e3572a97262ff4b37fb165b474a4f91429f59ff2b568910f4d3f8dab38"; + sha256 = "6d8b15775127619f923e7c255a01afcfd81d9d7bb01c0152e3aac3ef327b9ff2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/es-CL/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/es-CL/firefox-85.0b4.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "e5b2167a4ec5f7eede57c394bfb7ee01ffd1b0d81d36a586a6d562dffe2f50a3"; + sha256 = "26dedb44f4dd064005a2cb935444acd0f6a99a451b87263775cad4506503bccf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/es-ES/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/es-ES/firefox-85.0b4.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "dbd7505430897e38ba8f46b0081027c276184ff4085f801accac976cea68281b"; + sha256 = "96d8444ee16d78bbde1fca5a69d5f404bdb2199757c566cdf44416ef43761715"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/es-MX/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/es-MX/firefox-85.0b4.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "1a82057ebd73698db2d3f8753733f52fed2c5f853470a553c05d7c85dce7d3d2"; + sha256 = "ac4a2e7490b448a2654a0999b77e4e3e6e8dcd96c4239654dc8cc748f54d2ebc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/et/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/et/firefox-85.0b4.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "da22407a7c9505cc876ca3473cee8ef1f894f84d8ffea8c10425340a8b6358f3"; + sha256 = "d44ba8376fccea9feae2054a50db58a5d4abca559ebfe854821cca9342f05f42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/eu/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/eu/firefox-85.0b4.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "6facb92bcb4f03ac2e9b1f0288ad94b43e395b9113d38f924c372c8e78ddd749"; + sha256 = "d7f2131c7125fa6ee78a978e11d0f5c4ebbd55f5fa9fd8ac644aa0a9f68d60bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/fa/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/fa/firefox-85.0b4.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "b982f5211f262c9c5091d65ac941fa9f900707f1212a84df434f62e1d5c9a059"; + sha256 = "2f63087cb94dee9a97cdf0641478b076f119bdf30dc0e3d35b9db67dd1e75cfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ff/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ff/firefox-85.0b4.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "eb35a619db24de04f30dabdab45a3c53358c36706b3c6018de9798c3a79afb1e"; + sha256 = "e8bd39fe41b98ce4fd1e630d376e263815b60339947344d82a7fddfc4ac331d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/fi/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/fi/firefox-85.0b4.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "b39e892c9084a34a608b9385f7b8c6d25f1f9cda8c9891ea92e8fdc49e4ed63c"; + sha256 = "d743df7df584c30ab237771778df1a06a01cb8801ad57233738a9e7ee7b5a453"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/fr/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/fr/firefox-85.0b4.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "9de9f9342fa3d3bc721bbcb72b4b5ec42b8500e179222e229e7a45d724ec878f"; + sha256 = "9426e988190c0f65cd87cb502064cc2cfa8146e1edc15aaff7ad3a28e8c30ae0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/fy-NL/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/fy-NL/firefox-85.0b4.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "1f1511fb51c1ba7ad3602da39a3b4c95c86096edf155a652f0033a2d7cd173df"; + sha256 = "80896d31f83bfbee9ac2b585894fbe0332c2516c7cb9eb06b10dd8169fb0a50b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ga-IE/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ga-IE/firefox-85.0b4.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "295a46724cd89639feae42dda983bc5a48a78996d6c3fd1022bb81400e11567c"; + sha256 = "678c24f47dda38562f15889bfef5de79e1375a85c8158697c37846252d55f4e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/gd/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/gd/firefox-85.0b4.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "2926449119034ac81ecffb0a366ee521e29437c64b6bd37a7254ad392bc90061"; + sha256 = "87d924efdea12fa98ebbe88d42afa5944b821c4081ee0a549e66393d69c1eb53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/gl/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/gl/firefox-85.0b4.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "2df55d15357b45e643c4b8a020c7ad235fa2579c16f05f5dc84be8d52b6b0066"; + sha256 = "61cb992a445cee2689e19415da53d5611d68f65acd8aceaada76b0999e50ec13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/gn/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/gn/firefox-85.0b4.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "3a7686ad5d4f4b3adb96c6ea05844f890aeb456983af43827ff787e373733456"; + sha256 = "95c3467048e7250dddfcb018ae8b8bcdb9de78b3a01076c4e1aefc937f4bc3b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/gu-IN/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/gu-IN/firefox-85.0b4.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "b64c32a495d72f7c710e9a0168d4967743067f0f85ebf7109aed5b53db919cc6"; + sha256 = "1bdcef358bd0ac242dd0607545fc65ad98d0785898a6a53394d04c74c8ee0a22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/he/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/he/firefox-85.0b4.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "8c1a1b96eca7d84123c602543f1ac8f54ecb0111e195495e8a3265b2537b31cf"; + sha256 = "5f240e3754fb368288cab3f37ab250d6815dd1b792b77180fa5590e4d9c6acca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/hi-IN/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/hi-IN/firefox-85.0b4.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "bc561d6399a1dfd9aa1f7afcfb4b7ee1c600985dd45a9a195cd89256cd2493c1"; + sha256 = "9b0eb6eb03eeeeebc78c652f4e5bf511335ebad3afed9b31eeef8f5c830b0e1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/hr/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/hr/firefox-85.0b4.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "071ce5aeac01ef79ae210595305fd014d5a893594bbf2b547d15a6126a784848"; + sha256 = "53bd72eed8eda15e3dd1a070b221535bda8aee3930a713b121b84b64a2f95a3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/hsb/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/hsb/firefox-85.0b4.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "7ffe23f37f8908a31a3f0b29b361ef3c49917753300c6a492955237ca188fd6a"; + sha256 = "e233c7ab46d0f3dece1d580c8a615156bb70df6937d47286c3a54b4d15cebac9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/hu/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/hu/firefox-85.0b4.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "60101a07d1ae5c50b44bb55bf52b5b962f0f0912e574f1a58ba6021951fcedf5"; + sha256 = "2ffbc88d33631a5c0ebbc29b8f36c6b7f043b8faf0600398e24d48546d699eac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/hy-AM/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/hy-AM/firefox-85.0b4.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "89bffc83a11fd8ff4b8ee143173c6d4d37124f63d476f130d7931efbf5a723aa"; + sha256 = "f6cbd70bd95642caf737684c8c429342e8f567061bfb680732382b5c5f93f1a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ia/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ia/firefox-85.0b4.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "f317ebb0622f0286d648803dab6a917bacd6471214388b201558c9ec23e8e431"; + sha256 = "ae7c96c3120c1727c4d8ed4f9978aafe64740d49111bb6bd507e4a9e14d7dab2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/id/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/id/firefox-85.0b4.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "cdfd0cc0bd1b10bb96ca044f18aa2bfb857b18d83ae15a46533a8657eabbb168"; + sha256 = "680f5f3dc843b7acf86c79fb3238796ce3d28b60da3b76f55a37652d1a11c176"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/is/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/is/firefox-85.0b4.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "0834e007713da632917bb546b6be21117dcbfc3ecdf8062ecb1819611df62ee5"; + sha256 = "ca40b8a9e99234faa67141732a5ef70e416e9aae08b4e8cbf6fe2ada9f0b7b4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/it/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/it/firefox-85.0b4.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "57a071d56cbdb3fd754e91dbe9930ab90ff87ae9cb10e2e1bcb0f2a62165a62c"; + sha256 = "ac8f5d43fc30760e68be4802514bf09fdb4940336d48844fe833d9290a10506c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ja/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ja/firefox-85.0b4.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "d9fd58cb8ba9a30821c717c9047ce149efb7b1f06c2ab820208684d13436ad19"; + sha256 = "13c66340765699d336926872065ce0edf7e14f43b2f16dc99aa277f5d64f2275"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ka/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ka/firefox-85.0b4.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "7a6071fa1daa7875308c26073b0f690ef5e408e18c9d1063a321468ff3d92015"; + sha256 = "16ef31cb13dc3c54196ed3dd6209bfdbed14460c38d3fc8cdce4ee7801322ac0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/kab/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/kab/firefox-85.0b4.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "b25e902a6819cc252b23f9eb0019643deed468f65615fca808c55cf7a6c6a5ac"; + sha256 = "68aa1a647c86f2e9fe63bab675f7d851a08fb22d5ed72b10f2e6710e03e02672"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/kk/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/kk/firefox-85.0b4.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "0767c4cd2b99ef045135ae278c79466333ac1808c7503eda37d82a2941b0004f"; + sha256 = "8603847204461f9370447c6c546c4bf985926353597aa7d9ecee9d46a810ba95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/km/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/km/firefox-85.0b4.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "d6006640aacb18dcc8c8df330d60f831c12bdc214210c257bd6ace8763d88eed"; + sha256 = "d552b9301ca160577d24267584fa3b8c45a1c6eb82cf540778a617eaebbff6e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/kn/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/kn/firefox-85.0b4.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "37e8b5177ed9fd2341a39164769384c233da4378100617edc19060604002480d"; + sha256 = "b5f4259baa11d5010fdde27dbd583f56b0c9fafaeab9c7f31be87b9645478e6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ko/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ko/firefox-85.0b4.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "9fc2ddd0a9dffeb327ff33c24454a189e552c840ffcc916abe37b49836891cc0"; + sha256 = "e73be57006747f673e979741203537cbbd8f9fb6f4fb77cfc88a7d0c85c7a7de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/lij/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/lij/firefox-85.0b4.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "925a665aa1cc6ceb8cc0a70b5eaca499a82b59577770c006af73423c637f7d74"; + sha256 = "3190c816b7a2973aa7d2a0640fa4e174b02b62a62c28eed7e0df3b377242aec3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/lt/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/lt/firefox-85.0b4.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "7669ece40b4269062d50191f46d41d65511f4b6553280bf2e22990592c584cee"; + sha256 = "95a68d2d1a98bdda38e86f4c14c28669d2a11792fab561d6a8295c017d1a5068"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/lv/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/lv/firefox-85.0b4.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "d6c86314f58044c30b03e176db1273861f0d1c47a6ea168fb5ac6a4cc047ac24"; + sha256 = "3460fb2356584ad3cd02905b9b3a70a569ef78666a69bff754fbd0b0eba0cd1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/mk/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/mk/firefox-85.0b4.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "87cf9485d579da404bd2ef47c39785232eed16f31eb7cd2108cc9698378c5358"; + sha256 = "864d8ae602b06c75ebf0d0bb4b8fcc5722840db373bac1a5656a968df7aea6d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/mr/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/mr/firefox-85.0b4.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "5179a1d37c6c9504b5bd0c41ef91f9f9dfa1e0458cbe2b0dba36829de04d4a6e"; + sha256 = "09e63b52ae1de354e73838dd0a60de360fcffeaeedd8af316174866a43c49293"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ms/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ms/firefox-85.0b4.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "4722459468f6507be8aa111efdbcb17356970c8b4b2a355a27036b154356d341"; + sha256 = "c1e47d112d887922d81458bba8a7afa0a706444624738df92cdbe395f4bc9d0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/my/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/my/firefox-85.0b4.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "d398c8395ebbdfa5f799dd08e33935156f5bc99631f782e6e5c637b35e2a98f4"; + sha256 = "d78413226f8b87af0ef5baecad2ab4b9ced69358cca969635b4f71df645ccacc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/nb-NO/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/nb-NO/firefox-85.0b4.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "b58379bf0b1da5a85ccbae9b88081f384762ceef1ca2fe95700867f4416a5342"; + sha256 = "5ecff68265d8ce7c5a59da0366570adafc69b8c05fc323e619a7ce08fdeb7108"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ne-NP/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ne-NP/firefox-85.0b4.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "66047291e50429e9d0e50eb4959ab0b321c920d65fd3ec612cd0d136ebe86dc7"; + sha256 = "00824ae4fa57e98fba5fb1a46b86853a289e24341b94d2ede9e8e7d358d29e9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/nl/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/nl/firefox-85.0b4.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "b57675671a91478b60cd0c8a2b697c8d7f574f84eca1695f9eb20d5eb27e64cd"; + sha256 = "a0b3a25bdc123bf9ea441456b7d1b3c6fe78ef1589b69742dc38f50d3d92d700"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/nn-NO/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/nn-NO/firefox-85.0b4.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "c9b56bce646f09a0f2ff9990dbafec12f07aa1c92e5d6ceb419a450378662252"; + sha256 = "00f599f8850af9df078c5d296bfd50a7bdb012f7978e83828000371fbdd93509"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/oc/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/oc/firefox-85.0b4.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "2be07d5d2a582ad3d9d40a54243c97c4c4ca45d7691e19d5263440abd510d37f"; + sha256 = "d03638662bd89dfaa1af08312b5361da04d5cb9c93f6eea9b2442bdde25d1eb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/pa-IN/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/pa-IN/firefox-85.0b4.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "2febc1c6a6369236467d440b44bb15682dd975e8d5f399364c76518f869b37fc"; + sha256 = "2b7d9ed3aca15e5bb22f3fcc5fa0e6289729e5a88d8a43602a9adf38c4e0a8a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/pl/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/pl/firefox-85.0b4.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "2d107f89149db4be89a73f1c1fc825bcb73e7f3266f33bffce7ad75d02869d13"; + sha256 = "afe081f1f64aee140eecf24b413f44fa04d999f3bb97a2862a8469732489e94c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/pt-BR/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/pt-BR/firefox-85.0b4.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "c443b3d55413dff75de4a88f726b0c80df6a687ce0fcd10a10fa41e8c42a021a"; + sha256 = "9e643c670efe00e9144529aa65c8f10ea2c8f7d5374a2d93c439a56cabad7d2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/pt-PT/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/pt-PT/firefox-85.0b4.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "dc63f909e2f59a08cabc37fddd03fa6f42a20d5708329d1d660ae9dcc3c1ffa4"; + sha256 = "98cf63382a586b649b30685bee8591085edf46d747860fae751a5dc4ed183979"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/rm/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/rm/firefox-85.0b4.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "6f7458b0f03034867f370d449e0ab0f33a8c154faedea3347c89be681cb24105"; + sha256 = "e000820f06aef69922eb0305e4d70cdd1820f86a1bbb60cd0888cc5b5d6ce0b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ro/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ro/firefox-85.0b4.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "cde050b50475442e8d9c8f1228a84da4bdacc4202e387dd9c3d6b639f3a70b2f"; + sha256 = "daf8f2419a8122ac4da0dd585bc466d404f9a1cceb82aea8732aa4ec112219b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ru/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ru/firefox-85.0b4.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "fb99e81c93dfaac97468061dec682fb5da1f0b3c1c6b22b4b98a5c1f23b6694a"; + sha256 = "c081fddcc21b73b421516d529d7abb6d463c804f1875b4b755d34c0be34cfb05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/si/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/si/firefox-85.0b4.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "e4786b5b9adb260000cf7e1b49006c86b2ac4d5d50329e925adf82594213302b"; + sha256 = "607f0debcaeba1a5a6bc270e4a45793b56d4fb15580da6e264659fc3d4ed6577"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/sk/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/sk/firefox-85.0b4.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "b386c895de5d07ddb4caf734014a2fbc47d9acd6ee364e59004511a817fd8144"; + sha256 = "d3a06cb060f6ec2131705a75187dd5ca62fae91a22258c59f93c308151ff7b00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/sl/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/sl/firefox-85.0b4.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "058f2047df24199bae7a7b30a913929035a996dac65988665818d900ebbd3e3f"; + sha256 = "eb9c21cb4c577500464c8fde4091207a93ab96cd4a6119feac815242e846e65d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/son/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/son/firefox-85.0b4.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "c48206706c8c3170d40d5718704d35532cbc03ecf3b84b241ecca5142011d8f5"; + sha256 = "ce5449dfb0201d3a2c4891519284903af46177739feeea4353720d108107ccc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/sq/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/sq/firefox-85.0b4.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "2dbf91ea3c6714b1dc0a36661edf8d30ee05ecc3cd87f9446d9806958cd68cf1"; + sha256 = "65ab1b97653e2cb416d60f65d6fd7696cf7b5f63bb3b80d13fd199829247ca58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/sr/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/sr/firefox-85.0b4.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "ef21f1c5ae483dea2e522f8575573d2c43b706938572c682eea1fb69dc66284e"; + sha256 = "16c5e71c6dc86688d3cddc0330fcc98a7e948773833c3f1d856b194541fecc3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/sv-SE/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/sv-SE/firefox-85.0b4.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "a285c9e3274ea0e97997bb177e521d5c671c322e7a00a11367176ff9e5e3fb2d"; + sha256 = "7bcae95e5c57d1b380458ab30e2dec9a7bd2c1bc6c2712fa44a9245639ac083e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ta/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ta/firefox-85.0b4.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "df18247c65c74b7f84e5c18ba2948224e960df4fb3abb4057e291c0e0ec12f35"; + sha256 = "6f35fc2329ea0a96049c9cadaf925ed064e0f4b60bf12082029898396ab34dc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/te/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/te/firefox-85.0b4.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "7a134e7398eaff92a9e6b10b26e4ef26c8406aad91e22ad9c4e4cb8de55a96cf"; + sha256 = "9f4c691b6943f715e6d6a1db9a36cc745614ac99a33767080157f852d8cae594"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/th/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/th/firefox-85.0b4.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "91b3a69c2b660005050abd47fe50903aca9390da44bb074850e9440875aa378d"; + sha256 = "c15b8db3bbf1bd9362bb5f024daf0aee7ef3df8cd7864dbeec6a824449722063"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/tl/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/tl/firefox-85.0b4.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "b1813765c4a9292995bb529df922137f92ce4a39bdec97378dd71ce4225759d5"; + sha256 = "98837a0ce69e67b9bcc518c9953763331757870c5cf1ecaadb1cb37cb30338b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/tr/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/tr/firefox-85.0b4.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "0c2a166cff9a3731bc378552b3baf36fbd53e0d9a37a3caa939a17829dd008e4"; + sha256 = "cec9efb3c0ffd4f7438964efd34d78b377f117fb0f9d051e103663a676d6a6cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/trs/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/trs/firefox-85.0b4.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "69bc6b9532bf040d5311a864baa5ff88b182553ea9b0110c172a12f6f27f8eae"; + sha256 = "151687f7ed062ad3d0b46b113a26931c41dd375d324aa7055952492fd497c445"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/uk/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/uk/firefox-85.0b4.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "2653f28322a4adb50ecf00d9fe12f4ffa679a68616516c84af3eecacac692b9b"; + sha256 = "c0335c927cb343b3a48739949c3d8d1a813eb5caad4a989dd9a3fec16e4c5688"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/ur/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ur/firefox-85.0b4.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "637acba1c21f19f6414e864b2142b05c530c2b06d5acea907bc4a423774d0d04"; + sha256 = "5b4a20c279161d910dd6730f1691d4a4bb8319a3e365bfbcc553a47e96d9db30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/uz/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/uz/firefox-85.0b4.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "4a3e1155821b870d8d84de11c4c3e53100cf88e043bcd024493f5d196f1fb6bd"; + sha256 = "8fd7881da8c03c3b9313509047ee453d175c271fd086e27710bd0aba3fd319d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/vi/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/vi/firefox-85.0b4.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "bad32bc9d6dccdf87e1a5f36f359d379411837bbb55e109d088820bf0461ae2e"; + sha256 = "7dcdea1143af2cfaf9974640d520fec1e44cc156d085432f52318b745dd21f6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/xh/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/xh/firefox-85.0b4.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "2b92d825d913068f4707848df34fea54b2bee3da088cdb8b6dc99bc2a23a7d2f"; + sha256 = "f502767929505209d05830b7d0075fcf8186349afe07e793afee560eed9aafc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/zh-CN/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/zh-CN/firefox-85.0b4.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "6018f1350df63cf15317b6b60c1968d365c6f19a643b24fc359515b12d6d21a0"; + sha256 = "9d8c003da5dc117cda204487ffd0dd95d9677d7e30e5f868e3a39d3146569da1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-x86_64/zh-TW/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/zh-TW/firefox-85.0b4.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "4df049ce4e35a66db2fa6e6e32045d89e3d3d6c89cda7cc07d3e843a26543065"; + sha256 = "ebdf6822810a97381e63c6c2bb08baea4c239c35b4c75e714da367f982080863"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ach/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ach/firefox-85.0b4.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "71423d13d132c50df51a1aff2884280716ed865abe658cda2957a86816cc3f35"; + sha256 = "e63b45c8a34d286097825d2830b3697a2205fc8f62e7f7b19fa5569294d4fd3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/af/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/af/firefox-85.0b4.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "5fbe29f38605f08f65ebf3222ce12ae46168e96c107dc743b56d865d3daa8647"; + sha256 = "93f0fa71381f937d07764ed4bbdb1ea167664fdb1ed40d063b4fb079ed485dea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/an/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/an/firefox-85.0b4.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "a66e2d52b2af65f4bfd624dfe7883e8231b7f511e551f486a2b78c3ec164c57b"; + sha256 = "1ce6d8e8ba3409b7b5886f87633609a8568ceabdef45beef623ebf74e4bdbd76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ar/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ar/firefox-85.0b4.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "fa8c2083030e26c8d61f213e66b2bf5e1e9fdbdffc570216e7c97cee0e067b8a"; + sha256 = "990905d68a82f3eee04a9a8df4b291eb425469e6bf045a3a126bee08af2b785d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ast/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ast/firefox-85.0b4.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "5a5b01eca7665b91f8fb11b34c7eb1c0e681cf130cc5f1443686913a8d9e662e"; + sha256 = "606c37c4eda9d1f55e8a8fde0f8df822186995cef190e1644bcbe465cc1a0f54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/az/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/az/firefox-85.0b4.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "a0b1d6c634b38a72403ca48de6c527d9bf966a905f03ae6699df014595b3bba4"; + sha256 = "0d2cd416e309ae19af4f3704823de50b560863dc1f1939e75663e9976cbb5c8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/be/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/be/firefox-85.0b4.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "76d6e8286c947513951ea977d205d8cdeff87e142b1664a5a01cca4f187a1623"; + sha256 = "fcf922756a6830d9bf76bed71579f4b6e2e47edafbb843ee2a490552cfc88f86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/bg/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/bg/firefox-85.0b4.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "153249e545295ff4e8adecc5ea0dda230645fd0f4afa06f24a7e551d87e0d7fc"; + sha256 = "9d40f252156d646363e65aca32ae4ebbeffe147dccb3d4989e79a57a4dca57fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/bn/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/bn/firefox-85.0b4.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "14f439c1b3acbde375fc1c4cfbf8f20a274e8d04b32cfdd6bdde389a6ad6b19c"; + sha256 = "9471636ffff7f11db45001af18d86ae0d930517e09cd2aebb0a850a946b44917"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/br/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/br/firefox-85.0b4.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "9dd2fbc10b2515691c47fb0496b0fb78d1602ff9a6cffa11cc0a83d43d809e46"; + sha256 = "4482fe50747f7fbf4db5ffb0b3c16bc0245fc0397f582e73c609a8cbbd48c1f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/bs/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/bs/firefox-85.0b4.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "4223186d487b4d43ae08450bc896161b5060ea96da8cec63f19d2ba5d6f9c6b7"; + sha256 = "5357a4fb56a4aeeb43d98f5ace310000532da9088ca0cd06c818d3852fb38452"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ca-valencia/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ca-valencia/firefox-85.0b4.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "2dcdd7c1172375c5358ea5957822f3cefaf77edce286a9e9abcb7cf4f2b09396"; + sha256 = "1a22b215fa50f947afd5657ec702419ec708133f89f372d7667d12fe0e3b85eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ca/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ca/firefox-85.0b4.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "6d9c112fcfc56a39212a31ecef8b36f78c7d0130899a2630e8de53870f64276d"; + sha256 = "fd335110bb31eed1e1854d24c74c51b8ded826008e49d8ed6b1f7be85ef05753"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/cak/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/cak/firefox-85.0b4.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "c7cef2e121d960328aeaf43a933aa9b18911dae0c73b21edb483b1c036f7525e"; + sha256 = "b852765dd3dc4530c1d1d00232c6a615472d721d1f69cf303ddfd6d6b26d2745"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/cs/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/cs/firefox-85.0b4.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "9edc6df70bef140abe8b43d60369cfc17a10d2c20f9e06e4182035e1a33f48fb"; + sha256 = "747f697ca9aca2b1982a95a3d05f4549d3f1b276cdac39e17670c0b101f8b704"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/cy/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/cy/firefox-85.0b4.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "789bc341344eaafbaeee8e9db4128d12e1cc54490d544168ddbc3c88b2374630"; + sha256 = "4bf87e33539d8bc383715b89a5fa5e1f5d1e272a7899689585f9fdb711a5e259"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/da/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/da/firefox-85.0b4.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "678f6a6931f0c733b5836d994875f1c133a0f865a2eb496d0e30cbe3ce5faf5c"; + sha256 = "bf9961aef493ceb1613c91d79ef1c7b718dc5e39fa3ad8dbfb012d51c16b1e5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/de/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/de/firefox-85.0b4.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "e5721e408165ddf927e7810e6a940c50d2b2fe30ad5e2ccdb6811074ca0c4287"; + sha256 = "e4e85f2d49dfd9b4bf62e4ee2e77d03660f0b6ae9ce7ee827a17f2f067768b59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/dsb/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/dsb/firefox-85.0b4.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "b4aeb111e1124ead137bf3497e95bdced3f1a158f48585b644a73d50432a7d6e"; + sha256 = "71a3307575c45643d8121b64a345c19a6dbfa0924fa7d91b5913d52ce7a5d663"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/el/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/el/firefox-85.0b4.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "66ce828c90be502cdb820bd69f4216450db60a16a40ca038f75eecea3fd0d640"; + sha256 = "75bdc62ba592d48f172af3b072158e14ce0f433c7ee3b44f9bb0f4e0f9c71834"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/en-CA/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/en-CA/firefox-85.0b4.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "ab7c8f8626ac88afec096210d75ac972308ae75cb3ebb315b30ab21b51e0b064"; + sha256 = "c7e2bb86941274de33368c78122cb14bc52c4177de2b9cc757d269d9d7cff40d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/en-GB/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/en-GB/firefox-85.0b4.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "38cdf3449f82c51d6d1bdf3b6fd00a3f8bb057255ba2418a9547e48804744bef"; + sha256 = "46c5821f9e973a599c74445ab4a44ca31b3f76e18597f4e0d77479c1cd0d3841"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/en-US/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/en-US/firefox-85.0b4.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "b044f5e64dfd2bd5dba00f8530abb3f49b82d600aca6d3165dd1ea7504975483"; + sha256 = "4cd2facaa0b33b02228405e74689770516e6af6f07de8dac096bc66ca9a238bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/eo/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/eo/firefox-85.0b4.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "8ded13c7dc12d539efc5a3ed8a9d7fce556b7f012a184a1d1b96e8e2ec10a1c7"; + sha256 = "6966ac14fa72fb627955e9281c6e54f23eb03b83647cd52934304d672adb6d5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/es-AR/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/es-AR/firefox-85.0b4.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "f3dbe9b5f621bdfd1a19489a749db8bf452f4b5079ea4f79bfc9378056caa54a"; + sha256 = "ff32191b95dfba73d85caab8aca47e32b2579f92c9fedce14f6e16a6e42c2178"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/es-CL/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/es-CL/firefox-85.0b4.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "9c8f486cce81c331588271cb6a82624cf4bc4daf480150e66f24237e42e9389a"; + sha256 = "a7c7a9f646492e8de8474f1869075c568774ccc0118c340721b70c06e5471a5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/es-ES/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/es-ES/firefox-85.0b4.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "0f04e9217d3981dae74a534bea8c5085e0a147e2e8ebf34090932cc4e5ee1bc4"; + sha256 = "71e78fc680de3dbd91b77bb13b113ee5f34463aaa4791a3b0a445a292e5d0732"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/es-MX/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/es-MX/firefox-85.0b4.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "7b696644fdb7c270a08155ee1a6896172966de078b9e172ca24b128b2e869651"; + sha256 = "9c357beab45fad0e56f957fa73b8900a916c6cbcc8b18bd5389c0a977ddcd18e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/et/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/et/firefox-85.0b4.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "579bc62b32ea7805fdf5ca456c9343a40e0fbb1a2a040b8cbad7e70a54ab0172"; + sha256 = "a3de258fcfc4d633529566d2d8f7bb582683d6dc22cb3c9ad13a4914b84b6100"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/eu/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/eu/firefox-85.0b4.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "6c3049d47d9c35f96eee579b5d790a2b651f4f126fcea41b2fb05eca1fe686ce"; + sha256 = "092cb149621ff664ff4462c39266ea352971b30f5dfb0db163b62cd3af4e0fcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/fa/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/fa/firefox-85.0b4.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "33cca96a63f1f4a1598ab3c2daf4f758633d8be5316b8d1c194eca404f38d6f5"; + sha256 = "083d17daa3f86af4651cf433180750bcea6d00758ada3ade80bf2f713b3c04f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ff/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ff/firefox-85.0b4.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "2c2151136438802148d7cf22253e9681b5076f6831271a149f76fecc3c5d1a18"; + sha256 = "7de0cfa6bbdd1061cad1a72d80f5f504dd163a066c9911e1c44428f02b1942d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/fi/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/fi/firefox-85.0b4.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "ff96c7c1efea803822524ea5d47a25147d03547eb9e662bdeec42d30513f8a92"; + sha256 = "d718ce1837fcf64bf2b324724603559124697e58ddce8324c79e582c7f644205"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/fr/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/fr/firefox-85.0b4.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "e5679dc6f70a9d56604431e25954da2eb6592fefa6d6a99436b761ffc17dfc4d"; + sha256 = "74e2ab8182100b7e69c62698bcf5b03cb127f4e90dcbeb35bba7d66b58a711e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/fy-NL/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/fy-NL/firefox-85.0b4.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "c1be73adad9145d881228cc0567d677f94380489dc6aae9b4ff707207eb3a24e"; + sha256 = "135317f51eb93e2bbc18401c8e5fd2c070b3688fc6a9bb54e9e78bb7f37c676c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ga-IE/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ga-IE/firefox-85.0b4.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "40a2f2e6eade53f32c9fea90e0945376e5f06a0b220815c124630f419f319ede"; + sha256 = "77fc52e186c1f823067a7fdb549232a080753c813afdece12f49444bffa6507b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/gd/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/gd/firefox-85.0b4.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "7fa079c7e79971914f425db4877489e8aeda145af2968d51adfed235036d4576"; + sha256 = "abcaca790054b035687a78e9ae8151459af4b7f2d9d561d6ae41c87a0308c694"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/gl/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/gl/firefox-85.0b4.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "84d2b44fec8d9276b787eec99311384d83b626b3b9f75da2a725eeb50202ff81"; + sha256 = "291adca54f86591fdb67c6a958eb7784b5d5d4996858ae8936a5615c89e2fb4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/gn/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/gn/firefox-85.0b4.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "b9b528eaccb7f081b9ff7c0bad618d96faa5dbca0f200d197b760f1185f8cb53"; + sha256 = "0c8dc262e96c0a912cc8aae7e1ec76da36091cea47ed535eddb8039564ed24d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/gu-IN/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/gu-IN/firefox-85.0b4.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "5ffeb05e20bf3b4c2f89c4b81bc40656a943bd56687946ea10ca85308a8482d7"; + sha256 = "2fb8fe3c39353ae9b03018ab17a3531ae20e1a6794871a7ff02108484f641801"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/he/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/he/firefox-85.0b4.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "62d8b9327c77aea9b0b3070c0b5f5c9e48ec90f9f95b7d001a8efdfbea2656d4"; + sha256 = "3222cc40ba99d0833a3a8c5bd2e9e8c74ffe0e2209891899e9d37b6a35bd8e41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/hi-IN/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/hi-IN/firefox-85.0b4.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "497c96a2b69e2890725ba8b8a464970bab77988a0ba8b2b88cab068c13a69cd4"; + sha256 = "bb633eeadb00cf6913190221e5720c68da8d7a7d5e51b5f1d32621ab35fdf7ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/hr/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/hr/firefox-85.0b4.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "714e557e682e7a2a4bae5d457cb35c2e19273d613871b678bd2a8373f1e4a9b6"; + sha256 = "21a8dd0e511ff658e09a5497925fba833c32d1bf6537f11e53eafb07d6bd8854"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/hsb/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/hsb/firefox-85.0b4.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "94f4d2e8017fba63c8376e2d5daeceecf2bcfe0da1cbe5cf2422552faf6512b4"; + sha256 = "c862804fc9602884bc8074631d51e091866177682a6767e5b4935a3315b2ea82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/hu/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/hu/firefox-85.0b4.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "b7e0e33363de83462ebf94a9490f95ef7f088aa6dd665707e416772cbeed7de1"; + sha256 = "bf92592b0f3697e828c9b07d24c5394ef6cd980c94248ceaaeb0181a1d0ddb24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/hy-AM/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/hy-AM/firefox-85.0b4.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "7e7fb17fccca63b9614c5077e1c8e2c82ea778efaad332375d38ecff602db9fd"; + sha256 = "fe5686fbc9c1a173c4ce11695675a4aab2efb7d340bccef797d8a20eedadfbc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ia/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ia/firefox-85.0b4.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "baee0674ebb53768a13b889976bb6dcc9fe76b799873f9c3064279a3231bbe6e"; + sha256 = "791423722d872ecf6c45e0f16b74626e19764c003cc5f2ac2fbe3e1bacea9422"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/id/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/id/firefox-85.0b4.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "d3c1e1e0bd774e1af092cc40c2b912a7d510e3c99944dd0810d6314d865d69cf"; + sha256 = "df4b06f6d4946d2dcd55130df46b7cf5e391ba433eef792854ef8338dbcd891c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/is/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/is/firefox-85.0b4.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "4d8260ea95a026246dfd3da112fa1911ff52456656ec5f2896e8f6a5bdc510ad"; + sha256 = "d60f08191a68e5f4cfaf5848c6d0a755c9033e853e6da08eab6b74362c220ab1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/it/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/it/firefox-85.0b4.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "7f922294874c4a5876d8131572a93a9669b0f20b4381e7f6b82d5413b6fe6f5c"; + sha256 = "a1d38ce8785cc3f15d777e226aba48fa1448da021092d9aac340cd02ccfb5669"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ja/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ja/firefox-85.0b4.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "8a92ecb5b8f62ecc4c64ca566071a3ca42cf9338f5ada718f196f63d0972cc79"; + sha256 = "02626394737a87d0dc80365b7ff7829bb1d1191a65a063d4d079735199ce2731"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ka/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ka/firefox-85.0b4.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "35c4b28506f026a2c3beaff67db693aff09fa197e5c158056ac9419804b05aee"; + sha256 = "4581ada66c25d45db22d4cd41356e30b0b9fa88132758e219e15ed70dc4055a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/kab/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/kab/firefox-85.0b4.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "34db7140b10611dafa089ff930215eff8ff521b14542d742edb5af6ff710bafe"; + sha256 = "24b4d9cb927322b3805e930a54020fa84e3925d824363ef824501ff2769cb015"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/kk/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/kk/firefox-85.0b4.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "67ebfa76f660e6beeba6d4190f20503f88397e8e5730736f2416b5a91639d69d"; + sha256 = "868d5959ba761e578b5a2d00a29c244cfec0108a294fd52b18682cf31173b9c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/km/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/km/firefox-85.0b4.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "3d0c6a8a3387454f1d0fd0d99c19176085088a413ba11be59660ff2622bf957d"; + sha256 = "e5f63ff912c920d92d7608e2746d429737f0868bc5fe33d3c460ee1f745e242b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/kn/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/kn/firefox-85.0b4.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "73e01f0f6e28b29d49c1b2025af3ef188252afd7bfc5b38ae3bb4c29dc1f5158"; + sha256 = "65d45e29f289cdefecb369862fee62be698abad2b8452687507a52149b4d1de1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ko/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ko/firefox-85.0b4.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "471ffd1d4950a1b2dfceaf91ff538f6582b3c21be89b5bce4f7605cc3102cc42"; + sha256 = "83a516bbf83574f20339382778378a889016e5947c882fab63aadb728023465d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/lij/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/lij/firefox-85.0b4.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "11785be018c86839b225b9028d4cb9aad4bc86dd1dbeef0b26834e50bdb40797"; + sha256 = "690522d1a0d67c5538d567accde52effeba8b16cb4c36920aef230a62e1f655d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/lt/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/lt/firefox-85.0b4.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "868bdf38c6e26286db62df32475ec8a521574899ea23eb8f12d543ab1d74df6d"; + sha256 = "f586dd3c96aa61d9aa19ad734f4a61c9e1f6a530795ad486a2a1ff4cb18f0854"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/lv/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/lv/firefox-85.0b4.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "83b2e75858d984ea450c3b8867da0d7bd4321a139fe7cdd7fe968e83c3567588"; + sha256 = "002bdcaf29f65d2c81b607e36c280f73a08cefa32f9e878ca2c834b80eb69435"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/mk/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/mk/firefox-85.0b4.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "4b09567527422259087d69d78d55cf1310daaf6000fa6303b9dc0f1ad8f504df"; + sha256 = "06179e95fce7f93f410983664077e4213f31272ea626a8b3fefe1e78dd0b7fa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/mr/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/mr/firefox-85.0b4.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "68cf8cbec32be8571efb0bf8b9eec9e33f08e78985a68328748af6ca46f3b1a7"; + sha256 = "532c17600a7ccc995424759043f0dcf0df5a10870bd7daa92c39f3a2a0b11c68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ms/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ms/firefox-85.0b4.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "729642b22529b9b6caed5089fa6fdcfe7a05f0e50c898b816a01ee358012b2f2"; + sha256 = "b315e64474d410e4c6c403b1083b98fe5bba5f20fa4fcb115671c58075e1ad65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/my/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/my/firefox-85.0b4.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "2de61bfd5e438099f5a263eb8c5d22d675562843ee000cf023fc602ef8f6d623"; + sha256 = "848b472edef05971e5d6b003a1d3241c0d34a3f0b2a54ff97ed3a7f2ac96bdde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/nb-NO/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/nb-NO/firefox-85.0b4.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "4f96948cd2b2887a413b0ce1ed7815e502db1b26499ea6ad6f2d8a05db803b25"; + sha256 = "ca2e64f608b908b752413d9da7c8ec2cf23ab2f49df6362ce381b0d31e9caf56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ne-NP/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ne-NP/firefox-85.0b4.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "47b9c401d432002b457d9bd55f6558383870b8d976fe0a2e885610b9cb03a7f1"; + sha256 = "3386312e032b56457483fb46d935773adf12f3a3938ac4c6eb5b0c12242d93ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/nl/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/nl/firefox-85.0b4.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "d8cf656041406c15f54da4df8989b956c92837a3b17df08c071f43d8183e0cb3"; + sha256 = "7bbf63a4acf403611daf55e6663d796a46201349d29531245261aa5a8457e4c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/nn-NO/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/nn-NO/firefox-85.0b4.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "81e4789c887a07fc00428d9af00b3552c5fbf22beeec31f7839e72c96f0aa60c"; + sha256 = "f126bb842ae56504ff25f9ee0765cccf7b9a4bce1d45d382f6c13d23792bbf47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/oc/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/oc/firefox-85.0b4.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "4650fe41db72f2fd6317cb35980356149610180e00ad8c79e6f7203852a42649"; + sha256 = "3f4045cfe03eb4fcd16215b5693913577f6c5fc68ba74528c6575a5573528241"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/pa-IN/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/pa-IN/firefox-85.0b4.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "a50c61b670b011651f61c0d36f87180ddc75686f7a125e7a6a4da05208801bb4"; + sha256 = "cd4e81e714f78303603c390b490144e27f5f83ad436e610842aa04c242c8a549"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/pl/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/pl/firefox-85.0b4.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "b808e322fc60b7efaea73728e5f58292e3764f1ef22f47298b7dab2e2b2fe689"; + sha256 = "9147013773bab5f5da15e021becda90d63daf7f7068d7947f9d7eae3bdb0e124"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/pt-BR/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/pt-BR/firefox-85.0b4.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "323f5083225046500a368f86dad5581eb1d08078db5f0cbcf789da7fde2ea872"; + sha256 = "20efb971aaaebe780b337d1525eac527dde028eadecd5247321a5db5f0217143"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/pt-PT/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/pt-PT/firefox-85.0b4.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "0e59076c66d290d98b315451a3170a9d7ee9cda1285ae5bf2a59f9300be5749f"; + sha256 = "765cbe09264ffc15115da555500ae376bc1a91458c872ad7e4876701aab6f10b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/rm/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/rm/firefox-85.0b4.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "1b01c79a9c7601816dbeca84e7eb66d2d9240e883e4379d132efff2adc71eec5"; + sha256 = "93f5d6ed649d275ad4ee1f9a7075e8b4270abe6275b57eca0759b2a8efb08cff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ro/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ro/firefox-85.0b4.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "92e49c4dc22795b8f71a74e673f9c1713c182cb80c3811898c132c532d600a6b"; + sha256 = "aa44ba543a08a56f46e220f41695da4aa0fc97c9569563ff0555f308117cc983"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ru/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ru/firefox-85.0b4.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "82826401517e04b61ce8728496dafe2314560736cd5737202edf20353fa443fd"; + sha256 = "6a17313ad121e9821a766115259a8f29ace0ae683d18a86c844073e671a4b0cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/si/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/si/firefox-85.0b4.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "dc7fdcf680ab7aa71a9f06681ca35d521118cb9a9b07897ee28086f399bd5ef1"; + sha256 = "2766789c614ca35f6ec7177464c5cd2f5df5ec1ccde71e1835efd6f3635e0de5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/sk/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/sk/firefox-85.0b4.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "f4af1988166e39ecb93b0a2b2b2ca8473764d33217ec976f60a320277ec950c9"; + sha256 = "7de262a9caaf141c37d819f89eb3b1ee7ab932b10e345e7f9a50db7f1e8cdfa9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/sl/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/sl/firefox-85.0b4.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "22b192c317d9cdf7744f04636cf1534f940244d8db491ccc127f0486ce254868"; + sha256 = "e31fdd4a192daefe7a3946976c7682e15ebb61b598c5dcf8bb7a870efd3a9e27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/son/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/son/firefox-85.0b4.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "73ca06a27c14ca81b2c102503fe4e4a00b39b41800d774387f64a4e29d82e709"; + sha256 = "532dd0db390b3d8da03cb5f01e26dbc0752365e782e0b2d11925c14f5dfd8f0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/sq/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/sq/firefox-85.0b4.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "61783c5a14d81ac3aee9d354a8259347d5dcf2f14306a23cf6a89d852527c7d3"; + sha256 = "35c59d0543506c625fd6ab0c181566c5f370aee2504970fd37b50d0d34ed0e8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/sr/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/sr/firefox-85.0b4.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "2972079539e598fa558bb52237e7ccea45d7faba5e64dc26747e5e100f69a833"; + sha256 = "a6f9d8fdcfcb4b4a89e14b84e6a88bfdb0d6b578ee8e4129dc1f82bd933ecdcd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/sv-SE/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/sv-SE/firefox-85.0b4.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "4ccf2fe7e32204184b2a643a780444bd60419b39f6611466dae2572ecd34b4b1"; + sha256 = "664b8b51429c0267a745a69906f32757a28a4ae8b23bc2f591d3b190a3091379"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ta/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ta/firefox-85.0b4.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "3cb1bc787c91a8fb583472429151c7f5eb1bf53c9614f44632a69a06e75dd3f3"; + sha256 = "05679379a0abe41cf46ab182018810ca42cf8b81686f48c3c644928db85d4c76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/te/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/te/firefox-85.0b4.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "e197f97e88c40955e422cde9cf86109b3030ac2c826495e110b925636c9df59f"; + sha256 = "1c884e460b6e5a0e0c27e087b3f81a3c4245f6a5ba5ea2784b2b0b61114462dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/th/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/th/firefox-85.0b4.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "b9ad4d253cb8f4169acdf25eb1a1178441c7d0f8df20294fa256fe37d7abf29f"; + sha256 = "9ea2b02fba273e970bd2140e713468b300fda7cf50451f5f4f840220b782e1d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/tl/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/tl/firefox-85.0b4.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "b4ffaff8a4bd5dde81adc027935b5ea85877c997085d4f64635d1f657f294d69"; + sha256 = "ea9334cdbae5921720974575477da6310fb75c02eb068cb13d700b71df1596f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/tr/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/tr/firefox-85.0b4.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "0fa4e91de70badb0dceef368bea48c2ed7a0ff201e4abcc74597a220bb29b481"; + sha256 = "c2314d1159313ae8d330244150cfafb5345d7515c5062c62ae31d916f69bf4ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/trs/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/trs/firefox-85.0b4.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "e1f46d6ac7beff9048c3844379b3b375b3f1cd78f4464e70822194d6febb9ebe"; + sha256 = "769acc367c1dacee2617e784a98d4c546857123690f902783ed9f97c10062f8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/uk/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/uk/firefox-85.0b4.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "84bfa5825e4cd047d577ec5ec73c9c21ba356f10254b64cdd30259946744f184"; + sha256 = "d9c179bc63a3c9d8ec4722afb4cf4a3cd4175d01542477fc132147521d7be0b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/ur/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ur/firefox-85.0b4.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "bd254f994c6fb977154dfcabe6038d851cd00903ed12b376bc33e858e1aa4d8e"; + sha256 = "ed365cdf1f3ca389b308a2b9ee405917da0dd0cd1536c9c7a4e13949b118a2ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/uz/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/uz/firefox-85.0b4.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "54cf0f273950124152ec3e980e1d0a0fb84d2a4fab0660677636d1e46868c714"; + sha256 = "b6437d5c406edfbe0c3a114d230a5b9beaefec04e48c92d01a7cf900f6dabd56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/vi/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/vi/firefox-85.0b4.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "1af267979115d152f8282495de9e9280aae4d85ce1148a287b45c390bcc25bd1"; + sha256 = "1d6f91d852f0b20e357e1accc6c43ad93bcfe2e5a92f04a89c1d4bace70285cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/xh/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/xh/firefox-85.0b4.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "0dd914e24a2e42dfc424ce1d2257e6439e676f9f6a658c4e87b24c48c6fc4bc1"; + sha256 = "597a04402d0d34f10c6e3fbd0f629eb45c6b3b8eba2c63917074bb34c47e8cf1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/zh-CN/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/zh-CN/firefox-85.0b4.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "9e6b05b2897011b6e9c5c93c3f1117c4ef4955042ee05d40533809a20e5843de"; + sha256 = "e4df77f3447615bbbcb21904f15d2d18936ef7216c047a62c6901be00343df6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b2/linux-i686/zh-TW/firefox-85.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/zh-TW/firefox-85.0b4.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "112263f15ebc4f6a7f8a79113f2f43c61ef402f6037700112143f1b3bf6a3516"; + sha256 = "f0d9f95b465bf5a60bb0ec5906354acb705e78ab7dcfdcf0c09a3f26e4fc7bfc"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 8c16b5f8b9..1620bc6063 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,965 @@ { - version = "84.0"; + version = "84.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ach/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ach/firefox-84.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "12a2a0c416d491a867c3c68d2dec4efde37d1e21b50512971527d491dd173d21"; + sha256 = "576e937824252ead56b4b4472aaaf8e3553107c547bbff74457a0a1d33b721fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/af/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/af/firefox-84.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "73ac394e073b3964befef66a3a82a09f9904ed36b4de2d12d21600feba5ac1ab"; + sha256 = "ef9509ce8cc5f766aa3072c78750babf1bc26b4211f0f5ac7a4c88a29cdac875"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/an/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/an/firefox-84.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "5b8208b477ae3590311bef51cdbb8c5b786e3d943316760cc4ece3d27ebbc4a3"; + sha256 = "7bdc125a9ed334f2b3989d40bcbbb526ef583823be5bbba590bdd7fb9562d32e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ar/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ar/firefox-84.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "d53c3899a160d0381339d2e30bff8060961cc2db64cdfdc90af091c4d375cdba"; + sha256 = "710d77fc45c4164c96194209d2dd615ce4cbe3583440f8f8eaef8697ec53a078"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ast/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ast/firefox-84.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "78d159ee9c969c2b7acd9a42695695477fcd2ef958a3a4397e03662fe7422150"; + sha256 = "910c6c17015632c3f996b4e7732fcc895eb9f966037f53934cb1810856c3e292"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/az/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/az/firefox-84.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "2c625c4b1ed1413f9ffa399d84a73fbd99bd1c4650d786429f6b9ca9fb38cd81"; + sha256 = "3c636e6b006c7ffdc01bafcb048fd15de7b414e63968e278a37be8faffa89fe1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/be/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/be/firefox-84.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "c6cf89add52fccb933fcb9544b286b31a42d6af4f556a84bc81de721053f024d"; + sha256 = "aa691e814c2452bef9cb7f75098ab94cdbe742b3d25c456178badd68169b3b2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/bg/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/bg/firefox-84.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "eb0a8986c13e375cd834800686a94d52548df451d81d774377890a5b1e286411"; + sha256 = "f6aeefe5aa099ac804bdd10bdd180d101c634ced146ed42cc025180a6bb9ea69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/bn/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/bn/firefox-84.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "8f2baed5e81aeb9ecc579e9f4450a71c7dca13c869c8c39064bb900049884308"; + sha256 = "91ffef38c34407d455294fd69e93fdb40256da5d06ac6a300cb48902991fb172"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/br/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/br/firefox-84.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "cfdab10e0f57bdcd37d7749ee379cc9a2f31552c67312cf63858fcde31b39b42"; + sha256 = "d3735936296f33773e8fce3f3beb3a183a5db1ab7d1f1163dd451ffa43bfa0d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/bs/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/bs/firefox-84.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "1739b138e23fe56eb6ba8748f89adbc24673552ab0916250441af8e2a613fff6"; + sha256 = "a2fda7eed9a3fabb46a9e3049c1560f486fabf426a868b083b3c7d11447428ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ca-valencia/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ca-valencia/firefox-84.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "7cc19e90635c1cfb723be27b9917f35b64136afcdc1ef1d9359565af4bbb19d8"; + sha256 = "b1430d43b273e1dbf7899c537d93dce0c0674633ad50726611eb1bbd5397843b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ca/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ca/firefox-84.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "833334e585193387b45f087ecb7b034ca81ebebb649539db13e39b4276b3e65f"; + sha256 = "d06da0cc13e1bbd04f9bb0659fa4745da08d410710793c2dd52086b10ea82cef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/cak/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/cak/firefox-84.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "d4fdda0de3a95d7f4b7774da21af960b40b49c2dc5a85e1b234f7efec8f942de"; + sha256 = "66cbce52e16178231cfd884e88443f4d5825079c9df74a3f6ef5ad226ec87025"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/cs/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/cs/firefox-84.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "0a1887ed3fe2e325836c4592f830a95e11d6022f4156b0af6b525000847394d8"; + sha256 = "7c3243b48f437ac0d95de2f819f6088d882c52f09e74f910f8c7cd21dc57b7b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/cy/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/cy/firefox-84.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "fb6ba5719cf4a3405b75b58331d07d00c309fd88a5a54df77da006c6724d06fc"; + sha256 = "9bda66606c45b90de3ccef2c51d3a26d3456e312d145906070923924db2ee58a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/da/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/da/firefox-84.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "e2eed6ac1be7a1b21027325439e59459780fe549075051f83b27e418a0c52264"; + sha256 = "13727d086205c7ed560af7ec5fb4db2025dc24e327ad20c55244d9bcd0d54627"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/de/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/de/firefox-84.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "5789b1e6ba14a36c8c08247d123d062e5e6bb448b54d786089a7f5bed5e96eba"; + sha256 = "50167ebb8277c08d6c13c07c5ae871222ded9f42295ba7604836ac550d3890a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/dsb/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/dsb/firefox-84.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "c70c169c917a3d910e824430cc1cbc0316a0f474f6f77aea873213a6d810a806"; + sha256 = "62b96a0abcdff8e1299c01fb3ef1aa8de6bd895adfd20698b52d0dc2522c0160"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/el/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/el/firefox-84.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "d64d5b2ec25e4b5901a195c45dcbe6c979e50fdaac1121af2b309f8942ed5603"; + sha256 = "6d22ca0a28bf6c752772b778239d42060ca2a9ab97f6f82c5f88a53f717d3496"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/en-CA/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/en-CA/firefox-84.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "dddfc08d2e2966adb9a613d48fe505052e326402055c09372b73cf4cf91482f6"; + sha256 = "22b40400ffe16f3bc9e9a720170f65d58464b0f0e2ebaf9fc3217edbab5e1fa8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/en-GB/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/en-GB/firefox-84.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "74db586969ebad002996154ad983f58d38918089a89c370aa8822e4657fcac75"; + sha256 = "169edb75ae396aa19fee5472731ada83faa351a2fa0d4d291cd394fe00a9b92e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/en-US/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/en-US/firefox-84.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "601e5a9a12ce680ecd82177c7887dae008d8f33690da43be1a690b76563cd992"; + sha256 = "077cb7a8954ad544692a03bde4edd31751e1a819bd229413e35508984abee5ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/eo/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/eo/firefox-84.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "b67ef713a518415e7e03f5b11162ef8e950604aa0d6741be41d6bf4580111311"; + sha256 = "619667619bed6f5bc99b373e779af6ec98e21218e0d0d2b0d703cb16dfb1f171"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/es-AR/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/es-AR/firefox-84.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "a52880fea1c8c2364c680c1e09bdd355600c3468d61089ba7908cd5cb6dd9fd4"; + sha256 = "e7ae3b3415db29b8779f69ff557409f64ed7f031201c942cbee2fcd0e08abbb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/es-CL/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/es-CL/firefox-84.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "ef31a73e08e53fa5d257d9243e2b3bec36df93bdcc6a6776e531a36cde7fd2d7"; + sha256 = "7948825f75236751066a96e793b159538ee82c2315f07b9972f2204d27bd763f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/es-ES/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/es-ES/firefox-84.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "e5303528ea8d84dbf805db38a337a76fbfc50aae454f54272ba87539dc81511b"; + sha256 = "3f6ea39596f93e5625d79ba544d9f476158757931f3f7c59bad85d169ef99ccc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/es-MX/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/es-MX/firefox-84.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "64e93de2fb59f95f0eea6f5a85ea4bd78a5a150c26b9c513b8c20318900419de"; + sha256 = "aa220edf6cbf85e7605a0cde21fc7871939501a8459295b2142e4507e8699cab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/et/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/et/firefox-84.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "02aab2612552c42f584fa627a2d739729cf1f599c3383970130205253c499047"; + sha256 = "63fcb11eac26f26721d6a60c1001d867bceaa21eee2c81efbea8e00253412082"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/eu/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/eu/firefox-84.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "e7f14e47edd2c7b6b712f0dc35454d42760f1f4e8b8994416d3d2a75a7ade6ff"; + sha256 = "f49a421799e0691f475da2419ab786ac29caf67ed7413cb5b3736d7961309d17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/fa/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/fa/firefox-84.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "b9b9ecdcec2ba0ae689541a8f568356c0026859058e4bbe93dff74b1ddde1a3b"; + sha256 = "ef1e5342a658923452bc839258f292619c2edff304448ab9d85d9215ace907d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ff/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ff/firefox-84.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "59e158fd6fb66de985bc956538116e00c15b2044ec7d2f7a74477d5fa1771e3f"; + sha256 = "73ff19b083e8d8d6ba6e5ed1efd27f18caa9a285fd02bb27ae01190245eca577"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/fi/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/fi/firefox-84.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "fa3ca0125e271798bec62c213485a6b84ee3a0e0f072c39b04002b9d44c2337c"; + sha256 = "c576045a05d15ae4c8d6c82fd17036546825f9be1675197a1296a7c8d431992a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/fr/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/fr/firefox-84.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "e85a694d66eff7679f0e19593508f6e273f8bdbe7491df78deececff2368ec21"; + sha256 = "428270e0c4a3d80d810a106795986f2680c3e55faf7fc975ebf56fc90c0ce797"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/fy-NL/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/fy-NL/firefox-84.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "e38f39ca5b60e3569d63377c9b416323e03a79245b722e3ca42e8d817e9a51fe"; + sha256 = "0e272ab1540690cd688561b4efdf7429298ad087b51afeb1b735f8b7efbaae28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ga-IE/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ga-IE/firefox-84.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "4dfcaedece96eb802c83cc23801bf3999fa9e42bc1ad2d5dd1a180386cc79823"; + sha256 = "99e5381bfca90d1ebabbe00df75da91901f113ecd6e2aee1b16b5acef91bfaaf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/gd/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/gd/firefox-84.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "0249ff8660779e95ae356d0cce85067ead2160701d3a1ba4660651ed5f9524f8"; + sha256 = "ddde6096a541ff100d38929cefa87c93128d10131a4cf42717e9a169b5f99caa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/gl/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/gl/firefox-84.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "0aca9ad329c4a748cf9e093d5b931b228b003f09aa53cd041430afc1ada7ecad"; + sha256 = "98019391cc205449df19365459995d9711a1f73e94db226d7ae8c2172a14c8a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/gn/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/gn/firefox-84.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "cb911f23f0e805537ce71f657b1f086d833bb2055152fed15b2975034b5209b5"; + sha256 = "ca5a642179426bed73c4e3ebfb66c287ee57b3cbbdb35df35b1aebc024c9c8ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/gu-IN/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/gu-IN/firefox-84.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "d611bbec579ae153b65c6c5c371aadea7c97a5c814576f59853e8fa0aee05075"; + sha256 = "2c4f645de88f4db3a2274a67876372baea53e3d0bd275d6d67ef60ed2ced0ca4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/he/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/he/firefox-84.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "cb52716e4c1ae8c35e054b6475bd33eabc9b6672073f751b57f1ad38d546522a"; + sha256 = "f2e5ad70f26d393562cf4e0c3743dc01b1dc4ab9f77d88f92419acf8072d3ff0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/hi-IN/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/hi-IN/firefox-84.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "1cbc946e6d0073768fa066f985bf8eda377121714c8cfa09c9dff1f2a02a3b77"; + sha256 = "368a469ac2b44c0cb23adbf45c654ce2188e2674bc526a106f90159fdf35224c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/hr/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/hr/firefox-84.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "dc08dfe6ea67009d12347512e9fe398b86bc699621f1c55d352ea3fca00a81af"; + sha256 = "4cc283202d36f691ed24e0295a9edd51369c996f4a6782ea2a38b57011310dff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/hsb/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/hsb/firefox-84.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "cfa4a0905b61efe3ff4a808c994e1e062620bee907ed6af7489114d4a1cdb80f"; + sha256 = "cdce15a29c601de89923f77b334ffacf2e2f3474e054499d03aaaa95aa4285c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/hu/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/hu/firefox-84.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "81da1cba517a80cfd4ebf6bee95f88801192cfaee864a420af03c8bc96a882cd"; + sha256 = "0def021e54c67a80d5416cff8da4fba48b5d47f1d8c6bd673ac2fc7a64200116"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/hy-AM/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/hy-AM/firefox-84.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "1a2b4703b2b186c24c82a6264a95d7555fb0e33d4f057fdcf7664b7f8f386f88"; + sha256 = "f6a3cfbd4490d2d0cbc09f3ac15f9d723d485c64603549adb8a4c33d5af7823d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ia/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ia/firefox-84.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "67b1effbe9ad34e4e41bc42bcc6745ef4bcf40410913603e687e7ab97d093150"; + sha256 = "69c93ac33a54358f1cb35204b5acbf3a818a4031737aea44684bf3bdadd93acc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/id/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/id/firefox-84.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "718ed11d1ecd4d04ba53fbba85ba77c06156e4d2db29d53a1e6724139d72643a"; + sha256 = "59236a0a6024013e7b4b21394f66a9d2b3ddfb27ce54c37a227127defec2bc09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/is/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/is/firefox-84.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "21cb12e80c51180741a97f1dddefcd8d2568fc820841ff79d47946c6a89d4968"; + sha256 = "f13500ac51becd6cbfefb43cd98d3a6530dbb92bc88ad15b1714af775bc3e1c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/it/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/it/firefox-84.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "7717b32c7cb4528a205748f239dc0a14a53cb88562978ccfe38b4aac8eab4187"; + sha256 = "77beebceeb36f1eaa00838f3e3739dd9549a7a02e15bbbd83454a1e86bc83c9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ja/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ja/firefox-84.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "9523b9e9738c62a7088eddd4424c9a2a435bd57ed96913713460e413c2291e14"; + sha256 = "bbb98b2bad26a554493d9fbefe1b4061f14dacf59a14cb8ccd92e728d906a676"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ka/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ka/firefox-84.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "a9cfa1ff040471ebec43962486482bd103697a37cd73589dd3447501f22ba24c"; + sha256 = "20fc38d941e3aba6017143ac6865a5f210450b773a9d50c195a9b951e65ccdc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/kab/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/kab/firefox-84.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "43bc7f3395d69df38b302eb4536333f913160b479bef4e44dc5419de58621107"; + sha256 = "003d7d9d1f2b5f958e29168c698568f6c1e2c7c5c1ec652fab6f2b824828c0be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/kk/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/kk/firefox-84.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "6c440f99e31ec9e62a51f44387e6a37316e1f9a89bbfe7d172aa9ba063db0d8b"; + sha256 = "e16d8e9f41fbefc2b863978627eb66e1c82d53a9dc4b1acac912309d633f972f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/km/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/km/firefox-84.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "f1ade955303019e8bdccdfc8066a0490b76ce72c94cf5a587eb7ebc799a8aa1d"; + sha256 = "e75aa98eba7a600e459e25b7e6d1311a00c16ddade46eeec18ca37b799e7a492"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/kn/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/kn/firefox-84.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "09c4819813e8b343e5abee96623c3da4cc932263a9ce58dab072a26282dcd70b"; + sha256 = "282f240fae65764d4e1f5d5e3e0ec775ebd66dab4589b5ae9f34bcfb81f50996"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ko/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ko/firefox-84.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "7d4681545929bbc3d8946d554475d2a90a3ec1a96a6eba94996aacc3e04e03fe"; + sha256 = "2b5cc8a136b703db4fb59a2bf8ac24ab39416ff44f35836ff70b93e378727706"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/lij/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/lij/firefox-84.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "a7f7e4aa713c295f7e7e5d4e42e5c5b65d497a1d2dfc5726b0b6e8286033fd9a"; + sha256 = "4cb13be0d090d824b4b86e28f9c02d4c0875133603dec7a58b83ae67e86df30c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/lt/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/lt/firefox-84.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "9816a62da4f983b45402ec4ea0acef040559aa13d3118356f907356046cd67b4"; + sha256 = "b6fa373facf8e8d4a7d4bdb97955820d450748009becf166c33faf936fd34cc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/lv/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/lv/firefox-84.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "5084574d7d1d4b20b35ef239da626cb2d0468fbeb8bb137f66d473c225f73e89"; + sha256 = "5522a451edec23255b2a8fab65d2680e9b3854998290a7dd33183238cb17d33e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/mk/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/mk/firefox-84.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "f7aaa2c2d36e10f052ad0b39d4a436af312ba3d148588d53221c09e6516c041f"; + sha256 = "d0d96241bcbd32e000094008263a37543dfd4c5955b116f88118daff11759e0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/mr/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/mr/firefox-84.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "4244dca771907b6ab91ac86cc30913dd255b1f4b0d71fc5c3e91ffdf4daa2e51"; + sha256 = "06593e4a56e5f76ffb765b605684349fbf31c8a0747cc90ef991c532df38d411"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ms/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ms/firefox-84.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "7707153b7e841979d77953442fb4d08ff9c7a2f654657747c1353aded880c4c1"; + sha256 = "ffa6d0f8534253c5ea94df7aba31a06cdf9e294500781d25a31b8dcad15d5132"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/my/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/my/firefox-84.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "4efd86100aebfe964d9425f8b58930da8779c58849e4c6590c8f3d03df45ac9b"; + sha256 = "dafa195bca8536709110ecda82e988bed254b145f00581561b18827fa41149d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/nb-NO/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/nb-NO/firefox-84.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "b94bd5e53679f1fdff9ef8445bc5fcb94733c6986ad96f22d79ea2d8203caf0c"; + sha256 = "9a8e5175bb17ae3110a4ba74dcc575dd4b0fb44981f7152cc521ad017db7e2a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ne-NP/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ne-NP/firefox-84.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "331d3f46f36eb3c26eb8023dae89306e5148d0c14b3bca74d201e29a0099f3ff"; + sha256 = "4c2081207cfbc657d8f6a5ba781098f11adc5e159414036dc8217874a2c2d8b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/nl/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/nl/firefox-84.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "3ff0b28ceb0ddf2bb3af0c89da193728fa765f6b23429b77f8bc7b02f34092f8"; + sha256 = "947dc32c772a2205ab30fdd6d8bcf938642e9d734b58829d2dec5a1896ac6b4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/nn-NO/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/nn-NO/firefox-84.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "8f55248fbf565462e69116884237f242c3dd09c6a15627d8081720b85492f5de"; + sha256 = "89096b5f2ce27ece10be949b495aa41cd882bfb4a742cc3abfc66f36130313b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/oc/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/oc/firefox-84.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "9d6eae0d5097a5bcbb1c00345ff0420f269c54b2941dfb6c39d31ac690f2b88f"; + sha256 = "50f603507e5d276c5f3237d1554269faab573d8c194a488353227743b677ccc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/pa-IN/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/pa-IN/firefox-84.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "9a8bcf68808292eb8af5948be605e430d4891dcbb31b4bbfaaa4ed9e554b1766"; + sha256 = "231739c85f20014f50a982b4ac0634a8a4147cb6de5ba39a9a11a944d4ff80ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/pl/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/pl/firefox-84.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "fa065ac8620b29ae362f9def816662fb7dd350a0c77a65acedfe82ec2ffd35c2"; + sha256 = "9487ffb5fdfc2f7040a7f9bf2585af324782e2f3dfa996db719103b20d02bf55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/pt-BR/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/pt-BR/firefox-84.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "0f671b31c2a2696dcd0673c65740b57032c1bdc2d2d28269453b015a546e724b"; + sha256 = "fd53dbc5724968b0bb2c2b78de96f3708d05758de63aeaa7fb942f9b64a0649f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/pt-PT/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/pt-PT/firefox-84.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "12918be45174c8224458cc46e4e8a2a0ba8ba67b971359378a9f93ddd2b025f2"; + sha256 = "39211dde1b183c0453643fd6253fe6eea4dcf2b006842b1cd61e1ce142991a44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/rm/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/rm/firefox-84.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "ca71913a9f69ac64fd3a1b9409b631e3497ef26b6e153408466ca9a808405a0a"; + sha256 = "29cf408b9386907dd1e8a64f56aec2e0359de243c3d17fe2531c0f1c7285c205"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ro/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ro/firefox-84.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "c33e39f5ddb653ef70b1db606f18bd8f8af101a41d7cb175af856075cd1d558b"; + sha256 = "eced9ac8aa417dbb5dd725c952eaa977eca1b48a7271e9f8dcbe1ee46a4b1321"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ru/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ru/firefox-84.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "c5bd750a3c882edc312d7fe653c96e99d51184d3434fe188c305e8914bdd6219"; + sha256 = "7abfd2a2b30eb7744d890ba3a0589ac5017a9536c43fe3e154e60339d7b41544"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/si/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/si/firefox-84.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "ef4218b55b49877fa432641fdfbbfacacbd90820e4ed67e084b5e5e53b2bda13"; + sha256 = "e9e8c21b64f7f434db99b30b6e7190fa55f3b23a63dcdef120118d228ed533aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/sk/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/sk/firefox-84.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "f4985f1d41a1a7577ebd804f10183c7e63e6db08eaa9971e91f5944a942f14b9"; + sha256 = "dd2e17cf612de02aa71a933a8b1f26e403e1be4da54e63530667e81441d5f6e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/sl/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/sl/firefox-84.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "66c1436489bb92900d8e93750ca876753cd663de141acedfbb00bdfef4a09e6d"; + sha256 = "782e612494aa907990262c7ac7189e98d90336b270a806a8e191dcc1c8266218"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/son/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/son/firefox-84.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "fbcd98f61bd42e7ce8f73680efb4cac59062133f1242a0fff1e3bbf1335a7279"; + sha256 = "7730614e4e22eb871dadcc13f62d0d2bc445aed89c1ab6eee2600aa6f7023fa1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/sq/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/sq/firefox-84.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "5078f10233331aa3ab0a0a79a68b62c4a3059c863620a854341debf477739ea0"; + sha256 = "6726cc2fa9c7b40e92d512b83bc0a974c3668a3854ac91aafa334b4d30b71ee7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/sr/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/sr/firefox-84.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "22d31d3d7e0a97f8cbbab543aea767214fb135f6212e6c1d4dcf430e3c24dfc7"; + sha256 = "22b443987fa62f4d753efc04ae926e3ed69ce84c56a2fc653994d886da10f9e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/sv-SE/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/sv-SE/firefox-84.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "f1f7f281b99ab9db28315e4c99c8e7c6c1d0832abf48b555c1076aa39ad3af15"; + sha256 = "3c4d26bce8cd12a6531fe15e3e7251ac9046bc7d1670df3754f0c379bb63ef50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ta/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ta/firefox-84.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "0244fb189fd965bf5dd83c22cf8589f26f20b11e4eddd2c2bad9e419ae0d303d"; + sha256 = "edbfebceb857824f331c46eb7611dfa9adbfcf6cc7b80075478059261b0de6bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/te/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/te/firefox-84.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "1dc3959508233378ac2924ff4ec313569b1b5f6532bda09fe7d57164735a9bfa"; + sha256 = "06f342dd81f0ff481de67fbbbd5bbbefda27629be688d854a226d515c872d69c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/th/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/th/firefox-84.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "544eeca7272347865ad794f23308e475bfe73b1fcabdbcdbdbc82aa15fa73a44"; + sha256 = "1ccc1da981cd49effc811b4dd85a09bc584316b3ff50fcb05502e4618c465ea9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/tl/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/tl/firefox-84.0.1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "cd10d90a650536f1469d86b8f1047d616846e415288f4d4c32c6273edbb7a327"; + sha256 = "b15095bba6ff763f01e7677359a0e8885164eedfee1836e0eb4e1822322050db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/tr/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/tr/firefox-84.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "5cbad19746a07d2ce404d9a98a615a709827818de11f30ba7e3e6a29d1d22cd0"; + sha256 = "e140a2196da9ae934134bd3ad3dafcf8766aa676f410047817ba01ab831b0ad0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/trs/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/trs/firefox-84.0.1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "c3067c7639dc6b054f7529e19a33d4de1e5384372d33a546b2a1f6c4d4d4858a"; + sha256 = "3a8c6dd94d17c8ce892f7eec395f8f6676bf4fb18174a6dfadde41868f9d3e21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/uk/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/uk/firefox-84.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "0486b6d307fc90245b7a4329ed4180f242930ab2383471e4281fee6778f8e60b"; + sha256 = "d66bcb1f09213c34f14ec0cbd3687d8b5918afceacb2164e81ff94e681c432e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/ur/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ur/firefox-84.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "501c1f1c917198d481f37987073562194adba665a4454743955db182db9f321f"; + sha256 = "0d9094f14a25b0bb3c7656fd524cd330c0b7a6334ab23c86a01ecd1beca14988"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/uz/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/uz/firefox-84.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "04bef2a9b6762a04925b031c1821730ce14a34f36ccc50a2e16d1704910ff58c"; + sha256 = "70d3cf8198442718cdb664dbd832c91d5252041fe1076faa0f790e63f0c22771"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/vi/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/vi/firefox-84.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "fc53827a4b14180bfb81d0ab59d6f89019b3b9decba5871aebcfba6b2efb031f"; + sha256 = "17a0ee2e12c74e73fd1346257ae5f797c866f0c4081a154f6290e73f4be40f27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xh/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/xh/firefox-84.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "fb3a892bdb72a8542f24671d384b53e75c7fae7b96dddc368907c7c3df2f60f2"; + sha256 = "7383a176b5afc8319781586ece3eba752739499be2c6944050b57ef5b7b620f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/zh-CN/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/zh-CN/firefox-84.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "9b45c70bdfce252ca018511d39f3f2c9fa45d75cc4e064c118523ab1d3b0f3b7"; + sha256 = "08881c7f4043a6e4bac11b4de388da773a374a6c83068723318ab6e1eb981fdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/zh-TW/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/zh-TW/firefox-84.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "dabfb6ec2f8b55fbfdd86487d32ca7c0d207f1d403126bf1aef636b840347b13"; + sha256 = "ed3bb049a2a80cf294b4b4c4ca0e980b38b6f18c4e931a63ff78e5707fc2daf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ach/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ach/firefox-84.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "1451c261dac71047e39228744b132993fc70d65b9753f5b4d4ffbc9f944a2a22"; + sha256 = "4bdaa5921976290cc5bb11f981d2f6559751a693a2bbe512b9e80eb5148b2e37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/af/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/af/firefox-84.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "a5cf4473eeb289781d7c7a29085109b6a4235b6e48bb1e1308d05288d9683453"; + sha256 = "853d005f8ac8e2e5e31e3a24057b458f1441d6ac97a41f414c0831295b91fcd2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/an/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/an/firefox-84.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "97147495e41f79afed553ca8f3e39405fc917e2ad73219a3e75f26995208f114"; + sha256 = "6409ce28faf1dd18f079891e373a61f0b1eb730b3d1c7559a13784192367577b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ar/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ar/firefox-84.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "b50211de0a0e051828e38c2f4cd617029c5109534d3096a2aea6b2836fe47a02"; + sha256 = "9c9da9daad627f4c5dbe5588667cdf90fe8a582adaff962c674c483a5d80dd6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ast/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ast/firefox-84.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "a36089aa9e4684cb473067a86f517f557525d5502c2943b0d77592b2f33cb8fa"; + sha256 = "609de4719323b676dc1a15da8d0295d3c67bb4ee271f70f28db97dacaae87f4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/az/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/az/firefox-84.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "4166d192bfbf8293c14b65edae460a7c6037a6bed335e2966e3d565c0f0b0c2f"; + sha256 = "f411a4a560d1a6db4daee06ee3a29d6a14cb5e6e1914aac54c19918b93569e3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/be/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/be/firefox-84.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "5aec2961ff8b57ed09d4923da199ba2486ffc5e7b5f0ba7a2c7dcfd639e19c1b"; + sha256 = "46d73bb13f113dd6dda069ba571e623b3f20f2b6e76f55f307690ee01eb4dba7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/bg/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/bg/firefox-84.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "fbbd60cbb4975a61f9e0d501490b3354afe5f4e65b1a550c441b11d2500f6bb5"; + sha256 = "0bbab0465efeac3cc3f72749242310e1456dbee915bfb08b7ff7e5f5c2fff0e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/bn/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/bn/firefox-84.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "2ec9330098ce5645443e8730425c9a913e45191d6ae496ab0cb19e6d5a172f15"; + sha256 = "c1d47ac9ed0e01a0ec77776bb6131ae38faa17a3da2d8bea723679e3cd158074"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/br/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/br/firefox-84.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "c847065e169dc3900105e681dc53c705caef8e182f1fd5d469964ba6dff57894"; + sha256 = "b205df6c0016b2c3984b33c00c2153688c7ac162df1a3748b23ce081a87d46cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/bs/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/bs/firefox-84.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "e4ed084ecc7f3d106b9757fff691fdec4c9469f06ed10d54ce7eb3c00437076e"; + sha256 = "85093f59d815cc1d45e6aa6f8ea6ea2972102248aa4973b4386e265f985c85a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ca-valencia/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ca-valencia/firefox-84.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "30eb8aed4ac3923df65eea78136237df12a9375ed92a6a2c3699059136730f11"; + sha256 = "57b5054db2cb6987db174c1a32c5e87bc37f1de3ff3e1046421962fb50204af4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ca/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ca/firefox-84.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "edf2a0e3ec9165a1c77488f516c46a93663d15a5cb7100b43f0d2f4845453734"; + sha256 = "f57a9469122e99537dfe11984c11425008d81b738fb939297be2c1104858d52f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/cak/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/cak/firefox-84.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "769dc346360e41ed800981002fe85ee82fc11ddedc4ae6a578a3a45ffff38a11"; + sha256 = "6a8d4e9b3555ebb7020e347bb59d426fb5ab0cb1fb5012fdd99d0e978675b994"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/cs/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/cs/firefox-84.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "ad4b4bf00b730ce5c5a1cb5075ab4e3f83fca92bf1dc1bcd1c11823cbc3315f1"; + sha256 = "15d8e1ec0e3719228cd0d4f17667a08d4fadffdf2cae91abe47ddfe511d81046"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/cy/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/cy/firefox-84.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "7653f67150699878208ef741ca7d6698e474760330f5f483d1328f92d9feccdc"; + sha256 = "412d19fa8e4c47c892780b225e6d320bc24b3adf482cb023964599ac35350433"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/da/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/da/firefox-84.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "885d0e55a2d827e75b6bb49bc8e073dd1c954ff2d4cb22246bb3babff728f039"; + sha256 = "8116eb1c33d26e589c7cc3b7999159f7893018f7bdcf627d9b892b0f96a55e9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/de/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/de/firefox-84.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "6c12e40e26c13d55d1495da3f83eca9a83c800a0e71df96e9a99553c132c0a6d"; + sha256 = "433b02ea3b1d50e9a8287e6e264d518520f656fcbb9851068de1240599e4c512"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/dsb/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/dsb/firefox-84.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "bb6ab0d953ce4c9adf584373b6a04639b5e5fd027cdfcca1ad914b390dbf3993"; + sha256 = "5d55fdf5976a0c1f3a79058b1993923ae67c063b6643695dee8bcb4faed06c74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/el/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/el/firefox-84.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "6c51226b866cc905c74c88b0414ca8143a5832935c1c931e0c3513ad979fd7db"; + sha256 = "668a9f735be42cdd57a8b7395c37703e6e1b30264aaf9201a801efe711dd008e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/en-CA/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/en-CA/firefox-84.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "900738c62147b8abe5974ed5b7ba04e079dfd8504b6a1ad60d8c560ec2191608"; + sha256 = "9c20e6c096e1a7ab910d91380083e400f35052ed9ae72860b8ba66ac750c5fee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/en-GB/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/en-GB/firefox-84.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "7a5de0be8c0a2697e0cb277af09575efd72fc86632527bdc45ddc2404b8728bd"; + sha256 = "4de8ea0ba0e599529abde78983e04c509229bbae756c633fa929833b385f9519"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/en-US/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/en-US/firefox-84.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "011598d4ccaccf87b9dd655ca266805378d5fcfd87fd9213ae4d5be9dee56278"; + sha256 = "6cf9fc509ef21c004a70810c8cd4c428593642edbdd5d4f4c455345391ba4def"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/eo/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/eo/firefox-84.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "acf6bf1cf7aa5635a07e6b58a4c70318cf4f915f8146afc928ca00e471c2cd61"; + sha256 = "1ed7915f1cafa19d36465bb0d5f9fca8e57b7f0f8652dabcf90a4e232c0cccdd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/es-AR/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/es-AR/firefox-84.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "cd3f40e85c558b247dce4c34c6cae58b92f37e1d77d8dbabb59a433d22e690d0"; + sha256 = "359234b846e364352a6af0a262db06b6e9f4a911c407bf35f1ad2f8460eff7ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/es-CL/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/es-CL/firefox-84.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "35e78b21ec7137b78a394fbb3d49f5ff0dec784aa19315459c7e5ecc6e7d3db0"; + sha256 = "eae445daf305820692b7ee9d20dbd69f0da509716925db6c12eb7c2e7a521416"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/es-ES/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/es-ES/firefox-84.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "d13572cc97f21bfc447951def9a5be7df77ed55bd7d414cd16d5f5f5c605f67b"; + sha256 = "36a2f4eca19bff55f998e8e36718d4a4bdad0eea5c53af1825f857834dc6a1d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/es-MX/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/es-MX/firefox-84.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "d0e2cdb77cec5565e2f9f68046eeb237c1fd85e73187e10995cc317c1e9aaefd"; + sha256 = "7f7f384bbe156e37af25cdc19a49ddf225692a2579ce5c7df37b8684f0318102"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/et/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/et/firefox-84.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "4f074c663de7a0bd4883b600985d96da0191d387263332f8cf3282cd09ae47aa"; + sha256 = "39288f46064d259f4ac1f11481480b189d945608d4b3ece922b774ca31fbf95e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/eu/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/eu/firefox-84.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "dbd39da7c58abf53ad8545eaf5ea2b49f9ef6e372818e2bbb1d0403f78b9b31a"; + sha256 = "7693f969f356f87db5d48266ac20a152bbb8946486ee60f5efa0225a83a25493"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/fa/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/fa/firefox-84.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "bf951d5a0dacccc4ca785ac665e979b44e4ae4909d26c5952710156cc7dd61df"; + sha256 = "ff189730d71b2ad0e2694a364bc0c0ee4de50efe30f44935b1cef0d89488f8f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ff/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ff/firefox-84.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "7b2910636e68419041989e196841820cdfd49cca79d39165f693be68a2000450"; + sha256 = "b6f39b27d000fe98510da1d5be6b591e3a7cd1b6e2d2502bbe7e67b124822ed1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/fi/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/fi/firefox-84.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "b4effa12c09d22d9dcab2c988eaeadec0336f0cc4c2d501899717bcd458f33a3"; + sha256 = "ec33e3bc8a549c1c2d5bdc0f45113d96d3c959d1d9232d08417c09821cbd8e42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/fr/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/fr/firefox-84.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "8080503687cead7ec1e54a8cea9bfa5785725f5cdad694864374b942c16b5b6e"; + sha256 = "43e80f221e53db14a57da940d6ad98d639bffc94c71e08ff39501aafe319c3a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/fy-NL/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/fy-NL/firefox-84.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "c7bff7755f08df3d5b4f824710e69fd4823500f3bc9a58b536be7f86d518efd1"; + sha256 = "dbbe3af347ec5e8e856e4580889f99709231eb07631862ad4e8deb095f098390"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ga-IE/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ga-IE/firefox-84.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "4c5937b345de4e2461821c38d19cf719a65b9d801591f5e54278b7aa817af6ff"; + sha256 = "4d5c8fec2f370840cf79c19774976585af0d8e09f13abcb4a594f3ebf9c52558"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/gd/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/gd/firefox-84.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "297e0a412f3ed31115533f523ceb23c0d856b4612654882ee44cb1a70d057165"; + sha256 = "7ea8febc7443e1f7c732e07cc8bd027ed0a82eea018b6bf7c5979820821701ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/gl/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/gl/firefox-84.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "bc6efc2884cc4af00bfc90261f8b05afd55ce755479c36aabc870ce427a0cff1"; + sha256 = "207dfe2ed822245d089a4f1848fcf6c92e27715b4463bcdcdea2127e8ac8fae3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/gn/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/gn/firefox-84.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "a2942241c8d78ee123abda87a663868185f5b6bbe550f51807af3acee3c0c5fd"; + sha256 = "a07d734191885b4e5e66c1a5b2f64cbdcc133dd9a1cf8fdaea882a3a1ceec7ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/gu-IN/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/gu-IN/firefox-84.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "de8ad6a7b9907f163f405dc07ab6a288348ce8a0a1d51c9882b7ee4fb8d916ce"; + sha256 = "af4146f86e4f5aa81d10067e21653e657620d9b0b51d564dca83c4435f6cca82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/he/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/he/firefox-84.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "a202905c4b0a02beeecb4a6430c4f806c92d79cb07b143f3e56e043809f116e9"; + sha256 = "608652ef032ccbd0d61070a32a2931764b86ea0d25afb12617338136f3f29e42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/hi-IN/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/hi-IN/firefox-84.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "d722f0afc8fc92876ddd98f680c14d6cb1ad10ab44c0d5c4b643eee5ca2db853"; + sha256 = "1724879537c0472762dd93a2206f31767938881ab4113946076205342f8f5f7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/hr/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/hr/firefox-84.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "3df6bfce880a925b29580626a9ba7f33e2186517055aa00d5b2e3a610845a36a"; + sha256 = "727f4a1d3ef4e531027c5188798b8fd1aeab98bffe4c1f7f67d919aa8855e6bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/hsb/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/hsb/firefox-84.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "ca27b4d54ebf03df0c4a28ab6abf44d585e9ea9041a2d794c0f519cbce8d69bb"; + sha256 = "6efd8dd2cf6f82b688632095a16c5e488578ac08227cbbcf2613f9b2852c9445"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/hu/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/hu/firefox-84.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "2b85490e099c161752400aa87006c7166bd1b959502110e6c76adf6af2288b0a"; + sha256 = "458e8452d89e61f8f4ac3d1ca3e41583fd26cfa897c4b36e0888a2174c853508"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/hy-AM/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/hy-AM/firefox-84.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "459f6488de6c740b9bed48ea4f8f99804be0616e30993cd39e92b77f0eec6b18"; + sha256 = "b58af31a6ab2e224f9f50e88c1e97c8f4af273f5189c59f025c10d5589fc2d41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ia/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ia/firefox-84.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "5cb034cf8835cf9d02e6b853b1fb81be587ebff8b6872fedcabd4d6a4ee19f82"; + sha256 = "de6bab3cc3e08fed14584d57a58b9310829ce17906561d880c06968d3ca6a879"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/id/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/id/firefox-84.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "993d0893a1b429d9ce9203df35eb5d542396861b17e363525cd9c4f43f5168a5"; + sha256 = "31cd054f01b8050fe70a95def464b76bfddff2277993c759395e13c3829c2c70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/is/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/is/firefox-84.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "f9db0f82c1caf4d6d00c00bf9c78cb546d32aea95f1807a12c7ce6d623df7b0e"; + sha256 = "fbb17534672c6b7c89dc51eca97ac9c0f807fce84a68bbf75f077ce1c6202725"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/it/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/it/firefox-84.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "7f26ab3fa8f5972db64f03dfcde69477f73bf708f98a642347a56cb49c500cf3"; + sha256 = "9fcfd33025b3d7b88238e6c51472a06b1b6bef56d1275a1aeecb66224f8d6d9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ja/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ja/firefox-84.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "651a21c91413603c6d20d042f9cf196cb868ac491931f6910543b3dd02434d56"; + sha256 = "37a234db4a8618cb125215ef51700fe72e29f2ac9328c4f5a319516f32eac7f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ka/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ka/firefox-84.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "0328acc0fd12640bd8005bd0ef6c5db41907703b19429fe11d2e250406d019ad"; + sha256 = "0875616e42bb71c79427a31c5adac9e1d9112c0bbeae866725ae9bd87ca915f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/kab/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/kab/firefox-84.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "708502d90ed114f9abd8d79170a6c803a14d13cb023f414f6cfd05c75bd41ffe"; + sha256 = "88b6430577c73965bc229cc2875b138db1cc47ab27c7aed6c6004559f296d819"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/kk/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/kk/firefox-84.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "de2be2de243e74b8b76957e31f15f0e918f88f9b675ebcd6df29456c353451ec"; + sha256 = "6de277b39e76394245aaab0dfd4ccdcea4af5812fce20ff61faf9d62c22bd34f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/km/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/km/firefox-84.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "47ce408cfd299b0cb29a59eed50f5fdfb3183f2e997c48a901e30a89560aa8d6"; + sha256 = "25c0e6752716e6fc4ed02b465b820661ec59ebf997bfaebdbfe172e2a18dc387"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/kn/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/kn/firefox-84.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "8bfc11f38e69f1c59f02f79946e845a26a706ade17923b316bdee6aa55e807b8"; + sha256 = "f61cf632f934daada5d6d2164279981b5536d078ddb5b19e7146a7beb0917e23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ko/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ko/firefox-84.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "35443f1184b83a5d6801c1c6694ae6ee45d7ccab2b3bd1385339c3c25c991f9e"; + sha256 = "9e9000032c24fd20dd188c9306364ad79fc2d47b3433d36914a2caea716ff230"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/lij/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/lij/firefox-84.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "275e09a16c19cfa9aaf4b3edbde22ae22b374fec881163f6f656470d626c4e15"; + sha256 = "1fd2f5ec8c3074845a27072d8eddf364384e7ce7494739af331a739249c34e4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/lt/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/lt/firefox-84.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "e2eebd6411a3d5ea722356e0589e084e92bb9c6de6ef857c59f5073d1cf45faa"; + sha256 = "e8b43ae1a3e3cf7d5fb955cfa772f5fbec525fc9c3deb0e81390b8fc53b70176"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/lv/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/lv/firefox-84.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "2fa8dae6d41e45ff180aaacc351a5e649e97c7b19d07185b71d128c7c1107b09"; + sha256 = "00908977f480f6829761822a4f6f9800c3940faeac0362c46433813788ce1391"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/mk/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/mk/firefox-84.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "ed515998a2a59368012613f29ae328df232f8b53c84cbb0a76d0bc28d790de87"; + sha256 = "cc6a8e52d7e3940e2664b4659f4a33d452b1bea56d3d53c88c28afd604731118"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/mr/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/mr/firefox-84.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "1f1f39175dc1ed91417fae9cd4508152e0f34c483a972469059cda2484d8c4d7"; + sha256 = "4a16e203e5b02b146879722a1fe909bd964d712795841cbbd268acc34d5073c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ms/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ms/firefox-84.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "7c4129ca5630473536d11ccb9ee818739e68deb618a230371d7cda448a686e1a"; + sha256 = "2ebf161faa958992d3dbb9f7d70f7df058b93bc0627a4585fb3226a744c23ef6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/my/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/my/firefox-84.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "0608c452c89b1dc71aa99d540baa7a301f9c7974ff0f92e3bd567a577d6a8801"; + sha256 = "43255bc0c5a5adc89bb89ea9267b3d4b38d7432555c7285722228b174bf909a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/nb-NO/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/nb-NO/firefox-84.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "b480530a21a49b00e8c3666c6856ad281c060e0bf2471c5363b1af5fe842ca1f"; + sha256 = "153783b507cf3ec449e8a3d7db6ec523e956c23e1c01f9e26c0e6fc7547353b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ne-NP/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ne-NP/firefox-84.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "7874273d946dea1821e594eae22b5c9efca48c429c922a181b5033ed834a19d9"; + sha256 = "8a3b9e8607565e6031f15a94ae4bcc6e6681d1705408f79483406cdfc04e6c4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/nl/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/nl/firefox-84.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "f54431c579a32aa9c822d834facdd56dc22f319f56b3d8849beb2dba2cd92f3c"; + sha256 = "7d87b9188f74dc3f910761fc0e1c493c121ed6ab077a0fcf1c88af94fbca22a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/nn-NO/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/nn-NO/firefox-84.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "52d56abf19671927427755a91d34f97e8ea3beeeb4f855c43e5c17198c8a0033"; + sha256 = "5d0177a4c13faa2cf9aa0edacbbd381d1ff5eb9ad17ae44ab507f3c8e582c360"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/oc/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/oc/firefox-84.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "adb1fe2efc7c422ff032a7786ff4681964cbec3764d1a4cf0408db34f84c2af8"; + sha256 = "cf8cd276252fccf07990c0a294e4628566ff3884cc062f26d6510dc042c6b5af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/pa-IN/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/pa-IN/firefox-84.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "92c62a054d5755fd6aaf7527812bf2080e94a0b99bbadd8101b120e5a97a834b"; + sha256 = "75ab886eb9fe8d0a2cb9b0544090bd4b818e510ae4c3b137323782237d1a2a77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/pl/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/pl/firefox-84.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "ced027c3eed4912bf52a0e0fd87c3bb3e8fdb495310d54fa3e27202ceef6b181"; + sha256 = "9a2007a58e264731fbc1691213cf4aba07f360e5c3ee455c6a9abd85078f447f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/pt-BR/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/pt-BR/firefox-84.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "407b4bb3ff178be28dd475e8e8265a6db0728362011f155c58126af0ec3418e4"; + sha256 = "71b833c745a4fb334fc1aaa250b67d701cac46c3decec7b839e7554c30e4fbec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/pt-PT/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/pt-PT/firefox-84.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "4d5a1246694c849fc5f9dacff55a8d77b15cfdf9fad1c13dcc3379aaba08aca7"; + sha256 = "a56ada11b7681238a17c3e02c90122d4632070d8385624b34e03ebd2803328e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/rm/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/rm/firefox-84.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "020268365761b5e1667e62d9668b3ec72802f970335424eb0facc1d861010e1e"; + sha256 = "c0cadeebef45884e11a67e1f45f0b36754fc6e2537b2575f06ec539a43986bce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ro/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ro/firefox-84.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "890c046200b68226cd4efe1170c95582456fda0df1004ddc5a96ab4544bbbf80"; + sha256 = "386f7557754cfb2887c7ff2be165d8b4cdc4cc4303fd26539b2d09de440b8c0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ru/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ru/firefox-84.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "7a502fd6c96506809bfaf6c5784a49f4219fd859628938c4a536bc82ed2d1d5b"; + sha256 = "62ee54d895760e7a024fc4836096ad97b95b9bc0ca9d5900d551f86b16071aeb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/si/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/si/firefox-84.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "d4432722999b424c3d2b1f6aad41632db9051a33e40dea317acf933159630c20"; + sha256 = "37b2bf998d61de9ee9b372548d8ccc0a2b4cd098e26c7773829267379cf5bfc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/sk/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/sk/firefox-84.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "68f7b7769bcba9eec44bde88a7c0579c07d2501af8b1494271eeda207d8d256b"; + sha256 = "30429ca6601f9276339f925614fd79b03ac54573564307ea84f0f87359bac7f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/sl/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/sl/firefox-84.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "aa33d8fd7bcfbd340dd4251aedae9f1e5671715bebd2db7f4d4e40e1288dd875"; + sha256 = "412e8aed7694adc1870d4e2bd8eeef74eb63ba0699e815b1d2ec65d38de9b4ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/son/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/son/firefox-84.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "c22bfd8925e30ac477e554d8e17939969d5479425d44180a6b409113f2be961f"; + sha256 = "864e49755554df5ba8d5669f1b3d683517f2eb44039a35097e3acada4b22171d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/sq/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/sq/firefox-84.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "ecb182d80021e37933c8e34671fff744b24bfb66fd7b11382a921315664547fc"; + sha256 = "1449ff4fac39eb2c3f959a899d773e77e457639ebc4cb26dd9c4188395b9c831"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/sr/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/sr/firefox-84.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "d0d2121473dd5ff2ff16029abcdde740e9d4b56470c56c8d0e26f062c0972e1f"; + sha256 = "51813e4ef930533045632fa516752303430ea9fdb848653c1233ddd9ef6d26c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/sv-SE/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/sv-SE/firefox-84.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "dfc1c0c89fd89b6d3ef450d16b489b57d6324b27ca2da628ce136091fb46e19b"; + sha256 = "82e3ce190978b83da1f88b175bcf4f1c95a1539e15375c856c54516333b8fc5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ta/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ta/firefox-84.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "ad117c4e87e7623eb46d9ec23448cf6c9dd0efc950f04359dfbfcb25d88a78bd"; + sha256 = "09f104627061c25c188d6e945dc1915ac43af31c6a0a0a05e70f051915f3d2bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/te/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/te/firefox-84.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "1906a1dc8c981f4a3ff631cbe5451b5b3ffd2d66a6868bcb0c075e7cc53fb1b5"; + sha256 = "a58503877b476f20e176abfa0ca2e5406b8ae8877954924f63f6490c5be19526"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/th/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/th/firefox-84.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "953b0a336557f91e3d1831e0c77ba1da61e63fd6b76a9383dbf7703781a9ffc4"; + sha256 = "722f4194231fb315a07e0efcc922c6d62a8969321eadfccf2f6b74754b563d2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/tl/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/tl/firefox-84.0.1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "09edec56fa57de6fc29be4e3848059d6e975a44fe49edff426f4cd8c17c0d76e"; + sha256 = "6299ac5b4b505549cea0dd465059191adbee72346cfec46b94c67e7f5e9bc399"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/tr/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/tr/firefox-84.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "d93f502786328023bde8f025345acb835fc5b46ecf545d42fa5ef0ab7bee9dab"; + sha256 = "3e4755c497512bcb225a6e35e426db6772f263008f9d6c8495a8311d6d5ebfd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/trs/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/trs/firefox-84.0.1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "2c1ccaa3879d25fa8c63eba446a5ad2c4668e32210b5927e4c5280cf2c46f3a5"; + sha256 = "d6bc24f33f73fea25675a1bcb53a40d4dc123b6496f0087c25b4bd7f6ca717f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/uk/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/uk/firefox-84.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "050645f728c545f8febd5a2f3b886cfd0cdd9f3873d1f2c8248b625b16b1958b"; + sha256 = "37b48b8cf2e57a3bacc2d3a5c139ac1d465e246a68fd33b87891e8c844af0088"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/ur/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ur/firefox-84.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "96a1f37238376b3e2321945a92e6663d9a8a78956d6e37c227b597cb9cd312ec"; + sha256 = "b3a45eb2ad18d1af426e82163b426ceba5adc47957ff771121ee4b172037b53b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/uz/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/uz/firefox-84.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "3d51cb2280b706c7ab944ad612d8b7cdd5d175563f470a96c1f8540fc97dfa53"; + sha256 = "67539a5475aa12d25f8b83655cddc804d46b980e03908bb44f5378753abb649f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/vi/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/vi/firefox-84.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "4052e4a9edef39e7a5ab7167e284c9f5ba1bec85d3774cf6a79943df7d68fc0f"; + sha256 = "ad894dd659f5c86e0b094b709d0d336516e29dea1d1d9ff35f264e6606e59938"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/xh/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/xh/firefox-84.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "0f55bc55fa4674a6736bdf11cf3265747ece6acc2b644ad555f40c3825736026"; + sha256 = "a43b653ad3a3d865c410103ccb66d3603a08cc37177d5279a1b326381631dcf5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/zh-CN/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/zh-CN/firefox-84.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "a0dd3688a1a4da9d3b6de14758c4cd68508852b23dfebc1050ab8bbbaec13a21"; + sha256 = "73e877c33aa5553f90ffc0c68b7416bb988477e55f53632d9f78526ca11a89ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/zh-TW/firefox-84.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/zh-TW/firefox-84.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "236f2a5014478e0a722f9d0b42b509585f2fdc289e56149fd867f88914c1c11d"; + sha256 = "7f448ee87156e73cba4a9edcdd52299f6f70ef7660bad9ee6b7c60375d83e1e6"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index a0f0a1a28e..b4e0d9c582 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "84.0"; + ffversion = "84.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "37d5hc2wv1b6il4flgsw5g7ihw2jx3qrrmgm4cjg3lmk91q8k7908sy79z24na6529y7jxpj4m05l6yb850wnnwjhyc4c3vxqbldnba"; + sha512 = "0sl93h7pjiznabv6865pdbal08nlqncnv3g40l02mgwbphjh5iqrr1bz14khaf58h4v1la090cj7z0gmd0c10xfrx6z7wngm152zz75"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix index 5d299f3349..56acb453a8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, writeScript, desktop-file-utils -, pkgconfig, autoconf213, alsaLib, bzip2, cairo -, dbus, dbus-glib, ffmpeg_3, file, fontconfig, freetype +, pkg-config, autoconf213, alsaLib, bzip2, cairo +, dbus, dbus-glib, ffmpeg, file, fontconfig, freetype , gnome2, gnum4, gtk2, hunspell, libevent, libjpeg , libnotify, libstartup_notification, wrapGAppsHook , libGLU, libGL, perl, python2, libpulseaudio @@ -11,19 +11,19 @@ let - libPath = lib.makeLibraryPath [ ffmpeg_3 libpulseaudio ]; + libPath = lib.makeLibraryPath [ ffmpeg libpulseaudio ]; gtkVersion = if withGTK3 then "3" else "2"; in stdenv.mkDerivation rec { pname = "palemoon"; - version = "28.16.0"; + version = "28.17.0"; src = fetchFromGitHub { githubBase = "repo.palemoon.org"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = "${version}_Release"; - sha256 = "1svwbiar7c38c8xfw249mwnvayqq5868nkks7cbv9nyf2m9yap56"; + sha256 = "0478xn5skpls91hkraykc308hppdc8vj9xbgvlm5wkv0y4dp7h5x"; fetchSubmodules = true; }; @@ -43,11 +43,11 @@ in stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - desktop-file-utils file gnum4 perl pkgconfig python2 wget which wrapGAppsHook + desktop-file-utils file gnum4 perl pkg-config python2 wget which wrapGAppsHook ]; buildInputs = [ - alsaLib bzip2 cairo dbus dbus-glib ffmpeg_3 fontconfig freetype + alsaLib bzip2 cairo dbus dbus-glib ffmpeg fontconfig freetype gnome2.GConf gtk2 hunspell libevent libjpeg libnotify libstartup_notification libGLU libGL libpulseaudio unzip yasm zip zlib @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; configurePhase = '' - export MOZCONFIG=$(pwd)/mozconfig + export MOZCONFIG=$PWD/mozconfig export MOZ_NOSPAM=1 # Keep this similar to the official .mozconfig file, @@ -114,18 +114,18 @@ in stdenv.mkDerivation rec { ' ''; - buildPhase = "$src/mach build"; + buildPhase = "./mach build"; installPhase = '' - $src/mach install + ./mach install desktop-file-install --dir=$out/share/applications \ - $src/palemoon/branding/official/palemoon.desktop + ./palemoon/branding/official/palemoon.desktop for iconname in default{16,22,24,32,48,256} mozicon128; do n=''${iconname//[^0-9]/} size=$n"x"$n - install -Dm644 $src/palemoon/branding/official/$iconname.png $out/share/icons/hicolor/$size/apps/palemoon.png + install -Dm644 ./palemoon/branding/official/$iconname.png $out/share/icons/hicolor/$size/apps/palemoon.png done ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix index 508e0b656d..18a753ca3c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "qbec"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "splunk"; repo = "qbec"; rev = "v${version}"; - sha256 = "1g90z155nhcblr48qypw8qw3l8g4dz33iflv4cg4xrhwjp8dfbv9"; + sha256 = "10bf9ja44n1gzhb5znqbmr1xjc87akrsdyxfvrz4f5bd3p1fh6j0"; }; - vendorSha256 = "15hbjghi2ifylg7nr85qlk0alsy97h9zj6hf5w84m76dla2bcjf3"; + vendorSha256 = "0xkmccm6cyw1p5mah7psbpfsfaw8f09r1a2k4iksfggrn9mimaam"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix index c055718f47..1344440eaf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -52,7 +52,7 @@ mkDerivation rec { pname = "linphone-desktop"; - version = "4.2.4"; + version = "4.2.5"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -175,13 +175,12 @@ mkDerivation rec { ln -s ${liblinphone}/share/belr/grammars/* $out/share/belr/grammars/ mkdir -p $out/share/linphone ln -s ${liblinphone}/share/linphone/* $out/share/linphone/ - mkdir $out/lib # prevent warning ''; meta = with lib; { homepage = "https://www.linphone.org/"; description = "Open source SIP phone for voice/video calls and instant messaging"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ jluttine ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/neochat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/neochat/default.nix index 141b887ef9..f720f56e6a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/neochat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/neochat/default.nix @@ -1,23 +1,30 @@ -{ mkDerivation, stdenv, fetchFromGitLab -, pkgconfig, wrapQtAppsHook +{ mkDerivation +, stdenv +, fetchFromGitLab +, pkg-config , cmake -, qtbase, qttools, qtquickcontrols2, qtmultimedia, qtkeychain -, libpulseaudio -# Not mentioned but seems needed +, qtbase +, qttools +, qtquickcontrols2 +, qtmultimedia , qtgraphicaleffects -, qtdeclarative -, qtmacextras -, olm, libsecret, cmark, extra-cmake-modules, kirigami2, ki18n, knotifications, kdbusaddons, kconfig, libquotient -, KQuickImageEdit, kitemmodels +, qtkeychain +, libpulseaudio +, olm +, libsecret +, cmark +, extra-cmake-modules +, kirigami2 +, kitemmodels +, ki18n +, knotifications +, kdbusaddons +, kconfig +, libquotient +, kquickimageedit }: -let -qtkeychain-qt5 = qtkeychain.override { - inherit qtbase qttools; - withQt5 = true; -}; - -in mkDerivation rec { +mkDerivation rec { pname = "neochat"; version = "v1.0"; @@ -29,13 +36,31 @@ in mkDerivation rec { sha256 = "1r9n83kvc5v215lzmzh6hyc5q9i3w6znbf508qk0mdwdzxz4zry9"; }; - nativeBuildInputs = [ pkgconfig cmake extra-cmake-modules wrapQtAppsHook ]; - buildInputs = [ qtbase qtkeychain-qt5 qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative olm libsecret cmark kirigami2 ki18n knotifications kdbusaddons kconfig libquotient KQuickImageEdit kitemmodels libpulseaudio ]; + nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; + + buildInputs = [ + qtkeychain + qtquickcontrols2 + qtmultimedia + qtgraphicaleffects + olm + libsecret + cmark + kirigami2 + kitemmodels + ki18n + knotifications + kdbusaddons + kconfig + libquotient + kquickimageedit + libpulseaudio + ]; meta = with stdenv.lib; { description = "A client for matrix, the decentralized communication protocol."; homepage = "https://apps.kde.org/en/neochat"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = with platforms; linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/pro.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/pro.nix index d39091d461..3cdf1339e3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/pro.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/pro.nix @@ -1,11 +1,11 @@ -{ autoPatchelfHook, electron_4, fetchurl, makeDesktopItem, makeWrapper, nodePackages, nss, stdenv, xdg_utils, xorg }: +{ autoPatchelfHook, electron_7, fetchurl, makeDesktopItem, makeWrapper, nodePackages, nss, stdenv, xdg_utils, xorg }: let - electron = electron_4; + electron = electron_7; in stdenv.mkDerivation rec { pname = "rambox-pro"; - version = "1.3.2"; + version = "1.4.1"; dontBuild = true; dontStrip = true; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/ramboxapp/download/releases/download/v${version}/RamboxPro-${version}-linux-x64.tar.gz"; - sha256 = "010v5i8lxfz77cb5cn9va5cbnfa28nzdymk5k2fcpi65jldw1pxx"; + sha256 = "1bd4fba3ac8c20fa557ebfb110f6503d36e6c3dba0401d1073529dcae2c2ec1e"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 47a79c7309..d4e43ed3a9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -108,6 +108,10 @@ in stdenv.mkDerivation { # Fix the desktop link substituteInPlace $out/share/applications/skypeforlinux.desktop \ --replace /usr/bin/ $out/bin/ + substituteInPlace $out/share/applications/skypeforlinux-share.desktop \ + --replace /usr/bin/ $out/bin/ + substituteInPlace $out/share/kservices5/ServiceMenus/skypeforlinux.desktop \ + --replace /usr/bin/ $out/bin/ ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/spectral/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/spectral/default.nix deleted file mode 100644 index b0819ade4f..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/spectral/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchgit -, pkgconfig, wrapQtAppsHook -, cmake -, qtbase, qttools, qtquickcontrols2, qtmultimedia, qtkeychain -, libpulseaudio -# Not mentioned but seems needed -, qtgraphicaleffects -, qtdeclarative -, qtmacextras -, olm, libsecret, cmark -}: - -let qtkeychain-qt5 = qtkeychain.override { - inherit qtbase qttools; - withQt5 = true; -}; -in stdenv.mkDerivation rec { - pname = "spectral"; - version = "817"; - - src = fetchgit { - url = "https://gitlab.com/spectral-im/spectral.git"; - rev = version; - sha256 = "0lg0bkz621cmqb67kz1zmn4xwbspcqalz68byll5iszqz9y4gnp1"; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ pkgconfig cmake wrapQtAppsHook ]; - buildInputs = [ qtbase qtkeychain-qt5 qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative olm libsecret cmark ] - ++ stdenv.lib.optional stdenv.hostPlatform.isLinux libpulseaudio - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin qtmacextras; - - meta = with stdenv.lib; { - description = "A glossy cross-platform Matrix client"; - homepage = "https://spectral.im"; - license = licenses.gpl3; - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ dtzWill ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix index 45d41839a1..781e6c8369 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "aerc"; - version = "0.4.0"; + version = "0.5.2"; src = fetchurl { url = "https://git.sr.ht/~sircmpwn/aerc/archive/${version}.tar.gz"; - sha256 = "05qy14k9wmyhsg1hiv4njfx1zn1m9lz4d1p50kc36v7pq0n4csfk"; + sha256 = "h7kiRA5TuZ8mDSMymWU33stFLIOMd06TQLYzKW+faO4="; }; runVend = true; - vendorSha256 = "13zs5113ip85yl6sw9hzclxwlnrhy18d39vh9cwbq97dgnh9rz89"; + vendorSha256 = "9PXdUH0gu8PGaKlRJCUF15W1/LxA+sv3Pwl2UnjYxWY="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch index ed670d61a7..91978753ae 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch @@ -29,7 +29,7 @@ diff --git a/config/config.go b/config/config.go index 32d07fc..8ffd3e8 100644 --- a/config/config.go +++ b/config/config.go -@@ -355,6 +355,11 @@ func LoadConfigFromFile(root *string, sharedir string) (*AercConfig, error) { +@@ -472,6 +472,11 @@ func LoadConfigFromFile(root *string, sharedir string) (*AercConfig, error) { return nil, err } } @@ -41,10 +41,11 @@ index 32d07fc..8ffd3e8 100644 file.NameMapper = mapName config := &AercConfig{ Bindings: BindingConfig{ -@@ -423,6 +428,9 @@ func LoadConfigFromFile(root *string, sharedir string) (*AercConfig, error) { +@@ -546,6 +428,9 @@ func LoadConfigFromFile(root *string, sharedir string) (*AercConfig, error) { if err = config.LoadConfig(file); err != nil { return nil, err } + + for i, filter := range config.Filters { + config.Filters[i].Command = strings.ReplaceAll(filter.Command, "@SHAREDIR@", sharedir) + } diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 2e41883b40..66d2667e7e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -268,7 +268,7 @@ stdenv.mkDerivation rec { genericName = "Mail Reader"; name = "thunderbird"; exec = "thunderbird %U"; - icon = "$out/lib/thunderbird/chrome/icons/default/default256.png"; + icon = "thunderbird"; mimeType = lib.concatStringsSep ";" [ # Email "x-scheme-handler/mailto" @@ -288,6 +288,7 @@ stdenv.mkDerivation rec { postInstall = '' # TODO: Move to a dev output? rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl + install -Dm 444 $out/lib/thunderbird/chrome/icons/default/default256.png $out/share/icons/hicolor/256x256/apps/thunderbird.png ''; # Note on GPG support: diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix index 66fc3ec600..c32d671cb0 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix @@ -9,20 +9,23 @@ eigen, zlib, - cfitsio, indilib, xplanet, libnova, libraw, gsl, wcslib + cfitsio, indilib, xplanet, libnova, libraw, gsl, wcslib, stellarsolver }: mkDerivation rec { pname = "kstars"; - version = "3.4.3"; + version = "3.5.0"; src = fetchurl { - url = "https://mirrors.mit.edu/kde/stable/kstars/kstars-${version}.tar.xz"; - sha256 = "0j5yxg6ay6sic194skz6vjzg6yvrpb3gvypvs0frjrcjbsl1j4f8"; + url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz"; + sha256 = "0fpkm75abn0hhdhfyvpfl6n0fr7gvw63xhb4hvwdrglhkf2nxam1"; }; patches = [ - ./indi-fix.patch + # Patches ksutils.cpp to use nix store prefixes to find program binaries of + # indilib and xplanet dependencies. Without the patch, Ekos is unable to spawn + # indi servers for local telescope/camera control. + ./fs-fixes.patch ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; @@ -34,11 +37,12 @@ mkDerivation rec { eigen zlib - cfitsio indilib xplanet libnova libraw gsl wcslib + cfitsio indilib xplanet libnova libraw gsl wcslib stellarsolver ]; cmakeFlags = [ "-DINDI_NIX_ROOT=${indilib}" + "-DXPLANET_NIX_ROOT=${xplanet}" ]; meta = with lib; { @@ -51,6 +55,6 @@ mkDerivation rec { ''; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ timput ]; + maintainers = with maintainers; [ timput hjones2199 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/fs-fixes.patch b/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/fs-fixes.patch new file mode 100644 index 0000000000..b9bdfc0c5d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/fs-fixes.patch @@ -0,0 +1,59 @@ +--- kstars-3.5.0/CMakeLists.txt.old 2020-11-24 12:36:37.967433937 -0600 ++++ kstars-3.5.0/CMakeLists.txt 2020-11-24 13:36:56.275263691 -0600 +@@ -5,6 +5,9 @@ + set (KSTARS_BUILD_RELEASE "Stable") + set (CMAKE_CXX_STANDARD 11) + ++add_definitions(-DINDI_NIX_ROOT=${INDI_NIX_ROOT}) ++add_definitions(-DXPLANET_NIX_ROOT=${XPLANET_NIX_ROOT}) ++ + # Build KStars Lite with -DBUILD_KSTARS_LITE=ON + option(BUILD_KSTARS_LITE "Build KStars Lite" OFF) + +--- kstars-3.5.0/kstars/auxiliary/ksutils.old.cpp 2020-11-24 12:22:14.397319680 -0600 ++++ kstars-3.5.0/kstars/auxiliary/ksutils.cpp 2020-11-24 13:32:22.946477798 -0600 +@@ -1081,6 +1081,10 @@ + // We support running within Snaps, Flatpaks, and AppImage + // The path should accomodate the differences between the different + // packaging solutions ++ #define STR_EXPAND(x) #x ++ #define STR(x) STR_EXPAND(x) ++ QString indi_prefix = QString(STR(INDI_NIX_ROOT)); ++ QString xplanet_prefix = QString(STR(XPLANET_NIX_ROOT)); + QString snap = QProcessEnvironment::systemEnvironment().value("SNAP"); + QString flat = QProcessEnvironment::systemEnvironment().value("FLATPAK_DEST"); + QString appimg = QProcessEnvironment::systemEnvironment().value("APPDIR"); +@@ -1110,21 +1114,21 @@ + #if defined(Q_OS_OSX) + return "/usr/local/bin/indiserver"; + #endif +- return prefix + "/bin/indiserver"; ++ return indi_prefix + "/bin/indiserver"; + } + else if (option == "INDIHubAgent") + { + #if defined(Q_OS_OSX) + return "/usr/local/bin/indihub-agent"; + #endif +- return prefix + "/bin/indihub-agent"; ++ return indi_prefix + "/bin/indihub-agent"; + } + else if (option == "indiDriversDir") + { + #if defined(Q_OS_OSX) + return "/usr/local/share/indi"; + #elif defined(Q_OS_LINUX) +- return prefix + "/share/indi"; ++ return indi_prefix + "/share/indi"; + #else + return QStandardPaths::locate(QStandardPaths::GenericDataLocation, "indi", QStandardPaths::LocateDirectory); + #endif +@@ -1181,7 +1185,7 @@ + #if defined(Q_OS_OSX) + return "/usr/local/bin/xplanet"; + #endif +- return prefix + "/bin/xplanet"; ++ return xplanet_prefix + "/bin/xplanet"; + } + else if (option == "ASTAP") + { diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/indi-fix.patch b/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/indi-fix.patch deleted file mode 100644 index 9ff9f8a31d..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/indi-fix.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- CMakeLists.txt 2020-11-02 13:58:06.119743710 -0600 -+++ kstars-3.4.3/CMakeLists.txt 2020-11-02 14:05:01.707799274 -0600 -@@ -4,5 +4,7 @@ - set (KStars_VERSION_REVISION 3) - set (CMAKE_CXX_STANDARD 11) - -+add_definitions(-DINDI_NIX_ROOT=${INDI_NIX_ROOT}) -+ - # Build KStars Lite with -DBUILD_KSTARS_LITE=ON - option(BUILD_KSTARS_LITE "Build KStars Lite" OFF) - ---- ksutils.cpp 2020-11-02 13:47:44.883596916 -0600 -+++ kstars-3.4.3/kstars/auxiliary/ksutils.cpp 2020-11-02 17:41:44.961937090 -0600 -@@ -1076,6 +1076,9 @@ - { - QString snap = QProcessEnvironment::systemEnvironment().value("SNAP"); - QString flat = QProcessEnvironment::systemEnvironment().value("FLATPAK_DEST"); -+#define STR_EXPAND(x) #x -+#define STR(x) STR_EXPAND(x) -+ QString nix = QString(STR(INDI_NIX_ROOT)); - - if (option == "fitsDir") - { -@@ -1089,7 +1091,7 @@ - if (flat.isEmpty() == false) - return flat + "/bin/indiserver"; - else -- return snap + "/usr/bin/indiserver"; -+ return nix + "/bin/indiserver"; - } - else if (option == "INDIHubAgent") - { -@@ -1099,7 +1101,7 @@ - if (flat.isEmpty() == false) - return flat + "/bin/indihub-agent"; - else -- return snap + "/usr/bin/indihub-agent"; -+ return nix + "/bin/indihub-agent"; - } - else if (option == "indiDriversDir") - { -@@ -1109,7 +1111,7 @@ - if (flat.isEmpty() == false) - return flat + "/share/indi"; - else -- return snap + "/usr/share/indi"; -+ return nix + "/share/indi"; - #else - return QStandardPaths::locate(QStandardPaths::GenericDataLocation, "indi", QStandardPaths::LocateDirectory); - #endif diff --git a/third_party/nixpkgs/pkgs/applications/science/math/bcal/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/bcal/default.nix index 18b6e051b3..5df2d20549 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/bcal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/bcal/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, python3Packages, readline }: +{ stdenv, fetchFromGitHub, python3Packages, readline, bc }: with stdenv.lib; stdenv.mkDerivation rec { pname = "bcal"; - version = "1.9"; + version = "2.2"; src = fetchFromGitHub { owner = "jarun"; repo = "bcal"; rev = "v${version}"; - sha256 = "0h6qi5rvzl6c6fsfdpdb3l4jcgip03l18i0b1x08z1y89i56y8mm"; + sha256 = "4vR5rcbNkoEdSRNoMH9qMHP3iWFxejkVfXNiYfwbo/A="; }; nativeBuildInputs = [ python3Packages.pytest ]; @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline ]; doCheck = true; + checkInputs = [ bc ]; checkPhase = '' python3 -m pytest test.py ''; @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Storage conversion and expression calculator"; homepage = "https://github.com/jarun/bcal"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = [ "aarch64-linux" "x86_64-darwin" "x86_64-linux" ]; maintainers = with maintainers; [ jfrankenau ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/robotics/mission-planner/default.nix b/third_party/nixpkgs/pkgs/applications/science/robotics/mission-planner/default.nix new file mode 100644 index 0000000000..5ae04d8a84 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/robotics/mission-planner/default.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchurl, makeDesktopItem, makeWrapper, unzip, mono6 }: + +let + pname = "mission-planner"; + desktopItem = makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + comment = "MissionPlanner GCS & Ardupilot configuration tool"; + desktopName = "MissionPlanner"; + genericName = "Ground Control Station"; + }; +in stdenv.mkDerivation rec { + inherit pname; + version = "1.3.74"; + + src = fetchurl { + url = "https://firmware.ardupilot.org/Tools/MissionPlanner/MissionPlanner-${version}.zip"; + sha256 = "1cgpmsmmnbzw1lwsdafp8yklk1rwc61yf12vc1ahcc6bl7q2385x"; + }; + + nativeBuildInputs = [ makeWrapper mono6 unzip ]; + sourceRoot = "."; + + AOT_FILES = [ "MissionPlanner.exe" "MissionPlanner.*.dll" ]; + + buildPhase = '' + runHook preBuild + for file in $AOT_FILES + do + mono --aot $file + done + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,opt/mission-planner} + install -m 444 -D mpdesktop150.png $out/share/icons/mission-planner.png + cp -r ${desktopItem}/share/applications $out/share/ + mv * $out/opt/mission-planner + makeWrapper ${mono6}/bin/mono $out/bin/mission-planner \ + --add-flags $out/opt/mission-planner/MissionPlanner.exe + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "An ArduPilot ground station"; + longDescription = '' + Full-featured ground station application for the ArduPilot open source + autopilot project. Lets you both flash, configure and control ArduPilot + Plane, Copter and Rover targets. + ''; + homepage = "https://ardupilot.org/planner/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ wucke13 ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix index 1ec704f5d4..d06a66edf1 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "362"; + version = "363"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - sha256 = "HU/+Im+o8CGFm7wwB3iP9jpGoxJC2b2ae9fr4k6BrKI="; + sha256 = "2Bo2OeJlUrZ2W9zyi+Hs24rKv5B5VXCOgwrWOX6hC0g="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix index d019fcbae5..46b27e95c7 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix @@ -38,6 +38,8 @@ let ghq = callPackage ./ghq { }; + ghr = callPackage ./ghr { }; + git = appendToName "minimal" gitBase; git-absorb = callPackage ./git-absorb { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/ghr/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/ghr/default.nix new file mode 100644 index 0000000000..be6d64646a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/ghr/default.nix @@ -0,0 +1,30 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "ghr"; + version = "0.13.0"; + + src = fetchFromGitHub { + owner = "tcnksm"; + repo = "ghr"; + rev = "v${version}"; + sha256 = "1nm5kdjkqayxh06j9nr5daic9sw9nx9w06y9gaqhdrw9byvjpr1a"; + }; + + vendorSha256 = "14avsngzhl1b8a05i43ph6sxh9vj0jls0acxr9j7r0h3f0vpamcj"; + + # Tests require a Github API token, and networking + doCheck = false; + doInstallCheck = true; + + installCheckPhase = '' + $out/bin/ghr --version + ''; + + meta = with lib; { + homepage = "https://github.com/tcnksm/ghr"; + description = "Upload multiple artifacts to GitHub Release in parallel"; + license = licenses.mit; + maintainers = [ maintainers.ivar ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index a99ff3c2e0..a6ca3126d5 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gitstatus"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; rev = "v${version}"; - sha256 = "0skpi22plzb9r9cgqfnjzpaz856q9f4n0gd5i97nv8bfny8hl30z"; + sha256 = "1w5kpca2v6iii912riywp1jscq7cpr5xv93mglr30pjnar1mk8gs"; }; buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ]; @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "10x faster implementation of `git status` command"; homepage = "https://github.com/romkatv/gitstatus"; - license = [ licenses.gpl3 ]; + license = licenses.gpl3Only; maintainers = with maintainers; [ mmlb hexa ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix index 340ab283bf..ffbeb05095 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; buildGoPackage rec { pname = "gitea"; - version = "1.13.0"; + version = "1.13.1"; src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "090i4hk9mb66ia14kyp7rqymhc897yi1ifb0skvknylx0sw8vhk9"; + sha256 = "sha256-tah7ciq+jkkROJq/V+yPRtWPuWaSnf5hKndjnifsQYc="; }; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/redmine/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/redmine/default.nix index defbf9c2ae..4279fdd5f9 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/redmine/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/redmine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bundlerEnv, ruby }: +{ stdenv, fetchurl, bundlerEnv, ruby, makeWrapper }: let version = "4.1.1"; @@ -19,6 +19,7 @@ in sha256 = "1nndy5hz8zvfglxf1f3bsb1pkrfwinfxzkdan1vjs3rkckkszyh5"; }; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ]; # taken from https://www.redmine.org/issues/33784 @@ -31,12 +32,14 @@ in ''; installPhase = '' - mkdir -p $out/share + mkdir -p $out/bin $out/share cp -r . $out/share/redmine for i in config files log plugins public/plugin_assets public/themes tmp; do rm -rf $out/share/redmine/$i ln -fs /run/redmine/$i $out/share/redmine/$i done + + makeWrapper ${rubyEnv.wrappedRuby}/bin/ruby $out/bin/rdm-mailhandler.rb --add-flags $out/share/redmine/extra/mail_handler/rdm-mailhandler.rb ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/charliecloud/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/charliecloud/default.nix index d6cbc25d88..79e3200714 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/charliecloud/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/charliecloud/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { - version = "0.20"; + version = "0.21"; pname = "charliecloud"; src = fetchFromGitHub { owner = "hpc"; repo = "charliecloud"; rev = "v${version}"; - sha256 = "15ihffwhpjnzgz0ir5vc9la4fwkqj91vmrcsb2r58ikq7h9sk45j"; + sha256 = "Y/tH6Znq//HBA/FHfIm2Wpppx6TiL7CqKtZFDc/XSNc="; }; nativeBuildInputs = [ autoreconfHook makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix index cece3cc6b6..695109fd8a 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix @@ -1,12 +1,16 @@ -{ lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, installShellFiles, util-linux, nixosTests }: - -with lib; +{ lib +, fetchFromGitHub +, buildGoPackage +, btrfs-progs +, go-md2man +, installShellFiles +, util-linux +, nixosTests +}: buildGoPackage rec { pname = "containerd"; version = "1.4.3"; - # git commit for the above version's tag - commit = "269548fa27e0089a8b8278fc4fc781d7f65a939b"; src = fetchFromGitHub { owner = "containerd"; @@ -22,29 +26,32 @@ buildGoPackage rec { buildInputs = [ btrfs-progs ]; - buildFlags = [ "VERSION=v${version}" "REVISION=${commit}" ]; + buildFlags = [ "VERSION=v${version}" "REVISION=${src.rev}" ]; - BUILDTAGS = [] - ++ optional (btrfs-progs == null) "no_btrfs"; + BUILDTAGS = [ ] + ++ lib.optional (btrfs-progs == null) "no_btrfs"; buildPhase = '' cd go/src/${goPackagePath} patchShebangs . - make binaries $buildFlags + make binaries man $buildFlags ''; installPhase = '' - for b in bin/*; do - install -Dm555 $b $out/$b - done - - make man + install -Dm555 bin/* -t $out/bin installManPage man/*.[1-9] ''; + # completion installed separately so it can be overridden in docker + # can be moved to installPhase when docker uses containerd >= 1.4 + postInstall = '' + installShellFiles --bash contrib/autocomplete/ctr + installShellFiles --zsh --name _ctr contrib/autocomplete/zsh_autocomplete + ''; + passthru.tests = { inherit (nixosTests) docker; }; - meta = { + meta = with lib; { homepage = "https://containerd.io/"; description = "A daemon to control runC"; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix index 1d55744efb..1f4d5e3aac 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix @@ -41,6 +41,8 @@ rec { rev = containerdRev; sha256 = containerdSha256; }; + # disable completion, can be removed when docker uses containerd >= 1.4 + postInstall = []; # This should be removed once Docker uses containerd >=1.4 nativeBuildInputs = oldAttrs.nativeBuildInputs ++ lib.optional withlibseccomp pkgconfig; buildInputs = oldAttrs.buildInputs ++ lib.optional withlibseccomp libseccomp; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/balance-workspace.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/balance-workspace.nix new file mode 100644 index 0000000000..18e9167227 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/balance-workspace.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, i3ipc }: + +buildPythonPackage rec { + pname = "i3-balance-workspace"; + version = "1.8.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1gndzrwff8gfdqjjxv4zf2h2k0x7y97w1c3mrjpihz8xd0hbnk4d"; + }; + + propagatedBuildInputs = [ i3ipc ]; + + doCheck = false; # project has no test + pythonImportsCheck = [ "i3_balance_workspace" ]; + + meta = { + description = "Balance windows and workspaces in i3wm"; + homepage = "https://pypi.org/project/i3-balance-workspace/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pacien ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix index 5d9ef23d1c..fbae89bcf0 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix @@ -10,7 +10,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix index 0cb7a0d0b6..5cb0b53114 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix @@ -1,24 +1,24 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "1k87kb2858hy8w7hwdv2cs37x590flm44rrf9ahpjnbzdf22c35y"; - iosevka-aile = "0zlhkbxzi1bdfag0f6cfcpqb347qqbp8h1jr1166zwys5p92hm5n"; - iosevka-curly = "18b6wjq1jr08zpzp1dq63n54cahjyli5ivk7q6gh5qrvc9qa613w"; - iosevka-curly-slab = "0yf613nkpby501xxn4pwxm3c2lij5b98j5mnfa4phc43gls266fa"; - iosevka-etoile = "0ysj6sjrkky79l3330mp0264shprdr0yrrkj1absijywy4dw2k03"; - iosevka-slab = "04hg24iqc9x49m9i72a4pfx8vgyk03vyg9xbh9fnwm9dk58lv450"; - iosevka-sparkle = "100fas1j4ws4plzbcnlfag1kd2xwr8pcikghd8fw648zkrwrrnw4"; - iosevka-ss01 = "16qsb89z3c3n01l6xp813gs29dy81lmvfbmramm9amphrcx6y5n3"; - iosevka-ss02 = "10qjvkhr9az52spax4b9x3d9cxa189j3yznxpiwsgz641mf4mj4k"; - iosevka-ss03 = "028pzjisfqz4vlb2d8cwmmsxi2440vjayiwg13awllgzkpj3ibra"; - iosevka-ss04 = "1xzxwa91yvv8wbz3p1pmb3x559xic8k3qz8vrfgqzmv9ymyw19q4"; - iosevka-ss05 = "1bcdkydpzadb194nm4gmilj1rm46fblbwif4wcalcnypryfxlqgy"; - iosevka-ss06 = "0r436ajlphqm7qjnzwq972wi5ccyvavw6p2vw75cvwc1s7ihwqkg"; - iosevka-ss07 = "0fxwvwzkzc7xc0jhhppxjk9sm1gdr0qjvxa1szqf6nj2vy86cj73"; - iosevka-ss08 = "0aw28i1r48qn42c6m3q900j3b4i6gnwxjxndc88ybak1fg43sf40"; - iosevka-ss09 = "12nsjk9sxy7f0i0p6qjsc4z6d6w637fllabvsg83dblpkxw1yfac"; - iosevka-ss10 = "12sz1nriq2g776kg70gx9lp0ma7rqgvnrkr15fp791wxkvgwqq5b"; - iosevka-ss11 = "0yvcn9h7yxhp08rnl23j61agkb1p86rjgw8md23dkbxda600knqn"; - iosevka-ss12 = "1vvbnqrmgx2krphf08rdlpn4f6zjypnh69m7yh8cakkbvvr4jnv1"; - iosevka-ss13 = "09g3j713kssrkryb83kw803aa5dlnydvkqn80d666q0xyqv2xcfk"; - iosevka-ss14 = "1psbqdscs223yxdlll7779xpdvkzh0al61jn1ka62by3qizmvl4b"; + iosevka = "1s9nyq8gjmmah5rpflffl0wi0klnlsvzmy7b39vnpp2sp6ng9mv3"; + iosevka-aile = "0x2ccjnmi9hqms5jkfnkn30y9gd3adiwjvn9gzq8d6a563h61fik"; + iosevka-curly = "03n0f9nzjywb5q3w59ck5sq500ks5xxlgf9dpncr3c7i2dawss41"; + iosevka-curly-slab = "09qnd2vzl4v59c0d534mj06zxwa3rdwrhkwy191v6p79lfxp482x"; + iosevka-etoile = "0j3ah72dmk7fzcln9755y3xnzn7343lfrg95kb3xmqm2zyg0mbrw"; + iosevka-slab = "0prnm3nh8rgn6jivfj2fw7x12m8qqam8xnl45ip5ck4348piypx3"; + iosevka-sparkle = "1y180rwrxrvwd98hk1d07y0vs8h5rj7ipkhsqlv60h82pigxhl4a"; + iosevka-ss01 = "04q9vby5q9ylvv2myl3h2xfyq3s594wnwj0b956pivwwamhp0g3v"; + iosevka-ss02 = "14d5i88ls8zfbis5s7z95dcrpxqyqr2wzx90c5a4xpcdjd4n7fgg"; + iosevka-ss03 = "1zqqq11rcjmifc4qf5p2xcqhqp5ca2pgvzv8xirr6mq4knrvxrpq"; + iosevka-ss04 = "1xnnqyvyrz820dzfyjj84v3j1q8krykmwxw5xml4v7kk79agc7vk"; + iosevka-ss05 = "07w78jw23hxwzx65ampwzv691p12n0pvk8vnw2mnnspflirpm62r"; + iosevka-ss06 = "11brqklhk3sfhqyavyi5rggsn3286n404gphmh0frz65wj3k8lc6"; + iosevka-ss07 = "037vaxpgdpa6p9nmqcsa1mi7pn94300cd71kbr9lw8mql9wc2y9n"; + iosevka-ss08 = "0ga1bwb2d1rizr0910bcqabcj819dcd0bxp7cwbxnzq6i7ca4hj1"; + iosevka-ss09 = "1khjhn0lfpk8g1yx3558w6kkj0pd5b7kxbf0z97w1nvah3d5v50m"; + iosevka-ss10 = "0zp5173799vacssj0lsj3ck82b03qyk9cyfwa3j7xa2dhplrjfp2"; + iosevka-ss11 = "124a3i7iy9z7adxcb8yw3795gk52cw7ngsim8qjhrhcd2bjr0jvg"; + iosevka-ss12 = "1rd61ry3ihw311c926wjl9sc71bz0ligya07m7km1905dhlhirsv"; + iosevka-ss13 = "0jm3djc4rlzk22jn3syv4mwd0fz82z4lnyk3dkq815yyw6vmqkz0"; + iosevka-ss14 = "1a9a1bvzsbprmxfh19m78s82rfmxng4sambz6m4gd9mm14kjjp5r"; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix b/third_party/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix index fc4d76f6ad..42012e43d4 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix @@ -1,24 +1,24 @@ { lib, fetchzip }: let - version = "2.210"; + version = "2.221"; in fetchzip { name = "JetBrainsMono-${version}"; url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip"; - sha256 = "05csy42qji8xbaq5iap2nmki0d0cbiwiq9kbzjd1cah9qn6gfill"; + sha256 = "1in3znnj0i0yfwj93ncxi3s1cp9lhgwnv2r14br47rr7vik4zjr6"; postFetch = '' mkdir -p $out/share/fonts unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2 ''; meta = with lib; { description = "A typeface made for developers"; homepage = "https://jetbrains.com/mono/"; + changelog = "https://github.com/JetBrains/JetBrainsMono/blob/v${version}/Changelog.md"; license = licenses.ofl; maintainers = [ maintainers.marsam ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/data/fonts/meslo-lgs-nf/default.nix b/third_party/nixpkgs/pkgs/data/fonts/meslo-lgs-nf/default.nix new file mode 100644 index 0000000000..36ce33cd7d --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/fonts/meslo-lgs-nf/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "meslo-lgs-nf"; + version = "2020-03-22"; + + src = fetchFromGitHub { + owner = "romkatv"; + repo = "powerlevel10k-media"; + rev = "32c7d40239c93507277f14522be90b5750f442c9"; + sha256 = "10hq4whai1rqj495w4n80p0y21am8rihm4rc40xq7241d6dzilrd"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp $src/*.ttf $out/share/fonts/truetype + ''; + + meta = with stdenv.lib; { + description = "Meslo Nerd Font patched for Powerlevel10k"; + homepage = "https://github.com/romkatv/powerlevel10k-media"; + license = licenses.asl20; + maintainers = with maintainers; [ bbigras ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/icons/luna-icons/default.nix b/third_party/nixpkgs/pkgs/data/icons/luna-icons/default.nix index 2a75c6c203..b0de2ac3b1 100644 --- a/third_party/nixpkgs/pkgs/data/icons/luna-icons/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/luna-icons/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "luna-icons"; - version = "0.9"; + version = "0.9.1"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "1pwbmw20kzlxnwln92nxq7f5s1xwbpv6j7il7jxymlw0y31rl281"; + sha256 = "0mz5cayjgsc109nv7kdkn3gn1n79bl3hb773lrzrr0k2zblxg353"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix index 9227ceb491..0f4d0d1d90 100644 --- a/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20200801"; + version = "20200901"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "0w9ks8izxv7mkh82fnclfcdf6mif991dsbbnxsqmcbvljrmjval2"; + sha256 = "00khqbd7jz97q1kd43kkm6yaa40ml36rh04s76sgbm58srs66v3c"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/themes/sweet/default.nix b/third_party/nixpkgs/pkgs/data/themes/sweet/default.nix index 9d3603cbf5..6ba7ae40c6 100644 --- a/third_party/nixpkgs/pkgs/data/themes/sweet/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/sweet/default.nix @@ -1,46 +1,46 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "sweet"; - version = "1.10.5"; + version = "2.0"; srcs = [ (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-Ambar-Blue.zip"; - sha256 = "11040hx8ci4vbnyaj63zj924v0ln7rjm9a28mcqdax60h3dp12lj"; + url = "https://github.com/EliverLara/Sweet/releases/download/${version}/Sweet-Ambar-Blue.tar.xz"; + sha256 = "028pk07im7pab8a2vh3bvjm8jg37dpvn4c1mwn6vhb6wcr9v5c75"; }) (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-Ambar.zip"; - sha256 = "0lvnjmirpwdav8q0bfbhybwkr2h6dilc7lhhj18xd2k57xadjmxr"; + url = "https://github.com/EliverLara/Sweet/releases/download/${version}/Sweet-Ambar.tar.xz"; + sha256 = "0zmdmqndj65kr43g3z57blrmv0y856zlfprm6y45zbf4xz3ybkg6"; }) (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-Dark.zip"; - sha256 = "0a7mh1pgvi8w1ahsmvgnmpdawm30lcjqk4zqvg0lqadsd04dn4h1"; + url = "https://github.com/EliverLara/Sweet/releases/download/${version}/Sweet-Dark.tar.xz"; + sha256 = "02sw664fkrfpsygspq8fn4zgk8rxs9rd29nnx6nyvkji68mb51s6"; }) (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-mars.zip"; - sha256 = "0n2dkl35qrik10wvhvkayyra987p03g56pxhz5kc73cbsl5zd96l"; + url = "https://github.com/EliverLara/Sweet/releases/download/${version}/Sweet-mars.tar.xz"; + sha256 = "14rl3il61jyqwiqlpgbh397q3rcs7jcf2pvr2763ar5a9czmy8h6"; }) (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet.zip"; - sha256 = "0wwmc3wj2pjg4kimfkvcsimk3s4s7l7k000vxqi8yjlfs70f273c"; + url = "https://github.com/EliverLara/Sweet/releases/download/${version}/Sweet.tar.xz"; + sha256 = "0rza3yxwj256ibqimymjhd6lpjzr7fkhggq0ijdg1wab3q91x66q"; }) ]; - nativeBuildInputs = [ unzip ]; - sourceRoot = "."; installPhase = '' + runHook preInstall mkdir -p $out/share/themes/ cp -a Sweet* $out/share/themes/ rm $out/share/themes/*/{LICENSE,README*} + runHook postInstall ''; meta = with stdenv.lib; { description = "Light and dark colorful Gtk3.20+ theme"; homepage = "https://github.com/EliverLara/Sweet"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ fuzen ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/iagno/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/games/iagno/default.nix index 08d402ead5..9443fc2bb8 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -26,15 +26,6 @@ stdenv.mkDerivation rec { sha256 = "097dw1l92l73xah9l56ka5mi3dvx48ffpiv33ni5i5rqw0ng7fc4"; }; - patches = [ - # Fix build with Meson 0.55 - # https://gitlab.gnome.org/GNOME/iagno/-/issues/16 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/iagno/commit/0100bab269f2102f24a6e41202b931da1b6e8dc5.patch"; - sha256 = "ZW75s+bV45ivwA+SKUN7ejSvnXYEo/kYQjDVvFBA/sg="; - }) - ]; - nativeBuildInputs = [ meson ninja diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix index 6f841958c7..3c84f5558a 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix @@ -4,6 +4,7 @@ mkXfceDerivation { category = "apps"; pname = "mousepad"; version = "0.4.2"; + odd-unstable = false; sha256 = "0a35vaq4l0d8vzw7hqpvbgkr3wj1sqr2zvj7bc5z4ikz2cppqj7p"; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/orage/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/orage/default.nix index 31438a1fc7..3af6c0a6bb 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/orage/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/orage/default.nix @@ -1,18 +1,23 @@ -{ lib, fetchpatch, mkXfceDerivation, dbus-glib, gtk2, libical, libnotify, tzdata -, popt, libxfce4ui, xfce4-panel, withPanelPlugin ? true }: +{ stdenv, fetchurl, fetchpatch, pkg-config, intltool, dbus-glib, gtk2, libical, libnotify, tzdata +, popt, libxfce4ui, xfce4-panel, withPanelPlugin ? true, wrapGAppsHook, xfce }: assert withPanelPlugin -> libxfce4ui != null && xfce4-panel != null; let - inherit (lib) optionals; + inherit (stdenv.lib) optionals; in -mkXfceDerivation { - category = "archive"; +stdenv.mkDerivation rec { pname = "orage"; version = "4.12.1"; - sha256 = "04z6y1vfaz1im1zq1zr7cf8pjibjhj9zkyanbp7vn30q520yxa0m"; + src = fetchurl { + url = "https://archive.xfce.org/src/apps/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + sha256 = "0qlhvnl2m33vfxqlbkic2nmfpwyd4mq230jzhs48cg78392amy9w"; + }; + + nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; + buildInputs = [ dbus-glib gtk2 libical libnotify popt ] ++ optionals withPanelPlugin [ libxfce4ui xfce4-panel ]; @@ -33,7 +38,16 @@ mkXfceDerivation { }) ]; - meta = { - description = "A simple calendar application with reminders"; + passthru.updateScript = xfce.updateScript { + inherit pname version; + attrPath = "xfce.${pname}"; + versionLister = xfce.archiveLister "apps" pname; + }; + + meta = with stdenv.lib; { + description = "Simple calendar application with reminders"; + homepage = "https://git.xfce.org/archive/orage/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfwm4/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfwm4/default.nix index 7ab1246104..df46a80c4b 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfwm4/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfwm4/default.nix @@ -5,9 +5,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfwm4"; - version = "4.14.5"; + version = "4.14.6"; - sha256 = "0xxprhs8g00ysrl25y6z9agih6wb7n29v5f5m2icaz7yjvj1k9iv"; + sha256 = "1ml5b4nn8laqhjihfqqsbjn66525abhin5d32bplh1k9yfxw4xi4"; nativeBuildInputs = [ exo librsvg ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/mkXfceDerivation.nix b/third_party/nixpkgs/pkgs/desktops/xfce/mkXfceDerivation.nix index 4c6edf99b6..8709b84820 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/mkXfceDerivation.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/mkXfceDerivation.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, xfce4-dev-tools, hicolor-icon-theme, xfce, wrapGAppsHook }: +{ stdenv, fetchFromGitLab, pkgconfig, xfce4-dev-tools, hicolor-icon-theme, xfce, wrapGAppsHook }: { category , pname @@ -23,14 +23,16 @@ let zipAttrsWithNames (filterAttrNames isList (head attrsets)) (_: concatLists) attrsets; template = rec { - name = "${pname}-${version}"; + inherit pname version; nativeBuildInputs = [ pkgconfig xfce4-dev-tools wrapGAppsHook ]; buildInputs = [ hicolor-icon-theme ]; configureFlags = [ "--enable-maintainer-mode" ]; - src = fetchgit { - url = "git://git.xfce.org/${category}/${pname}"; + src = fetchFromGitLab { + domain = "gitlab.xfce.org"; + owner = category; + repo = pname; inherit rev sha256; }; @@ -41,11 +43,11 @@ let passthru.updateScript = xfce.updateScript { inherit pname version attrPath rev-prefix odd-unstable patchlevel-unstable; - versionLister = xfce.gitLister src.url; + versionLister = xfce.gitLister src.meta.homepage; }; meta = with stdenv.lib; { - homepage = "https://git.xfce.org/${category}/${pname}/about"; + homepage = "https://gitlab.xfce.org/${category}/${pname}/about"; license = licenses.gpl2; # some libraries are under LGPLv2+ platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix index affc957c51..fcd40462f6 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix @@ -1,29 +1,36 @@ -{ stdenv, pkgconfig, fetchFromGitHub, python2, vala_0_40 -, gtk2, libwnck, libxfce4util, xfce4-panel, wafHook }: +{ stdenv, pkgconfig, fetchFromGitHub, python2, vala_0_46 +, gtk3, libwnck3, libxfce4util, xfce4-panel, wafHook, xfce }: stdenv.mkDerivation rec { - ver = "0.3.1"; - rev = "07a23b3"; - name = "xfce4-namebar-plugin-${ver}"; + pname = "xfce4-namebar-plugin"; + version = "1.0.0"; src = fetchFromGitHub { - owner = "TiZ-EX1"; - repo = "xfce4-namebar-plugin"; - rev = rev; - sha256 = "1sl4qmjywfvv53ch7hyfysjfd91zl38y7gdw2y3k69vkzd3h18ad"; + owner = "HugLifeTiZ"; + repo = pname; + rev = "v${version}"; + sha256 = "0l70f6mzkscsj4wr43wp5c0l2qnf85vj24cv02bjrh3bzz6wkak8"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; - buildInputs = [ python2 vala_0_40 gtk2 libwnck libxfce4util xfce4-panel ]; + nativeBuildInputs = [ pkgconfig vala_0_46 wafHook ]; + buildInputs = [ gtk3 libwnck3 libxfce4util xfce4-panel ]; postPatch = '' - substituteInPlace src/preferences.vala --replace 'Environment.get_system_data_dirs()' "{ \"$out/share\" }" - substituteInPlace src/namebar.vala --replace 'Environment.get_system_data_dirs()' "{ \"$out/share\" }" + for f in src/preferences.vala src/namebar.vala; do + substituteInPlace $f --replace 'var dirs = Environment.get_system_data_dirs()' "string[] dirs = { \"$out/share\" }" + done ''; + passthru.updateScript = xfce.updateScript { + inherit pname version; + attrPath = "xfce.${pname}"; + versionLister = xfce.gitLister src.meta.homepage; + rev-prefix = "v"; + }; + meta = with stdenv.lib; { - homepage = "https://github.com/TiZ-EX1/xfce4-namebar-plugin"; - description = "A plugins which integrates titlebar and window controls into the xfce4-panel"; + homepage = "https://github.com/HugLifeTiZ/xfce4-namebar-plugin"; + description = "Plugin which integrates titlebar and window controls into the xfce4-panel"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.volth ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix index ac9f22a9a0..ef269d64e0 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix @@ -5,6 +5,7 @@ mkXfceDerivation { pname = "xfce4-whiskermenu-plugin"; version = "2.4.6"; rev-prefix = "v"; + odd-unstable = false; sha256 = "03asfaxqbhawzb3870az7qgid5y7cg3ip8h6r4z8kavcd0b7x4ii"; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/crystal/build-package.nix b/third_party/nixpkgs/pkgs/development/compilers/crystal/build-package.nix index 856c6e58bc..bcac4eeb9c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/crystal/build-package.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/crystal/build-package.nix @@ -1,6 +1,7 @@ { stdenv, lib, crystal, shards, git, pkgconfig, which, linkFarm, fetchFromGitHub, installShellFiles }: -{ # Some projects do not include a lock file, so you can pass one +{ + # Some projects do not include a lock file, so you can pass one lockFile ? null # Generate shards.nix with `nix-shell -p crystal2nix --run crystal2nix` in the projects root , shardsFile ? null @@ -10,10 +11,11 @@ , installManPages ? true # Specify binaries to build in the form { foo.src = "src/foo.cr"; } # The default `crystal build` options can be overridden with { foo.options = [ "--no-debug" ]; } -, crystalBinaries ? { }, ... }@args: +, crystalBinaries ? { } +, ... +}@args: assert (builtins.elem format [ "make" "crystal" "shards" ]); - let mkDerivationArgs = builtins.removeAttrs args [ "format" @@ -23,22 +25,34 @@ let "crystalBinaries" ]; - crystalLib = linkFarm "crystal-lib" (lib.mapAttrsToList (name: value: { - inherit name; - path = fetchFromGitHub value; - }) (import shardsFile)); + crystalLib = linkFarm "crystal-lib" (lib.mapAttrsToList + (name: value: { + inherit name; + path = fetchFromGitHub value; + }) + (import shardsFile)); # we previously had --no-debug here but that is not recommended by upstream defaultOptions = [ "--release" "--progress" "--verbose" ]; buildDirectly = shardsFile == null || crystalBinaries != { }; -in stdenv.mkDerivation (mkDerivationArgs // { - configurePhase = args.configurePhase or lib.concatStringsSep "\n" ([ - "runHook preConfigure" - ] ++ lib.optional (lockFile != null) "ln -s ${lockFile} ./shard.lock" - ++ lib.optional (shardsFile != null) "ln -s ${crystalLib} lib" - ++ [ "runHook postConfigure "]); +in +stdenv.mkDerivation (mkDerivationArgs // { + + configurePhase = args.configurePhase or lib.concatStringsSep "\n" + ( + [ + "runHook preConfigure" + ] + ++ lib.optional (lockFile != null) "cp ${lockFile} ./shard.lock" + ++ lib.optionals (shardsFile != null) [ + "test -e lib || mkdir lib" + "for d in ${crystalLib}/*; do ln -s $d lib/; done" + "cp shard.lock lib/.shards.info" + ] + ++ [ "runHook postConfigure" ] + ); CRFLAGS = lib.concatStringsSep " " defaultOptions; @@ -53,24 +67,31 @@ in stdenv.mkDerivation (mkDerivationArgs // { "runHook preBuild" ] ++ lib.optional (format == "make") ''make ''${buildTargets:-build} $makeFlags'' - ++ lib.optionals (format == "crystal") (lib.mapAttrsToList (bin: attrs: '' - crystal ${lib.escapeShellArgs (["build" "-o" bin - (attrs.src or (throw "No source file for crystal binary ${bin} provided")) - ] ++ (attrs.options or defaultOptions))} - '') crystalBinaries) + ++ lib.optionals (format == "crystal") (lib.mapAttrsToList + (bin: attrs: '' + crystal ${lib.escapeShellArgs ([ + "build" + "-o" + bin + (attrs.src or (throw "No source file for crystal binary ${bin} provided")) + ] ++ (attrs.options or defaultOptions))} + '') + crystalBinaries) ++ lib.optional (format == "shards") - "shards build --local --production ${lib.concatStringsSep " " defaultOptions}" + "shards build --local --production ${lib.concatStringsSep " " defaultOptions}" ++ [ "runHook postBuild" ])); installPhase = args.installPhase or (lib.concatStringsSep "\n" ([ "runHook preInstall" ] ++ lib.optional (format == "make") ''make ''${installTargets:-install} $installFlags'' - ++ lib.optionals (format == "crystal") (map (bin: '' + ++ lib.optionals (format == "crystal") (map + (bin: '' install -Dm555 ${lib.escapeShellArgs [ bin "${placeholder "out"}/bin/${bin}" ]} - '') (lib.attrNames crystalBinaries)) + '') + (lib.attrNames crystalBinaries)) ++ lib.optional (format == "shards") - ''install -Dm555 bin/* -t $out/bin'' + ''install -Dm555 bin/* -t $out/bin'' ++ [ '' for f in README* *.md LICENSE; do @@ -78,9 +99,9 @@ in stdenv.mkDerivation (mkDerivationArgs // { done '' ] ++ (lib.optional installManPages '' - if [ -d man ]; then - installManPage man/*.? - fi + if [ -d man ]; then + installManPage man/*.? + fi '') ++ [ "runHook postInstall" ])); diff --git a/third_party/nixpkgs/pkgs/development/compilers/crystal/crystal2nix.cr b/third_party/nixpkgs/pkgs/development/compilers/crystal/crystal2nix.cr deleted file mode 100644 index 0610de5cfa..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/crystal/crystal2nix.cr +++ /dev/null @@ -1,42 +0,0 @@ -require "yaml" -require "json" - -class PrefetchJSON - JSON.mapping(sha256: String) -end - -class ShardLock - YAML.mapping( - version: Float32, - shards: Hash(String, Hash(String, String)) - ) -end - -File.open "shards.nix", "w+" do |file| - file.puts %({) - yaml = ShardLock.from_yaml(File.read("shard.lock")) - yaml.shards.each do |key, value| - owner, repo = value["github"].split("/") - url = "https://github.com/#{value["github"]}" - rev = if value["version"]? - "v#{value["version"]}" - else - value["commit"] - end - - sha256 = "" - args = ["--url", url, "--rev", rev] - Process.run("@nixPrefetchGit@", args: args) do |x| - x.error.each_line { |e| puts e } - sha256 = PrefetchJSON.from_json(x.output).sha256 - end - - file.puts %( #{key} = {) - file.puts %( owner = "#{owner}";) - file.puts %( repo = "#{repo}";) - file.puts %( rev = "#{rev}";) - file.puts %( sha256 = "#{sha256}";) - file.puts %( };) - end - file.puts %(}) -end diff --git a/third_party/nixpkgs/pkgs/development/compilers/crystal/crystal2nix.nix b/third_party/nixpkgs/pkgs/development/compilers/crystal/crystal2nix.nix deleted file mode 100644 index 5fc40cd237..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/crystal/crystal2nix.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, crystal, nix-prefetch-git }: - -crystal.buildCrystalPackage { - pname = "crystal2nix"; - version = "unstable-2018-07-31"; - - nixPrefetchGit = "${lib.getBin nix-prefetch-git}/bin/nix-prefetch-git"; - unpackPhase = "substituteAll ${./crystal2nix.cr} crystal2nix.cr"; - - format = "crystal"; - - crystalBinaries.crystal2nix.src = "crystal2nix.cr"; - - # it will blow up without a shard.yml file - doInstallCheck = false; - - meta = with lib; { - description = "Utility to convert Crystal's shard.lock files to a Nix file"; - license = licenses.mit; - maintainers = with maintainers; [ manveru ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/compilers/crystal2nix/default.nix b/third_party/nixpkgs/pkgs/development/compilers/crystal2nix/default.nix new file mode 100644 index 0000000000..25cbbd4d01 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/crystal2nix/default.nix @@ -0,0 +1,36 @@ +{ lib, fetchFromGitHub, fetchgit, crystal, makeWrapper, nix-prefetch-git }: + +crystal.buildCrystalPackage rec { + pname = "crystal2nix"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "peterhoeg"; + repo = "crystal2nix"; + rev = "v${version}"; + sha256 = "sha256-K1ElG8VC/D0axmSRaufH3cE50xNQisAmFucDkV+5O0s="; + }; + + format = "shards"; + + shardsFile = ./shards.nix; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/crystal2nix \ + --prefix PATH : ${lib.makeBinPath [ nix-prefetch-git ]} + ''; + + # temporarily off. We need the checks to execute the wrapped binary + doCheck = false; + + # it requires an internet connection when run + doInstallCheck = false; + + meta = with lib; { + description = "Utility to convert Crystal's shard.lock files to a Nix file"; + license = licenses.mit; + maintainers = with maintainers; [ manveru peterhoeg ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/crystal2nix/shards.nix b/third_party/nixpkgs/pkgs/development/compilers/crystal2nix/shards.nix new file mode 100644 index 0000000000..abfc0f9307 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/crystal2nix/shards.nix @@ -0,0 +1,14 @@ +{ + json_mapping = { + owner = "crystal-lang"; + repo = "json_mapping.cr"; + rev = "v0.1.0"; + sha256 = "1qq5vs2085x7cwmp96rrjns0yz9kiz1lycxynfbz5psxll6b8p55"; + }; + yaml_mapping = { + owner = "crystal-lang"; + repo = "yaml_mapping.cr"; + rev = "v0.1.0"; + sha256 = "02spz1521g59ar6rp0znnr01di766kknbjxjnygs39yn0cmpzqc1"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/10/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/10/default.nix new file mode 100644 index 0000000000..b300a190e1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/10/default.nix @@ -0,0 +1,53 @@ +{ stdenv +, fetchurl +, ncurses5 +, python27 +}: + +stdenv.mkDerivation rec { + pname = "gcc-arm-embedded"; + version = "10-2020-q4-major"; + subdir = "10-2020q4"; + + suffix = { + aarch64-linux = "aarch64-linux"; + x86_64-darwin = "mac"; + x86_64-linux = "x86_64-linux"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + src = fetchurl { + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${suffix}.tar.bz2"; + sha256 = { + aarch64-linux = "0spkbh7vnda1w0nvavk342nb24nqxn8kln3k9j85mzil560qqg9l"; + x86_64-darwin = "1h5xn0npwkilqxg7ifrymsl7kjpafr9r9gjqgcpb0kjxavijvldy"; + x86_64-linux = "066nvhg5zdf3jvy9w23y439ghf1hvbicdyrrw9957gwb8ym4q4r1"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + }; + + dontConfigure = true; + dontBuild = true; + dontPatchELF = true; + dontStrip = true; + + installPhase = '' + mkdir -p $out + cp -r * $out + ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man + ''; + + preFixup = '' + find $out -type f | while read f; do + patchelf "$f" > /dev/null 2>&1 || continue + patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true + patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true + done + ''; + + meta = with stdenv.lib; { + description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; + homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; + license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; + maintainers = with maintainers; [ prusnak ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/6/default.nix index f635fce972..7d8a4b5b14 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/6/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/6/default.nix @@ -22,7 +22,10 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + dontConfigure = true; + dontBuild = true; + dontPatchELF = true; + dontStrip = true; installPhase = '' mkdir -p $out @@ -30,12 +33,9 @@ stdenv.mkDerivation rec { ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man ''; - dontPatchELF = true; - dontStrip = true; - preFixup = '' find $out -type f | while read f; do - patchelf $f > /dev/null 2>&1 || continue + patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true done diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/7/default.nix index 4944038fde..633ae054d0 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/7/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/7/default.nix @@ -22,7 +22,10 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + dontConfigure = true; + dontBuild = true; + dontPatchELF = true; + dontStrip = true; installPhase = '' mkdir -p $out @@ -30,12 +33,9 @@ stdenv.mkDerivation rec { ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man ''; - dontPatchELF = true; - dontStrip = true; - preFixup = '' find $out -type f | while read f; do - patchelf $f > /dev/null 2>&1 || continue + patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true done diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/8/default.nix index 510889dad6..99ec9d1b54 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/8/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/8/default.nix @@ -22,7 +22,10 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + dontConfigure = true; + dontBuild = true; + dontPatchELF = true; + dontStrip = true; installPhase = '' mkdir -p $out @@ -30,12 +33,9 @@ stdenv.mkDerivation rec { ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man ''; - dontPatchELF = true; - dontStrip = true; - preFixup = '' find $out -type f | while read f; do - patchelf $f > /dev/null 2>&1 || continue + patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true done diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/9/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/9/default.nix index 98b126e85f..c4c1ebc1d8 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/9/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/9/default.nix @@ -24,7 +24,10 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + dontConfigure = true; + dontBuild = true; + dontPatchELF = true; + dontStrip = true; installPhase = '' mkdir -p $out @@ -32,12 +35,9 @@ stdenv.mkDerivation rec { ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man ''; - dontPatchELF = true; - dontStrip = true; - preFixup = '' find $out -type f | while read f; do - patchelf $f > /dev/null 2>&1 || continue + patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true done diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/default.nix index 7e79ff8f11..5c09489398 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/default.nix @@ -14,6 +14,19 @@ let }; in rec { + lua5_4 = callPackage ./interpreter.nix { + sourceVersion = { major = "5"; minor = "4"; patch = "2"; }; + hash = "0ksj5zpj74n0jkamy3di1p6l10v4gjnd2zjnb453qc6px6bhsmqi"; + patches = [ + # build lua as a shared library as well, MIT-licensed from + # https://github.com/archlinux/svntogit-packages/tree/packages/lua/trunk + ./liblua.so.patch + ]; + }; + + lua5_4_compat = lua5_4.override({ + compat = true; + }); lua5_3 = callPackage ./interpreter.nix { sourceVersion = { major = "5"; minor = "3"; patch = "5"; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/liblua.so.patch b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/liblua.so.patch new file mode 100644 index 0000000000..197832116c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/liblua.so.patch @@ -0,0 +1,60 @@ +diff --git a/Makefile b/Makefile +index 416f444..eeaff03 100644 +--- a/Makefile ++++ b/Makefile +@@ -52,7 +52,7 @@ R= $V.0 + all: $(PLAT) + + $(PLATS) help test clean: +- @cd src && $(MAKE) $@ ++ @cd src && $(MAKE) $@ V=$(V) R=$(R) + + install: dummy + cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) +diff --git a/src/Makefile b/src/Makefile +index 514593d..372a6dc 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -33,6 +33,7 @@ CMCFLAGS= -Os + PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris + + LUA_A= liblua.a ++LUA_SO= liblua.so + CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o + LIB_O= lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o + BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS) +@@ -44,7 +45,7 @@ LUAC_T= luac + LUAC_O= luac.o + + ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) +-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) ++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) + ALL_A= $(LUA_A) + + # Targets start here. +@@ -60,6 +61,12 @@ $(LUA_A): $(BASE_O) + $(AR) $@ $(BASE_O) + $(RANLIB) $@ + ++$(LUA_SO): $(CORE_O) $(LIB_O) ++ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO) ++ ++ + $(LUA_T): $(LUA_O) $(LUA_A) + $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) + +diff --git a/src/luaconf.h b/src/luaconf.h +index bdf927e..7e15198 100644 +--- a/src/luaconf.h ++++ b/src/luaconf.h +@@ -227,7 +227,7 @@ + + #else /* }{ */ + +-#define LUA_ROOT "/usr/local/" ++#define LUA_ROOT "/usr/" + #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/" + #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/" + diff --git a/third_party/nixpkgs/pkgs/development/libraries/CGAL/default.nix b/third_party/nixpkgs/pkgs/development/libraries/CGAL/default.nix index 1979bdf5df..ca35034898 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/CGAL/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/CGAL/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cgal"; - version = "5.1.1"; + version = "5.2"; src = fetchFromGitHub { owner = "CGAL"; repo = "releases"; rev = "CGAL-${version}"; - sha256 = "1h4kj37zh60zap1gvpkvcl1b1lbdvav959gd59pq2c33i0ziagf6"; + sha256 = "1+ov1fu79MXoW0D8odInMZPFMYg69st//PoMW42oXpA="; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; diff --git a/third_party/nixpkgs/pkgs/development/libraries/KQuickImageEdit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/KQuickImageEdit/default.nix deleted file mode 100644 index a62bf54df6..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/KQuickImageEdit/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv -, fetchFromGitLab -, extra-cmake-modules -, qtbase -, qtquickcontrols2 -}: - -stdenv.mkDerivation rec { - pname = "KQuickImageEditor"; - version = "0.1"; - - src = fetchFromGitLab { - domain = "invent.kde.org"; - owner = "libraries"; - repo = pname; - rev = version; - sha256 = "0krx9bq6nfmpjjangis8gaz8rx3z35f6m3cpsrcfdwpgpm22fqll"; - }; - - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtbase qtquickcontrols2 ]; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/a52dec/default.nix b/third_party/nixpkgs/pkgs/development/libraries/a52dec/default.nix index 8ed47b91e5..7cbb369940 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/a52dec/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/a52dec/default.nix @@ -1,11 +1,12 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "a52dec-0.7.4p4"; + pname = "a52dec"; + version = "0.7.4"; src = fetchurl { - url = "${meta.homepage}/files/a52dec-0.7.4.tar.gz"; - sha256 = "0czccp4fcpf2ykp16xcrzdfmnircz1ynhls334q374xknd5747d2"; + url = "${meta.homepage}/files/${pname}-${version}.tar.gz"; + sha256 = "oh1ySrOzkzMwGUNTaH34LEdbXfuZdRPu9MJd5shl7DM="; }; configureFlags = [ @@ -18,10 +19,10 @@ stdenv.mkDerivation rec { # but it's better to disable tests than loose ASLR on i686 doCheck = !stdenv.isi686; - meta = { + meta = with stdenv.lib; { description = "ATSC A/52 stream decoder"; - homepage = "http://liba52.sourceforge.net/"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.gpl2; + homepage = "https://liba52.sourceforge.net/"; + platforms = platforms.unix; + license = licenses.gpl2Plus; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/bcg729/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bcg729/default.nix index 4363948e83..f178c192de 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bcg729/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/bcg729/default.nix @@ -1,42 +1,28 @@ { stdenv -, fetchFromGitHub -, fetchpatch +, fetchFromGitLab , cmake }: stdenv.mkDerivation rec { pname = "bcg729"; - version = "1.0.4"; + version = "1.1.1"; - src = fetchFromGitHub { - owner = "BelledonneCommunications"; + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + owner = "public"; + group = "BC"; repo = pname; rev = version; - sha256 = "05s0c5ps3a763y0v34wg5zghj0cdjnq4ch7g81848xxry7q90fwa"; + sha256 = "1hal6b3w6f8y5r1wa0xzj8sj2jjndypaxyw62q50p63garp2h739"; }; - patches = [ - (fetchpatch { - url = "https://github.com/BelledonneCommunications/bcg729/commit/a5907daf1b111e4ad7aab4f558f57e2af1e37e55.patch"; - sha256 = "0445syfwj4w4chh8ak80rq77iqcr27924n1ld5snshk3d21nxd64"; - }) - (fetchpatch { - url = "https://github.com/BelledonneCommunications/bcg729/commit/697bf6653a8c7421f0e821ee8d42471246e6850f.patch"; - sha256 = "1h3gf5sj2sg5cs5iv1lcav3lkqmd5jf4agvjzz83l89wd5f5hp5l"; - }) - (fetchpatch { - url = "https://github.com/BelledonneCommunications/bcg729/commit/d63ce04a93711820d9a6985b1d11d8d91ed8e6b6.patch"; - sha256 = "1piwf63ci2gma6jd6b4adkvxirysvazf0vklb5pc6vx1g93nkgxs"; - }) - ]; - nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { description = "Opensource implementation of both encoder and decoder of the ITU G729 Annex A/B speech codec"; homepage = "https://linphone.org/technical-corner/bcg729"; changelog = "https://gitlab.linphone.org/BC/public/bcg729/raw/${version}/NEWS"; - license = licenses.gpl2Plus; + license = licenses.gpl3Plus; maintainers = with maintainers; [ c0bw3b ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix index 0f99484f5a..655d3a5808 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "4.4.13"; + version = "4.4.21"; nativeBuildInputs = [ cmake bcunit ]; buildInputs = [ mbedtls ]; @@ -30,9 +30,7 @@ stdenv.mkDerivation rec { inherit version; description = "Utilities library for Linphone"; homepage = "https://gitlab.linphone.org/BC/public/bctoolbox"; - # Still using GPLv2 but as the rest of the Linphone projects have switched - # to GPLv3, this might too, so check this when bumping the version number. - license = licenses.gpl3Only; + license = licenses.gpl3Plus; maintainers = with maintainers; [ raskin jluttine ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/belcard/default.nix b/third_party/nixpkgs/pkgs/development/libraries/belcard/default.nix index ae9b1e6e43..35de9fb934 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/belcard/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/belcard/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ library to manipulate VCard standard format"; homepage = "https://gitlab.linphone.org/BC/public/belcard"; - license = licenses.lgpl21; + license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ jluttine ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/belle-sip/default.nix b/third_party/nixpkgs/pkgs/development/libraries/belle-sip/default.nix index 788e656301..8a028b5e0a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/belle-sip/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/belle-sip/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "belle-sip"; - version = "4.4.13"; + version = "4.4.21"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1ad7sqc5y4f3gc8glwmb3rvfzapnvhg981g13x90cg4nzikjvka0"; + sha256 = "0ylv1jsqnfhw23i6p3lfqqzw48lwii8zwkq3y34q0hhnngn26iiw"; }; - nativeBuildInputs = [ cmake antlr3_4 ]; + nativeBuildInputs = [ antlr3_4 cmake ]; buildInputs = [ zlib ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://linphone.org/technical-corner/belle-sip"; description = "Modern library implementing SIP (RFC 3261) transport, transaction and dialog layers"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ jluttine ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/belr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/belr/default.nix index 546949d9f2..ab3df9bae7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/belr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/belr/default.nix @@ -6,17 +6,15 @@ stdenv.mkDerivation rec { pname = "belr"; - # Using master branch for linphone-desktop caused a chain reaction that many - # of its dependencies needed to use master branch too. - version = "unstable-2020-03-09"; + version = "4.3.2"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; owner = "public"; group = "BC"; repo = pname; - rev = "326d030ca9db12525c2a6d2a65f386f36f3c2ed5"; - sha256 = "1cdblb9smncq3al0crqp5651b02k1g6whlw1ib769p61gad0rs3v"; + rev = version; + sha256 = "1lda0f89vas38xgmc4yvnrigmrbril3dyqxgb5jh1zfx1xczfh1q"; }; buildInputs = [ bctoolbox ]; @@ -28,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Belledonne Communications' language recognition library"; homepage = "https://gitlab.linphone.org/BC/public/belr"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ jluttine ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/bzrtp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bzrtp/default.nix index 4fe53a5d62..3eb9954924 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bzrtp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/bzrtp/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bzrtp"; - version = "4.4.0"; + version = "4.4.9"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -29,9 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An opensource implementation of ZRTP keys exchange protocol"; homepage = "https://gitlab.linphone.org/BC/public/bzrtp"; - # They have switched to GPLv3 on git HEAD so probably the next release will - # be GPL3. - license = licenses.lgpl21; + license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ jluttine ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/flite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/flite/default.nix index f9e4720f64..1db8a9fbe2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/flite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/flite/default.nix @@ -1,28 +1,28 @@ { stdenv, fetchFromGitHub, alsaLib }: -stdenv.mkDerivation { - name = "flite-2.1.0"; +stdenv.mkDerivation rec { + pname = "flite"; + version = "2.2"; src = fetchFromGitHub { - owner = "festvox"; - repo = "flite"; - rev = "d673f65b2c4a8cd3da7447079309a6dc4bcf1a5e"; - sha256 = "1kx43jvdln370590gfjhxxz3chxfi6kq18504wmdpljib2l0grjq"; + owner = "festvox"; + repo = "flite"; + rev = "v${version}"; + sha256 = "1n0p81jzndzc1rzgm66kw9ls189ricy5v1ps11y0p2fk1p56kbjf"; }; - buildInputs = [ alsaLib ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ alsaLib ]; configureFlags = [ "--enable-shared" - "--with-audio=alsa" - ]; + ] ++ stdenv.lib.optionals stdenv.isLinux [ "--with-audio=alsa" ]; enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "A small, fast run-time speech synthesis engine"; homepage = "http://www.festvox.org/flite/"; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsdOriginal; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix index ada25e10d5..153e41a777 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "20.4.3"; + version = "20.4.5"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "04a0hcw9f8fr96xpc1inc19mncssqzxmjba9cdvvh71n8j7n3yyw"; + sha256 = "149xkhhp8q06c1jzxjs24lnbfrlvf19m0hcwld593vv4arfpbpmf"; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/kquickimageedit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kquickimageedit/default.nix new file mode 100644 index 0000000000..f7cac0c037 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/kquickimageedit/default.nix @@ -0,0 +1,19 @@ +{ mkDerivation +, fetchFromGitLab +, extra-cmake-modules +}: + +mkDerivation rec { + pname = "kquickimageeditor"; + version = "0.1.2"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "libraries"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-4X3GO/NPzA3c9KiGIkznLHUjLfNNNnPXif7IFwY5dOM="; + }; + + nativeBuildInputs = [ extra-cmake-modules ]; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix index 21f9833a5d..7d7f035f77 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://www.linphone.org/technical-corner/liblinphone"; description = "Library for SIP calls and instant messaging"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ jluttine ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmesode/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmesode/default.nix index 90016b09c7..54ff0dccb9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmesode/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmesode/default.nix @@ -1,32 +1,32 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, libtool, openssl, expat, pkgconfig, check }: +{ stdenv +, fetchFromGitHub +, autoreconfHook +, libtool +, openssl +, expat +, pkg-config +, check +}: stdenv.mkDerivation rec { pname = "libmesode"; - version = "0.9.3"; + version = "0.10.1"; src = fetchFromGitHub { - owner = "boothj5"; + owner = "profanity-im"; repo = "libmesode"; rev = version; - sha256 = "0xzfg1xx88cn36352nnjlb1p7xyw32yqkhjzq10px88iaaqz1vv0"; + sha256 = "1bxnkhrypgv41qyy1n545kcggmlw1hvxnhwihijhhcf2pxd2s654"; }; - patches = [ - (fetchpatch { - name = "fix-ssl-certificate-verification.diff"; - url = "https://github.com/profanity-im/libmesode/commit/532ed1e9d3e71e5bea0752e03dbacd4139d750d1.diff"; - sha256 = "140jp7xzskik0sb6aqjsw7z477a124cxl7dkm80m2nyzjng4pzg5"; - }) - ]; - - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ openssl expat libtool check ]; dontDisableStatic = true; doCheck = true; - meta = { + meta = with stdenv.lib; { description = "Fork of libstrophe (https://github.com/strophe/libstrophe) for use with Profanity XMPP Client"; longDescription = '' Reasons for forking: @@ -39,9 +39,10 @@ stdenv.mkDerivation rec { Whilst Profanity will run against libstrophe, libmesode provides extra TLS functionality such as manual SSL certificate verification. ''; - homepage = "https://github.com/boothj5/libmesode/"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.devhell ]; + homepage = "https://github.com/profanity-im/libmesode/"; + license = with licenses; [ gpl3Only mit]; + platforms = platforms.unix; + broken = stdenv.isDarwin; + maintainers = with maintainers; [ devhell ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix index bbe0b61455..664b8d1a7e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libraspberrypi/default.nix @@ -1,25 +1,40 @@ -{ stdenv, cmake, fetchFromGitHub }: +{ stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, pkg-config +}: stdenv.mkDerivation rec { - name = "libraspberrypi"; - version = "2020-05-28"; + pname = "libraspberrypi"; + version = "unstable-2020-11-30"; + src = fetchFromGitHub { owner = "raspberrypi"; repo = "userland"; - rev = "f97b1af1b3e653f9da2c1a3643479bfd469e3b74"; - sha256 = "1r7n05rv96hqjq0rn0qzchmfqs0j7vh3p8jalgh66s6l0vms5mwy"; + rev = "093b30bbc2fd083d68cc3ee07e6e555c6e592d11"; + sha256 = "0n2psqyxlsic9cc5s8h65g0blblw3xws4czhpbbgjm58px3822d7"; }; - cmakeFlags = if (stdenv.targetPlatform.system == "aarch64-linux") - then "-DARM64=ON" - else "-DARM64=OFF"; - preConfigure = ''cmakeFlags="$cmakeFlags -DVMCS_INSTALL_PREFIX=$out"''; - nativeBuildInputs = [ cmake ]; + patches = [ + (fetchpatch { + # https://github.com/raspberrypi/userland/pull/670 + url = "https://github.com/raspberrypi/userland/pull/670/commits/37cb44f314ab1209fe2a0a2449ef78893b1e5f62.patch"; + sha256 = "1fbrbkpc4cc010ji8z4ll63g17n6jl67kdy62m74bhlxn72gg9rw"; + }) + ]; + + nativeBuildInputs = [ cmake pkg-config ]; + cmakeFlags = [ + (if (stdenv.hostPlatform.isAarch64) then "-DARM64=ON" else "-DARM64=OFF") + "-DVMCS_INSTALL_PREFIX=${placeholder "out"}" + ]; + meta = with stdenv.lib; { - description = "Userland libraries for interfacing with Raspberry Pi hardware"; + description = "Userland tools & libraries for interfacing with Raspberry Pi hardware"; homepage = "https://github.com/raspberrypi/userland"; license = licenses.bsd3; - platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ tkerber ]; + platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ dezgeg tavyc tkerber ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/oatpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/oatpp/default.nix new file mode 100644 index 0000000000..38c0217076 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/oatpp/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "oatpp"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "oatpp"; + repo = "oatpp"; + rev = version; + sha256 = "05rm0m5zf1b5ky8prf6yni2074bz6yjjbrc2qk96fb48fc1198gw"; + }; + + nativeBuildInputs = [ cmake ]; + + # Tests fail on darwin. See https://github.com/NixOS/nixpkgs/pull/105419#issuecomment-735826894 + doCheck = !stdenv.isDarwin; + + meta = with stdenv.lib; { + homepage = "https://oatpp.io/"; + description = "Light and powerful C++ web framework for highly scalable and resource-efficient web applications"; + license = licenses.asl20; + maintainers = [ maintainers.ivar ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/ortp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ortp/default.nix index f84f3ab1d8..ecd1549843 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ortp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ortp/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Real-Time Transport Protocol (RFC3550) stack"; homepage = "https://linphone.org/technical-corner/ortp"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ jluttine ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix index 12def74736..e9c5301aac 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "1.1"; src = fetchFromGitHub { - owner = "rhdunn"; + owner = "espeak-ng"; repo = "pcaudiolib"; rev = version; sha256 = "0c55hlqqh0m7bcb3nlgv1s4a22s5bgczr1cakjh3767rjb10khi0"; @@ -16,15 +16,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake which libtool pkgconfig ]; - buildInputs = [ portaudio alsaLib ] ++ lib.optional pulseaudioSupport libpulseaudio; + buildInputs = [ portaudio ] + ++ lib.optionals stdenv.isLinux [ alsaLib ] + ++ lib.optionals pulseaudioSupport [ libpulseaudio ]; preConfigure = "./autogen.sh"; meta = with stdenv.lib; { description = "Provides a C API to different audio devices"; - homepage = "https://github.com/rhdunn/pcaudiolib"; + homepage = "https://github.com/espeak-ng/pcaudiolib"; license = licenses.gpl3; maintainers = with maintainers; [ aske ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix index 2120c69385..a5c96dc351 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum-qt4"; - version = "0.15.3"; + version = "0.16.0"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "0jq3y63c36nr2rprg7im9ik112p5zvhj46vzgxfbnpvskmg0cchm"; + sha256 = "05ihjslnv7rrp4giwvvyaiig0dpfmw3jijfaadzax8jhbyscmxsq"; }; nativeBuildInputs = [ qmake4Hook ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sonic/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sonic/default.nix index 41b88b7f31..fc45e220a5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sonic/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sonic/default.nix @@ -1,27 +1,33 @@ -{ stdenv, fetchFromGitHub, fftw }: +{ stdenv, fetchFromGitHub, fftw, installShellFiles }: stdenv.mkDerivation { - pname = "sonic"; - version = "2018-07-06"; + pname = "sonic-unstable"; + version = "2020-12-27"; src = fetchFromGitHub { owner = "waywardgeek"; repo = "sonic"; - rev = "71c51195de71627d7443d05378c680ba756545e8"; - sha256 = "1z9qdk3pk507hdg39v2z1hanlw2wv7mhn8br4cb8qry9z9qwi87i"; + rev = "4a052d9774387a9d9b4af627f6a74e1694419960"; + sha256 = "0ah54nizb6iwcx277w104wsfnx05vrp4sh56d2pfxhf8xghg54m6"; }; - postPatch = '' - sed -i "s,^PREFIX=.*,PREFIX=$out," Makefile - ''; + makeFlags = [ "PREFIX=${placeholder "out"}" "CC=cc" ]; + + nativeBuildInputs = [ installShellFiles ]; buildInputs = [ fftw ]; + postInstall = '' + installManPage sonic.1 + '' + stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -id $out/lib/libsonic.so.0.3.0 $out/lib/libsonic.so.0.3.0 + ''; + meta = with stdenv.lib; { description = "Simple library to speed up or slow down speech"; homepage = "https://github.com/waywardgeek/sonic"; license = licenses.asl20; maintainers = with maintainers; [ aske ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/stellarsolver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/stellarsolver/default.nix new file mode 100644 index 0000000000..6941729961 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/stellarsolver/default.nix @@ -0,0 +1,30 @@ +{ stdenv, mkDerivation, fetchFromGitHub, cmake, + qtbase, cfitsio, gsl, wcslib, withTester ? false }: + +mkDerivation rec { + pname = "stellarsolver"; + version = "1.5"; + + src = fetchFromGitHub { + owner = "rlancaste"; + repo = pname; + rev = version; + sha256 = "12j20j9qbkkx55ix4nm1iw7wd36hamkpidbwhcnmj4yk5fqlyq4y"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ qtbase cfitsio gsl wcslib ]; + + cmakeFlags = [ + "-DBUILD_TESTER=${if withTester then "on" else "off"}" + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/rlancaste/stellarsolver"; + description = "Astrometric plate solving library"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ hjones2199 ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/utf8cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/utf8cpp/default.nix index a2aac1241c..ef02ca2c31 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/utf8cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/utf8cpp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "utf8cpp"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "nemtrif"; repo = "utfcpp"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1s2pda75488z7c3w3a6qv31bj239248696yk5j2a1drbg2x1dpfh"; + sha256 = "sha256-l5sneFsuvPDIRni2x+aR9fmQ9bzXNnIiP9EzZ63sNtg="; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/misc/rpiboot/unstable.nix b/third_party/nixpkgs/pkgs/development/misc/rpiboot/unstable.nix index a8f7e4795e..f12f5a845f 100644 --- a/third_party/nixpkgs/pkgs/development/misc/rpiboot/unstable.nix +++ b/third_party/nixpkgs/pkgs/development/misc/rpiboot/unstable.nix @@ -1,16 +1,14 @@ { stdenv, fetchFromGitHub, libusb1 }: -let - version = "2020-05-11"; - name = "rpiboot-unstable-${version}"; -in stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation { + pname = "rpiboot"; + version = "unstable-2020-10-20"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "usbboot"; - rev = "c650cd747c1d0597487dcf319bf95b5ba775d78b"; - sha256 = "17kapny79dh05vfmrniqdvz6xhpwnqnw0511ycfx4qcjh4krxh8n"; + rev = "d3760e119385a179765f43a50a8e051a44127c25"; + sha256 = "0vygzh2h27xplqp1x4isj6kgrgmvmvc1mr3ghmsi98kzp91w772r"; }; nativeBuildInputs = [ libusb1 ]; @@ -26,11 +24,11 @@ in stdenv.mkDerivation { cp -r msd $out/share/rpiboot ''; - meta = { + meta = with stdenv.lib; { homepage = "https://github.com/raspberrypi/usbboot"; description = "Utility to boot a Raspberry Pi CM/CM3/Zero over USB"; - maintainers = [ stdenv.lib.maintainers.cartr ]; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + license = licenses.asl20; + maintainers = with maintainers; [ cartr ]; + platforms = [ "aarch64-linux" "armv7l-linux" "armv6l-linux" "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/camlzip/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/camlzip/default.nix index 7de8968e06..1e6e0e8f8f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/camlzip/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/camlzip/default.nix @@ -4,30 +4,36 @@ let param = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "1.07"; - url = "https://github.com/xavierleroy/camlzip/archive/rel107.tar.gz"; - sha256 = "1pdz3zyiczm6c46zfgag2frwq3ljlq044p3a2y4wm2wb4pgz8k9g"; + version = "1.10"; + url = "https://github.com/xavierleroy/camlzip/archive/rel110.tar.gz"; + sha256 = "X0YcczaQ3lFeJEiTIgjSSZ1zi32KFMtmZsP0FFpyfbI="; patches = []; - installTargets = [ "install-findlib" ]; + postPatchInit = '' + cp META-zip META-camlzip + echo 'directory="../zip"' >> META-camlzip + ''; } else { version = "1.05"; download_id = "1037"; url = "http://forge.ocamlcore.org/frs/download.php/${param.download_id}/camlzip-${param.version}.tar.gz"; sha256 = "930b70c736ab5a7ed1b05220102310a0a2241564786657abe418e834a538d06b"; patches = [./makefile_1_05.patch]; - installTargets = [ "install" ]; + postPatchInit = '' + substitute ${./META} META --subst-var-by VERSION "${param.version}" + ''; }; in stdenv.mkDerivation { - name = "camlzip-${param.version}"; + pname = "camlzip"; + version = param.version; src = fetchurl { inherit (param) url; inherit (param) sha256; }; - buildInputs = [ocaml findlib]; + buildInputs = [ ocaml findlib ]; propagatedBuildInputs = [zlib]; @@ -35,8 +41,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; - postPatch = '' - substitute ${./META} META --subst-var-by VERSION "${param.version}" + postPatch = param.postPatchInit + '' substituteInPlace Makefile \ --subst-var-by ZLIB_LIBDIR "${zlib.out}/lib" \ --subst-var-by ZLIB_INCLUDE "${zlib.dev}/include" @@ -44,13 +49,11 @@ stdenv.mkDerivation { buildFlags = [ "all" "allopt" ]; - inherit (param) installTargets; - postInstall = '' ln -s $out/lib/ocaml/${ocaml.version}/site-lib/{,caml}zip ''; - meta = { + meta = with stdenv.lib; { homepage = "http://cristal.inria.fr/~xleroy/software.html#camlzip"; description = "A library for handling ZIP and GZIP files in OCaml"; longDescription = '' @@ -60,8 +63,6 @@ stdenv.mkDerivation { ''; license = "LGPL+linking exceptions"; platforms = ocaml.meta.platforms or []; - maintainers = [ - stdenv.lib.maintainers.maggesi - ]; + maintainers = with maintainers; [ maggesi ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix index 44b769636c..dc990325bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "2.4.2"; + version = "2.5.0"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "1c4a697d05a5e3d8d16ea18526115e84d8f015ba4c8b721a0d84062b6b244ef4"; + sha256 = "0b65e2af73a2e39a271bd627abbe4f7e4b0345486ed403e65987d79c72fcb70b"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix index 29445c6d79..f259ea6a78 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.16.43"; # N.B: if you change this, change botocore too + version = "1.16.44"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "sha256-pJs6tL+i9jlLpgFlz8RoQQeX3UEPMu7UfiL2FFHumG4="; + sha256 = "sha256-4/EO1tnKmEFf3sFcheUKiew41iKbzj+v1eeWWxbE68U="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix index e687718aa4..6966693830 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.19.43"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.19.44"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-c5jJANvU49YWRyaSFTluo+gIL0lPPntl2basoEnB1GM="; + sha256 = "sha256-dyXgjJWulsTb2VXLSuRKDAbT5B92p/6wqUHCekTGMRM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gpy/default.nix index dbc5791ac3..e4a20bc83d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gpy/default.nix @@ -1,5 +1,14 @@ -{ stdenv, buildPythonPackage, fetchPypi -, numpy, scipy, six, paramz, nose, matplotlib, cython }: +{ stdenv +, buildPythonPackage +, fetchPypi +, numpy +, scipy +, six +, paramz +, matplotlib +, cython +, nose +}: buildPythonPackage rec { pname = "GPy"; @@ -10,21 +19,35 @@ buildPythonPackage rec { sha256 = "04faf0c24eacc4dea60727c50a48a07ddf9b5751a3b73c382105e2a31657c7ed"; }; - # running tests produces "ImportError: cannot import name 'linalg_cython'" - # even though Cython has run - checkPhase = "nosetests -d"; - doCheck = false; - + buildInputs = [ cython ]; + propagatedBuildInputs = [ numpy scipy six paramz matplotlib ]; checkInputs = [ nose ]; - buildInputs = [ cython ]; + # $ nosetests GPy/testing/*.py + # => Ran 483 tests in 112.146s (on 8 cores) + # So instead, run shorter set of tests + checkPhase = '' + nosetests GPy/testing/linalg_test.py + ''; - propagatedBuildInputs = [ numpy scipy six paramz matplotlib ]; + # Rebuild cython-generated .c files since the included + # ones were built with an older version of cython that is + # incompatible with python3.9 + preBuild = '' + for fn in $(find . -name '*.pyx'); do + echo $fn | sed 's/\.\.pyx$/\.c/' | xargs ${cython}/bin/cython -3 + done + ''; + + pythonImportsCheck = [ + "GPy" + ]; meta = with stdenv.lib; { description = "Gaussian process framework in Python"; homepage = "https://sheffieldml.github.io/GPy"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; + broken = stdenv.isDarwin; # See inscrutable error message here: https://github.com/NixOS/nixpkgs/pull/107653#issuecomment-751527547 }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix index 2e751c6f48..85ceaf304c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix @@ -1,16 +1,22 @@ -{ stdenv, fetchPypi, buildPythonPackage, typed-ast, psutil, isPy3k +{ stdenv, fetchFromGitHub, buildPythonPackage, typed-ast, psutil, isPy3k , mypy-extensions , typing-extensions +, fetchpatch }: - buildPythonPackage rec { pname = "mypy"; version = "0.790"; disabled = !isPy3k; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-KyG6Ra2e8uLriM5K6t0BEtD1AmQYMkF2/UlKaCS3SXU="; + # Fetch 0.790 from GitHub temporarily because mypyc.analysis is missing from + # the Pip package (see also https://github.com/python/mypy/issues/9584). It + # should be possible to move back to Pypi for the next release. + src = fetchFromGitHub { + owner = "python"; + repo = pname; + rev = "v${version}"; + sha256 = "0zq3lpdf9hphcklk40wz444h8w3dkhwa12mqba5j9lmg11klnhz7"; + fetchSubmodules = true; }; propagatedBuildInputs = [ typed-ast psutil mypy-extensions typing-extensions ]; @@ -24,8 +30,31 @@ buildPythonPackage rec { "mypy.api" "mypy.fastparse" "mypy.report" + "mypyc" + "mypyc.analysis" ]; + # These three patches are required to make compilation with mypyc work for + # 0.790, see also https://github.com/python/mypy/issues/9584. + patches = [ + (fetchpatch { + url = "https://github.com/python/mypy/commit/f6522ae646a8d87ce10549f29fcf961dc014f154.patch"; + sha256 = "0d3jp4d0b7vdc0prk07grhajsy7x3wcynn2xysnszawiww93bfrh"; + }) + (fetchpatch { + url = "https://github.com/python/mypy/commit/acd603496237a78b109ca9d89991539633cbbb99.patch"; + sha256 = "0ry1rxpz2ws7zzrmq09pra9dlzxb84zhs8kxwf5xii1k1bgmrljr"; + }) + (fetchpatch { + url = "https://github.com/python/mypy/commit/81818b23b5d53f31caf3515d6f0b54e3c018d790.patch"; + sha256 = "002y24kfscywkw4mz9lndsps543j4xhr2kcnfbrqr4i0yxlvdbca"; + }) + ]; + + # Compile mypy with mypyc, which makes mypy about 4 times faster. The compiled + # version is also the default in the wheels on Pypi that include binaries. + MYPY_USE_MYPYC = "1"; + meta = with stdenv.lib; { description = "Optional static typing for Python"; homepage = "http://www.mypy-lang.org"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paramz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paramz/default.nix index 430d91a60e..6301464788 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/paramz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/paramz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, numpy, scipy, six, decorator }: +{ stdenv, buildPythonPackage, fetchPypi, numpy, scipy, six, decorator, nose }: buildPythonPackage rec { pname = "paramz"; @@ -10,6 +10,12 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ numpy scipy six decorator ]; + checkInputs = [ nose ]; + + # Ran 113 tests in 3.082s + checkPhase = '' + nosetests -v paramz/tests + ''; meta = with stdenv.lib; { description = "Parameterization framework for parameterized model creation and handling"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydantic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydantic/default.nix index 371bfba2f0..9bf4bede1f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydantic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydantic/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , ujson , email_validator , typing-extensions @@ -9,28 +8,21 @@ , isPy3k , pytest , pytestcov +, pytest-mock }: buildPythonPackage rec { pname = "pydantic"; - version = "1.5.1"; + version = "1.7.3"; disabled = !isPy3k; src = fetchFromGitHub { owner = "samuelcolvin"; repo = pname; rev = "v${version}"; - sha256 = "0fwrx7p6d5vskg9ibganahiz9y9299idvdmzhjw62jy84gn1vrb4"; + sha256 = "xihEDmly0vprmA+VdeCoGXg9PjWRPmBWAwk/9f2DLts="; }; - # fix tests, remove on next version bump - patches = [ - (fetchpatch { - url = "https://github.com/samuelcolvin/pydantic/commit/a5b0e741e585040a0ab8b0be94dd9dc2dd3afcc7.patch"; - sha256 = "0v91ac3dw23rm73370s2ns84vi0xqbfzpvj84zb7xdiicx8fhmf1"; - }) - ]; - propagatedBuildInputs = [ ujson email_validator @@ -40,6 +32,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytestcov + pytest-mock ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykka/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykka/default.nix index 6f76ca9850..075b607c77 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pykka/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykka/default.nix @@ -1,27 +1,21 @@ -{ stdenv -, buildPythonPackage -, fetchFromGitHub -}: +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pytest-mock }: buildPythonPackage rec { - pname = "pykka"; - version = "2.0.1"; + pname = "Pykka"; + version = "2.0.3"; - src = fetchFromGitHub { - owner = "jodal"; - repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "011rvv3vzj9rpwaq6vfpz9hfwm6gx1jmad4iri6z12g8nnlpydhs"; + src = fetchPypi { + inherit pname version; + sha256 = "4b9d2363365b3455a0204bf163f09bd351d24b938c618c79d975a9510e128e95"; }; - # There are no tests - doCheck = false; + checkInputs = [ pytestCheckHook pytest-mock ]; - meta = with stdenv.lib; { - homepage = "http://www.pykka.org"; + meta = with lib; { + homepage = "https://www.pykka.org/"; description = "A Python implementation of the actor model"; + changelog = "https://github.com/jodal/pykka/blob/v${version}/docs/changes.rst"; + maintainers = [ maintainers.marsam ]; license = licenses.asl20; - maintainers = []; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyscreenshot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyscreenshot/default.nix index ec67b7649e..3ca096332a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyscreenshot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyscreenshot/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyscreenshot"; - version = "2.2"; + version = "2.3"; src = fetchPypi { inherit pname version; - sha256 = "dec8517cb18faf4f983dd2ee6636924e472a5644da1480ae871786dfcac244e9"; + sha256 = "bfdc311bd6ec1ee9e3c25ece75b24a749673ad5d5f89ee02950080023054ffd5"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysychonaut/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysychonaut/default.nix new file mode 100644 index 0000000000..ae05070e76 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysychonaut/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchPypi, requests, requests-cache, beautifulsoup4 }: + +buildPythonPackage rec { + pname = "PySychonaut"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1wgk445gmi0x7xmd8qvnyxy1ka0n72fr6nrhzdm29q6687dqyi7h"; + }; + + preConfigure = '' + substituteInPlace setup.py --replace "bs4" "beautifulsoup4" + ''; + + propagatedBuildInputs = [ requests requests-cache beautifulsoup4 ]; + + # No tests available + doCheck = false; + pythonImportsCheck = [ "pysychonaut" ]; + + meta = with lib; { + description = "Unofficial python api for Erowid, PsychonautWiki and AskTheCaterpillar"; + homepage = "https://github.com/OpenJarbas/PySychonaut"; + maintainers = [ maintainers.ivar ]; + license = licenses.asl20; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/dub/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/dub/default.nix index 44c91e9360..2668eca456 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/dub/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/dub/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "dub"; - version = "1.14.0"; + version = "1.23.0"; enableParallelBuilding = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "dlang"; repo = "dub"; rev = "v${version}"; - sha256 = "070kfkyrkr98y1hbhcf85842c0x7l95w1ambrkdgajpb6kcmpf84"; + sha256 = "06a4whsl1m600k096nwif83n7za3vr7pj1xwapncy5fcad1gmady"; }; postUnpack = '' @@ -41,18 +41,25 @@ stdenv.mkDerivation rec { export HOME=$TMP rm -rf test/issue502-root-import - rm test/issue990-download-optional-selected.sh - rm test/timeout.sh rm test/issue674-concurrent-dub.sh rm test/issue672-upgrade-optional.sh + rm test/issue990-download-optional-selected.sh + rm test/issue877-auto-fetch-package-on-run.sh + rm test/issue1037-better-dependency-messages.sh + rm test/issue1040-run-with-ver.sh + rm test/issue1416-maven-repo-pkg-supplier.sh + rm test/issue1180-local-cache-broken.sh rm test/issue1574-addcommand.sh rm test/issue1524-maven-upgrade-dependency-tree.sh - rm test/issue1416-maven-repo-pkg-supplier.sh - rm test/issue1037-better-dependency-messages.sh - rm test/interactive-remove.sh + rm test/issue1773-lint.sh + + rm test/ddox.sh rm test/fetchzip.sh rm test/feat663-search.sh - rm test/ddox.sh + rm -rf test/git-dependency + rm test/interactive-remove.sh + rm test/timeout.sh + rm test/version-spec.sh rm test/0-init-multi.sh rm test/0-init-multi-json.sh diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix index cf85d894a3..24c2bdd2af 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "32cf43b58f91bd3b7063baa9f2d75d4af45d9c4b"; - version = "2020-12-17"; + rev = "4db8d5c27413f69297adfffac57485d88d73c60e"; + version = "2020-12-26"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "046xr3x73p63xnfakq981gvl299l5fahxgnn0bacvp7pa8g99dv2"; + sha256 = "B8abzdohkw3aPhbENJ2vxZFLWhIpf0HF/uv+WJbVRYg="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix index dc990af910..cf422fc2e0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix @@ -3,13 +3,9 @@ , crystal_0_34 , crystal_0_35 }: - let - generic = ( - { version - , sha256 - , crystal - }: + generic = + { version, sha256, crystal }: crystal.buildCrystalPackage { pname = "shards"; @@ -17,12 +13,12 @@ let src = fetchFromGitHub { owner = "crystal-lang"; - repo = "shards"; - rev = "v${version}"; + repo = "shards"; + rev = "v${version}"; inherit sha256; }; - # we cannot use `make` here as it would introduce a dependency on itself + # we cannot use `make` or `shards` here as it would introduce a cyclical dependency format = "crystal"; shardsFile = ./shards.nix; crystalBinaries.shards.src = "./src/shards.cr"; @@ -36,10 +32,10 @@ let maintainers = with maintainers; [ peterhoeg ]; inherit (crystal.meta) homepage platforms; }; - } - ); + }; -in rec { +in +rec { shards_0_11 = generic { version = "0.11.1"; sha256 = "05qnhc23xbmicdl4fwyxfpcvd8jq4inzh6v7jsjjw4n76vzb1f71"; diff --git a/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix b/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix index b04a42d57b..1ede21609b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lazygit"; - version = "0.23.7"; + version = "0.24.2"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "05s0rj785dm9dqr30ak5hi26qy0z2w71zljyln5is4frckxkcvng"; + sha256 = "0hy13l1v2kcsn99dswlq1hl0ly18cal387zhnzjfqv51qng2q5kq"; }; vendorSha256 = null; @@ -19,6 +19,7 @@ buildGoModule rec { meta = with stdenv.lib; { description = "Simple terminal UI for git commands"; homepage = "https://github.com/jesseduffield/lazygit"; + changelog = "https://github.com/jesseduffield/lazygit/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fpletz equirosa Br1ght0ne ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix index ac8a4c8bb7..ef04e78da6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.11508"; + version = "0.1.11540"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "1m0jy7h9mksgj85r4jcpb5nabcs9vrfbrky31acwbibzjxxw9afg"; + sha256 = "QtD+H59AlXp+3mXtUA44Dl+3xEvWdO8FybuBnL9sjBA="; }; - vendorSha256 = "15l9f87vgspdsxhwqdm56z3dvrspc8k1bbyvhhhnvqf3fkiki2bw"; + vendorSha256 = "fIk443TD4W0hhNuvFSZiV+fdxjelNsxh1+3qtw9yiZY="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/mdctags/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/mdctags/default.nix new file mode 100644 index 0000000000..ac61702160 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/mdctags/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage { + pname = "mdctags"; + version = "unstable-2020-06-11"; # v0.1.0 does not build with our rust version + + src = fetchFromGitHub { + owner = "wsdjeg"; + repo = "mdctags.rs"; + rev = "0ed9736ea0c77e6ff5b560dda46f5ed0a983ed82"; + sha256 = "14gryhgh9czlkfk75ml0620c6v8r74i6h3ykkkmc7gx2z8h1jxrb"; + }; + + cargoSha256 = "01ap2w755vbr01nfqc5185mr2w9y32g0d4ahc3lw2x3m8qv0bh6x"; + + meta = { + description = "tags for markdown file"; + homepage = "https://github.com/wsdjeg/mdctags.rs"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pacien ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/rtss/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/rtss/default.nix new file mode 100644 index 0000000000..505e6d23ef --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/rtss/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "rtss"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "Freaky"; + repo = pname; + rev = "v${version}"; + sha256 = "1936w161mkbcwicrxn51b42pgir5yjiw85s74lbfq70nddw18nyn"; + }; + + cargoSha256 = "0nll5gg7fjh6sz3cscarknb0gaivmzkcxhwdb2li47r74rcbrj36"; + + meta = with lib; { + description = "Annotate output with relative durations between lines"; + homepage = "https://github.com/Freaky/rtss"; + license = licenses.mit; + maintainers = with maintainers; [ djanatyn ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix index a4fb72666c..29edccf496 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terracognita"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "cycloidio"; repo = pname; rev = "v${version}"; - sha256 = "1z0vf3x46w3glwvq185hgmfkg7xfq31c7d3yjhh8qkwbhkx4bga4"; + sha256 = "1f0wi5mlb9r7ncvyvgmcdfngxrzgbdv7hm2ckb8bwmzcki2h2255"; }; - vendorSha256 = "1dmv16v1c9sydbl1g69pgwvrhznd0a133giwrcbqi4cyg1fdb3sr"; + vendorSha256 = "015r7zvah7lk5rbkaqhh2abbv19ky1in3ngzzrdvhbcqfns25iqr"; doCheck = false; @@ -22,6 +22,7 @@ buildGoModule rec { meta = with lib; { description = "Reads from existing Cloud Providers (reverse Terraform) and generates your infrastructure as code on Terraform configuration"; homepage = "https://github.com/cycloidio/terracognita"; + changelog = "https://github.com/cycloidio/terracognita/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = [ maintainers.marsam ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/quicktemplate/default.nix b/third_party/nixpkgs/pkgs/development/tools/quicktemplate/default.nix index 8f75540f3a..cb9b4f950c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/quicktemplate/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/quicktemplate/default.nix @@ -1,18 +1,18 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage { +buildGoModule rec { pname = "quicktemplate"; - version = "unstable-2019-07-08"; - goPackagePath = "github.com/valyala/quicktemplate"; - goDeps = ./deps.nix; + version = "1.6.3"; src = fetchFromGitHub { owner = "valyala"; repo = "quicktemplate"; - rev = "840e9171940bbc80bb1b925c880664cababae022"; - sha256 = "1pimf5bwivklsr438if6l8by34gr48a05gl6hq07cvc8z6wl01m2"; + rev = "v${version}"; + sha256 = "mQhrQcKRDtcXha7FIwCIUwWfoPGIJ5YLbA4HdatIdn8="; }; + vendorSha256 = null; + meta = with stdenv.lib; { homepage = "https://github.com/valyala/quicktemplate"; description = "Fast, powerful, yet easy to use template engine for Go"; diff --git a/third_party/nixpkgs/pkgs/development/tools/quicktemplate/deps.nix b/third_party/nixpkgs/pkgs/development/tools/quicktemplate/deps.nix deleted file mode 100644 index 6c042966c2..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/quicktemplate/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/valyala/bytebufferpool"; - fetch = { - type = "git"; - url = "https://github.com/valyala/bytebufferpool"; - rev = "cdfbe9377474227bb42120c1e22fd4433e7f69bf"; - sha256 = "0c6cixd85dvl2gvs7sdh0k2wm8r3grl4fw0jg4w7d78cp8s2k7ag"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/development/tools/statik/default.nix b/third_party/nixpkgs/pkgs/development/tools/statik/default.nix index f535fa055e..48ceea24b7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/statik/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/statik/default.nix @@ -1,18 +1,26 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage { +buildGoModule rec { pname = "statik"; - version = "unstable-2019-07-31"; - goPackagePath = "github.com/rakyll/statik"; + version = "0.1.7"; src = fetchFromGitHub { owner = "rakyll"; repo = "statik"; - rev = "925a23bda946b50bb0804894f340c5da2b95603b"; - sha256 = "15wwgrprfq36pa13b9anp7097q1fqcad28hirvivybmc011p0fri"; + rev = "v${version}"; + sha256 = "ahsNiac/3I2+PUqc90E73Brb99M68ewh9nWXoupfE3g="; }; - meta = with stdenv.lib; { + vendorSha256 = "pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + + # Avoid building example + subPackages = [ "." "fs" ]; + # Tests are checking that the files embeded are preserving + # their meta data like dates etc, but it assumes to be in 2048 + # which is not the case once entered the nix store + doCheck = false; + + meta = with lib; { homepage = "https://github.com/rakyll/statik"; description = "Embed files into a Go executable "; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/development/web/lucky-cli/default.nix b/third_party/nixpkgs/pkgs/development/web/lucky-cli/default.nix index ffa6fba778..5085346e3e 100644 --- a/third_party/nixpkgs/pkgs/development/web/lucky-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/lucky-cli/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "lucky-cli"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "luckyframework"; repo = "lucky_cli"; rev = "v${version}"; - sha256 = "1z1ns6lx5v6nd5s78brpx7jarc9aldca5yrqjrdb14iyw0jlxig4"; + sha256 = "sha256-/DKDg2lJO6PikF7+kbwRX8ClS8rflH8KdrZNx7AR36g="; }; # the integration tests will try to clone a remote repos @@ -38,5 +38,6 @@ crystal.buildCrystalPackage rec { license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; + broken = lib.versionOlder crystal.version "0.35.1"; }; } diff --git a/third_party/nixpkgs/pkgs/development/web/lucky-cli/shard.lock b/third_party/nixpkgs/pkgs/development/web/lucky-cli/shard.lock index 6564e86624..47c40af8c7 100644 --- a/third_party/nixpkgs/pkgs/development/web/lucky-cli/shard.lock +++ b/third_party/nixpkgs/pkgs/development/web/lucky-cli/shard.lock @@ -1,5 +1,14 @@ -version: 1.0 +version: 2.0 shards: + ameba: + git: https://github.com/crystal-ameba/ameba.git + version: 0.13.3 + + future: + git: https://github.com/crystal-community/future.cr.git + version: 0.1.0 + teeplate: - github: luckyframework/teeplate - version: 0.8.1 + git: https://github.com/luckyframework/teeplate.git + version: 0.8.2 + diff --git a/third_party/nixpkgs/pkgs/development/web/lucky-cli/shards.nix b/third_party/nixpkgs/pkgs/development/web/lucky-cli/shards.nix index 0fa5aec9e0..2741583b68 100644 --- a/third_party/nixpkgs/pkgs/development/web/lucky-cli/shards.nix +++ b/third_party/nixpkgs/pkgs/development/web/lucky-cli/shards.nix @@ -1,8 +1,20 @@ { + ameba = { + owner = "crystal-ameba"; + repo = "ameba"; + rev = "v0.13.3"; + sha256 = "0yhb8vfrfzsm3a45h2jmcrn1n7jy3zn2hwims3dikgq8kaggws9y"; + }; + future = { + owner = "crystal-community"; + repo = "future.cr"; + rev = "v0.1.0"; + sha256 = "1p88mfn1ab5hz4r81vjfm1vn9rww0lbbii8lyzfx9pkxanh9rp98"; + }; teeplate = { owner = "luckyframework"; repo = "teeplate"; - rev = "v0.8.1"; - sha256 = "022jmmg3d2wq2xnhc63afldm9vrcr8xqn43s9i39d7qflrzrfc7v"; + rev = "v0.8.2"; + sha256 = "1v7njslcpir52nnyd30mfnxvqmb7ycqnlq80qnx6myw20iy9dcww"; }; } diff --git a/third_party/nixpkgs/pkgs/games/banner/default.nix b/third_party/nixpkgs/pkgs/games/banner/default.nix index 6da8e1bf9b..e0f9ca41c6 100644 --- a/third_party/nixpkgs/pkgs/games/banner/default.nix +++ b/third_party/nixpkgs/pkgs/games/banner/default.nix @@ -1,17 +1,20 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "banner-1.3.4"; + pname = "banner"; + version = "1.3.5"; - src = fetchurl { - url = "http://software.cedar-solutions.com/ftp/software/${name}.tar.gz"; - sha256 = "04q5ribr0r9s8waky3nk356l0qdhfxw15ipz7lsfgv1fxq3qk6bz"; + src = fetchFromGitHub { + owner = "pronovic"; + repo = "banner"; + rev = "BANNER_V${version}"; + sha256 = "ISSnGzrFSzSj/+KxgeFtaw4H+4Ea5x5S5C8xjcjKWqQ="; }; meta = with stdenv.lib; { homepage = "http://software.cedar-solutions.com/utilities.html"; description = "Print large banners to ASCII terminals"; - license = licenses.gpl2; + license = licenses.gpl2Only; longDescription = '' An implementation of the traditional Unix-program used to display diff --git a/third_party/nixpkgs/pkgs/games/cataclysm-dda/stable.nix b/third_party/nixpkgs/pkgs/games/cataclysm-dda/stable.nix index 076a33a9e8..4210a21669 100644 --- a/third_party/nixpkgs/pkgs/games/cataclysm-dda/stable.nix +++ b/third_party/nixpkgs/pkgs/games/cataclysm-dda/stable.nix @@ -10,13 +10,13 @@ let }; self = common.overrideAttrs (common: rec { - version = "0.E-2"; + version = "0.E-3"; src = fetchFromGitHub { owner = "CleverRaven"; repo = "Cataclysm-DDA"; rev = version; - sha256 = "15l6w6lxays7qmsv0ci2ry53asb9an9dh7l7fc13256k085qcg68"; + sha256 = "qhHtsm5cM0ct/7qXev0SiLInO2jqs2odxhWndLfRDIE="; }; passthru = common.passthru // { diff --git a/third_party/nixpkgs/pkgs/games/mindustry/default.nix b/third_party/nixpkgs/pkgs/games/mindustry/default.nix index c547fb052a..423bf4bf9f 100644 --- a/third_party/nixpkgs/pkgs/games/mindustry/default.nix +++ b/third_party/nixpkgs/pkgs/games/mindustry/default.nix @@ -22,14 +22,14 @@ let # Note: when raising the version, ensure that all SNAPSHOT versions in # build.gradle are replaced by a fixed version # (the current one at the time of release) (see postPatch). - version = "121.4"; + version = "122"; buildVersion = makeBuildVersion version; src = fetchFromGitHub { owner = "Anuken"; repo = "Mindustry"; rev = "v${version}"; - sha256 = "14w0fkn8q5bj84py7vx33wdk9d37ncrq6rdj5ryz4mvlxbix2n4n"; + sha256 = "19dxqscnny0c5w3pyg88hflrkhsqgd7zx19240kh4h69y3wwaz0m"; }; desktopItem = makeDesktopItem { @@ -50,6 +50,13 @@ let sed -i 's/com.github.anuken:packr:-SNAPSHOT/com.github.anuken:packr:034efe51781d2d8faa90370492133241bfb0283c/' build.gradle ''; + preBuild = '' + # Arc is run at build time for sprite packing, and it needs to see + # the runtime libraries + ${stdenv.lib.optionalString stdenv.isLinux "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${alsaLib}/lib"} + export GRADLE_USER_HOME=$(mktemp -d) + ''; + # The default one still uses jdk8 (#89731) gradle_6 = (gradleGen.override (old: { java = jdk14; })).gradle_6_7; @@ -62,7 +69,7 @@ let # one hash for 'deps'. Deps can be garbage collected after the build, # so this is not really an issue. buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) + ${preBuild} gradle --no-daemon desktop:dist -Pbuildversion=${buildVersion} gradle --no-daemon server:dist -Pbuildversion=${buildVersion} ''; @@ -74,7 +81,7 @@ let ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "18n671aa013cnsnp9aaw61llqz4s4vn7zgja8cazd0cg632x8jca"; + outputHash = "1kymfrd2vd23y1rmx19q47wc212r6qx03x6g58pxbqyylxmcw5zq"; }; # Separate commands for building and installing the server and the client @@ -109,7 +116,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gradle_6 makeWrapper ]; buildPhase = with stdenv.lib; '' - export GRADLE_USER_HOME=$(mktemp -d) + ${preBuild} # point to offline repo sed -ie "s#mavenLocal()#mavenLocal(); maven { url '${deps}' }#g" build.gradle ${optionalString enableClient buildClient} @@ -125,11 +132,15 @@ stdenv.mkDerivation rec { homepage = "https://mindustrygame.github.io/"; downloadPage = "https://github.com/Anuken/Mindustry/releases"; description = "A sandbox tower defense game"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; # Hash mismatch on darwin: # https://github.com/NixOS/nixpkgs/pull/105590#issuecomment-737120293 - broken = stdenv.isDarwin; + # Problems with native libraries in aarch64: + # https://github.com/NixOS/nixpkgs/pull/107646 + # https://logs.nix.ci/?key=nixos/nixpkgs.107646&attempt_id=3032c060-72e9-4a76-8186-4739544397dd + broken = stdenv.isDarwin || + stdenv.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/misc/beep/default.nix b/third_party/nixpkgs/pkgs/misc/beep/default.nix index 40a8849ba3..bb62271a31 100644 --- a/third_party/nixpkgs/pkgs/misc/beep/default.nix +++ b/third_party/nixpkgs/pkgs/misc/beep/default.nix @@ -1,25 +1,25 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: # this package is working only as root # in order to work as a non privileged user you would need to suid the bin -stdenv.mkDerivation { - name = "beep-1.3"; - src = fetchurl { - url = "http://www.johnath.com/beep/beep-1.3.tar.gz"; - sha256 = "0bgch6jq5cahakk3kbr9549iysf2dik09afixxy5brbxk1xfzb2r"; +stdenv.mkDerivation rec { + pname = "beep"; + version = "1.4.9"; + + src = fetchFromGitHub { + owner = "spkr-beep"; + repo = "beep"; + rev = "v${version}"; + sha256 = "JLaoiINHpIFWSqsRl8wJ/NeBu7SCcPuT/BzY8szEu0o="; }; - makeFlags = [ "INSTALL_DIR=\${out}/bin/" "MAN_DIR=\${out}/man/man1/" ]; + makeFlags = [ "DESTDIR=\${out}" "prefix="]; - preInstall = '' - mkdir -p $out/bin - mkdir -p $out/man/man1 - ''; - meta = { + meta = with stdenv.lib; { description = "The advanced PC speaker beeper"; - homepage = "http://www.johnath.com/beep/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + homepage = "https://github.com/spkr-beep/beep"; + license = licenses.gpl2Only; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/misc/ptouch-print/default.nix b/third_party/nixpkgs/pkgs/misc/ptouch-print/default.nix new file mode 100644 index 0000000000..ac15ec6330 --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/ptouch-print/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, fetchgit +, autoreconfHook +, gd +, libusb1 +}: + +stdenv.mkDerivation rec { + pname = "ptouch-print"; + version = "1.4.3"; + + src = fetchgit { + url = "https://mockmoon-cybernetics.ch/cgi/cgit/linux/ptouch-print.git"; + rev = "v${version}"; + sha256 = "0i57asg2hj1nfwy5lcb0vhrpvb9dqfhf81vh4i929h1kiqhlw2hx"; + }; + + nativeBuildInputs = [ + autoreconfHook + ]; + + buildInputs = [ + gd + libusb1 + ]; + + meta = with stdenv.lib; { + description = "Command line tool to print labels on Brother P-Touch printers on Linux"; + license = licenses.gpl3Plus; + homepage = "https://mockmoon-cybernetics.ch/computer/p-touch2430pc/"; + maintainers = with maintainers; [ shamilton ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix b/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix index 28ac5e6f91..f10a2846de 100644 --- a/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix @@ -208,6 +208,10 @@ in rec { rev = "416f613d3eaadbe1f6f9eda77c49430527ebaffb"; sha256 = "1xbzdyhsgaq2in0f8f491gwjmx6cxpkf2c35d2dk0kg4jfs505sz"; }; + postInstall = '' + sed -i -e 's|ruby|${pkgs.ruby}/bin/ruby|g' $target/scripts/tmux-jump.sh + ''; + dependencies = [ pkgs.ruby ]; meta = with stdenv.lib; { homepage = "https://github.com/schasse/tmux-jump"; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix index 94f92b21ef..ccaa9b1ff1 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -2146,6 +2146,18 @@ let meta.homepage = "https://github.com/vim-scripts/mayansmoke/"; }; + mkdx = buildVimPluginFrom2Nix { + pname = "mkdx"; + version = "2020-10-12"; + src = fetchFromGitHub { + owner = "SidOfc"; + repo = "mkdx"; + rev = "65f343251d99c20db9f22e9c836b709f249129f6"; + sha256 = "06xz12h87wkcpn2w22k6m7gxshk5x75hg8ql9cmja89v0birsn0f"; + }; + meta.homepage = "https://github.com/SidOfc/mkdx/"; + }; + molokai = buildVimPluginFrom2Nix { pname = "molokai"; version = "2015-11-11"; @@ -3564,6 +3576,18 @@ let meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; }; + srcery-vim = buildVimPluginFrom2Nix { + pname = "srcery-vim"; + version = "2020-10-26"; + src = fetchFromGitHub { + owner = "srcery-colors"; + repo = "srcery-vim"; + rev = "ecbd5ba9055ad6b78dc47ef4f0894a7da63215f7"; + sha256 = "1ynyllw0fg4gfb5qcmwfjsqg5dr3dwfc5hya261zzd8a42qab1y4"; + }; + meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; + }; + starsearch-vim = buildVimPluginFrom2Nix { pname = "starsearch-vim"; version = "2014-09-21"; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names index d77ace1b04..c559a73b5b 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -497,6 +497,7 @@ Shougo/vimproc.vim Shougo/vimshell.vim shumphrey/fugitive-gitlab.vim sickill/vim-pasta +SidOfc/mkdx simnalamburt/vim-mundo SirVer/ultisnips sjl/gundo.vim @@ -507,6 +508,7 @@ sodapopcan/vim-twiggy solarnz/arcanist.vim sonph/onehalf steelsojka/completion-buffers +srcery-colors/srcery-vim stefandtw/quickfix-reflector.vim stephpy/vim-yaml sunaku/vim-dasht diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/atop/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/atop/default.nix index 0d8392cbcd..7557497b95 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/atop/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/atop/default.nix @@ -1,22 +1,24 @@ {stdenv, fetchurl, zlib, ncurses}: stdenv.mkDerivation rec { - version = "2.4.0"; pname = "atop"; + version = "2.6.0"; src = fetchurl { url = "https://www.atoptool.nl/download/atop-${version}.tar.gz"; - sha256 = "0s9xlxlzz688a80zxld840zkrmzw998rdkkg6yc7ssq8fw50275y"; + sha256 = "nsLKOlcWkvfvqglfmaUQZDK8txzCLNbElZfvBIEFj3I="; }; buildInputs = [zlib ncurses]; makeFlags = [ - ''SCRPATH=$out/etc/atop'' - ''LOGPATH=/var/log/atop'' - ''INIPATH=$out/etc/rc.d/init.d'' - ''CRNPATH=$out/etc/cron.d'' - ''ROTPATH=$out/etc/logrotate.d'' + "SCRPATH=$out/etc/atop" + "LOGPATH=/var/log/atop" + "INIPATH=$out/etc/rc.d/init.d" + "SYSDPATH=$out/lib/systemd/system" + "CRNPATH=$out/etc/cron.d" + "DEFPATH=$out/etc/default" + "ROTPATH=$out/etc/logrotate.d" ]; preConfigure = '' @@ -28,9 +30,9 @@ stdenv.mkDerivation rec { sed -e 's/chmod 04711/chmod 0711/g' -i Makefile ''; + installTargets = [ "systemdinstall" ]; preInstall = '' mkdir -p "$out"/{bin,sbin} - make systemdinstall $makeFlags ''; meta = with stdenv.lib; { @@ -42,7 +44,7 @@ stdenv.mkDerivation rec { Atop is an ASCII full-screen performance monitor that is capable of reporting the activity of all processes (even if processes have finished during the interval), daily logging of system and process activity for long-term analysis, highlighting overloaded system resources by using colors, etc. At regular intervals, it shows system-level activity related to the CPU, memory, swap, disks and network layers, and for every active process it shows the CPU utilization, memory growth, disk utilization, priority, username, state, and exit code. ''; inherit version; - license = licenses.gpl2; + license = licenses.gpl2Plus; downloadPage = "http://atoptool.nl/downloadatop.php"; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/99-displaylink.rules b/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/99-displaylink.rules new file mode 100644 index 0000000000..ceeb658a41 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/99-displaylink.rules @@ -0,0 +1 @@ +ACTION=="add", SUBSYSTEM=="usb", DRIVERS=="usb", ATTRS{idVendor}=="17e9", ATTR{bInterfaceClass}=="ff", ATTR{bInterfaceProtocol}=="03", TAG+="systemd", ENV{SYSTEMD_WANTS}="dlm.service" diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix index dcdafb98d7..5e60d68bc2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix @@ -1,6 +1,14 @@ -{ stdenv, lib, unzip, util-linux, - libusb1, evdi, systemd, makeWrapper, requireFile, substituteAll }: - +{ stdenv +, lib +, unzip +, util-linux +, libusb1 +, evdi +, systemd +, makeWrapper +, requireFile +, substituteAll +}: let arch = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" @@ -9,7 +17,8 @@ let bins = "${arch}-ubuntu-1604"; libPath = lib.makeLibraryPath [ stdenv.cc.cc util-linux libusb1 evdi ]; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "displaylink"; version = "5.3.1.34"; @@ -39,20 +48,11 @@ in stdenv.mkDerivation rec { ./displaylink-driver-${version}.run --target . --noexec --nodiskspace ''; - patches = [ (substituteAll { - src = ./udev-installer.patch; - inherit systemd; - })]; - installPhase = '' - sed -i "s,/opt/displaylink/udev.sh,$out/lib/udev/displaylink.sh,g" udev-installer.sh - ( source udev-installer.sh - mkdir -p $out/lib/udev/rules.d - main systemd "$out/lib/udev/rules.d/99-displaylink.rules" "$out/lib/udev/displaylink.sh" - ) - install -Dt $out/lib/displaylink *.spkg install -Dm755 ${bins}/DisplayLinkManager $out/bin/DisplayLinkManager + mkdir -p $out/lib/udev/rules.d + cp ${./99-displaylink.rules} $out/lib/udev/rules.d/99-displaylink.rules patchelf \ --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ --set-rpath ${libPath} \ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/udev-installer.patch b/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/udev-installer.patch deleted file mode 100644 index 880c073fbc..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/udev-installer.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/udev-installer.sh 2018-12-09 12:05:53.772318942 +0100 -+++ b/udev-installer.sh 2018-12-09 12:06:19.939947629 +0100 -@@ -21,12 +21,12 @@ - cat <<'EOF' - start_service() - { -- systemctl start displaylink-driver -+ /run/current-system/systemd/bin/systemctl start --no-block dlm - } - - stop_service() - { -- systemctl stop displaylink-driver -+ /run/current-system/systemd/bin/systemctl stop dlm - } - - EOF - diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix index 2333868476..1a432eb768 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix @@ -2,22 +2,22 @@ stdenv.mkDerivation { pname = "raspberrypi-wireless-firmware"; - version = "2019-08-16"; + version = "2020-12-01"; srcs = [ (fetchFromGitHub { name = "bluez-firmware"; owner = "RPi-Distro"; repo = "bluez-firmware"; - rev = "96eefffcccc725425fd83be5e0704a5c32b79e54"; - sha256 = "05h57gcxhb2c84h99cyxxx4mzi6kd5fm8pjqkz3nq5vs3nv8cqhr"; + rev = "1e4ee0c05bae10002124b56c0e44bb9ac6581ddc"; + sha256 = "10n6ibr3ra71f4hlvbpy8csjlgrapawxrr6jmijn470vkcqcpq27"; }) (fetchFromGitHub { name = "firmware-nonfree"; owner = "RPi-Distro"; repo = "firmware-nonfree"; - rev = "130cb86fa30cafbd575d38865fa546350d4c5f9c"; - sha256 = "0jmhgbpldzz8n8lncpzwfl5ym8zgss05y952rfpwcf9v5c7vgabx"; + rev = "b66ab26cebff689d0d3257f56912b9bb03c20567"; + sha256 = "0cffgsp0w7vv7ylpymdddx0bl9dx3pl7snlh30p4rr9srmn8869f"; }) ]; @@ -41,10 +41,10 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1r4alf1fbj6vkkf54d0anm47ymb6gn2ykl4a2hhd34b0hnf1dnhn"; + outputHash = "17k9y499kjc4zv7ivnsfrgfibwj0ldr3sqdgia4dackbr70jfg2h"; meta = with stdenv.lib; { - description = "Firmware for builtin Wifi/Bluetooth devices in the Raspberry Pi 3 and Zero W"; + description = "Firmware for builtin Wifi/Bluetooth devices in the Raspberry Pi 3+ and Zero W"; homepage = "https://github.com/RPi-Distro/firmware-nonfree"; license = licenses.unfreeRedistributableFirmware; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index 70bcaa15d9..b5fa3909c3 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchFromGitHub }: +{ stdenvNoCC, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { + # NOTE: this should be updated with linux_rpi pname = "raspberrypi-firmware"; - version = "1.20201022"; + version = "1.20201201"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - sha256 = "0j5m50cmmr11m3h8kk89j1pqkdqr7mzdzg04ayiqvfhvy32qqlg8"; + sha256 = "09yha3k72yqx29rwnv2j2zm73lzc4jgmcbmcc6yrl1i07x84lx3n"; }; installPhase = '' @@ -16,9 +17,11 @@ stdenv.mkDerivation rec { cp -R boot/* $out/share/raspberrypi/boot ''; + dontConfigure = true; + dontBuild = true; dontFixup = true; - meta = with stdenv.lib; { + meta = with stdenvNoCC.lib; { description = "Firmware for the Raspberry Pi board"; homepage = "https://github.com/raspberrypi/firmware"; license = licenses.unfreeRedistributableFirmware; # See https://github.com/raspberrypi/firmware/blob/master/boot/LICENCE.broadcom diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix deleted file mode 100644 index 79d6edcf94..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig }: - -stdenv.mkDerivation { - pname = "raspberrypi-tools"; - version = "2020-05-28"; - - src = fetchFromGitHub { - owner = "raspberrypi"; - repo = "userland"; - rev = "f97b1af1b3e653f9da2c1a3643479bfd469e3b74"; - sha256 = "1r7n05rv96hqjq0rn0qzchmfqs0j7vh3p8jalgh66s6l0vms5mwy"; - }; - - nativeBuildInputs = [ cmake pkgconfig ]; - - patches = [ - (fetchpatch { - # https://github.com/raspberrypi/userland/pull/670 - url = "https://github.com/raspberrypi/userland/pull/670/commits/37cb44f314ab1209fe2a0a2449ef78893b1e5f62.patch"; - sha256 = "1fbrbkpc4cc010ji8z4ll63g17n6jl67kdy62m74bhlxn72gg9rw"; - }) - ]; - - preConfigure = '' - cmakeFlagsArray+=("-DVMCS_INSTALL_PREFIX=$out") - '' + stdenv.lib.optionalString stdenv.isAarch64 '' - cmakeFlagsArray+=("-DARM64=1") - ''; - - meta = with stdenv.lib; { - description = "Userland tools for the Raspberry Pi board"; - homepage = "https://github.com/raspberrypi/userland"; - license = licenses.bsd3; - platforms = [ "x86_64-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ dezgeg tavyc ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix index f4404cae6f..aff68e1efa 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.212"; + version = "4.14.213"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0y8ck8pfxm8862wi4cz8qp9x9b18yl448i8m7bpbphs290nc66qf"; + sha256 = "079axkl14jp8lz30h21q4gmhmjw6zf5ycmxji65kgcgyg7dwwyzx"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix index 7e3030087c..744f35e3ea 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.248"; + version = "4.4.249"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1z1xbkm0z0v6k3scszii5hi24pn391332g0li93p3n1rnv74jap5"; + sha256 = "04pb4vgia6zaindf6804gq9jn3mhmy01yijqmpi79sh9rlqzzh1i"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix index 107fcd9268..bf044f7324 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.248"; + version = "4.9.249"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1kzczy0lz3lnjkhvx90dgjmzn3d3y55qxlihiclkr4y9c602d1s6"; + sha256 = "0kjcw0vgga9msgqnipgg028v3rcc5am2d094v3hqkkjvzyb8dwxi"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix index 411a88d929..783e7cf2d9 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.10.2"; + version = "5.10.3"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "18l1ywp99inm90434fm74w8rjfl4yl974kfcpizg2sp2p8xf311v"; + sha256 = "09cml495fnf52lhlkjxjznw34q5s8arvq7shkb6wjq6fwlrk65gr"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix new file mode 100644 index 0000000000..f270437897 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: + +let + version = "5.9.16"; +in + +buildLinux (args // { + modDirVersion = "${version}-lqx1"; + inherit version; + isZen = true; + + src = fetchFromGitHub { + owner = "zen-kernel"; + repo = "zen-kernel"; + rev = "v${version}-lqx1"; + sha256 = "0ljvqf91nxpql98z75bicg5y3nzkm41rq5b0rm1kcnsk0ji829ps"; + }; + + extraMeta = { + branch = "5.9/master"; + maintainers = with stdenv.lib.maintainers; [ atemu ]; + description = linux_zen.meta.description + " (Same as linux_zen but less aggressive release schedule)"; + }; + +} // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rpi.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rpi.nix index a3d2bfd483..176c2180f3 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -1,8 +1,9 @@ { stdenv, lib, buildPackages, fetchFromGitHub, perl, buildLinux, rpiVersion, ... } @ args: let - modDirVersion = "4.19.118"; - tag = "1.20200601"; + # NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this + modDirVersion = "5.4.79"; + tag = "1.20201201"; in lib.overrideDerivation (buildLinux (args // { version = "${modDirVersion}-${tag}"; @@ -12,7 +13,7 @@ lib.overrideDerivation (buildLinux (args // { owner = "raspberrypi"; repo = "linux"; rev = "raspberrypi-kernel_${tag}-1"; - sha256 = "11jzsmnd1qry2ir9vmsv0nfdzjpgkn5yab5ylxcz406plc073anp"; + sha256 = "093p5kh5f27djkhbcw371w079lhhihvg3s4by3wzsd40di4fcgn9"; }; defconfig = { @@ -22,6 +23,11 @@ lib.overrideDerivation (buildLinux (args // { "4" = "bcm2711_defconfig"; }.${toString rpiVersion}; + extraConfig = '' + # ../drivers/pci/controller/pcie-altera.c:679:8: error: too few arguments to function 'devm_of_pci_get_host_bridge_resources' + PCIE_ALTERA n + ''; + features = { efiBootStub = false; } // (args.features or {}); diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix index 5bf74ffd37..ac84e70bae 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,15 +3,15 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.10-rc6"; - extraMeta.branch = "5.10"; + version = "5.11-rc1"; + extraMeta.branch = "5.11"; # modDirVersion needs to be x.y.z, will always add .0 modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "14ykzs98r918sqv7lddlps4r7hza1zgw0x67mmj77cmqiv6d8ffi"; + sha256 = "sha256-nPJpz058khWE83QV9ITylTXjimBBw7SQwg7WBjWA7H0="; }; # Should the testing kernels ever be built on Hydra? diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix index fd06b2f821..dc28f37338 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -19,6 +19,7 @@ buildLinux (args // { extraMeta = { branch = "5.10/master"; maintainers = with stdenv.lib.maintainers; [ atemu andresilva ]; + description = "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads."; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/radeontop/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/radeontop/default.nix index 3d26914d4f..f55b09f699 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/radeontop/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/radeontop/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "radeontop"; - version = "2019-06-03"; + version = "1.3"; src = fetchFromGitHub { - sha256 = "1b1m30r2nfwqkajqw6m01xmfhlq83z1qylyijxg7962mp9x2k0gw"; - rev = "v1.2"; + sha256 = "sha256-tnIxM0+RfOIt714fEUWRP/4rEPHaOuCZFit9/RPdxis="; + rev = "v${version}"; repo = "radeontop"; owner = "clbr"; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix index ff9c8f4ce8..ee5ead73bc 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix @@ -1,15 +1,15 @@ { stdenvNoCC, lib, fetchFromGitHub, makeWrapper -, python3, binutils-unwrapped, findutils, kmod, pciutils, raspberrypi-tools +, python3, binutils-unwrapped, findutils, kmod, pciutils, libraspberrypi }: stdenvNoCC.mkDerivation { pname = "raspberrypi-eeprom"; - version = "unstable-2020-10-05"; + version = "2020-12-11"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "rpi-eeprom"; - rev = "718820bcebd21d4a619fa262d9b9cf3acbf110f8"; - sha256 = "1277jsiyv34dqpandva8kxy1s0y5ql344pl9gk84avzp1mqjnv4g"; + rev = "54a9796abbee59067bff9da6b90c1014178f2c21"; + sha256 = "0yp7bn444n6yisp4hiblrm00rrvrf213amzb4sh96mlb5nhxspqk"; }; buildInputs = [ python3 ]; @@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation { patchShebangs $out/bin wrapProgram $out/bin/rpi-eeprom-update \ --set FIRMWARE_ROOT $out/share/rpi-eeprom \ - ${lib.optionalString stdenvNoCC.isAarch64 "--set VCMAILBOX ${raspberrypi-tools}/bin/vcmailbox"} \ + ${lib.optionalString stdenvNoCC.isAarch64 "--set VCMAILBOX ${libraspberrypi}/bin/vcmailbox"} \ --prefix PATH : "${lib.makeBinPath ([ binutils-unwrapped findutils @@ -43,7 +43,7 @@ stdenvNoCC.mkDerivation { pciutils (placeholder "out") ] ++ lib.optionals stdenvNoCC.isAarch64 [ - raspberrypi-tools + libraspberrypi ])}" ''; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/usbguard/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/usbguard/default.nix index 0ece2f8360..e2746c7a1e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/usbguard/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/usbguard/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = { description = "The USBGuard software framework helps to protect your computer against BadUSB"; homepage = "https://usbguard.github.io/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.tnias ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/http/tomcat/tomcat-native.nix b/third_party/nixpkgs/pkgs/servers/http/tomcat/tomcat-native.nix index fa2769f99d..55eb277522 100644 --- a/third_party/nixpkgs/pkgs/servers/http/tomcat/tomcat-native.nix +++ b/third_party/nixpkgs/pkgs/servers/http/tomcat/tomcat-native.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tomcat-native"; - version = "1.2.25"; + version = "1.2.26"; src = fetchurl { url = "mirror://apache/tomcat/tomcat-connectors/native/${version}/source/${pname}-${version}-src.tar.gz"; - sha512 = "e121c0a18c51b5f952833df44c3a0add1f9a6e1b61e300abbafa0bc7e8f32296e64c9f81e9ad7389c1bd24abc40739e4726a56158d08e33b7ef00e5fa8a1d33d"; + sha512 = "319lrb0b5vvm2m46rdz2zbicisijvim6948ghz0mypck6f419yjr68j8rpmxpckscaj0ghmbq3p28jpxbjpig84ygy0m63cvgpxknfa"; }; sourceRoot = "${pname}-${version}-src/native"; diff --git a/third_party/nixpkgs/pkgs/servers/mattermost/matterircd.nix b/third_party/nixpkgs/pkgs/servers/mattermost/matterircd.nix index d644e985db..ece2195d11 100644 --- a/third_party/nixpkgs/pkgs/servers/mattermost/matterircd.nix +++ b/third_party/nixpkgs/pkgs/servers/mattermost/matterircd.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "matterircd"; - version = "0.19.4"; + version = "0.20.0"; src = fetchFromGitHub { owner = "42wim"; repo = "matterircd"; rev = "v${version}"; - sha256 = "1kwyk6gy4d4v2rzyr7vwvi8vm69rz1hdn0gkpan2kh1p63z77gbv"; + sha256 = "0rnkzxf953nd67w33ghmrfjfg099cd21nldm31q8pk7fs1mgjnld"; }; goPackagePath = "github.com/42wim/matterircd"; diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix index a63d75552c..d6ab3ec34b 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "tulir"; repo = "mautrix-whatsapp"; rev = "v${version}"; - sha256 = "1c77f3ffm6m9j8q9p1hb9i8zrqqpvfkr9ffamly44gs7xddmv9sv"; + sha256 = "sha256-RkMgzYu6r30uqUCtCS/FuvJQiTInRYWiWhlTtDQQh5g="; }; buildInputs = [ olm ]; - vendorSha256 = "01yr5321paqifmgzz235lknsa0w4hbs3182y6pxw8hqsvh18c48b"; + vendorSha256 = "sha256-p6TW5ACXjqCR5IAVleMEIWYW4SHI1ZRL5KJFZpPc7yU="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix index f1cefdc0b1..a3e85e2b82 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix @@ -1,37 +1,21 @@ -{ stdenv -, lib -, buildGoModule -, fetchFromGitHub -, makeWrapper -, nixosTests -, systemd -, fetchpatch +{ stdenv, lib, buildGoModule, fetchFromGitHub, makeWrapper, nixosTests, systemd }: buildGoModule rec { - version = "2.0.0"; + version = "2.1.0"; pname = "grafana-loki"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "loki"; - sha256 = "09a0mqdmk754vigd1xqijzwazwrmfaqcgdr2c6dz25p7a65568hj"; + sha256 = "O/3079a67j1i9pgf18SBx0iJcQPVmb0H+K/PzQVBCDQ="; }; vendorSha256 = null; subPackages = [ "..." ]; - patches = [ - (fetchpatch { - # Fix expected return value in Test_validateDropConfig - # https://github.com/grafana/loki/issues/2519 - url = "https://github.com/grafana/loki/commit/1316c0f0c5cda7c272c4873ea910211476fc1db8.patch"; - sha256 = "06hwga58qpmivbhyjgyqzb75602hy8212a4b5vh99y9pnn6c913h"; - }) - ]; - nativeBuildInputs = [ makeWrapper ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ systemd.dev ]; diff --git a/third_party/nixpkgs/pkgs/servers/roundcube/default.nix b/third_party/nixpkgs/pkgs/servers/roundcube/default.nix index 98ce4f25a2..05604e936c 100644 --- a/third_party/nixpkgs/pkgs/servers/roundcube/default.nix +++ b/third_party/nixpkgs/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.4.9"; + version = "1.4.10"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "1cpcr3abjq1f2af0ca571y976yni48z3rh3x146c6ninl5ip9b4z"; + sha256 = "03sjvmnrspkiq0w73xvp1w61pcxhv0djrdm3mvs8h0dp9pfc1n53"; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; diff --git a/third_party/nixpkgs/pkgs/servers/trezord/default.nix b/third_party/nixpkgs/pkgs/servers/trezord/default.nix index a6841f7fab..b89abfc615 100644 --- a/third_party/nixpkgs/pkgs/servers/trezord/default.nix +++ b/third_party/nixpkgs/pkgs/servers/trezord/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { propagatedBuildInputs = [ trezor-udev-rules ]; meta = with stdenv.lib; { - description = "TREZOR Communication Daemon aka TREZOR Bridge"; + description = "Trezor Communication Daemon aka Trezor Bridge"; homepage = "https://trezor.io"; license = licenses.lgpl3; maintainers = with maintainers; [ canndrew jb55 prusnak mmahut _1000101 ]; diff --git a/third_party/nixpkgs/pkgs/servers/unifi/default.nix b/third_party/nixpkgs/pkgs/servers/unifi/default.nix index 3072b44e4a..b354fd994c 100644 --- a/third_party/nixpkgs/pkgs/servers/unifi/default.nix +++ b/third_party/nixpkgs/pkgs/servers/unifi/default.nix @@ -38,23 +38,21 @@ let }; }; -in { - - # https://community.ui.com/releases / https://www.ui.com/download/unifi - # Outdated FAQ: https://help.ubnt.com/hc/en-us/articles/115000441548-UniFi-Current-Controller-Versions +in rec { + # see https://community.ui.com/releases / https://www.ui.com/download/unifi unifiLTS = generic { version = "5.6.42"; sha256 = "0wxkv774pw43c15jk0sg534l5za4j067nr85r5fw58iar3w2l84x"; }; - unifiStable = generic { + unifi5 = generic { version = "5.14.23"; sha256 = "1aar05yjm3z5a30x505w4kakbyz35i7mk7xyg0wm4ml6h94d84pv"; }; - unifiBeta = generic { - version = "6.0.36"; - sha256 = "1sjf4jd8jkf6194ahwqjxd2ip0r70bdk15gci1qrdw88agab143j"; + unifi6 = generic { + version = "6.0.43"; + sha256 = "1d9pw4f20pr4jb1xb43p7ycafv13ld1h40r05qg82029ml1s7jky"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix index 0e39895d39..9fdaafbd24 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix @@ -3,13 +3,13 @@ mkYarnPackage rec { name = "hedgedoc"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "hedgedoc"; repo = "hedgedoc"; rev = version; - sha256 = "1zz5ni9cp1dhcvcrzks13pww5qm2wna2hh0k59pfz7c897rs1l7v"; + sha256 = "0axad5581v25pynfj6pgy0h1xp92dyllnc7mk42z6hxbs4sgkrw1"; }; nativeBuildInputs = [ which makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/package.json b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/package.json index e90ec03c4e..3e8046bbec 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/package.json +++ b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/package.json @@ -1,6 +1,6 @@ { "name": "HedgeDoc", - "version": "1.7.0", + "version": "1.7.1", "description": "The best platform to write and share markdown.", "main": "app.js", "license": "AGPL-3.0", @@ -43,6 +43,7 @@ "express": ">=4.14", "express-session": "^1.14.2", "file-saver": "^1.3.3", + "file-type": "^16.1.0", "flowchart.js": "^1.6.4", "fork-awesome": "^1.1.3", "formidable": "^1.0.17", @@ -111,6 +112,7 @@ "readline-sync": "^1.4.7", "request": "^2.88.0", "reveal.js": "^3.9.2", + "rimraf": "^3.0.2", "scrypt-async": "^2.0.1", "scrypt-kdf": "^2.0.1", "select2": "^3.5.2-browserify", diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.lock b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.lock index 9ff34ceead..f228af65b5 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.lock +++ b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.lock @@ -106,6 +106,11 @@ resolved "https://registry.yarnpkg.com/@passport-next/passport-strategy/-/passport-strategy-1.1.0.tgz#4c0df069e2ec9262791b9ef1e23320c1d73bdb74" integrity sha512-2KhFjtPueJG6xVj2HnqXt9BlANOfYCVLyu+pXYjPGBDT8yk+vQwc/6tsceIj+mayKcoxMau2JimggXRPHgoc8w== +"@tokenizer/token@^0.1.0", "@tokenizer/token@^0.1.1": + version "0.1.1" + resolved "https://registry.yarnpkg.com/@tokenizer/token/-/token-0.1.1.tgz#f0d92c12f87079ddfd1b29f614758b9696bc29e3" + integrity sha512-XO6INPbZCxdprl+9qa/AAbFFOMzzwqYxpjPgLICrMD6C2FCw6qfJOPcBk6JqqPLSaZ/Qx87qn4rpPmPMwaAK6w== + "@types/anymatch@*": version "1.3.1" resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a" @@ -126,6 +131,11 @@ dependencies: "@types/node" "*" +"@types/debug@^4.1.5": + version "4.1.5" + resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd" + integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ== + "@types/express-serve-static-core@*": version "4.17.13" resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.13.tgz#d9af025e925fc8b089be37423b8d1eac781be084" @@ -219,7 +229,7 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c" integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA== -"@types/readable-stream@^2.3.5": +"@types/readable-stream@^2.3.5", "@types/readable-stream@^2.3.9": version "2.3.9" resolved "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-2.3.9.tgz#40a8349e6ace3afd2dd1b6d8e9b02945de4566a9" integrity sha512-sqsgQqFT7HmQz/V5jH1O0fvQQnXAJO46Gg9LRO/JPfjmVmGUlcx831TZZO3Y3HtWhIkzf3kTsNT0Z0kzIhIvZw== @@ -837,9 +847,9 @@ atob@^2.1.2: integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== aws-sdk@^2.521.0: - version "2.815.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.815.0.tgz#515ead6d0d242f603171faf30c49142fd53a53d9" - integrity sha512-BXL3Og97rOY9jE7OeYQdKftMAZ3SneFg/rBslyog+W0dTDKq3NBuM3fBWhc3POf26kHcFjsnLIWScM8bWhD4AA== + version "2.817.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.817.0.tgz#3a97b690b0ec494cf8ee927affb3973cf26abcc8" + integrity sha512-DZIdWpkcqbqsCz0MEskHsyFaqc6Tk9XIFqXAg1AKHbOgC8nU45bz+Y2osX77pU01JkS/G7OhGtGmlKDrOPvFwg== dependencies: buffer "4.9.2" events "1.1.1" @@ -4266,6 +4276,16 @@ file-saver@^1.3.3: resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-1.3.8.tgz#e68a30c7cb044e2fb362b428469feb291c2e09d8" integrity sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg== +file-type@^16.1.0: + version "16.1.0" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-16.1.0.tgz#1c8a4458b2103e07d2b49ae7f76384abafe86529" + integrity sha512-G4Klqf6tuprtG0pC4r9kni4Wv8XhAAsfHphVqsQGA+YiOlPAO40BZduDqKfv0RFsu9q9ZbFObWfwszY/NqhEZw== + dependencies: + readable-web-to-node-stream "^3.0.0" + strtok3 "^6.0.3" + token-types "^2.0.0" + typedarray-to-buffer "^3.1.5" + file-uri-to-path@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" @@ -5677,7 +5697,7 @@ is-symbol@^1.0.2: dependencies: has-symbols "^1.0.1" -is-typedarray@~1.0.0: +is-typedarray@^1.0.0, is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= @@ -7962,6 +7982,11 @@ pdfobject@^2.0.201604172: resolved "https://registry.yarnpkg.com/pdfobject/-/pdfobject-2.2.4.tgz#ccb3c191129298a471e9ccb59c88a3ee0b7c7530" integrity sha512-r6Rw9CQWsrY6uqmKvlgFNoupmuRbSt9EsG0sZhSAy3cIk4WgOXyAVmebFSlLhqj6gA5NIEXL3lSEbwOOYfdUvw== +peek-readable@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-3.1.0.tgz#250b08b7de09db8573d7fd8ea475215bbff14348" + integrity sha512-KGuODSTV6hcgdZvDrIDBUkN0utcAVj1LL7FfGbM0viKTtCHmtZcuEJ+lGqsp0fTFkGqesdtemV2yUSMeyy3ddA== + performance-now@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" @@ -8777,6 +8802,14 @@ readable-stream@~2.0.0: string_decoder "~0.10.x" util-deprecate "~1.0.1" +readable-web-to-node-stream@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.0.tgz#4ca5408e70471069119d691934141a52de413955" + integrity sha512-HNmLb3n0SteGAs8HQlErYPGeO+y7cvL/mVUKtXeUkl0iCZ/2GIgKGrCFHyS7UXFnO8uc9U+0y3pYIzAPsjFfvA== + dependencies: + "@types/readable-stream" "^2.3.9" + readable-stream "^3.6.0" + readdir-glob@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/readdir-glob/-/readdir-glob-1.1.1.tgz#f0e10bb7bf7bfa7e0add8baffdc54c3f7dbee6c4" @@ -10464,6 +10497,15 @@ strip-json-comments@^2.0.1, strip-json-comments@~2.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= +strtok3@^6.0.3: + version "6.0.4" + resolved "https://registry.yarnpkg.com/strtok3/-/strtok3-6.0.4.tgz#ede0d20fde5aa9fda56417c3558eaafccc724694" + integrity sha512-rqWMKwsbN9APU47bQTMEYTPcwdpKDtmf1jVhHzNW2cL1WqAxaM9iBb9t5P2fj+RV2YsErUWgQzHD5JwV0uCTEQ== + dependencies: + "@tokenizer/token" "^0.1.1" + "@types/debug" "^4.1.5" + peek-readable "^3.1.0" + stylehacks@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz#6718fcaf4d1e07d8a1318690881e8d96726a71d5" @@ -10767,6 +10809,14 @@ toidentifier@1.0.0: resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== +token-types@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/token-types/-/token-types-2.0.0.tgz#b23618af744818299c6fbf125e0fdad98bab7e85" + integrity sha512-WWvu8sGK8/ZmGusekZJJ5NM6rRVTTDO7/bahz4NGiSDb/XsmdYBn6a1N/bymUHuWYTWeuLUg98wUzvE4jPdCZw== + dependencies: + "@tokenizer/token" "^0.1.0" + ieee754 "^1.1.13" + toobusy-js@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/toobusy-js/-/toobusy-js-0.5.1.tgz#5511f78f6a87a6a512d44fdb0efa13672217f659" @@ -10896,6 +10946,13 @@ type@^2.0.0: resolved "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz#9bdc22c648cf8cf86dd23d32336a41cfb6475e3f" integrity sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA== +typedarray-to-buffer@^3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" + integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== + dependencies: + is-typedarray "^1.0.0" + typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.nix b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.nix index 01ca86f3b1..340341d0f1 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.nix @@ -113,6 +113,14 @@ sha1 = "4c0df069e2ec9262791b9ef1e23320c1d73bdb74"; }; } + { + name = "_tokenizer_token___token_0.1.1.tgz"; + path = fetchurl { + name = "_tokenizer_token___token_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/@tokenizer/token/-/token-0.1.1.tgz"; + sha1 = "f0d92c12f87079ddfd1b29f614758b9696bc29e3"; + }; + } { name = "_types_anymatch___anymatch_1.3.1.tgz"; path = fetchurl { @@ -137,6 +145,14 @@ sha1 = "31610c901eca573b8713c3330abc6e6b9f588546"; }; } + { + name = "_types_debug___debug_4.1.5.tgz"; + path = fetchurl { + name = "_types_debug___debug_4.1.5.tgz"; + url = "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz"; + sha1 = "b14efa8852b7768d898906613c23f688713e02cd"; + }; + } { name = "_types_express_serve_static_core___express_serve_static_core_4.17.13.tgz"; path = fetchurl { @@ -1010,11 +1026,11 @@ }; } { - name = "aws_sdk___aws_sdk_2.815.0.tgz"; + name = "aws_sdk___aws_sdk_2.817.0.tgz"; path = fetchurl { - name = "aws_sdk___aws_sdk_2.815.0.tgz"; - url = "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.815.0.tgz"; - sha1 = "515ead6d0d242f603171faf30c49142fd53a53d9"; + name = "aws_sdk___aws_sdk_2.817.0.tgz"; + url = "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.817.0.tgz"; + sha1 = "3a97b690b0ec494cf8ee927affb3973cf26abcc8"; }; } { @@ -4521,6 +4537,14 @@ sha1 = "e68a30c7cb044e2fb362b428469feb291c2e09d8"; }; } + { + name = "file_type___file_type_16.1.0.tgz"; + path = fetchurl { + name = "file_type___file_type_16.1.0.tgz"; + url = "https://registry.yarnpkg.com/file-type/-/file-type-16.1.0.tgz"; + sha1 = "1c8a4458b2103e07d2b49ae7f76384abafe86529"; + }; + } { name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; path = fetchurl { @@ -8801,6 +8825,14 @@ sha1 = "ccb3c191129298a471e9ccb59c88a3ee0b7c7530"; }; } + { + name = "peek_readable___peek_readable_3.1.0.tgz"; + path = fetchurl { + name = "peek_readable___peek_readable_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/peek-readable/-/peek-readable-3.1.0.tgz"; + sha1 = "250b08b7de09db8573d7fd8ea475215bbff14348"; + }; + } { name = "performance_now___performance_now_2.1.0.tgz"; path = fetchurl { @@ -9697,6 +9729,14 @@ sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; }; } + { + name = "readable_web_to_node_stream___readable_web_to_node_stream_3.0.0.tgz"; + path = fetchurl { + name = "readable_web_to_node_stream___readable_web_to_node_stream_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.0.tgz"; + sha1 = "4ca5408e70471069119d691934141a52de413955"; + }; + } { name = "readdir_glob___readdir_glob_1.1.1.tgz"; path = fetchurl { @@ -11401,6 +11441,14 @@ sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; } + { + name = "strtok3___strtok3_6.0.4.tgz"; + path = fetchurl { + name = "strtok3___strtok3_6.0.4.tgz"; + url = "https://registry.yarnpkg.com/strtok3/-/strtok3-6.0.4.tgz"; + sha1 = "ede0d20fde5aa9fda56417c3558eaafccc724694"; + }; + } { name = "stylehacks___stylehacks_4.0.3.tgz"; path = fetchurl { @@ -11697,6 +11745,14 @@ sha1 = "7e1be3470f1e77948bc43d94a3c8f4d7752ba553"; }; } + { + name = "token_types___token_types_2.0.0.tgz"; + path = fetchurl { + name = "token_types___token_types_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/token-types/-/token-types-2.0.0.tgz"; + sha1 = "b23618af744818299c6fbf125e0fdad98bab7e85"; + }; + } { name = "toobusy_js___toobusy_js_0.5.1.tgz"; path = fetchurl { @@ -11873,6 +11929,14 @@ sha1 = "9bdc22c648cf8cf86dd23d32336a41cfb6475e3f"; }; } + { + name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; + path = fetchurl { + name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; + url = "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; + sha1 = "a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"; + }; + } { name = "typedarray___typedarray_0.0.6.tgz"; path = fetchurl { diff --git a/third_party/nixpkgs/pkgs/shells/ion/default.nix b/third_party/nixpkgs/pkgs/shells/ion/default.nix index f84f150bc5..c2cc626bd3 100644 --- a/third_party/nixpkgs/pkgs/shells/ion/default.nix +++ b/third_party/nixpkgs/pkgs/shells/ion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "ion"; @@ -20,6 +20,10 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ dywedir ]; }; + buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin [ + Security + ]; + passthru = { shellPath = "/bin/ion"; }; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix index 38236c117e..4e377218b7 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2020-12-16"; + version = "2020-12-28"; pname = "oh-my-zsh"; - rev = "b28665aebb4c1b07a57890eb59551bc51d0acf37"; + rev = "4b2431e8b1c08a2dc14fe31bf07a5e5f08eaa87e"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "00m8d992jhbkd8mhm6zhirk9ga3dfzhh8idn2yp40yk7wdbzrd74"; + sha256 = "09776acglph64lg9x1f1ypglbbhknrqidq47zk95vksd1in8l3is"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix index 759613553f..aab4d1180e 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix @@ -5,6 +5,7 @@ , pixman , xcbutil , xcbutilimage +, libseccomp , libjpeg , libpng , libXpm @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ pixman xcbutilimage xcbutil libjpeg libpng libXpm ]; + buildInputs = [ pixman xcbutilimage xcbutil libseccomp libjpeg libpng libXpm ]; meta = with stdenv.lib; { homepage = "https://github.com/stoeckmann/xwallpaper"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix index 4f28a6d744..9c7f9936e5 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix @@ -28,11 +28,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.18.203"; # N.B: if you change this, change botocore to a matching version too + version = "1.18.204"; # N.B: if you change this, change botocore to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-afcXbYKRc9w0Zbuyg/bDA/J/lHm4N4FttUgGk4h4H4k="; + sha256 = "sha256-YAyqRJbETCagcME63dt5b9WDRj6tq8Gdwk6qyAd86lE="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/admin/chamber/default.nix b/third_party/nixpkgs/pkgs/tools/admin/chamber/default.nix index 7a80ed3718..c2126181f3 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/chamber/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/chamber/default.nix @@ -1,15 +1,23 @@ -{ buildGoModule, lib, fetchFromGitHub }: +{ buildGoModule, lib, fetchFromGitHub, fetchpatch }: + buildGoModule rec { pname = "chamber"; - version = "2.8.2"; + version = "2.9.0"; src = fetchFromGitHub { owner = "segmentio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7L9RaE4LvHRR6MUimze5QpbnfasWJdY4arfS/Usy2q0="; + sha256 = "eOMY9P/fCYvnl6KGNb6wohykLA0Sj9Ti0L18gx5dqUk="; }; + patches = [ + (fetchpatch { + url = "https://github.com/segmentio/chamber/commit/3aeb416cdf4c232552b653262e37047fc13b1f02.patch"; + sha256 = "cyxNF9ZP4oG+1sfX9yWZCyntpAvwYUh5BzTirZQGejc="; + }) + ]; + vendorSha256 = null; # set the version. see: chamber's Makefile diff --git a/third_party/nixpkgs/pkgs/tools/audio/aucdtect/default.nix b/third_party/nixpkgs/pkgs/tools/audio/aucdtect/default.nix deleted file mode 100644 index ad9d5fb869..0000000000 --- a/third_party/nixpkgs/pkgs/tools/audio/aucdtect/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, lib, rpmextract }: - -with lib; - -stdenv.mkDerivation rec { - pname = "aucdtect"; - version = "0.8-2"; - - src = fetchurl { - url = "http://www.true-audio.com/ftp/${pname}-${version}.i586.rpm"; - sha256 = "1lp5f0rq5b5n5il0c64m00gcfskarvgqslpryms9443d200y6mmd"; - }; - - unpackCmd = "${rpmextract}/bin/rpmextract $src"; - - installPhase = '' - runHook preInstall - - install -Dm755 local/bin/auCDtect $out/bin/aucdtect - - runHook postInstall - ''; - - dontStrip = true; - - meta = with stdenv.lib; { - description = "Verify authenticity of lossless audio files"; - homepage = "http://tausoft.org"; - license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix b/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix index 1f62834e4d..c29af7b2fd 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix @@ -19,11 +19,11 @@ let in pythonPackages.buildPythonApplication rec { pname = "duplicity"; - version = "0.8.13"; + version = "0.8.15"; src = fetchurl { url = "https://code.launchpad.net/duplicity/${majorMinor version}-series/${majorMinorPatch version}/+download/duplicity-${version}.tar.gz"; - sha256 = "0lflg1ay4q4w9qzpmh6y2hza4fc3ig12q44qkd80ks17hj21bxa6"; + sha256 = "1kg467mxg5a97v1rlv4shk32krgv8ys4nczq4b11av4bp1lgysdc"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch b/third_party/nixpkgs/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch index a3ba142291..c02527cf39 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch +++ b/third_party/nixpkgs/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch @@ -38,12 +38,12 @@ # """ERROR 2 --- a/testing/functional/test_rdiffdir.py +++ b/testing/functional/test_rdiffdir.py -@@ -38,7 +38,7 @@ class RdiffdirTest(FunctionalTestCase): - - def run_rdiffdir(self, argstring): - u"""Run rdiffdir with given arguments""" -- self.run_cmd(u"../bin/rdiffdir " + argstring) -+ self.run_cmd(u"rdiffdir " + argstring) - - def run_cycle(self, dirname_list): - u"""Run diff/patch cycle on directories in dirname_list""" +@@ -42,7 +42,7 @@ class RdiffdirTest(FunctionalTestCase): + basepython = os.environ.get(u'TOXPYTHON', None) + if basepython is not None: + cmd_list.extend([basepython]) +- cmd_list.extend([u"../bin/rdiffdir"]) ++ cmd_list.extend([u"rdiffdir"]) + cmd_list.extend(argstring.split()) + cmdline = u" ".join([u'"%s"' % x for x in cmd_list]) + self.run_cmd(cmdline) diff --git a/third_party/nixpkgs/pkgs/tools/misc/agedu/default.nix b/third_party/nixpkgs/pkgs/tools/misc/agedu/default.nix index c9bad789ad..3cdfa36337 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/agedu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/agedu/default.nix @@ -1,15 +1,17 @@ {stdenv, fetchgit, autoreconfHook, halibut}: let - date = "20200206"; - rev = "963bc9d"; + date = "20200705"; + rev = "2a7d4a2"; in stdenv.mkDerivation { - name = "agedu-${date}.${rev}"; + pname = "agedu"; + version = "${date}.${rev}"; + # upstream provides tarballs but it seems they disappear after the next version is released src = fetchgit { url = "https://git.tartarus.org/simon/agedu.git"; inherit rev; - sha256 = "1jmvgg2v6aqgbgpxbndrdhgfhlglrq4yv4sdbjaj6bsz9fb8lqhc"; + sha256 = "gRNscl/vhBoZaHFCs9JjDBHDRoEpILJLtiI4YV+K/b4="; }; nativeBuildInputs = [autoreconfHook halibut]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/barman/default.nix b/third_party/nixpkgs/pkgs/tools/misc/barman/default.nix index 2105ad0ae0..da79110f9a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/barman/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/barman/default.nix @@ -4,12 +4,12 @@ buildPythonApplication rec { pname = "barman"; - version = "2.11"; + version = "2.12"; outputs = [ "out" "man" ]; src = fetchurl { url = "mirror://sourceforge/pgbarman/${version}/barman-${version}.tar.gz"; - sha256 = "0w5lh4aavab9ynfy2mq09ga6j4vss4k0vlc3g6f5a9i4175g9pmr"; + sha256 = "Ts8I6tlP2GRp90OIIKXy+cRWWvUO3Sm86zq2dtVP5YE="; }; propagatedBuildInputs = [ dateutil argh psycopg2 boto3 argcomplete ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/calamares/default.nix b/third_party/nixpkgs/pkgs/tools/misc/calamares/default.nix index 815129f7f0..a671090460 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/calamares/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/calamares/default.nix @@ -6,16 +6,17 @@ mkDerivation rec { pname = "calamares"; - version = "3.2.17.1"; + version = "3.2.35.1"; # release including submodule src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "156zpjyw8w4y23aa60mvg3d3mr0kzfq5jkl7ixgahq33zpc17ms8"; + sha256 = "s2wnwcdrcJLG5NhugSkntBCYfPuv3T/9+PclbmK0BJ4="; }; + nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ - boost cmake extra-cmake-modules kparts.dev kpmcore.out kservice.dev + boost kparts.dev kpmcore.out kservice.dev libatasmart libxcb libyamlcpp parted polkit-qt python qtbase qtquickcontrols qtsvg qttools qtwebengine.dev util-linux ]; @@ -32,18 +33,14 @@ mkDerivation rec { POLKITQT-1_POLICY_FILES_INSTALL_DIR = "$(out)/share/polkit-1/actions"; - patchPhase = '' + postPatch = '' sed -e "s,/usr/bin/calamares,$out/bin/calamares," \ -i calamares.desktop \ -i com.github.calamares.calamares.policy sed -e 's,/usr/share/zoneinfo,${tzdata}/share/zoneinfo,' \ - -i src/modules/locale/timezonewidget/localeconst.h \ -i src/modules/locale/SetTimezoneJob.cpp - sed -e 's,/usr/share/i18n/locales,${glibc.out}/share/i18n/locales,' \ - -i src/modules/locale/timezonewidget/localeconst.h - sed -e 's,/usr/share/X11/xkb/rules/base.lst,${xkeyboard_config}/share/X11/xkb/rules/base.lst,' \ -i src/modules/keyboard/keyboardwidget/keyboardglobal.h @@ -56,8 +53,8 @@ mkDerivation rec { meta = with lib; { description = "Distribution-independent installer framework"; - license = licenses.gpl3; - maintainers = with lib.maintainers; [ manveru ]; + license = with licenses; [ gpl3Plus bsd2 ]; + maintainers = with maintainers; [ manveru ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/clac/default.nix b/third_party/nixpkgs/pkgs/tools/misc/clac/default.nix index 8aea37ebdd..8d6e464e9b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/clac/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/clac/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchFromGitHub }: + stdenv.mkDerivation rec { pname = "clac"; - version = "0.0.0.20170503"; + version = "0.3.3"; src = fetchFromGitHub { owner = "soveran"; repo = "clac"; - rev = "e92bd5cbab0d694cef945e3478820c9505e06f04"; - sha256 = "0j8p1npgq32s377c9lw959h5i2csq4yb27cvg7av17bji46816bv"; + rev = version; + sha256 = "rsag8MWl/udwXC0Gj864fAuQ6ts1gzrN2N/zelazqjE="; }; makeFlags = [ "PREFIX=$(out)" ]; @@ -17,12 +18,12 @@ stdenv.mkDerivation rec { cp README* LICENSE "$out/share/doc/${pname}" ''; - meta = { + meta = with stdenv.lib; { inherit version; description = "Interactive stack-based calculator"; - license = stdenv.lib.licenses.bsd2; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; homepage = "https://github.com/soveran/clac"; + license = licenses.bsd2; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/hdf4/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hdf4/default.nix index 5e5154111d..b15eba8b7b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hdf4/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/hdf4/default.nix @@ -1,6 +1,7 @@ { stdenv , fetchpatch , fetchurl +, fixDarwinDylibNames , cmake , libjpeg , zlib @@ -17,6 +18,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + fixDarwinDylibNames ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix index 2b252dabb5..abb17946fb 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2020.12.26"; + version = "2020.12.29"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1kqfrci4qg6bx7ywzppidjqxsx1c4l5psmwqcylw66bs0s442fwy"; + sha256 = "1hcr3mf63csp6lfpqszl5ibb2jhyl180s6pvbb7771jg0kdvlbbb"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/zalgo/default.nix b/third_party/nixpkgs/pkgs/tools/misc/zalgo/default.nix new file mode 100644 index 0000000000..d9538141af --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/zalgo/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "zalgo"; + version = "unstable-2020-08-26"; + + src = fetchFromGitHub { + owner = "lunasorcery"; + repo = "zalgo"; + rev = "6aa1f66cfe183f8164a666730dfeaf39133cf01a"; + sha256 = "00q56yvfcj2f89wllrckvizihivqmd6l77nihb52ffqd99rdd24w"; + }; + + installPhase = '' + install -Dm755 zalgo -t $out/bin + ''; + + meta = with stdenv.lib; { + description = "Read stdin and corrupt it with combining diacritics"; + homepage = "https://github.com/lunasorcery/zalgo"; + license = licenses.unfree; + platforms = platforms.unix; + maintainers = with maintainers; [ djanatyn ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/cjdns/default.nix b/third_party/nixpkgs/pkgs/tools/networking/cjdns/default.nix index 28a418c27f..8cc891cce1 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/cjdns/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/cjdns/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cjdns"; - version = "21"; + version = "21.1"; src = fetchFromGitHub { owner = "cjdelisle"; repo = "cjdns"; rev = "cjdns-v${version}"; - sha256 = "1s9d8yrdrj2gviig05jhr0fnzazb88lih0amxfk0av786rvh7ymj"; + sha256 = "NOmk+vMZ8i0E2MjrUzksk+tkJ9XVVNEXlE5OOTNa+Y0="; }; buildInputs = [ which python27 nodejs ] ++ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://github.com/cjdelisle/cjdns"; description = "Encrypted networking for regular people"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ ehmry ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/kapp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/kapp/default.nix new file mode 100644 index 0000000000..1307633852 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/kapp/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub }: +buildGoModule rec { + pname = "kapp"; + version = "0.35.0"; + + src = fetchFromGitHub { + owner = "vmware-tanzu"; + repo = "carvel-kapp"; + rev = "v${version}"; + sha256 = "1i4hpqpbwqb0yg3rx4z733zfslq3svmahfr39ss1ydylsipl02mg"; + }; + + vendorSha256 = null; + + subPackages = [ "cmd/kapp" ]; + + meta = with lib; { + description = "CLI tool that encourages Kubernetes users to manage bulk resources with an application abstraction for grouping"; + homepage = "https://get-kapp.io"; + license = licenses.asl20; + maintainers = with maintainers; [ brodes ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/qrcp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/qrcp/default.nix index 0cfc78d69d..bf3b3936ed 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/qrcp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/qrcp/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "qrcp"; - version = "0.6.4"; + version = "0.7.0"; src = fetchFromGitHub { owner = "claudiodangelis"; repo = "qrcp"; rev = version; - sha256 = "08fjy9mskf6n1zldc63fjm5x617qqx987a58cjav03apzfwzvvhg"; + sha256 = "0rx0pzy7p3dklayr2lkmyfdc00x9v4pd5xnzydbjx12hncnkpw4l"; }; vendorSha256 = "0iffy43x3njcahrxl99a71v8p7im102nzv8iqbvd5c6m14rsckqa"; diff --git a/third_party/nixpkgs/pkgs/tools/security/dnsx/default.nix b/third_party/nixpkgs/pkgs/tools/security/dnsx/default.nix new file mode 100644 index 0000000000..21bf7d4664 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/dnsx/default.nix @@ -0,0 +1,31 @@ +{ buildGoModule +, fetchFromGitHub +, stdenv +}: + +buildGoModule rec { + pname = "dnsx"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "projectdiscovery"; + repo = "dnsx"; + rev = "v${version}"; + sha256 = "1pgq21pbnz2dm272zrhd455njj5vg4kywpd230acj675nlgir6y1"; + }; + + vendorSha256 = "0j2cqvskzxbyfrvsv4gm4qwfjm0digizcg157z5iignnknddajax"; + + meta = with stdenv.lib; { + description = "Fast and multi-purpose DNS toolkit"; + longDescription = '' + dnsx is a fast and multi-purpose DNS toolkit allow to run multiple + probers using retryabledns library, that allows you to perform + multiple DNS queries of your choice with a list of user supplied + resolvers. + ''; + homepage = "https://github.com/projectdiscovery/dnsx"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/ffuf/default.nix b/third_party/nixpkgs/pkgs/tools/security/ffuf/default.nix new file mode 100644 index 0000000000..77a286df4c --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/ffuf/default.nix @@ -0,0 +1,34 @@ +{ buildGoModule +, fetchFromGitHub +, stdenv +}: + +buildGoModule rec { + pname = "ffuf"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "1jb2x0ybcb9zkqm7flpmr0hd3171xvnn6kxmfcgds4x8l9fbmxnr"; + }; + + vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + + # tests don't pass due to an issue with the memory addresses + # https://github.com/ffuf/ffuf/issues/367 + doCheck = false; + + meta = with stdenv.lib; { + description = "Fast web fuzzer written in Go"; + longDescription = '' + FFUF, or “Fuzz Faster you Fool” is an open source web fuzzing tool, + intended for discovering elements and content within web applications + or web servers. + ''; + homepage = "https://github.com/ffuf/ffuf"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/gau/default.nix b/third_party/nixpkgs/pkgs/tools/security/gau/default.nix new file mode 100644 index 0000000000..cfbae95152 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/gau/default.nix @@ -0,0 +1,29 @@ +{ buildGoModule +, fetchFromGitHub +, stdenv +}: + +buildGoModule rec { + pname = "gau"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "lc"; + repo = pname; + rev = "v${version}"; + sha256 = "1srbql603vvlxc6p1ibw0982icdq9kcr1iamxlr8bmgldbm8215w"; + }; + + vendorSha256 = "17ag2wvaxv2dyx3yx3fvlf36ww4a44660pn4gvpbrwacsan9as5s"; + + meta = with stdenv.lib; { + description = "Tool to fetch known URLs"; + longDescription = '' + getallurls (gau) fetches known URLs from various sources for any + given domain. + ''; + homepage = "https://github.com/lc/gau"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/gospider/default.nix b/third_party/nixpkgs/pkgs/tools/security/gospider/default.nix new file mode 100644 index 0000000000..7211c65d53 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/gospider/default.nix @@ -0,0 +1,33 @@ +{ buildGoModule +, fetchFromGitHub +, stdenv +}: + +buildGoModule rec { + pname = "gospider"; + version = "1.1.4"; + + src = fetchFromGitHub { + owner = "jaeles-project"; + repo = pname; + rev = "${version}"; + sha256 = "03gl8y2047iwa6bhmayyds3li21wy3sw1x4hpp9zgqgi95039q86"; + }; + + vendorSha256 = "0dc4ddi26i38c5rvy9zbal27a7qvn17h64w1yhbig4iyb79b18ym"; + + # tests require internet access and API keys + doCheck = false; + + meta = with stdenv.lib; { + description = "Fast web spider written in Go"; + longDescription = '' + GoSpider is a fast web crawler that parses sitemap.xml and robots.txt file. + It can generate and verify link from JavaScript files, extract URLs from + various sources and can detect subdomains from the response source. + ''; + homepage = "https://github.com/jaeles-project/gospider"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix b/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix new file mode 100644 index 0000000000..c7d83075e9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix @@ -0,0 +1,30 @@ +{ buildGoModule +, fetchFromGitHub +, stdenv +}: + +buildGoModule rec { + pname = "httpx"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "projectdiscovery"; + repo = "httpx"; + rev = "v${version}"; + sha256 = "15ihc5926kbai16i59c7bmvgd162qq9dpd52g4vrp7dq4jrz155m"; + }; + + vendorSha256 = "0fg93vhwpx113fpw8qg4ram4bdh6a8x3a36pr1c962s4vhrabwy2"; + + meta = with stdenv.lib; { + description = "Fast and multi-purpose HTTP toolkit"; + longDescription = '' + httpx is a fast and multi-purpose HTTP toolkit allow to run multiple + probers using retryablehttp library, it is designed to maintain the + result reliability with increased threads. + ''; + homepage = "https://github.com/projectdiscovery/httpx"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix b/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix new file mode 100644 index 0000000000..22013352a3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix @@ -0,0 +1,36 @@ +{ buildGoModule +, fetchFromGitHub +, stdenv +}: + +buildGoModule rec { + pname = "nuclei"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "projectdiscovery"; + repo = "nuclei"; + rev = "v${version}"; + sha256 = "0xrvza86aczlnb11x58fiqch5g0q6gvpxwsi5dq3akfi95gk3a3x"; + }; + + vendorSha256 = "1v3ax8l1lgp2vs50gsa2fhdd6bvyfdlkd118akrqmwxahyyyqycv"; + + preBuild = '' + mv v2/* . + ''; + + meta = with stdenv.lib; { + description = "Tool for configurable targeted scanning"; + longDescription = '' + Nuclei is used to send requests across targets based on a template + leading to zero false positives and providing effective scanning + for known paths. Main use cases for nuclei are during initial + reconnaissance phase to quickly check for low hanging fruits or + CVEs across targets that are known and easily detectable. + ''; + homepage = "https://github.com/projectdiscovery/nuclei"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/onlykey-cli/default.nix b/third_party/nixpkgs/pkgs/tools/security/onlykey-cli/default.nix new file mode 100644 index 0000000000..b342f203b4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/onlykey-cli/default.nix @@ -0,0 +1,24 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "onlykey-cli"; + version = "1.2.2"; + + src = python3Packages.fetchPypi { + inherit version; + pname = "onlykey"; + sha256 = "1qkbgab5xlg7bd0jfzf8k5ppb1zhib76r050fiaqi5wibrqrfwdi"; + }; + + # Requires having the physical onlykey (a usb security key) + doCheck = false; + propagatedBuildInputs = + with python3Packages; [ hidapi aenum six prompt_toolkit pynacl ecdsa cython ]; + + meta = with lib; { + description = "OnlyKey client and command-line tool"; + homepage = "https://github.com/trustcrypto/python-onlykey"; + license = licenses.mit; + maintainers = with maintainers; [ ranfdev ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix index 017066a2c2..ecd25bf8e8 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lowdown"; - version = "0.7.4"; + version = "0.7.5"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; - sha512 = "2iw5x3lf5knnscp0ifgk50yj48p54cbd34h94qrxa9vdybg2nnipklrqmmqblf6l7qph98h7jvlyr99m5qlrki9lvjr1jcgbgp31pn0"; + sha512 = "1wfbrydbk0f0blhg5my3m5gw8bspwh3rdg4w4mcalnrwpypzd4zrggc4aj3zm72c5jikx6pnjb2k9w1s075k84f6q8p8chlzb3s4qd2"; }; nativeBuildInputs = [ which ]; diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index ff17f73f92..6e5da1bf34 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -61,6 +61,7 @@ mapAliases ({ asterisk_15 = throw "asterisk_15: Asterisk 15 is end of life and has been removed."; # added 2020-10-07 at_spi2_atk = at-spi2-atk; # added 2018-02-25 at_spi2_core = at-spi2-core; # added 2018-02-25 + aucdtect = throw "aucdtect: Upstream no longer provides download urls."; # added 2020-12-26 avldrums-lv2 = x42-avldrums; # added 2020-03-29 bar-xft = lemonbar-xft; # added 2015-01-16 bashCompletion = bash-completion; # Added 2016-09-28 @@ -500,6 +501,7 @@ mapAliases ({ qtcurve = libsForQt5.qtcurve; # added 2020-11-07 qtpfsgui = throw "qtpfsgui is now luminanceHDR"; # added 2019-06-26 quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # added 2020-04-09 + raspberrypi-tools = throw "raspberrypi-tools has been removed in favor of identical 'libraspberrypi'"; # added 2020-12-24 rdf4store = throw "rdf4store has been removed from nixpkgs."; # added 2019-12-21 rdiff_backup = rdiff-backup; # added 2014-11-23 rdmd = dtools; # added 2017-08-19 @@ -571,6 +573,7 @@ mapAliases ({ smugline = throw "smugline has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # added 2020-11-04 slim = throw "slim has been removed. Please use a different display-manager"; # added 2019-11-11 slimThemes = throw "slimThemes has been removed because slim has been also"; # added 2019-11-11 + spectral = neochat; # added 2020-12-27 sundials_3 = throw "sundials_3 was removed in 2020-02. outdated and no longer needed"; # added 2020-02-10 @@ -663,6 +666,7 @@ mapAliases ({ ucsFonts = ucs-fonts; # added 2016-07-15 ultrastardx-beta = ultrastardx; # added 2017-08-12 unicorn-emu = unicorn; # added 2020-10-29 + unifiStable = unifi6; # added 2020-12-28 usb_modeswitch = usb-modeswitch; # added 2016-05-10 usbguard-nox = usbguard; # added 2019-09-04 utillinux = util-linux; # added 2020-11-24 diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 6bbb0f199c..6619845898 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -222,6 +222,8 @@ in ptags = callPackage ../development/tools/misc/ptags { }; + ptouch-print = callPackage ../misc/ptouch-print { }; + demoit = callPackage ../servers/demoit { }; deviceTree = callPackage ../os-specific/linux/device-tree {}; @@ -1305,6 +1307,8 @@ in gopass = callPackage ../tools/security/gopass { }; + gospider = callPackage ../tools/security/gospider { }; + browserpass = callPackage ../tools/security/browserpass { }; passff-host = callPackage ../tools/security/passff-host { }; @@ -3379,6 +3383,8 @@ in dnstop = callPackage ../tools/networking/dnstop { }; + dnsx = callPackage ../tools/security/dnsx { }; + dhcp = callPackage ../tools/networking/dhcp { }; dhcpdump = callPackage ../tools/networking/dhcpdump { }; @@ -4147,6 +4153,8 @@ in garmintools = callPackage ../development/libraries/garmintools {}; + gau = callPackage ../tools/security/gau { }; + gauge = callPackage ../development/tools/gauge { }; gawk = callPackage ../tools/text/gawk { @@ -4752,6 +4760,8 @@ in httptunnel = callPackage ../tools/networking/httptunnel { }; + httpx = callPackage ../tools/security/httpx { }; + hubicfuse = callPackage ../tools/filesystems/hubicfuse { }; humanfriendly = with python3Packages; toPythonApplication humanfriendly; @@ -5246,6 +5256,8 @@ in lvmsync = callPackage ../tools/backup/lvmsync { }; + kapp = callPackage ../tools/networking/kapp {}; + kdbg = libsForQt5.callPackage ../development/tools/misc/kdbg { }; kippo = callPackage ../servers/kippo { }; @@ -6204,6 +6216,8 @@ in oathToolkit = callPackage ../tools/security/oath-toolkit { }; + oatpp = callPackage ../development/libraries/oatpp { }; + obex_data_server = callPackage ../tools/bluetooth/obex-data-server { }; obexd = callPackage ../tools/bluetooth/obexd { }; @@ -6257,6 +6271,8 @@ in onioncircuits = callPackage ../tools/security/onioncircuits { }; + onlykey-cli = callPackage ../tools/security/onlykey-cli { }; + openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { }; openapi-generator-cli-unstable = callPackage ../tools/networking/openapi-generator-cli/unstable.nix { }; @@ -6964,6 +6980,8 @@ in rtptools = callPackage ../tools/networking/rtptools { }; + rtss = callPackage ../development/tools/misc/rtss { }; + reaverwps = callPackage ../tools/networking/reaver-wps {}; reaverwps-t6x = callPackage ../tools/networking/reaver-wps-t6x {}; @@ -8744,7 +8762,9 @@ in fish-foreign-env = callPackage ../shells/fish/fish-foreign-env { }; - ion = callPackage ../shells/ion { }; + ion = callPackage ../shells/ion { + inherit (darwin) Security; + }; jush = callPackage ../shells/jush { }; @@ -9031,8 +9051,9 @@ in crystal_0_33 crystal_0_34 crystal_0_35 - crystal - crystal2nix; + crystal; + + crystal2nix = callPackage ../development/compilers/crystal2nix { }; icr = callPackage ../development/tools/icr { }; @@ -9431,7 +9452,8 @@ in gcc-arm-embedded-7 = callPackage ../development/compilers/gcc-arm-embedded/7 {}; gcc-arm-embedded-8 = callPackage ../development/compilers/gcc-arm-embedded/8 {}; gcc-arm-embedded-9 = callPackage ../development/compilers/gcc-arm-embedded/9 {}; - gcc-arm-embedded = gcc-arm-embedded-9; + gcc-arm-embedded-10 = callPackage ../development/compilers/gcc-arm-embedded/10 {}; + gcc-arm-embedded = gcc-arm-embedded-10; gdc = gdc9; gdc9 = wrapCC (gcc9.cc.override { @@ -10544,7 +10566,7 @@ in ### LUA interpreters luaInterpreters = callPackage ./../development/interpreters/lua-5 {}; - inherit (luaInterpreters) lua5_1 lua5_2 lua5_2_compat lua5_3 lua5_3_compat luajit_2_1 luajit_2_0; + inherit (luaInterpreters) lua5_1 lua5_2 lua5_2_compat lua5_3 lua5_3_compat lua5_4 lua5_4_compat luajit_2_1 luajit_2_0; lua5 = lua5_2_compat; lua = lua5; @@ -11504,6 +11526,8 @@ in fffuu = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../tools/misc/fffuu { }); + ffuf = callPackage ../tools/security/ffuf { }; + flow = callPackage ../development/tools/analysis/flow { ocamlPackages = ocaml-ng.ocamlPackages_4_07; inherit (darwin.apple_sdk.frameworks) CoreServices; @@ -14985,6 +15009,8 @@ in mbedtls = callPackage ../development/libraries/mbedtls { }; + mdctags = callPackage ../development/tools/misc/mdctags { }; + mdds = callPackage ../development/libraries/mdds { }; mediastreamer = callPackage ../development/libraries/mediastreamer { }; @@ -15680,7 +15706,7 @@ in kreport = callPackage ../development/libraries/kreport { }; - KQuickImageEdit = callPackage ../development/libraries/KQuickImageEdit { }; + kquickimageedit = callPackage ../development/libraries/kquickimageedit { }; ldutils = callPackage ../development/libraries/ldutils { }; @@ -17860,9 +17886,9 @@ in inherit (callPackages ../servers/unifi { }) unifiLTS - unifiStable - unifiBeta; - unifi = unifiStable; + unifi5 + unifi6; + unifi = unifi6; urserver = callPackage ../servers/urserver { }; @@ -18500,6 +18526,14 @@ in ]; }; + linux_lqx = callPackage ../os-specific/linux/kernel/linux-lqx.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.export_kernel_fpu_functions."5.3" + ]; + }; + /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a specific kernel, we have a function that builds those packages @@ -18814,6 +18848,7 @@ in # zen-kernel linuxPackages_zen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_zen); + linuxPackages_lqx = recurseIntoAttrs (linuxPackagesFor pkgs.linux_lqx); # A function to build a manually-configured kernel linuxManualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {}); @@ -19163,8 +19198,6 @@ in raspberrypi-eeprom = callPackage ../os-specific/linux/raspberrypi-eeprom {}; - raspberrypi-tools = callPackage ../os-specific/linux/firmware/raspberrypi/tools.nix {}; - regionset = callPackage ../os-specific/linux/regionset { }; rfkill_udev = callPackage ../os-specific/linux/rfkill/udev.nix { }; @@ -19883,6 +19916,8 @@ in meslo-lg = callPackage ../data/fonts/meslo-lg {}; + meslo-lgs-nf = callPackage ../data/fonts/meslo-lgs-nf {}; + migmix = callPackage ../data/fonts/migmix {}; migu = callPackage ../data/fonts/migu {}; @@ -19938,6 +19973,8 @@ in nuclear = callPackage ../applications/audio/nuclear { }; + nuclei = callPackage ../tools/security/nuclei { }; + nullmailer = callPackage ../servers/mail/nullmailer { stdenv = gccStdenv; }; @@ -22019,8 +22056,6 @@ in spectrwm = callPackage ../applications/window-managers/spectrwm { }; - spectral = qt5.callPackage ../applications/networking/instant-messengers/spectral { }; - spotify-cli-linux = callPackage ../applications/audio/spotify-cli-linux { }; spotifyd = callPackage ../applications/audio/spotifyd { @@ -22058,6 +22093,8 @@ in i3altlayout = callPackage ../applications/window-managers/i3/altlayout.nix { }; + i3-balance-workspace = python3Packages.callPackage ../applications/window-managers/i3/balance-workspace.nix { }; + i3-easyfocus = callPackage ../applications/window-managers/i3/easyfocus.nix { }; i3-layout-manager = callPackage ../applications/window-managers/i3/layout-manager.nix { }; @@ -23169,6 +23206,8 @@ in sawfish = callPackage ../applications/window-managers/sawfish { }; + sc68 = callPackage ../applications/audio/sc68 { }; + sidplayfp = callPackage ../applications/audio/sidplayfp { }; sndpeek = callPackage ../applications/audio/sndpeek { }; @@ -24530,6 +24569,10 @@ in twinkle = qt5.callPackage ../applications/networking/instant-messengers/twinkle { }; + terminal-typeracer = callPackage ../applications/misc/terminal-typeracer { + inherit (darwin.apple_sdk.frameworks) Security; + }; + ueberzug = with python3Packages; toPythonApplication ueberzug; uhhyou.lv2 = callPackage ../applications/audio/uhhyou.lv2 { }; @@ -27498,6 +27541,8 @@ in stellarium = libsForQt5.callPackage ../applications/science/astronomy/stellarium { }; + stellarsolver = libsForQt5.callPackage ../development/libraries/stellarsolver { }; + astrolabe-generator = callPackage ../applications/science/astronomy/astrolabe-generator { }; tulip = callPackage ../applications/science/misc/tulip { @@ -27569,6 +27614,8 @@ in betaflight-configurator = callPackage ../applications/science/robotics/betaflight-configurator { }; + mission-planner = callPackage ../applications/science/robotics/mission-planner { }; + ### MISC acpilight = callPackage ../misc/acpilight { }; @@ -28766,8 +28813,6 @@ in mpvc = callPackage ../applications/misc/mpvc { }; - aucdtect = callPackage ../tools/audio/aucdtect { }; - togglesg-download = callPackage ../tools/misc/togglesg-download { }; discord = import ../applications/networking/instant-messengers/discord { @@ -28835,7 +28880,7 @@ in ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; }; vdr = callPackage ../applications/video/vdr { }; - vdrPlugins = recurseIntoAttrs (callPackages ../applications/video/vdr/plugins.nix { }); + vdrPlugins = recurseIntoAttrs (callPackage ../applications/video/vdr/plugins.nix { }); wrapVdr = callPackage ../applications/video/vdr/wrapper.nix {}; chrome-export = callPackage ../tools/misc/chrome-export {}; @@ -29011,6 +29056,8 @@ in navidrome = callPackage ../servers/misc/navidrome {}; + zalgo = callPackage ../tools/misc/zalgo { }; + zettlr = callPackage ../applications/misc/zettlr { }; unifi-poller = callPackage ../servers/monitoring/unifi-poller {}; diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index 330abc91db..02fee95980 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -8704,8 +8704,13 @@ let url = "mirror://cpan/authors/id/X/XA/XAOC/Glib-Object-Introspection-0.048.tar.gz"; sha256 = "01dx5w6r4nl3rgnz7wvgvqfaa48xmzy90p95d5k6315q44610kx6"; }; + checkInputs = [ pkgs.cairo ]; propagatedBuildInputs = [ pkgs.gobject-introspection Glib ]; meta = { + broken = true; # TODO: tests failing because "failed to load libregress.so" + # see https://github.com/NixOS/nixpkgs/pull/68115 + # and https://github.com/NixOS/nixpkgs/issues/68116 + # adding pkgs.gnome3.gjs does not fix it description = "Dynamically create Perl language bindings"; license = stdenv.lib.licenses.lgpl2Plus; }; diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index 71c53e238f..80f5f6cab1 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -5702,6 +5702,8 @@ in { inherit (pkgs) bash subversion apr aprutil expat neon openssl; }; + pysychonaut = callPackage ../development/python-modules/pysychonaut { }; + pytabix = callPackage ../development/python-modules/pytabix { }; pytado = callPackage ../development/python-modules/pytado { };