diff --git a/third_party/nixpkgs/.github/labeler.yml b/third_party/nixpkgs/.github/labeler.yml index 77422234ab..1b0392692e 100644 --- a/third_party/nixpkgs/.github/labeler.yml +++ b/third_party/nixpkgs/.github/labeler.yml @@ -5,6 +5,10 @@ - pkgs/development/libraries/agda/**/* - pkgs/top-level/agda-packages.nix +"6.topic: bsd": + - pkgs/os-specific/bsd/**/* + - pkgs/stdenv/freebsd/**/* + "6.topic: cinnamon": - pkgs/desktops/cinnamon/**/* diff --git a/third_party/nixpkgs/.github/workflows/direct-push.yml b/third_party/nixpkgs/.github/workflows/direct-push.yml new file mode 100644 index 0000000000..6177004295 --- /dev/null +++ b/third_party/nixpkgs/.github/workflows/direct-push.yml @@ -0,0 +1,29 @@ +name: "Direct Push Warning" +on: + push: + branches: + - master + - release-** +jobs: + build: + runs-on: ubuntu-latest + if: github.repository_owner == 'NixOS' + env: + GITHUB_SHA: ${{ github.sha }} + GITHUB_REPOSITORY: ${{ github.repository }} + steps: + - name: Check if commit is a merge commit + id: ismerge + run: | + ISMERGE=$(curl -H 'Accept: application/vnd.github.groot-preview+json' -H "authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" https://api.github.com/repos/${{ env.GITHUB_REPOSITORY }}/commits/${{ env.GITHUB_SHA }}/pulls | jq -r '.[] | select(.merge_commit_sha == "${{ env.GITHUB_SHA }}") | any') + echo "::set-output name=ismerge::$ISMERGE" + - name: Warn if the commit was a direct push + if: steps.ismerge.outputs.ismerge != 'true' + uses: peter-evans/commit-comment@v1 + with: + body: | + @${{ github.actor }}, you pushed a commit directly to master/release branch + instead of going through a Pull Request. + + That's highly discouraged beyond the few exceptions listed + on https://github.com/NixOS/nixpkgs/issues/118661 diff --git a/third_party/nixpkgs/doc/builders/packages/dlib.section.md b/third_party/nixpkgs/doc/builders/packages/dlib.section.md new file mode 100644 index 0000000000..8f0aa86101 --- /dev/null +++ b/third_party/nixpkgs/doc/builders/packages/dlib.section.md @@ -0,0 +1,13 @@ +# DLib {#dlib} + +[DLib](http://dlib.net/) is a modern, C++-based toolkit which provides several machine learning algorithms. + +## Compiling without AVX support {#compiling-without-avx-support} + +Especially older CPUs don\'t support [AVX](https://en.wikipedia.org/wiki/Advanced_Vector_Extensions) (Advanced Vector Extensions) instructions that are used by DLib to optimize their algorithms. + +On the affected hardware errors like `Illegal instruction` will occur. In those cases AVX support needs to be disabled: + +```nix +self: super: { dlib = super.dlib.override { avxSupport = false; }; } +``` diff --git a/third_party/nixpkgs/doc/builders/packages/dlib.xml b/third_party/nixpkgs/doc/builders/packages/dlib.xml deleted file mode 100644 index 5f768dd51b..0000000000 --- a/third_party/nixpkgs/doc/builders/packages/dlib.xml +++ /dev/null @@ -1,24 +0,0 @@ -
- DLib - - - DLib is a modern, C++-based toolkit which provides several machine learning algorithms. - - -
- Compiling without AVX support - - - Especially older CPUs don't support AVX (Advanced Vector Extensions) instructions that are used by DLib to optimize their algorithms. - - - - On the affected hardware errors like Illegal instruction will occur. In those cases AVX support needs to be disabled: -self: super: { - dlib = super.dlib.override { avxSupport = false; }; -} - -
-
diff --git a/third_party/nixpkgs/doc/builders/packages/fuse.section.md b/third_party/nixpkgs/doc/builders/packages/fuse.section.md index 5603481115..eb0023fcbc 100644 --- a/third_party/nixpkgs/doc/builders/packages/fuse.section.md +++ b/third_party/nixpkgs/doc/builders/packages/fuse.section.md @@ -17,3 +17,29 @@ following, it's a likely sign that you need to have macFUSE installed. Referenced from: /nix/store/w8bi72bssv0bnxhwfw3xr1mvn7myf37x-sshfs-fuse-2.10/bin/sshfs Reason: image not found [1] 92299 abort /nix/store/w8bi72bssv0bnxhwfw3xr1mvn7myf37x-sshfs-fuse-2.10/bin/sshfs + +Package maintainers may often encounter the following error when building FUSE +packages on macOS: + + checking for fuse.h... no + configure: error: No fuse.h found. + +This happens on autoconf based projects that uses `AC_CHECK_HEADERS` or +`AC_CHECK_LIBS` to detect libfuse, and will occur even when the `fuse` package +is included in `buildInputs`. It happens because libfuse headers throw an error +on macOS if the `FUSE_USE_VERSION` macro is undefined. Many proejcts do define +`FUSE_USE_VERSION`, but only inside C source files. This results in the above +error at configure time because the configure script would attempt to compile +sample FUSE programs without defining `FUSE_USE_VERSION`. + +There are two possible solutions for this problem in Nixpkgs: + +1. Pass `FUSE_USE_VERSION` to the configure script by adding + `CFLAGS=-DFUSE_USE_VERSION=25` in `configureFlags`. The actual value would + have to match the definition used in the upstream source code. +2. Remove `AC_CHECK_HEADERS` / `AC_CHECK_LIBS` for libfuse. + +However, a better solution might be to fix the build script upstream to use +`PKG_CHECK_MODULES` instead. This approach wouldn't suffer from the problem that +`AC_CHECK_HEADERS`/`AC_CHECK_LIBS` has at the price of introducing a dependency +on pkg-config. diff --git a/third_party/nixpkgs/doc/builders/packages/index.xml b/third_party/nixpkgs/doc/builders/packages/index.xml index a2bcd43153..f5b05b0bbc 100644 --- a/third_party/nixpkgs/doc/builders/packages/index.xml +++ b/third_party/nixpkgs/doc/builders/packages/index.xml @@ -6,7 +6,7 @@ This chapter contains information about how to use and maintain the Nix expressions for a number of specific packages, such as the Linux kernel or X.org. - + diff --git a/third_party/nixpkgs/doc/contributing/reviewing-contributions.xml b/third_party/nixpkgs/doc/contributing/reviewing-contributions.xml index 991db77bc5..7f83834bd8 100644 --- a/third_party/nixpkgs/doc/contributing/reviewing-contributions.xml +++ b/third_party/nixpkgs/doc/contributing/reviewing-contributions.xml @@ -170,60 +170,60 @@ - Reviewing process: + Review process: - Ensure that the package versioning is fitting the guidelines. + Ensure that the package versioning fits the guidelines. - Ensure that the commit name is fitting the guidelines. + Ensure that the commit name fits the guidelines. - Ensure that the meta field contains correct information. + Ensure that the meta fields contain correct information. - License must be checked to be fitting upstream license. + License must match the upstream license. - Platforms should be set or the package will not get binary substitutes. + Platforms should be set (or the package will not get binary substitutes). - A maintainer must be set. This can be the package submitter or a community member that accepts to take maintainership of the package. + Maintainers must be set. This can be the package submitter or a community member that accepts taking up maintainership of the package. - Ensure that the code contains no typos. + Report detected typos. - Ensure the package source. + Ensure the package source: - Mirrors urls should be used when available. + Uses mirror URLs when available. - The most appropriate function should be used (e.g. packages from GitHub should use fetchFromGitHub). + Uses the most appropriate functions (e.g. packages from GitHub should use fetchFromGitHub). diff --git a/third_party/nixpkgs/doc/contributing/submitting-changes.chapter.md b/third_party/nixpkgs/doc/contributing/submitting-changes.chapter.md index 13f15b929c..8a98128415 100644 --- a/third_party/nixpkgs/doc/contributing/submitting-changes.chapter.md +++ b/third_party/nixpkgs/doc/contributing/submitting-changes.chapter.md @@ -83,6 +83,52 @@ If a security fix applies to both master and a stable release then, similar to r Critical security fixes may by-pass the staging branches and be delivered directly to release branches such as `master` and `release-*`. +## Deprecating/removing packages {#submitting-changes-deprecating-packages} + +There is currently no policy when to remove a package. + +Before removing a package, one should try to find a new maintainer or fix smaller issues first. + +### Steps to remove a package from Nixpkgs + +We use jbidwatcher as an example for a discontinued project here. + +1. Have Nixpkgs checked out locally and up to date. +1. Create a new branch for your change, e.g. `git checkout -b jbidwatcher` +1. Remove the actual package including its directory, e.g. `rm -rf pkgs/applications/misc/jbidwatcher` +1. Remove the package from the list of all packages (`pkgs/top-level/all-packages.nix`). +1. Add an alias for the package name in `pkgs/top-level/aliases.nix` (There is also `pkgs/misc/vim-plugins/aliases.nix`. Package sets typically do not have aliases, so we can't add them there.) + + For example in this case: + ``` + jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # added 2021-03-15 + ``` + + The throw message should explain in short why the package was removed for users that still have it installed. + +1. Test if the changes introduced any issues by running `nix-env -qaP -f . --show-trace`. It should show the list of packages without errors. +1. Commit the changes. Explain again why the package was removed. If it was declared discontinued upstream, add a link to the source. + + ```ShellSession + $ git add pkgs/applications/misc/jbidwatcher/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/aliases.nix + $ git commit + ``` + + Example commit message: + + ``` + jbidwatcher: remove + + project was discontinued in march 2021. the program does not work anymore because ebay changed the login. + + https://web.archive.org/web/20210315205723/http://www.jbidwatcher.com/ + ``` + +1. Push changes to your GitHub fork with `git push` +1. Create a pull request against Nixpkgs. Mention the package maintainer. + +This is how the pull request looks like in this case: [https://github.com/NixOS/nixpkgs/pull/116470](https://github.com/NixOS/nixpkgs/pull/116470) + ## Pull Request Template {#submitting-changes-pull-request-template} The pull request template helps determine what steps have been made for a contribution so far, and will help guide maintainers on the status of a change. The motivation section of the PR should include any extra details the title does not address and link any existing issues related to the pull request. diff --git a/third_party/nixpkgs/doc/languages-frameworks/vim.section.md b/third_party/nixpkgs/doc/languages-frameworks/vim.section.md index 22b5e6f301..5316db9a13 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/vim.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/vim.section.md @@ -116,6 +116,44 @@ The resulting package can be added to `packageOverrides` in `~/.nixpkgs/config.n After that you can install your special grafted `myVim` or `myNeovim` packages. +### What if your favourite Vim plugin isn't already packaged? + +If one of your favourite plugins isn't packaged, you can package it yourself: + +``` +{ config, pkgs, ... }: + +let + easygrep = pkgs.vimUtils.buildVimPlugin { + name = "vim-easygrep"; + src = pkgs.fetchFromGitHub { + owner = "dkprice"; + repo = "vim-easygrep"; + rev = "d0c36a77cc63c22648e792796b1815b44164653a"; + sha256 = "0y2p5mz0d5fhg6n68lhfhl8p4mlwkb82q337c22djs4w5zyzggbc"; + }; + }; +in +{ + environment.systemPackages = [ + ( + pkgs.neovim.override { + configure = { + packages.myPlugins = with pkgs.vimPlugins; { + start = [ + vim-go # already packaged plugin + easygrep # custom package + ]; + opt = []; + }; + # ... + }; + } + ) + ]; +} +``` + ## Managing plugins with vim-plug To use [vim-plug](https://github.com/junegunn/vim-plug) to manage your Vim diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index 68ed8a02c3..28413f04f8 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -374,6 +374,12 @@ githubId = 786394; name = "Alexander Krupenkin "; }; + akshgpt7 = { + email = "akshgpt7@gmail.com"; + github = "akshgpt7"; + githubId = 20405311; + name = "Aksh Gupta"; + }; albakham = { email = "dev@geber.ga"; github = "albakham"; @@ -2195,6 +2201,16 @@ githubId = 4971975; name = "Janne Heß"; }; + dasisdormax = { + email = "dasisdormax@mailbox.org"; + github = "dasisdormax"; + githubId = 3714905; + keys = [{ + longkeyid = "rsa4096/0x02BA0D4480CA6C44"; + fingerprint = "E59B A198 61B0 A9ED C1FA 3FB2 02BA 0D44 80CA 6C44"; + }]; + name = "Maximilian Wende"; + }; dasj19 = { email = "daniel@serbanescu.dk"; github = "dasj19"; @@ -4403,6 +4419,12 @@ githubId = 2588851; name = "Jan Solanti"; }; + jappie = { + email = "jappieklooster@hotmail.com"; + github = "jappeace"; + githubId = 3874017; + name = "Jappie Klooster"; + }; javaguirre = { email = "contacto@javaguirre.net"; github = "javaguirre"; @@ -5990,6 +6012,12 @@ githubId = 115218; name = "Felix Richter"; }; + malo = { + email = "mbourgon@gmail.com"; + github = "malob"; + githubId = 2914269; + name = "Malo Bourgon"; + }; malyn = { email = "malyn@strangeGizmo.com"; github = "malyn"; @@ -7241,6 +7269,16 @@ github = "obsidian-systems-maintenance"; githubId = 80847921; }; + obfusk = { + email = "flx@obfusk.net"; + github = "obfusk"; + githubId = 1260687; + name = "Felix C. Stegerman"; + keys = [{ + longkeyid = "rsa4096/0x2F9607F09B360F2D"; + fingerprint = "D5E4 A51D F8D2 55B9 FAC6 A9BB 2F96 07F0 9B36 0F2D"; + }]; + }; odi = { email = "oliver.dunkl@gmail.com"; github = "odi"; @@ -8729,6 +8767,12 @@ githubId = 8534888; name = "Savanni D'Gerinel"; }; + sayanarijit = { + email = "sayanarijit@gmail.com"; + github = "sayanarijit"; + githubId = 11632726; + name = "Arijit Basu"; + }; sb0 = { email = "sb@m-labs.hk"; github = "sbourdeauducq"; @@ -9197,6 +9241,12 @@ fingerprint = "0EC3 FA89 EFBA B421 F82E 40B0 2567 6BCB FFAD 76B1"; }]; }; + sophrosyne = { + email = "joshuaortiz@tutanota.com"; + github = "sophrosyne97"; + githubId = 53029739; + name = "Joshua Ortiz"; + }; sorki = { email = "srk@48.io"; github = "sorki"; @@ -9435,6 +9485,12 @@ githubId = 187109; name = "Bjarki Ágúst Guðmundsson"; }; + suryasr007 = { + email = "94suryateja@gmail.com"; + github = "suryasr007"; + githubId = 10533926; + name = "Surya Teja V"; + }; suvash = { email = "suvash+nixpkgs@gmail.com"; github = "suvash"; @@ -11266,6 +11322,16 @@ github = "pulsation"; githubId = 1838397; }; + zane = { + name = "Zane van Iperen"; + email = "zane@zanevaniperen.com"; + github = "vs49688"; + githubId = 4423262; + keys = [{ + longkeyid = "rsa4096/0x68616B2D8AC4DCC5"; + fingerprint = "61AE D40F 368B 6F26 9DAE 3892 6861 6B2D 8AC4 DCC5"; + }]; + }; zseri = { name = "zseri"; email = "zseri.devel@ytrizja.de"; diff --git a/third_party/nixpkgs/maintainers/scripts/pluginupdate.py b/third_party/nixpkgs/maintainers/scripts/pluginupdate.py index 00a205313b..e7a183952b 100644 --- a/third_party/nixpkgs/maintainers/scripts/pluginupdate.py +++ b/third_party/nixpkgs/maintainers/scripts/pluginupdate.py @@ -460,6 +460,10 @@ def parse_args(editor: Editor): default=30, help="Number of concurrent processes to spawn.", ) + parser.add_argument( + "--no-commit", "-n", action="store_true", default=False, + help="Whether to autocommit changes" + ) return parser.parse_args() @@ -504,24 +508,30 @@ def update_plugins(editor: Editor): redirects = update() rewrite_input(args.input_file, editor.deprecated, redirects) - commit(nixpkgs_repo, f"{editor.name}Plugins: update", [args.outfile]) + + autocommit = not args.no_commit + + if autocommit: + commit(nixpkgs_repo, f"{editor.name}Plugins: update", [args.outfile]) if redirects: update() - commit( - nixpkgs_repo, - f"{editor.name}Plugins: resolve github repository redirects", - [args.outfile, args.input_file, editor.deprecated], - ) + if autocommit: + commit( + nixpkgs_repo, + f"{editor.name}Plugins: resolve github repository redirects", + [args.outfile, args.input_file, editor.deprecated], + ) for plugin_line in args.add_plugins: rewrite_input(args.input_file, editor.deprecated, append=(plugin_line + "\n",)) update() plugin = fetch_plugin_from_pluginline(plugin_line) - commit( - nixpkgs_repo, - "{editor}Plugins.{name}: init at {version}".format( - editor=editor.name, name=plugin.normalized_name, version=plugin.version - ), - [args.outfile, args.input_file], - ) + if autocommit: + commit( + nixpkgs_repo, + "{editor}Plugins.{name}: init at {version}".format( + editor=editor.name, name=plugin.normalized_name, version=plugin.version + ), + [args.outfile, args.input_file], + ) diff --git a/third_party/nixpkgs/maintainers/team-list.nix b/third_party/nixpkgs/maintainers/team-list.nix index 39c9b76718..cb30b2e013 100644 --- a/third_party/nixpkgs/maintainers/team-list.nix +++ b/third_party/nixpkgs/maintainers/team-list.nix @@ -56,6 +56,15 @@ with lib.maintainers; { scope = "Group registration for D. E. Shaw employees who collectively maintain packages."; }; + determinatesystems = { + # Verify additions to this team with at least one already existing member of the team. + members = [ + cole-h + grahamc + ]; + scope = "Group registration for packages maintained by Determinate Systems."; + }; + freedesktop = { members = [ jtojnar worldofpeace ]; scope = "Maintain Freedesktop.org packages for graphical desktop."; diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml index de64aa64bd..e0552c25a8 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml @@ -675,6 +675,11 @@ environment.systemPackages = [ Currently, the service doesn't enforce nor checks the correct number of paths to correspond to minio requirements. + + + All CUDA toolkit versions prior to CUDA 10 have been removed. + + diff --git a/third_party/nixpkgs/nixos/modules/config/iproute2.nix b/third_party/nixpkgs/nixos/modules/config/iproute2.nix index a1d9ebcec6..5f41f3d21e 100644 --- a/third_party/nixpkgs/nixos/modules/config/iproute2.nix +++ b/third_party/nixpkgs/nixos/modules/config/iproute2.nix @@ -18,15 +18,15 @@ in }; config = mkIf cfg.enable { - environment.etc."iproute2/bpf_pinning" = { mode = "0644"; text = fileContents "${pkgs.iproute}/etc/iproute2/bpf_pinning"; }; - environment.etc."iproute2/ematch_map" = { mode = "0644"; text = fileContents "${pkgs.iproute}/etc/iproute2/ematch_map"; }; - environment.etc."iproute2/group" = { mode = "0644"; text = fileContents "${pkgs.iproute}/etc/iproute2/group"; }; - environment.etc."iproute2/nl_protos" = { mode = "0644"; text = fileContents "${pkgs.iproute}/etc/iproute2/nl_protos"; }; - environment.etc."iproute2/rt_dsfield" = { mode = "0644"; text = fileContents "${pkgs.iproute}/etc/iproute2/rt_dsfield"; }; - environment.etc."iproute2/rt_protos" = { mode = "0644"; text = fileContents "${pkgs.iproute}/etc/iproute2/rt_protos"; }; - environment.etc."iproute2/rt_realms" = { mode = "0644"; text = fileContents "${pkgs.iproute}/etc/iproute2/rt_realms"; }; - environment.etc."iproute2/rt_scopes" = { mode = "0644"; text = fileContents "${pkgs.iproute}/etc/iproute2/rt_scopes"; }; - environment.etc."iproute2/rt_tables" = { mode = "0644"; text = (fileContents "${pkgs.iproute}/etc/iproute2/rt_tables") + environment.etc."iproute2/bpf_pinning" = { mode = "0644"; text = fileContents "${pkgs.iproute2}/etc/iproute2/bpf_pinning"; }; + environment.etc."iproute2/ematch_map" = { mode = "0644"; text = fileContents "${pkgs.iproute2}/etc/iproute2/ematch_map"; }; + environment.etc."iproute2/group" = { mode = "0644"; text = fileContents "${pkgs.iproute2}/etc/iproute2/group"; }; + environment.etc."iproute2/nl_protos" = { mode = "0644"; text = fileContents "${pkgs.iproute2}/etc/iproute2/nl_protos"; }; + environment.etc."iproute2/rt_dsfield" = { mode = "0644"; text = fileContents "${pkgs.iproute2}/etc/iproute2/rt_dsfield"; }; + environment.etc."iproute2/rt_protos" = { mode = "0644"; text = fileContents "${pkgs.iproute2}/etc/iproute2/rt_protos"; }; + environment.etc."iproute2/rt_realms" = { mode = "0644"; text = fileContents "${pkgs.iproute2}/etc/iproute2/rt_realms"; }; + environment.etc."iproute2/rt_scopes" = { mode = "0644"; text = fileContents "${pkgs.iproute2}/etc/iproute2/rt_scopes"; }; + environment.etc."iproute2/rt_tables" = { mode = "0644"; text = (fileContents "${pkgs.iproute2}/etc/iproute2/rt_tables") + (optionalString (cfg.rttablesExtraConfig != "") "\n\n${cfg.rttablesExtraConfig}"); }; }; } diff --git a/third_party/nixpkgs/nixos/modules/hardware/keyboard/teck.nix b/third_party/nixpkgs/nixos/modules/hardware/keyboard/teck.nix new file mode 100644 index 0000000000..091ddb8196 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/hardware/keyboard/teck.nix @@ -0,0 +1,16 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.hardware.keyboard.teck; +in +{ + options.hardware.keyboard.teck = { + enable = mkEnableOption "non-root access to the firmware of TECK keyboards"; + }; + + config = mkIf cfg.enable { + services.udev.packages = [ pkgs.teck-udev-rules ]; + }; +} + diff --git a/third_party/nixpkgs/nixos/modules/i18n/input-method/default.nix b/third_party/nixpkgs/nixos/modules/i18n/input-method/default.nix index 4649f9b862..bbc5783565 100644 --- a/third_party/nixpkgs/nixos/modules/i18n/input-method/default.nix +++ b/third_party/nixpkgs/nixos/modules/i18n/input-method/default.nix @@ -29,7 +29,7 @@ in options.i18n = { inputMethod = { enabled = mkOption { - type = types.nullOr (types.enum [ "ibus" "fcitx" "fcitx5" "nabi" "uim" "hime" ]); + type = types.nullOr (types.enum [ "ibus" "fcitx" "fcitx5" "nabi" "uim" "hime" "kime" ]); default = null; example = "fcitx"; description = '' @@ -46,6 +46,7 @@ in nabi: A Korean input method based on XIM. Nabi doesn't support Qt 5. uim: The universal input method, is a library with a XIM bridge. uim mainly support Chinese, Japanese and Korean. hime: An extremely easy-to-use input method framework. + kime: Koream IME. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/i18n/input-method/default.xml b/third_party/nixpkgs/nixos/modules/i18n/input-method/default.xml index 73911059f8..dd66316c73 100644 --- a/third_party/nixpkgs/nixos/modules/i18n/input-method/default.xml +++ b/third_party/nixpkgs/nixos/modules/i18n/input-method/default.xml @@ -40,6 +40,11 @@ Hime: An extremely easy-to-use input method framework. + + + Kime: Korean IME + +
IBus @@ -264,6 +269,23 @@ i18n.inputMethod = { i18n.inputMethod = { enabled = "hime"; }; + +
+
+ Kime + + + Kime is Korean IME. it's built with Rust language and let you get simple, safe, fast Korean typing + + + + The following snippet can be used to configure Kime: + + + +i18n.inputMethod = { + enabled = "kime"; +};
diff --git a/third_party/nixpkgs/nixos/modules/i18n/input-method/kime.nix b/third_party/nixpkgs/nixos/modules/i18n/input-method/kime.nix new file mode 100644 index 0000000000..2a73cb3f46 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/i18n/input-method/kime.nix @@ -0,0 +1,49 @@ +{ config, pkgs, lib, generators, ... }: +with lib; +let + cfg = config.i18n.inputMethod.kime; + yamlFormat = pkgs.formats.yaml { }; +in +{ + options = { + i18n.inputMethod.kime = { + config = mkOption { + type = yamlFormat.type; + default = { }; + example = literalExample '' + { + daemon = { + modules = ["Xim" "Indicator"]; + }; + + indicator = { + icon_color = "White"; + }; + + engine = { + hangul = { + layout = "dubeolsik"; + }; + }; + } + ''; + description = '' + kime configuration. Refer to for details on supported values. + ''; + }; + }; + }; + + config = mkIf (config.i18n.inputMethod.enabled == "kime") { + i18n.inputMethod.package = pkgs.kime; + + environment.variables = { + GTK_IM_MODULE = "kime"; + QT_IM_MODULE = "kime"; + XMODIFIERS = "@im=kime"; + }; + + environment.etc."xdg/kime/config.yaml".text = replaceStrings [ "\\\\" ] [ "\\" ] (builtins.toJSON cfg.config); + }; +} + diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix b/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix index 77c974fc22..21f2e730c3 100644 --- a/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix +++ b/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix @@ -163,7 +163,8 @@ in # List packages installed in system profile. To search, run: # \$ nix search wget # environment.systemPackages = with pkgs; [ - # wget vim + # nano vim # don't forget to add an editor to edit configuration.nix! + # wget # firefox # ]; diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index f72be73221..0bf944d364 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -49,6 +49,7 @@ ./hardware/i2c.nix ./hardware/sensor/hddtemp.nix ./hardware/sensor/iio.nix + ./hardware/keyboard/teck.nix ./hardware/keyboard/zsa.nix ./hardware/ksm.nix ./hardware/ledger.nix @@ -92,6 +93,7 @@ ./i18n/input-method/ibus.nix ./i18n/input-method/nabi.nix ./i18n/input-method/uim.nix + ./i18n/input-method/kime.nix ./installer/tools/tools.nix ./misc/assertions.nix ./misc/crashdump.nix @@ -729,6 +731,7 @@ ./services/networking/nar-serve.nix ./services/networking/nat.nix ./services/networking/ndppd.nix + ./services/networking/nebula.nix ./services/networking/networkmanager.nix ./services/networking/nextdns.nix ./services/networking/nftables.nix diff --git a/third_party/nixpkgs/nixos/modules/services/databases/redis.nix b/third_party/nixpkgs/nixos/modules/services/databases/redis.nix index 3ddc7aad81..7ec10c0eb5 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/redis.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/redis.nix @@ -5,6 +5,8 @@ with lib; let cfg = config.services.redis; + ulimitNofile = cfg.maxclients + 32; + mkValueString = value: if value == true then "yes" else if value == false then "no" @@ -14,8 +16,8 @@ let listsAsDuplicateKeys = true; mkKeyValue = generators.mkKeyValueDefault { inherit mkValueString; } " "; } cfg.settings); -in -{ + +in { imports = [ (mkRemovedOptionModule [ "services" "redis" "user" ] "The redis module now is hardcoded to the redis user.") (mkRemovedOptionModule [ "services" "redis" "dbpath" ] "The redis module now uses /var/lib/redis as data directory.") @@ -121,6 +123,12 @@ in description = "Set the number of databases."; }; + maxclients = mkOption { + type = types.int; + default = 10000; + description = "Set the max number of connected clients at the same time."; + }; + save = mkOption { type = with types; listOf (listOf int); default = [ [900 1] [300 10] [60 10000] ]; @@ -253,6 +261,7 @@ in logfile = cfg.logfile; syslog-enabled = cfg.syslog; databases = cfg.databases; + maxclients = cfg.maxclients; save = map (d: "${toString (builtins.elemAt d 0)} ${toString (builtins.elemAt d 1)}") cfg.save; dbfilename = "dump.rdb"; dir = "/var/lib/redis"; @@ -295,6 +304,34 @@ in StateDirectoryMode = "0700"; # Access write directories UMask = "0077"; + # Capabilities + CapabilityBoundingSet = ""; + # Security + NoNewPrivileges = true; + # Process Properties + LimitNOFILE = "${toString ulimitNofile}"; + # Sandboxing + ProtectSystem = "strict"; + ProtectHome = true; + PrivateTmp = true; + PrivateDevices = true; + PrivateUsers = true; + ProtectClock = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectControlGroups = true; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + LockPersonality = true; + MemoryDenyWriteExecute = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + PrivateMounts = true; + # System Call Filtering + SystemCallArchitectures = "native"; + SystemCallFilter = "~@clock @cpu-emulation @debug @keyring @memlock @module @mount @obsolete @privileged @raw-io @reboot @resources @setuid @swap"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/matrix-appservice-irc.nix b/third_party/nixpkgs/nixos/modules/services/misc/matrix-appservice-irc.nix index 63dc313ad1..a0a5973d30 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/matrix-appservice-irc.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/matrix-appservice-irc.nix @@ -214,7 +214,8 @@ in { PrivateMounts = true; SystemCallFilter = "~@aio @clock @cpu-emulation @debug @keyring @memlock @module @mount @obsolete @raw-io @setuid @swap"; SystemCallArchitectures = "native"; - RestrictAddressFamilies = "AF_INET AF_INET6"; + # AF_UNIX is required to connect to a postgres socket. + RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix index 2082d51316..88d355ff32 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix @@ -296,7 +296,7 @@ in { systemd.sockets.ipfs-api = { wantedBy = [ "sockets.target" ]; - # We also include "%t/ipfs.sock" because tere is no way to put the "%t" + # We also include "%t/ipfs.sock" because there is no way to put the "%t" # in the multiaddr. socketConfig.ListenStream = let fromCfg = multiaddrToListenStream cfg.apiAddress; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/mxisd.nix b/third_party/nixpkgs/nixos/modules/services/networking/mxisd.nix index 482d6ff456..f29d190c62 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/mxisd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/mxisd.nix @@ -41,8 +41,8 @@ in { package = mkOption { type = types.package; - default = pkgs.mxisd; - defaultText = "pkgs.mxisd"; + default = pkgs.ma1sd; + defaultText = "pkgs.ma1sd"; description = "The mxisd/ma1sd package to use"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nebula.nix b/third_party/nixpkgs/nixos/modules/services/networking/nebula.nix new file mode 100644 index 0000000000..e7ebfe1b4d --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/nebula.nix @@ -0,0 +1,219 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.nebula; + enabledNetworks = filterAttrs (n: v: v.enable) cfg.networks; + + format = pkgs.formats.yaml {}; + + nameToId = netName: "nebula-${netName}"; +in +{ + # Interface + + options = { + services.nebula = { + networks = mkOption { + description = "Nebula network definitions."; + default = {}; + type = types.attrsOf (types.submodule { + options = { + enable = mkOption { + type = types.bool; + default = true; + description = "Enable or disable this network."; + }; + + package = mkOption { + type = types.package; + default = pkgs.nebula; + defaultText = "pkgs.nebula"; + description = "Nebula derivation to use."; + }; + + ca = mkOption { + type = types.path; + description = "Path to the certificate authority certificate."; + example = "/etc/nebula/ca.crt"; + }; + + cert = mkOption { + type = types.path; + description = "Path to the host certificate."; + example = "/etc/nebula/host.crt"; + }; + + key = mkOption { + type = types.path; + description = "Path to the host key."; + example = "/etc/nebula/host.key"; + }; + + staticHostMap = mkOption { + type = types.attrsOf (types.listOf (types.str)); + default = {}; + description = '' + The static host map defines a set of hosts with fixed IP addresses on the internet (or any network). + A host can have multiple fixed IP addresses defined here, and nebula will try each when establishing a tunnel. + ''; + example = literalExample '' + { "192.168.100.1" = [ "100.64.22.11:4242" ]; } + ''; + }; + + isLighthouse = mkOption { + type = types.bool; + default = false; + description = "Whether this node is a lighthouse."; + }; + + lighthouses = mkOption { + type = types.listOf types.str; + default = []; + description = '' + List of IPs of lighthouse hosts this node should report to and query from. This should be empty on lighthouse + nodes. The IPs should be the lighthouse's Nebula IPs, not their external IPs. + ''; + example = ''[ "192.168.100.1" ]''; + }; + + listen.host = mkOption { + type = types.str; + default = "0.0.0.0"; + description = "IP address to listen on."; + }; + + listen.port = mkOption { + type = types.port; + default = 4242; + description = "Port number to listen on."; + }; + + tun.disable = mkOption { + type = types.bool; + default = false; + description = '' + When tun is disabled, a lighthouse can be started without a local tun interface (and therefore without root). + ''; + }; + + tun.device = mkOption { + type = types.nullOr types.str; + default = null; + description = "Name of the tun device. Defaults to nebula.\${networkName}."; + }; + + firewall.outbound = mkOption { + type = types.listOf types.attrs; + default = []; + description = "Firewall rules for outbound traffic."; + example = ''[ { port = "any"; proto = "any"; host = "any"; } ]''; + }; + + firewall.inbound = mkOption { + type = types.listOf types.attrs; + default = []; + description = "Firewall rules for inbound traffic."; + example = ''[ { port = "any"; proto = "any"; host = "any"; } ]''; + }; + + settings = mkOption { + type = format.type; + default = {}; + description = '' + Nebula configuration. Refer to + + for details on supported values. + ''; + example = literalExample '' + { + lighthouse.dns = { + host = "0.0.0.0"; + port = 53; + }; + } + ''; + }; + }; + }); + }; + }; + }; + + # Implementation + config = mkIf (enabledNetworks != {}) { + systemd.services = mkMerge (mapAttrsToList (netName: netCfg: + let + networkId = nameToId netName; + settings = recursiveUpdate { + pki = { + ca = netCfg.ca; + cert = netCfg.cert; + key = netCfg.key; + }; + static_host_map = netCfg.staticHostMap; + lighthouse = { + am_lighthouse = netCfg.isLighthouse; + hosts = netCfg.lighthouses; + }; + listen = { + host = netCfg.listen.host; + port = netCfg.listen.port; + }; + tun = { + disabled = netCfg.tun.disable; + dev = if (netCfg.tun.device != null) then netCfg.tun.device else "nebula.${netName}"; + }; + firewall = { + inbound = netCfg.firewall.inbound; + outbound = netCfg.firewall.outbound; + }; + } netCfg.settings; + configFile = format.generate "nebula-config-${netName}.yml" settings; + in + { + # Create systemd service for Nebula. + "nebula@${netName}" = { + description = "Nebula VPN service for ${netName}"; + wants = [ "basic.target" ]; + after = [ "basic.target" "network.target" ]; + before = [ "sshd.service" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = mkMerge [ + { + Type = "simple"; + Restart = "always"; + ExecStart = "${netCfg.package}/bin/nebula -config ${configFile}"; + } + # The service needs to launch as root to access the tun device, if it's enabled. + (mkIf netCfg.tun.disable { + User = networkId; + Group = networkId; + }) + ]; + }; + }) enabledNetworks); + + # Open the chosen ports for UDP. + networking.firewall.allowedUDPPorts = + unique (mapAttrsToList (netName: netCfg: netCfg.listen.port) enabledNetworks); + + # Create the service users and groups. + users.users = mkMerge (mapAttrsToList (netName: netCfg: + mkIf netCfg.tun.disable { + ${nameToId netName} = { + group = nameToId netName; + description = "Nebula service user for network ${netName}"; + isSystemUser = true; + }; + }) enabledNetworks); + + users.groups = mkMerge (mapAttrsToList (netName: netCfg: + mkIf netCfg.tun.disable { + ${nameToId netName} = {}; + }) enabledNetworks); + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/security/oauth2_proxy.nix b/third_party/nixpkgs/nixos/modules/services/security/oauth2_proxy.nix index 77c579279a..e85fd4b75d 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/oauth2_proxy.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/oauth2_proxy.nix @@ -90,10 +90,10 @@ in package = mkOption { type = types.package; - default = pkgs.oauth2_proxy; - defaultText = "pkgs.oauth2_proxy"; + default = pkgs.oauth2-proxy; + defaultText = "pkgs.oauth2-proxy"; description = '' - The package that provides oauth2_proxy. + The package that provides oauth2-proxy. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix index 389911ffcc..51c2f3febd 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix @@ -249,7 +249,15 @@ let + optionalString (ssl && vhost.http2) "http2 " + optionalString vhost.default "default_server " + optionalString (extraParameters != []) (concatStringsSep " " extraParameters) - + ";"; + + ";" + + (if ssl && vhost.http3 then '' + # UDP listener for **QUIC+HTTP/3 + listen ${addr}:${toString port} http3 reuseport; + # Advertise that HTTP/3 is available + add_header Alt-Svc 'h3=":443"'; + # Sent when QUIC was used + add_header QUIC-Status $quic; + '' else ""); redirectListen = filter (x: !x.ssl) defaultListen; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/vhost-options.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/vhost-options.nix index cf211ea9a7..1f5fe6a368 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -151,6 +151,19 @@ with lib; ''; }; + http3 = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable HTTP 3. + This requires using pkgs.nginxQuic package + which can be achived by setting services.nginx.package = pkgs.nginxQuic;. + Note that HTTP 3 support is experimental and + *not* yet recommended for production. + Read more at https://quic.nginx.org/ + ''; + }; + root = mkOption { type = types.nullOr types.path; default = null; diff --git a/third_party/nixpkgs/nixos/modules/tasks/cpu-freq.nix b/third_party/nixpkgs/nixos/modules/tasks/cpu-freq.nix index 513382936e..f1219c07c5 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/cpu-freq.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/cpu-freq.nix @@ -19,7 +19,7 @@ in default = null; example = "ondemand"; description = '' - Configure the governor used to regulate the frequence of the + Configure the governor used to regulate the frequency of the available CPUs. By default, the kernel configures the performance governor, although this may be overwritten in your hardware-configuration.nix file. diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/oci-containers.nix b/third_party/nixpkgs/nixos/modules/virtualisation/oci-containers.nix index 2dd15e3aba..ad436ed301 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/oci-containers.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/oci-containers.nix @@ -59,6 +59,18 @@ let ''; }; + environmentFiles = mkOption { + type = with types; listOf path; + default = []; + description = "Environment files for this container."; + example = literalExample '' + [ + /path/to/.env + /path/to/.env.secret + ] + ''; + }; + log-driver = mkOption { type = types.str; default = "journald"; @@ -236,6 +248,7 @@ let ] ++ optional (container.entrypoint != null) "--entrypoint=${escapeShellArg container.entrypoint}" ++ (mapAttrsToList (k: v: "-e ${escapeShellArg k}=${escapeShellArg v}") container.environment) + ++ map (f: "--env-file ${escapeShellArg f}") container.environmentFiles ++ map (p: "-p ${escapeShellArg p}") container.ports ++ optional (container.user != null) "-u ${escapeShellArg container.user}" ++ map (v: "-v ${escapeShellArg v}") container.volumes diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index 47384cf5a8..6f756aa85c 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -262,6 +262,7 @@ in nat.standalone = handleTest ./nat.nix { withFirewall = false; }; ncdns = handleTest ./ncdns.nix {}; ndppd = handleTest ./ndppd.nix {}; + nebula = handleTest ./nebula.nix {}; neo4j = handleTest ./neo4j.nix {}; netdata = handleTest ./netdata.nix {}; networking.networkd = handleTest ./networking.nix { networkd = true; }; diff --git a/third_party/nixpkgs/nixos/tests/ceph-multi-node.nix b/third_party/nixpkgs/nixos/tests/ceph-multi-node.nix index 4e6d644f96..33736e27b9 100644 --- a/third_party/nixpkgs/nixos/tests/ceph-multi-node.nix +++ b/third_party/nixpkgs/nixos/tests/ceph-multi-node.nix @@ -37,7 +37,7 @@ let generateHost = { pkgs, cephConfig, networkConfig, ... }: { virtualisation = { - memorySize = 512; + memorySize = 1024; emptyDiskImages = [ 20480 ]; vlans = [ 1 ]; }; @@ -120,6 +120,7 @@ let ) monA.wait_for_unit("ceph-mon-${cfg.monA.name}") monA.succeed("ceph mon enable-msgr2") + monA.succeed("ceph config set mon auth_allow_insecure_global_id_reclaim false") # Can't check ceph status until a mon is up monA.succeed("ceph -s | grep 'mon: 1 daemons'") diff --git a/third_party/nixpkgs/nixos/tests/ceph-single-node-bluestore.nix b/third_party/nixpkgs/nixos/tests/ceph-single-node-bluestore.nix index cc873e8aee..f706d4d56f 100644 --- a/third_party/nixpkgs/nixos/tests/ceph-single-node-bluestore.nix +++ b/third_party/nixpkgs/nixos/tests/ceph-single-node-bluestore.nix @@ -34,7 +34,7 @@ let generateHost = { pkgs, cephConfig, networkConfig, ... }: { virtualisation = { - memorySize = 512; + memorySize = 1024; emptyDiskImages = [ 20480 20480 20480 ]; vlans = [ 1 ]; }; @@ -95,6 +95,7 @@ let ) monA.wait_for_unit("ceph-mon-${cfg.monA.name}") monA.succeed("ceph mon enable-msgr2") + monA.succeed("ceph config set mon auth_allow_insecure_global_id_reclaim false") # Can't check ceph status until a mon is up monA.succeed("ceph -s | grep 'mon: 1 daemons'") diff --git a/third_party/nixpkgs/nixos/tests/ceph-single-node.nix b/third_party/nixpkgs/nixos/tests/ceph-single-node.nix index 19919371a3..d1d56ea670 100644 --- a/third_party/nixpkgs/nixos/tests/ceph-single-node.nix +++ b/third_party/nixpkgs/nixos/tests/ceph-single-node.nix @@ -34,7 +34,7 @@ let generateHost = { pkgs, cephConfig, networkConfig, ... }: { virtualisation = { - memorySize = 512; + memorySize = 1024; emptyDiskImages = [ 20480 20480 20480 ]; vlans = [ 1 ]; }; @@ -95,6 +95,7 @@ let ) monA.wait_for_unit("ceph-mon-${cfg.monA.name}") monA.succeed("ceph mon enable-msgr2") + monA.succeed("ceph config set mon auth_allow_insecure_global_id_reclaim false") # Can't check ceph status until a mon is up monA.succeed("ceph -s | grep 'mon: 1 daemons'") diff --git a/third_party/nixpkgs/nixos/tests/mxisd.nix b/third_party/nixpkgs/nixos/tests/mxisd.nix index 22755ea353..354612a8a5 100644 --- a/third_party/nixpkgs/nixos/tests/mxisd.nix +++ b/third_party/nixpkgs/nixos/tests/mxisd.nix @@ -6,25 +6,16 @@ import ./make-test-python.nix ({ pkgs, ... } : { }; nodes = { - server_mxisd = args : { + server = args : { services.mxisd.enable = true; services.mxisd.matrix.domain = "example.org"; }; - - server_ma1sd = args : { - services.mxisd.enable = true; - services.mxisd.matrix.domain = "example.org"; - services.mxisd.package = pkgs.ma1sd; - }; }; testScript = '' start_all() - server_mxisd.wait_for_unit("mxisd.service") - server_mxisd.wait_for_open_port(8090) - server_mxisd.succeed("curl -Ssf 'http://127.0.0.1:8090/_matrix/identity/api/v1'") - server_ma1sd.wait_for_unit("mxisd.service") - server_ma1sd.wait_for_open_port(8090) - server_ma1sd.succeed("curl -Ssf 'http://127.0.0.1:8090/_matrix/identity/api/v1'") + server.wait_for_unit("mxisd.service") + server.wait_for_open_port(8090) + server.succeed("curl -Ssf 'http://127.0.0.1:8090/_matrix/identity/api/v1'") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/nebula.nix b/third_party/nixpkgs/nixos/tests/nebula.nix new file mode 100644 index 0000000000..372cfebdf8 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/nebula.nix @@ -0,0 +1,223 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: let + + # We'll need to be able to trade cert files between nodes via scp. + inherit (import ./ssh-keys.nix pkgs) + snakeOilPrivateKey snakeOilPublicKey; + + makeNebulaNode = { config, ... }: name: extraConfig: lib.mkMerge [ + { + # Expose nebula for doing cert signing. + environment.systemPackages = [ pkgs.nebula ]; + users.users.root.openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; + services.openssh.enable = true; + + services.nebula.networks.smoke = { + # Note that these paths won't exist when the machine is first booted. + ca = "/etc/nebula/ca.crt"; + cert = "/etc/nebula/${name}.crt"; + key = "/etc/nebula/${name}.key"; + listen = { host = "0.0.0.0"; port = 4242; }; + }; + } + extraConfig + ]; + +in +{ + name = "nebula"; + + nodes = { + + lighthouse = { ... } @ args: + makeNebulaNode args "lighthouse" { + networking.interfaces.eth1.ipv4.addresses = [{ + address = "192.168.1.1"; + prefixLength = 24; + }]; + + services.nebula.networks.smoke = { + isLighthouse = true; + firewall = { + outbound = [ { port = "any"; proto = "any"; host = "any"; } ]; + inbound = [ { port = "any"; proto = "any"; host = "any"; } ]; + }; + }; + }; + + node2 = { ... } @ args: + makeNebulaNode args "node2" { + networking.interfaces.eth1.ipv4.addresses = [{ + address = "192.168.1.2"; + prefixLength = 24; + }]; + + services.nebula.networks.smoke = { + staticHostMap = { "10.0.100.1" = [ "192.168.1.1:4242" ]; }; + isLighthouse = false; + lighthouses = [ "10.0.100.1" ]; + firewall = { + outbound = [ { port = "any"; proto = "any"; host = "any"; } ]; + inbound = [ { port = "any"; proto = "any"; host = "any"; } ]; + }; + }; + }; + + node3 = { ... } @ args: + makeNebulaNode args "node3" { + networking.interfaces.eth1.ipv4.addresses = [{ + address = "192.168.1.3"; + prefixLength = 24; + }]; + + services.nebula.networks.smoke = { + staticHostMap = { "10.0.100.1" = [ "192.168.1.1:4242" ]; }; + isLighthouse = false; + lighthouses = [ "10.0.100.1" ]; + firewall = { + outbound = [ { port = "any"; proto = "any"; host = "any"; } ]; + inbound = [ { port = "any"; proto = "any"; host = "lighthouse"; } ]; + }; + }; + }; + + node4 = { ... } @ args: + makeNebulaNode args "node4" { + networking.interfaces.eth1.ipv4.addresses = [{ + address = "192.168.1.4"; + prefixLength = 24; + }]; + + services.nebula.networks.smoke = { + enable = true; + staticHostMap = { "10.0.100.1" = [ "192.168.1.1:4242" ]; }; + isLighthouse = false; + lighthouses = [ "10.0.100.1" ]; + firewall = { + outbound = [ { port = "any"; proto = "any"; host = "lighthouse"; } ]; + inbound = [ { port = "any"; proto = "any"; host = "any"; } ]; + }; + }; + }; + + node5 = { ... } @ args: + makeNebulaNode args "node5" { + networking.interfaces.eth1.ipv4.addresses = [{ + address = "192.168.1.5"; + prefixLength = 24; + }]; + + services.nebula.networks.smoke = { + enable = false; + staticHostMap = { "10.0.100.1" = [ "192.168.1.1:4242" ]; }; + isLighthouse = false; + lighthouses = [ "10.0.100.1" ]; + firewall = { + outbound = [ { port = "any"; proto = "any"; host = "lighthouse"; } ]; + inbound = [ { port = "any"; proto = "any"; host = "any"; } ]; + }; + }; + }; + + }; + + testScript = let + + setUpPrivateKey = name: '' + ${name}.succeed( + "mkdir -p /root/.ssh", + "chown 700 /root/.ssh", + "cat '${snakeOilPrivateKey}' > /root/.ssh/id_snakeoil", + "chown 600 /root/.ssh/id_snakeoil", + ) + ''; + + # From what I can tell, StrictHostKeyChecking=no is necessary for ssh to work between machines. + sshOpts = "-oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null -oIdentityFile=/root/.ssh/id_snakeoil"; + + restartAndCheckNebula = name: ip: '' + ${name}.systemctl("restart nebula@smoke.service") + ${name}.succeed("ping -c5 ${ip}") + ''; + + # Create a keypair on the client node, then use the public key to sign a cert on the lighthouse. + signKeysFor = name: ip: '' + lighthouse.wait_for_unit("sshd.service") + ${name}.wait_for_unit("sshd.service") + ${name}.succeed( + "mkdir -p /etc/nebula", + "nebula-cert keygen -out-key /etc/nebula/${name}.key -out-pub /etc/nebula/${name}.pub", + "scp ${sshOpts} /etc/nebula/${name}.pub 192.168.1.1:/tmp/${name}.pub", + ) + lighthouse.succeed( + 'nebula-cert sign -ca-crt /etc/nebula/ca.crt -ca-key /etc/nebula/ca.key -name "${name}" -groups "${name}" -ip "${ip}" -in-pub /tmp/${name}.pub -out-crt /tmp/${name}.crt', + ) + ${name}.succeed( + "scp ${sshOpts} 192.168.1.1:/tmp/${name}.crt /etc/nebula/${name}.crt", + "scp ${sshOpts} 192.168.1.1:/etc/nebula/ca.crt /etc/nebula/ca.crt", + ) + ''; + + in '' + start_all() + + # Create the certificate and sign the lighthouse's keys. + ${setUpPrivateKey "lighthouse"} + lighthouse.succeed( + "mkdir -p /etc/nebula", + 'nebula-cert ca -name "Smoke Test" -out-crt /etc/nebula/ca.crt -out-key /etc/nebula/ca.key', + 'nebula-cert sign -ca-crt /etc/nebula/ca.crt -ca-key /etc/nebula/ca.key -name "lighthouse" -groups "lighthouse" -ip "10.0.100.1/24" -out-crt /etc/nebula/lighthouse.crt -out-key /etc/nebula/lighthouse.key', + ) + + # Reboot the lighthouse and verify that the nebula service comes up on boot. + # Since rebooting takes a while, we'll just restart the service on the other nodes. + lighthouse.shutdown() + lighthouse.start() + lighthouse.wait_for_unit("nebula@smoke.service") + lighthouse.succeed("ping -c5 10.0.100.1") + + # Create keys for node2's nebula service and test that it comes up. + ${setUpPrivateKey "node2"} + ${signKeysFor "node2" "10.0.100.2/24"} + ${restartAndCheckNebula "node2" "10.0.100.2"} + + # Create keys for node3's nebula service and test that it comes up. + ${setUpPrivateKey "node3"} + ${signKeysFor "node3" "10.0.100.3/24"} + ${restartAndCheckNebula "node3" "10.0.100.3"} + + # Create keys for node4's nebula service and test that it comes up. + ${setUpPrivateKey "node4"} + ${signKeysFor "node4" "10.0.100.4/24"} + ${restartAndCheckNebula "node4" "10.0.100.4"} + + # Create keys for node4's nebula service and test that it does not come up. + ${setUpPrivateKey "node5"} + ${signKeysFor "node5" "10.0.100.5/24"} + node5.fail("systemctl status nebula@smoke.service") + node5.fail("ping -c5 10.0.100.5") + + # The lighthouse can ping node2 and node3 but not node5 + lighthouse.succeed("ping -c3 10.0.100.2") + lighthouse.succeed("ping -c3 10.0.100.3") + lighthouse.fail("ping -c3 10.0.100.5") + + # node2 can ping the lighthouse, but not node3 because of its inbound firewall + node2.succeed("ping -c3 10.0.100.1") + node2.fail("ping -c3 10.0.100.3") + + # node3 can ping the lighthouse and node2 + node3.succeed("ping -c3 10.0.100.1") + node3.succeed("ping -c3 10.0.100.2") + + # node4 can ping the lighthouse but not node2 or node3 + node4.succeed("ping -c3 10.0.100.1") + node4.fail("ping -c3 10.0.100.2") + node4.fail("ping -c3 10.0.100.3") + + # node2 can ping node3 now that node3 pinged it first + node2.succeed("ping -c3 10.0.100.3") + # node4 can ping node2 if node2 pings it first + node2.succeed("ping -c3 10.0.100.4") + node4.succeed("ping -c3 10.0.100.2") + ''; +}) diff --git a/third_party/nixpkgs/pkgs/applications/audio/myxer/default.nix b/third_party/nixpkgs/pkgs/applications/audio/myxer/default.nix new file mode 100644 index 0000000000..da3b8742d5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/myxer/default.nix @@ -0,0 +1,38 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, libpulseaudio +, glib +, pango +, gtk3 +}: + +rustPlatform.buildRustPackage rec { + pname = "myxer"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "Aurailus"; + repo = pname; + rev = version; + sha256 = "10m5qkys96n4v6qiffdiy0w660yq7b5sa70ww2zskc8d0gbmxp6x"; + }; + + cargoSha256 = "0nsscdjl5fh24sg87vdmijjmlihc0zk0p3vac701v60xlz55qipn"; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ libpulseaudio glib pango gtk3 ]; + + # Currently no tests are implemented, so we avoid building the package twice + doCheck = false; + + meta = with lib; { + description = "A modern Volume Mixer for PulseAudio"; + homepage = "https://github.com/Aurailus/Myxer"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ erin ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/sublime-music/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sublime-music/default.nix index f584b13a29..15963faf06 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sublime-music/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sublime-music/default.nix @@ -1,4 +1,12 @@ -{ fetchFromGitLab, lib, python3Packages, gobject-introspection, gtk3, pango, wrapGAppsHook +{ fetchFromGitLab +, fetchpatch +, lib +, python3Packages +, gobject-introspection +, gtk3 +, pango +, wrapGAppsHook +, xvfb_run , chromecastSupport ? false , serverSupport ? false , keyringSupport ? true @@ -8,18 +16,29 @@ python3Packages.buildPythonApplication rec { pname = "sublime-music"; - version = "0.11.10"; + version = "0.11.11"; + format = "pyproject"; src = fetchFromGitLab { owner = "sublime-music"; repo = pname; rev = "v${version}"; - sha256 = "1g78gmiywg07kaywfc9q0yab2bzxs936vb3157ni1z0flbmcwrry"; + sha256 = "sha256-r4Tn/7CGDny8Aa4kF4PM5ZKMYthMJ7801X3zPdvXh4Q="; }; + patches = [ + # Switch to poetry-core: + # https://gitlab.com/sublime-music/sublime-music/-/merge_requests/60 + (fetchpatch { + name = "use-poetry-core.patch"; + url = "https://gitlab.com/sublime-music/sublime-music/-/commit/9b0af19dbdfdcc5a0fa23e73bb34c7135a8c2855.patch"; + sha256 = "sha256-cXG0RvrnBpme6yKWM0nfqMqoK0qPT6spflJ9AaaslVg="; + }) + ]; + nativeBuildInputs = [ gobject-introspection - python3Packages.setuptools + python3Packages.poetry-core wrapGAppsHook ]; @@ -53,8 +72,14 @@ python3Packages.buildPythonApplication rec { # https://github.com/NixOS/nixpkgs/issues/56943 strictDeps = false; - # no tests - doCheck = false; + # Use the test suite provided by the upstream project. + checkInputs = with python3Packages; [ + pytest + pytest-cov + ]; + checkPhase = "${xvfb_run}/bin/xvfb-run pytest"; + + # Also run the python import check for sanity pythonImportsCheck = [ "sublime_music" ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/featherpad/default.nix b/third_party/nixpkgs/pkgs/applications/editors/featherpad/default.nix index c73238ce36..42c8e77ac6 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/featherpad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/featherpad/default.nix @@ -1,23 +1,25 @@ -{ lib, mkDerivation, pkg-config, qmake, qttools, qtbase, qtsvg, qtx11extras, fetchFromGitHub }: +{ lib, mkDerivation, cmake, hunspell, pkg-config, qttools, qtbase, qtsvg, qtx11extras +, fetchFromGitHub }: + mkDerivation rec { pname = "featherpad"; - version = "0.10.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "tsujan"; repo = "FeatherPad"; rev = "V${version}"; - sha256 = "1wrbs6kni9s3x39cckm9kzpglryxn5vyarilvh9pafbzpc6rc57p"; + sha256 = "0av96yx9ir1ap5adn2cvr6n5y7qjrspk73and21m65dmpwlfdiqb"; }; - nativeBuildInputs = [ qmake pkg-config qttools ]; - buildInputs = [ qtbase qtsvg qtx11extras ]; + nativeBuildInputs = [ cmake pkg-config qttools ]; + buildInputs = [ hunspell qtbase qtsvg qtx11extras ]; meta = with lib; { description = "Lightweight Qt5 Plain-Text Editor for Linux"; homepage = "https://github.com/tsujan/FeatherPad"; platforms = platforms.linux; maintainers = [ maintainers.flosse ]; - license = licenses.gpl3; + license = licenses.gpl3Plus; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix index fff9c8a2de..1da4a24b3e 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix @@ -1,6 +1,9 @@ { lib, stdenv, callPackage, fetchurl , jdk, cmake, libxml2, zlib, python3, ncurses5 , dotnet-sdk_3 +, autoPatchelfHook +, glib +, libdbusmenu , vmopts ? null }: @@ -25,6 +28,15 @@ let platforms = platforms.linux; }; }).overrideAttrs (attrs: { + nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ optionals (stdenv.isLinux) [ + autoPatchelfHook + ]; + buildInputs = (attrs.buildInputs or []) ++ optionals (stdenv.isLinux) [ + python3 + stdenv.cc.cc + libdbusmenu + ]; + dontAutoPatchelf = true; postFixup = (attrs.postFixup or "") + optionalString (stdenv.isLinux) '' ( cd $out/clion-${version} @@ -32,45 +44,7 @@ let rm -rf bin/cmake/linux ln -s ${cmake} bin/cmake/linux - lldbLibPath=$out/clion-${version}/bin/lldb/linux/lib - interp="$(cat $NIX_CC/nix-support/dynamic-linker)" - ln -s ${ncurses5.out}/lib/libtinfo.so.5 $lldbLibPath/libtinfo.so.5 - - patchelf --set-interpreter $interp \ - --set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib ]}:$lldbLibPath" \ - bin/lldb/linux/bin/lldb-server - - for i in LLDBFrontend lldb lldb-argdumper; do - patchelf --set-interpreter $interp \ - --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$lldbLibPath" \ - "bin/lldb/linux/bin/$i" - done - - patchelf \ - --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$lldbLibPath" \ - bin/lldb/linux/lib/python3.*/lib-dynload/zlib.cpython-*-x86_64-linux-gnu.so - - patchelf \ - --set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib python3 ]}:$lldbLibPath" \ - bin/lldb/linux/lib/liblldb.so - - gdbLibPath=$out/clion-${version}/bin/gdb/linux/lib - patchelf \ - --set-rpath "$gdbLibPath" \ - bin/gdb/linux/lib/python3.*/lib-dynload/zlib.cpython-*-x86_64-linux-gnu.so - patchelf --set-interpreter $interp \ - --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib zlib ]}:$gdbLibPath" \ - bin/gdb/linux/bin/gdb - patchelf --set-interpreter $interp \ - --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$gdbLibPath" \ - bin/gdb/linux/bin/gdbserver - - patchelf --set-interpreter $interp \ - --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib zlib ]}" \ - bin/clang/linux/clangd - patchelf --set-interpreter $interp \ - --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib zlib ]}" \ - bin/clang/linux/clang-tidy + autoPatchelf $PWD/bin wrapProgram $out/bin/clion \ --set CL_JDK "${jdk}" diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix index 41ff62a619..8b42191bde 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix @@ -1,5 +1,4 @@ { stdenv, symlinkJoin, lib, makeWrapper -, vimUtils , writeText , bundlerEnv, ruby , nodejs diff --git a/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix b/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix index 47b9677e31..a8435eb1e6 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix @@ -19,11 +19,11 @@ let isCross = stdenv.hostPlatform != stdenv.buildPlatform; in stdenv.mkDerivation rec { pname = "poke"; - version = "1.1"; + version = "1.2"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-zWjfY8dBtBYLEsvqAvJ8RxWCeUZuNEOTDSU1pFLAatY="; + hash = "sha256-9hz42ltkwBoTWTc3JarRyiV/NcHJJp5NUN0GZBg932I="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/texmacs/default.nix b/third_party/nixpkgs/pkgs/applications/editors/texmacs/default.nix index dd5e5e61b2..d628eeadab 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/texmacs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/texmacs/default.nix @@ -16,7 +16,7 @@ let pname = "TeXmacs"; - version = "1.99.18"; + version = "1.99.19"; common = callPackage ./common.nix { inherit tex extraFonts chineseFonts japaneseFonts koreanFonts; }; @@ -26,7 +26,7 @@ mkDerivation { src = fetchurl { url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz"; - sha256 = "0il3fwgw20421aj90wg8kyhkwk6lbgb3bb2g5qamh5lk90yj725i"; + sha256 = "1izwqb0z4gqiglv57mjswk6sjivny73kd2sxrf3nmj7wr12pn5m8"; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix index 49c442ee6d..a8dd7787a5 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix @@ -24,7 +24,7 @@ let six ]; in mkDerivation rec { - version = "3.16.5"; + version = "3.16.6"; pname = "qgis"; name = "${pname}-unwrapped-${version}"; @@ -32,7 +32,7 @@ in mkDerivation rec { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "1xkvgj1v2jgp107jyh9xmk1dzbbqxwkqy69z56vsaa8lf9gwgn5h"; + sha256 = "1vnz5kiyjircmhn4vq3fa5j2kvkxpwcsry7jc6nxl0w0dqx1zay1"; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/brscan4/default.nix index 9713618d79..6fcb583055 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -11,16 +11,15 @@ let in stdenv.mkDerivation rec { pname = "brscan4"; - version = "0.4.9-1"; + version = "0.4.10-1"; src = { "i686-linux" = fetchurl { url = "http://download.brother.com/welcome/dlf006646/${pname}-${version}.i386.deb"; - sha256 = "0pkg9aqvnkpjnb9cgzf7lxw2g4jqrf2w98irkv22r0gfsfs3nwma"; + sha256 = "sha256-ymIAg+rfSYP5uzsAM1hUYZacJ0PXmKEoljNtb0pgGMw="; }; "x86_64-linux" = fetchurl { - url = "https://download.brother.com/welcome/dlf006645/${pname}-${version}.amd64.deb"; - sha256 = "0kakkl8rmsi2yr3f8vd1kk8vsl9g2ijhqil1cvvbwrhwgi0b7ai7"; + sha256 = "sha256-Gpr5456MCNpyam3g2qPo7S3aEZFMaUGR8bu7YmRY8xk="; }; }."${stdenv.hostPlatform.system}"; @@ -33,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ libusb-compat-0_1 ]; dontBuild = true; - patchPhase = '' + postPatch = '' ${myPatchElf "opt/brother/scanner/brscan4/brsaneconfig4"} RPATH=${libusb-compat-0_1.out}/lib @@ -45,6 +44,7 @@ stdenv.mkDerivation rec { ''; installPhase = with lib; '' + runHook preInstall PATH_TO_BRSCAN4="opt/brother/scanner/brscan4" mkdir -p $out/$PATH_TO_BRSCAN4 cp -rp $PATH_TO_BRSCAN4/* $out/$PATH_TO_BRSCAN4 @@ -79,6 +79,7 @@ stdenv.mkDerivation rec { mkdir -p $out/etc/udev/rules.d cp -p ${udevRules}/etc/udev/rules.d/*.rules \ $out/etc/udev/rules.d + runHook postInstall ''; dontStrip = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix b/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix index f7e9846204..11667ea395 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix @@ -26,11 +26,11 @@ mkDerivation rec { pname = "calibre"; - version = "5.13.0"; + version = "5.16.1"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-GDFAZxZmkio7e7kVjhYqhNdhXIlUPJF0iMWVl0uWVCM="; + hash = "sha256-lTXCW0MGNOezecaGO9c2JGU4ylwpPmBaMXTY3nLNcrE="; }; patches = [ @@ -62,8 +62,6 @@ mkDerivation rec { dontUseQmakeConfigure = true; - enableParallelBuilding = true; - nativeBuildInputs = [ pkg-config qmake removeReferencesTo ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/dwmblocks/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dwmblocks/default.nix new file mode 100644 index 0000000000..45757787c7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/dwmblocks/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub, libX11, patches ? [ ], writeText, conf ? null }: + +stdenv.mkDerivation { + pname = "dwmblocks"; + version = "unstable-2020-12-27"; + + src = fetchFromGitHub { + owner = "torrinfail"; + repo = "dwmblocks"; + rev = "96cbb453e5373c05372fd4bf3faacfa53e409067"; + sha256 = "00lxfxsrvhm60zzqlcwdv7xkqzya69mgpi2mr3ivzbc8s9h8nwqx"; + }; + + buildInputs = [ libX11 ]; + + inherit patches; + + postPatch = + let + configFile = + if lib.isDerivation conf || builtins.isPath conf + then conf else writeText "blocks.def.h" conf; + in + lib.optionalString (conf != null) "cp ${configFile} blocks.def.h"; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "Modular status bar for dwm written in c"; + homepage = "https://github.com/torrinfail/dwmblocks"; + license = licenses.isc; + maintainers = with maintainers; [ sophrosyne ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/jiten/default.nix b/third_party/nixpkgs/pkgs/applications/misc/jiten/default.nix new file mode 100644 index 0000000000..5447a2b305 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/jiten/default.nix @@ -0,0 +1,91 @@ +{ lib +, fetchFromGitHub +, python3Packages +, makeWrapper +, pcre +, sqlite +, nodejs +}: + +python3Packages.buildPythonApplication rec { + pname = "jiten"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "obfusk"; + repo = "jiten"; + rev = "v${version}"; + sha256 = "1lg1n7f4383jdlkbma0q65yl6l159wgh886admcq7l7ap26zpqd2"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ pcre sqlite ]; + propagatedBuildInputs = with python3Packages; [ click flask ]; + checkInputs = [ nodejs ]; + + preBuild = '' + export JITEN_VERSION=${version} # override `git describe` + export JITEN_FINAL=yes # build & package *.sqlite3 + ''; + + postPatch = '' + substituteInPlace Makefile --replace /bin/bash "$(command -v bash)" + substituteInPlace jiten/res/jmdict/Makefile --replace /bin/bash "$(command -v bash)" + ''; + + checkPhase = "make test"; + + postInstall = '' + # requires pywebview + rm $out/bin/jiten-gui + ''; + + meta = with lib; { + description = "Japanese android/cli/web dictionary based on jmdict/kanjidic"; + longDescription = '' + Jiten is a Japanese dictionary based on JMDict/Kanjidic + + Fine-grained search using regexes (regular expressions) + • simple searches don't require knowledge of regexes + • quick reference available in the web interface and android app + + JMDict multilingual japanese dictionary + • kanji, readings (romaji optional), meanings & more + • meanings in english, dutch, german, french and/or spanish + • pitch accent (from Wadoku) + • browse by frequency/jlpt + + Kanji dictionary + • readings (romaji optional), meanings (english), jmdict entries, radicals & more + • search using SKIP codes + • search by radical + • browse by frequency/level/jlpt + + Example sentences (from Tatoeba) + • with english, dutch, german, french and/or spanish translation + • some with audio + + Stroke order + • input a word or sentence and see how it's written + + Web interface + • available online at https://jiten.obfusk.dev + • light/dark mode + • search history (stored locally) + • tooltips to quickly see meanings and readings for kanji and words + • use long press for tooltips on mobile + • converts romaji to hiragana and between hiragana and katakana + • can be run on your own computer + + Command-line interface + ''; + homepage = "https://github.com/obfusk/jiten"; + license = with licenses; [ + agpl3Plus # code + cc-by-sa-30 # jmdict/kanjidic + unfreeRedistributable # pitch data from wadoku is non-commercial :( + ]; + maintainers = [ maintainers.obfusk ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/nnn/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nnn/default.nix index 6fd68779f4..3b482e95d9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nnn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nnn/default.nix @@ -1,6 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper, ncurses, readline -, archivemount, atool, fzf, libarchive, rclone, sshfs, unzip, vlock -, conf ? null, withIcons ? false, withNerdIcons ? false }: +{ lib +, stdenv +, fetchFromGitHub +, installShellFiles +, makeWrapper +, pkg-config +, file +, ncurses +, readline +, which +# options +, conf ? null +, withIcons ? false +, withNerdIcons ? false +}: # Mutually exclusive options assert withIcons -> withNerdIcons == false; @@ -20,21 +32,21 @@ stdenv.mkDerivation rec { configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf); preBuild = lib.optionalString (conf != null) "cp ${configFile} src/nnn.h"; - nativeBuildInputs = [ pkg-config makeWrapper ]; + nativeBuildInputs = [ installShellFiles makeWrapper pkg-config ]; buildInputs = [ readline ncurses ]; - makeFlags = [ "PREFIX=$(out)" ] + makeFlags = [ "PREFIX=${placeholder "out"}" ] ++ lib.optional withIcons [ "O_ICONS=1" ] ++ lib.optional withNerdIcons [ "O_NERD=1" ]; - # shell completions - postInstall = '' - install -Dm555 misc/auto-completion/bash/nnn-completion.bash $out/share/bash-completion/completions/nnn.bash - install -Dm555 misc/auto-completion/zsh/_nnn -t $out/share/zsh/site-functions - install -Dm555 misc/auto-completion/fish/nnn.fish -t $out/share/fish/vendor_completions.d + binPath = lib.makeBinPath [ file which ]; - wrapProgram $out/bin/nnn \ - --prefix PATH : ${lib.makeBinPath [ archivemount atool fzf libarchive rclone sshfs unzip vlock ]} + postInstall = '' + installShellCompletion --bash --name nnn.bash misc/auto-completion/bash/nnn-completion.bash + installShellCompletion --fish misc/auto-completion/fish/nnn.fish + installShellCompletion --zsh misc/auto-completion/zsh/_nnn + + wrapProgram $out/bin/nnn --prefix PATH : "$binPath" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/xplr/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xplr/default.nix new file mode 100644 index 0000000000..f41fe82893 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/xplr/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + name = "xplr"; + version = "0.5.4"; + + src = fetchFromGitHub { + owner = "sayanarijit"; + repo = name; + rev = "v${version}"; + sha256 = "0m28jhkvz46psxbv8g34v34m1znvj51gqizaxlmxbgh9fj3vyfdb"; + }; + + cargoSha256 = "0q2k8bs32vxqbnjdh674waagpzpb9rxlwi4nggqlbzcmbqsy8n6k"; + + meta = with lib; { + description = "A hackable, minimal, fast TUI file explorer"; + homepage = "https://github.com/sayanarijit/xplr"; + license = licenses.mit; + maintainers = with maintainers; [ sayanarijit suryasr007 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix index f544660913..1138c1e292 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.21.77"; + version = "1.23.71"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "Q7paeGAvdmc4+FP28ASLlJhN1ui7M5fDpxnrh+gbEm4="; + sha256 = "17ajn1vx5xwlp2yvjf1hr8vw3b7hiribv5gaipyb37zrhkff241h"; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix index 1c3da1c860..3e823a5616 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -170,7 +170,10 @@ let ) ]; - postPatch = '' + postPatch = lib.optionalString (chromiumVersionAtLeast "91") '' + # Required for patchShebangs (unsupported): + chmod -x third_party/webgpu-cts/src/tools/deno + '' + '' # remove unused third-party for lib in ${toString gnSystemLibraries}; do if [ -d "third_party/$lib" ]; then diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json index dd22d98996..54ae1e5f5b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "90.0.4430.72", - "sha256": "0hw916j55lm3qnidfp92i8w6zywdd47rhihn9pn23b7ziz58ik55", - "sha256bin64": "0k1m786b94kh7r2c58qj8b9a39yr4m30kkrxk5d9q7dn1abl3wa3", + "version": "90.0.4430.85", + "sha256": "08j9shrc6p0vpa3x7av7fj8wapnkr7h6m8ag1gh6gaky9d6mki81", + "sha256bin64": "0li9w6zfsmx5r90jm5v5gfv3l2a76jndg6z5jvb9yx9xvrp9gpir", "deps": { "gn": { "version": "2021-02-09", @@ -18,9 +18,9 @@ } }, "beta": { - "version": "90.0.4430.72", - "sha256": "0hw916j55lm3qnidfp92i8w6zywdd47rhihn9pn23b7ziz58ik55", - "sha256bin64": "1ddj2pk4m26dpl1ja0r56fvm67c1z1hq5rq5an8px6ixy78s2760", + "version": "90.0.4430.85", + "sha256": "08j9shrc6p0vpa3x7av7fj8wapnkr7h6m8ag1gh6gaky9d6mki81", + "sha256bin64": "0aw76phm8r9k2zlqywyggzdqa467c8naqa717m24dk3nvv2rfkg2", "deps": { "gn": { "version": "2021-02-09", diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ephemeral/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/ephemeral/default.nix index 338ceaa434..64e2614257 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "ephemeral"; - version = "7.0.5"; + version = "7.1.0"; src = fetchFromGitHub { owner = "cassidyjames"; repo = "ephemeral"; rev = version; - sha256 = "sha256-dets4YoTUgFCDOrvzNuAwJb3/MsnjOSBx9PBZuT0ruk="; + sha256 = "sha256-07HO8nC2Pwz2EAea4ZzmqyMfQdgX8FVqDepdA6j/NT8="; }; nativeBuildInputs = [ 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 0971dd3b63..6b8079d524 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,975 +1,975 @@ { - version = "87.0"; + version = "88.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ach/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ach/firefox-88.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "656c92c9a588aed2059f4f68968735f884db6ee94b0619d983bd4affd2100174"; + sha256 = "12d09c3e723cf3853792d11bfa3344a3cf63cbfea150de441c46e552248d1532"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/af/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/af/firefox-88.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "0f8fe2b470177df3525fbf533934c66a5e4abdaa3dfb7848962ac148b224592d"; + sha256 = "60a0fee46e702ae161639eb3d06e893f157516667606fda241b997ffd356e768"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/an/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/an/firefox-88.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "a96ae593965364871d35ba0fd6dcd1029254110ee59f4a7abe27cf6d273c7be6"; + sha256 = "6b0583486643dc144c42b369cb54cac5ec28ac997e58ca3c29c0dc12701702cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ar/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ar/firefox-88.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "58eaefaba44b4b0592442e709604b597c74fd81390f8fcc410a8e605956a0bdd"; + sha256 = "149f7789dc5b356c336ef48788cff922bc69e9daa3bd4c32550cda0683695108"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ast/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ast/firefox-88.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "ca33473b77b8a57c305fe89cdd66b95810441aa54295ed687736a24c9160e45f"; + sha256 = "55259f1a56bfb5867a17751d8ed8bfd673aaf26c4c97a70dcf99c88e427605d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/az/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/az/firefox-88.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "6965f0b68279228a575dfb503eabae8d75f32e0fa8de119f4d48f0e9ec36d61c"; + sha256 = "36cc39d24f416717c1b07ab3aec2803c2811603a394c5e7cc3d6545655a883bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/be/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/be/firefox-88.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "a19d6d94cc15d269dbddccae06b4c92a3436e57d45dbebe8c6a2ff23df66fd28"; + sha256 = "06cc01d0f235d423301dd220941d8f67745a1208015f5d2ba0dfceabc5252dad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/bg/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/bg/firefox-88.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "885a44cf0acedc5ffbfcc73cce41f6eb2dcab13d070eeb156e64277b346a4fb1"; + sha256 = "a8753152946e55be48d55858a4aab8052f94fc9a6fa9192fc59a7664677fb85a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/bn/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/bn/firefox-88.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "09773257768f061819fa92ec229c1f94b217c04e78781d8e59a8dc1225f92be7"; + sha256 = "12daf255bb459ea1e576aef02f008dbceb752700eb91f569761e5d3b10e17891"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/br/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/br/firefox-88.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "23ec95e130593c51384a64165c33f02c4c5af753313fbaf8fa0f94bca1184506"; + sha256 = "8811d1da23da1286a4e2aca81e898a0466665386de80ff1217cac0f399396eaa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/bs/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/bs/firefox-88.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "30455df45e86894fd5a75ef6b9989b64f49da8ac8bee9656ea2724cfca59555c"; + sha256 = "1386daaf4d583a980a57a0d8c3a631ed28b46f3988a0184ed0c5c8a03e44e7d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ca-valencia/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ca-valencia/firefox-88.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "8ca8a4ee40ac57140560c3aeb664d60be5ecd8842f328544924a97d910c02303"; + sha256 = "15fbee8c563462b43c128c2c0d7c74d9453db32f078e6d49ff0600e73eefe4d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ca/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ca/firefox-88.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "3cc1cd1c7657a704d3c6c1a42934eac75439c05af5617d2d24991d62d412237e"; + sha256 = "0120c9adddfe03e4ed476ca290a0f59cc8fef4064984cde4016bbf12bcbb4730"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/cak/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/cak/firefox-88.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "160c598f55c012fc92c0882f7062a82b8057177398edfcdeb41c60aa83570f1f"; + sha256 = "7c0d355eb7ab709df66f5b77ede2824e3fdda646b61fd50df7762027c55dc971"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/cs/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/cs/firefox-88.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "1209d5401b55441126bcc64faa9d7692c92d2c009a40587923c048bec0cf2508"; + sha256 = "4b39fd4bc0c214f3409a446abe13d749a6c25908811f788513d850ebef648b41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/cy/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/cy/firefox-88.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "d177530e3e31900a38e9127b5d60bcc3b937c76e8b12b13c289a29e2afd06c40"; + sha256 = "40ca21bb7c715c4adfaee536a42929b10af1faefb73f8103e927b7e8cc1367fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/da/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/da/firefox-88.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "2e623b11e18d38dee391863115af75fae4119894a89606aa6f4194d04a1773c2"; + sha256 = "b311e549c38b5a49cef0c9a597e208d8d929cc828617e662b289f0d455f4bf46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/de/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/de/firefox-88.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "a29837d6c062ded4aed732cee06fe23773a57d62aecbca1e1a56c9d7a37423df"; + sha256 = "8916772413c5a615ae4b8ddc2721d5af5ff64cc4c5799fe00873f0a29854f64a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/dsb/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/dsb/firefox-88.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "cf584f97b136444861845bf1db0fe9d65d809f4a167a0f8bed780f94048fbb12"; + sha256 = "c0b1c757f55dfb6657fd4090b5e3084af3cca1c2526f9a90efcab844fa5ea974"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/el/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/el/firefox-88.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "73d03707575ef3270f7419d031fc85babdc498b1576d316abac273cd88dde30b"; + sha256 = "04251f33971a40988df8cbdb2875bf2f24e8c878a11661568a45ed7d4b040de2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/en-CA/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/en-CA/firefox-88.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "1d11c8a1f23df4e88668beecee244f2d0743b006e46d96e4a6a35bffc341569d"; + sha256 = "5505a96cfe87f15df89b908f6a769766767d86f98ec878324e5eb26963666ffe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/en-GB/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/en-GB/firefox-88.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "d885931198cf3958fca683ee4c301f25610f6b4d5777068fd812bd53048aecb6"; + sha256 = "e3a8649ef6107c61c6638317f367db5157acc8ce8989730d2fab7a3bd8c38d95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/en-US/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/en-US/firefox-88.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "3c9207bee0a998634c4fd12293acfae207d16508749ad405bf1e8717d06acf02"; + sha256 = "043e9ded27d8f86ff881c1f95a2626b5bbd7361990d7977320f8e9beaea63c93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/eo/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/eo/firefox-88.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "3d57787fc840f80271f4d26810f347929a96479ca58bd416bf1f94e3499a07b9"; + sha256 = "0deeafcdd14dddc9c31e8f68c819bdebd54e8fe6a480c6dfd723ee90da409fb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/es-AR/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/es-AR/firefox-88.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "294c83cce5bbead7c263e950ed8bb2787d4735f4086521726400ef97c5d26b35"; + sha256 = "b7dd60ba63a4408d94b015ee1529cc5f0c0ee4dfcfe515ed1f8eb7e183973022"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/es-CL/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/es-CL/firefox-88.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "4e57c8a517084eee27edb6ad706a250ebb323419407f1ef9c9f9ae4f0dc8d8b9"; + sha256 = "35fd7dc8d273c73c7fd334ec726da2415140497e81004a453fe144aabb8c9317"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/es-ES/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/es-ES/firefox-88.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "9cdea632b1c1365d3c6ec08e9acd154819d081f025473b027da8d5e873da66bb"; + sha256 = "c7f801a3d4cfe52b3a9c29c9f2d633d078e13b85fde25fe837e887865040f52d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/es-MX/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/es-MX/firefox-88.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "3698541ca4e9eb7f5c422082cbacd407870ffb170c9f9d0fe5f0c55dfe2b5449"; + sha256 = "9e295a332dc7e043dce50f3a7092c89b1fd2ffbcfe99d25f9df34eed33b7b34e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/et/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/et/firefox-88.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "86a1986a7c63f63c559d36d3d42e95def0eb8a89075879c3253156e80ed161c1"; + sha256 = "c023f6c1a279c3e3d0043b535d3e1666f44a7b079905f0c0ebc4dec3edeee8fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/eu/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/eu/firefox-88.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "5db12874991a1583ec09c934e18c93225b9831acc857d8c1b633f48c65e7a415"; + sha256 = "ee39a51081690cc9d13dc68d9cec458ad1c7055ae765ebb26299ae5267c8c8aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/fa/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/fa/firefox-88.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "5066d7b66933924442d683aaa19aec9385b66eaf49a55b155653ffba57c287d0"; + sha256 = "c61aff504e777a48272d61fe0648584f57b509a21f0f2f1269918ed5450e1131"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ff/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ff/firefox-88.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "35c8271fa506fcb43c20ccafb928b109125f3a17f80870a82365bc36f787b5ba"; + sha256 = "39e47a89cb93b9cfa11030cb227cd9bfaf20434c7a70b91e5aa1ef4afbdf89cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/fi/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/fi/firefox-88.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "a3a0dc8cee1db20eb795aea5e94efafc96fc624e50159d8be7f449a093ffd291"; + sha256 = "e71195871fe81b3b6125b8fa2415fd3fc9dd51a01f82ed7ba7f76840b58607b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/fr/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/fr/firefox-88.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "d9c1cdbbe2bacb06608f60745ab213cf80b27051c6b58f0ed7ef834b839da7fe"; + sha256 = "2341c8cdd77a355e83d795e007ee1b5f3da783c090f2424914681666e72939d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/fy-NL/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/fy-NL/firefox-88.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "6f15a66cee03b494edf6a68641e0d5f886fe8528e23b9e129b11702cb9a4442e"; + sha256 = "23f3ef8f9ca2552c2aa4c3159ff266b49e113888c855553fcec3920e8c317e23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ga-IE/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ga-IE/firefox-88.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "31fcb9d815afc52db6328b076d89eab85a89d4553748ee7741912d23c420fea2"; + sha256 = "52b5cba15c62fa709f56d9f767e6f6eb8741480eb8e325e9a9a2c4c4d72a63ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/gd/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/gd/firefox-88.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "c9d0b868022bf5c0335ed488df0d6006541cdb7609f8854aedf22b931017ed31"; + sha256 = "0a9ee7c11ff6d16d2b98fb6933102a310261e2a1f715935e162f535328662d3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/gl/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/gl/firefox-88.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "b546355345950e17202c4f2676731b0fe126d4d551131648f10e8c61cb8a2f26"; + sha256 = "795d38d83d728f550b6fe3efd238a7eb2760e9724bb86ba146190b141dbce8db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/gn/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/gn/firefox-88.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "51c403ad0460db69e2ed6213410d9fe2cb6ae9a5f100bd4f5ac7d36cc68b65c3"; + sha256 = "ffff3d3bd7b0ff27629c3a9776b5e4eb16eb1ddd14aa01dc4073e573ac2674b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/gu-IN/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/gu-IN/firefox-88.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "dad776c9a4809c574967bb18d1ef96ab8eb5e95df713fe88fce044b755951550"; + sha256 = "7a745004a27a87c965c3b3c7a3c9179bcffb8114fae7d90a51d0bc092884da43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/he/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/he/firefox-88.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "972135a17b091e8338762c4f3e9c60d826dd8b4f4e65c22d6cb07daabac95558"; + sha256 = "76ff3a975d0092bcfc98094e5ebfc638a192b0053b2d3c85be96d3dfe63e910c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/hi-IN/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/hi-IN/firefox-88.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "5eec4571d25c0c62a0d773af25b2be93d158e06302a6e5d47a0fa60f0819941a"; + sha256 = "6136353eff44b6234a111e622fda3882221107fd54ea0910fc659a9ad9afecfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/hr/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/hr/firefox-88.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "3183694fccb7a9560911d3d0813bf22ef79e1fdc8e72a5547258ff28b5ddbb6a"; + sha256 = "a71b3730bb4916214122daf8ad3847a58d7d4fc0b4ff583080f64c6721962c83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/hsb/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/hsb/firefox-88.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "82c02b623b0833468950a174a6c46bbf6c657252f0f876abb48e5b839a51f0c8"; + sha256 = "9128347b9d06a6025b4dd4d7f864b0c8a8a3f49b786e79106e39514bffa14a87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/hu/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/hu/firefox-88.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "0db68343a32b3a69b323b8cf7eade47a453499e092eae5d57414739e2ea92619"; + sha256 = "489550b063134a992e284d895e738c994109f700338b9158ef8c91c171ce66ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/hy-AM/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/hy-AM/firefox-88.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "65b9c3902feac56c5563fe24a8c1d0f3510fca9b90062f88e4072a0ef6258c06"; + sha256 = "16b015356550f9a73ba2fcbb9e0a36936204da476da359f2e3bae57c08353e29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ia/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ia/firefox-88.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "50023eb339a5886cabdf7b71a65ab130fd0a5609cf18ceec9266100ce96e7c92"; + sha256 = "9a543e14b7974e94e8ac6dab92a860b7cec778910f91060207c576cfd5ea1bd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/id/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/id/firefox-88.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "9a7279bcaeed8c6f6c44c4af728eddada5a96fd3c0204d10cd647d09721ec4e5"; + sha256 = "970652219ba2228cbdd187d45a49f64cb8020220ac94e798896c5668bea90a44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/is/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/is/firefox-88.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "697d1ac2cbc467d8526b8cf6a525b21a22fecb78f421936901ed3ecf91911146"; + sha256 = "d7011bb2ddb09d6f446ae9d8f790f0bb5382605385c8dbf04e200fe6e63c495a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/it/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/it/firefox-88.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "4f51f5c632f21a0b589e2c358972f69107ccde6a32c5619e5b9273cd54198e98"; + sha256 = "a58681975cf3a79e32413d9b21655b6ace0ee2ab0df9ac45485344bf2f2f3fc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ja/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ja/firefox-88.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "2ce4af36d057c26f8b9f95b3c578dc738ea9ee80fbbb20f0c7257312499fb3bc"; + sha256 = "b86e095903bc54db0bf0c6bbdc25184768c1537d57ccacf71a0da1d946bcf398"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ka/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ka/firefox-88.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "9d4d54895d3237c7431c367a5c9fc07b99b11c91a1645e89fa7668111bb70ffd"; + sha256 = "e7e5277b9e239a8738f96378c87de3e204df9f530936a535aad991b6690f541d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/kab/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/kab/firefox-88.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "4e67ce270e0a56f5acbe61a22368bc011ccf420201716bd36f5aec42a5d477bc"; + sha256 = "27b5edd4248feeb06f7c342a6f48b63ed98bfcd1d44f8ff467a204019b80263b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/kk/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/kk/firefox-88.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "c1f1feaad98c108f73d575c2b59c3ff2fa26f9fb97a8d30182aeb4bd587063b1"; + sha256 = "3187839a8941b3ceb64c42e084837ed5c9d01f0c518378fe21e5956bf5d4859d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/km/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/km/firefox-88.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "f99973849aa9e9ca4f7534cc6eb3bb7ccd75cf95f600a4a124dd2750da16d2a0"; + sha256 = "6c0df74570cae46c379ee7271608449a31f46c3bce030613cb04edf1ff6d16f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/kn/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/kn/firefox-88.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "4625c75234dfdd35aaa383ebcef3ba9e093c73aec2ca524a0f7b5b28a2438de1"; + sha256 = "30116c65417489496836aa71771a3e4d01ef420d12d080ab8f5d02e6c713a513"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ko/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ko/firefox-88.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "d65454c1b36d26d7df7a1eb510f73e7fea47431c6e51dc2119ae6932e11f351e"; + sha256 = "e73f7ee38b5061ab6b89b6c9817d1f70c85e4b6eacc22f6780a72c308bd8dfe9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/lij/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/lij/firefox-88.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "ef7668799697e1d9c35661f1f6c403307a6deb6b2f265a2906d8baa699c224a4"; + sha256 = "c98b27de29c3f98e13b4b3803233f3d99eebe04f33d6761c64464872941a978e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/lt/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/lt/firefox-88.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "bd34fdcad69d3e0c79e226899d0df49e5244a4072446fd1cb7a290261f8473c1"; + sha256 = "bb12e24f967b51b0ad2c7cfd0111f6c128f854a61d99e8262d64a5a4b2b972f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/lv/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/lv/firefox-88.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "34c379fa36cb7d1de95c99bfae8476f57a40d6d041941ad1884a8314f8511499"; + sha256 = "65e19afa82c25c3793297db156bc72fae45754bf709cf15f4a6cd6aebf8af314"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/mk/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/mk/firefox-88.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "4a9020fd5864d35efda8ee36454d72392ef3d2e5c50f0bcd6e6f3326dc8fb984"; + sha256 = "f7717adeb13e7592f3940867b47ad6a53172c7b99dbe5904dc78838d7230d22a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/mr/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/mr/firefox-88.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "6195db5fcfb95148c243d7fa4675fac0467f1093191bbb02dba714723a4f833a"; + sha256 = "db9cc5d8f42595824792ff2cf80e67eab5f54a9cda7f87a0a81582d53c72ab61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ms/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ms/firefox-88.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "95410958dbe73ead9ef89fcd81bdc3bd0bc6079cb8997962fd43fa07c6b546c7"; + sha256 = "3daa35a19a5fad78ad81381f48c1e27ebe70f5be03634594f30097645f061593"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/my/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/my/firefox-88.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "c43a08c4410d7d5d48c29ebbb96765d45dcd20335125bc664f5593d56440e8f6"; + sha256 = "de0f442f18cd82669b222bfd30aab14d1130e55765aee6992f7632f9b681284d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/nb-NO/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/nb-NO/firefox-88.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "7f39e801ca6ce05bf6398b914acff4a3cd9016503a4401f9b51f92bd4b2c6737"; + sha256 = "207136b91b4c830ed9c2bf4ba11b6a9f42696a3cd5b6815de1b9b4d8f265817f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ne-NP/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ne-NP/firefox-88.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "b3ccaa031229d8e369f1acedb49bd159d282cd771205beb2876a8c7d4fc90413"; + sha256 = "47d3322091d3663d4544d7551ff1127e01b64a773770651fb320f56379b24e9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/nl/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/nl/firefox-88.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "3647e87528883cd7bc3310000f77237dac6dc57b62b664c434b16b9bf736930c"; + sha256 = "d4e06fd6bc83235dbd1ec49cd8e4bb0a0a62d735221196770f1268c79228b5be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/nn-NO/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/nn-NO/firefox-88.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "3a94b93c5bd68f82ff9d310295f6397b902390061d21c0560a0906415e7150f0"; + sha256 = "57e49d9d199bb48ba594e21e5b57931785b9404d32259a45164a24123d9d1bb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/oc/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/oc/firefox-88.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "a6fcecb568052565e051879487b34fce54b0e3ca3cc761dd27749d949153523b"; + sha256 = "1108761ce4c7cb13077c4ebc6d9704923aa91f5affbae618768b9c855cadd784"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/pa-IN/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/pa-IN/firefox-88.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "14b10789c0d94e60c85be5594a0a11654a31e60518c78c04e4bea2b5e64843bb"; + sha256 = "bef979c51a367f733a365b3e7153dc7fa7b150d797ec15ed818983d81eaa4044"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/pl/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/pl/firefox-88.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "44aadea74c71dc86d7a5e0cbc04acbe2e26e46add5daaf0f8b31c4a17b439346"; + sha256 = "69bc8bbca55a74d243fecc95d60d2c6075b911375b0bdebf6a4e238ee4f5b2ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/pt-BR/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/pt-BR/firefox-88.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "057eb47c7f45a1c0005a508bb36ee04b3edfce0e23e175fa311c9f1cc49b7e03"; + sha256 = "c75ff2eca174e9ca9787c6e56e6e956c65027d111e8e05fa80a67df36b438dd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/pt-PT/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/pt-PT/firefox-88.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "dd33f93ef7acd1e183902bd85b292b7073beb9fca3b46279f0405bcd06016771"; + sha256 = "fae035e106d4fd6fc19bcb0c081bb62bc328820b09f2ca40b30eb9542a7de046"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/rm/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/rm/firefox-88.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "dd7649d8de678648f54a6dab7a66246abb6b514ccb5044eebff5f6689bae99d7"; + sha256 = "cd0ddd73f2281d88b5ecb6a6a92aac7ecb3a0d73074a3f8fc03d16cdcf30cc17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ro/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ro/firefox-88.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "bcbc82632f8a6802285f23bf0238738a5abe5e77d70596261cf7fbe6649c9560"; + sha256 = "6d028e81212cfc2e450ce7824771292706b458b6fd6c63764fae2b0804a8ed7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ru/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ru/firefox-88.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "bedcd965e2a460bbe2aef0fad6bfe524044ad29225d26009d5311b8796bcb64f"; + sha256 = "bff057c7306cc5d2c553fc744552bdb249e32a381d34007fd469247a4f22960f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/si/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/si/firefox-88.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "bb93e1dc7621094f32e385632844169a8dc51369be8c5ca459dc17708e1d1ed8"; + sha256 = "c73e53ce7498ac770a236f1f606dad29ce3ea6fc03713a223997b6e272cdb5c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/sk/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/sk/firefox-88.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "d7dfbfcded930a7d8aa03e482c66004202824256255cf08aee5a84a41d825285"; + sha256 = "ceafe41adedf9b9a354ddc9117a879b72f4331e4f7ff3ca3cbcce153b6cc7e42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/sl/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/sl/firefox-88.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "3ab06c56331850805e8e925deefb3cd0d21913fe88e04d6cd16ad9c59041d444"; + sha256 = "3b39bdecfc71fff21040e28301b0c8193119f38e1a0877b168504f31dcc33d19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/son/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/son/firefox-88.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "6b93d5b1eeaf64ed591a285b1384d63dec16f388609c845e12f4565ed2bb32af"; + sha256 = "437a98ebc049dd93537a52cfb56e19b1dd1142a61e9eaf0272e5bf490cb82022"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/sq/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/sq/firefox-88.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "834a04d54a73886c58d0360c675b137b44a69b34003e5d77ba8516397e976874"; + sha256 = "51b5da749c31fa8ca7af7b11d67f4b4d15c6924abed95d54c74c3107ba4b8fa2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/sr/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/sr/firefox-88.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "d629d7004fd5c3298e61ec154c7983b8b7bcc4ee8552ebbd53df81eec85e5cb0"; + sha256 = "c8a99c7a3a2a7bb2a2e6958f0e7d0d5e13441e758a024a7a2129e6adaaa41cc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/sv-SE/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/sv-SE/firefox-88.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "c3d19f42894dac47f78684ea1a9bc9d7a6fbfd51b4186bcb06679a6666a280e6"; + sha256 = "a2ec634c6f269de30f6020946e76a42ddb592da4636bfa64d87dd4711a1adbe6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/szl/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/szl/firefox-88.0.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "3572e4ef3dc20960e60f342e0dcbb4ca374c9184cf84c40d644c3677b8dbf4b8"; + sha256 = "4bf6b15dd8fd99ed8d144091ae1e6ed4a1d9922d50c9bab6f5569b73ef695213"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ta/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ta/firefox-88.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "b2f40c2f906fa1cdc67ba12faaab62468e71b9c9ec1c28790db56a4728e5f897"; + sha256 = "959cd948b386e2416c905eb13de3b22b94cf3d6592458dbe52106e6eaef9837f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/te/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/te/firefox-88.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "81f135e5b9e1c90cb22baee13c5ebd5d2a954f3d3a31be74489eb9bbf4dda7ce"; + sha256 = "8e1b26c7c4340665ede28290ae8298a877a735f078bf9440fefc65d13c0675d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/th/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/th/firefox-88.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "dac4e7326e9a2b0c6eec8361ebcf23afc95087f5fabb964c7802856bd8de02cb"; + sha256 = "d724ccdebe9a34909bd379d06c4af9beba245525374ccc090c492c3a95d65115"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/tl/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/tl/firefox-88.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "9be7f3be1ebdfc19c8da8a70b1eef8108c6508dc6c37b39824ef11756f62768c"; + sha256 = "76ec33e8f4a2b75e8f2b3c115c9b366d3c508ad9f1a33c942a7a6062525e51c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/tr/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/tr/firefox-88.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "d7be3f1cab9759042cc30002063764dc66a9f622df71291daf93faa204090b02"; + sha256 = "6aad672d2b197a23418fcc98347829fa00b9099b8e48812b05c6da5a57ecc175"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/trs/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/trs/firefox-88.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "31b5dc1f40614975a8e3fa05caa0dd8dcab6b15dd0ff1ac4626d9c19b3e763ba"; + sha256 = "061c0feb9d7cdc622d5eef97b8b4fe5153f0900358349c1ec1ca95d7c4a8f744"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/uk/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/uk/firefox-88.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "a53842d484e2a632931a72b16b3c8e30c902dc1e46c3cf2a7711bea1fd0911b2"; + sha256 = "77b603973f98b6ccd577a1daad05351b41a04d00b91a144ae9385d76a7c87c42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ur/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ur/firefox-88.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "1353882717c9ae8e35523ab403870fb08f06ddec2df0730637195b1ee112e746"; + sha256 = "e1f814600f1fecf237ba80870c8b70f548e994827618d2cc9c220b4ef15c6404"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/uz/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/uz/firefox-88.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "43feb49aefcd292f61faadda2771251017c6104038ab1474d43f5cae1e8ee3ab"; + sha256 = "032c603683f2e26956809835d38abe4676d9383917d56f5e64735754784161a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/vi/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/vi/firefox-88.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "d74a8de627e877e9c28cd19832605e039398dcea312a4784099151972d380516"; + sha256 = "3504f2c00d2b2225167200a7f1b809a71d2168d6c2cb048c94d221f40417a1a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/xh/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/xh/firefox-88.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "3251086b6f58c311906c49a6b499db17eaa3122a8ffcafb6f303db0489530560"; + sha256 = "68611d455147c4aaefaf1ad026d42a9600af923bd261b3326eb4395c7791ba60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/zh-CN/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/zh-CN/firefox-88.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "4d3471f60685d251b10dd1dc06610bb3ebf9d7a4e03616a6f6d988278868dc05"; + sha256 = "cbe315c6e9e4c05ee308a04d352c2573d9197b3aa200cfd82195fce852c017f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/zh-TW/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/zh-TW/firefox-88.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "8fcfa5987a0cfa37d5408c88701378e970960d21d181342ea2a3d6c43f4e4cc3"; + sha256 = "e130ed291b9833c687ba1c11c6abb192c8ea258ee5f7300a5cd5f0154d634d5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ach/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ach/firefox-88.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "42ba93ba360aac202bd0b653a982dea3c1ea0d5cd6c530deef47c29c189c197f"; + sha256 = "099c38d992da934be008e40b4ea0cce6e46f45f838cfb64b5e0b129a10f9f9af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/af/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/af/firefox-88.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "9aef316b230194ec02ebb1e7780e61d85b1a4cd398d56ec0c5238bfb9af8278d"; + sha256 = "56a0573fe7cb11133264363307ce3810177c6f03415ed3bee895765a4e737652"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/an/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/an/firefox-88.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "a645abc8fafb548a495efdf9e88ce96af06d0fa4703ed5ea6b63ae79d309f3f6"; + sha256 = "f0e12115504b079863d30ffc7e19f497c4563723023a3ad40b293c2d305921c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ar/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ar/firefox-88.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "c85e9eaf8480ec226eab70a8b434f56fbd5f4f8a7e57f13b341d478142e4ef99"; + sha256 = "2793fbba47c73a9c86bdb6665c7d28e7af5a0c6145b6751eb0bd38a3ec890818"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ast/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ast/firefox-88.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "96a1fe1ab748ba2f99a23fd149f1d0b60a27f4d96ad12bb2473ec0393597e968"; + sha256 = "e55e686603b6b827c49e87d52b547952b09ef0ceb105224b6ede539a5b269c8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/az/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/az/firefox-88.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "52d3bc8e60196814f7ed1d1732faf32b4129a25379e9f526db7e6b755bbd5746"; + sha256 = "a491479be97c794fc89184e32dec3fb6bd1775139ec0e02fcf0b8679ce8d9697"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/be/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/be/firefox-88.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "8cadf14d2ce8341e8a6a11a298203e121125d12ca63833642186b79ae79b5643"; + sha256 = "5561e4e9730ac83d94e0e19cb7509cbc8986559e49d4386059021ec776b7ce60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/bg/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/bg/firefox-88.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "b60d8361c16f9b200255e6a904fdbf8da00a6f33a95280e456b471d54cac75d4"; + sha256 = "8ffbce4041bba8a69fc3cde897e816c2f71a675a0935415d219835535a4644b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/bn/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/bn/firefox-88.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "1818bdfc297e2928255c006f8772478ce574c34748102ef64c5645ff59e3e2c3"; + sha256 = "826eed8716f6b02858f17d75da1dd39b7914c9b487c074c9065fb49917825b12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/br/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/br/firefox-88.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "7989cb7ba1a6984891c6eaa48a35b09281d0b8c7532c46cb1c87008bff5b68fc"; + sha256 = "3c2dc18b43a925d8bd0c46e3c108a74e07fb122ae72e723c108b9fdf8e0b70a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/bs/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/bs/firefox-88.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "d618086558e44219582ff263d9555855bd562e0a8b9d588c2a03734d003e1138"; + sha256 = "459bd06be3caa151b38fd3260405a8ef9d13fc445be4c6a218fe0074ad7140bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ca-valencia/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ca-valencia/firefox-88.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "8f74cf450192bc9dfd2877269f98663ebeb06fdd0cd6d25db3261e5d1f6b36c2"; + sha256 = "506d8950cdfc9ecea83789d9116c2fbdc7541d756f7e07db710b7dbf7eb51118"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ca/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ca/firefox-88.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "dee6a1ded1c10b4771294435c23e433ed209dfe55db9cbcc0454b0da23d26cec"; + sha256 = "c0ae65141073ebccd18c0e053198db998225150c4c1724bf0d07cf8954198e41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/cak/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/cak/firefox-88.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "9e55f71f4040c21d79fabe4487cf5b660baca37c23875a31015e70a520fe0737"; + sha256 = "5cc2ed5014cedec417a1cdfe193364031163b0c03c26af49293e54401c071ae1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/cs/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/cs/firefox-88.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "3121a7d49718ebf6c9a8babe0f57962547b54b99864f917d045f78ea4a4aede7"; + sha256 = "49ab8e8599bc78d1c7613d6b58f1a3da63af6ad6a4029fcb1977c3181eb190ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/cy/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/cy/firefox-88.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "02c5a049462f3d4c0a538a62756af8b4e59b1acdfc4d92d43639ee3a27e568a1"; + sha256 = "1ded8c796d12aac6d0767b1694f1a3ba7a852c8d9feaa1b1f3158c561539e553"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/da/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/da/firefox-88.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "8bc3ad5f69850d0fd4c91ef2296462fc2c641e8eb9835ac5ffe88a9dd518821a"; + sha256 = "f17e25561c7cc08b70dc66eb7904f9f4d27eda7ab1e79beca813b6ec86b8774b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/de/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/de/firefox-88.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "2e9e562e10477f4a54d677bf2cd6becf87e4f40336fea8f4337f5e7d928f28f8"; + sha256 = "6fdbff1eed3657ef9979d1e63941ed4e9340de8741c03c46075841f1acb10e95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/dsb/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/dsb/firefox-88.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "fc1881741d5aeaa5cc34e9b86515c8ad637984d88814c48f8f014dfab55bf02c"; + sha256 = "2a8ad12cf7487892097a6673fa9dade3fb30163c5d5fe5ad61c7ec417aba8363"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/el/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/el/firefox-88.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "cc44c88c82adbdcde8690825851711b48212a49aa74b7485cc51d234a5027cfa"; + sha256 = "e7b74c223382724059e70608bc62946a792203b5c688d4802de70d25955485e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/en-CA/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/en-CA/firefox-88.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "c6a32c84bd3ed42ee801a5780cf45a6061fc8b37de4220907a98d674831c0a00"; + sha256 = "eac978e84c34544bcea96a6c57b59644d7d282c4250942b7acf8365aadbf8e5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/en-GB/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/en-GB/firefox-88.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "cbf4e049602873ae13eabc2176657bdfb95fd4277360991ab4ef2a4e7be697f6"; + sha256 = "c1c69617ea1e048a2f141592b602745d2e9e556172f896379d5fdfb2b2c5c3c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/en-US/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/en-US/firefox-88.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "9127aee106dd9f09fac0c3cb89c5d75553384da4ec9be5943b60a5f55f31fccc"; + sha256 = "a6f45b2aac37f917c0e3b8450cce94646f8734215d8f04a896f21cdbca7ba77b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/eo/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/eo/firefox-88.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "7f75cb2fa8c73bc98a4d5b0f60ddbc66eff63a9caa271b98bb8eb4897fecdd49"; + sha256 = "73f658ca036879f9a70a1f9205c7da2899b1c1c59e58d957e165ea7bbcd5e34b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/es-AR/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/es-AR/firefox-88.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "090b13b1698e70c0d13409ffac5b45a044356556e3ecab970fd34907e16cfc11"; + sha256 = "6a5aa32bfb51de74b2d5c3567550ae0ed2820fbc302a48449a3ddc1f65eb279f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/es-CL/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/es-CL/firefox-88.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "1453a40f9c2ae6794dc886d1c5462e4341141fe84792e32a08b0e6c4ac5183c9"; + sha256 = "4c2d5cead45a8535a6c2e1a64bde129cf104ef1d4cf4d85a673c7b3500c1609f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/es-ES/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/es-ES/firefox-88.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "3dc986b05c389dab03cacd1672c8621f1ec93e5781dd79ec18358e3a1f2e8f84"; + sha256 = "8f8c2bb4af01cb144f751ecc9dd010ea24f557b75d7c08a09eeb023945c4cb62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/es-MX/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/es-MX/firefox-88.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "e6b18f0adf5ff99d1c7f84dbabc00b44ad7c3c2a4b95586f58d18421f28dfa1c"; + sha256 = "4dedabb4b1e51e22e2eeedbb448f96c4f7e6dd44b3e5fc414a81a22b1e03c73f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/et/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/et/firefox-88.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "573cabc8b8eed9e80d43ce960660737fad1f3bf43266d3e72ea475bec931eb9d"; + sha256 = "23b5abc7775a964ba1ee5752f8b61c7edf4c1e1eaf8962b66f13ac638da9ed25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/eu/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/eu/firefox-88.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "5b3d1ecd842b30029fa1749ad7a1aa6486bf96f977d5f274ecababe7909c71b0"; + sha256 = "3c87dc6406ca147713e5530b773581333d0c0835cab15d3e3254a4dab5e74e0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/fa/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/fa/firefox-88.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "41edf84920463d8c1f6ac8a8c0c5068143652129ec42377e3a3973d54e8477c0"; + sha256 = "b20949a6b54614935ca46ab5c7f2d3116ac3323a775ad812096d964cbd05dbc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ff/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ff/firefox-88.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "492d2b1307558b1b19b5d1d88bcc0eb151d00ebc1331356520068597614919f4"; + sha256 = "6f26c249f264b714e22402dc079d54fef92e1092a3ce12fbd61be283835c32a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/fi/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/fi/firefox-88.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "f495c5d6965c2fdfd06d23616f4b017c600e07efc22984be743c3eadcb5eceb5"; + sha256 = "f6bdd115eb26dad32b019c8e854e2bc1f67b7a3d56cd044199ef0cb4c79a3d29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/fr/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/fr/firefox-88.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "ba0cbea290a3911a6bc24fd52e726234f90213b05756a57aeeb01a8ebcc7af73"; + sha256 = "bdf941c1a60dd2018d341e439acb7746401298b7492ec1e93b2fc744f3ace4b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/fy-NL/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/fy-NL/firefox-88.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "9e9dfcea10f89836b3d63420f90f992b123dcec3beceb3eb739d47b15ced4a1a"; + sha256 = "cfb472e1e98f0ec8a9a6b24e8f31113ab25fcb7d1a01ddde09004414a0ac7954"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ga-IE/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ga-IE/firefox-88.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "316b6877a46f452d628509bf94c4e729080d93cb8590d8c17f9ce030823a3b86"; + sha256 = "20aaafb2d88eb09863ffb17c88df2d31aa20089672eef91e19c26795fb083de7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/gd/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/gd/firefox-88.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "34f2b2660f76ca13697ca029fe06cbdada7e8a0ee3f703c55b5290af4f59d687"; + sha256 = "af7d5ff85091ffb76cf15c0ed10e1148356fa5c3985e81a38c08c04f5c281064"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/gl/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/gl/firefox-88.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "b61531887132193a3b68fc1394682305bf242bb8244f19c6e6dc158b0e6dda61"; + sha256 = "28b4c52dd5191a5990a540029df8bc5ac40d5e38c23e2bbb0a2f9bd73623e74f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/gn/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/gn/firefox-88.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "286d7c949488a93370055dc650a70825df689b496de47382c7c326d0be16cf11"; + sha256 = "5834d96a0daaf084c0ddf33490287ec2a3c376420db87904e550cf341953567b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/gu-IN/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/gu-IN/firefox-88.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "c04e2f3cd9514b8494122af0baa474b2e3ac91d62939ec1117f3b07efbffecc0"; + sha256 = "025f19f373cbb3bb26029e119653a8fb1b8451166959493a75cbe89e16ae6d0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/he/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/he/firefox-88.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "9f4436ba36fe3d73f22c0837fa124e712c58169d9db1cccaad91187d895f4b95"; + sha256 = "3f6433e730b5a5ba0d1da4cc1d69e497b115394f5be5a8f91888bcfccfd35d92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/hi-IN/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/hi-IN/firefox-88.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "e1c3674ef1a401c6f8f5f9f3f4cfdc9a858fc670f71d0b09d79677820ed6ddb1"; + sha256 = "7ad200b8615fd8a703fd142314d72e4769f07ba420b62009d0985ff850305a4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/hr/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/hr/firefox-88.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "7dc0f6c2cf38f90741a8c0a2f5df22b32abb6399d9b24cc827f1ae972a481b23"; + sha256 = "b1dbefc5e048a496ea95abf5f25ace36e1d901a0ce4d1525606eb1337ef73212"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/hsb/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/hsb/firefox-88.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "d59ee63de2bcb95575a782294cad35a0ea99eb4c8e4bde8539cd20326d85b41b"; + sha256 = "54d82c14cd3dcba66b1efd8d9e44f69827c51f7ffa6bbfcfaa82be3c0881d2f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/hu/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/hu/firefox-88.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "c9d13a693183290db6a62eda37da63f0d1535db5604a6f62d88b990ac3ea39ef"; + sha256 = "e70da56c35e3f133a8942a08a97fc0905887e722d684138329d45195d4281254"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/hy-AM/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/hy-AM/firefox-88.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "7edb84df00e57987f4cbef235a1fecc22b6dd7aaafe101f62e002e4e59caf56e"; + sha256 = "ec8a7e6a0efe5715be61344116489215177dbaf103412a5f726006afcd2c9907"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ia/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ia/firefox-88.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "501cafeb34aef4d8dae63f47446abf8b04dcfee93b9931ec06f809823a6c675a"; + sha256 = "fe534973e0c2a86425c6d3abfd15d29fda8281924ec5d1c6cf32d067cfc439d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/id/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/id/firefox-88.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "9913aec5634c32300c2f556017be415ef6516a4380af3e597b2abd8e449e82a6"; + sha256 = "6e82306244398be24cd82790ddca2885b14cb1d909e416ef7b2f569a09bdbd34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/is/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/is/firefox-88.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "71b1bf3205043c5c23988de6955a51091ec812e82701d0f37c12e937ed774b69"; + sha256 = "83c237806e5ae3f6ae926e215caa74ad22e13e375c9b462de663fd836a819a3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/it/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/it/firefox-88.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "7a842251175a2db53e0bec3b65c2db0007a1fe5d84ec126fa9029c6d9dbc732c"; + sha256 = "ff72131ccce409524b044d32fdd18150524033db8841876bfcf39d43c376ce8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ja/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ja/firefox-88.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "6a8aa33e333fcfa9bb2a011d08af0d10b445be1a22dacc4458c121e8943b1f62"; + sha256 = "6392b53788f0908da45ef6e321445430c8a9db385a134a95c63826fdc0ad289f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ka/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ka/firefox-88.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "f2d2cc7b079e0ca69de3568b10bdf6d7f74ef7f8b0bd05a89442be41df3d2239"; + sha256 = "a24cd3fd2c46dbe764a4af86f5f79a97d1ef0c3a37bfb61883556c48d987a067"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/kab/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/kab/firefox-88.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "7211457301c54fed01aa3b0735fc7f0814d4fbfeb7862ebe438f5cebf7fed6e6"; + sha256 = "68ea95f04d07ed0c0f0fb92f4ab3ace4abd0c43a878548ffcbed61024efb8a8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/kk/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/kk/firefox-88.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "8b18ac077d961279b2bb179ea37819de964e488ab528d4591ce2479ecae167ee"; + sha256 = "6e190c44a82faa476214369e0b32c2d70d6ec4394a7c289c8c73e8d1b70b1de6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/km/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/km/firefox-88.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "6b06454f9e061ae6d099ffbb2079d92538b32eb619d12858c3d759f004c427c6"; + sha256 = "532ee78e0cb774ff3a131e6bb48e27701fa136297eb3c119ac9644e05b66bf4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/kn/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/kn/firefox-88.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "4b8d711f0f33c850d2bf39f16ef0da7e004374445ad8bb3e69e0b74ff0765cd1"; + sha256 = "547b191ab90c4b81209e519f675ced74cc2579f7776005c9f2e8fb677a79ed54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ko/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ko/firefox-88.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "f6da2239dc4e457623a64f2ac5e56868e70115941ddd3c19093ba180a3aeea7a"; + sha256 = "d8567c735f37308db5e541cbc44bd69aac0b5e86a5e55bb1915f10ab8cac32f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/lij/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/lij/firefox-88.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "fc45263e353af69c7dc2e5d74edefa793b0f1d2bb86f496dd75ad66bdfc7ffe1"; + sha256 = "e70a068ff713889d452cefde7bf19be4bf65349099026c57074d4cd035ba3c1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/lt/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/lt/firefox-88.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "f030574f0bfb8574ce07159fdd213f1e21c4293bf7e1961080e6ef10f7f14b42"; + sha256 = "9c2a6ebc75cc6becd5d8b73a8c47674ea71a4b97fdde973c2832d9bb76f91f4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/lv/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/lv/firefox-88.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "7648c4616260b09161a3431120fd99c97c5630347ad4ac196956eae4cb4b18f6"; + sha256 = "ad628812c1db1ee9b7ff0f9d2f308db2480427bbdf5b6430474400cf70a82696"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/mk/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/mk/firefox-88.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "c7bfcf5ee846d340d454d6cce2e66c0245bca10d1b74887170ba3820c392155a"; + sha256 = "17b3c4004f149f66c0f6feb5a2a644b7b815d2b440fac9df597bed0cafdb06e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/mr/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/mr/firefox-88.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "808207c6efa62312abf14091992022a3d37ba906c8003316d6af943228ba534a"; + sha256 = "406e1c0435c4ff1233c9da0931ba4ba5a23a3cd1f05ed7202123ca04497f3a83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ms/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ms/firefox-88.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "f836343cd1116657b8f8f28f49df99b36a13a4255d0499945953b64934f80e64"; + sha256 = "a312c23b1069438c8b0534007bf17c0b9e5b63d768b3cf24acefda1a257f0f5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/my/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/my/firefox-88.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "1c01f7dcea9ecbf1af3cc29cb38aa8cd928dc6c10f67fdb20f98a588951336de"; + sha256 = "93c9db14e9e462d89f04e928ac8ef3e3abdc682dc82a1781e76dcd62a2122c2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/nb-NO/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/nb-NO/firefox-88.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "f196268af59a118a4c5ca50b5c7f9ace27d642fd1952085dd693f09462eb27a9"; + sha256 = "321068345667a18ae07435d78371931c55c306df14bccf74e1dbaa582d3e46fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ne-NP/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ne-NP/firefox-88.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "6a80edda7e3b0f97282840eaacd9d4d003e6562c4931a14736bd1aba6ea8eb7c"; + sha256 = "fe92879652c7eccde08e9017f37daaca5f387be0fd7784051d2c0b7e9c83f298"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/nl/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/nl/firefox-88.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "495a43b18aa2078bd86468cbd1545ea04b0fc63c847a459156489c18432fe5ff"; + sha256 = "a8dbdf538cf310d2918026e907e8422a4b5cccb943323f1ec3b391c61341818c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/nn-NO/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/nn-NO/firefox-88.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "a3d58b74e2ee2c97a2b4aa5855040f34f79024df55d8de6623991df61cfc3b46"; + sha256 = "5a7ef37d7a2d13a2188781b69c01fc1b648c198aafc6ace0e7c818f58bea6e2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/oc/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/oc/firefox-88.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "c71e444eb03df8c4b28dc34d4cfc32db2471ba12389f448c28a9dc03fc0dbfb1"; + sha256 = "083eef36f466362ea6726170be55e6410b3394b316d3c0ee866c5a1200db6949"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/pa-IN/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/pa-IN/firefox-88.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "69eedac3a7f2912f179e2c5838f4dbe109c1b1c570ea1f375d5563a622553f13"; + sha256 = "ed57e8e612d677f69776e3bafcdb174ac73e35d493151e282eb2f7f8a062c62f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/pl/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/pl/firefox-88.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "106012905a00d898ad3fa43c733c1f568c0df2e74165276feb5b3f5eb79a3b20"; + sha256 = "83523f00d01f1e41b6777789026e820de1a94f9fd413f5c2e9279d4da21697cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/pt-BR/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/pt-BR/firefox-88.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "18434861a77abb7810008af068589250ae5621c1719ed4d37643c7aa3607070a"; + sha256 = "8d5e40ef90329e0fdc39d09b4f2a1492120182020c77a78b588e8eb66515876f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/pt-PT/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/pt-PT/firefox-88.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "b27fc0941804f4bedf10c15e26fd14fc381416a2c29fbe9b4d01f328e2164022"; + sha256 = "571539f8fee1519abd04900ac6ede845f0a500f612cb1b0e0a9b0415174eb45a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/rm/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/rm/firefox-88.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "2283c43282caeee2798a93af96979e46a103b3ab7c645e72384fe19973c49534"; + sha256 = "7e1ec5a0f813e8c1415f6a85e3f38bc03a8699a88573f1735345eb4099a0bd66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ro/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ro/firefox-88.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "6d7ba9b40f17f373c4eb151a4bbf6399d27a8e5071342d25a374afc67914bace"; + sha256 = "5618fabc43c88e541160e8d6c515a04dc5a6c0a9aae4302b7be2f906c2559fa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ru/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ru/firefox-88.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "77341829394b41ed8cf63090c30b993e3a540b838bb476239398795eb026442b"; + sha256 = "aca739451ce91482029101c0010d2fa8f92bb155abd96c601df495dcc1894706"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/si/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/si/firefox-88.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "b7aaa753f54ca1aa5172c39e9899c662f62cb81628f29d29ed8774c68697d1fc"; + sha256 = "6ce0ccfc444784d1a91bb860fe3bf4910cc6a1ac12074d6b113f23028ded5d23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/sk/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/sk/firefox-88.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "fc70db60786a652dfa0d8614c24bb4b5cb46849a468903723c9e9cdfebd9eb52"; + sha256 = "eac64804e893db4ef8a241ae1fc33b9cddd6f91e37418977c7879a0b620b56ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/sl/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/sl/firefox-88.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "392eccb8277c76b4178b6fb74c8974ad31e0b36fe8778b5933b37f6249d3c9b9"; + sha256 = "0d2531fdaa0259b02264a3b45b5bef081aa196526259dbb1560c53e0683991af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/son/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/son/firefox-88.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "c95c7ff206a42cf5c4caba9a3377834c1b8b4d258de566efed15ab0815b64726"; + sha256 = "dd384928a67803465f0a040cf9ce6b8680e44aec0bf8bb940b56026d550b5ba7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/sq/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/sq/firefox-88.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "7eb9cbe937262ed47711df80143b49d369bfb185119a3fb51f8a723bb99b1f9d"; + sha256 = "01523311694f7de9d035b838d94b28083c5800b55ff3ff5ea853c4e668a28495"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/sr/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/sr/firefox-88.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "4d4b88503ccc6d5f5c16988c626027516681d265b32ee205324919a170caa1b7"; + sha256 = "5e6253d7c7f9f335fa2fd96562ebac2d78091264034f6673c3398fc725496e38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/sv-SE/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/sv-SE/firefox-88.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "fe2fdf76541c95166fae7b9d1c0b3390552968ac0a8f47f2e23da750c8b8753a"; + sha256 = "6f8864ffa2195578543b2c36c782cf7fb7ba4bcd7096245695cd8ba89ed0bcc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/szl/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/szl/firefox-88.0.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "af91e1a4d0afefd890ce9ab04ac800427670a314089b67dc41e12bfa43ecf112"; + sha256 = "b4ccf73a518f9f4ff64adaecaedb4a7dfe116ac9f579cc1713086bc00a62c2bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ta/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ta/firefox-88.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "043162612ff54115953c25333fcc03d801176db1d379cb7c94f22c0da5a1ae00"; + sha256 = "5e0e58a52836e13f2cd49acd026feaff2d27059c9525501df3892bb29364ca4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/te/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/te/firefox-88.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "2fca2c54dd357d8d5e3bb8804dbc3cfcc7fd1c17f538eaf1e1fd60c95baf7252"; + sha256 = "55c0dff310e6a8e239540aa04777a2eab384b4876a78354a87b0b5b51b7994e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/th/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/th/firefox-88.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "b049f6cc876fce2d57387d2c90afff4f261baf38e582821656efd455fdbadc03"; + sha256 = "2a62c240946d8330166371d42fe9c04f246953a61958a9a66d28382bbad902fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/tl/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/tl/firefox-88.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "be18fe1caae3a85e3a48b0a5a45cb175bd11c31d1cfbe726dbe4952c50338299"; + sha256 = "ed76eb7e7c221bfa0ab06446a3b5ba40728bb61c92a303cdf2ca4099a0f4f8fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/tr/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/tr/firefox-88.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "5c43338e0fc0138c280f9231e05c14a553d2b0504053b5c090adb7ecb96cf8d7"; + sha256 = "36d3142aee1011b41b8a91fb8b5f1e7cbf6011b55acb93b0a24b9fcdb41077ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/trs/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/trs/firefox-88.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "510ee9988f4d1c6e0e50fc07d00d2aa80380f89f8db4b0655c7a9c0aaf07fc51"; + sha256 = "2f8f414f0c0ca102e359df2b24090e23d9a440b971506058be4ab14d2c72e88c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/uk/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/uk/firefox-88.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "a01aa11750b6027f01b45763d691c425b65aa577fe9fcae6f492b40bb8ff6056"; + sha256 = "671523abb993c10c355f23029dee6f718b1c3934b9dc84c9c9c67a1fea97c08a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ur/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ur/firefox-88.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "f2e83dfd361dc8abfc3fab5554d1c545b216a05f57718aa1f8976f7c2dda3b17"; + sha256 = "e88871cd7d3bb4eed5a466d46f19b7564bacc2274fd9dca198abf690c09f1173"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/uz/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/uz/firefox-88.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "4c570ba3aa3480efd63ba230b550d750a49289b3bafe9ede881b28184ac26ca1"; + sha256 = "d8c6d54bf364fdfce2c47554f2e476dc1578334b5fc7f2c35fe5e75729d0a759"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/vi/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/vi/firefox-88.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "846862d789b275ba1184b1f65a95570043ee1f8e2f7da5678252c192a8d31966"; + sha256 = "ef62bf56b514342e96c846a8d60da76b13955cab1a65c9d5e06e5add80676d4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/xh/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/xh/firefox-88.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "5c5a88654bcec7a8c5bb7245567270542823a377c7843a6b14d8f12cf57b7b59"; + sha256 = "30c97916ef8964ec1b15ab08bed806867262fecf07d0e486e8b4821f2839a214"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/zh-CN/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/zh-CN/firefox-88.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "b7774306c5941feb5b7abf4fbc3e3d3af854145fff741f561708b5ee94d1816b"; + sha256 = "6aca619cf86cec55e4712c2365e0ffa06c3a13b9df0cf64df80ea6ac07036400"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/zh-TW/firefox-87.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/zh-TW/firefox-88.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "d115d7086947003940bc270b6a83aa612324f7913e044a194c1e05648e241b17"; + sha256 = "4c60f41d35bc74fdda6b3cbdd0b7bb19883bb2e977bcd04bb50ae014d0f8c3d4"; } ]; } 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 7a3fc9b9a0..9629c59012 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 = "87.0"; + ffversion = "88.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "c1c08be2283e7a162c8be2f2647ec2bb85cab592738dc45e4b4ffb72969229cc0019a30782a4cb27f09a13b088c63841071dd202b3543dfba295140a7d6246a4"; + sha512 = "f58f44f2f0d0f54eae5ab4fa439205feb8b9209b1bf2ea2ae0c9691e9e583bae2cbd4033edb5bdf4e37eda5b95fca688499bed000fe26ced8ff4bbc49347ce31"; }; meta = { @@ -32,10 +32,10 @@ rec { firefox-esr-78 = common rec { pname = "firefox-esr"; - ffversion = "78.9.0esr"; + ffversion = "78.10.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "28582fc0a03fb50c0a817deb1083817bb7f2f5d38e98439bf655ed4ee18c83568b3002a59ef76edf357bfb11f55832a221d14130f116aac19d850768fba3ac8b"; + sha512 = "5e2cf137dc781855542c29df6152fa74ba749801640ade3cf01487ce993786b87a4f603d25c0af9323e67c7e15c75655523428c1c1426527b8623c7ded9f5946"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix index 390b26a1b9..bc9cf8a326 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -263,7 +263,6 @@ let --suffix PATH ':' "$out${browser.execdir or "/bin"}" \ --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \ --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \ - --set SNAP_NAME "firefox" \ --set MOZ_LEGACY_PROFILES 1 \ --set MOZ_ALLOW_DOWNGRADE 1 \ ${lib.optionalString forceWayland '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index b4ca094be1..3f3eec49c9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -88,19 +88,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "10.0.15"; + version = "10.0.16"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "1ah69jmfgik063f9gkvyv9d4k706pqihmzc4k7cc95zyd17v8wrs"; + sha256 = "07h2gd6cwwq17lrwjpfah1xvr8ny8700qvi971qacrr7ssicw2pw"; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "0gyhxfs4qpg6ys038d52cxnmb4khbng1w4hcsavi2rlgv18bz75p"; + sha256 = "145kniiby5nnd0ll3v2gggzxz52bqbrdp72hvh96i8qnzi0fq25a"; }; }; in diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix index fd5b2fff8b..4053a042bf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix @@ -44,7 +44,7 @@ with lib; # Those pieces of software we entirely ignore upstream's handling of, and just # make sure they're in the path if desired. let - k3sVersion = "1.20.5+k3s1"; # k3s git tag + k3sVersion = "1.20.6+k3s1"; # k3s git tag traefikChartVersion = "1.81.0"; # taken from ./scripts/download at the above k3s tag k3sRootVersion = "0.8.1"; # taken from ./scripts/download at the above k3s tag k3sCNIVersion = "0.8.6-k3s1"; # taken from ./scripts/version.sh at the above k3s tag @@ -96,7 +96,7 @@ let url = "https://github.com/k3s-io/k3s"; rev = "v${k3sVersion}"; leaveDotGit = true; # ./scripts/version.sh depends on git - sha256 = "sha256-7RAZkSTh15BEZ3p6u2xE9vd5fpy4KBYrl2TjtpIiStM="; + sha256 = "sha256-IIZotJKQ/+WNmfcEJU5wFtZBufWjUp4MeVCRk4tSjyQ="; }; # Stage 1 of the k3s build: # Let's talk about how k3s is structured. diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix index d0aa1029d6..decb586045 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix @@ -1,22 +1,22 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.20.5-k3s1" }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.20.6-k3s1" }: buildGoModule rec { pname = "kube3d"; - version = "4.4.1"; - - excludedPackages = "tools"; + version = "4.4.2"; src = fetchFromGitHub { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "sha256-u9P+7qNomamd4BkqWBxA6rDom0hF6t10QfDTjqOMGeE="; + sha256 = "sha256-6BDetNPWyAVZOsnCWs90HljVpfUlAytFDPQ/SqPxwgg="; }; vendorSha256 = null; nativeBuildInputs = [ installShellFiles ]; + excludedPackages = "\\(tools\\|docgen\\)"; + preBuild = let t = "github.com/rancher/k3d/v4/version"; in '' buildFlagsArray+=("-ldflags" "-s -w -X ${t}.Version=v${version} -X ${t}.K3sVersion=v${k3sVersion}") diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix index 1f3bf4467d..d21219f438 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "waypoint"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lB9ELa/okNvtKFDP/vImEdYFJCKRgtAcpBG1kIoAysE="; + sha256 = "sha256-WzKUVfc7oGMh0TamL5b6gsm/BAfSCZ6EB3Hg4Tg/3Hw="; }; deleteVendor = true; @@ -36,7 +36,7 @@ buildGoModule rec { export HOME="$TMPDIR" $out/bin/waypoint --help - $out/bin/waypoint version | grep "Waypoint v${version}" + $out/bin/waypoint version | grep "CLI: v${version}" runHook postInstallCheck ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix index 95bf8c0266..e5a45a1e9f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix @@ -1,27 +1,16 @@ -{ lib, fetchFromGitHub, fetchpatch, stdenv, bitlbee, autoconf, automake, libtool, pkg-config, json-glib }: +{ lib, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkg-config, json-glib }: stdenv.mkDerivation rec { pname = "bitlbee-facebook"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "bitlbee"; repo = "bitlbee-facebook"; - sha256 = "1yjhjhk3jzjip13lq009vlg84lm2lzwhac5jy0aq3vkcz6rp94rc"; + sha256 = "1qiiiq17ybylbhwgbwsvmshb517589r8yy5rsh1rfaylmlcxyy7z"; }; - # TODO: This patch should be included with the next release after v1.2.1 - # these lines should be removed when this happens. - patches = [ - (fetchpatch { - name = "FB_ORCA_AGENT_version_bump.patch"; - url = "https://github.com/bitlbee/bitlbee-facebook/commit/49ea312d98b0578b9b2c1ff759e2cfa820a41f4d.patch"; - sha256 = "0nzyyg8pw4f2jcickcpxq7r2la5wgl7q6iz94lhzybrkhss5753d"; - } - ) - ]; - nativeBuildInputs = [ autoconf automake libtool pkg-config ]; buildInputs = [ bitlbee json-glib ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index cdac4a2829..67127a0497 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -7,6 +7,7 @@ , atk , cairo , dbus +, dpkg , libGL , fontconfig , freetype @@ -29,11 +30,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let - version = "5.6.13632.0328"; + version = "5.6.16775.0418"; srcs = { x86_64-linux = fetchurl { - url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; - sha256 = "0nskpg3rbv40jcbih95sfdr0kfv5hjv50z9jdz1cddl8v7hbqg71"; + url = "https://zoom.us/client/${version}/zoom_amd64.deb"; + sha256 = "1fmzwxq8jv5k1b2kvg1ij9g6cdp1hladd8vm3cxzd8fywdjcndim"; }; }; @@ -70,17 +71,21 @@ in stdenv.mkDerivation rec { inherit version; src = srcs.${stdenv.hostPlatform.system}; - dontUnpack = true; - nativeBuildInputs = [ + dpkg makeWrapper ]; + unpackCmd = '' + mkdir out + dpkg -x $curSrc out + ''; + installPhase = '' runHook preInstall mkdir $out - tar -C $out -xf ${src} - mv $out/usr/* $out/ + mv usr/* $out/ + mv opt $out/ runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/glowing-bear/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/glowing-bear/default.nix index bd7e05e8d3..9e1e14dcfb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/glowing-bear/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/glowing-bear/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { pname = "glowing-bear"; - version = "0.7.2"; + version = "0.9.0"; src = fetchFromGitHub { rev = version; owner = "glowing-bear"; repo = "glowing-bear"; - sha256 = "14a3fqsmi28g7j3lzk4l4m47p2iml1aaf3514wazn2clw48lnqhw"; + sha256 = "0lf0j72m6rwlgqssdxf0m9si99lah08lww7q7i08p5i5lpv6zh2s"; }; installPhase = '' mkdir $out - cp index.html min.js serviceworker.js webapp.manifest.json $out + cp index.html serviceworker.js webapp.manifest.json $out cp -R 3rdparty assets css directives js $out ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index 20aebebf7d..c42fe55169 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -53,11 +53,11 @@ in buildPythonPackage { installPhase = '' mkdir -p $out/share $out/bin - cp $src/main.py $out/share/matrix.py + cp main.py $out/share/matrix.py - cp $src/contrib/matrix_upload.py $out/bin/matrix_upload - cp $src/contrib/matrix_decrypt.py $out/bin/matrix_decrypt - cp $src/contrib/matrix_sso_helper.py $out/bin/matrix_sso_helper + cp contrib/matrix_upload.py $out/bin/matrix_upload + cp contrib/matrix_decrypt.py $out/bin/matrix_decrypt + cp contrib/matrix_sso_helper.py $out/bin/matrix_sso_helper substituteInPlace $out/bin/matrix_upload \ --replace '/usr/bin/env -S python3' '${scriptPython}/bin/python' substituteInPlace $out/bin/matrix_sso_helper \ @@ -66,7 +66,7 @@ in buildPythonPackage { --replace '/usr/bin/env python3' '${scriptPython}/bin/python' mkdir -p $out/${python.sitePackages} - cp -r $src/matrix $out/${python.sitePackages}/matrix + cp -r matrix $out/${python.sitePackages}/matrix ''; dontPatchShebangs = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/himalaya/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/himalaya/default.nix new file mode 100644 index 0000000000..76f1e92d5f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/himalaya/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, openssl +, pkg-config +, installShellFiles +, enableCompletions ? stdenv.hostPlatform == stdenv.buildPlatform +, Security +, libiconv +}: +rustPlatform.buildRustPackage rec { + pname = "himalaya"; + version = "0.2.6"; + + src = fetchFromGitHub { + owner = "soywod"; + repo = pname; + rev = "v${version}"; + sha256 = "1fl3lingb4wdh6bz4calzbibixg44wnnwi1qh0js1ijp8b6ll560"; + }; + + cargoSha256 = "10p8di71w7hn36b1994wgk33fnj641lsp80zmccinlg5fiwyzncx"; + + nativeBuildInputs = [ ] + ++ lib.optionals (enableCompletions) [ installShellFiles ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ]; + + buildInputs = + if stdenv.hostPlatform.isDarwin then [ + Security + libiconv + ] else [ + openssl + ]; + + # The completions are correctly installed, and there is issue that himalaya + # generate empty completion files without mail configure. + # This supposed to be fixed in 0.2.7 + postInstall = lib.optionalString enableCompletions '' + # Install shell function + installShellCompletion --cmd himalaya \ + --bash <($out/bin/himalaya completion bash) \ + --fish <($out/bin/himalaya completion fish) \ + --zsh <($out/bin/himalaya completion zsh) + ''; + + meta = with lib; { + description = "CLI email client written in Rust"; + homepage = "https://github.com/soywod/himalaya"; + license = licenses.bsd3; + maintainers = with maintainers; [ yanganto ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 59ae195516..7badbc2b10 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "78.9.1"; + version = "78.10.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/af/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/af/thunderbird-78.10.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "7bfec5dfdab93e1ccd8737c67cec8f257d15387045437c016b5ff2b5ef6d6d45"; + sha256 = "25209094ced8e435c1d2b46f78e618b302b236995454bd494ed2c74357041012"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/ar/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/ar/thunderbird-78.10.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "5f1c9b32fc37c750a0fae80b0b41d3f11c774807014f930476a28885ad7854df"; + sha256 = "8c414c7b5f45f358918360369fb768b9c9051ef870cae22faad70c0fc9dc9ddf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/ast/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/ast/thunderbird-78.10.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "b880a02f42b9c6bd3c8b2f82f829c6458091bff1d3555a7cd07d59254c3f9694"; + sha256 = "650309b5890f67fece320e25fc9e070b560fb37474c00f4f4e08e18ab30ef33a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/be/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/be/thunderbird-78.10.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "ea2049f514881f76b0b775c5e27aace867d483c8a9e8f3c139e1c213fc97371e"; + sha256 = "2cf57f5c44bf244c59d3cfb849b66ec53308aff381ce39ac16adbb53dcf11064"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/bg/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/bg/thunderbird-78.10.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "54d77d3972fffde0a110b2451fd3516aacd27cf7365171ec369993f0d57506a4"; + sha256 = "348b23e62abe077e14235159d829b405b9fcb003dc7230883b10ee4f10b64f33"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/br/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/br/thunderbird-78.10.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "8fea37e1b1721dfcd06c2798b67260dcd3e3a9821cda5b03ee5355bd04759602"; + sha256 = "7baa2d4d149ae3011cb7f9ddc3e5a3f6536f7c8ed712e3a60d7f0c92547f1c18"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/ca/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/ca/thunderbird-78.10.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "26ebbb11b0db144ebd7c891a50fd595a1b40ac9e3aaae212464bed73bf8d29b7"; + sha256 = "368f1b24edae884a2c1e961f938b085478151742b161e5f9016bbb92b3e2ab13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/cak/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/cak/thunderbird-78.10.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "7dddaa78c0429b8dc7ed0570d8f0dc440da9df940eea2a091dbeb28323a1972c"; + sha256 = "38bb68cbe0054f6deac79ebd72ff5c9f28c9a2b9b638967da7d20442c909df2b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/cs/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/cs/thunderbird-78.10.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "b50810bcdc40363af165ea703ae660c68b33ceebb186cb736aa2dc7628eb7d51"; + sha256 = "810fa4e2e3507d419d55f16d0816a326751d2211675b3ca335b08b9e46f8a65a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/cy/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/cy/thunderbird-78.10.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "9e26a9dabe48146c0ffb94ea8464aba206fc9afe1f110642c5a0d742627e090a"; + sha256 = "847867a78b1e583cca457436e57cebaf0c721121f61eb955cffc144cc255270f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/da/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/da/thunderbird-78.10.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "156b5a65a987ee2a74e608f230129e65abf59952e331bb8467e48ebcda9448c3"; + sha256 = "d84a31c096f15d79b23e09f35ed2894dabc855c696b457405e2d638c52898945"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/de/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/de/thunderbird-78.10.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "f55a61264cec96205f75bae35a58ee9110614aa3a027fc19fa7b67b50167e343"; + sha256 = "2ad8585b955c60242747daf36855d6fb77658dd2dda75cb3ff8637c8ef07bc75"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/dsb/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/dsb/thunderbird-78.10.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "5e4290ddeb1bc2e301d400c5b71c719e25f109f20aa92c723cfda11342fcf171"; + sha256 = "84ac04cd5248ef47c49927edcdf71d2e8f7cf96139888289eb4d8898b5224f71"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/el/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/el/thunderbird-78.10.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "c10b09b8773cb4479c354194664f5c40bb45e748cc84aa3f895be72feca1b761"; + sha256 = "cf2760b5488590a76df140b7c877528bd76446187b673c82087b199e9e8f416d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/en-CA/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/en-CA/thunderbird-78.10.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "e21d94ea954e080db1d4a8c5a20d39099fc21019f78ddcb4fe105ca0beb6f5a3"; + sha256 = "7006ac951a834ff689f4ee1ab5a0a4e051368cb33ceaea459467536e2f22b74b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/en-GB/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/en-GB/thunderbird-78.10.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "9adcdb0b947f5ef79d874ca47b4361677e1dacb03c97ff4cdcffe0706d865272"; + sha256 = "e77850b2ff0b91f92ee18990715a75b7c73e226a6cdd9dec6b3fd689c3571053"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/en-US/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/en-US/thunderbird-78.10.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "20eafd8ee01018952d723a51f736aedaeba2c48f4da5554a80035427e24d1486"; + sha256 = "e7f324c2e959ca3ce15dddf949927975cb06001243f3b7bd8a0e162edebf837e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/es-AR/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/es-AR/thunderbird-78.10.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "18e3ca32a92fcc7d201d89abb2c053f5f081ad91402280a0de75c1307eed5955"; + sha256 = "17be1ad2c43f72ca07ae1060566ac4730e1022d4032efbfa76b6f1beec1bc123"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/es-ES/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/es-ES/thunderbird-78.10.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "ddae6044f742f3530bb1eb45f9464158d3b53f26dcaae81874e8082e839b581b"; + sha256 = "697acffd0cb7b8c5948fce660528729ae31ee0baae809e4b3d759f9d42a8d7f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/et/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/et/thunderbird-78.10.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "d3533609865cb53fa4c1226b747ae011737112755e83b734f0b54bc61d995f6b"; + sha256 = "84789fa2e03dc312a9e6509fd8e938aa333465df8b451d7224cc86ea9059bc5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/eu/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/eu/thunderbird-78.10.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "6e245317ce453ef71dae9a222e9fdaf5f72978aeee6735300a77bf452bba9934"; + sha256 = "29c7728bb5aef60f53dc914b5d6eed47bddd191198db92b79d0ef144e64c5890"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/fa/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/fa/thunderbird-78.10.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "a779002a3778e3b5939a1b778ea1d2a570d5ee71ac3db444b64a8fd19a4ffa1a"; + sha256 = "5ab74aa662aa970ea406a33f05059361e317079c41b755700c44cdc778d04e43"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/fi/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/fi/thunderbird-78.10.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "8edba99433e66f4d2ea9936fdcd7a0f84cfcea73da2fede520afc45e90d1f639"; + sha256 = "578b713326dfef5e59acb1df29dd13f35f7b935ebc5221433c180431943c9424"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/fr/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/fr/thunderbird-78.10.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "c21c71dc854aa27b6519b0220c646d32bf5015d39765ec34bef2b1a62712c9f1"; + sha256 = "2c43647dc70aa1f3bc15a83ec4654b6ec3c6d520d03bcb503f8672e1dba0edfe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/fy-NL/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/fy-NL/thunderbird-78.10.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "6babc9461a014f8f1eeaa0c9ed5912bf8cb9ed24776de637014e0a5ab52b4aba"; + sha256 = "a621165ce74cb20400bd104d43e4ddf196305cc7000cd524916b766662f20b23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/ga-IE/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/ga-IE/thunderbird-78.10.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "889788186a45a9f951ecfcd0c61710d2dd30334c81ca0c697229401f555dd4fc"; + sha256 = "5e45fb6ea542f24715d96e04d9c30b44584481115fe0d12a30e27ad2cc057faf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/gd/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/gd/thunderbird-78.10.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "f9bc35aeee7d40d4fab47d74edacfa66b784aea26c3ed60709bf8554f3151d38"; + sha256 = "2ccc8a5394119d98d9b3ca97128e62f18fdb8b86076ff24bca6f29ac3276dc4f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/gl/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/gl/thunderbird-78.10.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "71f270c780f58d7530e0f9535aa16d0df329f974cd9fa6d51da5870b2197d7af"; + sha256 = "fc84c102cab3c1b85af2beb68fcabf752c9643407b6b6322e2972d231dec9da9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/he/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/he/thunderbird-78.10.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "5927cfa48ea585e75894a64dcb70e68fe2d8e5eea5b926b26b522b8a78cbc2be"; + sha256 = "cdda0210f15750688490ceeac10608722184ebb05e566be2c8d0dca563d708b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/hr/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/hr/thunderbird-78.10.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "a5ea3a25d9a28518005a62d7a1a9832e58199924f9761b7bc8c1a6b0ed5dbc3e"; + sha256 = "3e18a65345e29126e7fc82a8da20bb7a8a3b8bd6efdcb143c8814d940a4e42b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/hsb/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/hsb/thunderbird-78.10.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "1e6b20a125c2fad0b78558b5299bb57208ccd3bbe9075505b94ed819d03faaac"; + sha256 = "e9b38d2a15e152210725f2422e283a84086c95edf164f33979f907180e46a568"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/hu/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/hu/thunderbird-78.10.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "1fb84c326aa68ce3bfd11c1381a0317b2b6f953b23611bfab6d409d208c164a2"; + sha256 = "733efd6a1eb66353e0a6dbe74f18f42cec0c7ecc01d1bea865303cba9d4067b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/hy-AM/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/hy-AM/thunderbird-78.10.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "4ae1a82ca5321cf068525ffdf775f1245efedc5a7db8104d83c177cc9606c61c"; + sha256 = "8798f26cddc10d47992031e21b785e115c46413d36b8b4e518649adaeb3b47ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/id/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/id/thunderbird-78.10.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "e797bad2246f1e1d1fd9ead1fd99c0c03cf70edd94cec0944f7ccc14ef7d5053"; + sha256 = "3cb73a2f9ee07cbbf13d562e988410cd644e5e5b87172c960463210bb9651be6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/is/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/is/thunderbird-78.10.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "1b9c39688d4958cec95537b972efc8179cca37901c75dce962e6ae8f18371125"; + sha256 = "3d3bc8d8c12d213635404e559d3b477435fe632ad3e69ea7060a03f30d31b86d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/it/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/it/thunderbird-78.10.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "62a19dfd8c496cb1dd44f960914ef46314d3f1542e7957b60622592e003fcff3"; + sha256 = "4ce44992d22f283f08e16549bc6cfdc416bb6d197bef63702ac279ab8a3366a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/ja/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/ja/thunderbird-78.10.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "b730278fe53e3bf51fdf2147348a6f68b4773f572166c8c180685a8acf805577"; + sha256 = "ecdb393877df52459486628f70024620e2824ad6da8363a9133e64c041fe3812"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/ka/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/ka/thunderbird-78.10.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "c22b1aa5d5d24ba355219bd31023acc74cbd73f7211594c5445ffcaff247675c"; + sha256 = "f39a3beed17681f36f28a33fb74083143aa33ae51a7836507345b147c04d1d0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/kab/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/kab/thunderbird-78.10.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "8b84e2d2d411ab7486e7013479632a65d836790e24df258db633e7c08cf8afb5"; + sha256 = "fe7b8e90b3c30de00ca5326e3a2a100aa7ba862322c7f386c871b56a22ca4e08"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/kk/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/kk/thunderbird-78.10.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "c2bd75e1945ff3f74dca7cc5bcecbdb36d94a07b0ad4c4636ddc22b0527b4e27"; + sha256 = "b1c8ece7ec8e634b0746664401ca750c1cd3a81b587f6ee918b6166720c3b074"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/ko/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/ko/thunderbird-78.10.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "add8f17f12b5add8759a4b4964d205ffeabf49d5d3ad351f575762f11cd496e7"; + sha256 = "31f16d08a51315502e0e1da5d11581e2637361b40fd5c0d60852c1546fd45cb7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/lt/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/lt/thunderbird-78.10.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "53dbfabba0feda6ba2c6d8673bad01769a99d28cd4cf05dd27cc13364e365d61"; + sha256 = "e56f4fd2bbee8bd0379030442355412f9f73e9c67123505242f438ccebc544ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/ms/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/ms/thunderbird-78.10.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "220db127c3a32811200db8c2e8ff1c3a026e5fc766830cf4267c42142f098932"; + sha256 = "13c2feb9ee22a40485f9648b2ad60113b0a463aa7c55cd9bef8cb2a68211bdfb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/nb-NO/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/nb-NO/thunderbird-78.10.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "e96f5814e9d2b9ca8f3326cfe867405681ab4132e98c17a0a0980c1e9a2dd0be"; + sha256 = "7e305950c61299fe992891cb2a18a8420c40bb9333b40dd45ca39b92d644cdf9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/nl/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/nl/thunderbird-78.10.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "deaed1d2f3ddf74391dfe94b3b11726e0a7823f45e37047b2dbfdc0133eb329c"; + sha256 = "eeaa3e5b0e72f36cf1a66c0bf040e94258f2547a7e1665fc667bab3cd9f84410"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/nn-NO/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/nn-NO/thunderbird-78.10.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "8bb5e5375805285da875280316dacf39be1069cc567df6b09cebc9689922a260"; + sha256 = "e870393eef06b6eb2564b00a039c7d19e418e2283f992970df860606099cd70b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/pa-IN/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/pa-IN/thunderbird-78.10.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "8680087bfcc7758df27d74f7be937b50625f08c44c3c8a2a2d21f3ffeda4d38d"; + sha256 = "24b11eb4bb5bc929e89b92cc0faf4011f5ce33dd03d4212ac5c0209ce7901c10"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/pl/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/pl/thunderbird-78.10.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "9bd9a119f0f2d0bb5e489907f23811a6e5933d9304fb92d938fa7b0e638dac6e"; + sha256 = "cace57aae947e8a2ed1b7875c4791d94d8f0d0f865ee0dc0a4a9230081db6477"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/pt-BR/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/pt-BR/thunderbird-78.10.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "2f87bb38281d69e34d9918b40ca29f35ada3b9f8a627bd36c56f21befe2a45f8"; + sha256 = "d36a91d97b8e53720665e3541215889a2ce848de5b87989c52c3022924ae73e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/pt-PT/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/pt-PT/thunderbird-78.10.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "786a97c6b1604e59a6a4114142b5f5c309149480ddd612b22c1ca122d3a2a633"; + sha256 = "18f71f0f278037a88af1ff4d87ab8b907cfa3097f11e3b98282c9f9de9d40fee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/rm/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/rm/thunderbird-78.10.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "cd54da5d6c3b105a8ed9dd09771d8e15881694b001b6daf8199014fd4043b777"; + sha256 = "833e51aaba81212aad670b276498362103aef388cf09b5404a78cb046805be4e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/ro/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/ro/thunderbird-78.10.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "e81e40a5eec5bb4dda0d0b7df414bd475c054008249c946e8d99c9272f31ab62"; + sha256 = "fe033d44674609c319c8bc6939056d8f77ccbabf0badcb059a06bbe028868af2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/ru/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/ru/thunderbird-78.10.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "283221c2b927c10a2e4017383af6b93bd717555c28b700b276ba8d600a84250d"; + sha256 = "19c26477c691f60c76813b1fc657ff837fe4f160d6e77ffa6f73d9e88e748655"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/si/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/si/thunderbird-78.10.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "7f6fe6533e54e6a8a544da7bd844079b2d6a5e913c16210ad77ac7c93d2b1415"; + sha256 = "ae2a50027f0df5e3533bcb5b094987976a040ef1cde810e030ce6e446338ba96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/sk/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/sk/thunderbird-78.10.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "b0f872351a9f2aa714f69be18b78a8092049c8e005b07a19a906a8d595d90fc1"; + sha256 = "9bed8f53737a363314cf67671b64b7bbdd93ff2ab50fe32a781f09cd991e3a96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/sl/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/sl/thunderbird-78.10.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "699f4e4dd786fd09d9f8430fc33b5b2897541334f5b9517a7a8dab527aabed7c"; + sha256 = "fd38aaf88301b3f58cbf0d63d0545d30f8db4994509f10f76efdcb6b0d4ea977"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/sq/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/sq/thunderbird-78.10.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "ce3c9e8cbfef057349e82462eba72a57b14d8c76f5d7949529dc9d629cc5b01e"; + sha256 = "6fa0d45921f4c2ca8c5c4a2755c8f724b3046a92504fa98bd20084b5be297891"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/sr/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/sr/thunderbird-78.10.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "1b2f383e517d80e6607fd4041b07071d71e26602bf812c85ecbbd0a5e7a674c1"; + sha256 = "1c85bd065b6441c2131f32b9faff5ca425bcd718a0b10052b05ba29a68a93c78"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/sv-SE/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/sv-SE/thunderbird-78.10.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "d0020ce77ec629cff313f8d23a1354c6ee2591d502d2f60d9800fa7baaedd0c3"; + sha256 = "cfcafa5ef9221bd1cc91f266e2659e769753a2acbac6893528347a5b7db92c2a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/th/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/th/thunderbird-78.10.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "40abb70abd9938a3141c50bf39a4e1d62c862b8b1bcfdba0a11d57fb5cf373b7"; + sha256 = "892b23cde316c922ea6fc7b537437885fa8ca2ebfd9b17d177b5f5d5deda30cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/tr/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/tr/thunderbird-78.10.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "363a371af193497ec72dafd8f5789c55b62e404f1fd386d78ed6178dfd8b5ef5"; + sha256 = "bad99148eb7f2777fc0227db9f6b03a9b31c7aaee19bfe4fbae26227547421e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/uk/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/uk/thunderbird-78.10.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "71697e823371ab8e9d5160c2fededd533de4e9adf4d491b018c2fb7db721b17c"; + sha256 = "127c636969dde8cb10121f8fa3ed0c18c35d13ccfd07643a2aa5c3aa78a6f82f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/uz/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/uz/thunderbird-78.10.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "46350d800495493f15295d65989bb3c63cd1180ccdbe4481550847618f54420e"; + sha256 = "2c1848c7cb62bf96cb255a39e31099516e7df8d3e34cf68430a323729b571430"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/vi/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/vi/thunderbird-78.10.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "a254cd59632d78971d7b3da95aad73a73cfbffbad7ebebde3c5b9f1c735db65b"; + sha256 = "754e8974cc2284fb7b01f413c0220cb1d99b50831189dd61ab8804e44bf54f48"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/zh-CN/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/zh-CN/thunderbird-78.10.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "c69bd4b840d5288d334191beaf89a4407e1039325b5cdeb107ea30c1a7e2d73d"; + sha256 = "f76ee6ce544ff1dd9df931b15e9d25b18971f489b3b9e6f03749976ead068c60"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-x86_64/zh-TW/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/zh-TW/thunderbird-78.10.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "1e120294db0dee586bb1f02ee935266f4b47ae58e0d76cfade4cb306d4153c65"; + sha256 = "fc7441b416e541c24b0148450812f350058a6d0fe2a44fa546fb4d059674bc27"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/af/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/af/thunderbird-78.10.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "31a8e3f3b38df0da0821a5bfbc7a9abaeea64b587ba3e7bfd9b601910b3e305f"; + sha256 = "5ed18c354dcb22e9999854f5f83d880fed92fd9e4ddb43564c8e69a07c5e29e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/ar/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/ar/thunderbird-78.10.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "f2ecd646ffe074f69c0b8e9b99b40984eb8ee3edfa9e54ee7994d45192dedcff"; + sha256 = "31caadee014741ec0c77307a155bfdf5ba4f7d9b06e1786edf1bf6162d59ef43"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/ast/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/ast/thunderbird-78.10.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "7206c4f541f559f97a3794e4fa523a5bbc0ddbbf53faedd6de0eedf9bc53b73f"; + sha256 = "e5dfbce6d8dffadda9ad5320d8baadbe185972d0e62d79079833853151b1bd54"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/be/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/be/thunderbird-78.10.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "fb8b7b8f054bb57c81ff3d6f9be2344875614603e51d0ada3c9ae9a7b293d51a"; + sha256 = "0f6507525b844b405c515b80238a9672012c6950185a2be6523eef3d42bcad50"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/bg/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/bg/thunderbird-78.10.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "9df0466da1b9d866055d1ab2c0afacfa52520cea68d399e0bfce31dca73501ea"; + sha256 = "002bb9b971851c3ec8eed1e1ce1c28fd97fac788578d53eb0eb130a2c100426d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/br/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/br/thunderbird-78.10.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "89625f21cef0fb98fe3b3755c73859ff942ada47b255b2f8a806f280a77af711"; + sha256 = "adbccb49d9f00198ee4fe2868d3ee4d745c79dda90a8b0b496c6be2a0ab9fada"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/ca/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/ca/thunderbird-78.10.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "6fa044e4b37fabe37ce76f09ae97edb0d82aabbc5e60442bed24fc0c6a8735fa"; + sha256 = "efb8a08377c34b49e57c424c86473429b475c9f0bb23e17f6beec2c3d288b9bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/cak/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/cak/thunderbird-78.10.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "2668ef838b08b75ac1f0d8f87ec01bc08fdd02631f8cbacd4c25bf0e13470dae"; + sha256 = "e3775d9aad469ac62c5b86e8441ee8597172cbb9f4f365309c402c42608bf3a9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/cs/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/cs/thunderbird-78.10.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "23bc6f0a178b9869cbdb59db4068cda6e88b7c19415c736ba651f886b5f680d0"; + sha256 = "a74c7a2c2bb7c0ce6456e808a6d503554c74d9588c59555086ef188e3ec9ad9b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/cy/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/cy/thunderbird-78.10.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "afaea8a7289f56ea07a2960a4ab645c8c748d43bf8ae5458b70fbd2c93d070b5"; + sha256 = "83fd84d86dff669f65b95014a222ffa4889f1db16209c133ea02c0d4f893169c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/da/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/da/thunderbird-78.10.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "7efbb2b12744af4da28580d6fcd648c41ca1a7bf09df1eb2fe149e9cb1db29c4"; + sha256 = "531984ff00cfcdf957186221d461d61dfb8637474448dd7c3f9c8f21c3d78eb9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/de/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/de/thunderbird-78.10.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "0c7059e9a8bbeceac0a834ec6db2d1a54b25d1016149cdd766259a9982b5a55d"; + sha256 = "bffa31e9ad9fcd17b3d29414d41e7fad2f95e3becfa79e45176a20ce4d7fdbb6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/dsb/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/dsb/thunderbird-78.10.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "266f62501dae1728eed1756bde56378f2a81c85e600f83e59ab47b0cda6eed7f"; + sha256 = "05101ba58d6929e128f753015220a7d018e6e0fc5b880843c2bd821a53d26064"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/el/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/el/thunderbird-78.10.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "a22d57db810633e9b6041207b018b6a4d97b4f6d25b9dac636b7c9dc7ac2bb3c"; + sha256 = "121178325199b8e4aaed151f197787e8bf82ffa6c93638322fc75755e9f09608"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/en-CA/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/en-CA/thunderbird-78.10.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "8bbca7d8bef81968c31317e298a471399ae183170dfeeea37c5791b60afcab7c"; + sha256 = "9a11bbbe5a320f4507813bde58407ef441b260d17811f7eaa692182fdd1866b4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/en-GB/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/en-GB/thunderbird-78.10.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "431a4f01e3220ed58bfc4f4d6633bb77f9f69929ebc68da9aa0945ec9686d569"; + sha256 = "f5bb637a3b17c7eea22ae7804c13734c60890755273badc4d832035a34fad272"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/en-US/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/en-US/thunderbird-78.10.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "0d0970844747d9ddeb55e81db916a7c46333e0d64c67b25106eded69d0345e57"; + sha256 = "7437fcbaa4c75858b3ceba7abce6237f80017e6c68cf963ed109b81bb73f3553"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/es-AR/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/es-AR/thunderbird-78.10.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "be435aa764c0c46864bd18463ad47ce31c3ace6ab2204c2d38ad44e6e924eacc"; + sha256 = "6aa396ca00791ed0127321bc9cb9e3fe677f1897bbde157986cb8829a6d1fecf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/es-ES/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/es-ES/thunderbird-78.10.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "0201bed6e8286dc455389cb62393cf697be955010e893a6d294a963861331324"; + sha256 = "4eb1605ee60dc731d578117fec45c03fec7f3f99ef29ab7475d4be15004949fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/et/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/et/thunderbird-78.10.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "a4594dbaba90ecbd7d2c6ebe91d3280bfa05815355b9f16756c19795a598f105"; + sha256 = "94555bbc597c622ec1cab4e310a978a638c94d7398beb40cb573555e2f5a86ba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/eu/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/eu/thunderbird-78.10.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "f74f02683bfcbf7795b92325d332f855c636f42259e36c1284d383b49e919770"; + sha256 = "77dca056a6c4cd64d6fe5ea60fe6d9c211a1ef1d0accb4685c9c8fea7861e2bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/fa/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/fa/thunderbird-78.10.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "ae29d36b6510bdda27ccdd1444bab1c2b2c581fabc2e501cfee54c50e34ea5f7"; + sha256 = "8e0b2bb8630c2ca64652fd952656637d1393b5845104f9f2ab08d0ade2a96da6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/fi/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/fi/thunderbird-78.10.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "2b586687b107c45d59a7da744ee7c8dca6b6b0dcf7685a963a901819e2b7c799"; + sha256 = "d8ba0d4194628ff7946159bf511d2485d310c42c9fc745c27b751f4c59477ed9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/fr/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/fr/thunderbird-78.10.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "dcf346dd57f6c9a5a5b05c9a367a7955b821de1c1a2e25caaa2c39d7eb451f32"; + sha256 = "ebb2561f50b1d6defb628a07646b70952687f666475ca126bd72dbd7478efe26"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/fy-NL/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/fy-NL/thunderbird-78.10.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "e19670ba85c5ee7840dc40e04c4d76dbe3b240c1eb865800a184cc512c7e1cc9"; + sha256 = "45c7c92986cc792273e5923834bd4f209e25d26e44ac1e155c8f7b539e72ee8e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/ga-IE/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/ga-IE/thunderbird-78.10.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "97608d41f96d830a0926e52bc218bbdbdbe2e3abebbfaaa8fcc78c5957bf2d3a"; + sha256 = "c127d817e6b4759eac5b2af5aaad82670a157857b63bc0869ac1adeb27d38f3c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/gd/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/gd/thunderbird-78.10.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "6f95e26b57550604c177a6b561bcd73ba39df76f6c08af71185eb050f66fdfbf"; + sha256 = "40468c9214fb67dda8cca1f43d03e5621910eb260bde268034a8c967af2bf73f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/gl/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/gl/thunderbird-78.10.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "6f911ad3c16a0fe9fcfab54518585b5ea53a6c800ef4a01ee22fba029d8f857f"; + sha256 = "55ab753b591c72307b31e9b98a1f426886a4a0007af1507fc8ffbe656d2c92b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/he/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/he/thunderbird-78.10.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "535430ac4b5991621ea4b3a042a45db7c5ec1dfb3831c882cc06180a6e21d1bd"; + sha256 = "2ea8691ac3188d8ca0c20fd7c9e9cba25e8b14eb6ebb338b42303aadaeba07e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/hr/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/hr/thunderbird-78.10.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "9dd72c9c518fad8e7b44467b6b0df15a6d631aac73fe4c6d5339b1a47f0abb62"; + sha256 = "6c5eab557ad07084889b08ae5a79569794a916535ad4b6b23493d2c658e57dc2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/hsb/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/hsb/thunderbird-78.10.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "b42f9b479e9a9e4a9be2ab99facb9a2d8a9d29ab549a69882e2e13eb15f67414"; + sha256 = "90ea860940cca6152ca92601e25514652ae652aae8df5a0ec9b9bcf59ccfa570"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/hu/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/hu/thunderbird-78.10.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "b82c89ffe3e76744a85c4a5357d294108aa1fad6b8783b27b0b38911974aaa3e"; + sha256 = "71895a707e263bbfdf9a08542bab2fd8609458c3f5229a536333db46b17282be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/hy-AM/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/hy-AM/thunderbird-78.10.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "b5f7387d7e2be74fffa44af77ae7a4dfd6a5c7ce88348eca948c5756296bb1c5"; + sha256 = "475e4c99597e444316de578c7ec4528e762ff27021189a31fb1d45a7c97b5eee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/id/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/id/thunderbird-78.10.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "87e85aace879757e916b733f36d2c6ef8aaf050c72f2a849b09df44e788071c6"; + sha256 = "c25f6bc1478c181dd88e9506b9b81882235c39f280b0065608827e90299ba5f3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/is/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/is/thunderbird-78.10.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "06f38495a1f62bafdbf4c594851d5a50a31ff7a619654e8ec5b267f81e5d83e1"; + sha256 = "eaa68dce6341f5074b3ba15452c24139737988d7af9046e8e3b41fae715ec344"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/it/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/it/thunderbird-78.10.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "17bf5e33c146e060b6ab26085173d46d8ef5774d0314963348507ae43928d632"; + sha256 = "5b1ecc37001284b49dd835060f5edf6a982f2e63218ef2dabd652e10c62ca742"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/ja/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/ja/thunderbird-78.10.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "f5db8f5abd1cee454fd93b4d25d2700ac53c98fbc3b3653a7501ae46032fd22f"; + sha256 = "eb61857839abcd445389de0349b7e297a0d737e7aa511ddeadd92b2a38419dd2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/ka/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/ka/thunderbird-78.10.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "99d0f8777c3edb3e10d9627789574cd32e3ab7b78f2d7fc914d1d8a6ccdf354c"; + sha256 = "902c0b7c3247c1d5d6dd80d751a8fbd22756a73414d8fcba072d2b3213b18280"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/kab/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/kab/thunderbird-78.10.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "56303c2d1432502b8086dbf77c97807bd1d06663e7d5329a98c063d2898db531"; + sha256 = "c91d1f0eeb7b6de618794ac369c323fe514a201d506906b53fa527da2dadabd8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/kk/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/kk/thunderbird-78.10.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "b1e9904229f9b1029a1679bd22ae58c849e1f5966729360c03b4bd8fac00c4f7"; + sha256 = "dc7115e726c51cb56625e2254b4987b951e972874b0dcd245e40f0477fa462af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/ko/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/ko/thunderbird-78.10.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "5f53baf78b96853b3c490abff44736ce4e24b049b81e9baad80889a995f9b610"; + sha256 = "a6d9b6b6c8a0a05fd2dde4545af109369d1158972ebdaf91bdb4c30498c88db6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/lt/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/lt/thunderbird-78.10.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "b9724ca09c3c3a4be2f73a0b6673e4c17cec5baf140d89dfdfac27f0486f07e8"; + sha256 = "4fb6c5ae8fee1c2a829c1adadb99e6e21ba96e61e59a631b88750a00093177ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/ms/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/ms/thunderbird-78.10.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "aa72459fdcf1348b53de43715b0e7649d7cbd6d450d069331f0dfd45910e68ee"; + sha256 = "bb4bf6706ad62be4adb23101cf621b9fcc742f757d317071b81dc6860317615e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/nb-NO/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/nb-NO/thunderbird-78.10.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "d22d185bfd1db98db50151c3d8872cbfb8df5ecc1472c1526f605274de086f2a"; + sha256 = "fdbd9715a34e6d4d4c77d1b5d6aa6ec1673907ab1df823a0b95730ea299ac6fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/nl/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/nl/thunderbird-78.10.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "a4a9fa6ff73d2a937d5a9d35e66006b1b6fec94daad7e54358844958e9b9531f"; + sha256 = "ee94b20e182fa93360e6a89e6df64c23d8ccaca7394d0716d217b25262a916b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/nn-NO/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/nn-NO/thunderbird-78.10.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "814d95b6c6a5c6d7faa61aa30cb87f4c44c8b1698f8908a95b85513bb2aaf515"; + sha256 = "9710055906529edba3d62cbc7d17745497ae3dadf1c0c53408952f4c99242c7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/pa-IN/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/pa-IN/thunderbird-78.10.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "39bfc9533287a19083e34a1d8e7944a434fd5348f3694b3004d2e5c05da1155a"; + sha256 = "b61f29bc72b49761beb5083a71594a750197ff049d84db5e3eacf322dd312275"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/pl/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/pl/thunderbird-78.10.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "1888be78e04a095e0a2576acbb3a4aa82b0060c6ca490f7a7b918efbb60e44a7"; + sha256 = "5a885bd885772dd09eea88a7e3f2d7f766d88281bb2bc1e690832286dbee3fda"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/pt-BR/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/pt-BR/thunderbird-78.10.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "3be3a00c44ef1be4d48a5f8c391153ad636128a030a671a646c7dee9d6327c2d"; + sha256 = "228d268675b9781aa5341bf0c8354cb1f3cdc700c7bb608438c2e31b2239e48f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/pt-PT/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/pt-PT/thunderbird-78.10.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "f140717de6d19f049ea3ff3ea43ba7f42a3ae6b72e9e2a2acb8b4e05c323361c"; + sha256 = "b69cbaaed70d582319c86d46016122a2a0a3e9abfc3c6393c2fd66b8f50cf855"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/rm/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/rm/thunderbird-78.10.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "f19c8067bb6a584bb7c6d059cdcd069144c266982504b9421d8b91e501847cb1"; + sha256 = "0ca4301df9ac5b234c8cf71718441c152403fbbb06cb42e2f6061fbc97ce31ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/ro/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/ro/thunderbird-78.10.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "64d36d6c811748b6bcb084c1a8573d9657accb9258fa384687ca8074ceb0a905"; + sha256 = "ab06982a3f6134388e6bf8049a80b2d1c6b1a338a3f2744516af2b7ba1d23ae6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/ru/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/ru/thunderbird-78.10.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "e6fe0da07d30ac884c04448b7d7b0f2010948ae35184b16b6f3df2f784f6fefc"; + sha256 = "858aedefc42e15ca2179ee5e1f09c4f89dbba46e76160cf172c3fa0cb5ed019c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/si/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/si/thunderbird-78.10.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "7ae069a1bd4020c1bedf951a9d097a95f784388d850e19514629d9b5f2a23a13"; + sha256 = "5193e29ea9ecaa1d8e13f959f294540bc3cc3e4f161358cb057c5f44b2dba396"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/sk/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/sk/thunderbird-78.10.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "5c07370cfd51774dd7333e68a61f29aeb4108303f891e14471909477d5d2c165"; + sha256 = "6d6fb547ded55b374c1556128af1406cd4708f207a90f24778a319cf0fab1e22"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/sl/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/sl/thunderbird-78.10.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "936e9be71d2881151de6ceda8eec86cc7342f56f3947c9fe48f59500c83cfcb2"; + sha256 = "89e246494a9e052e06894d2fae911e4a251b5c24b5bb26c9810277f43bcc211d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/sq/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/sq/thunderbird-78.10.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "309857b9ab66ec1ae407b286bd4f75a519d6afadf25cb64662dd369e831d0996"; + sha256 = "d465f5ea13b423cde1e6a6fc4bb8b21f1920fab6a73d4ed7dca16911d4918c2b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/sr/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/sr/thunderbird-78.10.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "5c437425b529b838d0895261a237d42423aad24fd5fbb5bc66cc305de30bfef9"; + sha256 = "4c9c7e2d0929e2ef65b8c33baa2ea335b8145580f7c2bd88f7c00e3cbad49327"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/sv-SE/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/sv-SE/thunderbird-78.10.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "d88378fe88c18a7f2d60d9c612b414f5706a03fb602da352393e1745bc6b2070"; + sha256 = "913c8d546f8aa518d8864c550749889b2fb72a86506bd407db2c0163fe6ea7e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/th/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/th/thunderbird-78.10.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "197686b485f5d2573fc7fdf8104bc10d81b4100bc4875dc6162365e933d07256"; + sha256 = "52bc9ca0b837c6209a040649dd432d459c7b73c1dcfd967c970dba3dcd0c0e8f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/tr/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/tr/thunderbird-78.10.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "96eddab994d3aaf57b933b8a7e1f3ca3036077c3c67c13d22c629314f05933d4"; + sha256 = "66eea04e8fa1993bff56b8af517564f782733ba83634a8b9cc452dc5fb1d87af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/uk/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/uk/thunderbird-78.10.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "a8170a0396763696a8ebded65e1761652b25371613dc28b3cdc6a312eb9da996"; + sha256 = "91be59e83c11aac5cd46f687e008794e666b2efce1da572ede42291e9620d9a9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/uz/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/uz/thunderbird-78.10.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "6de38d66847d61dcd50f0822374b3a5857272b4e74f7dae308ba3c32d42228c0"; + sha256 = "b216b0d189828622b7dce32e91f8dcf63f3763c2610ad7b30eaf05a3e92f4b3c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/vi/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/vi/thunderbird-78.10.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "1a5814a3a19d91eb940abf956d401b83717706b99c976376ff64c4ceb0ed12e6"; + sha256 = "af4294bc71e9a4fca7b7ced7fd401ef692163d7044f8b1cd5fa1c25192e98120"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/zh-CN/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/zh-CN/thunderbird-78.10.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "2d365539626c4f718b0e558f02827385749e6df507c81f411f688a6b43e1c4e5"; + sha256 = "f10b21744041485cdd4bb0e68d9167acbe3b55c914ace91ba024c23e3b8f3531"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.1/linux-i686/zh-TW/thunderbird-78.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/zh-TW/thunderbird-78.10.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "6003512f81b9d73363bffa38be003adc684456b75017222c2e324659d94f7735"; + sha256 = "f3df92551c102dd113ace048eca32e4dfc797cedc53fd0ea93ddea6954915316"; } ]; } 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 046e83e493..0e09633ea0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -73,13 +73,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.9.1"; + version = "78.10.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "3370ngycp6syvxfnindzz06xg39vb2knfi2zshsm87aqrapk52vmfbdagv5a85vwlmd2h5gd47zcmz2mj5360mcfxlc380hrqks69zs"; + "0nywhw1y9g78fpfgmcp6vphdidpnhfxif18qx23j7p20ayymvi2gd3smm4qfr6rlb0dkzyk1vxc2dj47zd8169wlkvr6l1kfsgvrj49"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix index 67ddcf5997..4567f26224 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix @@ -20,13 +20,13 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.1.3"; + version = "3.2.0"; src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-8Ql6tOvWOjAvMJA87WlT9TbpnbciBsjDxRuYlMVi/m8="; + sha256 = "1nklsa2lx9ayjp8rk1mycjysqqmnq47djig0wygzna5mycl3ji06"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/acd_cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/acd_cli/default.nix index 49fc578377..519242b887 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/acd_cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/acd_cli/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, buildPythonApplication, fuse , appdirs, colorama, dateutil, requests, requests_toolbelt -, fusepy, sqlalchemy }: +, fusepy, sqlalchemy, setuptools }: buildPythonApplication rec { pname = "acd_cli"; @@ -16,7 +16,7 @@ buildPythonApplication rec { }; propagatedBuildInputs = [ appdirs colorama dateutil fusepy requests - requests_toolbelt sqlalchemy ]; + requests_toolbelt setuptools sqlalchemy ]; makeWrapperArgs = [ "--prefix LIBFUSE_PATH : ${fuse}/lib/libfuse.so" ]; @@ -34,7 +34,6 @@ buildPythonApplication rec { description = "A command line interface and FUSE filesystem for Amazon Cloud Drive"; homepage = "https://github.com/yadayada/acd_cli"; license = licenses.gpl2; - platforms = platforms.linux; maintainers = with maintainers; [ edwtjo ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/elementary-planner/default.nix b/third_party/nixpkgs/pkgs/applications/office/elementary-planner/default.nix index d49ee41c9f..8633f1daec 100644 --- a/third_party/nixpkgs/pkgs/applications/office/elementary-planner/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/elementary-planner/default.nix @@ -12,22 +12,24 @@ , libgee , json-glib , glib +, glib-networking , sqlite , libsoup , gtk3 , pantheon /* granite, icons, maintainers */ , webkitgtk +, libpeas }: stdenv.mkDerivation rec { pname = "elementary-planner"; - version = "2.5.7"; + version = "2.6.9"; src = fetchFromGitHub { owner = "alainm23"; repo = "planner"; rev = version; - sha256 = "0s2f9q7i31c2splflfnaiqviwnxbsp2zvibr70xafhbhnkmzlrsk"; + sha256 = "17ij017x2cplqhway8376k8mmrll4w1jfwhf7ixldq9g0q2inzd8"; }; nativeBuildInputs = [ @@ -43,10 +45,12 @@ stdenv.mkDerivation rec { buildInputs = [ evolution-data-server glib + glib-networking gtk3 json-glib libgee libical + libpeas libsoup pantheon.elementary-icon-theme pantheon.granite @@ -66,6 +70,10 @@ stdenv.mkDerivation rec { ) ''; + postFixup = '' + ln -s $out/bin/com.github.alainm23.planner $out/bin/planner + ''; + meta = with lib; { description = "Task manager with Todoist support designed for GNU/Linux 🚀️"; homepage = "https://planner-todo.web.app"; diff --git a/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix b/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix index 4011879ddb..5894c6c3e1 100644 --- a/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix @@ -6,7 +6,7 @@ }: let - inherit (python3.pkgs) buildPythonApplication fetchPypi; + inherit (python3.pkgs) buildPythonApplication fetchPypi setuptools-scm; in buildPythonApplication rec { pname = "todoman"; @@ -17,8 +17,11 @@ buildPythonApplication rec { sha256 = "e7e5cab13ecce0562b1f13f46ab8cbc079caed4b462f2371929f8a4abff2bcbe"; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ installShellFiles + setuptools-scm ]; propagatedBuildInputs = with python3.pkgs; [ atomicwrites diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/octopus/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/octopus/default.nix index 0ef48ec641..b61a0764f2 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/octopus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/octopus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "octopus"; - version = "0.7.1"; + version = "0.7.3"; src = fetchFromGitHub { owner = "luntergroup"; repo = "octopus"; rev = "v${version}"; - sha256 = "sha256-TZ57uKTZ87FWpLNGPY8kbML1EDM8fnEFbXR+Z3dmiao="; + sha256 = "sha256-sPOBZ0YrEdjMNVye/xwqwA5IpsLy2jWN3sm/ce1fLg4="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix index b91b5ad14a..76048733a6 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix @@ -216,6 +216,8 @@ stdenv.mkDerivation rec { in (concatStringsSep "\n" (flatten [ + "runHook preInstall" + (optionalString (withScripting) "buildPythonPath \"${base} $pythonPath\" \n") # wrap each of the directly usable tools @@ -227,10 +229,19 @@ stdenv.mkDerivation rec { # link in the CLI utils (map (util: "ln -s ${base}/bin/${util} $out/bin/${util}") utils) + + "runHook postInstall" ]) ) ; + postInstall = '' + mkdir -p $out/share + ln -s ${base}/share/applications $out/share/applications + ln -s ${base}/share/icons $out/share/icons + ln -s ${base}/share/mime $out/share/mime + ''; + # can't run this for each pname # stable and unstable are in the same versions.nix # and kicad-small reuses stable @@ -248,7 +259,7 @@ stdenv.mkDerivation rec { KiCad is an open source software suite for Electronic Design Automation. The Programs handle Schematic Capture, and PCB Layout with Gerber output. ''; - license = lib.licenses.agpl3; + license = lib.licenses.gpl3Plus; # berce seems inactive... maintainers = with lib.maintainers; [ evils kiwi berce ]; # kicad is cross platform diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/beluga/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/beluga/default.nix index 44478a032b..66cfd30612 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/beluga/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/beluga/default.nix @@ -1,14 +1,14 @@ { lib, fetchFromGitHub, ocamlPackages, rsync }: -ocamlPackages.buildDunePackage { +ocamlPackages.buildDunePackage rec { pname = "beluga"; - version = "unstable-2020-03-11"; + version = "1.0"; src = fetchFromGitHub { owner = "Beluga-lang"; repo = "Beluga"; - rev = "6133b2f572219333f304bb4f77c177592324c55b"; - sha256 = "0sy6mi50z3mvs5z7dx38piydapk89all81rh038x3559b5fsk68q"; + rev = "v${version}"; + sha256 = "1ziqjfv8jwidl8lj2mid2shhgqhv31dfh5wad2zxjpvf6038ahsw"; }; useDune2 = true; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/gmsh/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/gmsh/default.nix index fabb3b08c4..c0d91a2844 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/gmsh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/gmsh/default.nix @@ -5,11 +5,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "gmsh"; - version = "4.8.0"; + version = "4.8.1"; src = fetchurl { url = "http://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "sha256-JYd4PEsClj+divtxfJlUyu+kY+ouChLhZZMH5qDX6ms="; + sha256 = "sha256-1QOPXyWuhZc1NvsFzIhv6xvX1n4mBanYeJvMJSj6izU="; }; buildInputs = [ blas lapack gmm fltk libjpeg zlib libGLU libGL diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix index f7ea37ff40..7dfca2cd80 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "1nrbz049nizrrfxdpws05gj0bqk47l4mrl4wcvfb6nwispc74ib0"; + sha256 = "0lx6sx3zkjq9855va1vxbd5g47viqkrchk5d2rb6xj7zywwm4mgb"; }; - vendorSha256 = "0j2jy7n7hca5ybwwgh7cvm77j96ngaq1a1l5bl70vjpd8hz2qapc"; + vendorSha256 = "1zmyd566xcksgqm0f7mq0rkfnxk0fmf39k13fcp9jy30c1y9681v"; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix index f28d49702b..be6e96fc8f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix @@ -2,21 +2,28 @@ rustPlatform.buildRustPackage rec { pname = "git-interactive-rebase-tool"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "MitMaro"; repo = pname; rev = version; - sha256 = "117zwxyq2vc33nbnfpjbdr5vc2l5ymf6ln1dm5551ha3y3gdq3bf"; + sha256 = "sha256-DYl/GUbeNtKmXoR3gq8mK8EfsZNVNlrdngAwfzG+epw="; }; - cargoSha256 = "051llwk9swq03xdqwyj0hlyv2ywq2f1cnks95nygyy393q7v930x"; + cargoSha256 = "sha256-1joMWPfn0s+pLsO6NHMT6AoXZ33R8MY2AWSrROY2mw8="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; - # external_editor::tests::* tests fail - doCheck = false; + checkFlags = [ + "--skip=external_editor::tests::edit_success" + "--skip=external_editor::tests::editor_non_zero_exit" + "--skip=external_editor::tests::empty_edit_abort_rebase" + "--skip=external_editor::tests::empty_edit_error" + "--skip=external_editor::tests::empty_edit_noop" + "--skip=external_editor::tests::empty_edit_re_edit_rebase_file" + "--skip=external_editor::tests::empty_edit_undo_and_edit" + ]; meta = with lib; { homepage = "https://github.com/MitMaro/git-interactive-rebase-tool"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/subversion/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/subversion/default.nix index 18eaea0dd6..1f604c44d7 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/subversion/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/subversion/default.nix @@ -17,7 +17,7 @@ assert javahlBindings -> jdk != null && perl != null; let - common = { version, sha256, extraBuildInputs ? [ ] }: stdenv.mkDerivation (rec { + common = { version, sha256 }: stdenv.mkDerivation (rec { inherit version; pname = "subversion"; @@ -29,8 +29,7 @@ let # Can't do separate $lib and $bin, as libs reference bins outputs = [ "out" "dev" "man" ]; - buildInputs = [ zlib apr aprutil sqlite openssl ] - ++ extraBuildInputs + buildInputs = [ zlib apr aprutil sqlite openssl lz4 utf8proc ] ++ lib.optional httpSupport serf ++ lib.optional pythonBindings python ++ lib.optional perlBindings perl @@ -114,12 +113,10 @@ in { subversion_1_10 = common { version = "1.10.7"; sha256 = "1nhrd8z6c94sc0ryrzpyd98qdn5a5g3x0xv1kdb9da4drrk8y2ww"; - extraBuildInputs = [ lz4 utf8proc ]; }; subversion = common { version = "1.12.2"; sha256 = "0wgpw3kzsiawzqk4y0xgh1z93kllxydgv4lsviim45y5wk4bbl1v"; - extraBuildInputs = [ lz4 utf8proc ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/giph/default.nix b/third_party/nixpkgs/pkgs/applications/video/giph/default.nix new file mode 100644 index 0000000000..431f267e4c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/giph/default.nix @@ -0,0 +1,43 @@ +{ stdenvNoCC +, lib +, fetchFromGitHub +, ffmpeg +, xdotool +, slop +, libnotify +, procps +, makeWrapper +}: + +stdenvNoCC.mkDerivation rec { + pname = "giph"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "phisch"; + repo = pname; + rev = version; + sha256 = "19l46m1f32b3bagzrhaqsfnl5n3wbrmg3sdy6fdss4y1yf6nqayk"; + }; + + dontConfigure = true; + + dontBuild = true; + + installFlags = [ "PREFIX=${placeholder "out"}" ]; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/giph \ + --prefix PATH : ${lib.makeBinPath [ ffmpeg xdotool libnotify slop procps ]} + ''; + + meta = with lib; { + homepage = "https://github.com/phisch/giph"; + description = "Simple gif recorder"; + license = licenses.mit; + maintainers = [ maintainers.legendofmiracles ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/default.nix b/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/default.nix index bac7619c33..10a3a8cc17 100644 --- a/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/default.nix @@ -26,23 +26,25 @@ mkDerivation rec { pname = "jellyfin-media-player"; - version = "1.3.1"; + version = "1.4.1"; src = fetchFromGitHub { - owner = "iwalton3"; + owner = "jellyfin"; repo = "jellyfin-media-player"; rev = "v${version}"; - sha256 = "sha256-rXW6vC0Ow8xFblXjGYaDExAZM8RgqLkDHiX7R8vAWjI="; + sha256 = "sha256-500Qlxpqkf+9D/jrzkrYkkFwxs0soLG/I5mgFV1UOc8="; }; jmpDist = fetchzip { - url = "https://github.com/iwalton3/jellyfin-web-jmp/releases/download/jwc-10.7.2/dist.zip"; - sha256 = "sha256-EpNAN4nzINiwMrmg0e4x3uJRTy5ovx4ZkmP83Kbn4S0="; + url = "https://github.com/iwalton3/jellyfin-web-jmp/releases/download/jwc-10.7.2-2/dist.zip"; + sha256 = "sha256-9oxOcSCV1Gm8WLpwVLanyUlhPx5PWUrkkWvKmwND94g="; }; patches = [ # the webclient-files are not copied in the regular build script. Copy them just like the linux build ./fix-osx-resources.patch + # disable update notifications since the end user can't simply download the release artifacts to update + ./disable-update-notifications.patch ]; buildInputs = [ @@ -99,9 +101,9 @@ mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/iwalton3/jellyfin-media-player"; + homepage = "https://github.com/jellyfin/jellyfin-media-player"; description = "Jellyfin Desktop Client based on Plex Media Player"; - license = with licenses; [ gpl2Plus mit ]; + license = with licenses; [ gpl2Only mit ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ jojosch ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/disable-update-notifications.patch b/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/disable-update-notifications.patch new file mode 100644 index 0000000000..dd56d71f90 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/disable-update-notifications.patch @@ -0,0 +1,13 @@ +diff --git a/resources/settings/settings_description.json b/resources/settings/settings_description.json +index 20fff81..9979de5 100644 +--- a/resources/settings/settings_description.json ++++ b/resources/settings/settings_description.json +@@ -118,7 +118,7 @@ + }, + { + "value": "checkForUpdates", +- "default": true ++ "default": false + }, + { + "value": "enableInputRepeat", diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/autoload.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/autoload.nix index f64e702f21..8f09070c5f 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/autoload.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/autoload.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, mpv-unwrapped, lib }: +{ stdenvNoCC, mpv-unwrapped, lib }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "mpv-autoload"; version = mpv-unwrapped.version; src = "${mpv-unwrapped.src.outPath}/TOOLS/lua/autoload.lua"; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/convert.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/convert.nix index ce06952033..2ff335b083 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/convert.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/convert.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchgit, lib +{ stdenvNoCC, fetchgit, lib , yad, mkvtoolnix-cli, libnotify }: -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { pname = "mpv-convert-script"; version = "2016-03-18"; src = fetchgit { @@ -30,14 +30,17 @@ stdenv.mkDerivation { ''; passthru.scriptName = "convert_script.lua"; - meta = { + meta = with lib; { description = "Convert parts of a video while you are watching it in mpv"; homepage = "https://gist.github.com/Zehkul/25ea7ae77b30af959be0"; - maintainers = [ lib.maintainers.Profpatsch ]; + maintainers = [ maintainers.Profpatsch ]; longDescription = '' When this script is loaded into mpv, you can hit Alt+W to mark the beginning and Alt+W again to mark the end of the clip. Then a settings window opens. ''; + license = licenses.unfree; + # script crashes mpv. See https://github.com/NixOS/nixpkgs/issues/113202 + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix new file mode 100644 index 0000000000..b7e95324f5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix @@ -0,0 +1,37 @@ +{ lib, stdenvNoCC, fetchFromGitHub, youtube-dl }: + +stdenvNoCC.mkDerivation rec { + pname = "mpv-playlistmanager"; + version = "unstable-2021-03-09"; + + src = fetchFromGitHub { + owner = "jonniek"; + repo = "mpv-playlistmanager"; + rev = "c15a0334cf6d4581882fa31ddb1e6e7f2d937a3e"; + sha256 = "uxcvgcSGS61UU8MmuD6qMRqpIa53iasH/vkg1xY7MVc="; + }; + + postPatch = '' + substituteInPlace playlistmanager.lua \ + --replace "'youtube-dl'" "'${youtube-dl}/bin/youtube-dl'" \ + ''; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/mpv/scripts + cp playlistmanager.lua $out/share/mpv/scripts + runHook postInstall + ''; + + passthru.scriptName = "playlistmanager.lua"; + + meta = with lib; { + description = "Mpv lua script to create and manage playlists"; + homepage = "https://github.com/jonniek/mpv-playlistmanager"; + license = licenses.unlicense; + platforms = platforms.all; + maintainers = with maintainers; [ lunik1 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpvacious.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpvacious.nix index 0995d976e6..3225317d78 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpvacious.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpvacious.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, curl, xclip }: +{ lib, stdenvNoCC, fetchFromGitHub, curl, xclip }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "mpvacious"; version = "0.14"; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix index 0c0597d3af..99b731757f 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ lib, stdenvNoCC , fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "simple-mpv-ui"; version = "1.0.0"; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/sponsorblock.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/sponsorblock.nix index 79ede806b0..5d33bfd92a 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/sponsorblock.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/sponsorblock.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, python3 }: +{ lib, stdenvNoCC, fetchFromGitHub, fetchpatch, python3 }: # Usage: `pkgs.mpv.override { scripts = [ pkgs.mpvScripts.sponsorblock ]; }` -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { pname = "mpv_sponsorblock"; version = "unstable-2020-07-05"; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/thumbnail.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/thumbnail.nix index cda15b2674..4bee220f4c 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/thumbnail.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/thumbnail.nix @@ -1,6 +1,6 @@ -{ fetchFromGitHub, lib, python3, stdenv }: +{ fetchFromGitHub, lib, python3, stdenvNoCC }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "mpv_thumbnail_script"; version = "unstable-2020-01-16"; diff --git a/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix b/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix index 24cb3769aa..3a9c4809c6 100644 --- a/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix @@ -25,13 +25,13 @@ assert lib.versionAtLeast mlt.version "6.24.0"; mkDerivation rec { pname = "shotcut"; - version = "21.02.27"; + version = "21.03.21"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "bcuJz27jDAB3OPEKq3xNgfv6C31UoMKosS4YIRZNMjM="; + sha256 = "UdeHbNkJ0U9FeTmpbcU4JxiyIHkrlC8ErhtY6zdCZEk="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/video/srt-live-server/default.nix b/third_party/nixpkgs/pkgs/applications/video/srt-live-server/default.nix new file mode 100644 index 0000000000..e02d15a595 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/srt-live-server/default.nix @@ -0,0 +1,37 @@ +{ lib +, fetchFromGitHub +, stdenv +, srt +, zlib +}: + +stdenv.mkDerivation rec { + pname = "srt-live-server"; + version = "1.4.8"; + + src = fetchFromGitHub { + owner = "Edward-Wu"; + repo = "srt-live-server"; + rev = "V${version}"; + sha256 = "0x48sxpgxznb1ymx8shw437pcgk76ka5rx0zhn9b3cyi9jlq1yld"; + }; + + patches = [ + # https://github.com/Edward-Wu/srt-live-server/pull/94 + ./fix-insecure-printfs.patch + ]; + + buildInputs = [ srt zlib ]; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + meta = with lib; { + description = "srt live server for low latency"; + license = licenses.mit; + homepage = "https://github.com/Edward-Wu/srt-live-server"; + maintainers = with maintainers; [ shamilton ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/srt-live-server/fix-insecure-printfs.patch b/third_party/nixpkgs/pkgs/applications/video/srt-live-server/fix-insecure-printfs.patch new file mode 100644 index 0000000000..8cc85549d1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/srt-live-server/fix-insecure-printfs.patch @@ -0,0 +1,61 @@ +diff --color -ur a/Makefile b/Makefile +--- a/Makefile 2021-04-16 13:02:41.416453040 +0200 ++++ b/Makefile 2021-04-16 13:21:23.020089623 +0200 +@@ -1,3 +1,4 @@ ++PREFIX = /usr/local + SHELL = /bin/sh + MAIN_NAME=sls + CLIENT_NAME=slc +@@ -64,3 +65,16 @@ + rm -f $(OUTPUT_PATH)/*.o + rm -rf $(BIN_PATH)/* + ++install: all ++ @echo installing executable files to ${DESTDIR}${PREFIX}/bin ++ @mkdir -p "${DESTDIR}${PREFIX}/bin" ++ @cp -f ${BIN_PATH}/${MAIN_NAME} "${DESTDIR}${PREFIX}/bin" ++ @chmod 755 "${DESTDIR}${PREFIX}/bin/${MAIN_NAME}" ++ @cp -f ${BIN_PATH}/${CLIENT_NAME} "${DESTDIR}${PREFIX}/bin" ++ @chmod 755 "${DESTDIR}${PREFIX}/bin/${CLIENT_NAME}" ++ ++uninstall: ++ @echo removing executable files from ${DESTDIR}${PREFIX}/bin ++ @rm -f "${DESTDIR}${PREFIX}/bin/${MAIN_NAME}" ++ @rm -f "${DESTDIR}${PREFIX}/bin/${CLIENT_NAME}" ++ +diff --color -ur a/slscore/HttpClient.cpp b/slscore/HttpClient.cpp +--- a/slscore/HttpClient.cpp 2021-04-16 13:02:41.416453040 +0200 ++++ b/slscore/HttpClient.cpp 2021-04-16 13:11:40.343866698 +0200 +@@ -90,7 +90,7 @@ + goto FUNC_END; + } + if (NULL != method && strlen(method) > 0) { +- sprintf(m_http_method, method); ++ strcpy(m_http_method, method); + } + + m_interval = interval; +diff --color -ur a/slscore/SLSLog.cpp b/slscore/SLSLog.cpp +--- a/slscore/SLSLog.cpp 2021-04-16 13:02:41.416453040 +0200 ++++ b/slscore/SLSLog.cpp 2021-04-16 13:08:16.836119519 +0200 +@@ -85,7 +85,7 @@ + vsnprintf (buf , 4095 , fmt , vl); + //sprintf(buf_info, "%s %s: %s\n" , cur_time, LOG_LEVEL_NAME[level], buf); + sprintf(buf_info, "%s:%03d %s %s: %s\n" , cur_time, cur_time_msec, APP_NAME, LOG_LEVEL_NAME[level], buf); +- printf(buf_info); ++ puts(buf_info); + + if (m_log_file) { + fwrite(buf_info, strlen(buf_info), 1, m_log_file); +diff --color -ur a/slscore/SLSSrt.cpp b/slscore/SLSSrt.cpp +--- a/slscore/SLSSrt.cpp 2021-04-16 13:02:41.417452995 +0200 ++++ b/slscore/SLSSrt.cpp 2021-04-16 13:10:11.004957820 +0200 +@@ -124,7 +124,7 @@ + std::map::iterator it; + for(it=map_error.begin(); it!=map_error.end(); ++it) { + sprintf(szBuf, "%d: %s\n", it->first, it->second.c_str()); +- printf(szBuf); ++ puts(szBuf); + } + printf("----------end------------\n"); + map_error.clear(); diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix index 1aee54c8af..a6bf559a41 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "0.19"; + version = "0.19.1"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "sha256-G9asWedX03cP5Qg5HIzlSIwwqNL16kiyWairk+6Kabw="; + sha256 = "sha256-v5uESTEspIc8rhZXrQqLEVMDvvPcfHuFoj6lI4M5z70="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/looking-glass-client/0001-client-all-fix-more-maybe-uninitialized-when-O3-is-i.patch b/third_party/nixpkgs/pkgs/applications/virtualization/looking-glass-client/0001-client-all-fix-more-maybe-uninitialized-when-O3-is-i.patch new file mode 100644 index 0000000000..82ce050b58 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/virtualization/looking-glass-client/0001-client-all-fix-more-maybe-uninitialized-when-O3-is-i.patch @@ -0,0 +1,45 @@ +From 95a7293b30ff7b89d615daea00269ed32f4b70a2 Mon Sep 17 00:00:00 2001 +From: Geoffrey McRae +Date: Tue, 23 Feb 2021 20:25:30 +1100 +Subject: [PATCH] [client] all: fix more `maybe-uninitialized` when `-O3` is in + use + +Closes #475 +--- + client/renderers/EGL/egl.c | 3 ++- + client/src/main.c | 5 +++-- + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/client/renderers/EGL/egl.c b/client/renderers/EGL/egl.c +index b7a5644..72ce50d 100644 +--- a/client/renderers/EGL/egl.c ++++ b/client/renderers/EGL/egl.c +@@ -271,7 +271,8 @@ static void egl_calc_mouse_size(struct Inst * this) + if (!this->formatValid) + return; + +- int w, h; ++ int w = 0, h = 0; ++ + switch(this->format.rotate) + { + case LG_ROTATE_0: +diff --git a/client/src/main.c b/client/src/main.c +index f05e929..f5d6fad 100644 +--- a/client/src/main.c ++++ b/client/src/main.c +@@ -186,8 +186,9 @@ static void updatePositionInfo(void) + if (!g_state.haveSrcSize) + goto done; + +- float srcW; +- float srcH; ++ float srcW = 0.0f; ++ float srcH = 0.0f; ++ + switch(params.winRotate) + { + case LG_ROTATE_0: +-- +2.30.1 + diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix index 720f684f44..345018bbe4 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -1,17 +1,18 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, SDL2, SDL2_ttf, spice-protocol , fontconfig, libX11, freefont_ttf, nettle, libpthreadstubs, libXau, libXdmcp -, libXi, libXext, wayland, libffi, libGLU, expat, libbfd +, libXi, libXext, wayland, wayland-protocols, libffi, libGLU, libXScrnSaver +, expat, libbfd }: stdenv.mkDerivation rec { pname = "looking-glass-client"; - version = "B2"; + version = "B3"; src = fetchFromGitHub { owner = "gnif"; repo = "LookingGlass"; rev = version; - sha256 = "100b5kzh8gr81kzw5fdqz2jsms25hv3815d31vy3qd6lrlm5gs3d"; + sha256 = "1vmabjzn85p0brdian9lbpjq39agzn8k0limn8zjm713lh3n3c0f"; fetchSubmodules = true; }; @@ -19,10 +20,18 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 SDL2_ttf spice-protocol fontconfig libX11 freefont_ttf nettle - libpthreadstubs libXau libXdmcp libXi libXext wayland libffi libGLU expat - libbfd + libpthreadstubs libXau libXdmcp libXi libXext wayland wayland-protocols + libffi libGLU libXScrnSaver expat libbfd ]; + patches = [ + # error: ‘h’ may be used uninitialized in this function [-Werror=maybe-uninitialized] + # Fixed upstream in master in 8771103abbfd04da9787dea760405364af0d82de, but not in B3. + # Including our own patch here since upstream commit patch doesnt apply cleanly on B3 + ./0001-client-all-fix-more-maybe-uninitialized-when-O3-is-i.patch + ]; + patchFlags = "-p2"; + sourceRoot = "source/client"; NIX_CFLAGS_COMPILE = "-mavx"; # Fix some sort of AVX compiler problem. diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix index 956baea885..c8b8467def 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , pkg-config , installShellFiles @@ -16,13 +17,13 @@ buildGoModule rec { pname = "podman"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "1ihpz50c50frw9nrjp0vna2lg50kwlar6y6vr4s5sjiwza1qv2d2"; + sha256 = "sha256-PS41e7myv5xCSJIeT+SRj4rLVCXpthq7KeHisYoSiOE="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/spice-vdagent/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/spice-vdagent/default.nix index 48b0423983..67ac8119fd 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/spice-vdagent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/spice-vdagent/default.nix @@ -2,15 +2,12 @@ libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus, libdrm, systemd}: stdenv.mkDerivation rec { - name = "spice-vdagent-0.20.0"; + pname = "spice-vdagent"; + version = "0.21.0"; src = fetchurl { - url = "https://www.spice-space.org/download/releases/${name}.tar.bz2"; - sha256 = "0n9k2kna2gd1zi6jv45zsp2jlv439nz5l5jjijirxqaycwi74srf"; + url = "https://www.spice-space.org/download/releases/${pname}-${version}.tar.bz2"; + sha256 = "0n8jlc1pv6mkry161y656b1nk9hhhminjq6nymzmmyjl7k95ymzx"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ]; - patchFlags = [ "-uNp1" ]; - # included in the next release. - patches = [ ./timeout.diff ]; postPatch = '' substituteInPlace data/spice-vdagent.desktop --replace /usr $out ''; @@ -29,7 +26,7 @@ stdenv.mkDerivation rec { * Multiple displays ''; homepage = "https://www.spice-space.org/"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.aboseley ]; platforms = lib.platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/spice-vdagent/timeout.diff b/third_party/nixpkgs/pkgs/applications/virtualization/spice-vdagent/timeout.diff deleted file mode 100644 index 2021e98e41..0000000000 --- a/third_party/nixpkgs/pkgs/applications/virtualization/spice-vdagent/timeout.diff +++ /dev/null @@ -1,84 +0,0 @@ -diff --git a/src/udscs.c b/src/udscs.c -index 4de75f8..7c99eed 100644 ---- a/src/udscs.c -+++ b/src/udscs.c -@@ -186,6 +186,7 @@ struct udscs_server *udscs_server_new( - server->read_callback = read_callback; - server->error_cb = error_cb; - server->service = g_socket_service_new(); -+ g_socket_service_stop(server->service); - - g_signal_connect(server->service, "incoming", - G_CALLBACK(udscs_server_accept_cb), server); -@@ -223,6 +224,11 @@ void udscs_server_listen_to_address(struct udscs_server *server, - g_object_unref(sock_addr); - } - -+void udscs_server_start(struct udscs_server *server) -+{ -+ g_socket_service_start(server->service); -+} -+ - void udscs_server_destroy_connection(struct udscs_server *server, - UdscsConnection *conn) - { -diff --git a/src/udscs.h b/src/udscs.h -index 45ebd3f..4f7ea36 100644 ---- a/src/udscs.h -+++ b/src/udscs.h -@@ -98,6 +98,8 @@ void udscs_server_listen_to_address(struct udscs_server *server, - const gchar *addr, - GError **err); - -+void udscs_server_start(struct udscs_server *server); -+ - void udscs_server_destroy_connection(struct udscs_server *server, - UdscsConnection *conn); - -diff --git a/src/vdagentd/vdagentd.c b/src/vdagentd/vdagentd.c -index cfd0a51..753c9bf 100644 ---- a/src/vdagentd/vdagentd.c -+++ b/src/vdagentd/vdagentd.c -@@ -1184,10 +1184,6 @@ int main(int argc, char *argv[]) - uinput_device = g_strdup(DEFAULT_UINPUT_DEVICE); - } - -- g_unix_signal_add(SIGINT, signal_handler, NULL); -- g_unix_signal_add(SIGHUP, signal_handler, NULL); -- g_unix_signal_add(SIGTERM, signal_handler, NULL); -- - openlog("spice-vdagentd", do_daemonize ? 0 : LOG_PERROR, LOG_USER); - - /* Setup communication with vdagent process(es) */ -@@ -1228,9 +1224,6 @@ int main(int argc, char *argv[]) - } - } - -- if (do_daemonize) -- daemonize(); -- - #ifdef WITH_STATIC_UINPUT - uinput = vdagentd_uinput_create(uinput_device, 1024, 768, NULL, 0, - debug > 1, uinput_fake); -@@ -1240,6 +1233,13 @@ int main(int argc, char *argv[]) - } - #endif - -+ if (do_daemonize) -+ daemonize(); -+ -+ g_unix_signal_add(SIGINT, signal_handler, NULL); -+ g_unix_signal_add(SIGHUP, signal_handler, NULL); -+ g_unix_signal_add(SIGTERM, signal_handler, NULL); -+ - if (want_session_info) - session_info = session_info_create(debug); - if (session_info) { -@@ -1252,6 +1252,7 @@ int main(int argc, char *argv[]) - - active_xfers = g_hash_table_new(g_direct_hash, g_direct_equal); - -+ udscs_server_start(server); - loop = g_main_loop_new(NULL, FALSE); - g_main_loop_run(loop); - diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/sway/lock-effects.nix b/third_party/nixpkgs/pkgs/applications/window-managers/sway/lock-effects.nix index eff8710ebf..25714f1f8a 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/sway/lock-effects.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/sway/lock-effects.nix @@ -1,18 +1,27 @@ -{ lib, stdenv, fetchFromGitHub, - meson, ninja, pkg-config, scdoc, - wayland, wayland-protocols, libxkbcommon, - cairo, gdk-pixbuf, pam +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, scdoc +, wayland +, wayland-protocols +, libxkbcommon +, cairo +, gdk-pixbuf +, pam }: stdenv.mkDerivation rec { pname = "swaylock-effects"; - version = "v1.6-2"; + version = "1.6-3"; src = fetchFromGitHub { owner = "mortie"; repo = "swaylock-effects"; - rev = version; - sha256 = "0fs3c4liajgkax0a2pdc7117v1g9k73nv87g3kyv9wsnkfbbz534"; + rev = "v${version}"; + sha256 = "sha256-71IX0fC4xCPP6pK63KtvDMb3KoP1rw/Iz3S7BgiLSpg="; }; postPatch = '' @@ -23,7 +32,9 @@ stdenv.mkDerivation rec { buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ]; mesonFlags = [ - "-Dpam=enabled" "-Dgdk-pixbuf=enabled" "-Dman-pages=enabled" + "-Dpam=enabled" + "-Dgdk-pixbuf=enabled" + "-Dman-pages=enabled" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/env.nix b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/env.nix index 89b567a249..226904f311 100644 --- a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/env.nix +++ b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv/env.nix @@ -81,6 +81,9 @@ let # compatibility with NixOS ln -s /host/etc/static static + # symlink nix config + ln -s /host/etc/nix nix + # symlink some NSS stuff ln -s /host/etc/passwd passwd ln -s /host/etc/group group diff --git a/third_party/nixpkgs/pkgs/data/fonts/mononoki/default.nix b/third_party/nixpkgs/pkgs/data/fonts/mononoki/default.nix index 195c39c0e8..d48332b4a2 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/mononoki/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/mononoki/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "1.2"; + version = "1.3"; in fetchzip { name = "mononoki-${version}"; @@ -12,7 +12,7 @@ in fetchzip { unzip -j $downloadedFile -d $out/share/fonts/mononoki ''; - sha256 = "19y4xg7ilm21h9yynyrwcafdqn05zknpmmjrb37qim6p0cy2glff"; + sha256 = "sha256-K2uOpJRmQ1NcDZfh6rorCF0MvGHFCsSW8J7Ue9OC/OY="; meta = with lib; { homepage = "https://github.com/madmalik/mononoki"; 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 ff907e91bf..0a0cba1e98 100644 --- a/third_party/nixpkgs/pkgs/data/icons/luna-icons/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/luna-icons/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , gtk3 , breeze-icons @@ -8,13 +9,13 @@ stdenv.mkDerivation rec { pname = "luna-icons"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "11g740x1asy7jbfn52gp1zx7hzhklw6f97m469wgyi9yf954js15"; + sha256 = "0kjnmclil21m9vgybk958nzzlbwryp286rajlgxg05wgjnby4cxk"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/themes/flat-remix-gtk/default.nix b/third_party/nixpkgs/pkgs/data/themes/flat-remix-gtk/default.nix new file mode 100644 index 0000000000..afdf478fea --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/themes/flat-remix-gtk/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, lib +, fetchFromGitHub +, gtk-engine-murrine +}: + +stdenv.mkDerivation rec { + pname = "flat-remix-gtk"; + version = "20201129"; + + src = fetchFromGitHub { + owner = "daniruiz"; + repo = pname; + rev = version; + hash = "sha256-lAlHRVB/P3A1qWsXQZPZ3uhgctR4FLa+ocUrsbleXJU="; + }; + + dontBuild = true; + + makeFlags = [ "PREFIX=$(out)" ]; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + meta = with lib; { + description = "GTK application theme inspired by material design"; + homepage = "https://drasite.com/flat-remix-gtk"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = [ maintainers.mkg20001 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/themes/orchis/default.nix b/third_party/nixpkgs/pkgs/data/themes/orchis/default.nix index cf479021fb..a53e2f79f6 100644 --- a/third_party/nixpkgs/pkgs/data/themes/orchis/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/orchis/default.nix @@ -1,18 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, gnome-themes-extra, gtk-engine-murrine -, accentColor ? "default" }: +{ lib +, stdenvNoCC +, fetchFromGitHub +, gtk3 +, gnome-themes-extra +, gtk-engine-murrine +, sassc +, accentColor ? "default" +}: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "orchis"; - version = "2021-02-28"; + version = "2021-04-20"; src = fetchFromGitHub { repo = "Orchis-theme"; owner = "vinceliuice"; rev = version; - sha256 = "sha256-HmC2e34n1eThFGgw9OzSgp5VFJOylyozpXgk9SO84+I="; + sha256 = "sha256-cCUmainVTqFztZGpL2z2Zj6zcE2SQBWrec6yNFUMo5M="; }; - nativeBuildInputs = [ gtk3 ]; + nativeBuildInputs = [ gtk3 sassc ]; buildInputs = [ gnome-themes-extra ]; diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 11fcdb7452..127516e58c 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -1,5 +1,4 @@ { atk -, autoreconfHook , cacert , fetchpatch , dbus @@ -42,32 +41,25 @@ , pciutils , timezonemap , libnma +, meson +, ninja +, gst_all_1 }: -let - libcroco = callPackage ./libcroco.nix { }; -in stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "4.6.1"; + version = "4.8.6"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - sha256 = "149lhg953fa0glm250f76z2jzyaabh97jxiqkjnqvsk6bjk1d0bw"; + hash = "sha256-4DMXQYH1/RjLhgrn55I7Vkk6+gGsR+OVmiwxVHUIyro="; }; patches = [ - # remove dbus-glib - (fetchpatch { - url = "https://github.com/linuxmint/cinnamon/commit/ce99760fa15c3de2e095b9a5372eeaca646fbed1.patch"; - sha256 = "0p2sbdi5w7sgblqbgisb6f8lcj1syzq5vlk0ilvwaqayxjylg8gz"; - }) - (fetchpatch { - url = "https://leigh123linux.fedorapeople.org/pub/patches/new_cjs.patch"; - sha256 = "07biv3vkbn3jzijbdrxcw73p8xz2djbsax014mlkvmryrmys0rg4"; - }) + ./use-sane-install-dir.patch + ./libdir.patch ]; buildInputs = [ @@ -84,7 +76,6 @@ stdenv.mkDerivation rec { glib gtk3 json-glib - libcroco libsoup libstartup_notification libXtst @@ -94,6 +85,7 @@ stdenv.mkDerivation rec { polkit libxml2 libgnomekbd + gst_all_1.gstreamer # bindings cairo @@ -114,23 +106,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gobject-introspection - autoreconfHook + meson + ninja wrapGAppsHook intltool gtk-doc ]; - autoreconfPhase = '' - GTK_DOC_CHECK=false NOCONFIGURE=1 bash ./autogen.sh - ''; - configureFlags = [ "--disable-static" "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt" "--with-libxml=${libxml2.dev}/include/libxml2" "--enable-gtk-doc=no" ]; postPatch = '' - substituteInPlace src/Makefile.am \ - --replace "\$(libdir)/muffin" "${muffin}/lib/muffin" - patchShebangs autogen.sh - find . -type f -exec sed -i \ -e s,/usr/share/cinnamon,$out/share/cinnamon,g \ -e s,/usr/share/locale,/run/current-system/sw/share/locale,g \ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/libcroco.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/libcroco.nix deleted file mode 100644 index d1ec77b705..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/libcroco.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, libxml2, glib, gnome3 }: - -stdenv.mkDerivation rec { - pname = "libcroco"; - version = "0.6.13"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1m110rbj5d2raxcdp4iz0qp172284945awrsbdlq99ksmqsc4zkn"; - }; - - outputs = [ "out" "dev" ]; - outputBin = "dev"; - - configureFlags = lib.optional stdenv.isDarwin "--disable-Bsymbolic"; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libxml2 glib ]; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - }; - }; - - meta = with lib; { - description = "GNOME CSS2 parsing and manipulation toolkit"; - homepage = https://gitlab.gnome.org/GNOME/libcroco; - license = licenses.lgpl2; - platforms = platforms.unix; - }; -} - diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/libdir.patch b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/libdir.patch new file mode 100644 index 0000000000..7783d0b3ad --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/libdir.patch @@ -0,0 +1,25 @@ +From 1c99ff9b042d77d97a0841c78fceb7cfbf41aa8b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= +Date: Sun, 28 Feb 2021 05:58:09 +0100 +Subject: [PATCH] libdir patch + +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 3c1e9a4f..a77d9b3c 100644 +--- a/meson.build ++++ b/meson.build +@@ -14,7 +14,7 @@ includedir = get_option('includedir') + libexecdir = get_option('libexecdir') + desktopdir = join_paths(datadir, 'applications') + schemadir = join_paths(datadir, 'glib-2.0', 'schemas') +-pkglibdir = join_paths(libdir, meson.project_name().to_lower()) ++pkglibdir = libdir + servicedir = join_paths(datadir, 'dbus-1', 'services') + pkgdatadir = join_paths(datadir, meson.project_name().to_lower()) + po_dir = join_paths(meson.source_root(), 'po') +-- +2.30.0 + diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/use-sane-install-dir.patch b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/use-sane-install-dir.patch new file mode 100644 index 0000000000..8cb6949cb2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/use-sane-install-dir.patch @@ -0,0 +1,33 @@ +From f7e802959d7a5c217ed574cab30404fc769f174d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= +Date: Sat, 6 Feb 2021 14:26:26 +0100 +Subject: [PATCH] use sane install dir + +--- + meson.build | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index bd803f20..3c1e9a4f 100644 +--- a/meson.build ++++ b/meson.build +@@ -127,8 +127,14 @@ configure_file( + ) + + install_subdir( +- 'files', +- install_dir: '/', ++ 'files/usr', ++ install_dir: get_option('prefix'), ++ strip_directory: true, ++) ++ ++install_subdir( ++ 'files/etc', ++ install_dir: join_paths(get_option('prefix'), 'etc'), + strip_directory: true, + ) + +-- +2.30.0 + diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index 4e951bfcc5..c2e50c6555 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -1,11 +1,9 @@ { lib, stdenv , fetchFromGitHub , pkg-config -, autoreconfHook , glib , gettext , cinnamon-desktop -, intltool , gtk3 , libnotify , libxml2 @@ -20,7 +18,7 @@ , libxklavier , networkmanager , libwacom -, libtool +, gnome3 , wrapGAppsHook , tzdata , glibc @@ -28,17 +26,19 @@ , modemmanager , xorg , gdk-pixbuf +, meson +, ninja }: stdenv.mkDerivation rec { pname = "cinnamon-control-center"; - version = "4.6.2"; + version = "4.8.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "0fbgi2r2xikpa04k431qq9akngi9akyflq1kcks8f095qs5gsana"; + hash = "sha256-vALThDY0uN9bV7b1fga3MK7b2/l5uL33+B2x6oSLPRE="; }; buildInputs = [ @@ -70,16 +70,11 @@ stdenv.mkDerivation rec { ./panels/datetime/tz.h:34:# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" */ postPatch = '' - patchShebangs ./autogen.sh sed 's|TZ_DIR "/usr/share/zoneinfo/"|TZ_DIR "${tzdata}/share/zoneinfo/"|g' -i ./panels/datetime/test-timezone.c sed 's|TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"|TZ_DATA_FILE "${tzdata}/share/zoneinfo/zone.tab"|g' -i ./panels/datetime/tz.h sed 's|"/usr/share/i18n/locales/"|"${glibc}/share/i18n/locales/"|g' -i panels/datetime/test-endianess.c ''; - autoreconfPhase = '' - NOCONFIGURE=1 bash ./autogen.sh - ''; - # it needs to have access to that file, otherwise we can't run tests after build preBuild = '' @@ -87,19 +82,23 @@ stdenv.mkDerivation rec { ln -s $PWD/panels/datetime $out/share/cinnamon-control-center/ ''; + mesonFlags = [ + "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" + ]; + preInstall = '' - rm -rfv $out + rm -r $out ''; - doCheck = true; + # the only test is wacom-calibrator and it seems to need an xserver and prob more services aswell + doCheck = false; nativeBuildInputs = [ pkg-config - autoreconfHook + meson + ninja wrapGAppsHook gettext - intltool - libtool ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix index cdcabb1261..25af38d43b 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-desktop"; - version = "4.6.4"; + version = "4.8.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "08z5hgc6dwdp9fczm75axwh8q9665iz4y2lxp92xp62r3k0v9fvd"; + hash = "sha256-FLruY1lxzB3iJ/So3jSjrbv9e8VoN/0+U2YDXju/u3E="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-menus/default.nix index a177150647..44566a94c6 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-menus/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-menus/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-menus"; - version = "4.6.1"; + version = "4.8.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "1qdaql4mknhzvl2qi1pyw4c820lqb7lg07gblh0wzfk4f7h8hddx"; + hash = "sha256-9VSrqCjC8U3js1gqjl5QFctWYECATxN+AdfMdHLxYUY="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index 0e8f6dbf8c..39dee473cc 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -23,27 +23,19 @@ , xapps , xorg , iso-flags-png-320x420 -, fetchpatch }: stdenv.mkDerivation rec { pname = "cinnamon-screensaver"; - version = "4.6.0"; + version = "4.8.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "068lh6wcmznfyvny7hx83q2rf4j96b6mv4a5v79y02k9110m7bsm"; + hash = "sha256-gvSGxSYKnRqJhj2unRYRHp6qGw/O9SxKPzhw5xjCSSQ="; }; - patches = [ - (fetchpatch { - url = "https://github.com/linuxmint/cinnamon-screensaver/pull/349/commits/4a9e5715f406bf2ca1aacddd5fd8f830102a423c.patch"; - sha256 = "0fmkmskry4c88zcw0i8vsmh6q14k3m937hqi77p5xi1p93imr46y"; - }) - ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/default.nix index 3d63846026..ba20bce410 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-session"; - version = "4.6.2"; + version = "4.8.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "133vpgs0dqr16pvx5wyxhfcargn9wl14z0q99m2pn93hf6zycmsv"; + hash = "sha256-lrwR8VSdPzHoc9MeBEQPbVfWNhPZDJ2wYizKSVpobmk="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-settings-daemon/csd-backlight-helper-fix.patch b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-settings-daemon/csd-backlight-helper-fix.patch index 967ba98eb4..a11660bdb1 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-settings-daemon/csd-backlight-helper-fix.patch +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-settings-daemon/csd-backlight-helper-fix.patch @@ -1,4 +1,4 @@ -From 6d71bf9764fb81d437678a603826167850bbf453 Mon Sep 17 00:00:00 2001 +From 7fa408ebd72c9f1ff7ff4e9d7f4a811465a8a41b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Tue, 21 Jan 2020 03:19:28 +0100 Subject: [PATCH] fix: use an impure path to csd-backlight-helper to fix @@ -6,35 +6,35 @@ Subject: [PATCH] fix: use an impure path to csd-backlight-helper to fix --- plugins/power/csd-power-manager.c | 4 ++-- - .../org.cinnamon.settings-daemon.plugins.power.policy.in.in | 2 +- + .../org.cinnamon.settings-daemon.plugins.power.policy.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/power/csd-power-manager.c b/plugins/power/csd-power-manager.c -index b24c456..212c47e 100755 +index 33f4489..84dd98b 100644 --- a/plugins/power/csd-power-manager.c +++ b/plugins/power/csd-power-manager.c -@@ -2519,7 +2519,7 @@ backlight_helper_get_value (const gchar *argument, CsdPowerManager* manager, +@@ -2529,7 +2529,7 @@ backlight_helper_get_value (const gchar *argument, CsdPowerManager* manager, #endif - + /* get the data */ - command = g_strdup_printf (LIBEXECDIR "/csd-backlight-helper --%s %s", + command = g_strdup_printf ("/run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper --%s %s", argument, manager->priv->backlight_helper_preference_args); ret = g_spawn_command_line_sync (command, -@@ -2609,7 +2609,7 @@ backlight_helper_set_value (const gchar *argument, +@@ -2619,7 +2619,7 @@ backlight_helper_set_value (const gchar *argument, #endif - + /* get the data */ - command = g_strdup_printf ("pkexec " LIBEXECDIR "/csd-backlight-helper --%s %i %s", + command = g_strdup_printf ("pkexec " "/run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper --%s %i %s", argument, value, manager->priv->backlight_helper_preference_args); ret = g_spawn_command_line_sync (command, -diff --git a/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in.in b/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in.in -index 2c44e62..c0a2348 100755 ---- a/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in.in -+++ b/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in.in +diff --git a/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in b/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in +index 504f017..3569e8c 100644 +--- a/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in ++++ b/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in @@ -25,7 +25,7 @@ no yes @@ -42,7 +42,8 @@ index 2c44e62..c0a2348 100755 - @libexecdir@/csd-backlight-helper + /run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper - + --- -2.24.1 +-- +2.30.0 + diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix index c5bae4e576..3df8760c85 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix @@ -1,12 +1,9 @@ { fetchFromGitHub -, autoconf-archive -, autoreconfHook , cinnamon-desktop , colord , glib , gsettings-desktop-schemas , gtk3 -, intltool , lcms2 , libcanberra-gtk3 , libgnomekbd @@ -29,11 +26,15 @@ , tzdata , nss , libgudev +, meson +, ninja +, dbus +, dbus-glib }: stdenv.mkDerivation rec { pname = "cinnamon-settings-daemon"; - version = "4.6.4"; + version = "4.8.5"; /* csd-power-manager.c:50:10: fatal error: csd-power-proxy.h: No such file or directory #include "csd-power-proxy.h" @@ -48,14 +49,15 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "1xcjzjfwnzvkv9jiyw8adsjyhz92almzhyfwb91115774zgqnb7m"; + hash = "sha256-PAWVTjGFs8yKXgNQ2ucDnEDS+n7bp2n3lhGl9gHXfdQ="; }; patches = [ ./csd-backlight-helper-fix.patch + ./use-sane-install-dir.patch ]; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; # TODO: https://github.com/NixOS/nixpkgs/issues/36468 + mesonFlags = [ "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" ]; buildInputs = [ cinnamon-desktop @@ -85,13 +87,14 @@ stdenv.mkDerivation rec { fontconfig nss libgudev + dbus + dbus-glib ]; nativeBuildInputs = [ - autoconf-archive - autoreconfHook + meson + ninja wrapGAppsHook - intltool pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-settings-daemon/use-sane-install-dir.patch b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-settings-daemon/use-sane-install-dir.patch new file mode 100644 index 0000000000..d980431f81 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-settings-daemon/use-sane-install-dir.patch @@ -0,0 +1,27 @@ +From be57c01e6595a8e08ecc17de298e30640b532f11 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= +Date: Sat, 6 Feb 2021 13:55:03 +0100 +Subject: [PATCH] use sane install-dir + +--- + meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 0e11d50..54f4637 100644 +--- a/meson.build ++++ b/meson.build +@@ -156,8 +156,8 @@ subdir('cinnamon-settings-daemon') + subdir('plugins') + + install_subdir( +- 'files', +- install_dir: '/', ++ 'files/usr', ++ install_dir: get_option('prefix'), + strip_directory: true, + ) + +-- +2.30.0 + diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-translations/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-translations/default.nix index 24bb382286..dafb5f4b3f 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-translations/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-translations/default.nix @@ -1,17 +1,18 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , gettext }: stdenv.mkDerivation rec { pname = "cinnamon-translations"; - version = "4.6.2"; + version = "4.8.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "0zaghha62ibhg3rir6mrfy1z3v7p7v83b6glhmj9s51nxd86fyv6"; + hash = "sha256-o/JFfwloXLUOy9YQzHtMCuzK7yBp/G43VS/RguxiTPY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cjs/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cjs/default.nix index 184c143819..3c01d00393 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cjs/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cjs/default.nix @@ -2,7 +2,8 @@ , fetchFromGitHub , gobject-introspection , pkg-config -, lib, stdenv +, lib +, stdenv , wrapGAppsHook , python3 , cairo @@ -27,14 +28,14 @@ }: stdenv.mkDerivation rec { - pname = "cjs-unstable"; - version = "2020-10-19"; + pname = "cjs"; + version = "4.8.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cjs"; - rev = "befc11adb5ba10681464e6fa81b1a79f108ce61c"; - hash = "sha256-F2t8uKV2r29NxX2+3mYp5x1bug2lwihJZTK1dSS8rPg="; + rev = version; + hash = "sha256-6+zlWL0DmyP+RFp1ECA4XGbgYUlsMqqyTd6z46w99Ug="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/muffin/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/muffin/default.nix index 93079e21d3..2df5f875b4 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/muffin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/muffin/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "muffin"; - version = "4.6.3"; + version = "4.8.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "1p8irzf20wari1id5rfx5sypywih1jsrmn0f83zlyhc5fxg02r5p"; + hash = "sha256-zRW+hnoaKKTe4zIJpY1D0Ahc8k5zRbvYBF5Y4vZ6Rbs="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix index 5017c1ce7d..79a5e09c4f 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "nemo"; - version = "4.6.5"; + version = "4.8.4"; # TODO: add plugins support (see https://github.com/NixOS/nixpkgs/issues/78327) @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "04rgdph9pxdj5wzzv2i0pgyhg3s74nh9jf1ry9z6v5bvv222ili4"; + hash = "sha256-OOPjxYrYUd1PIRxRgHwYbm7ennmAChbXqcM8MEPKXO0="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/warpinator/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/warpinator/default.nix index efcd20457b..8b316d37f5 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/warpinator/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/warpinator/default.nix @@ -17,7 +17,6 @@ python3.pkgs.buildPythonApplication rec { version = "1.0.8"; format = "other"; - doCheck = false; src = fetchFromGitHub { owner = "linuxmint"; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/unite/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/unite/default.nix index efb793cb1b..a2f4e81924 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/unite/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/unite/default.nix @@ -1,13 +1,14 @@ { lib, stdenv, gnome3, fetchFromGitHub, xprop, glib }: + stdenv.mkDerivation rec { pname = "gnome-shell-extension-unite"; - version = "50"; + version = "52"; src = fetchFromGitHub { owner = "hardpixel"; repo = "unite-shell"; rev = "v${version}"; - sha256 = "14n9lrjbxcmvcjnh6zbwlc1paqfhbg81lj0y2d35sh1c2fbsb7d9"; + sha256 = "1zahng79m2gw27fb2sw8zyk2n07qc0hbn02g5mfqzhwk62g97v4y"; }; uuid = "unite@hardpixel.eu"; diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/default.nix b/third_party/nixpkgs/pkgs/development/beam-modules/default.nix index 6e6da4fab0..6bf9e45e62 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/default.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/default.nix @@ -63,6 +63,8 @@ let debugInfo = true; }; + elixir_ls = callPackage ./elixir_ls.nix { inherit elixir fetchMixDeps mixRelease; }; + # Remove old versions of elixir, when the supports fades out: # https://hexdocs.pm/elixir/compatibility-and-deprecations.html diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/elixir_ls.nix b/third_party/nixpkgs/pkgs/development/beam-modules/elixir_ls.nix new file mode 100644 index 0000000000..916a150c1f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/beam-modules/elixir_ls.nix @@ -0,0 +1,71 @@ +{ lib, elixir, fetchFromGitHub, fetchMixDeps, mixRelease }: +# Based on the work of Hauleth +# None of this would have happened without him + +mixRelease rec { + pname = "elixir-ls"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "elixir-lsp"; + repo = "elixir-ls"; + rev = "v{version}"; + sha256 = "0d0hqc35hfjkpm88vz21mnm2a9rxiqfrdi83whhhh6d2ba216b7s"; + fetchSubmodules = true; + }; + + mixDeps = fetchMixDeps { + pname = "mix-deps-${pname}"; + inherit src version; + sha256 = "0r9x223imq4j9pn9niskyaybvk7jmq8dxcyzk7kwfsi128qig1a1"; + }; + + # elixir_ls is an umbrella app + # override configurePhase to not skip umbrella children + configurePhase = '' + runHook preConfigure + mix deps.compile --no-deps-check + runHook postConfigure + ''; + + # elixir_ls require a special step for release + # compile and release need to be performed together because + # of the no-deps-check requirement + buildPhase = '' + runHook preBuild + mix do compile --no-deps-check, elixir_ls.release + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp -Rv release $out/lib + # Prepare the wrapper script + substitute release/language_server.sh $out/bin/elixir-ls \ + --replace 'exec "''${dir}/launch.sh"' "exec $out/lib/launch.sh" + chmod +x $out/bin/elixir-ls + # prepare the launcher + substituteInPlace $out/lib/launch.sh \ + --replace "ERL_LIBS=\"\$SCRIPTPATH:\$ERL_LIBS\"" \ + "ERL_LIBS=$out/lib:\$ERL_LIBS" \ + --replace "exec elixir" "exec ${elixir}/bin/elixir" + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/elixir-lsp/elixir-ls"; + description = '' + A frontend-independent IDE "smartness" server for Elixir. + Implements the "Language Server Protocol" standard and provides debugger support via the "Debug Adapter Protocol" + ''; + longDescription = '' + The Elixir Language Server provides a server that runs in the background, providing IDEs, editors, and other tools with information about Elixir Mix projects. + It adheres to the Language Server Protocol, a standard for frontend-independent IDE support. + Debugger integration is accomplished through the similar VS Code Debug Protocol. + ''; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = teams.beam.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/default.nix b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/default.nix index 5685f17887..da6857f6ab 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/default.nix @@ -1,8 +1,6 @@ { lib , callPackage , fetchurl -, gcc48 -, gcc6 , gcc7 , gcc9 }: @@ -10,67 +8,6 @@ let common = callPackage ./common.nix; in rec { - cudatoolkit_9_0 = common { - version = "9.0.176.1"; - url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run"; - sha256 = "0308rmmychxfa4inb1ird9bpgfppgr9yrfg1qp0val5azqik91ln"; - runPatches = [ - (fetchurl { - url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/patches/1/cuda_9.0.176.1_linux-run"; - sha256 = "1vbqg97pq9z9c8nqvckiwmq3ljm88m7gaizikzxbvz01izh67gx4"; - }) - (fetchurl { - url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/patches/2/cuda_9.0.176.2_linux-run"; - sha256 = "1sz5dijbx9yf7drfipdxav5a5g6sxy4w6vi9xav0lb6m2xnmyd7c"; - }) - (fetchurl { - url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/patches/3/cuda_9.0.176.3_linux-run"; - sha256 = "1jm83bxpscpjhzs5q3qijdgjm0r8qrdlgkj7y08fq8c0v8q2r7j2"; - }) - (fetchurl { - url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/patches/4/cuda_9.0.176.4_linux-run"; - sha256 = "0pymg3mymsa2n48y0njz3spzlkm15lvjzw8fms1q83zslz4x0lwk"; - }) - ]; - gcc = gcc6; - }; - - cudatoolkit_9_1 = common { - version = "9.1.85.3"; - url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/local_installers/cuda_9.1.85_387.26_linux"; - sha256 = "0lz9bwhck1ax4xf1fyb5nicb7l1kssslj518z64iirpy2qmwg5l4"; - runPatches = [ - (fetchurl { - url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/1/cuda_9.1.85.1_linux"; - sha256 = "1f53ij5nb7g0vb5pcpaqvkaj1x4mfq3l0mhkfnqbk8sfrvby775g"; - }) - (fetchurl { - url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/2/cuda_9.1.85.2_linux"; - sha256 = "16g0w09h3bqmas4hy1m0y6j5ffyharslw52fn25gql57bfihg7ym"; - }) - (fetchurl { - url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/3/cuda_9.1.85.3_linux"; - sha256 = "12mcv6f8z33z8y41ja8bv5p5iqhv2vx91mv3b5z6fcj7iqv98422"; - }) - ]; - gcc = gcc6; - }; - - cudatoolkit_9_2 = common { - version = "9.2.148.1"; - url = "https://developer.nvidia.com/compute/cuda/9.2/Prod2/local_installers/cuda_9.2.148_396.37_linux"; - sha256 = "04c6v9b50l4awsf9w9zj5vnxvmc0hk0ypcfjksbh4vnzrz14wigm"; - runPatches = [ - (fetchurl { - url = "https://developer.nvidia.com/compute/cuda/9.2/Prod2/patches/1/cuda_9.2.148.1_linux"; - sha256 = "1kx6l4yzsamk6q1f4vllcpywhbfr2j5wfl4h5zx8v6dgfpsjm2lw"; - }) - ]; - gcc = gcc7; - }; - - cudatoolkit_9 = cudatoolkit_9_2; - cudatoolkit_10_0 = common { version = "10.0.130"; url = "https://developer.nvidia.com/compute/cuda/10.0/Prod/local_installers/cuda_10.0.130_410.48_linux"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix index fc4fbb34c5..7f7a40f336 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -176,6 +176,7 @@ let # Platform-specific flags ++ lib.optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" + ++ lib.optional targetPlatform.isNetBSD "--disable-libssp" # Provided by libc. ++ lib.optionals hostPlatform.isSunOS [ "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit" # On Illumos/Solaris GNU as is preferred diff --git a/third_party/nixpkgs/pkgs/development/compilers/haxe/default.nix b/third_party/nixpkgs/pkgs/development/compilers/haxe/default.nix index 73b82ff48d..c9e5a097de 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/haxe/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/haxe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, coreutils, ocaml-ng, zlib, pcre, neko, mbedtls }: +{ lib, stdenv, fetchFromGitHub, coreutils, ocaml-ng, zlib, pcre, neko, mbedtls, Security }: let ocamlDependencies = version: @@ -13,7 +13,8 @@ let sha dune_2 luv - ocaml_extlib + (if lib.versionAtLeast version "4.2" + then ocaml_extlib else ocaml_extlib-1-7-7) ] else with ocaml-ng.ocamlPackages_4_05; [ ocaml camlp4 @@ -30,7 +31,8 @@ let inherit version; buildInputs = [ zlib pcre neko ] - ++ lib.optional (lib.versionAtLeast version "4.1") [ mbedtls ] + ++ lib.optional (lib.versionAtLeast version "4.1") mbedtls + ++ lib.optional (lib.versionAtLeast version "4.1" && stdenv.isDarwin) Security ++ ocamlDependencies version; src = fetchFromGitHub { @@ -125,6 +127,14 @@ in { sed -i -re 's!(let +prefix_path += +).*( +in)!\1"'"$out/"'"\2!' src/main.ml ''; }; + haxe_4_0 = generic { + version = "4.0.5"; + sha256 = "0f534pchdx0m057ixnk07ab4s518ica958pvpd0vfjsrxg5yjkqa"; + }; + haxe_4_1 = generic { + version = "4.1.5"; + sha256 = "0rns6d28qzkbai6yyws08yzbyvxfn848nj0fsji7chdi0y7pzzj0"; + }; haxe_4_2 = generic { version = "4.2.1"; sha256 = "sha256-0j6M21dh8DB1gC/bPYNJrVuDbJyqQbP+61ItO5RBUcA="; diff --git a/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix index 92bd85b1e8..f70a46e2f8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix @@ -2,7 +2,7 @@ , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , openglSupport ? libGLSupported, libGL , alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib -, x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid +, x11Support ? !stdenv.targetPlatform.isWindows && !stdenv.hostPlatform.isAndroid , libX11, xorgproto, libICE, libXi, libXScrnSaver, libXcursor , libXinerama, libXext, libXxf86vm, libXrandr , waylandSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid @@ -79,6 +79,7 @@ stdenv.mkDerivation rec { "--disable-oss" ] ++ optional (!x11Support) "--without-x" ++ optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib" + ++ optional stdenv.targetPlatform.isWindows "--disable-video-opengles" ++ optional stdenv.isDarwin "--disable-sdltest"; # We remove libtool .la files when static libs are requested, diff --git a/third_party/nixpkgs/pkgs/development/libraries/afflib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/afflib/default.nix index b89683ac05..94970c5a30 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/afflib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/afflib/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, zlib, curl, expat, fuse, openssl -, autoreconfHook, python3 +, autoreconfHook, python3, libiconv }: stdenv.mkDerivation rec { @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ zlib curl expat openssl python3 ] - ++ lib.optionals stdenv.isLinux [ fuse ]; + ++ lib.optionals (with stdenv; isLinux || isDarwin) [ fuse ] + ++ lib.optionals stdenv.isDarwin [ libiconv ]; meta = { homepage = "http://afflib.sourceforge.net/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/attr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/attr/default.nix index b7c9287b68..b81afc24ee 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/attr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/attr/default.nix @@ -31,7 +31,15 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://savannah.nongnu.org/projects/attr/"; description = "Library and tools for manipulating extended attributes"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.gpl2Plus; + + # The build failure on Darwin will likely be solved after upgrading the + # macOS SDK in nixpkgs. Check the current SDK version in + # ../../../../os-specific/darwin/apple-sdk/default.nix to see if it has + # been updated to 10.13 or later. Once the requirements are met, building + # it should be straightforward as Homebrew was able to build it without + # patching. + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/boringssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/boringssl/default.nix index aa3eeef48a..f8c27f96dc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/boringssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/boringssl/default.nix @@ -1,22 +1,39 @@ -{ lib, stdenv, fetchgit, cmake, perl, go }: +{ lib +, stdenv +, fetchgit +, cmake +, ninja +, perl +, buildGoModule +}: # reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md -stdenv.mkDerivation { +buildGoModule { pname = "boringssl"; - version = "2019-12-04"; + version = "2021-04-18"; src = fetchgit { url = "https://boringssl.googlesource.com/boringssl"; - rev = "243b5cc9e33979ae2afa79eaa4e4c8d59db161d4"; - sha256 = "1ak27dln0zqy2vj4llqsb99g03sk0sg25wlp09b58cymrh3gccvl"; + rev = "468cde90ca58421d63f4dfeaebcf8bb3fccb4127"; + sha256 = "0gaqcbvp6r5fq265mckmg0i0rjab0bhxkxcvfxp3ar5dm7q88w39"; }; - nativeBuildInputs = [ cmake perl go ]; + nativeBuildInputs = [ cmake ninja perl ]; - makeFlags = [ "GOCACHE=$(TMPDIR)/go-cache" ]; + vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + + # hack to get both go and cmake configure phase + # (if we use postConfigure then cmake will loop runHook postConfigure) + preBuild = '' + cmakeConfigurePhase + ''; + + buildPhase = '' + ninjaBuildPhase + ''; # CMAKE_OSX_ARCHITECTURES is set to x86_64 by Nix, but it confuses boringssl on aarch64-linux. - cmakeFlags = lib.optionals (stdenv.isLinux) [ "-DCMAKE_OSX_ARCHITECTURES=" ]; + cmakeFlags = [ "-GNinja" ] ++ lib.optionals (stdenv.isLinux) [ "-DCMAKE_OSX_ARCHITECTURES=" ]; installPhase = '' mkdir -p $bin/bin $out/include $out/lib diff --git a/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix index 944b5276c5..a5baef8af1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "actor-framework"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; rev = version; - sha256 = "1c3spd6vm1h9qhlk5c4fdwi6nbqx5vwz2zvv6qp0rj1hx6xpq3cx"; + sha256 = "sha256-tRR+YFI/Ikf4rov4dzt59nDqaooALNspKEQehHP6sKU="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cxxopts/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cxxopts/default.nix index ddbc845e3b..1df570d7d2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cxxopts/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cxxopts/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cxxopts"; - version = "2.2.1"; + version = "unstable-2020-12-14"; src = fetchFromGitHub { owner = "jarro2783"; repo = name; - rev = "v${version}"; - sha256 = "0d3y747lsh1wkalc39nxd088rbypxigm991lk3j91zpn56whrpha"; + rev = "2d8e17c4f88efce80e274cb03eeb902e055a91d3"; + sha256 = "0pwrac81zfqjs17g3hx8r3ds2xf04npb6mz111qjy4bx17314ib7"; }; buildInputs = lib.optional enableUnicodeHelp [ icu.dev ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix index dd605aaae5..715e562145 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "intel-media-sdk"; - version = "20.4.1"; + version = "20.5.1"; src = fetchFromGitHub { owner = "Intel-Media-SDK"; repo = "MediaSDK"; rev = "intel-mediasdk-${version}"; - sha256 = "0qnq43qjcmzkn6v2aymzi3kycndk9xw6m5f5g5sz5x53nz556bp0"; + sha256 = "0l5m7r8585ycifbbi5i0bs63c9sb8rsmk43ik97mhfl1ivswf1mv"; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/iodash/0001-Add-cmake-install-directives.patch b/third_party/nixpkgs/pkgs/development/libraries/iodash/0001-Add-cmake-install-directives.patch new file mode 100644 index 0000000000..1868a74192 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/iodash/0001-Add-cmake-install-directives.patch @@ -0,0 +1,44 @@ +From 89c7c160f897f64e17fb74efffccfd1fc16f8b7d Mon Sep 17 00:00:00 2001 +From: Jappie Klooster +Date: Fri, 2 Apr 2021 14:22:02 -0400 +Subject: [PATCH] Add cmake install directives. + +To make nix builds work, it expect a `make install` command to +be available. +Adding these directives seems to fix the build. + +If it's no trouble to you, please add them. + +Maybe don't need endian +--- + CMakeLists.txt | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 06e416f..8d6f489 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,6 +6,8 @@ set(CMAKE_CXX_STANDARD 17) + add_library(IODash INTERFACE) + target_include_directories(IODash INTERFACE .) + ++include(GNUInstallDirs) ++ + add_executable(IODash_Test test.cpp) + target_link_libraries(IODash_Test IODash) + +@@ -20,3 +22,11 @@ if (DEFINED BUILD_BENCHMARKS AND (${BUILD_BENCHMARKS})) + target_link_libraries(boost_Benchmark_HTTP boost_system pthread) + endif() + ++install(TARGETS IODash ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(FILES IODash.hpp ++ DESTINATION include/) ++ ++install(FILES ++ IODash/Buffer.hpp IODash/SocketAddress.hpp IODash/File.hpp IODash/Socket.hpp IODash/EventLoop.hpp IODash/Serial.hpp IODash/Timer.hpp ++ DESTINATION include/IODash) +-- +2.29.2 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/iodash/default.nix b/third_party/nixpkgs/pkgs/development/libraries/iodash/default.nix new file mode 100644 index 0000000000..d8982f0f8c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/iodash/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }: + +stdenv.mkDerivation rec { + pname = "iodash"; + version = "0.1.7"; + + src = fetchFromGitHub { + owner = "YukiWorkshop"; + repo = "IODash"; + rev = "9dcb26621a9c17dbab704b5bab0c3a5fc72624cb"; + sha256 = "0db5y2206fwh3h1pzjm9hy3m76inm0xpm1c5gvrladz6hiqfp7bx"; + fetchSubmodules = true; + }; + # adds missing cmake install directives + # https://github.com/YukiWorkshop/IODash/pull/2 + patches = [ ./0001-Add-cmake-install-directives.patch]; + + nativeBuildInputs = [ cmake pkg-config ]; + + meta = with lib; { + homepage = "https://github.com/YukiWorkshop/IODash"; + description = "Lightweight C++ I/O library for POSIX operation systems"; + license = licenses.mit; + maintainers = with maintainers; [ jappie ]; + platforms = with platforms; linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libconfig/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libconfig/default.nix index ae5f117646..7387e9edc5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libconfig/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libconfig/default.nix @@ -11,11 +11,13 @@ stdenv.mkDerivation rec { doCheck = true; + configureFlags = lib.optional stdenv.targetPlatform.isWindows "--disable-examples"; + meta = with lib; { homepage = "http://www.hyperrealm.com/libconfig"; description = "A simple library for processing structured configuration files"; license = licenses.lgpl3; maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = with platforms; linux ++ darwin ++ windows; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libevdevplus/0001-Add-cmake-install-directives.patch b/third_party/nixpkgs/pkgs/development/libraries/libevdevplus/0001-Add-cmake-install-directives.patch new file mode 100644 index 0000000000..2635d6ab82 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libevdevplus/0001-Add-cmake-install-directives.patch @@ -0,0 +1,41 @@ +From 7f208aaf21aa468013fc41e67c32f6a6c8c08249 Mon Sep 17 00:00:00 2001 +From: Jappie Klooster +Date: Fri, 2 Apr 2021 16:01:05 -0400 +Subject: [PATCH] Add cmake install directives + +To make nix builds work, it expect a make install command to +be available. +Adding these directives seems to fix the build. + +If it's no trouble to you, please add them. +--- + CMakeLists.txt | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f9db618..425d391 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4,10 +4,17 @@ project(libevdevPlus) + set(SOURCE_FILES + evdevPlus.cpp evdevPlus.hpp CommonIncludes.hpp InputEvent.hpp Resource.cpp) + ++include(GNUInstallDirs) ++ + add_library(evdevPlus ${SOURCE_FILES}) + target_include_directories(evdevPlus PUBLIC .) + + add_executable(evdevPlus_test test.cpp) + target_link_libraries(evdevPlus_test evdevPlus) + +-configure_file(evdevPlus.pc.in evdevPlus.pc @ONLY) +\ No newline at end of file ++configure_file(evdevPlus.pc.in evdevPlus.pc @ONLY) ++ ++install(TARGETS evdevPlus ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(FILES evdevPlus.hpp CommonIncludes.hpp InputEvent.hpp ++ DESTINATION include/) +-- +2.29.2 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/libevdevplus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libevdevplus/default.nix index 66c5f1b069..11d644cd90 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libevdevplus/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libevdevplus/default.nix @@ -2,13 +2,17 @@ stdenv.mkDerivation rec { pname = "libevdevplus"; - version = "unstable-2019-10-01"; + version = "unstable-2021-04-02"; + + # adds missing cmake install directives + # https://github.com/YukiWorkshop/libevdevPlus/pull/10 + patches = [ ./0001-Add-cmake-install-directives.patch]; src = fetchFromGitHub { owner = "YukiWorkshop"; repo = "libevdevPlus"; - rev = "e863df2ade43e2c7d7748cc33ca27fb3eed325ca"; - sha256 = "18z6pn4j7fhmwwh0q22ip5nn7sc1hfgwvkdzqhkja60i8cw2cvvj"; + rev = "b4d4b3143056424a3da9f0516ca02a47209ef757"; + sha256 = "09y65s16gch0w7fy1s9yjk9gz3bjzxix36h5wmwww6lkj2i1z3rj"; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix index 210542e0c9..478e01f357 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "libplacebo"; - version = "3.120.1"; + version = "3.120.2"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = "v${version}"; - sha256 = "0x7jyzsdf884jrky4yci151pk4nzsz1w88wz8sk0cqing7bpaq16"; + sha256 = "0wh5w7bx789ynnzr27xi0csql4jaxq80csawg6znabw3ld54wb86"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libspectrum/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libspectrum/default.nix index 011531b1a2..09aa03e6f6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libspectrum/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libspectrum/default.nix @@ -13,12 +13,13 @@ stdenv.mkDerivation rec { buildInputs = [ audiofile bzip2 glib libgcrypt zlib ]; enableParallelBuilding = true; + doCheck = true; meta = with lib; { homepage = "http://fuse-emulator.sourceforge.net/libspectrum.php"; description = "ZX Spectrum input and output support library"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ orivej ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix index d17303bbb0..90c14c6fdf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -41,7 +41,6 @@ in stdenv.mkDerivation { description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; license = licenses.bsd3; maintainers = [ maintainers.phreedom ]; - broken = stdenv.isDarwin; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libuinputplus/0001-Add-cmake-install-directives.patch b/third_party/nixpkgs/pkgs/development/libraries/libuinputplus/0001-Add-cmake-install-directives.patch new file mode 100644 index 0000000000..cd6f43d377 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libuinputplus/0001-Add-cmake-install-directives.patch @@ -0,0 +1,40 @@ +From 265e406e254c8d84016b12b344d8df71d1765dd1 Mon Sep 17 00:00:00 2001 +From: Jappie Klooster +Date: Fri, 2 Apr 2021 16:33:18 -0400 +Subject: [PATCH] Add cmake install directives + +To make nix builds work, it expect a make install command to +be available. +Adding these directives seems to fix the build. + +If it's no trouble to you, please consider adding them. +--- + CMakeLists.txt | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cbfc9c1..948c432 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,6 +7,8 @@ set(SOURCE_FILES + uInput.cpp uInputSetup.cpp uInputResource.cpp + uInput.hpp CommonIncludes.hpp uInputSetup.hpp) + ++include(GNUInstallDirs) ++ + add_library(uInputPlus ${SOURCE_FILES}) + target_include_directories(uInputPlus PUBLIC .) + +@@ -15,3 +17,9 @@ target_link_libraries(uInputPlus_test uInputPlus) + + configure_file(uInputPlus.pc.in uInputPlus.pc @ONLY) + ++ ++install(TARGETS uInputPlus ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(FILES uInput.hpp CommonIncludes.hpp uInputSetup.hpp ++ DESTINATION include/) ++ +-- +2.29.2 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/libuinputplus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libuinputplus/default.nix index 9085b86107..28110b5770 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libuinputplus/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libuinputplus/default.nix @@ -1,14 +1,17 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config }: - stdenv.mkDerivation rec { pname = "libuinputplus"; - version = "2019-10-01"; + version = "2021-04-02"; + + # adds missing cmake install directives + # https://github.com/YukiWorkshop/libuInputPlus/pull/7 + patches = [ ./0001-Add-cmake-install-directives.patch]; src = fetchFromGitHub { owner = "YukiWorkshop"; repo = "libuInputPlus"; - rev = "962f180b4cc670e1f5cc73c2e4d5d196ae52d630"; - sha256 = "0jy5i7bmjad7hw1qcyjl4swqribp2027s9g3609zwj7lj8z5x0bg"; + rev = "f7f18eb339bba61a43f2cad481a9b1a453a66957"; + sha256 = "0sind2ghhy4h9kfkr5hsmhcq0di4ifwqyv4gac96rgj5mwvs33lp"; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/matio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/matio/default.nix index b6330f69e3..0b8143b691 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/matio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/matio/default.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "matio-1.5.19"; + name = "matio-1.5.20"; src = fetchurl { url = "mirror://sourceforge/matio/${name}.tar.gz"; - sha256 = "0vr8c1mz1k6mz0sgh6n3scl5c3a71iqmy5fnydrgq504icj4vym4"; + sha256 = "sha256-XR9yofUav2qc0j6qgS+xe4YQlwWQlfSMdoxINcWqJZg="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/mbedtls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mbedtls/default.nix index 2e25399d97..90e2c9bd9a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mbedtls/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mbedtls/default.nix @@ -11,13 +11,17 @@ stdenv.mkDerivation rec { pname = "mbedtls"; - version = "2.16.9"; # nixpkgs-update: no auto update + # Auto updates are disabled due to repology listing dev releases as release + # versions. See + # * https://github.com/NixOS/nixpkgs/pull/119838#issuecomment-822100428 + # * https://github.com/NixOS/nixpkgs/commit/0ee02a9d42b5fe1825b0f7cee7a9986bb4ba975d + version = "2.26.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "ARMmbed"; repo = "mbedtls"; rev = "${pname}-${version}"; - sha256 = "0mz7n373b8d287crwi6kq2hb8ryyi228j38h25744lqai23qj5cf"; + sha256 = "0scwpmrgvg6q7rvqkc352d2fqlsx0aylcbyibcp1f1rsn8iiif2m"; }; nativeBuildInputs = [ cmake ninja perl python3 ]; @@ -30,6 +34,10 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ "-DUSE_SHARED_MBEDTLS_LIBRARY=on" ]; + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ + "-Wno-error=format" + "-Wno-error=format-truncation" + ]; meta = with lib; { homepage = "https://tls.mbed.org/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mpir/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mpir/default.nix index 7f7df407e4..5e68ad80fc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mpir/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mpir/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ m4 which yasm ]; src = fetchurl { - url = "http://mpir.org/mpir-${version}.tar.bz2"; + url = "https://mpir.org/mpir-${version}.tar.bz2"; sha256 = "1fvmhrqdjs925hzr2i8bszm50h00gwsh17p2kn2pi51zrxck9xjj"; }; - configureFlags = [ "--enable-cxx" ]; + configureFlags = [ "--enable-cxx" "--enable-fat" ]; meta = { inherit version; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl3Plus; maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.unix; - downloadPage = "http://mpir.org/downloads.html"; - homepage = "http://mpir.org/"; + downloadPage = "https://mpir.org/downloads.html"; + homepage = "https://mpir.org/"; updateWalker = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/nanopb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nanopb/default.nix index e71d1c6a54..ca078a3f9d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nanopb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nanopb/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "nanopb"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0nqfi1b0szjmm1z8wd3ks64h10jblv9ip01kfggxgz6qjjfwgvq7"; + sha256 = "0cjfkwwzi018kc0b7lia7z2jdfgibqc99mf8rvj2xq2pfapp9kf1"; }; nativeBuildInputs = [ cmake python3 python3.pkgs.wrapPython ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix index c9ac76b655..15c8d46b61 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix @@ -1,54 +1,91 @@ -{ lib, stdenv -, fetchurl, fetchFromGitHub, fetchpatch -, cmake, pkg-config, unzip, zlib, pcre, hdf5 -, glog, boost, gflags, protobuf +{ lib +, stdenv +, fetchurl +, fetchFromGitHub +, cmake +, pkg-config +, unzip +, zlib +, pcre +, hdf5 +, boost +, gflags +, protobuf , config -, enableJPEG ? true, libjpeg -, enablePNG ? true, libpng -, enableTIFF ? true, libtiff -, enableWebP ? true, libwebp -, enableEXR ? !stdenv.isDarwin, openexr, ilmbase -, enableEigen ? true, eigen -, enableOpenblas ? true, openblas, blas, lapack -, enableContrib ? true +, enableJPEG ? true +, libjpeg +, enablePNG ? true +, libpng +, enableTIFF ? true +, libtiff +, enableWebP ? true +, libwebp +, enableEXR ? !stdenv.isDarwin +, openexr +, ilmbase +, enableEigen ? true +, eigen +, enableOpenblas ? true +, openblas +, enableContrib ? true -, enableCuda ? (config.cudaSupport or false) && - stdenv.hostPlatform.isx86_64, cudatoolkit, nvidia-optical-flow-sdk +, enableCuda ? (config.cudaSupport or false) && stdenv.hostPlatform.isx86_64 +, cudatoolkit +, nvidia-optical-flow-sdk -, enableUnfree ? false -, enableIpp ? false -, enablePython ? false, pythonPackages -, enableGtk2 ? false, gtk2 -, enableGtk3 ? false, gtk3 -, enableVtk ? false, vtk -, enableFfmpeg ? false, ffmpeg_3 -, enableGStreamer ? false, gst_all_1 -, enableTesseract ? false, tesseract, leptonica -, enableTbb ? false, tbb -, enableOvis ? false, ogre -, enableGPhoto2 ? false, libgphoto2 -, enableDC1394 ? false, libdc1394 -, enableDocs ? false, doxygen, graphviz-nox +, enableUnfree ? false +, enableIpp ? false +, enablePython ? false +, pythonPackages +, enableGtk2 ? false +, gtk2 +, enableGtk3 ? false +, gtk3 +, enableVtk ? false +, vtk +, enableFfmpeg ? true +, ffmpeg_3 +, enableGStreamer ? true +, gst_all_1 +, enableTesseract ? false +, tesseract +, leptonica +, enableTbb ? false +, tbb +, enableOvis ? false +, ogre +, enableGPhoto2 ? false +, libgphoto2 +, enableDC1394 ? false +, libdc1394 +, enableDocs ? false +, doxygen +, graphviz-nox -, AVFoundation, Cocoa, VideoDecodeAcceleration, CoreMedia, MediaToolbox, bzip2 +, AVFoundation +, Cocoa +, VideoDecodeAcceleration +, CoreMedia +, MediaToolbox +, bzip2 }: let - version = "4.3.0"; + version = "4.5.2"; src = fetchFromGitHub { - owner = "opencv"; - repo = "opencv"; - rev = version; - sha256 = "1r9bq9p1x99g2y8jvj9428sgqvljz75dm5vrfsma7hh5wjhz9775"; + owner = "opencv"; + repo = "opencv"; + rev = version; + sha256 = "sha256-pxi1VBF4txvRqspdqvCsAQ3XKzl633/o3wyOgD9wid4="; }; contribSrc = fetchFromGitHub { - owner = "opencv"; - repo = "opencv_contrib"; - rev = version; - sha256 = "068b4f95rlryab3mffxs2w6dnbmbhrnpsdgl007rxk4bwnz29y49"; + owner = "opencv"; + repo = "opencv_contrib"; + rev = version; + sha256 = "sha256-iMenRTY+qeL7WRgnRuQbsHflYDakE7pWWSHeIjrg0Iw="; }; # Contrib must be built in order to enable Tesseract support: @@ -57,35 +94,35 @@ let # See opencv/3rdparty/ippicv/ippicv.cmake ippicv = { src = fetchFromGitHub { - owner = "opencv"; - repo = "opencv_3rdparty"; - rev = "a56b6ac6f030c312b2dce17430eef13aed9af274"; + owner = "opencv"; + repo = "opencv_3rdparty"; + rev = "a56b6ac6f030c312b2dce17430eef13aed9af274"; sha256 = "1msbkc3zixx61rcg6a04i1bcfhw1phgsrh93glq1n80hgsk3nbjq"; } + "/ippicv"; - files = let name = platform : "ippicv_2019_${platform}_general_20180723.tgz"; in + files = let name = platform: "ippicv_2019_${platform}_general_20180723.tgz"; in if stdenv.hostPlatform.system == "x86_64-linux" then - { ${name "lnx_intel64"} = "c0bd78adb4156bbf552c1dfe90599607"; } + { ${name "lnx_intel64"} = "c0bd78adb4156bbf552c1dfe90599607"; } else if stdenv.hostPlatform.system == "i686-linux" then - { ${name "lnx_ia32"} = "4f38432c30bfd6423164b7a24bbc98a0"; } + { ${name "lnx_ia32"} = "4f38432c30bfd6423164b7a24bbc98a0"; } else if stdenv.hostPlatform.system == "x86_64-darwin" then - { ${name "mac_intel64"} = "fe6b2bb75ae0e3f19ad3ae1a31dfa4a2"; } + { ${name "mac_intel64"} = "fe6b2bb75ae0e3f19ad3ae1a31dfa4a2"; } else - throw "ICV is not available for this platform (or not yet supported by this package)"; + throw "ICV is not available for this platform (or not yet supported by this package)"; dst = ".cache/ippicv"; }; # See opencv_contrib/modules/xfeatures2d/cmake/download_vgg.cmake vgg = { src = fetchFromGitHub { - owner = "opencv"; - repo = "opencv_3rdparty"; - rev = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"; + owner = "opencv"; + repo = "opencv_3rdparty"; + rev = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"; sha256 = "0r9fam8dplyqqsd3qgpnnfgf9l7lj44di19rxwbm8mxiw0rlcdvy"; }; files = { - "vgg_generated_48.i" = "e8d0dcd54d1bcfdc29203d011a797179"; - "vgg_generated_64.i" = "7126a5d9a8884ebca5aea5d63d677225"; - "vgg_generated_80.i" = "7cd47228edec52b6d82f46511af325c5"; + "vgg_generated_48.i" = "e8d0dcd54d1bcfdc29203d011a797179"; + "vgg_generated_64.i" = "7126a5d9a8884ebca5aea5d63d677225"; + "vgg_generated_80.i" = "7cd47228edec52b6d82f46511af325c5"; "vgg_generated_120.i" = "151805e03568c9f490a5e3a872777b75"; }; dst = ".cache/xfeatures2d/vgg"; @@ -94,19 +131,19 @@ let # See opencv_contrib/modules/xfeatures2d/cmake/download_boostdesc.cmake boostdesc = { src = fetchFromGitHub { - owner = "opencv"; - repo = "opencv_3rdparty"; - rev = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"; + owner = "opencv"; + repo = "opencv_3rdparty"; + rev = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"; sha256 = "13yig1xhvgghvxspxmdidss5lqiikpjr0ddm83jsi0k85j92sn62"; }; files = { - "boostdesc_bgm.i" = "0ea90e7a8f3f7876d450e4149c97c74f"; - "boostdesc_bgm_bi.i" = "232c966b13651bd0e46a1497b0852191"; - "boostdesc_bgm_hd.i" = "324426a24fa56ad9c5b8e3e0b3e5303e"; + "boostdesc_bgm.i" = "0ea90e7a8f3f7876d450e4149c97c74f"; + "boostdesc_bgm_bi.i" = "232c966b13651bd0e46a1497b0852191"; + "boostdesc_bgm_hd.i" = "324426a24fa56ad9c5b8e3e0b3e5303e"; "boostdesc_binboost_064.i" = "202e1b3e9fec871b04da31f7f016679f"; "boostdesc_binboost_128.i" = "98ea99d399965c03d555cef3ea502a0b"; "boostdesc_binboost_256.i" = "e6dcfa9f647779eb1ce446a8d759b6ea"; - "boostdesc_lbgm.i" = "0ae0675534aa318d9668f2a179c2a052"; + "boostdesc_lbgm.i" = "0ae0675534aa318d9668f2a179c2a052"; }; dst = ".cache/xfeatures2d/boostdesc"; }; @@ -114,9 +151,9 @@ let # See opencv_contrib/modules/face/CMakeLists.txt face = { src = fetchFromGitHub { - owner = "opencv"; - repo = "opencv_3rdparty"; - rev = "8afa57abc8229d611c4937165d20e2a2d9fc5a12"; + owner = "opencv"; + repo = "opencv_3rdparty"; + rev = "8afa57abc8229d611c4937165d20e2a2d9fc5a12"; sha256 = "061lsvqdidq9xa2hwrcvwi9ixflr2c2lfpc8drr159g68zi8bp4v"; }; files = { @@ -136,10 +173,27 @@ let dst = ".cache/ade"; }; + # See opencv/modules/wechat_qrcode/CMakeLists.txt + wechat_qrcode = { + src = fetchFromGitHub { + owner = "opencv"; + repo = "opencv_3rdparty"; + rev = "a8b69ccc738421293254aec5ddb38bd523503252"; + sha256 = "sha256-/n6zHwf0Rdc4v9o4rmETzow/HTv+81DnHP+nL56XiTY="; + }; + files = { + "detect.caffemodel" = "238e2b2d6f3c18d6c3a30de0c31e23cf"; + "detect.prototxt" = "6fb4976b32695f9f5c6305c19f12537d"; + "sr.caffemodel" = "cbfcd60361a73beb8c583eea7e8e6664"; + "sr.prototxt" = "69db99927a70df953b471daaba03fbef"; + }; + dst = ".cache/wechat_qrcode"; + }; + # See opencv/cmake/OpenCVDownload.cmake - installExtraFiles = extra : with lib; '' + installExtraFiles = extra: with lib; '' mkdir -p "${extra.dst}" - '' + concatStrings (flip mapAttrsToList extra.files (name : md5 : '' + '' + concatStrings (flip mapAttrsToList extra.files (name: md5: '' ln -s "${extra.src}/${name}" "${extra.dst}/${md5}-${name}" '')); installExtraFile = extra: '' @@ -149,7 +203,7 @@ let opencvFlag = name: enabled: "-DWITH_${name}=${printEnabled enabled}"; - printEnabled = enabled : if enabled then "ON" else "OFF"; + printEnabled = enabled: if enabled then "ON" else "OFF"; in stdenv.mkDerivation { @@ -172,13 +226,15 @@ stdenv.mkDerivation { preConfigure = installExtraFile ade + lib.optionalString enableIpp (installExtraFiles ippicv) + ( - lib.optionalString buildContrib '' - cmakeFlagsArray+=("-DOPENCV_EXTRA_MODULES_PATH=$NIX_BUILD_TOP/source/opencv_contrib") + lib.optionalString buildContrib '' + cmakeFlagsArray+=("-DOPENCV_EXTRA_MODULES_PATH=$NIX_BUILD_TOP/source/opencv_contrib") - ${installExtraFiles vgg} - ${installExtraFiles boostdesc} - ${installExtraFiles face} - ''); + ${installExtraFiles vgg} + ${installExtraFiles boostdesc} + ${installExtraFiles face} + ${installExtraFiles wechat_qrcode} + '' + ); postConfigure = '' [ -e modules/core/version_string.inc ] @@ -186,7 +242,7 @@ stdenv.mkDerivation { ''; buildInputs = - [ zlib pcre hdf5 glog boost gflags protobuf ] + [ zlib pcre hdf5 boost gflags protobuf ] ++ lib.optional enablePython pythonPackages.python ++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk3 gtk3 @@ -198,7 +254,7 @@ stdenv.mkDerivation { ++ lib.optionals enableEXR [ openexr ilmbase ] ++ lib.optional enableFfmpeg ffmpeg_3 ++ lib.optionals (enableFfmpeg && stdenv.isDarwin) - [ VideoDecodeAcceleration bzip2 ] + [ VideoDecodeAcceleration bzip2 ] ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optional enableOvis ogre ++ lib.optional enableGPhoto2 libgphoto2 @@ -274,15 +330,13 @@ stdenv.mkDerivation { "$out/lib/pkgconfig/opencv4.pc" ''; - hardeningDisable = [ "bindnow" "relro" ]; - - passthru = lib.optionalAttrs enablePython { pythonPath = []; }; + passthru = lib.optionalAttrs enablePython { pythonPath = [ ]; }; meta = with lib; { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = "https://opencv.org/"; license = with licenses; if enableUnfree then unfree else bsd3; - maintainers = with maintainers; [mdaiter basvandijk]; + maintainers = with maintainers; [ mdaiter basvandijk ]; platforms = with platforms; linux ++ darwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencv/cmake-don-t-use-OpenCVFindOpenEXR.patch b/third_party/nixpkgs/pkgs/development/libraries/opencv/cmake-don-t-use-OpenCVFindOpenEXR.patch index dc80b09b64..bb398f7546 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencv/cmake-don-t-use-OpenCVFindOpenEXR.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/opencv/cmake-don-t-use-OpenCVFindOpenEXR.patch @@ -1,40 +1,17 @@ -From 6d988c08e852379a163ecd20df8639196d84d014 Mon Sep 17 00:00:00 2001 -From: Bernardo Meurer -Date: Sun, 26 Apr 2020 14:50:25 -0700 -Subject: [PATCH] cmake: don't use OpenCVFindOpenEXR - -Use find_package for this. ---- - CMakeLists.txt | 2 ++ - cmake/OpenCVFindLibsGrfmt.cmake | 15 +++------------ - 2 files changed, 5 insertions(+), 12 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4c0b3880fc..0360469350 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -14,6 +14,8 @@ FATAL: In-source builds are not allowed. - ") - endif() - -+# the future! -+include(FindPkgConfig) - - include(cmake/OpenCVMinDepVersions.cmake) - diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake -index 0beaf19317..4c5e46e615 100644 +index 23a6ca6959..27e121943a 100644 --- a/cmake/OpenCVFindLibsGrfmt.cmake +++ b/cmake/OpenCVFindLibsGrfmt.cmake -@@ -227,20 +227,11 @@ endif() +@@ -255,21 +255,12 @@ endif() # --- OpenEXR (optional) --- if(WITH_OPENEXR) ocv_clear_vars(HAVE_OPENEXR) - if(NOT BUILD_OPENEXR) +- ocv_clear_internal_cache_vars(OPENEXR_INCLUDE_PATHS OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY OPENEXR_VERSION) - include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake") - endif() -- + pkg_check_modules(OPENEXR OpenEXR) + if(OPENEXR_FOUND) set(HAVE_OPENEXR YES) - else() @@ -50,6 +27,3 @@ index 0beaf19317..4c5e46e615 100644 endif() endif() --- -2.26.1 - diff --git a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix index fda0c71655..f6d45f66b1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix @@ -72,14 +72,18 @@ let }.${stdenv.hostPlatform.system} or ( if stdenv.hostPlatform == stdenv.buildPlatform then "./config" + else if stdenv.hostPlatform.isBSD && stdenv.hostPlatform.isx86_64 + then "./Configure BSD-x86_64" + else if stdenv.hostPlatform.isBSD && stdenv.hostPlatform.isx86_32 + then "./Configure BSD-x86" + lib.optionalString (stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf") "-elf" + else if stdenv.hostPlatform.isBSD + then "./Configure BSD-generic${toString stdenv.hostPlatform.parsed.cpu.bits}" else if stdenv.hostPlatform.isMinGW then "./Configure mingw${optionalString (stdenv.hostPlatform.parsed.cpu.bits != 32) (toString stdenv.hostPlatform.parsed.cpu.bits)}" else if stdenv.hostPlatform.isLinux - then (if stdenv.hostPlatform.isx86_64 - then "./Configure linux-x86_64" - else "./Configure linux-generic${toString stdenv.hostPlatform.parsed.cpu.bits}") + then "./Configure linux-generic${toString stdenv.hostPlatform.parsed.cpu.bits}" else if stdenv.hostPlatform.isiOS then "./Configure ios${toString stdenv.hostPlatform.parsed.cpu.bits}-cross" else diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/cudnn/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/cudnn/default.nix index b8aac46d91..d4c7fcac97 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/cudnn/default.nix @@ -1,4 +1,4 @@ -{ callPackage, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 }: +{ callPackage, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 }: let generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) { @@ -6,29 +6,6 @@ let }; in rec { - cudnn_cudatoolkit_9_0 = generic rec { - version = "7.3.0"; - cudatoolkit = cudatoolkit_9_0; - srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.3.0.29.tgz"; - sha256 = "16z4vgbcmbayk4hppz0xshgs3g07blkp4j25cxcjqyrczx1r0gs0"; - }; - - cudnn_cudatoolkit_9_1 = generic rec { - version = "7.1.3"; - cudatoolkit = cudatoolkit_9_1; - srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.1.tgz"; - sha256 = "0a0237gpr0p63s92njai0xvxmkbailzgfsvh7n9fnz0njhvnsqfx"; - }; - - cudnn_cudatoolkit_9_2 = generic rec { - version = "7.2.1"; - cudatoolkit = cudatoolkit_9_2; - srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.2.1.38.tgz"; - sha256 = "1sf215wm6zgr17gs6sxfhw61b7a0qmcxiwhgy1b4nqdyxpqgay1y"; - }; - - cudnn_cudatoolkit_9 = cudnn_cudatoolkit_9_2; - cudnn_cudatoolkit_10_0 = generic rec { version = "7.4.2"; cudatoolkit = cudatoolkit_10_0; diff --git a/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix b/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix index e67cb1736b..b5df83a0b9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, plib, freeglut, xorgproto, libX11, libXext, libXi , libICE, libSM, libXt, libXmu, libGLU, libGL, boost, zlib, libjpeg, freealut -, openscenegraph, openal, expat, cmake, apr +, openscenegraph, openal, expat, cmake, apr, xz , curl }: let - version = "2020.3.6"; + version = "2020.3.8"; shortVersion = builtins.substring 0 6 version; in stdenv.mkDerivation rec { @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-7D7KRNIffgUr6vwbni1XwW+8GtXwM6vJZ7V6/QLDVmk="; + sha256 = "sha256-UXcWV9MPu7c+QlFjrhxtQ6ruAcxuKtewwphu4tt5dWc="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ plib freeglut xorgproto libX11 libXext libXi libICE libSM libXt libXmu libGLU libGL boost zlib libjpeg freealut - openscenegraph openal expat apr curl ]; + openscenegraph openal expat apr curl xz ]; meta = with lib; { description = "Simulation construction toolkit"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix index 8ef209fe80..3b6362f739 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix @@ -10,13 +10,13 @@ with lib; stdenv.mkDerivation rec { pname = "vapoursynth"; - version = "R52"; + version = "R53"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = version; - sha256 = "1krfdzc2x2vxv4nq9kiv1c09hgj525qn120ah91fw2ikq8ldvmx4"; + sha256 = "0qcsfkpkry0cmvi60khjwvfz4fqhy23nqmn4pb9qrwll26sn9dcr"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/node-packages/default.nix b/third_party/nixpkgs/pkgs/development/node-packages/default.nix index b0bd2afd14..8d00e3595f 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/default.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/default.nix @@ -241,6 +241,10 @@ let ''; }; + teck-programmer = super.teck-programmer.override { + buildInputs = [ pkgs.libusb ]; + }; + vega-cli = super.vega-cli.override { nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = with pkgs; [ diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json index 306c54e8e3..d8b98ea144 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -140,6 +140,7 @@ , "json-server" , "jsonlint" , "kaput-cli" +, "katex" , "karma" , "lcov-result-merger" , "leetcode-cli" @@ -220,6 +221,7 @@ , "svgo" , "swagger" , {"tedicross": "git+https://github.com/TediCross/TediCross.git#v0.8.7"} +, "teck-programmer" , "tern" , "textlint" , "textlint-plugin-latex" diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix index c9431e3ca3..366e04440f 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -40385,6 +40385,15 @@ let sha512 = "Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA=="; }; }; + "node-addon-api-3.0.2" = { + name = "node-addon-api"; + packageName = "node-addon-api"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.2.tgz"; + sha512 = "+D4s2HCnxPd5PjjI0STKwncjXTUKKqm74MDMz9OPXavjsGmjkvwgLtA5yoxJUdmpj52+2u+RrXgPipahKczMKg=="; + }; + }; "node-addon-api-3.1.0" = { name = "node-addon-api"; packageName = "node-addon-api"; @@ -45797,6 +45806,15 @@ let sha512 = "aaLVANlj4HgZweKttFNUVNRxDukytuIuxeK2boIMHjagNJCiVKWFsKF4tCE3ql3GbrD2tExPQ7/pwtEJcHNZeg=="; }; }; + "prebuild-install-5.3.6" = { + name = "prebuild-install"; + packageName = "prebuild-install"; + version = "5.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.6.tgz"; + sha512 = "s8Aai8++QQGi4sSbs/M1Qku62PFK49Jm1CbgXklGz4nmHveDq0wzJkg7Na5QbnO1uNH8K7iqx2EQ/mV0MZEmOg=="; + }; + }; "prebuild-install-6.1.1" = { name = "prebuild-install"; packageName = "prebuild-install"; @@ -59820,6 +59838,15 @@ let sha1 = "23f89069a6c62f46cf3a1d3b00169cefb90be0c6"; }; }; + "usb-1.7.0" = { + name = "usb"; + packageName = "usb"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/usb/-/usb-1.7.0.tgz"; + sha512 = "LHm9d389NCzZSMd0DnilxT5Lord4P2E3ETwP1LeuJcEBmI5uLJv8Sd18z/9bairUMbDnnNqX+Hi5Xkl93Kvdmw=="; + }; + }; "use-3.1.1" = { name = "use"; packageName = "use"; @@ -88881,6 +88908,27 @@ in bypassCache = true; reconstructLock = true; }; + katex = nodeEnv.buildNodePackage { + name = "katex"; + packageName = "katex"; + version = "0.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/katex/-/katex-0.13.2.tgz"; + sha512 = "u/KhjFDhyPr+70aiBn9SL/9w/QlLagIXBi2NZSbNnBUp2tR8dCjQplyEMkEzniem5gOeSCBjlBUg4VaiWs1JJg=="; + }; + dependencies = [ + sources."commander-6.2.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Fast math typesetting for the web."; + homepage = "https://katex.org"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; @@ -109967,6 +110015,96 @@ in bypassCache = true; reconstructLock = true; }; + teck-programmer = nodeEnv.buildNodePackage { + name = "teck-programmer"; + packageName = "teck-programmer"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/teck-programmer/-/teck-programmer-1.1.1.tgz"; + sha1 = "bd2b3b1e3b88ad3c7471bdc8a5244255564b69e1"; + }; + dependencies = [ + sources."ansi-regex-2.1.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.5" + sources."base64-js-1.5.1" + sources."bindings-1.5.0" + (sources."bl-4.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."buffer-5.7.1" + sources."chownr-1.1.4" + sources."code-point-at-1.1.0" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.2" + sources."decompress-response-4.2.1" + sources."deep-extend-0.6.0" + sources."delegates-1.0.0" + sources."detect-libc-1.0.3" + sources."end-of-stream-1.4.4" + sources."expand-template-2.0.3" + sources."file-uri-to-path-1.0.0" + sources."fs-constants-1.0.0" + sources."gauge-2.7.4" + sources."github-from-package-0.0.0" + sources."has-unicode-2.0.1" + sources."ieee754-1.2.1" + sources."inherits-2.0.4" + sources."ini-1.3.8" + sources."is-fullwidth-code-point-1.0.0" + sources."isarray-1.0.0" + sources."mimic-response-2.1.0" + sources."minimist-1.2.5" + sources."mkdirp-classic-0.5.3" + sources."napi-build-utils-1.0.2" + sources."node-abi-2.21.0" + sources."node-addon-api-3.0.2" + sources."noop-logger-0.1.1" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."prebuild-install-5.3.6" + sources."process-nextick-args-2.0.1" + sources."pump-3.0.0" + sources."q-1.5.1" + sources."rc-1.2.8" + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."semver-5.7.1" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.3" + sources."simple-concat-1.0.1" + sources."simple-get-3.1.0" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-json-comments-2.0.1" + sources."tar-fs-2.1.1" + (sources."tar-stream-2.2.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."tunnel-agent-0.6.0" + sources."usb-1.7.0" + sources."util-deprecate-1.0.2" + sources."which-pm-runs-1.0.0" + sources."wide-align-1.1.3" + sources."wrappy-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Programmer for TECK keyboards."; + homepage = "https://github.com/m-ou-se/teck-programmer"; + license = "GPL-3.0+"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; tern = nodeEnv.buildNodePackage { name = "tern"; packageName = "tern"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dap/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dap/default.nix new file mode 100644 index 0000000000..6d14945ee1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dap/default.nix @@ -0,0 +1,35 @@ +{ lib, buildDunePackage, fetchurl +, angstrom-lwt-unix, lwt, logs, lwt_ppx, ppx_deriving_yojson, ppx_expect, ppx_here, react +}: + +buildDunePackage rec { + pname = "dap"; + version = "1.0.6"; + useDune2 = true; + src = fetchurl { + url = "https://github.com/hackwaly/ocaml-dap/releases/download/${version}/dap-${version}.tbz"; + sha256 = "1zq0f8429m38a4x3h9n3rv7n1vsfjbs72pfi5902a89qwyilkcp0"; + }; + + minimumOCamlVersion = "4.08"; + + buildInputs = [ + lwt_ppx + ]; + + propagatedBuildInputs = [ + angstrom-lwt-unix + logs + lwt + ppx_deriving_yojson + ppx_expect + ppx_here + react + ]; + + meta = { + description = "Debug adapter protocol"; + homepage = "https://github.com/hackwaly/ocaml-dap"; + license = lib.licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/earlybird/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/earlybird/default.nix index b36874d49d..07e9b5a354 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/earlybird/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/earlybird/default.nix @@ -1,25 +1,25 @@ -{ lib, fetchurl, ocaml, buildDunePackage, angstrom, angstrom-lwt-unix, - batteries, cmdliner, lwt_ppx, ocaml_lwt, ppx_deriving_yojson, - ppx_tools_versioned, yojson }: +{ lib, fetchurl, ocaml, buildDunePackage +, cmdliner, dap, fmt, iter, logs, lru, lwt_ppx, lwt_react, menhir, path_glob, ppx_deriving_yojson +}: -if lib.versionAtLeast ocaml.version "4.08" +if lib.versionAtLeast ocaml.version "4.13" then throw "earlybird is not available for OCaml ${ocaml.version}" else buildDunePackage rec { pname = "earlybird"; - version = "0.1.5"; + version = "1.1.0"; useDune2 = true; - minimumOCamlVersion = "4.04"; + minimumOCamlVersion = "4.11"; src = fetchurl { url = "https://github.com/hackwaly/ocamlearlybird/releases/download/${version}/${pname}-${version}.tbz"; - sha256 = "10yflmsicw4sdmm075zjpbmxpwm9fvibnl3sl18zjpwnm6l9sv7d"; + sha256 = "1pwzhcr3pw24ra4j4d23vz71h0psz4xkyp7b12l2wl1slxzjbrxa"; }; - buildInputs = [ angstrom angstrom-lwt-unix batteries cmdliner lwt_ppx ocaml_lwt ppx_deriving_yojson ppx_tools_versioned yojson ]; + buildInputs = [ cmdliner dap fmt iter logs lru lwt_ppx lwt_react menhir path_glob ppx_deriving_yojson ]; meta = { homepage = "https://github.com/hackwaly/ocamlearlybird"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/extlib/1.7.7.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/extlib/1.7.7.nix new file mode 100644 index 0000000000..3314ebcb9b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/extlib/1.7.7.nix @@ -0,0 +1,11 @@ +# Older version of extlib for Haxe 4.0 and 4.1. +# May be replaceable by the next extlib + extlib-base64 release. +{ fetchurl, ocaml_extlib }: + +ocaml_extlib.overrideAttrs (_: rec { + version = "1.7.7"; + src = fetchurl { + url = "https://github.com/ygrek/ocaml-extlib/releases/download/${version}/extlib-${version}.tar.gz"; + sha256 = "1sxmzc1mx3kg62j8kbk0dxkx8mkf1rn70h542cjzrziflznap0s1"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix index abb21fd7c5..7c59e1eaef 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "ppx_irmin"; - version = "2.5.2"; + version = "2.5.3"; src = fetchurl { url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz"; - sha256 = "ac8d75144cafdaf4b5e106b540a27338245510b7e33a8c412d393c9d50cae490"; + sha256 = "2c8ef24cc57379c3a138f121fea350ee7b6077abc22a4fdc6a47d0c81585f3f6"; }; minimumOCamlVersion = "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix index 3ee09b2d51..5a6daa54de 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix @@ -1,46 +1,24 @@ -{ stdenv, lib, fetchurl, fetchzip, ocaml, findlib, tcl, tk }: +{ stdenv, lib, makeWrapper, fetchzip, ocaml, findlib, tcl, tk }: -let OCamlVersionAtLeast = lib.versionAtLeast ocaml.version; in - -if !OCamlVersionAtLeast "4.04" -then throw "labltk is not available for OCaml ${ocaml.version}" -else - -let param = - let mkNewParam = { version, sha256 }: { +let + params = + let mkNewParam = { version, sha256, rev ? version }: { inherit version; src = fetchzip { - url = "https://github.com/garrigue/labltk/archive/${version}.tar.gz"; + url = "https://github.com/garrigue/labltk/archive/${rev}.tar.gz"; inherit sha256; }; }; in - let mkOldParam = { version, key, sha256 }: { - src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/${key}/labltk-${version}.tar.gz"; - inherit sha256; - }; - inherit version; - }; in rec { - "4.04" = mkOldParam { - version = "8.06.2"; - key = "1628"; - sha256 = "1p97j9s33axkb4yyl0byhmhlyczqarb886ajpyggizy2br3a0bmk"; - }; - "4.05" = mkOldParam { - version = "8.06.3"; - key = "1701"; - sha256 = "1rka9jpg3kxqn7dmgfsa7pmsdwm16x7cn4sh15ijyyrad9phgdxn"; - }; - "4.06" = mkOldParam { + "4.06" = mkNewParam { version = "8.06.4"; - key = "1727"; - sha256 = "0j3rz0zz4r993wa3ssnk5s416b1jhj58l6z2jk8238a86y7xqcii"; + rev = "labltk-8.06.4"; + sha256 = "03xwnnnahb2rf4siymzqyqy8zgrx3h26qxjgbp5dh1wdl7n02c7g"; }; - "4.07" = mkOldParam { + "4.07" = mkNewParam { version = "8.06.5"; - key = "1764"; - sha256 = "0wgx65y1wkgf22ihpqmspqfp95fqbj3pldhp1p3b1mi8rmc37zwj"; + rev = "1b71e2c6f3ae6847d3d5e79bf099deb7330fb419"; + sha256 = "02vchmrm3izrk7daldd22harhgrjhmbw6i1pqw6hmfmrmrypypg2"; }; _8_06_7 = mkNewParam { version = "8.06.7"; @@ -60,14 +38,16 @@ let param = version = "8.06.10"; sha256 = "06cck7wijq4zdshzhxm6jyl8k3j0zglj2axsyfk6q1sq754zyf4a"; }; -}.${builtins.substring 0 4 ocaml.version}; + }; + param = params . ${lib.versions.majorMinor ocaml.version} + or (throw "labltk is not available for OCaml ${ocaml.version}"); in stdenv.mkDerivation rec { inherit (param) version src; name = "ocaml${ocaml.version}-labltk-${version}"; - buildInputs = [ ocaml findlib tcl tk ]; + buildInputs = [ ocaml findlib tcl tk makeWrapper ]; configureFlags = [ "--use-findlib" "--installbindir" "$(out)/bin" ]; dontAddPrefix = true; @@ -79,6 +59,10 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $OCAMLFIND_DESTDIR/stublibs mv $OCAMLFIND_DESTDIR/labltk/dlllabltk.so $OCAMLFIND_DESTDIR/stublibs/ + for p in $out/bin/* + do + wrapProgram $p --set CAML_LD_LIBRARY_PATH $OCAMLFIND_DESTDIR/stublibs + done ''; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/path_glob/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/path_glob/default.nix new file mode 100644 index 0000000000..ed6363bad2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/path_glob/default.nix @@ -0,0 +1,17 @@ +{ lib, buildDunePackage, fetchurl }: + +buildDunePackage rec { + pname = "path_glob"; + version = "0.2"; + useDune2 = true; + src = fetchurl { + url = "https://gasche.gitlab.io/path_glob/releases/path_glob-${version}.tbz"; + sha256 = "01ra20bzjiihbgma74axsp70gqmid6x7jmiizg48mdkni0aa42ay"; + }; + + meta = { + homepage = "https://gitlab.com/gasche/path_glob"; + description = "Checking glob patterns on paths"; + license = lib.licenses.lgpl2Only; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/php-packages/composer/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/composer/default.nix index d704b5f9a2..a7be06f1d0 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/composer/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/composer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: let pname = "composer"; - version = "2.0.11"; + version = "2.0.12"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "sha256-6r8pFwcglqlGeRk3YlATGeYh4rNppKElaywn9OaYRHc="; + sha256 = "sha256-guqMFTfPrOt+VvYATHzN+Z3a/OcjfAc3TZIOY1cwpjE="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix index ac4768c31d..2345f8cae4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.5.0"; + version = "3.6.0"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-QJeb9+iiS4QZ7poOBp5oKD5KuagkG6cfTalbNRwrI1M="; + sha256 = "sha256-096bMTAh5d2wikrmlDcUspD9GYZlPHbdDcf/e/BLAHI="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix index 13386eb12a..a34fa36734 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.5903"; + version = "9.0.6281"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-75Ul9JfMFYv3AfBlgmer6IDyfgOAS4AdXexznoxi35Y="; + sha256 = "sha256-IFUGtTO+DY8FIxLgvmwM/y/RQr42T9sABPpnJMILkqg="; }; propagatedBuildInputs = [ pyvex ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioimaplib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioimaplib/default.nix index df9748f1c8..a94818aee5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioimaplib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioimaplib/default.nix @@ -8,22 +8,19 @@ , nose , pyopenssl , pytestCheckHook -, pythonAtLeast , pytz , tzlocal }: buildPythonPackage rec { pname = "aioimaplib"; - version = "0.8.0"; - - disabled = pythonAtLeast "3.9"; + version = "0.9.0"; src = fetchFromGitHub { owner = "bamthomas"; repo = pname; rev = version; - sha256 = "sha256-ume25EwLNB6szokHXonDXHGKVK76CiZYOBXVUf37/x8="; + sha256 = "sha256-xxZAeJDuqrPv4kGgDr0ypFuZJk1zcs/bmgeEzI0jpqY="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiosmb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiosmb/default.nix index 49c67a0aa0..ce20341eae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiosmb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiosmb/default.nix @@ -1,6 +1,7 @@ { lib , asysocks , buildPythonPackage +, colorama , fetchPypi , minikerberos , prompt_toolkit @@ -13,22 +14,23 @@ buildPythonPackage rec { pname = "aiosmb"; - version = "0.2.37"; + version = "0.2.41"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0daf1fk7406vpywc0yxv0wzf4nw986js9lc2agfyfxz0q7s29lf0"; + sha256 = "sha256-hiLLoFswh0rm5f5TsaX+zyRDkOIyzGXVO0M5J5d/gtQ="; }; propagatedBuildInputs = [ - minikerberos - winsspi - six asysocks - tqdm + colorama + minikerberos prompt_toolkit + six + tqdm winacl + winsspi ]; # Project doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix new file mode 100644 index 0000000000..ba0b3b68be --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix @@ -0,0 +1,93 @@ +{ lib +, ailment +, archinfo +, buildPythonPackage +, cachetools +, capstone +, cffi +, claripy +, cle +, cppheaderparser +, dpkt +, fetchFromGitHub +, GitPython +, itanium_demangler +, mulpyplexer +, networkx +, progressbar2 +, protobuf +, psutil +, pycparser +, pkgs +, pythonOlder +, pyvex +, sqlalchemy +, rpyc +, sortedcontainers +, unicorn +}: + +let + # Only the pinned release in setup.py works properly + unicorn' = unicorn.overridePythonAttrs (old: rec { + pname = "unicorn"; + version = "1.0.2-rc4"; + src = fetchFromGitHub { + owner = "unicorn-engine"; + repo = pname; + rev = version; + sha256 = "17nyccgk7hpc4hab24yn57f1xnmr7kq4px98zbp2bkwcrxny8gwy"; + }; + }); +in + +buildPythonPackage rec { + pname = "angr"; + version = "9.0.6281"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "10i4qdk8f342gzxiwy0pjdc35lc4q5ab7l5q420ca61cgdvxkk4r"; + }; + + propagatedBuildInputs = [ + ailment + archinfo + cachetools + capstone + cffi + claripy + cle + cppheaderparser + dpkt + GitPython + itanium_demangler + mulpyplexer + networkx + progressbar2 + protobuf + psutil + sqlalchemy + pycparser + pyvex + sqlalchemy + rpyc + sortedcontainers + unicorn' + ]; + + # Tests have additional requirements, e.g., pypcode and angr binaries + # cle is executing the tests with the angr binaries + doCheck = false; + pythonImportsCheck = [ "angr" ]; + + meta = with lib; { + description = "Powerful and user-friendly binary analysis platform"; + homepage = "https://angr.io/"; + license = with licenses; [ bsd2 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix index b06e0320dc..ec1db2e33d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.5903"; + version = "9.0.6281"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4e+ZGIt/ouZj5rsmaVxUrz8gAq4Yq2+Qx4jdOojB4Sw="; + sha256 = "sha256-ZO2P53RdR3cYhDbtrdGJnadFZgKkBdDi5gR/CB7YTpI="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix index 61b72e8cf3..39413d0f9c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.5903"; + version = "9.0.6281"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NIKWUx1VT5TjnuqppuT6VzwNRwcBLc0xI5k3F2Nmj8A="; + sha256 = "sha256-gvo8I6LQRAEUa7QiV5Sugrt+e2SmGkkKfsGn/IKz+Mk="; }; # Use upstream z3 implementation diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix new file mode 100644 index 0000000000..436a364b2b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix @@ -0,0 +1,77 @@ +{ lib +, buildPythonPackage +, cffi +, fetchFromGitHub +, minidump +, nose +, pefile +, pyelftools +, pytestCheckHook +, pythonOlder +, pyvex +, pyxbe +, sortedcontainers +}: + +let + # The binaries are following the argr projects release cycle + version = "9.0.6281"; + + # Binary files from https://github.com/angr/binaries (only used for testing and only here) + binaries = fetchFromGitHub { + owner = "angr"; + repo = "binaries"; + rev = "v${version}"; + sha256 = "1qlrxfj1n34xvwkac6mbcc7zmixxbp34fj7lkf0fvp7zcz1rpla1"; + }; + +in +buildPythonPackage rec { + pname = "cle"; + inherit version; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "angr"; + repo = pname; + rev = "v${version}"; + sha256 = "0f2zc02dljmgp6ny6ja6917j08kqhwckncan860dq4xv93g61rmg"; + }; + + propagatedBuildInputs = [ + cffi + minidump + pefile + pyelftools + pyvex + pyxbe + sortedcontainers + ]; + + checkInputs = [ + nose + pytestCheckHook + ]; + + # Place test binaries in the right location (location is hard-coded in the tests) + preCheck = '' + export HOME=$TMPDIR + cp -r ${binaries} $HOME/binaries + ''; + + disabledTests = [ + # PPC tests seems to fails + "test_ppc_rel24_relocation" + "test_ppc_addr16_ha_relocation" + "test_ppc_addr16_lo_relocation" + ]; + + pythonImportsCheck = [ "cle" ]; + + meta = with lib; { + description = "Python loader for many binary formats"; + homepage = "https://github.com/angr/cle"; + license = with licenses; [ bsd2 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dsmr-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dsmr-parser/default.nix new file mode 100644 index 0000000000..155927368e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dsmr-parser/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyserial +, pyserial-asyncio +, pytestCheckHook +, pytz +, tailer +}: + +buildPythonPackage rec { + pname = "dsmr-parser"; + version = "0.29"; + + src = fetchFromGitHub { + owner = "ndokter"; + repo = "dsmr_parser"; + rev = "v${version}"; + sha256 = "11d6cwmabzc8p6jkqwj72nrj7p6cxbvr0x3jdrxyx6zki8chyw4p"; + }; + + propagatedBuildInputs = [ + pyserial + pyserial-asyncio + pytz + tailer + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "dsmr_parser" ]; + + meta = with lib; { + description = "Python module to parse Dutch Smart Meter Requirements (DSMR)"; + homepage = "https://github.com/ndokter/dsmr_parser"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/faadelays/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/faadelays/default.nix index 3175aabcae..7cd0e29199 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/faadelays/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/faadelays/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "faadelays"; - version = "0.0.6"; + version = "0.0.7"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "02z8p0n9d6n4l6v1m969009gxwmy5v14z108r4f3swd6yrk0h2xd"; + sha256 = "sha256-osZqfSYlKPYZMelBR6YB331iRB4DTjCUlmX7pcrIiGk="; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flufl/lock.nix b/third_party/nixpkgs/pkgs/development/python-modules/flufl/lock.nix index 1be5d9a7c4..b44a7f3cdf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flufl/lock.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flufl/lock.nix @@ -1,13 +1,24 @@ -{ buildPythonPackage, fetchPypi, atpublic }: +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook +, atpublic, psutil, pytestcov, sybil +}: buildPythonPackage rec { pname = "flufl.lock"; - version = "3.2"; - - propagatedBuildInputs = [ atpublic ]; + version = "5.0.5"; src = fetchPypi { inherit pname version; - sha256 = "0nzzd6l30ff6cwsrlrb94xzfja4wkyrqv3ydc6cz0hdbr766mmm8"; + sha256 = "1bnapkg99r6mixn3kh314bqcfk8q54y0cvhjpj87j7dhjpsakfpz"; + }; + + propagatedBuildInputs = [ atpublic psutil ]; + checkInputs = [ pytestCheckHook pytestcov sybil ]; + + meta = with lib; { + homepage = "https://flufllock.readthedocs.io/"; + description = "NFS-safe file locking with timeouts for POSIX and Windows"; + maintainers = with maintainers; [ qyliss ]; + license = licenses.asl20; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fusepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fusepy/default.nix index 45b7086304..03a5248e8e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fusepy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fusepy/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , pkgs @@ -18,7 +19,9 @@ buildPythonPackage rec { # No tests included doCheck = false; - patchPhase = '' + # On macOS, users are expected to install macFUSE. This means fusepy should + # be able to find libfuse in /usr/local/lib. + patchPhase = lib.optionalString (!stdenv.isDarwin) '' substituteInPlace fuse.py --replace \ "find_library('fuse')" "'${pkgs.fuse}/lib/libfuse.so'" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hachoir/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hachoir/default.nix new file mode 100644 index 0000000000..2c46b14a27 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/hachoir/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, urwid +}: + +buildPythonPackage rec { + pname = "hachoir"; + version = "3.1.2"; + + src = fetchFromGitHub { + owner = "vstinner"; + repo = pname; + rev = version; + sha256 = "06544qmmimvaznwcjs8wwfih1frdd7anwcw5z07cf69l8p146p0y"; + }; + + propagatedBuildInputs = [ + urwid + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "hachoir" ]; + + meta = with lib; { + description = "Python library to view and edit a binary stream"; + homepage = "https://hachoir.readthedocs.io/"; + license = with licenses; [ gpl2Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hyperion-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hyperion-py/default.nix new file mode 100644 index 0000000000..c282be29c6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/hyperion-py/default.nix @@ -0,0 +1,52 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, poetry-core +, pytest-aiohttp +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "hyperion-py"; + version = "0.7.4"; + disabled = pythonOlder "3.8"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "dermotduffy"; + repo = pname; + rev = "v${version}"; + sha256 = "00x12ppmvlxs3qbdxq06wnzakvwm2m39qhmpp27qfpl137b0qqyj"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + pytest-asyncio + pytest-aiohttp + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --timeout=9 --cov=hyperion" "" + ''; + + pythonImportsCheck = [ "hyperion" ]; + + meta = with lib; { + description = "Python package for Hyperion Ambient Lighting"; + homepage = "https://github.com/dermotduffy/hyperion-py"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix index b06db621b7..84ea65a747 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/jellyfin/jellyfin-apiclient-python"; description = "Python API client for Jellyfin"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ jojosch ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/minidump/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/minidump/default.nix index 45adc7adb7..864e58839f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/minidump/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/minidump/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "minidump"; - version = "0.0.16"; + version = "0.0.17"; src = fetchPypi { inherit pname version; - sha256 = "65a71ca1da2b73ee96daa9d52e4fb9c9b80a849475502c6a1c2a80a68bd149b0"; + sha256 = "sha256-nlPW83Tr3aec1tSYHgcZTwd+ydN12S6WNwK7gdwdatY="; }; # Upstream doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix index 481f302d66..ee0812eace 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/minikerberos/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "minikerberos"; - version = "0.2.9"; + version = "0.2.11"; src = fetchPypi { inherit pname version; - sha256 = "sha256-woYs8EYUfALCtqHUCVfF5z1v1UIc9D8Iep9n4NrNIlg="; + sha256 = "sha256-OC+Cnk47GFzK1QaDEDxntRVrakpFiBuNelM/R5t/AUY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msldap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msldap/default.nix index e9790db9f5..12bfb7d760 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msldap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msldap/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "msldap"; - version = "0.3.28"; + version = "0.3.29"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0sMi5PpwMWf/W+Hu0akQVF/1ZkbanfOzYDC3R6lZrSE="; + sha256 = "0khwyhylh28qvz35pdckr5fdd82zsybv0xmzlzjbgcv99cyy1a94"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix index 692c021a64..0856b30758 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix @@ -4,13 +4,13 @@ let py = python; in buildPythonPackage rec { pname = "mysql-connector"; - version = "8.0.23"; + version = "8.0.24"; src = fetchFromGitHub { owner = "mysql"; repo = "mysql-connector-python"; rev = version; - sha256 = "sha256-YVtcHbDsW1mTjbCY1YhqgtqWv4keKlLExn2AhlOzNEw="; + sha256 = "1zb5wf65rnpbk0lw31i4piy0bq09hqa62gx7bh241zc5310zccc7"; }; propagatedBuildInputs = with py.pkgs; [ protobuf dnspython ]; @@ -20,6 +20,8 @@ in buildPythonPackage rec { # But the library should be working as expected. doCheck = false; + pythonImportsCheck = [ "mysql" ]; + meta = { description = "A MySQL driver"; longDescription = '' @@ -28,7 +30,7 @@ in buildPythonPackage rec { ''; homepage = "https://github.com/mysql/mysql-connector-python"; changelog = "https://raw.githubusercontent.com/mysql/mysql-connector-python/${version}/CHANGES.txt"; - license = [ lib.licenses.gpl2 ]; - maintainers = with lib.maintainers; [ primeos ]; + license = [ lib.licenses.gpl2Only ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix index df831ab6b5..5bb173b915 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "nunavut"; - version = "1.0.2"; + version = "1.0.3"; disabled = pythonOlder "3.5"; # only python>=3.5 is supported src = fetchPypi { inherit pname version; - sha256 = "c6fe0a1b92c44bb64b2427f944fee663fe1aaf3d4d4080d04ad9c212b40a8763"; + sha256 = "474392035e9e20b2c74dced7df8bda135fd5c0ead2b2cf64523a4968c785ea73"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ppdeep/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ppdeep/default.nix new file mode 100644 index 0000000000..bbb5c3fc92 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ppdeep/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "ppdeep"; + version = "20200505"; + + src = fetchPypi { + inherit pname version; + sha256 = "1zx1h0ff0wjjkgd0dzjv31i6ag09jw2p9vcssc1iplp60awlpixc"; + }; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "ppdeep" ]; + + meta = with lib; { + description = "Python library for computing fuzzy hashes (ssdeep)"; + homepage = "https://github.com/elceef/ppdeep"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymetno/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymetno/default.nix index b3d91c595d..5e0131352c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymetno/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymetno/default.nix @@ -9,18 +9,29 @@ buildPythonPackage rec { pname = "PyMetno"; - version = "0.8.1"; + version = "0.8.2"; + format = "setuptools"; src = fetchFromGitHub { repo = pname; owner = "Danielhiversen"; rev = version; - sha256 = "1jngf0mbn5hn166pqh1ga5snwwvv7n5kv1k9kaksrfibixkvpw6h"; + sha256 = "0b1zm60yqj1mivc3zqw2qm9rqh8cbmx0r58jyyvm3pxzq5cafdg5"; }; - propagatedBuildInputs = [ aiohttp async-timeout pytz xmltodict ]; + propagatedBuildInputs = [ + aiohttp + async-timeout + pytz + xmltodict + ]; - pythonImportsCheck = [ "metno"]; + pythonImportsCheck = [ + "metno" + ]; + + # no tests + doCheck = false; meta = with lib; { description = "A library to communicate with the met.no api"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypykatz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypykatz/default.nix index e98e2bc3db..f4eafdcb4f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypykatz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypykatz/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pypykatz"; - version = "0.4.7"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "0il5sj47wyf9gn76alm8v1l63rqw2vsd27v6f7q1dpn0wq209syi"; + sha256 = "sha256-1p8v4Qi0MNqMUpcErWnxveYu4d4N5BUBCDBsw1xX96I="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysonos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysonos/default.nix index 704f3c44c4..308dd4e7f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysonos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysonos/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pysonos"; - version = "0.0.40"; + version = "0.0.43"; disabled = !isPy3k; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "amelchio"; repo = pname; rev = "v${version}"; - sha256 = "0a0c7jwv39nbvpdcx32sd8kjmj4nyrd7k0yxhpmxdnx4zr4vvzqg"; + sha256 = "sha256-OobKlAymXXvQH6m77Uqn2eoTlWgs8EBxYIDFJ5wwMKA="; }; propagatedBuildInputs = [ ifaddr requests xmltodict ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pystray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pystray/default.nix index c0ae2be9e7..9b778f9e21 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pystray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pystray/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/moses-palmer/pystray"; description = "This library allows you to create a system tray icon"; - license = with licenses; [ gpl3Only lgpl3Only ]; + license = with licenses; [ gpl3Plus lgpl3Plus ]; platforms = platforms.linux; maintainers = with maintainers; [ jojosch ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytube/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytube/default.nix index 9f32da55ff..8bcfa8b6c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytube/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytube/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pytube"; - version = "10.7.1"; + version = "10.7.2"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "pytube"; repo = "pytube"; rev = "v${version}"; - sha256 = "sha256-a9MYEQFJXfPXYkWiuZkjt/PGs73Dm5614/Xvv6Nn8RA="; + sha256 = "sha256-85pHzfQYyqwX8mQ5msIojM/0FSfeaC12KJw4mXmji3g="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix index 13c54f6a41..75637acc39 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix @@ -2,20 +2,20 @@ , stdenv , archinfo , bitstring -, fetchPypi -, cffi , buildPythonPackage +, cffi +, fetchPypi , future , pycparser }: buildPythonPackage rec { pname = "pyvex"; - version = "9.0.5903"; + version = "9.0.6281"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qhLlRlmb48zhjX2u9w6TVVv2gb0E9kSapabiv+u4J2s="; + sha256 = "sha256-E8BYCzV71qVNRzWCCI2yTVU88JVMA08eqnIO8OtbNlM="; }; propagatedBuildInputs = [ @@ -26,6 +26,11 @@ buildPythonPackage rec { pycparser ]; + postPatch = '' + substituteInPlace pyvex_c/Makefile \ + --replace "CC=gcc" "CC=${stdenv.cc.targetPrefix}cc" + ''; + # No tests are available on PyPI, GitHub release has tests # Switch to GitHub release after all angr parts are present doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywemo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywemo/default.nix index 807d08cbc1..ceb190fe75 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywemo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywemo/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , ifaddr , lxml , poetry-core @@ -24,6 +25,14 @@ buildPythonPackage rec { sha256 = "1hm1vs6m65vqar0lcjnynz0d9y9ri5s75fzhvp0yfjkcnp06gnfa"; }; + patches = [ + (fetchpatch { + # https://github.com/pywemo/pywemo/issues/264 + url = "https://github.com/pywemo/pywemo/commit/4fd7af8ccc7cb2412f61d5e04b79f83c9ca4753c.patch"; + sha256 = "1x0rm5dxr0z5llmv446bx3i1wvgcfhx22zn78qblcr0m4yv3mif4"; + }) + ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ @@ -38,11 +47,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # https://github.com/pywemo/pywemo/issues/264 - "test_rules_db_from_device" - ]; - pythonImportsCheck = [ "pywemo" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyxbe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyxbe/default.nix new file mode 100644 index 0000000000..4c101ccdc3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyxbe/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pyxbe"; + version = "unstable-2021-01-10"; + + src = fetchFromGitHub { + owner = "mborgerson"; + repo = pname; + rev = "a7ae1bb21b02a57783831eb080c1edbafaad1d5d"; + sha256 = "1cp9a5f41z8j7bzip6nhka8qnxs12v75cdf80sk2nzgf1k15wi2p"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + # Update location for run with pytest + preCheck = '' + substituteInPlace tests/test_load.py \ + --replace "'xbefiles'" "'tests/xbefiles'" + ''; + + pythonImportsCheck = [ "xbe" ]; + + meta = with lib; { + description = "Library to work with XBE files"; + homepage = "https://github.com/mborgerson/pyxbe"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix index f0e7b6233d..d227b7f8c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.35.0"; + version = "2.37.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-12YYUZbctM6oRaC7Sr/hOghAM+s/Cdm5XWHaVU5Gg6Q="; + sha256 = "sha256-96RDi32NHfhFvPeVRhG32EDQJTiwOXEwtSmFZGVBVk0="; }; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scapy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scapy/default.nix index 2b9eb5517a..d412c94a4b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scapy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scapy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "scapy"; - version = "2.4.4"; + version = "2.4.5"; disabled = isPyPy; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "secdev"; repo = "scapy"; rev = "v${version}"; - sha256 = "1wpx7gps3g8q5ykbfcd67mxwcs416zg37b53fwfzzlc1m58vhk3p"; + sha256 = "0nxci1v32h5517gl9ic6zjq8gc8drwr0n5pz04c91yl97xznnw94"; }; postPatch = '' @@ -44,6 +44,7 @@ buildPythonPackage rec { patchShebangs . .config/ci/test.sh ''; + pythonImportsCheck = [ "scapy" ]; meta = with lib; { description = "A Python-based network packet manipulation program and library"; @@ -70,7 +71,7 @@ buildPythonPackage rec { ''; homepage = "https://scapy.net/"; changelog = "https://github.com/secdev/scapy/releases/tag/v${version}"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.unix; maintainers = with maintainers; [ primeos bjornfor ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slob/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slob/default.nix index 09359d2798..72af69e3e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/slob/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/slob/default.nix @@ -8,14 +8,14 @@ buildPythonPackage { pname = "slob"; - version = "unstable-2016-11-03"; + version = "unstable-2020-06-26"; disabled = !isPy3k; src = fetchFromGitHub { owner = "itkach"; repo = "slob"; - rev = "d1ed71e4778729ecdfc2fe27ed783689a220a6cd"; - sha256 = "1r510s4r124s121wwdm9qgap6zivlqqxrhxljz8nx0kv0cdyypi5"; + rev = "018588b59999c5c0eb42d6517fdb84036f3880cb"; + sha256 = "01195hphjnlcvgykw143rf06s6y955sjc1r825a58vhjx7hj54zh"; }; propagatedBuildInputs = [ PyICU ]; @@ -24,10 +24,11 @@ buildPythonPackage { ${python.interpreter} -m unittest slob ''; + pythonImportsCheck = [ "slob" ]; + meta = with lib; { homepage = "https://github.com/itkach/slob/"; description = "Reference implementation of the slob (sorted list of blobs) format"; - license = licenses.gpl3; + license = licenses.gpl3Only; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tailer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tailer/default.nix new file mode 100644 index 0000000000..b8e19b7d97 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/tailer/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python +}: + +buildPythonPackage rec { + pname = "tailer"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "six8"; + repo = "pytailer"; + rev = version; + sha256 = "1s5p5m3q9k7r1m0wx5wcxf20xzs0rj14qwg1ydwhf6adr17y2w5y"; + }; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m doctest -v src/tailer/__init__.py + runHook postCheck + ''; + + pythonImportsCheck = [ "tailer" ]; + + meta = with lib; { + description = "Python implementation implementation of GNU tail and head"; + homepage = "https://github.com/six8/pytailer"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unify/default.nix new file mode 100644 index 0000000000..a1061ad9df --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/unify/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, untokenize +, python +}: + +buildPythonPackage rec { + pname = "unify"; + version = "0.5"; + + # PyPi release is missing tests (see https://github.com/myint/unify/pull/18) + src = fetchFromGitHub { + owner = "myint"; + repo = "unify"; + rev = "v${version}"; + sha256 = "1l6xxygaigacsxf0g5f7w5gpqha1ava6mcns81kqqy6vw91pyrbi"; + }; + + propagatedBuildInputs = [ untokenize ]; + + checkPhase = "${python.interpreter} -m unittest discover"; + + meta = with lib; { + description = "Modifies strings to all use the same quote where possible"; + homepage = "https://github.com/myint/unify"; + license = licenses.mit; + maintainers = with maintainers; [ FlorianFranzen ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/untokenize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/untokenize/default.nix new file mode 100644 index 0000000000..55becfeac4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/untokenize/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +}: + +buildPythonPackage rec { + pname = "untokenize"; + version = "0.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "3865dbbbb8efb4bb5eaa72f1be7f3e0be00ea8b7f125c69cbd1f5fda926f37a2"; + }; + + checkPhase = "${python.interpreter} -m unittest discover"; + + meta = with lib; { + description = "Transforms tokens into original source code while preserving whitespace"; + homepage = "https://github.com/myint/untokenize"; + license = licenses.mit; + maintainers = with maintainers; [ FlorianFranzen ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yeelight/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yeelight/default.nix index 85b282566e..9d435c1cce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yeelight/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yeelight/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "yeelight"; - version = "0.6.0"; + version = "0.6.1"; disabled = pythonOlder "3.4"; src = fetchFromGitLab { owner = "stavros"; repo = "python-yeelight"; rev = "v${version}"; - sha256 = "0yycc2pdqaa9y46jycvm0p6braps7ljg2vvljngdqj2l1a2jmv7x"; + sha256 = "sha256-LB7A8E22hyqhVBElrOwtC3IPNkyQkU7ZJ1ScqaXQ6zs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix index 1622c61686..cdade7c273 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix @@ -1,4 +1,5 @@ { lib +, fetchpatch , stdenv , fetchFromGitHub , buildPackages @@ -19,6 +20,7 @@ , python3 , ruby , lua +, capstone , useX11 ? false , rubyBindings ? false , pythonBindings ? false @@ -30,13 +32,11 @@ let # # DO NOT EDIT! Automatically generated by ./update.py - gittap = "5.1.1"; - gittip = "a86f8077fc148abd6443384362a3717cd4310e64"; - rev = "5.1.1"; - version = "5.1.1"; - sha256 = "0hv9x31iabasj12g8f04incr1rbcdkxi3xnqn3ggp8gl4h6pf2f3"; - cs_ver = "4.0.2"; - cs_sha256 = "0y5g74yjyliciawpn16zhdwya7bd3d7b1cccpcccc2wg8vni1k2w"; + gittap = "5.2.0"; + gittip = "cf3db945083fb4dab951874e5ec1283128deab11"; + rev = "5.2.0"; + version = "5.2.0"; + sha256 = "08azxfk6mw2vr0x4zbz0612rk7pj4mfz8shrzc9ima77wb52b8sm"; # in stdenv.mkDerivation { @@ -49,22 +49,13 @@ stdenv.mkDerivation { inherit rev sha256; }; - postPatch = - let - capstone = fetchFromGitHub { - owner = "aquynh"; - repo = "capstone"; - # version from $sourceRoot/shlr/Makefile - rev = cs_ver; - sha256 = cs_sha256; - }; - in - '' - mkdir -p build/shlr - cp -r ${capstone} capstone-${cs_ver} - chmod -R +w capstone-${cs_ver} - tar -czvf shlr/capstone-${cs_ver}.tar.gz capstone-${cs_ver} - ''; + patches = [ + # fix build against openssl, included in next release + (fetchpatch { + url = "https://github.com/radareorg/radare2/commit/e5e7469b6450c374e0884d35d44824e1a4eb46b4.patch"; + sha256 = "sha256-xTmMHvUdW7d2QG7d4hlvMgEcegND7pGU745TWGqzY44="; + }) + ]; postInstall = '' install -D -m755 $src/binr/r2pm/r2pm $out/bin/r2pm @@ -80,6 +71,7 @@ stdenv.mkDerivation { "--with-sysmagic" "--with-syszip" "--with-sysxxhash" + "--with-syscapstone" "--with-openssl" ]; @@ -87,8 +79,17 @@ stdenv.mkDerivation { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ file readline libusb-compat-0_1 libewf perl zlib openssl libuv ] - ++ optional useX11 [ gtkdialog vte gtk2 ] + buildInputs = [ + capstone + file + readline + libusb-compat-0_1 + libewf + perl + zlib + openssl + libuv + ] ++ optional useX11 [ gtkdialog vte gtk2 ] ++ optional rubyBindings [ ruby ] ++ optional pythonBindings [ python3 ] ++ optional luaBindings [ lua ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/update.py b/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/update.py index a860d226df..e1dfc071cd 100755 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/update.py +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/update.py @@ -55,24 +55,12 @@ def git(dirname: str, *args: str) -> str: def get_repo_info(dirname: str, rev: str) -> Dict[str, str]: sha256 = prefetch_github("radare", "radare2", rev) - cs_ver = None - with open(Path(dirname).joinpath("shlr", "Makefile")) as makefile: - for l in makefile: - match = re.match("CS_VER=(\S+)", l) - if match: - cs_ver = match.group(1) - assert cs_ver is not None - - cs_sha256 = prefetch_github("aquynh", "capstone", cs_ver) - return dict( rev=rev, sha256=sha256, version_commit=git(dirname, "rev-list", "--all", "--count"), gittap=git(dirname, "describe", "--tags", "--match", "[0-9]*"), gittip=git(dirname, "rev-parse", "HEAD"), - cs_ver=cs_ver, - cs_sha256=cs_sha256, ) @@ -107,8 +95,6 @@ def main() -> None: rev = "{info["rev"]}"; version = "{version}"; sha256 = "{info["sha256"]}"; - cs_ver = "{info["cs_ver"]}"; - cs_sha256 = "{info["cs_sha256"]}"; #""" ) elif "#" in l: diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix index c8ae231dea..d52ac500e8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "054g0lr0r1xzbss4b4j9ixkls9p1llmw61afib1381z4k0lvzgwn"; + sha256 = "1s49a3yihfkd8ib336a29ch53mpcyxzicglss7bqmqapv6zi37dg"; }; - vendorSha256 = "0j2avkhyq6vz6113lkf004d4hysygc6iw78v70z98s6m15mg9imn"; + vendorSha256 = "1w72n1sprwylaj96aj03h4qq43525q15iwb6vf23gf6913zhvqy3"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix index 0fbcb95704..c275d5bc30 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/buck/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, bash, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, jdk11, ant, python3, watchman, bash, makeWrapper }: stdenv.mkDerivation rec { pname = "buck"; - version = "2019.10.17.01"; + version = "2021.01.12.01"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "1irgp8yq1z11bq3b83yxvj35wqqq7y7b8q4d4y0hc05ac19ja0vj"; + sha256 = "sha256-NFiMQ+cG93R10LlkfUMzZ4TnV0uO5G+8S5TiMI6hU5o="; }; patches = [ ./pex-mtime.patch ]; @@ -17,20 +17,21 @@ stdenv.mkDerivation rec { grep -l -r '/bin/bash' --null | xargs -0 sed -i -e "s!/bin/bash!${bash}/bin/bash!g" ''; - buildInputs = [ jdk ant python2 watchman python2Packages.pywatchman ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper python3 jdk11 ant watchman ]; buildPhase = '' + # Set correct version, see https://github.com/facebook/buck/issues/2607 + echo v${version} > .buckrelease + ant PYTHONDONTWRITEBYTECODE=true ./bin/buck build -c buck.release_version=${version} buck ''; installPhase = '' - install -D -m755 buck-out/gen/programs/buck.pex $out/bin/buck + install -D -m755 buck-out/gen/*/programs/buck.pex $out/bin/buck wrapProgram $out/bin/buck \ - --prefix PYTHONPATH : $PYTHONPATH \ - --prefix PATH : "${lib.makeBinPath [jdk watchman]}" + --prefix PATH : "${lib.makeBinPath [ jdk11 watchman python3 ]}" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/remake/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/remake/default.nix index f61a7e7745..dc3920d174 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/remake/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/remake/default.nix @@ -1,27 +1,40 @@ -{ lib, stdenv, fetchurl, readline }: +{ lib +, stdenv +, fetchurl +, pkg-config +, readline +, guileSupport ? false +, guile +}: stdenv.mkDerivation rec { pname = "remake"; - remakeVersion = "4.1"; - dbgVersion = "1.1"; + remakeVersion = "4.3"; + dbgVersion = "1.5"; version = "${remakeVersion}+dbg-${dbgVersion}"; src = fetchurl { - url = "mirror://sourceforge/project/bashdb/remake/${version}/remake-${remakeVersion}+dbg${dbgVersion}.tar.bz2"; - sha256 = "1zi16pl7sqn1aa8b7zqm9qnd9vjqyfywqm8s6iap4clf86l7kss2"; + url = "mirror://sourceforge/project/bashdb/remake/${version}/remake-${remakeVersion}+dbg-${dbgVersion}.tar.gz"; + sha256 = "0xlx2485y0israv2pfghmv74lxcv9i5y65agy69mif76yc4vfvif"; }; patches = [ ./glibc-2.27-glob.patch ]; - buildInputs = [ readline ]; + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ readline ] + ++ lib.optionals guileSupport [ guile ]; + + # make check fails, see https://github.com/rocky/remake/issues/117 meta = { homepage = "http://bashdb.sourceforge.net/remake/"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Plus; description = "GNU Make with comprehensible tracing and a debugger"; platforms = with lib.platforms; linux ++ darwin; - maintainers = with lib.maintainers; [ bjornfor ]; + maintainers = with lib.maintainers; [ bjornfor shamilton ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix index f0e6efdca3..85bf919f77 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix @@ -1,6 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, fuse3, pkg-config, pcre }: +{ lib, stdenv, fetchFromGitHub, fuse3, macfuse-stubs, pkg-config, pcre }: -stdenv.mkDerivation rec { +let + fuse = if stdenv.isDarwin then macfuse-stubs else fuse3; +in stdenv.mkDerivation rec { pname = "tup"; version = "0.7.10"; outputs = [ "bin" "man" "out" ]; @@ -13,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ fuse3 pcre ]; + buildInputs = [ fuse pcre ]; configurePhase = '' sed -i 's/`git describe`/v${version}/g' src/tup/link.sh @@ -50,6 +52,13 @@ stdenv.mkDerivation rec { homepage = "http://gittup.org/tup/"; license = licenses.gpl2; maintainers = with maintainers; [ ehmry ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; + + # TODO: Remove once nixpkgs uses newer SDKs that supports '*at' functions. + # Probably MacOS SDK 10.13 or later. Check the current version in + # ../../../../os-specific/darwin/apple-sdk/default.nix + # + # https://github.com/gittup/tup/commit/3697c74 + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index eeffee057d..d03d59edb1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "13.10.0"; + version = "13.11.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "0lw087xcbzf4d68mq0h0s31na7lww2d9nv43icw9qx05aknlcddv"; + sha256 = "1vmj7vxz1a4js9kqz7mm6xgnkmb37c1jbx2lwsq2qkrybkxfcw8k"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "1mf3w85ivc8r2rmb78r4b87rrxmbb1zda9pp8n4nvd0igg23xqk8"; + sha256 = "1c1pywz7ylaysplvq1m15v7rf1sgdkh9scbqklzcm55fjk128lif"; }; in buildGoPackage rec { @@ -30,7 +30,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0xy5mpcpxcmwfdrspd29z8nyn1m9i4ma7d5kbihwa2yxznylydpx"; + sha256 = "07jqsxac50xwmhlv0nbnn098290nkpsmrxw872yh67n1s9gqfd27"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix index 669dc846e1..5373b2d359 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.277.2"; + version = "2.277.3"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "08lv5v5kxp9ln798gjmh8j9a8r8xc471fbhiz2l7gxncpxn50ga2"; + sha256 = "1awixb55bkpqcvf2s59aph3kxdd70g9x1a5s5kly33kwrplcf8iy"; }; buildCommand = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix index 5b492ee67b..8d06ff94a0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Lightweight and modular continuous integration service"; homepage = "https://laminar.ohwg.net"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ kaction maralorn ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix index 0be77237f4..32ab88bf41 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "4.3.1"; + version = "4.3.2"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-hOemDLfkjjPXQErKKCIMl8c5EPZe40B1HlNfvg7IZKU="; + sha256 = "sha256-sc/W4N+pd1bhLiyQLqm0j2o/RviT8iKzBZcD0GRDqqE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/godot/export-templates.nix b/third_party/nixpkgs/pkgs/development/tools/godot/export-templates.nix new file mode 100644 index 0000000000..bfcf3e3b3d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/godot/export-templates.nix @@ -0,0 +1,17 @@ +{ godot, lib }: + +# https://docs.godotengine.org/en/stable/development/compiling/compiling_for_x11.html#building-export-templates +godot.overrideAttrs (oldAttrs: rec { + pname = "godot-export-templates"; + sconsFlags = "target=release platform=x11 tools=no"; + installPhase = '' + # The godot export command expects the export templates at + # .../share/godot/templates/3.2.3.stable with 3.2.3 being the godot version. + mkdir -p "$out/share/godot/templates/${oldAttrs.version}.stable" + cp bin/godot.x11.opt.64 $out/share/godot/templates/${oldAttrs.version}.stable/linux_x11_64_release + ''; + outputs = [ "out" ]; + meta.description = + "Free and Open Source 2D and 3D game engine (export templates)"; + meta.maintainers = with lib.maintainers; [ twey jojosch ]; +}) diff --git a/third_party/nixpkgs/pkgs/development/tools/gopls/default.nix b/third_party/nixpkgs/pkgs/development/tools/gopls/default.nix index 1617900ace..cfe69886d4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gopls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gopls/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gopls"; - version = "0.6.2"; + version = "0.6.10"; src = fetchgit { rev = "gopls/v${version}"; url = "https://go.googlesource.com/tools"; - sha256 = "0hbfxdsbfz044vw8zp223ni6m7gcwqpff4xpjiqmihhgga5849lf"; + sha256 = "13mv6rvqlmgn1shx0hnlqxgqiiiz1ij37j30jz1jkr9kcrbxpacr"; }; modRoot = "gopls"; - vendorSha256 = "0r9bffgi9ainqrl4kraqy71rgwdfcbqmv3srs12h3xvj0w5ya5rz"; + vendorSha256 = "01apsvkds8f3m88inb37z4lgalrbjp12xr2jikwx7n10hjddgbqi"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/gops/default.nix b/third_party/nixpkgs/pkgs/development/tools/gops/default.nix index ff9b2064ce..d23aa71a8a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gops/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gops/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gops"; - version = "0.3.17"; + version = "0.3.18"; src = fetchFromGitHub { owner = "google"; repo = "gops"; rev = "v${version}"; - sha256 = "1l0k1v2wwwdrwwznrdq2ivbrl5z3hxa89xm89jlaglkd7jjg74zk"; + sha256 = "0534jyravpsj73lgdmw6fns1qaqiw401jlfk04wa0as5sv09rfhy"; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/jql/default.nix b/third_party/nixpkgs/pkgs/development/tools/jql/default.nix new file mode 100644 index 0000000000..381a53f0f1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/jql/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "jql"; + version = "2.9.4"; + + src = fetchFromGitHub { + owner = "yamafaktory"; + repo = pname; + rev = "v${version}"; + sha256 = "1rwnmp2rnzwc7anmk7nr8l4ncza8s1f8sn0r2la4ai2sx1iqn06h"; + }; + + cargoSha256 = "1c83mmdxci7l3c6ja5fhk4cak1gcbg0r0nlpbpims5gi16nf99r3"; + + meta = with lib; { + description = "A JSON Query Language CLI tool built with Rust"; + homepage = "https://github.com/yamafaktory/jql"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ akshgpt7 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/just/default.nix b/third_party/nixpkgs/pkgs/development/tools/just/default.nix index 38439e6247..c6863d535d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/just/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/just/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.8.4"; + version = "0.9.0"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "v${version}"; - sha256 = "sha256-K8jeX1/Wn6mbf48GIR2wRAwiwg1rxtbtCPjjH+4dPYw="; + sha256 = "sha256-orHUovyFFOPRvbfLKQhkfZzM0Gs2Cpe1uJg/6+P8HKY="; }; - cargoSha256 = "sha256-a9SBeX3oesdoC5G+4dK2tbt+W7VA4jPqCM9tOAex4DI="; + cargoSha256 = "sha256-YDIGZRbszhgWM7iAc2i89jyndZvZZsg63ADQfqFxfXw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/metals/default.nix b/third_party/nixpkgs/pkgs/development/tools/metals/default.nix index 78c99d94c8..d686067e63 100644 --- a/third_party/nixpkgs/pkgs/development/tools/metals/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.10.1"; + version = "0.10.2"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0z4ddnwx510hnx6w72fxmksmnwxg8p2nqxg7i7xix24gykgmgj5a"; + outputHash = "1yck935pcj9cg3qxzrmvgd16afsckz8wgmzf2rlmii2c1glrbq9c"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix index c3b4182a0b..4c8a4b9e9d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -52,5 +52,9 @@ rec { version = "0.17.0"; }; - ocamlformat = ocamlformat_0_17_0; + ocamlformat_0_18_0 = mkOCamlformat { + version = "0.18.0"; + }; + + ocamlformat = ocamlformat_0_18_0; } diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix index 69f26c5b88..223ac39c6a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix @@ -21,11 +21,10 @@ let src = "0.15.1" = "1x6fha495sgk4z05g0p0q3zfqm5l6xzmf6vjm9g9g7c820ym2q9a"; "0.16.0" = "1vwjvvwha0ljc014v8jp8snki5zsqxlwd7x0dl0rg2i9kcmwc4mr"; "0.17.0" = "0f1lxp697yq61z8gqxjjaqd2ns8fd1vjfggn55x0gh9dx098p138"; + "0.18.0" = "0571kzmb1h03qj74090n3mg8wfbh29qqrkdjkai6rnl5chll86lq"; }."${version}"; - } -; in - -let ocamlPackages = + }; + ocamlPackages = if lib.versionAtLeast version "0.14.3" then ocaml-ng.ocamlPackages else ocaml-ng.ocamlPackages_4_07 @@ -33,7 +32,7 @@ let ocamlPackages = with ocamlPackages; -buildDunePackage rec { +buildDunePackage { pname = "ocamlformat"; inherit src version; @@ -45,7 +44,24 @@ buildDunePackage rec { useDune2 = true; buildInputs = - if lib.versionAtLeast version "0.17.0" + if lib.versionAtLeast version "0.18.0" + then [ + base + cmdliner + fpath + odoc + re + stdio + uuseg + uutf + fix + menhir + dune-build-info + ocaml-version + # Changed since 0.16.0: + (ppxlib.override { version = "0.22.0"; }) + ] + else if lib.versionAtLeast version "0.17.0" then [ base cmdliner diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_php/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_php/default.nix index 40df9e974e..08c8214c63 100644 --- a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_php/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_php/default.nix @@ -2,23 +2,19 @@ buildGoModule rec { pname = "protoc-gen-twirp_php"; - version = "0.6.0"; + version = "0.7.1"; # fetchFromGitHub currently not possible, because go.mod and go.sum are export-ignored src = fetchgit { url = "https://github.com/twirphp/twirp.git"; rev = "v${version}"; - sha256 = "sha256-WnvCdAJIMA4A+f7H61qcVbKNn23bNVOC15vMCEKc+CI="; + sha256 = "sha256-94GN/Gq3RXXg83eUsmIcdF4VuK4syCgD0Zkc5eDiVYE="; }; - vendorSha256 = "sha256-LIMxrWXlK7+JIRmtukdXPqfw8H991FCAOuyEf7ZLSTs="; + vendorSha256 = "sha256-gz4JELCffuh7dyFdBex8/SFZ1/PDXuC/93m3WNHwRss="; subPackages = [ "protoc-gen-twirp_php" ]; - preBuild = '' - go generate ./... - ''; - meta = with lib; { description = "PHP port of Twitch's Twirp RPC framework"; homepage = "https://github.com/twirphp/twirp"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix index eeec0487c6..57866918f0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-crev"; - version = "0.19.1"; + version = "0.19.2"; src = fetchFromGitHub { owner = "crev-dev"; repo = "cargo-crev"; rev = "v${version}"; - sha256 = "sha256-/TROCaguzIdXnkQ4BpVR1W14ppGODGQ0MQAjJExMGVw="; + sha256 = "sha256-aqvdAljAJsYtmxz/WtMrrnmJJRXDpqDjUn1LusoM8ns="; }; - cargoSha256 = "sha256-3uIf6vyeDeww8+dqrzOG4J/T9QbXAnKQKXRbeujeqSo="; + cargoSha256 = "sha256-KwnZmehh0vdR1eSPBrY6yHJR6r7mhIEgfN4soEBDTjU="; nativeBuildInputs = [ perl pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix index df4c4ad77d..4a30a70fa0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -6,14 +6,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2021-04-12"; - cargoSha256 = "1mnx0mnfkvz6gmzy2jcl0wrdwd1mgfnrny4xf9wkd5vd4ks4k338"; + version = "2021-04-19"; + cargoSha256 = "sha256-CXkI3CQ/v6RBMM2Dpp2u+qnRwba+nqzeaPSJGBiQUoY="; src = fetchFromGitHub { owner = "rust-analyzer"; repo = "rust-analyzer"; rev = version; - sha256 = "1rg20aswbh9palwr3qfcnscsvzmbmhghn4k0nl11m9j7z6hva6bg"; + sha256 = "sha256-W/cUwZEvlUXzqQ/futeNFwDWR/cTL/RLZaW2srIs83Q="; }; buildAndTestSubdir = "crates/rust-analyzer"; diff --git a/third_party/nixpkgs/pkgs/development/web/deno/default.nix b/third_party/nixpkgs/pkgs/development/web/deno/default.nix index 6faba30bf7..a2e286d8bc 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/deno/default.nix @@ -15,15 +15,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LrJGwsP+P8zXYwboF5791YuWGVdhcQJLOoBv+VzrYzs="; + sha256 = "sha256-h8dXGSu7DebzwZdc92A2d9xlYy6wD34phBUj5v5KuIc="; }; - cargoSha256 = "sha256-JDapls3nRNETri6nZPRjZFlAFVN1Owhp965zf0Rn3ug="; + cargoSha256 = "sha256-htxpaALOXFQpQ68YE4b0T0jhcCIONgUZwpMPCcSdcgs="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v16.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v16.nix new file mode 100644 index 0000000000..b114c65cd1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v16.nix @@ -0,0 +1,13 @@ +{ callPackage, openssl, python3, enableNpm ? true }: + +let + buildNodejs = callPackage ./nodejs.nix { + inherit openssl; + python = python3; + }; +in + buildNodejs { + inherit enableNpm; + version = "16.0.0"; + sha256 = "00mada0vvybizygwhzsq6gcz0m2k864lfiiqqlnw8gcc3q8r1js7"; + } diff --git a/third_party/nixpkgs/pkgs/games/flightgear/default.nix b/third_party/nixpkgs/pkgs/games/flightgear/default.nix index 62db756a48..0996d4bd51 100644 --- a/third_party/nixpkgs/pkgs/games/flightgear/default.nix +++ b/third_party/nixpkgs/pkgs/games/flightgear/default.nix @@ -6,15 +6,15 @@ }: let - version = "2020.3.4"; + version = "2020.3.8"; shortVersion = builtins.substring 0 6 version; data = stdenv.mkDerivation rec { pname = "flightgear-data"; inherit version; src = fetchurl { - url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2"; - sha256 = "1cqikbqvidfaynml9bhqfr9yw5ga35gpqrbz62z94a1skdijkpkg"; + url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.txz"; + sha256 = "sha256-/KFumHRkmRvsU/L1i11jG/KbqobnOEP7l4lyPMKHycA="; }; phases = [ "installPhase" ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; - sha256 = "02d9h10p8hyn0a25csragj6pbwmrir1z8zb92023s9vi21j7bwy8"; + sha256 = "XXDqhZ9nR+FwQ3LauZe8iGxOjlyDXDrEtj61BQGVDYc="; }; # Of all the files in the source and data archives, there doesn't seem to be diff --git a/third_party/nixpkgs/pkgs/games/katago/default.nix b/third_party/nixpkgs/pkgs/games/katago/default.nix index 50b6caee62..7a91b698c1 100644 --- a/third_party/nixpkgs/pkgs/games/katago/default.nix +++ b/third_party/nixpkgs/pkgs/games/katago/default.nix @@ -33,14 +33,14 @@ let in env.mkDerivation rec { pname = "katago"; - version = "1.8.1"; - githash = "73bc3e38b3490cbe00179c9c37f5385dfd60c6bc"; + version = "1.8.2"; + githash = "b846bddd88fbc5353e4a93fa514f6cbf45358362"; src = fetchFromGitHub { owner = "lightvector"; repo = "katago"; rev = "v${version}"; - sha256 = "sha256-Rj6fgj1ZQgYhz6TrZk5b8dCMsCPk5N3qN3kgqV+UEDc="; + sha256 = "sha256-kL+y2rsEiC5GGDlWrbzxlJvLxHDCuvVT6CDOlUtXpDk="; }; fakegit = writeShellScriptBin "git" "echo ${githash}"; diff --git a/third_party/nixpkgs/pkgs/games/oh-my-git/default.nix b/third_party/nixpkgs/pkgs/games/oh-my-git/default.nix new file mode 100644 index 0000000000..89dc1bdd50 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/oh-my-git/default.nix @@ -0,0 +1,115 @@ +{ lib +, copyDesktopItems +, fetchFromGitHub +, makeDesktopItem +, stdenv +, alsaLib +, gcc-unwrapped +, git +, godot-export-templates +, godot-headless +, libGLU +, libX11 +, libXcursor +, libXext +, libXfixes +, libXi +, libXinerama +, libXrandr +, libXrender +, libglvnd +, libpulseaudio +, zlib +}: + +stdenv.mkDerivation rec { + pname = "oh-my-git"; + version = "0.6.4"; + + src = fetchFromGitHub { + owner = "git-learning-game"; + repo = "oh-my-git"; + rev = version; + sha256 = "sha256-GQLHyBUXF+yqEZ/LYutAn6TBCXFX8ViOaERQEm2J6CY="; + }; + + nativeBuildInputs = [ + copyDesktopItems + godot-headless + ]; + + buildInputs = [ + alsaLib + gcc-unwrapped.lib + git + libGLU + libX11 + libXcursor + libXext + libXfixes + libXi + libXinerama + libXrandr + libXrender + libglvnd + libpulseaudio + zlib + ]; + + desktopItems = [ + (makeDesktopItem { + name = "oh-my-git"; + exec = "oh-my-git"; + icon = "oh-my-git"; + desktopName = "oh-my-git"; + comment = "An interactive Git learning game!"; + genericName = "An interactive Git learning game!"; + categories = "Game;"; + }) + ]; + + buildPhase = '' + runHook preBuild + + # Cannot create file '/homeless-shelter/.config/godot/projects/...' + export HOME=$TMPDIR + + # Link the export-templates to the expected location. The --export commands + # expects the template-file at .../templates/3.2.3.stable/linux_x11_64_release + # with 3.2.3 being the version of godot. + mkdir -p $HOME/.local/share/godot + ln -s ${godot-export-templates}/share/godot/templates $HOME/.local/share/godot + + mkdir -p $out/share/oh-my-git + godot-headless --export "Linux" $out/share/oh-my-git/oh-my-git + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + ln -s $out/share/oh-my-git/oh-my-git $out/bin + + # Patch binaries. + interpreter=$(cat $NIX_CC/nix-support/dynamic-linker) + patchelf \ + --set-interpreter $interpreter \ + --set-rpath ${lib.makeLibraryPath buildInputs} \ + $out/share/oh-my-git/oh-my-git + + mkdir -p $out/share/pixmaps + cp images/oh-my-git.png $out/share/pixmaps/oh-my-git.png + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://ohmygit.org/"; + description = "An interactive Git learning game"; + license = with licenses; [ blueOak100 ]; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ jojosch ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix b/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix index 1a2ca5161e..f17c436ccc 100644 --- a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix +++ b/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix @@ -136,6 +136,13 @@ in buildFHSUserEnv rec { libbsd alsaLib + # Loop Hero + libidn2 + libpsl + nghttp2.lib + openssl_1_1 + rtmpdump + # needed by getcap for vr startup libcap @@ -202,7 +209,6 @@ in buildFHSUserEnv rec { SDL SDL2_image glew110 - openssl libidn tbb wayland diff --git a/third_party/nixpkgs/pkgs/games/warzone2100/default.nix b/third_party/nixpkgs/pkgs/games/warzone2100/default.nix index a90f76743d..c0707ed5e8 100644 --- a/third_party/nixpkgs/pkgs/games/warzone2100/default.nix +++ b/third_party/nixpkgs/pkgs/games/warzone2100/default.nix @@ -39,11 +39,11 @@ in stdenv.mkDerivation rec { inherit pname; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz"; - sha256 = "1d94072yns2xrjpagw1mqq7iyywhwz7vn3lgjdwmbgjy79jzcs1k"; + sha256 = "1f8a4kflslsjl8jrryhwg034h1yc9y3y1zmllgww3fqkz3aj4xik"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix b/third_party/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix index 7d0ba259dc..887e79999c 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/retroarch/cores.nix @@ -1011,6 +1011,20 @@ in with lib.licenses; makefile = "Makefile"; }; + thepowdertoy = mkLibRetroCore rec { + core = "thepowdertoy"; + src = fetchRetro { + repo = "ThePowderToy"; + rev = "0ff547e89ae9d6475b0226db76832daf03eec937"; + sha256 = "kDpmo/RPYRvROOX3AhsB5pIl0MfHbQmbyTMciLPDNew="; + }; + description = "Port of The Powder Toy to libretro"; + license = gpl3Only; + extraNativeBuildInputs = [ cmake ]; + makefile = "Makefile"; + postBuild = "cd src/"; + }; + tic80 = mkLibRetroCore { core = "tic80"; src = fetchRetro { diff --git a/third_party/nixpkgs/pkgs/misc/openrussian-cli/default.nix b/third_party/nixpkgs/pkgs/misc/openrussian-cli/default.nix new file mode 100644 index 0000000000..ce9a9e49c4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/openrussian-cli/default.nix @@ -0,0 +1,61 @@ +{ stdenv, lib, fetchFromGitHub, gnumake, pkg-config, wget, unzip, gawk +, sqlite, which, luaPackages, installShellFiles, makeWrapper +}: +stdenv.mkDerivation rec { + pname = "openrussian-cli"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "rhaberkorn"; + repo = "openrussian-cli"; + rev = version; + sha256 = "1ria7s7dpqip2wdwn35wmkry84g8ghdqnxc9cbxzzq63vl6pgvcn"; + }; + + nativeBuildInputs = [ + gnumake pkg-config wget unzip gawk sqlite which installShellFiles makeWrapper + ]; + + buildInputs = with luaPackages; [ lua luasql-sqlite3 luautf8 ]; + + makeFlags = [ + "LUA=${luaPackages.lua}/bin/lua" + "LUAC=${luaPackages.lua}/bin/luac" + ]; + + dontConfigure = true; + + # Disable check as it's too slow. + # doCheck = true; + + #This is needed even though it's the default for some reason. + checkTarget = "check"; + + # Can't use "make install" here + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/openrussian + cp openrussian-sqlite3.db $out/share/openrussian + cp openrussian $out/bin + + wrapProgram $out/bin/openrussian \ + --prefix LUA_PATH ';' "$LUA_PATH" \ + --prefix LUA_CPATH ';' "$LUA_CPATH" + + runHook postInstall + ''; + + postInstall = '' + installShellCompletion --cmd openrussian --bash ./openrussian-completion.bash + installManPage ./openrussian.1 + ''; + + meta = with lib; { + homepage = "https://github.com/rhaberkorn/openrussian-cli"; + description = "Offline Console Russian Dictionary (based on openrussian.org)"; + license = with licenses; [ gpl3Only mit cc-by-sa-40 ]; + maintainers = with maintainers; [ zane ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/multilockscreen/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/multilockscreen/default.nix index 56f5c82fe3..3049f3ba2a 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/multilockscreen/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/multilockscreen/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "multilockscreen"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "jeffmhubbard"; repo = pname; rev = "v${version}"; - sha256 = "0gmnrq7ibbhiwsn7mfi2r71fwm6nvhiwf4wsyz44cscm474z83p0"; + sha256 = "1vdai1ymkzlkh5l69s8zpyj2klzm8zyak00vd4p7lcldxfj861ig"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/deprecated.json b/third_party/nixpkgs/pkgs/misc/vim-plugins/deprecated.json index b95e91a19b..41373adf62 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/deprecated.json +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/deprecated.json @@ -19,4 +19,4 @@ "date": "2020-03-27", "new": "YouCompleteMe" } -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix index dfed2004ab..76fa0f3298 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-04-12"; + version = "2021-04-20"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "1cd0c0c33b211b5fface9b29f9c58bc6ae09323e"; - sha256 = "0cx8ap63742xr3zmk1gkqrchfzvzg0j9blggcw63s23wr9d1yriw"; + rev = "737c1bf1ac9becd67519f7a6832ad276feca8f08"; + sha256 = "0imngagc6p5mfx1v2maxcwzh75l1y4diyd1ymwjil51x93qkrzxi"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -209,12 +209,12 @@ let auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2021-04-09"; + version = "2021-04-18"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "49e2a0ef443eb0578c2b884a7b85f9f4e4c08fde"; - sha256 = "1xsb3346qgggpzfln3z1skk4d4hvss3qfck0h5ylpbcbh3f8dxyb"; + rev = "482329bad5d8e8fbd61ac2041e8a3c88a45dbe20"; + sha256 = "1yrccyygnz29p9vx1jvyj4imbq3m9rlm37m3cbb9azxmmvdbm0l3"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -257,12 +257,12 @@ let barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar-nvim"; - version = "2021-04-07"; + version = "2021-04-21"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "c5c67f450921dec675b42c7f6f960169411dc7fc"; - sha256 = "17gpmyqqskzmfvqilgdmcp5rb2ddgb8hvjz7ihfyaawp8sy11lv0"; + rev = "54b4376d9a44b45f12b0f6f5bcc46f98b66782e1"; + sha256 = "0nh4rgyix8mj3wag8wpcy68avyrh5ps89a842fqdd5x6054d3apv"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -329,12 +329,12 @@ let bufexplorer = buildVimPluginFrom2Nix { pname = "bufexplorer"; - version = "2020-02-17"; + version = "2021-04-20"; src = fetchFromGitHub { owner = "jlanzarotta"; repo = "bufexplorer"; - rev = "29258f58357acc10c672585a9efe8913d756734d"; - sha256 = "00wjwk9yzfclrbd4p59b5wpl21s2vjs4ahn30xhpza93bk513wnq"; + rev = "99557c451ff6ed3bbb9b9f6215ad57e919740635"; + sha256 = "0grkkbvrdnkmvq7wfj0rf128fzlbi3m5z8k4fg66l6gfiyp86zyc"; }; meta.homepage = "https://github.com/jlanzarotta/bufexplorer/"; }; @@ -377,24 +377,24 @@ let caw-vim = buildVimPluginFrom2Nix { pname = "caw-vim"; - version = "2021-01-25"; + version = "2021-04-15"; src = fetchFromGitHub { owner = "tyru"; repo = "caw.vim"; - rev = "26b91ddfcebaee954a3cd2aec1769a5b16779bdd"; - sha256 = "0yiic0a1l9ggwh3f5y150j74hxj7v783j4y3wnn5j1n7ljvqvhqc"; + rev = "42637427b1760f3f3006fafe95fb3e25fedca07b"; + sha256 = "1xyc50y7cicqwvzqyj0jm3bzqbwcy39v4mdjjx2czlmzzgv8qlqy"; }; meta.homepage = "https://github.com/tyru/caw.vim/"; }; chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-04-12"; + version = "2021-04-21"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "45ace3afea4e722efa3697b37d8c7dd7c58cab9c"; - sha256 = "113g6jqpy06z9mfc5097w99flvj7m6g8nqxv68ikkdqbp73kx51c"; + rev = "ce0ac184e56d1a1865df1f0059ec01317f4210db"; + sha256 = "13v1x0mxzm8fzmf8k6f3wjdx91yki6lqz40wh1897g5zvsfjfvvr"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -497,12 +497,12 @@ let coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2021-03-28"; + version = "2021-04-14"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "d826e14db13980f7f1734117ff60f5e3573eb2ce"; - sha256 = "1b0yi6513n690y2sqlyzsckr15jim9izkjlfpphpw4a8d819hx7l"; + rev = "f76e290d6765261b0a4aee2247dfaaba77e30ab9"; + sha256 = "0xm9clynyp7h248iddpns7rqdllgvf3f34qlxn47fby2nh07galc"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -533,12 +533,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-04-03"; + version = "2021-04-20"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "d3e40ceabd76323c07434fc2711521cc8bb2d028"; - sha256 = "0mppsxzcgxg20kf2zwja8r6gascxa9r9c7zh73i00i7n216f8fxd"; + rev = "19bfd9443708a769b2d1379af874f644ba9f1cd4"; + sha256 = "0c9i25dsqhb1v6kcym424zmc5yn396wz6k9w71s1ja5q4p1jmxd8"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -618,12 +618,12 @@ let compe-tabnine = buildVimPluginFrom2Nix { pname = "compe-tabnine"; - version = "2021-04-12"; + version = "2021-04-21"; src = fetchFromGitHub { owner = "tzachar"; repo = "compe-tabnine"; - rev = "def6e1a1c4e4a2c18f7ba3ab61152d96500ba0d3"; - sha256 = "1m8qrf5984kfmmv4yjs0bnqbhg62mmpag6zsw719r95v7r2j8p6n"; + rev = "1e81624bb91e79e245832bc0a88a1c194097f641"; + sha256 = "08cav97sj92vfl0y8kkn5kv5qxsfifb7xps3hndlg6vzbjci4vbr"; }; meta.homepage = "https://github.com/tzachar/compe-tabnine/"; }; @@ -822,12 +822,12 @@ let ctrlp-vim = buildVimPluginFrom2Nix { pname = "ctrlp-vim"; - version = "2020-11-12"; + version = "2021-04-18"; src = fetchFromGitHub { owner = "ctrlpvim"; repo = "ctrlp.vim"; - rev = "971c4d41880b72dbbf1620b3ad91418a6a6f6b9c"; - sha256 = "0n68hg59h4rjn0ziqbsh5pr03l3kr98zk54659ny6vq107af1w96"; + rev = "f68f4d00b9c99d0d711bfde3b071f0dafd249901"; + sha256 = "0lj596jmisv42mpaxp0w1gm31lyiv28kxjyy7352d16dv5a5432g"; }; meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/"; }; @@ -846,12 +846,12 @@ let dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2021-03-28"; + version = "2021-04-17"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "181ca6577101c04dd220b7a25096cbd4325979ec"; - sha256 = "03zazbnbcsg272zzx4q4n6vkvcwzm8lh1jw1fzbkn2blmffyjld6"; + rev = "ba98ab86487b8eda3b0934b5423759944b5f7ebd"; + sha256 = "1gyk0n8ks7xyjqab0gb7yx4ypl9k7csfjgmha84hy7mz4h08fkxq"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -882,12 +882,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2021-04-11"; + version = "2021-04-21"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "94a655cd9993b152feb6de4d6168d234d4b3f14b"; - sha256 = "0kram585pmj88gvfs71k50lgawg87qbiisw0plzp41hjrgs0ymkz"; + rev = "3730b008158327d0068b8a9b19d57fd7459bb8b9"; + sha256 = "0bc1gfwsms0mrxjfp7ia4r2rw1b95ih8xgkh02l9b30wp81xdfr3"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -930,12 +930,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2021-04-03"; + version = "2021-04-17"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "452b1800ad2f2db96847da857f9a0d67ff6ecc95"; - sha256 = "0rhqi6rc3iz549g95m6m6s10hzihyg3fjj4v8dhic3iqpxilw8l8"; + rev = "c3d1c1893bcaaa6b44135cbc8f3b809b703cf4dc"; + sha256 = "14y1fz4i7ym2f2q1lv93giq99y6jai0jwdvm5nlcr8ksrazfwq9v"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; @@ -1172,12 +1172,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2021-04-05"; + version = "2021-04-21"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "20d181d84c108ea2b13ce227e9dd5ae13df0e13e"; - sha256 = "058bb2pznmldk8936d69ynqf79apiv0j39sva68qpqmsixnljnz9"; + rev = "187b2bd2beb7802e66c93900430c29b4ab9c20c8"; + sha256 = "0l6i6wybhdzbj6p0x86kygyirhnhc1fj67p4l83v3jdgypqy246a"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1244,24 +1244,24 @@ let dracula-vim = buildVimPluginFrom2Nix { pname = "dracula-vim"; - version = "2021-04-08"; + version = "2021-04-15"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "d82b9198d4dda1ac4a96756570f56125a1f86cb1"; - sha256 = "1zj6ifair5gm1nn4nh886y6m8snlhiskiwxlfd1cm7j3xafwqapx"; + rev = "e9efa96bf130496537c978c8ee150bed280f7b19"; + sha256 = "0jzn6vax8ia9ha938jbs0wpm6wgz5m4vg6q3w8z562rq8kq70hcx"; }; meta.homepage = "https://github.com/dracula/vim/"; }; echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc-vim"; - version = "2021-04-11"; + version = "2021-04-16"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "da1704818a342c4ad17abdc6886836ae61aa6b2a"; - sha256 = "0k1gzajn335518vz1ga957i91pfb04bmhhmzc96l617qdkp3ij30"; + rev = "63d3c193ccb1652a972ca0def7ab82048bfb6068"; + sha256 = "0v0fd6n6fza1rj008zpjicvh9d8mcvz3kza8hhby9nx9cjlj2dpc"; }; meta.homepage = "https://github.com/Shougo/echodoc.vim/"; }; @@ -1317,12 +1317,12 @@ let emmet-vim = buildVimPluginFrom2Nix { pname = "emmet-vim"; - version = "2021-03-20"; + version = "2021-04-17"; src = fetchFromGitHub { owner = "mattn"; repo = "emmet-vim"; - rev = "1f5daf6810d205844c039a4c9efa89317e62259d"; - sha256 = "0250dp2jcxrhx333i6mk99q7ygwa8ac055id9qafdx331v9wxcil"; + rev = "46e60676f2d6b6f02478e444ae23ee804a3de45e"; + sha256 = "0civ9sx6qbm2cd0a8m57fangvrb1yrbfldg850avi9ay3s4y2nq5"; fetchSubmodules = true; }; meta.homepage = "https://github.com/mattn/emmet-vim/"; @@ -1354,12 +1354,12 @@ let falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2021-03-22"; + version = "2021-04-14"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "f6be01e8642dc8ccc7ed1f37b23f4b0dfa2c6f8c"; - sha256 = "1w4ld5dvy0jxgjvp6yf8qibc4x82hn490vfg0hpln67nr6mhq1iw"; + rev = "376aacc4ec6dd5495f201bc5bea0c1bcff574535"; + sha256 = "1y3r36594f6vhgi0gzszl9pf1d7jizxj6iamcpwmbqbj75i62hp3"; }; meta.homepage = "https://github.com/fenetikm/falcon/"; }; @@ -1402,12 +1402,12 @@ let fern-vim = buildVimPluginFrom2Nix { pname = "fern-vim"; - version = "2021-03-25"; + version = "2021-04-18"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "3f9f1957699346f240a9e71eee83fcb67c8fc0e5"; - sha256 = "1wkxih5glkpvjy6ka42y0x1di2iqm1y7rc93av4gfqhhskryfv0h"; + rev = "609610754b52d3d32616bd70094dcce3a88db3e6"; + sha256 = "1va4iaxnb03zk880k2kilsyr498pv0g78418d0nzxa4cdmvxcp5z"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -1523,12 +1523,12 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2021-03-24"; + version = "2021-04-14"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "caf7754b2636eabdf1bc11d30daccc5de66951ef"; - sha256 = "1743br19x41rycc1iqh2jiwaa2z80bi2zcd0lr9n17dc733ww5n2"; + rev = "ee91c93d4cbc6f29cf82877ca39f3ce23d5c5b7b"; + sha256 = "0zpf45wp0p924x96w9i171w5mbh25rzbmp987wpv8kgfzq7dviir"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -1593,30 +1593,54 @@ let meta.homepage = "https://github.com/eagletmt/ghcmod-vim/"; }; + gina-vim = buildVimPluginFrom2Nix { + pname = "gina-vim"; + version = "2020-10-07"; + src = fetchFromGitHub { + owner = "lambdalisue"; + repo = "gina.vim"; + rev = "97116f338f304802ce2661c2e7c0593e691736f8"; + sha256 = "1j3sc6dpnwp4fipvv3vycqb77cb450nrk5abc4wpikmj6fgi5hk0"; + }; + meta.homepage = "https://github.com/lambdalisue/gina.vim/"; + }; + git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame-nvim"; - version = "2021-04-12"; + version = "2021-04-15"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "d75b433c1ea96d8133cb33dcdb2d1d47c98e59fb"; - sha256 = "0b726nf63ydfsxc22v1ymz4z8qcp0i2yxgq5dh7i7b5ws809kyn5"; + rev = "bba913f065b7fba7150e71dc07e093c758c5ca98"; + sha256 = "1xvy5pnqcrvcs19b2b6l3n9rkj281grcgbrsg87iwvc9sw98bywl"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; git-messenger-vim = buildVimPluginFrom2Nix { pname = "git-messenger-vim"; - version = "2021-03-21"; + version = "2021-04-18"; src = fetchFromGitHub { owner = "rhysd"; repo = "git-messenger.vim"; - rev = "6fe62ce47491953487dac540964a4cfb037be7f3"; - sha256 = "0g8gaprkrqs69rplmbf6nc03km6qcapipyc13rghb7fyksad51nr"; + rev = "866b3ed000d483b27067d9bc89dbaa57a83244e8"; + sha256 = "1jj2nbsm5g1y9pw0frh35kbj17zpxy56gqym44gv8hy2wbhzwhbf"; }; meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; }; + git-worktree-nvim = buildVimPluginFrom2Nix { + pname = "git-worktree-nvim"; + version = "2021-04-19"; + src = fetchFromGitHub { + owner = "ThePrimeagen"; + repo = "git-worktree.nvim"; + rev = "77c54ff659ec3eba0965e9a54e8569abd084b726"; + sha256 = "0lraa4di5z5jm103bqzr804bjcxa49b131mhpgg4r40zpam9iip1"; + }; + meta.homepage = "https://github.com/ThePrimeagen/git-worktree.nvim/"; + }; + gitignore-vim = buildVimPluginFrom2Nix { pname = "gitignore-vim"; version = "2014-03-16"; @@ -1631,12 +1655,12 @@ let gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-04-12"; + version = "2021-04-20"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "2ba9f5a7610fac660c8266db244eea91b76dcf48"; - sha256 = "1zcflhcpvyl1chsxwdcii8lzhig5fwjpvhr5l3wvpr63vix7iy65"; + rev = "6b7b666cc95f91c869b1ef266e10f06807f7ccf0"; + sha256 = "1ya54gkig13adcjgwjmvyssnrdz82rcwimlwk5ff6qqivwcbpsjy"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -1715,12 +1739,12 @@ let gruvbox-community = buildVimPluginFrom2Nix { pname = "gruvbox-community"; - version = "2021-03-17"; + version = "2021-04-15"; src = fetchFromGitHub { owner = "gruvbox-community"; repo = "gruvbox"; - rev = "8a36e8dae3e31fa5edfb5ae91fb1c2d36b05979e"; - sha256 = "0yq8bvpqlnj57pl2j4jwwpihpwmq0lym1q5sigvkp0yghlwliqxx"; + rev = "42668ea643d56729467fb79c1a0a5e30289fe590"; + sha256 = "090jh2pwkl2mpycnii78457k2pkdj76l9x4p4yn9j662986imnhl"; }; meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; @@ -1799,12 +1823,12 @@ let hop-nvim = buildVimPluginFrom2Nix { pname = "hop-nvim"; - version = "2021-04-05"; + version = "2021-04-16"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "414b9aae83d7b13559ed5031995363fa6c4841f3"; - sha256 = "05cajsdfys608mb5379aj70w4f7pp7x3x3f5c2aryij5fg0mnx5j"; + rev = "998452d18934af4a527d4e1aa315fd2c74cb652a"; + sha256 = "0y17zm792fxakja4c852k9pw3lp20vgbyyzrmnc20112dll8vzgn"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; @@ -2064,24 +2088,24 @@ let julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2021-04-13"; + version = "2021-04-16"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "c76be0ea28926ab60276fd4788eddbd8c96b66fc"; - sha256 = "1bai15a7wwr7v9z43qjzryb1cpd8xyylfrrlcjjfckw9gbqpgs3w"; + rev = "5b3984bbd411fae75933dcf21bfe2faeb6ec3b34"; + sha256 = "1ynd3ricc3xja9b0wswg4dh1b09p8pnppf682bfkm5a5cqar7n5k"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; kotlin-vim = buildVimPluginFrom2Nix { pname = "kotlin-vim"; - version = "2021-04-11"; + version = "2021-04-20"; src = fetchFromGitHub { owner = "udalov"; repo = "kotlin-vim"; - rev = "ea258abc437d3615236d72c8b354de39b409a249"; - sha256 = "1r6wc5nnx6lxc7cyxp5dwzwxgmdrqzxl63m0807sl69rgl2444rq"; + rev = "e043f6a2ddcb0611e4afcb1871260a520e475c74"; + sha256 = "0ygvicf8gcaskz33qkfl1yg1jiv0l9cyp8fn2rrnzdsb7amsss0v"; }; meta.homepage = "https://github.com/udalov/kotlin-vim/"; }; @@ -2244,12 +2268,12 @@ let lightline-bufferline = buildVimPluginFrom2Nix { pname = "lightline-bufferline"; - version = "2021-03-10"; + version = "2021-04-16"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "f1feb5b3b9d1b13ccedae475e9346392e17895a4"; - sha256 = "1wki7q6w6ld1lx792f62s8k72ikcdl6il3ybsxxlajmnj5mixvkg"; + rev = "570e732e9e89f2a900a1e86fb3fa170c7dd201d6"; + sha256 = "0jvd7jp92qffas5hb2m6jg1vlm4g2is8q8hkj5mhyr5gnbpj2xf0"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; @@ -2280,12 +2304,12 @@ let lispdocs-nvim = buildVimPluginFrom2Nix { pname = "lispdocs-nvim"; - version = "2021-03-19"; + version = "2021-04-14"; src = fetchFromGitHub { owner = "tami5"; repo = "lispdocs.nvim"; - rev = "ff82d3668497e4520e195748d295cbe9513086b7"; - sha256 = "03698f1lydnql9xi0a1iggpqv3001yn390z9j1hvpwmra3k7lnpg"; + rev = "5225b347a722ba54ce3744364a3e0ff2939743cd"; + sha256 = "0x4nshkizivjz5ldb3scsxxi6x379g3rfpiplsixcs6bpxkib166"; }; meta.homepage = "https://github.com/tami5/lispdocs.nvim/"; }; @@ -2328,24 +2352,24 @@ let lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga-nvim"; - version = "2021-04-09"; + version = "2021-04-18"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "b77a08be564ccba4bd8c68cca89aa87e5520b3c3"; - sha256 = "0hwngd27cdfbcw8l8x4ri93749v5r6z3q9s5h6av27zdb4gbvddd"; + rev = "333178b4e941eb19d9c97c0b0b5640c76363b0ad"; + sha256 = "1ygqz8mf8h48jfn17ldr5fnpir1ylf37l10kla8rp197j8acidsy"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine-nvim"; - version = "2021-04-12"; + version = "2021-04-20"; src = fetchFromGitHub { owner = "hoob3rt"; repo = "lualine.nvim"; - rev = "8a99a0e9e76d81837ff9156599b399a70cb9fb80"; - sha256 = "18ch67d3in3k1j766cy1wbbnd2dmbrch5rm9yqwys18263cjsihg"; + rev = "e6cc09c2e95cc361babb64c113cc3e9355ea1130"; + sha256 = "1jf68z7vh467fr5arbcsk5g65gjpc0dqn584hbg0cpzfmdlrbj4n"; }; meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; }; @@ -2424,12 +2448,12 @@ let minimap-vim = buildVimPluginFrom2Nix { pname = "minimap-vim"; - version = "2021-03-30"; + version = "2021-04-13"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "a7af085a6f549875f7721caa7cd3071fba800597"; - sha256 = "0chzim7i3mq156n8zyay4prvyj306z6lqxdljzrz7j4mmkarcxl1"; + rev = "6afcca86b2274b43de9d39e3c1235f4b0f659129"; + sha256 = "08wabfqhj697qy92jrf6mzbhjbybyil45fsvhn6q3ffl161gvsak"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -2724,24 +2748,24 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2021-02-06"; + version = "2021-04-20"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "a75d96054618c47fbafef964d4d705525e8e37b9"; - sha256 = "0c7k1fhw1fjgby4h99r22sbzn639v76r12dl66fhdrnkvrk0709n"; + rev = "1a49552cdaddeaaa766a6f0016effe530634b39f"; + sha256 = "114mp407vck6bm224mig91rka5k7jj6641lllijwj25b3yfkgkmr"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-04-07"; + version = "2021-04-20"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "fa941274218fb16464072805a17ba80e7c6f2648"; - sha256 = "12f4f22wdsaa7ac0yzzqzsrrm2vrh0y7jmfir6ngkc9j3l52mg9d"; + rev = "cb846809d81c360b3f9658ee89a9342450c99da2"; + sha256 = "0r35flvb70y4ankp8v8p6jm0s9mrbg6i94n0v8avaw92xrcgl4ph"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -2868,12 +2892,12 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2021-04-06"; + version = "2021-04-13"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "6d0ab7dec9306fada667ea71edbb3da2b06a40ad"; - sha256 = "0w5vaz7f8r61rizlgn3x9p3yzxw2aca1a76gb0zpalc2n51bdf9s"; + rev = "1b53686d5f1d1607dc67430e9243283fee3a9764"; + sha256 = "03qzbvry4mygx109mxxqqmbv9adh9ifsiwl0rsvfgp7kl6l6fzkk"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; @@ -3012,36 +3036,36 @@ let nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-04-06"; + version = "2021-04-21"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "cae76770d1f69b927616313fe1676528adb6d62a"; - sha256 = "1kh38zfa4x69m0j94f1wzzw4nqxwd89s50inik32zj5948j6licb"; + rev = "d83b441b1838a30941af6582e9cb19d93b560b71"; + sha256 = "00h40qgkrydacsj5q8yv6g7m0835dqcxf66i1s2g32wssg6c1y5f"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2021-04-02"; + version = "2021-04-17"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "cf9b92326411640891360c7bdd784967a8923f43"; - sha256 = "14jd99i35yl04jhwnccj6bx80xwpn9fl5i3bpd7b7safpd6gfk8m"; + rev = "20e19029c9d212d8eb43eb590ac7530077e13350"; + sha256 = "097iplsdkkq72981nwfppj07d0fg0fzjglwlvpxq61w1jwscd8fj"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; nvim-bufferline-lua = buildVimPluginFrom2Nix { pname = "nvim-bufferline-lua"; - version = "2021-04-07"; + version = "2021-04-20"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-bufferline.lua"; - rev = "224f2627c471f319626fc7c1ab85f9d7d91bb98a"; - sha256 = "0yxby3p82pjkz8n0vnavbhw0qlva8mfq3nqff4bf1sg9iw0jpfkm"; + rev = "4ebab39af2376b850724dd29c29579c8e024abe6"; + sha256 = "0k671d27m2p0lv4vr99lra740511234f8m6zl2ykkb1b197841cg"; }; meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/"; }; @@ -3072,12 +3096,12 @@ let nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-04-12"; + version = "2021-04-19"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "4b3ade100866bb64b472644642da670e2fc61dde"; - sha256 = "0r3kwi5997rcfpc4gs25xcqslnlfwfm1cz2bgvxz389v71vay0mw"; + rev = "99452ae6875889c12653963b68e53c4564848954"; + sha256 = "1d5hpn3mr2h3s5h2svajbxm0n49mmc5w0sip9cpzyfdpbnv1gic3"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3096,12 +3120,12 @@ let nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-04-12"; + version = "2021-04-18"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "107c6882fa13f77d8a206709e3d50fb0290d57cc"; - sha256 = "0c1wq4s3cjysphvkdicxvc87dg6jr2zmxcxfnpz14ncn1s05gr9h"; + rev = "d646bbc4c820777c2b61dd73819eead1133b15f8"; + sha256 = "1bnxpcyrzi71b4ia0p1v8g3qx204ja4g3yfydcppdiwqfkhm2688"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -3144,12 +3168,12 @@ let nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-03-25"; + version = "2021-04-20"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "fdce47e0bd9669e2424cc2a0112ecb47ba571d13"; - sha256 = "1dn9wr23dizhs7byrim9zd3yi22g629jc2aqfx0q1v1i2i9g107v"; + rev = "89a00109fda04b2fe80cd4023092e5663a316777"; + sha256 = "1jx9wc6v4d4y4fx97qb0nhcm8w879ckk74anzsq3l9vxg7y9ydgq"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -3168,12 +3192,12 @@ let nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2021-03-28"; + version = "2021-04-16"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "4ebad2d52b7c648a7f6ceb5e62dde49167d07796"; - sha256 = "0cnh6x49yy6z3f3h7q0q8l90cl7dchxfdgz7c143nv5qd3qkgnmc"; + rev = "76c4972f6edb961e7c7486bfd0a1f629b49a3e43"; + sha256 = "1c0f94hjvkj6mhx3id5867d65is1cqffj72nswgnxwx4y4psnbdg"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -3192,12 +3216,12 @@ let nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-04-10"; + version = "2021-04-19"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "8924812e0d114b67dca376533bef2ac5bb054f8b"; - sha256 = "1dlx2bhvsdm9s5ivpkw5ikhkw6b99zng4p9qdh8ki49f644w5jsr"; + rev = "5c005ce93367ad85933eff80887228bca2a7efee"; + sha256 = "1nppy9vkl8v8biq1q9sgqxakhqlw5zm7z1wiq68zzyivlz5mj1hg"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3264,48 +3288,48 @@ let nvim-toggleterm-lua = buildVimPluginFrom2Nix { pname = "nvim-toggleterm-lua"; - version = "2021-03-23"; + version = "2021-04-20"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-toggleterm.lua"; - rev = "84980bd3f549821fe58d1821fdc1e7c54d1ebf3a"; - sha256 = "09dcajyfbimfzgxj57c988rqr6y6ah4p97j04gyvg1mrvlj95dg4"; + rev = "7c9d8c51841c3335818d04b684e93c655b5d61c9"; + sha256 = "04j34wyv7q9n7yld7k7cxxm92al3h7x3rkcnm1q61scwb1xf354r"; }; meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/"; }; nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2021-04-08"; + version = "2021-04-20"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "82b20f5b5ed741d2e6360990ee11a50f0cd253a4"; - sha256 = "0il4z9ch5jmrwp5c51lxgrj8w3d5av3z5pkwjclh8gwpvm7siwvr"; + rev = "796628a7651f9399637ad8376bab920fb10493cf"; + sha256 = "1mb7ncp35yhzwzwp6l54dr1y3is705sa63hlx6bf5ny84q13kvxd"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-04-10"; + version = "2021-04-19"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "615afe3541eec0b338b4ff5b6738f69c7f6f8860"; - sha256 = "14n9q9fnfys8vj7m4fbngybcz9f2vzr8f67r5m7nd3lljn2389dg"; + rev = "df189e28a498d90dc8813e90944e0999bc936e56"; + sha256 = "0azpx89vykc1ylbn26744rdfd4f3wga0azdsg06hmz55a9q6qq8p"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2021-04-09"; + version = "2021-04-18"; src = fetchFromGitHub { owner = "romgrk"; repo = "nvim-treesitter-context"; - rev = "6855cc725ee7d98dff00886d22d687ef7ba82c4f"; - sha256 = "1y2vpgmc2c2fpdxfpxlmz69f36wnp9q0yff6cidal61xaj28w71w"; + rev = "d5070fb1171220e8db6eef77ed994079198d6522"; + sha256 = "1x534yrbjnf4bny3bykj7jkydhkjxspmipkbb685ja4nppc2lp41"; }; meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/"; }; @@ -3324,48 +3348,48 @@ let nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2021-03-31"; + version = "2021-04-18"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "111cf356fd5c6c52d2dfb9299a76d201624be3cc"; - sha256 = "1dvfwcdj2cbgxlsw09qgsvym8cvg8jval90h4rwmkn7yzh1wyf7a"; + rev = "18cf678f6218ca40652b6d9017dad1b9e2899ba9"; + sha256 = "0xawv5pjz0mv4pf06vn3pvl4k996jmw4nmawbizqlvladcc2hc1k"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-04-09"; + version = "2021-04-19"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "445c02bb35e350df733af3ec70a0a7dea5dbcf43"; - sha256 = "0sh23vfk30492agc0a8jlcsksgw2ny0s3ngmxxy60xs8j4dpfhjs"; + rev = "d42bf9f52607c1cb281db570f3f47e0d84b03a02"; + sha256 = "13ndyskp3yx3nazg6xc1j3lzad588a1qdacs6ymh8vs616p5mqsf"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2021-04-06"; + version = "2021-04-16"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-web-devicons"; - rev = "ecc0ec031ec4330c7c4eaf3ed2efdf1abbaff834"; - sha256 = "1m4bhwb1vg75lizdj8dkai9zcrxgky2g1gm6ivzj7i1y7p1k1ccv"; + rev = "1db27380053de0cd4aaabd236a67c52d33199f1a"; + sha256 = "1qq9mk102jj5hqdkmrirccr3jkh2dgsfb3gy4wvpcp7mdcqapsqc"; }; meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/"; }; nvim-whichkey-setup-lua = buildVimPluginFrom2Nix { pname = "nvim-whichkey-setup-lua"; - version = "2021-04-08"; + version = "2021-04-16"; src = fetchFromGitHub { owner = "AckslD"; repo = "nvim-whichkey-setup.lua"; - rev = "7299ebd2bcfb412630a18356a653def7e72f162d"; - sha256 = "1kxg7ss95cijf9i8nbsp3jkpmx9x3c4qp52d0ckwcdbyvskkal9y"; + rev = "b2df0761b8ba3fca31b7ae1b0afcad2f8a4e89f4"; + sha256 = "02bidgicrrx6jwm6hpcq0waqdzif2rws2q1i47zvi5x9i3zyl5cx"; }; meta.homepage = "https://github.com/AckslD/nvim-whichkey-setup.lua/"; }; @@ -3480,12 +3504,12 @@ let packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-04-06"; + version = "2021-04-19"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "fdf1851c6121dee98294791c72aebff92b99b733"; - sha256 = "1ylwr70z7jlga260ydah03ngh47kf8jh7zgpl9iclih01nz6xwci"; + rev = "f9dc29914f34cb2371960236d514191b9feba8b5"; + sha256 = "02vg6m7572867gahvpsc1n9363mbk2ci5cvqwwqyh2spsx5f4g88"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -3564,24 +3588,24 @@ let playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2021-04-11"; + version = "2021-04-17"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "1bf0f79cb461b11196cc9f419763be3373db2848"; - sha256 = "15b1lszshsf9jz2lb3q2045pjpjig3a6nkz9zvvjh7gwh6xywlv4"; + rev = "a141bf5c9734ac164cb0dda5e7a2b8b16273a4f6"; + sha256 = "1grhxhnh5zij2brlk2bmy3b2y8bp9j75hyajfki8dk908pplng0i"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2021-04-10"; + version = "2021-04-20"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "a3276a4752e66a2264988a171d06433b104c9351"; - sha256 = "005xf3g9b38x6b29q9csbr2yyxvpw6f3nr6npygr65a2z4f1cjak"; + rev = "1a31d076a097ac23c0110537a99b686874ae2cdc"; + sha256 = "1ah2j5bxgg0mqa8nlc76f37apb9i6vx8i1c0vlmk144w9dfmxkis"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -3793,12 +3817,12 @@ let registers-nvim = buildVimPluginFrom2Nix { pname = "registers-nvim"; - version = "2021-04-12"; + version = "2021-04-13"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "29771d7b4d7b5b8b4c7398eef1becb911e2f4038"; - sha256 = "07j40j3pjsp4dw1aav3j8b202p2zrqyx2zkfb5g5ng07bma5gszn"; + rev = "b8ad2cd8a01dc3e4c2530820409d01b1bbd6fb95"; + sha256 = "1jz41mskrrbb4w2hkxcpmnpgj93nbh2rb30mn566xkjn3zkh1r23"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -3839,6 +3863,18 @@ let meta.homepage = "https://github.com/gu-fan/riv.vim/"; }; + rnvimr = buildVimPluginFrom2Nix { + pname = "rnvimr"; + version = "2020-10-02"; + src = fetchFromGitHub { + owner = "kevinhwang91"; + repo = "rnvimr"; + rev = "d83f5a8e070a1fc7e7af0aeea58e71b78956daab"; + sha256 = "0iwj01p9c2kczhx69vxrh1qd4z41ymcgfq5235b1l0rnz4d6v82y"; + }; + meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; + }; + robotframework-vim = buildVimPluginFrom2Nix { pname = "robotframework-vim"; version = "2017-04-14"; @@ -3877,12 +3913,12 @@ let rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools-nvim"; - version = "2021-04-11"; + version = "2021-04-16"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "230b147432556f2c751e7348a4915e30fd3f8023"; - sha256 = "0r2d8qqwmjd571h89i4ph44mzmfwnlyyfa7pq4jjsnhns9c6qd47"; + rev = "cd1b5632cc2b7981bd7bdb9e55701ae58942864f"; + sha256 = "1jam4fnzg0nvj06d1vd9ryaan8fza7xc7fwdd7675bw828cs2fq8"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -4057,12 +4093,12 @@ let sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-04-10"; + version = "2021-04-17"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "7a89d2d7ab1d8a92d137cdb358e7c5d661e7ceb3"; - sha256 = "0yk79151fwbjdf2sy5ri2gg58g052y31dml9ilbwdq7f4jncgljk"; + rev = "764bd716f08f1441e0020b8ae0c8d1b53970e4a9"; + sha256 = "1f21mn67cdiyq2pi92agvvzfprvr78kqc89bc3wh2k8ij47szmp6"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -4166,24 +4202,24 @@ let sql-nvim = buildVimPluginFrom2Nix { pname = "sql-nvim"; - version = "2021-02-09"; + version = "2021-04-13"; src = fetchFromGitHub { owner = "tami5"; repo = "sql.nvim"; - rev = "96d000d9eff0165c7e0496f73787cc56d7c1581c"; - sha256 = "1n9j3wv5xifs7ppgjnnbvx9p4h4llshbzgrly5b7lx0nnb91yqg0"; + rev = "afd60eef9edff543d4d05ac51d518fd501f2e413"; + sha256 = "115l3dp1i7pmfsqyqir5c73bprvsnnm737sbbz0dwibnlr5sd2q3"; }; meta.homepage = "https://github.com/tami5/sql.nvim/"; }; srcery-vim = buildVimPluginFrom2Nix { pname = "srcery-vim"; - version = "2020-12-22"; + version = "2021-04-14"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "8cd04af0507635a8368609ede79a332b96a7a245"; - sha256 = "0gb1mjr2yryrq0p9q17d4ndyi7b6wyba3s8ds72wf5bkl4vzrsbd"; + rev = "9c692e3f17b3485969b55d76a708136e2ccaa5de"; + sha256 = "1cd4vxx0zb4xcn2yp7kl5xgl8crfr0fwifn4apkn878lqx6ni7gj"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -4358,36 +4394,36 @@ let tcomment_vim = buildVimPluginFrom2Nix { pname = "tcomment_vim"; - version = "2021-03-31"; + version = "2021-04-14"; src = fetchFromGitHub { owner = "tomtom"; repo = "tcomment_vim"; - rev = "8b69645999fab1933faf4fb53ae930f7c4368e79"; - sha256 = "1x4mwg8dvfw1plkifawckkdi7brqs9rxpm8irp1q7kfywiwbyw0y"; + rev = "a15822ec1b42b7d43f5c8affaa3ad2c553a2831f"; + sha256 = "0bl4shhk5ldqamq2zk8sv2bdswd9a4762fh2smj0h1jgs2ff5pkm"; }; meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; telescope-frecency-nvim = buildVimPluginFrom2Nix { pname = "telescope-frecency-nvim"; - version = "2021-03-10"; + version = "2021-04-17"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "926fbde059d6a7cefcccdd92b40fa866e073ba41"; - sha256 = "100zi9ncz2b6hb5y9hxcsj5ra81kq8j2b4y8ck56y4yg96yi03pd"; + rev = "721300e3d6f4a7157a781014d3d69bb1c7b702a3"; + sha256 = "1981lfk7xckvf2jmhnnrb58iwb1s3qzz84g52h4rvbjr7dbrr4xk"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; telescope-fzf-writer-nvim = buildVimPluginFrom2Nix { pname = "telescope-fzf-writer-nvim"; - version = "2021-01-10"; + version = "2021-04-16"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-fzf-writer.nvim"; - rev = "9535863f519be3d5e57fd50916f96594241bfe16"; - sha256 = "0jmkzjqlcz47hzp44407xwkmirgprzkwrz6x8ax771gpk8cghfrx"; + rev = "00a1ab1b0aeaa4ad9da238861325ea1ee6d90a44"; + sha256 = "1c5kiqxg7i1cm69xzvlrrz8dsrpfz8c9sfrnhqc4p6c95kfsna57"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-writer.nvim/"; }; @@ -4431,12 +4467,12 @@ let telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-04-09"; + version = "2021-04-21"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "5bd6f5ca9828ea02f2c54d616ad65c72a5cdd7fb"; - sha256 = "0h47x7nqhr3wvxspymvgbyngqickvbxg13l1j525f3y68j4b2arg"; + rev = "3adeab2bed42597c8495fbe3a2376c746232f2e3"; + sha256 = "0nnqlrzgmg50kdyjmbkr29dfn8ydvdamfihrw0nalvszhh577487"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -4612,12 +4648,12 @@ let ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2021-04-11"; + version = "2021-04-18"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "3ccb1a7e75b31add82730f3b95c2be5c130b7ce4"; - sha256 = "0rhkpzz0ss8sb6jf3ygvavygmqiy8a418685izanvyplwhqi5zy4"; + rev = "204b501cc8f4acd7f32ebdea262bd5772ca007a2"; + sha256 = "0jdb3v8lplrl3sqrmx8j8p4pirnwc42fc01arw64rjigrh0fwm4k"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; @@ -4636,12 +4672,12 @@ let unicode-vim = buildVimPluginFrom2Nix { pname = "unicode-vim"; - version = "2021-02-01"; + version = "2021-04-15"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "afb8db4f81580771c39967e89bc5772e72b9018e"; - sha256 = "05d15yr5r8265j3yr8yz1dxl8p4p4nack4ldn663rmp29wm1q5pi"; + rev = "8b6bb82f66c1f336257e670eb9b7c03f29df3345"; + sha256 = "0r082yn0jbvwxf5jfl79kzjzq5hlhqf3nkmf39g675pw2mc2fw6x"; }; meta.homepage = "https://github.com/chrisbra/unicode.vim/"; }; @@ -4960,36 +4996,36 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2021-03-27"; + version = "2021-04-15"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "ed60e1d36912f64fdbed5640532b1067e11557ca"; - sha256 = "0yijan5nknkkxr36rncscm043badn49w6778nwyazi2fx4266jfn"; + rev = "07ab201a272fe8a848141a60adec3c0b837c0b37"; + sha256 = "131fj6fmpgbx7hiql1ci60rnpfffkzww0yf6ag3sclvnw375ylx4"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; vim-airline-clock = buildVimPluginFrom2Nix { pname = "vim-airline-clock"; - version = "2018-05-08"; + version = "2021-04-14"; src = fetchFromGitHub { owner = "enricobacis"; repo = "vim-airline-clock"; - rev = "a752ae89d833ce14f87e303f3f479c01065077ca"; - sha256 = "0wbaxm1k9j4cl5vw1wppsds0afc0h3n2ipp8xhgdh5jswjhr6wlc"; + rev = "c37797d40aa882a71fc3fba0cc27abc637886623"; + sha256 = "0rj53x4b0vjfrjvpr09vlz69r3y2rym4dab5lyx0sp3sgz9jqizm"; }; meta.homepage = "https://github.com/enricobacis/vim-airline-clock/"; }; vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2021-03-03"; + version = "2021-04-16"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "fa808d74e0aacf131337b58f01ee45fd3d3588af"; - sha256 = "02dq887676dq2rm1fxpzf3piyabs6zj0rvc70nxa5vvlv68qp6k7"; + rev = "0f9995d5996adf613297896c744415cd9e6b7a80"; + sha256 = "1zwicvlrfpvgczjnzjdkjhv2b110v5xbmvj132xl8a7xsj3rzg1d"; }; meta.homepage = "https://github.com/vim-airline/vim-airline-themes/"; }; @@ -5056,12 +5092,12 @@ let vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2021-04-01"; + version = "2021-04-20"; src = fetchFromGitHub { owner = "Chiel92"; repo = "vim-autoformat"; - rev = "781c72c0625728eb5677a6952e57f282070666f8"; - sha256 = "14l7h9h76x7cvvka8djn08dh3rmj34bycm8vqavh20nf2v8n9j2g"; + rev = "7ea00a64553854e04ce12be1fe665e02a0c7d9db"; + sha256 = "1jy5c50rd27k43rgl9wim502rp00cfnyh2zkd5bvbg0j85a9q72k"; }; meta.homepage = "https://github.com/Chiel92/vim-autoformat/"; }; @@ -5116,12 +5152,12 @@ let vim-beancount = buildVimPluginFrom2Nix { pname = "vim-beancount"; - version = "2021-03-07"; + version = "2021-04-16"; src = fetchFromGitHub { owner = "nathangrigg"; repo = "vim-beancount"; - rev = "30b55500094325af9e9498b72e75c8c1090df436"; - sha256 = "0bh7q7s3zb2yrnck3zx1cx0kv8lm8zp4p5fwj6kv35y27v109pfm"; + rev = "dd2f56a122b698454af582cbe7eae471dbdc48f8"; + sha256 = "00wcq3wg02rjzhc83cm4gvc9fw78a7s5gds4qdn7zqf55ha2d6vi"; }; meta.homepage = "https://github.com/nathangrigg/vim-beancount/"; }; @@ -5236,12 +5272,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-04-07"; + version = "2021-04-17"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "ee7e6a5782ec7033f361311f8f61f23146822e62"; - sha256 = "0gr2sh6fbc8qfz0xlv5rhkg8jxh81wb2lb141m0hyc0fk1n2pya7"; + rev = "8e13b23d69549c95d9c223ea5c2487d5dd9558f7"; + sha256 = "1biiq07dhrz9vhk0yg3zkkv3329nyla6lp8kavdzqrvqg0hsbr2j"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -5296,12 +5332,12 @@ let vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2021-03-28"; + version = "2021-04-15"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "048baf8361d7ea24bfbaa4427ab4de08c39b0d57"; - sha256 = "17xnxka4q7fqpl52x5fh2kpqzs7h1ql2lvv6sv7a0apf2qafs0qy"; + rev = "793d816524934e6553c76437120eea5df8e85a1e"; + sha256 = "174wq1sq862s474bhfq0w8lnmcilq75gf2sdp1hws7wj0fvn10h3"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -5404,12 +5440,12 @@ let vim-cpp-enhanced-highlight = buildVimPluginFrom2Nix { pname = "vim-cpp-enhanced-highlight"; - version = "2019-11-14"; + version = "2021-04-19"; src = fetchFromGitHub { owner = "octol"; repo = "vim-cpp-enhanced-highlight"; - rev = "27e0ffc215b81fa5aa87eca396acd4421d36c060"; - sha256 = "15nyd4yssswyi4brkch09rca0qh7p77li4xyrivmiapkr4a60vwb"; + rev = "4b7314a497ea2dd0a6911ccb94ce83b2d8684617"; + sha256 = "1fvy56r8p0fp8ipsfw6wiq6ppv541849cazzmp3da203ixs87wd1"; }; meta.homepage = "https://github.com/octol/vim-cpp-enhanced-highlight/"; }; @@ -5488,12 +5524,12 @@ let vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2021-04-02"; + version = "2021-04-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "33c86149c0aa114a5d14a1a2f2b5cbcc78cc0116"; - sha256 = "01rqs6hcfd1ih1hr8bbwl1f3g86q41g0jbvrn5fpdfr9ccjy2ip1"; + rev = "9e3ca4e897d63ae8f64be579e42188b53d29323d"; + sha256 = "1p7pps21l7d3yfsydw6axyfaaf0an7ls7j3p80vxg9ia307hqnws"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; @@ -5584,16 +5620,28 @@ let vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; - version = "2021-03-26"; + version = "2021-04-17"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "4313cbb398d8b61b08be09f9b5a9ae4270c86004"; - sha256 = "154vxj4bd10i70wd0d40g9j2yji6l5y00a0y4xk9402x5yljjmwr"; + rev = "250ea269e206445d10700b299afd3eb993e939ad"; + sha256 = "1fcp2nsgamkxm7x0mn1n3xp02dc7x773cdp9p30ikqn44pzgyq10"; }; meta.homepage = "https://github.com/tpope/vim-dispatch/"; }; + vim-dispatch-neovim = buildVimPluginFrom2Nix { + pname = "vim-dispatch-neovim"; + version = "2017-01-18"; + src = fetchFromGitHub { + owner = "radenling"; + repo = "vim-dispatch-neovim"; + rev = "c8c4e21a95c25032a041002f9bf6e45a75a73021"; + sha256 = "111n3f7lv9nkpj200xh0fwbi3scjqyivpw5fwdjdyiqzd6qabxml"; + }; + meta.homepage = "https://github.com/radenling/vim-dispatch-neovim/"; + }; + vim-docbk = buildVimPluginFrom2Nix { pname = "vim-docbk"; version = "2015-04-01"; @@ -5680,12 +5728,12 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2021-04-10"; + version = "2021-04-21"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "5a1811c3c70adeee42d9dc5faae1cba1d57461f9"; - sha256 = "03cqsv2y1zns2sj6i9afxb4yjnzd42nmwijdlbwbqnnjp03xq1ns"; + rev = "c3cb96e153728fbfd050173b4af19118b131f278"; + sha256 = "1v0rgzpnpanics4zhx3y9m6ppa727yc0mvcx065jg2a2a1563sgy"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; @@ -5884,12 +5932,12 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2021-04-12"; + version = "2021-04-20"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "b7747704c4df716efd21f331b4d94336c490a5ad"; - sha256 = "0sl40fvdciir9cbb4bcll971zhk38n6h8kmqy473viki149lg7pa"; + rev = "a0e34eb5471c54f979fc613b8068efa6d5015550"; + sha256 = "08xs3jzd41y0aa6g3var7shllh47g5biv4jv59f34d0l66mw18rz"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -5944,12 +5992,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-04-12"; + version = "2021-04-16"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "ae45609cfc3fae91bb7859dde95cb0aee493f34c"; - sha256 = "17m46r23gbrj8qh6vglcwhkqikjipvkyskkx1k9j9x29vnwz2r54"; + rev = "895e56daca03c441427f2adca291cb10ea4d7ca8"; + sha256 = "139zdz0zsaqpwbscqzp61xilrvdjlvhrn985mfpgiwwrr6sa6gdr"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -6016,12 +6064,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2021-03-19"; + version = "2021-04-13"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "24cc47789557827209add5881c226243711475ce"; - sha256 = "0fk8691wkhb7mb5ssmydipb61kh3hjnl31ngqbrbifzsqlkvibid"; + rev = "9756e95bd596a303946a90f06f4efe51dcd57e87"; + sha256 = "0wkcximk4alm26x9qrqbanlhhzrim95gs5cbjy0hnlrqa8xmz20k"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -6064,12 +6112,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2021-04-02"; + version = "2021-04-20"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "ce95699efa82921f80fdc0984d002ff81584c6e6"; - sha256 = "0fq6i4arnzq5fmzy50kf2fb8bf5ickrrhs53la04x1jwx3lfzs05"; + rev = "3ec431eaefb75520cbcfed0b6d0d7999d7ea3805"; + sha256 = "1h6lcxzm9njnyaxf9qjs4gspd5ag2dmqjjik947idxjs1435xjls"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -6353,12 +6401,12 @@ let vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2021-04-09"; + version = "2021-04-13"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "fe491924a7cf08bd839236a74f0c39bf0abf0fd2"; - sha256 = "0c6vqfwrbw0z036y41kf03syixnp58g1pwghm1d7frz2adn6mlvb"; + rev = "d20beb074f2de67104dda1f698cf83c920ffd78a"; + sha256 = "0lll31xp6vjqrzphs6f3zkz15rwis6lavw2cibvi7hx2vfp4hds2"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -6435,6 +6483,18 @@ let meta.homepage = "https://github.com/fisadev/vim-isort/"; }; + vim-jack-in = buildVimPluginFrom2Nix { + pname = "vim-jack-in"; + version = "2021-03-27"; + src = fetchFromGitHub { + owner = "clojure-vim"; + repo = "vim-jack-in"; + rev = "80c69cc021486d1cfa5dac7d9d6ab6954ff20c27"; + sha256 = "11dw8kngzznzf91n6iyvw7yi1l35vgpva32dck3n25vpxc24krpn"; + }; + meta.homepage = "https://github.com/clojure-vim/vim-jack-in/"; + }; + vim-janah = buildVimPluginFrom2Nix { pname = "vim-janah"; version = "2018-10-01"; @@ -6738,12 +6798,12 @@ let vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2021-04-12"; + version = "2021-04-17"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "9dc382c04af3389b48fd1ffb5ed4b6c294571f62"; - sha256 = "19bk55ifqh76528rf3k6pnwfc5y9954cir7apkz6ymrc0abiy47d"; + rev = "296fb98d198cbbb5c5c937c09b84c8c7a9605a16"; + sha256 = "1khiygamq1jirlz2hgjjksr12a7sj4x90hs7z4zkvzl83ysnbmdn"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -6835,12 +6895,12 @@ let vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2021-04-12"; + version = "2021-04-20"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "58a26a4c0c65a27d54159ba0d8adf8912f89f3c3"; - sha256 = "19jp6ilfsgwx6p7cq1gvswxxkhhg6czwwyim9g60gd66wrh2xbqf"; + rev = "71b97bac53aa09760e8d8c36767c657b274c468d"; + sha256 = "0ign21d8w6hcrbz9j6c0p1ff0y396wl7snm5dj81m7fck2287pj3"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -7171,12 +7231,12 @@ let vim-oscyank = buildVimPluginFrom2Nix { pname = "vim-oscyank"; - version = "2021-04-01"; + version = "2021-04-20"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "5b48c13143e55c234e8bf5bcfa2439b9ffa85241"; - sha256 = "1njxf2vwd9jfpjybx0f5c7k7fhlzmdwkwsflb9rkgv0pz3l0wkqb"; + rev = "2a0af02d0fd59baeb84cf865e395827750c875f0"; + sha256 = "06vrham1zg5vfr4q4gmz2ski4y02c3bfivzy4rlfvjs81qj3vn3m"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -7219,12 +7279,12 @@ let vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2021-03-10"; + version = "2021-04-16"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "0d4b68eb7f63e43f963a119d60a3e29c2bb822e0"; - sha256 = "0p7m75f7vqdm0nvg0p3nbzqnsd7wdvbsf3y2mzirdl7c0pbvphqp"; + rev = "5af0dcf7878a8c947ae5a69989524f0a1ba5f6da"; + sha256 = "17vb0xnzq6ic9naqg2wvjdh7s7ckz82ixv45pknxc21b6wjrfc75"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/"; }; @@ -7305,12 +7365,12 @@ let pname = "vim-pencil"; version = "2021-02-06"; src = fetchFromGitHub { - owner = "reedes"; + owner = "preservim"; repo = "vim-pencil"; rev = "2135374d48a7cb89efd5e818c12bb0ff450dfbb4"; sha256 = "17wgin33fj40brdb3zhm70qls2j2vssc4yrrv36y1qxwi7gdzn0f"; }; - meta.homepage = "https://github.com/reedes/vim-pencil/"; + meta.homepage = "https://github.com/preservim/vim-pencil/"; }; vim-phabricator = buildVimPluginFrom2Nix { @@ -7363,12 +7423,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2021-03-01"; + version = "2021-04-14"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "cc63193ce82c1e7b9ee2ad7d0ddd14e8394211ef"; - sha256 = "0and9148l36m8bhnzlyjirl1bd2ynswwzjc22605if82az9j55m8"; + rev = "730dcb02caab60a6ae5d8b4bdc16d290041061ec"; + sha256 = "1pgqw008xy3fn821zxfiwc9xpd0v33wxmk4yf9avm5jgqbkwn1ld"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -7591,12 +7651,12 @@ let vim-rhubarb = buildVimPluginFrom2Nix { pname = "vim-rhubarb"; - version = "2021-04-12"; + version = "2021-04-15"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rhubarb"; - rev = "b4081f0a882ff36d92d9d3ae5c3b70a378bfd5af"; - sha256 = "017mb54qc7ix5h1b1hg7rb3j31x5ihmsc1g5286sirzj4rcm90fi"; + rev = "2590324d7fdaf0c6311fad4ee2a2878acaaec42d"; + sha256 = "0ljlkzy2r8dzqkcl9pbgshr7swdcdbbxcgfvvmyxrw7swfx1srk9"; }; meta.homepage = "https://github.com/tpope/vim-rhubarb/"; }; @@ -7879,12 +7939,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2021-04-12"; + version = "2021-04-19"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "03f7e3395b1d2a0eaf8fc8bdb83fc95368a8b467"; - sha256 = "0s7ilz0zm6p03qhadr39v9hpkbygv4i984ac6f8bbdrf5bfkrclk"; + rev = "2a28fc35f6848ad38681d4b509ae3f5962276b5d"; + sha256 = "05xywkyh809g7zax4wdw5vn29xcs1wg3ylbsdi9rz18phm6im41k"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -8276,12 +8336,12 @@ let vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2021-04-10"; + version = "2021-04-19"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "be39204b64ac6d285d735166b94a28c218f1e4bc"; - sha256 = "0ghw3vzk6rjw5sfahrhfiisvm38zvn67ddvqg7l1h3hq411i0f2g"; + rev = "256235f8b60ccae36699e92edd61dbcf26fe0b17"; + sha256 = "000wyqm06h0614k6qwr90xxrvmwfbii7jjif5fjavk474ijgwckp"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -8408,12 +8468,12 @@ let vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2021-04-05"; + version = "2021-04-21"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "b05641ca8c7ebd396017121219047c480182a743"; - sha256 = "0184d5498iwi0kqf0gbd5zdqckvmqwaf7bs1dvj8rphp9xzsl72x"; + rev = "395d200728b467e141615f53afe564adc26985b9"; + sha256 = "1g0fhdqr6qmqmhvm3amv22fqb1aacmvd0swmk38w25zzcbl4b4gy"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -8480,12 +8540,12 @@ let vim-which-key = buildVimPluginFrom2Nix { pname = "vim-which-key"; - version = "2021-04-05"; + version = "2021-04-16"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-which-key"; - rev = "fdadbdcf5eda4b1ab381f3a36562005d161a6c4a"; - sha256 = "1lqqadf6qr4i7sfkjmra9b4rb6wa3sh93dp7lr5jdf365i4b0jfb"; + rev = "4c605b1ef91194ff178fdb1d957ab5b655a7089a"; + sha256 = "1zngyw1bj9bws00qyfcz3vc6fpybqrmxa43hy2pvga5anfjm5y6a"; }; meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; @@ -8494,12 +8554,12 @@ let pname = "vim-wordy"; version = "2020-10-24"; src = fetchFromGitHub { - owner = "reedes"; + owner = "preservim"; repo = "vim-wordy"; rev = "667426a0171787b2620dffa5b2d7c01c9040237f"; sha256 = "1lcrisv2wcd8iw76prql03wd11jgmknm3rvbcw7vv4v5r2s9rv5z"; }; - meta.homepage = "https://github.com/reedes/vim-wordy/"; + meta.homepage = "https://github.com/preservim/vim-wordy/"; }; vim-xdebug = buildVimPluginFrom2Nix { @@ -8574,6 +8634,18 @@ let meta.homepage = "https://github.com/andrep/vimacs/"; }; + vimade = buildVimPluginFrom2Nix { + pname = "vimade"; + version = "2021-04-07"; + src = fetchFromGitHub { + owner = "TaDaa"; + repo = "vimade"; + rev = "9b9254340e39dab3dad64c05b10af0fd85490b71"; + sha256 = "0sbk9lf5w136lwl3ca866m594993s23zad5ss4whzm9j0qknihl3"; + }; + meta.homepage = "https://github.com/TaDaa/vimade/"; + }; + vimagit = buildVimPluginFrom2Nix { pname = "vimagit"; version = "2020-11-18"; @@ -8624,12 +8696,12 @@ let vimoutliner = buildVimPluginFrom2Nix { pname = "vimoutliner"; - version = "2020-10-26"; + version = "2021-04-20"; src = fetchFromGitHub { owner = "vimoutliner"; repo = "vimoutliner"; - rev = "d198aa72c70270f1330f4237bbf853efaaa79723"; - sha256 = "05wcqs36qn8f3vcy9xi2cf0yyp7yzawlxqvpjhbad6lm52vzsabs"; + rev = "054f957779dff8e5fbb859e8cfbca06f1ed9e7f0"; + sha256 = "1bsfrma06mkigr1jhzic98z4v1gckzrjv908vx2wlbjq9cdv7d39"; }; meta.homepage = "https://github.com/vimoutliner/vimoutliner/"; }; @@ -8684,12 +8756,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-04-11"; + version = "2021-04-20"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "fa92c2a8d525972bcc97cba9579d9adfca3c859a"; - sha256 = "0a8wph6l1nr6ip6d02wg6x6g1zwys45pmj95i8c655fc6877rd79"; + rev = "297c0bea56fd3afce5209f47f330880d759c8698"; + sha256 = "04gkw01p5iiyj1xp9p446frg7f9szprm65gjs3w0s0akgbi5zp3g"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -8697,12 +8769,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-04-11"; + version = "2021-04-15"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "e6c03a17611a71ab1fc12ed0e9b4c32bf9ca826b"; - sha256 = "1g4vl0lxq7rvl064pf11n4r69z78c5k77qd987mm4hajbvmkbjqi"; + rev = "0d8a69f9e16a90cfed591264170dea0c5b686b81"; + sha256 = "014f85wg1c20cysn8qayw71d49qmv1vzzbgikzrd9msfqsp4l5qj"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -8878,12 +8950,12 @@ let YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2021-04-09"; + version = "2021-04-20"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "a3d02238ca5c19a64ff3336087fe016a4137fde9"; - sha256 = "05sfyqynqliyz2w2ams2a5rqi8v0i65iz5jfk2vsy9qcn94i2sr6"; + rev = "c8acf70d23337047af6548dbb8337d3e3a0c0357"; + sha256 = "0l24b07l1bdiwffpj2ajks879w69cjkn1adx9ak6pv98jlmsdzi1"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -8927,12 +8999,12 @@ let zephyr-nvim = buildVimPluginFrom2Nix { pname = "zephyr-nvim"; - version = "2021-04-10"; + version = "2021-04-18"; src = fetchFromGitHub { owner = "glepnir"; repo = "zephyr-nvim"; - rev = "057ee834776939bf76c4ae6c71e94e911014a172"; - sha256 = "0x1da7ihyrcrr3msy1jds566506k0jbsap5fk1w823cm8m0mwqn9"; + rev = "32c4ea97cc1cd3db1abebd46aff2ee18d66d8d59"; + sha256 = "1ab5ivfddifapc31qbipvajjgx1mclyqqf29cpz7avsc4h6fp3w0"; }; meta.homepage = "https://github.com/glepnir/zephyr-nvim/"; }; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix index 9d07ee434f..7e12d083c3 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -1,146 +1,91 @@ { lib , stdenv -, python -, cmake -, meson -, vim -, ruby -, which -, fetchFromGitHub -, fetchurl -, fetchpatch -, llvmPackages -, rustPlatform + + # nixpkgs functions , buildGoModule -, pkg-config -, curl -, openssl -, libgit2 -, libiconv -, xkb-switch -, fzf -, skim -, stylish-haskell +, buildVimPluginFrom2Nix +, fetchFromGitHub +, fetchpatch +, fetchurl +, substituteAll + + # Language dependencies +, python , python3 +, rustPlatform + + # Misc dependencies +, Cocoa +, code-minimap +, dasht +, direnv +, fzf +, gnome3 +, khard +, languagetool +, llvmPackages +, meson +, nim +, nodePackages +, skim +, sqlite +, stylish-haskell +, tabnine +, vim +, which +, xkb-switch +, ycmd + + # command-t dependencies +, rake +, ruby + + # cpsm dependencies , boost +, cmake , icu , ncurses -, ycmd -, rake -, gobject-introspection -, glib -, wrapGAppsHook -, substituteAll -, languagetool -, tabnine -, Cocoa + # LanguageClient-neovim dependencies , CoreFoundation , CoreServices -, buildVimPluginFrom2Nix -, nodePackages -, dasht -, sqlite -, code-minimap + # sved dependencies +, glib +, gobject-introspection +, wrapGAppsHook - # deoplete-khard dependency -, khard + # vim-clap dependencies +, curl +, libgit2 +, libiconv +, openssl +, pkg-config - # vim-go dependencies +# vim-go dependencies , asmfmt , delve , errcheck -, godef -, golint -, gomodifytags -, gotags -, gotools -, go-motion , gnused -, reftools -, gogetdoc -, golangci-lint -, impl -, iferr +, go-motion +, go-tools , gocode , gocode-gomod -, go-tools +, godef +, gogetdoc +, golangci-lint +, golint +, gomodifytags , gopls - - # direnv-vim dependencies -, direnv - - # vCoolor dependency -, gnome3 - - # fruzzy dependency -, nim +, gotags +, gotools +, iferr +, impl +, reftools }: self: super: { - vim2nix = buildVimPluginFrom2Nix { - pname = "vim2nix"; - version = "1.0"; - src = ./vim2nix; - dependencies = with super; [ vim-addon-manager ]; - }; - - # Mainly used as a dependency for fzf-vim. Wraps the fzf program as a vim - # plugin, since part of the fzf vim plugin is included in the main fzf - # program. - fzfWrapper = buildVimPluginFrom2Nix { - inherit (fzf) src version; - pname = "fzf"; - postInstall = '' - ln -s ${fzf}/bin/fzf $target/bin/fzf - ''; - }; - - skim = buildVimPluginFrom2Nix { - pname = "skim"; - version = skim.version; - src = skim.vim; - }; - - LanguageClient-neovim = - let - version = "0.1.161"; - LanguageClient-neovim-src = fetchFromGitHub { - owner = "autozimu"; - repo = "LanguageClient-neovim"; - rev = version; - sha256 = "Z9S2ie9RxJCIbmjSV/Tto4lK04cZfWmK3IAy8YaySVI="; - }; - LanguageClient-neovim-bin = rustPlatform.buildRustPackage { - pname = "LanguageClient-neovim-bin"; - inherit version; - src = LanguageClient-neovim-src; - - cargoSha256 = "H34UqJ6JOwuSABdOup5yKeIwFrGc83TUnw1ggJEx9o4="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; - - # FIXME: Use impure version of CoreFoundation because of missing symbols. - # Undefined symbols for architecture x86_64: "_CFURLResourceIsReachable" - preConfigure = lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS="-F${CoreFoundation}/Library/Frameworks -framework CoreFoundation $NIX_LDFLAGS" - ''; - }; - in - buildVimPluginFrom2Nix { - pname = "LanguageClient-neovim"; - inherit version; - src = LanguageClient-neovim-src; - - propagatedBuildInputs = [ LanguageClient-neovim-bin ]; - - preFixup = '' - substituteInPlace "$out"/share/vim-plugins/LanguageClient-neovim/autoload/LanguageClient.vim \ - --replace "let l:path = s:root . '/bin/'" "let l:path = '${LanguageClient-neovim-bin}' . '/bin/'" - ''; - }; - clang_complete = super.clang_complete.overrideAttrs (old: { # In addition to the arguments you pass to your compiler, you also need to # specify the path of the C++ std header (if you are using C++). @@ -156,14 +101,6 @@ self: super: { ''; }); - direnv-vim = super.direnv-vim.overrideAttrs (oa: { - preFixup = oa.preFixup or "" + '' - substituteInPlace $out/share/vim-plugins/direnv-vim/autoload/direnv.vim \ - --replace "let s:direnv_cmd = get(g:, 'direnv_cmd', 'direnv')" \ - "let s:direnv_cmd = get(g:, 'direnv_cmd', '${lib.getBin direnv}/bin/direnv')" - ''; - }); - clighter8 = super.clighter8.overrideAttrs (old: { preFixup = '' sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc.lib}/lib/libclang.so')|" \ @@ -179,6 +116,24 @@ self: super: { ''; }); + compe-tabnine = super.compe-tabnine.overrideAttrs (old: { + buildInputs = [ tabnine ]; + + postFixup = '' + mkdir $target/binaries + ln -s ${tabnine}/bin/TabNine $target/binaries/TabNine_$(uname -s) + ''; + }); + + completion-tabnine = super.completion-tabnine.overrideAttrs (old: { + buildInputs = [ tabnine ]; + + postFixup = '' + mkdir $target/binaries + ln -s ${tabnine}/bin/TabNine $target/binaries/TabNine_$(uname -s) + ''; + }); + cpsm = super.cpsm.overrideAttrs (old: { buildInputs = [ python3 @@ -232,6 +187,14 @@ self: super: { }; }); + direnv-vim = super.direnv-vim.overrideAttrs (oa: { + preFixup = oa.preFixup or "" + '' + substituteInPlace $out/share/vim-plugins/direnv-vim/autoload/direnv.vim \ + --replace "let s:direnv_cmd = get(g:, 'direnv_cmd', 'direnv')" \ + "let s:direnv_cmd = get(g:, 'direnv_cmd', '${lib.getBin direnv}/bin/direnv')" + ''; + }); + ensime-vim = super.ensime-vim.overrideAttrs (old: { passthru.python3Dependencies = ps: with ps; [ sexpdata websocket_client ]; dependencies = with super; [ vimproc-vim vimshell-vim super.self forms ]; @@ -276,22 +239,93 @@ self: super: { ''; }); + fzf-vim = super.fzf-vim.overrideAttrs (old: { + dependencies = [ self.fzfWrapper ]; + }); + + # Mainly used as a dependency for fzf-vim. Wraps the fzf program as a vim + # plugin, since part of the fzf vim plugin is included in the main fzf + # program. + fzfWrapper = buildVimPluginFrom2Nix { + inherit (fzf) src version; + pname = "fzf"; + postInstall = '' + ln -s ${fzf}/bin/fzf $target/bin/fzf + ''; + }; + ghcid = super.ghcid.overrideAttrs (old: { configurePhase = "cd plugins/nvim"; }); - vimsence = super.vimsence.overrideAttrs (old: { - meta = with lib; { - description = "Discord rich presence for Vim"; - homepage = "https://github.com/hugolgst/vimsence"; - maintainers = with lib.maintainers; [ hugolgst ]; + jedi-vim = super.jedi-vim.overrideAttrs (old: { + # checking for python3 support in vim would be neat, too, but nobody else seems to care + buildInputs = [ python3.pkgs.jedi ]; + meta = { + description = "code-completion for python using python-jedi"; + license = lib.licenses.mit; }; }); - vim-gist = super.vim-gist.overrideAttrs (old: { - dependencies = with super; [ webapi-vim ]; + LanguageClient-neovim = + let + version = "0.1.161"; + LanguageClient-neovim-src = fetchFromGitHub { + owner = "autozimu"; + repo = "LanguageClient-neovim"; + rev = version; + sha256 = "Z9S2ie9RxJCIbmjSV/Tto4lK04cZfWmK3IAy8YaySVI="; + }; + LanguageClient-neovim-bin = rustPlatform.buildRustPackage { + pname = "LanguageClient-neovim-bin"; + inherit version; + src = LanguageClient-neovim-src; + + cargoSha256 = "H34UqJ6JOwuSABdOup5yKeIwFrGc83TUnw1ggJEx9o4="; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + + # FIXME: Use impure version of CoreFoundation because of missing symbols. + # Undefined symbols for architecture x86_64: "_CFURLResourceIsReachable" + preConfigure = lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS="-F${CoreFoundation}/Library/Frameworks -framework CoreFoundation $NIX_LDFLAGS" + ''; + }; + in + buildVimPluginFrom2Nix { + pname = "LanguageClient-neovim"; + inherit version; + src = LanguageClient-neovim-src; + + propagatedBuildInputs = [ LanguageClient-neovim-bin ]; + + preFixup = '' + substituteInPlace "$out"/share/vim-plugins/LanguageClient-neovim/autoload/LanguageClient.vim \ + --replace "let l:path = s:root . '/bin/'" "let l:path = '${LanguageClient-neovim-bin}' . '/bin/'" + ''; + }; + + lens-vim = super.lens-vim.overrideAttrs (old: { + # remove duplicate g:lens#animate in doc/lens.txt + # https://github.com/NixOS/nixpkgs/pull/105810#issuecomment-740007985 + # https://github.com/camspiers/lens.vim/pull/40/files + patches = [ + (substituteAll { + src = ./patches/lens-vim/remove_duplicate_g_lens_animate.patch; + inherit languagetool; + }) + ]; }); + lf-vim = super.lf-vim.overrideAttrs (old: { + dependencies = with super; [ vim-floaterm ]; + }); + + meson = buildVimPluginFrom2Nix { + inherit (meson) pname version src; + preInstall = "cd data/syntax-highlighting/vim"; + meta.maintainers = with lib.maintainers; [ vcunat ]; + }; + minimap-vim = super.minimap-vim.overrideAttrs (old: { preFixup = '' substituteInPlace $out/share/vim-plugins/minimap-vim/plugin/minimap.vim \ @@ -301,12 +335,6 @@ self: super: { ''; }); - meson = buildVimPluginFrom2Nix { - inherit (meson) pname version src; - preInstall = "cd data/syntax-highlighting/vim"; - meta.maintainers = with lib.maintainers; [ vcunat ]; - }; - ncm2 = super.ncm2.overrideAttrs (old: { dependencies = with super; [ nvim-yarp ]; }); @@ -336,14 +364,16 @@ self: super: { dependencies = with super; [ popfix ]; }); - fzf-vim = super.fzf-vim.overrideAttrs (old: { - dependencies = [ self.fzfWrapper ]; - }); - onehalf = super.onehalf.overrideAttrs (old: { configurePhase = "cd vim"; }); + skim = buildVimPluginFrom2Nix { + pname = "skim"; + version = skim.version; + src = skim.vim; + }; + skim-vim = super.skim-vim.overrideAttrs (old: { dependencies = [ self.skim ]; }); @@ -384,30 +414,60 @@ self: super: { }; }); - vimacs = super.vimacs.overrideAttrs (old: { - buildPhase = '' - substituteInPlace bin/vim \ - --replace '/usr/bin/vim' 'vim' \ - --replace '/usr/bin/gvim' 'gvim' - # remove unnecessary duplicated bin wrapper script - rm -r plugin/vimacs - ''; - meta = with lib; { - description = "Vim-Improved eMACS: Emacs emulation plugin for Vim"; - homepage = "http://algorithm.com.au/code/vimacs"; - license = licenses.gpl2Plus; - maintainers = with lib.maintainers; [ millerjason ]; + telescope-frecency-nvim = super.telescope-frecency-nvim.overrideAttrs (old: { + dependencies = [ self.sql-nvim ]; + }); + + telescope-fzy-native-nvim = super.telescope-fzy-native-nvim.overrideAttrs (old: { + preFixup = + let + fzy-lua-native-path = "deps/fzy-lua-native"; + fzy-lua-native = + stdenv.mkDerivation { + name = "fzy-lua-native"; + src = "${old.src}/${fzy-lua-native-path}"; + # remove pre-compiled binaries + preBuild = "rm -rf static/*"; + installPhase = '' + install -Dm 444 -t $out/static static/* + install -Dm 444 -t $out/lua lua/* + ''; + }; + in + '' + rm -rf $target/${fzy-lua-native-path}/* + ln -s ${fzy-lua-native}/static $target/${fzy-lua-native-path}/static + ln -s ${fzy-lua-native}/lua $target/${fzy-lua-native-path}/lua + ''; + meta.platforms = lib.platforms.all; + }); + + unicode-vim = + let + unicode-data = fetchurl { + url = "http://www.unicode.org/Public/UNIDATA/UnicodeData.txt"; + sha256 = "16b0jzvvzarnlxdvs2izd5ia0ipbd87md143dc6lv6xpdqcs75s9"; + }; + in + super.unicode-vim.overrideAttrs (old: { + + # redirect to /dev/null else changes terminal color + buildPhase = '' + cp "${unicode-data}" autoload/unicode/UnicodeData.txt + echo "Building unicode cache" + ${vim}/bin/vim --cmd ":set rtp^=$PWD" -c 'ru plugin/unicode.vim' -c 'UnicodeCache' -c ':echohl Normal' -c ':q' > /dev/null + ''; + }); + + vCoolor-vim = super.vCoolor-vim.overrideAttrs (old: { + # on linux can use either Zenity or Yad. + propagatedBuildInputs = [ gnome3.zenity ]; + meta = { + description = "Simple color selector/picker plugin"; + license = lib.licenses.publicDomain; }; }); - vimshell-vim = super.vimshell-vim.overrideAttrs (old: { - dependencies = with super; [ vimproc-vim ]; - }); - - vim-addon-manager = super.vim-addon-manager.overrideAttrs (old: { - buildInputs = lib.optional stdenv.isDarwin Cocoa; - }); - vim-addon-actions = super.vim-addon-actions.overrideAttrs (old: { dependencies = with super; [ vim-addon-mw-utils tlib_vim ]; }); @@ -428,6 +488,10 @@ self: super: { dependencies = with super; [ tlib_vim ]; }); + vim-addon-manager = super.vim-addon-manager.overrideAttrs (old: { + buildInputs = lib.optional stdenv.isDarwin Cocoa; + }); + vim-addon-mru = super.vim-addon-mru.overrideAttrs (old: { dependencies = with super; [ vim-addon-other vim-addon-mw-utils ]; }); @@ -467,6 +531,36 @@ self: super: { passthru.python3Dependencies = ps: with ps; [ beancount ]; }); + vim-clap = super.vim-clap.overrideAttrs (old: { + preFixup = + let + maple-bin = rustPlatform.buildRustPackage { + name = "maple"; + src = old.src; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + CoreServices + curl + libgit2 + libiconv + ]; + + cargoSha256 = "25UkYKhlGmlDg4fz1jZHjpQn5s4k5FKlFK0MU8YM5SE="; + }; + in + '' + ln -s ${maple-bin}/bin/maple $target/bin/maple + ''; + + meta.platforms = lib.platforms.all; + }); + vim-closer = super.vim-closer.overrideAttrs (old: { patches = [ # Fix duplicate tag in doc @@ -533,6 +627,10 @@ self: super: { ''; }); + vim-gist = super.vim-gist.overrideAttrs (old: { + dependencies = with super; [ webapi-vim ]; + }); + vim-grammarous = super.vim-grammarous.overrideAttrs (old: { # use `:GrammarousCheck` to initialize checking # In neovim, you also want to use set @@ -546,16 +644,20 @@ self: super: { ]; }); - lens-vim = super.lens-vim.overrideAttrs (old: { - # remove duplicate g:lens#animate in doc/lens.txt - # https://github.com/NixOS/nixpkgs/pull/105810#issuecomment-740007985 - # https://github.com/camspiers/lens.vim/pull/40/files - patches = [ - (substituteAll { - src = ./patches/lens-vim/remove_duplicate_g_lens_animate.patch; - inherit languagetool; - }) - ]; + vim-hexokinase = super.vim-hexokinase.overrideAttrs (old: { + preFixup = + let + hexokinase = buildGoModule { + name = "hexokinase"; + src = old.src + "/hexokinase"; + vendorSha256 = "pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + }; + in + '' + ln -s ${hexokinase}/bin/hexokinase $target/hexokinase/hexokinase + ''; + + meta.platforms = lib.platforms.all; }); vim-hier = super.vim-hier.overrideAttrs (old: { @@ -593,6 +695,13 @@ self: super: { dependencies = with super; [ vim-addon-mw-utils tlib_vim ]; }); + vim-stylish-haskell = super.vim-stylish-haskell.overrideAttrs (old: { + postPatch = old.postPatch or "" + '' + substituteInPlace ftplugin/haskell/stylish-haskell.vim --replace \ + 'g:stylish_haskell_command = "stylish-haskell"' \ + 'g:stylish_haskell_command = "${stylish-haskell}/bin/stylish-haskell"' + ''; + }); vim-wakatime = super.vim-wakatime.overrideAttrs (old: { buildInputs = [ python ]; @@ -617,6 +726,37 @@ self: super: { ''; }); + vim2nix = buildVimPluginFrom2Nix { + pname = "vim2nix"; + version = "1.0"; + src = ./vim2nix; + dependencies = with super; [ vim-addon-manager ]; + }; + + vimacs = super.vimacs.overrideAttrs (old: { + buildPhase = '' + substituteInPlace bin/vim \ + --replace '/usr/bin/vim' 'vim' \ + --replace '/usr/bin/gvim' 'gvim' + # remove unnecessary duplicated bin wrapper script + rm -r plugin/vimacs + ''; + meta = with lib; { + description = "Vim-Improved eMACS: Emacs emulation plugin for Vim"; + homepage = "http://algorithm.com.au/code/vimacs"; + license = licenses.gpl2Plus; + maintainers = with lib.maintainers; [ millerjason ]; + }; + }); + + vimsence = super.vimsence.overrideAttrs (old: { + meta = with lib; { + description = "Discord rich presence for Vim"; + homepage = "https://github.com/hugolgst/vimsence"; + maintainers = with lib.maintainers; [ hugolgst ]; + }; + }); + vimproc-vim = super.vimproc-vim.overrideAttrs (old: { buildInputs = [ which ]; @@ -629,6 +769,10 @@ self: super: { ''; }); + vimshell-vim = super.vimshell-vim.overrideAttrs (old: { + dependencies = with super; [ vimproc-vim ]; + }); + YankRing-vim = super.YankRing-vim.overrideAttrs (old: { sourceRoot = "."; }); @@ -652,145 +796,6 @@ self: super: { }; }); - jedi-vim = super.jedi-vim.overrideAttrs (old: { - # checking for python3 support in vim would be neat, too, but nobody else seems to care - buildInputs = [ python3.pkgs.jedi ]; - meta = { - description = "code-completion for python using python-jedi"; - license = lib.licenses.mit; - }; - }); - - lf-vim = super.lf-vim.overrideAttrs (old: { - dependencies = with super; [ vim-floaterm ]; - }); - - vim-stylish-haskell = super.vim-stylish-haskell.overrideAttrs (old: { - postPatch = old.postPatch or "" + '' - substituteInPlace ftplugin/haskell/stylish-haskell.vim --replace \ - 'g:stylish_haskell_command = "stylish-haskell"' \ - 'g:stylish_haskell_command = "${stylish-haskell}/bin/stylish-haskell"' - ''; - }); - - vCoolor-vim = super.vCoolor-vim.overrideAttrs (old: { - # on linux can use either Zenity or Yad. - propagatedBuildInputs = [ gnome3.zenity ]; - meta = { - description = "Simple color selector/picker plugin"; - license = lib.licenses.publicDomain; - }; - }); - - unicode-vim = - let - unicode-data = fetchurl { - url = "http://www.unicode.org/Public/UNIDATA/UnicodeData.txt"; - sha256 = "16b0jzvvzarnlxdvs2izd5ia0ipbd87md143dc6lv6xpdqcs75s9"; - }; - in - super.unicode-vim.overrideAttrs (old: { - - # redirect to /dev/null else changes terminal color - buildPhase = '' - cp "${unicode-data}" autoload/unicode/UnicodeData.txt - echo "Building unicode cache" - ${vim}/bin/vim --cmd ":set rtp^=$PWD" -c 'ru plugin/unicode.vim' -c 'UnicodeCache' -c ':echohl Normal' -c ':q' > /dev/null - ''; - }); - - vim-hexokinase = super.vim-hexokinase.overrideAttrs (old: { - preFixup = - let - hexokinase = buildGoModule { - name = "hexokinase"; - src = old.src + "/hexokinase"; - vendorSha256 = "pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; - }; - in - '' - ln -s ${hexokinase}/bin/hexokinase $target/hexokinase/hexokinase - ''; - - meta.platforms = lib.platforms.all; - }); - - vim-clap = super.vim-clap.overrideAttrs (old: { - preFixup = - let - maple-bin = rustPlatform.buildRustPackage { - name = "maple"; - src = old.src; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ - CoreServices - curl - libgit2 - libiconv - ]; - - cargoSha256 = "25UkYKhlGmlDg4fz1jZHjpQn5s4k5FKlFK0MU8YM5SE="; - }; - in - '' - ln -s ${maple-bin}/bin/maple $target/bin/maple - ''; - - meta.platforms = lib.platforms.all; - }); - - compe-tabnine = super.compe-tabnine.overrideAttrs (old: { - buildInputs = [ tabnine ]; - - postFixup = '' - mkdir $target/binaries - ln -s ${tabnine}/bin/TabNine $target/binaries/TabNine_$(uname -s) - ''; - }); - - completion-tabnine = super.completion-tabnine.overrideAttrs (old: { - buildInputs = [ tabnine ]; - - postFixup = '' - mkdir $target/binaries - ln -s ${tabnine}/bin/TabNine $target/binaries/TabNine_$(uname -s) - ''; - }); - - telescope-frecency-nvim = super.telescope-frecency-nvim.overrideAttrs (old: { - dependencies = [ self.sql-nvim ]; - }); - - telescope-fzy-native-nvim = super.telescope-fzy-native-nvim.overrideAttrs (old: { - preFixup = - let - fzy-lua-native-path = "deps/fzy-lua-native"; - fzy-lua-native = - stdenv.mkDerivation { - name = "fzy-lua-native"; - src = "${old.src}/${fzy-lua-native-path}"; - # remove pre-compiled binaries - preBuild = "rm -rf static/*"; - installPhase = '' - install -Dm 444 -t $out/static static/* - install -Dm 444 -t $out/lua lua/* - ''; - }; - in - '' - rm -rf $target/${fzy-lua-native-path}/* - ln -s ${fzy-lua-native}/static $target/${fzy-lua-native-path}/static - ln -s ${fzy-lua-native}/lua $target/${fzy-lua-native-path}/lua - ''; - meta.platforms = lib.platforms.all; - }); - } // ( let nodePackageNames = [ 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 8cb03c52ce..f0f2e26019 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -63,6 +63,7 @@ christoomey/vim-sort-motion christoomey/vim-tmux-navigator chuling/ci_dark ckarnell/antonys-macro-repeater +clojure-vim/vim-jack-in cloudhead/neovim-fuzzy CoatiSoftware/vim-sourcetrail cocopon/iceberg.vim @@ -272,6 +273,7 @@ keith/rspec.vim keith/swift.vim kevinhwang91/nvim-bqf@main kevinhwang91/nvim-hlslens@main +kevinhwang91/rnvimr kien/rainbow_parentheses.vim knubie/vim-kitty-navigator konfekt/fastfold @@ -287,6 +289,7 @@ kshenoy/vim-signature kyazdani42/nvim-tree.lua kyazdani42/nvim-web-devicons lambdalisue/fern.vim +lambdalisue/gina.vim lambdalisue/vim-gista lambdalisue/vim-manpager lambdalisue/vim-pager @@ -483,6 +486,8 @@ prabirshrestha/vim-lsp preservim/nerdcommenter preservim/nerdtree preservim/tagbar +preservim/vim-pencil +preservim/vim-wordy preservim/vimux psliwka/vim-smoothie ptzz/lf.vim @@ -493,6 +498,7 @@ qnighy/lalrpop.vim qpkorr/vim-bufkill Quramy/tsuquyomi racer-rust/vim-racer +radenling/vim-dispatch-neovim rafaqz/ranger.vim rafi/awesome-vim-colorschemes raghur/fruzzy @@ -501,8 +507,6 @@ Raimondi/delimitMate rakr/vim-one rbgrouleff/bclose.vim rbong/vim-flog -reedes/vim-pencil -reedes/vim-wordy rhysd/committia.vim rhysd/devdocs.vim rhysd/git-messenger.vim @@ -578,6 +582,7 @@ sunaku/vim-dasht svermeulen/vim-subversive t9md/vim-choosewin t9md/vim-smalls +TaDaa/vimade takac/vim-hardtime tami5/compe-conjure tami5/lispdocs.nvim @@ -589,6 +594,7 @@ terryma/vim-multiple-cursors tex/vimpreviewpandoc Th3Whit3Wolf/one-nvim@main theHamsta/nvim-dap-virtual-text +ThePrimeagen/git-worktree.nvim ThePrimeagen/vim-apm thinca/vim-ft-diff_fold thinca/vim-prettyprint diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix index fd66c48ecb..c55e8aa0a0 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, vim, vimPlugins, vim_configurable, neovim, buildEnv, writeText, writeScriptBin +# tests available at pkgs/test/vim +{ lib, stdenv, vim, vimPlugins, vim_configurable, buildEnv, writeText, writeScriptBin , nix-prefetch-hg, nix-prefetch-git , fetchFromGitHub, runtimeShell }: @@ -183,13 +184,49 @@ let rtpPath = "share/vim-plugins"; + nativeImpl = packages: lib.optionalString (packages != null) + (let + link = (packageName: dir: pluginPath: "ln -sf ${pluginPath}/share/vim-plugins/* $out/pack/${packageName}/${dir}"); + packageLinks = (packageName: {start ? [], opt ? []}: + let + # `nativeImpl` expects packages to be derivations, not strings (as + # opposed to older implementations that have to maintain backwards + # compatibility). Therefore we don't need to deal with "knownPlugins" + # and can simply pass `null`. + depsOfOptionalPlugins = lib.subtractLists opt (findDependenciesRecursively opt); + startWithDeps = findDependenciesRecursively start; + in + [ "mkdir -p $out/pack/${packageName}/start" ] + # To avoid confusion, even dependencies of optional plugins are added + # to `start` (except if they are explicitly listed as optional plugins). + ++ (builtins.map (link packageName "start") (lib.unique (startWithDeps ++ depsOfOptionalPlugins))) + ++ ["mkdir -p $out/pack/${packageName}/opt"] + ++ (builtins.map (link packageName "opt") opt) + ); + packDir = (packages: + stdenv.mkDerivation { + name = "vim-pack-dir"; + src = ./.; + installPhase = lib.concatStringsSep "\n" (lib.flatten (lib.mapAttrsToList packageLinks packages)); + preferLocalBuild = true; + } + ); + in + '' + set packpath^=${packDir packages} + set runtimepath^=${packDir packages} + ''); + vimrcContent = { packages ? null, vam ? null, pathogen ? null, plug ? null, - beforePlugins ? "", - customRC ? "" + beforePlugins ? '' + " configuration generated by NIX + set nocompatible + '', + customRC ? null }: let @@ -301,56 +338,16 @@ let call vam#Scripts(l, {}) ''); - nativeImpl = lib.optionalString (packages != null) - (let - link = (packageName: dir: pluginPath: "ln -sf ${pluginPath}/share/vim-plugins/* $out/pack/${packageName}/${dir}"); - packageLinks = (packageName: {start ? [], opt ? []}: - let - # `nativeImpl` expects packages to be derivations, not strings (as - # opposed to older implementations that have to maintain backwards - # compatibility). Therefore we don't need to deal with "knownPlugins" - # and can simply pass `null`. - depsOfOptionalPlugins = lib.subtractLists opt (findDependenciesRecursively opt); - startWithDeps = findDependenciesRecursively start; - in - ["mkdir -p $out/pack/${packageName}/start"] - # To avoid confusion, even dependencies of optional plugins are added - # to `start` (except if they are explicitly listed as optional plugins). - ++ (builtins.map (link packageName "start") (lib.unique (startWithDeps ++ depsOfOptionalPlugins))) - ++ ["mkdir -p $out/pack/${packageName}/opt"] - ++ (builtins.map (link packageName "opt") opt) - ); - packDir = (packages: - stdenv.mkDerivation { - name = "vim-pack-dir"; - src = ./.; - installPhase = lib.concatStringsSep - "\n" - (lib.flatten (lib.mapAttrsToList packageLinks packages)); - preferLocalBuild = true; - } - ); - in - '' - set packpath^=${packDir packages} - set runtimepath^=${packDir packages} + entries = [ + beforePlugins + vamImpl pathogenImpl plugImpl + (nativeImpl packages) + customRC + ]; - filetype indent plugin on | syn on - ''); + in + lib.concatStringsSep "\n" (lib.filter (x: x != null && x != "") entries); - in '' - " configuration generated by NIX - set nocompatible - - ${beforePlugins} - - ${vamImpl} - ${pathogenImpl} - ${plugImpl} - ${nativeImpl} - - ${customRC} - ''; vimrcFile = settings: writeText "vimrc" (vimrcContent settings); in @@ -448,8 +445,6 @@ rec { ''; }; - vim_with_vim2nix = vim_configurable.customize { name = "vim"; vimrcConfig.vam.pluginDictionaries = [ "vim-addon-vim2nix" ]; }; - inherit (import ./build-vim-plugin.nix { inherit lib stdenv rtpPath vim; }) buildVimPlugin buildVimPluginFrom2Nix; # used to figure out which python dependencies etc. neovim needs @@ -475,62 +470,4 @@ rec { nativePlugins = lib.concatMap ({start?[], opt?[], knownPlugins?vimPlugins}: start++opt) nativePluginsConfigs; in nativePlugins ++ nonNativePlugins; - - - # test cases: - test_vim_with_vim_nix_using_vam = vim_configurable.customize { - name = "vim-with-vim-addon-nix-using-vam"; - vimrcConfig.vam.pluginDictionaries = [{name = "vim-nix"; }]; - }; - - test_vim_with_vim_nix_using_pathogen = vim_configurable.customize { - name = "vim-with-vim-addon-nix-using-pathogen"; - vimrcConfig.pathogen.pluginNames = [ "vim-nix" ]; - }; - - test_vim_with_vim_nix_using_plug = vim_configurable.customize { - name = "vim-with-vim-addon-nix-using-plug"; - vimrcConfig.plug.plugins = with vimPlugins; [ vim-nix ]; - }; - - test_vim_with_vim_nix = vim_configurable.customize { - name = "vim-with-vim-addon-nix"; - vimrcConfig.packages.myVimPackage.start = with vimPlugins; [ vim-nix ]; - }; - - # only neovim makes use of `requiredPlugins`, test this here - test_nvim_with_vim_nix_using_pathogen = neovim.override { - configure.pathogen.pluginNames = [ "vim-nix" ]; - }; - - # regression test for https://github.com/NixOS/nixpkgs/issues/53112 - # The user may have specified their own plugins which may not be formatted - # exactly as the generated ones. In particular, they may not have the `pname` - # attribute. - test_vim_with_custom_plugin = vim_configurable.customize { - name = "vim_with_custom_plugin"; - vimrcConfig.vam.knownPlugins = - vimPlugins // ({ - vim-trailing-whitespace = buildVimPluginFrom2Nix { - name = "vim-trailing-whitespace"; - src = fetchFromGitHub { - owner = "bronson"; - repo = "vim-trailing-whitespace"; - rev = "4c596548216b7c19971f8fc94e38ef1a2b55fee6"; - sha256 = "0f1cpnp1nxb4i5hgymjn2yn3k1jwkqmlgw1g02sq270lavp2dzs9"; - }; - # make sure string dependencies are handled - dependencies = [ "vim-nix" ]; - }; - }); - vimrcConfig.vam.pluginDictionaries = [ { names = [ "vim-trailing-whitespace" ]; } ]; - }; - - # system remote plugin manifest should be generated, deoplete should be usable - # without the user having to do `UpdateRemotePlugins`. To test, launch neovim - # and do `:call deoplete#enable()`. It will print an error if the remote - # plugin is not registered. - test_nvim_with_remote_plugin = neovim.override { - configure.pathogen.pluginNames = with vimPlugins; [ deoplete-nvim ]; - }; } diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix index c49c2b89db..708041897c 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix @@ -279,6 +279,23 @@ let }; }; + editorconfig.editorconfig = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "EditorConfig"; + publisher = "EditorConfig"; + version = "0.16.4"; + sha256 = "0fa4h9hk1xq6j3zfxvf483sbb4bd17fjl5cdm3rll7z9kaigdqwg"; + }; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/EditorConfig.EditorConfig/changelog"; + description = "EditorConfig Support for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=EditorConfig.EditorConfig"; + homepage = "https://github.com/editorconfig/editorconfig-vscode"; + license = licenses.mit; + maintainers = with maintainers; [ dbirks ]; + }; + }; + edonet.vscode-command-runner = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-command-runner"; @@ -525,6 +542,23 @@ let }; }; + iciclesoft.workspacesort = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "workspacesort"; + publisher = "iciclesoft"; + version = "1.6.0"; + sha256 = "1pbk8kflywll6lqhmffz9yjf01dn8xq8sk6rglnfn2kl2ildfhh6"; + }; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/iciclesoft.workspacesort/changelog"; + description = "Sort workspace-folders alphabetically rather than in chronological order"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=iciclesoft.workspacesort"; + homepage = "https://github.com/iciclesoft/workspacesort-for-VSCode"; + license = licenses.mit; + maintainers = with maintainers; [ dbirks ]; + }; + }; + james-yu.latex-workshop = buildVscodeMarketplaceExtension { mktplcRef = { name = "latex-workshop"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/afuse/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/afuse/default.nix index 7375f45eb6..75c44e1117 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/afuse/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/afuse/default.nix @@ -11,11 +11,18 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fuse ]; + postPatch = lib.optionalString stdenv.isDarwin '' + # Fix the build on macOS with macFUSE installed + substituteInPlace configure.ac --replace \ + 'export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH' \ + "" + ''; + meta = { description = "Automounter in userspace"; homepage = "https://github.com/pcarrier/afuse"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.marcweber ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bcc/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/bcc/default.nix index 290e3b5618..4235ecb38d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/bcc/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/bcc/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchFromGitHub , makeWrapper, cmake, llvmPackages, kernel , flex, bison, elfutils, python, luajit, netperf, iperf, libelf -, systemtap, bash +, systemtap, bash, libbpf }: python.pkgs.buildPythonApplication rec { @@ -10,9 +10,11 @@ python.pkgs.buildPythonApplication rec { disabled = !stdenv.isLinux; - src = fetchurl { - url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"; - sha256 = "sha256-TEH8Gmp+8ghLQ8UsGy5hBCMLqfMeApWEFr8THYSOdOQ="; + src = fetchFromGitHub { + owner = "iovisor"; + repo = "bcc"; + rev = "v${version}"; + sha256 = "sha256:0k807vzznlb2icczw64ph6q28605kvghya2kd4h3c7jmap6gq1qg"; }; format = "other"; @@ -20,6 +22,7 @@ python.pkgs.buildPythonApplication rec { llvm clang-unwrapped kernel elfutils luajit netperf iperf systemtap.stapBuild flex bash + libbpf ]; patches = [ @@ -38,6 +41,7 @@ python.pkgs.buildPythonApplication rec { "-DREVISION=${version}" "-DENABLE_USDT=ON" "-DENABLE_CPP_API=ON" + "-DCMAKE_USE_LIBBPF_PACKAGE=ON" ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/btfs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/btfs/default.nix index 70864b311d..342272f428 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/btfs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/btfs/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/johang/btfs"; license = licenses.gpl3; maintainers = with maintainers; [ rnhmjoj ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dropwatch/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/dropwatch/default.nix index 288dea85cc..c2701c0571 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/dropwatch/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/dropwatch/default.nix @@ -1,30 +1,47 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config -, libnl, readline, libbfd, ncurses, zlib }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, libbfd +, libnl +, libpcap +, ncurses +, readline +, zlib +}: stdenv.mkDerivation rec { pname = "dropwatch"; - version = "1.5.1"; + version = "1.5.3"; src = fetchFromGitHub { owner = "nhorman"; repo = pname; rev = "v${version}"; - sha256 = "1qmax0l7z1qik42c949fnvjh5r6awk4gpgzdsny8iwnmwzjyp8b8"; + sha256 = "0axx0zzrs7apqnl0r70jyvmgk7cs5wk185id479mapgngibwkyxy"; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libbfd libnl ncurses readline zlib ]; - - # To avoid running into https://sourceware.org/bugzilla/show_bug.cgi?id=14243 we need to define: - NIX_CFLAGS_COMPILE = "-DPACKAGE=${pname} -DPACKAGE_VERSION=${version}"; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + buildInputs = [ + libbfd + libnl + libpcap + ncurses + readline + zlib + ]; enableParallelBuilding = true; meta = with lib; { description = "Linux kernel dropped packet monitor"; homepage = "https://github.com/nhorman/dropwatch"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.c0bw3b ]; + maintainers = with maintainers; [ c0bw3b ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/isgx/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/isgx/default.nix index 1806916b14..3e551e5591 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/isgx/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/isgx/default.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation rec { url = "https://github.com/intel/linux-sgx-driver/commit/276c5c6a064d22358542f5e0aa96b1c0ace5d695.patch"; sha256 = "sha256-PmchqYENIbnJ51G/tkdap/g20LUrJEoQ4rDtqy6hj24="; }) + # Fixes detection with kernel >= 5.11 + (fetchpatch { + url = "https://github.com/intel/linux-sgx-driver/commit/ed2c256929962db1a8805db53bed09bb8f2f4de3.patch"; + sha256 = "sha256-MRbgS4U8FTCP1J1n+rhsvbXxKDytfl6B7YlT9Izq05U="; + }) ]; hardeningDisable = [ "pic" ]; @@ -46,8 +51,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/intel/linux-sgx-driver"; license = with licenses; [ bsd3 /* OR */ gpl2Only ]; maintainers = with maintainers; [ oxalica ]; - platforms = platforms.linux; - # The driver is already in kernel >= 5.11.0. - broken = kernelAtLeast "5.11.0"; + platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix index 008205f5b1..1e20cf6105 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix @@ -715,7 +715,6 @@ let MD = yes; # Device mapper (RAID, LVM, etc.) # Enable initrd support. - BLK_DEV_RAM = yes; BLK_DEV_INITRD = yes; PM_TRACE_RTC = no; # Disable some expensive (?) features. diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json index 9580836ced..990262ed4d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -7,26 +7,26 @@ }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.186-hardened1.patch", - "sha256": "01f8scgr3shjxl6w7jqyvb38idrs0m53cafpplvz1q69axaf9gy6", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.186-hardened1/linux-hardened-4.19.186-hardened1.patch" + "name": "linux-hardened-4.19.187-hardened1.patch", + "sha256": "1vw05qff7hvzl7krcf5kh0ynyy5gljps8qahr4jm0hsd69lmn0qk", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.187-hardened1/linux-hardened-4.19.187-hardened1.patch" }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.29-hardened1.patch", - "sha256": "0aj46a6bhfgn8czpmaqpnggmxzfqz29kmh9kif4v3a546q5mrq7n", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.29-hardened1/linux-hardened-5.10.29-hardened1.patch" + "name": "linux-hardened-5.10.30-hardened1.patch", + "sha256": "0sxxzrhj41pxk01s2bcfwb47aab2by1zc7yyx9859rslq7dg5aly", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.30-hardened1/linux-hardened-5.10.30-hardened1.patch" }, "5.11": { "extra": "-hardened1", - "name": "linux-hardened-5.11.13-hardened1.patch", - "sha256": "008izyg6a2dycxczfixykshll5hq5gff216fhgl1azr4ymiicywy", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.13-hardened1/linux-hardened-5.11.13-hardened1.patch" + "name": "linux-hardened-5.11.14-hardened1.patch", + "sha256": "1j8saj1dyflah3mjs07rvxfhhpwhxk65r1y2bd228gp5nm6305px", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.14-hardened1/linux-hardened-5.11.14-hardened1.patch" }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.111-hardened1.patch", - "sha256": "1zvhdyhvmzi58g07bsg8140nf9k29dzxlbqvha2sylnlj99sjjfd", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.111-hardened1/linux-hardened-5.4.111-hardened1.patch" + "name": "linux-hardened-5.4.112-hardened1.patch", + "sha256": "1l9igc68dq22nlnlls4x3zfz1h2hb6dqy7vr5r4jvbk22330m12j", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.112-hardened1/linux-hardened-5.4.112-hardened1.patch" } } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix index bab03ada98..a0084887c5 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.186"; + version = "4.19.187"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0cg6ja7plry1l2mg6hx16lsw0gzn4xpj7xdrrs2hwl8l8a2dgifq"; + sha256 = "1hx0jw11xmj57v9a8w34729vgrandaing2n9qkhx5dq4mhy04k50"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ]; 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 fd8d8f0b69..bf7d3fa7ab 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 lib; buildLinux (args // rec { - version = "5.10.29"; + version = "5.10.30"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1v79wylb2kd9gadiqf7dr7jcgynr970bbga09mdn940sq536g30m"; + sha256 = "0h06lavcbbj9a4dfzca9sprghiq9z33q8i4gh3n2912wmjsnj0nl"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix index 54ebe18948..67dd444810 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.11.13"; + version = "5.11.14"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0yvgkc1fmmd4g06sydn51q4l3g5785q9yaaq04lv3kgj4hyijqgs"; + sha256 = "1ia4wzh44lkvrbvnhdnnjcdyvqx2ihpbwkih7wqm1n5prhq38ql7"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_11 ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix index c80c4ccea2..d3fe5a3670 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.111"; + version = "5.4.112"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "00qs4y4d9adffwysdh8sly81hxc3rw7bi9vs3fs4rhwdclr62qi1"; + sha256 = "190cq97pm0r6s115ay66rjra7fnyn7m4rak89inwhm223931sdmq"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; 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 index 5e4d752f1d..8662fbbd18 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.11.14"; + version = "5.11.15"; suffix = "lqx1"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "0kgr6c3mpc9nmg4m2qfk58bji95paq3jwqsyl3h55xk40gshka32"; + sha256 = "1dwibknj4q8cd3mim679mrb4j8yi7p4q9qjcb4rwvw0yzgxmz3lv"; }; extraMeta = { 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 d97e4d6aa0..92aaa95745 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 @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, ... } @ args: let - version = "5.11.14"; + version = "5.11.15"; suffix = "zen1"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "1n49h9s3jyvrdy662b6j9xjbmhxxdczk980vrlgs09fg5ny0k59a"; + sha256 = "0n9wm0lpwkqd79112k03lxp4hc898nvs2jjw3hxzggn5wk4i2dz9"; }; extraMeta = { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvme-cli/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvme-cli/default.nix index 5e8bb550cf..3a30650848 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvme-cli/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "nvme-cli"; - version = "1.13"; + version = "1.14"; src = fetchFromGitHub { owner = "linux-nvme"; repo = "nvme-cli"; rev = "v${version}"; - sha256 = "1d538kp841bjh8h8d9q7inqz56rdcwb3m78zfx8607ddykv7wcqb"; + sha256 = "0dpadz945482srqpsbfx1bh7rc499fgpyzz1flhk9g9xjbpapkzc"; }; nativeBuildInputs = [ pkg-config ]; @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ primeos tavyc ]; + maintainers = with maintainers; [ mic92 ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix index cb5719c31a..16dcfe9ba0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix @@ -10,12 +10,12 @@ buildGoModule rec { pname = "oci-seccomp-bpf-hook"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "containers"; repo = "oci-seccomp-bpf-hook"; rev = "v${version}"; - sha256 = "0zbrpv6j4gd4l36zl2dljazdm85qlqwchf0xvmnaywcj8c8b49xw"; + sha256 = "sha256-SRphs8zwKz6jlAixVZkHdww0jroaBNK82kSLj1gs6Wg="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtw88/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtw88/default.nix index 6b5e3211a9..4230235124 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtw88/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtw88/default.nix @@ -5,13 +5,13 @@ let in stdenv.mkDerivation { pname = "rtw88"; - version = "unstable-2021-04-01"; + version = "unstable-2021-04-19"; src = fetchFromGitHub { owner = "lwfinger"; repo = "rtw88"; - rev = "689ce370b0c2da207bb092065697f6cb455a00dc"; - hash = "sha256-gdfQxpzYJ9bEObc2iEapA0TPMZuXndBvEu6qwKqdhyo="; + rev = "0f3cc6a5973bc386d9cb542fc85a6ba027edff5d"; + hash = "sha256-PRzWXC1lre8gt1GfVdnaG836f5YK57P9a8tG20yef0w="; }; makeFlags = [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/teck-udev-rules/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/teck-udev-rules/default.nix new file mode 100644 index 0000000000..eec5eac344 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/teck-udev-rules/default.nix @@ -0,0 +1,22 @@ +{ lib, stdenv, teck-programmer }: + +stdenv.mkDerivation { + pname = "teck-udev-rules"; + version = lib.getVersion teck-programmer; + + inherit (teck-programmer) src; + + dontBuild = true; + + installPhase = '' + runHook preInstall + install 40-teck.rules -D -t $out/etc/udev/rules.d/ + runHook postInstall + ''; + + meta = { + description = "udev rules for TECK keyboards"; + inherit (teck-programmer.meta) license; + maintainers = [ lib.maintainers.lourkeur ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix index 15c8df3cb1..845593e266 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix @@ -157,7 +157,7 @@ let done ''; - outputs = [ "out" ] ++ optionals buildUser [ "lib" "dev" ]; + outputs = [ "out" ] ++ optionals buildUser [ "dev" ]; passthru = { inherit enableMail; @@ -210,9 +210,9 @@ in { kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.12"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2.0.4"; + version = "2.1.0-rc3"; - sha256 = "sha256-ySTt0K3Lc0Le35XTwjiM5l+nIf9co7wBn+Oma1r8YHo="; + sha256 = "sha256-ARRUuyu07dWwEuXerTz9KBmclhlmsnnGucfBxxn0Zsw="; isUnstable = true; }; diff --git a/third_party/nixpkgs/pkgs/servers/asterisk/default.nix b/third_party/nixpkgs/pkgs/servers/asterisk/default.nix index 86017314ae..be0cd87745 100644 --- a/third_party/nixpkgs/pkgs/servers/asterisk/default.nix +++ b/third_party/nixpkgs/pkgs/servers/asterisk/default.nix @@ -74,7 +74,7 @@ let meta = with lib; { description = "Software implementation of a telephone private branch exchange (PBX)"; homepage = "https://www.asterisk.org/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ auntie DerTim1 yorickvp ]; }; }; @@ -105,8 +105,8 @@ in rec { asterisk = asterisk_18; asterisk_13 = common { - version = "13.38.0"; - sha256 = "1kxff6pbry8nydkspi0mqllidz2lw3d3g3r127x8jwgx021x0rik"; + version = "13.38.2"; + sha256 = "1v7wgsa9vf7qycg3xpvmn2bkandkfh3x15pr8ylg0w0gvfkkf5b9"; externals = { "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10; "addons/mp3" = mp3-202; @@ -114,8 +114,8 @@ in rec { }; asterisk_16 = common { - version = "16.15.0"; - sha256 = "12nc7ywm6w1xyn720kdc1sqz5wkjjrkxr25wisl02f4v5wz8py7m"; + version = "16.17.0"; + sha256 = "1bzlsk9k735qf8a693b6sa548my7m9ahavmdicwmc14px70wrvnw"; externals = { "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10; "addons/mp3" = mp3-202; @@ -123,8 +123,8 @@ in rec { }; asterisk_17 = common { - version = "17.9.0"; - sha256 = "1fnm1z7g45m883ivkm36r4kqb7163bzazi70mwf0fc2rc28jd1z4"; + version = "17.9.3"; + sha256 = "0nhk0izrxx24pz806fwnhidjmciwrkcrsvxvhrdvibiqyvfk8yk7"; externals = { "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10; "addons/mp3" = mp3-202; @@ -132,8 +132,8 @@ in rec { }; asterisk_18 = common { - version = "18.1.0"; - sha256 = "1pq2nrf60xnvh2h1rv82bdfbxxxd277g68xas0vbfgr4531gc4nc"; + version = "18.3.0"; + sha256 = "1xb953i9ay82vcdv8izi5dd5xnspcsvg10ajiyph377jw2xnd5fb"; externals = { "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10; "addons/mp3" = mp3-202; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index 973b73d4d1..4d86e743d1 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.4.5"; + version = "2021.4.6"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -187,7 +187,7 @@ "doorbird" = ps: with ps; [ aiohttp-cors ]; # missing inputs: doorbirdpy "dovado" = ps: with ps; [ ]; # missing inputs: dovado "downloader" = ps: with ps; [ ]; - "dsmr" = ps: with ps; [ ]; # missing inputs: dsmr_parser + "dsmr" = ps: with ps; [ dsmr-parser ]; "dsmr_reader" = ps: with ps; [ aiohttp-cors paho-mqtt ]; "dte_energy_bridge" = ps: with ps; [ ]; "dublin_bus_transport" = ps: with ps; [ ]; @@ -373,7 +373,7 @@ "hunterdouglas_powerview" = ps: with ps; [ ]; # missing inputs: aiopvapi "hvv_departures" = ps: with ps; [ ]; # missing inputs: pygti "hydrawise" = ps: with ps; [ hydrawiser ]; - "hyperion" = ps: with ps; [ ]; # missing inputs: hyperion-py + "hyperion" = ps: with ps; [ hyperion-py ]; "iammeter" = ps: with ps; [ ]; # missing inputs: iammeter "iaqualink" = ps: with ps; [ iaqualink ]; "icloud" = ps: with ps; [ pyicloud ]; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index 59b7f1135c..ea9a7f5d15 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -23,7 +23,7 @@ let # Override the version of some packages pinned in Home Assistant's setup.py # Pinned due to API changes in astral>=2.0, required by the sun/moon plugins - # https://github.com/home-assistant/core/issues/36636 + # https://github.com/home-assistant/core/pull/48573; Remove >= 2021.5 (mkOverride "astral" "1.10.1" "d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1") @@ -43,6 +43,7 @@ let }) # Pinned due to API changes in pylilterbot>=2021.3.0 + # https://github.com/home-assistant/core/pull/48300; Remove >= 2021.5 (self: super: { pylitterbot = super.pylitterbot.overridePythonAttrs (oldAttrs: rec { version = "2021.2.8"; @@ -108,7 +109,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.4.5"; + hassVersion = "2021.4.6"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -127,7 +128,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "106d1n9z8pfcnqm594vkhczrrrjap801w6fdr0psv5vhdxrqh4sj"; + sha256 = "1s1slwcqls2prz9kgyhggs8xi3x7ghwdi33j983kvpg0gva7d2f0"; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -227,6 +228,7 @@ in with py.pkgs; buildPythonApplication rec { "devolo_home_control" "dhcp" "discovery" + "dsmr" "econet" "emulated_hue" "esphome" @@ -260,6 +262,7 @@ in with py.pkgs; buildPythonApplication rec { "html5" "http" "hue" + "hyperion" "iaqualink" "ifttt" "image" diff --git a/third_party/nixpkgs/pkgs/servers/http/nginx/quic.nix b/third_party/nixpkgs/pkgs/servers/http/nginx/quic.nix new file mode 100644 index 0000000000..062520a3d1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/http/nginx/quic.nix @@ -0,0 +1,21 @@ +{ callPackage, fetchhg, boringssl, ... } @ args: + +callPackage ./generic.nix args { + src = fetchhg { + url = "https://hg.nginx.org/nginx-quic"; + rev = "47a43b011dec"; # branch=quic + sha256 = "1d4d1v4zbnf5qlfl79pi7sficn1h7zm6kk7llm24yyhlsvssz10x"; + }; + + preConfigure = '' + ln -s auto/configure configure + ''; + + configureFlags = [ + "--with-http_v3_module" + "--with-http_quic_module" + "--with-stream_quic_module" + ]; + + version = "quic"; +} diff --git a/third_party/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix b/third_party/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix index 5500f46585..99eae786cb 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "HyperKitty"; # Note: Mailman core must be on the latest version before upgrading HyperKitty. # See: https://gitlab.com/mailman/postorius/-/issues/516#note_544571309 - version = "1.3.3"; + version = "1.3.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0p85r9q6mn5as5b39xp9hkkipnk0156acx540n2ygk3qb3jd4a5n"; + sha256 = "1lbh8n66fp3l5s0xvmvsbfvgs3z4knx0gwf0q117n2nfkslf13zp"; }; nativeBuildInputs = [ isort ]; diff --git a/third_party/nixpkgs/pkgs/servers/mxisd/default.nix b/third_party/nixpkgs/pkgs/servers/mxisd/default.nix deleted file mode 100644 index 48f49b57fc..0000000000 --- a/third_party/nixpkgs/pkgs/servers/mxisd/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, jre, git, gradle_6, perl, makeWrapper }: - -let - name = "mxisd-${version}"; - version = "1.4.6"; - rev = "6e9601cb3a18281857c3cefd20ec773023b577d2"; - - src = fetchFromGitHub { - inherit rev; - owner = "kamax-matrix"; - repo = "mxisd"; - sha256 = "07gpdgbz281506p2431qn92bvdza6ap3jfq5b7xdm7nwrry80pzd"; - }; - - - deps = stdenv.mkDerivation { - name = "${name}-deps"; - inherit src; - nativeBuildInputs = [ gradle_6 perl git ]; - - buildPhase = '' - export MXISD_BUILD_VERSION=${rev} - export GRADLE_USER_HOME=$(mktemp -d); - gradle --no-daemon build -x test - ''; - - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - ''; - - dontStrip = true; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "0z9f3w7lfdvbk26kyckpbgas7mi98rjghck9w0kvx3r7k48p5vnv"; - }; - -in -stdenv.mkDerivation { - inherit name src version; - nativeBuildInputs = [ gradle_6 perl makeWrapper ]; - buildInputs = [ jre ]; - - patches = [ ./0001-gradle.patch ]; - - buildPhase = '' - export MXISD_BUILD_VERSION=${rev} - export GRADLE_USER_HOME=$(mktemp -d) - - sed -ie "s#REPLACE#mavenLocal(); maven { url '${deps}' }#g" build.gradle - gradle --offline --no-daemon build -x test - ''; - - installPhase = '' - install -D build/libs/source.jar $out/lib/mxisd.jar - makeWrapper ${jre}/bin/java $out/bin/mxisd --add-flags "-jar $out/lib/mxisd.jar" - ''; - - meta = with lib; { - description = "a federated matrix identity server"; - homepage = "https://github.com/kamax-matrix/mxisd"; - license = licenses.agpl3; - maintainers = with maintainers; [ mguentner ]; - platforms = platforms.all; - }; - -} diff --git a/third_party/nixpkgs/pkgs/servers/oauth2_proxy/default.nix b/third_party/nixpkgs/pkgs/servers/oauth2-proxy/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/servers/oauth2_proxy/default.nix rename to third_party/nixpkgs/pkgs/servers/oauth2-proxy/default.nix diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/default.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/default.nix index 50b8eb4d98..c886173096 100644 --- a/third_party/nixpkgs/pkgs/shells/fish/plugins/default.nix +++ b/third_party/nixpkgs/pkgs/shells/fish/plugins/default.nix @@ -6,6 +6,8 @@ lib.makeScope newScope (self: with self; { clownfish = callPackage ./clownfish.nix { }; + done = callPackage ./done.nix { }; + # Fishtape 2.x and 3.x aren't compatible, # but both versions are used in the tests of different other plugins. fishtape = callPackage ./fishtape.nix { }; diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/done.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/done.nix new file mode 100644 index 0000000000..25065b21fb --- /dev/null +++ b/third_party/nixpkgs/pkgs/shells/fish/plugins/done.nix @@ -0,0 +1,25 @@ +{ lib, buildFishPlugin, fetchFromGitHub, fishtape }: + +buildFishPlugin rec { + pname = "done"; + version = "1.16.1"; + + src = fetchFromGitHub { + owner = "franciscolourenco"; + repo = "done"; + rev = version; + sha256 = "NFysKzRZgDXXZW/sUlZNu7ZpMCKwbjAhIfspSK3UqCY="; + }; + + checkPlugins = [ fishtape ]; + checkPhase = '' + fishtape test/done.fish + ''; + + meta = { + description = "Automatically receive notifications when long processes finish"; + homepage = "https://github.com/franciscolourenco/done"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ malo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/default.nix b/third_party/nixpkgs/pkgs/stdenv/generic/default.nix index 476fab3eed..c3582b1667 100644 --- a/third_party/nixpkgs/pkgs/stdenv/generic/default.nix +++ b/third_party/nixpkgs/pkgs/stdenv/generic/default.nix @@ -137,7 +137,7 @@ let # Utility flags to test the type of platform. inherit (hostPlatform) - isDarwin isLinux isSunOS isCygwin isFreeBSD isOpenBSD + isDarwin isLinux isSunOS isCygwin isBSD isFreeBSD isOpenBSD isi686 isx86_32 isx86_64 is32bit is64bit isAarch32 isAarch64 isMips isBigEndian; diff --git a/third_party/nixpkgs/pkgs/test/cuda/cuda-samples/default.nix b/third_party/nixpkgs/pkgs/test/cuda/cuda-samples/default.nix index 46d4d53169..1a361c5721 100644 --- a/third_party/nixpkgs/pkgs/test/cuda/cuda-samples/default.nix +++ b/third_party/nixpkgs/pkgs/test/cuda/cuda-samples/default.nix @@ -1,17 +1,9 @@ { callPackage -, cudatoolkit_9_2 , cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2 , cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 }: rec { - cuda-samples_cudatoolkit_9_2 = callPackage ./generic.nix { - cudatoolkit = cudatoolkit_9_2; - sha256 = "1ydankhyigcg99h0rqnmz1z4vc0sl6p9s1s0hbdxh5l1sx9141j6"; - }; - - cuda-samples_cudatoolkit_9 = cuda-samples_cudatoolkit_9_2; - ## cuda-samples_cudatoolkit_10_0 = callPackage ./generic.nix { diff --git a/third_party/nixpkgs/pkgs/test/cuda/default.nix b/third_party/nixpkgs/pkgs/test/cuda/default.nix index 9e7eaf8036..aac52e6a4f 100644 --- a/third_party/nixpkgs/pkgs/test/cuda/default.nix +++ b/third_party/nixpkgs/pkgs/test/cuda/default.nix @@ -3,8 +3,6 @@ rec { cuda-samplesPackages = callPackage ./cuda-samples { }; inherit (cuda-samplesPackages) - cuda-samples_cudatoolkit_9 - cuda-samples_cudatoolkit_9_2 cuda-samples_cudatoolkit_10 cuda-samples_cudatoolkit_10_0 cuda-samples_cudatoolkit_10_1 diff --git a/third_party/nixpkgs/pkgs/test/default.nix b/third_party/nixpkgs/pkgs/test/default.nix index fa93ceb072..b24fc539c9 100644 --- a/third_party/nixpkgs/pkgs/test/default.nix +++ b/third_party/nixpkgs/pkgs/test/default.nix @@ -41,6 +41,8 @@ with pkgs; rustCustomSysroot = callPackage ./rust-sysroot {}; buildRustCrate = callPackage ../build-support/rust/build-rust-crate/test { }; + vim = callPackage ./vim {}; + nixos-functions = callPackage ./nixos-functions {}; patch-shebangs = callPackage ./patch-shebangs {}; diff --git a/third_party/nixpkgs/pkgs/test/vim/default.nix b/third_party/nixpkgs/pkgs/test/vim/default.nix new file mode 100644 index 0000000000..4ca004a60c --- /dev/null +++ b/third_party/nixpkgs/pkgs/test/vim/default.nix @@ -0,0 +1,72 @@ +{ vimUtils, vim_configurable, neovim, vimPlugins +, lib, fetchFromGitHub, +}: +let + inherit (vimUtils) buildVimPluginFrom2Nix; + + packages.myVimPackage.start = with vimPlugins; [ vim-nix ]; +in +{ + vim_empty_config = vimUtils.vimrcFile { beforePlugins = ""; customRC = ""; }; + + vim_with_vim2nix = vim_configurable.customize { + name = "vim"; vimrcConfig.vam.pluginDictionaries = [ "vim-addon-vim2nix" ]; + }; + + # test cases: + test_vim_with_vim_nix_using_vam = vim_configurable.customize { + name = "vim-with-vim-addon-nix-using-vam"; + vimrcConfig.vam.pluginDictionaries = [{name = "vim-nix"; }]; + }; + + test_vim_with_vim_nix_using_pathogen = vim_configurable.customize { + name = "vim-with-vim-addon-nix-using-pathogen"; + vimrcConfig.pathogen.pluginNames = [ "vim-nix" ]; + }; + + test_vim_with_vim_nix_using_plug = vim_configurable.customize { + name = "vim-with-vim-addon-nix-using-plug"; + vimrcConfig.plug.plugins = with vimPlugins; [ vim-nix ]; + }; + + test_vim_with_vim_nix = vim_configurable.customize { + name = "vim-with-vim-addon-nix"; + vimrcConfig.packages.myVimPackage.start = with vimPlugins; [ vim-nix ]; + }; + + # only neovim makes use of `requiredPlugins`, test this here + test_nvim_with_vim_nix_using_pathogen = neovim.override { + configure.pathogen.pluginNames = [ "vim-nix" ]; + }; + + # regression test for https://github.com/NixOS/nixpkgs/issues/53112 + # The user may have specified their own plugins which may not be formatted + # exactly as the generated ones. In particular, they may not have the `pname` + # attribute. + test_vim_with_custom_plugin = vim_configurable.customize { + name = "vim_with_custom_plugin"; + vimrcConfig.vam.knownPlugins = + vimPlugins // ({ + vim-trailing-whitespace = buildVimPluginFrom2Nix { + name = "vim-trailing-whitespace"; + src = fetchFromGitHub { + owner = "bronson"; + repo = "vim-trailing-whitespace"; + rev = "4c596548216b7c19971f8fc94e38ef1a2b55fee6"; + sha256 = "0f1cpnp1nxb4i5hgymjn2yn3k1jwkqmlgw1g02sq270lavp2dzs9"; + }; + # make sure string dependencies are handled + dependencies = [ "vim-nix" ]; + }; + }); + vimrcConfig.vam.pluginDictionaries = [ { names = [ "vim-trailing-whitespace" ]; } ]; + }; + + # system remote plugin manifest should be generated, deoplete should be usable + # without the user having to do `UpdateRemotePlugins`. To test, launch neovim + # and do `:call deoplete#enable()`. It will print an error if the remote + # plugin is not registered. + test_nvim_with_remote_plugin = neovim.override { + configure.pathogen.pluginNames = with vimPlugins; [ deoplete-nvim ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/admin/cjdns-tools/default.nix b/third_party/nixpkgs/pkgs/tools/admin/cjdns-tools/default.nix new file mode 100644 index 0000000000..2468d32954 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/admin/cjdns-tools/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, cjdns +, nodejs +, makeWrapper +, lib +}: + +stdenv.mkDerivation { + pname = "cjdns-tools"; + version = cjdns.version; + + src = cjdns.src; + + buildInputs = [ + nodejs + ]; + + nativeBuildInputs = [ + makeWrapper + ]; + + buildPhase = '' + patchShebangs tools + + sed -e "s|'password': 'NONE'|'password': Fs.readFileSync('/etc/cjdns.keys').toString().split('\\\\n').map(v => v.split('=')).filter(v => v[0] === 'CJDNS_ADMIN_PASSWORD').map(v => v[1])[0]|g" \ + -i tools/lib/cjdnsadmin/cjdnsadmin.js + ''; + + installPhase = '' + mkdir -p $out/bin + cat ${./wrapper.sh} | sed "s|@@out@@|$out|g" > $out/bin/cjdns-tools + chmod +x $out/bin/cjdns-tools + + cp -r tools $out/tools + find $out/tools -maxdepth 1 -type f -exec chmod -v a+x {} \; + cp -r node_modules $out/node_modules + ''; + + meta = with lib; { + homepage = "https://github.com/cjdelisle/cjdns"; + description = "Tools for cjdns managment"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ mkg20001 ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/admin/cjdns-tools/wrapper.sh b/third_party/nixpkgs/pkgs/tools/admin/cjdns-tools/wrapper.sh new file mode 100644 index 0000000000..2e8d85b1dd --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/admin/cjdns-tools/wrapper.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +export PATH="@@out@@/tools:$PATH" + +set -eo pipefail + +if ! cat /etc/cjdns.keys >/dev/null 2>&1; then + echo "ERROR: No permission to read /etc/cjdns.keys (use sudo)" >&2 + exit 1 +fi + +if [[ -z $1 ]]; then + echo "Cjdns admin" + + echo "Usage: $0 " + + echo + echo "Commands:" $(find @@out@@/tools -maxdepth 1 -type f | sed -r "s|.+/||g") + + _sh=$(which sh) + PATH="@@out@@/tools" PS1="cjdns\$ " "$_sh" +else + if [[ ! -e @@out@@/tools/$1 ]]; then + echo "ERROR: '$1' is not a valid tool" >&2 + exit 2 + else + "$@" + fi +fi diff --git a/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix b/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix index ef47578ac5..b9ed3eca91 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix @@ -105,13 +105,13 @@ in pythonPackages.buildPythonApplication rec { # unstable does not require bs1770gain[2]. # [1]: https://discourse.beets.io/t/forming-a-beets-core-team/639 # [2]: https://github.com/NixOS/nixpkgs/pull/90504 - version = "unstable-2021-03-24"; + version = "unstable-2021-04-17"; src = fetchFromGitHub { owner = "beetbox"; repo = "beets"; - rev = "854b4ab48324afe8884fcd11fa47bd6258d2f4f7"; - sha256 = "sha256-y5EWVNF4bd9fNvU6VkucMpenyFZuqdPkrqQDgG9ZPJY="; + rev = "50163b373f527d1b1f8b2442240ca547e846744e"; + sha256 = "sha256-l7drav4Qx2JCF+F5OA0s641idcKM3S4Yx2lM2evJQWE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/audio/beets/plugins/alternatives.nix b/third_party/nixpkgs/pkgs/tools/audio/beets/plugins/alternatives.nix index c0b9123d96..146e9f5066 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/beets/plugins/alternatives.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/beets/plugins/alternatives.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { pname = "beets-alternatives"; - version = "0.10.2"; + version = "unstable-2021-02-01"; src = fetchFromGitHub { repo = "beets-alternatives"; owner = "geigerzaehler"; - rev = "v${version}"; - sha256 = "1dsz94fb29wra1f9580w20bz2f1bgkj4xnsjgwgbv14flbfw4bp0"; + rev = "288299e3aa9a1602717b04c28696fce5ce4259bf"; + sha256 = "sha256-Xl7AHr33hXQqQDuFbWuj8HrIugeipJFPmvNXpCkU/mI="; }; postPatch = '' @@ -23,10 +23,10 @@ pythonPackages.buildPythonApplication rec { mock ]; - meta = { + meta = with lib; { description = "Beets plugin to manage external files"; homepage = "https://github.com/geigerzaehler/beets-alternatives"; - maintainers = [ lib.maintainers.aszlig ]; - license = lib.licenses.mit; + maintainers = with maintainers; [ aszlig lovesegfault ]; + license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/tools/audio/beets/plugins/copyartifacts.nix b/third_party/nixpkgs/pkgs/tools/audio/beets/plugins/copyartifacts.nix index b8a17a7d13..2f1ecdfc36 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/beets/plugins/copyartifacts.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/beets/plugins/copyartifacts.nix @@ -1,13 +1,14 @@ { lib, fetchFromGitHub, beets, pythonPackages, glibcLocales }: pythonPackages.buildPythonApplication { - name = "beets-copyartifacts"; + pname = "beets-copyartifacts"; + version = "unstable-2020-02-15"; src = fetchFromGitHub { repo = "beets-copyartifacts"; - owner = "sbarakat"; - rev = "d0bb75c8fc8fe125e8191d73de7ade6212aec0fd"; - sha256 = "19b4lqq1p45n348ssmql60jylw2fw7vfj9j22nly5qj5qx51j3g5"; + owner = "adammillerio"; + rev = "85eefaebf893cb673fa98bfde48406ec99fd1e4b"; + sha256 = "sha256-bkT2BZZ2gdcacgvyrVe2vMrOMV8iMAm8Q5xyrZzyqU0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/audio/beets/plugins/extrafiles.nix b/third_party/nixpkgs/pkgs/tools/audio/beets/plugins/extrafiles.nix index 0ab6b3e541..9118765cc1 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/beets/plugins/extrafiles.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/beets/plugins/extrafiles.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { pname = "beets-extrafiles"; - version = "0.0.7"; + version = "unstable-2020-12-13"; src = fetchFromGitHub { repo = "beets-extrafiles"; owner = "Holzhaus"; - rev = "v${version}"; - sha256 = "0ah7mgax9zrhvvd5scf2z0v0bhd6xmmv5sdb6av840ixpl6vlvm6"; + rev = "a1d6ef9a9682b6bf7af9483541e56a3ff12247b8"; + sha256 = "sha256-ajuEbieWjTCNjdRZuGUwvStZwjx260jmY0m+ZqNd7ec="; }; postPatch = '' @@ -18,6 +18,8 @@ pythonPackages.buildPythonApplication rec { nativeBuildInputs = [ beets ]; + propagatedBuildInputs = with pythonPackages; [ mediafile ]; + preCheck = '' HOME=$TEMPDIR ''; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/9pfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/9pfs/default.nix index 9664526761..bf817a5087 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/9pfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/9pfs/default.nix @@ -10,6 +10,10 @@ stdenv.mkDerivation { sha256 = "007s2idsn6bspmfxv1qabj39ggkgvn6gwdbhczwn04lb4c6gh3xc"; }; + # Upstream development has stopped and is no longer accepting patches + # https://github.com/mischief/9pfs/pull/3 + patches = [ ./fix-darwin-build.patch ]; + preConfigure = '' substituteInPlace Makefile --replace '-g bin' "" @@ -25,7 +29,7 @@ stdenv.mkDerivation { homepage = "https://github.com/mischief/9pfs"; description = "FUSE-based client of the 9P network filesystem protocol"; maintainers = [ lib.maintainers.eelco ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; license = with lib.licenses; [ lpl-102 bsd2 ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/9pfs/fix-darwin-build.patch b/third_party/nixpkgs/pkgs/tools/filesystems/9pfs/fix-darwin-build.patch new file mode 100644 index 0000000000..a565248f19 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/filesystems/9pfs/fix-darwin-build.patch @@ -0,0 +1,47 @@ +From 6b7863b51c97f8ecd9a93fc4347f8938f9b5c05f Mon Sep 17 00:00:00 2001 +From: midchildan +Date: Tue, 30 Mar 2021 22:21:51 +0900 +Subject: [PATCH] build: fix build for macOS + +--- + 9pfs.c | 4 ++-- + libc.h | 4 ++++ + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/9pfs.c b/9pfs.c +index 2c481bd..f5c487c 100644 +--- a/9pfs.c ++++ b/9pfs.c +@@ -30,7 +30,7 @@ + enum + { + CACHECTLSIZE = 8, /* sizeof("cleared\n") - 1 */ +- MSIZE = 8192 ++ MSIZE_9P = 8192 + }; + + void dir2stat(struct stat*, Dir*); +@@ -505,7 +505,7 @@ main(int argc, char *argv[]) + freeaddrinfo(ainfo); + + init9p(); +- msize = _9pversion(MSIZE); ++ msize = _9pversion(MSIZE_9P); + if(doauth){ + authfid = _9pauth(AUTHFID, user, NULL); + ai = auth_proxy(authfid, auth_getkey, "proto=p9any role=client"); +diff --git a/libc.h b/libc.h +index 099adba..aac03c5 100644 +--- a/libc.h ++++ b/libc.h +@@ -61,6 +61,10 @@ typedef unsigned char uchar; + typedef unsigned long long uvlong; + typedef long long vlong; + ++#ifndef __GLIBC__ ++typedef unsigned long ulong; ++#endif ++ + typedef + struct Qid + { diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/aefs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/aefs/default.nix index ed47b8f885..fb6fa01894 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/aefs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/aefs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fuse }: +{ lib, stdenv, fetchurl, fetchpatch, fuse }: stdenv.mkDerivation rec { name = "aefs-0.4pre259-8843b7c"; @@ -8,12 +8,29 @@ stdenv.mkDerivation rec { sha256 = "167hp58hmgdavg2mqn5dx1xgq24v08n8d6psf33jhbdabzx6a6zq"; }; + patches = [ + (fetchpatch { + url = "https://github.com/edolstra/aefs/commit/15d8df8b8d5dc1ee20d27a86c4d23163a67f3123.patch"; + sha256 = "0k36hsyvf8a0ji2hpghgqff2fncj0pllxn8p0rs0aj4h7j2vp4iv"; + }) + ]; + + # autoconf's AC_CHECK_HEADERS and AC_CHECK_LIBS fail to detect libfuse on + # Darwin if FUSE_USE_VERSION isn't set at configure time. + # + # NOTE: Make sure the value of FUSE_USE_VERSION specified here matches the + # actual version used in the source code: + # + # $ tar xf "$(nix-build -A aefs.src)" + # $ grep -R FUSE_USE_VERSION + configureFlags = lib.optional stdenv.isDarwin "CPPFLAGS=-DFUSE_USE_VERSION=26"; + buildInputs = [ fuse ]; meta = with lib; { homepage = "https://github.com/edolstra/aefs"; description = "A cryptographic filesystem implemented in userspace using FUSE"; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.eelco ]; license = licenses.gpl2; }; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/android-file-transfer/darwin-dont-vendor-dependencies.patch b/third_party/nixpkgs/pkgs/tools/filesystems/android-file-transfer/darwin-dont-vendor-dependencies.patch new file mode 100644 index 0000000000..6e0f38582c --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/filesystems/android-file-transfer/darwin-dont-vendor-dependencies.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8b05ab0..81e31f5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -236,16 +236,6 @@ endif() + + if (''${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(MACOSX_BUNDLE_LIBS) +- if (OPENSSL_FOUND) +- list(APPEND MACOSX_BUNDLE_LIBS /usr/local/opt/openssl@1.1/lib/libcrypto.1.1.dylib) +- endif() +- if (TAGLIB_FOUND) +- list(APPEND MACOSX_BUNDLE_LIBS /usr/local/opt/taglib/lib/libtag.1.dylib) +- endif() +- if (FUSE_FOUND) +- list(APPEND MACOSX_BUNDLE_LIBS /usr/local/lib/libosxfuse.2.dylib) +- endif() +- + set(MACOSX_BUNDLE_LIBS_INSTALL) + set(MACOSX_BUNDLE_ROOT_DIR "''${CMAKE_INSTALL_PREFIX}/''${CMAKE_PROJECT_NAME}.app") + message(STATUS "bundle root dir: ''${MACOSX_BUNDLE_ROOT_DIR}") diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix index f0efaaa323..a8511f8b99 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix @@ -1,4 +1,14 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, fuse, readline, pkg-config, qtbase, qttools }: +{ lib +, stdenv +, mkDerivation +, fetchFromGitHub +, cmake +, fuse +, readline +, pkg-config +, qtbase +, qttools +, wrapQtAppsHook }: mkDerivation rec { pname = "android-file-transfer"; @@ -11,14 +21,24 @@ mkDerivation rec { sha256 = "125rq8ji83nw6chfw43i0h9c38hjqh1qjibb0gnf9wrigar9zc8b"; }; - nativeBuildInputs = [ cmake readline pkg-config ]; + patches = [ ./darwin-dont-vendor-dependencies.patch ]; + + nativeBuildInputs = [ cmake readline pkg-config wrapQtAppsHook ]; buildInputs = [ fuse qtbase qttools ]; + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir $out/Applications + mv $out/*.app $out/Applications + for f in $out/Applications/android-file-transfer.app/Contents/MacOS/*; do + wrapQtApp "$f" + done + ''; + meta = with lib; { description = "Reliable MTP client with minimalistic UI"; homepage = "https://whoozle.github.io/android-file-transfer-linux/"; license = licenses.lgpl21Plus; maintainers = [ maintainers.xaverdh ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/archivemount/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/archivemount/default.nix index e3f9d8505f..32c942aea5 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/archivemount/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/archivemount/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { meta = { description = "Gateway between FUSE and libarchive: allows mounting of cpio, .tar.gz, .tar.bz2 archives"; license = lib.licenses.gpl2; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/avfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/avfs/default.nix index e89828dd75..3315085191 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/avfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/avfs/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://avf.sourceforge.net/"; description = "Virtual filesystem that allows browsing of compressed files"; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; license = lib.licenses.gpl2; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/boxfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/boxfs/default.nix index 5637b9af29..ef611afd5d 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/boxfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/boxfs/default.nix @@ -37,7 +37,10 @@ in stdenv.mkDerivation { buildInputs = [ curl fuse libxml2 ]; nativeBuildInputs = [ pkg-config ]; - buildFlags = [ "static" ]; + buildFlags = [ + "static" + "CC=${stdenv.cc.targetPrefix}cc" + ] ++ lib.optional stdenv.isDarwin "CFLAGS=-D_BSD_SOURCE"; installPhase = '' mkdir -p $out/bin @@ -55,6 +58,6 @@ in stdenv.mkDerivation { ''; homepage = "https://github.com/drotiro/boxfs2"; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix index e923bb6132..d13d4915e1 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix @@ -1,5 +1,4 @@ { lib, stdenv, runCommand, fetchurl -, fetchpatch , ensureNewerSourcesHook , cmake, pkg-config , which, git @@ -14,6 +13,15 @@ , libnl, libcap_ng , rdkafka , nixosTests +, cryptsetup +, sqlite +, lua +, icu +, bzip2 +, doxygen +, graphviz +, fmt +, python3 # Optional Dependencies , yasm ? null, fcgi ? null, expat ? null @@ -123,10 +131,10 @@ let ]); sitePackages = ceph-python-env.python.sitePackages; - version = "15.2.10"; + version = "16.2.1"; src = fetchurl { url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - sha256 = "1xfijynfb56gydpwh6h4q781xymwxih6nx26idnkcjqih48nsn01"; + sha256 = "1qqvfhnc94vfrq1ddizf6habjlcp77abry4v18zlq6rnhwr99zrh"; }; in rec { ceph = stdenv.mkDerivation { @@ -142,12 +150,18 @@ in rec { pkg-config which git python3Packages.wrapPython makeWrapper python3Packages.python # for the toPythonPath function (ensureNewerSourcesHook { year = "1980"; }) + python3 + fmt + # for building docs/man-pages presumably + doxygen + graphviz ]; buildInputs = cryptoLibsMap.${cryptoStr} ++ [ boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3 malloc zlib openldap lttng-ust babeltrace gperf gtest cunit snappy lz4 oathToolkit leveldb libnl libcap_ng rdkafka + cryptsetup sqlite lua icu bzip2 ] ++ lib.optionals stdenv.isLinux [ linuxHeaders util-linux libuuid udev keyutils optLibaio optLibxfs optZfs # ceph 14 @@ -171,7 +185,6 @@ in rec { ''; cmakeFlags = [ - "-DWITH_PYTHON3=ON" "-DWITH_SYSTEM_ROCKSDB=OFF" # breaks Bluestore "-DCMAKE_INSTALL_DATADIR=${placeholder "lib"}/lib" @@ -182,6 +195,8 @@ in rec { "-DWITH_TESTS=OFF" # TODO breaks with sandbox, tries to download stuff with npm "-DWITH_MGR_DASHBOARD_FRONTEND=OFF" + # WITH_XFS has been set default ON from Ceph 16, keeping it optional in nixpkgs for now + ''-DWITH_XFS=${if optLibxfs != null then "ON" else "OFF"}'' ]; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix index eec257c44b..a0dc312415 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix @@ -25,6 +25,9 @@ stdenv.mkDerivation rec { url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/cryfs/files/cryfs-0.10.2-unbundle-libs.patch?id=192ac7421ddd4093125f4997898fb62e8a140a44"; sha256 = "0hzss5rawcjrh8iqzc40w5yjhxdqya4gbg6dzap70180s50mahzs"; }) + + # Backported from https://github.com/cryfs/cryfs/pull/378 + ./use-macfuse.patch ]; postPatch = '' @@ -48,16 +51,18 @@ stdenv.mkDerivation rec { strictDeps = true; - buildInputs = [ boost cryptopp curl fuse openssl gtest ]; + buildInputs = [ boost cryptopp curl fuse openssl ]; + + checkInputs = [ gtest ]; cmakeFlags = [ "-DCRYFS_UPDATE_CHECKS:BOOL=FALSE" "-DBoost_USE_STATIC_LIBS:BOOL=FALSE" # this option is case sensitive "-DUSE_SYSTEM_LIBS:BOOL=TRUE" - "-DBUILD_TESTING:BOOL=TRUE" - ]; + "-DBUILD_TESTING:BOOL=${if doCheck then "TRUE" else "FALSE"}" + ] ++ lib.optional doCheck "-DCMAKE_PREFIX_PATH=${gtest.dev}/lib/cmake"; - doCheck = (!stdenv.isDarwin); # Cryfs tests are broken on darwin + doCheck = true; checkPhase = '' # Skip CMakeFiles directory and tests depending on fuse (does not work well with sandboxing) @@ -73,6 +78,6 @@ stdenv.mkDerivation rec { homepage = "https://www.cryfs.org"; license = licenses.lgpl3; maintainers = with maintainers; [ peterhoeg c0bw3b ]; - platforms = with platforms; linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/cryfs/use-macfuse.patch b/third_party/nixpkgs/pkgs/tools/filesystems/cryfs/use-macfuse.patch new file mode 100644 index 0000000000..47e7845cf3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/filesystems/cryfs/use-macfuse.patch @@ -0,0 +1,207 @@ +diff --git a/.travisci/install.sh b/.travisci/install.sh +index 9057a75b..2929c360 100755 +--- a/.travisci/install.sh ++++ b/.travisci/install.sh +@@ -6,12 +6,11 @@ set -e + if [ "${CXX}" == "g++" ]; then + # We need to uninstall oclint because it creates a /usr/local/include/c++ symlink that clashes with the gcc5 package + # see https://github.com/Homebrew/homebrew-core/issues/21172 +- brew cask uninstall oclint ++ brew uninstall oclint + brew install gcc@7 + fi + +-brew cask install osxfuse +-brew install libomp ++brew install libomp pkg-config macfuse + + # By default, travis only fetches the newest 50 commits. We need more in case we're further from the last version tag, so the build doesn't fail because it can't generate the version number. + git fetch --unshallow --tags +diff --git a/README.md b/README.md +index b0f4a684..7001119a 100644 +--- a/README.md ++++ b/README.md +@@ -19,7 +19,7 @@ OSX + + CryFS is distributed via Homebrew. Just do + +- brew cask install osxfuse ++ brew install osxfuse + brew install cryfs + + Windows (experimental) +@@ -45,6 +45,7 @@ Requirements + - Git (for getting the source code) + - GCC version >= 5.0 or Clang >= 4.0 + - CMake version >= 3.0 ++ - pkg-config (on Unix) + - libcurl4 (including development headers) + - Boost libraries version >= 1.65.1 (including development headers) + - filesystem +@@ -53,20 +54,20 @@ Requirements + - program_options + - thread + - SSL development libraries (including development headers, e.g. libssl-dev) +- - libFUSE version >= 2.8.6 (including development headers), on Mac OS X instead install osxfuse from https://osxfuse.github.io/ ++ - libFUSE version >= 2.8.6 (including development headers), on Mac OS X instead install macFUSE from https://osxfuse.github.io/ + - Python >= 2.7 + - OpenMP + + You can use the following commands to install these requirements + + # Ubuntu +- $ sudo apt install git g++ cmake make libcurl4-openssl-dev libboost-filesystem-dev libboost-system-dev libboost-chrono-dev libboost-program-options-dev libboost-thread-dev libssl-dev libfuse-dev python ++ $ sudo apt install git g++ cmake make pkg-config libcurl4-openssl-dev libboost-filesystem-dev libboost-system-dev libboost-chrono-dev libboost-program-options-dev libboost-thread-dev libssl-dev libfuse-dev python + + # Fedora +- sudo dnf install git gcc-c++ cmake make libcurl-devel boost-devel boost-static openssl-devel fuse-devel python ++ sudo dnf install git gcc-c++ cmake make pkgconf libcurl-devel boost-devel boost-static openssl-devel fuse-devel python + + # Macintosh +- brew install cmake boost openssl libomp ++ brew install cmake pkg-config boost openssl libomp + + Build & Install + --------------- +@@ -116,17 +117,17 @@ On most systems, CMake should find the libraries automatically. However, that do + + cmake .. -DBoost_USE_STATIC_LIBS=off + +-2. **Fuse/Osxfuse library not found** ++2. **Fuse library not found** + + Pass in the library path with + +- cmake .. -DFUSE_LIB_PATH=/path/to/fuse/or/osxfuse ++ PKG_CONFIG_PATH=/path-to-fuse-or-macFUSE/lib/pkgconfig cmake .. + +-3. **Fuse/Osxfuse headers not found** ++3. **Fuse headers not found** + + Pass in the include path with + +- cmake .. -DCMAKE_CXX_FLAGS="-I/path/to/fuse/or/osxfuse/headers" ++ PKG_CONFIG_PATH=/path-to-fuse-or-macFUSE/lib/pkgconfig cmake .. + + 4. **Openssl headers not found** + +diff --git a/cmake-utils/utils.cmake b/cmake-utils/utils.cmake +index da4dff8c..66021c5c 100644 +--- a/cmake-utils/utils.cmake ++++ b/cmake-utils/utils.cmake +@@ -157,33 +157,6 @@ function(require_clang_version VERSION) + endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") + endfunction(require_clang_version) + +-################################################## +-# Find the location of a library and return its full path in OUTPUT_VARIABLE. +-# If PATH_VARIABLE points to a defined variable, then the library will only be searched in this path. +-# If PATH_VARIABLE points to a undefined variable, default system locations will be searched. +-# +-# Uses (the following will search for fuse in system locations by default, and if the user passes -DFUSE_LIB_PATH to cmake, it will only search in this path. +-# find_library_with_path(MYLIBRARY fuse FUSE_LIB_PATH) +-# target_link_library(target ${MYLIBRARY}) +-################################################## +-function(find_library_with_path OUTPUT_VARIABLE LIBRARY_NAME PATH_VARIABLE) +- if(${PATH_VARIABLE}) +- find_library(${OUTPUT_VARIABLE} ${LIBRARY_NAME} PATHS ${${PATH_VARIABLE}} NO_DEFAULT_PATH) +- if (${OUTPUT_VARIABLE} MATCHES NOTFOUND) +- message(FATAL_ERROR "Didn't find ${LIBRARY_NAME} in path specified by the ${PATH_VARIABLE} parameter (${${PATH_VARIABLE}}). Pass in the correct path or remove the parameter to try common system locations.") +- else(${OUTPUT_VARIABLE} MATCHES NOTFOUND) +- message(STATUS "Found ${LIBRARY_NAME} in user-defined path ${${PATH_VARIABLE}}") +- endif(${OUTPUT_VARIABLE} MATCHES NOTFOUND) +- else(${PATH_VARIABLE}) +- find_library(${OUTPUT_VARIABLE} ${LIBRARY_NAME}) +- if (${OUTPUT_VARIABLE} MATCHES NOTFOUND) +- message(FATAL_ERROR "Didn't find ${LIBRARY_NAME} library. If ${LIBRARY_NAME} is installed, try passing in the library location with -D${PATH_VARIABLE}=/path/to/${LIBRARY_NAME}/lib.") +- else(${OUTPUT_VARIABLE} MATCHES NOTFOUND) +- message(STATUS "Found ${LIBRARY_NAME} in system location") +- endif(${OUTPUT_VARIABLE} MATCHES NOTFOUND) +- endif(${PATH_VARIABLE}) +-endfunction(find_library_with_path) +- + include(cmake-utils/TargetArch.cmake) + function(get_target_architecture output_var) + target_architecture(local_output_var) +diff --git a/src/fspp/fuse/CMakeLists.txt b/src/fspp/fuse/CMakeLists.txt +index b991bd72..8df3dbb7 100644 +--- a/src/fspp/fuse/CMakeLists.txt ++++ b/src/fspp/fuse/CMakeLists.txt +@@ -35,12 +35,12 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") + DESTINATION "${CMAKE_INSTALL_BINDIR}" + ) + +-elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +- set(CMAKE_FIND_FRAMEWORK LAST) +- find_library_with_path(FUSE "osxfuse" FUSE_LIB_PATH) +- target_link_libraries(${PROJECT_NAME} PUBLIC ${FUSE}) +-else() # Linux +- find_library_with_path(FUSE "fuse" FUSE_LIB_PATH) +- target_link_libraries(${PROJECT_NAME} PUBLIC ${FUSE}) ++else() # Linux and macOS ++ find_package(PkgConfig REQUIRED) ++ pkg_check_modules(Fuse REQUIRED IMPORTED_TARGET fuse) ++ target_link_libraries(${PROJECT_NAME} PUBLIC PkgConfig::Fuse) + endif() + ++if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") ++ set(CMAKE_FIND_FRAMEWORK LAST) ++endif() +diff --git a/src/fspp/fuse/Fuse.cpp b/src/fspp/fuse/Fuse.cpp +index 52cd5644..df0b400d 100644 +--- a/src/fspp/fuse/Fuse.cpp ++++ b/src/fspp/fuse/Fuse.cpp +@@ -295,7 +295,7 @@ vector Fuse::_build_argv(const bf::path &mountdir, const vector + // Make volume name default to mountdir on macOS + _add_fuse_option_if_not_exists(&argv, "volname", mountdir.filename().string()); + #endif +- // TODO Also set read/write size for osxfuse. The options there are called differently. ++ // TODO Also set read/write size for macFUSE. The options there are called differently. + // large_read not necessary because reads are large anyhow. This option is only important for 2.4. + //argv.push_back(_create_c_string("-o")); + //argv.push_back(_create_c_string("large_read")); +diff --git a/src/fspp/fuse/params.h b/src/fspp/fuse/params.h +index 4a45ef79..9903ac82 100644 +--- a/src/fspp/fuse/params.h ++++ b/src/fspp/fuse/params.h +@@ -3,14 +3,6 @@ + #define MESSMER_FSPP_FUSE_PARAMS_H_ + + #define FUSE_USE_VERSION 26 +-#if defined(__linux__) || defined(__FreeBSD__) + #include +-#elif __APPLE__ +-#include +-#elif defined(_MSC_VER) +-#include // Dokany fuse +-#else +-#error System not supported +-#endif + + #endif +diff --git a/src/fspp/impl/FilesystemImpl.cpp b/src/fspp/impl/FilesystemImpl.cpp +index bc0ffbd7..23b28601 100644 +--- a/src/fspp/impl/FilesystemImpl.cpp ++++ b/src/fspp/impl/FilesystemImpl.cpp +@@ -321,7 +321,7 @@ void FilesystemImpl::statfs(struct ::statvfs *fsstat) { + fsstat->f_namemax = stat.max_filename_length; + + //f_frsize, f_favail, f_fsid and f_flag are ignored in fuse, see http://fuse.sourcearchive.com/documentation/2.7.0/structfuse__operations_4e765e29122e7b6b533dc99849a52655.html#4e765e29122e7b6b533dc99849a52655 +- fsstat->f_frsize = fsstat->f_bsize; // even though this is supposed to be ignored, osxfuse needs it. ++ fsstat->f_frsize = fsstat->f_bsize; // even though this is supposed to be ignored, macFUSE needs it. + } + + void FilesystemImpl::createSymlink(const bf::path &to, const bf::path &from, ::uid_t uid, ::gid_t gid) { +diff --git a/test/fspp/testutils/FuseThread.cpp b/test/fspp/testutils/FuseThread.cpp +index 277a2dac..7f3638db 100644 +--- a/test/fspp/testutils/FuseThread.cpp ++++ b/test/fspp/testutils/FuseThread.cpp +@@ -23,7 +23,7 @@ void FuseThread::start(const bf::path &mountDir, const vector &fuseOptio + //Wait until it is running (busy waiting is simple and doesn't hurt much here) + while(!_fuse->running()) {} + #ifdef __APPLE__ +- // On Mac OS X, _fuse->running() returns true too early, because osxfuse calls init() when it's not ready yet. Give it a bit time. ++ // On Mac OS X, _fuse->running() returns true too early, because macFUSE calls init() when it's not ready yet. Give it a bit time. + std::this_thread::sleep_for(std::chrono::milliseconds(200)); + #endif + } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/curlftpfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/curlftpfs/default.nix index 4bfa22838a..2c5d886c14 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/curlftpfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/curlftpfs/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, fuse, curl, pkg-config, glib, zlib}: +{ lib, stdenv, fetchurl, autoreconfHook, fuse, curl, pkg-config, glib, zlib }: stdenv.mkDerivation { name = "curlftpfs-0.9.2"; @@ -6,8 +6,18 @@ stdenv.mkDerivation { url = "mirror://sourceforge/curlftpfs/curlftpfs-0.9.2.tar.gz"; sha256 = "0n397hmv21jsr1j7zx3m21i7ryscdhkdsyqpvvns12q7qwwlgd2f"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [fuse curl glib zlib]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ fuse curl glib zlib ]; + + CFLAGS = lib.optionalString stdenv.isDarwin "-D__off_t=off_t"; + + postPatch = lib.optionalString stdenv.isDarwin '' + # Fix the build on macOS with macFUSE installed. Needs autoreconfHook for + # this change to effect + substituteInPlace configure.ac --replace \ + 'export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH' \ + "" + ''; doCheck = false; # fails, doesn't work well too, btw @@ -15,7 +25,6 @@ stdenv.mkDerivation { description = "Filesystem for accessing FTP hosts based on FUSE and libcurl"; homepage = "http://curlftpfs.sourceforge.net"; license = licenses.gpl2; - platforms = platforms.linux; - + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix index b5addf833c..54d23e770d 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fuse, zlib, bzip2, openssl, libxml2, icu, lzfse }: +{ lib, stdenv, fetchFromGitHub, cmake, fuse, zlib, bzip2, openssl, libxml2, icu, lzfse, libiconv }: stdenv.mkDerivation rec { pname = "darling-dmg"; @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ fuse openssl zlib bzip2 libxml2 icu lzfse ]; + buildInputs = [ fuse openssl zlib bzip2 libxml2 icu lzfse ] + ++ lib.optionals stdenv.isDarwin [ libiconv ]; CXXFLAGS = [ "-DCOMPILE_WITH_LZFSE=1" @@ -22,8 +23,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.darlinghq.org/"; description = "Darling lets you open macOS dmgs on Linux"; - platforms = platforms.linux; - license = licenses.gpl3; + platforms = platforms.unix; + license = licenses.gpl3Only; maintainers = with maintainers; [ Luflosi ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix index e65e4665bd..10559985f8 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix @@ -1,6 +1,8 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , cmake +, pkg-config , mbedtls , fuse }: @@ -17,7 +19,20 @@ stdenv.mkDerivation rec { sha256 = "1ak68s1v5dwh8y2dy5zjybmrh0pnqralmyqzis67y21m87g47h2k"; }; - nativeBuildInputs = [ cmake ]; + patches = [ + # This patch + # 1. adds support for the latest FUSE on macOS + # 2. uses pkg-config to find libfuse instead of searching in predetermined + # paths + # + # https://github.com/Aorimn/dislocker/pull/246 + (fetchpatch { + url = "https://github.com/Aorimn/dislocker/commit/7744f87c75fcfeeb414d0957771042b10fb64e62.diff"; + sha256 = "0bpyccbbfjsidsrd2q9qylb95nvi8g3glb3jss7xmhywj86bhzr5"; + }) + ]; + + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ fuse mbedtls ]; meta = with lib; { @@ -25,6 +40,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/aorimn/dislocker"; license = licenses.gpl2; maintainers = with maintainers; [ elitak ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/encfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/encfs/default.nix index 2b88dde153..14701a615c 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/encfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/encfs/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An encrypted filesystem in user-space via FUSE"; homepage = "https://vgough.github.io/encfs"; - license = with licenses; [ gpl3 lgpl3 ]; - platforms = with platforms; linux; + license = with licenses; [ gpl3Plus lgpl3Plus ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/exfat/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/exfat/default.nix index 8cb552cdc7..488ae337a3 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/exfat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/exfat/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; license = licenses.gpl2Plus; maintainers = with maintainers; [ dywedir ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix index e4a120264f..03e76e5fb2 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix @@ -14,6 +14,12 @@ python3Packages.buildPythonApplication rec { patchPhase = '' # requirement checks are unnecessary at runtime echo > requirements.txt + + # NOTE: As of gitfs 0.5.2, The pygit2 release that upstream uses is a major + # version behind the one packaged in nixpkgs. + substituteInPlace gitfs/mounter.py --replace \ + 'from pygit2.remote import RemoteCallbacks' \ + 'from pygit2 import RemoteCallbacks' ''; checkInputs = with python3Packages; [ pytest pytestcov mock ]; @@ -31,7 +37,7 @@ python3Packages.buildPythonApplication rec { ''; homepage = "https://github.com/PressLabs/gitfs"; license = lib.licenses.asl20; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = [ lib.maintainers.robbinch ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix index c62703c7b5..f107add29c 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/hubicfuse/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/hubicfuse/default.nix index 4f40bd37ab..0ebc1f2322 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/hubicfuse/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/hubicfuse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, curl, openssl, fuse, libxml2, json_c, file }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, curl, openssl, fuse, libxml2, json_c, file }: stdenv.mkDerivation rec { pname = "hubicfuse"; @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "1x988hfffxgvqxh083pv3lj5031fz03sbgiiwrjpaiywfbhm8ffr"; }; + patches = [ + # Fix Darwin build + # https://github.com/TurboGit/hubicfuse/pull/159 + (fetchpatch { + url = "https://github.com/TurboGit/hubicfuse/commit/b460f40d86bc281a21379158a7534dfb9f283786.patch"; + sha256 = "0nqvcbrgbc5dms8fkz3brlj40yn48p36drabrnc26gvb3hydh5dl"; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ curl openssl fuse libxml2 json_c file ]; postInstall = '' @@ -22,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/TurboGit/hubicfuse"; description = "FUSE-based filesystem to access hubic cloud storage"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.mit; maintainers = [ maintainers.jpierre03 ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ifuse/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/ifuse/default.nix index 4abb50b8bd..09be33384d 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/ifuse/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/ifuse/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { devices. ''; license = licenses.lgpl21Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ infinisil ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/jmtpfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/jmtpfs/default.nix index a9d3c40aae..8589abffc7 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/jmtpfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/jmtpfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, file, fuse, libmtp }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, file, fuse, libmtp }: let version = "0.5"; in stdenv.mkDerivation { @@ -12,14 +12,22 @@ stdenv.mkDerivation { owner = "JasonFerrara"; }; + patches = [ + # Fix Darwin build (https://github.com/JasonFerrara/jmtpfs/pull/12) + (fetchpatch { + url = "https://github.com/JasonFerrara/jmtpfs/commit/b89084303477d1bc4dc9a887ba9cdd75221f497d.patch"; + sha256 = "0s7x3jfk8i86rd5bwhj7mb1lffcdlpj9bd7b41s1768ady91rb29"; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ file fuse libmtp ]; meta = with lib; { description = "A FUSE filesystem for MTP devices like Android phones"; homepage = "https://github.com/JasonFerrara/jmtpfs"; - license = licenses.gpl3; - platforms = platforms.linux; + license = licenses.gpl3Only; + platforms = platforms.unix; maintainers = [ maintainers.coconnor ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix index e38b040ec0..ee0d5eedc9 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix @@ -24,14 +24,30 @@ stdenv.mkDerivation rec { buildInputs = [ fuse libpcap zlib python ]; + buildFlags = lib.optionals stdenv.isDarwin [ "CPPFLAGS=-UHAVE_STRUCT_STAT_ST_BIRTHTIME" ]; + + # Fix the build on macOS with macFUSE installed + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace configure --replace \ + "/usr/local/lib/pkgconfig" "/nonexistent" + ''; + + preBuild = lib.optional stdenv.isDarwin '' + substituteInPlace config.h --replace \ + "#define HAVE_STRUCT_STAT_ST_BIRTHTIME 1" \ + "#undef HAVE_STRUCT_STAT_ST_BIRTHTIME" + ''; + postInstall = '' substituteInPlace $out/sbin/mfscgiserv --replace "datapath=\"$out" "datapath=\"" ''; + doCheck = true; + meta = with lib; { homepage = "https://moosefs.com"; description = "Open Source, Petabyte, Fault-Tolerant, Highly Performing, Scalable Network Distributed File System"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.gpl2; maintainers = [ maintainers.mfossen ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/mp3fs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/mp3fs/default.nix index 8b241e9026..1b80adc843 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/mp3fs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/mp3fs/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://khenriks.github.io/mp3fs/"; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/romdirfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/romdirfs/default.nix index b4fa173706..0304508d41 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/romdirfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/romdirfs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "FUSE for access Playstation 2 IOP IOPRP images and BIOS dumps"; homepage = "https://github.com/mlafeldt/romdirfs"; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix index 0a05a683ad..b196b29483 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix @@ -16,6 +16,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fuse curl expat ]; + # AC_CHECK_DECLS doesn't work with clang + postPatch = lib.optionalString stdenv.cc.isClang '' + substituteInPlace configure.ac --replace \ + 'AC_CHECK_DECLS(fdatasync)' "" + ''; + autoreconfPhase = '' patchShebangs ./autogen.sh ./autogen.sh @@ -25,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/archiecobbs/s3backer"; description = "FUSE-based single file backing store via Amazon S3"; license = licenses.gpl2Plus; - platforms = with platforms; linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/securefs/add-macfuse-support.patch b/third_party/nixpkgs/pkgs/tools/filesystems/securefs/add-macfuse-support.patch new file mode 100644 index 0000000000..217f637ff9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/filesystems/securefs/add-macfuse-support.patch @@ -0,0 +1,188 @@ +From 8c65c2219976c02a68e27c28156ec0c4c02857e0 Mon Sep 17 00:00:00 2001 +From: midchildan +Date: Sun, 28 Mar 2021 23:39:59 +0900 +Subject: [PATCH] Support the latest FUSE on macOS + +This drops osxfuse support in favor of macFUSE. macFUSE is a newer +version of osxfuse that supports the latest release of macOS, and is a +rebranded version of the same project. +--- + CMakeLists.txt | 8 ++---- + LICENSE.md | 58 ++++++++++++++++++++------------------ + README.md | 2 +- + sources/commands.cpp | 6 ---- + 4 files changed, 33 insertions(+), 41 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7b5e57d..c176554 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,12 +18,8 @@ git_describe(GIT_VERSION --tags) + configure_file(${CMAKE_SOURCE_DIR}/sources/git-version.cpp.in ${CMAKE_BINARY_DIR}/git-version.cpp) + + if (UNIX) +- find_path(FUSE_INCLUDE_DIR fuse.h PATHS /usr/local/include PATH_SUFFIXES osxfuse) +- if (APPLE) +- find_library(FUSE_LIBRARIES osxfuse PATHS /usr/local/lib) +- else() +- find_library(FUSE_LIBRARIES fuse PATHS /usr/local/lib) +- endif() ++ find_path(FUSE_INCLUDE_DIR fuse.h PATHS /usr/local/include) ++ find_library(FUSE_LIBRARIES fuse PATHS /usr/local/lib) + include_directories(${FUSE_INCLUDE_DIR}) + link_libraries(${FUSE_LIBRARIES}) + add_compile_options(-Wall -Wextra -Wno-unknown-pragmas) +diff --git a/LICENSE.md b/LICENSE.md +index a8f920c..b134532 100644 +--- a/LICENSE.md ++++ b/LICENSE.md +@@ -758,13 +758,11 @@ Public License instead of this License. + + ------------------------------------------------------------------------------ + +-# [osxfuse] (https://github.com/osxfuse/osxfuse) ++# [macFUSE] (https://github.com/osxfuse/osxfuse) + +-FUSE for macOS is a software developed by the osxfuse project and is covered +-under the following BSD-style license: ++macFUSE is covered under the following license: + +- Copyright (c) 2011-2016 Benjamin Fleischer +- Copyright (c) 2011-2012 Erik Larsson ++ Copyright (c) 2011-2021 Benjamin Fleischer + All rights reserved. + + Redistribution and use in source and binary forms, with or without +@@ -775,9 +773,13 @@ under the following BSD-style license: + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +- 3. Neither the name of osxfuse nor the names of its contributors may be used +- to endorse or promote products derived from this software without specific +- prior written permission. ++ 3. Neither the name of the copyright holder nor the names of its contributors ++ may be used to endorse or promote products derived from this software ++ without specific prior written permission. ++ 4. Redistributions in binary form, bundled with commercial software, are not ++ allowed without specific prior written permission. This includes the ++ automated download or installation or both of the binary form in the ++ context of commercial software. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +@@ -791,9 +793,9 @@ under the following BSD-style license: + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +-FUSE for macOS is a fork of MacFUSE. MacFUSE has been developed by Google Inc.. +-Additional information and the original source of MacFUSE are available on +-http://code.google.com/p/macfuse/. MacFUSE is covered under the following ++macFUSE is a fork of the legacy Google MacFUSE software. Additional information ++and the original source code of Google MacFUSE are available on ++http://code.google.com/p/macfuse/. Google MacFUSE is covered under the following + BSD-style license: + + Copyright (c) 2007—2009 Google Inc. +@@ -830,9 +832,9 @@ BSD-style license: + Portions of this package were derived from code developed by other authors. + Please read further for specific details. + +-* Unless otherwise noted, parts of the FUSE for macOS kernel extension contain +- code derived from the FreeBSD version of FUSE, which is covered under the +- following BSD-style license: ++* Unless otherwise noted, parts of the macFUSE kernel extension contain code ++ derived from the FreeBSD version of FUSE, which is covered under the following ++ BSD-style license: + + Copyright (C) 2005 Csaba Henk. All rights reserved. + +@@ -856,12 +858,13 @@ Please read further for specific details. + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +-* Parts of the FUSE for macOS kernel extension contain code derived from Tuxera +- Inc.'s "rebel" branch. The original source of the "rebel" branch is available +- on https://github.com/tuxera. These modifications are covered under the +- following BSD-style license: ++* Parts of the macFUSE kernel extension contain code derived from Tuxera's ++ "rebel" branch. The original source code of the "rebel" branch is available on ++ https://github.com/tuxera. These modifications are covered under the following ++ BSD-style license: + + Copyright (c) 2010 Tuxera Inc. ++ Copyright (c) 2011-2012 Erik Larsson + All rights reserved. + + Redistribution and use in source and binary forms, with or without +@@ -888,9 +891,9 @@ Please read further for specific details. + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +-* Parts of FUSE for macOS contain code derived from Fuse4X. The original source +- of Fuse4X is available on https://github.com/fuse4x. Fuse4X is covered under +- the following BSD-style license: ++* Parts of macFUSE contain code derived from Fuse4X. The original source code of ++ Fuse4X is available on https://github.com/fuse4x. Fuse4X is covered under the ++ following BSD-style license: + + Copyright (c) 2011 Anatol Pomozov + All rights reserved. +@@ -916,21 +919,20 @@ Please read further for specific details. + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +-* Parts of the mount_osxfuse command-line program are covered under the Apple ++* Parts of the mount_macfuse command-line program are covered under the Apple + Public Source License (APSL). You can read the APSL at: + + http://www.opensource.apple.com/license/apsl/ + +-* fuse_kernel.h is an unmodified copy of the interface header from the Linux ++* fuse_kernel.h is a modified copy of the interface header from the Linux + FUSE distribution (https://github.com/libfuse/libfuse). fuse_kernel.h can be + redistributed either under the GPL or under the BSD license. It is being + redistributed here under the BSD license. + +-* fuse_nodehash.c is a slightly modified version of HashNode.c from an +- Apple Developer Technical Support (DTS) sample code example. The original +- source, which is available on +- http://developer.apple.com/library/mac/#samplecode/MFSLives/, has the +- following disclaimer: ++* fuse_nodehash.c is a modified version of HashNode.c from an Apple Developer ++ Technical Support (DTS) sample code example. The original source, which is ++ available on http://developer.apple.com/library/mac/#samplecode/MFSLives/, ++ has the following disclaimer: + + Disclaimer: IMPORTANT: This Apple software is supplied to you by Apple + Computer, Inc. Apple") in consideration of your agreement to the following +diff --git a/README.md b/README.md +index 9085e96..6fe3592 100644 +--- a/README.md ++++ b/README.md +@@ -28,7 +28,7 @@ There are already many encrypting filesystem in widespread use. Some notable one + + ### macOS + +-Install with [Homebrew](https://brew.sh). [osxfuse](https://osxfuse.github.io) has to be installed beforehand. ++Install with [Homebrew](https://brew.sh). [macFUSE](https://osxfuse.github.io) has to be installed beforehand. + ``` + brew install securefs + ``` +diff --git a/sources/commands.cpp b/sources/commands.cpp +index a371212..862602b 100644 +--- a/sources/commands.cpp ++++ b/sources/commands.cpp +@@ -1252,12 +1252,6 @@ class VersionCommand : public CommandBase + printf("WinFsp %u.%u\n", vn >> 16, vn & 0xFFFFu); + } + } +-#elif defined(__APPLE__) +- typedef const char* version_function(void); +- auto osx_version_func +- = reinterpret_cast(::dlsym(RTLD_DEFAULT, "osxfuse_version")); +- if (osx_version_func) +- printf("osxfuse %s\n", osx_version_func()); + #else + typedef int version_function(void); + auto fuse_version_func + diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/securefs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/securefs/default.nix index 235d8a53fe..44e547b01c 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/securefs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/securefs/default.nix @@ -14,6 +14,12 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # Make it build with macFUSE + # Backported from https://github.com/netheril96/securefs/pull/114 + ./add-macfuse-support.patch + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ fuse ]; @@ -31,6 +37,6 @@ stdenv.mkDerivation rec { contents. ''; license = with licenses; [ bsd2 mit ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix index bb7df1aa94..265495389b 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix @@ -19,6 +19,17 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ qyliss ]; platforms = platforms.unix; + + # TODO: Remove once nixpkgs uses newer SDKs that supports '*at' functions. + # Probably macOS SDK 10.13 or later. Check the current version in + # ../../../../os-specific/darwin/apple-sdk/default.nix + # + # From the build logs: + # + # > Undefined symbols for architecture x86_64: + # > "_utimensat", referenced from: + # > _set_attribs in rdsquashfs-restore_fstree.o + # > ld: symbol(s) not found for architecture x86_64 broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix index a2e930f915..14a7f60243 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix @@ -8,10 +8,6 @@ stdenv.mkDerivation rec { pname = "squashfuse"; version = "0.1.103"; - # platforms.darwin should be supported : see PLATFORMS file in src. - # we could use a nix fuseProvider, and let the derivation choose the OS - # specific implementation. - src = fetchFromGitHub { owner = "vasi"; repo = pname; @@ -26,7 +22,7 @@ stdenv.mkDerivation rec { description = "FUSE filesystem to mount squashfs archives"; homepage = "https://github.com/vasi/squashfuse"; maintainers = [ ]; - platforms = platforms.linux; + platforms = platforms.unix; license = "BSD-2-Clause"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/svnfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/svnfs/default.nix index bef4d6b5ce..a192032aa9 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/svnfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/svnfs/default.nix @@ -1,14 +1,26 @@ -{ lib, stdenv, fetchurl, automake, autoconf, subversion, fuse, apr, perl }: +{ lib, stdenv, fetchurl, autoreconfHook, subversion, fuse, apr, perl }: -stdenv.mkDerivation { - name = "svnfs-0.4"; +stdenv.mkDerivation rec { + pname = "svnfs"; + version = "0.4"; src = fetchurl { - url = "http://www.jmadden.eu/wp-content/uploads/svnfs/svnfs-0.4.tgz"; + url = "http://www.jmadden.eu/wp-content/uploads/svnfs/svnfs-${version}.tgz"; sha256 = "1lrzjr0812lrnkkwk60bws9k1hq2iibphm0nhqyv26axdsygkfky"; }; - buildInputs = [automake autoconf subversion fuse apr perl]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ subversion fuse apr perl ]; + + # autoconf's AC_CHECK_HEADERS and AC_CHECK_LIBS fail to detect libfuse on + # Darwin if FUSE_USE_VERSION isn't set at configure time. + # + # NOTE: Make sure the value of FUSE_USE_VERSION specified here matches the + # actual version used in the source code: + # + # $ tar xf "$(nix-build -A svnfs.src)" + # $ grep -R FUSE_USE_VERSION + configureFlags = lib.optionals stdenv.isDarwin [ "CFLAGS=-DFUSE_USE_VERSION=25" ]; # why is this required? preConfigure='' @@ -21,8 +33,8 @@ stdenv.mkDerivation { meta = { description = "FUSE filesystem for accessing Subversion repositories"; homepage = "http://www.jmadden.eu/index.php/svnfs/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; maintainers = [lib.maintainers.marcweber]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/tmsu/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/tmsu/default.nix index 1eac3e03ec..aa3057202c 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/tmsu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/tmsu/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, fetchFromGitHub, fuse, installShellFiles }: +{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "tmsu"; @@ -14,7 +14,6 @@ buildGoPackage rec { goDeps = ./deps.nix; - buildInputs = [ fuse ]; nativeBuildInputs = [ installShellFiles ]; preBuild = '' @@ -24,7 +23,10 @@ buildGoPackage rec { ''; postInstall = '' - mv $out/bin/{TMSU,tmsu} + # can't do "mv TMSU tmsu" on case-insensitive filesystems + mv $out/bin/{TMSU,tmsu.tmp} + mv $out/bin/{tmsu.tmp,tmsu} + cp src/misc/bin/* $out/bin/ installManPage src/misc/man/tmsu.1 installShellCompletion --zsh src/misc/zsh/_tmsu @@ -34,7 +36,7 @@ buildGoPackage rec { homepage = "http://www.tmsu.org"; description = "A tool for tagging your files using a virtual filesystem"; maintainers = with maintainers; [ pSub ]; - license = licenses.gpl3; - platforms = platforms.linux; + license = licenses.gpl3Plus; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/tmsu/deps.nix b/third_party/nixpkgs/pkgs/tools/filesystems/tmsu/deps.nix index 90e64b434c..7dee6324b6 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/tmsu/deps.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/tmsu/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/hanwen/go-fuse"; - rev = "730713460d4fc41afdc2533bd37ff60c94c0c586"; - sha256 = "1y44d08fxyis99s6jxdr6dbbw5kv3wb8lkhq3xmr886i4w41lz03"; + rev = "0f728ba15b38579efefc3dc47821882ca18ffea7"; + sha256 = "05ymw2pp58avf19wvi0cgdzqf3d88k1jdf6ldj4hmhbkm3waqf7l"; }; } { diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/wdfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/wdfs/default.nix index 9837736573..29d8b4c288 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/wdfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/wdfs/default.nix @@ -1,18 +1,27 @@ -{lib, stdenv, fetchurl, glib, neon, fuse, pkg-config}: +{lib, stdenv, fetchurl, glib, neon, fuse, autoreconfHook, pkg-config}: + +stdenv.mkDerivation rec { + pname = "wdfs-fuse"; + version = "1.4.2"; -stdenv.mkDerivation { - name = "wdfs-fuse-1.4.2"; src = fetchurl { - url = "http://noedler.de/projekte/wdfs/wdfs-1.4.2.tar.gz"; + url = "http://noedler.de/projekte/wdfs/wdfs-${version}.tar.gz"; sha256 = "fcf2e1584568b07c7f3683a983a9be26fae6534b8109e09167e5dff9114ba2e5"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [fuse glib neon]; + postPatch = lib.optionalString stdenv.isDarwin '' + # Fix the build on macOS with macFUSE installed. Needs autoreconfHook to + # take effect. + substituteInPlace configure.ac --replace \ + 'export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH' "" + ''; + meta = with lib; { homepage = "http://noedler.de/projekte/wdfs/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; description = "User-space filesystem that allows to mount a webdav share"; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix new file mode 100644 index 0000000000..859d6f1eee --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix @@ -0,0 +1,71 @@ +{ lib +, gccStdenv +, fetchFromGitHub +, cmake +, simdExtensions ? null +}: + +with rec { + # SIMD instruction sets to compile for. If none are specified by the user, + # an appropriate one is selected based on the detected host system + isas = with gccStdenv.hostPlatform; + if simdExtensions != null then lib.toList simdExtensions + else if avx2Support then [ "AVX2" ] + else if sse4_1Support then [ "SSE41" ] + else if isx86_64 then [ "SSE2" ] + else if isAarch64 then [ "NEON" ] + else [ "NONE" ]; + + archFlags = lib.optionals gccStdenv.hostPlatform.isAarch64 [ "-DARCH=aarch64" ]; + + # CMake Build flags for the selected ISAs. For a list of flags, see + # https://github.com/ARM-software/astc-encoder/blob/main/Docs/Building.md + isaFlags = map ( isa: "-DISA_${isa}=ON" ) isas; + + # The suffix of the binary to link as 'astcenc' + mainBinary = builtins.replaceStrings + [ "AVX2" "SSE41" "SSE2" "NEON" "NONE" ] + [ "avx2" "sse4.1" "sse2" "neon" "none" ] + ( builtins.head isas ); +}; + +gccStdenv.mkDerivation rec { + pname = "astc-encoder"; + version = "2.5"; + + src = fetchFromGitHub { + owner = "ARM-software"; + repo = "astc-encoder"; + rev = version; + sha256 = "0ff5jh40w942dz7hmgvznmpa9yhr1j4i9qqj5wy6icm2jb9j4pak"; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = isaFlags ++ archFlags ++ [ + "-DCMAKE_BUILD_TYPE=Release" + ]; + + # Link binaries into environment and provide 'astcenc' link + postInstall = '' + mv $out/astcenc $out/bin + ln -s $out/bin/astcenc-${mainBinary} $out/bin/astcenc + ''; + + meta = with lib; { + homepage = "https://github.com/ARM-software/astc-encoder"; + description = "An encoder for the ASTC texture compression format"; + longDescription = '' + The Adaptive Scalable Texture Compression (ASTC) format is + widely supported by mobile and desktop graphics hardware and + provides better quality at a given bitrate compared to ETC2. + + This program supports both compression and decompression in LDR + and HDR mode and can read various image formats. Run `astcenc + -help` to see all the options. + ''; + platforms = platforms.unix; + license = licenses.asl20; + maintainers = with maintainers; [ dasisdormax ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/kime/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/kime/default.nix new file mode 100644 index 0000000000..35ed99b5a4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/kime/default.nix @@ -0,0 +1,113 @@ +{ lib, stdenv, rustPlatform, rustc, cargo, fetchFromGitHub, pkg-config, cmake, extra-cmake-modules, llvmPackages +, withWayland ? true +, withIndicator ? true, dbus, libdbusmenu +, withXim ? true, xorg, cairo +, withGtk2 ? true, gtk2 +, withGtk3 ? true, gtk3 +, withQt5 ? true, qt5 +}: + +let + cmake_args = lib.optionals withGtk2 ["-DENABLE_GTK2=ON"] + ++ lib.optionals withGtk3 ["-DENABLE_GTK3=ON"] + ++ lib.optionals withQt5 ["-DENABLE_QT5=ON"]; + + optFlag = w: (if w then "1" else "0"); +in +stdenv.mkDerivation rec { + pname = "kime"; + version = "2.5.2"; + + src = fetchFromGitHub { + owner = "Riey"; + repo = pname; + rev = "v${version}"; + sha256 = "10zd4yrqxzxf4nj3b5bsblcmlbqssxqq9pac0misa1g61jdbszj8"; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + sha256 = "1bimi7020m7v287bh7via7zm9m7y13d13kqpd772xmpdbwrj8nrl"; + }; + + # Replace autostart path + postPatch = '' + substituteInPlace res/kime.desktop --replace "/usr/bin/kime" "$out/bin/kime" + ''; + + dontUseCmakeConfigure = true; + dontWrapQtApps = true; + buildPhase = '' + runHook preBuild + export KIME_BUILD_CHECK=1 + export KIME_BUILD_INDICATOR=${optFlag withIndicator} + export KIME_BUILD_XIM=${optFlag withXim} + export KIME_BUILD_WAYLAND=${optFlag withWayland} + export KIME_BUILD_KIME=1 + export KIME_CARGO_ARGS="-j$NIX_BUILD_CORES --frozen" + export KIME_MAKE_ARGS="-j$NIX_BUILD_CORES" + export KIME_CMAKE_ARGS="${lib.concatStringsSep " " cmake_args}" + bash scripts/build.sh -r + runHook postBuild + ''; + + doCheck = true; + checkPhase = '' + runHook preCheck + cargo test --release --frozen + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + export KIME_BIN_DIR=bin + export KIME_INSTALL_HEADER=1 + export KIME_INSTALL_DOC=1 + export KIME_INCLUDE_DIR=include + export KIME_DOC_DIR=share/doc/kime + export KIME_ICON_DIR=share/icons + export KIME_LIB_DIR=lib + export KIME_QT5_DIR=lib/qt-${qt5.qtbase.version} + bash scripts/install.sh "$out" + runHook postInstall + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + # Don't pipe output to head directly it will cause broken pipe error https://github.com/rust-lang/rust/issues/46016 + kimeVersion=$(echo "$($out/bin/kime --version)" | head -n1) + echo "'kime --version | head -n1' returns: $kimeVersion" + [[ "$kimeVersion" == "kime ${version}" ]] + runHook postInstallCheck + ''; + + buildInputs = lib.optionals withIndicator [ dbus libdbusmenu ] + ++ lib.optionals withXim [ xorg.libxcb cairo ] + ++ lib.optionals withGtk2 [ gtk2 ] + ++ lib.optionals withGtk3 [ gtk3 ] + ++ lib.optionals withQt5 [ qt5.qtbase ]; + + nativeBuildInputs = [ + pkg-config + llvmPackages.clang + llvmPackages.libclang + llvmPackages.bintools + cmake + extra-cmake-modules + rustPlatform.cargoSetupHook + rustc + cargo + ]; + + RUST_BACKTRACE = 1; + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + + meta = with lib; { + homepage = "https://github.com/Riey/kime"; + description = "Korean IME"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.riey ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/ffsend/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ffsend/default.nix index 4c92a0be79..4e059725f8 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ffsend/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ffsend/default.nix @@ -7,7 +7,7 @@ }: let - usesX11 = stdenv.isLinux || stdenv.hostPlatform.isBSD; + usesX11 = stdenv.isLinux || stdenv.isBSD; in assert (x11Support && usesX11) -> xclip != null || xsel != null; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix index 10b1143cc2..b5c0940910 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix @@ -41,13 +41,13 @@ let ])); in stdenv.mkDerivation rec { pname = "ostree"; - version = "2020.8"; + version = "2021.1"; outputs = [ "out" "dev" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; - sha256 = "16v73v63h16ika73kgh2cvgm0v27r2d48m932mbj3xm6s295kapx"; + sha256 = "sha256-kbS9kmSDHSD/AOxELUjt5SbbVTeb2RdgaGPAX0O4WlE="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix index 354075df54..ff4e15c9cc 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "sha256-kRKU6ynZffV17GqEArkXxz6M9xoa3kn2yNqjyLRY0rc="; + sha256 = "sha256-RWezBNqjKybMtfpxPhDg2ysb4ksKphTPdTNTwCe4pas="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/websocat/default.nix b/third_party/nixpkgs/pkgs/tools/misc/websocat/default.nix index d5f09d9f9f..821c059a45 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/websocat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/websocat/default.nix @@ -2,21 +2,24 @@ rustPlatform.buildRustPackage rec { pname = "websocat"; - version = "1.6.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "vi"; - repo = "websocat"; + repo = pname; rev = "v${version}"; - sha256 = "0iilq96bxcb2fsljvlgy47pg514w0jf72ckz39yy3k0gwc1yfcja"; + sha256 = "sha256-jwoWxK4phBqhIeo3+oRnpGsfvtn9gTR1ryd4N+0Lmbw="; }; cargoBuildFlags = [ "--features=ssl" ]; - cargoSha256 = "1hsms8rlnds8npr8m0dm21h04ci5ljda09pqb598v7ny3j2dldiq"; + cargoSha256 = "sha256-+3SG1maarY4DJ4+QiYGwltGLksOoOhKtcqstRwgzi2k="; nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + # Needed to get openssl-sys to use pkg-config. + OPENSSL_NO_VENDOR=1; + # The wrapping is required so that the "sh-c" option of websocat works even # if sh is not in the PATH (as can happen, for instance, when websocat is # started as a systemd service). @@ -26,8 +29,9 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "Command-line client for WebSockets (like netcat/socat)"; homepage = "https://github.com/vi/websocat"; + description = "Command-line client for WebSockets (like netcat/socat)"; + changelog = "https://github.com/vi/websocat/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ thoughtpolice Br1ght0ne ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/wemux/default.nix b/third_party/nixpkgs/pkgs/tools/misc/wemux/default.nix new file mode 100644 index 0000000000..0eee60187f --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/wemux/default.nix @@ -0,0 +1,38 @@ +{ stdenv, lib, fetchFromGitHub, tmux, installShellFiles }: + +stdenv.mkDerivation rec { + pname = "wemux"; + version = "unstable-2021-04-16"; + + src = fetchFromGitHub { + owner = "zolrath"; + repo = "wemux"; + rev = "01c6541f8deceff372711241db2a13f21c4b210c"; + sha256 = "1y962nzvs7sf720pl3wa582l6irxc8vavd0gp4ag4243b2gs4qvm"; + }; + + nativeBuildInputs = [ installShellFiles ]; + + installPhase = '' + runHook preInstall + + substituteInPlace wemux \ + --replace tmux ${tmux}/bin/tmux \ + --replace "/usr/local/etc" "/etc" + + substituteInPlace man/wemux.1 --replace "/usr/local/etc" "/etc" + + install -Dm755 wemux -t $out/bin + installManPage man/wemux.1 + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/zolrath/wemux"; + description = "Multi-user tmux made easy"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ bsima ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnstwist/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnstwist/default.nix new file mode 100644 index 0000000000..e19b4dabd7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/dnstwist/default.nix @@ -0,0 +1,37 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "dnstwist"; + version = "20201228"; + disabled = python3.pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "elceef"; + repo = pname; + rev = version; + sha256 = "0bxshi1p0va2f449v6vsm8bav5caa3r3pyknj3zf4n5rvk6say70"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + dnspython + GeoIP + ppdeep + requests + tld + whois + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "dnstwist" ]; + + meta = with lib; { + description = "Domain name permutation engine for detecting homograph phishing attacks"; + homepage = "https://github.com/elceef/dnstwist"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/qrcp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/qrcp/default.nix index bf3b3936ed..fd6b79ecb2 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/qrcp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/qrcp/default.nix @@ -1,23 +1,34 @@ { lib , buildGoModule , fetchFromGitHub +, installShellFiles }: buildGoModule rec { pname = "qrcp"; - version = "0.7.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "claudiodangelis"; repo = "qrcp"; rev = version; - sha256 = "0rx0pzy7p3dklayr2lkmyfdc00x9v4pd5xnzydbjx12hncnkpw4l"; + sha256 = "001w15hj5xb7p9gpvw1216lp26g5018qdi8mq6i84akb7zfd2q01"; }; - vendorSha256 = "0iffy43x3njcahrxl99a71v8p7im102nzv8iqbvd5c6m14rsckqa"; + vendorSha256 = "1hn8c72fvih6ws1y2c4963pww3ld64m0yh3pmx62hwcy83bhb0v4"; subPackages = [ "." ]; + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = '' + installShellCompletion --bash --cmd qrcp <($out/bin/qrcp completion bash) + installShellCompletion --fish --cmd qrcp <($out/bin/qrcp completion fish) + installShellCompletion --zsh --cmd qrcp <($out/bin/qrcp completion zsh) + ''; + meta = with lib; { homepage = "https://claudiodangelis.com/qrcp/"; description = "Transfer files over wifi by scanning a QR code from your terminal"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/sish/default.nix b/third_party/nixpkgs/pkgs/tools/networking/sish/default.nix new file mode 100644 index 0000000000..181582f545 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/sish/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "sish"; + version = "1.1.5"; + + src = fetchFromGitHub { + owner = "antoniomika"; + repo = pname; + rev = "v${version}"; + sha256 = "06ckgxhnijs7yrj0hhwh1vk2fvapwn6wb44w3g6qs6n6fmqh92mb"; + }; + + vendorSha256 = "0vfazbaiaqka5nd7imh5ls7k3asf1c17y081nzkban98svg3l3sj"; + + meta = with lib; { + description = "HTTP(S)/WS(S)/TCP Tunnels to localhost"; + homepage = "https://github.com/antoniomika/sish"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/swagger-codegen/default.nix b/third_party/nixpkgs/pkgs/tools/networking/swagger-codegen/default.nix index 93fb6e1e35..f2847703bd 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/swagger-codegen/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/swagger-codegen/default.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { sha256 = "04wl5k8k1ziqz7k5w0g7i6zdfn41pbh3k0m8vq434k1886inf8yn"; }; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' - install -D "$src" "$out/share/java/${jarfilename}" + install -D $src $out/share/java/${jarfilename} - makeWrapper ${jre}/bin/java $out/bin/swagger-codegen \ + makeWrapper ${jre}/bin/java $out/bin/${pname} \ --add-flags "-jar $out/share/java/${jarfilename}" ''; diff --git a/third_party/nixpkgs/pkgs/tools/networking/swagger-codegen3/default.nix b/third_party/nixpkgs/pkgs/tools/networking/swagger-codegen3/default.nix new file mode 100644 index 0000000000..8fc908a1f2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/swagger-codegen3/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchurl, jre, makeWrapper }: + +stdenv.mkDerivation rec { + version = "3.0.25"; + pname = "swagger-codegen"; + + jarfilename = "${pname}-cli-${version}.jar"; + + nativeBuildInputs = [ + makeWrapper + ]; + + src = fetchurl { + url = "https://repo1.maven.org/maven2/io/swagger/codegen/v3/${pname}-cli/${version}/${jarfilename}"; + sha256 = "1rdz45kmmg60fs7ddnla1xq30nah6s6rd18fqbjbjxng8r92brnd"; + }; + + dontUnpack = true; + + installPhase = '' + install -D $src $out/share/java/${jarfilename} + + makeWrapper ${jre}/bin/java $out/bin/${pname}3 \ + --add-flags "-jar $out/share/java/${jarfilename}" + ''; + + meta = with lib; { + description = "Allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an OpenAPI Spec"; + homepage = "https://github.com/swagger-api/swagger-codegen/tree/3.0.0"; + license = licenses.asl20; + maintainers = [ maintainers._1000101 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/nix/manix/default.nix b/third_party/nixpkgs/pkgs/tools/nix/manix/default.nix index 6c9f02f0e4..768a283ebd 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/manix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/manix/default.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin, Security }: rustPlatform.buildRustPackage rec { pname = "manix"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "mlvzk"; repo = pname; rev = "v${version}"; - sha256 = "0fv3sgzwjsgq2h1177r8r1cl5zrfja4ll801sd0bzj3nzmkyww7p"; + sha256 = "1b7xi8c2drbwzfz70czddc4j33s7g1alirv12dwl91hbqxifx8qs"; }; - buildInputs = lib.optional stdenv.isDarwin [ darwin.Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "0f2q3bj1cmpbma0fjhc2lc92j4al78fhrx3yc37kmbgzaza0yan5"; + cargoSha256 = "1yivx9vzk2fvncvlkwq5v11hb9llr1zlcmy69y12q6xnd9rd8x1b"; meta = with lib; { description = "A Fast Documentation Searcher for Nix"; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-update/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix-update/default.nix index 3c420a5565..296f3be49c 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix-update/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix-update/default.nix @@ -3,21 +3,23 @@ , fetchFromGitHub , nixFlakes , nix-prefetch +, nixpkgs-fmt +, nixpkgs-review }: buildPythonApplication rec { pname = "nix-update"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "Mic92"; repo = pname; rev = version; - sha256 = "1ykxr0yah7zl06igm7wiji9zx3y0xpjc37hbfhn6gnir6ssa0kqp"; + sha256 = "sha256-n3YuNypKFaBtO5Fhf7Z3Wgh0+WH5bQWR0W0uHCYKtuY="; }; makeWrapperArgs = [ - "--prefix" "PATH" ":" (lib.makeBinPath [ nixFlakes nix-prefetch ]) + "--prefix" "PATH" ":" (lib.makeBinPath [ nixFlakes nix-prefetch nixpkgs-fmt nixpkgs-review ]) ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix index d3fcac6277..2229e0c6a1 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -7,19 +7,21 @@ python3.pkgs.buildPythonApplication rec { pname = "nixpkgs-review"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "Mic92"; repo = "nixpkgs-review"; rev = version; - sha256 = "1k4i54j5if86qf9dmwm8ybfc4j7ap40y82f03hxfxb7lzq5cqmcv"; + sha256 = "sha256-096oSvc9DidURGKE0FNEBOQz82+RGg6aJo8o9HhaSp0="; }; makeWrapperArgs = [ "--prefix" "PATH" ":" (lib.makeBinPath [ nixFlakes git ]) ]; + doCheck = false; + meta = with lib; { description = "Review pull-requests on https://github.com/NixOS/nixpkgs"; homepage = "https://github.com/Mic92/nixpkgs-review"; diff --git a/third_party/nixpkgs/pkgs/tools/security/badtouch/default.nix b/third_party/nixpkgs/pkgs/tools/security/badtouch/default.nix new file mode 100644 index 0000000000..ea74bbb4fc --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/badtouch/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchFromGitHub +, installShellFiles +, libcap +, openssl +, pkg-config +, rustPlatform +, Security +, zlib +}: + +rustPlatform.buildRustPackage rec { + pname = "badtouch"; + version = "0.7.3"; + + src = fetchFromGitHub { + owner = "kpcyrd"; + repo = pname; + rev = "v${version}"; + sha256 = "05dzwx9y8zh0y9zd4mibp02255qphc6iqy916fkm3ahaw0rg84h3"; + }; + + cargoSha256 = "0mmglgz037dk3g7qagf1dyss5hvvsdy0m5m1h6c3rk5bp5kjzg87"; + + nativeBuildInputs = [ + installShellFiles + pkg-config + ]; + + buildInputs = [ + libcap + zlib + openssl + ] ++ lib.optional stdenv.isDarwin Security; + + postInstall = '' + installManPage docs/${pname}.1 + ''; + + # Tests requires access to httpin.org + doCheck = false; + + meta = with lib; { + description = "Scriptable network authentication cracker"; + homepage = "https://github.com/kpcyrd/badtouch"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix b/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix index c0ef3b7400..eb33d7dbb5 100644 --- a/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix @@ -1,25 +1,35 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, lib, buildGoModule, fetchFromGitHub, pcsclite, pkg-config, PCSC }: buildGoModule rec { pname = "cosign"; - version = "0.2.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "1zwb2q62ngb2zh1hasvq7r7pmrjlpgfhs5raibbhkxbk5kayvmii"; + sha256 = "1gfzard6bh78xxgjk14c9zmdplppkcjqxhvfazcbv8qppjl2pbbd"; }; - vendorSha256 = "0nwbjaps4z5fhiknbj9pybxb6kgwb1vf2qhy0mzpycprf04q6g0v"; + buildInputs = + lib.optional stdenv.isLinux (lib.getDev pcsclite) + ++ lib.optionals stdenv.isDarwin [ PCSC ]; + + nativeBuildInputs = [ pkg-config ]; + + vendorSha256 = "15163v484rv08rn439y38r9spyqn3lf4q4ly8xr18nnf4bs3h6y2"; subPackages = [ "cmd/cosign" ]; + preBuild = '' + buildFlagsArray+=("-ldflags" "-s -w -X github.com/sigstore/cosign/cmd/cosign/cli.gitVersion=v${version}") + ''; + meta = with lib; { homepage = "https://github.com/sigstore/cosign"; changelog = "https://github.com/sigstore/cosign/releases/tag/v${version}"; description = "Container Signing CLI with support for ephemeral keys and Sigstore signing"; license = licenses.asl20; - maintainers = with maintainers; [ lesuisse ]; + maintainers = with maintainers; [ lesuisse jk ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/cryptomator/default.nix b/third_party/nixpkgs/pkgs/tools/security/cryptomator/default.nix index 465e05077b..ec18a5ed10 100644 --- a/third_party/nixpkgs/pkgs/tools/security/cryptomator/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/cryptomator/default.nix @@ -6,20 +6,20 @@ let pname = "cryptomator"; - version = "1.5.14"; + version = "1.5.15"; src = fetchFromGitHub { owner = "cryptomator"; repo = "cryptomator"; rev = version; - sha256 = "05zgan1i2dzipzw8x510lg2l40dz9hvk43nrwpi0kg9l1qs9sxrq"; + sha256 = "06n7wda7gfalvsg1rlcm51ss73nlbhh95z6zq18yvn040clkzkij"; }; icons = fetchFromGitHub { owner = "cryptomator"; repo = "cryptomator-linux"; rev = version; - sha256 = "0gb5sd5bkpxv4hff1i09rxr90pi5d15vjsfrk9m8221xiypqmccp"; + sha256 = "1sqbx858zglv0xkpjya0cpbkxf2hkj1xvxhnir3176y2xyjv6aib"; }; # perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB) @@ -44,7 +44,7 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0gvpjc77g99vcwk77nknvg8z33xbskcfwx3015nhhc089b2frq02"; + outputHash = "195ysv9l861y9d1lvmvi7wmk172ynlba9n233blpaigq88cjn208"; }; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/tools/security/hfinger/default.nix b/third_party/nixpkgs/pkgs/tools/security/hfinger/default.nix index 9e053276ec..8116c222d0 100644 --- a/third_party/nixpkgs/pkgs/tools/security/hfinger/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/hfinger/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "hfinger"; - version = "0.2.0"; + version = "0.2.1"; disabled = python3.pythonOlder "3.3"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "1vz8mf572qyng684fvb9gdwaaiybk7mjmikbymvjvy24d10raak1"; + sha256 = "sha256-QKnrprDDBq+D8N1brkqgcfK4E+6ssvgPtRaSxkF0C84="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/tools/security/honeytrap/default.nix b/third_party/nixpkgs/pkgs/tools/security/honeytrap/default.nix new file mode 100644 index 0000000000..735d5d69bd --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/honeytrap/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: +buildGoModule { + pname = "honeytrap"; + version = "unstable-2020-12-10"; + + src = fetchFromGitHub { + owner = "honeytrap"; + repo = "honeytrap"; + rev = "affd7b21a5aa1b57f086e6871753cb98ce088d76"; + sha256 = "y1SWlBFgX3bFoSRGJ45DdC1DoIK5BfO9Vpi2h57wWtU="; + }; + + # Otherwise, will try to install a "scripts" binary; it's only used in + # dockerize.sh, which we don't care about. + subPackages = [ "." ]; + + vendorSha256 = "W8w66weYzCpZ+hmFyK2F6wdFz6aAZ9UxMhccNy1X1R8="; + + meta = with lib; { + description = "Advanced Honeypot framework"; + homepage = "https://github.com/honeytrap/honeytrap"; + license = licenses.asl20; + maintainers = teams.determinatesystems.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/ldeep/default.nix b/third_party/nixpkgs/pkgs/tools/security/ldeep/default.nix index db4d14ba3e..82d0456a05 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ldeep/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ldeep/default.nix @@ -10,11 +10,11 @@ buildPythonApplication rec { pname = "ldeep"; - version = "1.0.10"; + version = "1.0.11"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/7mcmAj69NmuiK+xlQijAk39sMLDX8kHatmSI6XYbwE="; + sha256 = "sha256-MYVC8fxLW85n8uZVMhb2Zml1lQ8vW9gw/eRLcmemQx4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/nwipe/default.nix b/third_party/nixpkgs/pkgs/tools/security/nwipe/default.nix index d87be0c297..81ed9849be 100644 --- a/third_party/nixpkgs/pkgs/tools/security/nwipe/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/nwipe/default.nix @@ -1,22 +1,42 @@ -{ lib, stdenv, fetchFromGitHub, ncurses, parted, automake, autoconf, pkg-config }: +{ lib +, stdenv +, autoreconfHook +, fetchFromGitHub +, ncurses +, parted +, pkg-config +}: stdenv.mkDerivation rec { - version = "0.28"; pname = "nwipe"; + version = "0.30"; + src = fetchFromGitHub { owner = "martijnvanbrummelen"; repo = "nwipe"; rev = "v${version}"; - sha256 = "1aw905lmn1vm6klqn3q7445dwmwbjhcmwnkygpq9rddacgig1gdx"; + sha256 = "sha256-cNZMFnk4L95jKTyGEUN3DlAChUNZlIjDdZqkkwPjehE="; }; - nativeBuildInputs = [ automake autoconf pkg-config ]; - buildInputs = [ ncurses parted ]; - preConfigure = "sh init.sh || :"; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + ncurses + parted + ]; + + preConfigure = '' + sh init.sh || : + ''; + meta = with lib; { description = "Securely erase disks"; homepage = "https://github.com/martijnvanbrummelen/nwipe"; - license = licenses.gpl2; - maintainers = [ maintainers.woffs ]; + license = licenses.gpl2Only; + maintainers = with maintainers; [ woffs ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/wprecon/default.nix b/third_party/nixpkgs/pkgs/tools/security/wprecon/default.nix new file mode 100644 index 0000000000..401692bdf6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/wprecon/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "wprecon"; + version = "1.6.3a"; + + src = fetchFromGitHub { + owner = "blackbinn"; + repo = pname; + rev = version; + sha256 = "0gqi4799ha3mf8r7ini0wj4ilkfsh80vnnxijfv9a343r6z5w0dn"; + }; + + vendorSha256 = "1sab58shspll96rqy1rp659s0yikqdcx59z9b88d6p4w8a98ns87"; + + meta = with lib; { + description = "WordPress vulnerability recognition tool"; + homepage = "https://github.com/blackbinn/wprecon"; + # License Zero Noncommercial Public License 2.0.1 + # https://github.com/blackbinn/wprecon/blob/master/LICENSE + license = with licenses; [ unfree ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/text/amber/default.nix b/third_party/nixpkgs/pkgs/tools/text/amber/default.nix index 632a318e86..1cd9e74f19 100644 --- a/third_party/nixpkgs/pkgs/tools/text/amber/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/amber/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, rustPlatform -, Security +, libiconv, Security }: rustPlatform.buildRustPackage rec { @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-opRinhTmhZxpAwHNiVOLXL8boQf09Y1NXrWQ6HWQYQ0="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; meta = with lib; { description = "A code search-and-replace tool"; diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix index ba343fe657..155daf41a7 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix @@ -7,6 +7,7 @@ , requests , pyyaml , setuptools +, installShellFiles }: let @@ -48,14 +49,21 @@ buildPythonApplication rec { cp data-3 linodecli/ ''; - # requires linode access token for unit tests, and running executable - doCheck = false; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/linode-cli --skip-config --version | grep ${version} > /dev/null + ''; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' + installShellCompletion --cmd linode-cli --bash <($out/bin/linode-cli --skip-config completion bash) + ''; meta = with lib; { homepage = "https://github.com/linode/linode-cli"; description = "The Linode Command Line Interface"; license = licenses.bsd3; - maintainers = with maintainers; [ ryantm ]; + maintainers = with maintainers; [ ryantm superherointj ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/wayland/ydotool/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/ydotool/default.nix index 76ebd22500..4a75eac8c5 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/ydotool/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/ydotool/default.nix @@ -1,26 +1,34 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, boost, libevdevplus, libuinputplus }: +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, boost, libevdevplus, libuinputplus, iodash, cxxopts}: stdenv.mkDerivation rec { pname = "ydotool"; - version = "0.1.8"; + version = "unstable-2021-01-20"; src = fetchFromGitHub { owner = "ReimuNotMoe"; repo = "ydotool"; - rev = "v${version}"; - sha256 = "0mx3636p0f8pznmwm4rlbwq7wrmjb2ygkf8b3a6ps96a7j1fw39l"; + rev = "b1d041f52f7bac364d6539b1251d29c3b77c0f37"; + sha256 = "1gzdbx6fv0dbcyia3yyzhv93az2gf90aszb9kcj5cnxywfpv9w9g"; }; - # disable static linking + # upstream decided to use a cpp package manager called cpm. + # we need to disable that because it wants networking, furthermore, + # it does some system folder creating which also needs to be disabled. + # Both changes are to respect the sandbox. + patches = [ ./fixup-cmakelists.patch ]; + + + # cxxopts is a header only library. + # See pull request: https://github.com/ReimuNotMoe/ydotool/pull/105 postPatch = '' substituteInPlace CMakeLists.txt --replace \ - "-static" \ - "" + "PUBLIC cxxopts" \ + "PUBLIC" ''; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - boost libevdevplus libuinputplus + boost libevdevplus libuinputplus iodash cxxopts ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/wayland/ydotool/fixup-cmakelists.patch b/third_party/nixpkgs/pkgs/tools/wayland/ydotool/fixup-cmakelists.patch new file mode 100644 index 0000000000..965d5c38d8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/wayland/ydotool/fixup-cmakelists.patch @@ -0,0 +1,58 @@ +From bb8bc44d22060cd1215712117cf30eae09f4f6ba Mon Sep 17 00:00:00 2001 +From: Jappie Klooster +Date: Fri, 2 Apr 2021 14:04:14 -0400 +Subject: [PATCH] Fixup cmaklists + +We remove cpm, which is a package manager for c++, +which requires networking, so it's better just deleted. + +Furthermore we delete the adddirectory statements. +These want to modify directories outside of the sandbox. +--- + CMakeLists.txt | 26 -------------------------- + 1 file changed, 26 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b5e8789..b797538 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -13,30 +13,6 @@ endif() + + include(${CPM_DOWNLOAD_LOCATION}) + +-CPMAddPackage( +- NAME IODash +- GITHUB_REPOSITORY YukiWorkshop/IODash +- VERSION 0.1.0 +-) +- +-CPMAddPackage( +- NAME libevdevPlus +- GITHUB_REPOSITORY YukiWorkshop/libevdevPlus +- VERSION 0.2.1 +-) +- +-CPMAddPackage( +- NAME libuInputPlus +- GITHUB_REPOSITORY YukiWorkshop/libuInputPlus +- VERSION 0.2.1 +-) +- +-CPMAddPackage( +- NAME cxxopts +- GITHUB_REPOSITORY jarro2783/cxxopts +- VERSION 3.0.0 +- GIT_TAG 2d8e17c4f88efce80e274cb03eeb902e055a91d3 +-) + + set(SOURCE_FILES_LIBRARY + CommonIncludes.hpp +@@ -74,5 +50,3 @@ add_executable(ydotool ${SOURCE_FILES_CLIENT}) + target_link_libraries(ydotool ydotool_library dl pthread uInputPlus evdevPlus) + install(TARGETS ydotool DESTINATION ${CMAKE_INSTALL_BINDIR}) + +-add_subdirectory(Daemon) +-add_subdirectory(manpage) +-- +2.29.2 + diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index 78e7c308e7..f4b1963ab5 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -130,10 +130,18 @@ mapAliases ({ cudatoolkit_7 = throw "cudatoolkit_7 has been removed in favor of newer versions"; # added 2021-02-14 cudatoolkit_7_5 = throw "cudatoolkit_7_5 has been removed in favor of newer versions"; # added 2021-02-14 cudatoolkit_8 = throw "cudatoolkit_8 has been removed in favor of newer versions"; # added 2021-02-14 + cudatoolkit_9 = throw "cudatoolkit_9 has been removed in favor of newer versions"; # added 2021-04-18 + cudatoolkit_9_0 = throw "cudatoolkit_9_0 has been removed in favor of newer versions"; # added 2021-04-18 + cudatoolkit_9_1 = throw "cudatoolkit_9_1 has been removed in favor of newer versions"; # added 2021-04-18 + cudatoolkit_9_2 = throw "cudatoolkit_9_2 has been removed in favor of newer versions"; # added 2021-04-18 cudnn_cudatoolkit_7 = throw "cudnn_cudatoolkit_7 has been removed in favor of newer versions"; # added 2021-02-14 cudnn_cudatoolkit_7_5 = throw "cudnn_cudatoolkit_7_5 has been removed in favor of newer versions"; # added 2021-02-14 cudnn6_cudatoolkit_8 = throw "cudnn6_cudatoolkit_8 has been removed in favor of newer versions"; # added 2021-02-14 cudnn_cudatoolkit_8 = throw "cudnn_cudatoolkit_8 has been removed in favor of newer versions"; # added 2021-02-14 + cudnn_cudatoolkit_9 = throw "cudnn_cudatoolkit_9 has been removed in favor of newer versions"; # added 2021-04-18 + cudnn_cudatoolkit_9_0 = throw "cudnn_cudatoolkit_9_0 has been removed in favor of newer versions"; # added 2021-04-18 + cudnn_cudatoolkit_9_1 = throw "cudnn_cudatoolkit_9_1 has been removed in favor of newer versions"; # added 2021-04-18 + cudnn_cudatoolkit_9_2 = throw "cudnn_cudatoolkit_9_2 has been removed in favor of newer versions"; # added 2021-04-18 cupsBjnp = cups-bjnp; # added 2016-01-02 cups_filters = cups-filters; # added 2016-08 cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; @@ -446,6 +454,7 @@ mapAliases ({ mpv-with-scripts = self.wrapMpv self.mpv-unwrapped { }; # added 2020-05-22 multipath_tools = multipath-tools; # added 2016-01-21 mupen64plus1_5 = mupen64plus; # added 2016-02-12 + mxisd = throw "mxisd has been removed from nixpkgs as it has reached end of life, see https://github.com/kamax-matrix/mxisd/blob/535e0a5b96ab63cb0ddef90f6f42c5866407df95/EOL.md#end-of-life-notice . ma1sd may be a suitable alternative."; # added 2021-04-15 mysqlWorkbench = mysql-workbench; # added 2017-01-19 nagiosPluginsOfficial = monitoring-plugins; ncat = nmap; # added 2016-01-26 @@ -466,6 +475,7 @@ mapAliases ({ nologin = shadow; # added 2018-04-25 nxproxy = nx-libs; # added 2019-02-15 nylas-mail-bin = throw "nylas-mail-bin was deprecated on 2019-09-11: abandoned by upstream"; + oauth2_proxy = oauth2-proxy; # added 2021-04-18 opencascade_oce = opencascade; # added 2018-04-25 oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # added 2019-12-10 opencl-icd = ocl-icd; # added 2017-01-20 diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 71a063a439..f31d9fdd1c 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -1050,6 +1050,8 @@ in asls = callPackage ../development/tools/misc/asls { }; + astc-encoder = callPackage ../tools/graphics/astc-encoder { }; + asymptote = callPackage ../tools/graphics/asymptote { texLive = texlive.combine { inherit (texlive) scheme-small epsf cm-super texinfo; }; gsl = gsl_1; @@ -1274,7 +1276,9 @@ in corsmisc = callPackage ../tools/security/corsmisc { }; - cosign = callPackage ../tools/security/cosign { }; + cosign = callPackage ../tools/security/cosign { + inherit (darwin.apple_sdk.frameworks) PCSC; + }; cozy = callPackage ../applications/audio/cozy-audiobooks { }; @@ -1662,6 +1666,10 @@ in backblaze-b2 = callPackage ../development/tools/backblaze-b2 { }; + badtouch = callPackage ../tools/security/badtouch { + inherit (darwin.apple_sdk.frameworks) Security; + }; + bandwhich = callPackage ../tools/networking/bandwhich { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -1740,6 +1748,8 @@ in bindfs = callPackage ../tools/filesystems/bindfs { }; + binwalk = with python3Packages; toPythonApplication binwalk; + birdtray = libsForQt5.callPackage ../applications/misc/birdtray { }; bitbucket-cli = python2Packages.bitbucket-cli; @@ -2540,6 +2550,8 @@ in gif-for-cli = callPackage ../tools/misc/gif-for-cli { }; + giph = callPackage ../applications/video/giph { }; + gir-rs = callPackage ../development/tools/gir { }; gist = callPackage ../tools/text/gist { }; @@ -2665,6 +2677,8 @@ in jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { }; + jiten = callPackage ../applications/misc/jiten { }; + jotta-cli = callPackage ../applications/misc/jotta-cli { }; joycond = callPackage ../os-specific/linux/joycond { }; @@ -2757,6 +2771,8 @@ in meritous = callPackage ../games/meritous { }; + oh-my-git = callPackage ../games/oh-my-git { }; + opendune = callPackage ../games/opendune { }; merriweather = callPackage ../data/fonts/merriweather { }; @@ -3313,7 +3329,8 @@ in libceph = ceph.lib; inherit (callPackages ../tools/filesystems/ceph { - boost = boost172.override { enablePython = true; python = python38; }; + boost = boost17x.override { enablePython = true; python = python3; }; + lua = lua5_4; }) ceph ceph-client; @@ -3347,6 +3364,7 @@ in }; cjdns = callPackage ../tools/networking/cjdns { }; + cjdns-tools = callPackage ../tools/admin/cjdns-tools { }; cjson = callPackage ../development/libraries/cjson { }; @@ -3443,6 +3461,8 @@ in unifdef = callPackage ../development/tools/misc/unifdef { }; + unify = with python3Packages; toPythonApplication unify; + unionfs-fuse = callPackage ../tools/filesystems/unionfs-fuse { }; usb-modeswitch = callPackage ../development/tools/misc/usb-modeswitch { }; @@ -3462,6 +3482,8 @@ in gebaar-libinput = callPackage ../tools/inputmethods/gebaar-libinput { }; + kime = callPackage ../tools/inputmethods/kime { }; + libpinyin = callPackage ../development/libraries/libpinyin { }; libskk = callPackage ../development/libraries/libskk { @@ -3642,10 +3664,6 @@ in cudaPackages = recurseIntoAttrs (callPackage ../development/compilers/cudatoolkit {}); inherit (cudaPackages) - cudatoolkit_9 - cudatoolkit_9_0 - cudatoolkit_9_1 - cudatoolkit_9_2 cudatoolkit_10 cudatoolkit_10_0 cudatoolkit_10_1 @@ -3659,10 +3677,6 @@ in cudnnPackages = callPackages ../development/libraries/science/math/cudnn { }; inherit (cudnnPackages) - cudnn_cudatoolkit_9 - cudnn_cudatoolkit_9_0 - cudnn_cudatoolkit_9_1 - cudnn_cudatoolkit_9_2 cudnn_cudatoolkit_10 cudnn_cudatoolkit_10_0 cudnn_cudatoolkit_10_1 @@ -5052,6 +5066,8 @@ in godot = callPackage ../development/tools/godot {}; + godot-export-templates = callPackage ../development/tools/godot/export-templates.nix { }; + godot-headless = callPackage ../development/tools/godot/headless.nix { }; godot-server = callPackage ../development/tools/godot/server.nix { }; @@ -5749,6 +5765,8 @@ in jq = callPackage ../development/tools/jq { }; + jql = callPackage ../development/tools/jql { }; + jo = callPackage ../development/tools/jo { }; jrnl = python3Packages.callPackage ../applications/misc/jrnl { }; @@ -6113,8 +6131,6 @@ in mxt-app = callPackage ../misc/mxt-app { }; - mxisd = callPackage ../servers/mxisd { }; - naabu = callPackage ../tools/security/naabu { }; nagstamon = callPackage ../tools/misc/nagstamon { @@ -6178,9 +6194,13 @@ in nodejs-slim-15_x = callPackage ../development/web/nodejs/v15.nix { enableNpm = false; }; + nodejs-16_x = callPackage ../development/web/nodejs/v16.nix { }; + nodejs-slim-16_x = callPackage ../development/web/nodejs/v16.nix { + enableNpm = false; + }; # Update this when adding the newest nodejs major version! - nodejs_latest = nodejs-15_x; - nodejs-slim_latest = nodejs-slim-15_x; + nodejs_latest = nodejs-16_x; + nodejs-slim_latest = nodejs-slim-16_x; nodePackages_latest = dontRecurseIntoAttrs (callPackage ../development/node-packages/default.nix { nodejs = pkgs.nodejs_latest; @@ -6206,6 +6226,7 @@ in ispell = callPackage ../tools/text/ispell {}; + iodash = callPackage ../development/libraries/iodash { }; jumanpp = callPackage ../tools/text/jumanpp {}; jump = callPackage ../tools/system/jump {}; @@ -6490,7 +6511,9 @@ in mandoc = callPackage ../tools/misc/mandoc { }; - manix = callPackage ../tools/nix/manix {}; + manix = callPackage ../tools/nix/manix { + inherit (darwin.apple_sdk.frameworks) Security; + }; marktext = callPackage ../applications/misc/marktext { }; @@ -7153,6 +7176,8 @@ in openrgb = libsForQt5.callPackage ../applications/misc/openrgb { }; + openrussian-cli = callPackage ../misc/openrussian-cli { }; + opensc = callPackage ../tools/security/opensc { inherit (darwin.apple_sdk.frameworks) Carbon PCSC; }; @@ -8456,6 +8481,8 @@ in srcml = callPackage ../applications/version-management/srcml { }; + srt-live-server = callPackage ../applications/video/srt-live-server { }; + srt-to-vtt-cl = callPackage ../tools/cd-dvd/srt-to-vtt-cl { }; sourcehut = callPackage ../applications/version-management/sourcehut { }; @@ -8571,6 +8598,8 @@ in swagger-codegen = callPackage ../tools/networking/swagger-codegen { }; + swagger-codegen3 = callPackage ../tools/networking/swagger-codegen3 { }; + swapview = callPackage ../os-specific/linux/swapview/default.nix { }; swec = callPackage ../tools/networking/swec { }; @@ -8670,6 +8699,8 @@ in tea = callPackage ../tools/misc/tea { }; + inherit (nodePackages) teck-programmer; + ted = callPackage ../tools/typesetting/ted { }; teamviewer = libsForQt514.callPackage ../applications/networking/remote/teamviewer { }; @@ -9218,6 +9249,8 @@ in welkin = callPackage ../tools/graphics/welkin {}; + wemux = callPackage ../tools/misc/wemux { }; + wf-recorder = callPackage ../applications/video/wf-recorder { }; whipper = callPackage ../applications/audio/whipper { }; @@ -9263,6 +9296,8 @@ in xe = callPackage ../tools/system/xe { }; + xplr = callPackage ../applications/misc/xplr {}; + testdisk = libsForQt5.callPackage ../tools/system/testdisk { }; testdisk-qt = testdisk.override { enableQt = true; }; @@ -10609,8 +10644,12 @@ in graphviz = graphviz-nox; }); - inherit (callPackage ../development/compilers/haxe { }) + inherit (callPackage ../development/compilers/haxe { + inherit (darwin.apple_sdk.frameworks) Security; + }) haxe_4_2 + haxe_4_1 + haxe_4_0 haxe_3_4 haxe_3_2 ; @@ -10919,7 +10958,7 @@ in knightos-z80e = callPackage ../development/tools/knightos/z80e { }; - koka = haskellPackages.callPackage ../development/compilers/koka { }; + koka = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../development/compilers/koka { }); kotlin = callPackage ../development/compilers/kotlin { }; @@ -11658,7 +11697,8 @@ in inherit (beam.interpreters) erlang erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18 erlang_odbc erlang_javac erlang_odbc_javac erlang_basho_R16B02 - elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7; + elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 + elixir_ls; erlang_nox = beam_nox.interpreters.erlang; @@ -12401,9 +12441,7 @@ in wxGTK = wxGTK30; }; - buck = callPackage ../development/tools/build-managers/buck { - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + buck = callPackage ../development/tools/build-managers/buck { }; buildkite-agent = buildkite-agent3; buildkite-agent2 = throw "pkgs.buildkite-agent2 has been discontinued. Please use pkgs.buildkite-agent (v3.x)"; @@ -18685,6 +18723,15 @@ in nginx = nginxStable; + nginxQuic = callPackage ../servers/http/nginx/quic.nix { + withPerl = false; + # We don't use `with` statement here on purpose! + # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 + modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ]; + # Use latest boringssl to allow http3 support + openssl = boringssl; + }; + nginxStable = callPackage ../servers/http/nginx/stable.nix { withPerl = false; # We don't use `with` statement here on purpose! @@ -18720,7 +18767,7 @@ in nsq = callPackage ../servers/nsq { }; - oauth2_proxy = callPackage ../servers/oauth2_proxy { + oauth2-proxy = callPackage ../servers/oauth2-proxy { buildGoModule = buildGo115Module; }; @@ -20762,6 +20809,8 @@ in # FIXME: `tcp-wrapper' is actually not OS-specific. tcp_wrappers = callPackage ../os-specific/linux/tcp-wrappers { }; + teck-udev-rules = callPackage ../os-specific/linux/teck-udev-rules { }; + tiptop = callPackage ../os-specific/linux/tiptop { }; tpacpi-bat = callPackage ../os-specific/linux/tpacpi-bat { }; @@ -21151,6 +21200,7 @@ in flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme { inherit (plasma5Packages) breeze-icons; }; + flat-remix-gtk = callPackage ../data/themes/flat-remix-gtk { }; font-awesome_4 = (callPackage ../data/fonts/font-awesome-5 { }).v4; font-awesome_5 = (callPackage ../data/fonts/font-awesome-5 { }).v5; @@ -21830,7 +21880,7 @@ in acd-cli = callPackage ../applications/networking/sync/acd_cli { inherit (python3Packages) buildPythonApplication appdirs colorama dateutil - requests requests_toolbelt sqlalchemy fusepy; + requests requests_toolbelt setuptools sqlalchemy fusepy; }; adobe-reader = pkgsi686Linux.callPackage ../applications/misc/adobe-reader { }; @@ -22545,6 +22595,8 @@ in dwm = callPackage ../applications/window-managers/dwm { }; + dwmblocks = callPackage ../applications/misc/dwmblocks { }; + dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { }; dynamips = callPackage ../applications/virtualization/dynamips { }; @@ -23453,6 +23505,8 @@ in gxplugins-lv2 = callPackage ../applications/audio/gxplugins-lv2 { }; + hachoir = with python3Packages; toPythonApplication hachoir; + hackrf = callPackage ../applications/radio/hackrf { }; hacksaw = callPackage ../tools/misc/hacksaw {}; @@ -23499,6 +23553,10 @@ in hexedit = callPackage ../applications/editors/hexedit { }; + himalaya = callPackage ../applications/networking/mailreaders/himalaya { + inherit (darwin.apple_sdk.frameworks) Security; + }; + hipchat = callPackage ../applications/networking/instant-messengers/hipchat { }; hivelytracker = callPackage ../applications/audio/hivelytracker { }; @@ -24617,6 +24675,7 @@ in autoload = callPackage ../applications/video/mpv/scripts/autoload.nix {}; convert = callPackage ../applications/video/mpv/scripts/convert.nix {}; mpris = callPackage ../applications/video/mpv/scripts/mpris.nix {}; + mpv-playlistmanager = callPackage ../applications/video/mpv/scripts/mpv-playlistmanager.nix {}; mpvacious = callPackage ../applications/video/mpv/scripts/mpvacious.nix {}; simple-mpv-webui = callPackage ../applications/video/mpv/scripts/simple-mpv-webui.nix {}; sponsorblock = callPackage ../applications/video/mpv/scripts/sponsorblock.nix {}; @@ -25105,6 +25164,8 @@ in pamixer = callPackage ../applications/audio/pamixer { }; + myxer = callPackage ../applications/audio/myxer { }; + ncpamixer = callPackage ../applications/audio/ncpamixer { }; pan = callPackage ../applications/networking/newsreaders/pan { }; @@ -25708,6 +25769,8 @@ in siproxd = callPackage ../applications/networking/siproxd { }; + sish = callPackage ../tools/networking/sish { }; + skypeforlinux = callPackage ../applications/networking/instant-messengers/skypeforlinux { }; skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { }; @@ -26792,6 +26855,7 @@ in ++ optional (cfg.enableStella or false) stella ++ optional (cfg.enableStella2014 or false) stella2014 ++ optional (cfg.enableTGBDual or false) tgbdual + ++ optional (cfg.enableThePowderToy or false) the-powder-toy ++ optional (cfg.enableTIC80 or false) tic80 ++ optional (cfg.enableVbaNext or false) vba-next ++ optional (cfg.enableVbaM or false) vba-m @@ -29048,6 +29112,8 @@ in hologram = callPackage ../tools/security/hologram { }; + honeytrap = callPackage ../tools/security/honeytrap { }; + tini = callPackage ../applications/virtualization/tini {}; ifstat-legacy = callPackage ../tools/networking/ifstat-legacy { }; @@ -30240,7 +30306,9 @@ in rmount = callPackage ../tools/filesystems/rmount {}; - romdirfs = callPackage ../tools/filesystems/romdirfs {}; + romdirfs = callPackage ../tools/filesystems/romdirfs { + stdenv = gccStdenv; + }; rss-glx = callPackage ../misc/screensavers/rss-glx { }; @@ -30584,6 +30652,8 @@ in wordpress = callPackage ../servers/web-apps/wordpress { }; + wprecon = callPackage ../tools/security/wprecon { }; + wraith = callPackage ../applications/networking/irc/wraith { openssl = openssl_1_0_2; }; @@ -30868,6 +30938,8 @@ in inherit (darwin) libresolv; }; + dnstwist = callPackage ../tools/networking/dnstwist {}; + dsniff = callPackage ../tools/networking/dsniff {}; wal-g = callPackage ../tools/backup/wal-g { }; diff --git a/third_party/nixpkgs/pkgs/top-level/beam-packages.nix b/third_party/nixpkgs/pkgs/top-level/beam-packages.nix index aae127fd04..ac9d4ab524 100644 --- a/third_party/nixpkgs/pkgs/top-level/beam-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/beam-packages.nix @@ -111,7 +111,7 @@ rec { # access for example elixir built with different version of Erlang, use # `beam.packages.erlangR23.elixir`. inherit (packages.erlang) - elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7; + elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_ls; inherit (packages.erlang) lfe lfe_1_2 lfe_1_3; }; diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index b8c8b0a9d9..d8c1f2d3e4 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -236,6 +236,8 @@ let ctypes = callPackage ../development/ocaml-modules/ctypes { }; + dap = callPackage ../development/ocaml-modules/dap { }; + decompress = callPackage ../development/ocaml-modules/decompress { }; diet = callPackage ../development/ocaml-modules/diet { }; @@ -930,6 +932,8 @@ let parse-argv = callPackage ../development/ocaml-modules/parse-argv { }; + path_glob = callPackage ../development/ocaml-modules/path_glob { }; + pbkdf = callPackage ../development/ocaml-modules/pbkdf { }; pcap-format = callPackage ../development/ocaml-modules/pcap-format { }; @@ -1018,7 +1022,11 @@ let ocaml-protoc = callPackage ../development/ocaml-modules/ocaml-protoc { }; - ocaml_extlib = callPackage ../development/ocaml-modules/extlib { }; + ocaml_extlib = ocaml_extlib-1-7-8; + + ocaml_extlib-1-7-8 = callPackage ../development/ocaml-modules/extlib { }; + + ocaml_extlib-1-7-7 = callPackage ../development/ocaml-modules/extlib/1.7.7.nix { }; ocb-stubblr = callPackage ../development/ocaml-modules/ocb-stubblr { }; diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index 708170c31b..f22df1c35d 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -393,6 +393,8 @@ in { androguard = callPackage ../development/python-modules/androguard { }; + angr = callPackage ../development/python-modules/angr { }; + aniso8601 = callPackage ../development/python-modules/aniso8601 { }; annexremote = callPackage ../development/python-modules/annexremote { }; @@ -1385,6 +1387,8 @@ in { cld2-cffi = callPackage ../development/python-modules/cld2-cffi { }; + cle = callPackage ../development/python-modules/cle { }; + cleo = callPackage ../development/python-modules/cleo { }; clf = callPackage ../development/python-modules/clf { }; @@ -2105,6 +2109,8 @@ in { ds4drv = callPackage ../development/python-modules/ds4drv { }; + dsmr-parser = callPackage ../development/python-modules/dsmr-parser { }; + dtopt = callPackage ../development/python-modules/dtopt { }; duckdb = callPackage ../development/python-modules/duckdb { @@ -3065,6 +3071,8 @@ in { habanero = callPackage ../development/python-modules/habanero { }; + hachoir = callPackage ../development/python-modules/hachoir { }; + ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { }; halo = callPackage ../development/python-modules/halo { }; @@ -3241,6 +3249,8 @@ in { hyperframe = callPackage ../development/python-modules/hyperframe { }; + hyperion-py = callPackage ../development/python-modules/hyperion-py { }; + hyperkitty = callPackage ../servers/mail/mailman/hyperkitty.nix { }; hyperlink = callPackage ../development/python-modules/hyperlink { }; @@ -5245,6 +5255,8 @@ in { pkuseg = callPackage ../development/python-modules/pkuseg { }; + ppdeep = callPackage ../development/python-modules/ppdeep { }; + pynndescent = callPackage ../development/python-modules/pynndescent { }; pynuki = callPackage ../development/python-modules/pynuki { }; @@ -7151,6 +7163,8 @@ in { pyx = callPackage ../development/python-modules/pyx { }; + pyxbe = callPackage ../development/python-modules/pyxbe { }; + pyxdg = callPackage ../development/python-modules/pyxdg { }; pyxeoma = callPackage ../development/python-modules/pyxeoma { }; @@ -8278,6 +8292,8 @@ in { tahoma-api = callPackage ../development/python-modules/tahoma-api { }; + tailer = callPackage ../development/python-modules/tailer { }; + tarman = callPackage ../development/python-modules/tarman { }; tasklib = callPackage ../development/python-modules/tasklib { }; @@ -8725,6 +8741,8 @@ in { unifi = callPackage ../development/python-modules/unifi { }; + unify = callPackage ../development/python-modules/unify { }; + unifiled = callPackage ../development/python-modules/unifiled { }; units = callPackage ../development/python-modules/units { }; @@ -8743,6 +8761,8 @@ in { untangle = callPackage ../development/python-modules/untangle { }; + untokenize = callPackage ../development/python-modules/untokenize { }; + upass = callPackage ../development/python-modules/upass { }; update_checker = callPackage ../development/python-modules/update_checker { }; diff --git a/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix b/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix index 0866fcad46..1d928ce05a 100644 --- a/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0clfsmkdqviwrjdc0fjqx3qs7xkq06bdl24f2qdyk4p2f0aszdw9"; + sha256 = "0dr6w3h7i7xyqd04aw66x2ddm7xinvlw02pkk1sxczi8x21z16hf"; type = "gem"; }; - version = "6.1.0"; + version = "6.1.3.1"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14qcia1l2yjga3azgc381mk75xrddspkpxxvswrr6rg9453i70wf"; + sha256 = "0w3cq2m1qbmxp7yv3qs82ffn9y46vq5q04vqwxak6ln0ki0v4hn4"; type = "gem"; }; - version = "6.1.0"; + version = "6.1.3.1"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17cnw2pi5gbll6wqqmp40wdxbg3v0kz1jmfdbg7kwdk8b4mkfqmw"; + sha256 = "1wsa6kcgjx5am9hn44q2afg174m2gda4n8bfk5na17nj48s9g1ii"; type = "gem"; }; - version = "6.1.0"; + version = "6.1.3.1"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mbmizxyl2k6z386zqvvzg3i8b91g7ag4hfjmm7fpbc8p6j4kjmb"; + sha256 = "0brr9kbmmc4fr2x8a7kj88yv8whfjfvalik3h82ypxlbg5b1c9iz"; type = "gem"; }; - version = "6.1.0"; + version = "6.1.3.1"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19dgv0zcq7k0wps7gbaiprrardqm74ija9zjydkv93anqqfw3rwd"; + sha256 = "04f7x7ycg73zc2v3lhvrnl072f7nl0nhp0sspfa2sqq14v4akmmb"; type = "gem"; }; - version = "6.1.0"; + version = "6.1.3.1"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d68p974w96b3mg8q45cmwy2629dl615fm9in56fgb0k7vcrpazk"; + sha256 = "0m009iki20hhwwj713bqdw57hmz650l7drfbajw32xn2qnawf294"; type = "gem"; }; - version = "6.1.0"; + version = "6.1.3.1"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pkiy5jy5xjgh4diw5wyc72w1r9s07p1qp1kpwv50a5q1ca12aw0"; + sha256 = "0zjwcfr4qyff9ln4hhjb1csbjpvr3z4pdgvg8axvhcs86h4xpy2n"; type = "gem"; }; - version = "6.1.0"; + version = "6.1.3.1"; }; activemodel = { dependencies = ["activesupport"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "019gwxrbki4fr3n2c6g7qyyjw94z5qxjwalh2n69hh1anpcbrd98"; + sha256 = "118slj94hif5g1maaijlxsywrq75h7qdz20bq62303pkrzabjaxm"; type = "gem"; }; - version = "6.1.0"; + version = "6.1.3.1"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -93,21 +93,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ag8wpfayzbv8n9gf9ca2k8rm9yndsxybvf7jv451j9r822mxzm8"; + sha256 = "1jva5iqnjmj76mhhxcvx6xzda071cy80bhxn3r79f76pvgwwyymg"; type = "gem"; }; - version = "6.1.0"; + version = "6.1.3.1"; }; activestorage = { - dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mimemagic"]; + dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kzslp0990fjyxvlsxb7kdysx28mc3zvay4q3zp2wbfnpl1ik41j"; + sha256 = "1800ski0619mzyk2p2xcmy4xlym18g3lbqw8wb3ss06jhvn5dl5p"; type = "gem"; }; - version = "6.1.0"; + version = "6.1.3.1"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -115,10 +115,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pflc2fch1bbgzk1rqgj21l6mgx025l92kd9arxjls98nf5am44v"; + sha256 = "0l0khgrb7zn611xjnmygv5wdxh7wq645f613wldn5397q5w3l9lc"; type = "gem"; }; - version = "6.1.0"; + version = "6.1.3.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -136,10 +136,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l3468czzjmxl93ap40hp7z94yxp4nbag0bxqs789bm30md90m2a"; + sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; type = "gem"; }; - version = "2.4.1"; + version = "2.4.2"; }; atk = { dependencies = ["glib2"]; @@ -167,10 +167,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14arh1ixfsd6j5md0agyzvksm5svfkvchb90fp32nn7y3avcmc2h"; + sha256 = "0vkq6c8y2jvaw03ynds5vjzl1v9wg608cimkd3bidzxc0jvk56z9"; type = "gem"; }; - version = "1.8.0"; + version = "1.9.2"; }; bacon = { groups = ["default"]; @@ -203,15 +203,15 @@ version = "11.1.3"; }; cairo = { - dependencies = ["native-package-installer" "pkg-config"]; + dependencies = ["native-package-installer" "pkg-config" "red-colors"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00hiy6anibkjq9w77hg0lpgnkkbcxrfbz8wxv44jfzqbab8910wb"; + sha256 = "0vbj9szp2xbnxqan8hppip8vm9fxpcmpx745y5fvg2scdh9f0p7s"; type = "gem"; }; - version = "1.16.6"; + version = "1.17.5"; }; cairo-gobject = { dependencies = ["cairo" "glib2"]; @@ -291,10 +291,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jvpxf32l5y2ayj0jp9mv9n7vn61zingzd0s5f7490n584lwmvmg"; + sha256 = "1y04ig8p9rparhff5dh3781pwf1xlirgq8p0fzvggjjpx761bvra"; type = "gem"; }; - version = "3.4.1"; + version = "3.4.2"; }; cocoapods = { dependencies = ["activesupport" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-stats" "cocoapods-trunk" "cocoapods-try" "colored" "escape" "fourflusher" "molinillo" "nap" "xcodeproj"]; @@ -354,10 +354,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b91sfsriizsr08m1vn9j4sf9sb8vgsyr6xjnw18bpy66bpwsqca"; + sha256 = "0syya8l1kz36069y7cx4f37aihpmbm4yd5wvifs3j8qzz8bpxpfi"; type = "gem"; }; - version = "0.0.2"; + version = "0.0.3"; }; cocoapods-core = { dependencies = ["activesupport" "fuzzy_match" "nap"]; @@ -458,10 +458,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pwzrwp3sys5ad23lc49r3ja2ijzhzjfrq4bbrpbz1x5z7jsa77v"; + sha256 = "0vpn0y2r91cv9kr2kh6rwh51ipi90iyjfya8ir9grxh1ngv179ck"; type = "gem"; }; - version = "2.2.0"; + version = "2.2.2"; }; cocoapods-git_url_rewriter = { groups = ["default"]; @@ -583,10 +583,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ln4kywj4bx32qyqvr0byi3g4fk8yj026n00xch782x0147f8lka"; + sha256 = "1z50v9y66kl0s9s84syd8vai77hhysdaymmgbdmpaq54bra6xk72"; type = "gem"; }; - version = "0.0.11"; + version = "0.2.0"; }; cocoapods-wholemodule = { groups = ["default"]; @@ -643,10 +643,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz"; + sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; type = "gem"; }; - version = "1.1.7"; + version = "1.1.8"; }; crass = { groups = ["default"]; @@ -745,10 +745,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wi81lynfdvbwhrc4ws746g3j8761vian4m9gxamdj9rjwj9jhls"; + sha256 = "1bpdrsdqwv80qqc3f4xxzpii13lx9mlx3zay4bnmmscrx8c0p63z"; type = "gem"; }; - version = "1.3.4"; + version = "1.3.5"; }; domain_name = { dependencies = ["unf"]; @@ -808,10 +808,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gggrgkcq839mamx7a8jbnp2h7x2ykfn34ixwskwb0lzx2ak17g9"; + sha256 = "1cql2cxl9bg8gbmmlzl4kvpq7y0gjldgarsnxq35vpd7ga3h54w2"; type = "gem"; }; - version = "0.12.0"; + version = "0.13.0"; }; eventmachine = { groups = ["default"]; @@ -828,41 +828,61 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16ij8617v3js03yj1zd32mmrf7kpi9l96bid5mpqk30c4mzai55r"; + sha256 = "0jn8s74nxsh0vmxv2fjrrrc3b2cgp8d267dyn206hbw5ki4pkd85"; type = "gem"; }; - version = "0.78.1"; + version = "0.80.1"; }; faraday = { - dependencies = ["faraday-net_http" "multipart-post" "ruby2_keywords"]; + dependencies = ["faraday-excon" "faraday-net_http" "faraday-net_http_persistent" "multipart-post" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz"; + sha256 = "0q646m07lfahakx5jdq77j004rcgfj6lkg13c0f84993gi78dhvi"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.1"; + }; + faraday-excon = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh"; + type = "gem"; + }; + version = "1.1.0"; }; faraday-net_http = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kk5d1c5nxbmwawl5gcznwiscjz24nz3vdhxrlzvj7748c1qqr6d"; + sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; + }; + faraday-net_http_persistent = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l2c835wl7gv34xp49fhd1bl4czkpw2g3ahqsak2251iqv5589ka"; + type = "gem"; + }; + version = "1.1.0"; }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15hgiy09i8ywjihyzyvjvk42ivi3kmy6dm21s5sgg9j7y3h3zkkx"; + sha256 = "0nq1fb3vbfylccwba64zblxy96qznxbys5900wd7gm9bpplmf432"; type = "gem"; }; - version = "1.14.2"; + version = "1.15.0"; }; ffi-compiler = { dependencies = ["ffi" "rake"]; @@ -1143,10 +1163,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kr0bx9323fv5ys6nlhsy05kmwcbs94h6ac7ka9qqywy0vbdvrrv"; + sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; type = "gem"; }; - version = "1.8.7"; + version = "1.8.10"; }; iconv = { groups = ["default"]; @@ -1174,10 +1194,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02llgsg30jz9kpxs8jzv6rvzaylw7948xj2grp4vsfg54z20cwbm"; + sha256 = "1vz0vp5lbp1bz2samyn8nk49vyh6zhvcqz35faq4i3kgsd4xlnhp"; type = "gem"; }; - version = "2.10.1"; + version = "2.11.2"; }; jekyll = { dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"]; @@ -1247,10 +1267,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14ynyq1q483spj20ffl4xayfqx1a8qr761mqjfxczf8lwlap392n"; + sha256 = "036i5fc09275ms49mw43mh4i9pwaap778ra2pmx06ipzyyjl6bfs"; type = "gem"; }; - version = "2.2.2"; + version = "2.2.3"; }; kramdown = { dependencies = ["rexml"]; @@ -1280,10 +1300,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nw1gscax8zsv1m682h9f8vys26385nrwpkbigiifs5bsz6272rk"; + sha256 = "0h2sc2la6dd808pfnd7vh66fqwc7xg3nd2jqr4pdqymxspk9zcsq"; type = "gem"; }; - version = "1.4.2"; + version = "1.4.3"; }; libv8 = { groups = ["default"]; @@ -1321,10 +1341,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06hkw6mssx39fg3jqyq57czr5acd11nqs5631k0xs50lr2y2pv8p"; + sha256 = "0h2v34xhi30w0d9gfzds2w6v89grq2gkpgvmdj9m8x1ld1845xnj"; type = "gem"; }; - version = "3.4.0"; + version = "3.5.1"; }; loofah = { dependencies = ["crass" "nokogiri"]; @@ -1332,10 +1352,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ndimir6k3kfrh8qrb7ir1j836l4r3qlwyclwjh88b86clblhszh"; + sha256 = "1w9mbii8515p28xd4k72f3ab2g6xiyq15497ys5r8jn6m355lgi7"; type = "gem"; }; - version = "2.8.0"; + version = "2.9.1"; }; mab = { groups = ["default"]; @@ -1370,15 +1390,14 @@ version = "2.7.1"; }; marcel = { - dependencies = ["mimemagic"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nxbjmcyg8vlw6zwagf17l9y2mwkagmmkg95xybpn4bmf3rfnksx"; + sha256 = "0bp001p687nsa4a8sp3q1iv8pfhs24w7s3avychjp64sdkg6jxq3"; type = "gem"; }; - version = "0.3.3"; + version = "1.0.1"; }; markaby = { dependencies = ["builder"]; @@ -1427,20 +1446,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag"; + sha256 = "1phcq7z0zpipwd7y4fbqmlaqghv07fjjgrx99mwq3z3n0yvy7fmi"; type = "gem"; }; - version = "3.2020.1104"; - }; - mimemagic = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1qfqb9w76kmpb48frbzbyvjc0dfxh5qiw1kxdbv2y2kp6fxpa1kf"; - type = "gem"; - }; - version = "0.3.5"; + version = "3.2021.0225"; }; mini_magick = { groups = ["default"]; @@ -1457,10 +1466,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha"; + sha256 = "1np6srnyagghhh2w4nyv09sz47v0i6ri3q6blicj94vgxqp12c94"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; }; mini_portile2 = { groups = ["default"]; @@ -1477,10 +1486,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ipjhdw8ds6q9h7bs3iw28bjrwkwp215hr4l3xf6215fsl80ky5j"; + sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl"; type = "gem"; }; - version = "5.14.3"; + version = "5.14.4"; }; molinillo = { groups = ["default"]; @@ -1497,10 +1506,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lva6bkvb4mfa0m3bqn4lm4s4gi81c40jvdcsrxr6vng49q9daih"; + sha256 = "06iajjyhx0rvpn4yr3h1hc4w4w3k59bdmfhxnjzzh76wsrdxxrc6"; type = "gem"; }; - version = "1.3.3"; + version = "1.4.2"; }; multi_json = { groups = ["default"]; @@ -1568,10 +1577,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0piclgf6pw7hr10x57x0hn675djyna4sb3xc97yb9vh66wkx1fl0"; + sha256 = "1ww1mq41q7rda975byjmq5dk8k13v8dawvm33370pbkrymd8syp8"; type = "gem"; }; - version = "1.0.9"; + version = "1.1.1"; }; ncursesw = { groups = ["default"]; @@ -1619,10 +1628,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cbwp1kbv6b2qfxv8sarv0d0ilb257jihlvdqj8f5pdm0ksq1sgk"; + sha256 = "00fwz0qq7agd2xkdz02i8li236qvwhma3p0jdn5bdvc21b7ydzd5"; type = "gem"; }; - version = "2.5.4"; + version = "2.5.7"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -1630,10 +1639,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2"; + sha256 = "19d78mdg2lbz9jb4ph6nk783c9jbsdm8rnllwhga6pd53xffp6x0"; type = "gem"; }; - version = "1.11.1"; + version = "1.11.3"; }; opus-ruby = { dependencies = ["ffi"]; @@ -1663,10 +1672,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zlk3bksiwrdvb7j0r5av7w280kigl7947wa7w4kbwqz3snaxl3m"; + sha256 = "0m2acfd6l6k9xvqxvwivcnwji9974ac7498znydxh69z1x3rr8nm"; type = "gem"; }; - version = "4.4.0"; + version = "4.4.1"; }; pango = { dependencies = ["cairo-gobject" "gobject-introspection"]; @@ -1695,10 +1704,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jixakyzmy0j5c1rb0fjrrdhgnyryvrr6vgcybs14jfw09akv5ml"; + sha256 = "04ri489irbbx6sbkclpgri7j7p99v2qib5g2i70xx5fay12ilny8"; type = "gem"; }; - version = "3.0.0.0"; + version = "3.0.1.0"; }; pathutil = { dependencies = ["forwardable-extended"]; @@ -1746,10 +1755,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "068sf963n2zk47kqcckj624g5pxmk68mm76h02piphfyh9x4zmi3"; + sha256 = "1mjjy1grxr64znkffxsvprcckbrrnm40b6gbllnbm7jxslbr3gjl"; type = "gem"; }; - version = "1.4.4"; + version = "1.4.6"; }; polyglot = { groups = ["default"]; @@ -1767,10 +1776,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0iyw4q4an2wmk8v5rn2ghfy2jaz9vmw2nk8415nnpx2s866934qk"; + sha256 = "0m445x8fwcjdyv2bc0glzss2nbm1ll51bq45knixapc7cl3dzdlr"; type = "gem"; }; - version = "0.13.1"; + version = "0.14.1"; }; pry-byebug = { dependencies = ["byebug" "pry"]; @@ -1778,10 +1787,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "096y5vmzpyy4x9h4ky4cs4y7d19vdq9vbwwrqafbh5gagzwhifiv"; + sha256 = "07cv2hddswb334777pjgc9avxn0x9qhrdr191g7windvnjk3scvg"; type = "gem"; }; - version = "3.9.0"; + version = "3.8.0"; }; pry-doc = { dependencies = ["pry" "yard"]; @@ -1810,10 +1819,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13640p5fk19705ygp8j6p07lccag3d80bx8bmjgpd5zsxxsdc50b"; + sha256 = "0wiprd0v4mjqv5p1vqaidr9ci2xm08lcxdz1k50mb1b6nrw6r74k"; type = "gem"; }; - version = "5.1.1"; + version = "5.2.2"; }; racc = { groups = ["default"]; @@ -1896,10 +1905,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "179r2qymrh16ih5x563wqv3zpka9fvby5czqf47d24zm7zw1bwla"; + sha256 = "1m3ckisji9n3li2700jpkyncsrh5b2z20zb0b4jl5x16cwsymr7b"; type = "gem"; }; - version = "6.1.0"; + version = "6.1.3.1"; }; rainbow = { groups = ["default"]; @@ -1968,10 +1977,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16q71cc9wx342c697q18pkz19ym4ncjd97hcw4v6f1mgflkdv400"; + sha256 = "13za43xb5xfg1xb1vwlvwx14jlmnk7jal5dqw8q9a5g13csx41sw"; type = "gem"; }; - version = "1.2.0"; + version = "1.4.0"; + }; + red-colors = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ar2k7zvhr1215jx5di29hkg5h1798f1gypmq6v0sy9v35w6ijca"; + type = "gem"; + }; + version = "0.1.1"; }; redcarpet = { groups = ["default"]; @@ -2020,10 +2039,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zm86k9q8m5jkcnpb1f93wsvc57saldfj8czxkx1aw031i95inip"; + sha256 = "0vg7imjnfcqjx7kw94ccj5r78j4g190cqzi1i59sh4a0l940b9cr"; type = "gem"; }; - version = "2.0.3"; + version = "2.1.1"; }; rest-client = { dependencies = ["http-accept" "http-cookie" "mime-types" "netrc"]; @@ -2041,20 +2060,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; type = "gem"; }; - version = "3.2.4"; + version = "3.2.5"; }; rmagick = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ajn6aisf9hh3x5zrs7n02pg5xy3m8x38gh9cn7b3klzgp3djla5"; + sha256 = "04ahv5gwfwdmwx6b7c0z91rrsfklvnqichgnqk1f9b9n6md3b8yw"; type = "gem"; }; - version = "4.1.2"; + version = "4.2.2"; }; rouge = { groups = ["default"]; @@ -2115,20 +2134,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x4aks5qq489iikb4ir11ppy1dg83l4dw3s34jlwvc90mj2fjrql"; + sha256 = "1d13g6kipqqc9lmwz5b244pdwc97z15vcbnbq6n9rlf32bipdz4k"; type = "gem"; }; - version = "3.10.1"; + version = "3.10.2"; }; rspec-support = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lw9qdrff4dfdz62ww8cmv33rddmadr92k2lrvc042aajvk6x886"; + sha256 = "15j52parvb8cgvl6s0pbxi2ywxrv6x0764g222kz5flz0s4mycbl"; type = "gem"; }; - version = "3.10.1"; + version = "3.10.2"; }; rubocop = { dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; @@ -2136,10 +2155,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12kkyzyzh30mi9xs52lc1pjki1al4x9acdaikj40wslhpwp1ng1l"; + sha256 = "0cgrj670wrdw202pddiawcx2jbkcp7ja8zbc646by7nrg9ax492d"; type = "gem"; }; - version = "1.7.0"; + version = "1.13.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -2147,10 +2166,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qvfp567aprjgcwj757p55ynj0dx2b3c3hd76za9z3c43sphprcj"; + sha256 = "0gkf1p8yal38nlvdb39qaiy0gr85fxfr09j5dxh8qvrgpncpnk78"; type = "gem"; }; - version = "1.4.0"; + version = "1.4.1"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -2158,10 +2177,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01aahh54r9mwhdj7v2s6kmkdm1k1n1z27dlknlbgm281ny1aswrk"; + sha256 = "07c3kymvsid9aajwmmwr3n6apxgyjcbzbl2n6r5lpzkyz28jqn15"; type = "gem"; }; - version = "1.9.2"; + version = "1.10.2"; }; ruby-graphviz = { dependencies = ["rexml"]; @@ -2220,20 +2239,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lk124dixshf8mmrjpsy9avnaygni3cwki25g8nm5py4d2f5fwwa"; + sha256 = "1wy58f9qijwvkmw1j40ak2v5nsr3wcwsa1nilfw047liwyi06yad"; type = "gem"; }; - version = "2.0.17"; + version = "2.1.0"; }; ruby2_keywords = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17pcc0wgvh3ikrkr7bm3nx0qhyiqwidd13ij0fa50k7gsbnr2p0l"; + sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs"; type = "gem"; }; - version = "0.0.2"; + version = "0.0.4"; }; RubyInline = { dependencies = ["ZenTest"]; @@ -2303,20 +2322,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lanqba97ncv88m9r5a3i12n938j5hnpn06q55fxhayfls4fsgdn"; + sha256 = "13mlccf70slrjpxvpvmnk2cls39nkpgksa7sd90jlnm0s0z7lhdd"; type = "gem"; }; - version = "0.11.1"; + version = "0.11.4"; }; sequel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ym43w8alp65fl8j7792i1l44laq9pm91zj97x0r340xkmaii9hp"; + sha256 = "0i2zbx3zkrppvf7zmk5hpiji9kj18c0yavcr2c3i0gaqskhzvaj9"; type = "gem"; }; - version = "5.40.0"; + version = "5.43.0"; }; sequel_pg = { dependencies = ["pg" "sequel"]; @@ -2335,10 +2354,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vv68r61crcnyr5i2qi3h220xbwndsfzwcfzzdr6cmhcdczyr9n2"; + sha256 = "1hrv046jll6ad1s964gsmcq4hvkr3zzr6jc7z1mns22mvfpbc3cr"; type = "gem"; }; - version = "0.21.1"; + version = "0.21.2"; }; simplecov-html = { groups = ["default"]; @@ -2377,10 +2396,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nqyam74izmbczwb406bsmgdzjz5r91d4lywlvdbxx5sl4g4256a"; + sha256 = "0516kmcypysgf2lw8zm8n9yghv6igqgphhfgmgyzgiin388xw4gj"; type = "gem"; }; - version = "2.6.0"; + version = "2.7.0"; }; slop = { groups = ["default"]; @@ -2439,10 +2458,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g7398sn8syybz3nbf3dqwa8q8v3s3s444i24xl5q9pzx4g4nkf1"; + sha256 = "1nkwmlx0ja35gs4lkh7hmshlwsqk5wm1wqrc2p45icnjmrh0x5cw"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.0"; }; terminal-table = { dependencies = ["unicode-display_width"]; @@ -2460,20 +2479,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm"; + sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.0"; }; thrift = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08076cmdx0g51yrkd7dlxlr45nflink3jhdiq7006ljc2pc3212q"; + sha256 = "1sfa4120a7yl3gxjcx990gyawsshfr22gfv5rvgpk72l2p9j2420"; type = "gem"; }; - version = "0.13.0"; + version = "0.14.1"; }; tilt = { groups = ["default"]; @@ -2595,10 +2614,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ch19amq0spj5dc240mv6s8hh245w7nis2h070qr3jm15r4jb21m"; + sha256 = "092y84kak86ds2as9kwn5a9m2yzqwqcz4wx31jk3kin32c3hwcrn"; type = "gem"; }; - version = "5.0.1"; + version = "5.0.2"; }; xcodeproj = { dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"];