diff --git a/third_party/nixpkgs/.github/workflows/compare-manuals.sh b/third_party/nixpkgs/.github/workflows/compare-manuals.sh new file mode 100755 index 0000000000..b2cc68c783 --- /dev/null +++ b/third_party/nixpkgs/.github/workflows/compare-manuals.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p html-tidy + +set -euo pipefail +shopt -s inherit_errexit + +normalize() { + tidy \ + --anchor-as-name no \ + --coerce-endtags no \ + --escape-scripts no \ + --fix-backslash no \ + --fix-style-tags no \ + --fix-uri no \ + --indent yes \ + --wrap 0 \ + < "$1" \ + 2> /dev/null +} + +diff -U3 <(normalize "$1") <(normalize "$2") diff --git a/third_party/nixpkgs/.github/workflows/manual-nixos.yml b/third_party/nixpkgs/.github/workflows/manual-nixos.yml index 64829a1913..86825eb5ae 100644 --- a/third_party/nixpkgs/.github/workflows/manual-nixos.yml +++ b/third_party/nixpkgs/.github/workflows/manual-nixos.yml @@ -27,5 +27,13 @@ jobs: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. name: nixpkgs-ci signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' - - name: Building NixOS manual + - name: Building NixOS manual with DocBook options run: NIX_PATH=nixpkgs=$(pwd) nix-build --option restrict-eval true nixos/release.nix -A manual.x86_64-linux + - name: Building NixOS manual with Markdown options + run: | + export NIX_PATH=nixpkgs=$(pwd) + nix-build \ + --option restrict-eval true \ + --arg configuration '{ documentation.nixos.options.allowDocBook = false; }' \ + nixos/release.nix \ + -A manual.x86_64-linux diff --git a/third_party/nixpkgs/.github/workflows/manual-rendering.yml b/third_party/nixpkgs/.github/workflows/manual-rendering.yml new file mode 100644 index 0000000000..4f5486f2ac --- /dev/null +++ b/third_party/nixpkgs/.github/workflows/manual-rendering.yml @@ -0,0 +1,64 @@ +name: "Check NixOS Manual DocBook rendering against MD rendering" + + +on: + schedule: + # * is a special character in YAML so you have to quote this string + # Check every 24 hours + - cron: '0 0 * * *' + +permissions: + contents: read + +jobs: + check-rendering-equivalence: + permissions: + issues: write # for peter-evans/create-or-update-comment to create or update comment + if: github.repository_owner == 'NixOS' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: cachix/install-nix-action@v17 + with: + # explicitly enable sandbox + extra_nix_config: sandbox = true + - uses: cachix/cachix-action@v10 + with: + # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. + name: nixpkgs-ci + signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' + + - name: Build DocBook and MD manuals + run: | + export NIX_PATH=nixpkgs=$(pwd) + nix-build \ + --option restrict-eval true \ + -o docbook nixos/release.nix \ + -A manual.x86_64-linux + nix-build \ + --option restrict-eval true \ + --arg configuration '{ documentation.nixos.options.allowDocBook = false; }' \ + -o md nixos/release.nix \ + -A manual.x86_64-linux + + - name: Compare DocBook and MD manuals + id: check + run: | + export NIX_PATH=nixpkgs=$(pwd) + .github/workflows/compare-manuals.sh \ + docbook/share/doc/nixos/options.html \ + md/share/doc/nixos/options.html + + # if the manual can't be built we don't want to notify anyone. + # while this may temporarily hide rendering failures it will be a lot + # less noisy until all nixpkgs pull requests have stopped using + # docbook for option docs. + - name: Comment on failure + uses: peter-evans/create-or-update-comment@v2 + if: ${{ failure() && steps.check.conclusion == 'failure' }} + with: + issue-number: 189318 + body: | + Markdown and DocBook manuals do not agree. + + Check https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }} for details. diff --git a/third_party/nixpkgs/lib/options.nix b/third_party/nixpkgs/lib/options.nix index a56e579ab8..dea85f0db0 100644 --- a/third_party/nixpkgs/lib/options.nix +++ b/third_party/nixpkgs/lib/options.nix @@ -284,7 +284,10 @@ rec { */ literalDocBook = text: if ! isString text then throw "literalDocBook expects a string." - else { _type = "literalDocBook"; inherit text; }; + else + lib.warnIf (lib.isInOldestRelease 2211) + "literalDocBook is deprecated, use literalMD instead" + { _type = "literalDocBook"; inherit text; }; /* Transition marker for documentation that's already migrated to markdown syntax. diff --git a/third_party/nixpkgs/lib/types.nix b/third_party/nixpkgs/lib/types.nix index d7655bc1a6..f235e34199 100644 --- a/third_party/nixpkgs/lib/types.nix +++ b/third_party/nixpkgs/lib/types.nix @@ -227,11 +227,11 @@ rec { }; int = mkOptionType { - name = "int"; - description = "signed integer"; - check = isInt; - merge = mergeEqualOption; - }; + name = "int"; + description = "signed integer"; + check = isInt; + merge = mergeEqualOption; + }; # Specialized subdomains of int ints = @@ -292,10 +292,34 @@ rec { port = ints.u16; float = mkOptionType { - name = "float"; - description = "floating point number"; - check = isFloat; - merge = mergeEqualOption; + name = "float"; + description = "floating point number"; + check = isFloat; + merge = mergeEqualOption; + }; + + number = either int float; + + numbers = let + betweenDesc = lowest: highest: + "${builtins.toJSON lowest} and ${builtins.toJSON highest} (both inclusive)"; + in { + between = lowest: highest: + assert lib.assertMsg (lowest <= highest) + "numbers.between: lowest must be smaller than highest"; + addCheck number (x: x >= lowest && x <= highest) // { + name = "numberBetween"; + description = "integer or floating point number between ${betweenDesc lowest highest}"; + }; + + nonnegative = addCheck number (x: x >= 0) // { + name = "numberNonnegative"; + description = "nonnegative integer or floating point number, meaning >=0"; + }; + positive = addCheck number (x: x > 0) // { + name = "numberPositive"; + description = "positive integer or floating point number, meaning >0"; + }; }; str = mkOptionType { diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index c429c50b98..210af3584e 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -1027,6 +1027,12 @@ fingerprint = "BF8B F725 DA30 E53E 7F11 4ED8 AAA5 0652 F047 9205"; }]; }; + apraga = { + email = "alexis.praga@proton.me"; + github = "apraga"; + githubId = 914687; + name = "Alexis Praga"; + }; ar1a = { email = "aria@ar1as.space"; github = "ar1a"; @@ -1075,6 +1081,12 @@ githubId = 628387; name = "Arian van Putten"; }; + arikgrahl = { + email = "mail@arik-grahl.de"; + github = "arikgrahl"; + githubId = 8049011; + name = "Arik Grahl"; + }; aristid = { email = "aristidb@gmail.com"; github = "aristidb"; @@ -6043,6 +6055,12 @@ fingerprint = "A506 C38D 5CC8 47D0 DF01 134A DA8B 833B 5260 4E63"; }]; }; + jcs090218 = { + email = "jcs090218@gmail.com"; + github = "jcs090218"; + githubId = 8685505; + name = "Jen-Chieh Shen"; + }; jcumming = { email = "jack@mudshark.org"; github = "jcumming"; @@ -8599,6 +8617,13 @@ githubId = 71893; name = "Michael Maclean"; }; + mglolenstine = { + email = "mglolenstine@gmail.com"; + github = "MGlolenstine"; + githubId = 9406770; + matrix = "@mglolenstine:matrix.org"; + name = "MGlolenstine"; + }; mgregoire = { email = "gregoire@martinache.net"; github = "M-Gregoire"; @@ -15268,6 +15293,12 @@ fingerprint = "4384 B8E1 299F C028 1641 7B8F EC30 EFBE FA7E 84A4"; }]; }; + bezmuth = { + email = "benkel97@protonmail.com"; + name = "Ben Kelly"; + github = "bezmuth"; + githubId = 31394095; + }; cafkafk = { email = "cafkafk@cafkafk.com"; matrix = "@cafkafk:matrix.cafkafk.com"; @@ -15284,4 +15315,10 @@ githubId = 7775707; name = "RB"; }; + bpaulin = { + email = "brunopaulin@bpaulin.net"; + github = "bpaulin"; + githubId = 115711; + name = "bpaulin"; + }; } diff --git a/third_party/nixpkgs/nixos/doc/manual/default.nix b/third_party/nixpkgs/nixos/doc/manual/default.nix index 1cd769b6a5..d61bbaddf7 100644 --- a/third_party/nixpkgs/nixos/doc/manual/default.nix +++ b/third_party/nixpkgs/nixos/doc/manual/default.nix @@ -6,6 +6,7 @@ , extraSources ? [] , baseOptionsJSON ? null , warningsAreErrors ? true +, allowDocBook ? true , prefix ? ../../.. }: @@ -28,7 +29,7 @@ let stripAnyPrefixes = lib.flip (lib.foldr lib.removePrefix) prefixesToStrip; optionsDoc = buildPackages.nixosOptionsDoc { - inherit options revision baseOptionsJSON warningsAreErrors; + inherit options revision baseOptionsJSON warningsAreErrors allowDocBook; transformOptions = opt: opt // { # Clean up declaration sites to not refer to the NixOS source tree. declarations = map stripAnyPrefixes opt.declarations; diff --git a/third_party/nixpkgs/nixos/doc/manual/development/option-declarations.section.md b/third_party/nixpkgs/nixos/doc/manual/development/option-declarations.section.md index 8bf73a6645..7fdc77b964 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/option-declarations.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/development/option-declarations.section.md @@ -44,26 +44,23 @@ The function `mkOption` accepts the following arguments. : A textual representation of the default value to be rendered verbatim in the manual. Useful if the default value is a complex expression or depends on other values or packages. - Use `lib.literalExpression` for a Nix expression, `lib.literalDocBook` for - a plain English description in DocBook format. + Use `lib.literalExpression` for a Nix expression, `lib.literalMD` for + a plain English description in [Nixpkgs-flavored Markdown]( + https://nixos.org/nixpkgs/manual/#sec-contributing-markup) format. `example` : An example value that will be shown in the NixOS manual. - You can use `lib.literalExpression` and `lib.literalDocBook` in the same way + You can use `lib.literalExpression` and `lib.literalMD` in the same way as in `defaultText`. `description` -: A textual description of the option, in DocBook format, that will be +: A textual description of the option, in [Nixpkgs-flavored Markdown]( + https://nixos.org/nixpkgs/manual/#sec-contributing-markup) format, that will be included in the NixOS manual. During the migration process from DocBook - to CommonMark the description may also be written in CommonMark, but has - to be wrapped in `lib.mdDoc` to differentiate it from DocBook. See - the nixpkgs manual for [the list of CommonMark extensions]( - https://nixos.org/nixpkgs/manual/#sec-contributing-markup) - supported by NixOS documentation. - - New documentation should preferably be written as CommonMark. + to CommonMark the description may also be written in DocBook, but this is + discouraged. ## Utility functions for common option patterns {#sec-option-declarations-util} diff --git a/third_party/nixpkgs/nixos/doc/manual/development/option-types.section.md b/third_party/nixpkgs/nixos/doc/manual/development/option-types.section.md index 9b35e66301..40b4d78b25 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/option-types.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/development/option-types.section.md @@ -4,7 +4,7 @@ Option types are a way to put constraints on the values a module option can take. Types are also responsible of how values are merged in case of multiple value definitions. -## Basic Types {#sec-option-types-basic} +## Basic types {#sec-option-types-basic} Basic types are the simplest available types in the module system. Basic types include multiple string types that mainly differ in how definition @@ -25,6 +25,11 @@ merging is handled. : A top-level store path. This can be an attribute set pointing to a store path, like a derivation or a flake input. +`types.enum` *`l`* + +: One element of the list *`l`*, e.g. `types.enum [ "left" "right" ]`. + Multiple definitions cannot be merged. + `types.anything` : A type that accepts any value and recursively merges attribute sets @@ -95,7 +100,7 @@ merging is handled. problems. ::: -Integer-related types: +### Numeric types {#sec-option-types-numeric} `types.int` @@ -118,6 +123,10 @@ Integer-related types: from 0 to 2^n−1 respectively (e.g. `0` to `255` for 8 bits). +`types.ints.between` *`lowest highest`* + +: An integer between *`lowest`* and *`highest`* (both inclusive). + `types.ints.positive` : A positive integer (that is > 0). @@ -127,12 +136,44 @@ Integer-related types: : A port number. This type is an alias to `types.ints.u16`. -String-related types: +`types.float` + +: A floating point number. + + ::: {.warning} + Converting a floating point number to a string with `toString` or `toJSON` + may result in [precision loss](https://github.com/NixOS/nix/issues/5733). + ::: + +`types.number` + +: Either a signed integer or a floating point number. No implicit conversion + is done between the two types, and multiple equal definitions will only be + merged if they have the same type. + +`types.numbers.between` *`lowest highest`* + +: An integer or floating point number between *`lowest`* and *`highest`* (both inclusive). + +`types.numbers.nonnegative` + +: A nonnegative integer or floating point number (that is >= 0). + +`types.numbers.positive` + +: A positive integer or floating point number (that is > 0). + +### String types {#sec-option-types-string} `types.str` : A string. Multiple definitions cannot be merged. +`types.separatedString` *`sep`* + +: A string. Multiple definitions are concatenated with *`sep`*, e.g. + `types.separatedString "|"`. + `types.lines` : A string. Multiple definitions are concatenated with a new line @@ -144,7 +185,7 @@ String-related types: `types.envVar` -: A string. Multiple definitions are concatenated with a collon `":"`. +: A string. Multiple definitions are concatenated with a colon `":"`. `types.strMatching` @@ -152,24 +193,9 @@ String-related types: definitions cannot be merged. The regular expression is processed using `builtins.match`. -## Value Types {#sec-option-types-value} +## Submodule types {#sec-option-types-submodule} -Value types are types that take a value parameter. - -`types.enum` *`l`* - -: One element of the list *`l`*, e.g. `types.enum [ "left" "right" ]`. - Multiple definitions cannot be merged. - -`types.separatedString` *`sep`* - -: A string with a custom separator *`sep`*, e.g. - `types.separatedString "|"`. - -`types.ints.between` *`lowest highest`* - -: An integer between *`lowest`* and *`highest`* (both inclusive). Useful - for creating types like `types.port`. +Submodules are detailed in [Submodule](#section-option-types-submodule). `types.submodule` *`o`* @@ -178,7 +204,6 @@ Value types are types that take a value parameter. value. Submodules are used in composed types to create modular options. This is equivalent to `types.submoduleWith { modules = toList o; shorthandOnlyDefinesConfig = true; }`. - Submodules are detailed in [Submodule](#section-option-types-submodule). `types.submoduleWith` { *`modules`*, *`specialArgs`* ? {}, *`shorthandOnlyDefinesConfig`* ? false } @@ -239,7 +264,7 @@ Value types are types that take a value parameter. more convenient and discoverable than expecting the module user to type-merge with the `attrsOf submodule` option. -## Composed Types {#sec-option-types-composed} +## Composed types {#sec-option-types-composed} Composed types are types that take a type as parameter. `listOf int` and `either int str` are examples of composed types. @@ -496,7 +521,7 @@ Types are mainly characterized by their `check` and `merge` functions. of strings, and `defs` the list of defined values as a list. It is possible to override a type merge function for custom needs. -## Custom Types {#sec-option-types-custom} +## Custom types {#sec-option-types-custom} Custom types can be created with the `mkOptionType` function. As type creation includes some more complex topics such as submodule handling, diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-declarations.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-declarations.section.xml index d7c7f7716b..ba604d109a 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-declarations.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-declarations.section.xml @@ -69,8 +69,10 @@ options = { verbatim in the manual. Useful if the default value is a complex expression or depends on other values or packages. Use lib.literalExpression for a Nix expression, - lib.literalDocBook for a plain English - description in DocBook format. + lib.literalMD for a plain English + description in + Nixpkgs-flavored + Markdown format. @@ -82,7 +84,7 @@ options = { An example value that will be shown in the NixOS manual. You can use lib.literalExpression and - lib.literalDocBook in the same way as in + lib.literalMD in the same way as in defaultText. @@ -93,18 +95,12 @@ options = { - A textual description of the option, in DocBook format, that - will be included in the NixOS manual. During the migration - process from DocBook to CommonMark the description may also be - written in CommonMark, but has to be wrapped in - lib.mdDoc to differentiate it from DocBook. - See the nixpkgs manual for - the - list of CommonMark extensions supported by NixOS - documentation. - - - New documentation should preferably be written as CommonMark. + A textual description of the option, in + Nixpkgs-flavored + Markdown format, that will be included in the NixOS + manual. During the migration process from DocBook to + CommonMark the description may also be written in DocBook, but + this is discouraged. diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-types.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-types.section.xml index 929d5302ed..4036bc0ba7 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-types.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-types.section.xml @@ -6,7 +6,7 @@ in case of multiple value definitions.
- Basic Types + Basic types Basic types are the simplest available types in the module system. Basic types include multiple string types that mainly differ in @@ -49,6 +49,20 @@ + + + types.enum + l + + + + One element of the list + l, e.g. + types.enum [ "left" "right" ]. + Multiple definitions cannot be merged. + + + types.anything @@ -150,186 +164,241 @@ - - Integer-related types: - - - - - types.int - - - - A signed integer. - - - - - - types.ints.{s8, s16, s32} - - - - Signed integers with a fixed length (8, 16 or 32 bits). They - go from −2^n/2 to 2^n/2−1 respectively (e.g. - −128 to 127 for 8 - bits). - - - - - - types.ints.unsigned - - - - An unsigned integer (that is >= 0). - - - - - - types.ints.{u8, u16, u32} - - - - Unsigned integers with a fixed length (8, 16 or 32 bits). - They go from 0 to 2^n−1 respectively (e.g. - 0 to 255 for 8 bits). - - - - - - types.ints.positive - - - - A positive integer (that is > 0). - - - - - - types.port - - - - A port number. This type is an alias to - types.ints.u16. - - - - - - String-related types: - - - - - types.str - - - - A string. Multiple definitions cannot be merged. - - - - - - types.lines - - - - A string. Multiple definitions are concatenated with a new - line "\n". - - - - - - types.commas - - - - A string. Multiple definitions are concatenated with a comma - ",". - - - - - - types.envVar - - - - A string. Multiple definitions are concatenated with a - collon ":". - - - - - - types.strMatching - - - - A string matching a specific regular expression. Multiple - definitions cannot be merged. The regular expression is - processed using builtins.match. - - - - +
+ Numeric types + + + + types.int + + + + A signed integer. + + + + + + types.ints.{s8, s16, s32} + + + + Signed integers with a fixed length (8, 16 or 32 bits). + They go from −2^n/2 to 2^n/2−1 respectively (e.g. + −128 to 127 for 8 + bits). + + + + + + types.ints.unsigned + + + + An unsigned integer (that is >= 0). + + + + + + types.ints.{u8, u16, u32} + + + + Unsigned integers with a fixed length (8, 16 or 32 bits). + They go from 0 to 2^n−1 respectively (e.g. + 0 to 255 for 8 + bits). + + + + + + types.ints.between + lowest highest + + + + An integer between + lowest and + highest (both + inclusive). + + + + + + types.ints.positive + + + + A positive integer (that is > 0). + + + + + + types.port + + + + A port number. This type is an alias to + types.ints.u16. + + + + + + types.float + + + + A floating point number. + + + + Converting a floating point number to a string with + toString or toJSON + may result in + precision + loss. + + + + + + + types.number + + + + Either a signed integer or a floating point number. No + implicit conversion is done between the two types, and + multiple equal definitions will only be merged if they + have the same type. + + + + + + types.numbers.between + lowest highest + + + + An integer or floating point number between + lowest and + highest (both + inclusive). + + + + + + types.numbers.nonnegative + + + + A nonnegative integer or floating point number (that is + >= 0). + + + + + + types.numbers.positive + + + + A positive integer or floating point number (that is > + 0). + + + + +
+
+ String types + + + + types.str + + + + A string. Multiple definitions cannot be merged. + + + + + + types.separatedString + sep + + + + A string. Multiple definitions are concatenated with + sep, e.g. + types.separatedString "|". + + + + + + types.lines + + + + A string. Multiple definitions are concatenated with a new + line "\n". + + + + + + types.commas + + + + A string. Multiple definitions are concatenated with a + comma ",". + + + + + + types.envVar + + + + A string. Multiple definitions are concatenated with a + colon ":". + + + + + + types.strMatching + + + + A string matching a specific regular expression. Multiple + definitions cannot be merged. The regular expression is + processed using builtins.match. + + + + +
-
- Value Types +
+ Submodule types - Value types are types that take a value parameter. + Submodules are detailed in + Submodule. - - - types.enum - l - - - - One element of the list - l, e.g. - types.enum [ "left" "right" ]. - Multiple definitions cannot be merged. - - - - - - types.separatedString - sep - - - - A string with a custom separator - sep, e.g. - types.separatedString "|". - - - - - - types.ints.between - lowest highest - - - - An integer between - lowest and - highest (both - inclusive). Useful for creating types like - types.port. - - - types.submodule @@ -345,8 +414,6 @@ in composed types to create modular options. This is equivalent to types.submoduleWith { modules = toList o; shorthandOnlyDefinesConfig = true; }. - Submodules are detailed in - Submodule. @@ -467,7 +534,7 @@
- Composed Types + Composed types Composed types are types that take a type as parameter. listOf int and @@ -850,7 +917,7 @@ nixThings = mkOption {
- Custom Types + Custom types Custom types can be created with the mkOptionType function. As type creation diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/installation/installing.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/installation/installing.chapter.xml index 0112458674..e0ff368b80 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/installation/installing.chapter.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/installation/installing.chapter.xml @@ -243,6 +243,15 @@ OK # parted /dev/sda -- mkpart primary 1MB -8GB + + + + + Set the root partition’s boot flag to on. This allows the + disk to be booted from. + + +# parted /dev/sda -- set 1 boot on diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 9b08a54445..1e9e28d421 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -265,6 +265,14 @@ services.tempo. + + + AusweisApp2, + the authentication software for the German ID card. Available + as + programs.ausweisapp. + + Patroni, @@ -577,6 +585,25 @@ as coreboot’s fork is no longer available. + + + Option descriptions, examples, and defaults writting in + DocBook are now deprecated. Using CommonMark is preferred and + will become the default in a future release. + + + + + The + documentation.nixos.options.allowDocBook + option was added to ease the transition to CommonMark option + documentation. Setting this option to false + causes an error for every option included in the manual that + uses DocBook documentation; it defaults to + true to preserve the previous behavior and + will be removed once the transition to CommonMark is complete. + + The udisks2 service, available at diff --git a/third_party/nixpkgs/nixos/doc/manual/installation/installing.chapter.md b/third_party/nixpkgs/nixos/doc/manual/installation/installing.chapter.md index 7254f9d184..b1e58b14b7 100644 --- a/third_party/nixpkgs/nixos/doc/manual/installation/installing.chapter.md +++ b/third_party/nixpkgs/nixos/doc/manual/installation/installing.chapter.md @@ -183,7 +183,13 @@ update /etc/fstab. # parted /dev/sda -- mkpart primary 1MB -8GB ``` -3. Finally, add a *swap* partition. The size required will vary +3. Set the root partition's boot flag to on. This allows the disk to be booted from. + + ```ShellSession + # parted /dev/sda -- set 1 boot on + ``` + +4. Finally, add a *swap* partition. The size required will vary according to needs, here a 8GiB one is created. ```ShellSession diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2211.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2211.section.md index 584a17cfca..abd3a739e6 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2211.section.md @@ -94,6 +94,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [Grafana Tempo](https://www.grafana.com/oss/tempo/), a distributed tracing store. Available as [services.tempo](#opt-services.tempo.enable). +- [AusweisApp2](https://www.ausweisapp.bund.de/), the authentication software for the German ID card. Available as [programs.ausweisapp](#opt-programs.ausweisapp.enable). + - [Patroni](https://github.com/zalando/patroni), a template for PostgreSQL HA with ZooKeeper, etcd or Consul. Available as [services.patroni](options.html#opt-services.patroni.enable). @@ -197,6 +199,10 @@ Use `configure.packages` instead. - memtest86+ was updated from 5.00-coreboot-002 to 6.00-beta2. It is now the upstream version from https://www.memtest.org/, as coreboot's fork is no longer available. +- Option descriptions, examples, and defaults writting in DocBook are now deprecated. Using CommonMark is preferred and will become the default in a future release. + +- The `documentation.nixos.options.allowDocBook` option was added to ease the transition to CommonMark option documentation. Setting this option to `false` causes an error for every option included in the manual that uses DocBook documentation; it defaults to `true` to preserve the previous behavior and will be removed once the transition to CommonMark is complete. + - The udisks2 service, available at `services.udisks2.enable`, is now disabled by default. It will automatically be enabled through services and desktop environments as needed. This also means that polkit will now actually be disabled by default. The default for `security.polkit.enable` was already flipped in the previous release, but udisks2 being enabled by default re-enabled it. diff --git a/third_party/nixpkgs/nixos/lib/make-options-doc/default.nix b/third_party/nixpkgs/nixos/lib/make-options-doc/default.nix index 3f98e2cf87..43dbff0e68 100644 --- a/third_party/nixpkgs/nixos/lib/make-options-doc/default.nix +++ b/third_party/nixpkgs/nixos/lib/make-options-doc/default.nix @@ -34,6 +34,10 @@ # instead of printing warnings for eg options with missing descriptions (which may be lost # by nix build unless -L is given), emit errors instead and fail the build , warningsAreErrors ? true +# allow docbook option docs if `true`. only markdown documentation is allowed when set to +# `false`, and a different renderer may be used with different bugs and performance +# characteristics but (hopefully) indistinguishable output. +, allowDocBook ? true }: let @@ -127,26 +131,23 @@ in rec { ]; options = builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON optionsNix)); + # merge with an empty set if baseOptionsJSON is null to run markdown + # processing on the input options + baseJSON = + if baseOptionsJSON == null + then builtins.toFile "base.json" "{}" + else baseOptionsJSON; } '' # Export list of options in different format. dst=$out/share/doc/nixos mkdir -p $dst - ${ - if baseOptionsJSON == null - then '' - # `cp $options $dst/options.json`, but with temporary - # markdown processing - python ${./mergeJSON.py} $options <(echo '{}') > $dst/options.json - '' - else '' - python ${./mergeJSON.py} \ - ${lib.optionalString warningsAreErrors "--warnings-are-errors"} \ - ${baseOptionsJSON} $options \ - > $dst/options.json - '' - } + python ${./mergeJSON.py} \ + ${lib.optionalString warningsAreErrors "--warnings-are-errors"} \ + ${lib.optionalString (! allowDocBook) "--error-on-docbook"} \ + $baseJSON $options \ + > $dst/options.json brotli -9 < $dst/options.json > $dst/options.json.br diff --git a/third_party/nixpkgs/nixos/lib/make-options-doc/mergeJSON.py b/third_party/nixpkgs/nixos/lib/make-options-doc/mergeJSON.py index 1a1af11337..eae9ca0312 100644 --- a/third_party/nixpkgs/nixos/lib/make-options-doc/mergeJSON.py +++ b/third_party/nixpkgs/nixos/lib/make-options-doc/mergeJSON.py @@ -212,8 +212,17 @@ def convertMD(options: Dict[str, Any]) -> str: return options -warningsAreErrors = sys.argv[1] == "--warnings-are-errors" -optOffset = 1 if warningsAreErrors else 0 +warningsAreErrors = False +errorOnDocbook = False +optOffset = 0 +for arg in sys.argv[1:]: + if arg == "--warnings-are-errors": + optOffset += 1 + warningsAreErrors = True + if arg == "--error-on-docbook": + optOffset += 1 + errorOnDocbook = True + options = pivot(json.load(open(sys.argv[1 + optOffset], 'r'))) overrides = pivot(json.load(open(sys.argv[2 + optOffset], 'r'))) @@ -241,9 +250,33 @@ for (k, v) in overrides.items(): severity = "error" if warningsAreErrors else "warning" +def is_docbook(o, key): + val = o.get(key, {}) + if not isinstance(val, dict): + return False + return val.get('_type', '') == 'literalDocBook' + # check that every option has a description hasWarnings = False +hasErrors = False for (k, v) in options.items(): + if errorOnDocbook: + if isinstance(v.value.get('description', {}), str): + hasErrors = True + print( + f"\x1b[1;31merror: option {v.name} description uses DocBook\x1b[0m", + file=sys.stderr) + elif is_docbook(v.value, 'defaultText'): + hasErrors = True + print( + f"\x1b[1;31merror: option {v.name} default uses DocBook\x1b[0m", + file=sys.stderr) + elif is_docbook(v.value, 'example'): + hasErrors = True + print( + f"\x1b[1;31merror: option {v.name} example uses DocBook\x1b[0m", + file=sys.stderr) + if v.value.get('description', None) is None: hasWarnings = True print(f"\x1b[1;31m{severity}: option {v.name} has no description\x1b[0m", file=sys.stderr) @@ -254,6 +287,8 @@ for (k, v) in options.items(): f"\x1b[1;31m{severity}: option {v.name} has no type. Please specify a valid type, see " + "https://nixos.org/manual/nixos/stable/index.html#sec-option-types\x1b[0m", file=sys.stderr) +if hasErrors: + sys.exit(1) if hasWarnings and warningsAreErrors: print( "\x1b[1;31m" + diff --git a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix index 8c7bac6f6c..c5976166fb 100644 --- a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix +++ b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix @@ -26,7 +26,7 @@ with lib; # Provide networkmanager for easy wireless configuration. networking.networkmanager.enable = true; - networking.wireless.enable = mkForce false; + networking.wireless.enable = mkImageMediaOverride false; # KDE complains if power management is disabled (to be precise, if # there is no power management backend such as upower). diff --git a/third_party/nixpkgs/nixos/modules/misc/documentation.nix b/third_party/nixpkgs/nixos/modules/misc/documentation.nix index 5dcdc8f96c..e85ad4efd0 100644 --- a/third_party/nixpkgs/nixos/modules/misc/documentation.nix +++ b/third_party/nixpkgs/nixos/modules/misc/documentation.nix @@ -99,7 +99,7 @@ let exit 1 } >&2 ''; - inherit (cfg.nixos.options) warningsAreErrors; + inherit (cfg.nixos.options) warningsAreErrors allowDocBook; }; @@ -255,6 +255,23 @@ in ''; }; + nixos.options.allowDocBook = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc '' + Whether to allow DocBook option docs. When set to `false` all option using + DocBook documentation will cause a manual build error; additionally a new + renderer may be used. + + ::: {.note} + The `false` setting for this option is not yet fully supported. While it + should work fine and produce the same output as the previous toolchain + using DocBook it may not work in all circumstances. Whether markdown option + documentation is allowed is independent of this option. + ::: + ''; + }; + nixos.options.warningsAreErrors = mkOption { type = types.bool; default = true; diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index 12692d7bfb..e6f077dd5d 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -128,6 +128,7 @@ ./programs/adb.nix ./programs/appgate-sdp.nix ./programs/atop.nix + ./programs/ausweisapp.nix ./programs/autojump.nix ./programs/bandwhich.nix ./programs/bash/bash.nix diff --git a/third_party/nixpkgs/nixos/modules/profiles/installation-device.nix b/third_party/nixpkgs/nixos/modules/profiles/installation-device.nix index a8601a9e2c..ae9be08c8d 100644 --- a/third_party/nixpkgs/nixos/modules/profiles/installation-device.nix +++ b/third_party/nixpkgs/nixos/modules/profiles/installation-device.nix @@ -22,10 +22,10 @@ with lib; config = { # Enable in installer, even if the minimal profile disables it. - documentation.enable = mkForce true; + documentation.enable = mkImageMediaOverride true; # Show the manual. - documentation.nixos.enable = mkForce true; + documentation.nixos.enable = mkImageMediaOverride true; # Use less privileged nixos user users.users.nixos = { @@ -41,7 +41,7 @@ with lib; # Allow passwordless sudo from nixos user security.sudo = { enable = mkDefault true; - wheelNeedsPassword = mkForce false; + wheelNeedsPassword = mkImageMediaOverride false; }; # Automatically log in at the virtual consoles. diff --git a/third_party/nixpkgs/nixos/modules/programs/ausweisapp.nix b/third_party/nixpkgs/nixos/modules/programs/ausweisapp.nix new file mode 100644 index 0000000000..ef1f059568 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/programs/ausweisapp.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.ausweisapp; +in +{ + options.programs.ausweisapp = { + enable = mkEnableOption (lib.mdDoc "AusweisApp2"); + + openFirewall = mkOption { + description = lib.mdDoc '' + Whether to open the required firewall ports for the Smartphone as Card Reader (SaC) functionality of AusweisApp2. + ''; + default = false; + type = lib.types.bool; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ AusweisApp2 ]; + networking.firewall.allowedUDPPorts = lib.optionals cfg.openFirewall [ 24727 ]; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/programs/rust-motd.nix b/third_party/nixpkgs/nixos/modules/programs/rust-motd.nix index 671e701cd1..f89b5e0383 100644 --- a/third_party/nixpkgs/nixos/modules/programs/rust-motd.nix +++ b/third_party/nixpkgs/nixos/modules/programs/rust-motd.nix @@ -7,7 +7,7 @@ let format = pkgs.formats.toml { }; in { options.programs.rust-motd = { - enable = mkEnableOption "rust-motd"; + enable = mkEnableOption (lib.mdDoc "rust-motd"); enableMotdInSSHD = mkOption { default = true; type = types.bool; diff --git a/third_party/nixpkgs/nixos/modules/security/wrappers/default.nix b/third_party/nixpkgs/nixos/modules/security/wrappers/default.nix index 45aee7c973..a58c792d8c 100644 --- a/third_party/nixpkgs/nixos/modules/security/wrappers/default.nix +++ b/third_party/nixpkgs/nixos/modules/security/wrappers/default.nix @@ -52,10 +52,11 @@ let { type = lib.types.commas; default = ""; description = lib.mdDoc '' - A comma-separated list of capabilities to be given to the wrapper - program. For capabilities supported by the system check the - {manpage}`capabilities(7)` - manual page. + A comma-separated list of capability clauses to be given to the + wrapper program. The format for capability clauses is described in the + “TEXTUAL REPRESENTATION” section of the {manpage}`cap_from_text(3)` + manual page. For a list of capabilities supported by the system, check + the {manpage}`capabilities(7)` manual page. ::: {.note} `cap_setpcap`, which is required for the wrapper diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildkite-agents.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildkite-agents.nix index 3d29a641a1..7c8f77580f 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildkite-agents.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildkite-agents.nix @@ -9,7 +9,7 @@ let inherit name; value = mkOption { default = null; - inherit description; + description = lib.mdDoc description; type = types.nullOr types.lines; } // (if example == null then {} else { inherit example; }); }; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/influxdb.nix b/third_party/nixpkgs/nixos/modules/services/databases/influxdb.nix index 9b3922c70a..b3361d2014 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/influxdb.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/influxdb.nix @@ -96,10 +96,8 @@ let }; } cfg.extraConfig; - configFile = pkgs.runCommandLocal "config.toml" { - nativeBuildInputs = [ pkgs.remarshal ]; - } '' - remarshal -if json -of toml \ + configFile = pkgs.runCommandLocal "config.toml" { } '' + ${pkgs.buildPackages.remarshal}/bin/remarshal -if json -of toml \ < ${pkgs.writeText "config.json" (builtins.toJSON configOptions)} \ > $out ''; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/espanso.nix b/third_party/nixpkgs/nixos/modules/services/desktops/espanso.nix index 4ef6724dda..cbc4803479 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/espanso.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/espanso.nix @@ -6,7 +6,7 @@ in { meta = { maintainers = with lib.maintainers; [ numkem ]; }; options = { - services.espanso = { enable = options.mkEnableOption "Espanso"; }; + services.espanso = { enable = options.mkEnableOption (lib.mdDoc "Espanso"); }; }; config = mkIf cfg.enable { diff --git a/third_party/nixpkgs/nixos/modules/services/logging/vector.nix b/third_party/nixpkgs/nixos/modules/services/logging/vector.nix index c4bd4fe809..ab5ea887ac 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/vector.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/vector.nix @@ -43,8 +43,10 @@ in format = pkgs.formats.toml { }; conf = format.generate "vector.toml" cfg.settings; validateConfig = file: - pkgs.runCommand "validate-vector-conf" { } '' - ${pkgs.vector}/bin/vector validate --no-environment "${file}" + pkgs.runCommand "validate-vector-conf" { + nativeBuildInputs = [ pkgs.buildPackages.vector ]; + } '' + vector validate --no-environment "${file}" ln -s "${file}" "$out" ''; in diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gollum.nix b/third_party/nixpkgs/nixos/modules/services/misc/gollum.nix index a4bed2da8a..ca6f42736a 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gollum.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gollum.nix @@ -87,6 +87,14 @@ in description = lib.mdDoc "Specifies the path of the repository directory. If it does not exist, Gollum will create it on startup."; }; + package = mkOption { + type = types.package; + default = pkgs.gollum; + defaultText = literalExpression "pkgs.gollum"; + description = lib.mdDoc '' + The package used in the service + ''; + }; }; config = mkIf cfg.enable { @@ -120,7 +128,7 @@ in Group = config.users.groups.gollum.name; WorkingDirectory = cfg.stateDir; ExecStart = '' - ${pkgs.gollum}/bin/gollum \ + ${cfg.package}/bin/gollum \ --port ${toString cfg.port} \ --host ${cfg.address} \ --config ${pkgs.writeText "gollum-config.rb" cfg.extraConfig} \ diff --git a/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/default.nix b/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/default.nix index dd0e016a1d..9177f3cd02 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/default.nix @@ -101,7 +101,7 @@ let todosrht ]); mkOptionNullOrStr = description: mkOption { - inherit description; + description = lib.mdDoc description; type = with types; nullOr str; default = null; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix index dd99fa3ddc..fd3418b8f6 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix @@ -628,18 +628,18 @@ in { }; allowedDomains = mkOption { description = lib.mdDoc '' - To limit access to authenticated users who are members of one or more groups, - set allowedGroups to a comma- or space-separated list of group object IDs. - You can find object IDs for a specific group on the Azure portal. + Limits access to users who belong to specific domains. + Separate domains with space or comma. ''; default = ""; type = types.str; }; allowedGroups = mkOption { description = lib.mdDoc '' - Limits access to users who belong to specific domains. - Separate domains with space or comma. - ''; + To limit access to authenticated users who are members of one or more groups, + set allowedGroups to a comma- or space-separated list of group object IDs. + You can find object IDs for a specific group on the Azure portal. + ''; default = ""; type = types.str; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/rtl_433.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/rtl_433.nix index 42bf1788ae..1f7235cb78 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/rtl_433.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/rtl_433.nix @@ -16,7 +16,7 @@ in }; "${field}" = lib.mkOption { type = int; - inherit description; + description = lib.mdDoc description; }; location = lib.mkOption { type = str; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/v2ray.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/v2ray.nix index 185506cfc2..a019157c66 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/v2ray.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/v2ray.nix @@ -11,7 +11,7 @@ in v2rayEndpoint = mkOption { type = types.str; default = "127.0.0.1:54321"; - description = '' + description = lib.mdDoc '' v2ray grpc api endpoint ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/i2pd.nix b/third_party/nixpkgs/nixos/modules/services/networking/i2pd.nix index 47f4a42aa5..b60cbe664b 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/i2pd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/i2pd.nix @@ -396,12 +396,12 @@ in }; precomputation.elgamal = mkEnableTrueOption "Precomputed ElGamal tables" // { - description = '' + description = lib.mdDoc '' Whenever to use precomputated tables for ElGamal. - i2pd defaults to false + {command}`i2pd` defaults to `false` to save 64M of memory (and looses some performance). - We default to true as that is what most + We default to `true` as that is what most users want anyway. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/keepalived/default.nix b/third_party/nixpkgs/nixos/modules/services/networking/keepalived/default.nix index 1ab25c8799..e9df08f00c 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/keepalived/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/keepalived/default.nix @@ -268,11 +268,11 @@ in type = types.nullOr types.path; default = null; example = "/run/keys/keepalived.env"; - description = '' + description = lib.mdDoc '' Environment variables from this file will be interpolated into the - final config file using envsubst with this syntax: $ENVIRONMENT - or ''${VARIABLE}. - The file should contain lines formatted as SECRET_VAR=SECRET_VALUE. + final config file using envsubst with this syntax: `$ENVIRONMENT` + or `''${VARIABLE}`. + The file should contain lines formatted as `SECRET_VAR=SECRET_VALUE`. This is useful to avoid putting secrets into the nix store. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix b/third_party/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix index 8245b25719..dc6d8f48e6 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix @@ -152,7 +152,7 @@ rec { option = mkOption { type = types.attrsOf (types.submodule {options = paramsToOptions params;}); default = {}; - inherit description; + description = lib.mdDoc description; }; render = postfix: attrs: let postfixedAttrs = mapAttrs' (name: nameValuePair "${name}-${postfix}") attrs; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix b/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix index 0b6b4bf9e5..0876007a6e 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix @@ -325,11 +325,12 @@ in { }; type = mkOption { - type = types.enum [ "sendreceive" "sendonly" "receiveonly" ]; + type = types.enum [ "sendreceive" "sendonly" "receiveonly" "receiveencrypted" ]; default = "sendreceive"; description = lib.mdDoc '' Whether to only send changes for this folder, only receive them - or both. + or both. `receiveencrypted` can be used for untrusted devices. See + for reference. ''; }; @@ -528,6 +529,8 @@ in { }; systemd.services = { + # upstream reference: + # https://github.com/syncthing/syncthing/blob/main/etc/linux-systemd/system/syncthing%40.service syncthing = mkIf cfg.systemService { description = "Syncthing service"; after = [ "network.target" ]; @@ -539,7 +542,7 @@ in { wantedBy = [ "multi-user.target" ]; serviceConfig = { Restart = "on-failure"; - SuccessExitStatus = "2 3 4"; + SuccessExitStatus = "3 4"; RestartForceExitStatus="3 4"; User = cfg.user; Group = cfg.group; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix b/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix index 6c58bcfbbf..119575bddd 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix @@ -187,12 +187,12 @@ in { }; allowAuxiliaryImperativeNetworks = mkEnableOption (lib.mdDoc "support for imperative & declarative networks") // { - description = '' + description = lib.mdDoc '' Whether to allow configuring networks "imperatively" (e.g. via - wpa_supplicant_gui) and declaratively via - . + `wpa_supplicant_gui`) and declaratively via + [](#opt-networking.wireless.networks). - Please note that this adds a custom patch to wpa_supplicant. + Please note that this adds a custom patch to `wpa_supplicant`. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/system/cachix-agent/default.nix b/third_party/nixpkgs/nixos/modules/services/system/cachix-agent/default.nix index 2972e02b46..64b31b3b01 100644 --- a/third_party/nixpkgs/nixos/modules/services/system/cachix-agent/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/system/cachix-agent/default.nix @@ -63,7 +63,7 @@ in { KillMode = "process"; Restart = "on-failure"; EnvironmentFile = cfg.credentialsFile; - ExecStart = "${cfg.package}/bin/cachix ${lib.optionalString cfg.verbose "--verbose"} deploy agent ${cfg.name} ${if cfg.profile != null then profile else ""}"; + ExecStart = "${cfg.package}/bin/cachix ${lib.optionalString cfg.verbose "--verbose"} deploy agent ${cfg.name} ${if cfg.profile != null then cfg.profile else ""}"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/dolibarr.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/dolibarr.nix index 2b2e2a6214..5335c43932 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/dolibarr.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/dolibarr.nix @@ -48,12 +48,12 @@ in { # interface options.services.dolibarr = { - enable = mkEnableOption "dolibarr"; + enable = mkEnableOption (lib.mdDoc "dolibarr"); domain = mkOption { type = types.str; default = "localhost"; - description = '' + description = lib.mdDoc '' Domain name of your server. ''; }; @@ -61,35 +61,35 @@ in user = mkOption { type = types.str; default = "dolibarr"; - description = '' + description = lib.mdDoc '' User account under which dolibarr runs. - - If left as the default value this user will automatically be created - on system activation, otherwise you are responsible for - ensuring the user exists before the dolibarr application starts. - + ::: {.note} + If left as the default value this user will automatically be created + on system activation, otherwise you are responsible for + ensuring the user exists before the dolibarr application starts. + ::: ''; }; group = mkOption { type = types.str; default = "dolibarr"; - description = '' + description = lib.mdDoc '' Group account under which dolibarr runs. - - If left as the default value this group will automatically be created - on system activation, otherwise you are responsible for - ensuring the group exists before the dolibarr application starts. - + ::: {.note} + If left as the default value this group will automatically be created + on system activation, otherwise you are responsible for + ensuring the group exists before the dolibarr application starts. + ::: ''; }; stateDir = mkOption { type = types.str; default = "/var/lib/dolibarr"; - description = '' + description = lib.mdDoc '' State and configuration directory dolibarr will use. ''; }; @@ -98,33 +98,33 @@ in host = mkOption { type = types.str; default = "localhost"; - description = "Database host address."; + description = lib.mdDoc "Database host address."; }; port = mkOption { type = types.port; default = 3306; - description = "Database host port."; + description = lib.mdDoc "Database host port."; }; name = mkOption { type = types.str; default = "dolibarr"; - description = "Database name."; + description = lib.mdDoc "Database name."; }; user = mkOption { type = types.str; default = "dolibarr"; - description = "Database username."; + description = lib.mdDoc "Database username."; }; passwordFile = mkOption { type = with types; nullOr path; default = null; example = "/run/keys/dolibarr-dbpassword"; - description = "Database password file."; + description = lib.mdDoc "Database password file."; }; createLocally = mkOption { type = types.bool; default = true; - description = "Create the database and database user locally."; + description = lib.mdDoc "Create the database and database user locally."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/writefreely.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/writefreely.nix index c363760d5c..dec00b46f3 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/writefreely.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/writefreely.nix @@ -133,45 +133,45 @@ let in { options.services.writefreely = { enable = - lib.mkEnableOption "Writefreely, build a digital writing community"; + lib.mkEnableOption (lib.mdDoc "Writefreely, build a digital writing community"); package = lib.mkOption { type = lib.types.package; default = pkgs.writefreely; defaultText = lib.literalExpression "pkgs.writefreely"; - description = "Writefreely package to use."; + description = lib.mdDoc "Writefreely package to use."; }; stateDir = mkOption { type = types.path; default = "/var/lib/writefreely"; - description = "The state directory where keys and data are stored."; + description = lib.mdDoc "The state directory where keys and data are stored."; }; user = mkOption { type = types.str; default = "writefreely"; - description = "User under which Writefreely is ran."; + description = lib.mdDoc "User under which Writefreely is ran."; }; group = mkOption { type = types.str; default = "writefreely"; - description = "Group under which Writefreely is ran."; + description = lib.mdDoc "Group under which Writefreely is ran."; }; host = mkOption { type = types.str; default = ""; - description = "The public host name to serve."; + description = lib.mdDoc "The public host name to serve."; example = "example.com"; }; settings = mkOption { default = { }; - description = '' - Writefreely configuration (config.ini). Refer to - + description = lib.mdDoc '' + Writefreely configuration ({file}`config.ini`). Refer to + for details. ''; @@ -183,7 +183,7 @@ in { theme = mkOption { type = types.str; default = "write"; - description = "The theme to apply."; + description = lib.mdDoc "The theme to apply."; }; }; @@ -192,7 +192,7 @@ in { type = types.port; default = if cfg.nginx.enable then 18080 else 80; defaultText = "80"; - description = "The port WriteFreely should listen on."; + description = lib.mdDoc "The port WriteFreely should listen on."; }; }; }; @@ -203,60 +203,60 @@ in { type = mkOption { type = types.enum [ "sqlite3" "mysql" ]; default = "sqlite3"; - description = "The database provider to use."; + description = lib.mdDoc "The database provider to use."; }; name = mkOption { type = types.str; default = "writefreely"; - description = "The name of the database to store data in."; + description = lib.mdDoc "The name of the database to store data in."; }; user = mkOption { type = types.nullOr types.str; default = if cfg.database.type == "mysql" then "writefreely" else null; defaultText = "writefreely"; - description = "The database user to connect as."; + description = lib.mdDoc "The database user to connect as."; }; passwordFile = mkOption { type = types.nullOr types.path; default = null; - description = "The file to load the database password from."; + description = lib.mdDoc "The file to load the database password from."; }; host = mkOption { type = types.str; default = "localhost"; - description = "The database host to connect to."; + description = lib.mdDoc "The database host to connect to."; }; port = mkOption { type = types.port; default = 3306; - description = "The port used when connecting to the database host."; + description = lib.mdDoc "The port used when connecting to the database host."; }; tls = mkOption { type = types.bool; default = false; description = - "Whether or not TLS should be used for the database connection."; + lib.mdDoc "Whether or not TLS should be used for the database connection."; }; migrate = mkOption { type = types.bool; default = true; description = - "Whether or not to automatically run migrations on startup."; + lib.mdDoc "Whether or not to automatically run migrations on startup."; }; createLocally = mkOption { type = types.bool; default = false; - description = '' - When is set to - "mysql", this option will enable the MySQL service locally. + description = lib.mdDoc '' + When {option}`services.writefreely.database.type` is set to + `"mysql"`, this option will enable the MySQL service locally. ''; }; }; @@ -264,15 +264,15 @@ in { admin = { name = mkOption { type = types.nullOr types.str; - description = "The name of the first admin user."; + description = lib.mdDoc "The name of the first admin user."; default = null; }; initialPasswordFile = mkOption { type = types.path; - description = '' + description = lib.mdDoc '' Path to a file containing the initial password for the admin user. - If not provided, the default password will be set to nixos. + If not provided, the default password will be set to `nixos`. ''; default = pkgs.writeText "default-admin-pass" "nixos"; defaultText = "/nix/store/xxx-default-admin-pass"; @@ -284,13 +284,13 @@ in { type = types.bool; default = false; description = - "Whether or not to enable and configure nginx as a proxy for WriteFreely."; + lib.mdDoc "Whether or not to enable and configure nginx as a proxy for WriteFreely."; }; forceSSL = mkOption { type = types.bool; default = false; - description = "Whether or not to force the use of SSL."; + description = lib.mdDoc "Whether or not to force the use of SSL."; }; }; @@ -299,7 +299,7 @@ in { type = types.bool; default = false; description = - "Whether or not to automatically fetch and configure SSL certs."; + lib.mdDoc "Whether or not to automatically fetch and configure SSL certs."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/picom.nix b/third_party/nixpkgs/nixos/modules/services/x11/picom.nix index 99bde5e1f0..d42cf1d741 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/picom.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/picom.nix @@ -11,15 +11,6 @@ let addCheck (listOf x) (y: length y == 2) // { description = "pair of ${x.description}"; }; - floatBetween = a: b: with types; - let - # toString prints floats with hardcoded high precision - floatToString = f: builtins.toJSON f; - in - addCheck float (x: x <= b && x >= a) - // { description = "a floating point number in " + - "range [${floatToString a}, ${floatToString b}]"; }; - mkDefaultAttrs = mapAttrs (n: v: mkDefault v); # Basically a tinkered lib.generators.mkKeyValueDefault @@ -93,7 +84,7 @@ in { }; fadeSteps = mkOption { - type = pairOf (floatBetween 0.01 1); + type = pairOf (types.numbers.between 0.01 1); default = [ 0.028 0.03 ]; example = [ 0.04 0.04 ]; description = lib.mdDoc '' @@ -133,7 +124,7 @@ in { }; shadowOpacity = mkOption { - type = floatBetween 0 1; + type = types.numbers.between 0 1; default = 0.75; example = 0.8; description = lib.mdDoc '' @@ -156,7 +147,7 @@ in { }; activeOpacity = mkOption { - type = floatBetween 0 1; + type = types.numbers.between 0 1; default = 1.0; example = 0.8; description = lib.mdDoc '' @@ -165,7 +156,7 @@ in { }; inactiveOpacity = mkOption { - type = floatBetween 0.1 1; + type = types.numbers.between 0.1 1; default = 1.0; example = 0.8; description = lib.mdDoc '' @@ -174,7 +165,7 @@ in { }; menuOpacity = mkOption { - type = floatBetween 0 1; + type = types.numbers.between 0 1; default = 1.0; example = 0.8; description = lib.mdDoc '' diff --git a/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix b/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix index a076ea24a4..38f8b6fd87 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix @@ -148,6 +148,7 @@ let + optionalString dev.bypassWorkqueues " --perf-no_read_workqueue --perf-no_write_workqueue" + optionalString (dev.header != null) " --header=${dev.header}"; cschange = "cryptsetup luksChangeKey ${dev.device} ${optionalString (dev.header != null) "--header=${dev.header}"}"; + fido2luksCredentials = dev.fido2.credentials ++ optional (dev.fido2.credential != null) dev.fido2.credential; in '' # Wait for luksRoot (and optionally keyFile and/or header) to appear, e.g. # if on a USB drive. @@ -417,7 +418,7 @@ let } ''} - ${optionalString (luks.fido2Support && (dev.fido2.credential != null)) '' + ${optionalString (luks.fido2Support && fido2luksCredentials != []) '' open_with_hardware() { local passsphrase @@ -433,7 +434,7 @@ let echo "Please move your mouse to create needed randomness." ''} echo "Waiting for your FIDO2 device..." - fido2luks open${optionalString dev.allowDiscards " --allow-discards"} ${dev.device} ${dev.name} ${dev.fido2.credential} --await-dev ${toString dev.fido2.gracePeriod} --salt string:$passphrase + fido2luks open${optionalString dev.allowDiscards " --allow-discards"} ${dev.device} ${dev.name} "${builtins.concatStringsSep "," fido2luksCredentials}" --await-dev ${toString dev.fido2.gracePeriod} --salt string:$passphrase if [ $? -ne 0 ]; then echo "No FIDO2 key found, falling back to normal open procedure" open_normally @@ -444,7 +445,7 @@ let # commands to run right before we mount our device ${dev.preOpenCommands} - ${if (luks.yubikeySupport && (dev.yubikey != null)) || (luks.gpgSupport && (dev.gpgCard != null)) || (luks.fido2Support && (dev.fido2.credential != null)) then '' + ${if (luks.yubikeySupport && (dev.yubikey != null)) || (luks.gpgSupport && (dev.gpgCard != null)) || (luks.fido2Support && fido2luksCredentials != []) then '' open_with_hardware '' else '' open_normally @@ -695,6 +696,17 @@ in description = lib.mdDoc "The FIDO2 credential ID."; }; + credentials = mkOption { + default = []; + example = [ "f1d00200d8dc783f7fb1e10ace8da27f8312d72692abfca2f7e4960a73f48e82e1f7571f6ebfcee9fb434f9886ccc8fcc52a6614d8d2" ]; + type = types.listOf types.str; + description = lib.mdDoc '' + List of FIDO2 credential IDs. + + Use this if you have multiple FIDO2 keys you want to use for the same luks device. + ''; + }; + gracePeriod = mkOption { default = 10; type = types.int; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix index 0b38a94c25..cb60117f0e 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix @@ -1257,11 +1257,10 @@ let default = {}; example = { Route = "fd00::/64"; }; type = types.addCheck (types.attrsOf unitOption) check.network.sectionIPv6RoutePrefix; - description = '' + description = lib.mdDoc '' Each attribute in this set specifies an option in the - [IPv6RoutePrefix] section of the unit. See - systemd.network - 5 for details. + `[IPv6RoutePrefix]` section of the unit. See + {manpage}`systemd.network(5)` for details. ''; }; }; @@ -1411,12 +1410,11 @@ let ipv6RoutePrefixes = mkOption { default = []; - example = [ { Route = "fd00::/64"; LifetimeSec = 3600; } ]; + example = [ { ipv6RoutePrefixConfig = { Route = "fd00::/64"; LifetimeSec = 3600; }; } ]; type = with types; listOf (submodule ipv6RoutePrefixOptions); - description = '' + description = lib.mdDoc '' A list of ipv6RoutePrefix sections to be added to the unit. See - systemd.network - 5 for details. + {manpage}`systemd.network(5)` for details. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix index 0207bfba82..edc6dfdc15 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix @@ -584,7 +584,7 @@ in example = literalExpression '' import pkgs.path { system = "x86_64-darwin"; } ''; - description = '' + description = lib.mdDoc '' pkgs set to use for the host-specific packages of the vm runner. Changing this to e.g. a Darwin package set allows running NixOS VMs on Darwin. ''; diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index f3cde7e23a..230ad47f3b 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -189,6 +189,7 @@ in { gobgpd = handleTest ./gobgpd.nix {}; gocd-agent = handleTest ./gocd-agent.nix {}; gocd-server = handleTest ./gocd-server.nix {}; + gollum = handleTest ./gollum.nix {}; google-oslogin = handleTest ./google-oslogin {}; gotify-server = handleTest ./gotify-server.nix {}; grafana = handleTest ./grafana.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/gitea.nix b/third_party/nixpkgs/nixos/tests/gitea.nix index 037fc7b31b..68a2566c11 100644 --- a/third_party/nixpkgs/nixos/tests/gitea.nix +++ b/third_party/nixpkgs/nixos/tests/gitea.nix @@ -18,7 +18,7 @@ let services.gitea = { enable = true; database = { inherit type; }; - disableRegistration = true; + settings.service.DISABLE_REGISTRATION = true; }; environment.systemPackages = [ pkgs.gitea pkgs.jq ]; services.openssh.enable = true; diff --git a/third_party/nixpkgs/nixos/tests/gollum.nix b/third_party/nixpkgs/nixos/tests/gollum.nix new file mode 100644 index 0000000000..833db87f2f --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/gollum.nix @@ -0,0 +1,14 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "gollum"; + + nodes = { + webserver = { pkgs, lib, ... }: { + services.gollum.enable = true; + }; + }; + + testScript = { nodes, ... }: '' + webserver.wait_for_unit("gollum") + webserver.wait_for_open_port(${toString nodes.webserver.config.services.gollum.port}) + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix b/third_party/nixpkgs/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix index fda05bacb4..93e655c305 100644 --- a/third_party/nixpkgs/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix +++ b/third_party/nixpkgs/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix @@ -47,9 +47,8 @@ in { }; }; - services.redis = { - enable = true; - }; + services.redis.servers."nextcloud".enable = true; + services.redis.servers."nextcloud".port = 6379; systemd.services.nextcloud-setup= { requires = ["postgresql.service"]; diff --git a/third_party/nixpkgs/nixos/tests/nextcloud/with-postgresql-and-redis.nix b/third_party/nixpkgs/nixos/tests/nextcloud/with-postgresql-and-redis.nix index 36a69fda50..1ef848cfb1 100644 --- a/third_party/nixpkgs/nixos/tests/nextcloud/with-postgresql-and-redis.nix +++ b/third_party/nixpkgs/nixos/tests/nextcloud/with-postgresql-and-redis.nix @@ -37,9 +37,8 @@ in { }; }; - services.redis = { - enable = true; - }; + services.redis.servers."nextcloud".enable = true; + services.redis.servers."nextcloud".port = 6379; systemd.services.nextcloud-setup= { requires = ["postgresql.service"]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/miniplayer/default.nix b/third_party/nixpkgs/pkgs/applications/audio/miniplayer/default.nix new file mode 100644 index 0000000000..b808bfb8b2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/miniplayer/default.nix @@ -0,0 +1,35 @@ +{ lib +, python3Packages +}: + +with python3Packages; + +buildPythonApplication rec { + pname = "miniplayer"; + version = "1.7.0"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-JUlUFj/5DOTLa1XCZX/9Nj3Z9W+k4gnpJONiS4qNBIU="; + }; + + propagatedBuildInputs = [ + colorthief + ffmpeg-python + mpd2 + pillow + pixcat + requests + ueberzug + ]; + + # pythonImportsCheck is disabled because this package doesn't expose any modules. + + meta = with lib; { + description = "A curses-based MPD client with basic functionality that can also display an album art"; + homepage = "https://github.com/GuardKenzie/miniplayer"; + license = licenses.mit; + maintainers = with maintainers; [ azahi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/quodlibet/default.nix b/third_party/nixpkgs/pkgs/applications/audio/quodlibet/default.nix index 49b320703d..c5f02d7085 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/quodlibet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/quodlibet/default.nix @@ -1,66 +1,168 @@ -{ lib, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome, gtk3, gdk-pixbuf, librsvg, - tag ? "", xvfb-run, dbus, glibcLocales, glib, glib-networking, gobject-introspection, hicolor-icon-theme, - gst_all_1, withGstPlugins ? true, - xineBackend ? false, xine-lib, - withDbusPython ? false, withPyInotify ? false, withMusicBrainzNgs ? false, withPahoMqtt ? false, - webkitgtk ? null, - keybinder3 ? null, gtksourceview ? null, libmodplug ? null, kakasi ? null, libappindicator-gtk3 ? null }: +{ lib +, fetchFromGitHub +, fetchpatch +, tag ? "" + +# build time +, gettext +, gobject-introspection +, wrapGAppsHook + +# runtime +, adwaita-icon-theme +, gdk-pixbuf +, glib +, glib-networking +, gtk3 +, gtksourceview +, kakasi +, keybinder3 +, libappindicator-gtk3 +, libmodplug +, librsvg +, libsoup +, webkitgtk + +# optional features +, withDbusPython ? false +, withPypresence ? false +, withPyInotify ? false +, withMusicBrainzNgs ? false +, withPahoMqtt ? false +, withSoco ? false + +# backends +, withGstreamerBackend ? true, gst_all_1 +, withGstPlugins ? withGstreamerBackend +, withXineBackend ? true, xine-lib + +# tests +, dbus +, glibcLocales +, hicolor-icon-theme +, python3 +, xvfb-run +}: -let optionals = lib.optionals; in python3.pkgs.buildPythonApplication rec { pname = "quodlibet${tag}"; version = "4.5.0"; + format = "pyproject"; - src = fetchurl { - url = "https://github.com/quodlibet/quodlibet/releases/download/release-${version}/quodlibet-${version}.tar.gz"; - sha256 = "sha256-MBYVgp9lLLr+2zVTkjcWKli8HucaVn0kn3eJ2SaCRbw="; + src = fetchFromGitHub { + owner = "quodlibet"; + repo = "quodlibet"; + rev = "refs/tags/release-${version}"; + hash = "sha256-G6zcdnHkevbVCrMoseWoSia5ajEor8nZhee6NeZIs8Q="; }; - nativeBuildInputs = [ wrapGAppsHook gettext ]; + patches = [ + (fetchpatch { + # Fixes cover globbing under python 3.10.5+ + url = "https://github.com/quodlibet/quodlibet/commit/5eb7c30766e1dcb30663907664855ee94a3accc0.patch"; + hash = "sha256-bDyEOE7Vs4df4BeN4QMvt6niisVEpvc1onmX5rtoAWc="; + }) + ]; - checkInputs = [ gdk-pixbuf hicolor-icon-theme ] ++ (with python3.pkgs; [ pytest pytest-xdist polib xvfb-run dbus.daemon glibcLocales ]); + outputs = [ + "out" + "doc" + ]; - buildInputs = [ gnome.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk-pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ] - ++ (if xineBackend then [ xine-lib ] else with gst_all_1; - [ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]); + nativeBuildInputs = [ + gettext + gobject-introspection + wrapGAppsHook + ] ++ (with python3.pkgs; [ + sphinxHook + sphinx-rtd-theme + ]); - propagatedBuildInputs = with python3.pkgs; [ pygobject3 pycairo mutagen gst-python feedparser ] - ++ optionals withDbusPython [ dbus-python ] - ++ optionals withPyInotify [ pyinotify ] - ++ optionals withMusicBrainzNgs [ musicbrainzngs ] - ++ optionals withPahoMqtt [ paho-mqtt ]; + buildInputs = [ + adwaita-icon-theme + gdk-pixbuf + glib + glib-networking + gtk3 + gtksourceview + kakasi + keybinder3 + libappindicator-gtk3 + libmodplug + libsoup + webkitgtk + ] ++ lib.optionals (withXineBackend) [ + xine-lib + ] ++ lib.optionals (withGstreamerBackend) (with gst_all_1; [ + gst-plugins-base + gstreamer + ] ++ lib.optionals (withGstPlugins) [ + gst-plugins-bad + gst-plugins-good + gst-plugins-ugly + ]); + + propagatedBuildInputs = with python3.pkgs; [ + feedparser + gst-python + mutagen + pycairo + pygobject3 + ] + ++ lib.optionals withDbusPython [ dbus-python ] + ++ lib.optionals withPypresence [ pypresence ] + ++ lib.optionals withPyInotify [ pyinotify ] + ++ lib.optionals withMusicBrainzNgs [ musicbrainzngs ] + ++ lib.optionals withPahoMqtt [ paho-mqtt ] + ++ lib.optionals withSoco [ soco ]; LC_ALL = "en_US.UTF-8"; - pytestFlags = lib.optionals (xineBackend || !withGstPlugins) [ - "--ignore=tests/plugin/test_replaygain.py" - ] ++ [ + checkInputs = [ + dbus.daemon + gdk-pixbuf + glibcLocales + hicolor-icon-theme + xvfb-run + ] ++ (with python3.pkgs; [ + polib + pytest + pytest-xdist + ]); + + pytestFlags = [ # requires networking - "--ignore=tests/test_browsers_iradio.py" - # the default theme doesn't have the required icons - "--ignore=tests/plugin/test_trayicon.py" + "--deselect=tests/test_browsers_iradio.py::TIRFile::test_download_tags" + # missing translation strings in potfiles + "--deselect=tests/test_po.py::TPOTFILESIN::test_missing" # upstream does actually not enforce source code linting "--ignore=tests/quality" # build failure on Arch Linux # https://github.com/NixOS/nixpkgs/pull/77796#issuecomment-575841355 "--ignore=tests/test_operon.py" + ] ++ lib.optionals (withXineBackend || !withGstPlugins) [ + "--ignore=tests/plugin/test_replaygain.py" ]; + preCheck = '' + export XDG_DATA_DIRS="$out/share:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_ICON_DIRS:$XDG_DATA_DIRS" + export GDK_PIXBUF_MODULE_FILE=${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache + export HOME=$(mktemp -d) + ''; + checkPhase = '' runHook preCheck - # otherwise tests can't find the app icons; instead of creating index.theme from scratch - # I re-used the one from hicolor-icon-theme which seems to work - cp "${hicolor-icon-theme}/share/icons/hicolor/index.theme" quodlibet/images/hicolor - env XDG_DATA_DIRS="$out/share:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_ICON_DIRS:$XDG_DATA_DIRS" \ - GDK_PIXBUF_MODULE_FILE=${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ - HOME=$(mktemp -d) \ - xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ - py.test $pytestFlags + + xvfb-run -s '-screen 0 1920x1080x24' \ + dbus-run-session --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + pytest $pytestFlags + runHook postCheck ''; - preFixup = lib.optionalString (kakasi != null) "gappsWrapperArgs+=(--prefix PATH : ${kakasi}/bin)"; + preFixup = lib.optionalString (kakasi != null) '' + gappsWrapperArgs+=(--prefix PATH : ${kakasi}/bin) + ''; meta = with lib; { description = "GTK-based audio player written in Python, using the Mutagen tagging library"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/tageditor/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tageditor/default.nix index 320a26b817..46f7544215 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/tageditor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/tageditor/default.nix @@ -1,9 +1,8 @@ { stdenv -, pkgs +, lib , fetchFromGitHub , pkg-config , cmake - , cpp-utilities , qtutilities , mp4v2 @@ -18,13 +17,13 @@ stdenv.mkDerivation rec { pname = "tageditor"; - version = "3.3.10"; + version = "3.7.5"; src = fetchFromGitHub { owner = "martchus"; - repo = "tageditor"; + repo = pname; rev = "v${version}"; - sha256 = "16cmq7dyalcwc8gx1y9acngw5imjh8ydp4prxy7qpzk4fj3kpsak"; + hash = "sha256-/0zzzOEkzNr1aIpPFdflFaM/0HTs3TlIRxau3Yt+Hog="; }; nativeBuildInputs = [ @@ -32,10 +31,10 @@ stdenv.mkDerivation rec { cmake wrapQtAppsHook ]; + buildInputs = [ mp4v2 libid3tag - pkg-config qtbase qttools qtx11extras @@ -45,7 +44,7 @@ stdenv.mkDerivation rec { tagparser ]; - meta = with pkgs.lib; { + meta = with lib; { homepage = "https://github.com/Martchus/tageditor"; description = "A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska"; license = licenses.gpl2; @@ -53,4 +52,3 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } - diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bisq-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/bisq-desktop/default.nix index f7d186ffea..9ac34e61b2 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/bisq-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/bisq-desktop/default.nix @@ -34,11 +34,11 @@ let in stdenv.mkDerivation rec { pname = "bisq-desktop"; - version = "1.9.4"; + version = "1.9.5"; src = fetchurl { url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb"; - sha256 = "sha256-8CgbJ5gfzIEh5ppwvQxYz1IES7Dd4MZCac0uVLh/YaY="; + sha256 = "1jmhngxyn2yf7k1dn98yr9d20jlvkmskbpzz5kbzci36v2wfmjrp"; }; nativeBuildInputs = [ makeWrapper copyDesktopItems imagemagick dpkg zip xz ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 7e84dd4389..10c95a91ed 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.46.0"; + version = "2.46.2"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-QbCiOzASqicd0Tns1sV9ZVoc/GmuoohB9wB/g0Z6uFA="; + hash = "sha256-fSfES+6+LCRTLdOy3RJaHzv0zRXkqT+0Rsdt2kSeU18="; }; appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index dd91eff370..9a22dbb683 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -159,10 +159,10 @@ elpaBuild { pname = "aircon-theme"; ename = "aircon-theme"; - version = "0.0.5"; + version = "0.0.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/aircon-theme-0.0.5.tar"; - sha256 = "0k9nsm64szi2hvngx9ciyjn8ic9qprfm3gmwp33f0kakq05ykpd1"; + url = "https://elpa.gnu.org/packages/aircon-theme-0.0.6.tar"; + sha256 = "09yjjx9gy1x2i8xk7jlblzk6gkx7cgglb0pwxbl8n6aj19ba40nd"; }; packageRequires = [ emacs ]; meta = { @@ -234,10 +234,10 @@ elpaBuild { pname = "async"; ename = "async"; - version = "1.9.5"; + version = "1.9.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/async-1.9.5.tar"; - sha256 = "02f43vqlggy4qkqdggkl9mcg3rvagjysj45xgrx41jjx6cnjnm19"; + url = "https://elpa.gnu.org/packages/async-1.9.6.tar"; + sha256 = "0qyf1niqjhzaphb50q1znkwqzpdvqw3drivkzrqxrs747k7pm3my"; }; packageRequires = [ emacs ]; meta = { @@ -249,10 +249,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "13.1.3"; + version = "13.1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-13.1.3.tar"; - sha256 = "0v9rxwz6ngnwrgvzgdki861s136gq30lqhy2gcd9q0a36gb6zhwk"; + url = "https://elpa.gnu.org/packages/auctex-13.1.4.tar"; + sha256 = "1r9qysnfdbiblq3c95rgsh7vgy3k4qabnj0vicqhdkca0cl2b2bj"; }; packageRequires = [ emacs ]; meta = { @@ -354,10 +354,10 @@ elpaBuild { pname = "blist"; ename = "blist"; - version = "0.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/blist-0.1.tar"; - sha256 = "0p9jx7m05ynfi3bnd91jghw7101ym8qzm5r42rb1vy85pcf9lbad"; + url = "https://elpa.gnu.org/packages/blist-0.2.tar"; + sha256 = "1gsrj6clsfw36i7pdayfip615r80543j3iph6zm93p88wgwqigrq"; }; packageRequires = []; meta = { @@ -493,10 +493,10 @@ elpaBuild { pname = "cape"; ename = "cape"; - version = "0.8"; + version = "0.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/cape-0.8.tar"; - sha256 = "03zc1c2r8h3p9aqk2y8pwysiawbx0f5vgz7582d9qnixdygni117"; + url = "https://elpa.gnu.org/packages/cape-0.9.tar"; + sha256 = "0bjzm1jf3554q83mbmyj584v29cgb0s5wpj74y4p9iyy40g739rw"; }; packageRequires = [ emacs ]; meta = { @@ -628,10 +628,10 @@ elpaBuild { pname = "cobol-mode"; ename = "cobol-mode"; - version = "1.0.0"; + version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/cobol-mode-1.0.0.el"; - sha256 = "1zmcfpl7v787yacc7gxm8mkp53fmrznp5mnad628phf3vj4kwnxi"; + url = "https://elpa.gnu.org/packages/cobol-mode-1.1.tar"; + sha256 = "1ivp0pghrkflhr2md34a6a86gwns867bnl30nqzwq8m4qc5xqjra"; }; packageRequires = [ cl-lib ]; meta = { @@ -771,10 +771,10 @@ elpaBuild { pname = "compat"; ename = "compat"; - version = "28.1.2.0"; + version = "28.1.2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/compat-28.1.2.0.tar"; - sha256 = "0gm2drvxdlmc3fjlapb5z8k1ymr6q7mrj9z7mb686jfy931b9mwr"; + url = "https://elpa.gnu.org/packages/compat-28.1.2.2.tar"; + sha256 = "1jymfbadvnbjfyml6lri7hc7gz4f97nadn7a7ifpcncm9mhi13bp"; }; packageRequires = [ emacs nadvice ]; meta = { @@ -786,10 +786,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "0.18"; + version = "0.19"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-0.18.tar"; - sha256 = "0nvi8f0jrji26sjmji8f7rvc8gr1zq49kliq39z7h970d8p10cx2"; + url = "https://elpa.gnu.org/packages/consult-0.19.tar"; + sha256 = "11dac6cl40xyg05wzxanxsc74f1kgnnkqlgf5gqlkq24gwmlgvyk"; }; packageRequires = [ compat emacs ]; meta = { @@ -801,10 +801,10 @@ elpaBuild { pname = "consult-recoll"; ename = "consult-recoll"; - version = "0.6.2"; + version = "0.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-recoll-0.6.2.tar"; - sha256 = "0ngisaxdsfmjcincxdjrpgj6q6vh4dav7b2bpfls9a7107rb2ycp"; + url = "https://elpa.gnu.org/packages/consult-recoll-0.7.tar"; + sha256 = "12a1qhp7yz6r5pblm68wp1zis0xnvsn2rm12rz9fircq8p3ff3j7"; }; packageRequires = [ consult emacs ]; meta = { @@ -831,10 +831,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.26"; + version = "0.27"; src = fetchurl { - url = "https://elpa.gnu.org/packages/corfu-0.26.tar"; - sha256 = "13wsb0llrnmk65m27drnyaqzv9qicnxbpvqcanj0k90iv411kw21"; + url = "https://elpa.gnu.org/packages/corfu-0.27.tar"; + sha256 = "1i8nl94aaa5p4bp0idsmph3z61lccg9a7plbsnpicy0klsaj69r2"; }; packageRequires = [ emacs ]; meta = { @@ -842,16 +842,16 @@ license = lib.licenses.free; }; }) {}; - coterm = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + coterm = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "coterm"; ename = "coterm"; - version = "1.5"; + version = "1.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/coterm-1.5.tar"; - sha256 = "1v8cl3bw5z0f36iw8x3gcgiizml74m1kfxfrasyfx8k01nbxcfs8"; + url = "https://elpa.gnu.org/packages/coterm-1.6.tar"; + sha256 = "0ikfm1acdsckflv1hcy9lmssyac2099x2yybhvb6vkghcgy99p00"; }; - packageRequires = [ emacs ]; + packageRequires = [ compat emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/coterm.html"; license = lib.licenses.free; @@ -906,10 +906,10 @@ elpaBuild { pname = "crdt"; ename = "crdt"; - version = "0.3.0"; + version = "0.3.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/crdt-0.3.0.tar"; - sha256 = "0fmrmpjqyzxcmx38kwl6mifq412qfgm9ak7j4f54j33kbp10hjj7"; + url = "https://elpa.gnu.org/packages/crdt-0.3.3.tar"; + sha256 = "12xdqdp4zwd163wc19cjakabgjyzm4l4xg4bns6q1p60zgynbkx8"; }; packageRequires = []; meta = { @@ -966,10 +966,10 @@ elpaBuild { pname = "cursory"; ename = "cursory"; - version = "0.2.1"; + version = "0.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/cursory-0.2.1.tar"; - sha256 = "12q1icz1npan9fjn0sy2zfs3d0iz6b34hqsfggm187igq4zj3rrb"; + url = "https://elpa.gnu.org/packages/cursory-0.3.0.tar"; + sha256 = "1mgvdncqgf0ll2mn5zp47lvvbzrzgdga9dbbjwqaapzy6llfg51x"; }; packageRequires = [ emacs ]; meta = { @@ -1041,10 +1041,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.32"; + version = "0.33"; src = fetchurl { - url = "https://elpa.gnu.org/packages/debbugs-0.32.tar"; - sha256 = "1xp3mj3ndaljma0g7x9abziphgi2a6j8k1v52sb8xwgn4p5gdvby"; + url = "https://elpa.gnu.org/packages/debbugs-0.33.tar"; + sha256 = "1s4p3jf9yrm8pn5pljpkrw05n2p9v6fpl141rh1df7f7l0w80qbk"; }; packageRequires = [ emacs soap-client ]; meta = { @@ -1071,10 +1071,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "0.4.0"; + version = "0.6.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/denote-0.4.0.tar"; - sha256 = "031ia1k5fqzq154jhi4icvivhdg8yn7zfkwy81yf0ivcsivri54s"; + url = "https://elpa.gnu.org/packages/denote-0.6.1.tar"; + sha256 = "1yxfnwq2b32xrl52g61a9g3i53m94iybx0n8hh6nbmcv5x4y43ya"; }; packageRequires = [ emacs ]; meta = { @@ -1086,10 +1086,10 @@ elpaBuild { pname = "detached"; ename = "detached"; - version = "0.7"; + version = "0.8.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/detached-0.7.tar"; - sha256 = "1a2w6cmzy7c861rih9k2qbnmizyybrs1kwqp6lbz3wfs2h0zisrw"; + url = "https://elpa.gnu.org/packages/detached-0.8.1.tar"; + sha256 = "03riybjk2yls8wjkp1sqd30p0jpvrlz3qlj8r04cx7s1nn1kn9g3"; }; packageRequires = [ emacs ]; meta = { @@ -1131,10 +1131,10 @@ elpaBuild { pname = "diff-hl"; ename = "diff-hl"; - version = "1.8.8"; + version = "1.9.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/diff-hl-1.8.8.tar"; - sha256 = "10g1333xvki8aw5vhyijkpjn62jh9k3n4a5sh1z69hsfvxih5lqk"; + url = "https://elpa.gnu.org/packages/diff-hl-1.9.0.tar"; + sha256 = "00mqknqyibbqyfcvdvk1m7nwipfpsw3afbvipqmghh5zm2n7wjr4"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1386,10 +1386,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20220626"; + version = "20220828"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20220626.tar"; - sha256 = "0n09dws1qy23a31s5iv75dzl6xy8m5m7qy9gf7sk1b3133ly4sf5"; + url = "https://elpa.gnu.org/packages/eev-20220828.tar"; + sha256 = "0znsimjq61p67c2q3qbia5qrimy847xy6gjpl1jgyrdlpgm9hv6r"; }; packageRequires = [ emacs ]; meta = { @@ -1397,6 +1397,21 @@ license = lib.licenses.free; }; }) {}; + ef-themes = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "ef-themes"; + ename = "ef-themes"; + version = "0.4.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ef-themes-0.4.2.tar"; + sha256 = "0ik9kzdv5r1q7hw81nh3raiychpmwi61034y12pqvbq24njp0y72"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ef-themes.html"; + license = lib.licenses.free; + }; + }) {}; eglot = callPackage ({ eldoc , elpaBuild , emacs @@ -1535,6 +1550,38 @@ license = lib.licenses.free; }; }) {}; + ement = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib + , map + , plz + , svg-lib + , taxy + , taxy-magit-section + , transient }: + elpaBuild { + pname = "ement"; + ename = "ement"; + version = "0.1.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ement-0.1.2.tar"; + sha256 = "1n5k3rcgdq625b9fjhl53nl5zbis4dw0d00h4dk16m61nk98ra2l"; + }; + packageRequires = [ + emacs + map + plz + svg-lib + taxy + taxy-magit-section + transient + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ement.html"; + license = lib.licenses.free; + }; + }) {}; emms = callPackage ({ cl-lib ? null , elpaBuild , fetchurl @@ -1774,10 +1821,10 @@ elpaBuild { pname = "fontaine"; ename = "fontaine"; - version = "0.3.0"; + version = "0.4.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/fontaine-0.3.0.tar"; - sha256 = "0ixi48w3d0yvmw1103gj7iq2acj90p0qlyhna4hpfhnwa247lp2k"; + url = "https://elpa.gnu.org/packages/fontaine-0.4.0.tar"; + sha256 = "1phbni32zgwml5mwldbqmqmkbhbdj4vf4bs98wj0my6d902x6lbw"; }; packageRequires = [ emacs ]; meta = { @@ -2208,10 +2255,10 @@ elpaBuild { pname = "inspector"; ename = "inspector"; - version = "0.5"; + version = "0.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/inspector-0.5.tar"; - sha256 = "19f2a0fw0zcrfirjhq7my910jiqxqkishyjprj87cahpksdp4cp9"; + url = "https://elpa.gnu.org/packages/inspector-0.7.tar"; + sha256 = "0cwfbg7bx4ni0xadba9v5jbkivz2slqwxcy7q8s3zipb4m578xbk"; }; packageRequires = [ emacs ]; meta = { @@ -2438,10 +2485,10 @@ elpaBuild { pname = "kind-icon"; ename = "kind-icon"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/kind-icon-0.1.6.tar"; - sha256 = "0ac53qrz217b054z51244r7whvjmyrq4941ld0bgl9crssrhb588"; + url = "https://elpa.gnu.org/packages/kind-icon-0.1.7.tar"; + sha256 = "02imi2qj329yrqvs23d4z7fv8bbaz0fvya6zdswb38blpdri4cn1"; }; packageRequires = [ emacs svg-lib ]; meta = { @@ -2543,10 +2590,10 @@ elpaBuild { pname = "lin"; ename = "lin"; - version = "0.4.0"; + version = "1.0.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/lin-0.4.0.tar"; - sha256 = "1fynn3fpf3c2yamlpp9j6rakgd21ivyvqrx0hmsgcyr115q5afm4"; + url = "https://elpa.gnu.org/packages/lin-1.0.0.tar"; + sha256 = "0b090g2l8mvm3b6k7s31v9lw48qjcvcif2p201wlqgipddm6s180"; }; packageRequires = [ emacs ]; meta = { @@ -2633,10 +2680,10 @@ elpaBuild { pname = "logos"; ename = "logos"; - version = "0.4.0"; + version = "0.5.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/logos-0.4.0.tar"; - sha256 = "12yypzfd6lf71qyix0a1088vkamh9ilq8inpmv2882w3r5dii345"; + url = "https://elpa.gnu.org/packages/logos-0.5.0.tar"; + sha256 = "026nzkgkfs96m9qxpng7h0kqvhxfah883pv4i08fz0950lrsxynd"; }; packageRequires = [ emacs ]; meta = { @@ -2663,10 +2710,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "0.13"; + version = "0.14"; src = fetchurl { - url = "https://elpa.gnu.org/packages/marginalia-0.13.tar"; - sha256 = "1d5y3d2plkxnmm4458l0gfpim6q3vzps3bsfakvnzf86hh5nm77j"; + url = "https://elpa.gnu.org/packages/marginalia-0.14.tar"; + sha256 = "0y1mz9688h56knyly7by3gl6v37q437c3lp5bsx6jajysb8v69xw"; }; packageRequires = [ emacs ]; meta = { @@ -2693,10 +2740,10 @@ elpaBuild { pname = "math-symbol-lists"; ename = "math-symbol-lists"; - version = "1.2.1"; + version = "1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/math-symbol-lists-1.2.1.el"; - sha256 = "015q44qg9snrpz04syz89f9f79pzg5h7w88nh84p38klynkx2f86"; + url = "https://elpa.gnu.org/packages/math-symbol-lists-1.3.tar"; + sha256 = "0h330j7vxmb56z66xgynqlxkr5bnp5id25j0w4ikyms407sdyrbs"; }; packageRequires = []; meta = { @@ -2862,10 +2909,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-themes-2.5.0.tar"; - sha256 = "0j2mx47fpbqvpwhkdskgrnyj5nzg25sqgxwsdvrvw22c7gxhirxn"; + url = "https://elpa.gnu.org/packages/modus-themes-2.6.0.tar"; + sha256 = "0i4y69rrdcm64mvqs5z7dmgx1xk0x7g5978q5gjblczlfka444k4"; }; packageRequires = [ emacs ]; meta = { @@ -3130,10 +3177,10 @@ elpaBuild { pname = "num3-mode"; ename = "num3-mode"; - version = "1.4"; + version = "1.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/num3-mode-1.4.tar"; - sha256 = "01cl5wc5xzf4milq6r5ps2f4ikpkdbdidk880svby9mhiw6agydh"; + url = "https://elpa.gnu.org/packages/num3-mode-1.5.tar"; + sha256 = "0i01v0sl0wi98xvc3wkk2lwc3nxmnhhpyrhr9gn88x5ygc0p4rdw"; }; packageRequires = []; meta = { @@ -3235,10 +3282,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.5.4"; + version = "9.5.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.5.4.tar"; - sha256 = "1rcr1kyvd2l5h1i22z40x998jm4b6vk47i77y376blcrcx2dp26m"; + url = "https://elpa.gnu.org/packages/org-9.5.5.tar"; + sha256 = "13sykrkhb192vnmj5nlws5jc5a4fr7ynmyxpzanqlzx1gbdxv32p"; }; packageRequires = [ emacs ]; meta = { @@ -3655,10 +3702,10 @@ elpaBuild { pname = "pulsar"; ename = "pulsar"; - version = "0.4.0"; + version = "0.5.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pulsar-0.4.0.tar"; - sha256 = "027kpywdjfd1xm1fxkprbc04iq96lnyzw2f3499wyrfj4vxk2dn2"; + url = "https://elpa.gnu.org/packages/pulsar-0.5.0.tar"; + sha256 = "1bs6f8j1a7vypwm087zsrccv5kbahxyg3nhc65ffgpwrnxfp4v96"; }; packageRequires = [ emacs ]; meta = { @@ -3670,10 +3717,10 @@ elpaBuild { pname = "pyim"; ename = "pyim"; - version = "5.2.3"; + version = "5.2.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pyim-5.2.3.tar"; - sha256 = "189r0qkd8nv5zjg2ljbzbj086jb8xbl4yd1jliz4azaprv8fhqv0"; + url = "https://elpa.gnu.org/packages/pyim-5.2.4.tar"; + sha256 = "1dzl4xaf31nyjb5hnwwf29i75x0i8dakpmmagbn4ks5hi3jl2ig0"; }; packageRequires = [ async emacs xr ]; meta = { @@ -4181,10 +4228,10 @@ elpaBuild { pname = "shell-command-plus"; ename = "shell-command+"; - version = "2.3.2"; + version = "2.4.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/shell-command+-2.3.2.tar"; - sha256 = "03hmk4gr9kjy3238n0ys9na00py035j9s0y8d87c45f5af6c6g2c"; + url = "https://elpa.gnu.org/packages/shell-command+-2.4.1.tar"; + sha256 = "1pbv5g58647gq83vn5pg8c6kjhvjn3lj0wggz3iz3695yvl8aw4i"; }; packageRequires = [ emacs ]; meta = { @@ -4730,14 +4777,29 @@ license = lib.licenses.free; }; }) {}; + topspace = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "topspace"; + ename = "topspace"; + version = "0.3.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/topspace-0.3.1.tar"; + sha256 = "1c2raqmbyv5bd48gimh6dazfb6dmipjmf1j0w53vyrs48dx6kskq"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/topspace.html"; + license = lib.licenses.free; + }; + }) {}; tramp = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.5.3.1"; + version = "2.5.3.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.5.3.1.tar"; - sha256 = "0dqc5gmp20isrlanccvj6nhalmmsfg7bmm690gxfgrbqcc2vj69a"; + url = "https://elpa.gnu.org/packages/tramp-2.5.3.2.tar"; + sha256 = "1jcicb9f7c1nmaqg20yy2j4wd0qfch4llc26ga7q3ckhx41pvbiw"; }; packageRequires = [ emacs ]; meta = { @@ -5045,10 +5107,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "0.25"; + version = "0.26"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-0.25.tar"; - sha256 = "1v0icwqp4ppa2j1k1fk4fc5zdzqb4hcdc7khjc1c31q0gad6l3xy"; + url = "https://elpa.gnu.org/packages/vertico-0.26.tar"; + sha256 = "070dkw7ii5lfg4m0bwl9blbyq3rgqs212my142ri69ig1fz9x5ad"; }; packageRequires = [ emacs ]; meta = { @@ -5462,4 +5524,19 @@ license = lib.licenses.free; }; }) {}; + zuul = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }: + elpaBuild { + pname = "zuul"; + ename = "zuul"; + version = "0.4.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/zuul-0.4.0.tar"; + sha256 = "1bm91g001q3n5m9ihxc719siiiy23pkpfkhplwi9p1i4i9zrpx5g"; + }; + packageRequires = [ emacs project ]; + meta = { + homepage = "https://elpa.gnu.org/packages/zuul.html"; + license = lib.licenses.free; + }; + }) {}; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index ec3eeaf7fd..b312c17d9a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -232,6 +232,8 @@ tree-sitter-langs = callPackage ./tree-sitter-langs { final = self; }; tsc = callPackage ./tsc { }; + yes-no = callPackage ./yes-no { }; + youtube-dl = callPackage ./youtube-dl { }; # From old emacsPackages (pre emacsPackagesNg) diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index 07ffad496c..05b70b5728 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -135,21 +135,16 @@ license = lib.licenses.free; }; }) {}; - autothemer = callPackage ({ cl-lib ? null - , dash - , elpaBuild - , emacs - , fetchurl - , lib }: + autothemer = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "autothemer"; ename = "autothemer"; - version = "0.2.5"; + version = "0.2.14"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/autothemer-0.2.5.tar"; - sha256 = "1g07j8fmyqhhas0ci2f9l7i5l238cpb02vr93gyn2a3r3lq6wn4d"; + url = "https://elpa.nongnu.org/nongnu/autothemer-0.2.14.tar"; + sha256 = "14y8b807d75qym1qviiqy1s85495z9g7jvvfqqz42ngdnk87l3qb"; }; - packageRequires = [ cl-lib dash emacs ]; + packageRequires = [ dash emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/autothemer.html"; license = lib.licenses.free; @@ -219,10 +214,10 @@ elpaBuild { pname = "buttercup"; ename = "buttercup"; - version = "1.25"; + version = "1.26"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/buttercup-1.25.tar"; - sha256 = "1iadgn56sfakv927g9bk7fq7yjg0f3r10ygrmjpy46vgvfz0fqs6"; + url = "https://elpa.nongnu.org/nongnu/buttercup-1.26.tar"; + sha256 = "1ddzk6h4cxrl7mn8vr2qp4xjj2al3h5s3kwqxpdwd3zn6wqgyqm4"; }; packageRequires = [ emacs ]; meta = { @@ -245,16 +240,16 @@ license = lib.licenses.free; }; }) {}; - cdlatex = callPackage ({ auctex, elpaBuild, fetchurl, lib }: + cdlatex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "cdlatex"; ename = "cdlatex"; - version = "4.12"; + version = "4.14"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/cdlatex-4.12.tar"; - sha256 = "1m8liqxz76r8f3b8hvyyn7kqgq0fkk5pv4pqgdscbgw36vpcbkry"; + url = "https://elpa.nongnu.org/nongnu/cdlatex-4.14.tar"; + sha256 = "114g2afnq86c6662ychd0v64aam7nhk3hacbwx1cavhg1k2l7kci"; }; - packageRequires = [ auctex ]; + packageRequires = []; meta = { homepage = "https://elpa.gnu.org/packages/cdlatex.html"; license = lib.licenses.free; @@ -273,10 +268,10 @@ elpaBuild { pname = "cider"; ename = "cider"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/cider-1.4.1.tar"; - sha256 = "0l36pqmjqzv6ykmw593h6qd24pygq7171qfinvlp2fh8897ac2nj"; + url = "https://elpa.nongnu.org/nongnu/cider-1.5.0.tar"; + sha256 = "0vggh2l92m8hm2wqzcyka439fs0kzbbfknfgyn79hf2f2f405534"; }; packageRequires = [ clojure-mode @@ -793,6 +788,21 @@ license = lib.licenses.free; }; }) {}; + focus = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "focus"; + ename = "focus"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/focus-1.0.0.tar"; + sha256 = "0gicqiw7npcf18rfb99hm1s054m9l4izzcqzij2kpnc544aqgf9y"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/focus.html"; + license = lib.licenses.free; + }; + }) {}; forth-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "forth-mode"; @@ -832,10 +842,10 @@ elpaBuild { pname = "geiser"; ename = "geiser"; - version = "0.24"; + version = "0.26.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-0.24.tar"; - sha256 = "14qnni8ridrg3afh1wy9nvchbk0drn0h7ww5xgc6s03ivvmy7a71"; + url = "https://elpa.nongnu.org/nongnu/geiser-0.26.1.tar"; + sha256 = "1fq68gvyyrplxw8i0yma4q0yqmrzp00v1v7izlc5r7h58wryy39a"; }; packageRequires = [ emacs project transient ]; meta = { @@ -922,10 +932,10 @@ elpaBuild { pname = "geiser-guile"; ename = "geiser-guile"; - version = "0.23.2"; + version = "0.26.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.23.2.tar"; - sha256 = "1z2khagg425y5cfja694zxrj3lyw3awsmqd86b2hpqhrylrb8jaa"; + url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.26.1.tar"; + sha256 = "1ay7v2qsl0kr9zvf6j1sss3gxniwrqp8xgxhxf7nhlkmkgcfp1wk"; }; packageRequires = [ emacs geiser ]; meta = { @@ -1123,10 +1133,10 @@ elpaBuild { pname = "gruvbox-theme"; ename = "gruvbox-theme"; - version = "1.27.0"; + version = "1.30.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/gruvbox-theme-1.27.0.tar"; - sha256 = "0p36b2rrhizfrj8i86zm810bh0w7qikb5cwpyn106yfvgcv39jl8"; + url = "https://elpa.nongnu.org/nongnu/gruvbox-theme-1.30.1.tar"; + sha256 = "19r3ffkyq779jjz0jvyxdf2zhm1yd1lax9sh0qsj1r5xrcmb15l7"; }; packageRequires = [ autothemer ]; meta = { @@ -1345,10 +1355,10 @@ elpaBuild { pname = "inf-ruby"; ename = "inf-ruby"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/inf-ruby-2.6.1.tar"; - sha256 = "0z57wwpm7wh04yp7za8fmv4ib56np629kmk4djs8qaz5bv494znr"; + url = "https://elpa.nongnu.org/nongnu/inf-ruby-2.6.2.tar"; + sha256 = "09p9pny4p0bfw6lw5pf17spyd77jb0pliapp3mfn7r3w8l8wi8xc"; }; packageRequires = [ emacs ]; meta = { @@ -1723,10 +1733,10 @@ elpaBuild { pname = "org-auto-tangle"; ename = "org-auto-tangle"; - version = "0.5.1"; + version = "0.6.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/org-auto-tangle-0.5.1.tar"; - sha256 = "12sy30yr8r3g7gmvcdsrrmy62lhvajg3gp62gj7p836kh9xllpsl"; + url = "https://elpa.nongnu.org/nongnu/org-auto-tangle-0.6.0.tar"; + sha256 = "07g1cwsr8j1sd8whshi9y2b69qx10g9vd77pmwki9ba4sy0m7b0p"; }; packageRequires = [ async emacs ]; meta = { @@ -1944,10 +1954,10 @@ elpaBuild { pname = "php-mode"; ename = "php-mode"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/php-mode-1.24.0.tar"; - sha256 = "158850zdmz5irjy6cjai1i8j7qs1vwp95a2dli9f341lbpv2jvzp"; + url = "https://elpa.nongnu.org/nongnu/php-mode-1.24.1.tar"; + sha256 = "0ixm7z2bq4aacbwyzx53alfnqwbdn36i5ixdi3qjhr8rh5k48vg1"; }; packageRequires = [ emacs ]; meta = { @@ -2338,10 +2348,10 @@ elpaBuild { pname = "subed"; ename = "subed"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/subed-1.0.7.tar"; - sha256 = "0js48yar8xgj3wjmlkv3k5208q1zvv74sg4lhk6asiy4cq3pqjia"; + url = "https://elpa.nongnu.org/nongnu/subed-1.0.8.tar"; + sha256 = "05dx4ywma7n73d0cihf4v8ayihm7gmfqpzvdycq4yk0zkxb958z1"; }; packageRequires = [ emacs ]; meta = { @@ -2614,10 +2624,10 @@ elpaBuild { pname = "web-mode"; ename = "web-mode"; - version = "17.2.3"; + version = "17.3.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/web-mode-17.2.3.tar"; - sha256 = "1fvkr3yvhx67wkcynid7xppaci3m1d5ggdaii3d4dfp57wwz5c13"; + url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.1.tar"; + sha256 = "0xlpxk9qscxip93lqyl1l5bzv6nxgq5yb8r05s4jslcipbbfil1d"; }; packageRequires = [ emacs ]; meta = { @@ -2712,10 +2722,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "17.19.20220806194323"; + version = "17.22.20220909110152"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-17.19.20220806194323.tar"; - sha256 = "1cflsvp1cpyr3zsj2dij3mc36lprwjdhrvxx2k8ilavhzi4dn64v"; + url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-17.22.20220909110152.tar"; + sha256 = "1d8xkwcyd6dcxp926mwb8kgcpdqrcpmdv62ybdhx7izx0abia95y"; }; packageRequires = [ emacs ]; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 48f2183fcb..2d254503e8 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -1139,8 +1139,8 @@ "auto-complete", "rtags" ], - "commit": "c628efc9b485470a48aec2692d79f7c140bc5b92", - "sha256": "03avv7brbrj69368riq3xg4qh65yzl5cyjn9wc2rbyx4jw2q3p4p" + "commit": "b9c680e7ca003c103687e790f740d86daa6b4b17", + "sha256": "01f1vv71gimhsm6bzh0fxfmap54qs4wqnc5zj9barr9zvwpqmrbn" }, "stable": { "version": [ @@ -1846,8 +1846,8 @@ "deps": [ "markup-faces" ], - "commit": "e0d08ee6d29289a475796e22b2298b028c02b408", - "sha256": "1dp3av91rwq87vfgwpgi622imbv0z79znnfx0r6f5i06xn1ag5bv" + "commit": "00c59c8d952c92c547cb18ba57dff0f673866670", + "sha256": "1bs1kcdfkmhaajbrazj12qghgqv4m11jq0w6bpy8cahlpyhk4f4h" }, "stable": { "version": [ @@ -2008,11 +2008,11 @@ "repo": "Malabarba/aggressive-indent-mode", "unstable": { "version": [ - 20210701, - 2224 + 20220817, + 9 ], - "commit": "cb416faf61c46977c06cf9d99525b04dc109a33c", - "sha256": "1mlvdxs4jbxxfj57h2hc6yapgz4zzqj80k4psds116kpp0y2r5ja" + "commit": "70b3f0add29faff41e480e82930a231d88ee9ca7", + "sha256": "1wxr1z0w5lx5pk1lr7ycss38knar8vb655njlqidlhh1cwbw991v" }, "stable": { "version": [ @@ -2062,11 +2062,11 @@ "url": "https://bitbucket.org/agriggio/ahg", "unstable": { "version": [ - 20220529, - 1200 + 20220825, + 1006 ], - "commit": "d93cc73f79f6c29d533c468112181cd4c7b11935", - "sha256": "1jq411g0ryxkqw4wig6mlm0dpjzx87cw3x277bcj796s3nxl95ln" + "commit": "0e1bb428e1501155dba3f1cbcd789267263ba264", + "sha256": "0qavisfyaza5wsg6lksd85y4izy46lyz4vh7wk6m3y4bjxv6rbyn" } }, { @@ -2228,25 +2228,26 @@ "repo": "wlemuel/alarm-clock", "unstable": { "version": [ - 20191204, - 716 + 20220819, + 1538 ], "deps": [ "f" ], - "commit": "644f331071f8b09a898fae490541908b5054d2e6", - "sha256": "0yf2mikpxnfl673rv0w7xp1cvlkgvlmzgaixva3ppz6f0wg3vgz6" + "commit": "2ca4e5177d2ca9a21fa52f4b4b75711617d5424c", + "sha256": "08wdycs32krva7y9pbb24rj6srp4s302nlld5003idd5h5ds3xcv" }, "stable": { "version": [ 1, - 0 + 0, + 1 ], "deps": [ "f" ], - "commit": "2621d3a492d7f4e10a34d9d1d4af015df55a2b1b", - "sha256": "1l1q9hkip9yikvppxscf6vy6wls16ryhgyp1x8640v81xh1jy8jb" + "commit": "ec41b150ef5ecdd23e732ff41c14c4d6158bacf9", + "sha256": "11afq6lnlqdzbll015fx3031bslwfaz5362qgk2ipgqlk872559h" } }, { @@ -2371,16 +2372,16 @@ "repo": "jwiegley/alert", "unstable": { "version": [ - 20220808, - 510 + 20220818, + 1606 ], "deps": [ "cl-lib", "gntp", "log4e" ], - "commit": "fb92919739b35ec6e9e6db56ca7c10cf7ef1329d", - "sha256": "1yik54ksk1al4kb2m0nc1xmcz8333h45c5w9qfg1w23mfg52g11y" + "commit": "c39ce68ed8d80fb996fb78eafc06481a54bf27ce", + "sha256": "09qcql44d0pkmr4hnql4al269q2naxpybalkqq0zj3x5zbhy7zs0" }, "stable": { "version": [ @@ -2489,11 +2490,11 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20220801, - 1541 + 20220823, + 1719 ], - "commit": "6f876fa11ef64af20d9b2a44fdabac6446de51ba", - "sha256": "1n975ziy5wyfnmmpak1vsj7nqzm5ciw811pcg7rdmc2ljlc90n5p" + "commit": "4a4d6269b8b85b0b15954f063e6ce378630d80c0", + "sha256": "0y1dpxv8hha8pcxssayy0gaa7jd15ad0hwpmpixg164xzjn0cnb6" }, "stable": { "version": [ @@ -2641,15 +2642,15 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20220625, - 1332 + 20220810, + 2027 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "616a39f71484b15d21d89ca40cd174e0ca15b8f4", - "sha256": "0k3lg23jd83cav74rvpmwv3v7b7700ih4jgs2hilwszs8kq2kn5g" + "commit": "5b20fd336f248104a9ab1f8cb37c21d636ea2974", + "sha256": "1za64mbaaymasc6rxvvly417n3ar6ks412rx3xz2xnd2a088b2dp" }, "stable": { "version": [ @@ -2715,8 +2716,8 @@ 20220704, 644 ], - "commit": "cd007b1627afc450a30183da82e50d611afe6b8e", - "sha256": "19fw0ayfha9py11bn564knbi6yzf3cjvzn4pg183mk4lb8h3964h" + "commit": "6ba4b3cc6c7891adff408e58e9ed399d9effbea9", + "sha256": "1ziqc129n7pvmwpa4s14d2f7d0xs5b4hy3kajsbqdkvfjy1cd3ql" }, "stable": { "version": [ @@ -2988,10 +2989,10 @@ }, { "ename": "ancient-one-dark-theme", - "commit": "df6184184228dfdb0b0e4a770c30c67d05a9bf94", - "sha256": "064yiab7ll7nwls7p8cyh8glmzr4msmdhl4vvvy45ll5diyfbkfa", + "commit": "28c4d0f2fb9519f4d40eea0b11a0404fb8b6c9dd", + "sha256": "1rjchaq292x17w0l1zck6h0nl495nb7gwvzxr4hyjk0llkjkln0y", "fetcher": "github", - "repo": "holodata/ancient-one-dark-emacs", + "repo": "sigvt/ancient-one-dark-emacs", "unstable": { "version": [ 20211030, @@ -3009,11 +3010,14 @@ "repo": "fernando-jascovich/android-env.el", "unstable": { "version": [ - 20200722, - 1403 + 20220810, + 1449 ], - "commit": "5c6a6d9449f300eec4f374a5410edc1cbab02e40", - "sha256": "182b3fd85q3x5ynnfnjb01phhq1glf1wxj5rz8zx43ddnzz9ahmn" + "deps": [ + "s" + ], + "commit": "d2890f1156ed184314adbfcf01cdceb6ea79b10d", + "sha256": "1innx53w0vrsg6b7h4kiyy97kjjlcwx080h3hlrfrvnmmmawwfl5" } }, { @@ -3271,8 +3275,8 @@ 20200914, 644 ], - "commit": "5d2d77abbc0c97f5b23d7089797c3ef8796508dc", - "sha256": "1ayprcd7alryqz89p5gi3wawbc72210r7j8jw7naind7wwkjz386" + "commit": "b382d7d376fad3429940de2fa0d399519e172cfc", + "sha256": "1z3nlvpj5m51hb207niqhclsg8i2g138ynsng20ik8ifwm72a1bj" }, "stable": { "version": [ @@ -3627,8 +3631,8 @@ }, { "ename": "apel", - "commit": "4976446a8ae40980d502186615902fc05c15ec7c", - "sha256": "0zrm8m66p3aqr0108s3cj6z4xqbg2hx37z1pam4c65bqlhh74s8y", + "commit": "746947a065c8fd26bfb540c96d869d05a0bd9b53", + "sha256": "0cxd1k4xzv1dad402kkhng9k3rjhmiymdih4z4vsg0alngcrdndm", "fetcher": "github", "repo": "wanderlust/apel", "unstable": { @@ -3648,11 +3652,11 @@ "repo": "radian-software/apheleia", "unstable": { "version": [ - 20220620, - 2151 + 20220821, + 2221 ], - "commit": "12804a50206c708570104637472411288d6133f5", - "sha256": "1dw9d1xm1c1l528bbrm0gckg0qnn9364g37fi41mi10cg6fvi04c" + "commit": "04366a90dfc1063c4a22ea2e4ccaa48303a457e0", + "sha256": "15zkq1jwsmpapck5njm4dgb8nqpjacpsrbp4c51jmgggys75phcx" }, "stable": { "version": [ @@ -3808,11 +3812,11 @@ "repo": "waymondo/apropospriate-theme", "unstable": { "version": [ - 20220612, - 1555 + 20220817, + 235 ], - "commit": "17ec6fc0f43f7c0bcb970e2b71b8674891a464c7", - "sha256": "1w6y3j5r1ngjx08ymqkfp7xjlycrij9bmcnn6pw2jpih3zgzsyny" + "commit": "07265cc0122d3bde62615e8f5671e271598d95da", + "sha256": "18kdrnx264bf2k59b6355b1fbpqd02c5rjr9sfhafpgwg0265d6h" }, "stable": { "version": [ @@ -3942,8 +3946,8 @@ 20210511, 653 ], - "commit": "a93de7e8fef202163df4657f2ab522b57f70f202", - "sha256": "1jmwjz1ldr0lgh3vvpn8y6qzpqzavmdqcgf9jz4sx0v8nd5hr4pn" + "commit": "603f9f4d7d9cb37b005b8f10e5105636dc559217", + "sha256": "0qip4pcl0mdlymapvksg7853xmqs8v322d6wjk7p2vbh8vb1qp21" } }, { @@ -4067,15 +4071,15 @@ "repo": "slotThe/arxiv-citation", "unstable": { "version": [ - 20220706, - 706 + 20220816, + 542 ], "deps": [ "dash", "s" ], - "commit": "a10af07419b66559569362ea57d897d988c17760", - "sha256": "05109ci3nccisjrn1ycx642zdas126g4vfvszbafb758777x9a02" + "commit": "e41d5b90a00b79849cd2fd405b2af75a53b15abe", + "sha256": "1j5cgkiksmgl6slacs5q7wrzyd8bqh3q1yn0rivvfn2v2fxzd5fk" } }, { @@ -4274,20 +4278,20 @@ "repo": "jwiegley/emacs-async", "unstable": { "version": [ - 20220807, - 1541 + 20220820, + 530 ], - "commit": "6d164db151c4ab68242662342f71741b8594762f", - "sha256": "08njlpivli93jc8z5sklwas6m1mjizsn8m46dfsswwnxpsl3zsd7" + "commit": "73f825fd739875e4b8e10d47d497df402bbb61e7", + "sha256": "0rha8s43hx1angz37a80d38m9hlwwl900hy8cljfy2a4cx16h67r" }, "stable": { "version": [ 1, 9, - 4 + 6 ], - "commit": "67c369555de998eaabd60056dead038c6c50b8fd", - "sha256": "0hhpyxb3d531jb2f3wvzx25183f0anm8nxv6mh0p825q2gkm6ly7" + "commit": "370ead445f5d0fc21b7338e05a64830c410368a3", + "sha256": "1q480ss2jgijdpy6pa4xrjni9pf5q6dwf8hv052fhdpi55bmfdn2" } }, { @@ -4298,15 +4302,15 @@ "repo": "chuntaro/emacs-async-await", "unstable": { "version": [ - 20200117, - 828 + 20220825, + 946 ], "deps": [ "iter2", "promise" ], - "commit": "deef2bb343463f5196545f1dd8c2a32d0cb3b146", - "sha256": "0aav9qdswnw7ynqlzn0sm34as5fj2d85syxgg8zjabzp6646ay29" + "commit": "46cd65bdac59c85ce54e3bf3ce6ea2849a0331d4", + "sha256": "1x4i5rbp2srv7cwdm4nm7xkli56r9j7rdlbn5khp6fgaiwzldj6i" }, "stable": { "version": [ @@ -4379,8 +4383,8 @@ 20220704, 644 ], - "commit": "074183f5d4fe77c9b5f1d0c90287a41aaa3e5eff", - "sha256": "08dc48b4phwgll55qmc8ha8wakckpv7nraacnzlx589hbjd2dsvx" + "commit": "5ddd52c752fc60096ed3cf939d773b60f781e325", + "sha256": "0c7lybh5bz21yppjp9vx58vzg3swa0l267hv2pdli7l3cdczbkw6" }, "stable": { "version": [ @@ -4403,8 +4407,8 @@ 20220704, 644 ], - "commit": "14639839f5e206b315c800ab4dc09d2d1693fa0b", - "sha256": "0iry5q6vh0528npf50nxxvdv7hzfsb8sni83mnhk1nckldsbwv05" + "commit": "e5047b5fd68b540e2653aa5915da80c70201544d", + "sha256": "0ascwmiia56b24vshx9kcr54gk4vlz06gdajgjja7y9wj9cq2b1w" }, "stable": { "version": [ @@ -4495,8 +4499,8 @@ "repo": "jyp/attrap", "unstable": { "version": [ - 20220124, - 1253 + 20220822, + 1348 ], "deps": [ "dash", @@ -4504,8 +4508,8 @@ "flycheck", "s" ], - "commit": "19a520ecb99529790906a1fb5599acdf2b4f005f", - "sha256": "15jv6bng8xnkng005n1qbbg5lngjyq7mb5q6x3j77bkb3l8pnr9d" + "commit": "62fbd5f2665f0001f9c6a2dd0622edda7f4431da", + "sha256": "0b1vzhq5s10wifad7x1m5yiwrry9zwxqhpdvkkvyhbzdlf9c2668" }, "stable": { "version": [ @@ -4704,8 +4708,8 @@ "keytar", "s" ], - "commit": "c69176b476c9424a42d19ef8c200fcf2dc850749", - "sha256": "10wv8g2m4kvr3yj04v3rs6c65wcqy2n83ql362sn32kh4lp01g4l" + "commit": "1f38686e5818eba4d570ce3dec1e2130adc2a648", + "sha256": "0zl977a8rsqg4ka8nqnp9fwfh8q1v0lj4s1r62mhiw09gn06nh1k" }, "stable": { "version": [ @@ -4848,8 +4852,8 @@ "cl-lib", "popup" ], - "commit": "8f33bc4fecb653d48d70a4902078f9d493eb882f", - "sha256": "03vsf4n150bgvqsrk07pjzfh6g5hlzgn842mqa4nxlzy70xqqdzx" + "commit": "561e010b6b5e7df60e59309464d2793ef2c8cd40", + "sha256": "0dyb663ja5bdlla4a1dyzvqba5pq3g4dvx99698awnhnf2nxjdpr" }, "stable": { "version": [ @@ -5191,8 +5195,8 @@ "deps": [ "ht" ], - "commit": "616c1391646da49aa3b5a6034d0f8d6a987d5e8c", - "sha256": "1nw96894f4aylh4rljk15s0wfq0skmcj76b8hpmf3kf51jwq09bq" + "commit": "b0cf431f3020c91988cc807a7088b44354935539", + "sha256": "1f0wmxrs054ixkr506s02p9bbw0z1adggls20xwh8zjnwvc7718i" }, "stable": { "version": [ @@ -5341,8 +5345,8 @@ 20220704, 639 ], - "commit": "955a25bf371fe7edc7c1c5fdda0578731273c108", - "sha256": "00rz98vm2hr7vhqsfyz0fdp82vnq34cpnw8hgp02dv232amldlra" + "commit": "7e47763d127ccebcf58aa5fce5daf14260b5d55b", + "sha256": "0fjb171qz9jpsr3kjlhm38rxg196r2s4cwajmvbj7x9scfrmqnlq" }, "stable": { "version": [ @@ -5640,28 +5644,26 @@ "repo": "jasonm23/autothemer", "unstable": { "version": [ - 20220809, - 906 + 20220824, + 2009 ], "deps": [ - "cl-lib", "dash" ], - "commit": "3223cd8867fb75a109e41ccce98ab0e89d0a4f1b", - "sha256": "1rwz8hdmycmvak1w5sriwf1pwahham77vyab6jngdw8x9ngxabnx" + "commit": "378f8707bdd944f19b6fd4544359e993c9113752", + "sha256": "1p7ii7f0w607zxyqnr8ivi0n0sg2p93pi6dpd9kjqywdagqyrnw1" }, "stable": { "version": [ 0, 2, - 5 + 9 ], "deps": [ - "cl-lib", "dash" ], - "commit": "3223cd8867fb75a109e41ccce98ab0e89d0a4f1b", - "sha256": "1rwz8hdmycmvak1w5sriwf1pwahham77vyab6jngdw8x9ngxabnx" + "commit": "378f8707bdd944f19b6fd4544359e993c9113752", + "sha256": "1p7ii7f0w607zxyqnr8ivi0n0sg2p93pi6dpd9kjqywdagqyrnw1" } }, { @@ -6320,11 +6322,11 @@ "repo": "base16-project/base16-emacs", "unstable": { "version": [ - 20220725, - 353 + 20220821, + 127 ], - "commit": "36cd6ed044ee37e399fc5d0db8070ae79fb06800", - "sha256": "1v0i80iydmzrd8z1ri1dmg9bqj13xvr21lwvaqpq9jxh7iq1b9a8" + "commit": "d70a96152a3d2d66776012ec7e578f93d7c6aa2c", + "sha256": "0cn3pbsjyksi1a8hvvm1s3xyanbv5yw71l4ik349ilf7k9l7n23d" }, "stable": { "version": [ @@ -6424,14 +6426,14 @@ "repo": "dykstrom/basic-mode", "unstable": { "version": [ - 20210316, - 1253 + 20220823, + 1148 ], "deps": [ "seq" ], - "commit": "eaa5f24d2fb303d9e5d7de2a28c7c18b01532ab6", - "sha256": "1qvrf6mdrxzzd66888saddjrg5008rrgk0shg6vsyd39gk2bai22" + "commit": "8d7f66ba38d003d7ee6ff271482edfabf146963c", + "sha256": "0aq1rkd4bwzwfdbzv19m038akj91476l3d1wsmrndbqsnrpj7ngr" }, "stable": { "version": [ @@ -6788,14 +6790,11 @@ "repo": "Titan-C/cardano.el", "unstable": { "version": [ - 20220718, - 1440 + 20220810, + 1529 ], - "deps": [ - "dash" - ], - "commit": "40d04a0baf5c3d1087b18cc03595c573a1b5891d", - "sha256": "1z2kvv5im24h7hqmz2yhpar6d6cp4hzhzk6kxgrdrwgywpaf0bdx" + "commit": "5e1bf8b8ffa4c75bece7a93feab9858f0e7d676e", + "sha256": "0n2zf8pqaylrjy9w2qdir9hch7zhmrkcxnajnrbjswn1cwk8l2mm" } }, { @@ -6838,11 +6837,11 @@ "repo": "DamienCassou/beginend", "unstable": { "version": [ - 20220803, - 1431 + 20220824, + 1605 ], - "commit": "eb77d82dc88846c5715353b7fd99c9030a2e2ee7", - "sha256": "0xswh4wfrnwzwsrxmfsvfm1bcdviwfs2hhdark62l37s5xx6dcc9" + "commit": "d0aec04c05911a0d47b34625959e1950ead4e4bd", + "sha256": "17m0dv2z8yf3cnc9fbvxcbg6mbk9vycws38rw6x5b05dg4vpi1pf" }, "stable": { "version": [ @@ -7002,8 +7001,8 @@ 20220704, 645 ], - "commit": "9ec8cb24751784cc114263728d7565fd473facd7", - "sha256": "1dvl99px3y1wv275ygrm224kpnwaalfdxqwwkx4qbgb8lgmbmha7" + "commit": "6ca5c402757710eba2c20c382ea532aa10f054a2", + "sha256": "07rfq5ms5ddyc2nb1abcc0xc3yrwcjyzs3xxh96z2n57wbp45y8p" }, "stable": { "version": [ @@ -7387,8 +7386,8 @@ "bind-key", "key-chord" ], - "commit": "e5f64cc6d9d0df3721b319eeecca1f4f49ea86a3", - "sha256": "1108x07jf9cfgi5wyy18v0dr6vjpssl19032q9g0vci5mpi5k123" + "commit": "e2d173b1200865a9efd5c2066831a230497582c0", + "sha256": "1m5987l96xlpxz0aiczc1nifrsjh33z9z7biryb47khdgizhy931" }, "stable": { "version": [ @@ -7412,11 +7411,11 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20220809, - 42 + 20220815, + 1925 ], - "commit": "e5f64cc6d9d0df3721b319eeecca1f4f49ea86a3", - "sha256": "1108x07jf9cfgi5wyy18v0dr6vjpssl19032q9g0vci5mpi5k123" + "commit": "e2d173b1200865a9efd5c2066831a230497582c0", + "sha256": "1m5987l96xlpxz0aiczc1nifrsjh33z9z7biryb47khdgizhy931" }, "stable": { "version": [ @@ -8023,8 +8022,8 @@ "deps": [ "cl-lib" ], - "commit": "af929c164c4ffaee0c33ba97c06733f0ce9431d4", - "sha256": "0qq3a48650brpif3j8kwg9lm2bk5izv1bm9ff1mk7x0anjkcv1hy" + "commit": "449c17b5f25513398173f265b272fc1f9178a6e2", + "sha256": "15b4jc1zyv333llar95mq9hwim5izkvxz7jldz55y7d29jax92x6" }, "stable": { "version": [ @@ -8106,8 +8105,8 @@ "repo": "boogie-org/boogie-friends", "unstable": { "version": [ - 20220726, - 1637 + 20220815, + 1808 ], "deps": [ "cl-lib", @@ -8116,8 +8115,8 @@ "flycheck", "yasnippet" ], - "commit": "0a736ab6e9669e755141db5afefbfe8cd5df6961", - "sha256": "0mg5w8zvavw4g9iaivsbg1r42vzjjcbzq0zprwl0x09p8z23drga" + "commit": "986458f66a4f306e4697b71806c9a797940cf92c", + "sha256": "0pzrf6by8nkm4gy1vlramanxiwpxa4jhh6hfxdbmipmjwci1vkq9" } }, { @@ -8190,16 +8189,16 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20220502, - 1850 + 20220822, + 1348 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "db7b6083d390e3febf82f9af5782e1a36d30093c", - "sha256": "1i6wff18rlhdncm8qaz5zmrl4g5bl4h13yw9y635nlzzailmjjvj" + "commit": "ccf3e5c0c92f0f73d20f14cad0337e4cb0907a9b", + "sha256": "0b1dyi9l2cjqpkc22vv0r7bx5k2imv61zsq5dn93yzrz5sab4kg1" }, "stable": { "version": [ @@ -8223,15 +8222,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20220803, - 1958 + 20220812, + 1139 ], "deps": [ "epkg", "magit" ], - "commit": "47122b6559f4990c03e0b26d6e123e7f9f46525b", - "sha256": "00ihsfsinjy0cvgb64chixffv6afb5qj5sidq6699g79xpvdhp1i" + "commit": "d3cdc176ee72e3e3feac6dd6b527cff5dcf788eb", + "sha256": "0nw1vnw60h366a4i97gp2vjly2n4bvj5y645f6wqaabqxbglz463" }, "stable": { "version": [ @@ -8722,14 +8721,14 @@ "repo": "astoff/buffer-env", "unstable": { "version": [ - 20220728, - 1835 + 20220811, + 1159 ], "deps": [ "compat" ], - "commit": "7c176d043445ea94fe924a715158c25b91ec4776", - "sha256": "0badxbj4whqcz8pkwzhp2fxppgcfqrrf0cciwnxy1nyamcrf0y7z" + "commit": "9ccfbd07c4b2e2af38fe315ce7e3d905298d2fdd", + "sha256": "1hsf5r96pd3j4s90xym3dkrsnxqg8pwlmrj93p0xvdr493gms2a4" } }, { @@ -8849,20 +8848,20 @@ }, { "ename": "buffer-sets", - "commit": "61d07bbe7201fc991c7ab7ee6299a89d63ddb5e5", - "sha256": "1xj9fn2x4kbx8kp999wvz1j68znp7j81zl6rnbaipbx7hjpqrsin", + "commit": "1fb027a2f96f47ca0f06d78e37049042fe56b413", + "sha256": "0i66zjk6krr9i8y7day535yaa996ipj73lfsiibhv0nz2xzknpjy", "fetcher": "git", - "url": "https://git.flintfam.org/swf-projects/buffer-sets.git", + "url": "https://git.sr.ht/~swflint/buffer-sets", "unstable": { "version": [ - 20170718, - 340 + 20220821, + 1413 ], "deps": [ "cl-lib" ], - "commit": "bc84c2f79a33609cccf3c996101125859b2e26ab", - "sha256": "0xw3fs8v3ciw0kvdb2nvs4wk5fjpl012hisv9ypx0nhszzyggrs6" + "commit": "d0e4c86960d0a36cabdc34d860722fd304646a88", + "sha256": "03c3msy03130glqg1mxcrj1acy6cgvmz8931p2970i5zn3sys7yc" } }, { @@ -8930,8 +8929,8 @@ 20220704, 646 ], - "commit": "8be8508ad5570b1487d9d2fc1b5aa71558f2d0f5", - "sha256": "19k4xxalcirxis6s8gci9hyp8l6vw1dx9z31nnvihb3yd932816i" + "commit": "b0c18216904581d6223e76626821a266355830da", + "sha256": "1l7rdx7q13v6l1x5brw28whv546hr3k1hqhhrf9qdxygwwyib42d" }, "stable": { "version": [ @@ -9329,19 +9328,19 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20220629, - 2119 + 20220814, + 2150 ], - "commit": "62176a39ee6aa990c96e97c13ee4992355f0a122", - "sha256": "0j9qaa45r14kyqv44jhnygc03xzvw2k7rfaai99v7xl6a6aj4p8k" + "commit": "e2b77ac49cc61c32566f22b84ba304a5703ff7b3", + "sha256": "1xymh8nywhb00ylggjfmad1vxqrzw59mzxhd0jhy5c9z8qsvms44" }, "stable": { "version": [ 1, - 25 + 26 ], - "commit": "ba62f80555d46faf49dc451c0ad20f39f6a170ab", - "sha256": "0fsysvsypda6b7azc15bpaprq3bwx4gb6rlq2mj6f8rgwdqc8153" + "commit": "9022546ebf2f492e9f3ce92e02ed893bcecab027", + "sha256": "1zr9lczdr9dfh99n079d5advxm9p32a8f984dx14f3jn5mx750b1" } }, { @@ -9670,6 +9669,21 @@ "sha256": "04yg0rf6i95s913hs6zn01rajpbc1gk2hcpzkxyjy3mj1lqhh45s" } }, + { + "ename": "calc-prog-utils", + "commit": "bd54f7a1085278bfda388607096917c80095349c", + "sha256": "0pihlnh74rclp9qjz1nsf9cgcj3glp4vkbvr2gz48sf83yaa7379", + "fetcher": "github", + "repo": "Jesse-Millwood/calc-prog-utils", + "unstable": { + "version": [ + 20220820, + 1855 + ], + "commit": "190acfda56660a2d75df2d9eac5b14edaccccd80", + "sha256": "0p2wl4c5rqr7hfwzb22hx8mj6c2wbk9rlzm41h8h4z8qqhfvv2lr" + } + }, { "ename": "calendar-norway", "commit": "c5d01230027d5cec9da2545a9ce9270a611f6567", @@ -10010,11 +10024,11 @@ "repo": "minad/cape", "unstable": { "version": [ - 20220804, - 2211 + 20220819, + 1710 ], - "commit": "ab2f4ec9ec778d256c7e4b3490ecd50269c422f0", - "sha256": "1ivhf9xvhxz8k53fk2m03s4967hcyghacgrbg7sc0mywhdf0ba1f" + "commit": "f360464007386b36952b4c3ba0a977f056d0ee19", + "sha256": "1chf8yqpi4hjd98gm27gzx72j7grhy7zf447cynhphl1lvp9fa96" }, "stable": { "version": [ @@ -10036,8 +10050,8 @@ 20210707, 2310 ], - "commit": "a41bf576b2d4f27696e9366e69072359138612c2", - "sha256": "03ag1lzclyx0khz5cai4x1a0zqkllp1xmhgyfj27lla8qr18y8vg" + "commit": "577e258e754426ffb731af139de745bce8b44312", + "sha256": "0bqcxa4hqfr9a5am0bmb0ixna50009n3gm3zhhq6ngiassqr2dwy" }, "stable": { "version": [ @@ -10102,8 +10116,8 @@ "yaml-mode", "yasnippet" ], - "commit": "40d04a0baf5c3d1087b18cc03595c573a1b5891d", - "sha256": "1z2kvv5im24h7hqmz2yhpar6d6cp4hzhzk6kxgrdrwgywpaf0bdx" + "commit": "5e1bf8b8ffa4c75bece7a93feab9858f0e7d676e", + "sha256": "0n2zf8pqaylrjy9w2qdir9hch7zhmrkcxnajnrbjswn1cwk8l2mm" } }, { @@ -10124,8 +10138,8 @@ "yaml", "yaml-mode" ], - "commit": "40d04a0baf5c3d1087b18cc03595c573a1b5891d", - "sha256": "1z2kvv5im24h7hqmz2yhpar6d6cp4hzhzk6kxgrdrwgywpaf0bdx" + "commit": "5e1bf8b8ffa4c75bece7a93feab9858f0e7d676e", + "sha256": "0n2zf8pqaylrjy9w2qdir9hch7zhmrkcxnajnrbjswn1cwk8l2mm" } }, { @@ -10467,14 +10481,14 @@ "repo": "Titan-C/cardano.el", "unstable": { "version": [ - 20220802, - 1008 + 20220810, + 1600 ], "deps": [ "dash" ], - "commit": "40d04a0baf5c3d1087b18cc03595c573a1b5891d", - "sha256": "1z2kvv5im24h7hqmz2yhpar6d6cp4hzhzk6kxgrdrwgywpaf0bdx" + "commit": "5e1bf8b8ffa4c75bece7a93feab9858f0e7d676e", + "sha256": "0n2zf8pqaylrjy9w2qdir9hch7zhmrkcxnajnrbjswn1cwk8l2mm" } }, { @@ -10564,11 +10578,11 @@ "repo": "cdominik/cdlatex", "unstable": { "version": [ - 20220808, - 1414 + 20220823, + 747 ], - "commit": "6fc8a1f2949b1b58b2ef9a56b3417490f1ca3b61", - "sha256": "1364prn41fypbr7j985mpbdr0ra4p8niwmrc5xi2s6sr367a2dki" + "commit": "6f734db8ab87f11dffb77c33a445140baeb723c4", + "sha256": "0pcfv8vhqxpcwmbsyvhy08dk4cbj4kzz05c2c9pfnkbbakxfalvk" }, "stable": { "version": [ @@ -10846,8 +10860,8 @@ 20171115, 2108 ], - "commit": "72e8af1887116a7ee609b1d5f24ecd459388349f", - "sha256": "1j9zf96mlk5yw8xcc0inkxcqwn6iyhvp169di05y3i87qdwv3wmr" + "commit": "c854fca2bef6929487f5dc828d6a08529f69f47a", + "sha256": "0ki9zhssxk1gih9ndndrp8gzg2fmnz1gc94ys65b9cn6y0qyycgf" }, "stable": { "version": [ @@ -11002,8 +11016,8 @@ 20220318, 1007 ], - "commit": "2b930905c23f1cd2fcf3ecad558fde5b708ea1a8", - "sha256": "0rjaj1y2nax40j41b8wz32lx0znhr1vvx6x9cf477c8rd9sbfxhj" + "commit": "86e04b7182b1205769b03281e56d4f2d53e9fee9", + "sha256": "1lc3w8qr79l314v17q3z2lqg3isa49rf51ijbb7fldmzzdzn303s" }, "stable": { "version": [ @@ -11680,8 +11694,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20220808, - 1329 + 20220824, + 759 ], "deps": [ "clojure-mode", @@ -11691,14 +11705,14 @@ "sesman", "spinner" ], - "commit": "9577dbbdae8cffe023442427b97f963b4447983a", - "sha256": "01f1is17zkz2gzgf8bpismxk5050syk7yacfyp9ihln27h1hlb4f" + "commit": "5bba4856fb42636bd52d1a1ebb4997a8806df759", + "sha256": "0v45bj46y0y8v3mi69zak827qpxhhci7ij72nr6p3ij4h24m7980" }, "stable": { "version": [ 1, - 4, - 1 + 5, + 0 ], "deps": [ "clojure-mode", @@ -11708,8 +11722,8 @@ "sesman", "spinner" ], - "commit": "11156e7b0cab470f4aab39d3af5ee3cb1e0b09d0", - "sha256": "08635ln514nrglx6qyhaq1x7y7lw4mcd659ba8zs071yjiariarm" + "commit": "700ded1d6c245e01fca7f364db1561ad1e1bb595", + "sha256": "1ih902n8p3pl1apprprkyrlnrp2dxli86y5k09zahy9mglfz2z5n" } }, { @@ -11990,16 +12004,16 @@ "repo": "emacs-citar/citar", "unstable": { "version": [ - 20220809, - 1305 + 20220820, + 1409 ], "deps": [ "citeproc", "org", "parsebib" ], - "commit": "9d7088c1fe82e9cfa508ead7ef7738c732556644", - "sha256": "1n69lkp7298gasm9hlbx9nhgp9ggh8w8ffyvi1rmbj96lcnpsyi9" + "commit": "731c0ae81aecca94f7dcc4f2dad51a0cd1c3de68", + "sha256": "0ng128j689h6q2hqfizrcnj5b927br363qajnqg2n194s5k997zc" }, "stable": { "version": [ @@ -12030,8 +12044,8 @@ "citar", "embark" ], - "commit": "9d7088c1fe82e9cfa508ead7ef7738c732556644", - "sha256": "1n69lkp7298gasm9hlbx9nhgp9ggh8w8ffyvi1rmbj96lcnpsyi9" + "commit": "731c0ae81aecca94f7dcc4f2dad51a0cd1c3de68", + "sha256": "0ng128j689h6q2hqfizrcnj5b927br363qajnqg2n194s5k997zc" }, "stable": { "version": [ @@ -12046,6 +12060,37 @@ "sha256": "1n69lkp7298gasm9hlbx9nhgp9ggh8w8ffyvi1rmbj96lcnpsyi9" } }, + { + "ename": "citar-org-roam", + "commit": "87aefd56251d20a2a832d27e3170a3e39e39870d", + "sha256": "0pxpag791kgyd4hs0jf1dyrc88dhln1303x3san0j55kfmr5hdrs", + "fetcher": "github", + "repo": "emacs-citar/citar-org-roam", + "unstable": { + "version": [ + 20220815, + 114 + ], + "deps": [ + "citar", + "org-roam" + ], + "commit": "4325e648c228269e519c322d696846a6c1f42f99", + "sha256": "0rr5sbl1fcd286h4vbg1b3q1r74l26670bhdx0pialr7rxp67i57" + }, + "stable": { + "version": [ + 0, + 3 + ], + "deps": [ + "citar", + "org-roam" + ], + "commit": "0ad9639d133011d9d94cdd0496d38f5aa88f2881", + "sha256": "1ldfs7g7ixnrwj23draiph4vy6xq7qgw18vhi7vbw6wvkh9fcv9r" + } + }, { "ename": "citeproc", "commit": "20aa56e9a4809cee1082224b1b4e65921a48bda1", @@ -12054,8 +12099,8 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20220717, - 729 + 20220816, + 1732 ], "deps": [ "dash", @@ -12066,8 +12111,8 @@ "s", "string-inflection" ], - "commit": "406bd9964f1ce531fc45beddcf9ccc44d3456129", - "sha256": "0rkwqn9pcimfcyq19wlrcij0kcjyhbwisla7vwbhjj8ang0bq9rm" + "commit": "36c4ecdc485a2f264297bb60f82c0afe1a1d64d3", + "sha256": "1wcwm6cwmy7zxf9s841q6y3nz11a55ymvbgmp8cd8j24aydn3qpn" }, "stable": { "version": [ @@ -12530,8 +12575,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20220729, - 543 + 20220821, + 1956 ], "deps": [ "cider", @@ -12544,14 +12589,14 @@ "seq", "yasnippet" ], - "commit": "1bd7b09976c05ebd1ff1ee3d5c882af303780b67", - "sha256": "0ygq2s9g63lk8v5m4mbkf2411li656wlq9nisadmhlahxk1vs26x" + "commit": "cd97626fd952f824564808a2f21b40bfcb59ff0f", + "sha256": "1bvy3s953qlca9k8pvd1npl5nbpsbzbp8y41k3h6w588hjdwarsi" }, "stable": { "version": [ 3, 5, - 5 + 6 ], "deps": [ "cider", @@ -12564,8 +12609,8 @@ "seq", "yasnippet" ], - "commit": "1bd7b09976c05ebd1ff1ee3d5c882af303780b67", - "sha256": "0ygq2s9g63lk8v5m4mbkf2411li656wlq9nisadmhlahxk1vs26x" + "commit": "cd97626fd952f824564808a2f21b40bfcb59ff0f", + "sha256": "1bvy3s953qlca9k8pvd1npl5nbpsbzbp8y41k3h6w588hjdwarsi" } }, { @@ -12844,11 +12889,11 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20220729, - 2246 + 20220824, + 1801 ], - "commit": "ad322e989e56c10c05bb286e5b55a82b1e031d62", - "sha256": "12m3yjhy4q0x3ri4xxb9raqg9lmw4hk4jgn436d9zvsk4fr3h1nd" + "commit": "52f3e1f981af2adb007ddbf178c9e5625fdc63b6", + "sha256": "0qh3k62v3wh9sv666pjm4v4skwmsz2130sqglkmvjf3c6rwj0z5r" }, "stable": { "version": [ @@ -12874,8 +12919,8 @@ "deps": [ "clojure-mode" ], - "commit": "ad322e989e56c10c05bb286e5b55a82b1e031d62", - "sha256": "12m3yjhy4q0x3ri4xxb9raqg9lmw4hk4jgn436d9zvsk4fr3h1nd" + "commit": "52f3e1f981af2adb007ddbf178c9e5625fdc63b6", + "sha256": "0qh3k62v3wh9sv666pjm4v4skwmsz2130sqglkmvjf3c6rwj0z5r" }, "stable": { "version": [ @@ -12995,15 +13040,15 @@ "repo": "emacscollective/closql", "unstable": { "version": [ - 20220422, - 1601 + 20220821, + 1814 ], "deps": [ "compat", "emacsql-sqlite" ], - "commit": "87d2edae8bc3d390bcfc5e909e9c13ff9fce994a", - "sha256": "1grxpxrjzziqad840cw5ivp4xym0p3y0p3jwrf1j4dkbp670c75d" + "commit": "46b3020acf6655fd8abb4ef60e090629ee33e8c3", + "sha256": "1zgn8mg9l7nymc72bii2677lwin63x15avssz47w04j0g3ii6dwz" }, "stable": { "version": [ @@ -13176,20 +13221,20 @@ "url": "https://gitlab.kitware.com/cmake/cmake.git", "unstable": { "version": [ - 20220617, - 1532 + 20220823, + 1201 ], - "commit": "f7a13beaa4e7ef262004e37997ffc5d856fc26f2", - "sha256": "0ni5y55h6d6mfa23hkicvkrrk8axh9577w1ipm1zmbrc70ln2rd0" + "commit": "9d1ecd72fb45af722da7668d0c7482b7a0b1876f", + "sha256": "07a9lj4bklndkg96b2l6a0s8918qgnaxdhn9hn1la83gmhy12183" }, "stable": { "version": [ 3, 24, - 0 + 1 ], - "commit": "4be24f031a4829db75b85062cc67125035d8831e", - "sha256": "1ylp6i2q9lkhcl5kng3sl48dqb4ci1fvl2sj89jm1q4sq0xyl8vf" + "commit": "c3793b41573ee584e572ea546527b9350f46a05d", + "sha256": "1sq08rxldwv6wq203b5fp3za31fg0ql1qsirqlm0ffsclgvw3za8" } }, { @@ -13475,6 +13520,29 @@ "sha256": "1xdkm1f04z1h3ivd6zm8hckf3n3fbi5rwybg4dwi5mim6w84i7j9" } }, + { + "ename": "codespaces", + "commit": "385b9c079904e3548dc9ecaf6daf78cd737349fd", + "sha256": "0iln27y69zz7d9ls5ddbhh8jax3spjg3pfclpajwfgwncwkl8qgz", + "fetcher": "github", + "repo": "patrickt/codespaces.el", + "unstable": { + "version": [ + 20220824, + 1816 + ], + "commit": "43cf115189b27c7b348b8bb22ef74160d2c942e7", + "sha256": "0kw9w8viizb4dmmd21ajpldaxp63hqcradgv1y6qh358q42p2cqd" + }, + "stable": { + "version": [ + 0, + 1 + ], + "commit": "c4757e73e845895e8368fe621fa2bb2bd5a6d49c", + "sha256": "0yg2v8q7w5siyrq5jfsdjm8a4jx9mqlqyw6k69snsj95kzgj11g6" + } + }, { "ename": "codic", "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", @@ -13842,8 +13910,8 @@ "deps": [ "s" ], - "commit": "bda336544e61b45e24927d8850fdb28d4b7c267e", - "sha256": "1w4chg2d152sr82mqkxiibf06qh1fbxylzd5asjx9712gy33fy69" + "commit": "f54c2ba98d4e73d5504152ae8d61071ed467e39f", + "sha256": "1zci73gmzyl3x6rb733b0lxzdzvqsyc60jwza9by8jr7ma6v3c0p" }, "stable": { "version": [ @@ -14177,11 +14245,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20220731, - 2333 + 20220825, + 1044 ], - "commit": "f1877a370ca76d5cd6614c527635b2d6983188af", - "sha256": "1nis7561w9lbis3bz84is40fychg1gz3i9q3m2h0ml1x0m4ss6lh" + "commit": "35408c0ac3a730908fbce0810f8d159eb353c1d5", + "sha256": "0chh9zbb7hj64lx2sb7bid2wbyk4qaadkzghslfqybxmsdsizyik" }, "stable": { "version": [ @@ -14635,8 +14703,8 @@ "emojify", "ht" ], - "commit": "cc3ae96fbafa51d71fde802fa3c1e5fad9402158", - "sha256": "0hw2pzg1prcjysrxrki0qsfzfqr0gp0mh606lakr33hzkib447xx" + "commit": "f877614d3395ba3f2a678b50d79bac6d392c2d2b", + "sha256": "1lz7dvkfw5667v2xkak00d3d47dr6dm2jz2hamr8rpw2jh3svpqi" }, "stable": { "version": [ @@ -14739,8 +14807,8 @@ "ht", "s" ], - "commit": "91b76fc475f7eb17a0ae8b94a42625dfb546cc01", - "sha256": "1yabv0g07xpj1kfm95ygxa21zgq8r0lq0iyavdv9s56q1aiwpkpq" + "commit": "7b54f88d2241073986b0e3d109012ee396cfdb3f", + "sha256": "070ysb9cwp6rfash85d633h8ig1rmwdd7x7a4vwrhzhlggidy34l" }, "stable": { "version": [ @@ -15092,8 +15160,8 @@ "maxima", "seq" ], - "commit": "1334f44725bd80a265de858d652f3fde4ae401fa", - "sha256": "1h1lqrl3p9qgkicds8v44vdry19g53rya56hdj3cz5q8xj1nisn1" + "commit": "1913ee496bb09430e85f76dfadf8ba4d4f95420f", + "sha256": "1milqql0p9gp4dn9phn4fw1izf37wizpirvmzh5s71rwzrr6a9ix" }, "stable": { "version": [ @@ -15249,8 +15317,8 @@ "company", "org" ], - "commit": "29a2edb35e18c2627dcfa0641852a55d9639263c", - "sha256": "14qvxypgc1cj6ijvkkybl7x5p00435v4rdaw7pvvlf58lc422492" + "commit": "4d96750beba7f90478dbf5f4d52eb9c21d538f4a", + "sha256": "0k3zhy2173wr8j8m92zik150qiq5y9cd12hpbfrkksybgdpmmaf1" } }, { @@ -15486,15 +15554,15 @@ "repo": "company-mode/company-quickhelp", "unstable": { "version": [ - 20211115, - 1335 + 20220825, + 1037 ], "deps": [ "company", "pos-tip" ], - "commit": "3ca2708b4e5190205aca01d65fe1b391963a53f9", - "sha256": "120kvdrzbxs7idrqwz8rz59ic3ymq1b586l0qi27y7bdy2pg6njw" + "commit": "6660a1b380b9599af9ef1cc617168db83f24b9b7", + "sha256": "175zw6jnkr6cf3nl9gvyjj69pzv4w1p19gjid9dkhqy38wyslkr9" }, "stable": { "version": [ @@ -15525,8 +15593,8 @@ "company-quickhelp", "popup" ], - "commit": "70c8a979d82e436dca8595e3ec049c733246f338", - "sha256": "1ym333y58b7xadxcf4p3aj8p3yns98q4w20xv3nz2vn58j5ha7ym" + "commit": "4968de67d0db8ddae29a03719b31f1be0434cb9f", + "sha256": "1i9wwgjsh4akhss924lc0fh776zr2c5ha7ipqka8i0by135mysfh" }, "stable": { "version": [ @@ -15632,8 +15700,8 @@ "company", "rtags" ], - "commit": "c628efc9b485470a48aec2692d79f7c140bc5b92", - "sha256": "03avv7brbrj69368riq3xg4qh65yzl5cyjn9wc2rbyx4jw2q3p4p" + "commit": "b9c680e7ca003c103687e790f740d86daa6b4b17", + "sha256": "01f1vv71gimhsm6bzh0fxfmap54qs4wqnc5zj9barr9zvwpqmrbn" }, "stable": { "version": [ @@ -15656,30 +15724,29 @@ "repo": "Alexander-Miller/company-shell", "unstable": { "version": [ - 20211013, - 1725 + 20220822, + 2014 ], "deps": [ "cl-lib", "company", "dash" ], - "commit": "a77f4de75912aa87314cde92c603b831d5050246", - "sha256": "1mh93l6xn9frfvw86vbvs1fz544c7ylja118iaccfl42gr2ypsw9" + "commit": "024c2172a0cc8f1b35f173e42fff5f2d938920fc", + "sha256": "06nfq2va9vwf5wiqdfrjziv3hjkj36w8p91bicfb92ggv1afg9ra" }, "stable": { "version": [ 1, - 2, - 1 + 3 ], "deps": [ "cl-lib", "company", "dash" ], - "commit": "acdbf8cba6ad9831d81a77bab7bbfd50f19edd86", - "sha256": "1dk927da7g4a39sva9bda978bx6hpiz5kf341fj8sb7xhryvh5r2" + "commit": "024c2172a0cc8f1b35f173e42fff5f2d938920fc", + "sha256": "06nfq2va9vwf5wiqdfrjziv3hjkj36w8p91bicfb92ggv1afg9ra" } }, { @@ -16221,8 +16288,8 @@ "repo": "necaris/conda.el", "unstable": { "version": [ - 20220724, - 1857 + 20220814, + 1919 ], "deps": [ "dash", @@ -16230,8 +16297,8 @@ "pythonic", "s" ], - "commit": "a65ed0084876366fd1b238bb2b8b36ee75ac98d8", - "sha256": "0w4fb615019w8bav5v67a5y6rb4bs2fbh3kggs3pya96ncr475cr" + "commit": "e7f7e72cc058318b9c11499c38c3b0125322e6d6", + "sha256": "1vqgqap06zaspl0wy30fn1mxf6g181b6isp59nidbackksn8z6fc" }, "stable": { "version": [ @@ -16391,8 +16458,8 @@ "deps": [ "compat" ], - "commit": "e4546edb6f1268c4a13ac3dd1dec8c9b28d7df51", - "sha256": "0i5s6hndk7d45fl2idmbqrrddaf1vjcg2qvycm9gs6f568ld1s0m" + "commit": "90536f39db3bd9085971998308ee42176613d68f", + "sha256": "071dp9dj0xrjbk13mrss1h3as4x04i6lf0cnw1kq3ckaihjw0lar" }, "stable": { "version": [ @@ -16671,6 +16738,26 @@ "sha256": "14dyclspkf1a34nvjj800ckz1phsizq07ps8k4x0ah6ik0hfhy1w" } }, + { + "ename": "consult-notes", + "commit": "bd01544509dfe92d007d1edd47cfff0686a057f5", + "sha256": "0s13l1xdbihyp48k9nkflfw257q008imhv2zpfa86g9j04n4h0rz", + "fetcher": "github", + "repo": "mclear-tools/consult-notes", + "unstable": { + "version": [ + 20220822, + 158 + ], + "deps": [ + "consult", + "dash", + "s" + ], + "commit": "fd4091dd3655fdbbbb3fa15cfa96babe17c8b8b5", + "sha256": "0q8hg6290gxchqwic4290jnkhg9pd03pd8gj6fxi9n7k72rx418i" + } + }, { "ename": "consult-notmuch", "commit": "e61a3f8cba4e5e303379f80c9fdd773fdde66406", @@ -16778,26 +16865,25 @@ "url": "https://codeberg.org/jao/consult-recoll.git", "unstable": { "version": [ - 20220808, - 9 + 20220823, + 1338 ], "deps": [ "consult" ], - "commit": "2bd1ed98b23c2b72617fcef11aba7eb969b94ffa", - "sha256": "185crk09jyv2hxkkc3xl9fny9w4aa3nnnma1rrwp5lkm6ypr0j03" + "commit": "b3724c704b0d7d942c095dedd9e0ce064a8847c9", + "sha256": "1f6lmx2brp47f0rqxjpbw3acr9zz3liwp3y68sqq80flssy10msw" }, "stable": { "version": [ 0, - 6, - 2 + 7 ], "deps": [ "consult" ], - "commit": "8299efb610178a73ea809de74f87d724ee6183d6", - "sha256": "0k0796sqqbl66s8i8i6icdqj21xghjphsibkakp2nwy65cn5snx7" + "commit": "714810486a13bb6adba5be0eaaca7eabe3298927", + "sha256": "0353j98ql2nzwq1ffx721b9qv1jgxljx2z3h3z7hyygkc7r95q07" } }, { @@ -17452,14 +17538,14 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20220728, - 1351 + 20220825, + 259 ], "deps": [ "counsel" ], - "commit": "b109dff190db6706e32ad08deb64b77fc8ad75c7", - "sha256": "0qgdhqwhw4pf2aclb602p0hirym28fh38ykmdnhzang2027l16p5" + "commit": "e38b12771183fd43fb94c9fa562b20b5efeefc1b", + "sha256": "0r4mq4kxbj2kfg3nwni0canp1nvzl7j9jvpi523bj0apfrab1p9v" }, "stable": { "version": [ @@ -18089,26 +18175,26 @@ "repo": "emacsfodder/emacs-theme-creamsody", "unstable": { "version": [ - 20220808, - 518 + 20220819, + 754 ], "deps": [ "autothemer" ], - "commit": "f7155dd7a9f53050fcfcaadbec5e0d3511d8c33c", - "sha256": "1kk3iis4h26xmrsw579yzz4ici53ci5khysxkp4afi5rc8frz6x9" + "commit": "0823101e9886cc31cc48f2d79f354a4fd2c2b9f3", + "sha256": "0z81b1xgyalkws9l4dqncmssm98n8c3rzbkhcxisfhv65qpyzci0" }, "stable": { "version": [ + 1, 0, - 3, - 16 + 5 ], "deps": [ "autothemer" ], - "commit": "f7155dd7a9f53050fcfcaadbec5e0d3511d8c33c", - "sha256": "1kk3iis4h26xmrsw579yzz4ici53ci5khysxkp4afi5rc8frz6x9" + "commit": "cc16c7ce5d733c5e77ea67342dc655ab8f920684", + "sha256": "0wzp3qlahkxic924sslaj8v9npqcjcw3ff87mr0d697z2g1kbwdh" } }, { @@ -18427,11 +18513,11 @@ "repo": "emacs-csharp/csharp-mode", "unstable": { "version": [ - 20220704, - 1242 + 20220819, + 1351 ], - "commit": "396b5e9b32bb58c9f984a03f5075455af87f7307", - "sha256": "07arvkrmg86kzyxyxzmxarb46g2l94q5inzhp4r05xaxhz6jqfp4" + "commit": "6e9d1f6b9900d3b8aa4106abf84a89311dfed85f", + "sha256": "1shyv3lkilbglqlg0mzaz9aslx3xg9gjp63phdvhsgafvwzpi254" }, "stable": { "version": [ @@ -18866,20 +18952,20 @@ "repo": "russell/cue-mode", "unstable": { "version": [ - 20220809, - 1942 + 20220811, + 1938 ], - "commit": "ebc50a881c6fbce429b0ec6bef8ea91a8310cf46", - "sha256": "1n8fx8xkyw9aq8hy02wdm7qdfmv5qj4cq5xdp9vniak3x5r3gwwp" + "commit": "31c671d56e7884fa87ad0f1d27d0bb439dc65380", + "sha256": "19f71kwdpv5zrzl96wyc9w516cq1naigvyv7g3n7093yzmgwyj4w" }, "stable": { "version": [ 1, 0, - 10 + 11 ], - "commit": "ebc50a881c6fbce429b0ec6bef8ea91a8310cf46", - "sha256": "1n8fx8xkyw9aq8hy02wdm7qdfmv5qj4cq5xdp9vniak3x5r3gwwp" + "commit": "31c671d56e7884fa87ad0f1d27d0bb439dc65380", + "sha256": "19f71kwdpv5zrzl96wyc9w516cq1naigvyv7g3n7093yzmgwyj4w" } }, { @@ -19011,6 +19097,36 @@ "sha256": "0507acyr9h4646scx316niq27vir6hl2gsgz7wdbiw0cb2drfkd1" } }, + { + "ename": "cyanometric-theme", + "commit": "a7162105818602f33eb929d0b598272ae1c638ae", + "sha256": "0jx3v8n64i7nag8ax3szfs3w537vpzrdqwqsz52v85cmll15n3b0", + "fetcher": "github", + "repo": "emacsfodder/emacs-theme-cyanometric", + "unstable": { + "version": [ + 20220822, + 301 + ], + "deps": [ + "autothemer" + ], + "commit": "9b20e33a8cc2c76bfe6ad45916be6881386707f5", + "sha256": "0hhwm9dwzf7dqzacxppgq0c64abjn29h0lyf620q40wvhq79qkwj" + }, + "stable": { + "version": [ + 1, + 0, + 2 + ], + "deps": [ + "autothemer" + ], + "commit": "9b20e33a8cc2c76bfe6ad45916be6881386707f5", + "sha256": "0hhwm9dwzf7dqzacxppgq0c64abjn29h0lyf620q40wvhq79qkwj" + } + }, { "ename": "cyberpunk-2019-theme", "commit": "1821a436d3d9f7c46cbd198f93951aa35bbf6ad7", @@ -19165,8 +19281,8 @@ 20211111, 1407 ], - "commit": "b721a96d13b43f7018ed6f697715e829d0e5a9af", - "sha256": "0k19shxpnx4gn34qns83jpdcp1amgrchbcjydx87zrabb1zhbapg" + "commit": "3424926e9c8f03061b55516d2516a9f98999399e", + "sha256": "15rr4vc241ckg75klf0spwhfn9ws9n0q0ybv5wai8i56sk5nmhxk" }, "stable": { "version": [ @@ -19373,8 +19489,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20220802, - 617 + 20220824, + 623 ], "deps": [ "bui", @@ -19387,8 +19503,8 @@ "posframe", "s" ], - "commit": "e2a37cc0a4ec2da858022badd33ccc086b283075", - "sha256": "0a9wb4wasdc8k9bpqx4hs8s9yhhr3lk1wrnbrq160b2iiayk4qss" + "commit": "b5a617ff916ea6c50d6d7a6b5584d51a2ea197a0", + "sha256": "1pncc3np5gbn3f9bwfbzrl1sm89n2k50liq05vxl5ai0hy7zhaxq" }, "stable": { "version": [ @@ -19545,26 +19661,26 @@ "repo": "emacsfodder/emacs-theme-darktooth", "unstable": { "version": [ - 20220808, - 620 + 20220819, + 754 ], "deps": [ "autothemer" ], - "commit": "7ea1435cc2867fcc4f8a133739cdd506f6ac9a2d", - "sha256": "19ivnwpmjzg6bgjrpc47symw13c1ipdjx2fif3p4m7r4sbig0412" + "commit": "d6f3876d686b9af5a5eb80bc55ae3d17f8ec42b8", + "sha256": "1gkkrnz8q6jdp6f46b3dpfxnj7f63xa0icva2m8gy2jiz2v67h4z" }, "stable": { "version": [ + 1, 0, - 4, - 1 + 0 ], "deps": [ "autothemer" ], - "commit": "7ea1435cc2867fcc4f8a133739cdd506f6ac9a2d", - "sha256": "19ivnwpmjzg6bgjrpc47symw13c1ipdjx2fif3p4m7r4sbig0412" + "commit": "980071d47c8577613e8777d9290919d0a09700dc", + "sha256": "0y9mcgsxbsbil9z8ai89pq1l0r30clxpvnyz5q5681kjmkbg7qn5" } }, { @@ -19741,8 +19857,8 @@ 20220809, 1358 ], - "commit": "49e5603cac7d028bfc4c679161a20ca40327956c", - "sha256": "0hs4hq9rj3xrjcm98gd9b6vyvakhq97gqym4z19h1wkrnhf3rpv0" + "commit": "f6ac4a2ba87bd669d196bd4f53ac59191b789dcd", + "sha256": "02xmycxlgf4w7wvlj9mf9fi5jjx9clz782n6fx6cnbs50jwbp2ky" }, "stable": { "version": [ @@ -19790,8 +19906,8 @@ "deps": [ "dashboard" ], - "commit": "62cc1aa84c9f5a6657fcd5032574a7670eac5aa0", - "sha256": "06mc82ibz0rgplhh93g7zjagrwfbn3alrbpy1qw89rphhc4v13n0" + "commit": "1f8c66c7d05c3d350f6986841adaa3294f1699d2", + "sha256": "0pxg880yv1nb08z60jv3j097xxb6qwvcmgl9rfh2gd6nk6bn297v" }, "stable": { "version": [ @@ -20402,8 +20518,8 @@ "s", "wiki-summary" ], - "commit": "de026f399d5b7fa9286f7733b2e3416c6f234372", - "sha256": "1dhf64sb0ja5bs7zfbzkwk40ccqmb35kv3cdhshlmdf9d9fj9jv0" + "commit": "c2ca045c76a63ebea45da3808bf1c1df791beae8", + "sha256": "1ra0yqzh2ak8zkzis908yy7sh906d6n7d26qrwqygbmz92nbrbqj" }, "stable": { "version": [ @@ -20775,11 +20891,11 @@ "url": "https://git.sr.ht/~niklaseklund/detached.el", "unstable": { "version": [ - 20220718, - 1501 + 20220823, + 2025 ], - "commit": "d8e657cc569da2ad0f1916aa0b5dbc444f0675ff", - "sha256": "092j3d7f4fvdb2dz35133wi284q6b02m8d95nnczlwcsrh1ssryp" + "commit": "8a76055290aae3e9b555a055498e71591032e995", + "sha256": "0mgxd82p8yqj1gdbck30yjv5pa2kggpsc9p9r93m4w9q6inczk11" }, "stable": { "version": [ @@ -20813,11 +20929,11 @@ "repo": "astoff/devdocs.el", "unstable": { "version": [ - 20220729, - 923 + 20220811, + 703 ], - "commit": "60099be5fc5c90d5adc2795b3bfacb492a0adb88", - "sha256": "0hxyanl0vy3ajyzrjqgcybp388jxdk139wgwbb0kzw05blr0jzxv" + "commit": "61ce83b79dc64e2f99d7f016a09b97e14b331459", + "sha256": "1dbffni30h8bx04j4hmia3a6xhzrgxx53yhhvymrrr7144x6i3ap" } }, { @@ -21066,8 +21182,8 @@ "deps": [ "cl-lib" ], - "commit": "dabb7be6283488abd8d232ea8ce590d502713ed8", - "sha256": "0j9xq8r4ar6rv6a3gnakm2bzr43r7sqnbgczriifr3ybkssnpzp0" + "commit": "283aa2b9df68ed125090d66a0ae664e1fc196b74", + "sha256": "1pj49l7d7hb8j46sfpbax98kcbsq4bnyclxi770h35bj41br5i01" }, "stable": { "version": [ @@ -21422,8 +21538,8 @@ 20220704, 648 ], - "commit": "6521793eb1a33d56c78bb1e8e579cdeafd224ed7", - "sha256": "06p6aa8k21n975ii6s4aigwm232qibyk5hva4i3y3l7idv6ildn6" + "commit": "ace41c25a6ec8bce755a0d83b3abef22db7ea641", + "sha256": "03wyfy0k02365m21wjpkxafv2vs64ri9sp22ma81ll689ly436hw" }, "stable": { "version": [ @@ -21443,11 +21559,11 @@ "repo": "gonewest818/dimmer.el", "unstable": { "version": [ - 20211123, - 1536 + 20220817, + 122 ], - "commit": "2f915b100044e09dd647b22085e1696249c4b115", - "sha256": "00y6645zjary1sz7517qy5pjwfm5ipsc46sypmdygin65hbbc8wg" + "commit": "a5b697580e5aed6168b571ae3d925753428284f8", + "sha256": "1lj7pgsyzmd547yq33k4r75vfz3pdqafvnrxcv110hmb7mj3dvr4" }, "stable": { "version": [ @@ -22359,14 +22475,14 @@ "repo": "wbolster/emacs-direnv", "unstable": { "version": [ - 20220513, - 656 + 20220812, + 956 ], "deps": [ "dash" ], - "commit": "416ed17efa93503b37eba196a14f967e0899bce4", - "sha256": "0s8p96w6jvlcv2fqf3f3a3fkpk0b6a6znj6xr5nwl49xvdivlaw7" + "commit": "268536f564b7eba99264a89a9149268eb4bc67ac", + "sha256": "1rfr6cby7syshs3fbk83hhb3s4mjp0pfxb4dkznm5sdp259s4rqs" }, "stable": { "version": [ @@ -22481,14 +22597,14 @@ "repo": "alexluigit/dirvish", "unstable": { "version": [ - 20220809, - 1208 + 20220824, + 1107 ], "deps": [ "transient" ], - "commit": "2715ecfaa0147078318d3bcc74e95e0086786045", - "sha256": "10vpk2hcbij4rpa4z33w2xwg24w1n82n4vd0nk2fyqqm575h7wmi" + "commit": "880f426fb780acdd19f932ba99e581c2f276d744", + "sha256": "1a8kbav07wcl9bs3rg14ms5h7k6cs7idnkxzxv7qkkfzv7q3zwi4" }, "stable": { "version": [ @@ -23358,19 +23474,19 @@ "repo": "spotify/dockerfile-mode", "unstable": { "version": [ - 20220806, - 1709 + 20220822, + 2021 ], - "commit": "c7e4e2541deb66d266f58c364e33a4a10cefbc2b", - "sha256": "0hmzwh8m72rj6cwaxfypnv3fmjrs11iqr15vsdw1rw7m55xi675f" + "commit": "52c6c00da1d31c0b6c29c74335b3af63ed6bf06c", + "sha256": "0yj80bcrpckdbhfl64r78q0hmk4hd3ry42lx70ky4h8h7f7l1gra" }, "stable": { "version": [ 1, - 7 + 8 ], - "commit": "c7e4e2541deb66d266f58c364e33a4a10cefbc2b", - "sha256": "0hmzwh8m72rj6cwaxfypnv3fmjrs11iqr15vsdw1rw7m55xi675f" + "commit": "73a8bcc25547b874e1983a75901f6c31708cd104", + "sha256": "0bv19mii4h47jllps72h69nwrlbfvwxgca1cl4cdxvpx0zkr6qx7" } }, { @@ -23391,8 +23507,8 @@ "s", "transient" ], - "commit": "a7f5b4a8b1a43552067ce27bce6080a509c92cff", - "sha256": "0dr0m5rrk0vhz1sq3d28pxijlkj030ckxc5mhqv3jpq2xfjwd2gv" + "commit": "525b5d42c51995f52f0f82fb41ba8e1d246532d1", + "sha256": "05dicql51iaa17qk1ydap8rv276sv1p51w3bbvb3rgbdgz501z0m" }, "stable": { "version": [ @@ -23449,11 +23565,11 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20220713, - 1659 + 20220812, + 443 ], - "commit": "15974ad8d4d7baa071b5ea33877e9dc117c4153e", - "sha256": "0cz0anbp286pcm9ymjlax5p42ifnkkmpcf9q396zl20vgm8xgdib" + "commit": "506c22f365b75f5423810c4933856802554df464", + "sha256": "03a8z9cwfg87144b0g4ggilr925l561hgmgra9wchxwydixrlnml" } }, { @@ -23545,8 +23661,8 @@ 20220720, 1218 ], - "commit": "824eae7ecf1cce08fa41f6762a27670815b7f786", - "sha256": "0jvq6k9qlyk5g9gvs8yhmq27hgdygplvqn94rcjw77gwsgr568p6" + "commit": "f2307b883d6b94b741662dcd160fb7ee24588314", + "sha256": "11nad1722fvws02bp02jsh1xbh9h116lzkzjspnqw6rravf5g5cm" } }, { @@ -23586,15 +23702,15 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20220805, - 1037 + 20220816, + 1627 ], "deps": [ "compat", "shrink-path" ], - "commit": "1b7463832f21369377bf0a3d8f402241ad8102cb", - "sha256": "08cj22njp8xc9mk02wzjvgsxs9w2gvcrr393xqw452x95n59fnr5" + "commit": "acac2409e2debfeabcc81a17b6ae67f9622d72ae", + "sha256": "1bb9xyvvqzf3im8zikhnz1pcvfvsbp6d9zgjq24pmwjids2japqj" }, "stable": { "version": [ @@ -23863,11 +23979,11 @@ "repo": "david-christiansen/dr-racket-like-unicode", "unstable": { "version": [ - 20200513, - 1642 + 20220810, + 2000 ], - "commit": "70bc1caea6b277e49e1cb29e1926a7b0c83c5ebc", - "sha256": "1an4hk9cjg1lhis0japdr371mnf1p4pl5mzl0l1cfkvprbxhzy65" + "commit": "d09b9be289e91e25c941107be5e8f52e7c8f0065", + "sha256": "06h15xfqh8s58m3dn1vxrwwfg129001s7j3jpfik98prjh7n0d0m" }, "stable": { "version": [ @@ -23887,11 +24003,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20220804, - 618 + 20220821, + 1717 ], - "commit": "37b3979b91b06a0520a0d326bc323b4dda280123", - "sha256": "1z4zk38agf2j36gbrj3wmngmk617mc6id8y4c11kvva2fd7l60am" + "commit": "fdf057f5e80037814098dc8bb67888886c89a761", + "sha256": "1v9p120aaa71x30xixxwglvgfwp7pf5y4503zd6rlj98rmidj96w" }, "stable": { "version": [ @@ -24129,8 +24245,8 @@ "repo": "dtk01/dtk", "unstable": { "version": [ - 20220808, - 1529 + 20220821, + 2228 ], "deps": [ "cl-lib", @@ -24138,8 +24254,8 @@ "s", "seq" ], - "commit": "2a76bd06d95ef0b07cad235b01107051616a5387", - "sha256": "1g29af3ds8c0jqk16bnay93z95brnimynp20p7w4n29n7kqfjmhx" + "commit": "a9dce9b7639c2b011f42c04820472a9c0717546b", + "sha256": "0ghq66dv6acc9z9d04443sq5g50hgc1nqplgcdyrxpfmvxg51cg3" } }, { @@ -24299,8 +24415,8 @@ 20220805, 1652 ], - "commit": "dcde9174164aa82708d3108eef40287b363cc8ea", - "sha256": "18ghh62273ybmzklzccy7qg6xasdfk75906qn06yw4xhkwbxlldg" + "commit": "7ce9e8eaf7b65645879c8974dc4f2c5e06876ffa", + "sha256": "1hzcbkqcsdni00nhqxp8gy1s0ywk2q92334n1rhs979xrgj2w0d4" }, "stable": { "version": [ @@ -24403,11 +24519,11 @@ "repo": "xenodium/dwim-shell-command", "unstable": { "version": [ - 20220809, - 738 + 20220820, + 1006 ], - "commit": "f89b831f6f66326f63905b800d95bda233bf9765", - "sha256": "1msnbqwj9czclndgmgi8mf05lbl4qwi5knq9zsw3ydr262gjaiqq" + "commit": "ed5aff8f1176de141cadbd1be6771ef1ce2795f4", + "sha256": "0p62iymjklb2a3ch0pyc9gy97as2d60zvy7sqz746xavqv4lm2i4" } }, { @@ -25081,14 +25197,14 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20220711, - 1845 + 20220822, + 1725 ], "deps": [ "parsebib" ], - "commit": "36b487b798cb432a52c2d5d14c3aec74fc7eece9", - "sha256": "1h3s236drhcpgxxs8pkq2g3wvw6avk0wp9gr2n5d53pmqhdki63x" + "commit": "e1a230b49cb84b2cc8518a8a287cb2291692e68f", + "sha256": "1xl5b9sb07l7vldwl1dd62d7zwjbwaljblc4syaz4in0qc0vcp8s" }, "stable": { "version": [ @@ -25411,11 +25527,11 @@ "url": "https://repo.or.cz/edebug-inline-result.git", "unstable": { "version": [ - 20220210, - 1357 + 20220820, + 2240 ], - "commit": "9fb3c48434da24f800833a5ee3419452d5fb83cb", - "sha256": "09rqvs1vj6h8k93xi5h2r1vba2hj5dl7bk7x9ry6mcr3m0c2z6di" + "commit": "90e401ae3e7b3c85da8b24af940fd97f5e744625", + "sha256": "0mg1cnkxn78dnbkdhcm4pg1c0ac8fz8d2d8cpp80lk3xf0axc0jh" } }, { @@ -26781,20 +26897,19 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20220807, - 1244 + 20220816, + 1746 ], - "commit": "a9d5607372b0935fb1b84a81bfcbdf60a7bf7ca8", - "sha256": "1159kz63fsw116bl42vhfgnzck1g5x6vj41pwz7jl2cx4fgcc7pc" + "commit": "067134a9bfe6326de258f0af666a53e13a9b4a93", + "sha256": "1w44rhs5m3s85jrc1fhrry214f3d3ffw7yrgrlzmpalyg8mng39m" }, "stable": { "version": [ 1, - 1, - 3 + 2 ], - "commit": "45ab1502619c8aa389aeaa25b37f40648e697fcb", - "sha256": "1dgbwaar8l8nl79mlzf5g1n49f1j9yj4772yfmim9vv8ppxnzbqk" + "commit": "df63962605f06f9914b0d33c138000cb583f65c8", + "sha256": "1dmi05ry62nszy9w6zyvzh2q5ii57vdyc7mwv3dyfhwx4hqbngs4" } }, { @@ -26969,14 +27084,14 @@ "repo": "davidshepherd7/electric-operator", "unstable": { "version": [ - 20220417, - 809 + 20220814, + 1439 ], "deps": [ "dash" ], - "commit": "f567f03da4a55d6eafa0e6e148ca4884d5370498", - "sha256": "1km5ghqldd0avbxr9drps6pik51yfkh2dj2gg4z7jkyvi8i0cxkm" + "commit": "281abdae033559fa9a8878ed1dd05a7ade118cfd", + "sha256": "1jsmbibas0jsvlv6zi788f6c16qwr2si0wwj038qdq552q4ckvc2" }, "stable": { "version": [ @@ -27314,21 +27429,33 @@ }, { "ename": "elfeed-tube", - "commit": "4676a25e2739917f61e6721724ee064d8addca4b", - "sha256": "1499aks5whs1vy4lzwhvdgh6fd25va7v7lqcrgkpn8i4nfq4bbg7", + "commit": "d3e742cf4b9901f6372679b917cff64e067c8fda", + "sha256": "1yimx812wfvcng26k433pc4i3n78qzzmir2z6kpg2y1dn4v3yr72", "fetcher": "github", "repo": "karthink/elfeed-tube", "unstable": { "version": [ - 20220716, - 1217 + 20220823, + 238 ], "deps": [ "aio", "elfeed" ], - "commit": "a048950b9dc6d33741ed3224d6d8440fe4408742", - "sha256": "0a8fj2wy9y2k0qrszd4vbizlgpwywjrkjz1vs7x4smbf9cj5mxaw" + "commit": "18d89f19203423b9e2df59a556c1240746903d8f", + "sha256": "0h32bpq8w1j3rbwfqlfj10vvlw21j9rcpqjpp45pw8z6xxb2q0lp" + }, + "stable": { + "version": [ + 0, + 15 + ], + "deps": [ + "aio", + "elfeed" + ], + "commit": "7e1409e41628d61d8197ca248d910182ae4fc520", + "sha256": "1vsrsnvz0ysd36a99zk7n2giv0gxznlnls8zq6lcc0hwqw78i5cq" } }, { @@ -27339,15 +27466,27 @@ "repo": "karthink/elfeed-tube", "unstable": { "version": [ - 20220704, - 1952 + 20220814, + 42 ], "deps": [ "elfeed-tube", "mpv" ], - "commit": "a048950b9dc6d33741ed3224d6d8440fe4408742", - "sha256": "0a8fj2wy9y2k0qrszd4vbizlgpwywjrkjz1vs7x4smbf9cj5mxaw" + "commit": "18d89f19203423b9e2df59a556c1240746903d8f", + "sha256": "0h32bpq8w1j3rbwfqlfj10vvlw21j9rcpqjpp45pw8z6xxb2q0lp" + }, + "stable": { + "version": [ + 0, + 15 + ], + "deps": [ + "elfeed-tube", + "mpv" + ], + "commit": "7e1409e41628d61d8197ca248d910182ae4fc520", + "sha256": "1vsrsnvz0ysd36a99zk7n2giv0gxznlnls8zq6lcc0hwqw78i5cq" } }, { @@ -27677,11 +27816,11 @@ "repo": "elixir-editors/emacs-elixir", "unstable": { "version": [ - 20220314, - 1302 + 20220811, + 353 ], - "commit": "e0d0466d83ec80ddb412bb1473908a21baad1ec3", - "sha256": "1whi4ni2jcinwq68yrzcl0q23dhp0b5k3jy5j3m89s2kdv3rwsm9" + "commit": "d495ed87a9c507f5939a51c740f119950c83e2ff", + "sha256": "1cqiqairhx7chs3n72ii9iqx926hslz9av4m0k1cr52ldnxz1s80" }, "stable": { "version": [ @@ -29282,8 +29421,8 @@ "emojify", "request" ], - "commit": "caaa3a10a9c44aba74f4964b04169b0adedeb2f9", - "sha256": "0hk872z33ghv3ppddis83q37qz2iyc3asvw67fr5sfi891hfrswk" + "commit": "01d4a14f06d76b6d121be897dea8bc92dad50ee6", + "sha256": "0lbfdwyzfbvs584y8ff73fsb7lvr2q0557my0abmr350s0dvrq3w" }, "stable": { "version": [ @@ -29763,15 +29902,15 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20220510, - 2036 + 20220822, + 1221 ], "deps": [ "closql", "compat" ], - "commit": "4524f9a8f19717c4afb84a184db7841b4ffcbf56", - "sha256": "01j2190srr9mkc68f1l9rcpxvqadn4qprddamj351n97079jw4cs" + "commit": "f4dc72d130eae2ad4f479671339d1cdebda62811", + "sha256": "1jl201pg2sack59bbmwf0rbka6jl1b1lxw45w34zkcwgx54xgjfi" }, "stable": { "version": [ @@ -30417,8 +30556,8 @@ 20200914, 644 ], - "commit": "5d2d77abbc0c97f5b23d7089797c3ef8796508dc", - "sha256": "1ayprcd7alryqz89p5gi3wawbc72210r7j8jw7naind7wwkjz386" + "commit": "b382d7d376fad3429940de2fa0d399519e172cfc", + "sha256": "1z3nlvpj5m51hb207niqhclsg8i2g138ynsng20ik8ifwm72a1bj" }, "stable": { "version": [ @@ -30442,17 +30581,17 @@ 20220215, 1844 ], - "commit": "c58471e58117409c9470a04f9dc1de6c765aa86d", - "sha256": "1xhbxcpcvc9vy66qp4ap26cg44dx2j7zarljmmw801ckcmv3ff84" + "commit": "95fe8c4fcf670d6b2aff8a23cd7dad034d2c9b67", + "sha256": "177wa08fx78dvxaci4j7x72a8p6lmqm3hdn1h6nqifcjbvxs6rbx" }, "stable": { "version": [ 25, 0, - 3 + 4 ], - "commit": "89c04fb1836fb865565125a4d5880b93e784d856", - "sha256": "0zchcm7gv52j30fq5p658h9c593ziirq09kkah6mpsvjfdsmvmgl" + "commit": "c028b855ee3f12c835ff3538a90ac5dbc155631b", + "sha256": "0bkl08hp80zcsp6sjm8nh9f40nbwi8vp010b77zs2xi38fn7fbvc" } }, { @@ -31054,11 +31193,11 @@ "repo": "akreisher/eshell-syntax-highlighting", "unstable": { "version": [ - 20210429, - 413 + 20220816, + 2017 ], - "commit": "8e3a685fc6d97af79e1046e5b24385786d8e92f6", - "sha256": "15m084kk3ikw85pw9dg5xwc1abbv51a2f0k421vks0bhi37ba1wd" + "commit": "1ba39a9ffb2298cd716a4314cf3f369028c7bafe", + "sha256": "0w2f5a9cxa365hcc92c24b3kq5dwry3prig57jgnicwmjn5nkqlz" }, "stable": { "version": [ @@ -31166,20 +31305,20 @@ "repo": "DamienCassou/eslint-disable-rule", "unstable": { "version": [ - 20220328, - 354 + 20220811, + 1006 ], - "commit": "7d4cc05d336fbc465f91a87b38bf360efaf76fcf", - "sha256": "08428v3w80v16c8a57gd6abfz2jafvrh0sbscsxm07ykcsp7y2cf" + "commit": "642ead124172dd470e8ab59fd0645597dc9d8e66", + "sha256": "1s7dhc26pbqxkaahr6cag6xk29bdi1iivd3qmkylz1w0zrl33rvk" }, "stable": { "version": [ 0, - 2, + 3, 0 ], - "commit": "7d4cc05d336fbc465f91a87b38bf360efaf76fcf", - "sha256": "08428v3w80v16c8a57gd6abfz2jafvrh0sbscsxm07ykcsp7y2cf" + "commit": "642ead124172dd470e8ab59fd0645597dc9d8e66", + "sha256": "1s7dhc26pbqxkaahr6cag6xk29bdi1iivd3qmkylz1w0zrl33rvk" } }, { @@ -31397,11 +31536,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20220727, - 1131 + 20220815, + 2020 ], - "commit": "b8167727d3c51f7adee6ebcad698ab566b68a55e", - "sha256": "1g3bih73fr8vinasw19kag28f1d2z9isxa5n9jk52vi0rcspmsb1" + "commit": "9675bf58bd7237e2762e24501ccc5a6b4e031333", + "sha256": "127nrx9sd251yr0dg53rra49p4wzgsrxb5f6h5bx29wmfwb7xb67" }, "stable": { "version": [ @@ -32015,15 +32154,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20220809, - 2107 + 20220825, + 745 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "87a1fc7fdf75feaac1b0fd163ca60694eda1834e", - "sha256": "0lp9h23ymzz8xqxr5rxaan8jzj4lynmvcvrc459xvh7dv2j2wl83" + "commit": "691d0cd36e6c09ecbc18537b7721dcb6d775e873", + "sha256": "043x68j8g0prv71xbpakw781jb56ywsg55bpf7b14lbb36v0mqvz" }, "stable": { "version": [ @@ -32216,15 +32355,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20220809, - 650 + 20220810, + 1901 ], "deps": [ "annalist", "evil" ], - "commit": "c1ede88de9b09f280e4a37c671b6dd540bf1028a", - "sha256": "1zx14vm9a7gf38vm4fzby0rg9dgwryp299k735v8f6xghgvpx0k4" + "commit": "665d5c99e216c7b18856f7ceda7c91ea5669f904", + "sha256": "0vmwd85vc6hcyfzg4zwhsilp6y0kmygnyfn02ham0b6gc2kakz23" }, "stable": { "version": [ @@ -33533,8 +33672,8 @@ "deps": [ "evil" ], - "commit": "87a1fc7fdf75feaac1b0fd163ca60694eda1834e", - "sha256": "0lp9h23ymzz8xqxr5rxaan8jzj4lynmvcvrc459xvh7dv2j2wl83" + "commit": "691d0cd36e6c09ecbc18537b7721dcb6d775e873", + "sha256": "043x68j8g0prv71xbpakw781jb56ywsg55bpf7b14lbb36v0mqvz" }, "stable": { "version": [ @@ -33736,15 +33875,15 @@ "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20220805, - 1520 + 20220819, + 1408 ], "deps": [ "evil", "tree-sitter" ], - "commit": "7ec5835662941ce64201281bc0ed0f31ee34e48a", - "sha256": "10kh8idwlcxa9f7f5jmwg1sykm3v1lv50lf3zqn13k1blj0k0ya0" + "commit": "f0b887faac1eb1f964e11745e63c1ef53398a7a8", + "sha256": "1y2gvf0l6g8gr8kkgy0mi098l5dh2hkmx8nsqid319zr8d4i6cd8" } }, { @@ -34459,11 +34598,11 @@ "url": "https://repo.or.cz/external-dict.el.git", "unstable": { "version": [ - 20220801, - 2349 + 20220816, + 2136 ], - "commit": "aa051548ca850d15f939acfa82b358f756a761f6", - "sha256": "1nnkyy7wi5zkb511bsp8j95p88rd451nfncyvss27ldrscnizjf0" + "commit": "680c37f01e5205805dffeef05be00e2196886a8c", + "sha256": "01rq6xw86q03br55njh51myzl2v1wfb2z6xpapwfs77rcismx616" } }, { @@ -34787,15 +34926,15 @@ "repo": "rejeep/f.el", "unstable": { "version": [ - 20220608, - 943 + 20220814, + 1054 ], "deps": [ "dash", "s" ], - "commit": "d2019d4f9625bcc44349c69fe46d6645fd9ff4ff", - "sha256": "0vml6p19zwab2zrln2g6g2hb31czlz2rqln5wi8lc37h8lgfx7fy" + "commit": "85c91f95f8b98e153fd959ae467b46bf79622c5d", + "sha256": "0rb85v52snsh2532na9p4b98lkfd0zz6646frw44k7ydbp29wnd3" }, "stable": { "version": [ @@ -35290,8 +35429,8 @@ "repo": "jumper047/fb2-reader", "unstable": { "version": [ - 20211214, - 954 + 20220820, + 1607 ], "deps": [ "async", @@ -35300,8 +35439,8 @@ "s", "visual-fill-column" ], - "commit": "9dcc0801a7dd302ee0620781ea17868895d3f082", - "sha256": "1i74nqivp59129w2n81x86zrf0cy4ws6wyxdsw65nib96jrwg683" + "commit": "8138cc3b674c911e92d280b97a5fdbbdf6e3182d", + "sha256": "1qg7ndkr4mv5wfgss05iq3gnj2s9nx6pmikli0s3m3cilxp6c53k" } }, { @@ -35519,8 +35658,8 @@ "f", "s" ], - "commit": "fad2f5ce83800b7ddcd5927bd84d377990446981", - "sha256": "08mcbxiqq445cgbgib39c701216ifp9dsk8m4gdbbn9iam3vj3bx" + "commit": "24fc776c9647859031fdc44d737aee5b96d2bf51", + "sha256": "0gybszfhlndpgw1sidif0ksmlnrw6pfm835j5vxwggkkvk5bn6wz" }, "stable": { "version": [ @@ -35693,8 +35832,8 @@ 20220704, 650 ], - "commit": "7da1dc1259c1b15e28736d27d87f4cef40a3a18d", - "sha256": "1ryxay5pdwvcdz85wwmxsdpi1cjr38ybfawgg2pxcbyqizydlyry" + "commit": "84f3ba47d7864e9a5ba9fa83770e3f3919751380", + "sha256": "0jsc1svbwvlh14ccrabgdpkjv2lx6yiaxzgh3syd89r677da4cwk" }, "stable": { "version": [ @@ -36836,8 +36975,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20220729, - 1039 + 20220823, + 1254 ], "deps": [ "dash", @@ -36845,8 +36984,8 @@ "pkg-info", "seq" ], - "commit": "8541a61053bba1f2f31d0791e597cd3c78a21456", - "sha256": "1rh76xwiikcq2pbq5i2nf5dx1dsgaqlgmjpcm011w99m0nzg7bvi" + "commit": "600b3bffda3862121d96bbc5c1f8990fa9033a82", + "sha256": "0nv8ln8mr63kn1c41amj88isl8f3imqhb0bqrpl6g6frm2rfwxkm" }, "stable": { "version": [ @@ -37762,8 +37901,8 @@ "deps": [ "flycheck" ], - "commit": "93c5b26ec55d0df54bc230e2de0890fe074f35d3", - "sha256": "0f0713a0d9l92cy6xc5y1cg4pg88kq58krlz37bkfq3s20yfz097" + "commit": "8a7293dedc6245830580260d2dc70e1001a0ff29", + "sha256": "0aqyzv7kz8b75s640dml83a2ckwkjw9s6bmzfkfjjcbxh8jn9d0r" }, "stable": { "version": [ @@ -37804,25 +37943,25 @@ "url": "https://git.umaneti.net/flycheck-grammalecte/", "unstable": { "version": [ - 20210705, - 1656 + 20220822, + 2307 ], "deps": [ "flycheck" ], - "commit": "59b37e09923290da1c8458e507da43f403f555d2", - "sha256": "1l0rq2g9dn90xr75cjz64cyai90m5cayr2b2fdrkkrz70g00pqlr" + "commit": "314de13247710410f11d060a214ac4f400c02a71", + "sha256": "0xxg98mny4f5x9j9s05an668v0b4d6r6f87nmsfni8wjf3f404zy" }, "stable": { "version": [ 2, - 0 + 1 ], "deps": [ "flycheck" ], - "commit": "fab1b5071b7fe7a34869ffb8672abad38948c047", - "sha256": "040mb9djj4cxpjsjch9i30pi36a2z7grkhnsnfdi5qyh341p4pq0" + "commit": "314de13247710410f11d060a214ac4f400c02a71", + "sha256": "0xxg98mny4f5x9j9s05an668v0b4d6r6f87nmsfni8wjf3f404zy" } }, { @@ -37841,8 +37980,8 @@ "grammarly", "s" ], - "commit": "fccdba6a6bfb043031a43c62b3c5b635d52bf723", - "sha256": "0f26x7ssvagpilv30hn7wc106m4jbf6qha26jzym4ymyfwj0b503" + "commit": "73308f79d98dbb12ae68e2823970edc84a7149ca", + "sha256": "1bvrfrnslfsys2q9x9cvfh4q9qnnqi3gsxmnjard03h7h80vqbfa" }, "stable": { "version": [ @@ -38267,8 +38406,8 @@ "deps": [ "flycheck" ], - "commit": "53b3e46d47a0e70fd2e5c49fea9134ee9aa41793", - "sha256": "1di51jp20ymqkp777rsvwkqzr9vpnpi90b8bd4db5v2ji46xrkjf" + "commit": "f267f3075298ef715406f16efc1aba23f53a37ad", + "sha256": "06igrpsicszsn4jv094ripb4qn4y2n193ikhlsyjmr9wij1r4l4g" }, "stable": { "version": [ @@ -38480,8 +38619,8 @@ "deps": [ "flycheck" ], - "commit": "0a86156fad0d6f02e8e6b4c5594f7173c96d6481", - "sha256": "122j1imz755lhfhlnzl4gggghbvpqyq6r6iix3qq60kzb3hpq1b2" + "commit": "3b08af9f502d64db26c7e6fea3510155d7e6d185", + "sha256": "1f240kpnzwp6qzrj640592vwjs3mgjy6r6n61s7x5flxqhn911c7" }, "stable": { "version": [ @@ -39025,8 +39164,8 @@ "flycheck", "rtags" ], - "commit": "c628efc9b485470a48aec2692d79f7c140bc5b92", - "sha256": "03avv7brbrj69368riq3xg4qh65yzl5cyjn9wc2rbyx4jw2q3p4p" + "commit": "b9c680e7ca003c103687e790f740d86daa6b4b17", + "sha256": "01f1vv71gimhsm6bzh0fxfmap54qs4wqnc5zj9barr9zvwpqmrbn" }, "stable": { "version": [ @@ -39184,8 +39323,8 @@ "deps": [ "flycheck" ], - "commit": "54193175c87a4c0bbf7ed16a3e76d6daff35c76f", - "sha256": "000fp4qzmc4kbjji03lxwafyvv32r4i7adf29j9s7v7dmdljpndl" + "commit": "d52d7edd51e0b06e174b6744e5aa12ab15602cfa", + "sha256": "056qqrkrr0slxw8dck5xwxx8xf52j08s2jgh87sb8qn6naq7byz6" }, "stable": { "version": [ @@ -39575,8 +39714,8 @@ "deps": [ "flymake" ], - "commit": "d3c632f26a2d13fb288252c288faaf8107b3d86a", - "sha256": "1xylljq1j71xr7xmykk2pl816f8lkxf0314ghmhlfx0pxir9xpih" + "commit": "238d872c40b2a5ea26710845369cbb15dd37f351", + "sha256": "1f0qc8vz9bgwyzavcd06sg02g7q98a9ynprwxa5mn1zhfavmawxh" }, "stable": { "version": [ @@ -39803,8 +39942,8 @@ "grammarly", "s" ], - "commit": "7ad726f27031fbe816885632155851cc2cfcd522", - "sha256": "0yzandkqkwnsqm3mahq03l6ki45v8g5hz9fz6krnyg82n5bx32zh" + "commit": "2e3c0851b322c21e4147c92f05d2488687eccd8e", + "sha256": "0g11iv48ya9dlw5mslqkz1iray90k9c7jbfxhw7imk479x0954ln" }, "stable": { "version": [ @@ -40059,14 +40198,14 @@ "repo": "emacs-languagetool/flymake-languagetool", "unstable": { "version": [ - 20220704, - 637 + 20220814, + 550 ], "deps": [ "s" ], - "commit": "857f4f94a7615d7de5305a40045b2b85ae1ff760", - "sha256": "1kmqk7hq07lclnbcmwhwnsbrn4qj4qkbq9kimfc0vy7fcd7qb79p" + "commit": "0860650caa5538ccb679b5149dffb9b4992cfa75", + "sha256": "1v71cdyy836ls9cl7is7cqcg9hvi7fldl33h3c95p5z6vis44djr" }, "stable": { "version": [ @@ -40182,8 +40321,8 @@ "deps": [ "flymake" ], - "commit": "394b961b27b1fddc3c7107046a53d47f58757300", - "sha256": "0rv1i02lg9x5iidmx6bhf6qw22xv8gmnrd3pspnv6xc7p3bq4gwl" + "commit": "a0bc983c6187c03b72a93e78371c391a28321b81", + "sha256": "1b0bzbzlqcnr3q3lrcmrvys8azhbvla34f6bmk2gqngavd0jckyh" }, "stable": { "version": [ @@ -40271,8 +40410,8 @@ "deps": [ "flymake-easy" ], - "commit": "433fd05b608f06a40bb209fbea76117d896449ed", - "sha256": "149yk0l55p2fcvcgy0pqv3iw8mgbskycmb84bqvjg8227a38bks8" + "commit": "dca5d00fa1fb3f25d2108e9cbbd0c74b71d8dc64", + "sha256": "1gzqgjxvsynzng1aiax484442vx14fj8409f09nmd4prbff3m1zg" }, "stable": { "version": [ @@ -41329,8 +41468,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20220622, - 1929 + 20220821, + 2143 ], "deps": [ "closql", @@ -41344,8 +41483,8 @@ "transient", "yaml" ], - "commit": "ed8abdafd8b15852538bbe064fef037345772627", - "sha256": "0kdj2x3sj7iy9xs2qzw0p7vm2hi7r0brcnqyjwirjj4x5jr6ag61" + "commit": "6a820a424465900b0cc7bc54ccdad6491764e581", + "sha256": "07y3001wjslc8qzsg7vrr6yndmxh5icdgvwzff239hkgqr9a1ag9" }, "stable": { "version": [ @@ -41400,15 +41539,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20220806, - 702 + 20220815, + 632 ], "deps": [ "inheritenv", "language-id" ], - "commit": "7e375c01eeaacdf33a27b59f6cf1849bb6a0caa5", - "sha256": "1xh6bbwcgx6bs78vfmfv5cy16ng7i9k37kr1cpdxfchjl3ylyhw1" + "commit": "f5e97b4feaba46be2cde825f22094e4b6e595850", + "sha256": "0k02m7h94h31mynkki1gasa4ch176cm0mg05x8zafp2161dhz49n" }, "stable": { "version": [ @@ -42179,8 +42318,8 @@ "deps": [ "cl-lib" ], - "commit": "b0badd157101d4b6b184f06726b456a00171b801", - "sha256": "11vpvjyh860j0k7rcysa0ssgggrai8fq6q33hqw2wz66pf2xn6bv" + "commit": "cda1e5f9ad1d6b55077b7a88f18e89e882e8ffef", + "sha256": "06am0vp9c19axd4zjjvpsp7wshrj9b08m3l6zz40fzb215sam7ki" }, "stable": { "version": [ @@ -42333,25 +42472,25 @@ "repo": "jojojames/fussy", "unstable": { "version": [ - 20220723, - 1500 + 20220817, + 1234 ], "deps": [ "flx" ], - "commit": "d789dd9eb292ef2ff8a0959dc015f2edc67af6f7", - "sha256": "1h08kbd7i1g84rxmwn50rq9h67xmi615wg0yzjzdi0x4f2y56xgi" + "commit": "fa62f9624a6847dac594ab9f9a3154105ba2e3ef", + "sha256": "16ra07ry0gnkimab125971q32aza1zrc4yw4f73cvvphv4ri9f9m" }, "stable": { "version": [ 1, - 4 + 5 ], "deps": [ "flx" ], - "commit": "4526f81bb76b5af3af13e540ff7a5f1ac0d8ed4f", - "sha256": "0mk31kf9aj0mmdynv42h3lwzd4x9ys1d9s1r9qyy0kdi8y8vcs21" + "commit": "d59703fb6f1e1fcba6c5e1a607cadcceff763621", + "sha256": "10pbi6v5xy5fahxl28p244pcnmx6ym7vwzbrkza06szpl7fjv5k9" } }, { @@ -42362,14 +42501,14 @@ "repo": "diku-dk/futhark-mode", "unstable": { "version": [ - 20220425, - 1144 + 20220824, + 828 ], "deps": [ "cl-lib" ], - "commit": "7fd0a3c6c96ed8afd0249ab0734d9b63d4fd1cb1", - "sha256": "06y66lzhw2vl5y3lpcmgn71rpshq07ljah2p2ksgml87qml29r3s" + "commit": "adf92a6c38b059f8ead65a08ccebdc5855cf9d1b", + "sha256": "0d3inzi0m87qcql0xlppxxprzjn4k8crvds6vmqv7b7wvk86rdjn" } }, { @@ -42407,8 +42546,8 @@ 20211231, 1837 ], - "commit": "74867a4c991b98cf636ff1a2b81c2a6b41ebbcb9", - "sha256": "0rw59nga6phhrzlskq03qwg4k3l4pyn9cdzcmg3vjf1nvssa13g1" + "commit": "c848480e81028a29c634c43b8162230cc3601b32", + "sha256": "1zvwj0py6148hzdjfdrlzbq7hah4sxlniprkk1w8wdsab4p9hmmg" }, "stable": { "version": [ @@ -42641,11 +42780,11 @@ "repo": "gvol/gap-mode", "unstable": { "version": [ - 20220503, - 1555 + 20220815, + 2355 ], - "commit": "99237f714c28981142674e8cfeb155863c834858", - "sha256": "0bjrrjz6k7a83gxad9grmynr14s6mig4cihd21nk6x499fn3ssia" + "commit": "afa70e8e396ce15f348612f09146650795fe58f8", + "sha256": "1y4djgqnhy7yrv8az0bgpdyhlpgbxz1j9b84bfg95flrwfbbjiy9" } }, { @@ -42811,28 +42950,28 @@ "repo": "emacs-geiser/geiser", "unstable": { "version": [ - 20220802, - 1327 + 20220825, + 46 ], "deps": [ "project", "transient" ], - "commit": "bd3d4ab6d7dffd9f8565af32471dc58aaf5a2214", - "sha256": "1kz8sl1iyrxx5lrfj4rkzm4xcmgvxwkvxdpw37id2jh0d986x0ql" + "commit": "621642856832dff4f80ad60153b240991299d419", + "sha256": "10pv8c09hhzbsiq7gvcgaqjcn1sapql841vsky359dzd5nx0jzld" }, "stable": { "version": [ 0, - 23, - 2 + 25, + 1 ], "deps": [ "project", "transient" ], - "commit": "bc0dde310492de733f9ec528d7aeddd57093d05e", - "sha256": "1gxa5ba5n7k169klg3zyrl8ywyljmcp006x2fql3s7awz0c98rw0" + "commit": "ecfbef1c771f3a5c34f46fb2b387b9669c661d2f", + "sha256": "0qm43qkf0rpcbsf5wb7b51m79jvn2fkl19f49acbzjpavx66vn3n" } }, { @@ -43306,16 +43445,16 @@ "repo": "thisch/gerrit.el", "unstable": { "version": [ - 20220809, - 928 + 20220812, + 2150 ], "deps": [ "dash", "magit", "s" ], - "commit": "eaedb6a200bf76d5add77e4cb00b8b9fd57fd087", - "sha256": "0ygdfycpipk3g51kmw419b2r5i4240v1i3hk5xjps0ni4x87i26i" + "commit": "4de561d1295d4c86ca9b159ab0c746bedc2d0380", + "sha256": "1k1gr6hnb9warbaglhfzarm145afsrv55xdkq6wq6s0imac742ba" } }, { @@ -43606,16 +43745,16 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20220624, - 803 + 20220810, + 1157 ], "deps": [ "compat", "let-alist", "treepy" ], - "commit": "94f5aa2ddecc6426ebc69a0c67934ccba6ae9797", - "sha256": "11ylxrc6hrzzw0z2wd9h375fmg42q637c5nf1n8yxmqfx3skj5bm" + "commit": "4e5bb75305a763ef9ccfc1971b3cba4520f290d7", + "sha256": "11a5r5bvjh5d1iwiijwvrd1iq5yvlhqjq00n0ral1vwx1f273zba" }, "stable": { "version": [ @@ -43906,15 +44045,15 @@ "repo": "walseb/git-backup-ivy", "unstable": { "version": [ - 20220412, - 1914 + 20220816, + 30 ], "deps": [ "git-backup", "ivy" ], - "commit": "c53e1bc800963c0d826226c37c22e36f2353c70d", - "sha256": "02ilrrgb2vijhd7sylj8dxdbpxh83zxhkkb8m9kqn8mqxpj0ii1g" + "commit": "ad6434bcd540de8e3cd9953035680f0a745040d5", + "sha256": "1c3ycd4if2ykd7pl7zxlrh6cqgrz158nlx9ynq3cddqglqb0jw6l" } }, { @@ -43981,8 +44120,8 @@ "transient", "with-editor" ], - "commit": "8a0cc83eff98489d3685b8585afdcebbb47c1393", - "sha256": "0hf3zyxwhknnkgcms5phwf5qrbzjkj5c8kpmynzb9bwr6ba8yf6p" + "commit": "712be4632b0ddc7899ca90db8f9be20d90b4326f", + "sha256": "08dk0vdvsxc2pvvk5h3xf2pxb572scsjd4mcj19lqhrzkcwnxgsd" }, "stable": { "version": [ @@ -46776,8 +46915,8 @@ 20220704, 630 ], - "commit": "104a04c3228b3cde2432ae802d739859f96c8509", - "sha256": "1akd9bvz736sgwf9wbi97yjaipw6kkrmfz7azb78jl0kwngfzqcc" + "commit": "b4c6f5ef2f0b2449d29e45e6fb95fe3b0f3c8bb6", + "sha256": "0cv6b9xyx6l59syrxj71xnjjrr8b8inhldxa6ra8sb79q26yag1h" }, "stable": { "version": [ @@ -46839,17 +46978,17 @@ }, { "ename": "goto-last-point", - "commit": "20148869e301d236bbf335e8545131488ad57f27", - "sha256": "0lns0w7zvi8afsr64kcyn68arrjf7bqmpadw12zj100nnnvs40lh", - "fetcher": "github", - "repo": "manuel-uberti/goto-last-point", + "commit": "5b8fb98e7825176e4661675e064296e98c2b0d8b", + "sha256": "0m3ywjxk0p2z5b0q49jz5nddig24f0knqs7yyxzjxil9gq5q2jkr", + "fetcher": "git", + "url": "https://git.sr.ht/~gitmux/goto-last-point", "unstable": { "version": [ - 20190525, - 1855 + 20220816, + 153 ], - "commit": "6218441a0e644c23e247594aece004e80775d307", - "sha256": "1rhf5llw9k6r05wrr870c2m1d6jalz7xz1rsgl1fp01pb4jwq82i" + "commit": "0a006c70719f479bc4e3ae75dd2fc84cbb15f049", + "sha256": "013nh9lwh22v858bkhwj3mqzwg378ncmjp7y4m2hhbv4ap0ay3vd" } }, { @@ -46863,8 +47002,8 @@ 20220704, 630 ], - "commit": "b58af255e822b6bb226085592ca471dee6027b95", - "sha256": "03cxm3hlxzf2nz30p360jpskiw6279frr8v6jw42ismm6ryvlw4d" + "commit": "162f6f3e410365399efed4122321eec23d482e22", + "sha256": "1r8sql7cv1a9nf8l31vdygvrjx9vs3k1jbywrswcdpwb4njmxlar" }, "stable": { "version": [ @@ -46893,8 +47032,8 @@ "magit-popup", "s" ], - "commit": "f036314826293cb5df72f124a20b175d17e6daa4", - "sha256": "0g1s1rhndb35d9g3p2kbgj6pw022xqijhl61x8k4csgy0fyj1g9b" + "commit": "cf96cab7e22d0f7e3dcfaaf6d079b9491d8af7a9", + "sha256": "0j90ir14amhigh2rb31n47zhajcm67ymw7svc31y9z744q2gjb6b" }, "stable": { "version": [ @@ -47128,8 +47267,8 @@ "s", "websocket" ], - "commit": "1242c4f26c70697ed2447b7fca41645e8f9daf96", - "sha256": "1kwkihvkhrl2ibqjpdy04df0vryqfhn55kpizydhw5hxwipq85i4" + "commit": "fa7463ff3692581112c6aadade570744028ecc91", + "sha256": "054bna6d2pzvvx7jf0v54v9lpjrd0r4k3yynzvbp92a48dhnap8j" }, "stable": { "version": [ @@ -47523,11 +47662,11 @@ "repo": "gugod/grey-paper-theme", "unstable": { "version": [ - 20220711, - 2241 + 20220811, + 2301 ], - "commit": "10e243316000e85a10b49729745ccd4262d21cda", - "sha256": "14hyq5hh4z6lmrh94hc07pdxarw4wy510p55vb7czfmh98z6nl5f" + "commit": "760e8d26f5b2aeaa56b91bf435e42b1e5d6f69d7", + "sha256": "0wlf35yxd04xfjyyq2xp7bw6bqqz9l8b5cgq897rknjglwk867py" } }, { @@ -47746,26 +47885,26 @@ "repo": "greduan/emacs-theme-gruvbox", "unstable": { "version": [ - 20220808, - 302 + 20220822, + 1711 ], "deps": [ "autothemer" ], - "commit": "9c31dda03e386dbbf7ad206f401528261942fbb3", - "sha256": "108xr16kzfqsvwp07xwas93j6pmpwgsshdlj26l8qkfvqz1fvwj5" + "commit": "74e8dc88b7fa15bba964f4f1ce1fccd76f523bfd", + "sha256": "0i9mgfym6rsdj5kgaz3l9bdif6hbv22l3axxp3cnfhm937spqbvq" }, "stable": { "version": [ 1, - 29, + 30, 0 ], "deps": [ "autothemer" ], - "commit": "5cc7e7354a778d5e9df5ee6850e2fdd8e02851d1", - "sha256": "0ydwr2l3jhqbs3gk5qajirl54vfb8i65qrlzrs04jnsj1pkzq5xa" + "commit": "e9f8e6ee52727f6008c125b71a26c80cfa59c0af", + "sha256": "1dzaivis9cpqzb53qmkmhijr5l4hl2l3yr2412jxrz2jmqi3q4c5" } }, { @@ -48055,11 +48194,11 @@ "repo": "Overdr0ne/gumshoe", "unstable": { "version": [ - 20211229, - 152 + 20220816, + 2254 ], - "commit": "2366f1c65cdcf09c6b98ca466110842cd88c9db3", - "sha256": "01ha47h7ylkkplxz2bm6h5d773lvvjdgmqh3b9r5asjiyma8zn31" + "commit": "5e30a68f1cd80c8bdf67c06afa1fe7642decbef7", + "sha256": "1vw7p92qq5ahvzql4pcbza0nzf2rxfxc6i5g64ldv1hgzih0cv56" } }, { @@ -48194,14 +48333,14 @@ "repo": "hhvm/hack-mode", "unstable": { "version": [ - 20211224, - 19 + 20220825, + 127 ], "deps": [ "s" ], - "commit": "a522f61c088ee2a13ab17f289a3131329e59badf", - "sha256": "0nz3mcrdkjjmnj0b1n3hs9hy2kbn004w64j2v6f2i8np2k2il6sd" + "commit": "26f06ffe82574f98e7da381e48202eceb8ef0793", + "sha256": "0sbrrwlr64dkb1dnfblx5l8ypwmcjxwbzf7ppqjnw0n2wx466751" }, "stable": { "version": [ @@ -48407,14 +48546,14 @@ "repo": "alphapapa/hammy.el", "unstable": { "version": [ - 20220808, - 1841 + 20220818, + 2115 ], "deps": [ "ts" ], - "commit": "0151ac98064f1b7d2dc542598cc0f6711c065800", - "sha256": "1mimgkfywpr9mqahj4r52sj3dp7p8xnb8wir514c3xc2frbgwkff" + "commit": "81e0316a98c4788375bc0e50e5d6ba9dd440e586", + "sha256": "11nzlnc5dfdpkf6cg0njxjm15p5gfih4v8jbwd7zwah8mm3cci4n" } }, { @@ -48780,26 +48919,26 @@ "repo": "purplg/hass", "unstable": { "version": [ - 20220612, - 2151 + 20220813, + 1717 ], "deps": [ "request" ], - "commit": "9de26718ba6f369c9f161957cbc5136382fc51e1", - "sha256": "0jb38idqrh16mfn5hkvl1q96njd4s9s0a6phqjhfs8vpg53f27f9" + "commit": "c6d9bd2e29fc2c4f37c0c72f3d136e43f34addbc", + "sha256": "0km3gcsd9vn4w9700rzfyfw4vj47sbd39xxn42lgqjw0h1bywdkw" }, "stable": { "version": [ 2, 2, - 2 + 3 ], "deps": [ "request" ], - "commit": "9de26718ba6f369c9f161957cbc5136382fc51e1", - "sha256": "0jb38idqrh16mfn5hkvl1q96njd4s9s0a6phqjhfs8vpg53f27f9" + "commit": "c6d9bd2e29fc2c4f37c0c72f3d136e43f34addbc", + "sha256": "0km3gcsd9vn4w9700rzfyfw4vj47sbd39xxn42lgqjw0h1bywdkw" } }, { @@ -48990,15 +49129,15 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20220807, - 734 + 20220822, + 659 ], "deps": [ "helm-core", "popup" ], - "commit": "1d066466feb786f3477f1e6b3278d6af54666177", - "sha256": "0rgwvav867k7y7nx850nzxq14y10bjf1344m8lk8qs9f4kzy2mnh" + "commit": "4e99cc8ef66aac2d824c456f58abe833be26c99d", + "sha256": "0lldprrgmr7gbnqfp0g7n342hgp3aqbfzv4n9dc51sg1fsdivpz4" }, "stable": { "version": [ @@ -49896,14 +50035,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20220809, - 1446 + 20220824, + 1925 ], "deps": [ "async" ], - "commit": "1d066466feb786f3477f1e6b3278d6af54666177", - "sha256": "0rgwvav867k7y7nx850nzxq14y10bjf1344m8lk8qs9f4kzy2mnh" + "commit": "4e99cc8ef66aac2d824c456f58abe833be26c99d", + "sha256": "0lldprrgmr7gbnqfp0g7n342hgp3aqbfzv4n9dc51sg1fsdivpz4" }, "stable": { "version": [ @@ -50460,8 +50599,8 @@ "deps": [ "helm" ], - "commit": "c7584ce5e75c7f1b7b31c820fcd30bde4614c663", - "sha256": "0spzwm0g2fq3f8fnr23l2vndlbbwa77s1554fmx7ck14qj7l9jfa" + "commit": "20656a0c222708101f7738490ace67d822f482f0", + "sha256": "0a35gan19b7j3kswl083k37q4ipysmnrnyrv6ncav5my8xgrjj0j" }, "stable": { "version": [ @@ -50725,8 +50864,8 @@ "flx", "helm" ], - "commit": "6098cee7fb274a814e539db85b7a4924d56493e8", - "sha256": "05mr4rxa84bpgkbq6yxjg51rffbcfph7q9377mcy1n1fmfxxm1hk" + "commit": "a716d266f0042aa2164d51f82aa76932119748fe", + "sha256": "1bag2ada7k99znn46f8apg7gz4bm93ya1p645jpgamhc98g3hi08" }, "stable": { "version": [ @@ -51526,14 +51665,14 @@ "repo": "emacs-helm/helm-ls-git", "unstable": { "version": [ - 20220727, - 505 + 20220818, + 553 ], "deps": [ "helm" ], - "commit": "9d91c25c7d1776d137fd126f241d0272b6e5f90e", - "sha256": "0bxmhi1dr553v1grspig5b16ldwl74dzflf6xqi8kk7wdpk1ir3k" + "commit": "fc44fc1015bbc75d16e7d7aa5d971ff1ad85e9e1", + "sha256": "1im54c10nv5i0bncdcw8x6mnyy1jh6w9dxg09rkxvy0vjjpv17pr" }, "stable": { "version": [ @@ -51796,14 +51935,14 @@ "repo": "emacs-helm/helm-mu", "unstable": { "version": [ - 20210816, - 913 + 20220825, + 1025 ], "deps": [ "helm" ], - "commit": "b85019d01815a4b58d6016c3a30fefa60d8363f2", - "sha256": "0dld66r7z525y1b22liq2j8fz248ghj8pxfid66508jpxhh71np3" + "commit": "85714ac9a9db6619035c40f5b5a2cae948561b01", + "sha256": "1rvq7jbc2a0r2ab6ffxp9rbd907hjppyj4j29mjvm9f5frb2w7f7" } }, { @@ -52004,8 +52143,8 @@ "org-ql", "s" ], - "commit": "06f1e1be6ff5ef7e2c8c05dc1954bcedcbb6eb0b", - "sha256": "0qn3ww9hp08xbmjicd451zcqm3za84wvizjwlzmxi6hqsaxmzpfm" + "commit": "d7ada532c7d06e91d6e07800ca22d5fbdb970e3e", + "sha256": "0nj1dvg30wj84ayqkjifxi1h0g1kjkm6nhhq59w13pkl2q0w5ygw" }, "stable": { "version": [ @@ -52365,16 +52504,16 @@ "repo": "bbatsov/helm-projectile", "unstable": { "version": [ - 20220807, - 350 + 20220820, + 826 ], "deps": [ "cl-lib", "helm", "projectile" ], - "commit": "6dcc543815984f7f40e99050b1ee3b68a088e160", - "sha256": "0xhf56p3svl9bs2gc2sj1i3k6y3wrcbrrh3jfr09pxziffj0300z" + "commit": "5813f7286533990783546c9c39c184faa034d1f1", + "sha256": "1qrdms3lmr7wspqhd0ygqmyznlc6spy2lnn1n8p4v495nzdygzdh" }, "stable": { "version": [ @@ -52763,8 +52902,8 @@ "helm", "rtags" ], - "commit": "c628efc9b485470a48aec2692d79f7c140bc5b92", - "sha256": "03avv7brbrj69368riq3xg4qh65yzl5cyjn9wc2rbyx4jw2q3p4p" + "commit": "b9c680e7ca003c103687e790f740d86daa6b4b17", + "sha256": "01f1vv71gimhsm6bzh0fxfmap54qs4wqnc5zj9barr9zvwpqmrbn" }, "stable": { "version": [ @@ -52898,8 +53037,8 @@ "s", "searcher" ], - "commit": "521326e61b878bce0db7e1a862ffc890bd59122f", - "sha256": "0fxd61k1ry4xwkam965yk0vs5h9l6v918lka7fna92hfww3wz4ik" + "commit": "4219ee9e6d173caef7f8a4a586966b054f55d8e2", + "sha256": "11w5d2qmbwk7ph6yb2xfdi8waiyvp44yhqqcgz80c071kjjay3s1" }, "stable": { "version": [ @@ -54323,8 +54462,8 @@ }, { "ename": "highlight-parentheses", - "commit": "40bb1119bea79bb9e91378c99e2aa60936de013a", - "sha256": "0ly9d01ja517psf1sqg12wyljykixi5c6qbhahyjy7n331kkpkmr", + "commit": "746947a065c8fd26bfb540c96d869d05a0bd9b53", + "sha256": "0zb23w53izwbxdsxfia6ja97jcd4yxl9hf7a9ip46d7m7ncmgkr4", "fetcher": "git", "url": "https://git.sr.ht/~tsdh/highlight-parentheses.el", "unstable": { @@ -54735,6 +54874,21 @@ "sha256": "0fwb64ja5ij97308pnd7g6l5mascavcp7jcar8igxv9yyqnw6pfi" } }, + { + "ename": "hl-indent-scope", + "commit": "40d598ab57e33b1fe5838ed89077e2d6668f6ff5", + "sha256": "1mm8bgj6qjbkqf9h4mc6hi556byigj9xll5sr9vx5yw3fav4yc1g", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-hl-indent-scope.git", + "unstable": { + "version": [ + 20220816, + 426 + ], + "commit": "243b6e4202502439f39ab2a485e4ecf8ea50edbe", + "sha256": "14mlpddh5hkxk2db2b46a526df2aap7y4hi9kf70gcz63yjhn07w" + } + }, { "ename": "hl-prog-extra", "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", @@ -55180,8 +55334,8 @@ }, { "ename": "howdoyou", - "commit": "eb5356c3e094e93c09398bfd628b1594c7e3ec20", - "sha256": "0dnlhkpnjag6vk7qyfgzc7p0fs1b01pc3dnm6bgw19ghdp1wvp8y", + "commit": "746947a065c8fd26bfb540c96d869d05a0bd9b53", + "sha256": "1p9nq6n7y8ldv3acim5nwm0mz9fb510y246ikvpcnx3zqwa0l0wd", "fetcher": "github", "repo": "thanhvg/emacs-howdoyou", "unstable": { @@ -55206,14 +55360,14 @@ "url": "https://scm.osdn.net/gitroot/howm/howm.git", "unstable": { "version": [ - 20211230, - 1221 + 20220815, + 1125 ], "deps": [ "cl-lib" ], - "commit": "c381e50f0c771c38306bda37bd972a37a36a5db5", - "sha256": "1azzsbvnjbd5y0isl2bq9yjaqbbiivmswkrvyx3mgmq7rw6xvn61" + "commit": "9982e74e212014bc8ed67bbe780eb6ca55dc5298", + "sha256": "05dfd8sqvv51miwkr82hym5z7byiiv38zsx47b7sqr8kkqj9jcf5" } }, { @@ -55388,8 +55542,8 @@ 20220704, 652 ], - "commit": "aeabbb7606e033bccbb70d2a1c463ba8a733a4e9", - "sha256": "1khzdwyi6qdpazhpbr749wbcybak2x5gqjqyman002dnpwaxy2fb" + "commit": "31ebfdaa333c6ef7d5d249de9d859030bfb3cb82", + "sha256": "1ldfzkr5v4v2ri0mv84ph9l0hg2kk624b2z42rv5965zsky45n2j" }, "stable": { "version": [ @@ -57262,8 +57416,8 @@ "deps": [ "impatient-mode" ], - "commit": "501d8eb255022d832bb30178db154d0004eac18c", - "sha256": "0qqg84yyfxc7kb1fxn0kpnsjgi7kphh7cvq9avabl1yiy1s51gq8" + "commit": "3d07d3377d8e5cec93f113d57e656f76d2f52afe", + "sha256": "03qq2falmnpaz6llay6r6v8gdx8y85awsrcnk902g4b980pflnpy" }, "stable": { "version": [ @@ -57376,11 +57530,11 @@ "repo": "flashcode/impostman", "unstable": { "version": [ - 20220102, - 1856 + 20220818, + 1845 ], - "commit": "5b122f3d5a3421aa2d89bdc9dc4aafaf19cf85d4", - "sha256": "095g54cxicd5ysxpw2zaw4i92yxmr3inwacbla34aa0l62lqy5ig" + "commit": "16ee00e35e9ee82bb06c6feafb148d98165f822f", + "sha256": "1ghwrg7w9b3xhfj2yjxzd9ysbgrb81pkg6gqhiq3n2zsia18i87p" }, "stable": { "version": [ @@ -57403,8 +57557,8 @@ 20220704, 652 ], - "commit": "9d4474980f6955187a0800fd1f5669e3ba291915", - "sha256": "0cav7jaa32sslp0db8l59qfiml221i0j7jc6z0m03fahz7z4cvb9" + "commit": "3f992c8d4bfcdd92a936621058f677ee0a0ef5a9", + "sha256": "0bwdjcb3jn04jp6w31zxj0yjs99bf9n9av6kxcvaagkq9r7w4ajh" }, "stable": { "version": [ @@ -57708,11 +57862,11 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20220804, - 18 + 20220811, + 949 ], - "commit": "7dfc779dc6038125c516c7c7746994a54b96e409", - "sha256": "0jfc3slm0yxd7l533x5x575h8f6hzmzkf0iya6g1sdhw6kibs66h" + "commit": "eb7bf95d5b03bdb9b28647c89ea0a73e35fe0ad1", + "sha256": "1n7zdjf80saj0mwrlcfalk2s04d1cwsy13swp0dlj17cmjndzp66" }, "stable": { "version": [ @@ -58060,11 +58214,11 @@ "url": "https://codeberg.org/ideasman42/emacs-theme-inkpot.git", "unstable": { "version": [ - 20220731, - 435 + 20220819, + 28 ], - "commit": "a8a09d1c4f9044f89b480fcfec9cc9cd868190e5", - "sha256": "0dd6w7ffhhj2z3p1y2gy14byyvhcd7cfg4bvjzbjfd3xq1zb8g0g" + "commit": "4a488ddf2cd47949ee627af03743f66ee91177cd", + "sha256": "1byl4lrd82y7wr98c3bljfv9q1cpi44j7r7cjx37wmkfp464gq68" } }, { @@ -58654,8 +58808,8 @@ "deps": [ "f" ], - "commit": "08b1102c1f55011952aff818261a9478175a5b92", - "sha256": "0fsqa970gqxdrvjkgp468f1shpb7alzh50j1r5bpvkfx9ifdx40h" + "commit": "a8c9a9f71c34ba35f9754621ce4f70d19381e807", + "sha256": "02i5v16kxfx3zwvrwsb8k3xvzxq7qfqbfvpa0sr9bbqwhkcam2df" }, "stable": { "version": [ @@ -59165,8 +59319,8 @@ "ivy", "s" ], - "commit": "3b78a194298290babd1a35ed689f333a271471b6", - "sha256": "18k03gp52qykkphh53sj4q33lbw5mhqraqp0ng0md39cwfdwrxsd" + "commit": "30af5edfe6ce27738233050774356f9ab15d05d0", + "sha256": "10ln9dvxn2sm1dljxkb442qs685bihwzjh6n20c1zm4kfgw9nml1" }, "stable": { "version": [ @@ -59587,8 +59741,8 @@ "ivy", "rtags" ], - "commit": "c628efc9b485470a48aec2692d79f7c140bc5b92", - "sha256": "03avv7brbrj69368riq3xg4qh65yzl5cyjn9wc2rbyx4jw2q3p4p" + "commit": "b9c680e7ca003c103687e790f740d86daa6b4b17", + "sha256": "01f1vv71gimhsm6bzh0fxfmap54qs4wqnc5zj9barr9zvwpqmrbn" }, "stable": { "version": [ @@ -59620,8 +59774,8 @@ "s", "searcher" ], - "commit": "fcaa8087a0cb9e61bedc2102f47c8b9754968288", - "sha256": "00k8xn2jclq27f7y7k5mlqxjn6x3c1jzzsz88cjrrv12ifg698s6" + "commit": "0779b4122553375c169ba7a53001c55c9f6e42f9", + "sha256": "006df1wdvn5bc1hrkdpffcprvqz1qknhkb6538qz6nbr6kmxs5fr" }, "stable": { "version": [ @@ -59761,16 +59915,16 @@ "repo": "squiter/ivy-youtube", "unstable": { "version": [ - 20181126, - 1039 + 20220818, + 2146 ], "deps": [ "cl-lib", "ivy", "request" ], - "commit": "273788e0d22a06cca1050eb1205d3fbc2245d001", - "sha256": "0w0aifinr8v0sdbj0gasqacwh5gmsb0rcg6jwi8ppga944wlkb2y" + "commit": "3ef64d912a6b8e239a07d4fb67d6cbc7b3af2223", + "sha256": "1h5gr4na6y195s6cwqickxir0irjhl83xgjhfjqvi22rc4xgk07l" }, "stable": { "version": [ @@ -59859,24 +60013,6 @@ "sha256": "08q0hbm4pvp8sf261w1ihqa93sg8blfybfkhq7wrnvgs6kasgwvq" } }, - { - "ename": "jabber-otr", - "commit": "9219f685c18c8e799cae3dc43cc1c740c0f67733", - "sha256": "114z5bwhkza03yvfa4nmicaih2jdq83lh6micxjimpddsc8fjgi0", - "fetcher": "github", - "repo": "legoscia/emacs-jabber-otr", - "unstable": { - "version": [ - 20150918, - 1144 - ], - "deps": [ - "jabber" - ], - "commit": "2692b1530234e0ba9a0d6c1eaa1cbe8679f193c0", - "sha256": "0yv86nadp6dfzl05vhk8c1kahg2pcrhfmd3mnfjrngp7ksac5lyf" - } - }, { "ename": "jack-connect", "commit": "c0f5c5f8051f3046baebb08f41b0ca0bf0d73c85", @@ -60627,11 +60763,11 @@ "repo": "Michael-Allan/Java_Mode_Tamed", "unstable": { "version": [ - 20220524, - 2327 + 20220812, + 145 ], - "commit": "5e8eb048dd398597378eaf20842e410398bd5b55", - "sha256": "0qhp1p49b8mjnyr8lxlvwjdhnl36l5byyzb9psnf1iid7f306rki" + "commit": "75e484849a43e4ee844c1a63258e9ff1979cd06f", + "sha256": "1lpb46vw5gp4fyi0ax7v4gjlrfbsfyjsbdd2380ps347v6z1x2pi" } }, { @@ -61219,14 +61355,14 @@ "repo": "taku0/json-par", "unstable": { "version": [ - 20220723, - 829 + 20220815, + 1101 ], "deps": [ "json-mode" ], - "commit": "2c13ad1bc3c2a62141d3312501d2c2012555972b", - "sha256": "1f0aj6dl5f0gjsgkh12rk79akbrrf6whn79jpgmjc0pa22k1v66p" + "commit": "4f1fffd2595be3e3af0b5fb1e0c499ecee698273", + "sha256": "06wz6kd7y7yiawffkz348q8fw7lqdgh3y6j7waq0fnb6bg4drg9q" }, "stable": { "version": [ @@ -61576,8 +61712,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20220722, - 547 + 20220812, + 2248 ], "deps": [ "dash", @@ -61587,8 +61723,8 @@ "spinner", "vterm" ], - "commit": "d275f8a070431d2ce669a2844a28e5a65ee0c430", - "sha256": "0bzqgwhc2ks3gblbs78hgbyvxqc5qwvq426l3appx1srh52chizz" + "commit": "d411c022b9259d4e31055fc33323f878d07c6b7e", + "sha256": "19d8bvh8c6fd7flnl0idfnw54rzvnvd1wqak2ryk2lhpr17jm5zx" }, "stable": { "version": [ @@ -61615,14 +61751,14 @@ "repo": "shg/julia-vterm.el", "unstable": { "version": [ - 20220720, - 1410 + 20220825, + 554 ], "deps": [ "vterm" ], - "commit": "698ca35da04d99f25c8f075e8342015434f6a662", - "sha256": "0n6nif6vci5dxq1s9vv2awf953pa2g5snpzg61jxbqsv533rn01y" + "commit": "a82419796dbd2faf70b7cb41f484ccf36e6ae5dd", + "sha256": "1m2i9r02lk2inz87v5sk6zjhr0wkf8fbjwvzk80w1srga7f3ml4j" }, "stable": { "version": [ @@ -62074,10 +62210,10 @@ }, { "ename": "kaleidoscope-evil-state-flash", - "commit": "148d47626879be1608f35827ef82a28274ff4de3", - "sha256": "17a4nmdi6h0z4va3kiw4ivaywiisblz6cicypk9d3g9sl92drcvq", - "fetcher": "github", - "repo": "algernon/kaleidoscope.el", + "commit": "54f7c5e02f28bdf04be147fb2994cb589c77cfdf", + "sha256": "10vjkin1qcwyi21cbqhph3gxbbyknwzdfm1kncbbbcrqi6dj0a1f", + "fetcher": "git", + "url": "https://git.madhouse-project.org/algernon/kaleidoscope.el", "unstable": { "version": [ 20170728, @@ -62136,8 +62272,8 @@ 20160826, 1139 ], - "commit": "eda4f8666486689d36317db7dbda54fb73d3e3d2", - "sha256": "1m0s1kdgz1psiidpxcrzm8qmvmrmk5g2k8lz1lq357z482l4i7ll" + "commit": "9785fdca081a44ebb9869347b26130c4c3c4474e", + "sha256": "0awck4wgz21x0pcpv12s5ryvj10190hfnkrbhzsrs3fvc1gk4dgp" } }, { @@ -62759,8 +62895,8 @@ 20220704, 626 ], - "commit": "4b874662b2eb19d31426faa061d1307359f10013", - "sha256": "1frbnm2zsag28yz84zpsm17lfm623awx826n3b6ycy24j3vkibkp" + "commit": "ecbc2677de1cb68bb8b8e405304d7dfe6bce5668", + "sha256": "151aaxlh4v3h7yak0qljqi4dbxmzbjh0v7g81an42zail1825gn6" }, "stable": { "version": [ @@ -63015,8 +63151,8 @@ 20210318, 2106 ], - "commit": "714f4935085d4ac0c220fdf7183fb35175f8bcad", - "sha256": "0kmsqg6z490sywvkqmiz13r6cikbzg20rnxhis7xv6swfncq7w6d" + "commit": "2d9755ad8a82ba0777299cbc1666bed25278db94", + "sha256": "0bly219vmhxwvkaahgq4d92qr03davqdk0w84g3c3spl4iwhigsx" }, "stable": { "version": [ @@ -63506,26 +63642,26 @@ "repo": "emacsfodder/kurecolor", "unstable": { "version": [ - 20220808, - 1456 + 20220818, + 1336 ], "deps": [ "s" ], - "commit": "e4f4ee32f54c0c71551dbe5e4419d2c2727130bf", - "sha256": "04rck57mri2r0w9i69fyhwql0ka9g8vcicqjz1k9pl7a5lb5f6vc" + "commit": "e4b02142bb955e7f3f621b405520a42f9dd35aec", + "sha256": "1a3pq1px5876yps22gp71pb35qprma60nwm8sfzaxwi4s596h4az" }, "stable": { "version": [ 1, - 3, - 2 + 4, + 3 ], "deps": [ "s" ], - "commit": "2016973e92651f25518e130405155bb8728339e3", - "sha256": "0n6lgh3y6qx8rym74ll1z26cc7hihdxb3qny4ymrcyycywh2kmnq" + "commit": "528aefe83362b7d41fa7fe212033328b7a1577ef", + "sha256": "1bl9g0d3wzg7zqq3i24hfk7p3bpxl928hm7p00pp6sikncdz1sy9" } }, { @@ -63692,19 +63828,19 @@ "repo": "zakudriver/lacquer", "unstable": { "version": [ - 20220809, - 635 + 20220811, + 649 ], - "commit": "676919f5fc301451fcfb8553c3f8262a65c36192", - "sha256": "09irbdnw4crpp572hpv29hdcjp31l1a3rvhdz01v1i5hzbq59p9n" + "commit": "70650105be1b4c1ade34c0a1c3263d80b2388593", + "sha256": "0rzdc2v9gfj3mh2dvpb90ikvyk67cbmd6snadpraawypajgr7vyc" }, "stable": { "version": [ 1, - 1 + 2 ], - "commit": "71bf9e8464ae240db17204dd2b968260a9c4c305", - "sha256": "1y2vdypmr0bbmfm4xh6ss8r6rq41mpxgkrlrcfmxdlal1qzx93vy" + "commit": "70650105be1b4c1ade34c0a1c3263d80b2388593", + "sha256": "0rzdc2v9gfj3mh2dvpb90ikvyk67cbmd6snadpraawypajgr7vyc" } }, { @@ -63893,11 +64029,11 @@ "repo": "lassik/emacs-language-id", "unstable": { "version": [ - 20220702, - 529 + 20220810, + 1351 ], - "commit": "1d05bb74075879351a33fedc363a5f375a18b8e5", - "sha256": "0msirbjyf5daaycq3zvwsl4gxhk5lw1nxd492wzj4rb1m7dm4wk4" + "commit": "ba65c244ac931dbf9e8569f080dedffed88fb029", + "sha256": "1lyx8ywra09fw0pmlkzx3hbb7wqhxl2dmzdkj90f7wz2da1q1568" }, "stable": { "version": [ @@ -64020,15 +64156,15 @@ "repo": "Malabarba/latex-extra", "unstable": { "version": [ - 20170817, - 147 + 20220817, + 5 ], "deps": [ "auctex", "cl-lib" ], - "commit": "82d99b8b0c2db20e5270749582e03bcc2443ffb5", - "sha256": "15m7zvdhg5z7d8alrw66p703wdp5r57lxrgq3zz7xc4hscwghlb1" + "commit": "a81e7588448f85c5fcc3f3fc71cf957d0928a656", + "sha256": "0sajg5vmygnkcnmkrpf8r7c4b8v95hgsv1y6pz868jpznmldnxkb" }, "stable": { "version": [ @@ -64889,11 +65025,11 @@ "repo": "rvirding/lfe", "unstable": { "version": [ - 20220709, - 1956 + 20220822, + 911 ], - "commit": "d10af0a774d6d9c41ea78fe0185fdd0065a05d66", - "sha256": "1v9xawdmbbrqcax1n47dgysjr14nv1db63kmrjs8qq0ci9jb66dc" + "commit": "f7cfdd30620448df1b058467ac160b34d4b8105b", + "sha256": "07xccdww2bsz5jgd19xj7kn9drgqncamvl6px31qw6h2799x81g1" }, "stable": { "version": [ @@ -65035,11 +65171,11 @@ "repo": "andyetitmoves/libmpdee", "unstable": { "version": [ - 20160117, - 2301 + 20220821, + 1554 ], - "commit": "a6ca3b7d6687f3ba60996b9b5044ad1d3b228290", - "sha256": "039awlam3nrgkxrarcapfyc2myvc77aw7whrkcsjjybzylpzv0pr" + "commit": "cbc92f7245a80803851c36669b5275868d4cdd17", + "sha256": "1csmrw0dlmqnghs0cqgw9g88q83x85pk9jj4531bjf9cjg40b22f" } }, { @@ -65139,8 +65275,8 @@ "deps": [ "request" ], - "commit": "8182fa959477388b61c3a5d226e88e63ca2e87d3", - "sha256": "1azzb9cyc4k9sj0gab22d5qx2jfbxzzs89185jzhabappyf4zj5z" + "commit": "a926f07abc7b4daa22944f0e9ce393fe45094a5f", + "sha256": "1x6sb9r3bskjlksxdh65pqrk0saixb8ixjah30iwcyxhliammb9x" }, "stable": { "version": [ @@ -65155,6 +65291,21 @@ "sha256": "1z6qd4bcpwdpvi6w9yrkrnk2ypllhm6k4zjl8v1p8k0j93dbn3ny" } }, + { + "ename": "ligature", + "commit": "cab410fbe3e418503ed9e8262ad5fcf8e3967455", + "sha256": "0j0mm7aj194cpwwkjb4gm1raxj24j1dlvfjpaqxr36hzp23jfipw", + "fetcher": "github", + "repo": "mickeynp/ligature.el", + "unstable": { + "version": [ + 20220808, + 1225 + ], + "commit": "5eb950ada991705fdda4456970b0321241ee2bfa", + "sha256": "0dv58y4mifx9in3cfwk5d92aggyv5y1kymp94kxz1k8kdki8pa53" + } + }, { "ename": "light-soap-theme", "commit": "053be1123bb934d80b4d6db0e7e39b59771be035", @@ -65181,8 +65332,8 @@ 20220209, 755 ], - "commit": "5c772aac623b4216d06de5c73683402fd43f34ed", - "sha256": "1ly7p0503ydx364r2pnvwjwn4r86crmr8xmvlmifnwks79pb45hh" + "commit": "9642210b1ad3eecf9b273a3a70657841b35681b8", + "sha256": "0rj29m3k7s611k90nd4k7im135gcj4q8x5z9kj2063pz742iwi9k" }, "stable": { "version": [ @@ -65211,8 +65362,8 @@ "indicators", "ov" ], - "commit": "1b2dfa899409f4af2896fce6b9acbe98072abd59", - "sha256": "1xxmvdgqfj3lv33vn4pw3rdrxjmqypf09hh5w1jr69xbyl2ahzzp" + "commit": "3928cf1ba8492b8c0d79340ad7ba5bb5badb5374", + "sha256": "08y4l4qh6np8fvpipd2dfr81q0xiz7x3ra67c47ljayhxmz6056j" }, "stable": { "version": [ @@ -65472,8 +65623,8 @@ 20220704, 654 ], - "commit": "2d8df67f62b3aba0ea3c1dcdd41d83e39e3d8f8f", - "sha256": "1x8allkw2az7g6nz9fbak917rd0gydhvcaqs66xx61qhz26sfr0z" + "commit": "e2d62849a2295dbc9d457cfcfadca3769ee62199", + "sha256": "08mvh4magjqqn018p6j5bz3nv0yi2i9a8c5968gw5m8db0hvlhfp" }, "stable": { "version": [ @@ -65588,8 +65739,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20220804, - 1946 + 20220817, + 1839 ], "deps": [ "ace-window", @@ -65598,8 +65749,8 @@ "swiper", "zoutline" ], - "commit": "cdb7d32f2195ca2ed8df237aa6826bbd177b2813", - "sha256": "000f87v26fdy3ydqiisa53xhrnpf8phkjqxr60wyr8s7r6ng69y9" + "commit": "887a5a0a296fb361bdc6bb56974a5ac901c5ad21", + "sha256": "180p3930kfmdr5isxi3wsslqjb2i1a2sdjf1a1ing8x9f0iplvg9" }, "stable": { "version": [ @@ -65977,14 +66128,11 @@ "repo": "Atreyagaurav/litex-mode", "unstable": { "version": [ - 20220415, - 1704 + 20220823, + 2231 ], - "deps": [ - "cl-lib" - ], - "commit": "5d5750af2990c050c8d36baa4b8e7a45850d5a6a", - "sha256": "0kfij90iqslc6lnlpvj0hmfhfrfhp28ljd4zj6gv8wz02aldkjgd" + "commit": "c4a1071fcf6d2bec9eb367ede8c33b190e9ff802", + "sha256": "0bm3zx2ylrcs8apid2g6a6m5f27ahkvavqbprld5d0mfb1m42lw2" }, "stable": { "version": [ @@ -66066,8 +66214,8 @@ 20220518, 204 ], - "commit": "a700f04e9865cbb6da498681a09d7ea607b3883c", - "sha256": "0wmaxghjq6vmky0spfdgynmpkz748j5q9lx9nlqqylp60gw334nc" + "commit": "351820438f6f416ac9bc991a4d120cd6a4720158", + "sha256": "015f36bnhpkpsc8ig9ap3drwsv6w8vp8byksmjgl82lf396gzjza" }, "stable": { "version": [ @@ -66462,8 +66610,8 @@ "ht", "s" ], - "commit": "c5c2e8c3850417d8c1b0733b77a364002805863c", - "sha256": "0ifjv4c13jd2cgq3l3n88bsca2nayk40wm3v08a86ywmr9bpfrfb" + "commit": "7c110d94a7d17c55fc1fac489f307f2e6055d82e", + "sha256": "0cijmmqx66ar092mqnpmqn804qmnh8bqs7vv4wpg1pk6dq8k9mqp" }, "stable": { "version": [ @@ -66697,15 +66845,15 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20220731, - 202 + 20220821, + 1746 ], "deps": [ "map", "seq" ], - "commit": "10a9be5f0b143dee454bb64d2b5146e4509553d6", - "sha256": "0khsnpr1x834zm453ff8ri2i7kyhgxrn782nkzhc4blk6bjljr5p" + "commit": "e3835d4013da423cbdabbeac889a9a2a70ef17c7", + "sha256": "0ipj3927wdhdl8m7rmwills0337bs6j8wlk2n5ws31sjfhlqpfhw" }, "stable": { "version": [ @@ -66736,8 +66884,8 @@ "dash", "loopy" ], - "commit": "10a9be5f0b143dee454bb64d2b5146e4509553d6", - "sha256": "0khsnpr1x834zm453ff8ri2i7kyhgxrn782nkzhc4blk6bjljr5p" + "commit": "e3835d4013da423cbdabbeac889a9a2a70ef17c7", + "sha256": "0ipj3927wdhdl8m7rmwills0337bs6j8wlk2n5ws31sjfhlqpfhw" }, "stable": { "version": [ @@ -66799,14 +66947,14 @@ "repo": "abo-abo/lpy", "unstable": { "version": [ - 20201027, - 1425 + 20220818, + 1613 ], "deps": [ "lispy" ], - "commit": "076ce9acb68f6ac1b39127b634a91ffd865d13d8", - "sha256": "10sab50wmr3zn7jgzx93201ymhmacqacn3m2qllsqkfw2gpsi6dn" + "commit": "ce78a4613458790cc785c1687af7eed8f0d8d66c", + "sha256": "1vxrjy6k030hcbclblgcaaw7h6k17kl3n9zla08527525c0gma01" } }, { @@ -66817,15 +66965,15 @@ "repo": "LaurenceWarne/lsp-cfn.el", "unstable": { "version": [ - 20220707, - 824 + 20220822, + 1545 ], "deps": [ "lsp-mode", "yaml-mode" ], - "commit": "8228864e0b16f7107300fb6b8ba595bb84f016fd", - "sha256": "1gshnby7682ymqk6n10n6sr42grlbbwny1n887s5w348z6vlxq93" + "commit": "55203d41d767c091511599fca236c1f9c39cd58a", + "sha256": "0xmv3aqlfp4qk9vmahzmn58m8m0i7929x1mwy2rh33jx08v67xv3" } }, { @@ -66940,8 +67088,8 @@ "request", "s" ], - "commit": "ece2c7d8c119213d4622deca756f4affedbabc42", - "sha256": "1yfvmdcpa9qr2vmh6lkxip5vmxj5z7rb9k4fn1xvbw5hbdljpmgx" + "commit": "1fa44a3f9ccffb09021bf05a5e7d905061fe5a95", + "sha256": "0rsx9aysb3a2h0yp48ij58dfzh2hb106f9kxmz3124xx6xs5f0mq" }, "stable": { "version": [ @@ -67037,8 +67185,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20220623, - 455 + 20220825, + 450 ], "deps": [ "dap-mode", @@ -67050,8 +67198,8 @@ "request", "treemacs" ], - "commit": "a1aff851bcf4f397f2a968557d213db1fede0c8a", - "sha256": "1qbgs2r92fbrhwxdpwzmfmac7vhcfc26i90a23pxk50dbh5byyyb" + "commit": "13b92b097f91f9296ca65a1dc3eda992315c67ea", + "sha256": "1dzcrlwdsnvm1l0jiwqn2q48nzx792dhrvab5jhfqlva4ivw5h0x" }, "stable": { "version": [ @@ -67198,8 +67346,8 @@ "deps": [ "lsp-mode" ], - "commit": "18b0e8608408f9e913d89075e78c2b4e3f69cf1c", - "sha256": "1a0vlcnw7dzaz3ypav7ws5nfs8p8rg7rfjm302fbf8sz167rb2xq" + "commit": "b673fce2c46d00da216a32a6c04558c3cbb68939", + "sha256": "02l5hy10rvqnzjx7hfp5g2cn4cggq10bj31j7q9n66qy76smbi5a" }, "stable": { "version": [ @@ -67268,8 +67416,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20220808, - 1239 + 20220824, + 721 ], "deps": [ "dash", @@ -67279,8 +67427,8 @@ "markdown-mode", "spinner" ], - "commit": "ece9bcdc01953c794533b734b24931485c0070fb", - "sha256": "11xn75rxlgm9xfwbfb9mdk8snh9rnlvyyncvlb54mc3y7xdqhy9q" + "commit": "9c47b6d44f6fd78410f13e496d83682dbd52da0e", + "sha256": "0gn63a5bmnf8l3ddq7rw2afmy3r7i5z92zy7zfkprq92322ibzks" }, "stable": { "version": [ @@ -67594,15 +67742,15 @@ "repo": "merrickluo/lsp-tailwindcss", "unstable": { "version": [ - 20220601, - 1509 + 20220816, + 1602 ], "deps": [ "f", "lsp-mode" ], - "commit": "09377d5bbb742f11c458481905ddbb022dd2b0da", - "sha256": "090ymnd24cd2665b9kb32yxwvbbrcxc884s68b9g1x59z7wmw42g" + "commit": "6cff7196d0742a359a58c21a719a2cd436006e12", + "sha256": "0sxs6p4sglk753q6q2ysqbfr7gbybqc5l76y8f4ima6i66sjn4jm" }, "stable": { "version": [ @@ -67661,16 +67809,16 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20220723, - 1213 + 20220823, + 1626 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "8d4fa5a14f5b5c6f57bc69f454eba6861ed2ba9f", - "sha256": "1z3gfv6ca1ssyyaggzpaljybzrilh77lzqrixm9napzfv3aa795w" + "commit": "d8cce7dc154aa3216c080dd5c6fb827bdba9a312", + "sha256": "0b7gfyrrzxr3x6vr7mcl3ha60ssmhk77fc250impxqg62ckr2nbx" }, "stable": { "version": [ @@ -68005,14 +68153,14 @@ "repo": "amake/macports.el", "unstable": { "version": [ - 20220808, - 41 + 20220820, + 1110 ], "deps": [ "transient" ], - "commit": "4e5e80721df474d1a4fa8c8ad4123d6435b8b4ac", - "sha256": "1wb56g1xd0avby1hqxk7q71fbdnaxqhaq1gmc8zcxlr3adip4lna" + "commit": "771f1a71ac9e93b4328089ec133ef2dd0f287b0c", + "sha256": "1hzv2i7dn6q1wyal12s72rd74zxfrxs69ic0bhh40a11089zjll3" } }, { @@ -68199,8 +68347,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220806, - 702 + 20220821, + 1819 ], "deps": [ "compat", @@ -68210,8 +68358,8 @@ "transient", "with-editor" ], - "commit": "8a0cc83eff98489d3685b8585afdcebbb47c1393", - "sha256": "0hf3zyxwhknnkgcms5phwf5qrbzjkj5c8kpmynzb9bwr6ba8yf6p" + "commit": "712be4632b0ddc7899ca90db8f9be20d90b4326f", + "sha256": "08dk0vdvsxc2pvvk5h3xf2pxb572scsjd4mcj19lqhrzkcwnxgsd" }, "stable": { "version": [ @@ -68577,8 +68725,8 @@ "libgit", "magit" ], - "commit": "8a0cc83eff98489d3685b8585afdcebbb47c1393", - "sha256": "0hf3zyxwhknnkgcms5phwf5qrbzjkj5c8kpmynzb9bwr6ba8yf6p" + "commit": "712be4632b0ddc7899ca90db8f9be20d90b4326f", + "sha256": "08dk0vdvsxc2pvvk5h3xf2pxb572scsjd4mcj19lqhrzkcwnxgsd" }, "stable": { "version": [ @@ -68628,9 +68776,37 @@ "ename": "magit-p4", "commit": "e6c16a59ca48a0b17cae90354e8929d31a5eef1f", "sha256": "1c5qv1f2d8c114a5z21j0nkw285k3gx787l0c3cd9ls7awxfp1is", - "error": "Not in archive", "fetcher": "github", - "repo": "emacsorphanage/magit-p4" + "repo": "emacsorphanage/magit-p4", + "unstable": { + "version": [ + 20220822, + 2022 + ], + "deps": [ + "cl-lib", + "magit", + "magit-popup", + "p4" + ], + "commit": "0fd0f882eb14510714393c15c2ccb8d2c259f01e", + "sha256": "0wdclkkqlfswqbsg8ld1gqji1rnxpl8s00ym7imgqdf1is961qj1" + }, + "stable": { + "version": [ + 1, + 2, + 1 + ], + "deps": [ + "cl-lib", + "magit", + "magit-popup", + "p4" + ], + "commit": "0fd0f882eb14510714393c15c2ccb8d2c259f01e", + "sha256": "0wdclkkqlfswqbsg8ld1gqji1rnxpl8s00ym7imgqdf1is961qj1" + } }, { "ename": "magit-patch-changelog", @@ -68726,15 +68902,15 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220803, - 2341 + 20220810, + 1158 ], "deps": [ "compat", "dash" ], - "commit": "8a0cc83eff98489d3685b8585afdcebbb47c1393", - "sha256": "0hf3zyxwhknnkgcms5phwf5qrbzjkj5c8kpmynzb9bwr6ba8yf6p" + "commit": "712be4632b0ddc7899ca90db8f9be20d90b4326f", + "sha256": "08dk0vdvsxc2pvvk5h3xf2pxb572scsjd4mcj19lqhrzkcwnxgsd" }, "stable": { "version": [ @@ -68753,9 +68929,33 @@ "ename": "magit-stgit", "commit": "72a38bbc5bba53dfb971f17213287caf0d190db0", "sha256": "1spli6yq258zwx95y16s27hr7hlc2h0kc9mjnvjjl13y2l6shm0i", - "error": "Not in archive", "fetcher": "github", - "repo": "emacsorphanage/magit-stgit" + "repo": "emacsorphanage/magit-stgit", + "unstable": { + "version": [ + 20220822, + 2023 + ], + "deps": [ + "magit", + "magit-popup" + ], + "commit": "cd1e04e63002ea47f7b858dbe475e90150ae6c00", + "sha256": "01s16dwmbm3yiibd09i39dqabh1bga1lccyyww689jis5iz1jd09" + }, + "stable": { + "version": [ + 2, + 2, + 1 + ], + "deps": [ + "magit", + "magit-popup" + ], + "commit": "cd1e04e63002ea47f7b858dbe475e90150ae6c00", + "sha256": "01s16dwmbm3yiibd09i39dqabh1bga1lccyyww689jis5iz1jd09" + } }, { "ename": "magit-svn", @@ -68765,15 +68965,15 @@ "repo": "emacsorphanage/magit-svn", "unstable": { "version": [ - 20210426, - 2114 + 20220314, + 1451 ], "deps": [ "magit", "transient" ], - "commit": "350493217afdb7637564e089f475909adecd9208", - "sha256": "1v1y4fir1plz4kj0cvkcd29wibli4dw7vp4fmbxq4df76d8iy8yd" + "commit": "b8277081db90977247ae3900ea6afeb0ca644d36", + "sha256": "1ywwylxasgyk6gldypvbn6hlbmkp24rx6kcd0qvxsp39bbd0in50" }, "stable": { "version": [ @@ -68827,8 +69027,8 @@ "repo": "alphapapa/magit-todos", "unstable": { "version": [ - 20220326, - 519 + 20220822, + 2224 ], "deps": [ "async", @@ -68840,8 +69040,8 @@ "s", "transient" ], - "commit": "67fd80c2f10aec4d5b2a24b5d3d53c08cc1f05dc", - "sha256": "00hs3a9hpxmwsrd8xxwn9cpxk69x5ghmxq205aqpr7mjigcg7n2d" + "commit": "c5030cc27c7c1a48db52b0134bf2648a59a43176", + "sha256": "0j32zslcbiaq2a6ppyzdq4x59payya5hzd2kpw3mdj0p479byz19" }, "stable": { "version": [ @@ -69335,8 +69535,8 @@ "deps": [ "manage-minor-mode" ], - "commit": "e47d0e1856f0a9eb9935abdaf6e14e67ef2ab4cc", - "sha256": "1aqmm5r0wqdfvac3nqwpali2b8lk7vwjs9fww5dhcwmsna8mr9vk" + "commit": "dd1c23ecaeaabba8d72f2a0822eefd6a2df9fcb7", + "sha256": "0zf0fga88sl34dnzfmdv5161wp8y7avrr4phka984gmjghplmkpc" }, "stable": { "version": [ @@ -69881,8 +70081,8 @@ 20220704, 753 ], - "commit": "14f490b8683bdce53a6272fcc28a9b4137f86a24", - "sha256": "0vkf98hbcla6gl4xvy0wln87msjh5wf9dhnyscbqavgwql6m07k9" + "commit": "8a54972a893d28ba79dcd832d55c446a8db43d62", + "sha256": "14p382gz8fkx8r34v3b1p460i3c2wx79q34l08rjskg5511zgaf5" }, "stable": { "version": [ @@ -69962,15 +70162,15 @@ "url": "https://codeberg.org/martianh/mastodon.el", "unstable": { "version": [ - 20220808, - 1410 + 20220820, + 1427 ], "deps": [ "request", "seq" ], - "commit": "3ff8f250c3a0e0ab0670cf7af72a2607950e4b5e", - "sha256": "1w3mk7y37jw8m69c1vsjx7z0d4qvzsys1022x070dfjxvis1s8r7" + "commit": "003fada37fee8e2e0b627f10356fcfd64c86a616", + "sha256": "12iw8alzmvm11pbrj353zpm4c7gk9p6vg7nn4k24h7qz32naalbc" }, "stable": { "version": [ @@ -70017,16 +70217,16 @@ "repo": "matsievskiysv/math-preview", "unstable": { "version": [ - 20220604, - 1107 + 20220812, + 430 ], "deps": [ "dash", "json", "s" ], - "commit": "a7254ba89a524f30c1acfdbde07a179271f02658", - "sha256": "1d1s1ff49xb5rdmphgx2g5n5mmjrkrdi38wqijlkr6jj15d5lrig" + "commit": "226f2be25d74f6f8224eb7aa96dfb1985aeac722", + "sha256": "0bl28b7pb80jbjvqjc1ir1had5yr5p4nr09zbj3mdxm6nxwz7p9w" }, "stable": { "version": [ @@ -70179,8 +70379,8 @@ "s", "test-simple" ], - "commit": "1334f44725bd80a265de858d652f3fde4ae401fa", - "sha256": "1h1lqrl3p9qgkicds8v44vdry19g53rya56hdj3cz5q8xj1nisn1" + "commit": "1913ee496bb09430e85f76dfadf8ba4d4f95420f", + "sha256": "1milqql0p9gp4dn9phn4fw1izf37wizpirvmzh5s71rwzrr6a9ix" }, "stable": { "version": [ @@ -70623,8 +70823,8 @@ 20220630, 1249 ], - "commit": "be753d9412387aedcf32aba88a1be9bcd33d97ba", - "sha256": "1cpa9x45w54l4mqqmc8z3s5gscggw37gb6z9i7wwss86fj1wgclh" + "commit": "60518062c77e1d27a7d135a24a7c31bbf27290ba", + "sha256": "0sqmp7gsjdlh8jdi8sp17smx3da9pl6r45888r6j2g8ivh3x0zbh" }, "stable": { "version": [ @@ -70652,8 +70852,8 @@ "auto-complete", "merlin" ], - "commit": "be753d9412387aedcf32aba88a1be9bcd33d97ba", - "sha256": "1cpa9x45w54l4mqqmc8z3s5gscggw37gb6z9i7wwss86fj1wgclh" + "commit": "60518062c77e1d27a7d135a24a7c31bbf27290ba", + "sha256": "0sqmp7gsjdlh8jdi8sp17smx3da9pl6r45888r6j2g8ivh3x0zbh" }, "stable": { "version": [ @@ -70685,8 +70885,8 @@ "company", "merlin" ], - "commit": "be753d9412387aedcf32aba88a1be9bcd33d97ba", - "sha256": "1cpa9x45w54l4mqqmc8z3s5gscggw37gb6z9i7wwss86fj1wgclh" + "commit": "60518062c77e1d27a7d135a24a7c31bbf27290ba", + "sha256": "0sqmp7gsjdlh8jdi8sp17smx3da9pl6r45888r6j2g8ivh3x0zbh" }, "stable": { "version": [ @@ -70747,8 +70947,8 @@ "iedit", "merlin" ], - "commit": "be753d9412387aedcf32aba88a1be9bcd33d97ba", - "sha256": "1cpa9x45w54l4mqqmc8z3s5gscggw37gb6z9i7wwss86fj1wgclh" + "commit": "60518062c77e1d27a7d135a24a7c31bbf27290ba", + "sha256": "0sqmp7gsjdlh8jdi8sp17smx3da9pl6r45888r6j2g8ivh3x0zbh" }, "stable": { "version": [ @@ -70981,20 +71181,21 @@ "repo": "org2blog/org2blog", "unstable": { "version": [ - 20210422, - 326 + 20220824, + 148 ], - "commit": "68695ed0e012379556d57f9564ac5ad8cd68fbb8", - "sha256": "1qk9kshi4hyy0fni3gb383m0yvj4fmgidiab6vhnms5zgghj4kl7" + "commit": "b641fbcf33ac2b8a0de7b80536b42ce035428625", + "sha256": "0wy98gfj7vfmw8rj2zal1jrywsi7p8k4jr5m9rnwhj8v8ld1cw7d" }, "stable": { "version": [ 1, 1, - 11 + 12, + 1 ], - "commit": "c1b386f3522054f063f4ac60730397ed1f724478", - "sha256": "0d0s9hxjvv39n1rik894yh7d20aw120r6cadyp4hqw4n24j8cs5q" + "commit": "b641fbcf33ac2b8a0de7b80536b42ce035428625", + "sha256": "0wy98gfj7vfmw8rj2zal1jrywsi7p8k4jr5m9rnwhj8v8ld1cw7d" } }, { @@ -71076,8 +71277,8 @@ "repo": "danielsz/meyvn-el", "unstable": { "version": [ - 20220723, - 1800 + 20220821, + 2242 ], "deps": [ "cider", @@ -71087,8 +71288,8 @@ "projectile", "s" ], - "commit": "20878c2c059d1302b169f6c0252641a176a3f327", - "sha256": "1lhds8k74rcqqd71j02y4n2ci3sh4xyc6d0475qj8sam3j6f329w" + "commit": "43b2061f907dda533abd3136dccdb1ce467ec6c0", + "sha256": "0jrqxk0sf6360sm7b78cbmdkhi4ihgdjsyxgw5qn8xl81n41xas1" }, "stable": { "version": [ @@ -71110,8 +71311,8 @@ 20220806, 306 ], - "commit": "3cea4223657cdbb32fcb0afc54bb736388dfbd5e", - "sha256": "018spmlvb30x8qxvsr8avbngvcn0qcvzyh5520jwrm0q0yhnvb4x" + "commit": "d547c39a164a7de0c7d2dee800f565313a6c53a6", + "sha256": "0ydbdxj9y528f95xi97ji1d0pi67s90gk2b56z8s0dy2gw4zklcw" }, "stable": { "version": [ @@ -71281,11 +71482,11 @@ "repo": "erikbackman/mindre-theme", "unstable": { "version": [ - 20220725, - 1404 + 20220819, + 1 ], - "commit": "b8a2942524c75aa94505ee05c82ecfb803f04f7f", - "sha256": "0svnmxmr1wip6f6aq6j8mg4w155znmkm8mmk70k4kl92dc9l2f6i" + "commit": "9fd58e5d60d786451bf2d2836947d0c7ab25c896", + "sha256": "10dvknibjk79as96j8ghxv4zy4s44p9v4v4465912wlzari29zs8" } }, { @@ -72189,26 +72390,26 @@ }, { "ename": "modus-themes", - "commit": "efe3a60d8d9f467713e928b3890233c1224c3128", - "sha256": "1j4vp4j6z916mh0b2g5rzii0h9xnl1ambiaqvl5i8jycmwd38gg0", + "commit": "746947a065c8fd26bfb540c96d869d05a0bd9b53", + "sha256": "09mbsb1l80mzkyk16ixx3dn3zdwz4lyw8n1pcphiiv0b7d6q0l25", "fetcher": "git", "url": "https://git.sr.ht/~protesilaos/modus-themes", "unstable": { "version": [ - 20220809, - 1644 + 20220823, + 1919 ], - "commit": "2b0c31b94ddb82307181dcf0078cee2f3c187aec", - "sha256": "14lm9vn2w3nm5iszi2ghsdzw6krf3lp28l91hn2xhijv8364v3pd" + "commit": "777089c0ffaabadc10cefead3737fabe24b9004c", + "sha256": "16n87jns4i72369zm5xsa7skqcrq6bf5w1bxwn7q5w4h1694ry2g" }, "stable": { "version": [ 2, - 5, + 6, 0 ], - "commit": "64f9378a5114399f3a47c9d23136af677c25e513", - "sha256": "0ng85240zabw87ac53xnrlrafp10ns5wn6dgv9d1jxvnq40p7zqz" + "commit": "976f52b34a23b9d42cbc94f2a31636af5771a5d6", + "sha256": "1zl1gd3jlkanjmlsxmwhqaiwyblp6kzznfjnw9cq8ah2390y9n1c" } }, { @@ -72851,8 +73052,8 @@ 20210306, 1053 ], - "commit": "d1f5657f9b43fdf06852424cfb4f1a6fe2bc5171", - "sha256": "0hwdas1njbf8iy5shhr4ijblq2ksznby83mz8q793qrbfxi1d2dy" + "commit": "72f91f31936afa9b8f0bece819bb767915a7f14d", + "sha256": "044zpskdi84c6i0spn5502svpgvlhabiadmc6l57144m7k383djh" }, "stable": { "version": [ @@ -73712,14 +73913,14 @@ "repo": "magnars/multiple-cursors.el", "unstable": { "version": [ - 20220613, - 2122 + 20220821, + 932 ], "deps": [ "cl-lib" ], - "commit": "225fc0e889e094bfd2913cfd448084cb49211ac6", - "sha256": "0j0958ziik1wpdxb4clyxcl1fzs6ar51vlk8rrqdzwb8if8h9z21" + "commit": "1e4842d1297241a5277bfd5c7bfab9e8711da60a", + "sha256": "0qrkgbihbax422x0y0hhdx9aflplp4cbc089ry3dbzyl09s7mwfl" }, "stable": { "version": [ @@ -73924,15 +74125,15 @@ "repo": "agzam/mw-thesaurus.el", "unstable": { "version": [ - 20220629, - 2024 + 20220822, + 2112 ], "deps": [ "dash", "request" ], - "commit": "39d27eb4511588160b72078b67e11ce645dc76ee", - "sha256": "0nrql6vlbibymrq12pcwa65qqqw922lqf71xh228wcgnj94mhxhl" + "commit": "bae48760b09f750359ef702875fdde783be2ce4d", + "sha256": "1adi97y6qx5shn3mfx0f420ad051wx641f3y78s4sr2qgd2y0787" } }, { @@ -74192,11 +74393,11 @@ "repo": "kenranunderscore/emacs-naga-theme", "unstable": { "version": [ - 20220724, - 2023 + 20220824, + 2032 ], - "commit": "c5ef0baf1d2e95bc613e99700c38a1227cabe187", - "sha256": "133d871a1rrapnkjv5nhll1gc14ih3n045v5brmmr642w97ri9dh" + "commit": "5f22695256f909667ee416d5f26abc1bc809daf9", + "sha256": "13g3r32xxcskcdbxjpmj5q8dks4pzil53q9hvg3j0h4622519y5c" } }, { @@ -74778,8 +74979,8 @@ 20220514, 2039 ], - "commit": "77f33fc765decce01d5ad7905e908ccbf2233307", - "sha256": "1cz04p6lh4wrr8b8f09qfp98mghvzw9bbabd73xqhiyzx969948c" + "commit": "2e08696672f64fcacfa148c45f255c8c1bd441f8", + "sha256": "1ca5nw713n38cv550d706d70rphzvxnvgf9wrf16xyadqd766lfd" }, "stable": { "version": [ @@ -75317,8 +75518,8 @@ 20181024, 1439 ], - "commit": "d4017a2b1ea642f12dabe05ec99b2a16c93e99aa", - "sha256": "1clg0v1kl6aspwssw90qdrzdvd3dw9d86ffh6wydl45v6mylq0d1" + "commit": "b5f521a16173f51995523da436d1fe5bbd4dbd46", + "sha256": "17f0jqiaqwaj794z8svz2k4r4q0cwhygkxj9qj48whkjlgzi1wkg" }, "stable": { "version": [ @@ -75478,11 +75679,11 @@ "repo": "jwiegley/nix-update-el", "unstable": { "version": [ - 20220809, - 412 + 20220816, + 2212 ], - "commit": "1dd1434a2fcc054ad0046cca0563a292e890d59b", - "sha256": "10h6q8j6p9pvhja6ldpbh1s57lq0wpzy11wcbqknsyv0wpbrcpwk" + "commit": "aab70a38165575a9cb41726f1cc67df60fbf2832", + "sha256": "01cc86wvlwl5sy758vcjhwwh1has4ng6sqyrsd5y610qahs8cbib" } }, { @@ -75758,16 +75959,16 @@ "repo": "thomp/noaa", "unstable": { "version": [ - 20220803, - 1427 + 20220812, + 1535 ], "deps": [ "kv", "request", "s" ], - "commit": "beacb05f7298228dce4d494fb41c73d26991e15c", - "sha256": "1ak7c2qy80idk1izs3xjw7nlsd9hjvig5qxqf1bwmiqrrdbcqsgs" + "commit": "c691e770da0f1ed5b83c656087dfbc2ff231bef7", + "sha256": "01whmrfikxmxz2dmg1hy7myp68cvnblvb9blvk872k30y8yv074n" } }, { @@ -75989,8 +76190,8 @@ "repo": "p3r7/norns.el", "unstable": { "version": [ - 20220707, - 1006 + 20220821, + 1614 ], "deps": [ "dash", @@ -75999,8 +76200,8 @@ "s", "websocket" ], - "commit": "fea64be77d413ef3d8442a9699b3bfc53859ae80", - "sha256": "0wllc4qmfc7jc2jlri7bwbkpm5745g8fzpjp6k9pawja5yl0rw7y" + "commit": "022b433334cd1db4f83e77f055cd89e9f857076d", + "sha256": "0bbzna234f5ldmjn9nfh1msxi8m8fs31zl8fswsk20cdgd58mba2" } }, { @@ -76056,19 +76257,19 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20220807, - 1005 + 20220811, + 1025 ], - "commit": "6d6d2a5fe7a04cc8de43d6b27844c50f02d749ed", - "sha256": "0rv19isfggcxzwd7d071i1rh4mix4hf7bnj21w20c6kvryfpfr2b" + "commit": "76c3147613d0cb624573a5ba1ac7d0a5f81113bc", + "sha256": "029rw79niz8r50h1nfv9v5j7ckvkp0i99nwac23v9cfdwkb439n4" }, "stable": { "version": [ 0, - 36 + 37 ], - "commit": "a9b5f8959a20bbce774dec8a65a8b207555e52bd", - "sha256": "0dxvavdn97gicsjdfbrfbx1qz140ri3qdyfyxs5xxmmmc3c6gxjd" + "commit": "c864b59942d510a4f6a1a46db1b8e13b7f40f7ee", + "sha256": "1ql0rm8krsrg4lrcs164j338kr357051arwn9y3rw5bmv6jvxkq4" } }, { @@ -77685,14 +77886,14 @@ "repo": "alf/ob-restclient.el", "unstable": { "version": [ - 20220618, - 2139 + 20220819, + 2228 ], "deps": [ "restclient" ], - "commit": "3ac834b02b8276aae1b760312612c3b940598f90", - "sha256": "10x1ll090ihgjgzr76194mfc1z7yh3sr19dh0h561910gy97w2wk" + "commit": "1b021ce1c67c97fa1aa4d2c0816edb7add129e48", + "sha256": "1bcjj01q5n9w2cch6brbz8pzwnwsmdlgaa4sf5s97b9frmqb2ffg" } }, { @@ -77721,11 +77922,11 @@ "repo": "micanzhang/ob-rust", "unstable": { "version": [ - 20210204, - 244 + 20220824, + 1923 ], - "commit": "30fe7e7181f44443d02e905dda77f83ec4944e76", - "sha256": "103j84iblzw87p12w1vjinfsq6zif47lvmjzs0456d8kwli0hpkp" + "commit": "be059d231fafeb24a658db212a55ccdc55c0c500", + "sha256": "0r6ckhnyr824s4isz8z6hbd7ix9fyg9pha115km9pvafhcw05xdn" } }, { @@ -77938,8 +78139,8 @@ "org", "swift-mode" ], - "commit": "31cfe991eb171bb0d2f53cf621be1b9d91573ac3", - "sha256": "1l2n4ijf3sfgj05xzvnb1cd9k24ynh2cg36yj386bq7kadamympc" + "commit": "0a568c309eb2601b6e832e6c1661fdc908d761ca", + "sha256": "1pdppwfg1j07pisxakphyj9zys4b2dz61wy435386h53cil9408b" } }, { @@ -78160,36 +78361,35 @@ "repo": "licht1stein/obsidian.el", "unstable": { "version": [ - 20220808, - 2351 + 20220824, + 1728 ], "deps": [ - "company", "dash", "elgrep", "markdown-mode", - "org", - "s" + "s", + "yaml" ], - "commit": "49b4712b407a3542bbba50d3f74e1bb45025e255", - "sha256": "1x9y6mq72f3p53fcp6p2jv48xjph1i704d7q46gn1hvxbpryvhzz" + "commit": "324d614d36c2dc9dd5326952b7c44d40453b2b9d", + "sha256": "0lv7j3l8fkfpvpm7367cildjvs1khkw05918hrz5ssyljsvp49pq" }, "stable": { "version": [ 1, 1, - 0 + 2 ], "deps": [ - "company", "dash", "elgrep", "markdown-mode", "org", - "s" + "s", + "yaml" ], - "commit": "ef5f4174acdc8c6ef38707103f2a05223ad4481b", - "sha256": "1l88ixp3nyi7j4302pdkgi02vmyqm7amk46cz5pkwh8lf74pk9jc" + "commit": "0952bcbac335a8eebe6f7d40458eb3342474ab42", + "sha256": "0x7z9jvz1fa0b8wjsaxmcb8snf4l1s1z4va80ivn4wck0an4f9c9" } }, { @@ -78218,8 +78418,8 @@ 20220707, 751 ], - "commit": "9cbd8150c28f70ba6315c347a833a4ac8c85c481", - "sha256": "071fsdl67c0wis521i2w7mw85ijavxc7c458minanwqamabjvsck" + "commit": "aabb34f3eced86d1b834b6bbcbb258816f540508", + "sha256": "00ryzyq4w140nsjm784f6r3raab3rz5ip8cb9hsx0azxihqp72yy" }, "stable": { "version": [ @@ -78773,8 +78973,8 @@ }, { "ename": "omnisharp", - "commit": "e327c483be04de32638b420c5b4e043d12a2cd01", - "sha256": "0gh0wwdpdx2cjf95pcagj52inf7mrmiq7x8p0x5c7lvl4pfzhh87", + "commit": "746947a065c8fd26bfb540c96d869d05a0bd9b53", + "sha256": "1h6va10yyz21vp3h6z1g49gxd7s9h70pi6cmq93zycc6h8gnj0g4", "fetcher": "github", "repo": "OmniSharp/omnisharp-emacs", "unstable": { @@ -79134,6 +79334,36 @@ "sha256": "12q09kdcgv6hl1hmgarl73j4g9gi4h7sj865655mdja0ns9n1pdb" } }, + { + "ename": "orangey-bits-theme", + "commit": "b32596675ebc0c403abdad2cda8b1eba7d548765", + "sha256": "17rcbjxd5v8qkzzmh6nskxzs4n9d9jnd93dnr8z7n7xyawjzkvlw", + "fetcher": "github", + "repo": "emacsfodder/emacs-theme-orangey-bits", + "unstable": { + "version": [ + 20220822, + 324 + ], + "deps": [ + "autothemer" + ], + "commit": "b3b8844c41792e08b65342f9479e1738d4e329c2", + "sha256": "0wx8cdvdqsx2z41x515drywgh78xlbrdqap2pz8jv56nq3mj63s1" + }, + "stable": { + "version": [ + 1, + 0, + 2 + ], + "deps": [ + "autothemer" + ], + "commit": "533856d399cb4098300bcaf4a2d20920395746f8", + "sha256": "0a7xs9rwj2n44zny3fw9h65lz721bql4jdzanj9z7fx544r54x46" + } + }, { "ename": "orca", "commit": "f4d9cf89c58a9b36b7c2a42de2aecb3b60001908", @@ -79322,30 +79552,30 @@ "repo": "eyeinsky/org-anki", "unstable": { "version": [ - 20220712, - 1916 + 20220817, + 655 ], "deps": [ "dash", "promise", "request" ], - "commit": "4c3b27efe8eed9a9c8b5636fb15b86975ef7e00e", - "sha256": "19vig86ivx4gycfa54yi8k66zkp45sp8b082673xkmhrvvnnjm0a" + "commit": "4ed63cbebb35d7427d92652df209b0450655e5ac", + "sha256": "0zsrvkp4cp65yzqhhx5bzj6bskrjwzvgnsf9nxpf0m0wdcpqxvv6" }, "stable": { "version": [ 1, 0, - 4 + 5 ], "deps": [ "dash", "promise", "request" ], - "commit": "4c3b27efe8eed9a9c8b5636fb15b86975ef7e00e", - "sha256": "19vig86ivx4gycfa54yi8k66zkp45sp8b082673xkmhrvvnnjm0a" + "commit": "4ed63cbebb35d7427d92652df209b0450655e5ac", + "sha256": "0zsrvkp4cp65yzqhhx5bzj6bskrjwzvgnsf9nxpf0m0wdcpqxvv6" } }, { @@ -79386,11 +79616,11 @@ "repo": "bkaestner/org-arbeitszeit", "unstable": { "version": [ - 20220328, - 1951 + 20220816, + 1447 ], - "commit": "60e6adfe457bcc4ee47e3e5805b6b40544f98ee0", - "sha256": "0m93d60bybw2sjw75h65y76r9aspdfpv846pwm6xvjph9v614dgy" + "commit": "b22ae3292b24772aa37dd5a54cd551f7312b6213", + "sha256": "0ns1s0n0nckwkr6akrk2sdwwc0xj636qry1jvvys3rp2irjh6g0s" } }, { @@ -79439,26 +79669,26 @@ "repo": "yilkalargaw/org-auto-tangle", "unstable": { "version": [ - 20220809, - 1711 + 20220812, + 2327 ], "deps": [ "async" ], - "commit": "69c4aa39f33c157f124db81050928838aee54704", - "sha256": "04i7clcsalq56raw356cn5fis5ghc3dlcrmvs375pd6gwv85rlks" + "commit": "2494a6f78c9db5311123abc7cad119851a29a55c", + "sha256": "1kn1jsbv97ps280lcdx19d6hs7pvz7q9ng67xlb1kwjb680pa7rl" }, "stable": { "version": [ 0, - 5, - 1 + 6, + 0 ], "deps": [ "async" ], - "commit": "bce665c79fc29f1e80f1eae7db7e91c56b0788fc", - "sha256": "0gj3sqzg5zzqb84vbf08wyqkynyz0zzs4hy5q83zgz02mwwjbv01" + "commit": "2494a6f78c9db5311123abc7cad119851a29a55c", + "sha256": "1kn1jsbv97ps280lcdx19d6hs7pvz7q9ng67xlb1kwjb680pa7rl" } }, { @@ -79486,8 +79716,8 @@ }, { "ename": "org-babel-eval-in-repl", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "0brqp0w9s28ibws4idlm1rw09lsfa98l5wbpwm64rvlixhs6zlnx", + "commit": "746947a065c8fd26bfb540c96d869d05a0bd9b53", + "sha256": "00glg9sscvzkfyp0gf989yqwqz67y607n545x4rchz2bnqw8w2wa", "fetcher": "github", "repo": "diadochos/org-babel-eval-in-repl", "unstable": { @@ -80772,8 +81002,8 @@ "dash", "request" ], - "commit": "93629335727d855e8795470e78282c9dc532c839", - "sha256": "050sf6i8y28hl0d90y0hr4p5gzmsf3v728ghrj7y0hfvq0r3bhwj" + "commit": "f6e9b905ff3c6212aca8182764e1371fb71c309f", + "sha256": "17kasngsy8pyxlwy264bs62hix0npjb49klrfmfkax7mxlkzx152" }, "stable": { "version": [ @@ -80843,16 +81073,16 @@ "repo": "SqrtMinusOne/org-journal-tags", "unstable": { "version": [ - 20220805, - 1001 + 20220815, + 1604 ], "deps": [ "magit-section", "org-journal", "transient" ], - "commit": "66b4dcd6084242008a430aedb27e5834671b5f99", - "sha256": "1l352pqpmhld74qgkzq9i6inkppgiy145cmr0zyjk0803gry0g67" + "commit": "c7db858aef69501b2878a7c2aed4ad0447842b4e", + "sha256": "142wrq9k494aks4lxbq80pkm39nqkbdpfw69mlh33skmwvsfzzsf" }, "stable": { "version": [ @@ -80951,14 +81181,14 @@ "url": "https://repo.or.cz/org-link-beautify.git", "unstable": { "version": [ - 20220701, - 359 + 20220822, + 1337 ], "deps": [ "all-the-icons" ], - "commit": "ee06be6d82d36330cf0f96544e7cfcfdc1b7bb02", - "sha256": "1dnlnk1gin48bc36798y9swj0q96gnsyrdf6sjq7asfm821zv68k" + "commit": "5309895a7616e04a55a9dd397100adfe35fcec60", + "sha256": "0fzd65p38s1xr3xcji2gficl1lxrb1ip9hnd7hlrab955www2ip7" } }, { @@ -81198,11 +81428,11 @@ "repo": "minad/org-modern", "unstable": { "version": [ - 20220730, - 827 + 20220821, + 1927 ], - "commit": "c82b50a61d04571e11c242fb91944753d8bf945c", - "sha256": "0x6i69balwp5gzalgfcnb0m6gz78ca6vdj7qlx354awnxsd70nhz" + "commit": "23347906b826656c5054b8e35714a1c3d74bdcc4", + "sha256": "1mqzyrs400yfpss1mrfw4yn9fp1rskklzd7wlcg533l1cvggsp25" }, "stable": { "version": [ @@ -81832,8 +82062,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20220718, - 1844 + 20220819, + 838 ], "deps": [ "dash", @@ -81847,8 +82077,8 @@ "transient", "ts" ], - "commit": "06f1e1be6ff5ef7e2c8c05dc1954bcedcbb6eb0b", - "sha256": "0qn3ww9hp08xbmjicd451zcqm3za84wvizjwlzmxi6hqsaxmzpfm" + "commit": "d7ada532c7d06e91d6e07800ca22d5fbdb970e3e", + "sha256": "0nj1dvg30wj84ayqkjifxi1h0g1kjkm6nhhq59w13pkl2q0w5ygw" }, "stable": { "version": [ @@ -82124,8 +82354,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20220808, - 1445 + 20220818, + 1215 ], "deps": [ "avy", @@ -82140,8 +82370,8 @@ "parsebib", "s" ], - "commit": "4c9128f8cff3f5393efecf9c7547c630331a0299", - "sha256": "10kmkwyrfklzllgq5a5j5531whsjlq2mba2mh1cd14fvha5dwvd9" + "commit": "a65e3020759ca695c843965295f43d5f3e4fe6c3", + "sha256": "14aakjacj296rd2cqm4v2vgwykaaxwr0zgh33y20rygrjx10q18z" }, "stable": { "version": [ @@ -82217,28 +82447,28 @@ "repo": "akirak/org-reverse-datetree", "unstable": { "version": [ - 20220731, - 1246 + 20220824, + 1824 ], "deps": [ "dash", "org" ], - "commit": "e53d0fde875d137eeb03eddd6b50d3c827f9947f", - "sha256": "1syksy6c914d1z57zjiyqfmfpi6lpw2nfyw321mc4fr3m2l8wzzv" + "commit": "5794fd8d1aa7bf89abb37f79574118951ad036a6", + "sha256": "1p29f9svvzlf2l8pr23azdgrqg4ab8b2jlhx4gz0z0xxmf8yd6iy" }, "stable": { "version": [ 0, 3, - 13 + 14 ], "deps": [ "dash", "org" ], - "commit": "e53d0fde875d137eeb03eddd6b50d3c827f9947f", - "sha256": "1syksy6c914d1z57zjiyqfmfpi6lpw2nfyw321mc4fr3m2l8wzzv" + "commit": "311a8bff2fa0a6ccf83311c648d2cd045d765bc6", + "sha256": "1427w3bv5rsaq07877lb3w9v5b0il6hgzdg52yf9kx22z5f7qgqr" } }, { @@ -82384,8 +82614,8 @@ "simple-httpd", "websocket" ], - "commit": "c75fc7506ee7f03840a9a93ed9336d7ed24551aa", - "sha256": "0mkcd2622np8s5qz2zvx7lch6dc586xqmn6914gi4ym7nvklf3zy" + "commit": "16a8da9e5107833032893bc4c0680b368ac423ac", + "sha256": "0l5cbd0al5idc9pckl4885vp3449awvz5sgz0r998say5xxsajii" } }, { @@ -82756,8 +82986,8 @@ "repo": "alphapapa/org-super-agenda", "unstable": { "version": [ - 20210928, - 916 + 20220817, + 2351 ], "deps": [ "dash", @@ -82766,8 +82996,8 @@ "s", "ts" ], - "commit": "3108bc3f725818f0e868520d2c243abe9acbef4e", - "sha256": "172kjz03byizc972h8qh5hp5lrjqxp8x7cpcqykzj5j4db670ym1" + "commit": "fcc860190682274989fef15385c37c02895078df", + "sha256": "1yk2rw6k7cb34j2n0wc0jkdsx8y1aacp865dmjja3jk8n7ab2rrz" }, "stable": { "version": [ @@ -82943,15 +83173,15 @@ "url": "https://repo.or.cz/org-tag-beautify.git", "unstable": { "version": [ - 20220723, - 758 + 20220820, + 102 ], "deps": [ "all-the-icons", "org-pretty-tags" ], - "commit": "b9c6ffcc206ffaeafbe6e3ef9561ce6a8e0f30ad", - "sha256": "1apxxhjmz04myl99fm88la941n69a5sw6pkcxaz7svga1cnpdj9l" + "commit": "28eceb17131a4a5de79ce06f867bce49d1a04b78", + "sha256": "0smsww8k9vpz0i0sxlw1ys49zrdgl88yxz4iw832p3c6k0hpp0sd" } }, { @@ -83543,14 +83773,14 @@ "repo": "ymherklotz/emacs-zettelkasten", "unstable": { "version": [ - 20220727, - 859 + 20220819, + 2335 ], "deps": [ "org" ], - "commit": "edba7bcfdc054ad0ff1952bb525f5709a687db25", - "sha256": "06rb7frgw1vja7azsd9cxzkbvlr7xpzapgqypsc777szncz06xhi" + "commit": "505fd41dea012e743962c3a376c1e63e7a1e127e", + "sha256": "13pf2ygyizqk3axfl7s246an9w1ih38jq1knzy5f4qn2pf5k2zjs" }, "stable": { "version": [ @@ -83573,8 +83803,8 @@ "repo": "org2blog/org2blog", "unstable": { "version": [ - 20210929, - 17 + 20220824, + 148 ], "deps": [ "htmlize", @@ -83582,14 +83812,15 @@ "metaweblog", "xml-rpc" ], - "commit": "68695ed0e012379556d57f9564ac5ad8cd68fbb8", - "sha256": "1qk9kshi4hyy0fni3gb383m0yvj4fmgidiab6vhnms5zgghj4kl7" + "commit": "b641fbcf33ac2b8a0de7b80536b42ce035428625", + "sha256": "0wy98gfj7vfmw8rj2zal1jrywsi7p8k4jr5m9rnwhj8v8ld1cw7d" }, "stable": { "version": [ 1, 1, - 11 + 12, + 1 ], "deps": [ "htmlize", @@ -83597,8 +83828,8 @@ "metaweblog", "xml-rpc" ], - "commit": "c1b386f3522054f063f4ac60730397ed1f724478", - "sha256": "0d0s9hxjvv39n1rik894yh7d20aw120r6cadyp4hqw4n24j8cs5q" + "commit": "b641fbcf33ac2b8a0de7b80536b42ce035428625", + "sha256": "0wy98gfj7vfmw8rj2zal1jrywsi7p8k4jr5m9rnwhj8v8ld1cw7d" } }, { @@ -83763,8 +83994,8 @@ "ht", "s" ], - "commit": "1f422f6f3fa569a6c238ac34aec0320934f06208", - "sha256": "06d71kkn5kasfg9x977vdcd6pbnj44jzalp9igwm6qh5k7krklr3" + "commit": "9a35d8d3d660ac9d4f0a8d15b78cca4d7ed35f74", + "sha256": "0wpxygjwa0m981lm3rjyxp5hlv7fn9zfwg1jx3mjnnzrmw6v6q6y" }, "stable": { "version": [ @@ -83967,8 +84198,8 @@ 20220715, 16 ], - "commit": "9fba876c51d070832e15c888bf81609c4145f233", - "sha256": "0pck6pgyr55xf8g0kwrshal7jm64nxclhdm9ys8wx6vi7mvdqnb7" + "commit": "f72980693976648cfdaef32b51b78f1209683d0e", + "sha256": "1ffc6ikf15267q904ds8qf209xpgz61lx3665n3v7pfk64c5s0q0" }, "stable": { "version": [ @@ -84439,6 +84670,26 @@ "sha256": "1pry1xw2p01b18ks5n0xs895qqqci7v2nrwjiil2vr3m1ys92ymc" } }, + { + "ename": "ouroboros", + "commit": "b505d4228b84bf8656dd9b20e0783be8924cbc12", + "sha256": "19lzv8gmy1s88vr4cg3hlk6pd3p2ap1qw3kw9vpm20vi0imyamdy", + "fetcher": "github", + "repo": "Titan-C/cardano.el", + "unstable": { + "version": [ + 20220810, + 1617 + ], + "deps": [ + "bech32", + "cbor", + "dash" + ], + "commit": "5e1bf8b8ffa4c75bece7a93feab9858f0e7d676e", + "sha256": "0n2zf8pqaylrjy9w2qdir9hch7zhmrkcxnajnrbjswn1cwk8l2mm" + } + }, { "ename": "outline-magic", "commit": "a98ad2ef680eef541ee82e8a65ed73e524df98a1", @@ -84624,8 +84875,8 @@ 20200425, 1601 ], - "commit": "e02b835a08919ead079d7221d513348ac02ba92e", - "sha256": "0fy8739fbhmixgjxgd1j5v2rjkwhsqac5kczx3mdjlfd2w55k3h7" + "commit": "4fea116272aa16593d4bf23cdbd2998074a593a7", + "sha256": "1b7v66yzgck7wxpi4wbap9a6w9w3afd3x3n8flz63x1mzd986ywi" }, "stable": { "version": [ @@ -85811,11 +86062,11 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20220625, - 1438 + 20220815, + 1311 ], - "commit": "0a47905f0cefac5a4043c923efe6d80b03a79551", - "sha256": "0w4l189pcbx9a511w8fflq481ryg4l6q4q7i2rk10b9kg3v00zkb" + "commit": "b137f76ae76dd7c2e9648a352a679099f1b0f101", + "sha256": "11h62pmnisp4va4gf0pdwgyrvzm2ikbgkh000fbap1g04a6jx076" }, "stable": { "version": [ @@ -86390,16 +86641,16 @@ "repo": "atgreen/paperless", "unstable": { "version": [ - 20201130, - 1241 + 20220819, + 226 ], "deps": [ "cl-lib", "f", "s" ], - "commit": "2db39586a2914f78f345379511d0e8cea4c96b86", - "sha256": "03ckcbhpiys3p0jambrlcapba6sv7jn101kikvj2jp66vygdnsn0" + "commit": "f230acbc01588bb2ec99426832099b7fb7bad6c0", + "sha256": "1glxxmm28w7yklr86m743mg068k24hbnvfx6xyb48d3fq568r2d0" } }, { @@ -87462,16 +87713,16 @@ "repo": "vedang/pdf-tools", "unstable": { "version": [ - 20220723, - 2329 + 20220823, + 513 ], "deps": [ "let-alist", "nadvice", "tablist" ], - "commit": "bb0b71f5bafd81d0b5647c4ec48fafa0bb6f6c21", - "sha256": "1j6aj6sxw82n8pvwylwcnrgi95d6n5fpa0g75lphfgkaqk9nbgmw" + "commit": "1a0a30c54dc3effdba4781a2983115d4b6993260", + "sha256": "1gy7d25iplix02h9kqxxvfrxfwr2gm11xdmmx9ckbj3q51b5gi1r" }, "stable": { "version": [ @@ -88868,14 +89119,14 @@ "repo": "xuchunyang/pinyin.el", "unstable": { "version": [ - 20180620, - 1241 + 20220815, + 1239 ], "deps": [ "cl-lib" ], - "commit": "e5508e5aa1ad4cfa05a7f4d299e5a155b288ec4c", - "sha256": "1bzs6i88b5d7bk9pg2q654kvbychz27rl1srhkq9lvqx91g8zbz2" + "commit": "b7a0aad8ff35e50d1c536df4c0e73fc7e9d06700", + "sha256": "1cbs4mhf9bxhz8552dfdfr09v8abi6ppvm9arykwp7s5pnj7c705" } }, { @@ -90267,30 +90518,30 @@ "repo": "SqrtMinusOne/pomm.el", "unstable": { "version": [ - 20220315, - 2038 + 20220815, + 824 ], "deps": [ "alert", "seq", "transient" ], - "commit": "2a2673bdc8e2c2af99040b14e97b39271806bf79", - "sha256": "09w3m2gb0qv3cr3kklv37rgpcaxvyp21sdjmb15c26cf0i8rc86c" + "commit": "42f03d6ff29109038b31a8647f1acdc80fb867be", + "sha256": "19laxxwjcxbz1jsh19w5871jlj93ar0h071bi6syx2xf2n3yza6j" }, "stable": { "version": [ 0, - 1, - 4 + 2, + 0 ], "deps": [ "alert", "seq", "transient" ], - "commit": "596eed778fa30e7b33910f015543eda13abd1888", - "sha256": "0arhl9x9d4d1s4x5qcf1kn9hkwgsrs6sjn0rky10pgja7gqh6214" + "commit": "0942131ac3f2d20cc1004eecdb99ec0db1271c31", + "sha256": "1d302d5ffin1ckgbbj041rd9dwadh88n03ax0ja4gg03g2r3y5ci" } }, { @@ -90478,8 +90729,8 @@ 20211231, 1823 ], - "commit": "c65905aa1a3ac32d1dbc8c1060605621e6143f80", - "sha256": "1bvw8fwjwsrhx2z8mmlsmzxmjqin1yrg045sn2pma2gxls85bqv8" + "commit": "34c2684a6fb9a98683951b4a68f542622d17952f", + "sha256": "0svgyyrzfgyb05ki738b99n7cyzhvrsgb6v2cslz3nd2lipq4q6b" }, "stable": { "version": [ @@ -90807,6 +91058,30 @@ "sha256": "112s6qb80sn44b1cxggqfci89wymxvvwkwl7nknfnr2dzd58lzzy" } }, + { + "ename": "power-mode", + "commit": "bc58af06aa1973d1a3fdad0c8a150b26f82bd35b", + "sha256": "0mvjngp90gx2qpvi6w2baf6ngw2jrkh8q5rnmy81d54bk0d19dfv", + "fetcher": "github", + "repo": "elizagamedev/power-mode.el", + "unstable": { + "version": [ + 20220817, + 429 + ], + "commit": "1641a01ecca254db4094e166893a073b7f9288d0", + "sha256": "0z3wbj1skialwm2s0rzyzqlj364gx6ryi29x2wk1jhrvvdjnbgwr" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "commit": "313698d9c7766c17b077a70b31a2d0f52496d767", + "sha256": "1nkqn8jmnv4l2ydj9jipk3mz76kbz1gfk3iz986wgj8h2317vbzy" + } + }, { "ename": "powerline", "commit": "f805053cd4dd9ed53ee0df17ad69429bc62325bb", @@ -90968,8 +91243,8 @@ "repo": "blahgeek/emacs-pr-review", "unstable": { "version": [ - 20220629, - 1556 + 20220815, + 1610 ], "deps": [ "ghub", @@ -90977,8 +91252,8 @@ "magit-section", "markdown-mode" ], - "commit": "e4db206f2ca9baf65ca7757234bc2baf5634d8cb", - "sha256": "0fl69419hiifmpvphfyhh6z9h7b5qcgpsm6r8z8c0ysang7l7y26" + "commit": "8033aed0f6c16464b822489b137ba2f3ffe787de", + "sha256": "1c2gxvxv1fyqdabbhv859axq90xjwaf8c573z3db61iq97hvcvxc" } }, { @@ -91651,8 +91926,8 @@ 20220704, 658 ], - "commit": "5c35af3e456f1300f0e170d74da87e563b6cc222", - "sha256": "190g3iqzb2kv3z59b4zbf110g8yzxx64ml1c6ix194w76faghxix" + "commit": "8ce8f7cf2b228795dc76af0128cc66c7d7aac3be", + "sha256": "1lrspsfn4q9c1zfrpw9kbkjf4c47xhgs08qb3f88dscz84yawdxp" }, "stable": { "version": [ @@ -91709,8 +91984,8 @@ 20220720, 2110 ], - "commit": "509ac9a01cd344ee9bfa1bfebed6565dd4cfedd7", - "sha256": "0a256hcjyl7qlx08bfqcsacl3kpwgzdf458p4r1sxrwd0b1lz1g9" + "commit": "a8809cc1a50cfdedaf7bed2810249ae262884716", + "sha256": "0bmx9a1g199axj9ypqisvfyf1517czw23zg96x1wdzqrpw3cb7cx" } }, { @@ -91811,8 +92086,8 @@ 20220720, 2109 ], - "commit": "2d348279876f3073176048d903f9672f3c933ca5", - "sha256": "05in97rym6nc91nyshbdk4i1g013gsgzgs5r5nhsshpa9glwpv55" + "commit": "2bc01068d532ca338d3e24b1793e7ba69fadf419", + "sha256": "01d4crfii9hxmxrmdljkm80v16lfqqmpm35g3rs20z1wbjsjy8hy" } }, { @@ -92223,8 +92498,8 @@ }, { "ename": "proof-general", - "commit": "5bab170dd89e99f7c8430a11e6a2d8191b60f746", - "sha256": "0fx1avmkwi8ilmv0lxk6pp91hd6saycggca52z8rvjz66h9rmq3c", + "commit": "746947a065c8fd26bfb540c96d869d05a0bd9b53", + "sha256": "0kphsh3gl6g0lisxh9yqpxk5s3kgwvlwgcfv32mc30ddzs8p7mvj", "fetcher": "github", "repo": "ProofGeneral/PG", "unstable": { @@ -92336,8 +92611,8 @@ 20220303, 1716 ], - "commit": "e83492d94a8ce8ef529b829da0df4e458ee05908", - "sha256": "1b42aaj76vdhangx9awwi8lv1vr5kh4m956mzzcbn0ydgml7zxp5" + "commit": "cde4f478772edd5e8f0d80255d7d85067ed7c515", + "sha256": "1lrrgk7yynn49mh1491gxw2ii7d3pdzc49hl2bl2i67giq4wcxx6" }, "stable": { "version": [ @@ -93404,8 +93679,8 @@ 20210411, 1931 ], - "commit": "50f369047078810311f11c7d8cc2ad98fad7ea67", - "sha256": "1mpdn680jrg783857xdrcrvjc6hcw502b92jqf8hfywa12qcylm8" + "commit": "32116ae72cff8cec0d57160c6505a1c6ec43fc7e", + "sha256": "1cc5p5bx0mriv8h1sbybzxxrcmvsl35vcwjagh0c7s1sbjsrnq0c" }, "stable": { "version": [ @@ -93752,11 +94027,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20220726, - 1741 + 20220817, + 2017 ], - "commit": "23f8f55d3e5ce34b19f74c78928a43914df38696", - "sha256": "1ar1x8k3pl05zffbz6aj239j22523vgxiiikdxj5515w0rddk06k" + "commit": "765af4569eaf93c07c6aecdf7f134022677f9620", + "sha256": "0hfkncpz7vl9d2qi8ab9zfdrvjqsw69cw33nwcd2pn1qm08l7zw7" }, "stable": { "version": [ @@ -94136,8 +94411,8 @@ "leaf", "quelpa" ], - "commit": "bd306aed20349ac96472a05da096c584f9c17408", - "sha256": "1ridwj8svsx7mg33nwk5qh0g5cwvf1hb67h99pcs3i5a17vmycdx" + "commit": "e7e610662018fe187697b3be3b4fe3a0aae49e73", + "sha256": "1y82gfnwygiws2brpl8jdw5srpa2w9nfi4ivbgn49fwlg3afywng" }, "stable": { "version": [ @@ -94434,11 +94709,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20220809, - 1724 + 20220818, + 1323 ], - "commit": "194fe14888fb653219ed6e605377884673fb6308", - "sha256": "1simri1lrg32qpxhzpxgj7g6zms6j5l442pdk9yf95x6fxxwc24i" + "commit": "56df0bdf81070a45a524c94cbfe6354ad613dcbe", + "sha256": "1hyh7incbncf7a01blwm89qwy3nzjmnf4x3z3x9idpwqd2pg485d" } }, { @@ -95132,8 +95407,8 @@ 20220711, 911 ], - "commit": "40d04a0baf5c3d1087b18cc03595c573a1b5891d", - "sha256": "1z2kvv5im24h7hqmz2yhpar6d6cp4hzhzk6kxgrdrwgywpaf0bdx" + "commit": "5e1bf8b8ffa4c75bece7a93feab9858f0e7d676e", + "sha256": "0n2zf8pqaylrjy9w2qdir9hch7zhmrkcxnajnrbjswn1cwk8l2mm" } }, { @@ -95182,16 +95457,16 @@ "repo": "realgud/realgud", "unstable": { "version": [ - 20211107, - 2210 + 20220818, + 1750 ], "deps": [ "load-relative", "loc-changes", "test-simple" ], - "commit": "45f7e4409470abf964c7cb1d526248e4fa7078e0", - "sha256": "1xb1k6cl8xvjy1l16r4l0f2s0isac579apizyly6p8d7y45kzdky" + "commit": "aff03aeef1e40d2abb244240bab9787f4b3e6035", + "sha256": "15i0x5brbmhh6fif9djnc27gpx5fyh3wnljcxhhy6qrp4whj3van" }, "stable": { "version": [ @@ -96431,11 +96706,11 @@ "repo": "canatella/repo-el", "unstable": { "version": [ - 20191201, - 38 + 20220820, + 1554 ], - "commit": "7b3ce731f1209d74113cb65a2d6aa6f54ce8ed27", - "sha256": "0jgiawdnzjlrpx2j1y6djwbqncdpmyfd31q1qf1890049y8ppxnb" + "commit": "e504aa831bfa38ddadce293face28b3c9d9ff9b7", + "sha256": "1clmh8khr7i95zw1m64pjch8zwnr8gd7vcrzz5rx0xlqrd3hd3d7" }, "stable": { "version": [ @@ -96490,11 +96765,11 @@ "repo": "tkf/emacs-request", "unstable": { "version": [ - 20220614, - 1604 + 20220814, + 2158 ], - "commit": "38ed1d2e64138eb16a9d8ed2987cff2e01b4a93b", - "sha256": "0c8jmw4jif6vcizz2ba9yvh334ci45q7alhsayij0rwmwawgykgc" + "commit": "91313f1e00302b7e60d2043d8104bccf72aae80b", + "sha256": "1n0idvr3akfawb71a1p20i9984r9gn6y1pnl8k6ffk7lmhpfa0zr" }, "stable": { "version": [ @@ -96521,8 +96796,8 @@ "deferred", "request" ], - "commit": "38ed1d2e64138eb16a9d8ed2987cff2e01b4a93b", - "sha256": "0c8jmw4jif6vcizz2ba9yvh334ci45q7alhsayij0rwmwawgykgc" + "commit": "91313f1e00302b7e60d2043d8104bccf72aae80b", + "sha256": "1n0idvr3akfawb71a1p20i9984r9gn6y1pnl8k6ffk7lmhpfa0zr" }, "stable": { "version": [ @@ -96792,8 +97067,8 @@ "f", "s" ], - "commit": "ccc5d8c61d386bb817863624fea0dba1273e7255", - "sha256": "1rmxpw3an4kdjmzv3qbh1gb1anc3pb5a0zxl6mh2yrppwggyh29c" + "commit": "3d9a05c0bd3a80600a0544f420b77eba9a1f86c4", + "sha256": "03smgdqa7lvq1ycdxqsnawkv51ljfax8nxffx4b65nzzgb3iyq5l" }, "stable": { "version": [ @@ -96909,11 +97184,11 @@ "repo": "kmuto/review-el", "unstable": { "version": [ - 20220809, - 1250 + 20220817, + 1010 ], - "commit": "d0ec3357ae80e745e3a2b00012dd577e276b88d0", - "sha256": "13lcwhy47p4d6fk6x0xh726q8ka5l41hzqri00rbdafz0dzflbj4" + "commit": "2b24db8d85a1c40dbd67be195caa79c9df1e0f4b", + "sha256": "0hw8spbhdwgaaggf8vrmkpg5zdy9s71ygcj8rlp4acw7cfcp6sbx" } }, { @@ -97707,11 +97982,11 @@ "repo": "Andersbakken/rtags", "unstable": { "version": [ - 20211101, - 2149 + 20220818, + 1535 ], - "commit": "c628efc9b485470a48aec2692d79f7c140bc5b92", - "sha256": "03avv7brbrj69368riq3xg4qh65yzl5cyjn9wc2rbyx4jw2q3p4p" + "commit": "b9c680e7ca003c103687e790f740d86daa6b4b17", + "sha256": "01f1vv71gimhsm6bzh0fxfmap54qs4wqnc5zj9barr9zvwpqmrbn" }, "stable": { "version": [ @@ -97736,8 +98011,8 @@ "deps": [ "rtags" ], - "commit": "c628efc9b485470a48aec2692d79f7c140bc5b92", - "sha256": "03avv7brbrj69368riq3xg4qh65yzl5cyjn9wc2rbyx4jw2q3p4p" + "commit": "b9c680e7ca003c103687e790f740d86daa6b4b17", + "sha256": "01f1vv71gimhsm6bzh0fxfmap54qs4wqnc5zj9barr9zvwpqmrbn" } }, { @@ -98149,11 +98424,11 @@ "repo": "bard/emacs-run-command", "unstable": { "version": [ - 20210529, - 1505 + 20220821, + 1421 ], - "commit": "ce2d69feeffb9ef9815ef5b5e32f236763197a10", - "sha256": "132gsmgqnfzx8q0f4gchjzhm3wqm5frjrsb8q9cmqsa5y2g7qjmf" + "commit": "0ac25bc1acae652ffb58c48a3853cd1dcd7b40a4", + "sha256": "0c455f4jv0c2mmvk37s3cs56gbxbw3h6lbc53q76xnm16hg8b0nv" } }, { @@ -98277,11 +98552,11 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20220626, - 1126 + 20220819, + 1203 ], - "commit": "01ba44166cf16d9b78d99f2fa0c3c54c0f206894", - "sha256": "1mcvalgsilg1lsmnxpsg6qjd4z0k2d5dfij92gdqhzgc3188ad1p" + "commit": "894487d44c1664a9005cafd625fa99b54ff66c85", + "sha256": "0dwxf634d1wsnw85iyrxdcbbrqvcsk313bh53mhzmpljsyhinzzw" }, "stable": { "version": [ @@ -98324,8 +98599,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20220715, - 1010 + 20220824, + 858 ], "deps": [ "dash", @@ -98339,13 +98614,13 @@ "spinner", "xterm-color" ], - "commit": "baef1faba8c73587455f8582ee6ba3ef32077a69", - "sha256": "0vbwcbslbmrh3jmwb2m2jk394s0jnbsw26lmcg0fs17byxfzssv4" + "commit": "e279b7d60fa87b54264a8ba6c05604b8178e0d01", + "sha256": "0lj3wgiyrv3mma49k1ijlfhaj3d16fg0brdb9bshz0kizjlwzjx4" }, "stable": { "version": [ 3, - 2 + 3 ], "deps": [ "dash", @@ -98359,8 +98634,8 @@ "spinner", "xterm-color" ], - "commit": "0bd7932ebe30c19068b8c4fc154e00787a678200", - "sha256": "000awxvnwxg2hmhhn6yd9pnvflr91npfs2v1p5y7hcwg1d6mmvgk" + "commit": "868757f5675e602d924a15ca7f716fdfd4a873f2", + "sha256": "088g6arlbq7czxyg5f31zmcm0gla7qh4vapaaskf6866yyqhizvb" } }, { @@ -98429,11 +98704,11 @@ "repo": "magnars/s.el", "unstable": { "version": [ - 20210616, - 619 + 20220816, + 956 ], - "commit": "08661efb075d1c6b4fa812184c1e5e90c08795a9", - "sha256": "02hcjnf8n0nzqysqi9g7kqykxmn8nwhsx1scrq6wj1iibc16nh0p" + "commit": "07c57d3562da534d1b18a0fb21e12cd6ae6ff4d7", + "sha256": "1mlb0wjsjrsm1qrr0kymzqx14qzalqyawh0b4jxgpsdaidlvfnp6" }, "stable": { "version": [ @@ -98570,6 +98845,30 @@ "sha256": "18c6l36sdc3any2fccm49wiyrda97pnd07jdir22wfl5wba7xnj8" } }, + { + "ename": "sakura-theme", + "commit": "0009711939d1e18e8543be0a1c318f3cdc3024c4", + "sha256": "18xxsdxhbmg0cq4fi00pk05d6dqic2hc6lj988hlz1f0p0h2w30s", + "fetcher": "github", + "repo": "emacsfodder/emacs-theme-sakura", + "unstable": { + "version": [ + 20220822, + 254 + ], + "commit": "49f6fbb9f0f5d0129c2fc23c09be2c6bfc7ada0a", + "sha256": "1hkglja81k7qgvai35bq3169hizgwc9ci0h0s7g3sz1p9q4bdx2h" + }, + "stable": { + "version": [ + 1, + 0, + 1 + ], + "commit": "d78648632a94dd5354d2fed0f94fcb7aece29132", + "sha256": "0nxj6gx5virv95sfxbasvr2mh427w5srzjsfawhf58ixif8wkhd0" + } + }, { "ename": "salesforce-utils", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -99413,8 +99712,8 @@ "dash", "f" ], - "commit": "6debf99431a5cb4d1db55e5379453c6a181a133f", - "sha256": "18jl7ccv7b4p9gr9dkqpidkwazqly7nic99x29av0f8vicmg00w3" + "commit": "54330eabcc5c47019b9ab51d6b3fc035deebbab0", + "sha256": "1mkcr2jgczrgbyrv8db3ghc8h1lba8wx6nc6m3lmzi44niacm06d" }, "stable": { "version": [ @@ -100393,11 +100692,11 @@ "repo": "qhga/shanty-themes", "unstable": { "version": [ - 20220623, - 1528 + 20220816, + 1830 ], - "commit": "906104f6a6b185efc19285fcc3bc943f094fb594", - "sha256": "1gxb0sgq2ng9l7nfjbwjzc0ylxdgms018srs6550d779mi5gc8b7" + "commit": "9ddd8ccd94b51ad5b19ee7097dcfccb3588b5eef", + "sha256": "0j0vf6v4cw9v661zk1hcm3cnxl0lgfk5bpd7xwdah8v38mb02k8w" } }, { @@ -100798,11 +101097,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20220809, - 115 + 20220823, + 543 ], - "commit": "a8e2e5c7b7576afd7b097b40c6ca39e5717f97a5", - "sha256": "0vqq69jkx11d8m9g9v2m4zvpq3khkdhvgzvpcszvic4fvaa65jpc" + "commit": "e185b54d13fb7eac7d045daf6a83731d9ef79231", + "sha256": "0mbv68g1q98dysjvhdxwf3gcwwmihy6ni3b4r4kz6klyfr2jwqim" } }, { @@ -100877,8 +101176,8 @@ 20220704, 659 ], - "commit": "1a332666192f377dca933b0da71e6528b288fc09", - "sha256": "166af5nmhskkaih955prgbdyqhl3gms20x9wlaj2ckhqapdgikdk" + "commit": "61e8b5f867b3b139bdaa8a0079fe11447b5ca886", + "sha256": "002mr608yrir3krillg6y9h8l3hwx0mq8wg07a7jhqbx32zhsgjz" }, "stable": { "version": [ @@ -101269,8 +101568,8 @@ 20220806, 401 ], - "commit": "3e1889daa10ea6950b130e29991296d150fd9679", - "sha256": "0579qmb3sspk438v2qrp3gkfn0cwydp3x7s3lvya7lfs4ywmqcpv" + "commit": "c76ed684e36f1a81914cd8dfcfe7efe2d061468e", + "sha256": "1i7jbvnhm7pvbqa2yswd92ixpyfqydr1lgbgpjpca613s278kn8n" }, "stable": { "version": [ @@ -101297,8 +101596,8 @@ "sideline", "vc-msg" ], - "commit": "574592a8ecc171112d4ac2575f9cac51ff5eb184", - "sha256": "08msa23fgwhfwnyl8dmakv32qa8fkzqfspcgc0bliqrxh6dpcjr5" + "commit": "b0db4abe5c1c74e15c0844f60a94e8bcb1e29d11", + "sha256": "1m8bmf8ymrsfrmws8964sx9b4z2jswy84gcn11ph7z8kiisr7dd6" }, "stable": { "version": [ @@ -101330,8 +101629,8 @@ "ht", "sideline" ], - "commit": "7f11c14c938a88a35728b04add991903486ddd31", - "sha256": "0y30iw3psllf0g8llvzm8sd0kkhazhn433fwq0nq6hy21rm4r12x" + "commit": "72e94b34c58e9497abb4f997d2de9f5978b50fa3", + "sha256": "1vizkq0c4vjwjbcbwvpza3i2apnynqk40hvn4kk3bl7sw2flcfnm" }, "stable": { "version": [ @@ -101361,8 +101660,8 @@ "deps": [ "sideline" ], - "commit": "a6c6e9e4e64a12040adadaf351f3e83a0e2954e6", - "sha256": "1gf0jfs4gnvp2n4d1nix84sqr3a8np0hf05f1prhk0z2sr4ils8k" + "commit": "d105be829dc621bbc50158da3dbed7a5e304f8a8", + "sha256": "1hy6sckfwy51lw1mi3r6bxvb0kfwh688d0rx6a092nzwrnj4f6q7" }, "stable": { "version": [ @@ -101395,8 +101694,8 @@ "s", "sideline" ], - "commit": "b340c1e9a6d26ad4b3afe6aa660d62e8cebd66c8", - "sha256": "00y2jsvk0a1jjp0jw6r49pqmcbmrgrsrrhjkxvh13765i89x3fck" + "commit": "4495fd9c7d926b0caf2d041c8deb7833f4be06be", + "sha256": "01sl6admcylr93gn6si4hgngnyr3b1kr5s4hdfzxgsxw8qahvms9" }, "stable": { "version": [ @@ -102307,17 +102606,17 @@ }, { "ename": "slow-keys", - "commit": "5d16756967dd9077399b92cde2ddd7784739b693", - "sha256": "03p0qx8a3g8mapjhdf9pjp3n0ng2pxmizpqn87wk8mbc8cmlwk2w", - "fetcher": "github", - "repo": "manuel-uberti/slow-keys", + "commit": "5e0cbc811ff757c3e0ae349ceb047dfa8515f396", + "sha256": "1zjdq087xqnpx2hpyz0zr0ld0pz0c7l7wll5fvxp9y73k33jf640", + "fetcher": "git", + "url": "https://git.sr.ht/~gitmux/slow-keys", "unstable": { "version": [ - 20180831, - 459 + 20220807, + 1425 ], - "commit": "b89b4fbddb4b6b95fcc7301ec543ea535b2cc4d7", - "sha256": "06gr15dlz910azxzlwwbqimy2pvpncw2p3iixm6r4kbb41ycpn87" + "commit": "ec69a853a40bc5650c1b30cd866acb16e0a2dd8a", + "sha256": "1b6rz830chirjirs0ish2r6kphy16nv4pr285rkcdpbk700kbw0n" } }, { @@ -103306,8 +103605,8 @@ "deps": [ "transient" ], - "commit": "0dfeaff6079558c39081c2c078c41369da01903b", - "sha256": "0mir9ic4ywhyhhsn7y2qwy2s5h4qlrxz11mrs6680d2ki1bnyc81" + "commit": "849a74c24597c72818f194cf410087fc7c07f3d1", + "sha256": "1ri4g5a0cw7ldmznqkr78zvd033mazki01m0x7g1xisc181s57rb" }, "stable": { "version": [ @@ -103795,11 +104094,26 @@ "repo": "emacsfodder/emacs-soothe-theme", "unstable": { "version": [ - 20141027, - 1441 + 20220825, + 729 ], - "commit": "0786fe70c6c1b4ddcfb932fdc6862b9611cfc09b", - "sha256": "10gh1hvxq9gm29r6qzlnva7vjidd7n4kih4z2ihyvbvy9za20xqw" + "deps": [ + "autothemer" + ], + "commit": "36c3a8be287d59a1514e59674ed2ebc9c936eb1d", + "sha256": "038268wccb5l36cdnhhlcivc1hvpm33rh1a9igm83kyc7y6l6k2x" + }, + "stable": { + "version": [ + 2, + 0, + 3 + ], + "deps": [ + "autothemer" + ], + "commit": "36c3a8be287d59a1514e59674ed2ebc9c936eb1d", + "sha256": "038268wccb5l36cdnhhlcivc1hvpm33rh1a9igm83kyc7y6l6k2x" } }, { @@ -104191,19 +104505,19 @@ "repo": "nashamri/spacemacs-theme", "unstable": { "version": [ - 20220430, - 2248 + 20220817, + 1546 ], - "commit": "bd376f705d6eb7afd9a1dfa0c1bd407e869d1e9f", - "sha256": "1kxnnmnj7pbli7lybxvhhd63q376i65il8zxnjig0p13pyh5j1mv" + "commit": "e04d1f21107a1565861625209bb9c46a7aa43cc5", + "sha256": "1yz8xg9ni9290nly5b93djkzk9235q6k4lhb5ghs6snr0r39157n" }, "stable": { "version": [ 0, - 2 + 3 ], - "commit": "b45fcdcd47a10362a782f27370b2f54714ad9f62", - "sha256": "15l9hb8f08nkxsaj8pxbg2mip4pp2msnrl0nvlq22zg40gh7pqsn" + "commit": "e04d1f21107a1565861625209bb9c46a7aa43cc5", + "sha256": "1yz8xg9ni9290nly5b93djkzk9235q6k4lhb5ghs6snr0r39157n" } }, { @@ -104274,14 +104588,14 @@ "repo": "ljos/sparql-mode", "unstable": { "version": [ - 20210701, - 1202 + 20220824, + 1323 ], "deps": [ "cl-lib" ], - "commit": "ceb370b3879841f8809cc3f9b1b87e898f10562f", - "sha256": "05vbsfyck0nxa0bsg7jjshjzh7719gx6z6i9i4ayxcfygh3wh6xz" + "commit": "15960092e8ce8ebe6a6afd82202ccf47cb306e76", + "sha256": "1wlwn2f6r00fj7wk1pymrha2rpfrd3b2ggmcjsz74f7ixc0y4c2k" }, "stable": { "version": [ @@ -104319,11 +104633,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20220803, - 148 + 20220824, + 154 ], - "commit": "cefebe6215b4065827553f2e0cb87c31c5893e5e", - "sha256": "060nbh6bq55d1vv0ln67kdp6am7fad6i6zpjvfdf5252gsz63lds" + "commit": "3e9b59dbdb81a8ade36f21ae57690df5922a67b5", + "sha256": "1c01v5mdqvsn01pxcd7h7qrr2cqxl6hgpisz8m3gigabj0lx1r6d" } }, { @@ -104376,22 +104690,19 @@ "repo": "dakra/speed-type", "unstable": { "version": [ - 20220809, - 1119 + 20220815, + 1458 ], - "commit": "e2fda90683945d9fff9f5b48ee080eebe3994fb9", - "sha256": "0cngw8v8n7byskiyyjq2lxz95kz34xr5gb5z8m42rwk780mn6hz2" + "commit": "304cb8cd6c30d07577d7d864fd32858a29a73dba", + "sha256": "0n7rcb0bfw5d22fmy0kb14i4z88z0p4k23zxq5i23srcskihbkl8" }, "stable": { "version": [ 1, - 2 + 3 ], - "deps": [ - "cl-lib" - ], - "commit": "5ef695f7159aa1f20c7c9e55f0c39bcdacce8d21", - "sha256": "17xh7f1ps6bfs55a08d0jjma2hs117fv4j90w4xif0n2h49m4pjp" + "commit": "657946280a540587831494415b16df3194ae7c52", + "sha256": "0nnvk3qnn61hg5rgwpiy1dqg6sqfh1m5256sbsk2pwrdmk54k85k" } }, { @@ -104447,11 +104758,11 @@ "url": "https://codeberg.org/ideasman42/emacs-spell-fu.git", "unstable": { "version": [ - 20220802, - 1151 + 20220822, + 2347 ], - "commit": "bfd017fd1985418a1b101c1e497510ce24bb0348", - "sha256": "1gv2596kq06x90cscc5bhwsisrm3pipiwh5gmq11j28dj0mih3pf" + "commit": "2288af944af74f03f4fdb298d0aa7e62ed805c04", + "sha256": "048akpwrfnhl0r4sx8g422x0pv71980kwa0ny84isxjc4xqjc97l" } }, { @@ -105055,11 +105366,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20220724, - 11 + 20220812, + 2051 ], - "commit": "10c36b101cadfdded4d7b78d920fc2919a7d674e", - "sha256": "0y2rc30k1dn4w3s2s75789f33vn6r9v1g2i7agkihjyp4sc4zmsa" + "commit": "a17dabd0c45c4481de48e00ce390f5968d95111d", + "sha256": "0031xdisf7s57mpqv44f6lwnqmhb51xg25hy2r30x801mz0v8caw" }, "stable": { "version": [ @@ -105490,11 +105801,11 @@ "repo": "stacked-git/stgit", "unstable": { "version": [ - 20200606, - 1308 + 20220822, + 1637 ], - "commit": "1d829904702be42f057e89686cfc07e7051d7b05", - "sha256": "1vcbjg0hrndrcs6mmdnynv2ly9cl4gwp3zqbp2av9w95lx8ynqif" + "commit": "af04cf8247f7b2adc71e618dbff6006faca1af5a", + "sha256": "01jax58bq7m5z67ikdblzyyh6sibq23hmyi7y3z5k08ikvjkxbj9" }, "stable": { "version": [ @@ -105543,11 +105854,11 @@ "repo": "motform/stimmung-themes", "unstable": { "version": [ - 20220808, - 1150 + 20220823, + 919 ], - "commit": "9c8391cbc69bb44576b333af5caec84221d7b596", - "sha256": "1fwmns83vlbin272zy4nnwbbjlr3zjlh0shb661jlxvbqbi25p9p" + "commit": "fc9f685fee717f52a249a72189bbdccb225bc122", + "sha256": "0a40ddrpqd3ylf1ylnaxvmrr966z8qqv8xh796nacmr5klbmzc6i" } }, { @@ -105714,11 +106025,11 @@ "repo": "akicho8/string-inflection", "unstable": { "version": [ - 20210918, - 419 + 20220812, + 1259 ], - "commit": "fd7926ac17293e9124b31f706a4e8f38f6a9b855", - "sha256": "0wskrp3v5gi3b3s9471ijkdncnfd888qd50c72rv2p8846174paj" + "commit": "f848c68221f0c474a4f060884d8f7a86f44f42d4", + "sha256": "188qlhaisrfbhh9646gqvmz0ksqd00vrbc3lb2gfhigadyfzm15j" }, "stable": { "version": [ @@ -106791,11 +107102,11 @@ "repo": "dimitri/switch-window", "unstable": { "version": [ - 20210808, - 742 + 20220812, + 2137 ], - "commit": "8d9fe251d8d38b223d643df975876356ddfc1b98", - "sha256": "0qc004gpyzf0hpsjr1xhsnfnn0g2jkpfxzvysa05p9nwglfpsn09" + "commit": "71ef2f54c97f3fd2e7ff7964d82e6562eb6282f7", + "sha256": "186100j93in5dm1h3xl1sg892yfz8nvssap2hsy5kh6aw1am412y" }, "stable": { "version": [ @@ -107027,8 +107338,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20220705, - 1558 + 20220811, + 235 ], "deps": [ "evil", @@ -107040,8 +107351,8 @@ "seq", "undo-tree" ], - "commit": "533eb8ad0ce43c6a7667a2c8a9a8fd6ae275c820", - "sha256": "1al6d586rip99q42farhh117li0d14in0vvy4dy2lm68nk7b095n" + "commit": "adebb7aa1dedac88585bd1077ac81f97df3bd7d5", + "sha256": "0bhm3nvnhmnr2djsig9vqzpsk5plsx6q1zv5hbnwyjcrawm6d9rs" }, "stable": { "version": [ @@ -107740,17 +108051,17 @@ }, { "ename": "tangonov-theme", - "commit": "a9595a5239a1f1003a269e7c7b52804ccb692d30", - "sha256": "13dlllb7j03sigydwm3j6p4fh5dp7pi9bywvrarhnxrhh6wmdizv", - "fetcher": "github", - "repo": "trev-dev/tangonov-theme", + "commit": "76cd5a26b05fdba0bf979e7d34a0a3ab981de47c", + "sha256": "01fap05nfx28zbj72661z55bl7x7jmvgcwq2lgwaaa8m08si883k", + "fetcher": "git", + "url": "https://git.sr.ht/~trevdev/tangonov-theme", "unstable": { "version": [ - 20220808, - 1727 + 20220816, + 2316 ], - "commit": "fdef90a7795549181276d51d679eacb6e8e74e74", - "sha256": "09izx2k8kpcck63qpwjpsbb5952zzynsa9cdbh3irmkkck9i3bnp" + "commit": "18c0c07b03a963b0c625f66c77f1f0755a0ca22a", + "sha256": "0xy0p5h5s3rzxs97q9l66a1kv0z0gzzlfn76dp61rkaqgpclakwf" } }, { @@ -107985,21 +108296,21 @@ }, { "ename": "telega", - "commit": "e5d96e72c0fb942e001f3001ce907be0117705a7", - "sha256": "1qn6gw8dqh335am0wx6dnfc7qxw8djypvvzbk5sl1zmzsg562sbq", + "commit": "746947a065c8fd26bfb540c96d869d05a0bd9b53", + "sha256": "15k4nl78fp7nl6nr6wf49ngbpx8659mx3ypfwq7b3pfmanawp7wp", "fetcher": "github", "repo": "zevlg/telega.el", "unstable": { "version": [ - 20220713, - 2342 + 20220819, + 506 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "11c0c785ed9e479b65514a10022d5c34984aab59", - "sha256": "0g4lk0lp4hj05hvl7pyxfc9lpmaknlr85h71sawpnvkr8853v2as" + "commit": "42a0dd0e30a82a8e34eaccf6e7a1366f4621d49d", + "sha256": "1psgkb2k5w1f3r6ik4gby9w5qinhwdimb6yhsqz06y9a2d9g97rm" }, "stable": { "version": [ @@ -108471,11 +108782,11 @@ "repo": "davidshepherd7/terminal-here", "unstable": { "version": [ - 20220519, - 552 + 20220814, + 2056 ], - "commit": "c16a500926416c09cd2faee6ab9541686b51e34f", - "sha256": "1iv1c2mbvhn00ha46c6f98j9syc71xhjpk8m5wa5p32sk4wcc9f4" + "commit": "3cc7c57599630036714183b973b47d559fa46a9a", + "sha256": "0kzr1y2731hnqbx1qq894my8vnl42zlnkwssm24lnxdcb6qbd616" }, "stable": { "version": [ @@ -108519,8 +108830,8 @@ "cl-lib", "json" ], - "commit": "ef50c6f0269a6fd9ce742d0a87647d60a0ef850f", - "sha256": "1c3zamvcambi9l91vilc0sbyzn21jj89n9j02simza4ffyn9xix9" + "commit": "5f1f83b1689d4954d62e794d9a89c57709099c27", + "sha256": "1chpq59hrxlf5bnjcahmlm6k896jxi74mafj5i5q3d82i88qv8m6" }, "stable": { "version": [ @@ -108552,8 +108863,8 @@ "cl-lib", "tern" ], - "commit": "ef50c6f0269a6fd9ce742d0a87647d60a0ef850f", - "sha256": "1c3zamvcambi9l91vilc0sbyzn21jj89n9j02simza4ffyn9xix9" + "commit": "5f1f83b1689d4954d62e794d9a89c57709099c27", + "sha256": "1chpq59hrxlf5bnjcahmlm6k896jxi74mafj5i5q3d82i88qv8m6" }, "stable": { "version": [ @@ -109018,8 +109329,8 @@ "deps": [ "cl-lib" ], - "commit": "e6e8efd740df0b68db89805ba72492818dba61ab", - "sha256": "1cy1s9iyv2c4c2kld42aricar4s5d0irdhsqb8rsbbriif50vpvd" + "commit": "617c3674193c38d34e5b01d5d936318cc421eedd", + "sha256": "0351l334h0wsnjp61ldahcax06hrjiv5m2yswfgwppg78j0lpsb6" }, "stable": { "version": [ @@ -109155,18 +109466,18 @@ 20200212, 1903 ], - "commit": "8d346673d83b8019c1637e8396ed4635d5c2ddb0", - "sha256": "06zhd2v80j6flxiqdavpyq87v8yvnixjv98agpsabh1lrvl4cday" + "commit": "1e2c611272f9943c85286275151a4a81ce59e52f", + "sha256": "1zxqirgk6fw6ps8jx2ln1mqr8nylyia0yq0wpzzlxr0ifhpk6jk9" }, "stable": { "version": [ 2022, 8, - 8, + 22, 0 ], - "commit": "68ac4169a6e95bb94540f222cd6b3f9f2ed3f868", - "sha256": "1nb9waad0ijgd1ah2d9jipwjplx9mdn61bsxcpvqcpswy326ymad" + "commit": "27f978d8a30a7499377854a25e1f0dab64ae0152", + "sha256": "1vspyssn5kacbpzxl69x9v0mry1rsmd96vc8rhf8n3z6i4bdjhrj" } }, { @@ -109222,8 +109533,8 @@ "deps": [ "haskell-mode" ], - "commit": "4356f6309a3686cbb5e4d298f265baadb855b945", - "sha256": "07syq66z3b4nnxf67zljsvnmmd0im76vd24kw660qcls5fj4k3ps" + "commit": "22cb3d3ebd7fb7acec349e040f977495e44aec8b", + "sha256": "0iy9qckjv9zbyg7bacqhihk8m4ws1kf6pd93vclsa1p6aa30jps7" }, "stable": { "version": [ @@ -109311,6 +109622,24 @@ "sha256": "1qxhrm852j93sqi1lznlrjn7s0vscsixm48g46ja70gl320chyzm" } }, + { + "ename": "time-block", + "commit": "9f7b6f0801b42358e021ec13897b1146e0f8c4e4", + "sha256": "10p61y2897n873x986f30kghiq60b72jz98lbzarwx55vf1l63hc", + "fetcher": "git", + "url": "https://git.sr.ht/~swflint/time-block-command", + "unstable": { + "version": [ + 20220821, + 1431 + ], + "deps": [ + "ts" + ], + "commit": "4ac663b5196567326b82fe76c9930c116bed5596", + "sha256": "0w1iqzdy0zf885wcag77jb21snx2k5wy4m3ckdj24gnjsa6r6inj" + } + }, { "ename": "time-ext", "commit": "f8e4328cae9b4759a75da0b26ea8b68821bc71af", @@ -109871,14 +110200,14 @@ "repo": "nagy/tokei.el", "unstable": { "version": [ - 20220422, - 2234 + 20220823, + 2058 ], "deps": [ "magit-section" ], - "commit": "181021cd881eecd604a546d4a717866a81c7a511", - "sha256": "0gcjlcfxd4bg123gjf7d0vfvfd6zpd0da8svynglca1qhp77jkx1" + "commit": "86fbca422f580a95eb30247e46891184f3ac5c18", + "sha256": "0nn8v9x0dczw0ingibclc1v8fnhjiwl14vm1qjcng9dcr2pbp7mq" }, "stable": { "version": [ @@ -109990,20 +110319,20 @@ "repo": "trevorpogue/topspace", "unstable": { "version": [ - 20220803, - 2258 + 20220824, + 134 ], - "commit": "fa67b67e1ae41adb44de0e5180a6cab922da6bb0", - "sha256": "1v78pmv6554qb9b4s2i19vvxncsp914qblyyv95zbq8id3k3v606" + "commit": "4f090520174cab0fa752765b7c18885efb6cce11", + "sha256": "1qx4ablzj4w16780g6lk97lyhsmip6s2yjlb3nwpivn9979py9m4" }, "stable": { "version": [ 0, 3, - 0 + 1 ], - "commit": "6ed32d242666b4a38276de433aca9f6387dd867b", - "sha256": "1yxcig19wkr0592iips3bh7mj1g9yhv0v2yaw19jaxqg1rzg3hip" + "commit": "33c2a6f0a11d1d88cdb2065c5a897e33507f4c86", + "sha256": "16jcw01nh09lcd3xmq88iw0sq77ginyvnpkcjwds1bixmyl1frw1" } }, { @@ -110376,8 +110705,8 @@ "deps": [ "compat" ], - "commit": "3b267425c0fe93a518a703d814cff3cf6a304a97", - "sha256": "04xdaap7hqx42mpwwxdvlmmsffbdv107jqkvy6pifwjl2mmz2p5v" + "commit": "6b9c93af9c1d1646be4445656c46ee9390c9f129", + "sha256": "1kvjn30cy03729ma74qzplr6lcwcqgh2lbvj409jhq1ksmzbh35a" }, "stable": { "version": [ @@ -110530,8 +110859,8 @@ 20220704, 640 ], - "commit": "9f3c5ef4029f992fe94b70d54b8d00f0a4cbce1c", - "sha256": "19ail8y13ywp0rzl1r78iyg7176nijlqjw348is83kdv6qbf8fcc" + "commit": "7a8dc6ac88536e4ce7bdaf47bd2da06a77336f5a", + "sha256": "0di5amih9sskglj30nlhrkggda7vix32zvck2mjg7bwx4r4kz6ns" }, "stable": { "version": [ @@ -110779,26 +111108,26 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20220508, - 636 + 20220821, + 1313 ], "deps": [ "tree-sitter" ], - "commit": "deb2d8674be8f777ace50e15c7c041aeddb1d0b2", - "sha256": "1p2zbb6ac7wi6x6zpbczcmpkb2p45md2csd2bj43d8s56ckzw5mp" + "commit": "5c6900a66a6b3a5d4ae6bde5199b5288c09af43b", + "sha256": "0arj78dbinvki0yvgmj4p4blf9gb2c140sgphddnzfh134lvpkl9" }, "stable": { "version": [ 0, 12, - 0 + 1 ], "deps": [ "tree-sitter" ], - "commit": "deb2d8674be8f777ace50e15c7c041aeddb1d0b2", - "sha256": "1p2zbb6ac7wi6x6zpbczcmpkb2p45md2csd2bj43d8s56ckzw5mp" + "commit": "5c6900a66a6b3a5d4ae6bde5199b5288c09af43b", + "sha256": "0arj78dbinvki0yvgmj4p4blf9gb2c140sgphddnzfh134lvpkl9" } }, { @@ -110858,8 +111187,8 @@ "pfuture", "s" ], - "commit": "aa3f4547c3cb32b0b6b25bfab215228d9d848162", - "sha256": "0srm2gnhakng4sfi5yz8iikbijxpfxgqjhdxwgc5sybdnn2dkqha" + "commit": "89ade54c0e96f1c6f6abe5c5373c46c3355c91be", + "sha256": "1qhxh88p20l9yhxv0w98rvb5g4ldlgzqy3034kl8jgaqfhwvr2i7" }, "stable": { "version": [ @@ -110895,8 +111224,8 @@ "all-the-icons", "treemacs" ], - "commit": "aa3f4547c3cb32b0b6b25bfab215228d9d848162", - "sha256": "0srm2gnhakng4sfi5yz8iikbijxpfxgqjhdxwgc5sybdnn2dkqha" + "commit": "89ade54c0e96f1c6f6abe5c5373c46c3355c91be", + "sha256": "1qhxh88p20l9yhxv0w98rvb5g4ldlgzqy3034kl8jgaqfhwvr2i7" }, "stable": { "version": [ @@ -110926,8 +111255,8 @@ "evil", "treemacs" ], - "commit": "aa3f4547c3cb32b0b6b25bfab215228d9d848162", - "sha256": "0srm2gnhakng4sfi5yz8iikbijxpfxgqjhdxwgc5sybdnn2dkqha" + "commit": "89ade54c0e96f1c6f6abe5c5373c46c3355c91be", + "sha256": "1qhxh88p20l9yhxv0w98rvb5g4ldlgzqy3034kl8jgaqfhwvr2i7" }, "stable": { "version": [ @@ -110956,8 +111285,8 @@ "deps": [ "treemacs" ], - "commit": "aa3f4547c3cb32b0b6b25bfab215228d9d848162", - "sha256": "0srm2gnhakng4sfi5yz8iikbijxpfxgqjhdxwgc5sybdnn2dkqha" + "commit": "89ade54c0e96f1c6f6abe5c5373c46c3355c91be", + "sha256": "1qhxh88p20l9yhxv0w98rvb5g4ldlgzqy3034kl8jgaqfhwvr2i7" }, "stable": { "version": [ @@ -110987,8 +111316,8 @@ "pfuture", "treemacs" ], - "commit": "aa3f4547c3cb32b0b6b25bfab215228d9d848162", - "sha256": "0srm2gnhakng4sfi5yz8iikbijxpfxgqjhdxwgc5sybdnn2dkqha" + "commit": "89ade54c0e96f1c6f6abe5c5373c46c3355c91be", + "sha256": "1qhxh88p20l9yhxv0w98rvb5g4ldlgzqy3034kl8jgaqfhwvr2i7" }, "stable": { "version": [ @@ -111020,8 +111349,8 @@ "persp-mode", "treemacs" ], - "commit": "aa3f4547c3cb32b0b6b25bfab215228d9d848162", - "sha256": "0srm2gnhakng4sfi5yz8iikbijxpfxgqjhdxwgc5sybdnn2dkqha" + "commit": "89ade54c0e96f1c6f6abe5c5373c46c3355c91be", + "sha256": "1qhxh88p20l9yhxv0w98rvb5g4ldlgzqy3034kl8jgaqfhwvr2i7" }, "stable": { "version": [ @@ -111053,8 +111382,8 @@ "perspective", "treemacs" ], - "commit": "aa3f4547c3cb32b0b6b25bfab215228d9d848162", - "sha256": "0srm2gnhakng4sfi5yz8iikbijxpfxgqjhdxwgc5sybdnn2dkqha" + "commit": "89ade54c0e96f1c6f6abe5c5373c46c3355c91be", + "sha256": "1qhxh88p20l9yhxv0w98rvb5g4ldlgzqy3034kl8jgaqfhwvr2i7" }, "stable": { "version": [ @@ -111085,8 +111414,8 @@ "projectile", "treemacs" ], - "commit": "aa3f4547c3cb32b0b6b25bfab215228d9d848162", - "sha256": "0srm2gnhakng4sfi5yz8iikbijxpfxgqjhdxwgc5sybdnn2dkqha" + "commit": "89ade54c0e96f1c6f6abe5c5373c46c3355c91be", + "sha256": "1qhxh88p20l9yhxv0w98rvb5g4ldlgzqy3034kl8jgaqfhwvr2i7" }, "stable": { "version": [ @@ -111116,8 +111445,8 @@ "dash", "treemacs" ], - "commit": "aa3f4547c3cb32b0b6b25bfab215228d9d848162", - "sha256": "0srm2gnhakng4sfi5yz8iikbijxpfxgqjhdxwgc5sybdnn2dkqha" + "commit": "89ade54c0e96f1c6f6abe5c5373c46c3355c91be", + "sha256": "1qhxh88p20l9yhxv0w98rvb5g4ldlgzqy3034kl8jgaqfhwvr2i7" }, "stable": { "version": [ @@ -111325,15 +111654,15 @@ "repo": "alphapapa/ts.el", "unstable": { "version": [ - 20210813, - 1617 + 20220822, + 2313 ], "deps": [ "dash", "s" ], - "commit": "3fee71ceefac71ba55eb34829d7e94bb3df37cee", - "sha256": "1041zwlslj70rfjmpcxbib4h05rclhykr7i7pckvz7smsh4w3p2i" + "commit": "552936017cfdec89f7fc20c254ae6b37c3f22c5b", + "sha256": "18lif159zndl19ddz9rfq12l90770858yasfns21ryl1yrq3aifr" }, "stable": { "version": [ @@ -111744,11 +112073,11 @@ "repo": "emacs-typescript/typescript.el", "unstable": { "version": [ - 20220805, - 2008 + 20220815, + 1954 ], - "commit": "d1123e0e96da3535a22380e9345249730e756966", - "sha256": "0lp2mbfzpvcr08kgk2mgrlmpzxkq4kbaj53qsv6jbkfdcbv48x3i" + "commit": "d79551c67ff5f2bd5f651eb411cdc66ceeb787e3", + "sha256": "0r57nxcwdpjckpv6lrk310p3hjivnlyfvqpfg9jd86y37bbaw8fa" }, "stable": { "version": [ @@ -112175,8 +112504,8 @@ 20220616, 1950 ], - "commit": "6bc351c4cb49ccc7210801e6b54ecc2993289b92", - "sha256": "0vvz0s5jq2a9dlqbnq18mlkh4dkpp8kizkjyn7jk38npqy4syyv1" + "commit": "ee8a3cff8abadbfcd1b3c51e8622d32a104c99c4", + "sha256": "04lcbxjrclnijannx1hdkkcg6vyvm16jkns8ix89bk3sj0j3wgk0" }, "stable": { "version": [ @@ -112930,14 +113259,14 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20220809, - 42 + 20220819, + 553 ], "deps": [ "bind-key" ], - "commit": "e5f64cc6d9d0df3721b319eeecca1f4f49ea86a3", - "sha256": "1108x07jf9cfgi5wyy18v0dr6vjpssl19032q9g0vci5mpi5k123" + "commit": "e2d173b1200865a9efd5c2066831a230497582c0", + "sha256": "1m5987l96xlpxz0aiczc1nifrsjh33z9z7biryb47khdgizhy931" }, "stable": { "version": [ @@ -112969,8 +113298,8 @@ "key-chord", "use-package" ], - "commit": "e5f64cc6d9d0df3721b319eeecca1f4f49ea86a3", - "sha256": "1108x07jf9cfgi5wyy18v0dr6vjpssl19032q9g0vci5mpi5k123" + "commit": "e2d173b1200865a9efd5c2066831a230497582c0", + "sha256": "1m5987l96xlpxz0aiczc1nifrsjh33z9z7biryb47khdgizhy931" }, "stable": { "version": [ @@ -113032,8 +113361,8 @@ "system-packages", "use-package" ], - "commit": "e5f64cc6d9d0df3721b319eeecca1f4f49ea86a3", - "sha256": "1108x07jf9cfgi5wyy18v0dr6vjpssl19032q9g0vci5mpi5k123" + "commit": "e2d173b1200865a9efd5c2066831a230497582c0", + "sha256": "1m5987l96xlpxz0aiczc1nifrsjh33z9z7biryb47khdgizhy931" }, "stable": { "version": [ @@ -113119,8 +113448,8 @@ 20220704, 700 ], - "commit": "6473227e4e26896db099d54bd2ba1d05619395bc", - "sha256": "1mf2r3c6dhx39j5kr2nv5mc7nh99hi2bz361al0kw5r5shk0mvid" + "commit": "9fd4d37c3fce9d0f3743172f50ed7c4cb17b822d", + "sha256": "06fl5baxdylgsdfn97823ljmwyk3ly6rxirgw6wrf62qx5kz0a3i" }, "stable": { "version": [ @@ -113898,6 +114227,36 @@ "sha256": "0w8v0ivwq3i42mxfxk5zvlx1lz4di06dpd93j2j13ns5h46vxhc0" } }, + { + "ename": "vegetative-theme", + "commit": "5fcab9f039aae62707ab953440dbb4a65f6964db", + "sha256": "1m1wgas1qfb53lfd1jbmys9x1bn4qyyi3nw211d060dmj9dggp01", + "fetcher": "github", + "repo": "emacsfodder/emacs-theme-vegetative", + "unstable": { + "version": [ + 20220822, + 353 + ], + "deps": [ + "autothemer" + ], + "commit": "db60ce0fe327ae7e4371545179ed94483b1132a8", + "sha256": "1cqrrkp8dhwh73ypfhw3hzn2siy7s23kfafn61y6qgkxm2hnhj0j" + }, + "stable": { + "version": [ + 1, + 0, + 2 + ], + "deps": [ + "autothemer" + ], + "commit": "db60ce0fe327ae7e4371545179ed94483b1132a8", + "sha256": "1cqrrkp8dhwh73ypfhw3hzn2siy7s23kfafn61y6qgkxm2hnhj0j" + } + }, { "ename": "verb", "commit": "3802b91f39ef7800afd49589d398182cb191b756", @@ -114622,11 +114981,11 @@ "repo": "emacs-vs/vs-dark-theme", "unstable": { "version": [ - 20220703, - 809 + 20220817, + 733 ], - "commit": "87b1b300375bb9f06f92e253c6941113b9bce5b4", - "sha256": "1za8p2xj5drn71xx1yvy8k96576z3rfgfcjgj4h697ldlsbz3xgi" + "commit": "bf0e9d763ccff2add31f441261903986f9cbc702", + "sha256": "02a73gnw3c92pslyis7p2yq4lz8h5pk970izvml5ifpf86raqcnq" }, "stable": { "version": [ @@ -114645,11 +115004,11 @@ "repo": "emacs-vs/vs-light-theme", "unstable": { "version": [ - 20220703, - 806 + 20220817, + 737 ], - "commit": "af9c8ee7e99ec4ffb20d15512efafc49d509f5db", - "sha256": "1cvvhckf3s21v7bs20jgza57dazm6ck6k8lzlmj6f3fmhif27hvx" + "commit": "38c45512dc74b1221ad3364c560c2eb65ced8ff4", + "sha256": "0ydzsfbq4mkfmah4h6n4mb48f0pzfdjflqhrza5sniymgjw2mv56" }, "stable": { "version": [ @@ -114722,11 +115081,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20220613, - 1614 + 20220822, + 1158 ], - "commit": "3155a477b43c1567d754768f5be79296440ebaf8", - "sha256": "1pki7ih33n09k0q23053xc6vwn9gcvas91g3z5y19b9c5nr9b1sr" + "commit": "f104e3a11c9ff33ccc0e086cffaadc9549e9e8b1", + "sha256": "1pcqj1w3gi5bqwwb45z30zmhd2klrq76w1vbxf7l9kq9j5m590x9" } }, { @@ -114737,14 +115096,14 @@ "repo": "jixiuf/vterm-toggle", "unstable": { "version": [ - 20220606, - 1524 + 20220820, + 1608 ], "deps": [ "vterm" ], - "commit": "02519323aa0a2e6af641cd205b230f48a04a5ca3", - "sha256": "15na73bil1kfyg3915d1gm7lsl6k4p81x7ybwr79lx8qpw9rlqvg" + "commit": "b94522e3a4ddaae098f4711aadce675e891cdec8", + "sha256": "1glzc23mvfn84h3v8pqpncm67xljxvpn04qkjrzpw982lwgi6bjz" } }, { @@ -114980,11 +115339,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20220805, - 157 + 20220823, + 543 ], - "commit": "a8e2e5c7b7576afd7b097b40c6ca39e5717f97a5", - "sha256": "0vqq69jkx11d8m9g9v2m4zvpq3khkdhvgzvpcszvic4fvaa65jpc" + "commit": "e185b54d13fb7eac7d045daf6a83731d9ef79231", + "sha256": "0mbv68g1q98dysjvhdxwf3gcwwmihy6ni3b4r4kz6klyfr2jwqim" } }, { @@ -115491,11 +115850,11 @@ "repo": "fxbois/web-mode", "unstable": { "version": [ - 20220615, - 602 + 20220820, + 1935 ], - "commit": "7b5459f58c381f31eed257480b000a9a46209094", - "sha256": "054jawhk1cd3bjr6b320bmbjkmpx3mbp7fyn9l20gm4h5sjs4y70" + "commit": "de9dfa3ac3cd54e6acb4f9d9d1343f8d4eabd363", + "sha256": "0rwifqcn1m5s82vqpi0jk9zx0vz2i2bj5m5jjc1grkgkfhf2psr8" }, "stable": { "version": [ @@ -115732,20 +116091,20 @@ "repo": "xgqt/emacs-websearch", "unstable": { "version": [ - 20220809, - 1338 + 20220823, + 42 ], - "commit": "362bf974532e01c31d4abb340ed3f749da385175", - "sha256": "104ajdhxm9hsc7zrs1lxzqscnlnd01vs7s7y72fb0n03f5jyg853" + "commit": "9336601462ce29822e6aa14db01d923a4bd1c6ef", + "sha256": "0vwsi1ibmw4947bm7c1yz6jvgphilh7039akckfknc6dpacic2r6" }, "stable": { "version": [ - 1, + 2, 0, 0 ], - "commit": "c20c42177ee9268ac29dc00ab6533719ad5c59bc", - "sha256": "104ajdhxm9hsc7zrs1lxzqscnlnd01vs7s7y72fb0n03f5jyg853" + "commit": "a39858c0b81817e3defd7b02583287a4d020bc25", + "sha256": "0vwsi1ibmw4947bm7c1yz6jvgphilh7039akckfknc6dpacic2r6" } }, { @@ -116054,11 +116413,11 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20220518, - 1941 + 20220811, + 1616 ], - "commit": "1ab1d0cc88843c9a614ed3226c5a1070e32e4823", - "sha256": "0i4wxihcly3i8pgmw1gv7lriqcyis9q476akvwrdgjwxnn2gmk0w" + "commit": "8093644032854b1cdf3245ce4e3c7b6673f741bf", + "sha256": "1s2c7jdkgxq4rajd1c2n6bkmds7xgkmff1849nviixqsdxxcb0mf" }, "stable": { "version": [ @@ -116825,14 +117184,14 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20220608, - 1017 + 20220810, + 1159 ], "deps": [ "compat" ], - "commit": "cfcbc2731e402b9169c0dc03e89b5b57aa988502", - "sha256": "02kdsksjn76g4fcqxnidzdy1zql25650fpdjjsx2ccdnbyj9fqax" + "commit": "1d5860cfd05d6805018bd071b8f9b56493ba11c6", + "sha256": "1h6ddc9jkhk77yncfzk4pz14idci8a06lc8hl4ipcp9mcdrjikzb" }, "stable": { "version": [ @@ -116852,11 +117211,11 @@ "repo": "twlz0ne/with-emacs.el", "unstable": { "version": [ - 20200210, - 1543 + 20220814, + 444 ], - "commit": "9f99bec56f87e53deb9f33b364eda77677a17eb9", - "sha256": "0ay860skpnbv6a8xid0hhz9vx33ks2vkdicvpm3a4qngp932jvnp" + "commit": "fb9ef454a4bb2d6de3415807b4858a20a9cc0dad", + "sha256": "0dldr2m3lhg68xx6bznkyi2kjfpgbqn849cbh3sdi8njp829vbqb" } }, { @@ -117577,11 +117936,11 @@ "repo": "jobbflykt/x509-mode", "unstable": { "version": [ - 20220705, - 757 + 20220819, + 541 ], - "commit": "49fbab6166d03e5d4c8b856de6ef04b99ba16eb4", - "sha256": "0kjfrqavz76mbiabzl01hywgjgfrn86a28y86kh01dd7f9njll97" + "commit": "a2ec552b454c22f027da5acc44f20f51a531e2e5", + "sha256": "0rxcyvckmwblr44pd7jnxsf8b60zrgnrmryvflnkl79cn2zpdyf9" } }, { @@ -117704,8 +118063,8 @@ "repo": "dandavison/xenops", "unstable": { "version": [ - 20220421, - 1320 + 20220821, + 1111 ], "deps": [ "aio", @@ -117715,8 +118074,8 @@ "f", "s" ], - "commit": "a2c685b3bb2257da49af771caa02325aa41fa699", - "sha256": "12iy5fk3vz4rfyw848nb9dnnc4l338s9wm981w17k73wf37gnv89" + "commit": "4d75c1cd5ee7afba62af3a39a1f43432b295c29c", + "sha256": "11sxypdpf31hmimskqqg9fd6qnycmx9wr2274ghws9l7mn20df60" } }, { @@ -118425,8 +118784,8 @@ "deps": [ "yaml" ], - "commit": "3e698c625c716a1f85e64b9b839241cb56f0db92", - "sha256": "0c0p07g6zjpfnmac368iigw63zl7fylxawx8rbmcwzkb5yrbq4xq" + "commit": "4f2b032a75871b1ece2c465ca41fd54e615e4d25", + "sha256": "070fj01kw672cnmj1mcgzdn2zc63vrnj5d9whzclxssgrmrbs462" }, "stable": { "version": [ @@ -118541,8 +118900,8 @@ 20220317, 935 ], - "commit": "4c959b300ce52665c92e04e524dda5ed051c34f3", - "sha256": "0kb2a4hcmaczn279hbgk0jv88hsjznv1kqpkgkadszd02q53n0cl" + "commit": "8a9738f2d4b3454a01c755ca690cdef881f12843", + "sha256": "1b7cr2jvij66n3rlkicmsjnqak9ff5mfh40zgbcydc1b0ni6wvqy" } }, { @@ -119171,11 +119530,11 @@ "repo": "bbatsov/zenburn-emacs", "unstable": { "version": [ - 20220710, - 623 + 20220823, + 442 ], - "commit": "cff73bfea8deef2c97cc1ceac4b03702702c4a83", - "sha256": "1nj4zbf0551whlzgx4gc0p0l5223ag1rwjmjsvk08knvr14jnjm5" + "commit": "2db3a34f50ec4dd6e2cae92bab639ccfc742b3cc", + "sha256": "1iqshfkf4xchymmf340bdh6vl555z50l2wd3r3g063gf03vxsr5a" }, "stable": { "version": [ @@ -119543,14 +119902,14 @@ "repo": "ymherklotz/emacs-zettelkasten", "unstable": { "version": [ - 20220727, - 1137 + 20220819, + 2351 ], "deps": [ "s" ], - "commit": "edba7bcfdc054ad0ff1952bb525f5709a687db25", - "sha256": "06rb7frgw1vja7azsd9cxzkbvlr7xpzapgqypsc777szncz06xhi" + "commit": "505fd41dea012e743962c3a376c1e63e7a1e127e", + "sha256": "13pf2ygyizqk3axfl7s246an9w1ih38jq1knzy5f4qn2pf5k2zjs" }, "stable": { "version": [ @@ -119660,11 +120019,11 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20220722, - 1626 + 20220820, + 1139 ], - "commit": "d997b13e7a03f7c3c7411183641bd0dc89526ec9", - "sha256": "04nqd7mhv8s2sp68vk14x4p9gmw4z9gayvyl5zl5ilv1zlchkiwv" + "commit": "843e33acaa8e0a2caa8cd5fbbcc7ab66693efe06", + "sha256": "08ijhxd45gv4glfihv8m6r12ypjmr4gdfpyi09lyn7j3jw2m1wqp" }, "stable": { "version": [ @@ -119683,14 +120042,14 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20220723, - 1824 + 20220821, + 1327 ], "deps": [ "zk" ], - "commit": "d997b13e7a03f7c3c7411183641bd0dc89526ec9", - "sha256": "04nqd7mhv8s2sp68vk14x4p9gmw4z9gayvyl5zl5ilv1zlchkiwv" + "commit": "843e33acaa8e0a2caa8cd5fbbcc7ab66693efe06", + "sha256": "08ijhxd45gv4glfihv8m6r12ypjmr4gdfpyi09lyn7j3jw2m1wqp" }, "stable": { "version": [ @@ -119712,15 +120071,15 @@ "repo": "localauthor/zk-luhmann", "unstable": { "version": [ - 20220713, - 1653 + 20220820, + 1643 ], "deps": [ "zk", "zk-index" ], - "commit": "566fa6a5933455a3f42f700bc91f9f9958878861", - "sha256": "15h28v1aljbwril0mx5swk6vy0972qymxiki2y7a6wsczx252zrh" + "commit": "304536486ccae8129dd681265d199062f2026891", + "sha256": "1b4nmf7dicp11hn7sp0p1j5wg5fix9fg32wky29wgr8p3qsnr9wl" } }, { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay index 052364c803..80167084c5 100755 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay @@ -1,17 +1,37 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -p curl nix +#! nix-shell -i bash -p curl nix coreutils set -euxo pipefail -export NIXPKGS_ALLOW_BROKEN=1 - # This script piggybacks on the automatic code generation done by the nix-community emacs overlay # You can use this to avoid running lengthy code generation jobs locally -curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/elpa/elpa-generated.nix -nix-instantiate ../../../../../ -A emacs.pkgs.elpaPackages --show-trace -git diff --exit-code elpa-generated.nix > /dev/null || git commit -m "emacs.pkgs.elpa-packages: $(date --iso)" -- elpa-generated.nix +export NIXPKGS_ALLOW_BROKEN=1 -curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/melpa/recipes-archive-melpa.json +download_change() { + local FILE_LOCATION="$1" + + local BASEURL="https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos" + + curl -s -O "${BASEURL}/${FILE_LOCATION}" +} + +commit_change() { + local MESSAGE="$1" + local FILENAME="$2" + + git diff --exit-code "${FILENAME}" > /dev/null || \ + git commit -m "${MESSAGE}: updated $(date --iso) (from overlay)" -- "${FILENAME}" +} + +download_change "elpa/elpa-generated.nix" +nix-instantiate ../../../../../ -A emacs.pkgs.elpaPackages --show-trace +commit_change "elpa-packages" "elpa-generated.nix" + +download_change "melpa/recipes-archive-melpa.json" nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaStablePackages nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaPackages -git diff --exit-code recipes-archive-melpa.json > /dev/null || git commit -m "emacs.pkgs.melpa-packages: $(date --iso)" -- recipes-archive-melpa.json +commit_change "melpa-packages" "recipes-archive-melpa.json" + +download_change "nongnu/nongnu-generated.nix" +nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.nongnuPackages +commit_change "nongnu-packages" "nongnu-generated.nix" diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/yes-no/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/yes-no/default.nix new file mode 100644 index 0000000000..2b51332c30 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/yes-no/default.nix @@ -0,0 +1,19 @@ +{ lib, fetchurl, trivialBuild }: + +trivialBuild { + pname = "yes-no"; + version = "2017-10-01"; + + src = fetchurl { + url = "https://raw.githubusercontent.com/emacsmirror/emacswiki.org/143bcaeb679a8fa8a548e92a5a9d5c2baff50d9c/yes-no.el"; + sha256 = "03w4wfx885y89ckyd5d95n2571nmmzrll6kr0yan3ip2aw28xq3i"; + }; + + meta = with lib; { + description = "Specify use of `y-or-n-p' or `yes-or-no-p' on a case-by-case basis"; + homepage = "https://www.emacswiki.org/emacs/yes-no.el"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jcs090218 ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix index 5643cad16c..073379555c 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix @@ -2609,6 +2609,30 @@ let ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare-vsliveshare { }; + vscjava.vscode-java-debug = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-java-debug"; + publisher = "vscjava"; + version = "0.44.0"; + sha256 = "sha256-8/H7rihSKAvXp8QxK949txgMKwt6aYVN4EQdwhphIiQ="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + + vscjava.vscode-java-test = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-java-test"; + publisher = "vscjava"; + version = "0.37.1"; + sha256 = "sha256-QpDMG+0RbiRY9YQYXQhA6ESBoIjBeUxq+bEZ1Y71oSM="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + vscodevim.vim = buildVscodeMarketplaceExtension { mktplcRef = { name = "vim"; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/pcsx2/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/pcsx2/default.nix index 5f5579658b..a4e99b0515 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/pcsx2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/pcsx2/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { pname = "pcsx2"; version = "1.7.3165"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "PCSX2"; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/default.nix index 3609b9492d..3f8c2fc97b 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/default.nix @@ -9,10 +9,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "13907-cdef752a9"; - rpcs3Version = "0.0.23-13907-cdef752a9"; - rpcs3Revision = "cdef752a9c2004010279cd4a6d77b451b42cc6ab"; - rpcs3Sha256 = "1mw6k097rsiljaw34harhvr32dvrh4xv22ryinylijnsjlm3hcan"; + rpcs3GitVersion = "14141-d686b48f6"; + rpcs3Version = "0.0.24-14141-d686b48f6"; + rpcs3Revision = "d686b48f6549c736661e14d1e0990b043c32e3c2"; + rpcs3Sha256 = "1jzpb189isy9kc6l5cy1nfx0wq5cri753sh32b1xq259lkqihdp5"; ittapi = fetchFromGitHub { owner = "intel"; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix index 12d6d0a405..fa0b63ba1b 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix @@ -27,13 +27,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.248"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.257"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "5ff5fe47bad947a95545390865c597bec6c62070"; - sha256 = "0nfzf7q58mhdyszwv3mbz3wqf4w0m1p3fmf3cpga1pf9mfq65nqz"; + rev = "81f1a4dc3161882b0385c9d4752fbba84b9eca96"; + sha256 = "1p4c8k8pc47hl32bml050fvxyhdjcd002xx60rwvzlgvdgw6b3xq"; }; nugetDeps = ./deps.nix; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix b/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix index 3d34cd8a06..b90ac2d07a 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix @@ -46,9 +46,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "7.15"; + version = "7.17"; url = "https://dl.winehq.org/wine/source/7.x/wine-${version}.tar.xz"; - sha256 = "sha256-0auKGarm/mwIM8PYgqMkSKv6SihZDxRulUUOufWPuRw="; + sha256 = "sha256-JDa4rFDWKPTKOsUwDBgmY9/PpIuhulVIp3KOtmH7T0E="; inherit (stable) gecko32 gecko64 patches; mono = fetchurl rec { @@ -61,7 +61,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-JMig0EUgxdRwpeaxZcNQi+6xWHUg43bXB7jkm5skKC8="; + sha256 = "sha256-eC5nYX6Cjutd30rrAn6SavWlQtF8swMHDzsESN4SUmo="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/drawing/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/drawing/default.nix index cd92a0d39e..546af551de 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/drawing/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/drawing/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , meson , ninja , pkg-config @@ -19,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "drawing"; - version = "1.0.0"; + version = "1.0.1"; format = "other"; @@ -27,19 +26,9 @@ python3.pkgs.buildPythonApplication rec { owner = "maoschanz"; repo = pname; rev = version; - sha256 = "sha256-qNaljtuA5E/QaLJ9QILPRQCqOvKmX4ZGq/0z5unA8KA="; + sha256 = "sha256-9nosriI3Kdf1M5/TYFWn1jtQTqNKhBcFh7q3E4Uoq4s="; }; - patches = [ - # Fix build with meson 0.61, can be removed on next update. - # https://github.com/NixOS/nixpkgs/issues/167584 - (fetchpatch { - url = "https://github.com/maoschanz/drawing/commit/6dd271089af76b69322500778e3ad6615a117dcc.patch"; - sha256 = "sha256-4pKWm3LYstVxZ4+gGsZDfM4K+7WBY8EYjylzc/CQZmo="; - includes = [ "data/meson.build" "help/meson.build" ]; - }) - ]; - nativeBuildInputs = [ appstream-glib desktop-file-utils diff --git a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix index 1080f56ebe..e755b708a0 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "20.2.3"; + version = "20.3.0"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; - sha256 = "sha256-O/gzXAzvaYJXpexjBSc6jNW1wX0ukwQcpFU8fq4qM4k="; + sha256 = "bfcd363f549ce8dc13ae2287cec5099e4bf1d0d4b6f8deef40a81279f78817e1"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/eyedropper/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/eyedropper/default.nix new file mode 100644 index 0000000000..6344835222 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/eyedropper/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, pkg-config +, meson +, ninja +, glib +, gtk4 +, libadwaita +, wrapGAppsHook4 +, appstream-glib +, desktop-file-utils +}: + +stdenv.mkDerivation rec { + pname = "eyedropper"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "FineFindus"; + repo = pname; + rev = "v${version}"; + hash = "sha256-xyvnnWts+VuUFlV/o1cGOM7482ReiHVsn+AfdExYBTM="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-8G1fJ5YiUAzMqDoIjWGDTvtPw8chkxPrOz/c9WZRbhM="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook4 + appstream-glib + desktop-file-utils + ] ++ (with rustPlatform; [ + rust.cargo + rust.rustc + cargoSetupHook + ]); + + buildInputs = [ + glib + gtk4 + libadwaita + ]; + + meta = with lib; { + description = "An easy-to-use color picker and editor"; + homepage = "https://github.com/FineFindus/eyedropper"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pixinsight/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pixinsight/default.nix index f54aef75ac..b6e03baace 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/pixinsight/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/pixinsight/default.nix @@ -128,6 +128,7 @@ stdenv.mkDerivation rec { license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.sheepforce ]; + hydraPlatforms = []; mainProgram = "PixInsight"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pizarra/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pizarra/default.nix new file mode 100644 index 0000000000..6a288bd3be --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/pizarra/default.nix @@ -0,0 +1,49 @@ +{ lib +, fetchFromGitLab +, rustPlatform +, cargo +, pkg-config +, binutils-unwrapped +, gtk3-x11 +, atk +, glib +, librsvg +, gdk-pixbuf +, wrapGAppsHook +}: + +rustPlatform.buildRustPackage rec { + pname = "pizarra"; + version = "1.7.3"; + + src = fetchFromGitLab { + owner = "categulario"; + repo = "pizarra-gtk"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "sha256-XP+P2w6s47JQV4spKeMKe/Ktxid7uokGYH4IEJ5VHSc="; + }; + + cargoSha256 = "sha256-JQZ/95tRlmsrb0EJaPlE8G0fMSeEgLnDi3pkLjcJz/o="; + + nativeBuildInputs = [ wrapGAppsHook pkg-config gdk-pixbuf ]; + + buildInputs = [ gtk3-x11 atk glib librsvg ]; + + meta = with lib; { + description = "A simple blackboard written in GTK"; + longDescription = '' + A simple endless blackboard. + Contains various features, such as: + - Pencil + - Rectangle + - Ellipse + - Line + - Text + - Grids + ''; + homepage = "https://pizarra.categulario.tk/en/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ mglolenstine ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/kde/kdepim-runtime/default.nix b/third_party/nixpkgs/pkgs/applications/kde/kdepim-runtime/default.nix index b73e5a1800..0cc78c69ae 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kdepim-runtime/default.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kdepim-runtime/default.nix @@ -24,6 +24,6 @@ mkDerivation { qca-qt5 qtkeychain qtnetworkauth qtspeech qtxmlpatterns ]; qtWrapperArgs = [ - "--prefix SASL_PATH : ${lib.makeSearchPath "lib/sasl2" [ cyrus_sasl libkgapi ]}" + "--prefix SASL_PATH : ${lib.makeSearchPath "lib/sasl2" [ cyrus_sasl.out libkgapi ]}" ]; } diff --git a/third_party/nixpkgs/pkgs/applications/kde/okular.nix b/third_party/nixpkgs/pkgs/applications/kde/okular.nix index 87aeff1f91..51994c2868 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/okular.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/okular.nix @@ -1,7 +1,7 @@ { stdenv, mkDerivation, lib, extra-cmake-modules, kdoctools, - breeze-icons, chmlib ? null, discount, djvulibre, ebook_tools, kactivities, + breeze-icons, chmlib, discount, djvulibre, ebook_tools, kactivities, karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket, kiconthemes, kjs, khtml, kio, kparts, kpty, kpurpose, kwallet, kwindowsystem, libkexiv2, libspectre, libzip, phonon, poppler, @@ -16,8 +16,8 @@ mkDerivation { kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes kjs khtml kio kparts kpty kpurpose kwallet kwindowsystem libkexiv2 libspectre libzip phonon poppler qca-qt5 - qtdeclarative qtsvg threadweaver kcrash qtspeech - ] ++ lib.optional (!stdenv.isAarch64) chmlib; + qtdeclarative qtsvg threadweaver kcrash qtspeech chmlib + ]; # InitialPreference values are too high and end up making okular # default for anything considered text/plain. Resetting to 1, which diff --git a/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix index ccb8c36f6f..7ad32e678f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "AusweisApp2"; - version = "1.24.1"; + version = "1.24.2"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = version; - sha256 = "sha256-Uoi12odfJGyNc8Ap7E/zm4xklYdPPQvCGNxjb9AWJOI="; + sha256 = "sha256-p38zcTFbCyImiGVCr5o/QQ6BT8U2SMiHeYE3aTNYpJs="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/genact/default.nix b/third_party/nixpkgs/pkgs/applications/misc/genact/default.nix index 44a1f79e5b..97abbaca77 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/genact/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/genact/default.nix @@ -1,21 +1,22 @@ -{ fetchFromGitHub, lib, rustPlatform }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "genact"; - version = "1.0.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sKFI7r0mwmzKiHy9HmskS10M5v/jZj/VeO4F9ZQl2g0="; + sha256 = "sha256-lZNVXBIYl9niqdwNcSzQwQTdxlA4kKQ/WrEt93cQDJU="; }; - cargoSha256 = "sha256-79IC51xdkelgsRJF+rz9UOTfrJ/HS6PbkyxySe0Qk4Q="; + cargoSha256 = "sha256-9IiA7KAaj9bLJ7QSB/ojLEiUVv0FGYsu9by4NSfMtiE="; meta = with lib; { description = "A nonsense activity generator"; homepage = "https://github.com/svenstaro/genact"; + changelog = "https://github.com/svenstaro/genact/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gollum/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gollum/default.nix index 3f77b89045..cafebfad39 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gollum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gollum/default.nix @@ -1,4 +1,4 @@ -{ lib, bundlerApp, bundlerUpdateScript, ruby, makeWrapper, git, docutils }: +{ lib, bundlerApp, bundlerUpdateScript, ruby, makeWrapper, git, docutils, nixosTests }: bundlerApp rec { pname = "gollum"; @@ -10,6 +10,7 @@ bundlerApp rec { nativeBuildInputs = [ makeWrapper ]; passthru.updateScript = bundlerUpdateScript "gollum"; + passthru.tests.gollum = nixosTests.gollum; meta = with lib; { description = "A simple, Git-powered wiki with a sweet API and local frontend"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/hubstaff/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hubstaff/default.nix index a446c37aea..3916e97a69 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hubstaff/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hubstaff/default.nix @@ -4,9 +4,9 @@ , curl, writeShellScript, common-updater-scripts }: let - url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.6-61e2338c/Hubstaff-1.6.6-61e2338c.sh"; - version = "1.6.6-61e2338c"; - sha256 = "0i5wxwnrgabirk1x9aii7m428dkr745sfm1lcql4yhlqx4mw6qn1"; + url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.7-5c6fee47/Hubstaff-1.6.7-5c6fee47.sh"; + version = "1.6.7-5c6fee47"; + sha256 = "0i0xlabdi4xhjkfwb6s4bwjnl4k3dj15k7aqjilmq5wb4rhhfpws"; rpath = lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft diff --git a/third_party/nixpkgs/pkgs/applications/misc/nerd-font-patcher/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nerd-font-patcher/default.nix index 9912c3231c..e865479f8d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nerd-font-patcher/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nerd-font-patcher/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "nerd-font-patcher"; - version = "2.1.0"; + version = "2.2.2"; # This uses a sparse checkout because the repo is >2GB without it src = fetchFromGitHub { @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { font-patcher /src/glyphs ''; - sha256 = "sha256-06dn6M2wCFO/uBHDR7VZHNHIybT4h/VGD9nHc4G0EKA="; + sha256 = "sha256-boZUd1PM8puc9BTgOwCJpkfk6VMdXLsIyp+fQmW/ZqI="; }; propagatedBuildInputs = with python3Packages; [ fontforge ]; @@ -22,15 +22,15 @@ python3Packages.buildPythonApplication rec { postPatch = '' sed -i font-patcher \ - -e 's,__dir__ + "/src,"'$out'/share/${pname},' + -e 's,__dir__ + "/src,"'$out'/share/nerd-font-patcher,' ''; dontBuild = true; installPhase = '' - mkdir -p $out/bin $out/share/${pname} - install -Dm755 font-patcher $out/bin/${pname} - cp -ra src/glyphs $out/share/${pname} + mkdir -p $out/bin $out/share/nerd-font-patcher + install -Dm755 font-patcher $out/bin/nerd-font-patcher + cp -ra src/glyphs $out/share/nerd-font-patcher ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/phoc/0001-handle-outputs-that-arent-in-the-layout.patch b/third_party/nixpkgs/pkgs/applications/misc/phoc/0001-handle-outputs-that-arent-in-the-layout.patch new file mode 100644 index 0000000000..4555f8a870 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/phoc/0001-handle-outputs-that-arent-in-the-layout.patch @@ -0,0 +1,14 @@ +diff --git a/types/wlr_output_layout.c b/types/wlr_output_layout.c +index eb672f06..f0f546da 100644 +--- a/types/wlr_output_layout.c ++++ b/types/wlr_output_layout.c +@@ -242,6 +242,9 @@ bool wlr_output_layout_contains_point(struct wlr_output_layout *layout, + if (reference) { + struct wlr_output_layout_output *l_output = + wlr_output_layout_get(layout, reference); ++ if (!l_output) { ++ return false; ++ } + struct wlr_box *box = output_layout_output_get_box(l_output); + return wlr_box_contains_point(box, lx, ly); + } else { \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/applications/misc/phoc/default.nix b/third_party/nixpkgs/pkgs/applications/misc/phoc/default.nix index ee6c213fbf..0fae80fc14 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/phoc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/phoc/default.nix @@ -21,36 +21,38 @@ let phocWlroots = wlroots.overrideAttrs (old: { patches = (old.patches or []) ++ [ - # Temporary fix. Upstream report: https://source.puri.sm/Librem5/phosh/-/issues/422 + # Revert "layer-shell: error on 0 dimension without anchors" + # https://source.puri.sm/Librem5/phosh/-/issues/422 (fetchpatch { name = "0001-Revert-layer-shell-error-on-0-dimension-without-anch.patch"; - url = "https://gitlab.alpinelinux.org/alpine/aports/-/raw/78fde4aaf1a74eb13a3f083cb6dfb29f578c3265/community/wlroots/0001-Revert-layer-shell-error-on-0-dimension-without-anch.patch"; - sha256 = "1zjn7mwdj21z0jsc2mz90cnrzk97yqkiq58qqgpjav4h4dgpfb38"; + url = "https://source.puri.sm/Librem5/wlroots/-/commit/4f66b0931aaaee65367102e9c4ccb736097412c7.patch"; + hash = "sha256-2Vy5a4lWh8FP2PN6xRIZv6IlUuLZibT0MYW+EyvVULs="; }) - # xwayland: Allow to retrieve _NET_STARTUP_ID + # xdg-activation: Deduplicate token creation code (fetchpatch { - name = "allow-to-retrieve-net-startup-id.patch"; - url = "https://github.com/swaywm/wlroots/commit/66593071bc90a1cccaeedc636eb6f33c973f5362.patch"; - sha256 = "sha256-yKf/twdUzrII5IakH7AH6LGyPDo9Nl/gIB0pTThSTfY="; + name = "xdg-activation-deduplicate-token-creation-code.patch"; + url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/dd03d839ab56c3e5d7c607a8d76e58e0b75edb85.patch"; + sha256 = "sha256-mxt68MISC24xpaBtVSc1F2W4cyNs5wQowtbUQH9Eqr8="; }) - # xdg-activation: Allow to submit tokens + + # seat: Allow to cancel touches (fetchpatch { - name = "allow-to-submit-tokens.patch"; - url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/4c59f7d46a949548caa55805b00922f846d58525.patch"; - sha256 = "sha256-1kUIt6lV3HXN2BBBER8sjYVLTvgqELdSeFullJjNGo8="; - }) - # xwayland: Allow to retrieve startup-id via _NET_STARTUP_INFO - (fetchpatch { - name = "allow-to-retrieve-startup-id-via-net-startup-info.patch"; - url = "https://github.com/swaywm/wlroots/commit/235bb6f2fcb8ee4174215ba74b5bc2f191c5960a.patch"; - sha256 = "sha256-7AWBq12tF/781CmgvTaOvTIiiJMywxRn6eWp+jacdak="; + name = "seat-Allow-to-cancel-touches.patch"; + url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/17b2b06633729f1826715c1d0b84614aa3cedb3a.patch"; + sha256 = "sha256-BAeXa3ZB5TXnlq0ZP2+rZlVXEPWpLP4Wi4TLwoXjkz4="; }) + + # From + # https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/13fcdba75cf5f21cfd49c1a05f4fa62f77619b40 + # which has been merged upstream, but doesn't cleanly apply on to the + # latest released version. + ./0001-handle-outputs-that-arent-in-the-layout.patch ]; }); in stdenv.mkDerivation rec { pname = "phoc"; - version = "0.13.0"; + version = "0.21.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -58,7 +60,7 @@ in stdenv.mkDerivation rec { owner = "Phosh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-65u59S6ntvkoQUO5BvkHZVcbj6cHIU4CgHWjzFo6s94="; + sha256 = "sha256-HPqhro6TE/Ukh4txBPrDoIuDaxSxd/ZkDVZU3+m3GFg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix index 936efd60e9..286abfb3fd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix @@ -22,6 +22,7 @@ , libpng , mpfr , nlopt +, opencascade-occt , openvdb , pcre , qhull @@ -48,7 +49,7 @@ let in stdenv.mkDerivation rec { pname = "prusa-slicer"; - version = "2.4.2"; + version = "2.5.0"; nativeBuildInputs = [ cmake @@ -74,6 +75,7 @@ stdenv.mkDerivation rec { libpng mpfr nlopt + opencascade-occt openvdb pcre systemd @@ -133,7 +135,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "prusa3d"; repo = "PrusaSlicer"; - sha256 = "17p56f0zmiryy8k4da02in1l6yxniz286gf9yz8s1gaz5ksqj4af"; + sha256 = "sha256-wLe+5TFdkgQ1mlGYgp8HBzugeONSne17dsBbwblILJ4="; rev = "version_${version}"; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi-bluetooth/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rofi-bluetooth/default.nix new file mode 100644 index 0000000000..ed80e5d5af --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/rofi-bluetooth/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, rofi-unwrapped +, bluez +}: + +stdenv.mkDerivation rec { + pname = "rofi-bluetooth"; + version = "unstable-2021-03-05"; + + src = fetchFromGitHub { + owner = "nickclyde"; + repo = "rofi-bluetooth"; + # https://github.com/nickclyde/rofi-bluetooth/issues/19 + rev = "893db1f2b549e7bc0e9c62e7670314349a29cdf2"; + sha256 = "sha256-3oROJKEQCuSnLfbJ+JSSc9hcmJTPrLHRQJsrUcaOMss="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + install -D --target-directory=$out/bin/ ./rofi-bluetooth + + wrapProgram $out/bin/rofi-bluetooth \ + --prefix PATH ":" ${lib.makeBinPath [ rofi-unwrapped bluez ] } + + runHook postInstall + ''; + + meta = with lib; { + description = "Rofi-based interface to connect to bluetooth devices and display status info"; + homepage = "https://github.com/nickclyde/rofi-bluetooth"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ MoritzBoehme ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/sticky/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sticky/default.nix index 98c844c696..9710399ab6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sticky/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sticky/default.nix @@ -7,6 +7,7 @@ , gspell , gtk3 , gobject-introspection +, gitUpdater }: python3.pkgs.buildPythonApplication rec { @@ -73,6 +74,13 @@ python3.pkgs.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; + passthru = { + updateScript = gitUpdater { + inherit pname version; + ignoredVersions = ''master.*''; + }; + }; + meta = with lib; { description = "A sticky notes app for the linux desktop"; homepage = "https://github.com/linuxmint/sticky"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/sway-launcher-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sway-launcher-desktop/default.nix index b671229652..174b95df67 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sway-launcher-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sway-launcher-desktop/default.nix @@ -37,6 +37,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.thehedgeh0g ]; - mainProgram = "${pname}"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/xdgmenumaker/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xdgmenumaker/default.nix index 357fa7f596..e070026351 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xdgmenumaker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xdgmenumaker/default.nix @@ -12,13 +12,13 @@ python3Packages.buildPythonApplication rec { pname = "xdgmenumaker"; - version = "1.6"; + version = "2.0"; src = fetchFromGitHub { owner = "gapan"; repo = pname; rev = version; - sha256 = "Q38m8YrvkkTCY2dByvPj+Ee1DMSUbWvwSDI0kW182bU="; + sha256 = "CLFFsc/F6I8UOY/XbViWCAlnnu32E5gtEXg9+KSJqI0="; }; format = "other"; 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 79d23bfca3..359b0a026c 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 @@ -32,15 +32,15 @@ } }, "dev": { - "version": "106.0.5249.21", - "sha256": "0d3ha2r54sjx1rhaas0mrgk2dl4xvgb83r5pbq9qzh52z43ynmlv", - "sha256bin64": "0bawgqjkpllqif0jaah43vys57c9y8w7a5rjn35bxlmjrfmfwhwc", + "version": "107.0.5286.2", + "sha256": "111dk9qdxbad2agvnh8ijb18ip9vw32gdfxajqkrlqgcmmj61vsz", + "sha256bin64": "0l19ylpcrnzqj2imlhl13h0f5773znwx6h4xjzrac2z2lxkzmkmk", "deps": { "gn": { - "version": "2022-08-11", + "version": "2022-08-31", "url": "https://gn.googlesource.com/gn", - "rev": "0bcd37bd2b83f1a9ee17088037ebdfe6eab6d31a", - "sha256": "13zks2z65kg7fzzsysq4mswd4bhhy3h7ycdrpxfilcvixx2n2gac" + "rev": "00b741b1568d56cf4e117dcb9f70cd42653b4c78", + "sha256": "0vi9gigzdyji8fql8k8sv1v5z0icjph8awz49xidn26bvly6526g" } } }, diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 06bf178200..94a6f90c7a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,985 +1,985 @@ { - version = "105.0b7"; + version = "105.0b9"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/ach/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/ach/firefox-105.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "13a62be6911a5f87861881bed801072236737b5759e65b357ae299cc96ff1aa7"; + sha256 = "79770ceaeba02d97cb15d371df933bbf4945d8c41f13b4fa9d9b4f71cc342a98"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/af/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/af/firefox-105.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "f0099ffc0dc4d9af4fb188f435b97c400c58a500c655474fa5fadc5d4dffbcc1"; + sha256 = "64828c77cdc223eb2da7257f9b606bedf542295ad1c0d3eda6b689cfb93d7726"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/an/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/an/firefox-105.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "21e9e063cd0b632e3d9705b5a80c5fa9a89e5b7434c3e8734a790e2acef43442"; + sha256 = "ff9ffea76d0d00fe13cc98550611075cb191c8bec8859c06ab289dba60af0a08"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/ar/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/ar/firefox-105.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "a73196b20aa377a2cb59c703461688fdbd536e972fbacb1a8b2b07373710d7d4"; + sha256 = "87483cf7a378d9921398e45f1b47e0f700786232de95575da2ae2b7b514d7489"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/ast/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/ast/firefox-105.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "2e49bd2d24c2b82a1ed32e4bc80185c26757a5c3d25adf9a4b14812ef9f2e470"; + sha256 = "f401f8e17804b705fdb24e046d746fec1e6686c2dae3dabd65ad5d4550753a63"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/az/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/az/firefox-105.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "b0e234f6ca1857a6cacd6216788d0ab9ad6423f84d7bdc925c3548e1ffd75c0a"; + sha256 = "fd869f8fb79ae4b4ef896c04c12ea811c7801354b0726d6d9bdc2c0651058ef8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/be/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/be/firefox-105.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "5ae874edf139a8de1ed3979a95ec5504a1edc0061ad16948fc50ba9cd589c3ac"; + sha256 = "46c1dc6f236a6b093c5700fbb16c2928fd1b9076809dada1646f633722d5accb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/bg/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/bg/firefox-105.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "570e978f4004e83765869f48bb6323928060cd66d7a83730ac41bb313980bfa8"; + sha256 = "b4bebc53162139f6c3c6705d6f67d180cb5325d4295e0258730b8da2dd4312d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/bn/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/bn/firefox-105.0b9.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "d2b249993c01207c7632e03ac650c65be2beeecaeefeae0a959e3f4469bd03d3"; + sha256 = "ecb0aded7ad67330abbc7d82ae1fcfea9f2dd2b36464423223838e8ab5274108"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/br/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/br/firefox-105.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "94cb7a8497fd00db19c72ecb3c6abb3346ad880dee69ab5a554f7551aae74497"; + sha256 = "8be66ca9b85502156cf99ffb05106ac8af68dadae342e03414548a3b3a6f1410"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/bs/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/bs/firefox-105.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "e6fe304c7715bf7d9ebed33b04be48c05bb92b9a8a379a6f13d8741c2e1a0463"; + sha256 = "3c96e1ac621374fbc36cf8a62ad75b705cfb7a98d3e5f477ad8d2f65886139a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/ca-valencia/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/ca-valencia/firefox-105.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "cb2a906394c5578b152fbab4c6d2b108c7f22134f1bfd464cf352e35f352931b"; + sha256 = "b7a7aa8b0c6eb8356b8d43a5442a2230d573ddf43def3e6199b4c5b30f1d7d1c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/ca/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/ca/firefox-105.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "28660bafe17c4caae2557e34197df4d2a4f15d752eb2544ee85d4e8a91a2d4d2"; + sha256 = "2499dcf4f9c0f430b9aeb53d395c0958a70cb1c80550bf9770d3020d6212b661"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/cak/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/cak/firefox-105.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "6eca76304180c2a3eec62abb8aef1fb493190e7398920d43ed07fe8ad2b71c84"; + sha256 = "0a3e7a8163b7738ff36e5a66e607234d251d693f56ad1b018891b0fad0b213cc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/cs/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/cs/firefox-105.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "e05b6161a38d7510ba9e043790622ab93cfae10c6daa41eccae09cee91dab747"; + sha256 = "8c7e43f8d6e5cad2454b07008db7437959219c0e0b09797d7d99509c0dca7b83"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/cy/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/cy/firefox-105.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "365d1cb65216955dc6154a7fb55d647e542444308336fe220b27f93f2296095d"; + sha256 = "3072f2cb496dc65c09d2b38fe99622dedf28cdac6140e93128f4bfdb8efd2a60"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/da/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/da/firefox-105.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "2502ce36a6fc6caefa6c61313e47c0ac7a7e4592122b0dc9c61cc5a71d843c70"; + sha256 = "3bf824ae1891e81ee1354f04b27166c232967451fa09278b7cbc32ba188f06ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/de/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/de/firefox-105.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "a3ca68ccaf196819e7486cbe3428bdc31dcf7a76304d5c49999954679f4ff773"; + sha256 = "60bc38dcb4a09819fd707ff97f99472bcf81d5210cc015ba90f68535fbc137fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/dsb/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/dsb/firefox-105.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "acf1f01a5c22276311e168a4220944cc246a900ad86ac90cfe52900888920962"; + sha256 = "4ae1090c039da3dbf719b60656979a711c5d51aa6f379c1675f8dca9aeacd832"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/el/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/el/firefox-105.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "7388edcd56f5ad294b15831e61f4a0e9a77672f4adeaf58bc785efcc55166d5d"; + sha256 = "bfb169c8f9be4f5d0d0426e1cb5da5ded616d8e1bdd5a6aac1901e278f4aec53"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/en-CA/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/en-CA/firefox-105.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "b7da929c9f3f7b7a00c106628c9519217970b49cecd283ed0e302a3aced794e3"; + sha256 = "8387de677806f4eb444c6844d0cb0050f2fb6f15378743e07766559f1afacb66"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/en-GB/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/en-GB/firefox-105.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "af49484d4d24e254af371a011866950e59ba8312283dcab7f20081ec6f2afc66"; + sha256 = "cd17534df2e3442f441b94cf32a3de523b4fb5626faeee6483d58d0070f8e47b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/en-US/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/en-US/firefox-105.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "813a0564e1fed3b63e7e29ab420d0939463e503ef33ddf3d80f07168e52847c6"; + sha256 = "5f63efc11ae3c61c894aa320215a74a9430456b556a2d35f2b60ed19dd5dff75"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/eo/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/eo/firefox-105.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "d3fe7f293788d4e366b7ab770d0555b5934023975375e2175bde5b56d4d27470"; + sha256 = "2e6d0c6a3f697a7b1d805328240f734a02547066fc62ecc176ad9300707ecae8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/es-AR/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/es-AR/firefox-105.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "f5c46350b90bd37c3b4e45b234f700ab83e89c4e11915d5f65868fbf22fbaa16"; + sha256 = "260c91053bb7f993578717595bb7dc177d8217c382dabb080b1d663ee823e960"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/es-CL/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/es-CL/firefox-105.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "f66a7f164df38afac62c2840eacb4a77090d7ee46f01822cbbf532f393d64f70"; + sha256 = "b23ddce54271e9967db533d3e93bf818b8a11aec52d99ceefca82c5c1409f9ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/es-ES/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/es-ES/firefox-105.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "1530d720bceee238ddbd678ce8178b82bc39ff4dd6d46040025a95a24a62b468"; + sha256 = "a8bde5586eb5b350214089a41edaba0f35b8fb4674746c07d57c6fba9689cfa2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/es-MX/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/es-MX/firefox-105.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "5fde90a6bd7f6e5a5cbce269f38cd440d2b313f2ecfe419bac300576bff3bfb6"; + sha256 = "c83aee7dfe43ae5f8372e66d4c3da71d70368f46ad1bd67fe10fc9bb21c38590"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/et/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/et/firefox-105.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "2d8ecf0cce7f336eb72f2c437a366ff22af388e8e24e5879e5e16899126c5c1f"; + sha256 = "7b79c467c2621cc66be63e73cab0c7844bfc1ac9344dfff366df4ab2487aaffa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/eu/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/eu/firefox-105.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "3af8b10bba6bda9ccc82fbf151e96344855b0eeb6eaca0e51861ad31447ee36b"; + sha256 = "e8c70159786931e9bd371ae53f1090e662c8e0d97aff6fa62034504192a01534"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/fa/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/fa/firefox-105.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "ec4afce2b55e518ca2cdd4eb7c5e2b71dfcd129b6d414320874b65a6c010bd25"; + sha256 = "7d0e7236140259df054f95eff774035b2c3338beb6f9e7ee71d340d87286dde7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/ff/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/ff/firefox-105.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "b4b939a65a7f0a14b43625bb9d62a5f88b9743e6ac8cb1f440fd10932a2b0f7a"; + sha256 = "fb8562d09c6fc893a1454cbed985f31281c02f090f8d2f0aed8849b4a0d03585"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/fi/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/fi/firefox-105.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "61ee094a94103dad37800754c8632fed5b432807c971191f0974b4fc6fe67551"; + sha256 = "77bd828db9878f9335b7afbee104a2605a327a1b6d18e7d8d61ccc9efc62073f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/fr/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/fr/firefox-105.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "711eb85209495aa1429d8224954273e2f1dc93f5d225405a7ff33ee98d15466f"; + sha256 = "7e883f450156e71c2f8a783a1fa7ceb265667e093416fc9162e695051935332e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/fy-NL/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/fy-NL/firefox-105.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "8797b779508074eacd09a568e48a274446cf1a71fd0e4cce2d8b1381f7401bf1"; + sha256 = "368f139d4e0021f85a897d81046d0283e0f2be89def31b1670e12b7bb8876d4d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/ga-IE/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/ga-IE/firefox-105.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "a9bc5f839f186a12eaa99bb58282bad228ecfab68f22bd072a53a4af0381735d"; + sha256 = "3be7ceac760ed77b082365109de6d0aa517c8d7960364ee7065ee182ace85e91"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/gd/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/gd/firefox-105.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "16f8c5e3a91c353d9d7cc54ae92ae18cb850dc708571ee681556d9843da7017e"; + sha256 = "d2826639d43e2529d65b9c64dea8915c1847728df21710057a4a2df8a6a41ce2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/gl/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/gl/firefox-105.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "1dd1a06cb8c4ab0e9a9ec12a77b32a12cde88224717f32bde706bdf685549188"; + sha256 = "f193b93c97f58bab188750106e1b7a0f9e876f33efc704cae6b103278a3bb02b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/gn/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/gn/firefox-105.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "85f832fb117683efcdc27577d8fc3c4b395bcd29cc11c1462f2b9aa18c9387fc"; + sha256 = "399a34c200c1b844ca9782d52faf2cacb9efd88c2b2483b83cb00cf91406eb46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/gu-IN/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/gu-IN/firefox-105.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "b250875a640b26f09e6e02f3a126a8e5bbfe42af113925ce9b365724bf57a97e"; + sha256 = "32d03f86d869b46af12acf6ceb95931d4529f59aa30c02e0f5fbca8fd836a58c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/he/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/he/firefox-105.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "ad279ae9378bc95184ae8d35917783ebc882d17c51e115f5e5135dc5ef28c512"; + sha256 = "b2ad2bb06de8a931be129545693d4ea2144561ec5addae76a2f87fc1008dbae6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/hi-IN/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/hi-IN/firefox-105.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "3bfe69b2a62eea5bfe9aa42ab40a336fde4d18078386e6007a34e00b09a01f30"; + sha256 = "651e91851ff12b1f654e0bc2a7c338c6b1cb52aac53da34739dec9c1848f259c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/hr/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/hr/firefox-105.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "6f5d0cad0eb51286c65410b50690490f01b9a6a482b3193b3b84134a104722fb"; + sha256 = "47d7ae728acca6dbee5f23a7761770c4597c9108a7d2b3267e05199d6e39a098"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/hsb/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/hsb/firefox-105.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "7057e09b13062dddd253ef0e3a1092d9c5927c5535af9347cdd3a7d2fe32ceb0"; + sha256 = "f603ce1b6dbe9d924485d4dfdc500aacc0a4da60950fe9025644eaaaa893eac3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/hu/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/hu/firefox-105.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "da70d69bd720783457c958f660e9d43690844479e40feac890c25fef88483e11"; + sha256 = "f4abb340d830f4071256d633a2afc67e99dd2e3d33cace206efb2bff62713cd0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/hy-AM/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/hy-AM/firefox-105.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "709d92a8bb38e1848486c778a6caa65eb62c03ddd569047163d6d379b9659a59"; + sha256 = "5c6b2d3620dfe0b64696fc30e54994eaed8c8d063203bbc0b5a25f646266d403"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/ia/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/ia/firefox-105.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "8956636f5e9a73845ce2a2a985a3400fdf6756bb067b718c1d0f973344ea0594"; + sha256 = "cb61082fc67b5c0cf96e887ab74c16896c889f44ef9b0a9fe184f8de8a9f69c6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/id/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/id/firefox-105.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "d843bda421ab18a1b9d4d6d0a1ff84b11997a9410947b8cabc6824d12ff92cb9"; + sha256 = "6d6de61f61e2d9263fda9dc6123b9c1aa8ddcbf87c1b8cb6244e245f20a485d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/is/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/is/firefox-105.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "0e39f998588c62b8c0ed585c455d7d2fe7cb7c345130c350542c2332a300768f"; + sha256 = "f63230b3358e0dcacba6bca7509467316ffb94e6dc59b90e82b362fea6eb7c9f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/it/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/it/firefox-105.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "399171eca9f00f2fd6de9f7b2ba70f44edb6671ee0f2ce78ee5fc4bd53f91897"; + sha256 = "4709c194e40a0cb5be0d0f5459aecb718d5d7f652656bdbcaf1082ad2ffd0403"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/ja/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/ja/firefox-105.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "63377f004554553566cab432567691f5c05cac98ab828790d2b31e6170d6351a"; + sha256 = "8a4fdaa21fbef73014d5c538065dc3b563515de76f5fac6275fde3869ec50f77"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/ka/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/ka/firefox-105.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "afaa721bc9de934dfcbc877039524f1182c6b1a490c74040cd9a88f80d384caa"; + sha256 = "21daca829963e747d3b08c04acbfb5f7f74a64d840b664e8ce75e4c8fe97545c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/kab/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/kab/firefox-105.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "f1fb49fc3cad44e0f36a4b93d8865ca86153574fed56986b5a38e8ae286d643b"; + sha256 = "70c2ba0023f7671826087e70235bcc206c01d466990c85a73e8d69713d840a8c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/kk/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/kk/firefox-105.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "11c45debdfa934576bd018bed468d68ed5cd1ba23aa53225bb59e447358f7017"; + sha256 = "fdbc98622abee3c484972ddbc2f91942e5d16d03d71ca8dd3810b498c93fd4b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/km/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/km/firefox-105.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "673e3a75bd899b452487ebbb2cc11e1e4ba479ca523ec2dc70ef02f21775e6c6"; + sha256 = "24f870e4b441c216b453b858718698229cb97952953e123e187a3c39d15eb4cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/kn/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/kn/firefox-105.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "e2b7245903fa77dc298c403c0d1f0ced0b73817a225fc9b75edf69619405983b"; + sha256 = "fb995447906f84a230cde2a1eb2204058ae2cdfc88bb0bf621b0c6a9db8038e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/ko/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/ko/firefox-105.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "d6034ee93743430908351525beb537aba7fac33728175b2dbaa3b4a2711ddaa1"; + sha256 = "58d82905acca3ea509229c71e22ed3621d31809cb0ba967471176ef2b08afece"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/lij/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/lij/firefox-105.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "37ef77fcf09d9183d2739e4f1e996bde7ba06801c4fb76958a9c37a1561c1b08"; + sha256 = "c7d50bfcb6fecd13cc660dc4783e97d0ebaa4e0ef605ba11dc2390e2fd46dc96"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/lt/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/lt/firefox-105.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "ef18f0531d27870a9ac21d0561c7b003802c485b003894869bc6c6de6fea6944"; + sha256 = "42bac4f21713dd140ef0db688cd09d5af3d997e281dc398a61090a44e2d3622c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/lv/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/lv/firefox-105.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "875a15f3ac5b591bc053113ce75729bb418c8ffaa7b887cc1693857a729c927e"; + sha256 = "3e3128eea7f9945499ebc4aabdc48d7e980dd1efd2ee89bb8c333db5e1cb6c09"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/mk/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/mk/firefox-105.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "48720e781a01b1e3303acdbcf67b4c900412a4926ba56ba2d083ecda766d832e"; + sha256 = "6f0c048caf2c176394df914717c71da441f516651d3b329aa385b75f2c3170b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/mr/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/mr/firefox-105.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "a9ca850bb1587ec2a04f02bc1bb084955ebfa62b4420eb70a6b8c84b05f94967"; + sha256 = "d9f72b91ba4da93cf060b9a1d2ff8ea2baed332dec3b5d9a5f45fb24c8739230"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/ms/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/ms/firefox-105.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "86afbfdbd242f529023cbf8b9fdac1b855fc785bc5a2b76f487dc128ed9c3d2c"; + sha256 = "4dd0089509cd93ddfb0196161ed5ec029d53c5d46eb1ecb6cf3eda6917f6b7a9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/my/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/my/firefox-105.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "fbbef1a89617248e39994c3b15ec28a7e63363203f918f474333a27886715659"; + sha256 = "35bc81b184b274abe59e382f0315b77cd5331d4ec17f52a5254ec05b399be3fb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/nb-NO/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/nb-NO/firefox-105.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "08dc174142f0504e5c861801c94e9edb7212f75b1ddd2618a0bf10974a339858"; + sha256 = "b74206fc6ec161e617bf070614bca733f6670171cf178b054885a4b71ca1a8d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/ne-NP/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/ne-NP/firefox-105.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "1fcfd03fa7ef6a166ffb3b5b604f2269df080f1a7a667adee4f0fc3cff46fdbf"; + sha256 = "54ddfde0dee5d1341fb3502186bac336643f7e0d333f6c69da8a5c27384d6d3e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/nl/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/nl/firefox-105.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "d01013367ba10d4b277699400ffd42472251fa4cfee1d19ab832157d7768950c"; + sha256 = "d376c29d72c9915ec03fe133ab82fe348099490940e9eca9b9521371f3553101"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/nn-NO/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/nn-NO/firefox-105.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "604df0b9375f10076a16c0534f389f7df1f231787baf6920faea9e377b50961a"; + sha256 = "80ee20201c974e9ba7e6082106ad43aaab60c440ff1b923c0da7583368a15283"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/oc/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/oc/firefox-105.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "54b267142a7610874b8035fd7a1515930cbcfdd87dcf728267a2612b6ea3fa05"; + sha256 = "77a02c90fee1de7102d53d93eef80ec9bb3070b64bb8e6d8cee67fd2f453315c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/pa-IN/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/pa-IN/firefox-105.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "79ad16af9b1db8cffebc90e5fe1ae3ad5cd15d525ec6a9207ad6c549c8feb06d"; + sha256 = "9e68752b0fd0731e6079e715947a9fec1502f3640cfe49be1acdde6b8ab0f599"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/pl/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/pl/firefox-105.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "d8c7b8e41f31e1f0ab5b0529e812f0b4ee00dfa16cf059229e2f4a8f59206751"; + sha256 = "2d823ad10a5ff9c127337e5b3961af408ca5773662e4dff0eeb44bd2b828f597"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/pt-BR/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/pt-BR/firefox-105.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "2966d0d3ba90d7a8d6f547de9f637f2529f6c30641f2f31db2f91e64de5f60a2"; + sha256 = "be777e0758ab5117bfdb837f5ed0c8502a95877899b2e2d79f9d2616be2916bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/pt-PT/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/pt-PT/firefox-105.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "86b2f6b2466af8fe7168789ef13c01679803c999413a8bafb912f499cf9ce560"; + sha256 = "227280a96a21bf3dd728cf10a61311c7902d6cbf3185bc6018d0d21cae702f37"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/rm/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/rm/firefox-105.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "1e15cfd326277cf7b2a7df294a7c3ebed482554b73b1cfde79894d6f24e75c47"; + sha256 = "08a572c80a824e18e3669afdfcfb64798968b24569b29120c3d9ade287c63523"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/ro/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/ro/firefox-105.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "5885ad7d401bb22132778ed7110998d32851c301ca2cd681ca4c8832f47e51f3"; + sha256 = "d419868e403ae4f14469b35c9a4e13367faf166e9b0a3b2da81d02b3e2caf51f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/ru/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/ru/firefox-105.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "ff82a49bff9ed006aa5cbb4de32b9b0f03ecfc9df959fcc0081b44a65c275d8a"; + sha256 = "66cae70d4ba24d6880bf8cf57e44dbcc137a14050be31dbb795904a67c873756"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/sco/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/sco/firefox-105.0b9.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "1dccd958bba50ccdde880236937144541c69ae04d68d148d8ea0676cf1bb3146"; + sha256 = "aeffd2f9b7a617895bbdbcef183fbda82e46daca27c6b5c15e95eb843bc0a167"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/si/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/si/firefox-105.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "f80b0ff36ee4e950b07118aba76a936f4be31b6f165eb0a7c5f6a6311f85cec6"; + sha256 = "bbf22a219e215869952680fff013399a301df7dac443addbe179da8ab1e07d6f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/sk/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/sk/firefox-105.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "c4d3802ba892f91ccbe08cf4b78ba11ec85729b69d788ccd9b05f03be2c00ff4"; + sha256 = "38b86a085825a0a666214564e18c12367103a4a9ecb26870aa461a842a6d934c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/sl/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/sl/firefox-105.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "ba6b0a38beb958fc1c04b72c29abb7573651952915490e40362d1da340254b13"; + sha256 = "599febd947ed08480a6d98641de388c78ee6b977e6fae542d6b626af8a5441da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/son/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/son/firefox-105.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "620e33ad569ddb08a908b35893479f61e028d6f24436ae275181cf5fb9cdce31"; + sha256 = "1c6e35175e482dbccc657aeb0d643fc9940f99ea6f7aa0103cea54f53f24d1ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/sq/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/sq/firefox-105.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "c60ffab78ad65dc2d601ca7d1d18fe300b08a1c462ed9bae7110bcf60e302630"; + sha256 = "749b935221ab4f8e9f4cd646c2580eafbb57c20614698f24f334e47b7594df12"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/sr/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/sr/firefox-105.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "4648afe034e724b7c29a2f25dc915643667c96c797729553fd9ebf9cbc70ff30"; + sha256 = "532e3b636ceaab8a3a956771d89304120164bc3a83e7c97af1104221f3f01151"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/sv-SE/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/sv-SE/firefox-105.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "a5cd48036e92fd8beccd7888b1eef0c4674d700cffc23fe068f1f5b9ad50aa18"; + sha256 = "0cacde7645bdfd4b439ecf151ffa6add2f4ad2e15f1cf032739b8d84551a1ee8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/szl/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/szl/firefox-105.0b9.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "984c228cae4f8e258a927efea71fc8004c1d8105fbd16e0650146ee4b3aec96a"; + sha256 = "f1902e223b4e53cfff7487d30b48a57e9bff156b5dae4f2eefb4bd5c0c4e9a7c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/ta/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/ta/firefox-105.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "bf3ac91735ec4d1774f3b0b9b4888c6adb4c96803ca2cd1540cd54c709fdd3be"; + sha256 = "45f17b3cd8fe452508c467735a65085b0a88da33db16bf2dc8531035f1e43ee0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/te/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/te/firefox-105.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "d5254b2d5e28c4eb29046d3877c22fb5e3fea3f20140ddacc9a768045ead90de"; + sha256 = "04741abd4ff358cc679c13fcff0191d96481055380ac11747fcd852627fc4202"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/th/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/th/firefox-105.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "a70e7001a2c930dce2a3dfbd90bec64fa28b26ef4d44a45d8c610fb51488f28d"; + sha256 = "77ef4bdf663f7e43db9be37a9564fbe531d84af0863583570906f5ae92cbfdf5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/tl/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/tl/firefox-105.0b9.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "916a7d3e75497c399e11bf9da97b29ab4255f8d299ac38fdbf2e2dd9c15f4a72"; + sha256 = "5c5a2736cf16605befb73eb8942ea6bc486f1907010d099525801271bc6920dc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/tr/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/tr/firefox-105.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "f9e4030e563e4f48230854a1938f79799187c88bfed83201d0cc4e2652479160"; + sha256 = "cc4a279b031b655c17e40a2b78bfb686d2e693927fe8bbe8f72f55a901c3a0e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/trs/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/trs/firefox-105.0b9.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "1b94d24b358639f95a27270e9c6277a2b4842849fdd85c8c8f866818f0330fd4"; + sha256 = "b118fc8f5ee0a83aae00bda27d21fb07f102deb35cd9d0cd0f5e9eca9095dcb0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/uk/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/uk/firefox-105.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "a44b8311d8ffddf09658e8832568296a1316bf1a40a1d1972cbf0c02e964de7e"; + sha256 = "2f2efbe9d588f3a0004ba71a9a9b15f909624cc26aede7e4036f30aeeade6d6f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/ur/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/ur/firefox-105.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "aa093d955810a55959a7a87e46a2b2eac4669a953e3799d3f438fdf0e08a1c43"; + sha256 = "350dc300a083a5a0a5fa7c6ba013065f6eba8855eaf5ecbb2058f99952520eda"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/uz/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/uz/firefox-105.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "2a8b7ce3dcfaaff5afa167cb1477f4aefc8bdb1f7bed2214d8cddc683b6f4776"; + sha256 = "09165c6ceeab7b12d798be02256576a387b5e344274fdb560823936935f99158"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/vi/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/vi/firefox-105.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "4ace0bf9b421158fe8b621980283b4ef8c9635cb6b1c382c5e289677b2ae24ba"; + sha256 = "5ca9ba7498a73bcc9bcb57302ed3275f58fc00d0d7e0dffbdc008ea257649f08"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/xh/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/xh/firefox-105.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "b8bd277d9dce3286db6b5d88639089835521234040862546ffe207285a9bea79"; + sha256 = "618f73a822864fe233c73a955eade48d60e383e8b37b228d77afba037953c3d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/zh-CN/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/zh-CN/firefox-105.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "1f32136c672590d07f63624737d89801e99a827ddbe9362afdb7363d16a86768"; + sha256 = "a890055f137223b517aa36f27486a34cfe0525120e8df63c07dd0ac17b3045e4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-x86_64/zh-TW/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-x86_64/zh-TW/firefox-105.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "c8fdccccdf233b22adf983f8e4e37f42cb25ea120a37c1152d63b19a6c0dfc3b"; + sha256 = "fe72854b473bf718def041994891a8dd0eea7f8b66752efde8c48c7d62d21d95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/ach/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/ach/firefox-105.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "8a79163406319fdbbdaef5726eee9b51a9b2db90a82628d036964e5e96134a95"; + sha256 = "2c5355185433c9f5b220ec907e016ee2a4761beddaa4830f50fa92cb0d5c5e39"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/af/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/af/firefox-105.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "dd30ef9f04909242712cf048e2e5482443d2ac6e7ec25a98207fe7a50466e03c"; + sha256 = "ddec0b2f6f77728d0bc99bc83b90ab62683be5d997edae6704a4c1d0f87ccc35"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/an/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/an/firefox-105.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "91e82a3426c9b318fd2a9624bfc5518753ec47784a9dd084b23bce808c37fbd3"; + sha256 = "f3641af3c977927a6d8b97e4bccc1b30c57742f2244b28b488cb3ec164e2a2e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/ar/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/ar/firefox-105.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "645f8e8e101e5ccfbdab9618b9488d0fc5f3295f42ae09e851ac3ec4b2e15a24"; + sha256 = "904c808576b8e72307a9f18e314c9e23f7fae6767a9c6bd338a2b33e6a8791bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/ast/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/ast/firefox-105.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "12dcc595a5d0c0e4ee553113c2cb25d0d9849b460528227346a003582793fd7a"; + sha256 = "110243e1bfffb1cce24add92b91ac05ef7f05d1933da5ef6201e40a8621db4ad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/az/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/az/firefox-105.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "cc01fc756e452c8ed5eeba3f181588edad0f596556c25d2814bcda051e62bc56"; + sha256 = "e31177931cba5d852be4b45405e82dc78ad8deb50cd6df54f570f8ad87b13f0a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/be/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/be/firefox-105.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "1fe85390fdf39aa78da80c79b368c8512343987499d61f99f7ddee436c27042c"; + sha256 = "ac14108e9aefa5b66ecdb0f76840604cc8328d6548be4d57ae756c4ff57f55b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/bg/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/bg/firefox-105.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "2e43d97831cc333cc3ab727e9071bb9ec9c3505c3e41fefa5870506e3a6abbf3"; + sha256 = "35136e3c2f110f91ac783cca0a31f15428a09c05da23367550932bbb6ddebb6f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/bn/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/bn/firefox-105.0b9.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "b722e41397db4714d50f2c19c2b65c0387db927c5c059dffd63d838495904f6a"; + sha256 = "8253fd176f97443fb9af7bf3125163fc1673335fa51dd1da48e481b42e349dde"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/br/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/br/firefox-105.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "6524622c7c0bb66f62862023af201afb75a7a626c868827f9faed10d228360eb"; + sha256 = "2c81f29fdedd5567431771cfb30cf2284966ebbb73009d2513fc892d00205ddb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/bs/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/bs/firefox-105.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "b06d698767ea11303efe7b21f29a6930d015813cdc962c981329c840946f7ae6"; + sha256 = "9e519ebe10a6cc1d63ad40247e5b938fe99d32cb82efad0a8e1b79ae98019ce3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/ca-valencia/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/ca-valencia/firefox-105.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "54b73cf334f79c723d9038afee3c4440d9f4e852ad482bb63510320472afc6eb"; + sha256 = "0992baee440f77f6972a55a3aa4ff1657caed77613481e11d6b2d70142d0bda7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/ca/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/ca/firefox-105.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "d9fa450f3abd89f9ae6eb5fae8ee050df2c82fb73b50b31bef8254f9394ff404"; + sha256 = "54a752d34aa9b8f3b524b87468106ad447d30cba8fca3c04eb7b0dc3209ed8f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/cak/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/cak/firefox-105.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "8cf2a58a84b19954631b0f95b47e5bdd1d647711d64237afdb6a4cb3eac29073"; + sha256 = "3dc9bb67ca3c77ed2fc3af17c4b905aa49c573e93ecf25da2a037a5c2c3291e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/cs/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/cs/firefox-105.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "8e154ef48fcb2c178904e80133b932c776deb54387672e00a9a2ef9e47f7d074"; + sha256 = "a531591021d974ddc8d407f99dd642bb1aa4413864edf5ee791aedf1c29a98ad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/cy/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/cy/firefox-105.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "8da8c8a21d247b08ad38229750ff7ca62c3262249e7d90c5ce07d47e6184c519"; + sha256 = "d12c598c695f6a26de0491a05cf0be710ca65038efe0f5d7256d5e5c7b8ae636"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/da/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/da/firefox-105.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "1f8d6b3cdca8f96ce4492b5fc764c5e36f50f11c63284d7963603d40051a4017"; + sha256 = "b5eb8724b33ab141f60eea9d58ab1c8a4df1c9d0d533352722958effa931f3e0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/de/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/de/firefox-105.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "cfee445a533dc5e01e3db63318e4959af1748192ea72b6dfdb86c3804b83a84f"; + sha256 = "f87fae783c52009c3fe110e908ddf2deb44a4132cdb0f92c5882156fadb73202"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/dsb/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/dsb/firefox-105.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "a2736e67ff9547ecb6837eef11668ff1eb2905b673a0efb224dee6f06f411fb1"; + sha256 = "73fd3057f6c4a7de0c9015c50c99db3d99849d8057279ce3a832e4c1164ef176"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/el/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/el/firefox-105.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "197b6df04f42212663386822b2f2d22b88262ef06839e9d58ba204410142deba"; + sha256 = "0072e858a0dbd54f34dda266e0d7311cd1f4b6d54e7880b6569923c6a50b7c41"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/en-CA/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/en-CA/firefox-105.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "5c7dcc47da6d2cbf0f95a7c07e33732af6d95a5f5a2f5c2918bf5e470f9abddb"; + sha256 = "2279f3cbc3ced337c0778a667bb5e2d4aab38dfe23ba2ebedf1dff42388bc803"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/en-GB/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/en-GB/firefox-105.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "cc8ed9c353bcd702b8c1d8568994cb46c2564af2d5b18972c083061dea530668"; + sha256 = "0e29daa605fe409cd0f809b5fae6dc2f8ab9e4e8f87759b47b4ea5879b7ab705"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/en-US/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/en-US/firefox-105.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "d7691688423e9980be334ee597b83956bed93ca3ec681ec3a776232b3de799a1"; + sha256 = "6468cb28940d9bc8b774f320beb1091d61cb34f90db0ff793a0af5053fa9a353"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/eo/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/eo/firefox-105.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "7ef482769080f3cd5bfd044764af9800737e17f285a66ecf5c01e4786211e0a4"; + sha256 = "4b161af2ddd91937c1c26a6f69b46fbb2fc053153e5e19071b06f077c6ae201f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/es-AR/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/es-AR/firefox-105.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "7bf3e1ba9dad95fc339d8a4a3bbdcfa28d672399e1b10baee6880d9ea89c81c2"; + sha256 = "ab2e74390eab2defdc8ba2a091ff3ae5a256e3f2980a412c046f5871ac0e6cb7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/es-CL/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/es-CL/firefox-105.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "e4e31c38221213f379c83f93755c7465afa8dd8b7a30ead56c99edd6d9fcc1ce"; + sha256 = "35393f50a0c50201923a27634e6f3322eb91f8769de60d1c527900ca6dcb4d7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/es-ES/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/es-ES/firefox-105.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "4c5b106a1683c69bce4534ac4facd87a89cc551218bf9aacf84ead1411a4286d"; + sha256 = "4dd68e48fd997f48f39f8a15063445931c79b64a6a8c4bbc456928b6a8649f28"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/es-MX/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/es-MX/firefox-105.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "4dc95bd04e33760d979787340cd14370cc06bf9b2cac6cd66ed8a75e42276b30"; + sha256 = "e5b576b50c606b33e6876d4c49f33d3d73a8907bb148c2ba183ca50ec9191707"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/et/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/et/firefox-105.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "864a21c72777aed316a13b5a7a7d6f3214c66376417e9c4338ab415e4f175814"; + sha256 = "a9dc091e93d5ab4e35ff210c537c04c8b327092b469657db6566f82d09e606b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/eu/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/eu/firefox-105.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "ca54b8cb3e4fc3dc1314ce77e5eca86f1e31286352cb379ab43c1fea7e4229c3"; + sha256 = "c86ca29ee06f3627e0a17df7eb51ac260ecb455c8820000d4102cd627c5b2b03"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/fa/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/fa/firefox-105.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "429db01b9dd0169050ee14bcf4ef79013dea13b6679c15e9158b1ed47a3b3620"; + sha256 = "c22d8e376dba57992540e578d77b674001fac7348e1d4715074b79e72e0b1aeb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/ff/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/ff/firefox-105.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "176790d8f9b70cf81274676e2019fcd2cf25fdf8c22a23e42e53e8852c18084f"; + sha256 = "719b6e69f024390bca5ec48a3c3295d7011a48f68de7853fbf8ae08a20e8c8a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/fi/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/fi/firefox-105.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "b57bb43585d2037a411d8f5be52800faa480f636372b86b8238484055bd5e449"; + sha256 = "5f562052bbba14d080301378a41a6de2e1363b52e5ee0e416dc73eb9cdc05e8d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/fr/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/fr/firefox-105.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "e18817bd6ba798f743a083c7be8de83a716a919ed800640b78021b4baf3a5d52"; + sha256 = "484820b310ef3aa98229497a442220f465ee72e344fa34bab5d2ac2b51e1fd1c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/fy-NL/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/fy-NL/firefox-105.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "3f730a5a65eb4bdb97965a37f87aef37f1a00a8209cfd1f6a2bbd97836b2c4cf"; + sha256 = "d317cf868516e2144de1a1eea57fd5fd40785af8c1e8b7c856f0cd031a617b22"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/ga-IE/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/ga-IE/firefox-105.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "b3c26a42d9bfd6b106ecf5edcf28288defe080adca3f9834d33000a7779262b2"; + sha256 = "9a649cc40c714aabaab7ce5133f325e45bed00152c9630438ec730ac5e22426a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/gd/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/gd/firefox-105.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "03bc483a77990c7abd9145e2d38dba8a61fd5bc256d5baed332b82948cd75511"; + sha256 = "6ed25d372c686084071a3ccca77b4b14be29493679fc7840adebec828147e15c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/gl/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/gl/firefox-105.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "e5a699d8287babf72c091443c52af0c11662e995c07419c3ac57020eafbe7465"; + sha256 = "2fe922fa9505996710463b881f619e01828ca75d1ccf78ed7061551c7f713fb9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/gn/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/gn/firefox-105.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "8443c87731f3c0cce14f2089181df277500cce1b74b11d56de66774cb7c4272b"; + sha256 = "e81023c1edf4796d4fed407a19ab58e9145a29132293424b23ac6c2e079414b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/gu-IN/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/gu-IN/firefox-105.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "a354865fade4730606241d7ce6e26e9b0552b3127ed0ab480e83fa160c02a455"; + sha256 = "4f66a3423624d385b5e81132e94c93ce1f8b622c9e034fbb52a4be4fb4d195a9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/he/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/he/firefox-105.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "ee828206a0de497eb296951e3d6f34b7ae1312299a4cdea872594cc0d0d4081f"; + sha256 = "1a493aa87247855e50ee275fa02c81c7075487c7624a7d4ad07d02901138c408"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/hi-IN/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/hi-IN/firefox-105.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "3215bbaf6d715fef020466d4f747695f66208351cc1b040af44b0596465e723c"; + sha256 = "4dad7c8ebaf3680005251da3e55025974fae4953f4438e13ce06dacf51820c62"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/hr/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/hr/firefox-105.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "7e412b19745b586ce46a509833c5a65033e35706728034ee612ee7c2430fb06c"; + sha256 = "fdc7f06b3ff74bbfd124a9d38574bea48de9b390e23252d6100fbef953f274db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/hsb/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/hsb/firefox-105.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "a5faf9ecffcd0084d5b2951ab735e2b76b6dff19585b0ad632806493659ba2dd"; + sha256 = "fcbe0795420501016855ae1ff4e44237c9fdcaccdb6811279ecf32edc3f2d0c6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/hu/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/hu/firefox-105.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "29dbb8f19c6856323a1d6085f55c40e9f7d2ce15acb9b9ce50e4f4b8c1519da9"; + sha256 = "75d5c3cda24d13a99742f72969416fd064c2e4f45f3f9610fdb7c1de50c1b44f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/hy-AM/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/hy-AM/firefox-105.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "e604a92e6b100edc085d6da7a2df58f9ecaeba2c1e776a2285245ca61867da8f"; + sha256 = "5ea4726ea262e5ebed05d384b0b80f3456a03fdd102c6adad00df3c67422bc42"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/ia/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/ia/firefox-105.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "d7b63d055c83501b772423b7d6aa8c15997602e3db6efac9530b2a84b47008c2"; + sha256 = "a901fe6722da3db6b9808d3b6070aa61bc2cf803dec9878ef6106e860a3e58ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/id/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/id/firefox-105.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "0154283f68d3cd5ff3739d61f238f9814ab187c1fb7654e4116fd69b8877b251"; + sha256 = "d338c3fcaac4fec8664ac11a685ada42b75f8302b500398a67853d9fc5d1b1b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/is/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/is/firefox-105.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "8a726cc353c2474a3f0ab45580cf5ac65e6905521af0b0bb9493eedd707d4c97"; + sha256 = "920be60dd3c6788d963acc11caaab1248906f64772879fcbf034da6f8a1c1431"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/it/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/it/firefox-105.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "9d7f56ef7547f6b6dd7c9e4fc483ecb93d9c185c842e90b8fb1227c1ba2bc99e"; + sha256 = "6cd036b350e78a749d4edb01a7d57cbbda0f0cdd69a1b4abe773f7f345e4f1f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/ja/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/ja/firefox-105.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "10505e1acfc1e67f67971cd779b414dc0db3fae85b80402cea5d727b21596dd2"; + sha256 = "86cd8e1f2981f4f712ef25434908c76f212811d273fcc1f912603354b297b321"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/ka/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/ka/firefox-105.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "c7e69e19221d5ca83a6ed290597e4e5913f742556552692e803c9af92fb9fcfe"; + sha256 = "25afc48601b448f9347c78790c8670bbaba0c92e2e9c4b1a5ce0aa9385d65c1f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/kab/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/kab/firefox-105.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "828c84f727177e72d712db0a6530b6cc963b7e4d2b4341ee8d0521d66c4d6c24"; + sha256 = "274e7ecd83be64e7ec85f0f5d121919fb07d41f10cc7fd2c2bb8fc16f96731fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/kk/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/kk/firefox-105.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "3ffad382088f692beb29f6cce6549555f53caeea9f4b8f4d63f4305d5b11308b"; + sha256 = "93a27f2288176085deba86e14fecc9ec395b1cbb6d6173b945931903aee8baf3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/km/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/km/firefox-105.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "3c0bc5779d894b9473071ef9e92c03caf6d7f28f7340ac8bf7bcc3cd03b4f082"; + sha256 = "32aade41b03d442ea2922e2f36117dfcd9485be8348f7822d514d0084444bbbf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/kn/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/kn/firefox-105.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "1825fd0001d3bb425fbbe47769911624c4f067ba92e3183556d153577ce37dbf"; + sha256 = "eaffe915385d03471763c4aceb23a312b3b29fba46502ac35b4e3d690d450e07"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/ko/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/ko/firefox-105.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "edb36c21d31682bb5858937a56496f2bba0d5249b55cb8cced4cfe8f70c8f01f"; + sha256 = "822256dcd7f10abea1075f85b1200caad002d572746b10bb4e29428954852077"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/lij/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/lij/firefox-105.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "26f5b03382dfeedf1ead9831946147a3e60d44c03acf017bd5425cef06c812ac"; + sha256 = "3ff0e125d02faf490ba24486b3b05386da06458b70a98b7617ce014a7e6672da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/lt/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/lt/firefox-105.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "24c08596879ba8a5e7cd3b2b8a044e349a5a067feb0ed00a7545e41c2ea5360c"; + sha256 = "3fc55ef46e89aa617203d220bccca425676d64a794273daa1ba0cf377c156427"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/lv/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/lv/firefox-105.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "9f5bd67bb40ee418ba7b4b98b33b0a1b54a9f934b0d221ec1c142939edaa9d90"; + sha256 = "40e91426d6b6a069308d836221b7542cf99e39a5656d7c81664063f676834700"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/mk/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/mk/firefox-105.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "a0f662e5c8adfa5d63b99c0acaa19655fef74f09d0f0102e9e4a244d9cd7ebfc"; + sha256 = "c0a2ba1e86ebf6b4d4e4b0f03c2692e79b8bdee8d3fe14ce4f53f6ad81171e58"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/mr/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/mr/firefox-105.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "f6f4a7e00d3603467c0cffdaf7d655d37ec867b26234da2518f508d574a4a92f"; + sha256 = "0d5c641dbc37a6bb621a2bfb930c9c38218f482a6c4cfe95c0afbf5761ea9309"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/ms/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/ms/firefox-105.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "76a9e7df0a6d7c097e6ea43103024c8245c74ff01900f3bb0042dddd6fe30546"; + sha256 = "e7c7850d7121a5e4595f3f941a81fb15cfb40027c6792f4a279f9dfd8fa4fa06"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/my/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/my/firefox-105.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "707d9b7389cb13d4a353241285be6fb249fa3dbbced60c9ddcea806d7cc6d82c"; + sha256 = "ca33e2bfaf86d7bcb31452f8c96a0a58ee0fc02cde779de173b109f172837e4c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/nb-NO/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/nb-NO/firefox-105.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "0b4c9e37989f9946c45d29d605428ad1fd5dae2901eb1e001801af968c54a553"; + sha256 = "2ba4bcc31c776d11587d8ff1ece9361af00a2f202fb4a3ce7923c5b7651bd752"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/ne-NP/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/ne-NP/firefox-105.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "54870358a207b77ad06d74b97d3d0f02ad72d6ad03176a94ddc52a0ac68f59a1"; + sha256 = "1b1bffd0562975f19ac6b2700621423fd8825910d6d9f97471a01c1a92b587db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/nl/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/nl/firefox-105.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "4980f4d5d022c9374a1c64bd1e3d6a00e16996d357c5c2e5c3976dce295bbb6f"; + sha256 = "130ff17cc9efc21b1705270cdb0850f2ed05568ddd84e5ac4b60ffc741d78edd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/nn-NO/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/nn-NO/firefox-105.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "4022e90a4d90db67f9d9a9668cc447ca9d56ba6d550dd4afa5b6bfd420307200"; + sha256 = "a028ac3d577c071e0ee8abbae51bf9476729f46eb99b65dae1a6e8ec026d6dbf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/oc/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/oc/firefox-105.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "46f616ae6c48f0d3cb49c01f50eecf11166f32d677c4e6ec1d7d28fe6340c035"; + sha256 = "640fc1b632861a411fa86aec78a4a8ddfb3c1f5659789b66be4a680b11d0372b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/pa-IN/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/pa-IN/firefox-105.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "e07c3639c91bea102044aca96f60d5d58faf2d49dd0eefae88d04bdc5081c71f"; + sha256 = "325caef6d5de3e4d9de88812bcaa75b913c857f0fccda16920429ce3174c6b29"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/pl/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/pl/firefox-105.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "8b5458468374cd6567581d3c915bef7be22d535402f6d9b1853229a2877a58a4"; + sha256 = "17214cacb9b02e07064388fb73f46802c21c6686656a6982356e1d9056c21967"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/pt-BR/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/pt-BR/firefox-105.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "996648fb5c185952ed441997ac689c4d8da2dc064306b3aff1c32405da8e85c9"; + sha256 = "b1e5ec447e383645ac796fa120c66ddedb8c81053db95ba3c7bec52ce4fa9f93"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/pt-PT/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/pt-PT/firefox-105.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "b92ca1f134e09d0587a64b87010058fa30ab3a49035c41f07f704c0a40da2670"; + sha256 = "5cbdb249fe7ca280d89cfeca9cd15bd3806b74ab782ec9e3ef89315e64098c81"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/rm/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/rm/firefox-105.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "c487f6b873c3075f94247affa4dd27b630d5544664c1cda405b6b60fd30f4068"; + sha256 = "e1e8f6e01b3373502244db65351950baf460573f453aedc9292c9a28ae4ccf5b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/ro/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/ro/firefox-105.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "07e0cfa7f8ccbb31bd0b7723d35f64316cbdbe0f676e6f9ca907238ff20a979c"; + sha256 = "a2caaed2fe2b02b75f75d8824a0e7ab094c745136c6fc1413cefd31812495ec3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/ru/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/ru/firefox-105.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "0b19de137527fcc99f45e516b5ed34d044f7dded24f3fa1f7546d4744d7cef44"; + sha256 = "a215f91d472cd9ff56d672e63c1232fb8bfe054cb02d991644f1926c07ecb993"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/sco/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/sco/firefox-105.0b9.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "c7e5ab469c7cda3af0dcdaabc50e15a7acad613eac4212a7d1d50af6b8cffede"; + sha256 = "cb2c861d0d98be8c5028747c62db2a404c3c2f0d6eeaed417809d3eb2278d245"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/si/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/si/firefox-105.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "3ecf4f710a9858b203331b845a9ef4a0a8c0d156cfa4828da19a7b4c0dd1c636"; + sha256 = "e86fa7036a64ec0bbf564e04feb4bd333d0d77d6a592a83f37d85b9460e9dc8f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/sk/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/sk/firefox-105.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "058eed9e796918659be9385ee12d1988436140de55569a4c5d6e27bf1d1bb925"; + sha256 = "070ec7dda8a0d45ef7a1dfdca30ce33d25f8e80abbfb37d42ccc65f41795f329"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/sl/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/sl/firefox-105.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "b31053632a69d89634d9e6b22f842b2b205ce2930ca740081044ca18bddb84ba"; + sha256 = "ce7b92a0f30139dc6790849a5a22348013e45d7c622a3f04784575a9d64574f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/son/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/son/firefox-105.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "0ef828ca1e35cb1eb2d9026a9661fa042f4ab45e17c0f8b4cd4525f1d9deca47"; + sha256 = "9488a008a014ed5f28723d45216244ca082c56084c607c77e11a64d274cde4e4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/sq/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/sq/firefox-105.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "7a77233f388062d298dd414f51d16c162cd34a0c9200835f8327acd3cbb49195"; + sha256 = "f319400e6df0e4d6ac4702ab9bc0a7fc525ae4eab68a99dd58c0242c6da8ac09"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/sr/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/sr/firefox-105.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "2c37d2f0ffc5bcac7c418925835d2d99c2038a4394d8c687547d3a6da9a67d99"; + sha256 = "6bad31fd676c7dfa10fb39717e9f56242bdedc72e79540a632cb0df3504efe65"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/sv-SE/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/sv-SE/firefox-105.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "0c57588c2e263b2e0388594784ef5a99aee25ca9af5d5f1aade62e90f15dbfe8"; + sha256 = "d6920092fcf49412d2dc178c2cc484bef5cc6e11190bccc54a84aee3d9bbf342"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/szl/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/szl/firefox-105.0b9.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "94440f21c940eb0919cb0f4eaee0a1e78c84fa07814c1f430a37fc66ea8283d5"; + sha256 = "7e0a1ce4e278811d2790df93ab73ce3a02e19cd1e5b33ba90579cf293bf8a790"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/ta/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/ta/firefox-105.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "f02e8ef3a2980e4efff329f352c569fe57f06c55260d9d84e879ededc9fa525d"; + sha256 = "4cc6ee0ffb3c47acd8e58be027331726d0d82c1b42cd619d34d2913f4574e428"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/te/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/te/firefox-105.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "f425dbe7c83e16a5b40d04272d88dee50418ab9f12121c8f3ddd123bd963e97e"; + sha256 = "83d5ca04abc678e8eb043d07c97f8d02b89d707dae634c96f741b7a0ac7cbedb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/th/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/th/firefox-105.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "ce5cb99e2078e8e8071904c5555978556fabe3e81c52197c95a97a4fd7af8781"; + sha256 = "843b6c1a5c58dc904dae493c8f8bfd39ff0250e574ecf839eb19bf747f5dbe12"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/tl/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/tl/firefox-105.0b9.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "92826687ce1dda746598a25bdfdd19558c15619b3adfff17d50fb06c81c4a093"; + sha256 = "526b596a1c51f6d0014c94ebab0b24a4231ca917a8e77012a423e70e6bd4f6c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/tr/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/tr/firefox-105.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "0191dc0d436017946a049e9b58cf286751a3a68b3609774dd4f472798753df6a"; + sha256 = "d8e70b493a2602108dbff36076462ccd1f1ee8c9f497d8ae684ed3f5f8e097df"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/trs/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/trs/firefox-105.0b9.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "48dd0d4d2069c6903c09225c4cdcf554a71f159dc949300eb61ecc4f7f2e5206"; + sha256 = "b7252ccdaeaec5e1436097824813feb02c57843e2c9265f430cbac589fe28ee2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/uk/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/uk/firefox-105.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "46c5195e8620e89359d4ec3ef4459762998741157024083104244c2e2b0fb555"; + sha256 = "b898c523c032bf6a14a84f2c5ce21704f11161b04ea4e45dc258e09e1b775265"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/ur/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/ur/firefox-105.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "8ff1c85efc895de8b77ebb45fa70533c7c42cb14435b93630a5b61e21f5990f6"; + sha256 = "e7f9b3178f29895eb2afc4a40632f09c7f0fdfd71edb5e4ae9f3892e900a9f2b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/uz/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/uz/firefox-105.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "eab0e07f9ca884635f2cb5af22633a62e323856306a055f94117f5d4c97d7739"; + sha256 = "ff4fb6ccc88f14a91ea862813cd51971eb1c65c567728d8936fbc17675dcdd38"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/vi/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/vi/firefox-105.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "6fd296c409afcd4393ec882d33ac42dcc3d504556f77ee66d3b1a2da3a8954cc"; + sha256 = "9426039edd4597fb1c19a8717085eaed373d4c151beb8b84cb15bf5dac571e04"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/xh/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/xh/firefox-105.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "c979fc5936f031087d7e5ef34c7469a3304846164aca3d53c6d2a47b2cb191c0"; + sha256 = "9599991073c8c3367e2a6e94a0bd7a194275c2dd76bbc5517e2531496b528313"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/zh-CN/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/zh-CN/firefox-105.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "0d0fe599a723622827d09dab13ca90c6be5806a50e0af58eeae2556259ca5622"; + sha256 = "943ffc4c11b9ec256709b305aa06515f0c5980582ca917f839f3e2f02af37abc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b7/linux-i686/zh-TW/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/105.0b9/linux-i686/zh-TW/firefox-105.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "864380014676d51e54ca79dc35d9d78ccf885ac671150bf3e31c2ad63d6f94c0"; + sha256 = "e18784a328b94455107df70ee1dddf34e3c6e2edee49facd90aef78eb7878d3f"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index b7b4b781e3..8f62832c1c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,985 +1,985 @@ { - version = "105.0b7"; + version = "105.0b9"; sources = [ - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/ach/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/ach/firefox-105.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "f9ed5881dd2d9f4e830a8b41b74c97f753e90815f26ff9cf84ada35ce82e756b"; + sha256 = "8020f4d9d6c5b3052835e47ccdd739bfbbf27db14a3d771b1bbc8a0292ec0159"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/af/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/af/firefox-105.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "ba43220df73912f340b4b7906d528a9eeb5fff97beb2f98561c7ff1bb0523ff7"; + sha256 = "6cdd01fba7c40976cdea9405616f68d05f58cc282dcd43901e685788e15d990a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/an/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/an/firefox-105.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "0bcd4d4c3a9aa12929a360e2cebe75ba39561c3a5e0bf035daea917a50cef483"; + sha256 = "c265d73be5aad088a516215409e482e9ffd32b27de04f3d74d70d6c37301df8d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/ar/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/ar/firefox-105.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "885eb5fafa64d128623c237fc9e512a6a939e5db30e36e2074d9116ef3902bb2"; + sha256 = "9b694e424a714054f93dea9984fe54d2948f74b64b5e6d03c0b3ffea75d9a8bd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/ast/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/ast/firefox-105.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "2db2eada936647e9c0e3ea7015cc68f0efc4853fb699ace541665409c44098aa"; + sha256 = "e10247626a71b067b61549d477b82519a5b0ad6a0748a6c32820a493c4a418f9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/az/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/az/firefox-105.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "c1df6ddcc0f04520a25248b9166565569a77e84e5421ab331a150b704abcf947"; + sha256 = "fad9c7fe6a2df16b2fcbc4704403d1fab7c127f91f774d4ad03509fef54774ab"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/be/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/be/firefox-105.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "a40cfcb8f4c7a86c306d757f20acb555523d1780cd4b355a07cb5b395486d6c9"; + sha256 = "7f7fca5e0c7697cc3bb93316f1cc4c962e245451680566e02f4079dfd8cd44f0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/bg/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/bg/firefox-105.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "366a6cb972117fc0fb0246c969b299df160fe8342d751774a6846abe4d833e2d"; + sha256 = "9f5c95591bfc2e0c68002f30a3aa5252bfe57b5c1419798e8960aeeb80b62558"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/bn/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/bn/firefox-105.0b9.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "f5f7aeaf73ee7bda731f89c48cbd725180421208314797f15249ddcff7935890"; + sha256 = "48d4d2d5889abe7e6ddf5d0eb1cd373e9bcada6ea75dd5bd11d9a3caf31911e1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/br/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/br/firefox-105.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "d795103d86c8b23096f48f51008ce1df592d543b801141e3da8b2ec90d5ed760"; + sha256 = "86d285e71fd154924e5cb7b9772bc4c1c8f8b49418951b45e58f4a3412e4f57c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/bs/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/bs/firefox-105.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "0c2928e31be0f601f48c560eca2ad32c95127b5775febbe1b6c590989f49deff"; + sha256 = "776d97cca84697da8043d1c565814d50f9399460a1409c3ee1d1d93c87f12b5b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/ca-valencia/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/ca-valencia/firefox-105.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "f3c99892e9357da2191b2c408fb6ea72cf2386907eda18c1eff8a00eccb5c73d"; + sha256 = "c1feb9ed9ce33c21e411f6eaf32150e0690aa2ed2d73ad66c9d59a8ea0fc52f7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/ca/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/ca/firefox-105.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "c8f84af5c19422b73a34e1342cd93cac28bfa10acc7f7dcbc06222f75693f95e"; + sha256 = "a1d0ec5a1d1303945d78f2308eb5216d7eaeee9f07a32600d42a88ee2a3fa822"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/cak/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/cak/firefox-105.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "9838b5224d7e161bfea451124e19f4f8a28f96106cf1dccbc5e42a87bc86846c"; + sha256 = "faad994362555029fd57f10fc4493652881c595e22c876c5827bb9ac51c21bf0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/cs/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/cs/firefox-105.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "327b12321f68c9343a0ea4d3adc10313a363e43398cdd1659e842b681ba7f8fd"; + sha256 = "2ef5dcc31f4e19f17a74389f92ab52689394a0b1522093ef1ec0a0fd6736dfea"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/cy/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/cy/firefox-105.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "11d4f2a1653f1433b990a762df574c7ffb4f5a53153c0568f7ac23603a3cfa4f"; + sha256 = "9fc5f9671c817cfd24cb63510509f819eb873a80c72e41b4d18031d749eea888"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/da/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/da/firefox-105.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "ef6b515fca5e076a461aa3976333b622d47082433985ee251bd8332c01bf9f53"; + sha256 = "41a82e42e5333f8d97f67d5b42dfb3f27675bd921cc93a874c028c22409a7eca"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/de/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/de/firefox-105.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "dc041053c2dcb548dbdfdf6ba76ae38c175b5cb6f6176f483d9e9efb55677871"; + sha256 = "f8e57272a828d0cc9896200877f141d0c3ef2c7061ac39d43005f0d344382ebd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/dsb/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/dsb/firefox-105.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "ed042c438d72e8a829861061f10c2673e5c22313c0353d368e95ad11e7c18c0e"; + sha256 = "892cbf1aeaaef5747207311647227e491bd418052ce6a441b138c93d76ae7798"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/el/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/el/firefox-105.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "ecc1354b763f8c7abbd9a66ff70f8afe3a4270833d0f8f362a2f22a6813db4af"; + sha256 = "eabb4f00fd215059ed74e0c9bace0d35124910f43f83cf17f91706c2a1df93ae"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/en-CA/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/en-CA/firefox-105.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "28b46a62d0023c115b202ae6706c1180f9a078cedf7026c04822c48fd2d9a905"; + sha256 = "891b4e1b91b8afa550c36ae0ae49672176ae55d58a4bc6ff9057d8e6233bff8e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/en-GB/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/en-GB/firefox-105.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "a295f0995de373c2475a61a38805ab112489097bb1a227b9320bdfebd1e8ffb3"; + sha256 = "cba93155a82cb31edc9f22c7988d94e79e016fbea81ba3566e28571c7eef5a6b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/en-US/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/en-US/firefox-105.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "c6e5578ebb31521edccdbda4469b6af06701aa37c168017e00ac28c9f5871e95"; + sha256 = "6643432a47864c77445f8648b28e2ca3092ceefac83af72884983bedea6e9c01"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/eo/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/eo/firefox-105.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "e4396046f3d8f8f4c4100869f6ed7e806ea39ae0d19649d419d8c6148ac8dd64"; + sha256 = "88c8a38b67d41822dca35aef42ee1360f96a3e3bcce762a5fd8cc7e9e0197e20"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/es-AR/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/es-AR/firefox-105.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "d6c2c0a18ec5cf9cf6a4ec1b099dd494ead653053f5796fc043d676e3e41b696"; + sha256 = "80fae5da5823f20bdb4401e1913b0ff4a972de3248ea471a0da6e071681103da"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/es-CL/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/es-CL/firefox-105.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "d2681a37c03c5b16a79427ddab4853eb1913d58820e6a1aec6e61e68376a3399"; + sha256 = "144859955e1dbcc2b5821f614bbc8d362cc163bd5828e420c8f1fdfe04681400"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/es-ES/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/es-ES/firefox-105.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "a8b7b4339d544fce843953e2cfb6b8d9ef9c13af412eb8cba5d349881ee5d879"; + sha256 = "f66cf4134e5ed89f2fb2d545bb460079109cf585311b4d2d7db425078c130193"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/es-MX/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/es-MX/firefox-105.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "a63511b03dd4f4d42835b8c31df2e0185c5f5ca965c911095773bc5936e9d75e"; + sha256 = "ba7217257eb41fe74f5c1c8f7ad2d2a29b51e21a1503b33e37a20dfe6f8abfa7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/et/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/et/firefox-105.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "973e3af967aea805fd2a8d3d9b8a39fec5b41ed27cc85400a1f094466b929ce3"; + sha256 = "883a0f722d5079bbd0e7e61870a9487f895027b8b73d12567ed8af709b7179eb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/eu/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/eu/firefox-105.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "938a441056aea6370ff4469d3177c0becb1854dcc61897e005af4198d0220993"; + sha256 = "3e2e49bd977e3d17d0ba4ec6d99b216246e10d105f402441a50f4502d4788ed7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/fa/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/fa/firefox-105.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "113c442b04f02637881eca2023948101bd19f34476397176fda2963c177e7808"; + sha256 = "b0249e65d168d842115d2dcbf5adeaa6f2f30375c6fd88c45f63fa2ef928cc52"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/ff/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/ff/firefox-105.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "4606ba39899dfe2bcdc03d2867541d20a3d350e242e53895830a927cdf34897a"; + sha256 = "63f0b0e36059b3a633f48c3e17549d5a766878e597719500087eec0ce475b3dd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/fi/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/fi/firefox-105.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "b3451c3b34f3307593ea65f061ef69d402a1ad5a1ae5606e6f3e104feca99850"; + sha256 = "d3cc4af7b34cb0c4323f3377907c9e61a45d413a06c2d902dfc860f7d54e6632"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/fr/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/fr/firefox-105.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "4d70d97bf7c9395f14177dcdb4641a6d2ed7c12156ce98baae768bb47c321b67"; + sha256 = "31b22f94e9ae69f653eff9dd97bde7b3430a6f590005164a212713a003687cfc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/fy-NL/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/fy-NL/firefox-105.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "2ecd33855a8eee051f578c8d13c0762074985dba5384f88a67b251528e14885b"; + sha256 = "9e1337bd9c457c2001db18136c9fe361594f990064d9e3a8e0cbdf173cfb3dfc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/ga-IE/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/ga-IE/firefox-105.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "d413155c768b783b1cbb04c514b52fb573fcac490ca8440cce58c295d0306c33"; + sha256 = "913a3f838a80155a1bb6a147c3f787a8d86c90f300350658dc11866d77c97dbb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/gd/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/gd/firefox-105.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "df287de7167addf9081f1d69f50f1ff6e67c70c93fc600ef1ae201e808a88073"; + sha256 = "ae54f0fbc0a0255b54c37c30bee8e0d384427e0a9b753358149640212891ee13"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/gl/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/gl/firefox-105.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "4a36292799dc25444f6f08205e210dac923d24a9eaeefd5d136eec8456f82fd4"; + sha256 = "ba95438b7d2f019a80bea37ac3e39e0261c8ede8e8935b28ec6bca7f599c454d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/gn/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/gn/firefox-105.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "f6029ae4595c31ee753f72412c400cbcc98207b290e72647cb1b66abd8020f28"; + sha256 = "a70710575dbee102e9edb06530c1c5473b0b9f39a8a8f796564ce65019e6269c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/gu-IN/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/gu-IN/firefox-105.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "2448c1681a9ba7522756d31608e6ca74ad8816ce335be0716e5e26d9dee44fcc"; + sha256 = "3283dad0045e859414638d004af1e61a1e3c6830570d0e123d4ffdde47f068b3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/he/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/he/firefox-105.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "e857b093da44ff11576879df759c55f5b1b3f87f1e18f5636a3d688cd1fc8876"; + sha256 = "4ca1aa762b2a80a5771d73b474254e147cbf0d2ab60df6037423f7e6e65cbc6c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/hi-IN/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/hi-IN/firefox-105.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "ac8454216677cf05eb815ca1611a47d2be33f0fe72b2ba721dd472395608fbe0"; + sha256 = "98b6276510ff641092b507230a3d9555d6c7cee8c8ef1c70f229c8080a8575e6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/hr/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/hr/firefox-105.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "65c7702502fa59bc261aebd3af8246f40072ad2dfbc605f5c254ff2a51bf108e"; + sha256 = "44adf2d8985e8b089fe11e69f70fa0b3697100e96fd140c9545baa5115ba6af0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/hsb/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/hsb/firefox-105.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "9715966ba1f6b9fe691473c88fdfec93a3e544da0486db61149d6b69efa119ae"; + sha256 = "20d44c489de6dcca94f0f0bc6e8f3d3c788c285d02ba39fec06dbbbc01b37928"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/hu/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/hu/firefox-105.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "a92f2ead63d16f2dc52e9b1d76546fc1ce2e70318dd3d92fc3e65e36effb0021"; + sha256 = "20a4842c9545ab67b2394bd583e5ef753cfbf56c95efb37049beaca9a12d4943"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/hy-AM/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/hy-AM/firefox-105.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "d2936ea9570d6122817369b0938ebdd406c845dbbfae3282b338d622333e07b4"; + sha256 = "961c54dbcca02d4142cdff48f3d577803468d597223679d4d656fa998a2e1b4d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/ia/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/ia/firefox-105.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "ac823c4d9ae2f74ac4fa9e3fd3d902c52e8a87987ec5aef803404eae83edfbee"; + sha256 = "11fbac1e4b34beb6972793d792eaef9fee02598ede1f45b18aca6c2938c1f246"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/id/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/id/firefox-105.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "edc7cc55f03e93fee4cd1ea4e9284fadd2451de8405ebfe1cd36bad3ce037916"; + sha256 = "d43810fad162db466900f9e1ef78c571ca2dae3a96cadea15fc53aa8c2950c91"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/is/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/is/firefox-105.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "2a9b2c8d6ad77c04566f7ad38db00d16da61a51d003d60d875088cd3393eca72"; + sha256 = "af22e21039d056409aa375ee5baee45d1f5a71da81418c4a462264612bb481a0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/it/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/it/firefox-105.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "7e0cf4f4feae193364ca90c3d60e17a173344d3476f67acc333408fcc3eb26eb"; + sha256 = "f4def4ff1ced33b748a8114733ab484a0a53893184ea49c67c5a1b423bbd9e03"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/ja/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/ja/firefox-105.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "d82753524dc2587e6e229fbe37c7298ed6aa103b98a5d1379f9b81f7d3e88ce4"; + sha256 = "c60a5e0eee07b83c7f6aaaeb7780637af63679deaade5fc28a87f567f89fff59"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/ka/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/ka/firefox-105.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "4fd1a1bc2091055d32728206276bf0a8765ffdd726cd110bf1145e5673a2031e"; + sha256 = "f2ded37f9187ed8723215f7f71d500063ff7494f26ddc38b79004cf90a9019ac"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/kab/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/kab/firefox-105.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "34dd78e993071cb4cff51729106e487feb9ae4d919eb15e1fe1c14bdcfea66b6"; + sha256 = "3065ae4fbb834c4de88c077ccf3a9aa0d229506715fd447c639411a841a18673"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/kk/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/kk/firefox-105.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "e06a7f0ccaa879d26e10a5dd3407cb7755026e97f323af72a727252f85371bd8"; + sha256 = "d929fcab7b833374ff1f4c38572cd3f8bb1564c683bfb3e4dce8e3bb0a97a637"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/km/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/km/firefox-105.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "6b8084cb087652b70bae48ecc4827896847b68b04424438acb6e8d29965ce2bb"; + sha256 = "aa62d5aee571b28792b8e13fbe6dff386446215a8acb0699c91158aa6815f74d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/kn/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/kn/firefox-105.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "625efa6dc65aff58290ada4e08fd8098c7992001bbb05ebff6670fed2ddbc27c"; + sha256 = "b86cdafccab0de5742ae6dbf783690fd68419f289f462ec527141b96700e341d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/ko/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/ko/firefox-105.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "8cd46c7e6354303298b1f1199498bdc4f312f2ed9b09fd6b76405eea1658ec6d"; + sha256 = "2538d91d8b834718faf7e06daade9f31e1c7b1c1f74ea0cc5a9c97af3ba25dbb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/lij/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/lij/firefox-105.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "01077366b93a1e4f24656c01fc3d914c553296ee45564426e4b35f4bf9373d7c"; + sha256 = "b4494f7de1e58150f9a8f3d50b642e2fcff73ee8b9b83d51e6f71d0f7ffc8b33"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/lt/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/lt/firefox-105.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "710ac8ccd6e21d46d238b1f606e7b18b0eeb1c4abca6b73e5d80788b29ff5d8a"; + sha256 = "88210cc2a14a1051b96a1f5b10ad4d9034eca12033cdb703da964ad5aed4f94b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/lv/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/lv/firefox-105.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "580c8a2dcf69f6e6e3274e00f61639e08b8216766ce753e4e360b0abd9227db0"; + sha256 = "c74a0fffbb560f1350df6b539df93f93d2d1ceeddb64882b5e0c13633ffe1f92"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/mk/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/mk/firefox-105.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "478f083fa99a14fdbb054bf582c9fd8924bc673af38a06e939b2003dfc816a38"; + sha256 = "b0b4f95afd3d5eaf2bd40fc4ef439e1b012037c97b23ce65c5849bd72a69472c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/mr/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/mr/firefox-105.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "d98b910ec7c21db26402e2f7c1c59ebda3390d83b26498db0421ee72078fe7bd"; + sha256 = "af5969821dc72f988502315f52cdf9a74914115d2c229c78b8dfe8a6babc3cba"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/ms/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/ms/firefox-105.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "77e4081b3e25e36a342375404d4073f8711191a9914da6d00db527e28bdf5569"; + sha256 = "28c04610ad0889d2d34fa2e10024d7ec83ebe444977f55f9439e632e6bd31706"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/my/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/my/firefox-105.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "a7c4bf65867fd804785d80e70f5ac02c37640d655796ef3707e24c30f03e2293"; + sha256 = "0b9c5f32a212050f94bba7cded521f53097ea335895c1efef7151d70c6134b83"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/nb-NO/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/nb-NO/firefox-105.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "6da93fcbf48b9f36ae42ebd4490a855e3ebb1b4d33c1e8845e16db01e26548bd"; + sha256 = "f5d1fdb733624eedf6fb52cc3f18a1155c8e39758ca0ace03b0e9dae43019f2b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/ne-NP/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/ne-NP/firefox-105.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "710a987cbf6d0f5e78175fa205ecb859ace0c6b2a33acba9d19099dcf328fefe"; + sha256 = "1f883699bd09d948612c07f08bded186a3b820636bc35c828c7ca9a8493e6df9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/nl/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/nl/firefox-105.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "f4d0527e98f2f12be7f492061049fb01f48bd835d0458ccc3d192fc9a3180cc7"; + sha256 = "3483bb5596da364ca5a7fa496cdf4716dd1364a5fb8e42d2a75e3e4afa3aae60"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/nn-NO/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/nn-NO/firefox-105.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "bb1cd05d17d81d4ff61110381fc03a0d395abba654633d4015fac6173f547c83"; + sha256 = "6fdde89c3fc90339d8876cfe8534b89324137e0eeb0f15264e8a84d54b52a59d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/oc/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/oc/firefox-105.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "961b793144730bafd42e9a6312e1f92f14d4741a59b283de827750cd4f4df30f"; + sha256 = "dded656e83d50a47afa10fc342da7035d425ef3889494720dacb47fc237fdb48"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/pa-IN/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/pa-IN/firefox-105.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "839ac627365973e2bf82799fb03e063e68a3828fd8c7d306737a3558f4e764af"; + sha256 = "2b05b061d6ea887f63c1ef2d8b19554fe94c2a319cc2221d6c99c221a6108bd5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/pl/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/pl/firefox-105.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "3df949572daa3c063cdd65f5ba4e112c5147266944dec27387d4318b32be8950"; + sha256 = "0ca3de0e41efd736475cee393c954d0d8703f7d298fc5991e2db51883ab7ca37"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/pt-BR/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/pt-BR/firefox-105.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "373af13073e4652c98b0d5f0bf0ad56dc8f64e7b90c536a0c951a004fd9e6696"; + sha256 = "c04bfd72fadd3b9bf4b3a067145a286914693f25959d4f4f561afb1fca217f99"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/pt-PT/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/pt-PT/firefox-105.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "3d145c2aee5341a3dc3442f7749bdb201be618fb5c31c22ef00d2a315d0eced9"; + sha256 = "49d56768aa5958340f8e257dec70fd491d56a544b9bc96b5161ad2d891afd387"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/rm/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/rm/firefox-105.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "c8c99d0e7389819817ef4d794330e1441662244603bbf801cd42daf25c2cb6c0"; + sha256 = "3609868864a146fd4778bde63e4a3bfec3d1ee23e144170c94eb2a015c87391c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/ro/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/ro/firefox-105.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "aba252578bea2e80f133f873d2e4ebbd307b26ae02c609da86e98feba6f2e47f"; + sha256 = "924bb2dc01902860808b54c68498b3d99fa1cb5e1c493c336b4613feebe448f5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/ru/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/ru/firefox-105.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "21900e3fd6d622d1c05cd2245fa685e12bf3be424f61cbbd30e781afaed6a29e"; + sha256 = "b47cd3c37c0b213c8649a4daa4b519daa3584a2684a05742ba62b8ffd8a58b12"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/sco/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/sco/firefox-105.0b9.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "97db95bdbf28748c3901cb05734bb3db0b11b010372309240f361515fae14fe3"; + sha256 = "f2ae256a94388c24e39d4cc9fc29a74e9232b070f5d446446c52db7cf6a067c8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/si/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/si/firefox-105.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "87dd101705962b873ba777ec8d363d0e9397df051424d0708133ea77b98fadbe"; + sha256 = "100f001ee0815a0eea54883441ff8f596e4ed0d2e8eadb4ebb54cf443b6b4f22"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/sk/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/sk/firefox-105.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "ed7337f9a71028c8d99b7c165e1c52806e06df3e0c3044af02e60becd04f7c66"; + sha256 = "ca345f4d57611dab1b671e05783049f11e759123503a395da9b52de883902ddb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/sl/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/sl/firefox-105.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "ae6f9c04a02bc618d26efde7f9b76857bff29acffa6f82d43776e93066ef9ea7"; + sha256 = "c6825d5da5ff7db6e276201bc5f895d4cd89efdb7ac19f2b904b62f932083e80"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/son/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/son/firefox-105.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "934608cedd43c3473024f711fd2419754aa326d2a210a7da410774fb13361d9f"; + sha256 = "c8416e68678ff8479f1aa693de9b26805dedec37f541eea28c434788be2036c1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/sq/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/sq/firefox-105.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "03d384c17887d09b3a43fdcb901ae5c1adcb64b1a9a6f99d6747afd7e9a1c24a"; + sha256 = "d6dbccbebe1309fc892cb0ba67c5a0261a91cd8f90084ab40461a36b899be017"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/sr/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/sr/firefox-105.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "5ad33b9402e664cf25a706bc8dcfd3440cbe792d6cc71cfcfeceeca13b50e00e"; + sha256 = "678aa8a40ac51886f06fc7ccc834af6637143a21d2bda8f100384df10a518e40"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/sv-SE/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/sv-SE/firefox-105.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "115fed66d7ee716c3d11f15c883a8aaff8d0a5ce06914462ff9bbfaccead8fe9"; + sha256 = "a48c48dd3ea6df061ba67941466e33972f12e6a7b1c274f0e50f5d336c1fcd44"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/szl/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/szl/firefox-105.0b9.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "2bdffdf500aa796ed0f6b6bec1497048014f33d5cb01ba508b9b430db9f9c7ac"; + sha256 = "f6571462487527f10be6f131981fca90270e48c3883b0b7415244495903b5114"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/ta/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/ta/firefox-105.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "beffb0eb6ccf06a65688df4b6d19766d9bcd4c74d966da29878ab9ef83e25002"; + sha256 = "6a3b6df39db96ab9dcd5c94322570e426a1fb94db8023edabcf045d63a7bb25d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/te/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/te/firefox-105.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "91f722acb621485b01ecbf55a2e06f43651ba263ed8d1a1808bf9d1f335c9fc0"; + sha256 = "921ce974f2e883529430de161857ed55452858dbaffdc251c107d29b93883820"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/th/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/th/firefox-105.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "a867fcdbb125a8cc8f1f02897653dcc2eacd3f72a9d09e86d40803884f4acafe"; + sha256 = "4848b32981b51bfc6c00ddbe5cb0a877d2d7f5fb037cfaaf8ace44fb5b4759c2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/tl/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/tl/firefox-105.0b9.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "337f90742745bde608f6678218d4ddaedfe6ab8922acf714426aa99211863c03"; + sha256 = "090d3b6e8cb63a6f1920de59cb5a6a4e5fe44ff00ca871952a37800bfbe774a4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/tr/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/tr/firefox-105.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "93f9c96e904cb24fe12b8dd497d3bb2e093c998863bb259be1e8bcfab87896f4"; + sha256 = "158eac8adcfbc7379ac2a10320347f3933f8b259b7ec65053d78c3339cd3c2aa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/trs/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/trs/firefox-105.0b9.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "e6e67dd5067f16bcd7b5b12a0008b72c2e190517de1c1486413f0bb16640d7fd"; + sha256 = "ce3ecb1e84c3dac41db95055fee99e8a3b246eba4e14e93f40e778b54b81be6a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/uk/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/uk/firefox-105.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "109aeeb507610fd8bbd653ed5848ded31311b997a22ced8c9dc31e0f9d0f9223"; + sha256 = "29c06e826e4047689e509e8c114d353ae5d7e24679bb99309397ba59e1a96d8f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/ur/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/ur/firefox-105.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "c5eede5051c2f7610bf1038d0e4f267f2a90e20a77c61baef466146e85e1a64f"; + sha256 = "1de2eb1fba3f3b988c348e2f1b0a71f1f879c02d53154fd7c05ce05c4d898776"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/uz/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/uz/firefox-105.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "f35b5dbe015aa06428e9af8732c018cd1e70517dcf768e62cc0eb8a1afe44820"; + sha256 = "d62efd4451a2f68eab196a5b420b48dd0a04b83b95f9847ab9af3ca01086336a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/vi/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/vi/firefox-105.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "37919b430d561957004d6ac7cd3d1221cdaead20a0fc8d3686991b31f3a85412"; + sha256 = "1ae78c21a4ea20d5a748a8543bbbdc47a0f7e331337dc7b723f6384b4c7d5f8d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/xh/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/xh/firefox-105.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "5e1e2d4d0254eb03b678038b1530c31aa17e04dace1b8239289cb8417655f9f5"; + sha256 = "fb55c502b18873399d4204b8a08594dee9c2b8c254fb05428ec78841e6640708"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/zh-CN/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/zh-CN/firefox-105.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "cada9ee5aee542fb5029aa63e6a4af74a668e6b13838f519194d9f39cea61c12"; + sha256 = "95059e4f6d8e6e919caa2ca4e0b9fe22de476ac7ae09042dab892ad2622e5f28"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-x86_64/zh-TW/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-x86_64/zh-TW/firefox-105.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "1d6a4fb24ea63c74a0da94c85a976f04abfa019142d638e7a9bc646d398dfba6"; + sha256 = "a457b8eb240a87e5ddb1de01dca15b67069146487d3f2486158cc9a607b06993"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/ach/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/ach/firefox-105.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "a2f7e8a0e3848828a3ed510af13e15c5210ac70874bc503d57104f1d16724ddd"; + sha256 = "077f539335d08473cdf09087ac0be3fb6d28fedfd05f80f0bb8343073b2f98a2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/af/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/af/firefox-105.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "5aa746b98ca4b33a51d49e54ac33869d8b724586961bcf6495f082432fdf94ee"; + sha256 = "b475413ef512a4f87b59a97eeeaf85eee1d0081fc766d968eda2d9d39f2d9075"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/an/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/an/firefox-105.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "9fa4b05cfd3ac618035c7df2b51bcf4a577dd07c108ea62141cccfe4731c9f35"; + sha256 = "cdced2ab00ebc4e83fb3401338fedb69488b0f532baf64af08b37e85a96cdfdc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/ar/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/ar/firefox-105.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "2c693e4fbe4ca432dbe03e06e0f703f24125ca38a6e963f1058c47931304ad86"; + sha256 = "d19069b61d91c148c4ee024081602e6ab488a46de03881064f6feb7e79e34c91"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/ast/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/ast/firefox-105.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "6a43fbf9c6005e9d35bfa3fc312a0bd3a88c0fa542231a03d670c99ff6548baa"; + sha256 = "dbcd4dc09b97ff5d7d31acc92873cebb3d3d8e6244a1a4844bc77ee8d51cb233"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/az/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/az/firefox-105.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "b9cead726243f90d5c8f6ad833b4dd2022995d7db069ec3e9a58cffdebb5c3e2"; + sha256 = "0d15881ed71fb93823455f8183059967f74a0a29fd2de8b881a4d97877d20a06"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/be/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/be/firefox-105.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "0b407632149bd7100737c73adf6a3d595d01bb175fcf80719b540bc466b34c15"; + sha256 = "b7adc44f4211f9f7b49f3c8499e3bc9a23717eafd7ab3b1d8d43beccf00d0b3f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/bg/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/bg/firefox-105.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "bf97dc547cd2538ac9582d361975d60b75fe0f6003941e5136dba52cabf3bd2b"; + sha256 = "8d343f5fa6cbe7c7981a6382afc465f3ef11e1f7d9897d2cb854d943c9e341e0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/bn/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/bn/firefox-105.0b9.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "5cb3c12b64823bbc517ab535b2db6cfce3b070b79700cfef4d06c3a427b27495"; + sha256 = "68b81e5551fa0d6895b8a51c3bbb77a3c0ad218e5b0017190492610fdeef0f15"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/br/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/br/firefox-105.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "682425ea3fe485d34fac300b9dbcd5ff77979fc9d12a0bb2bf1f287416d23d2b"; + sha256 = "90920303c8c5ca76653a6fc7c6a84aa225b462f4855cd4092326b198e770b7ac"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/bs/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/bs/firefox-105.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "bf8b139967fed32e6be5d4288305bcbf1b1c77bc759a564124cc7c0d3d8100e3"; + sha256 = "c5747cac58fad675afc2b5b162466091437c969f82ce4f52b7db78e835310ec3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/ca-valencia/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/ca-valencia/firefox-105.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "d271254652594cf73c5cc36f09ca807fbb4aca36e5aa74551844fcaae94c2381"; + sha256 = "2777de62d320f0c5979e76efcd2b725d39f1f6c4b2f4844198610c635d92f6c4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/ca/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/ca/firefox-105.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "497442365d89e42b3a24e328e94e3ee07e7f9b23b0c618c4528576a6581335fd"; + sha256 = "cd0202599bbd99279b4e5908357f3afc2790d8ab820d3edfe66f67fcc5319034"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/cak/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/cak/firefox-105.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "89f34815231e418aec4f68cbc03ba6951fbbe7d2165f7b7efdbddf63c3033264"; + sha256 = "ce85166af8e377bb1e1e3f47290e76f03ede0439fcbc5c1c3f2c56ed2e159268"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/cs/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/cs/firefox-105.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "7e32abaf3f6f5b7fad8f8a08182c3c24236210c3faae56231a0044ba8a27d85d"; + sha256 = "df60c8950e42f85bfe0e0e2d3f44f16a27bf6620e6db87e6064c32b3f3612157"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/cy/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/cy/firefox-105.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "d6b649f50dd992bfaf11beda5b00a86c28e8dd732ab502ba667764e25ac09f74"; + sha256 = "91ee79502bc40a621babbbcd8e391d3ba2435c16c6f5892257343fcbeab94e67"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/da/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/da/firefox-105.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "5459c4aabe9b90932574528d061bb0eb9a0413841d3d14b9d526d258c7ccfce0"; + sha256 = "a06628c8527c3c016c1482c703a489e40efa5365f6abce317b87c1e8cb2969f3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/de/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/de/firefox-105.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "baa6c20b93b0ab77ab126eeb34a53a72cbcec76c77e6d041a477a4fbe7c942cf"; + sha256 = "7398689b2c80284b209a5ff3ef2883a7b404affa30853df04eae8ea02ae4b6fc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/dsb/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/dsb/firefox-105.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "05ec702144102b1f675ff9139d523cec8ce3cb9fcd733d73e7e79376091414ea"; + sha256 = "0d77345729eab32e8a9b7760e3049d294e40f550b5fa6a113659b8e9d9984994"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/el/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/el/firefox-105.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "73d97a30d7f47e8a9946fd3d242e87e98501e37af522d25bd56bf39122dd007a"; + sha256 = "ad33aa612923a25cdc1a33b4fc02b9463b721c68aa5645a227872c3bfdaa2af2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/en-CA/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/en-CA/firefox-105.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "c8f1af4787b1c73c0cbaa56b8faafbd78e592732ad7d3799c4530e0a90912db2"; + sha256 = "0645424a50d40b2704c919c33c0ebbbedc69b94f2aa6383bf8ddb8228fffc606"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/en-GB/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/en-GB/firefox-105.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "f20cdd02d0f73d36473a796878407518260a917ec6634c8dabaf54014f1a9852"; + sha256 = "fdcfa1be0a73bb51277b0d4fafcf0bac2b86a2ec7376462fe6204f601ace2c2d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/en-US/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/en-US/firefox-105.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "cd508890eaff2b3e4d2c5e37cff778d2e11138ba374665ab01fb243bf3aaa328"; + sha256 = "aefcb690a14c83fd280be3cc7450812cc8f0c443a8a0d0e9b3eaa2228a836327"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/eo/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/eo/firefox-105.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "eab4e8e697f41d11b6aeb8379731e8ccf834e95757d133c92067d8c78bf3697e"; + sha256 = "f7fae825f565fe70858ad9a9eb735133abf9cc9b352ad04ef8ae116c2d3a615e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/es-AR/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/es-AR/firefox-105.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "c983374044ae5b28826f37703f3d60abfbc25008d7fc74153fd04c6343db2d87"; + sha256 = "99c2c2d151999628b095d36badb6f05b293bc5f92244ffbd393769e6cbb9d51d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/es-CL/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/es-CL/firefox-105.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "2b976c15006af15910e008eea6377f5825973f018be7b908281d324b848d4bb3"; + sha256 = "92f0b699e3f967e2e185d36dd68ee24fb56671db3ee646da99ccf86e789f63fc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/es-ES/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/es-ES/firefox-105.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "00d09aa82eaca9f0c01860df1ebbf8a5a8663ae86b69e21317f766a4f0bb03a6"; + sha256 = "3bfdd754036b68c8d36ed7c4f5b1cec9979884b809bfa237cc7b31fe272db62d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/es-MX/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/es-MX/firefox-105.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "3bb47f8e19f8df778a530dffde2adc35ada2a1d60d74e28c69be8e0e8cab5e2d"; + sha256 = "121031b3e733b98e73f935e9a046f1addae7557906b6f7f235c6412be87ecd02"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/et/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/et/firefox-105.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "e676f2c1f9af6f5077a32de2b37b1c17c3a7e0d18f61a62a0f7bb6ad9cb79b84"; + sha256 = "10ade3ab5d155a283021c16e616c562e49b4c0b8c68be38e2a4a96b19655913d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/eu/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/eu/firefox-105.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "2a7b3b21fcdbec93587e8f7085485967c850ff46c6a951b9ebc40057ad435b61"; + sha256 = "a822481a3a1907f5c1a7b238b65ad8b64466fb058c8562396fb1d7d93d9752c5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/fa/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/fa/firefox-105.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "55cf1be2f8ec26d677a46ea5f5c944006be36430882a4f3312e484bbf6e2faae"; + sha256 = "a2014b52559d5544939c96f7e8101e650b915d68d99adeaaba7fcac3c7dd2c41"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/ff/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/ff/firefox-105.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "8d77b6a35ac85de269002bbb9599b7ff49b0f1beb1c4cd40818ddc86f2ec7366"; + sha256 = "b7effc3a0453783d8e6f8b03c378d40a678608a056671d79a2d8edcd8040d904"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/fi/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/fi/firefox-105.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "36d9c6adf9afa99c8d53b15a3c01ce3f50a1d34b72d99286dbfea289c3675887"; + sha256 = "32516b04d66d173c15ba5406775df99f063faf5561e678936ab00d66c97995b3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/fr/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/fr/firefox-105.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "35fa4217954a9ce2a9f37fc16e2b46151c81487cf3bed3e34940a3a4a96920a0"; + sha256 = "db9aa0b522c86136e0e470e91c4dec26726bfa2e3c89297a69e913295559cfe0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/fy-NL/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/fy-NL/firefox-105.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "1318cdb9a9e59e4644c72dcbbbfb9fb9188b31cd40bf1e8eebf9e4c1cbf49322"; + sha256 = "b5dc0b045b015692d8f58f44d19993801b73ce769d852ee4fcc50a15912c95c0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/ga-IE/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/ga-IE/firefox-105.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "31bee4fc77fe4d2d4bc54fcf650820dd1775f529c1a0be6780b5348961d30621"; + sha256 = "18a1d3075a4276c1fefc0363f983f1009cb1a13ac466c90adfcf3407dcc5a809"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/gd/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/gd/firefox-105.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "d45f87a654e9ff0d626817cb0c6332203523885d27fb20aefa1f1fea6a8a9a5b"; + sha256 = "b3c3c29b4d27cfaecbdbbedec4f7535db7a16c20d7fb02bcab56102ce4cecba5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/gl/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/gl/firefox-105.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "696fa24a4481a8e96e4efb79708141968cacfd6dc289f53481ddea81d2248f56"; + sha256 = "25c17bc45ff4d30b81144fd216238a81a22efab4616b805c7912f72a3471af7b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/gn/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/gn/firefox-105.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "ad307064e2e702a11d47cbcd3a2f55ceb8a5064ee359acb37c10c9ecbba6efdd"; + sha256 = "80f270b6bd7fba7c1591b83855715e7218978f1059ed63c76042429540b5e96b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/gu-IN/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/gu-IN/firefox-105.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "6921cd481e8ca808a18d75789e54b18c0b095a345d08bcfe219e5c67b5d24ae3"; + sha256 = "20db10717bf46223c6da7febd93ad0eec0cfe4f0bab3141509fe3a35d3b85ce5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/he/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/he/firefox-105.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "8008601d3162cd2a7cbda4d7bb8e2cdd5b524f3425dfcebca9f92193ad4b4e0f"; + sha256 = "523708bd975ea3d3a3f84230e725f85b1a5dfc4efc0af29f5857052a0cb0c692"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/hi-IN/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/hi-IN/firefox-105.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "262e4564e5b7a37335fb0b38bb00c54974d49dc86104fe7cd473ad3734f85b7e"; + sha256 = "163baa66e71dd58f321eabb53e04ad0841a9bde958974d0c10c68df93e85b2af"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/hr/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/hr/firefox-105.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "35f38bfb4d10e6f133e6ab6eb32a2ff7e8f7ca6569928d51206da5f9cca49c4c"; + sha256 = "52faed68c572de7d17068398df7ae3781a3e1fa01cb43b4feefa583d962ede3e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/hsb/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/hsb/firefox-105.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "fc258e8bc246772424c6cde450b26f9f920e5501f393955eec0b37017cbd7fd2"; + sha256 = "9785eaefbc0f25cff559c99f387169a1ca45398436f67d8c4d7e10e1b6db9d1b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/hu/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/hu/firefox-105.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "0531dfc535700f9cb4078c21b3188e1dfb54c4d53b6a2105611af833614cb4c8"; + sha256 = "5be0655faac91e6b891cf8cc38e798c6ce182dc591a8f0fa9263a37bc482fc3c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/hy-AM/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/hy-AM/firefox-105.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "1d30d63d45745891945dc091265d076677da43515844d9379f67201938660ee0"; + sha256 = "58151ed4a63d10a527945a7851f0dd5d341f1cb615e7fd2611cba6d949261bce"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/ia/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/ia/firefox-105.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "787095ca8863b370060b36775bb0f60727d0678105d948b26e1bc6417b23e45e"; + sha256 = "3419edb87595c744b8890f0f458ebe7dd881b2a3545c1fa6ef4716f20e6ddaad"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/id/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/id/firefox-105.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "43ebdc78511195ab8eabc0bf60ddc61c2ac8834793ef3d9293ca0d928ebc6000"; + sha256 = "95735d6865e13f1e868e9fa582dd86bda1715be06a80534a72cb6d255728f78a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/is/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/is/firefox-105.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "88ba10f1e07605f23a7144bd2dc93c78c3a002cd7f5b66ad0fd0548b3fee3e75"; + sha256 = "942bb818eb8922d9f86eda1f1347699437b161e63ab2ca54d43971701581c1fb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/it/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/it/firefox-105.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "a934d08a697f1a309ac34edb08314a134c24f242cb9dc26cef5d4d017afea043"; + sha256 = "7a30e107554b6d4d5438d21d3df7e53327a8fa0f001399c89ccc534f686959ff"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/ja/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/ja/firefox-105.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "8e14b8ddeedc9e7d08d6b90c40877c670870be834a084f91a282dfdd281d4a94"; + sha256 = "bfdf4acf3c3606b61a6f02d286400ffd56ce672e2f5a6aad9212d5fcd2742fa5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/ka/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/ka/firefox-105.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "6f7a1151d112f8173cc9479e7ab68abf5d36b819c3f9f827737b6185e68c5e37"; + sha256 = "bd37a60fa36a0687ca1a97d431382ecb10aee1100e7a589e418884d1ed4cd5a8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/kab/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/kab/firefox-105.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "1c4252f04cdb7b96596a5895b12bcbe88718a0302648fb2703ab47846c4620fc"; + sha256 = "ac6df8191c7376fd03cc96209665cce4862086b249a824a39e10f34668121480"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/kk/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/kk/firefox-105.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "db2acaefbeba6a983367c4e58107e1b599920d8b4b04078f631295b6806fba84"; + sha256 = "a84d03efe81e44275f91a20c0bc369dee296deac1bb7a6173657d56a4b71a460"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/km/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/km/firefox-105.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "30a57951732fd40f4fbbb79621a983bba0905b2369fb4758eebb10c7cbc2efc2"; + sha256 = "d84c74e09bcb6d9dff3ae550d0dc09172d4318dfe88e466d1f80f53f020b91e7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/kn/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/kn/firefox-105.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "9ec40c1a7cdbcb222d4bf9ab33b5dd7c605d71731da83dd3b714e1b1330c96cb"; + sha256 = "c4ec29e2057c0cfac9154b40bc918f49c77025f202ec5cde9943dae36dc100b1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/ko/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/ko/firefox-105.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "3135cabd301635ec831225b0c6529e03850cbfc4e33cbee6918ff2ae993e8b77"; + sha256 = "ee54595d77e5d7a036ea6d768917c82e1b72d5fcfc51aa250b9ceee705a196a3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/lij/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/lij/firefox-105.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "e83ea8a205d4ae071d86eb35c161ca6325090438fd25722399b39d789fb167fa"; + sha256 = "79181c3212f137b020a662b36c161f926e3c41f025497257ad0477cf22eb9872"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/lt/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/lt/firefox-105.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "14099fadcca1da120520a66aeac0393be3d5f0540d7ae160637b5fdfccedd7a2"; + sha256 = "00e7057b34c272396d3b3f1cd72213acd460c798ab9ac17bb035ceb6cf2f5afb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/lv/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/lv/firefox-105.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "9fc56d60a0a8d3564c09a080e643c6491903375382fcc654e687b49c6693f42b"; + sha256 = "35b759cc6cf1ca411e3be03eaa189c1e4f37bb766e91563b8f87c8eb5c7abdcd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/mk/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/mk/firefox-105.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "6b5dbf714e0abfd4090c561404c51dfecc99b51829dd783d6ea780441cda904a"; + sha256 = "178c7452297fa99eb7f487250444c711849f7baf8973221ccc9255a1ee9d6402"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/mr/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/mr/firefox-105.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "79876e4150eb622a9e569df9601ce7d6da3fab6e76d47422b1a434742fb0f369"; + sha256 = "67f3e0eb39497e4ab1e05f2a64c27701730e49ccf9376f0e20915126457797cc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/ms/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/ms/firefox-105.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "afa057f21cfdff7ab671267e29e1744e0cf06e59ec2b328b2544a014b5c88d05"; + sha256 = "851f4455e3e3d2588fbf2170df9dd740b4f18540b0a6ca18ae219d6f1b912a5a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/my/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/my/firefox-105.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "c3aafe8cb3914105e10765846488604598e0190d49099c4863d16a5417356d36"; + sha256 = "a93ac7cdde56c1a75a80dea32846591ce0f80d409ef5d2794b6fb6cdad0d6255"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/nb-NO/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/nb-NO/firefox-105.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "c709bbf8932a43432f6fd39ed19c68ec25b1219ebdecaa440cb8fa4cc76478ac"; + sha256 = "27e2f6d7051d77e4f4cdde55e4b77c5b6b14aaea43a88e20026884e75febe3de"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/ne-NP/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/ne-NP/firefox-105.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "3e37642d18b297612da0d1629c5df03345dff8d7fa9f38ddec1586444968268f"; + sha256 = "856f82d7a84a7dd4c50cb2b239210fe1fa06a2bd2509640305b4528f27d318c3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/nl/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/nl/firefox-105.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "31f9129bb427e9a63c005b5fe25b9ec4814d5ba6a21923f2ce0172064c20139a"; + sha256 = "004cb6370433a1c146d90ed2b4f5fc685a53585bac520f60473c145a6c7c014e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/nn-NO/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/nn-NO/firefox-105.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "b87aff06a8040d3508b0ea7aec139c2b2d16720399b8b0f9b9987ab8d2733706"; + sha256 = "5a898859bb5c3c2630213883c818a9078a30e843d79ac0005984df8e406068cd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/oc/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/oc/firefox-105.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "881a947a26b907f747248bf81eabc1298dc0c9f5913751bea0fa3afc8bd072a7"; + sha256 = "d5f9e2894aaa00dfeb0b87031fbb366d790a652ef1d89ef3bf0e450abb77a42d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/pa-IN/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/pa-IN/firefox-105.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "37694990ac36aef8207ef66cca1c757f38a40ea5660799544a4f381308f772bf"; + sha256 = "575d5c415aa9750f2bff121a39595e1a10164d098597c3a4d87d2fc7f26e855f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/pl/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/pl/firefox-105.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "5629e4f6d8f12f7d98db3b06cfdd69a937bdf8ce555cad9ab197da8a85e0c14d"; + sha256 = "4df2c428595923a73cc540e1e5bada6e785f7cf0a511c88f165e4ae60325df78"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/pt-BR/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/pt-BR/firefox-105.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "292929f4526a8dd23f40e676ac761d58854412108e553bcf7a66758959dcbc1b"; + sha256 = "76d3cfcbba8bb94f1ae8a9e7632032d313d2f9c766310fa528128347c597fb57"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/pt-PT/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/pt-PT/firefox-105.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "a334545a7fe60a2dd31fc37895efb596ab0f8e1d50283766bb0ee0071a023b3b"; + sha256 = "b0575a86bb28ad8a8d313167aaa199caf95f0a74cd9424adc64096fe8dba3d38"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/rm/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/rm/firefox-105.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "fcbea8590253f884b2c825638ee5db715906b3fb0d2af068e9871e2ab2fa2028"; + sha256 = "bf5e9b966bc54be129ffc7f5c8155eda28aa4b89726ae62255b2981d281eafe9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/ro/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/ro/firefox-105.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "a2fe0ce1eae6fd5ccf430f2f27e26fe243192fc8b3bb06ce594f9b7137d8da06"; + sha256 = "604a23fdc0699918dd013851a588e90801d1c7a3fcb94f5983dee5fdd3851201"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/ru/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/ru/firefox-105.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "0545c86d65800a197d260c901dd9adbe5c4314a92de3d6585d28bfa7424b961a"; + sha256 = "3794ddca37f69efbd26c808f28b558a44f5def86bfbc0c5023ee58409b08a07b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/sco/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/sco/firefox-105.0b9.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "3088a34a74231eefc0211f74970c25c09a065e714475ead7530d4169449defc1"; + sha256 = "814ed63cfaa58b186472704bb69d5561f5d75a9a83b854672b7808c7e15e3dd3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/si/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/si/firefox-105.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "176375a83ab1be2f151ddb6fae353c799edf2b113feaf414068f092f5eff6d43"; + sha256 = "58c552417b36a5769680c8ea31c0525855c16eb7789c8318066526a6297ef207"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/sk/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/sk/firefox-105.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "1f77696dc438d781ca97cfa80cbd973bba504637ddc3a191b4170302e423f364"; + sha256 = "21cd5e16eb498ed6bdea3cd41adf1ed3155f87ea9c33bd2e3cec31c53c67d494"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/sl/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/sl/firefox-105.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "c4177e0f975834d06f4c9274d77bbff52e1ed69c37d59c30441d39aeb906eef1"; + sha256 = "6cb2d2644c374f61afe790768b03693f4d041644a7368150a991cd0fb2ab52ab"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/son/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/son/firefox-105.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "44ff8d9c65de4f4d3b5b680cba96714cd628bd91344e51bd608a497699b0278e"; + sha256 = "f54b3097d68d4639d4648ae5e10908d65fb5273f06c5a29302fc41a82fede683"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/sq/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/sq/firefox-105.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "425144d84ed4de63af3a55237be87e189c1a92ba337dd836ce039d151bbe2787"; + sha256 = "94c7b240be6fc90629675956c555fb8f830a8f21b4797bf560b5803baa023500"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/sr/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/sr/firefox-105.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "084791fddf4941105966715019f015f236f44be2a50611934d8a16fe9188c2b7"; + sha256 = "0d53baf330168accb3baf8213ce658fccd123449be2122c29babfaf0d68a520c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/sv-SE/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/sv-SE/firefox-105.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "f0acc7ff6bc0fec65810a9dc6361c9e1722690c6785c294405f8fae30732e372"; + sha256 = "965b92624b9a60f1aeec899c2558243bd5cef73a21941b285cff653472707996"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/szl/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/szl/firefox-105.0b9.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "5930bc5b76e923a57818b22baafd4ea5834d2b6023cfe652d3347db2d10a57d6"; + sha256 = "ac5ca00d0644bd545b28cc4b0b3ec94481ef3ae1c894dc107b579b3e6df20139"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/ta/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/ta/firefox-105.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "62d4cf46230a5cce86a4aa1d4291f9b926e77f42833d61dd13006c32990378a6"; + sha256 = "d62359bdcf776f6b589c30021dedc16a304652c8656814ef6e03bbe1093a34ea"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/te/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/te/firefox-105.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "1c7038c601f97bfabbd0042b87c45f83f521a79a8de220c68e81529bf2b9bfd6"; + sha256 = "1ff6dc680ff913a454f1a4530a070a28bed872f254090ffed30fc633da7c0428"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/th/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/th/firefox-105.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "be6127c6ccd2b9059a74924712d343f2d516cbab7f657510d7db093eb3a6ef09"; + sha256 = "73978861cd35ff8348cfbfb194df588dacb4e4bc4c90710a22eab1f534d5de7e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/tl/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/tl/firefox-105.0b9.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "3ea16c0492259bf92411a9f36f4de158b855a3b2e6a1f17e1f83b35823b355fc"; + sha256 = "b5fa8cd13d050ae8b834e45144033afb26967399986814411081c6fec47e1c34"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/tr/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/tr/firefox-105.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "c941241f543bb715e2d4e6b5702fbefdbd366ec65bd78fab33271aae9a8d0754"; + sha256 = "f502a2dd9338020178cd7e6d88a51df5486cc4fa760b612ea01d6d9750ce4a8f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/trs/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/trs/firefox-105.0b9.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "ff9f3ba492eadb4ec0d5da885eeb5a01138eb8edab94c6fc52302635675ef91b"; + sha256 = "baa2ac9fa3f4d41b31e82d66f1ff5d651170d77b99b05bf475a5c297a89570ba"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/uk/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/uk/firefox-105.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "1d969e756dec62b43c39acb3f9f3dc08d2f54b8c2427ee7397c987199806ffc5"; + sha256 = "d2ecdabafacd4abad6809457e76975637717e6a832cd0c9bb2b871e9ed5712af"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/ur/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/ur/firefox-105.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "08d78f19dbcdb382e7bc2c97f1ad8be9b251756d285bd091872c6659c459e6b3"; + sha256 = "c50bc8f450767960fc444deaccf0cfc63bd34b7c3d532be605e9a82e7eb05e32"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/uz/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/uz/firefox-105.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "ecf37ec50b90c146c3325fc79eaec6468e79d2abd3c2b39e5395c31d1bff4a4a"; + sha256 = "bbb6e86693afdd573aac40d2b0664b8e2699567aeeee32c71aca05c90fd0aa67"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/vi/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/vi/firefox-105.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "9564e9bedd47a03e37de3aca042cd1f76725b014e22d66ad22f478b801ed2306"; + sha256 = "c69e88577023555cddf20c62df9c9836452c5ddd930ea9fed00b629e3be85263"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/xh/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/xh/firefox-105.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "25864ec3def2d389be9e40e1ed4c482d0cceaa9021577cf5028853a61423f8ff"; + sha256 = "7f2ecbcb64141eafc7f1d8cc62c93387b8cf4fd19a83d77c207dde63c51b8757"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/zh-CN/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/zh-CN/firefox-105.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "4ba390d58f3380ea89b7a7caf493b246ea4c1568f67da56f2950c33eb879026e"; + sha256 = "b864b41d58db6d57c36cf8e57b283a33e91cb398a771591cdab729001c82257d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b7/linux-i686/zh-TW/firefox-105.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/105.0b9/linux-i686/zh-TW/firefox-105.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "e0f5a12bd06bbd3cfc68642dd3d780b2999a7afe4fb0a887e722315eb0f0b7a1"; + sha256 = "342aaca830e468d1373668895e15f31721b740a147e924e7eb5b1f401fffc4a9"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix index 30ae4f468f..75effcdc8f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "glooctl"; - version = "1.12.11"; + version = "1.12.12"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-vG1FSBHXaJBJk9dC61yZK1Vkr8PyQ7Q4TVZWRIsDY3E="; + hash = "sha256-aQUN1T6AH1TRj2pPkNFoS5Fmo3NPmmiEXFZfFeXtN1w="; }; subPackages = [ "projects/gloo/cli/cmd" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubespy/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubespy/default.nix index 5a9b1c463c..0ed978a4a5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubespy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubespy/default.nix @@ -13,15 +13,18 @@ buildGoModule rec { vendorSha256 = "sha256-HmMh5jrRGs4rtN9GLddS9IwITyvVmOrL5TShhQeyxKU="; + nativeBuildInputs = [ installShellFiles ]; + doCheck = false; - # TODO: enable after https://github.com/pulumi/kubespy/issues/72 is addressed. - # postInstall = '' - # for shell in bash zsh; do - # $out/bin/kubespy completion $shell > kubespy.$shell - # installShellCompletion kubespy.$shell - # done - # ''; + ldflags = [ "-X" "github.com/pulumi/kubespy/version.Version=${version}" ]; + + postInstall = '' + for shell in bash fish zsh; do + $out/bin/kubespy completion $shell > kubespy.$shell + installShellCompletion kubespy.$shell + done + ''; meta = with lib; { description = "A tool to observe Kubernetes resources in real time"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix index 60411f4d91..42a35e5c7f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "node-problem-detector"; - version = "0.8.11"; + version = "0.8.12"; src = fetchFromGitHub { owner = "kubernetes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dkOkHsQ1ZfB5rSFuFRlrKf605EIo/7IkyyYz3ZhMggQ="; + sha256 = "sha256-FLOkGeGl2tpLCyJxiGubzo+d2fieF/aNfhNJ2nzOtfw="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/pinniped/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/pinniped/default.nix new file mode 100644 index 0000000000..9ee8109a94 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/pinniped/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec{ + pname = "pinniped"; + version = "0.17.0"; + + src = fetchFromGitHub { + owner = "vmware-tanzu"; + repo = "pinniped"; + rev = "v${version}"; + sha256 = "sha256-0h7zyKe2gmC1n9EB5FRVI/io7Yj+91ZAtLy+1u3gyO0="; + }; + + subPackages = "cmd/pinniped"; + + vendorSha256 = "sha256-8ohyyciL1ORYOxPu64W0jXASTv+vVZR8StutzbF9N4Y="; + + meta = with lib; { + description = "Tool to securely log in to your Kubernetes clusters"; + homepage = "https://pinniped.dev/"; + license = licenses.asl20; + maintainers = with maintainers; [ bpaulin ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix index 030836b1b0..13b326b067 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.3.25"; + version = "3.3.26"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-kfpri6AFNb9GcAIDVhFV1uSDSNNSopReWRKuvWifcTU="; + hash = "sha256-5THgUOQv9gPUh9emWiBs/tSNsOX4ZVh+jvKEpWsy05w="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix index 7e2f242257..d7c3de7267 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { pname = "coyim"; - version = "0.3.11"; + version = "0.4"; goPackagePath = "github.com/coyim/coyim"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "coyim"; repo = "coyim"; rev = "v${version}"; - sha256 = "1g8nf56j17rdhhj7pv3ha1rb2mfc0mdvyzl35pgcki08w7iw08j3"; + sha256 = "sha256-dpTU5Tx1pfUGZMt9QNEYDytgArhhvEvh1Yvj6IAjgeI="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; @@ -23,6 +23,5 @@ buildGoPackage rec { homepage = "https://coy.im/"; license = licenses.gpl3; platforms = platforms.linux; - broken = true; #fails to build with go >= 1.16 }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix index 91e38aae5c..f8a10e48f5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -3,7 +3,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.19"; ptb = "0.0.29"; - canary = "0.0.138"; + canary = "0.0.139"; } else { stable = "0.0.264"; ptb = "0.0.59"; @@ -22,7 +22,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "sha256-NojoHrrgdvLiMgWYPClXzWjWXuvHz7urhyHzMnZwvBY="; + sha256 = "sha256-/PfO0TWRxMrK+V1XkYmdaXQ6SfyJNBFETaR9oV90itI="; }; }; aarch64-darwin = { @@ -53,7 +53,7 @@ let downloadPage = "https://discordapp.com/download"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ MP2E devins2518 ]; + maintainers = with maintainers; [ MP2E devins2518 artturin infinidoge ]; platforms = [ "x86_64-linux" "x86_64-darwin" ] ++ lib.optionals (branch != "stable") [ "aarch64-darwin" ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal-next/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal-next/default.nix index e273127559..f1b8b0a9e9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal-next/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal-next/default.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { pname = "fractal-next"; - version = "unstable-2022-07-21"; + version = "unstable-2022-09-09"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "fractal"; - rev = "d076bd24419ac6172c2c1a7cc023a5dca938ef07"; - hash = "sha256-2bS6PZuMbR/VgSpMD31sQR4ZkhWNu1CLSl6MX0f/m5A="; + rev = "5f0a4b48a745ccce202d14e7d02e14f51598fb42"; + hash = "sha256-7s2ytHpM5pZ0dhnVMA8KDWIBaSWds7t9GB6Wav+0dQA="; }; cargoDeps = rustPlatform.fetchCargoTarball { 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 0181bdb6a2..3b944b91d0 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 = "102.2.1"; + version = "102.2.2"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/af/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/af/thunderbird-102.2.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "d38c09e55cf1438269d80461672a615c155e975d65c8c35f5879f4236702c9eb"; + sha256 = "81f0274a9358a25a70589923a114d92452f2f693490e93ebdf65efa955c6e36a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/ar/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/ar/thunderbird-102.2.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "881eb9bafcea2646ab0830cc5a7d3ed2979b0e745ddb7a018336ed7b8382e491"; + sha256 = "27ebc77615606d1b7c3c2a2d5f9a3b1cf5343c7f17fa127467a410c02336780e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/ast/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/ast/thunderbird-102.2.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "17cba24fa82d4b3a16be5d44ea9be4b7bb1aff4b206841d5eb169815951a9f7f"; + sha256 = "05cf9d371640de3421c42ea464f6de6bdb1bc4eaff6ee43bbcff82513d034776"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/be/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/be/thunderbird-102.2.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "271b5d606fc489918cec8d8d316f0b8cf295a296b95a1dd458dd0b7f68fe148b"; + sha256 = "9c85da8f62f1300462c2bad9d19988c17ef7cc1bf093703b3c8d695c1049b832"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/bg/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/bg/thunderbird-102.2.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "1e68a8cd66f72712f74bc3735af6c0016256ebfe1c7c2e820624268ed8837350"; + sha256 = "3235edcae2382d6198fa66ac2c03f4e01fbf0890c7dc944921abfadb38e8303d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/br/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/br/thunderbird-102.2.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "82ab077f9a5f43875c6c82ad7d0e17f9c0b893e0bf307574fa8506e3220c8604"; + sha256 = "0c690d54d04b585f106d2ebf47aec2643ef730dff513ee3ef20d7d5ce884bfce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/ca/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/ca/thunderbird-102.2.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "2ed8291572dbfaee211f5b9fdb97d4faa591f853815d9eaa43b704270551b02e"; + sha256 = "814820aada02f77ac7f7bbf46488269b12f4112bd0d27820ec4cfbe9b07195e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/cak/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/cak/thunderbird-102.2.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "a5e472616951c799e6dbbdfedc3e8ba497812b027ab22c909166c3e452a29d74"; + sha256 = "12bfe570291becd5aa074be7dacba8f6b01068d9046e0c35aa0016cd7487b198"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/cs/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/cs/thunderbird-102.2.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "1d3d1e0355275152050a0c5d32fc0b0f6b53f336d02837ca7653416888e271b5"; + sha256 = "dbabd84e1380447fdd7435362fcdc0daf60af718693381336195d31790cd2331"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/cy/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/cy/thunderbird-102.2.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "4b2f3cc7e1e81abdc52969cd08cd3586e14ea2ff574c8c3b334109dab00ccd64"; + sha256 = "2817bb295ea0f6d180dcdaed2e5152b1e89e25eb9d12eaebae6f5d74b7e9c06a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/da/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/da/thunderbird-102.2.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "89613187e078a6f341ad8799cb4980cca770b2a0ccb0969740f53e5e7073f00b"; + sha256 = "de91ba53ab1a416c5326611930c4b8031e9f7038791164e08ec9079ae49a6111"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/de/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/de/thunderbird-102.2.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "4b7a030cb532a94a6eb3cc1343144bb90abcb7b2fcd3df81dc126b831d0a2740"; + sha256 = "547576de35e0e7950d0d1150167e4bba6d7802abe498c97324fd3856a0d0eb51"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/dsb/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/dsb/thunderbird-102.2.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "e1d05cac1f513ba573239dd677da6edb94cda9badef57b168f498b5bc218a3ee"; + sha256 = "e64baa142d019eacf84ed9a30ca9490a7aa34cc647774f4b4be4eb9e852875da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/el/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/el/thunderbird-102.2.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "d63891c05b56970021fdc455fe67d2d6f27233670e436b52522cfd012c503c74"; + sha256 = "e04c18427b47eda0583e62ec88a07bcba8b625d47762e355bbba0b5dd81807fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/en-CA/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/en-CA/thunderbird-102.2.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "34c81ec572000433e356ec5f13dbe461ca788b19ca0af9fc34ab50d7feda9cd1"; + sha256 = "cbb9ab2c74fa24e70be67defd94ea4777f7d4f45ba4e6f6074915dcb72756c43"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/en-GB/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/en-GB/thunderbird-102.2.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "2e9aeef97495ebe462a62cfd0d9966b66cdf0a0464a8d5d012cf3d430b4a28cb"; + sha256 = "8b86fa495e54a99ef5bba2d6f1b507138ac85a5425e88f2e568e82501337b679"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/en-US/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/en-US/thunderbird-102.2.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "92883c21319411096c355569c43b6cae2cbe7770c1814a9997ea7b9746431271"; + sha256 = "a406c23d5e7cc372d68cd5d08f3c86c611fcb63a9b78a944e3e1a048fcb6dbec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/es-AR/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/es-AR/thunderbird-102.2.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "51730734c71b67ffc865646453fec802e92852fd9ab7eb371d31d9c3e843f810"; + sha256 = "831b31ce85bb7668befc8eed476befad689805c1ca5b2393ff433a391e2069bb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/es-ES/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/es-ES/thunderbird-102.2.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "c61667e937b15fdb22e03b7875a474e422069800780df73529b6811cdb384824"; + sha256 = "5e942c3308489d73f3c2f3a923d5fd4e8712e0b10f5a9d4e785b743afb92ffdf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/es-MX/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/es-MX/thunderbird-102.2.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "7c5a404101f20fd9624c5402e8ba2c0699986739302de5739ad3304e2ea234f6"; + sha256 = "eb0ba009a05c402c215ca04bc32ca85e130fb26feb16d8f484dd5a6780f2d0ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/et/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/et/thunderbird-102.2.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "5fb2498c2a7e1a76512ace5421bfff47a1ef336cf95f671e85188dce7c8fea78"; + sha256 = "1020c72f7316ee97510b7f6d8cceea49753f3f00d33cf33f6246abb492eca0ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/eu/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/eu/thunderbird-102.2.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "0eb3f3ca7e23e950ebafbdb6d4f4200279cc8e18a042a91ad163eb83c939c704"; + sha256 = "2c95c74fdb3115d2ac41b5ddf5fba8da63fb0946b87d1bc77740298ca55c0b40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/fi/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/fi/thunderbird-102.2.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "ae76c531ac5b826593310b2b4b2e01d877dd246379a7ae8427f6039eb5dd581f"; + sha256 = "0407e22920c7830d9f4214a6e42cd85fbbeff2c2422c3c9c10d5ec7330f4795f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/fr/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/fr/thunderbird-102.2.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "3b344b3348487c393ea72012eb6fd82dd647e31cb1dd0c305dbe6aafa8438c53"; + sha256 = "8a3da1833d1088d87ef9a73e1dcdd875b0db5aa57bba659c7423e6a9052beb9d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/fy-NL/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/fy-NL/thunderbird-102.2.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "3143c39b7e3aac2d90e6d68e2d1f782a306fdabd69641a4aa31afd02b6cd172f"; + sha256 = "880e2585652b91265030345cb4bcf8aebbc5361a49d31edbe0a193b954df5214"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/ga-IE/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/ga-IE/thunderbird-102.2.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "db877b69e105c8d14b6ff420448712eafbaf6580a13fd415eb5112930a8633b8"; + sha256 = "e19acf7c7e3013cb39114615ad19dbc28d62b9b538d0cdffda44f50c4e105781"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/gd/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/gd/thunderbird-102.2.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "3025fcddde35315267b3f0cc9d57696c5462bbe6705fb26b7a1be1eb670ca984"; + sha256 = "c4ac7117cad296e84aece7868d8747f7d70b9a5a94f2a7b2c7eb4711790dc5c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/gl/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/gl/thunderbird-102.2.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "39469544764d5607d73d3ffc0eafbcd2117072b2af6dba1a4a7ab43c3af2eb75"; + sha256 = "b8a73f3349113154a2b330b44570138e0a715c0452058034ac33cdde1cd1d896"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/he/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/he/thunderbird-102.2.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "52c67f10bda950e12822207d41c6b425079d29f0d1d5654bb10b6e1d88751828"; + sha256 = "6a26ca35bec64b24d71d50e5c2bdf2139e442768a89153169d33ce8ba6b31d2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/hr/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/hr/thunderbird-102.2.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "e584a8f724d8e337743f9ad22e637089c5771c082091e221aad55b97541e0c16"; + sha256 = "3c2010dd691155bd1f3184870905994a58f70e7911b5ab51496cfe6ae89597e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/hsb/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/hsb/thunderbird-102.2.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "0304b06dd0f23ca59f85e34e3068cd9ac3275c815e2e2004358540b38cf058c9"; + sha256 = "6adb0e04a8a3c9104f343ad6365acd2889499fbca192b80ff86652636d09a3b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/hu/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/hu/thunderbird-102.2.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "ef155776003ddccfe863e920f31b45f673ef445c01556d69b6ed086561a74768"; + sha256 = "a46951b9a21b804685024ada9f386b6d81393bc66516affe2abf996d88835f40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/hy-AM/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/hy-AM/thunderbird-102.2.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "c65a335777b3cd9ab95b14007a9b6f10304b17c267388889a7f299ea61c44fbf"; + sha256 = "37f04ccbe1a0ab6a2e25118aaf50186e2555f186f0d8a1b3352caa9b6158ee18"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/id/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/id/thunderbird-102.2.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "a407cd50ed7b4fce63b2607632a82c4e9b853b76ba522a564aae219afd0034ed"; + sha256 = "9e754ea12d18fb9257712a95a93883685bc0afc3be1ebaec03d3aee5c2960efc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/is/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/is/thunderbird-102.2.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "6035248bcfde9fea269fa10ff3a87f035e3552b8cf76c10dfc86dd889cc7e958"; + sha256 = "c046d691e9a11b59ec8dcb325ed072a47e7e447e2abe06a8e52e280879d38386"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/it/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/it/thunderbird-102.2.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "afeef80077a18120cff1854d54067ccbc92b30f9c0e75b41067ec1e398340eb9"; + sha256 = "6d3e7bd4eaec2b8a88bebf883ade76be411a073f9c12ec0a9bb3c66cc9981e8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/ja/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/ja/thunderbird-102.2.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "1d98a3c50d1aff70bec9ae9335708a85cf4458fbe0ff49db45a57f4d29614de4"; + sha256 = "5400f7453a76a5c761b8c22b4f50d444bd8112c3afe3a43b0e6338cfda4fe56e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/ka/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/ka/thunderbird-102.2.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "5c749efe25f328be5f17ba2b2eeda41af0ce69f0f3e9cbc8bb55d58a3990d99a"; + sha256 = "840cc16f368ebc3e6aa357ce3b41bacbafdccb510729fae8f1b76fc1c5bfb621"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/kab/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/kab/thunderbird-102.2.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "93b93383e4bad3b4f930bcbc35d178639a50fd7a30eaac573bc74b895955ec5a"; + sha256 = "c67e24314357d8f2d1e857339c234dbb1813e1ba4df0e107d25f3aefefebcac2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/kk/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/kk/thunderbird-102.2.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "298e2c42888f29b90fdc6589b6336c5c2261a5331f5d52db89ee5b6618ec120f"; + sha256 = "5b23cacf902762ec8f90536e3f1cb951077d674495fbfa3764707197dc413d89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/ko/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/ko/thunderbird-102.2.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "75625d041a0193cfd8015174a1eaddd7315f3030258e58828df4b3521863bba8"; + sha256 = "1c236ec1fe62e2e7969a4821aaad80a143347a5b775ea8ebb75b51c08c2acc80"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/lt/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/lt/thunderbird-102.2.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "c5705caf0c71efb566a0d1828ec36e940940eeee23d37b9d66246abbb28114bc"; + sha256 = "ec59fae4f57313a4bb4ea9009369af1f12ad82e24f9013c8b34a73fc41762713"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/lv/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/lv/thunderbird-102.2.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "d26ea9198e8d5e9ae5f51fa2456181bd979694d7bc9bcab8f3a82c01233760d6"; + sha256 = "99828bf55cf13781efbaac4e0e99d42b669bd9be0f78302fd69efb6270dd225f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/ms/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/ms/thunderbird-102.2.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "6dca09cd5f9306d102bca42d01607b63e1219324d1107447a728bab8693aeb8b"; + sha256 = "f8f6c88e562650d9c19988ad9bb878fec1c79af5a163beff1693a203f79341c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/nb-NO/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/nb-NO/thunderbird-102.2.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "8d2a62dd4ccade7544ecfc6a4f88bd354f70089cf161f2fe92aeb9886e6f6411"; + sha256 = "cbdab2fcf1bfd0dcac3c1e0e988bce513d789f6bba8e1b7cc65db1cf997b36d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/nl/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/nl/thunderbird-102.2.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "b82895cfc2058be4b7818ea17521deb014a17659ddb57c093cbdc26ab3e7f7cb"; + sha256 = "d8b3e422b7aa8baf63f4f8b057c57aa824e5e0b9cf9588f0076567cc2ef70559"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/nn-NO/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/nn-NO/thunderbird-102.2.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "aea319db70387a2f075776fcf07b29e433ca16f898af70689d9cd4ed9d98d52f"; + sha256 = "7b5eff29d874d33f07ea5e38b51fe1d0c2451b9d07ee9eea164ace136e6c86c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/pa-IN/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/pa-IN/thunderbird-102.2.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "02c366563dd39f64ae11f9377c62434291aaedd951cea43e867a236dcd99dc2d"; + sha256 = "ddee5093d6caccfe6f8666efc4978194302beea23396c7884c18144b077934c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/pl/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/pl/thunderbird-102.2.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "5e2b8d486eacda9a8913e0ab60e2c4079d3fb89e827ca1fba871f2b6295c6cbc"; + sha256 = "ca14c3d7061aa0c0cc65651b21d10a83f375b730ca9d372095408e729d8e31dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/pt-BR/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/pt-BR/thunderbird-102.2.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "83339737a6ff360f1036a5b11b56f6d6648011f0c206a13da2b557aa85f4e2a0"; + sha256 = "0d4801320dd611ef12a858e0f1da9ba1077634d73c510c7660aebcfbec423ce7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/pt-PT/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/pt-PT/thunderbird-102.2.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "4950899b2da0a706f39767199ec412e9da2b670bf15c29153244c5eb3a317731"; + sha256 = "a54938d91562d0fcab6875395b58f18dcc51f22727a289ecdf402f1cdc48639e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/rm/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/rm/thunderbird-102.2.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "d9030e30196b03c341b1fd9078447d9baf7542a119617494ea73d11192f194e0"; + sha256 = "b9df55f6fb6268bc534e0a82636af2fbbb7e046b46c6134bd50abf37254671f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/ro/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/ro/thunderbird-102.2.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "d3be25f071698102abc71b50d71253326a9201ff9db3e7935afdd27d728985e1"; + sha256 = "6c2ce54a34d5a1a6e3e29431998955793dd49157db74679951f537f61fcbac74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/ru/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/ru/thunderbird-102.2.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "f9a520adaca32180b01f18fb9b8280145075248378a4a1fd273c9687733cbf42"; + sha256 = "fac401762dd4cd9ca5870064212fbf928d63751827446a6e5ea870fdbdde4aae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/sk/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/sk/thunderbird-102.2.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "4045843feb9303bc65612d1060f874d21fdf39c0abadc84c84af0017b1fcee32"; + sha256 = "928958768474f0fe3d081be979891ca54a162fc24d7e8e27930d9035d330ffaa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/sl/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/sl/thunderbird-102.2.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "d914ee5a953b4ec651e634d7c2b971987ccb2ebdd130dd3ee4ab3d0cae274f59"; + sha256 = "a34dddb780a858e61a665661d1e2384cf853b431229689d860fef3622c9d0e0f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/sq/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/sq/thunderbird-102.2.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "2fd3128af2a55cae9a8adc248afcc9497d602f0d36cb2cd7ff51aaca1b064487"; + sha256 = "fcae87e539cfa1b73ee78de3ca3d23a81d6b6cdaa81e22e819b07355b7112a2b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/sr/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/sr/thunderbird-102.2.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "2c5ffe0a8f4d431c37cb7f39fbd145937839425232aa72e173b88fa49628ded6"; + sha256 = "524da643994d056e0ecc1eb5d241eb4cc906e71fe0c821cec5eef78cadf695c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/sv-SE/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/sv-SE/thunderbird-102.2.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "e98429f73e6379ebfb2bf98f9396f86025e158543e664b2b219875964dae6e1c"; + sha256 = "40ad15ecddd5d936da810f470faba93157c0b453503a48a83f7e69d2f6f742c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/th/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/th/thunderbird-102.2.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "605a86e6be2eabd0ade653f93fe62e6ae47eb80951fa9c7ab9035d13bc22e52f"; + sha256 = "b08db7a7a5f15aa7d0257858942f861457941b27e2ae2d73f0c65876c8fa2b11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/tr/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/tr/thunderbird-102.2.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "51dfa4db80dd7596c24e6a0b67e1196d59b9083de63550862fccb6672535825a"; + sha256 = "126defec4dbab1cb25f23899542166628201ecc1d80ed566b99e427f1ce6e6cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/uk/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/uk/thunderbird-102.2.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "a6fcd5719501d801ed0e9f39ac100309945e567d535e6972791ca97c509131fd"; + sha256 = "5b9af3defc3547caba361e3ebd460a3682a09a1207bac5abee08b67cb530d710"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/uz/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/uz/thunderbird-102.2.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "e4666827e963fd2180babba2a117425cadff2bf47674e30225ec4f046cde1adf"; + sha256 = "af88cbbd45ae2c168c52d0d2f19d4940a4d448e4c3b68125eb359a2c6dbffb36"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/vi/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/vi/thunderbird-102.2.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "67cfdc9bb1753852250aeb523f2f91ec2fdfcab910ca1e38ac61e3922f281ee9"; + sha256 = "dd6071e000258aae9406e7750238c96101a5280989a68b955b4ad3129a62768a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/zh-CN/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/zh-CN/thunderbird-102.2.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "f2bcca607b71c567f0ba3414e668e033633f05fff7404a1cd321d165172a36b6"; + sha256 = "da9f27ff43aa88c9e394b75b246a27639ef51f95203e955d16d3075872b43c0e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/zh-TW/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/zh-TW/thunderbird-102.2.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "e827be51e3af98fd484bb82d387754e5375cb7a5749bd1b8d0401632172165ed"; + sha256 = "57006f7eb829e7a2e8f6323bd01276e065b98da51a5b40e9d52c5fe057afe224"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/af/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/af/thunderbird-102.2.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "42e10d674f9bc1220a1ae08f5c20551ceb9030700991681b32df137fb1fbbda6"; + sha256 = "45b8a62bfa3a1c4c0d33a9c6332c3db769d6262740fdf63523cdac6a73c877f1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/ar/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/ar/thunderbird-102.2.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "d5a6370d2e20fea976165cc0d84c13832b8ded075fefdc98f21e1ab530dc8624"; + sha256 = "aa0c2fa1e459e3c7089fc0ca35c0abd259deca9f1a2dbea9a788f41e9bb9d927"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/ast/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/ast/thunderbird-102.2.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "19f2ac39f04b47fb2789b0c0df8b9e0634062bcd3f117cf2cf776a39d701ec7e"; + sha256 = "7c6d00d2d4bc270159fe383001070192612c360b19307d3f30564b251740e8e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/be/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/be/thunderbird-102.2.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "4e007951f445b5c9daf36523535db459e869b50b732a8e82f64b3c0d898c512f"; + sha256 = "1834f3bff9a9e59a350c4da3fc9accc06e7948db4be13a888b5ffbf41bd3665f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/bg/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/bg/thunderbird-102.2.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "6430c82f5ebc4daa2fc099d54f0aacc1d680a4c603fe69fe117490d58d9c7af3"; + sha256 = "77e09e97aa320c88c952a99ccf1f81b64374ed96dc124268baf138e0c41b9f1a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/br/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/br/thunderbird-102.2.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "84568e1ec4284d1f81cf5f5627de0e19db7a32f57cb621210df27f61178961ea"; + sha256 = "256d12149eae5a9cd171f45b8fca86c69ab2161058921019d1decbb1c4931e60"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/ca/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/ca/thunderbird-102.2.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "496bd038e349d2480c7ca8c05f8ec9ccd93d0e17210cf1ffe8f65c470a2db5ad"; + sha256 = "e1311c92360ed218361341f61529b2c4abd6c90a8458fd95c9401db9d4103011"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/cak/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/cak/thunderbird-102.2.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "f1e811a5f1e821ecffb6d4d110f19fe55ef153992cbcf53980fd56c16552f663"; + sha256 = "34e6a9743bfbb88d6ddb00fc8343c4da5a7849dcc913ac1e9a17e44b35666da4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/cs/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/cs/thunderbird-102.2.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "6ff1add590d03bb49fab16ead5b549eb32c5767998ecc955c394163ef36d8554"; + sha256 = "c650dd57f13520963f59eb67931c6fa12c862515c31a505d026df0d5aef78342"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/cy/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/cy/thunderbird-102.2.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "6605ab434753eda8d9f67eb57d470616e9c3b202978d655738bdd4f478cbfd42"; + sha256 = "56511f4b9dfe2c4525c960a2031031881049adc8b4ef3daed9f8d12cf8dd81bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/da/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/da/thunderbird-102.2.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "7f60ac0c21c4894dbaacc43e74753e5dd29a768a31167eb3b0ad86c0333c247e"; + sha256 = "fde094d4ea03acafc9804964d14c4ffe091467f4bbc0871552344aadde758345"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/de/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/de/thunderbird-102.2.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "9d9ee8d7d92cbfa94732d915cfd4fd86278ff08225c4099d421f48527c5b279a"; + sha256 = "3ab1e257a58e01a107989a62854a407f9faf5ee4d1f6223221ad6fc9bd8a08ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/dsb/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/dsb/thunderbird-102.2.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "37c2ea9d16be51d4cbd9eff62d0a146681d52caa63e2407e1f0d8d422b7c62de"; + sha256 = "28fe086cad5e27a9baa68b28d9556914a385796d2420c2238f83f08c61efc982"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/el/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/el/thunderbird-102.2.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "e3804af2c4a34c8ec6679e7a06449d00416641d17f2d58d15e745b25cac4fb82"; + sha256 = "94eaf766fae60a5204a8fef9306db32a32ccd670bc77fecf8f062b6f6c12096a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/en-CA/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/en-CA/thunderbird-102.2.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "6d2dc53467776fc068935a1181c3ec7f6c2ab9c6387ff8c12b4f689b904e9430"; + sha256 = "01652e32486efe2a610a3649d93128ecbb4d83c2b88a9f635775e95600255d56"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/en-GB/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/en-GB/thunderbird-102.2.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "f0a2db3262832de3cf5edf4721327538af261a8eaae831337a1f1f732045f1a2"; + sha256 = "444a6814a90f982a9b515ae34831b0a421dc3543f50492219553d3c918f03913"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/en-US/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/en-US/thunderbird-102.2.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "04754457bbcd3b037c27cf5c1186ab1224fc01d3b1106c76ca21d26770ff28a1"; + sha256 = "66c7f533483337423fec636873278dc9d7af72acbee25cd4696b055006faae34"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/es-AR/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/es-AR/thunderbird-102.2.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "9fd407ef93b7c613709312350b5ba520f06c5b0d664e315ef671f85e5af50ac0"; + sha256 = "74b59f5777a884b281f64872ce268f5a096a571e5b37158f26757725f569f4e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/es-ES/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/es-ES/thunderbird-102.2.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "a3975e3489c8c67374a7ade117a45c85aa42c5379670204571dce0118f7aaf8f"; + sha256 = "feea88b74e5b3576a333b4a9b867afaf4412540ba45103ade194af28013a1259"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/es-MX/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/es-MX/thunderbird-102.2.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "857d1f4073ffbfa81a1ad17d219ccde4f8a8b18adc6e3e2f844020be32e1c5a8"; + sha256 = "fbf4a44defa20ee88152ad45ed2368bbf97f4d1979e7ac731ba08e7d0caf1be9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/et/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/et/thunderbird-102.2.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "37b5f428f5f16dc80736de0c2f23ca24003de5d4639e1500f303b1f4aa664460"; + sha256 = "abd03a775f1295e16dbbb2c4116f5193fc73b99e39b3a0f9e7a5de9eced240c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/eu/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/eu/thunderbird-102.2.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "0e4a8abe3b956d304d79218d63f64b01ef566122d00d025ef69c07f73aa87fec"; + sha256 = "90f90a640af343f87279af424da423d927dfaf3a08d9155a9469d42a734e7bfa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/fi/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/fi/thunderbird-102.2.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "0a3242f6d791ab5f1be52b67d8f95ac8245bc7cf556f9dda814c2827d8f60e40"; + sha256 = "d8fbcad40e09ad5d193d3a520ee9fec023df89e545e9aae75bface677d2b2c8a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/fr/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/fr/thunderbird-102.2.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "32c67c444bbe3d920aa4c30226fdbf469d5caba7a066b3d84270d0f9e0daabe5"; + sha256 = "a78e8962cd4121e5a4a2ceb573d7b69a61ed3706163ff47c6d1c960847cb7ded"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/fy-NL/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/fy-NL/thunderbird-102.2.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "0405585c63321c44f3f459356db4bbd0cf73cccf7ae6c8684b13152e3aa3b7f3"; + sha256 = "39f416be5d19d31c84fd8c02805a1d5fdadb665aabccaeee78ab1e53fffaa9ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/ga-IE/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/ga-IE/thunderbird-102.2.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "54e4e55b3339d6436591d8967de6c1cffab94da38d064df6fc0d8b85c4475d84"; + sha256 = "d270e50e6c79f37401c080567caec4e852a3138a3f3fe095a759d1d6e118b691"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/gd/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/gd/thunderbird-102.2.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "46130971e0b49bb45c6895d7cf9ec890d7f95fda6479bba38cf180d36e4c4eb7"; + sha256 = "62723dd4145b2aab4d91e3d7be6763474c23eb969407b532eb21e8e95d00c497"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/gl/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/gl/thunderbird-102.2.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "6e0ae14bb163b5a10c58cbdd49793e69d9d5042b0045f40be4c595781ad84c92"; + sha256 = "933795b2c0d3ab6b56d943470f3c0b5df3b4907acbdccb9f7f70ea300e094a50"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/he/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/he/thunderbird-102.2.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "6d353e9ec5a72366b991854aea9163385ab902c812690c0161790c882343e5a4"; + sha256 = "265d98ccba83b5eff448318d2208e11cbac484d0eec01f796bfee590d4473657"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/hr/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/hr/thunderbird-102.2.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "a05a828b434cb2677b1d3c9f317d5448db003c1373edbb84d1822182a93d3e7c"; + sha256 = "bc120009485b1d3b91cbd87018b6e4af229d1beabb2f6aed18d498ec58cb6fdb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/hsb/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/hsb/thunderbird-102.2.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "4573f6938c41160f1d4c79be035f24426bc83d9440b36ca269004b729a5564e2"; + sha256 = "8d1cf043172256f022d6ead46545b36cc366570838d6d45814b78b8484d504e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/hu/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/hu/thunderbird-102.2.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "727246ee523554d64ff72611d353aead8c8b79e8f55cf187b3fb3d9f442a947e"; + sha256 = "93c1ab56e082c2e9d579031570e496175f7fa701840a5a8c25604ecb0b333c78"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/hy-AM/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/hy-AM/thunderbird-102.2.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "467c8af9d3cfdbd18ea04214369b9d262c9d925a171a2f56548af00ec85a3611"; + sha256 = "f141fdd4521ad0bd2c7133f8a7b87bfea09f2c82be7c72271370555f80426c8a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/id/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/id/thunderbird-102.2.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "4177b047863412c9ef91d8552440b7fa1f848b8675cc55b881a4cc5fdb157303"; + sha256 = "708aa8829a18291d7e2cced2be4f161cdd2752cf6b642200159d7e4f20b496ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/is/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/is/thunderbird-102.2.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "cb8cc7838fe3c4182d887c711c636b66d017b1854a2fadbb0f6e862a54a66d40"; + sha256 = "de55318223875e4a43a35159a1c9ee795367d8ad447f29e4bb285fcb450f3e05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/it/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/it/thunderbird-102.2.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "9e9214820e407c0067cf60a3b360e8f5a608225a41708a0fd25d00fb91e46d00"; + sha256 = "722b270098611484878e2a6cb912aababe665e781a469bbdb46818ff18e077e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/ja/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/ja/thunderbird-102.2.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "ffa126f9b4a25165163df6eca65299c553b087fc2313f6dd1c7b266d41a1769f"; + sha256 = "96f27b3877f0b23d8fd09efc5ceb6a5162d0c704abcc84ae34493e120da69cea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/ka/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/ka/thunderbird-102.2.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "563eb58790172bf3a037f5828786dfb7624e3f03b81c1a57a4126f102e9572f8"; + sha256 = "75e43501045da981ce21f3b52391379f03de3f4df731ff85bd83e2881b2adc71"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/kab/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/kab/thunderbird-102.2.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "c79ff5505434a23ef88c2b1aadd9e70562ad9ea77fdb379169e3495725cad1a3"; + sha256 = "5a2861bc768fededbcf7d3fd0e9bc565be2fd5badfb18524edf762425e8da933"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/kk/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/kk/thunderbird-102.2.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "bfc4037fa631727d454c5b22af1e8861b436c40aa2bafda007221e5d5a813dd7"; + sha256 = "1014bcbb12c623164871e3416bde2218326d887d527c1f76d8579b451a673d81"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/ko/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/ko/thunderbird-102.2.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "386921200c4b6544407994c5d1d73a3671a383f1e5b69d5f34b7a8ec727bc646"; + sha256 = "03ed9709c1bfa2066f8ab596faf5f4b9a37174bde7da3d32448770021d1bf48f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/lt/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/lt/thunderbird-102.2.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "2027b59fc1a8f11dbc8ce693296a26604e9ba579e34df02e9f0c8243eda38e94"; + sha256 = "cc06df43b59a768415d6d07051eb67892e8e849ef0ff1799ad094dbe1671a954"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/lv/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/lv/thunderbird-102.2.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "a5179ee6caa6847b36e9494e09d3c233beb9bb8651c586b11ce160b054e12d73"; + sha256 = "362877abf9d52b936fdde5913655ad3e88097503415cdd38bffc35032094bd92"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/ms/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/ms/thunderbird-102.2.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "6d1f11d137da476fe7dbe04e7d5692c5dc81931d30e116217083ad187fdc37cc"; + sha256 = "64224aa3c1032528e9a233e992c95be4f8fa72c27a95e8ca38803265c2dd9c41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/nb-NO/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/nb-NO/thunderbird-102.2.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "d7a50f3f8734d249e565cbf1078627fb0e3cfa42f293574127bd2fa549652be9"; + sha256 = "389f8bdfdbe6b6f05a6bc4154b2381aa4810787d18bb22a4f4dafd3f2f7f4e17"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/nl/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/nl/thunderbird-102.2.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "8962f690d105d4589df0279770b63f0b90485cb499f86e953393dd4116a87b2c"; + sha256 = "409729a161f278ff03c5505aca4ea4894c4fb973a3ab34bad9375a8aeea898c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/nn-NO/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/nn-NO/thunderbird-102.2.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "d0b940decdc8d77a0a6371ded16c551d8ce081134c4bb7d795adde39c5844254"; + sha256 = "bd3712769496d416f4c3a5df2ccca46cfdfbd1ffd55346af5abb9fa7c50410ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/pa-IN/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/pa-IN/thunderbird-102.2.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "dd5a2d9b78085786039ca20ef88f991285ff7b59ce47857b7d81bc74faa6ec54"; + sha256 = "47ffb31c017241cfb6cfbd9a205b159adfd21be9b079f996a5d4ba05b0cc20d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/pl/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/pl/thunderbird-102.2.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "9da17d31bbacc006c2a9530d42d864ea56c9cf5b84a73d03add270bc275543b0"; + sha256 = "ca50e4489e3a949f37b2310e7fb1d24bf24c26e7000bacd051ab77968397a882"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/pt-BR/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/pt-BR/thunderbird-102.2.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "81fee2a7ba6a2b0b8607e412324b2eebd1dc3f28194dc7de1efa5af9f1fa23a6"; + sha256 = "3a411aa23669d0c2b9146cd64986d7e9bfda6832e3b86a8f17f08a4fcbc05ab4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/pt-PT/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/pt-PT/thunderbird-102.2.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "82e354e1642b8018c0a6f2ccc3d3d38f3a7aa39333a30d9a6ea7c6c52df6d6f5"; + sha256 = "10613a544aff584af3da980ecf511f180b1d3cf7fe01828e2a37f593487bca6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/rm/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/rm/thunderbird-102.2.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "d7fa26de70531e74931892a78a5148f95df92d29a94e7ce5aeef11168c1069ce"; + sha256 = "60797ab2c9393806bd5ab3b4b9fb9048775fb30c58ccc436f4b21a0a39ceaf97"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/ro/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/ro/thunderbird-102.2.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "c4392159cabd3cf19b575d8a0598b0d52a1f9fb993234d1170240c6c6a5e4fa6"; + sha256 = "40f11c3afad15a07f506b5b8d7dd74317b37720a398e890dd73911882ab9354e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/ru/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/ru/thunderbird-102.2.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "ac3d6fc7b555298ae05cb3b0fef2b6264ff11a5961f5e044664022e80bb9ae34"; + sha256 = "10935eb98bc6d83fe9b8e5e567a9f30a00abff8b5b3e4c527ecebd7ee56ec122"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/sk/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/sk/thunderbird-102.2.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "41cc5938d5b64508bcc095ddfbe3eef3cde3dd88a8f145ed279bf825785fde50"; + sha256 = "07e6c734108896e827e97671afe30aa709e701b2e64f1d1b692aee7155479cb4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/sl/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/sl/thunderbird-102.2.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "f8fb013b2705ce34749d1470e799d47c09b5ba94a9580a5e2d12be8b660c58c7"; + sha256 = "b862cd06ba4a1c8a16269d2c7fda76c7b97aebf0d60ac6828cc7b3dbb51b6468"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/sq/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/sq/thunderbird-102.2.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "dc7407c4cb28070693b7862bc29b465a4d96c473b5b4f553d238390c694804a1"; + sha256 = "28792eca6aa976a712c4f2c619e22c70263f7941c2c99a3aa9d83e5eb6cf00b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/sr/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/sr/thunderbird-102.2.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "640731bbc689acb4874bc0f439f34213e30812bafae3ef94471945b13ae27243"; + sha256 = "69460ea89828e4db9a93f2a005a146a503f5fd5c022665cedfbf9ee62bd826e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/sv-SE/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/sv-SE/thunderbird-102.2.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "6d71d4ffa6393bc997566dc604992c093c24bd3a978b947704f82f03893fccfd"; + sha256 = "08cf31fe3ad5d214278c9c79ad84defa2166d2b84917a6e7b11b7abfe113df09"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/th/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/th/thunderbird-102.2.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "faecaf65b8737dc63d2ea469ba1181c1e0a71c334baf29c8677730faecffb57c"; + sha256 = "ef0c353c78ead98ffdf929912631dc3bee4087acd070dec878ce3bf9709a8f23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/tr/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/tr/thunderbird-102.2.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "c6401dfca452996547b3f33dead4690f9e376313920ef7880774c8a3e556b213"; + sha256 = "fe9e77c1739e33c5e226253a79070dd6e15d813d81cfbadca187cbeaa6fada9a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/uk/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/uk/thunderbird-102.2.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "05fc335e16ad0c28a59a6ba51566161f92c0053b12b0ec56409e62eaf77fa2b2"; + sha256 = "3e12f9228479fb2361186eeee6174f4256990c829b369b4f762e75e89a7cfd12"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/uz/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/uz/thunderbird-102.2.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "5690ad8156e70dba56ed7664f99ac335409e88f5fc0d05be530774fdeedd20ee"; + sha256 = "ad59e3da2b1b3f20f910e979d85e60253b07f11410dca635399681cb50d372ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/vi/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/vi/thunderbird-102.2.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "41cb6da3b59cfa31ebf28e67f93349977dcd640df5491fa451f19bc0670aa2d9"; + sha256 = "a0342a62cd34cb6879e38717c05e272d2f45990078d0b920906ce400db3cc206"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/zh-CN/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/zh-CN/thunderbird-102.2.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "79f9f7e1620efa56ab2a8f3a1d1aea91cf82a0c12b6f0bbac01bbd5fdc6b3c63"; + sha256 = "6506ef24bcf862da6860a166a1a14c95187518e72bbb560b114eceb9d77a7c8f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-i686/zh-TW/thunderbird-102.2.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-i686/zh-TW/thunderbird-102.2.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "763790430eff0c8689cb045e30920b1c0fe239a324ce739b153f8a16ccb07b25"; + sha256 = "479d149ec221ddead41c6e6b8f3f854487ea833ff80fe6efa31061600938299e"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 08a94291c9..0c34c2b174 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -39,13 +39,13 @@ rec { }; thunderbird-102 = (buildMozillaMach rec { pname = "thunderbird"; - version = "102.2.1"; + version = "102.2.2"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "7b69cfffb5de56690cbbd97f6b627733072dee498a15adfece990f9019df8df948762ce8eb2ca2d91ef12ff56262fb1905476d8a477aed70bc71cd2f9f986ea4"; + sha512 = "fe72ddb81d35d4a85b25a6d955a0b0f705aeda2dca0f572efca7ce94041c4ddcead6c690bda8d4bded4c43e12a15669f9608db6debec38d8b5157a914e280db5"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. 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 51b95a3f2a..bf05d9d1fa 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix @@ -26,7 +26,7 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.5.4"; + version = "3.6.0"; outputs = [ "out" "dev" ]; @@ -34,7 +34,7 @@ mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-ennKNUuoyhpVfG1XPzJKrop0i77BAB3C2MNqZPOXNkc="; + sha256 = "sha256-wAxq5xFlofn2xEguvewMvGcel9O+CN/1AycR3tv/xMA="; }; patches = [ @@ -77,8 +77,6 @@ mkDerivation rec { qtWrapperArgs = [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}" - # See also: https://bugreports.qt.io/browse/QTBUG-85967 - "--set QML_DISABLE_DISK_CACHE 1" # make xdg-open overrideable at runtime "--suffix PATH : ${lib.makeBinPath [ xdg-utils ]}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/fava/default.nix b/third_party/nixpkgs/pkgs/applications/office/fava/default.nix index 27281b5d52..10cd1e9985 100644 --- a/third_party/nixpkgs/pkgs/applications/office/fava/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/fava/default.nix @@ -2,12 +2,12 @@ python3.pkgs.buildPythonApplication rec { pname = "fava"; - version = "1.22.2"; + version = "1.22.3"; format = "pyproject"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "sha256-Oarh0a0q+PYFojsYmdX763vFRSQhtm09z4ruSxXDpSA="; + sha256 = "sha256-e8/VOn0WmrUO69x/4hKGtgKuj11U1Qv7OUhfOL/p5Ds="; }; nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/gatk/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/gatk/default.nix new file mode 100644 index 0000000000..c0818b8336 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/biology/gatk/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchzip }: + +stdenv.mkDerivation rec { + pname = "gatk"; + version = "4.2.6.1"; + src = fetchzip { + url = "https://github.com/broadinstitute/gatk/releases/download/${version}/gatk-${version}.zip"; + sha256 = "0hjlsl7fxf3ankyjidqhwxc70gjh6z4lnjzw6b5fldzb0qvgfvy8"; + }; + + installPhase = '' + mkdir -p $out/bin + install -m755 -D $src/gatk $out/bin/ + install -m755 -D $src/gatk-package-${version}-local.jar $out/bin/ + ''; + + meta = with lib; { + homepage = "https://gatk.broadinstitute.org/hc/en-us"; + description = "A wide variety of tools with a primary focus on variant discovery and genotyping." ; + license = licenses.asl20; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ] ; + maintainers = with maintainers; [ apraga ]; + longDescription = '' + The GATK is the industry standard for identifying SNPs and indels in germline + DNA and RNAseq data. Its scope is now expanding to include somatic short variant + calling, and to tackle copy number (CNV) and structural variation (SV). In + addition to the variant callers themselves, the GATK also includes many + utilities to perform related tasks such as processing and quality control of + high-throughput sequencing data, and bundles the popular Picard toolkit. + + These tools were primarily designed to process exomes and whole genomes + generated with Illumina sequencing technology, but they can be adapted to handle + a variety of other technologies and experimental designs. And although it was + originally developed for human genetics, the GATK has since evolved to handle + genome data from any organism, with any level of ploidy. + ''; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/nanovna-saver/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/nanovna-saver/default.nix index 06b77294da..67b600b19f 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/nanovna-saver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/nanovna-saver/default.nix @@ -6,13 +6,13 @@ }: python3.pkgs.buildPythonApplication rec { pname = "nanovna-saver"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "NanoVNA-Saver"; repo = pname; - rev = "v${version}"; - sha256 = "1n1bh46spdyk7kgvv95hyfy9f904czhzlvk41vliqkak56hj2ss1"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-2/A9uFYa682cvK2uzvBLZBDouhS6C6Q91v8Pun7GgSw="; }; nativeBuildInputs = [ wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix index 0d045c8828..74f27fa534 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix @@ -95,11 +95,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # disable stackprotector on aarch64-darwin for now - # https://github.com/NixOS/nixpkgs/issues/158730 - # see https://github.com/NixOS/nixpkgs/issues/127608 for a similar issue - hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; - setupHook = ./setup-hook.sh; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/sasview/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/sasview/default.nix index 51dea27557..e32a4ba0c0 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/sasview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/sasview/default.nix @@ -1,7 +1,6 @@ { lib , python3 , fetchFromGitHub -, which , wrapQtAppsHook }: diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix index f7d7c1e342..d4131f64c5 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.29.1"; + version = "2.29.2"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-odlvhkgIiNB8fsRfVswiqfpAKLtP9EtcoMxd5SmhX8I="; + sha256 = "sha256-995+6AYhSkMkOSm/ZjlInS5zb1od5nbEChvUyS/8RHM="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile b/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile index 3b1ac09c8a..3b22a9d507 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile +++ b/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' ruby '>= 2.4.0', '< 2.8.0' gem 'bundler', '>= 1.12.0' -gem 'rails', '5.2.6.3' +gem 'rails', '5.2.8' gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5' gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0') gem 'rouge', '~> 3.26.0' @@ -14,7 +14,13 @@ gem 'roadie-rails', (RUBY_VERSION < '2.5' ? '~> 1.3.0' : '~> 2.2.0') gem 'marcel' gem "mail", "~> 2.7.1" gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '~> 3.1.1') -gem 'nokogiri', (RUBY_VERSION < '2.5' ? '~> 1.10.0' : '~> 1.11.1') +gem 'nokogiri', (if Gem.ruby_version < Gem::Version.new('2.5.0') + '~> 1.10.10' + elsif Gem.ruby_version < Gem::Version.new('2.6.0') + '~> 1.12.5' + else + '~> 1.13.6' + end) gem 'i18n', '~> 1.8.2' gem "rbpdf", "~> 1.20.0" gem 'addressable' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock index 2643918716..5ad1b80d3c 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock @@ -1,19 +1,19 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.2.6.3) - actionpack (= 5.2.6.3) + actioncable (5.2.8) + actionpack (= 5.2.8) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.6.3) - actionpack (= 5.2.6.3) - actionview (= 5.2.6.3) - activejob (= 5.2.6.3) + actionmailer (5.2.8) + actionpack (= 5.2.8) + actionview (= 5.2.8) + activejob (= 5.2.8) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.6.3) - actionview (= 5.2.6.3) - activesupport (= 5.2.6.3) + actionpack (5.2.8) + actionview (= 5.2.8) + activesupport (= 5.2.8) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) @@ -21,32 +21,32 @@ GEM actionpack-xml_parser (2.0.1) actionpack (>= 5.0) railties (>= 5.0) - actionview (5.2.6.3) - activesupport (= 5.2.6.3) + actionview (5.2.8) + activesupport (= 5.2.8) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.6.3) - activesupport (= 5.2.6.3) + activejob (5.2.8) + activesupport (= 5.2.8) globalid (>= 0.3.6) - activemodel (5.2.6.3) - activesupport (= 5.2.6.3) - activerecord (5.2.6.3) - activemodel (= 5.2.6.3) - activesupport (= 5.2.6.3) + activemodel (5.2.8) + activesupport (= 5.2.8) + activerecord (5.2.8) + activemodel (= 5.2.8) + activesupport (= 5.2.8) arel (>= 9.0) - activestorage (5.2.6.3) - actionpack (= 5.2.6.3) - activerecord (= 5.2.6.3) + activestorage (5.2.8) + actionpack (= 5.2.8) + activerecord (= 5.2.8) marcel (~> 1.0.0) - activesupport (5.2.6.3) + activesupport (5.2.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) arel (9.0.0) ast (2.4.2) builder (3.2.4) @@ -66,13 +66,13 @@ GEM addressable csv (3.1.9) docile (1.4.0) - erubi (1.10.0) + erubi (1.11.0) globalid (1.0.0) activesupport (>= 5.0) htmlentities (4.3.4) i18n (1.8.11) concurrent-ruby (~> 1.0) - loofah (2.16.0) + loofah (2.18.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -81,48 +81,52 @@ GEM method_source (1.0.0) mini_magick (4.11.0) mini_mime (1.0.3) - minitest (5.15.0) - mocha (1.13.0) - mysql2 (0.5.3) - net-ldap (0.17.0) + mini_portile2 (2.8.0) + minitest (5.16.3) + mocha (1.14.0) + mysql2 (0.5.4) + net-ldap (0.17.1) nio4r (2.5.8) - nokogiri (1.11.7) + nokogiri (1.13.8) + mini_portile2 (~> 2.8.0) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) racc (~> 1.4) parallel (1.22.1) - parser (3.1.2.0) + parser (3.1.2.1) ast (~> 2.4.1) pg (1.2.3) - public_suffix (4.0.7) - puma (5.6.4) + public_suffix (5.0.0) + puma (5.6.5) nio4r (~> 2.0) racc (1.6.0) - rack (2.2.3) + rack (2.2.4) rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails (5.2.6.3) - actioncable (= 5.2.6.3) - actionmailer (= 5.2.6.3) - actionpack (= 5.2.6.3) - actionview (= 5.2.6.3) - activejob (= 5.2.6.3) - activemodel (= 5.2.6.3) - activerecord (= 5.2.6.3) - activestorage (= 5.2.6.3) - activesupport (= 5.2.6.3) + rack-test (2.0.2) + rack (>= 1.3) + rails (5.2.8) + actioncable (= 5.2.8) + actionmailer (= 5.2.8) + actionpack (= 5.2.8) + actionview (= 5.2.8) + activejob (= 5.2.8) + activemodel (= 5.2.8) + activerecord (= 5.2.8) + activestorage (= 5.2.8) + activesupport (= 5.2.8) bundler (>= 1.3.0) - railties (= 5.2.6.3) + railties (= 5.2.8) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.2) + rails-html-sanitizer (1.4.3) loofah (~> 2.3) - railties (5.2.6.3) - actionpack (= 5.2.6.3) - activesupport (= 5.2.6.3) + railties (5.2.8) + actionpack (= 5.2.8) + activesupport (= 5.2.8) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) @@ -145,7 +149,7 @@ GEM roadie (>= 3.1, < 5.0) rotp (6.2.0) rouge (3.26.1) - rqrcode (2.1.1) + rqrcode (2.1.2) chunky_png (~> 1.0) rqrcode_core (~> 1.0) rqrcode_core (1.2.0) @@ -158,7 +162,7 @@ GEM rubocop-ast (>= 1.2.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.17.0) + rubocop-ast (1.21.0) parser (>= 3.1.1.0) rubocop-performance (1.10.2) rubocop (>= 0.90.0, < 2.0) @@ -170,15 +174,16 @@ GEM ruby-openid (2.9.2) ruby-progressbar (1.11.0) rubyzip (2.3.2) - selenium-webdriver (4.1.0) + selenium-webdriver (4.4.0) childprocess (>= 0.5, < 5.0) rexml (~> 3.2, >= 3.2.5) - rubyzip (>= 1.2.2) + rubyzip (>= 1.2.2, < 3.0) + websocket (~> 1.0) simplecov (0.18.5) docile (~> 1.1) simplecov-html (~> 0.11) simplecov-html (0.12.3) - sprockets (4.0.3) + sprockets (4.1.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.4.2) @@ -187,20 +192,21 @@ GEM sprockets (>= 3.0.0) thor (1.2.1) thread_safe (0.3.6) - tzinfo (1.2.9) + tzinfo (1.2.10) thread_safe (~> 0.1) - unicode-display_width (2.1.0) + unicode-display_width (2.2.0) webdrivers (4.7.0) nokogiri (~> 1.6) rubyzip (>= 1.3.0) selenium-webdriver (> 3.141, < 5.0) webrick (1.7.0) + websocket (1.2.9) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - yard (0.9.27) + yard (0.9.28) webrick (~> 1.7.0) PLATFORMS @@ -221,11 +227,11 @@ DEPENDENCIES mocha (>= 1.4.0) mysql2 (~> 0.5.0) net-ldap (~> 0.17.0) - nokogiri (~> 1.11.1) + nokogiri (~> 1.13.6) pg (~> 1.2.2) puma rack-openid - rails (= 5.2.6.3) + rails (= 5.2.8) rails-dom-testing rbpdf (~> 1.20.0) redcarpet (~> 3.5.1) @@ -249,4 +255,4 @@ RUBY VERSION ruby 2.7.6p219 BUNDLED WITH - 2.2.33 + 2.3.20 diff --git a/third_party/nixpkgs/pkgs/applications/version-management/redmine/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/redmine/default.nix index 1f0f9f4e78..a518a9cec2 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/redmine/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/redmine/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper }: +{ lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper, nixosTests }: let - version = "4.2.5"; + version = "4.2.7"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; @@ -16,7 +16,7 @@ in src = fetchurl { url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz"; - sha256 = "112rc2sjx6x7046fjz7np0ilszvkqapc180ld02ncwmdxaq88w6r"; + sha256 = "sha256-7UvgO1q2PCZBqH24l4c53Zl8D2Rr+hAQrJ5SEMNDck4="; }; nativeBuildInputs = [ makeWrapper ]; @@ -42,6 +42,8 @@ in makeWrapper ${rubyEnv.wrappedRuby}/bin/ruby $out/bin/rdm-mailhandler.rb --add-flags $out/share/redmine/extra/mail_handler/rdm-mailhandler.rb ''; + passthru.tests.redmine = nixosTests.redmine; + meta = with lib; { homepage = "https://www.redmine.org/"; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix b/third_party/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix index 77d1d997fd..a478796ca2 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gmwailk92znzrdpi4116ih6bq609a38rpnszzh5piq7b507ikpn"; + sha256 = "123nrlrh5kikl314l4gjbc8ljw3h2ppzhpmm7cilisqvn71s5ysd"; type = "gem"; }; - version = "5.2.6.3"; + version = "5.2.8"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "103a1nixkazzdk21bg42vs722m6gm0vf17ag2fdad5dycwk3ycpp"; + sha256 = "18vrdwdwfmrnpj8k30qhvdx23km233ffnhhzpbmx8m6spavwvli2"; type = "gem"; }; - version = "5.2.6.3"; + version = "5.2.8"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15fz3rjk85svpx9lsqfdwlvyd972zf0g5jasnsllcbf6d300gdj6"; + sha256 = "1knnka6n292f4hhbjfchpa4sbjj79wys5y8bcggm8ah894051kzk"; type = "gem"; }; - version = "5.2.6.3"; + version = "5.2.8"; }; actionpack-xml_parser = { dependencies = ["actionpack" "railties"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00cfpmbk8gw9c589xnqazsbd860p2368gyh8nyzixcsa6k28wfwv"; + sha256 = "0zndg7ax4bckayjw558p9hz92ic6x3r5acfbd5vnad0xh7hfdrmx"; type = "gem"; }; - version = "5.2.6.3"; + version = "5.2.8"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gczbnk7qy4rjhv0q82nd70xawc9lb1vinvwr4ngpim5rqwzm6d6"; + sha256 = "0kzb5y4lflmvi3vxz2zrj55k6xyys2h5bdqp2ki69rcyd4ay5qrg"; type = "gem"; }; - version = "5.2.6.3"; + version = "5.2.8"; }; activemodel = { dependencies = ["activesupport"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ib8qlbwr9hp5284c6bmx08lrfy45zzd4inzmawz08alkgdcrzca"; + sha256 = "1b6pskl8x4c1hcsf4xh4cl9qlh814s91bjv3yy94cdc4xpl76vr6"; type = "gem"; }; - version = "5.2.6.3"; + version = "5.2.8"; }; activerecord = { dependencies = ["activemodel" "activesupport" "arel"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ky3zc8i5rjg2dpdb95icsgb443siim9sv71xwcmryjxp5rhkqyx"; + sha256 = "078iiv5g02n1ivrgpkbw5bxkbihi85msvn88p5q37vbfr14ynk0a"; type = "gem"; }; - version = "5.2.6.3"; + version = "5.2.8"; }; activestorage = { dependencies = ["actionpack" "activerecord" "marcel"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1risg5jklxrm7j5i4rzaqpb94822ivbjaasblppwmx5f33vhfpca"; + sha256 = "1xnxgg9j4nr6yw8g3l0jdr9m985k3wrvjql9j5qr5lfcsn9zwz4w"; type = "gem"; }; - version = "5.2.6.3"; + version = "5.2.8"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09vif5aajkvrsdcl51kvk8crz8hl38awprh7d5wj93nscpxmqgns"; + sha256 = "0anvhpxjgic1cv1h66lmz6x5nd7g0bbnwl0rgxnbdr3w76fa8w02"; type = "gem"; }; - version = "5.2.6.3"; + version = "5.2.8"; }; addressable = { dependencies = ["public_suffix"]; @@ -115,10 +115,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; + sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.1"; }; arel = { groups = ["default"]; @@ -237,10 +237,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l"; + sha256 = "11bz1v1cxabm8672gabrw542zyg51dizlcvdck6vvwzagxbjv9zx"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.0"; }; globalid = { dependencies = ["activesupport"]; @@ -280,10 +280,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15s6z5bvhdhnqv4wg8zcz3mhbc7i4dbqskv5jvhprz33ak7682km"; + sha256 = "18ymp6l3bv7abz07k6qbbi9c9vsiahq30d2smh4qzsvag8j5m5v1"; type = "gem"; }; - version = "2.16.0"; + version = "2.18.0"; }; mail = { dependencies = ["mini_mime"]; @@ -336,25 +336,35 @@ }; version = "1.0.3"; }; + mini_portile2 = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; + type = "gem"; + }; + version = "2.8.0"; + }; minitest = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd"; + sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30"; type = "gem"; }; - version = "5.15.0"; + version = "5.16.3"; }; mocha = { groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15s53ggsykk69kxqvs4416s8yxdhz6caggva55n8sjgy4ixzwp10"; + sha256 = "0ffd7zn24lwhp3xp747jfg4zxgqbm04ar7shhjy2iv5xg1pz01lr"; type = "gem"; }; - version = "1.13.0"; + version = "1.14.0"; }; mysql2 = { groups = ["default"]; @@ -369,20 +379,20 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d14pcy5m4hjig0zdxnl9in5f4izszc7v9zcczf2gyi5kiyxk8jw"; + sha256 = "0xsy70mg4p854jska7ff7cy8fyn9nhlkrmfdvkkfmk8qxairbfq1"; type = "gem"; }; - version = "0.5.3"; + version = "0.5.4"; }; net-ldap = { groups = ["ldap"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j19yxrz7h3hj7kiiln13c7bz7hvpdqr31bwi88dj64zifr7896n"; + sha256 = "1ycw0qsw3hap8svakl0i30jkj0ffd4lpyrn17a1j0w8mz5ainmsj"; type = "gem"; }; - version = "0.17.0"; + version = "0.17.1"; }; nio4r = { groups = ["default" "test"]; @@ -395,15 +405,15 @@ version = "2.5.8"; }; nokogiri = { - dependencies = ["racc"]; + dependencies = ["mini_portile2" "racc"]; groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vrn31385ix5k9b0yalnlzv360isv6dincbcvi8psllnwz4sjxj9"; + sha256 = "0g7axlq2y6gzmixzzzhw3fn6nhrhg469jj8gfr7gs8igiclpkhkr"; type = "gem"; }; - version = "1.11.7"; + version = "1.13.8"; }; parallel = { groups = ["default" "test"]; @@ -421,10 +431,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xhfghgidj8cbdnqp01f7kvnrv1f60izpkd9dhxsvpdzkfsdg97d"; + sha256 = "1q31n7yj59wka8xl8s5wkf66hm4pgvblx95czyxffprdnlhrir2p"; type = "gem"; }; - version = "3.1.2.0"; + version = "3.1.2.1"; }; pg = { groups = ["default"]; @@ -449,10 +459,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb"; + sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6"; type = "gem"; }; - version = "4.0.7"; + version = "5.0.0"; }; puma = { dependencies = ["nio4r"]; @@ -460,10 +470,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dgr2rybayih2naz3658mbzqwfrg9fxl80zsvhscf6b972kp3jdw"; + sha256 = "0qzq0c791kacv68hgk9zqsd1p7zx1y1rr9j10rn9yphibb8jj436"; type = "gem"; }; - version = "5.6.4"; + version = "5.6.5"; }; racc = { groups = ["default" "test"]; @@ -480,10 +490,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; + sha256 = "0axc6w0rs4yj0pksfll1hjgw1k6a5q0xi2lckh91knfb72v348pa"; type = "gem"; }; - version = "2.2.3"; + version = "2.2.4"; }; rack-openid = { dependencies = ["rack" "ruby-openid"]; @@ -502,10 +512,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m"; + sha256 = "0rjl709krgf499dhjdapg580l2qaj9d91pwzk8ck8fpnazlx1bdd"; type = "gem"; }; - version = "1.1.0"; + version = "2.0.2"; }; rails = { dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; @@ -513,10 +523,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19962nkjssr77753a8893yz17kmvb63h9rl3ajq6r8rx9xifq8fn"; + sha256 = "0884z2ilm4by47qk7my856dr42vzy12ghj241rymp13flaf54449"; type = "gem"; }; - version = "5.2.6.3"; + version = "5.2.8"; }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; @@ -535,10 +545,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09qrfi3pgllxb08r024lln9k0qzxs57v0slsj8616xf9c0cwnwbk"; + sha256 = "1mj0b7ay10a2fgwj70kjw7mlyrp7a5la8lx8zmwhy40bkansdfrf"; type = "gem"; }; - version = "1.4.2"; + version = "1.4.3"; }; railties = { dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; @@ -546,10 +556,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0waa50li6vvckz9mznyz4jhks46ba09fmbdadrrj35mzwahyb6fy"; + sha256 = "157mmm2jhvq2g08xhq0780i3r4i679h14m68jj7265ik26gbchhc"; type = "gem"; }; - version = "5.2.6.3"; + version = "5.2.8"; }; rainbow = { groups = ["default" "test"]; @@ -681,10 +691,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10sq4aknch9rzpy8af77rqxk8rr59d33slg1kwg9h7fw9f1spmjn"; + sha256 = "0s97q1rqmw7rzsdr500hr4f2k6s24n8qk1klciz5q94zvdrygx3p"; type = "gem"; }; - version = "2.1.1"; + version = "2.1.2"; }; rqrcode_core = { groups = ["default"]; @@ -713,10 +723,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k9izkr5rhw3zc309yjp17z7496l74j4li3zrcgpgqfnqwz695qx"; + sha256 = "0s4m9h9hzrpfmsnswvfimafmjwfa79cbqh9dvq18cja32dhrhpcg"; type = "gem"; }; - version = "1.17.0"; + version = "1.21.0"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -771,15 +781,15 @@ version = "2.3.2"; }; selenium-webdriver = { - dependencies = ["childprocess" "rexml" "rubyzip"]; + dependencies = ["childprocess" "rexml" "rubyzip" "websocket"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17hilxa40cj7q48k6wcx1cbdb1v3q9c4nx89fji7gyqpcfm16vq7"; + sha256 = "1vy0baak61wr652a7qf249n85sqq5k5mi51ws5ccyyirlsymz2gv"; type = "gem"; }; - version = "4.1.0"; + version = "4.4.0"; }; simplecov = { dependencies = ["docile" "simplecov-html"]; @@ -808,10 +818,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19k5cwg8gyb6lkmz4kab7c5nlplpgj64jy7vw8p5l2i2ysq5hym0"; + sha256 = "1qj82dcfkk6c4zw357k5r05s5iwvyddh57bpwj0a1hjgaw70pcb8"; type = "gem"; }; - version = "4.0.3"; + version = "4.1.1"; }; sprockets-rails = { dependencies = ["actionpack" "activesupport" "sprockets"]; @@ -850,20 +860,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; + sha256 = "0rw89y3zj0wcybcyiazgcprg6hi42k8ipp1n2lbl95z1dmpgmly6"; type = "gem"; }; - version = "1.2.9"; + version = "1.2.10"; }; unicode-display_width = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0csjm9shhfik0ci9mgimb7hf3xgh7nx45rkd9rzgdz6vkwr8rzxn"; + sha256 = "1nlfck6z986fngp0r74maswmyb1rcksc8xc3mfpw9cj23c3s8zwn"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; webdrivers = { dependencies = ["nokogiri" "rubyzip" "selenium-webdriver"]; @@ -886,6 +896,16 @@ }; version = "1.7.0"; }; + websocket = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dib6p55sl606qb4vpwrvj5wh881kk4aqn2zpfapf8ckx7g14jw8"; + type = "gem"; + }; + version = "1.2.9"; + }; websocket-driver = { dependencies = ["websocket-extensions"]; groups = ["default"]; @@ -924,9 +944,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d08gkis1imlvppyh8dbslk89hwj5af2fmlzvmwahgx2bm48d9sn"; + sha256 = "0p1if8g9ww6hlpfkphqv3y1z0rbqnnrvb38c5qhnala0f8qpw6yk"; type = "gem"; }; - version = "0.9.27"; + version = "0.9.28"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/redmine/update.sh b/third_party/nixpkgs/pkgs/applications/version-management/redmine/update.sh index de59f4685d..3c4d842735 100755 --- a/third_party/nixpkgs/pkgs/applications/version-management/redmine/update.sh +++ b/third_party/nixpkgs/pkgs/applications/version-management/redmine/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell --pure -i bash -p cacert bundix +#!nix-shell --pure -i bash -p cacert bundix bundler # Do these steps before running this script: # 1. Copy Gemfile from new Redmine version to this folder @@ -14,4 +14,6 @@ for file in "gemset.nix" "Gemfile.lock"; do fi done +bundle lock --add-platform ruby +bundle lock --remove-platform x86_64-linux bundix -l diff --git a/third_party/nixpkgs/pkgs/applications/video/pipe-viewer/default.nix b/third_party/nixpkgs/pkgs/applications/video/pipe-viewer/default.nix index 53ffa9bcdc..f4d915374b 100644 --- a/third_party/nixpkgs/pkgs/applications/video/pipe-viewer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/pipe-viewer/default.nix @@ -38,13 +38,13 @@ let in buildPerlModule rec { pname = "pipe-viewer"; - version = "0.1.4"; + version = "0.3.0"; src = fetchFromGitHub { owner = "trizen"; repo = "pipe-viewer"; rev = version; - hash = "sha256-kDlZ3Cl8zvN/naGExh2yVW5yHwc1O04x4s22lNkbCzU="; + hash = "sha256-2Kzo7NYxARPFuOijwf2a3WQxnNumtKRiRhMhjrWA4GY="; }; nativeBuildInputs = [ makeWrapper ] diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/distrobox/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/distrobox/default.nix index 9a6bd0a0e3..e9409004c8 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/distrobox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/distrobox/default.nix @@ -1,28 +1,37 @@ -{ stdenvNoCC, lib, fetchFromGitHub }: +{ stdenvNoCC, lib, fetchFromGitHub, makeWrapper, wget }: stdenvNoCC.mkDerivation rec { pname = "distrobox"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "89luca89"; repo = pname; rev = version; - sha256 = "sha256-7qPEtWDshe3bHUvbf35k31EnL2sQEXeDmMUGBPkiB9U="; + sha256 = "sha256-XYqPwBiMbwG0bTiFRywZRWjp1OabTHcwhmbcx11SgPo="; }; dontConfigure = true; dontBuild = true; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' runHook preInstall - mkdir -p $out/bin - ./install -p $out/bin + # https://github.com/89luca89/distrobox/issues/408 + substituteInPlace ./distrobox-generate-entry \ + --replace 'icon_default="''${HOME}/.local' "icon_default=\"$out" + ./install -P $out runHook postInstall ''; + # https://github.com/89luca89/distrobox/issues/407 + postFixup = '' + wrapProgram "$out/bin/distrobox-generate-entry" \ + --prefix PATH ":" ${lib.makeBinPath [ wget ]} + ''; + meta = with lib; { description = "Wrapper around podman or docker to create and start containers"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix index f21afbd55a..edf7582dd9 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix @@ -243,19 +243,19 @@ rec { # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* docker_20_10 = callPackage dockerGen rec { - version = "20.10.17"; + version = "20.10.18"; rev = "v${version}"; - sha256 = "sha256-YCuohqtE4rbGyboVRyxvpqs93IS1k7aUTPdtHIlkUU8="; + sha256 = "sha256-AyY6xfFEvUv7Kqo3M0gv9/4NoBUDqQyP4ZIcz+oGNys="; moby-src = fetchFromGitHub { owner = "moby"; repo = "moby"; rev = "v${version}"; - sha256 = "sha256-7SQubrbMvXSN3blcCW47F9OnjuKZxdXM5O/lE85zx0I="; + sha256 = "sha256-c0A66JVvRPFNT/xCTIsW8k3a/EMIl73d/UlCohjmGMk="; }; - runcRev = "v1.1.2"; - runcSha256 = "sha256-tMneqB81w8lQp5RWWCjALyKbOY3xog+oqb6cYKasG/8="; - containerdRev = "v1.6.6"; - containerdSha256 = "sha256-cmarbad6VzcGTCHT/NtApkYsK/oo6WZQ//q8Fvh+ez8="; + runcRev = "v1.1.4"; + runcSha256 = "sha256-ougJHW1Z+qZ324P8WpZqawY1QofKnn8WezP7orzRTdA="; + containerdRev = "v1.6.8"; + containerdSha256 = "sha256-0UiPhkTWV61DnAF5kWd1FctX8i0sXaJ1p/xCMznY/A8="; tiniRev = "v0.19.0"; tiniSha256 = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/ovmfvartool/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/ovmfvartool/default.nix deleted file mode 100644 index 1367087e08..0000000000 --- a/third_party/nixpkgs/pkgs/applications/virtualization/ovmfvartool/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenvNoCC, fetchFromGitHub, python3 }: - -stdenvNoCC.mkDerivation rec { - pname = "ovmfvartool"; - version = "unstable-2021-06-16"; - - src = fetchFromGitHub { - owner = "hlandau"; - repo = pname; - rev = "c4c0c24dce1d201f95dfd69fd7fd9d51ea301377"; - hash = "sha256-3OvYAB41apPn1c2YTKBIEITmHSUMQ0oEijY5DhZWWGo="; - }; - - postPatch = let - pythonPkg = python3.withPackages (p: with p; [ pyyaml ]); - in '' - # needed in build but /usr/bin/env is not available in sandbox - substituteInPlace ovmfvartool \ - --replace "/usr/bin/env python3" "${pythonPkg.interpreter}" - ''; - - installPhase = '' - mkdir -p $out/bin - install -m 755 ovmfvartool $out/bin/ - ''; - - meta = with lib; { - description = "Parse and generate OVMF_VARS.fd from Yaml"; - homepage = "https://github.com/hlandau/ovmfvartool"; - license = licenses.gpl3; - maintainers = with maintainers; [ baloo raitobezarius ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix index 3d8d87ec22..8e7a683ed3 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, python3, python3Packages, zlib, pkg-config, glib, buildPackages +{ lib, stdenv, fetchurl, fetchpatch, python3, zlib, pkg-config, glib, buildPackages , perl, pixman, vde2, alsa-lib, texinfo, flex , bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool , makeWrapper, runtimeShell, removeReferencesTo @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ makeWrapper removeReferencesTo pkg-config flex bison meson ninja perl python3 python3Packages.sphinx python3Packages.sphinx-rtd-theme ] + nativeBuildInputs = [ makeWrapper removeReferencesTo pkg-config flex bison meson ninja perl python3 python3.pkgs.sphinx python3.pkgs.sphinx-rtd-theme ] ++ lib.optionals gtkSupport [ wrapGAppsHook ] ++ lib.optionals stdenv.isDarwin [ sigtool ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix index 65bd4bcecb..03aba1c412 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "virt-manager"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-3ycXNBuf91kI2cJCRw0ZzaWkaIVwb/lmkOKeHNwpH9Y="; + hash = "sha256-UgZ58WLXq0U3EDt4311kv0kayVU17In4kwnQ+QN1E7A="; }; nativeBuildInputs = [ @@ -33,16 +33,6 @@ python3.pkgs.buildPythonApplication rec { pygobject3 libvirt libxml2 requests cdrtools ]; - patches = [ - # due to a recent change in setuptools-61, "packages=[]" needs to be included - # this patch can hopefully be removed, once virt-manager has an upstream version bump - (fetchpatch { - name = "fix-for-setuptools-61.patch"; - url = "https://github.com/virt-manager/virt-manager/commit/46dc0616308a73d1ce3ccc6d716cf8bbcaac6474.patch"; - sha256 = "sha256-/RZG+7Pmd7rmxMZf8Fvg09dUggs2MqXZahfRQ5cLcuM="; - }) - ]; - postPatch = '' sed -i 's|/usr/share/libvirt/cpu_map.xml|${system-libvirt}/share/libvirt/cpu_map.xml|g' virtinst/capabilities.py sed -i "/'install_egg_info'/d" setup.py @@ -80,6 +70,8 @@ python3.pkgs.buildPythonApplication rec { disabledTests = [ "testAlterDisk" "test_misc_nonpredicatble_generate" + "test_disk_dir_searchable" # does something strange with permissions + "testCLI0001virt_install_many_devices" # expects /var to exist ]; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/phosh/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/phosh/default.nix index 11a5c9b56c..a9b16c53fd 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/phosh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/phosh/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , meson , ninja , pkg-config @@ -28,11 +27,12 @@ , networkmanager , polkit , libsecret +, evolution-data-server }: stdenv.mkDerivation rec { pname = "phosh"; - version = "0.17.0"; + version = "0.21.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects - sha256 = "sha256-o/0NJZo1EPpXguN/tkUc+/9XaVTQWaLGe+2pU0B91Cg="; + sha256 = "sha256-NJLuOUBQmgphGMFZN3MsIOP99YI+CxyR+JuybX3Vnpc="; }; nativeBuildInputs = [ @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { libxkbcommon libgudev callaudiod + evolution-data-server pulseaudio glib gcr @@ -83,19 +84,11 @@ stdenv.mkDerivation rec { # Temporarily disabled - Test is broken (SIGABRT) doCheck = false; - mesonFlags = [ "-Dsystemd=true" "-Dcompositor=${phoc}/bin/phoc" ]; - - patches = [ - # build: Adjust to polkit version changes - (fetchpatch { - url = "https://gitlab.gnome.org/World/Phosh/phosh/-/commit/16b46e295b86cbf1beaccf8218cf65ebb4b7a6f1.patch"; - sha256 = "sha256-Db1OEdiI1QBHGEBs1Coi7LTF9bCScdDgxmovpBdIY/g="; - }) - # polkit-auth-agent: Scope cleanup function for PolkitAgentListener - (fetchpatch { - url = "https://gitlab.gnome.org/World/Phosh/phosh/-/commit/b864653df50bfd8f34766fc6b37a3bf32cfbdfa4.patch"; - sha256 = "sha256-YCw3tGk94NAa6PPTmA1lCJVzzi9GC74BmvtTcvuHPh0="; - }) + mesonFlags = [ + "-Dsystemd=true" + "-Dcompositor=${phoc}/bin/phoc" + # https://github.com/NixOS/nixpkgs/issues/36468 + "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/build-support/coq/extra-lib.nix b/third_party/nixpkgs/pkgs/build-support/coq/extra-lib.nix index 65b48f5112..3c226b4920 100644 --- a/third_party/nixpkgs/pkgs/build-support/coq/extra-lib.nix +++ b/third_party/nixpkgs/pkgs/build-support/coq/extra-lib.nix @@ -142,4 +142,52 @@ with builtins; with lib; recursiveUpdate lib (rec { if cl?case then compare cl.case var else all (equal true) (zipListsWith compare cl.cases var); in switch-if (map (cl: { cond = combine cl var; inherit (cl) out; }) clauses) default; + + /* Override arguments to mkCoqDerivation for a Coq library. + + This function allows you to easily override arguments to mkCoqDerivation, + even when they are not exposed by the Coq library directly. + + Type: overrideCoqDerivation :: AttrSet -> CoqLibraryDerivation -> CoqLibraryDerivation + + Example: + + ```nix + coqPackages.lib.overrideCoqDerivation + { + defaultVersion = "9999"; + release."9999".sha256 = "1lq8x86vd3vqqh2yq6hvyagpnhfq5wmk5pg2z0xq7b7dbbbhyfkw"; + } + coqPackages.QuickChick; + ``` + + This example overrides the `defaultVersion` and `release` arguments that + are passed to `mkCoqDerivation` in the QuickChick derivation. + + Note that there is a difference between using `.override` on a Coq + library vs this `overrideCoqDerivation` function. `.override` allows you + to modify arguments to the derivation itself, for instance by passing + different versions of dependencies: + + ```nix + coqPackages.QuickChick.override { ssreflect = my-cool-ssreflect; } + ``` + + whereas `overrideCoqDerivation` allows you to override arguments to the + call to `mkCoqDerivation` in the Coq library. + + Note that all Coq libraries in Nixpkgs have a `version` argument for + easily using a different version. So if all you want to do is use a + different version, and the derivation for the Coq library already has + support for the version you want, you likely only need to update the + `version` argument on the library derivation. This is done with + `.override`: + + ```nix + coqPackages.QuickChick.override { version = "1.4.0"; } + ``` + */ + overrideCoqDerivation = f: drv: (drv.override (args: { + mkCoqDerivation = drv_: (args.mkCoqDerivation drv_).override f; + })); }) diff --git a/third_party/nixpkgs/pkgs/common-updater/scripts/update-source-version b/third_party/nixpkgs/pkgs/common-updater/scripts/update-source-version index fbeb375fa8..480fb7b226 100755 --- a/third_party/nixpkgs/pkgs/common-updater/scripts/update-source-version +++ b/third_party/nixpkgs/pkgs/common-updater/scripts/update-source-version @@ -133,12 +133,6 @@ if [[ $(grep --count "$oldHash" "$nixFile") != 1 ]]; then die "Couldn't locate old source hash '$oldHash' (or it appeared more than once) in '$nixFile'!" fi -oldUrl=$(nix-instantiate $systemArg --eval -E "with $importTree; builtins.elemAt ($attr.$sourceKey.drvAttrs.urls or [ $attr.$sourceKey.url ]) 0" | tr -d '"') - -if [[ -z "$oldUrl" ]]; then - die "Couldn't evaluate source url from '$attr.$sourceKey'!" -fi - oldVersion=$(nix-instantiate $systemArg --eval -E "with $importTree; $attr.${versionKey} or (builtins.parseDrvName $attr.name).version" | tr -d '"') if [[ -z "$oldVersion" ]]; then @@ -162,7 +156,6 @@ fi # Escape regex metacharacter that are allowed in store path names oldVersionEscaped=$(echo "$oldVersion" | sed -re 's|[.+]|\\&|g') -oldUrlEscaped=$(echo "$oldUrl" | sed -re 's|[${}.+]|\\&|g') if [[ $(grep --count --extended-regexp "^\s*(let\b)?\s*$versionKey\s*=\s*\"$oldVersionEscaped\"" "$nixFile") = 1 ]]; then pattern="/\b$versionKey\b\s*=/ s|\"$oldVersionEscaped\"|\"$newVersion\"|" @@ -206,30 +199,36 @@ oldHashEscaped=$(echo "$oldHash" | sed -re 's|[+]|\\&|g') tempHashEscaped=$(echo "$tempHash" | sed -re 's|[+]|\\&|g') # Replace new version -sed -i.bak "$nixFile" -re "$pattern" -if cmp -s "$nixFile" "$nixFile.bak"; then +sed -i.cmp "$nixFile" -re "$pattern" +if cmp -s "$nixFile" "$nixFile.cmp"; then die "Failed to replace version '$oldVersion' to '$newVersion' in '$attr'!" fi # Replace new URL if [[ -n "$newUrl" ]]; then - sed -i "$nixFile" -re "s|\"$oldUrlEscaped\"|\"$newUrl\"|" + oldUrl=$(nix-instantiate $systemArg --eval -E "with $importTree; builtins.elemAt ($attr.$sourceKey.drvAttrs.urls or [ $attr.$sourceKey.url ]) 0" | tr -d '"') + if [[ -z "$oldUrl" ]]; then + die "Couldn't evaluate source url from '$attr.$sourceKey'!" + fi - if cmp -s "$nixFile" "$nixFile.bak"; then + # Escape regex metacharacter that are allowed in store path names + oldUrlEscaped=$(echo "$oldUrl" | sed -re 's|[${}.+]|\\&|g') + + sed -i.cmp "$nixFile" -re "s|\"$oldUrlEscaped\"|\"$newUrl\"|" + if cmp -s "$nixFile" "$nixFile.cmp"; then die "Failed to replace source URL '$oldUrl' to '$newUrl' in '$attr'!" fi fi -sed -i "$nixFile" -re "s|\"$oldHashEscaped\"|\"$tempHash\"|" -if cmp -s "$nixFile" "$nixFile.bak"; then +sed -i.cmp "$nixFile" -re "s|\"$oldHashEscaped\"|\"$tempHash\"|" +if cmp -s "$nixFile" "$nixFile.cmp"; then die "Failed to replace source hash of '$attr' to a temporary hash!" fi # Replace new revision, if given if [[ -n "$newRevision" ]]; then - sed -i "$nixFile" -re "s|\"$oldRevision\"|\"$newRevision\"|" - - if cmp -s "$nixFile" "$nixFile.bak"; then + sed -i.cmp "$nixFile" -re "s|\"$oldRevision\"|\"$newRevision\"|" + if cmp -s "$nixFile" "$nixFile.cmp"; then die "Failed to replace source revision '$oldRevision' to '$newRevision' in '$attr'!" fi fi @@ -254,16 +253,15 @@ if [[ -z "$newHash" ]]; then fi if [[ -z "${ignoreSameHash}" && "$oldVersion" != "$newVersion" && "$oldHash" = "$newHash" ]]; then - mv "$nixFile.bak" "$nixFile" die "Both the old and new source hashes of '$attr.$sourceKey' were equivalent. Please fix the package's source URL to be dependent on '\${version}'!" fi -sed -i "$nixFile" -re "s|\"$tempHashEscaped\"|\"$newHash\"|" -if cmp -s "$nixFile" "$nixFile.bak"; then +sed -i.cmp "$nixFile" -re "s|\"$tempHashEscaped\"|\"$newHash\"|" +if cmp -s "$nixFile" "$nixFile.cmp"; then die "Failed to replace temporary source hash of '$attr' to the final source hash!" fi -rm -f "$nixFile.bak" +rm -f "$nixFile.cmp" rm -f "$attr.fetchlog" if [ -n "$printChanges" ]; then diff --git a/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix index 880fc6f423..cf90cf6757 100644 --- a/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20220808"; + version = "20220910"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "sha256-eOsqBIo7Bs/5mbD8x2Q+RO49Cqxd1KoqNbTsiV9RDWg="; + sha256 = "sha256-ohZe7TCvbQcJmUyFY7DN6BgfAAqW1HhXi1UXXPh0t4Q="; }; nativeBuildInputs = [ gtk3 papirus-folders ]; diff --git a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json index 6180f9185e..7a9f81521e 100644 --- a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json +++ b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "3c1ad4d78a1d5fc29c5e169f5ba9f82bc580d2f0", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3c1ad4d78a1d5fc29c5e169f5ba9f82bc580d2f0.tar.gz", - "sha256": "0cd24ibv0i2zq0vvawafm0hqjgv70flmna84g320h5jy3lc0qrv4", - "msg": "Update from Hackage at 2022-08-20T06:29:36Z" + "commit": "0fd2081c5296d9891054f8c742545d3871d76485", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0fd2081c5296d9891054f8c742545d3871d76485.tar.gz", + "sha256": "1bxxlks9bjf9lmshlg8777j6h7gb5mpd9lxj97nkqh32gnlj8m38", + "msg": "Update from Hackage at 2022-08-28T23:15:42Z" } diff --git a/third_party/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix b/third_party/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix index 8fc5d74485..78d7a3005f 100644 --- a/third_party/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,14 +3,14 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20220808014309"; + version = "20220908131416"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - sha256 = "sha256-pqe6AjXDTN71tShD41/tQFljRiH7qJaZ8w5lcTs6dxk="; + sha256 = "sha256-LXtdyLINmUcyT2x9w7KCoLLifcYrSq6JN+2J9wbKjCI="; }; - vendorSha256 = "sha256-Igx8yGWWVmVEogvbrosaK13LVs+ZZuYLBNji7iSfzdo="; + vendorSha256 = "sha256-CCY3CgjA1w4svzmkaI2Jt272Rrt5UOt5sbVDAWRRfzk="; meta = with lib; { description = "community managed domain list"; homepage = "https://github.com/v2fly/domain-list-community"; diff --git a/third_party/nixpkgs/pkgs/data/themes/adapta-kde/default.nix b/third_party/nixpkgs/pkgs/data/themes/adapta-kde/default.nix index 4feeeaa6c0..a93e78480b 100644 --- a/third_party/nixpkgs/pkgs/data/themes/adapta-kde/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/adapta-kde/default.nix @@ -13,11 +13,6 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - # Make this a fixed-output derivation - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - ouputHash = "0rxhk8sp81vb2mngqr7kn9vlqyliq9aqj2d25igcr01v5axbxbzb"; - meta = { description = "A port of the Adapta theme for Plasma"; homepage = "https://git.io/adapta-kde"; diff --git a/third_party/nixpkgs/pkgs/data/themes/arc-kde/default.nix b/third_party/nixpkgs/pkgs/data/themes/arc-kde/default.nix index 267e1b8b8b..2b41baa634 100644 --- a/third_party/nixpkgs/pkgs/data/themes/arc-kde/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/arc-kde/default.nix @@ -2,22 +2,17 @@ stdenv.mkDerivation rec { pname = "arc-kde-theme"; - version = "20220810"; + version = "20220908"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "arc-kde"; rev = version; - sha256 = "sha256-atL0sW3AedQl7PabOQOjeJ5U8a4/J4x0rxFCbxJ4ONA="; + sha256 = "sha256-dxk8YpJB4XaZHD/O+WvQUFKJD2TE38VZyC5orn4N7BA="; }; makeFlags = [ "PREFIX=$(out)" ]; - # Make this a fixed-output derivation - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - ouputHash = "2c2def57092a399aa1c450699cbb8639f47d751157b18db17"; - meta = { description = "A port of the arc theme for Plasma"; homepage = "https://git.io/arc-kde"; diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/warpinator/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/warpinator/default.nix index a720c2fb4c..0fafc538cd 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/warpinator/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/warpinator/default.nix @@ -10,6 +10,7 @@ , gettext , polkit , glib +, gitUpdater }: python3.pkgs.buildPythonApplication rec { @@ -72,6 +73,12 @@ python3.pkgs.buildPythonApplication rec { chmod -x+X $out/libexec/warpinator/*.py ''; + passthru.updateScript = gitUpdater { + inherit pname version; + attrPath = "cinnamon.warpinator"; + ignoredVersions = "^master.*"; + }; + meta = with lib; { homepage = "https://github.com/linuxmint/warpinator"; description = "Share files across the LAN"; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix index fc33e5a683..d3ddb03b92 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-archiver/default.nix @@ -5,7 +5,9 @@ , pkg-config , lxqt-build-tools , json-glib +, libexif , libfm-qt +, menu-cache , qtbase , qttools , qtx11extras @@ -31,7 +33,9 @@ mkDerivation rec { buildInputs = [ json-glib + libexif libfm-qt + menu-cache qtbase qttools qtx11extras diff --git a/third_party/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix index cc3a6ce30c..0d1dd2baa1 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "caja-extensions"; - version = "1.26.0"; + version = "1.26.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "03zwv3yl5553cnp6jjn7vr4l28dcdhsap7qimlrbvy20119kj5gh"; + sha256 = "WJwZ4/oQJC1iOaXMuVhVmENqVuvpTS6ypQtZUMzh1SA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix index 507b13896f..e12a8be568 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "bismuth"; - version = "3.1.2"; + version = "3.1.3"; src = fetchFromGitHub { owner = "Bismuth-Forge"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sYehZ9f+V7xeqYaw5p6BCm2XWsC/mpmsak6pUFIWAbI="; + sha256 = "sha256-IWwFsYqoqW3924+pf8L+acIt31aU/mhqakXbT9Q4Bqw="; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix index 8a50a0d0fa..8a376862d9 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix @@ -1,14 +1,32 @@ -{ lib, mkXfceDerivation, glib, gtk3, libnotify, libxfce4ui, libxfce4util -, xfce4-panel, xfconf }: +{ lib +, mkXfceDerivation +, glib +, gtk3 +, libnotify +, libxfce4ui +, libxfce4util +, xfce4-panel +, xfconf +}: mkXfceDerivation { category = "apps"; pname = "xfce4-notifyd"; - version = "0.6.3"; + version = "0.6.4"; - sha256 = "sha256-JcHxqKLl4F4FQv7lE64gWUorCvl5g5mSD+jEmj1ORfY="; + sha256 = "sha256-H/qAfgwM0qaIxpVlSAUJJ4/Z3WtvYxJb2TtjKHK6AjE="; - buildInputs = [ gtk3 glib libnotify libxfce4ui libxfce4util xfce4-panel xfconf ]; + buildInputs = [ + gtk3 + glib + libnotify + libxfce4ui + libxfce4util + xfce4-panel + xfconf + ]; + + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; configureFlags = [ "--enable-dbus-start-daemon" diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix index 5915a43372..7591ed1e0e 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix @@ -18,8 +18,8 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-pulseaudio-plugin"; - version = "0.4.3"; - sha256 = "sha256-+E1pyDP140xUbYPZXhdiEjdU0t8Un+IjV7Ek+hAX3OU="; + version = "0.4.4"; + sha256 = "sha256-arnHB9ziQm/vQk6hYHS+MKL5dJeEVxUX+SwjZ3/LcEQ="; nativeBuildInputs = [ automakeAddFlags diff --git a/third_party/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix b/third_party/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix index 0df2476c4b..c86731c493 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { ] ++ (lib.optionals stdenv.isDarwin [ "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin" "C_COMPILER=$(CC)" + "LINKER_OPTIONS=-headerpad_max_install_names" ]); nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/default.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/default.nix index 6c579373f5..7c78a78457 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/default.nix @@ -83,7 +83,6 @@ in inherit CoreFoundation Security; }; clippy = self.callPackage ./clippy.nix { inherit Security; }; - rls = self.callPackage ./rls { inherit CoreFoundation Security SystemConfiguration; }; }); }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/rls/default.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/rls/default.nix deleted file mode 100644 index 036031d98f..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/rls/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, stdenv, makeWrapper, fetchFromGitHub, rustPlatform -, openssh, openssl, pkg-config, cmake, zlib, curl, libiconv -, CoreFoundation, Security, SystemConfiguration }: - -rustPlatform.buildRustPackage rec { - pname = "rls"; - inherit (rustPlatform.rust.rustc) src version; - - # changes hash of vendor directory otherwise - dontUpdateAutotoolsGnuConfigScripts = true; - - cargoVendorDir = "vendor"; - buildAndTestSubdir = "src/tools/rls"; - - preBuild = '' - # client tests are flaky - rm ${buildAndTestSubdir}/tests/client.rs - ''; - - # a nightly compiler is required unless we use this cheat code. - RUSTC_BOOTSTRAP=1; - - # As of rustc 1.45.0, these env vars are required to build rls - # (due to https://github.com/rust-lang/rust/pull/72001) - CFG_RELEASE = "${rustPlatform.rust.rustc.version}-nightly"; - CFG_RELEASE_CHANNEL = "nightly"; - - # rls-rustc links to rustc_private crates - CARGO_BUILD_RUSTFLAGS = if stdenv.isDarwin then "-C rpath" else null; - - nativeBuildInputs = [ pkg-config cmake makeWrapper ]; - buildInputs = [ openssh openssl curl zlib libiconv rustPlatform.rust.rustc.llvm ] - ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security SystemConfiguration ]; - - doCheck = true; - - doInstallCheck = true; - installCheckPhase = '' - $out/bin/rls --version - ''; - - RUST_SRC_PATH = rustPlatform.rustLibSrc; - postInstall = '' - wrapProgram $out/bin/rls --set-default RUST_SRC_PATH ${rustPlatform.rustLibSrc} - ''; - - meta = with lib; { - description = "Rust Language Server - provides information about Rust programs to IDEs and other tools"; - homepage = "https://github.com/rust-lang/rls/"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ symphorien ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/compilers/sagittarius-scheme/default.nix b/third_party/nixpkgs/pkgs/development/compilers/sagittarius-scheme/default.nix index 5cac2a8457..7f48108314 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/sagittarius-scheme/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/sagittarius-scheme/default.nix @@ -16,10 +16,10 @@ let platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" in stdenv.mkDerivation rec { pname = "sagittarius-scheme"; - version = "0.9.8"; + version = "0.9.9"; src = fetchurl { url = "https://bitbucket.org/ktakashi/${pname}/downloads/sagittarius-${version}.tar.gz"; - sha256 = "sha256-CdnBpTq+c04JdipfhIiI8EkVFsCc00Gh+cA5zYENMqI="; + sha256 = "sha256-UB7Lfyc2afTIVW5SIiHxXi2wyoVC2Q2ClTkSOQ6UmPg="; }; preBuild = '' # since we lack rpath during build, need to explicitly add build path diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/gappalib/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/gappalib/default.nix index 903b3518e5..52e69e90d1 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/gappalib/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/gappalib/default.nix @@ -6,7 +6,8 @@ with lib; mkCoqDerivation { owner = "gappa"; domain = "gitlab.inria.fr"; inherit version; - defaultVersion = if versions.range "8.8" "8.15" coq.coq-version then "1.5.1" else null; + defaultVersion = if versions.range "8.8" "8.16" coq.coq-version then "1.5.2" else null; + release."1.5.2".sha256 = "sha256-A021Bhqz5r2CZBayfjIiWrCIfUlejcQAfbTmOaf6QTM="; release."1.5.1".sha256 = "1806bq1z6q5rq2ma7d5kfbqfyfr755hjg0dq7b2llry8fx9cxjsg"; release."1.5.0".sha256 = "1i1c0gakffxqqqqw064cbvc243yl325hxd50jmczr6mk18igk41n"; release."1.4.5".sha256 = "081hib1d9wfm29kis390qsqch8v6fs3q71g2rgbbzx5y5cf48n9k"; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index b168eab18c..4f7689ce77 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -99,7 +99,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "0p9qd7yasdji5kwxn4d0hrv9hnxbzfsczknldh8jav3ynhg8k6c9"; + sha256 = "19n60rx4mpr52551mvm0i5kgy32099rvgnihvmh5np09n2f81c2r"; # delete android and Android directories which cause issues on # darwin (case insensitive directory). Since we don't need them # during the build process, we can delete it to prevent a hash @@ -820,9 +820,9 @@ self: super: { testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_9_3 ]; testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ]; }) (super.sensei.override { - hspec = self.hspec_2_10_0_1; + hspec = self.hspec_2_10_1; hspec-wai = super.hspec-wai.override { - hspec = self.hspec_2_10_0_1; + hspec = self.hspec_2_10_1; }; }); @@ -1223,9 +1223,18 @@ self: super: { # The test suite depends on an impure cabal-install installation in # $HOME, which we don't have in our build sandbox. - cabal-install-parsers = dontCheck (super.cabal-install-parsers.override { - Cabal = self.Cabal_3_6_3_0; - }); + # 2022-08-31: Jailbreak is done to allow aeson 2.0.*: + # https://github.com/haskell-CI/haskell-ci/commit/6ad0d5d701cbe101013335d597acaf5feadd3ab9#r82681900 + cabal-install-parsers = doJailbreak (dontCheck (super.cabal-install-parsers.override { + Cabal-syntax = self.Cabal-syntax_3_8_1_0; + })); + cabal-install-parsers_0_4_5 = doDistribute ( + dontCheck ( + super.cabal-install-parsers_0_4_5.override { + Cabal = self.Cabal_3_6_3_0; + } + ) + ); # 2022-03-12: Pick patches from master for compat with Stackage Nightly gitit = appendPatches [ @@ -1633,14 +1642,14 @@ self: super: { servant-openapi3 = dontCheck super.servant-openapi3; # Give hspec 2.10.* correct dependency versions without overrideScope - hspec_2_10_0_1 = doDistribute (super.hspec_2_10_0_1.override { - hspec-discover = self.hspec-discover_2_10_0_1; - hspec-core = self.hspec-core_2_10_0_1; + hspec_2_10_1 = doDistribute (super.hspec_2_10_1.override { + hspec-discover = self.hspec-discover_2_10_1; + hspec-core = self.hspec-core_2_10_1; }); - hspec-discover_2_10_0_1 = super.hspec-discover_2_10_0_1.override { + hspec-discover_2_10_1 = super.hspec-discover_2_10_1.override { hspec-meta = self.hspec-meta_2_9_3; }; - hspec-core_2_10_0_1 = super.hspec-core_2_10_0_1.override { + hspec-core_2_10_1 = super.hspec-core_2_10_1.override { hspec-meta = self.hspec-meta_2_9_3; }; @@ -2022,19 +2031,9 @@ self: super: { haskell-ci = super.haskell-ci.overrideScope (self: super: { Cabal = self.Cabal_3_6_3_0; ShellCheck = self.ShellCheck_0_7_2; + cabal-install-parsers = self.cabal-install-parsers_0_4_5; }); - # Build haskell-ci from git repository - haskell-ci-unstable = overrideSrc rec { - version = "0.14.1-${builtins.substring 0 7 src.rev}"; - src = pkgs.fetchFromGitHub { - owner = "haskell-CI"; - repo = "haskell-ci"; - rev = "8311a999b8e8be3aa31f65f314def256aa2d5535"; - sha256 = "169jaqm4xs2almmvqsk567wayxs0g6kn0l5877c03hzr3d9ykrav"; - }; - } self.haskell-ci; - large-hashable = lib.pipe (super.large-hashable.override { # https://github.com/factisresearch/large-hashable/commit/5ec9d2c7233fc4445303564047c992b693e1155c utf8-light = null; @@ -2186,7 +2185,19 @@ self: super: { # Fixes https://github.com/NixOS/nixpkgs/issues/140613 # https://github.com/recursion-schemes/recursion-schemes/issues/128 - recursion-schemes = appendPatch ./patches/recursion-schemes-128.patch super.recursion-schemes; + recursion-schemes = overrideCabal (drv: { + patches = drv.patches or [] ++ [ + ./patches/recursion-schemes-128.patch + ]; + # make sure line endings don't break the patch + prePatch = drv.prePatch or "" + '' + "${pkgs.buildPackages.dos2unix}/bin/dos2unix" *.cabal + ''; + }) super.recursion-schemes; + + # 2022-08-30 Too strict bounds on finite-typelits + # https://github.com/jumper149/blucontrol/issues/1 + blucontrol = doJailbreak super.blucontrol; # Fix from https://github.com/brendanhay/gogol/pull/144 which has seen no release # Can't use fetchpatch as it required tweaking the line endings as the .cabal @@ -2544,6 +2555,10 @@ self: super: { testTarget = "regex-tdfa-unittest"; } super.regex-tdfa; + # 2022-09-01: + # Restrictive upper bound on base. + # Remove once version 1.* is released + monad-bayes = doJailbreak super.monad-bayes; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super // (let # We need to build purescript with these dependencies and thus also its reverse # dependencies to avoid version mismatches in their dependency closure. diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 1f82ecebd6..3650766cfd 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -93,7 +93,8 @@ self: super: { time-compat = doJailbreak super.time-compat; http-media = unmarkBroken (doJailbreak super.http-media); servant-server = unmarkBroken (doJailbreak super.servant-server); - foundation = dontCheck super.foundation; + basement = doDistribute self.basement_0_0_14; + foundation = doDistribute (dontCheck self.foundation_0_0_28); vault = dontHaddock super.vault; # https://github.com/snapframework/snap-core/issues/288 diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 5fb3ae9f6c..41228cfb29 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -87,7 +87,7 @@ self: super: { constraints = doJailbreak super.constraints; cpphs = overrideCabal (drv: { postPatch = "sed -i -e 's,time >=1.5 && <1.11,time >=1.5 \\&\\& <1.12,' cpphs.cabal";}) super.cpphs; data-fix = doJailbreak super.data-fix; - dbus = self.dbus_1_2_25; + dbus = self.dbus_1_2_26; dec = doJailbreak super.dec; ed25519 = doJailbreak super.ed25519; ghc-byteorder = doJailbreak super.ghc-byteorder; @@ -130,13 +130,27 @@ self: super: { retrie = doDistribute (dontCheck self.retrie_1_2_0_1); singleton-bool = doJailbreak super.singleton-bool; servant = doJailbreak super.servant; - servant-auth = doJailbreak super.servant-auth; servant-swagger = doJailbreak super.servant-swagger; + + # 2022-09-02: Too strict bounds on lens + # https://github.com/haskell-servant/servant/pull/1607/files + servant-docs = doJailbreak super.servant-docs; + servant-foreign = doJailbreak super.servant-foreign; + servant-auth = doJailbreak super.servant-auth; + servant-auth-docs = doJailbreak super.servant-auth-docs; + servant-auth-server = doJailbreak super.servant-auth-server; servant-auth-swagger = doJailbreak super.servant-auth-swagger; + # 2022-09-02: Too strict bounds on lens + # https://github.com/haskell-servant/servant-multipart/pull/64 + servant-multipart = doJailbreak super.servant-multipart; + # 2022-09-02: Too strict bounds on lens + # https://github.com/GetShopTV/swagger2/pull/242 + swagger2 = doJailbreak super.swagger2; + shelly = doJailbreak super.shelly; splitmix = doJailbreak super.splitmix; tasty-hspec = doJailbreak super.tasty-hspec; - th-desugar = self.th-desugar_1_13_1; + th-desugar = self.th-desugar_1_14; time-compat = doJailbreak super.time-compat; tomland = doJailbreak super.tomland; type-equality = doJailbreak super.type-equality; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index af19c91216..b2a861d53c 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -70,6 +70,7 @@ broken-packages: - aeson-bson - aeson-decode - aeson-default + - aeson-dependent-sum - aeson-deriving - aeson-diff-generic - aeson-filthy @@ -1144,6 +1145,7 @@ broken-packages: - djinn-th - dmcc - dmenu + - dns-patterns - dnsrbl - dnssd - dobutok @@ -1344,7 +1346,6 @@ broken-packages: - etcd - ethereum-rlp - eurofxref - - evdev - eve - eved - event @@ -2144,7 +2145,6 @@ broken-packages: - heterogeneous-list-literals - hetris - heukarya - - hevm - HExcel - hexchat - hexif @@ -2421,6 +2421,7 @@ broken-packages: - hsns - hsntp - hs-openmoji-data + - hs-opentelemetry-instrumentation-hspec - hsoptions - hsoz - hsparql @@ -2809,7 +2810,6 @@ broken-packages: - kd-tree - keccak - keera-hails-reactivevalues - - keid-render-basic - keid-ui-dearimgui - keiretsu - kempe @@ -3273,7 +3273,6 @@ broken-packages: - monadacme - monad-atom - monad-atom-simple - - monad-bayes - monad-branch - MonadCatchIO-transformers - monad-choice @@ -4069,6 +4068,7 @@ broken-packages: - proxy-mapping - psc-ide - pseudo-trie + - psx - PTQ - publicsuffix - publicsuffixlistcreate @@ -5068,6 +5068,7 @@ broken-packages: - text-ascii - text-builder-linear - text-containers + - text-display - text-format-heavy - text-generic-pretty - text-icu-normalized @@ -5198,6 +5199,7 @@ broken-packages: - tracetree - tracked-files - tracker + - trackit - traction - tracy - traildb diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 72fda2b3a1..13aa881032 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -150,6 +150,9 @@ extra-packages: - weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7 - weeder == 2.3.* # 2022-05-31: preserve for GHC 9.0.2 - brick == 0.70.* # 2022-08-13: needed by matterhorn-50200.17.0 + - basement < 0.0.15 # 2022-08-30: last version to support GHC < 8.10 + - foundation < 0.0.29 # 2022-08-30: last version to support GHC < 8.10 + - cabal-install-parsers < 0.5 # 2022-08-31: required by haskell-ci 0.14.3 package-maintainers: abbradar: @@ -535,6 +538,8 @@ supported-platforms: dx9base: [ platforms.windows ] dx9d3d: [ platforms.windows ] dx9d3dx: [ platforms.windows ] + evdev: [ platforms.linux ] + evdev-streamly: [ platforms.linux ] geomancy: [ platforms.x86 ] # x86 intrinsics gi-gtkosxapplication: [ platforms.darwin ] gtk-mac-integration: [ platforms.darwin ] diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 06627c6be6..01beb6f773 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 19.19 +# Stackage LTS 19.20 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -13,11 +13,11 @@ default-package-overrides: - active ==0.2.0.15 - ad ==4.5.2 - ad-delcont ==0.3.0.0 - - adjunctions ==4.4.1 + - adjunctions ==4.4.2 - adler32 ==0.1.2.0 - advent-of-code-api ==0.2.8.1 - - aern2-mp ==0.2.9.1 - - aern2-real ==0.2.9.1 + - aern2-mp ==0.2.10.0 + - aern2-real ==0.2.10.0 - aeson ==2.0.3.0 - aeson-attoparsec ==0.0.0 - aeson-better-errors ==0.9.1.1 @@ -140,7 +140,7 @@ default-package-overrides: - base64-string ==0.2 - base-compat ==0.11.2 - base-compat-batteries ==0.11.2 - - basement ==0.0.14 + - basement ==0.0.15 - base-orphans ==0.8.7 - base-prelude ==1.6.1 - base-unicode-symbols ==0.2.4.2 @@ -315,7 +315,7 @@ default-package-overrides: - charset ==0.3.9 - charsetdetect-ae ==1.1.0.4 - Chart ==1.9.4 - - ChasingBottoms ==1.3.1.11 + - ChasingBottoms ==1.3.1.12 - cheapskate ==0.1.1.2 - cheapskate-highlight ==0.1.0.0 - cheapskate-lucid ==0.1.0.0 @@ -429,7 +429,7 @@ default-package-overrides: - convertible ==1.1.1.1 - cookie ==0.4.5 - copr-api ==0.1.0 - - core-data ==0.3.4.0 + - core-data ==0.3.6.0 - core-program ==0.4.6.4 - core-text ==0.3.8.0 - countable ==1.0 @@ -604,7 +604,7 @@ default-package-overrides: - doctest-exitcode-stdio ==0.0 - doctest-extract ==0.1 - doctest-lib ==0.1 - - doctest-parallel ==0.2.4 + - doctest-parallel ==0.2.5 - doldol ==0.4.1.2 - do-list ==1.0.1 - domain ==0.1.1.3 @@ -624,7 +624,7 @@ default-package-overrides: - drifter-sqlite ==0.1.0.0 - dsp ==0.2.5.1 - dual ==0.1.1.1 - - dual-tree ==0.2.3.0 + - dual-tree ==0.2.3.1 - dublincore-xml-conduit ==0.1.0.2 - dunai ==0.8.3 - duration ==0.2.0.0 @@ -683,7 +683,7 @@ default-package-overrides: - errors ==2.3.0 - errors-ext ==0.4.2 - ersatz ==0.4.12 - - esqueleto ==3.5.6.1 + - esqueleto ==3.5.7.0 - essence-of-live-coding ==0.2.6 - essence-of-live-coding-gloss ==0.2.6 - essence-of-live-coding-pulse ==0.2.6 @@ -725,7 +725,7 @@ default-package-overrides: - fakedata-quickcheck ==0.2.0 - fakefs ==0.3.0.2 - fakepull ==0.3.0.2 - - faktory ==1.1.2.2 + - faktory ==1.1.2.3 - fast-builder ==0.1.3.0 - fast-logger ==3.1.1 - fast-math ==1.0.2 @@ -754,7 +754,7 @@ default-package-overrides: - fin ==0.2.1 - FindBin ==0.0.5 - fingertree ==0.1.5.0 - - finite-typelits ==0.1.4.2 + - finite-typelits ==0.1.6.0 - first-class-families ==0.8.0.1 - first-class-patterns ==0.3.2.5 - fitspec ==0.4.10 @@ -793,7 +793,7 @@ default-package-overrides: - format-numbers ==0.1.0.1 - formatting ==7.1.3 - fortran-src ==0.9.0 - - foundation ==0.0.28 + - foundation ==0.0.29 - fourmolu ==0.4.0.0 - Frames ==0.7.3 - free ==5.1.9 @@ -946,7 +946,7 @@ default-package-overrides: - graph-core ==0.3.0.0 - graphite ==0.10.0.1 - graphs ==0.7.2 - - graphula ==2.0.1.1 + - graphula ==2.0.2.1 - graphviz ==2999.20.1.0 - graph-wrapper ==0.2.6.0 - gravatar ==0.8.1 @@ -1122,7 +1122,7 @@ default-package-overrides: - hslua-core ==2.1.0 - hslua-marshalling ==2.1.0 - hslua-module-doclayout ==1.0.4 - - hslua-module-path ==1.0.2 + - hslua-module-path ==1.0.3 - hslua-module-system ==1.0.2 - hslua-module-text ==1.0.2 - hslua-module-version ==1.0.2 @@ -1299,7 +1299,7 @@ default-package-overrides: - io-memoize ==1.1.1.0 - io-region ==0.1.1 - io-storage ==0.3 - - io-streams ==1.5.2.1 + - io-streams ==1.5.2.2 - ip6addr ==1.0.3 - iproute ==1.7.12 - IPv6Addr ==2.0.5 @@ -1480,7 +1480,7 @@ default-package-overrides: - markdown ==0.1.17.5 - markdown-unlit ==0.5.1 - markov-chain ==0.0.3.4 - - massiv ==1.0.1.1 + - massiv ==1.0.2.0 - massiv-io ==1.0.0.1 - massiv-persist ==1.0.0.3 - massiv-serialise ==1.0.0.2 @@ -1624,7 +1624,7 @@ default-package-overrides: - nano-erl ==0.1.0.1 - NanoID ==3.2.1 - nanospec ==0.2.2 - - nanovg ==0.8.0.0 + - nanovg ==0.8.1.0 - nats ==1.1.2 - natural-arithmetic ==0.1.3.0 - natural-induction ==0.2.0.0 @@ -1953,7 +1953,7 @@ default-package-overrides: - pulse-simple ==0.1.14 - pureMD5 ==2.1.4 - purescript-bridge ==0.14.0.0 - - pusher-http-haskell ==2.1.0.10 + - pusher-http-haskell ==2.1.0.11 - pvar ==1.0.0.0 - PyF ==0.10.2.0 - qchas ==1.1.0.1 @@ -2343,7 +2343,7 @@ default-package-overrides: - Stream ==0.4.7.2 - streaming ==0.2.3.1 - streaming-attoparsec ==1.0.0.1 - - streaming-bytestring ==0.2.2 + - streaming-bytestring ==0.2.3 - streaming-cassava ==0.2.0.0 - streaming-commons ==0.2.2.4 - streamly ==0.8.1.1 @@ -2598,7 +2598,7 @@ default-package-overrides: - type-spec ==0.4.0.0 - typography-geometry ==1.0.1.0 - tz ==0.1.3.6 - - tzdata ==0.2.20220810.0 + - tzdata ==0.2.20220815.0 - ua-parser ==0.7.7.0 - uglymemo ==0.1.0.1 - unagi-chan ==0.4.1.4 @@ -2840,7 +2840,7 @@ with-compiler: ghc-9.0.2 - yesod-auth ==1.6.11 - yesod-auth-basic ==0.1.0.3 - yesod-auth-hashdb ==1.7.1.7 - - yesod-auth-oauth2 ==0.7.0.1 + - yesod-auth-oauth2 ==0.7.0.2 - yesod-bin ==1.6.2.1 - yesod-core ==1.6.24.0 - yesod-eventsource ==1.6.0.1 diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 0a5cc001f8..cc89d688c2 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1332,7 +1332,6 @@ dont-distribute-packages: - ethereum-client-haskell - ethereum-merkle-patricia-db - euphoria - - evdev-streamly - eve-cli - event-monad - eventful-dynamodb @@ -2184,6 +2183,7 @@ dont-distribute-packages: - hsx-jmacro - hsx-xhtml - html-kure + - html-parse-util - htoml-parse - hts - htsn-import diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index e89d77d5fa..c9bea8e922 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -738,8 +738,10 @@ self: super: builtins.intersectAttrs super { ''; }) super.haskell-language-server; + # NOTE: this patch updates the hevm code to work with the latest packages that broke the build + # it's temporary until hevm version 0.50.0 is released - https://github.com/ethereum/hevm/milestone/1 # tests depend on a specific version of solc - hevm = dontCheck (doJailbreak super.hevm); + hevm = dontCheck (appendPatch ./patches/hevm-update-deps.patch super.hevm); # hadolint enables static linking by default in the cabal file, so we have to explicitly disable it. # https://github.com/hadolint/hadolint/commit/e1305042c62d52c2af4d77cdce5d62f6a0a3ce7b @@ -980,6 +982,14 @@ self: super: builtins.intersectAttrs super { ''; }) super.jacinda; + # Smoke test can't be executed in sandbox + # https://github.com/georgefst/evdev/issues/25 + evdev = overrideCabal (drv: { + testFlags = drv.testFlags or [] ++ [ + "-p" "!/Smoke/" + ]; + }) super.evdev; + # Tests assume dist-newstyle build directory is present cabal-hoogle = dontCheck super.cabal-hoogle; @@ -1026,6 +1036,8 @@ self: super: builtins.intersectAttrs super { broken = false; }) super.cabal-install; + keid-render-basic = addBuildTool pkgs.glslang super.keid-render-basic; + # haskell-language-server plugins all use the same test harness so we give them what we want in this loop. } // pkgs.lib.mapAttrs (_: overrideCabal (drv: { diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index 8ca53ae36b..d4b7c96434 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -2134,8 +2134,8 @@ self: { }: mkDerivation { pname = "BlogLiterately"; - version = "0.8.8"; - sha256 = "1g374dxdvs2mg9y5aq07qkff4srd53rhanav2fdz1g73ssbdjyhl"; + version = "0.8.8.1"; + sha256 = "1jj3daw8vr11v4dlvdkd7gddkpiy484mpk8dl9zgns2wnq5ibrkj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -3281,24 +3281,6 @@ self: { }) {}; "ChasingBottoms" = callPackage - ({ mkDerivation, array, base, containers, mtl, QuickCheck, random - , syb - }: - mkDerivation { - pname = "ChasingBottoms"; - version = "1.3.1.11"; - sha256 = "162lykrhhnj7i3l0kfzk2jwgjkdrqwamvxwf8g3hr042rqr1qywp"; - libraryHaskellDepends = [ - base containers mtl QuickCheck random syb - ]; - testHaskellDepends = [ - array base containers mtl QuickCheck random syb - ]; - description = "For testing partial and infinite values"; - license = lib.licenses.mit; - }) {}; - - "ChasingBottoms_1_3_1_12" = callPackage ({ mkDerivation, array, base, containers, mtl, QuickCheck, random , syb }: @@ -3314,7 +3296,6 @@ self: { ]; description = "For testing partial and infinite values"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "CheatSheet" = callPackage @@ -12204,8 +12185,8 @@ self: { pname = "JuicyPixels-scale-dct"; version = "0.1.2"; sha256 = "04rhrmjnh12hh2nz04k245avgdcwqfyjnsbpcrz8j9328j41nf7p"; - revision = "8"; - editedCabalFile = "08ym2s8ypmqs2viz4jr9zm54cia8b54li2zqi8dq93vjnzz0kkbf"; + revision = "9"; + editedCabalFile = "130s6r1p7v0dhfk9q0kb5qlapccap3mbkjzn2y59r00n011rs6bi"; libraryHaskellDepends = [ base base-compat carray fft JuicyPixels ]; @@ -15973,6 +15954,8 @@ self: { pname = "PSQueue"; version = "1.1.1"; sha256 = "02pgqzwxndi8cwa5fw668gfsh7z3lzbygkgcsf56bwrxwqjyz4bi"; + revision = "1"; + editedCabalFile = "02a5g59sc9jh3v4pibhjpijv8lsbiydznrpqyin7qhwsyc0p813a"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Priority Search Queue"; @@ -24683,6 +24666,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "active_0_2_0_16" = callPackage + ({ mkDerivation, base, lens, linear, QuickCheck, semigroupoids + , semigroups, vector + }: + mkDerivation { + pname = "active"; + version = "0.2.0.16"; + sha256 = "1fz2rsyk41p9f9avlmn9lrdmii5alv88lkw677mw8q6mzyxpw67i"; + libraryHaskellDepends = [ + base lens linear semigroupoids semigroups vector + ]; + testHaskellDepends = [ + base lens linear QuickCheck semigroupoids semigroups vector + ]; + description = "Abstractions for animation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "activehs" = callPackage ({ mkDerivation, activehs-base, array, base, blaze-html , blaze-markup, bytestring, cmdargs, containers, data-pprint @@ -24975,27 +24977,6 @@ self: { }) {}; "adjunctions" = callPackage - ({ mkDerivation, array, base, comonad, containers, contravariant - , distributive, free, generic-deriving, hspec, hspec-discover, mtl - , profunctors, semigroupoids, semigroups, tagged, transformers - , transformers-compat, void - }: - mkDerivation { - pname = "adjunctions"; - version = "4.4.1"; - sha256 = "0hqm86v5in7xp31wv3wvr1h7gsim96fpl0si0xrpv8060qalzwww"; - libraryHaskellDepends = [ - array base comonad containers contravariant distributive free mtl - profunctors semigroupoids semigroups tagged transformers - transformers-compat void - ]; - testHaskellDepends = [ base distributive generic-deriving hspec ]; - testToolDepends = [ hspec-discover ]; - description = "Adjunctions and representable functors"; - license = lib.licenses.bsd3; - }) {}; - - "adjunctions_4_4_2" = callPackage ({ mkDerivation, array, base, comonad, containers, contravariant , distributive, free, generic-deriving, hspec, hspec-discover, mtl , profunctors, semigroupoids, semigroups, tagged, transformers @@ -25014,7 +24995,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Adjunctions and representable functors"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "adler32" = callPackage @@ -25207,8 +25187,8 @@ self: { }: mkDerivation { pname = "aern2-mp"; - version = "0.2.9.1"; - sha256 = "0fygbfrww0qjjjfj21crkv5najrnk57qizfh8q43s4z1szad9lk1"; + version = "0.2.10.0"; + sha256 = "1rrgij6wa0479pa2qr2fqylqlymg1xxsblrdp0ahmabdaazbdqd7"; libraryHaskellDepends = [ base cdar-mBound collect-errors deepseq hspec integer-logarithms mixed-types-num QuickCheck reflection regex-tdfa template-haskell @@ -25221,15 +25201,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "aern2-mp_0_2_10_0" = callPackage + "aern2-mp_0_2_11_0" = callPackage ({ mkDerivation, base, cdar-mBound, collect-errors, deepseq, hspec , integer-logarithms, mixed-types-num, QuickCheck, reflection , regex-tdfa, template-haskell }: mkDerivation { pname = "aern2-mp"; - version = "0.2.10.0"; - sha256 = "1rrgij6wa0479pa2qr2fqylqlymg1xxsblrdp0ahmabdaazbdqd7"; + version = "0.2.11.0"; + sha256 = "17syak48rqqlssk4gsxdfl21sidfypfwsyfmxsakahflcvl9jgpy"; libraryHaskellDepends = [ base cdar-mBound collect-errors deepseq hspec integer-logarithms mixed-types-num QuickCheck reflection regex-tdfa template-haskell @@ -25249,8 +25229,8 @@ self: { }: mkDerivation { pname = "aern2-real"; - version = "0.2.9.1"; - sha256 = "09h1x62jz30spfbshriznb9nczxiigd6nhs8n2xgnsjbdrspy45q"; + version = "0.2.10.0"; + sha256 = "08hfk0q6jmrjmkr9bj488lxjr7prkhc48ghfrk33flwk59zfgh3i"; libraryHaskellDepends = [ aern2-mp base collect-errors hspec integer-logarithms mixed-types-num QuickCheck @@ -25263,14 +25243,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "aern2-real_0_2_10_0" = callPackage + "aern2-real_0_2_11_0" = callPackage ({ mkDerivation, aern2-mp, base, collect-errors, hspec , integer-logarithms, mixed-types-num, QuickCheck }: mkDerivation { pname = "aern2-real"; - version = "0.2.10.0"; - sha256 = "08hfk0q6jmrjmkr9bj488lxjr7prkhc48ghfrk33flwk59zfgh3i"; + version = "0.2.11.0"; + sha256 = "094hs147jzlg3zqary2zbpi7n18vykj0f7cw89k125zrs2h0f0v2"; libraryHaskellDepends = [ aern2-mp base collect-errors hspec integer-logarithms mixed-types-num QuickCheck @@ -25544,8 +25524,8 @@ self: { pname = "aeson-compat"; version = "0.3.10"; sha256 = "0ia3qfdpbrzhwwg4ywpdwca0z1m85k081pcz6jh1sx8qjsvcr71w"; - revision = "3"; - editedCabalFile = "0a4mvv7j18a4wiv6sssb6v4z2xn3kbrfw34842nq0hbygxqn05ri"; + revision = "4"; + editedCabalFile = "001w7pck3q5k4cnx53npllil5cblkg1ssqza4s9v347dfih3zmss"; libraryHaskellDepends = [ aeson attoparsec attoparsec-iso8601 base base-compat bytestring containers exceptions hashable scientific tagged text time @@ -25595,6 +25575,29 @@ self: { broken = true; }) {}; + "aeson-dependent-sum" = callPackage + ({ mkDerivation, aeson, base, bytestring, constraints-extras + , dependent-sum, dependent-sum-template, hedgehog, some, tasty + , tasty-discover, tasty-hedgehog, tasty-hunit, vector + }: + mkDerivation { + pname = "aeson-dependent-sum"; + version = "0.1.0.1"; + sha256 = "1ahgvs93i4lkyli7x0xiqm0fg5gyd1zbk9xzwrdishaxs1w0aw3k"; + libraryHaskellDepends = [ + aeson base constraints-extras dependent-sum some vector + ]; + testHaskellDepends = [ + aeson base bytestring constraints-extras dependent-sum + dependent-sum-template hedgehog tasty tasty-hedgehog tasty-hunit + ]; + testToolDepends = [ tasty-discover ]; + description = "JSON encoding/decoding for dependent-sum"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "aeson-deriving" = callPackage ({ mkDerivation, aeson, base, hedgehog, regex-tdfa, text , unordered-containers @@ -25675,6 +25678,8 @@ self: { pname = "aeson-extra"; version = "0.5.1.1"; sha256 = "1fzri1h2wica3grnp8ag8izakqmsb2lh0nld7xnpxk0p766wg9r7"; + revision = "1"; + editedCabalFile = "1bw3qsk0ndw0d72qz3jgb2r7z5mvaxdjl1n9s2qhrx0jz2vapn0q"; libraryHaskellDepends = [ aeson attoparsec base base-compat-batteries bytestring deepseq recursion-schemes scientific semialign template-haskell text these @@ -25958,20 +25963,17 @@ self: { license = lib.licenses.mit; }) {}; - "aeson-optics_1_2" = callPackage + "aeson-optics_1_2_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, optics-core - , optics-extra, scientific, text, text-short, unordered-containers - , vector + , optics-extra, scientific, text, text-short, vector }: mkDerivation { pname = "aeson-optics"; - version = "1.2"; - sha256 = "0p852w0ns9mkmydbhj1p3szvkw7pl83c0xaqhvn5jwdrpqj6ma74"; - revision = "1"; - editedCabalFile = "0d8f0sx4qqiqws70b1gm6ks4gw5hwl0qjh7mdjzr1yf3r4zyk5hq"; + version = "1.2.0.1"; + sha256 = "0b7frw4fm5hn611i8ldbnkq1h47vjw4fn6f85sj38fw2cn4n826j"; libraryHaskellDepends = [ aeson attoparsec base bytestring optics-core optics-extra - scientific text text-short unordered-containers vector + scientific text text-short vector ]; description = "Law-abiding optics for aeson"; license = lib.licenses.mit; @@ -27539,27 +27541,25 @@ self: { }) {}; "algebraic-graphs-io" = callPackage - ({ mkDerivation, algebraic-graphs, attoparsec, base, binary + ({ mkDerivation, aeson, algebraic-graphs, attoparsec, base, binary , binary-conduit, bytestring, conduit, conduit-extra, containers - , csv-conduit, directory, dot, exceptions, filepath, hspec - , http-conduit, matrix-market-attoparsec, megaparsec, mtl - , parser-combinators, primitive, QuickCheck, tar-conduit, text - , transformers, vector + , csv-conduit, directory, exceptions, filepath, hspec, http-conduit + , megaparsec, mtl, parser-combinators, primitive, serialise + , tar-conduit, text, transformers, vector }: mkDerivation { pname = "algebraic-graphs-io"; - version = "0.4"; - sha256 = "03a31y4kxswn9h32vs7nh83cvwjmx714rckj8pvqxl4l7i01y6wf"; - revision = "1"; - editedCabalFile = "060m82d4qirv7anyp3n6wh5rsycipr5cimhl1y8p9mcm5573r2pl"; + version = "0.5.0.1"; + sha256 = "07vi8b928kjbrmd2p6mv808bh8vwb08wcsnz125v7wm4mc8lv24c"; libraryHaskellDepends = [ - algebraic-graphs attoparsec base binary binary-conduit bytestring - conduit conduit-extra containers csv-conduit directory dot - exceptions filepath http-conduit matrix-market-attoparsec - megaparsec mtl parser-combinators primitive tar-conduit text - transformers vector + aeson algebraic-graphs attoparsec base binary binary-conduit + bytestring conduit conduit-extra containers csv-conduit directory + exceptions filepath http-conduit megaparsec mtl parser-combinators + primitive serialise tar-conduit text transformers vector + ]; + testHaskellDepends = [ + aeson algebraic-graphs base hspec serialise ]; - testHaskellDepends = [ base hspec QuickCheck ]; description = "I/O utilities and datasets for algebraic-graphs"; license = lib.licenses.bsd3; }) {}; @@ -34189,8 +34189,8 @@ self: { }: mkDerivation { pname = "argo"; - version = "0.2022.2.27"; - sha256 = "0jbxkkgia4jj49kyc7zg97w397cfdfk194bx8s6cikyaigw0yg0a"; + version = "0.2022.8.28"; + sha256 = "0hiqj4by1pqx13rqnmkwncnv37lkgx4s5dlnyn1f4mqmw5x54s4k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36612,6 +36612,27 @@ self: { license = lib.licenses.mit; }) {}; + "atrophy" = callPackage + ({ mkDerivation, base, contiguous, deepseq, HUnit, QuickCheck + , quickcheck-classes, random, tasty, tasty-bench, tasty-hunit + , tasty-quickcheck, wide-word + }: + mkDerivation { + pname = "atrophy"; + version = "0.1.0.0"; + sha256 = "13jdrbnmg2nvgl5c35kdikgdacw7c8kxdwq111mdi9x8bsd3j23q"; + libraryHaskellDepends = [ base contiguous wide-word ]; + testHaskellDepends = [ + base contiguous HUnit QuickCheck quickcheck-classes tasty + tasty-hunit tasty-quickcheck wide-word + ]; + benchmarkHaskellDepends = [ + base deepseq random tasty tasty-bench + ]; + description = "Faster integer division and modulus operations"; + license = lib.licenses.mit; + }) {}; + "ats-format" = callPackage ({ mkDerivation, ansi-wl-pprint, base, Cabal, cli-setup, directory , filepath, language-ats, optparse-applicative, process, text @@ -37612,6 +37633,22 @@ self: { mainProgram = "autoexporter"; }) {}; + "autoexporter_2_0_0_2" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath }: + mkDerivation { + pname = "autoexporter"; + version = "2.0.0.2"; + sha256 = "1058lfjxlcbnd2p7lfjvhbzsgl0wss24c6frw7qzl2sg2kd5bppi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base Cabal directory filepath ]; + executableHaskellDepends = [ base Cabal directory filepath ]; + description = "Automatically re-export modules"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "autoexporter"; + }) {}; + "autom" = callPackage ({ mkDerivation, base, bytestring, colour, ghc-prim, gloss , JuicyPixels, random, vector @@ -40614,7 +40651,7 @@ self: { license = lib.licenses.mit; }) {}; - "basement" = callPackage + "basement_0_0_14" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "basement"; @@ -40625,9 +40662,10 @@ self: { libraryHaskellDepends = [ base ghc-prim ]; description = "Foundation scrap box of array & string"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; - "basement_0_0_15" = callPackage + "basement" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "basement"; @@ -40636,7 +40674,6 @@ self: { libraryHaskellDepends = [ base ghc-prim ]; description = "Foundation scrap box of array & string"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "basement-cd" = callPackage @@ -41607,8 +41644,8 @@ self: { }: mkDerivation { pname = "bearriver"; - version = "0.13.5"; - sha256 = "08r6i7xs7n9054m80svqbyjgy6c5diypxswwjkc3gxrcn1s0fqkv"; + version = "0.13.6"; + sha256 = "07ga08r2wwwd2n7jq2bc93jaiqymn4kih2mjb43273zz29kxds99"; libraryHaskellDepends = [ base dunai MonadRandom mtl simple-affine-space transformers ]; @@ -42610,6 +42647,8 @@ self: { pname = "bin"; version = "0.1.2"; sha256 = "0idm2ix4wv1ppr3fjvd8xdlbkhk6lq4rvfs9dv615lmds4gbzm72"; + revision = "1"; + editedCabalFile = "052i9qfb037p71fhzl38ly51jkk9q6klb1cb07a0cv2ja5nzrjgn"; libraryHaskellDepends = [ base boring dec deepseq fin hashable QuickCheck some ]; @@ -42874,6 +42913,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "binary-instances_1_0_3" = callPackage + ({ mkDerivation, aeson, base, binary, binary-orphans, bytestring + , case-insensitive, hashable, primitive, QuickCheck + , quickcheck-instances, scientific, tagged, tasty, tasty-quickcheck + , text, text-binary, time-compat, unordered-containers, vector + , vector-binary-instances + }: + mkDerivation { + pname = "binary-instances"; + version = "1.0.3"; + sha256 = "00wwdk744x762p39jkg0azswxj0qy1lxjw8h9z2c0cvfam934987"; + libraryHaskellDepends = [ + aeson base binary binary-orphans case-insensitive hashable + primitive scientific tagged text text-binary time-compat + unordered-containers vector vector-binary-instances + ]; + testHaskellDepends = [ + aeson base binary bytestring case-insensitive hashable primitive + QuickCheck quickcheck-instances scientific tagged tasty + tasty-quickcheck text time-compat unordered-containers vector + ]; + description = "Orphan instances for binary"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "binary-io" = callPackage ({ mkDerivation, async, base, binary, bytestring, concurrency , deque, exceptions, hspec, process, stm, transformers @@ -43130,8 +43195,8 @@ self: { pname = "binary-tagged"; version = "0.3.1"; sha256 = "01d1wb8h5mz76l09r2azphvhm1y3nar8pqrh2waxn797bd2dh6fp"; - revision = "1"; - editedCabalFile = "08s4ryp28j0vg94rfp9gnlb8mfyfcnrqnvq59k88l7hh1s4af0r5"; + revision = "2"; + editedCabalFile = "0w0n299j37w4xyf69wlfs1s06m01y6yyh9r5clacrr5m893rxy9a"; libraryHaskellDepends = [ array base base16-bytestring binary bytestring containers structured tagged @@ -44151,8 +44216,8 @@ self: { }: mkDerivation { pname = "binrep"; - version = "0.2.0"; - sha256 = "151vvxs4h6x24j437qma62z3n82yhvl754321zlyjj815icrax5a"; + version = "0.3.0"; + sha256 = "1mx4bjgn3jjflnr4cxyqljvh0k7yd7pla422xpawpkr5q1z8rq5m"; libraryHaskellDepends = [ aeson base bytestring either flatparse mason megaparsec refined strongweak text text-icu vector vector-sized @@ -46534,8 +46599,8 @@ self: { }: mkDerivation { pname = "bloodhound"; - version = "0.20.0.2"; - sha256 = "1dvs0gbh7wn9bp99b64vdf2as7zr4bcvxrjzpmlkak4vb4g4bqfz"; + version = "0.21.0.0"; + sha256 = "01znn7g5vnhdharl8cl2symffqinbz9syanpnim3ijx7015nasf1"; libraryHaskellDepends = [ aeson base blaze-builder bytestring containers exceptions hashable http-client http-types mtl network-uri scientific semigroups semver @@ -47687,8 +47752,8 @@ self: { pname = "boring"; version = "0.2"; sha256 = "0d2cm9ra69cvaxs5x3lr2rfv7xx6xrbpb3dbcpyd8m77cqxm7b0b"; - revision = "1"; - editedCabalFile = "116sbp55pp6b4z9c1iyxaafxwd3mzra5ha2g65sfdla28rabwxj0"; + revision = "2"; + editedCabalFile = "04pn94i3mysi7px93k86sf29vw99sf38sl4n0gy2nma0iqsik828"; libraryHaskellDepends = [ base tagged transformers ]; description = "Boring and Absurd types"; license = lib.licenses.bsd3; @@ -47825,6 +47890,8 @@ self: { pname = "bound-extras"; version = "0.0.2"; sha256 = "1mrsr75yd55p3rgqqjlhs0f498qgbmj12ldadj4frmkhjqf3vf9y"; + revision = "1"; + editedCabalFile = "07mqf5ycbjj31q1d8b2szzb96nigfhn9iv1h153ks8cgjh5ir8qj"; libraryHaskellDepends = [ base bound deepseq hashable transformers ]; @@ -47901,6 +47968,8 @@ self: { pname = "boundingboxes"; version = "0.2.3"; sha256 = "0r3mffqxqadn8qklq3kr0ggirkficfj8ic1fxgki2zrc5jm4f2g8"; + revision = "1"; + editedCabalFile = "0qz1bnci5bhb8zqc2dw19sa0k9i57fyhhdh78s3yllp3aijdc3n6"; libraryHaskellDepends = [ base lens ]; description = "A generic boundingbox for an arbitrary vector"; license = lib.licenses.bsd3; @@ -48200,6 +48269,22 @@ self: { mainProgram = "breakout"; }) {}; + "breakpoint" = callPackage + ({ mkDerivation, base, containers, ghc, haskeline, mtl, tasty + , tasty-hunit, transformers + }: + mkDerivation { + pname = "breakpoint"; + version = "0.1.0.0"; + sha256 = "11b2wbm8fm1zwz81hx1l3c559ad7y50d0838n94lkm1vsa39hpk7"; + libraryHaskellDepends = [ + base containers ghc haskeline mtl transformers + ]; + testHaskellDepends = [ base containers tasty tasty-hunit ]; + description = "Set breakpoints using a GHC plugin"; + license = lib.licenses.mit; + }) {}; + "breve" = callPackage ({ mkDerivation, aeson, base, binary, blaze-html, bytestring , configurator, cryptohash, directory, hashtables, http-api-data @@ -48584,6 +48669,8 @@ self: { pname = "broadcast-chan"; version = "0.2.1.2"; sha256 = "1zsrafz3q9l8np8wafmrbi8ilwwsgnzkc8jfjkjfgs4kq65yglqw"; + revision = "1"; + editedCabalFile = "1989dc49db8cf3ca24x4hs3nirm74xl9p0dqf8kpj1dr64y6dvzj"; libraryHaskellDepends = [ base transformers unliftio-core ]; benchmarkHaskellDepends = [ async base criterion deepseq stm ]; description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks"; @@ -48598,6 +48685,8 @@ self: { pname = "broadcast-chan-conduit"; version = "0.2.1.2"; sha256 = "0mwd82arm50zwz559qzxi70ia9d4h5kjwdvhk09jf966hd0knnmm"; + revision = "1"; + editedCabalFile = "0p0xp5jd5mjgapym482178z2b0vs61w93dxza37n3gqgd28n79is"; libraryHaskellDepends = [ base broadcast-chan conduit resourcet transformers unliftio-core ]; @@ -48616,6 +48705,8 @@ self: { pname = "broadcast-chan-pipes"; version = "0.2.1.1"; sha256 = "06nghcddlcnc97p3464fsgcfvjlsnxv7i7khzws3g3myl8hrd89c"; + revision = "1"; + editedCabalFile = "1cigswvq3jvsvk155mszyvjvrhlng7yjf8gnvdw2hw089dzsva95"; libraryHaskellDepends = [ base broadcast-chan pipes pipes-safe ]; testHaskellDepends = [ base broadcast-chan-tests containers foldl pipes pipes-safe @@ -48634,8 +48725,8 @@ self: { pname = "broadcast-chan-tests"; version = "0.2.1.2"; sha256 = "08qjvhdx2pwgj5kcl5fmg5qdlzbdchxjihmqch4sgv48kcga06nv"; - revision = "2"; - editedCabalFile = "0cd1sfjkf158z5g0xk2r5mcawmzay04q8hyhcbara4lfx6gwx3h9"; + revision = "3"; + editedCabalFile = "0z8ldbdgwzacl6pimn8784yvqnl6na8ffzbh76icdic59frwc2sz"; libraryHaskellDepends = [ async base broadcast-chan clock containers optparse-applicative paramtree stm tagged tasty tasty-golden tasty-hunit tasty-travis @@ -49706,6 +49797,27 @@ self: { license = lib.licenses.mit; }) {}; + "burrito_2_0_1_2" = callPackage + ({ mkDerivation, base, bytestring, containers, hspec, parsec + , QuickCheck, template-haskell, text, transformers + }: + mkDerivation { + pname = "burrito"; + version = "2.0.1.2"; + sha256 = "1awfxllw4n1zg58q08ml25k0f3mvbrlsws17m40hwp3ddvv8nyfd"; + libraryHaskellDepends = [ + base bytestring containers parsec template-haskell text + transformers + ]; + testHaskellDepends = [ + base bytestring containers hspec parsec QuickCheck template-haskell + text transformers + ]; + description = "Parse and render URI templates"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "burst-detection" = callPackage ({ mkDerivation, base, criterion, deepseq }: mkDerivation { @@ -50264,6 +50376,8 @@ self: { pname = "bytes"; version = "0.17.2"; sha256 = "06kqqk19qjhrwdqi6pyd1lwqfnj2sw3b3s49lc5vr2fmv8gg8mdw"; + revision = "1"; + editedCabalFile = "0frs6ag93kmg2fw3vd686czx8g7h9qmdn1ip6wdk96d94ap0fz9i"; libraryHaskellDepends = [ base binary binary-orphans bytestring cereal containers hashable mtl scientific text time transformers transformers-compat @@ -50566,6 +50680,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "bytestring-lexing_0_5_0_9" = callPackage + ({ mkDerivation, base, bytestring, tasty, tasty-quickcheck + , tasty-smallcheck + }: + mkDerivation { + pname = "bytestring-lexing"; + version = "0.5.0.9"; + sha256 = "14nx7sfs75g57mlfiwgzm5sc3wm4va58zryjp27m5lmfdp30873c"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + base bytestring tasty tasty-quickcheck tasty-smallcheck + ]; + description = "Efficiently parse and produce common integral and fractional numbers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bytestring-mmap" = callPackage ({ mkDerivation, base, bytestring, unix }: mkDerivation { @@ -52021,7 +52152,7 @@ self: { broken = true; }) {}; - "cabal-install-parsers" = callPackage + "cabal-install-parsers_0_4_5" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring , binary, binary-instances, bytestring, Cabal, containers , criterion, cryptohash-sha256, deepseq, directory, filepath, lukko @@ -52047,6 +52178,36 @@ self: { ]; description = "Utilities to work with cabal-install files"; license = "GPL-2.0-or-later AND BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + }) {}; + + "cabal-install-parsers" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring + , binary, binary-instances, bytestring, Cabal-syntax, containers + , criterion, cryptohash-sha256, deepseq, directory, filepath, lukko + , network-uri, parsec, pretty, tar, tasty, tasty-golden + , tasty-hunit, text, time, transformers, tree-diff + }: + mkDerivation { + pname = "cabal-install-parsers"; + version = "0.5"; + sha256 = "017q4cagx3w0ww9bpilji9hiscilmg78m10ggi9ih0997hjp4l50"; + libraryHaskellDepends = [ + aeson base base16-bytestring binary binary-instances bytestring + Cabal-syntax containers cryptohash-sha256 deepseq directory + filepath lukko network-uri parsec pretty tar text time transformers + ]; + testHaskellDepends = [ + ansi-terminal base base16-bytestring bytestring Cabal-syntax + containers directory filepath pretty tar tasty tasty-golden + tasty-hunit tree-diff + ]; + benchmarkHaskellDepends = [ + base bytestring Cabal-syntax containers criterion directory + filepath + ]; + description = "Utilities to work with cabal-install files"; + license = "GPL-2.0-or-later AND BSD-3-Clause"; }) {}; "cabal-install-solver" = callPackage @@ -52220,6 +52381,35 @@ self: { mainProgram = "cabal-plan"; }) {}; + "cabal-plan_0_7_2_2" = callPackage + ({ mkDerivation, aeson, ansi-terminal, async, base, base-compat + , base16-bytestring, bytestring, containers, directory, filepath + , mtl, optics-core, optparse-applicative, parsec, process + , semialign, singleton-bool, text, these, topograph, transformers + , vector + }: + mkDerivation { + pname = "cabal-plan"; + version = "0.7.2.2"; + sha256 = "0ld2hgyyx64ns9cfxp1blb3azkv951qrcpx878hdvx2cdllgyy31"; + configureFlags = [ "-fexe" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring containers directory + filepath text + ]; + executableHaskellDepends = [ + ansi-terminal async base base-compat bytestring containers + directory mtl optics-core optparse-applicative parsec process + semialign singleton-bool text these topograph transformers vector + ]; + description = "Library and utility for processing cabal's plan.json file"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + mainProgram = "cabal-plan"; + }) {}; + "cabal-progdeps" = callPackage ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { @@ -53075,8 +53265,8 @@ self: { }: mkDerivation { pname = "caerbannog"; - version = "1.0.0.0"; - sha256 = "1sfk4kh7jk762dqfp4c0hq9jqmp1r0x0727vp0cp48wsp9yn4d8f"; + version = "1.0.0.2"; + sha256 = "09rkj17p8c2j0zwkzhvjpajhga5h5q9y1vay2bmnplchx3r3sm8i"; libraryHaskellDepends = [ base binary bytestring ]; testHaskellDepends = [ base binary bytestring hspec QuickCheck random @@ -55521,15 +55711,15 @@ self: { broken = true; }) {}; - "cayley-client_0_4_19_1" = callPackage + "cayley-client_0_4_19_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, bytestring , exceptions, hspec, http-client, http-conduit, lens, lens-aeson , mtl, text, transformers, unordered-containers, vector }: mkDerivation { pname = "cayley-client"; - version = "0.4.19.1"; - sha256 = "195qkxxmzbfaynzni7bv99iv7ia2k0ijhkd260nfdaa3z98j4rkz"; + version = "0.4.19.2"; + sha256 = "0p8s4r4wgscqll2jd1k3plfq8v89jf344vq5bz5fg9r66kbryjxs"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring exceptions http-client http-conduit lens lens-aeson mtl text transformers @@ -62435,8 +62625,8 @@ self: { pname = "colors"; version = "0.3.0.2"; sha256 = "0gbdqn5wrh9711j5hs5ypbd3w7a3mh37g6aadqiq4m5n7jna6phm"; - revision = "1"; - editedCabalFile = "0q152j8ybnga46azvfg3xmsjk01lz4wkhlli07cd92803vc4d6dl"; + revision = "2"; + editedCabalFile = "1zhm6608y16haxvkf0rs3iihq1j8jg5kgfj9r6n65raymymd7rfj"; libraryHaskellDepends = [ base lens linear profunctors ]; description = "A type for colors"; license = lib.licenses.bsd3; @@ -68189,25 +68379,6 @@ self: { }) {}; "core-data" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, core-text - , hashable, hourglass, prettyprinter, scientific, text, time - , unordered-containers, uuid, vector - }: - mkDerivation { - pname = "core-data"; - version = "0.3.4.0"; - sha256 = "07f90lhjv9vpnymidq6kyrnz6s2w3slvy2nwzjxvbia2p22nqmak"; - revision = "1"; - editedCabalFile = "1zc0y1f2mzycdnyd5f8dmkhnwc15bczhf2i82y45bjy4pg3890vg"; - libraryHaskellDepends = [ - aeson base bytestring containers core-text hashable hourglass - prettyprinter scientific text time unordered-containers uuid vector - ]; - description = "Convenience wrappers around common data structures and encodings"; - license = lib.licenses.mit; - }) {}; - - "core-data_0_3_6_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, core-text , hashable, hourglass, prettyprinter, scientific, text, time , unordered-containers, uuid, vector @@ -68222,7 +68393,6 @@ self: { ]; description = "Convenience wrappers around common data structures and encodings"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "core-haskell" = callPackage @@ -70240,8 +70410,8 @@ self: { pname = "crypt-sha512"; version = "0"; sha256 = "1wsma9frdrn39i506zydlzlk1ir6jh1pidqfjms8rwqjpx965gn2"; - revision = "7"; - editedCabalFile = "18i2irw9ghwic6yanl6iqqbqqvlwvm6hvvniqgb75hinxgyim0d4"; + revision = "8"; + editedCabalFile = "09fj4nghk80l8pqxjiddw0v8frwg46v5izkjsx2jvk1ksh6cif2b"; libraryHaskellDepends = [ attoparsec base bytestring cryptohash-sha512 ]; @@ -71847,6 +72017,8 @@ self: { pname = "cue-sheet"; version = "2.0.2"; sha256 = "0n8a5m5qlz8dz03sphj9pybfjfkc0gngpmh56h6idj88frn1z947"; + revision = "1"; + editedCabalFile = "14w4r8y871fkvvak9lklncchlnq3cb6gy4qy1124g9hsnf75mgg4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers exceptions megaparsec mtl QuickCheck @@ -73412,6 +73584,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "data-bword_0_1_0_2" = callPackage + ({ mkDerivation, base, ghc-prim, tasty, tasty-quickcheck }: + mkDerivation { + pname = "data-bword"; + version = "0.1.0.2"; + sha256 = "0dcngqc0igqs68lplqzfg5rl2nj1iy4555g7swsxd8n7svkq0j6n"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ base tasty tasty-quickcheck ]; + description = "Extra operations on binary words of fixed length"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "data-carousel" = callPackage ({ mkDerivation, base, containers, lens }: mkDerivation { @@ -76642,6 +76827,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "dec_0_0_5" = callPackage + ({ mkDerivation, base, boring }: + mkDerivation { + pname = "dec"; + version = "0.0.5"; + sha256 = "126z70ij9hhy8pajw0d5fl0hrppy5sh22j8nkx46i0g6qz3l7071"; + libraryHaskellDepends = [ base boring ]; + description = "Decidable propositions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "decepticons" = callPackage ({ mkDerivation, base, comonad-transformers }: mkDerivation { @@ -77209,6 +77406,23 @@ self: { license = lib.licenses.mit; }) {}; + "dejafu_2_4_0_4" = callPackage + ({ mkDerivation, base, concurrency, containers, contravariant + , deepseq, exceptions, leancheck, profunctors, random, transformers + }: + mkDerivation { + pname = "dejafu"; + version = "2.4.0.4"; + sha256 = "0nf89l7ps8wrm97skkn8nmi7wmmnr3dxmvjmhs69abnlahj7zjqh"; + libraryHaskellDepends = [ + base concurrency containers contravariant deepseq exceptions + leancheck profunctors random transformers + ]; + description = "A library for unit-testing concurrent programs"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "deka" = callPackage ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }: mkDerivation { @@ -78231,6 +78445,23 @@ self: { mainProgram = "derulo"; }) {}; + "derulo_2_0_0_3" = callPackage + ({ mkDerivation, base, HUnit }: + mkDerivation { + pname = "derulo"; + version = "2.0.0.3"; + sha256 = "0bs0bl66256i7ib82i70slf8s2pm091vbqk50pna2vrxs0a3mlkb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base HUnit ]; + description = "Parse and render JSON simply"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "derulo"; + }) {}; + "describe" = callPackage ({ mkDerivation, base, bytestring, cereal, fixed-vector, lens , mmorph, monad-control, mtl, profunctors, QuickCheck @@ -79836,6 +80067,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "diagrams-core_1_5_0_1" = callPackage + ({ mkDerivation, adjunctions, base, containers, distributive + , dual-tree, lens, linear, monoid-extras, mtl, profunctors + , semigroups, unordered-containers + }: + mkDerivation { + pname = "diagrams-core"; + version = "1.5.0.1"; + sha256 = "1gv1p5hrxi3hks0nb4l38gdgfq9bh9d86b6dxcyzqxrwxbxk1khn"; + libraryHaskellDepends = [ + adjunctions base containers distributive dual-tree lens linear + monoid-extras mtl profunctors semigroups unordered-containers + ]; + description = "Core libraries for diagrams EDSL"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "diagrams-graphviz" = callPackage ({ mkDerivation, base, containers, diagrams-lib, fgl, graphviz , split @@ -79976,8 +80225,8 @@ self: { pname = "diagrams-lib"; version = "1.4.5.1"; sha256 = "1hkxp549i99s45qk8zmhjvz1xyyv3i0ffl8155bifkic6fd8y2gz"; - revision = "2"; - editedCabalFile = "12zif237fhf8r016225wsfkshwsxpqq0bm0h3k1ys5yjyk6m3x90"; + revision = "3"; + editedCabalFile = "1s8iyx86hd7p1h08nlmx8dj03fdzbwi417yw1qxc5ivd77ciqj61"; libraryHaskellDepends = [ active adjunctions array base bytestring cereal colour containers data-default-class diagrams-core diagrams-solve directory @@ -81677,20 +81926,21 @@ self: { "discord-haskell" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring , containers, data-default, emoji, http-api-data, http-client - , iso8601-time, MonadRandom, mtl, req, safe-exceptions, scientific - , text, time, unliftio, websockets, wuss + , iso8601-time, MonadRandom, mtl, network, req, safe-exceptions + , scientific, text, time, unliftio, unordered-containers + , websockets, wuss }: mkDerivation { pname = "discord-haskell"; - version = "1.14.0"; - sha256 = "0dxzv2kl4njnq5m48d017ph1r8fir418ndzjahcing3b2hp2g1lp"; + version = "1.15.1"; + sha256 = "18md6zdvanmd29d6pn6v979c8iy4rsbzbrppjmz732fn5q9063f2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring containers data-default emoji http-api-data http-client iso8601-time - MonadRandom mtl req safe-exceptions scientific text time unliftio - websockets wuss + MonadRandom mtl network req safe-exceptions scientific text time + unliftio unordered-containers websockets wuss ]; executableHaskellDepends = [ base text unliftio ]; description = "Write bots for Discord in Haskell"; @@ -82826,14 +83076,12 @@ self: { }) {}; "ditto" = callPackage - ({ mkDerivation, base, containers, mtl, semigroups, text, torsor }: + ({ mkDerivation, base, containers, mtl, text }: mkDerivation { pname = "ditto"; - version = "0.4"; - sha256 = "0qnkv0r5dm73qlrsgwxwzm7f9gbknwcy1dzbjs6vlcmx8hyqh2gp"; - libraryHaskellDepends = [ - base containers mtl semigroups text torsor - ]; + version = "0.4.1"; + sha256 = "0wimz4zpiyll6wcbdhlwjbbjb0y6xy6lk0q1p0hpq5jmf1j2h4pb"; + libraryHaskellDepends = [ base containers mtl text ]; description = "ditto is a type-safe HTML form generation and validation library"; license = lib.licenses.bsd3; }) {}; @@ -83043,8 +83291,8 @@ self: { pname = "dlist-nonempty"; version = "0.1.1"; sha256 = "0csbspdy43pzvasb5mhs5pz2f49ws78pi253cx7pp84wjx6ads20"; - revision = "12"; - editedCabalFile = "0b8lkcpzxjdwm13v7y35j2x3sy97rwzyjwdwzag1va4lvfwa1287"; + revision = "13"; + editedCabalFile = "1hbd0j8yw81y4rnxqxxnvhy33ccgl5c7qcr9shzqy97fwi2vkikm"; libraryHaskellDepends = [ base base-compat deepseq dlist semigroupoids ]; @@ -83250,14 +83498,16 @@ self: { }: mkDerivation { pname = "dns-patterns"; - version = "0.1.3"; - sha256 = "01373vx919s6xznifc0nv9dlwnqh8j0h57v0pdzmpfa5z7jyq7vf"; + version = "0.2.1"; + sha256 = "0vaxh178kndjryhchx6wryla5q8a9498vx7w39bb4va96f7gyby6"; libraryHaskellDepends = [ attoparsec base bytestring parser-combinators text ]; testHaskellDepends = [ attoparsec base bytestring HUnit text ]; description = "DNS name parsing and pattern matching utilities"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "dnscache" = callPackage @@ -84079,34 +84329,6 @@ self: { }) {}; "doctest-parallel" = callPackage - ({ mkDerivation, base, base-compat, Cabal, code-page, containers - , deepseq, directory, exceptions, extra, filepath, ghc, ghc-paths - , Glob, hspec, hspec-core, hspec-discover, HUnit, mockery, pretty - , process, QuickCheck, random, setenv, silently, stringbuilder, syb - , template-haskell, transformers, unordered-containers - }: - mkDerivation { - pname = "doctest-parallel"; - version = "0.2.4"; - sha256 = "0fzfhvam3j15vmh356svg6zlafbayaqmds8hki6jxrandj2d14kp"; - libraryHaskellDepends = [ - base base-compat Cabal code-page containers deepseq directory - exceptions extra filepath ghc ghc-paths Glob pretty process random - syb template-haskell transformers unordered-containers - ]; - testHaskellDepends = [ - base base-compat code-page containers deepseq directory exceptions - filepath ghc ghc-paths hspec hspec-core hspec-discover HUnit - mockery process QuickCheck setenv silently stringbuilder syb - transformers - ]; - testToolDepends = [ hspec-discover ]; - doHaddock = false; - description = "Test interactive Haskell examples"; - license = lib.licenses.mit; - }) {}; - - "doctest-parallel_0_2_5" = callPackage ({ mkDerivation, base, base-compat, Cabal, code-page, containers , deepseq, directory, exceptions, extra, filepath, ghc, ghc-paths , Glob, hspec, hspec-core, hspec-discover, HUnit, mockery, pretty @@ -84132,7 +84354,6 @@ self: { doHaddock = false; description = "Test interactive Haskell examples"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "doctest-prop" = callPackage @@ -85940,26 +86161,6 @@ self: { }) {}; "dual-tree" = callPackage - ({ mkDerivation, base, monoid-extras, newtype-generics, QuickCheck - , semigroups, testing-feat - }: - mkDerivation { - pname = "dual-tree"; - version = "0.2.3.0"; - sha256 = "0qyn7kb42wvlcvb1wbf1qx3isc2y6k3hzp5iq6ab0r0llw9g6qlg"; - revision = "2"; - editedCabalFile = "0cv2pkq85d7wgk6jjcq8vpv3577iyd1x0sg5ivw9ixyf5v5qwjxy"; - libraryHaskellDepends = [ - base monoid-extras newtype-generics semigroups - ]; - testHaskellDepends = [ - base monoid-extras QuickCheck semigroups testing-feat - ]; - description = "Rose trees with cached and accumulating monoidal annotations"; - license = lib.licenses.bsd3; - }) {}; - - "dual-tree_0_2_3_1" = callPackage ({ mkDerivation, base, monoid-extras, QuickCheck, semigroups , testing-feat }: @@ -85973,7 +86174,6 @@ self: { ]; description = "Rose trees with cached and accumulating monoidal annotations"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "dualizer" = callPackage @@ -86159,6 +86359,24 @@ self: { maintainers = [ lib.maintainers.turion ]; }) {}; + "dunai_0_9_0" = callPackage + ({ mkDerivation, base, MonadRandom, simple-affine-space, tasty + , tasty-hunit, transformers, transformers-base + }: + mkDerivation { + pname = "dunai"; + version = "0.9.0"; + sha256 = "0p93c1h5bggvabx4vvd95khmjrq4qh46rvxkm4cqcdfd0601lyy5"; + libraryHaskellDepends = [ + base MonadRandom simple-affine-space transformers transformers-base + ]; + testHaskellDepends = [ base tasty tasty-hunit transformers ]; + description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.turion ]; + }) {}; + "dunai-core" = callPackage ({ mkDerivation, base, MonadRandom, transformers, transformers-base }: @@ -86179,8 +86397,8 @@ self: { ({ mkDerivation, base, dunai, normaldistribution, QuickCheck }: mkDerivation { pname = "dunai-test"; - version = "0.8.3"; - sha256 = "07kirfcyzanscp0kdhgsg0pf809nwf6im0m104xrsrxkak1iqkh4"; + version = "0.9.0"; + sha256 = "0j007pd475fmxhnvvwh6z8awrxfcfgwmph1z412k332lrj46nhv7"; libraryHaskellDepends = [ base dunai normaldistribution QuickCheck ]; @@ -87916,8 +88134,8 @@ self: { }: mkDerivation { pname = "effectful"; - version = "2.0.0.0"; - sha256 = "1fhi7nfaxbazq01pgypf5mk6gd6k983jm3qbvwf6wi75xqx68rxy"; + version = "2.1.0.0"; + sha256 = "16vkxjmlwmyrvp3gdjma73jqlbmvbj9cawazg9h6fchxfr6ps53n"; libraryHaskellDepends = [ async base bytestring directory effectful-core process stm time unliftio @@ -87939,8 +88157,8 @@ self: { }: mkDerivation { pname = "effectful-core"; - version = "2.0.0.0"; - sha256 = "15jg59843h0llv6v6s66nhz8q48ch1y5jibpxq4ki3w91nqaz13i"; + version = "2.1.0.0"; + sha256 = "1lgg8f66jrs206b4zvkplq7w8d8sd91mxj9333sr4v4dnnshp4lk"; libraryHaskellDepends = [ base containers exceptions monad-control primitive transformers-base unliftio-core @@ -88897,16 +89115,17 @@ self: { license = lib.licenses.bsd3; }) {}; - "eliminators_0_9" = callPackage + "eliminators_0_9_1" = callPackage ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats - , singletons-base, template-haskell, th-abstraction, th-desugar + , singletons-base, template-haskell, text, th-abstraction + , th-desugar }: mkDerivation { pname = "eliminators"; - version = "0.9"; - sha256 = "118bd51hfbh29yhs9ai3srk431avwsmccm1500mp21fbwxq8phsj"; + version = "0.9.1"; + sha256 = "0qw6fd6mskwyj1mzz6a6vdxh80jqxn0dzmwp1vq8py1cgnzrpfda"; libraryHaskellDepends = [ - base extra singleton-nats singletons-base template-haskell + base extra singleton-nats singletons-base template-haskell text th-abstraction th-desugar ]; testHaskellDepends = [ base hspec singleton-nats singletons-base ]; @@ -89729,8 +89948,8 @@ self: { }: mkDerivation { pname = "ema"; - version = "0.8.0.0"; - sha256 = "03phqldw1dldmp4gp1wmlm8cyb5qkg1v62brvhwbc9cl1iasllk2"; + version = "0.8.2.0"; + sha256 = "158n1qizqncl4q4szk9jwjdnj1y0jsbpzyi4hjslk4zkvkkscwqa"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson async base blaze-html blaze-markup constraints-extras @@ -89879,10 +90098,8 @@ self: { }: mkDerivation { pname = "email-validator"; - version = "1.0.0"; - sha256 = "0l8c87kv80y1cpifcg80zhmdi884n7409w22akvc7kb9vvyp3b4v"; - revision = "1"; - editedCabalFile = "08ncdqjmgxlzsxfj8z0xaj1p5nnx4ndj4490gvfhj50kv2wx47iw"; + version = "1.0.1"; + sha256 = "0nn1lrl1dv9zg9kvw46253jdb6cfzh5wn70n71pv85adc544001s"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -89890,8 +90107,8 @@ self: { pcre-light tasty tasty-hunit ]; testHaskellDepends = [ - base bytestring cmdargs dns doctest email-validate HUnit - parallel-io pcre-light tasty tasty-hunit + base bytestring doctest email-validate HUnit pcre-light tasty + tasty-hunit ]; description = "Perform basic syntax and deliverability checks on email addresses"; license = lib.licenses.agpl3Only; @@ -90412,6 +90629,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "entropy_0_4_1_10" = callPackage + ({ mkDerivation, base, bytestring, Cabal, directory, filepath + , process, unix + }: + mkDerivation { + pname = "entropy"; + version = "0.4.1.10"; + sha256 = "1rbx4ydabrjs8kkdg9laznkh9nisiq6b5z93vnp9bh6iy59ivb45"; + setupHaskellDepends = [ base Cabal directory filepath process ]; + libraryHaskellDepends = [ base bytestring unix ]; + description = "A platform independent entropy source"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "entwine" = callPackage ({ mkDerivation, async, base, clock, containers, criterion , directory, exceptions, monad-loops, process, QuickCheck @@ -90914,6 +91146,27 @@ self: { maintainers = [ lib.maintainers.sternenseemann ]; }) {}; + "envy_2_1_1_0" = callPackage + ({ mkDerivation, base, bytestring, containers, hspec, mtl + , QuickCheck, quickcheck-instances, text, time, transformers + }: + mkDerivation { + pname = "envy"; + version = "2.1.1.0"; + sha256 = "0cc4lxh4zyg388s794i4ydixi83mgzarjldssmccmss9gp90qcj6"; + libraryHaskellDepends = [ + base bytestring containers mtl text time transformers + ]; + testHaskellDepends = [ + base bytestring hspec mtl QuickCheck quickcheck-instances text time + transformers + ]; + description = "An environmentally friendly way to deal with environment variables"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.sternenseemann ]; + }) {}; + "envy-extensible" = callPackage ({ mkDerivation, base, doctest, envy, extensible, hspec , hspec-discover, main-tester, QuickCheck @@ -91169,6 +91422,8 @@ self: { pname = "equational-reasoning"; version = "0.7.0.1"; sha256 = "1xp5vmz19idc29xidr7q65hsnhfnl3ca80hxxfllsqpyyh32qlhn"; + revision = "1"; + editedCabalFile = "0bi5xmaq5cbs1jqz6naw4706wv5yjgx1g4vibp872iqzcjc86yka"; libraryHaskellDepends = [ base containers template-haskell th-desugar void ]; @@ -91690,6 +91945,8 @@ self: { pname = "ersatz-toysat"; version = "0.2.2.0"; sha256 = "056yyls1mhl20sbngk43lip9gi092c1da0snx6fcs0vbv8gm0j4v"; + revision = "2"; + editedCabalFile = "0ijzzn2bis2kgxf3cnnqkxrfh3n5pw5jp29548dac9ayfk8iwvvh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91898,8 +92155,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.5.6.1"; - sha256 = "1cb8hnv3i75db46dgi2a960zq715py2jq9w3x31q8d3avfkgds2i"; + version = "3.5.7.0"; + sha256 = "1dqd1ni4rv70yrb71cbldrak22dgxgns3qnfhsnwbwp5mia9h1v1"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged template-haskell text time @@ -91916,7 +92173,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "esqueleto_3_5_7_0" = callPackage + "esqueleto_3_5_8_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring , conduit, containers, exceptions, hspec, hspec-core, monad-logger , mtl, mysql, mysql-simple, persistent, persistent-mysql @@ -91926,8 +92183,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.5.7.0"; - sha256 = "1dqd1ni4rv70yrb71cbldrak22dgxgns3qnfhsnwbwp5mia9h1v1"; + version = "3.5.8.0"; + sha256 = "06fdrmp57kqvyj4bl8a7f1xz4iyd1w5qldrkf3raq6in0l628m9y"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged template-haskell text time @@ -92638,8 +92895,7 @@ self: { ]; description = "Bindings to libevdev"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; + platforms = lib.platforms.linux; }) {inherit (pkgs) libevdev;}; "evdev-streamly" = callPackage @@ -92657,7 +92913,7 @@ self: { ]; description = "Bridge for working with evdev and streamly"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; + platforms = lib.platforms.linux; }) {}; "eve" = callPackage @@ -93244,8 +93500,8 @@ self: { }: mkDerivation { pname = "evoke"; - version = "0.2022.5.19"; - sha256 = "1kw4jklbr5pjd1rhwm6c89492w7rjc0mv335j5bis6nn53g7psna"; + version = "0.2022.8.26"; + sha256 = "05jyak1dmb4cw4gp5p71pv8imkfachylq8bak81jmg6ni2shp28j"; libraryHaskellDepends = [ base ghc text ]; testHaskellDepends = [ aeson base HUnit insert-ordered-containers lens QuickCheck swagger2 @@ -94063,8 +94319,8 @@ self: { }: mkDerivation { pname = "exon"; - version = "0.4.0.0"; - sha256 = "17hzyfh4wcv5x1446qk448mdlcr63z50nkicf67k8618szf2sqdl"; + version = "0.5.0.0"; + sha256 = "0q55lxd85nkpml2x1c1i0dgh6z3c61cr07866zzlqn0mnm2wx8rv"; libraryHaskellDepends = [ base flatparse haskell-src-exts haskell-src-meta incipit-base template-haskell text @@ -94891,6 +95147,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "extra_1_7_11" = callPackage + ({ mkDerivation, base, clock, directory, filepath, process + , QuickCheck, quickcheck-instances, time, unix + }: + mkDerivation { + pname = "extra"; + version = "1.7.11"; + sha256 = "0zskgc0y16y3fkfd5z0r0rh4z8jahfpywbs6xviqg09hx5y0bxjy"; + libraryHaskellDepends = [ + base clock directory filepath process time unix + ]; + testHaskellDepends = [ + base directory filepath QuickCheck quickcheck-instances unix + ]; + description = "Extra functions I use"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "extract-dependencies" = callPackage ({ mkDerivation, async, base, Cabal, containers , package-description-remote @@ -95438,34 +95713,6 @@ self: { }) {}; "faktory" = callPackage - ({ mkDerivation, aeson, aeson-casing, aeson-qq, async, base - , bytestring, connection, cryptonite, errors, hspec, markdown-unlit - , megaparsec, memory, mtl, network, random, safe-exceptions - , scanner, semigroups, text, time, unix, unordered-containers - }: - mkDerivation { - pname = "faktory"; - version = "1.1.2.2"; - sha256 = "0vkjd20wpzb170lisk1sb4508h56mgjbk4f5qbi6k8vvbdipiaqy"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-casing base bytestring connection cryptonite errors - megaparsec memory mtl network random safe-exceptions scanner - semigroups text time unix unordered-containers - ]; - executableHaskellDepends = [ aeson base safe-exceptions ]; - testHaskellDepends = [ - aeson aeson-qq async base hspec markdown-unlit mtl time - ]; - testToolDepends = [ markdown-unlit ]; - description = "Faktory Worker for Haskell"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "faktory_1_1_2_3" = callPackage ({ mkDerivation, aeson, aeson-casing, aeson-qq, async, base , bytestring, connection, cryptonite, errors, hspec, markdown-unlit , megaparsec, memory, mtl, network, random, safe-exceptions @@ -97507,6 +97754,8 @@ self: { pname = "fgl"; version = "5.7.0.3"; sha256 = "04k5grp5d381wkc7sxgcl0sd3z3nlm6l6mmh103vhzh6p49vhs99"; + revision = "1"; + editedCabalFile = "0d5b88j42a3f50b7kbksszvwvcgr59f8pcg3p6cvzq9f4n7y51s7"; libraryHaskellDepends = [ array base containers deepseq transformers ]; @@ -97746,6 +97995,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "file-embed-lzma_0_0_1" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, lzma + , template-haskell, text, transformers + }: + mkDerivation { + pname = "file-embed-lzma"; + version = "0.0.1"; + sha256 = "19l1gdjhsn4zh96mzbjsa5rn0acwrx1w3jy25cm23xv6jl8z28i9"; + libraryHaskellDepends = [ + base bytestring directory filepath lzma template-haskell text + transformers + ]; + testHaskellDepends = [ base bytestring ]; + description = "Use Template Haskell to embed (LZMA compressed) data"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "file-embed-poly" = callPackage ({ mkDerivation, base, bytestring, directory, file-embed, filepath , hspec, template-haskell @@ -98057,6 +98324,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "filepattern_0_1_3" = callPackage + ({ mkDerivation, base, directory, extra, filepath, QuickCheck }: + mkDerivation { + pname = "filepattern"; + version = "0.1.3"; + sha256 = "0dlnwnwhsfdkwm69z66wj5d2x9n3la55glq4fsn5rxm2kr1msi6c"; + libraryHaskellDepends = [ base directory extra filepath ]; + testHaskellDepends = [ base directory extra filepath QuickCheck ]; + description = "File path glob-like matching"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "fileplow" = callPackage ({ mkDerivation, base, binary-search, bytestring, hspec, mtl , QuickCheck, temporary, vector @@ -98242,6 +98522,8 @@ self: { pname = "fin"; version = "0.2.1"; sha256 = "14zknp1f65i57nsx8v0np08d7y0szzblybmq7fa5ydazhqwnxlrv"; + revision = "1"; + editedCabalFile = "0qk48l13k8xr0qcs4nr5mpr5y84s8apdm5wlqldjdl9l3qbp58aw"; libraryHaskellDepends = [ base boring dec deepseq hashable QuickCheck some universe-base ]; @@ -98593,18 +98875,6 @@ self: { }) {}; "finite-typelits" = callPackage - ({ mkDerivation, base, deepseq }: - mkDerivation { - pname = "finite-typelits"; - version = "0.1.4.2"; - sha256 = "0iyp9fyd2ki9qcmk9infz9p6rjhsx9jrs3f5yz0yqs8vj5na81yj"; - libraryHaskellDepends = [ base deepseq ]; - description = "A type inhabited by finitely many values, indexed by type-level naturals"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.turion ]; - }) {}; - - "finite-typelits_0_1_6_0" = callPackage ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { pname = "finite-typelits"; @@ -98614,7 +98884,6 @@ self: { testHaskellDepends = [ base deepseq QuickCheck ]; description = "A type inhabited by finitely many values, indexed by type-level naturals"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.turion ]; }) {}; @@ -98972,6 +99241,25 @@ self: { mainProgram = "fix-whitespace"; }) {}; + "fix-whitespace_0_0_10" = callPackage + ({ mkDerivation, base, directory, extra, filepath, filepattern + , text, yaml + }: + mkDerivation { + pname = "fix-whitespace"; + version = "0.0.10"; + sha256 = "1jlkx0ygl315yik0f2fh4ml77c4080y0czs2mlnc84pkhximj58l"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory extra filepath filepattern text yaml + ]; + description = "Fixes whitespace issues"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + mainProgram = "fix-whitespace"; + }) {}; + "fixed" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -100059,6 +100347,19 @@ self: { license = lib.licenses.mit; }) {}; + "flow_2_0_0_1" = callPackage + ({ mkDerivation, base, HUnit }: + mkDerivation { + pname = "flow"; + version = "2.0.0.1"; + sha256 = "1drbw1lbglx30i48mq9a77f34jff6wxvgq1d4rk8axlfis6pnj4h"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base HUnit ]; + description = "Write more understandable Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "flow-er" = callPackage ({ mkDerivation, base, doctest, flow, QuickCheck }: mkDerivation { @@ -101168,8 +101469,8 @@ self: { pname = "force-layout"; version = "0.4.0.6"; sha256 = "17956k3mab2xhrmfy7fj5gh08h43yjlsryi5acjhnkmin5arhwpp"; - revision = "8"; - editedCabalFile = "0ifp1bcvgkyma6sp889f1fr866vw884d0wgrnzqx9isfjk52csi4"; + revision = "9"; + editedCabalFile = "0271sh8py8lm6amwxyr4dic20cji5hq1iixmikq0kmijg1095wkp"; libraryHaskellDepends = [ base containers data-default-class lens linear ]; @@ -101692,8 +101993,8 @@ self: { }: mkDerivation { pname = "fortran-src-extras"; - version = "0.3.1"; - sha256 = "1n4w5qs93pahdnmfc30r5nmfn7zq6sxmb80f2bnl1zws3xcr30v7"; + version = "0.3.2"; + sha256 = "1b8vcg86pq92r1012s6fpnnkr489zs9x202rdjkjnyrmzm9v8rrx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101723,8 +102024,8 @@ self: { }: mkDerivation { pname = "fortran-vars"; - version = "0.3.0"; - sha256 = "0095ifc9psi2mv348qw7538rl1ld2drfq5pcsbdyxrhklm12h5ji"; + version = "0.3.1"; + sha256 = "16b1f2h3q2bskz139p8v7w5aa9nsz73w05jby3s3h1rv4g7lj3f1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101840,7 +102141,7 @@ self: { mainProgram = "foscam-sort"; }) {}; - "foundation" = callPackage + "foundation_0_0_28" = callPackage ({ mkDerivation, base, basement, gauge, ghc-prim }: mkDerivation { pname = "foundation"; @@ -101851,9 +102152,10 @@ self: { benchmarkHaskellDepends = [ base basement gauge ]; description = "Alternative prelude with batteries and no dependencies"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; - "foundation_0_0_29" = callPackage + "foundation" = callPackage ({ mkDerivation, base, basement, gauge, ghc-prim }: mkDerivation { pname = "foundation"; @@ -101864,7 +102166,6 @@ self: { benchmarkHaskellDepends = [ base basement gauge ]; description = "Alternative prelude with batteries and no dependencies"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "foundation-edge" = callPackage @@ -101956,7 +102257,7 @@ self: { mainProgram = "fourmolu"; }) {}; - "fourmolu_0_8_1_0" = callPackage + "fourmolu_0_8_2_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, bytestring , Cabal, containers, Diff, directory, dlist, exceptions, filepath , ghc-lib-parser, gitrev, hspec, hspec-discover, hspec-megaparsec @@ -101966,8 +102267,8 @@ self: { }: mkDerivation { pname = "fourmolu"; - version = "0.8.1.0"; - sha256 = "0acpl5p259pfs42k4iaqhpfpbpbzjk8fxzc65i9wr2wka9cdvzdv"; + version = "0.8.2.0"; + sha256 = "1wyfj3yfhp00pr0sjbkba8djjgp1pk8jabj48cps2nkgy5lqbyix"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104174,6 +104475,8 @@ self: { pname = "functor-classes-compat"; version = "2.0.0.2"; sha256 = "02jamibwyr8hvf432m761v94xmwhbflrp6hd01jyv7fm95f5ki6h"; + revision = "1"; + editedCabalFile = "1yiw8wsxyvadbdbhv8r9h1m130lvgdgvz1v7lmga8pcg7brfagz8"; libraryHaskellDepends = [ base containers ]; description = "Data.Functor.Classes instances for core packages"; license = lib.licenses.bsd3; @@ -104675,6 +104978,23 @@ self: { license = lib.licenses.asl20; }) {}; + "fusion-plugin_0_2_5" = callPackage + ({ mkDerivation, base, containers, directory, filepath + , fusion-plugin-types, ghc, syb, time, transformers + }: + mkDerivation { + pname = "fusion-plugin"; + version = "0.2.5"; + sha256 = "0xzy7ml8wh63mza4am9rdd12qqn9r6ba6c0i9bv7bxp0nlzy7d6l"; + libraryHaskellDepends = [ + base containers directory filepath fusion-plugin-types ghc syb time + transformers + ]; + description = "GHC plugin to make stream fusion more predictable"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "fusion-plugin-types" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -106377,14 +106697,14 @@ self: { license = lib.licenses.mit; }) {}; - "generic-arbitrary_1_0_0" = callPackage + "generic-arbitrary_1_0_1" = callPackage ({ mkDerivation, base, deepseq, QuickCheck, tasty, tasty-discover , tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "generic-arbitrary"; - version = "1.0.0"; - sha256 = "1l1d61336r92rrpcgsdfxfc2c9slvf9g1m7vbl54bcvw0qlgzgc9"; + version = "1.0.1"; + sha256 = "1ir95k98w3i7aisw3gjflzaxzgq3qamxw1bssvdbww43sgckw0cj"; libraryHaskellDepends = [ base QuickCheck ]; testHaskellDepends = [ base deepseq QuickCheck tasty tasty-discover tasty-hunit @@ -106652,14 +106972,26 @@ self: { pname = "generic-lens-lite"; version = "0.1"; sha256 = "07z00phy6h50bb4axlr57kin9l5fygi4q4j33rj5180ai2cbcpc6"; - revision = "3"; - editedCabalFile = "0srsqwncr5fkjcqk7ldfmd8q4y80ksbv9mvnzrw9lk2hywdagl8c"; + revision = "4"; + editedCabalFile = "1aw808ifylrwjpsf754gzq4npmh7c872cy2fsm7r2gpjgk7mkpp6"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Monomorphic field lens like with generic-lens"; license = lib.licenses.bsd3; }) {}; + "generic-lexicographic-order" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "generic-lexicographic-order"; + version = "0.1.0.0"; + sha256 = "096c1fan7isxynyk968llm3p204kgcmh8xp4krnmspz0xvcn7sh0"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Derive Bounded and Enum for sum types and Enum for product types"; + license = lib.licenses.bsd3; + }) {}; + "generic-lucid-scaffold" = callPackage ({ mkDerivation, base, lucid, text }: mkDerivation { @@ -106747,8 +107079,8 @@ self: { pname = "generic-optics-lite"; version = "0.1"; sha256 = "0vf5sk1narj69pdhjqxjj0w3w3i5lxjxn8p98xp8dj0jws4mx9xi"; - revision = "3"; - editedCabalFile = "0f2dnsdl25s6cfdp7f97r2d9md82vn53dm5gry2pds791k1w4q53"; + revision = "4"; + editedCabalFile = "1k5lkdzzdqq743bcw0shhwxj2i7ywh7rihdgasy543i5mvcp0cr4"; libraryHaskellDepends = [ base generic-lens-lite optics-core ]; testHaskellDepends = [ base optics-core ]; description = "Monomorphic field opics like with generic-lens"; @@ -107001,6 +107333,8 @@ self: { pname = "generics-sop"; version = "0.5.1.2"; sha256 = "098blydb7c7wg77dn658r0zb1z20vfkar1him1rqlq0da90437b3"; + revision = "1"; + editedCabalFile = "1s8bx25yrjqy1cj9y1s1m8a8qlby9dxjzin16yymz7g39fqcqxz8"; libraryHaskellDepends = [ base ghc-prim sop-core template-haskell th-abstraction ]; @@ -107018,8 +107352,8 @@ self: { pname = "generics-sop-lens"; version = "0.2.0.1"; sha256 = "1yl74pz6r2zf9sspzbqg6xvr6k9b5irq3c3pjrf5ih6hfrz4k1ks"; - revision = "2"; - editedCabalFile = "14rw0xyfhgyywyb7yghjaqnkpkx9dh0yz8y7l8phxzqgim5r8d1v"; + revision = "3"; + editedCabalFile = "0p9h7xbd0jcf85r480gbnyyh822r3wziv1rg2qwgq0ll5apqvzmn"; libraryHaskellDepends = [ base generics-sop lens ]; description = "Lenses for types in generics-sop"; license = lib.licenses.bsd3; @@ -108291,16 +108625,16 @@ self: { }) {}; "gettext-th" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath + ({ mkDerivation, base, bytestring, containers, directory, filepath , haskell-gettext, template-haskell, text, th-lift-instances }: mkDerivation { pname = "gettext-th"; - version = "0.1.0.3"; - sha256 = "0z0mz8bm4a1ns2k7mm5k1amm0l9vk7f64g3w6la7v7q80zaql0b1"; + version = "0.2.0.0"; + sha256 = "0jmzg9yj6barpwdvq3mzdd2m9x3hn10hlvd18b1s8qfa2qq2lf21"; libraryHaskellDepends = [ - base bytestring directory filepath haskell-gettext template-haskell - text th-lift-instances + base bytestring containers directory filepath haskell-gettext + template-haskell text th-lift-instances ]; description = "gettext-th can internationalise a haskell program without runtime dependencies"; license = lib.licenses.bsd3; @@ -108400,25 +108734,28 @@ self: { mainProgram = "gh-pocket-knife"; }) {}; - "ghc_9_2_4" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , deepseq, directory, exceptions, filepath, ghc-boot, ghc-heap - , ghci, hpc, process, template-haskell, terminfo, time - , transformers, unix + "ghc_9_4_2" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, Cabal + , containers, deepseq, deriveConstants, directory, exceptions + , filepath, genprimopcode, ghc-boot, ghc-heap, ghci, happy, hpc + , process, stm, template-haskell, terminfo, time, transformers + , unix }: mkDerivation { pname = "ghc"; - version = "9.2.4"; - sha256 = "0w63p24p4k16jbr4pnh8nrnxqpiyg8fa0l75ry28y72kp4ngif9q"; + version = "9.4.2"; + sha256 = "1xqcc807pdlm2108iz138dh90ppa3v9swb0nfd790va1xvqdvn4c"; + setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory - exceptions filepath ghc-boot ghc-heap ghci hpc process + exceptions filepath ghc-boot ghc-heap ghci hpc process stm template-haskell terminfo time transformers unix ]; + libraryToolDepends = [ alex deriveConstants genprimopcode happy ]; description = "The GHC API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - }) {}; + }) {deriveConstants = null; genprimopcode = null;}; "ghc-api-compat_8_6" = callPackage ({ mkDerivation, ghc }: @@ -109047,8 +109384,8 @@ self: { }: mkDerivation { pname = "ghc-hs-meta"; - version = "0.1.0.0"; - sha256 = "0csbhd6agq3siwrlkjc063jynzxplpwi3x288kw3hhaz5nz1v3ck"; + version = "0.1.1.0"; + sha256 = "0yrrf0lx626rl4b14jaqmkab1vf4vymi81jkjm91y5vas8zc276i"; libraryHaskellDepends = [ base bytestring ghc ghc-boot template-haskell ]; @@ -109196,7 +109533,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-lib_9_4_1_20220807" = callPackage + "ghc-lib_9_4_2_20220822" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser , ghc-prim, happy, hpc, parsec, pretty, process, rts, stm, time @@ -109204,10 +109541,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "9.4.1.20220807"; - sha256 = "0anaf36bgziqy8ajc5442qf06xv06p3x46dca29qdnplckjypc51"; - revision = "1"; - editedCabalFile = "00mik89sdk4hr5pk3f82kdyik0aamlc1c6apiwvqv03pwrl2v6ih"; + version = "9.4.2.20220822"; + sha256 = "0ri29jyrs31ai4a1w3a9jwxc6xb1hqp64gxbwb5y7mbfyi5ray30"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -109281,15 +109616,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-lib-parser_9_4_1_20220807" = callPackage + "ghc-lib-parser_9_4_2_20220822" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec , pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.4.1.20220807"; - sha256 = "0m297q39afy2dd2gya451lgwl8wjrzcz2f72102x69qbbp3r63q2"; + version = "9.4.2.20220822"; + sha256 = "0irqp5v5vsmv4jmwizl0ag9v43bxfi14m2n977xzya27fdwzvc9y"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -112479,8 +112814,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "10.20220724"; - sha256 = "0890xsfhk5k7xddqgq4qppbr169vjja76cd5cz1cslj20lmz5f28"; + version = "10.20220822"; + sha256 = "1qv3cb7p2zyc5mpcr4nfgzdmswfny5jbimd2ip7ygh71jlahrbfc"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -113172,6 +113507,31 @@ self: { mainProgram = "github-release"; }) {}; + "github-release_2_0_0_2" = callPackage + ({ mkDerivation, aeson, base, burrito, bytestring, http-client + , http-client-tls, http-types, mime-types, optparse-generic, text + , unordered-containers + }: + mkDerivation { + pname = "github-release"; + version = "2.0.0.2"; + sha256 = "0xyh4nkrclpvy5i9v0yqlbzm6aq5gl4p3sairdi1abnyzn3ij04h"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base burrito bytestring http-client http-client-tls + http-types mime-types optparse-generic text unordered-containers + ]; + executableHaskellDepends = [ + aeson base burrito bytestring http-client http-client-tls + http-types mime-types optparse-generic text unordered-containers + ]; + description = "Upload files to GitHub releases"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "github-release"; + }) {}; + "github-rest" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring, http-client , http-client-tls, http-types, jwt, mtl, scientific, tasty @@ -113429,20 +113789,24 @@ self: { }) {}; "gitlab-haskell" = callPackage - ({ mkDerivation, aeson, base, bytestring, connection, http-client - , http-conduit, http-types, tasty, tasty-hunit, temporary, text - , time, transformers, unix + ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring + , connection, http-client, http-conduit, http-types, tasty + , tasty-hunit, temporary, text, time, transformers, tree-diff, unix + , unordered-containers, vector }: mkDerivation { pname = "gitlab-haskell"; - version = "0.3.2.0"; - sha256 = "1ibsb4wyavyb6s64czy1pdbcskfwn96wcky4vlpr0r1f8gjpym5s"; + version = "1.0.0.1"; + sha256 = "1spd989dpqjx7m39fdzdkirp3pgh5cf57dqv756x51r4qkcs4hh1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring connection http-client http-conduit http-types temporary text time transformers unix ]; - testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ]; + testHaskellDepends = [ + aeson ansi-wl-pprint base bytestring tasty tasty-hunit tree-diff + unordered-containers vector + ]; description = "A Haskell library for the GitLab web API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -119305,30 +119669,6 @@ self: { }) {}; "graphula" = callPackage - ({ mkDerivation, base, containers, directory, generic-arbitrary - , generics-eot, hspec, HUnit, markdown-unlit, monad-logger, mtl - , persistent, persistent-sqlite, QuickCheck, random, resourcet - , semigroups, temporary, text, transformers, unliftio - , unliftio-core - }: - mkDerivation { - pname = "graphula"; - version = "2.0.1.1"; - sha256 = "0gn33jz9nb2pf1mkjzwnf04l0shnvj520qb0jmz6d87w79jiqdlj"; - libraryHaskellDepends = [ - base containers directory generics-eot HUnit mtl persistent - QuickCheck random semigroups temporary text unliftio unliftio-core - ]; - testHaskellDepends = [ - base generic-arbitrary hspec markdown-unlit monad-logger persistent - persistent-sqlite QuickCheck resourcet transformers unliftio-core - ]; - testToolDepends = [ markdown-unlit ]; - description = "A simple interface for generating persistent data and linking its dependencies"; - license = lib.licenses.mit; - }) {}; - - "graphula_2_0_2_1" = callPackage ({ mkDerivation, base, containers, directory, generic-arbitrary , generics-eot, hspec, HUnit, markdown-unlit, monad-logger, mtl , persistent, persistent-sqlite, QuickCheck, random, resourcet @@ -119350,7 +119690,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "A simple interface for generating persistent data and linking its dependencies"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "graphula-core" = callPackage @@ -119394,6 +119733,8 @@ self: { pname = "graphviz"; version = "2999.20.1.0"; sha256 = "0l0zxgb938hh09qirggbaskq79mgj3s081cnr42y5vm1rp1jir2s"; + revision = "1"; + editedCabalFile = "1i0ayvs8iaq5vg38ximc23w1f1qvgmwmn5znqkjsrb96x0ssmdiw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122558,6 +122899,8 @@ self: { pname = "hackage-repo-tool"; version = "0.1.1.3"; sha256 = "13q81gi3xmkzwfrbyk5dwxws3c92vnrlslksi021iasmjwhw2h6l"; + revision = "1"; + editedCabalFile = "0c1hg72yxpkmcpl22rm40gf0xx3djdakscqll5g7hsgda4bkg2lr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -122584,6 +122927,8 @@ self: { pname = "hackage-security"; version = "0.6.2.2"; sha256 = "0xmjw3frssdv3glhdg3yivdy38h5icz6xywngrahc19220ba6cx8"; + revision = "1"; + editedCabalFile = "01fhp3kzc1wfvixzgnz4y52bzm4sickk1cj7pksrwmbi90dghv0s"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal Cabal-syntax containers cryptohash-sha256 directory ed25519 @@ -122815,35 +123160,40 @@ self: { "hackport" = callPackage ({ mkDerivation, array, async, base, base16-bytestring - , base64-bytestring, binary, bytestring, cabal-install, containers + , base64-bytestring, binary, bytestring, containers , cryptohash-sha256, deepseq, directory, doctest, echo, ed25519 , edit-distance, extensible-exceptions, filepath, ghc-prim - , hashable, hspec, hspec-discover, HTTP, mtl, network, network-uri - , parallel, parsec, pretty, process, QuickCheck, random, regex-base - , regex-posix, resolv, split, stm, tar, template-haskell, text - , time, transformers, unix, xml, zlib + , hashable, hspec, hspec-discover, HTTP, lifted-base, monad-control + , mtl, network, network-uri, optparse-applicative, parallel, parsec + , parser-combinators, pretty, process, QuickCheck, random + , regex-base, regex-posix, resolv, split, stm, tar + , template-haskell, text, time, transformers, unix, xml, zlib }: mkDerivation { pname = "hackport"; - version = "0.7.2.2"; - sha256 = "0yknhk34pwmij8virmlf619sw1k8rl5a8sy7h18q05rsnsdsbipf"; + version = "0.7.3.0"; + sha256 = "0166ybpnb0ajp2afgi70lwwmkwbbgavj8mfpcksyaysbpa6zpl4m"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ array async base base16-bytestring base64-bytestring binary bytestring containers cryptohash-sha256 deepseq directory echo ed25519 edit-distance extensible-exceptions filepath ghc-prim - hashable HTTP mtl network network-uri parallel parsec pretty - process QuickCheck random regex-base regex-posix resolv split stm - tar template-haskell text time transformers unix xml zlib + hashable HTTP lifted-base monad-control mtl network network-uri + parallel parsec pretty process QuickCheck random regex-base + regex-posix resolv split stm tar template-haskell text time + transformers unix xml zlib + ]; + executableHaskellDepends = [ + base directory filepath optparse-applicative parsec + parser-combinators ]; - executableHaskellDepends = [ base directory filepath ]; testHaskellDepends = [ async base bytestring containers deepseq directory - extensible-exceptions filepath hspec network-uri parallel pretty - process QuickCheck split text time xml + extensible-exceptions filepath hspec network-uri parallel parsec + pretty process QuickCheck split text time xml ]; - testToolDepends = [ cabal-install doctest hspec-discover ]; + testToolDepends = [ doctest hspec-discover ]; doHaddock = false; description = "Hackage and Portage integration tool"; license = lib.licenses.gpl3Plus; @@ -123237,8 +123587,8 @@ self: { }: mkDerivation { pname = "haeredes"; - version = "0.5.2"; - sha256 = "0qqz22aghl00hy240hvws3sgaw2jvhqicms0c1y76b68af1dlkyh"; + version = "0.5.3"; + sha256 = "10pjkgwqyij2vd6q2n6g53n11h6fqv9g2zr57bym8dp2j22p2jzh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -126616,15 +126966,17 @@ self: { "hashes" = callPackage ({ mkDerivation, base, bytestring, criterion, openssl, QuickCheck - , sydtest + , sha-validation, sydtest, vector }: mkDerivation { pname = "hashes"; - version = "0.2.1.1"; - sha256 = "0ni2viazdsg7632lf5viclmwicas36y4ky3mm1bmy3rpvw48g8np"; + version = "0.2.2.0"; + sha256 = "194r4zi3sz3dwd5qmrrf92y655v1vxl0xkzsmj4yjk9xpl85wpcl"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ openssl ]; - testHaskellDepends = [ base bytestring QuickCheck sydtest ]; + testHaskellDepends = [ + base bytestring QuickCheck sha-validation sydtest vector + ]; testSystemDepends = [ openssl ]; benchmarkHaskellDepends = [ base bytestring criterion ]; benchmarkSystemDepends = [ openssl ]; @@ -132137,15 +132489,15 @@ self: { }: mkDerivation { pname = "hath"; - version = "0.5.0"; - sha256 = "16597w35xbv0hq14bdz4g8w52iy7z54wrqfmd929xrzbxbnc41r6"; + version = "0.5.7"; + sha256 = "0ma4myb0cnia0j31a8863a2c80ynw9aa85ls9r688cd9gl1dbhfy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base cmdargs split tasty tasty-hunit tasty-quickcheck ]; testHaskellDepends = [ - base cmdargs process split tasty tasty-hunit tasty-quickcheck + base process split tasty tasty-hunit tasty-quickcheck ]; description = "Hath manipulates network blocks in CIDR notation"; license = lib.licenses.agpl3Only; @@ -134086,7 +134438,7 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hedgehog_1_1_1" = callPackage + "hedgehog_1_2" = callPackage ({ mkDerivation, ansi-terminal, async, barbies, base, bytestring , concurrent-output, containers, deepseq, directory, erf , exceptions, lifted-async, mmorph, monad-control, mtl, pretty-show @@ -134095,10 +134447,8 @@ self: { }: mkDerivation { pname = "hedgehog"; - version = "1.1.1"; - sha256 = "1qx7bjcdgczvz5xhrqz25lray9rk3wrhzqfc5vpjnvgkzvnj3mny"; - revision = "2"; - editedCabalFile = "06i998jic83qpihcv7xhc2ny1z3b4k0p22ds79l5l9hfbf0la6rh"; + version = "1.2"; + sha256 = "0zlfmzzancsglzqmdr40kdfk3ih7anssfkb196r0n9b5lvdcfn98"; libraryHaskellDepends = [ ansi-terminal async barbies base bytestring concurrent-output containers deepseq directory erf exceptions lifted-async mmorph @@ -134308,8 +134658,8 @@ self: { pname = "hedgehog-quickcheck"; version = "0.1.1"; sha256 = "1z2ja63wqz83qhwzh0zs98k502v8fjdpnsnhqk3srypx2nw5vdlp"; - revision = "3"; - editedCabalFile = "0mfpgn46126y1y2k3i2r5nqxcrsa16il3vyf7ir0w471nmks7n54"; + revision = "4"; + editedCabalFile = "1838hm2p22n8qrps17zjzf9k0jwvrw9g99r0crii3igfbi22m8nf"; libraryHaskellDepends = [ base hedgehog QuickCheck transformers ]; description = "Use QuickCheck generators in Hedgehog and vice versa"; license = lib.licenses.bsd3; @@ -134538,6 +134888,22 @@ self: { broken = true; }) {}; + "hegg" = callPackage + ({ mkDerivation, base, containers, deriving-compat, tasty + , tasty-hunit, tasty-quickcheck, transformers + }: + mkDerivation { + pname = "hegg"; + version = "0.1.0.0"; + sha256 = "00i18as11njqc10g360aca0l9diz474lsm73rwkg53bwwnfssg1n"; + libraryHaskellDepends = [ base containers transformers ]; + testHaskellDepends = [ + base containers deriving-compat tasty tasty-hunit tasty-quickcheck + ]; + description = "Fast equality saturation in Haskell"; + license = lib.licenses.bsd3; + }) {}; + "heidi" = callPackage ({ mkDerivation, base, boxes, containers, criterion, exceptions , generics-sop, hashable, microlens, microlens-th, scientific @@ -135879,9 +136245,7 @@ self: { testSystemDepends = [ secp256k1 ]; description = "Ethereum virtual machine evaluator"; license = lib.licenses.agpl3Only; - hydraPlatforms = lib.platforms.none; mainProgram = "hevm"; - broken = true; }) {inherit (pkgs) libff; inherit (pkgs) secp256k1;}; "hevolisa" = callPackage @@ -139097,8 +139461,8 @@ self: { pname = "hkd"; version = "0.1"; sha256 = "1xz0i8lkh0rp55b0s7npkzqgyz9pf1bwq9b66cwbg073r9sz41wa"; - revision = "3"; - editedCabalFile = "0801yrh576b5yvglv0ywzhqfqda376bc10frgdkc0phi5c7qmnj4"; + revision = "4"; + editedCabalFile = "08qjy1616ypa6r0jwh5m66dlvnj87k4cdcggi28caadzg8cf1fz5"; libraryHaskellDepends = [ base some ]; testHaskellDepends = [ base some ]; description = "\"higher-kinded data\""; @@ -144281,6 +144645,8 @@ self: { pname = "hpqtypes"; version = "1.9.4.0"; sha256 = "0m0jpv0d2zynhn53gbjb50sb91lxss71qnzhcy30agxvf29qpi0w"; + revision = "2"; + editedCabalFile = "1xpbb5js710rd7kbdgx6hl10dl7n95yp6pidqrh8f9ifwx076k3g"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ aeson async base bytestring containers exceptions lifted-base @@ -145380,8 +145746,8 @@ self: { }: mkDerivation { pname = "hs-opentelemetry-api"; - version = "0.0.3.5"; - sha256 = "0jk623sg997d92iid7v04bh83mp09bb1fyf0j005r9f0zgmdmwvv"; + version = "0.0.3.6"; + sha256 = "1g634i1md07vrq10c6sj01nnanhn377xv14vcmygi85np66mqkc8"; libraryHaskellDepends = [ async attoparsec base binary bytestring charset clock containers ghc-prim hashable http-types memory mtl template-haskell text @@ -145469,6 +145835,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "hs-opentelemetry-instrumentation-hspec" = callPackage + ({ mkDerivation, base, hs-opentelemetry-api, hspec, hspec-core, mtl + , resourcet, text, unliftio, vault + }: + mkDerivation { + pname = "hs-opentelemetry-instrumentation-hspec"; + version = "0.0.1.0"; + sha256 = "0ya2s4x37fz8zzdik1mbxv5j69rz8m4gv9viizcgp5wcknjs818z"; + libraryHaskellDepends = [ + base hs-opentelemetry-api hspec hspec-core mtl resourcet text + unliftio vault + ]; + testHaskellDepends = [ + base hs-opentelemetry-api hspec hspec-core mtl resourcet text + unliftio vault + ]; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "hs-opentelemetry-instrumentation-http-client" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit , hs-opentelemetry-api, hs-opentelemetry-instrumentation-conduit @@ -145604,29 +145991,48 @@ self: { ({ mkDerivation, async, base, bytestring, clock , hs-opentelemetry-api, hs-opentelemetry-exporter-otlp , hs-opentelemetry-propagator-w3c, hspec, http-types, mwc-random - , network-bsd, random, random-bytestring, stm, text, unagi-chan - , unix, unordered-containers, vector, vector-builder + , network-bsd, random, random-bytestring, stm, text, transformers + , unagi-chan, unix, unordered-containers, vector, vector-builder }: mkDerivation { pname = "hs-opentelemetry-sdk"; - version = "0.0.3.1"; - sha256 = "0z4j2jih8076xic39kil0w0p6vcjbpcmpbfiskx2i7ycm2cg4gs2"; + version = "0.0.3.3"; + sha256 = "1721786554sb0jwa8mmkcrlwci1i49mgwpaxa8xaiilw6nddmc8a"; libraryHaskellDepends = [ async base bytestring hs-opentelemetry-api hs-opentelemetry-exporter-otlp hs-opentelemetry-propagator-w3c http-types mwc-random network-bsd random random-bytestring stm text - unagi-chan unix unordered-containers vector vector-builder + transformers unagi-chan unix unordered-containers vector + vector-builder ]; testHaskellDepends = [ async base bytestring clock hs-opentelemetry-api hs-opentelemetry-exporter-otlp hs-opentelemetry-propagator-w3c hspec http-types mwc-random network-bsd random random-bytestring - stm text unagi-chan unix unordered-containers vector vector-builder + stm text transformers unagi-chan unix unordered-containers vector + vector-builder ]; description = "OpenTelemetry SDK for use in applications"; license = lib.licenses.bsd3; }) {}; + "hs-opentelemetry-utils-exceptions" = callPackage + ({ mkDerivation, base, exceptions, hs-opentelemetry-api + , hs-opentelemetry-sdk, text + }: + mkDerivation { + pname = "hs-opentelemetry-utils-exceptions"; + version = "0.1.0.0"; + sha256 = "0syz50by1n5818pwfap58rj6d76frwvhk14aqxk1x3mx2ddsz0yc"; + libraryHaskellDepends = [ + base exceptions hs-opentelemetry-api hs-opentelemetry-sdk text + ]; + testHaskellDepends = [ + base exceptions hs-opentelemetry-api hs-opentelemetry-sdk text + ]; + license = lib.licenses.bsd3; + }) {}; + "hs-pattrans" = callPackage ({ mkDerivation, async, base, bytestring, cassava, Chart , Chart-cairo, colour, containers, contravariant, directory @@ -148201,25 +148607,6 @@ self: { }) {}; "hslua-module-path" = callPackage - ({ mkDerivation, base, filepath, hslua-core, hslua-marshalling - , hslua-packaging, tasty, tasty-hunit, tasty-lua, text - }: - mkDerivation { - pname = "hslua-module-path"; - version = "1.0.2"; - sha256 = "0y2syngdhqdpbz9y5ya0cwp07s2q7g16djw508w5003va811yw60"; - libraryHaskellDepends = [ - base filepath hslua-core hslua-marshalling hslua-packaging text - ]; - testHaskellDepends = [ - base filepath hslua-core hslua-marshalling hslua-packaging tasty - tasty-hunit tasty-lua text - ]; - description = "Lua module to work with file paths"; - license = lib.licenses.mit; - }) {}; - - "hslua-module-path_1_0_3" = callPackage ({ mkDerivation, base, filepath, hslua-core, hslua-marshalling , hslua-packaging, tasty, tasty-hunit, tasty-lua, text }: @@ -148236,7 +148623,6 @@ self: { ]; description = "Lua module to work with file paths"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hslua-module-system" = callPackage @@ -148772,14 +149158,14 @@ self: { license = lib.licenses.mit; }) {}; - "hspec_2_10_0_1" = callPackage + "hspec_2_10_1" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: mkDerivation { pname = "hspec"; - version = "2.10.0.1"; - sha256 = "0in22h0k4f0c6d55zbdsypf0a546f4mafifxmk019cxnj4i5rx8q"; + version = "2.10.1"; + sha256 = "1nhsamvdpbz89dxww1bz1428nn7zb5w83r4jgjwb30y5aa29w2jm"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -148903,7 +149289,7 @@ self: { license = lib.licenses.mit; }) {}; - "hspec-core_2_10_0_1" = callPackage + "hspec-core_2_10_1" = callPackage ({ mkDerivation, ansi-terminal, array, base, base-orphans , call-stack, clock, deepseq, directory, filepath, ghc, ghc-boot-th , hspec-expectations, hspec-meta, HUnit, process, QuickCheck @@ -148912,8 +149298,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.10.0.1"; - sha256 = "0g59jlkds28q9vb4fw7wc7cdwa7rl4anhk6gaz411j8ra3j1cjql"; + version = "2.10.1"; + sha256 = "0f1af3j1szh801ahxrxasb78icq8swhdv99hjlgb52k3drf77pwn"; libraryHaskellDepends = [ ansi-terminal array base call-stack clock deepseq directory filepath ghc ghc-boot-th hspec-expectations HUnit QuickCheck @@ -148994,14 +149380,14 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hspec-discover_2_10_0_1" = callPackage + "hspec-discover_2_10_1" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, mockery , QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.10.0.1"; - sha256 = "1z27h094qyiqnlqsp5ppfd6v9yshhnz4ry7x7zvkyjfmx3xxwm9z"; + version = "2.10.1"; + sha256 = "034xm9zgclvpbbs54d93s0h9qvbb9p86dd1w1p9sl8kjp108a542"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -150730,8 +151116,8 @@ self: { pname = "htaglib"; version = "1.2.0"; sha256 = "0ph04j1ysjzzrcyllgibzrzfv5g5mgpa6s0ksxww15aryipw65sa"; - revision = "1"; - editedCabalFile = "09vsz2z5sb5ai3qpksqdckb43vndqs66x4abx3lln2xr40dlkljv"; + revision = "2"; + editedCabalFile = "1vb9izb058z8lsq5yp4c0w4lralb0mzr5g6hw4mvd82yjf07il0z"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring text transformers ]; librarySystemDepends = [ taglib ]; @@ -151088,6 +151474,18 @@ self: { broken = true; }) {}; + "html-parse-util" = callPackage + ({ mkDerivation, attoparsec, base, html-parse, text }: + mkDerivation { + pname = "html-parse-util"; + version = "0.2.1"; + sha256 = "1n5pxx7m1b2dnlck3vqibjcny2r3ywi6r4f9vl3j516dx8r22pp2"; + libraryHaskellDepends = [ attoparsec base html-parse text ]; + description = "Utility functions for working with html-parse"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "html-presentation-text" = callPackage ({ mkDerivation, base, cli-arguments, lists-flines }: mkDerivation { @@ -151468,6 +151866,8 @@ self: { pname = "http-api-data"; version = "0.5"; sha256 = "0gxpfrkr83gq5kndfbyg03ps0g421bn4vafdqng7wmnn5hhb9vgp"; + revision = "1"; + editedCabalFile = "1gcqa0lm804cqv1xdaxz87mg0fv7d98i57px8al7qgdzpldma17k"; libraryHaskellDepends = [ attoparsec attoparsec-iso8601 base base-compat bytestring containers cookie hashable http-types tagged text time-compat @@ -159578,8 +159978,8 @@ self: { pname = "insert-ordered-containers"; version = "0.2.5.1"; sha256 = "1mnc0gby7xz8065rvkqsaqk1vqs0gv1y9qgvwsvxx3gsg9yj3a7r"; - revision = "2"; - editedCabalFile = "1mb1iknk0hyz0az85k9w45ymdan37gx3m72mn6zw9i3dib3ly1il"; + revision = "3"; + editedCabalFile = "11awwf3lm3qzjqxy8gw9cizr30228cjwhqzff7wvjvdx131s0raa"; libraryHaskellDepends = [ aeson base deepseq hashable indexed-traversable lens optics-core optics-extra semigroupoids text transformers unordered-containers @@ -161164,33 +161564,6 @@ self: { }) {}; "io-streams" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, deepseq, directory - , filepath, HUnit, mtl, network, primitive, process, QuickCheck - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, time, transformers, vector, zlib, zlib-bindings - }: - mkDerivation { - pname = "io-streams"; - version = "1.5.2.1"; - sha256 = "1y3sqmxrwiksz7pl4hf3vzvg8p8n00qnv98nj5xbpcadlh468rny"; - revision = "3"; - editedCabalFile = "14zy4y6xnrfal02w0m8smjpb202axmq88cm40722rzxfpy5s1cjq"; - configureFlags = [ "-fnointeractivetests" ]; - libraryHaskellDepends = [ - attoparsec base bytestring network primitive process text time - transformers vector zlib-bindings - ]; - testHaskellDepends = [ - attoparsec base bytestring deepseq directory filepath HUnit mtl - network primitive process QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 text time - transformers vector zlib zlib-bindings - ]; - description = "Simple, composable, and easy-to-use stream I/O"; - license = lib.licenses.bsd3; - }) {}; - - "io-streams_1_5_2_2" = callPackage ({ mkDerivation, attoparsec, base, bytestring, deepseq, directory , filepath, HUnit, mtl, network, primitive, process, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -161213,7 +161586,6 @@ self: { ]; description = "Simple, composable, and easy-to-use stream I/O"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "io-streams-haproxy" = callPackage @@ -165248,6 +165620,26 @@ self: { license = lib.licenses.mit; }) {}; + "json-feed_2_0_0_4" = callPackage + ({ mkDerivation, aeson, base, bytestring, filepath, hspec + , mime-types, network-uri, tagsoup, text, time + }: + mkDerivation { + pname = "json-feed"; + version = "2.0.0.4"; + sha256 = "022zdas84skhh9s17k6mx45axrzfv2c7jf7f2rhk324706b7wxfl"; + libraryHaskellDepends = [ + aeson base bytestring mime-types network-uri tagsoup text time + ]; + testHaskellDepends = [ + aeson base bytestring filepath hspec mime-types network-uri tagsoup + text time + ]; + description = "JSON Feed"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "json-fu" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , hashable, hspec, mtl, syb, text, time, unordered-containers @@ -168084,25 +168476,26 @@ self: { }) {inherit (pkgs) SDL_mixer;}; "keid-core" = callPackage - ({ mkDerivation, base, binary, bytestring, cryptohash-md5 - , derive-storable, derive-storable-plugin, file-embed, foldl - , geomancy, GLFW-b, ktx-codec, neat-interpolation - , optparse-applicative, optparse-simple, resourcet, rio, rio-app - , serialise, StateVar, tagged, template-haskell, text, transformers - , unagi-chan, unliftio, vector, vulkan, vulkan-utils + ({ mkDerivation, base, binary, bytestring, containers + , cryptohash-md5, derive-storable, derive-storable-plugin + , file-embed, foldl, geomancy, GLFW-b, ktx-codec + , neat-interpolation, optparse-applicative, optparse-simple + , resourcet, rio, rio-app, serialise, spirv-reflect-types + , spirv-reflect-yaml, StateVar, tagged, template-haskell, text + , transformers, unagi-chan, unliftio, vector, vulkan, vulkan-utils , VulkanMemoryAllocator, zstd }: mkDerivation { pname = "keid-core"; - version = "0.1.6.1"; - sha256 = "0r0gkq8hn3gkfpc9c982fhncdfbbk2y06lll515ycs55456bqdnh"; + version = "0.1.7.0"; + sha256 = "0y9ks8bgaimg8qzwx5lxkihlx0akkbwhghma9sfm37d7qq2nbn07"; libraryHaskellDepends = [ - base binary bytestring cryptohash-md5 derive-storable + base binary bytestring containers cryptohash-md5 derive-storable derive-storable-plugin file-embed foldl geomancy GLFW-b ktx-codec neat-interpolation optparse-applicative optparse-simple resourcet - rio rio-app serialise StateVar tagged template-haskell text - transformers unagi-chan unliftio vector vulkan vulkan-utils - VulkanMemoryAllocator zstd + rio rio-app serialise spirv-reflect-types spirv-reflect-yaml + StateVar tagged template-haskell text transformers unagi-chan + unliftio vector vulkan vulkan-utils VulkanMemoryAllocator zstd ]; description = "Core parts of Keid engine"; license = lib.licenses.bsd3; @@ -168149,8 +168542,8 @@ self: { }: mkDerivation { pname = "keid-render-basic"; - version = "0.1.6.1"; - sha256 = "0rp06ap82ky70qhp8prhyi3vkynrn3c2wilr2lmlh2gv64q2ri0g"; + version = "0.1.7.0"; + sha256 = "0amv73z9154r10501wm5zxcc2drqf47xsvygqzhyvs655yfcg0x6"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring derive-storable derive-storable-plugin @@ -168160,8 +168553,6 @@ self: { description = "Basic rendering programs for Keid engine"; license = lib.licenses.bsd3; platforms = [ "x86_64-linux" ]; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "keid-resource-gltf" = callPackage @@ -168206,8 +168597,8 @@ self: { }: mkDerivation { pname = "keid-ui-dearimgui"; - version = "0.1.1.1"; - sha256 = "0qxkgrayb365mj7sknzq7w9cxs5ppfzg272cah632bvs70qkl7xl"; + version = "0.1.2.0"; + sha256 = "1n8a33fr8y8wz4nbgn1pijk73ik0jmr6mxp8dnvcad2gp4cr86j5"; libraryHaskellDepends = [ base binary bytestring dear-imgui GLFW-b keid-core resourcet rio rio-app unliftio vector vulkan vulkan-utils VulkanMemoryAllocator @@ -169934,6 +170325,19 @@ self: { license = lib.licenses.mit; }) {}; + "lackey_2_0_0_3" = callPackage + ({ mkDerivation, base, hspec, servant, servant-foreign, text }: + mkDerivation { + pname = "lackey"; + version = "2.0.0.3"; + sha256 = "0drcq03vsya11002wg7i3phbgyylcyx4zry3ixflffm8sz00smci"; + libraryHaskellDepends = [ base servant-foreign text ]; + testHaskellDepends = [ base hspec servant servant-foreign text ]; + description = "Generate Ruby clients from Servant APIs"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "lacroix" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -170866,8 +171270,8 @@ self: { pname = "lame"; version = "0.2.0"; sha256 = "1bqq3aanfffdsl3v0am7jdfslcr6y372cq7jx36z7g09zy5mp2sp"; - revision = "1"; - editedCabalFile = "1czjga37b56xs6jrylsf5gip5srmlfg2982k96l5w4300sj8ricz"; + revision = "2"; + editedCabalFile = "15yjwhwxiqds425y7a4s1z9vdrgmqwq2y5kvl1d1xhw7h05ryxkr"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring directory exceptions filepath text transformers @@ -170884,6 +171288,31 @@ self: { broken = true; }) {mp3lame = null;}; + "lame_0_2_1" = callPackage + ({ mkDerivation, base, bytestring, directory, exceptions, filepath + , hspec, hspec-discover, htaglib, mp3lame, temporary, text + , transformers, wave + }: + mkDerivation { + pname = "lame"; + version = "0.2.1"; + sha256 = "1xz98v2kqs69jijza0vyz57lpbs3h2f7fcablihlzprh1sylc3vq"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring directory exceptions filepath text transformers + wave + ]; + librarySystemDepends = [ mp3lame ]; + testHaskellDepends = [ + base directory filepath hspec htaglib temporary text + ]; + testToolDepends = [ hspec-discover ]; + description = "A high-level binding to the LAME encoder"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {mp3lame = null;}; + "lame-tester" = callPackage ({ mkDerivation, base-noprelude, bizzlelude, containers, semigroups , tasty, tasty-hunit, validation @@ -170903,17 +171332,17 @@ self: { }) {}; "landlock" = callPackage - ({ mkDerivation, base, exceptions, filepath, process, QuickCheck - , tasty, tasty-expected-failure, tasty-hunit, tasty-quickcheck - , unix + ({ mkDerivation, async, base, exceptions, filepath, process, psx + , QuickCheck, tasty, tasty-expected-failure, tasty-hunit + , tasty-quickcheck, unix }: mkDerivation { pname = "landlock"; - version = "0.1.0.0"; - sha256 = "19l95a4wajdzml38l9251yklxsgk70ky29x7bmldyn6nagdqgdap"; - libraryHaskellDepends = [ base exceptions unix ]; + version = "0.2.0.1"; + sha256 = "1xn517if819v7qrazq0dx7mmgn9i996j1lmxrkb68rmflbg2wic1"; + libraryHaskellDepends = [ base exceptions psx unix ]; testHaskellDepends = [ - base filepath process QuickCheck tasty tasty-expected-failure + async base filepath process QuickCheck tasty tasty-expected-failure tasty-hunit tasty-quickcheck ]; doHaddock = false; @@ -171186,8 +171615,8 @@ self: { ({ mkDerivation, base, language-c99, language-c99-util, mtl }: mkDerivation { pname = "language-c99-simple"; - version = "0.2.1"; - sha256 = "0ii5mlxzy47gs91amriv1zsbb0myayanwsw3qwz4p29m09fqjpic"; + version = "0.2.2"; + sha256 = "16va8nd3xa4a8nfdpazcnrl0192cpdc7z06ixcx0ya04sycc9cx9"; libraryHaskellDepends = [ base language-c99 language-c99-util mtl ]; @@ -173577,6 +174006,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "leancheck_1_0_0" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "leancheck"; + version = "1.0.0"; + sha256 = "0896792d34aqag2hhmi6596kx46ca3897d0v9lr69qbcms9jj5gh"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base ]; + description = "Enumerative property-based testing"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "leancheck-enum-instances" = callPackage ({ mkDerivation, base, enum-types, leancheck }: mkDerivation { @@ -177159,17 +177601,17 @@ self: { , containers, data-default-class, free-vector-spaces, hashable , ieee754, lens, linear, manifolds-core, MemoTrie, QuickCheck , semigroups, tagged, tasty, tasty-quickcheck, template-haskell - , transformers, vector, vector-space + , th-abstraction, transformers, vector, vector-space }: mkDerivation { pname = "linearmap-category"; - version = "0.4.2.0"; - sha256 = "0iblymralldn1xljdl6qyvxcsxg6rmgj42qx254vaajijp51ycmp"; + version = "0.4.3.0"; + sha256 = "0319x0fz863d44p1lzgbnp8nwxdpvn50ms29z7lwh0g3s0mcs628"; libraryHaskellDepends = [ base call-stack constrained-categories containers data-default-class free-vector-spaces hashable ieee754 lens linear manifolds-core MemoTrie QuickCheck semigroups tagged - template-haskell transformers vector vector-space + template-haskell th-abstraction transformers vector vector-space ]; testHaskellDepends = [ base constrained-categories linear manifolds-core QuickCheck tasty @@ -178240,26 +178682,25 @@ self: { ({ mkDerivation, base, bytestring, cmdargs, configurator , containers, directory, dns, doctest, filemanip, filepath, HDBC , HDBC-postgresql, HDBC-sqlite3, MissingH, tasty, tasty-hunit - , tasty-quickcheck }: mkDerivation { pname = "list-remote-forwards"; - version = "0.0.1"; - sha256 = "1bq5244ys4xy3pfj72dq399x0g57q41lrllbd5hgvk9z0j92lxys"; + version = "0.0.3"; + sha256 = "0c7fm8mbhhh9nhcib5d0k2gipfkcsvpkg5x4xb7x75x0i099q6jf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring cmdargs configurator containers directory dns filepath HDBC HDBC-postgresql HDBC-sqlite3 MissingH tasty - tasty-hunit tasty-quickcheck + tasty-hunit ]; testHaskellDepends = [ base bytestring cmdargs configurator containers directory dns - doctest filemanip filepath HDBC HDBC-postgresql HDBC-sqlite3 - MissingH tasty tasty-hunit tasty-quickcheck + doctest filemanip filepath HDBC HDBC-sqlite3 MissingH tasty + tasty-hunit ]; description = "List all remote forwards for mail accounts stored in a SQL database"; - license = lib.licenses.gpl3Only; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; mainProgram = "list-remote-forwards"; broken = true; @@ -178276,6 +178717,18 @@ self: { license = lib.licenses.mit; }) {}; + "list-singleton_2_0_0_2" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "list-singleton"; + version = "2.0.0.2"; + sha256 = "1n1b1fk8zn9hz162lmy9d123icd2i6cnlvpkk2ypbphmnam0xr43"; + libraryHaskellDepends = [ base ]; + description = "Easily and clearly create lists with only one element in them"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "list-t" = callPackage ({ mkDerivation, base, base-prelude, foldl, HTF, logict, mmorph , monad-control, mtl, mtl-prelude, semigroups, transformers @@ -179797,6 +180250,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "lockfree-queue_0_2_4" = callPackage + ({ mkDerivation, abstract-deque, abstract-deque-tests + , atomic-primops, base, bytestring, ghc-prim, HUnit, test-framework + , test-framework-hunit + }: + mkDerivation { + pname = "lockfree-queue"; + version = "0.2.4"; + sha256 = "1vlrydp3ywqgfnhmfm7zhdfn3nrkd7q8lj9apa34y35yvh67gxm0"; + libraryHaskellDepends = [ + abstract-deque atomic-primops base ghc-prim + ]; + testHaskellDepends = [ + abstract-deque abstract-deque-tests atomic-primops base bytestring + ghc-prim HUnit test-framework test-framework-hunit + ]; + description = "Michael and Scott lock-free queues"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lockpool" = callPackage ({ mkDerivation, base, clock, stm }: mkDerivation { @@ -181996,8 +182470,8 @@ self: { pname = "lukko"; version = "0.1.1.3"; sha256 = "07xb926kixqv5scqdl8w34z42zjzdpbq06f0ha3f3nm3rxhgn3m8"; - revision = "2"; - editedCabalFile = "1h4pdybiqpwljjm4p9bhn3nr2kgqxxggnl5czk5d6ch6li1w1160"; + revision = "3"; + editedCabalFile = "1a6spmbiv3ias40sjrnsxfgr1d5mwg039a2q7113zb7i9n6c1m7g"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ async base bytestring filepath singleton-bool tasty @@ -182420,6 +182894,24 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) xz;}; + "lzma_0_0_0_4" = callPackage + ({ mkDerivation, base, bytestring, HUnit, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck, xz + }: + mkDerivation { + pname = "lzma"; + version = "0.0.0.4"; + sha256 = "0fy11i7fanrsbh8w7cclwx0i6csn5df6vl38dh2112aqw6n7h382"; + libraryHaskellDepends = [ base bytestring ]; + librarySystemDepends = [ xz ]; + testHaskellDepends = [ + base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + description = "LZMA/XZ compression and decompression"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) xz;}; + "lzma-clib" = callPackage ({ mkDerivation }: mkDerivation { @@ -183273,8 +183765,8 @@ self: { }: mkDerivation { pname = "mailbox-count"; - version = "0.0.5"; - sha256 = "0g1kbb4pmh1vs8ddswpcmqb9fhfkhlffwp9y7r4dq5wcsdihwm8c"; + version = "0.0.6"; + sha256 = "0pjy1l63wzic55snhkxq7hv4iscda3np5f5dl5lb9vmh0hlx4x1k"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -183283,8 +183775,7 @@ self: { ]; testHaskellDepends = [ base cmdargs configurator containers directory doctest filemanip - filepath HDBC HDBC-postgresql HDBC-sqlite3 MissingH tasty - tasty-hunit + filepath HDBC HDBC-sqlite3 MissingH tasty tasty-hunit ]; description = "Count mailboxes in a SQL database"; license = lib.licenses.agpl3Only; @@ -184794,25 +185285,6 @@ self: { }) {}; "massiv" = callPackage - ({ mkDerivation, base, bytestring, deepseq, doctest, exceptions - , primitive, random, scheduler, unliftio-core, vector - }: - mkDerivation { - pname = "massiv"; - version = "1.0.1.1"; - sha256 = "1yg594y0v8bpymd5g6hy8a7cy2hbvlpyxm9hnq3pprbhbcrrx22w"; - revision = "1"; - editedCabalFile = "1rcjcd3sf4qlrwk026sw5nz9i5jagpga83jyp5ij3igkg2ffps21"; - libraryHaskellDepends = [ - base bytestring deepseq exceptions primitive random scheduler - unliftio-core vector - ]; - testHaskellDepends = [ base doctest ]; - description = "Massiv (Массив) is an Array Library"; - license = lib.licenses.bsd3; - }) {}; - - "massiv_1_0_2_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, doctest, exceptions , primitive, random, scheduler, unliftio-core, vector }: @@ -184827,7 +185299,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Massiv (Массив) is an Array Library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "massiv-io" = callPackage @@ -189878,6 +190349,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "mixed-types-num_0_5_11" = callPackage + ({ mkDerivation, base, collect-errors, hspec, hspec-smallcheck, mtl + , QuickCheck, smallcheck, template-haskell + }: + mkDerivation { + pname = "mixed-types-num"; + version = "0.5.11"; + sha256 = "15r1lj39fkddlqfda41cp76xr8ck4fkannszxi32j7a8lkjr2f21"; + libraryHaskellDepends = [ + base collect-errors hspec hspec-smallcheck mtl QuickCheck + smallcheck template-haskell + ]; + testHaskellDepends = [ + base collect-errors hspec hspec-smallcheck QuickCheck smallcheck + ]; + description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "mixpanel-client" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring, hspec , hspec-discover, http-client, http-client-tls, markdown-unlit @@ -191071,9 +191562,7 @@ self: { ]; description = "A library for probabilistic programming"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "example"; - broken = true; }) {}; "monad-bool" = callPackage @@ -191532,6 +192021,28 @@ self: { license = lib.licenses.mit; }) {}; + "monad-logger_0_3_37" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , exceptions, fast-logger, lifted-base, monad-control, monad-loops + , mtl, resourcet, stm, stm-chans, template-haskell, text + , transformers, transformers-base, transformers-compat + , unliftio-core + }: + mkDerivation { + pname = "monad-logger"; + version = "0.3.37"; + sha256 = "1z275a428zcj73zz0cpfha2adwiwqqqp7klx3kbd3i9rl20xa106"; + libraryHaskellDepends = [ + base bytestring conduit conduit-extra exceptions fast-logger + lifted-base monad-control monad-loops mtl resourcet stm stm-chans + template-haskell text transformers transformers-base + transformers-compat unliftio-core + ]; + description = "A class of monads which can log messages"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "monad-logger-aeson" = callPackage ({ mkDerivation, aeson, aeson-diff, base, bytestring, context , directory, exceptions, fast-logger, hspec, hspec-discover @@ -193300,8 +193811,8 @@ self: { pname = "months"; version = "0.2"; sha256 = "054dag7806850hdii7s5rxg8gx2spdp33pnx4s4ckni9ayvspija"; - revision = "5"; - editedCabalFile = "1fqxdjclv2jsj802sr4v35cn12qchcxdmhpfm003v2j1s6gp689s"; + revision = "6"; + editedCabalFile = "05h58b9cg1iy9l4lh1xf35ngjh9cpwiibprbbsmjl0gw9d0a32p9"; libraryHaskellDepends = [ aeson attoparsec base base-compat deepseq hashable intervals QuickCheck text time-compat @@ -193699,8 +194210,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql"; - version = "0.20.0"; - sha256 = "0ikbfapl9jb9yd9i5v9plw3s3drsbx660h8x0mibn8qsci0jsbh5"; + version = "0.20.1"; + sha256 = "0y1c43010spp70z2srfmln1nd7r286b8nprq851f2zgp0g3lbkfi"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers morpheus-graphql-app @@ -193728,8 +194239,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-app"; - version = "0.20.0"; - sha256 = "1qvgfsykml7mx36azgbdvjc814hdd14554qpld716v339bj3jgmp"; + version = "0.20.1"; + sha256 = "0dc84pswgjl401nqx3127zn2r43a1n9kmhwx4xqy5l1favm1lfv0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers hashable megaparsec @@ -193777,8 +194288,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-client"; - version = "0.20.0"; - sha256 = "1gq7sn2dfsmbls2l9kw1x59xq2xqb7ahbdgi4705riwm06kvrj1y"; + version = "0.20.1"; + sha256 = "0r2qp9nin5hlk1adflgn6s2x831d3g6y5d1pvdiahgjbn0mm580w"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers file-embed @@ -193802,8 +194313,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-code-gen"; - version = "0.20.0"; - sha256 = "0d7p2151zrvbbdxwsp6kjrmd4x5za3n7p47apn9b4lhwylqzgx1k"; + version = "0.20.1"; + sha256 = "08hzxxvnbrqnkhaahh5npjy637pjkhcf8dnh2zswq1c2pmyaw10s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -193829,8 +194340,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-core"; - version = "0.20.0"; - sha256 = "19203qc0zfixb60fyf8ddlpbdwynq0g1w31ssmcdldqjdqf7fpdc"; + version = "0.20.1"; + sha256 = "0rinp9zkdls07lr0606jxxijybq89xwxl6vgkx9wgfkrcd014wng"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers hashable megaparsec mtl relude @@ -193857,8 +194368,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-subscriptions"; - version = "0.20.0"; - sha256 = "1yrba6d33x24rmzpmbnd3pbnn00za0bs4xl9sqfbyizc485164v0"; + version = "0.20.1"; + sha256 = "1wad97zjw8766920q26069qb1fi4w25i9pxibkadvc42j4vzkv0p"; libraryHaskellDepends = [ aeson base bytestring morpheus-graphql-app morpheus-graphql-core mtl relude text transformers unliftio-core unordered-containers @@ -193890,14 +194401,14 @@ self: { license = lib.licenses.mit; }) {}; - "morpheus-graphql-tests_0_20_0" = callPackage + "morpheus-graphql-tests_0_20_1" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, relude, tasty , tasty-hunit, text, unordered-containers }: mkDerivation { pname = "morpheus-graphql-tests"; - version = "0.20.0"; - sha256 = "0ss2fmz97ppmxsd2dfaxbiy2rw1xba7kyn6fg7a0y25y68whwryl"; + version = "0.20.1"; + sha256 = "1z977hyf1hsaal45m4jh938q3srw3kh75xhgb9m0zrph085wzr7f"; libraryHaskellDepends = [ aeson base bytestring directory relude tasty tasty-hunit text unordered-containers @@ -198361,29 +198872,6 @@ self: { }) {}; "nanovg" = callPackage - ({ mkDerivation, base, bytestring, c2hs, containers, freetype, glew - , hspec, inline-c, libGL, libGLU, libX11, QuickCheck, text, vector - }: - mkDerivation { - pname = "nanovg"; - version = "0.8.0.0"; - sha256 = "1il4305wv7f53225jv5s04nf7gf5rw6cfxm8j3v1di2xvhdingz5"; - revision = "2"; - editedCabalFile = "1vvlmbvpafvqawfph2aicysy9nklm8rqdz2bdpkq0kg4dgi72jr2"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base bytestring containers text vector ]; - librarySystemDepends = [ glew libGL libGLU libX11 ]; - libraryPkgconfigDepends = [ freetype glew ]; - libraryToolDepends = [ c2hs ]; - testHaskellDepends = [ base containers hspec inline-c QuickCheck ]; - description = "Haskell bindings for nanovg"; - license = lib.licenses.isc; - }) {inherit (pkgs) freetype; inherit (pkgs) glew; - inherit (pkgs) libGL; inherit (pkgs) libGLU; - inherit (pkgs.xorg) libX11;}; - - "nanovg_0_8_1_0" = callPackage ({ mkDerivation, base, bytestring, c2hs, containers, freetype, glew , hspec, inline-c, libGL, libGLU, libX11, QuickCheck, text, vector }: @@ -198400,7 +198888,6 @@ self: { testHaskellDepends = [ base containers hspec inline-c QuickCheck ]; description = "Haskell bindings for nanovg"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) freetype; inherit (pkgs) glew; inherit (pkgs) libGL; inherit (pkgs) libGLU; inherit (pkgs.xorg) libX11;}; @@ -203188,8 +203675,8 @@ self: { pname = "nonlinear-optimization-ad"; version = "0.2.4"; sha256 = "0wqi1y4f2sqn7wg1bj3i73kwdawg9ni6lq1s87m6sshy34n0vbx5"; - revision = "2"; - editedCabalFile = "09q4c4vaxs1dxi6m8ph8r1jw95hwsqvcybsfpzxdrk2j5mp43gw8"; + revision = "3"; + editedCabalFile = "0n32cs870mkw8imgm7fx4d6jg53q2idxnl0x85ky973p4igdpy4h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -203207,6 +203694,8 @@ self: { pname = "nonlinear-optimization-backprop"; version = "0.2.4"; sha256 = "0j7i67m25r4hs81w0j090c8wifvxxs0hzj0l0rj7aa1yrx5iwbhq"; + revision = "1"; + editedCabalFile = "1n034q0qc7xz3ggj105ghsn89k5v91178p1vfji9ig9f8kfs055c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -204674,6 +205163,46 @@ self: { license = lib.licenses.asl20; }) {}; + "nvim-hs_2_2_0_3" = callPackage + ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit + , containers, data-default, deepseq, foreign-store, hslogger, hspec + , hspec-discover, HUnit, megaparsec, messagepack, mtl, network + , optparse-applicative, path, path-io, prettyprinter + , prettyprinter-ansi-terminal, QuickCheck, resourcet, stm + , streaming-commons, template-haskell + , template-haskell-compat-v0208, text, time, time-locale-compat + , transformers, transformers-base, typed-process, unliftio + , unliftio-core, utf8-string, vector, void + }: + mkDerivation { + pname = "nvim-hs"; + version = "2.2.0.3"; + sha256 = "0sbppnphnbygxjns373hyb3hvbwzlv4sq104682bcajd07x6vhmw"; + libraryHaskellDepends = [ + base bytestring cereal cereal-conduit conduit containers + data-default deepseq foreign-store hslogger megaparsec messagepack + mtl network optparse-applicative path path-io prettyprinter + prettyprinter-ansi-terminal resourcet stm streaming-commons + template-haskell template-haskell-compat-v0208 text time + time-locale-compat transformers transformers-base typed-process + unliftio unliftio-core utf8-string vector void + ]; + testHaskellDepends = [ + base bytestring cereal cereal-conduit conduit containers + data-default foreign-store hslogger hspec hspec-discover HUnit + megaparsec messagepack mtl network optparse-applicative path + path-io prettyprinter prettyprinter-ansi-terminal QuickCheck + resourcet stm streaming-commons template-haskell + template-haskell-compat-v0208 text time time-locale-compat + transformers transformers-base typed-process unliftio unliftio-core + utf8-string vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell plugin backend for neovim"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "nvim-hs-contrib" = callPackage ({ mkDerivation, base, bytestring, data-default, directory , filepath, hspec, hspec-discover, messagepack, mtl, nvim-hs @@ -208040,6 +208569,8 @@ self: { pname = "optics-extra"; version = "0.4.2.1"; sha256 = "0hfa5yb7l3l310lfxkii13fjzb69g619agadc5a86i734nisf8vy"; + revision = "1"; + editedCabalFile = "0bpr1bkb7mmww028n8ikwa0qhdl7ybxpb9s887dlp3dvxr5iq8nq"; libraryHaskellDepends = [ array base bytestring containers hashable indexed-profunctors indexed-traversable-instances mtl optics-core text transformers @@ -208057,8 +208588,8 @@ self: { pname = "optics-th"; version = "0.4.1"; sha256 = "05zxljfqmhr5if7l8gld5s864nql6kqjfizsf1z7r3ydknvmff6p"; - revision = "1"; - editedCabalFile = "0q58020ql4ggv50y64chg57czczg27f8ysbp4a265zxi5i0kfvvq"; + revision = "2"; + editedCabalFile = "1fl217q7s0g8a46p2smanhhdj0jqvc9n3lagcnpphkv3fzfgrcbz"; libraryHaskellDepends = [ base containers mtl optics-core template-haskell th-abstraction transformers @@ -210137,8 +210668,8 @@ self: { pname = "palette"; version = "0.3.0.2"; sha256 = "0820n3cj4zy9s46diln2rrs4lrxbipkhdw74p2w42gc7k1nlj54i"; - revision = "3"; - editedCabalFile = "1m9nd65pmnwmy74yqq283w53p483mnfvzkv1iyd6y97f0scgxs84"; + revision = "4"; + editedCabalFile = "07yjz9hsmfm5jh05i4nqc6iax61ssr97475l7pf3bbdp8bam39wl"; libraryHaskellDepends = [ array base colour containers MonadRandom ]; @@ -210276,7 +210807,7 @@ self: { maintainers = [ lib.maintainers.peti ]; }) {}; - "pandoc_2_19_1" = callPackage + "pandoc_2_19_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base , base64, binary, blaze-html, blaze-markup, bytestring , case-insensitive, citeproc, commonmark, commonmark-extensions @@ -210297,8 +210828,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.19.1"; - sha256 = "107r2hqljjic503w198qz16gv7gmkl7w8ir1w5riba0kvz9nqs3c"; + version = "2.19.2"; + sha256 = "0ia2gpl345lwymk38y89sgcqjci7sjmxbi228idg6nkaqfa3ds1n"; configureFlags = [ "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -211235,6 +211766,48 @@ self: { license = lib.licenses.bsd3; }) {}; + "pantry_0_5_7" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal + , casa-client, casa-types, conduit, conduit-extra, containers + , cryptonite, cryptonite-conduit, digest, exceptions, filelock + , generic-deriving, hackage-security, hedgehog, hpack, hspec + , http-client, http-client-tls, http-conduit, http-download + , http-types, memory, mtl, network-uri, path, path-io, persistent + , persistent-sqlite, persistent-template, primitive, QuickCheck + , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint + , tar-conduit, text, text-metrics, time, transformers, unix-compat + , unliftio, unordered-containers, vector, yaml, zip-archive + }: + mkDerivation { + pname = "pantry"; + version = "0.5.7"; + sha256 = "1cck09972pv2kz6kpg631rxfqwy92g4ibngfjy0bkp2xfadcg6ci"; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring Cabal casa-client casa-types + conduit conduit-extra containers cryptonite cryptonite-conduit + digest filelock generic-deriving hackage-security hpack http-client + http-client-tls http-conduit http-download http-types memory mtl + network-uri path path-io persistent persistent-sqlite + persistent-template primitive resourcet rio rio-orphans + rio-prettyprint tar-conduit text text-metrics time transformers + unix-compat unliftio unordered-containers vector yaml zip-archive + ]; + testHaskellDepends = [ + aeson ansi-terminal base bytestring Cabal casa-client casa-types + conduit conduit-extra containers cryptonite cryptonite-conduit + digest exceptions filelock generic-deriving hackage-security + hedgehog hpack hspec http-client http-client-tls http-conduit + http-download http-types memory mtl network-uri path path-io + persistent persistent-sqlite persistent-template primitive + QuickCheck raw-strings-qq resourcet rio rio-orphans rio-prettyprint + tar-conduit text text-metrics time transformers unix-compat + unliftio unordered-containers vector yaml zip-archive + ]; + description = "Content addressable Haskell package management"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pantry-tmp" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans , base64-bytestring, bytestring, Cabal, conduit, conduit-extra @@ -215578,7 +216151,7 @@ self: { maintainers = [ lib.maintainers.psibi ]; }) {}; - "persistent_2_14_1_0" = callPackage + "persistent_2_14_2_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, bytestring, conduit, containers, criterion, deepseq , fast-logger, file-embed, hspec, http-api-data, lift-type @@ -215589,8 +216162,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.14.1.0"; - sha256 = "1jzmqxlvyzgp25rczlp1pi8msd776gw6jlf141zlqrs3523qc0wq"; + version = "2.14.2.0"; + sha256 = "0iwkn9llas29jmih1zqj52973352pz4yp3dpajdxbypyn16v8p5v"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers fast-logger http-api-data lift-type monad-logger @@ -215689,6 +216262,8 @@ self: { pname = "persistent-discover"; version = "0.1.0.5"; sha256 = "1y90046yva6zxm0im8p51yivqyp8nhgplwgnmw78sw1fa2gvjvs9"; + revision = "1"; + editedCabalFile = "1irdncx38kk4s22fbygh4q3ai08sj98qw2mp2dhaflyjxmv3px5x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -216551,24 +217126,27 @@ self: { }) {}; "pg-entity" = callPackage - ({ mkDerivation, base, bytestring, colourista, exceptions, hspec - , hspec-expectations-lifted, hspec-pg-transact, monad-control - , parsec, pg-transact, postgresql-simple - , postgresql-simple-migration, resource-pool, safe-exceptions - , template-haskell, text, text-manipulate, time, uuid, vector + ({ mkDerivation, aeson, base, bytestring, colourista, containers + , exceptions, hedgehog, monad-control, mtl, optics-core, parsec + , pg-transact, postgresql-simple, postgresql-simple-migration + , resource-pool, safe-exceptions, tasty, tasty-hunit + , template-haskell, text, text-display, text-manipulate, time + , tmp-postgres, uuid, vector }: mkDerivation { pname = "pg-entity"; - version = "0.0.1.0"; - sha256 = "0njmlxxisigza4k6v5ci36xm6mpf5jdls2mrlarlw91agxiz8zd9"; + version = "0.0.2.0"; + sha256 = "0g8ici9l5lm4a900nyi90xvbjgy4z3zds46nn8sdw8ipnj0hkk1v"; libraryHaskellDepends = [ base bytestring colourista exceptions monad-control parsec pg-transact postgresql-simple resource-pool safe-exceptions - template-haskell text text-manipulate time uuid vector + template-haskell text text-display text-manipulate time uuid vector ]; testHaskellDepends = [ - base hspec hspec-expectations-lifted hspec-pg-transact pg-transact - postgresql-simple postgresql-simple-migration text time uuid vector + aeson base containers hedgehog mtl optics-core pg-transact + postgresql-simple postgresql-simple-migration resource-pool + safe-exceptions tasty tasty-hunit text time tmp-postgres uuid + vector ]; description = "A pleasant PostgreSQL layer"; license = lib.licenses.mit; @@ -217155,8 +217733,8 @@ self: { ({ mkDerivation, base, filters-basic, mmsyn2-array }: mkDerivation { pname = "phonetic-languages-filters-array"; - version = "0.4.0.0"; - sha256 = "0rkgwf9v98vdflhkcfn7s0in8dw69rh2dcv8n9lvpjd0ccmlvil8"; + version = "0.5.0.0"; + sha256 = "087ngarvpihrjvfnm6kbm7qfiy947r35rig44hyn5dxzq7pxqzp6"; libraryHaskellDepends = [ base filters-basic mmsyn2-array ]; description = "Allows to change the structure of the function output"; license = lib.licenses.mit; @@ -217324,8 +217902,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-examples-array"; - version = "0.20.0.0"; - sha256 = "0w22h8s272rnasqyzlxx0badw5dkv99sxrgbflb86hj6lsm06g1d"; + version = "0.20.1.0"; + sha256 = "0c664k9vvk2j522dwn27caf4d35dshj3z07c9qgzy47rjs65r6xw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -217390,8 +217968,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-array"; - version = "0.18.1.0"; - sha256 = "1frn5zijjv1054lwd7mvp4klv96ywpbxv5msnyl7a2bbikwrdhqs"; + version = "0.18.2.0"; + sha256 = "0jyg507a4gh437vzxj658nhs8l32p2xg4vifrgs5q5jyck61p7z5"; libraryHaskellDepends = [ base cli-arguments foldable-ix heaps mmsyn2-array mmsyn3 parallel phonetic-languages-basis phonetic-languages-constraints-array @@ -221604,8 +222182,8 @@ self: { }: mkDerivation { pname = "polysemy-chronos"; - version = "0.5.0.0"; - sha256 = "04cj96iwn7fgyk4r8hy730lm1j01q7iv1yd7rdq20kp9mris5c6c"; + version = "0.5.1.0"; + sha256 = "00kbc6591mpa41fl0vzmxickphn4ryh3fx2f55qbqpshvg417m6x"; libraryHaskellDepends = [ base chronos incipit-core polysemy-time ]; @@ -222148,8 +222726,8 @@ self: { }: mkDerivation { pname = "polysemy-time"; - version = "0.5.0.0"; - sha256 = "026rqwm9bjlxvcxjnnma06z30xkmysjnj8r5krbq5rinqdpjdfbs"; + version = "0.5.1.0"; + sha256 = "16p5256v9cvns348xva8qz0dsaqgcf5cijm93831lskfkvlvnzc5"; libraryHaskellDepends = [ aeson base incipit-core stm template-haskell time torsor ]; @@ -223818,6 +224396,39 @@ self: { broken = true; }) {}; + "postgresql-query_3_10_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring + , containers, data-default, doctest, exceptions, file-embed + , generic-arbitrary, haskell-src-meta, hreader, hset, inflections + , monad-control, monad-logger, mtl, postgresql-simple, QuickCheck + , quickcheck-assertions, quickcheck-instances, resource-pool + , semigroups, tasty, tasty-hunit, tasty-quickcheck, tasty-th + , template-haskell, text, th-lift, th-lift-instances, time + , transformers, transformers-base, transformers-compat + }: + mkDerivation { + pname = "postgresql-query"; + version = "3.10.0"; + sha256 = "16dkfcv9wcbzqdyka609nav538044bwzvzw79mghrrax0xmzl1xj"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder bytestring containers + data-default exceptions file-embed haskell-src-meta hreader hset + inflections monad-control monad-logger mtl postgresql-simple + resource-pool semigroups template-haskell text th-lift + th-lift-instances time transformers transformers-base + transformers-compat + ]; + testHaskellDepends = [ + attoparsec base doctest generic-arbitrary postgresql-simple + QuickCheck quickcheck-assertions quickcheck-instances tasty + tasty-hunit tasty-quickcheck tasty-th text time + ]; + description = "Sql interpolating quasiquote plus some kind of primitive ORM using it"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "postgresql-replicant" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, binary, bits , bytestring, cereal, containers, hspec, keep-alive @@ -227660,46 +228271,47 @@ self: { , bytestring, Cabal, cassava, conduit, containers, convertible , criterion, cryptohash-sha256, curryer-rpc, data-interval, deepseq , deepseq-generics, deferred-folds, directory, either, exceptions - , extended-reals, filepath, foldl, ghc, ghc-boot, ghc-paths, ghci - , Glob, gnuplot, hashable, hashable-time, haskeline, http-api-data - , http-conduit, http-types, HUnit, list-t, megaparsec, modern-uri - , monad-parallel, MonadRandom, mtl, network, old-locale - , optparse-applicative, parallel, parser-combinators, path-pieces - , prettyprinter, QuickCheck, quickcheck-instances, random - , random-shuffle, recursion-schemes, resourcet, rset, scotty - , semigroups, stm, stm-containers, streamly, template-haskell - , temporary, text, text-manipulate, time, transformers, unix - , unordered-containers, uuid, vector, vector-instances, wai - , wai-websockets, warp, warp-tls, websockets, winery, zlib + , extended-reals, fast-builder, filepath, foldl, ghc, ghc-boot + , ghc-paths, ghci, Glob, gnuplot, hashable, haskeline + , http-api-data, http-conduit, http-types, HUnit, list-t + , megaparsec, modern-uri, monad-parallel, MonadRandom, mtl, network + , old-locale, optparse-applicative, parallel, parser-combinators + , path-pieces, prettyprinter, QuickCheck, quickcheck-instances + , random, random-shuffle, recursion-schemes, resourcet, rset + , scientific, scotty, semigroups, stm, stm-containers, streamly + , template-haskell, temporary, text, text-manipulate, time + , time-compat, transformers, unix, unordered-containers, uuid + , vector, vector-instances, wai, wai-websockets, warp, warp-tls + , websockets, winery, zlib }: mkDerivation { pname = "project-m36"; - version = "0.9.4"; - sha256 = "0byxxgakhkmqgzc0p394fi3k3qffn65zkk51zgvlzin0m074baxp"; + version = "0.9.5"; + sha256 = "01gd1hi7x515q1y2nz3zsx3481rb13f30i6xccyzm4fjn7p08mv7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async attoparsec base base64-bytestring bytestring cassava conduit containers convertible cryptohash-sha256 curryer-rpc data-interval deepseq deepseq-generics deferred-folds directory - either exceptions extended-reals filepath foldl ghc ghc-boot - ghc-paths ghci Glob gnuplot hashable hashable-time haskeline + either exceptions extended-reals fast-builder filepath foldl ghc + ghc-boot ghc-paths ghci Glob gnuplot hashable haskeline http-api-data list-t monad-parallel MonadRandom mtl network old-locale optparse-applicative parallel path-pieces QuickCheck quickcheck-instances random-shuffle recursion-schemes resourcet - rset semigroups stm stm-containers streamly temporary text - text-manipulate time transformers unix unordered-containers uuid - vector vector-instances winery zlib + rset scientific semigroups stm stm-containers streamly temporary + text text-manipulate time time-compat transformers unix + unordered-containers uuid vector vector-instances winery zlib ]; executableHaskellDepends = [ aeson attoparsec barbies base base16-bytestring base64-bytestring binary blaze-html bytestring Cabal cassava conduit containers cryptohash-sha256 curryer-rpc data-interval deepseq deepseq-generics directory either filepath ghc ghc-paths gnuplot - hashable hashable-time haskeline http-api-data http-conduit - http-types HUnit list-t megaparsec modern-uri MonadRandom mtl - network optparse-applicative parallel parser-combinators - path-pieces prettyprinter random scotty semigroups stm + hashable haskeline http-api-data http-conduit http-types HUnit + list-t megaparsec modern-uri MonadRandom mtl network + optparse-applicative parallel parser-combinators path-pieces + prettyprinter random scientific scotty semigroups stm stm-containers template-haskell temporary text time transformers unordered-containers uuid vector wai wai-websockets warp warp-tls websockets winery @@ -227708,22 +228320,21 @@ self: { aeson attoparsec base base16-bytestring base64-bytestring bytestring Cabal cassava containers cryptohash-sha256 curryer-rpc data-interval deepseq deepseq-generics directory filepath gnuplot - hashable hashable-time haskeline http-conduit http-types HUnit - list-t megaparsec modern-uri MonadRandom mtl network - optparse-applicative parallel parser-combinators prettyprinter - random semigroups stm stm-containers temporary text time - transformers unordered-containers uuid vector websockets winery + hashable haskeline http-conduit http-types HUnit list-t megaparsec + modern-uri MonadRandom mtl network optparse-applicative parallel + parser-combinators prettyprinter random scientific semigroups stm + stm-containers temporary text time transformers + unordered-containers uuid vector websockets winery ]; benchmarkHaskellDepends = [ aeson attoparsec base base16-bytestring base64-bytestring bytestring Cabal cassava containers criterion cryptohash-sha256 curryer-rpc data-interval deepseq deepseq-generics directory - filepath gnuplot hashable hashable-time haskeline http-conduit - http-types HUnit list-t megaparsec modern-uri MonadRandom mtl - network optparse-applicative parallel parser-combinators - prettyprinter random semigroups stm stm-containers temporary text - time transformers unordered-containers uuid vector websockets - winery + filepath gnuplot hashable haskeline http-conduit http-types HUnit + list-t megaparsec modern-uri MonadRandom mtl network + optparse-applicative parallel parser-combinators prettyprinter + random scientific semigroups stm stm-containers temporary text time + transformers unordered-containers uuid vector websockets winery ]; description = "Relational Algebra Engine"; license = lib.licenses.mit; @@ -229209,6 +229820,20 @@ self: { mainProgram = "pstemmer-test-exe"; }) {}; + "psx" = callPackage + ({ mkDerivation, async, base, tasty, tasty-hunit }: + mkDerivation { + pname = "psx"; + version = "0.1.0.0"; + sha256 = "1clxvv9qazq02307ay7acy17614407zhjm9p1139dfiqri1218ar"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ async base tasty tasty-hunit ]; + description = "Integrate @libpsx@ with the GHC RTS"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "ptera" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest , enummapset-th, hspec, hspec-discover, membership, ptera-core @@ -230335,27 +230960,6 @@ self: { }) {}; "pusher-http-haskell" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , cryptonite, hashable, hspec, http-client, http-client-tls - , http-types, memory, QuickCheck, text, time, unordered-containers - }: - mkDerivation { - pname = "pusher-http-haskell"; - version = "2.1.0.10"; - sha256 = "1xmqs11v8bj099izdqfq6mza4rqm1njznrdcfq4zvwg9381n86hz"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring cryptonite hashable - http-client http-client-tls http-types memory text time - unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring hspec QuickCheck text unordered-containers - ]; - description = "Haskell client library for the Pusher Channels HTTP API"; - license = lib.licenses.mit; - }) {}; - - "pusher-http-haskell_2_1_0_11" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , cryptonite, hashable, hspec, http-client, http-client-tls , http-types, memory, QuickCheck, text, time, unordered-containers @@ -230374,7 +230978,6 @@ self: { ]; description = "Haskell client library for the Pusher Channels HTTP API"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "pusher-ws" = callPackage @@ -231875,8 +232478,8 @@ self: { ({ mkDerivation, base, QuickCheck, random }: mkDerivation { pname = "quickcheck-dynamic"; - version = "1.0.0"; - sha256 = "0c4kagvlwihqz14kwdawkv9gg1ncq36icqdxyz3lyk5hyijxr56n"; + version = "1.1.0"; + sha256 = "0agb3hi9g9fcwbas1wh3sxb77gakisgh5wmfbysr91pxilqkrx3y"; libraryHaskellDepends = [ base QuickCheck random ]; description = "A library for stateful property-based testing"; license = lib.licenses.asl20; @@ -233394,6 +233997,8 @@ self: { pname = "ral"; version = "0.2.1"; sha256 = "1f6sks81g8zxkgnp7lc5n0aimnvbbvkazassc17z0prs56hs63si"; + revision = "1"; + editedCabalFile = "12hvk5cz97ljnwa4y8c47hhfg8v1j7n3zqhb99cmrvgm58ar5j4q"; libraryHaskellDepends = [ adjunctions base bin boring deepseq distributive fin hashable indexed-traversable QuickCheck semigroupoids @@ -233409,8 +234014,8 @@ self: { pname = "ral-lens"; version = "0.2"; sha256 = "0nlw0q0b8bza98h74k0wa2vc9m5bk6g9slri1mzd6cr1pmpvna67"; - revision = "1"; - editedCabalFile = "0fmwfl0ci25g4lzprj9xm4jv1is4m7j8v8j0n09j4qxvlzz6y4p1"; + revision = "2"; + editedCabalFile = "156nfgr5229r2r3aq92jrjagjvp95vy303b680h89rfyl8bjx7qi"; libraryHaskellDepends = [ base bin fin lens ral ]; description = "Length-indexed random access lists: lens utilities"; license = lib.licenses.gpl2Plus; @@ -233422,8 +234027,8 @@ self: { pname = "ral-optics"; version = "0.2"; sha256 = "1s7pxkf0vw1a5k1gwyfn6wsmiaa4csbghqshdbva8c73510q0fp1"; - revision = "1"; - editedCabalFile = "1dbd9v0s0g06sr0cx5dma4bn6ga47ha501nm06rfs2y6dbv1jn23"; + revision = "2"; + editedCabalFile = "111b5ghsy1flf5czqz42hfqzp5n8fphw4a1jdgphm2f9b3h1bj43"; libraryHaskellDepends = [ base bin fin optics-core ral ]; description = "Length-indexed random access lists: optics utilities"; license = lib.licenses.gpl2Plus; @@ -233491,6 +234096,20 @@ self: { license = lib.licenses.mit; }) {}; + "rampart_2_0_0_3" = callPackage + ({ mkDerivation, base, criterion, hspec }: + mkDerivation { + pname = "rampart"; + version = "2.0.0.3"; + sha256 = "1g6297vfsa61ygywsc906p5449nzljldl3bbf2jags79b6qwa15n"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Determine how intervals relate to each other"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "ramus" = callPackage ({ mkDerivation, base, criterion, hspec, QuickCheck, quickcheck-io }: @@ -233937,8 +234556,8 @@ self: { pname = "range-set-list"; version = "0.1.3.1"; sha256 = "0m8c8qhpk9vaykqfy6gsv1csmvdclm27zv9l56ipv152k75xks0j"; - revision = "3"; - editedCabalFile = "0r6ilczzhzhkndg56bih8na4jf62nrwwpkc5n16sbm61yr49hsha"; + revision = "4"; + editedCabalFile = "17wbbhjlcbyz9qil2z2s6nwk7mdfck1lkx5jqrdsavwbrzza6xzr"; libraryHaskellDepends = [ base containers deepseq hashable ]; testHaskellDepends = [ base containers deepseq hashable tasty tasty-quickcheck @@ -234406,6 +235025,28 @@ self: { license = lib.licenses.mit; }) {}; + "ratel_2_0_0_4" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, filepath, hspec, http-client, http-client-tls + , http-types, uuid + }: + mkDerivation { + pname = "ratel"; + version = "2.0.0.4"; + sha256 = "0iwdj9bmv3k7ppq51z66z1h8rrsi6jcc6xpdf5b8c869fazy6nd4"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive containers http-client + http-client-tls http-types uuid + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive containers filepath hspec + http-client http-client-tls http-types uuid + ]; + description = "Notify Honeybadger about exceptions"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "ratel-wai" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , http-client, ratel, wai @@ -234421,6 +235062,22 @@ self: { license = lib.licenses.mit; }) {}; + "ratel-wai_2_0_0_1" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , http-client, ratel, wai + }: + mkDerivation { + pname = "ratel-wai"; + version = "2.0.0.1"; + sha256 = "0hh99f7dwl5gihgqjn627s6sn4p68h1lifl2m8qqlhhdnnbwy4lr"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers http-client ratel wai + ]; + description = "Notify Honeybadger about exceptions via a WAI middleware"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "ratelimiter" = callPackage ({ mkDerivation, base, containers, extra, mtl, time, timespan , vector @@ -234566,14 +235223,14 @@ self: { broken = true; }) {}; - "rattletrap_11_2_11" = callPackage + "rattletrap_11_2_12" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring , containers, filepath, http-client, http-client-tls, text }: mkDerivation { pname = "rattletrap"; - version = "11.2.11"; - sha256 = "004lhyi5v34124990j1m8mhcb1inn6313lp4db9yd3p82c7k928n"; + version = "11.2.12"; + sha256 = "1c3mpcjx2yl1w5myrqsdcsgr5x2hiv4pw5qd3ghlxkhl15rxbkzv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -236185,6 +236842,8 @@ self: { pname = "recursion-schemes"; version = "5.2.2.2"; sha256 = "018l7j9pk8izi817vqyrakrkjsxr332jh24d6j0yl35i5wm4khv6"; + revision = "1"; + editedCabalFile = "1l6wbzx8804pb6p8gvk45hal6sz8r1gvyxb8aa9ih6j8pqv4q04c"; libraryHaskellDepends = [ base base-orphans comonad containers data-fix free template-haskell th-abstraction transformers @@ -236281,6 +236940,20 @@ self: { broken = true; }) {}; + "recv" = callPackage + ({ mkDerivation, base, bytestring, hspec, hspec-discover, network + }: + mkDerivation { + pname = "recv"; + version = "0.0.0"; + sha256 = "1yz9b95m9yxcwbbwdvp288y47ycn4yq9g7ixlw0sf98h5rjp4s2w"; + libraryHaskellDepends = [ base bytestring network ]; + testHaskellDepends = [ base bytestring hspec network ]; + testToolDepends = [ hspec-discover ]; + description = "Efficient netowrk recv"; + license = lib.licenses.bsd3; + }) {}; + "red-black-record" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, profunctors , sop-core, tasty, tasty-hunit, text @@ -238398,6 +239071,8 @@ self: { pname = "regex-rure"; version = "0.1.2.0"; sha256 = "1my3rmj2766bd00qg25wijgvw7ffk8fq965y2b97s5v00fjds33r"; + revision = "1"; + editedCabalFile = "0pyj0ar204q8vhcwn0i5rqjjplsw0b6yhvy57am5b3sgcki41si5"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ rure ]; libraryToolDepends = [ c2hs ]; @@ -240652,8 +241327,8 @@ self: { pname = "rere"; version = "0.2"; sha256 = "0s89flhcmwppypxz909ifmzq7vlwy35yjrbw0gkgm4ikbw6l1ylr"; - revision = "1"; - editedCabalFile = "1mpabhclfkn4a1b7r4vwf6n98xwrzivw8nd0g5jbplbsw5lwxv1j"; + revision = "2"; + editedCabalFile = "1gbf04s2rjs8kn1g28kd5qm8rvq6fdna88l1plw67q19v9rkxidp"; libraryHaskellDepends = [ base containers fin parsec QuickCheck transformers vec ]; @@ -241439,8 +242114,8 @@ self: { }: mkDerivation { pname = "ret"; - version = "0.1.4.2"; - sha256 = "1p0d854hw5qs94fiqsbgbs4picyjj2g51x0j4nasw4acbfwhmzgz"; + version = "0.1.5.0"; + sha256 = "0d7r0q39xkgh23bgl0za9jrwxlp8jvc5zkz51561sd40hjwbllqx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -244443,6 +245118,32 @@ self: { broken = true; }) {}; + "rpmbuild-order_0_4_9" = callPackage + ({ mkDerivation, base, case-insensitive, directory, extra, fgl + , filepath, graphviz, hspec, optparse-applicative, simple-cmd + , simple-cmd-args, unix + }: + mkDerivation { + pname = "rpmbuild-order"; + version = "0.4.9"; + sha256 = "1fclj2g340030y26mvlzkg9x1br1dmz1y8g5gjh3ngwjwlpy8k1q"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base case-insensitive directory extra fgl filepath graphviz + simple-cmd + ]; + executableHaskellDepends = [ + base directory extra fgl optparse-applicative simple-cmd-args + ]; + testHaskellDepends = [ base extra hspec simple-cmd unix ]; + description = "Sort RPM packages in dependency order"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "rpmbuild-order"; + broken = true; + }) {}; + "rrb-vector" = callPackage ({ mkDerivation, base, deepseq, indexed-traversable, primitive , tasty, tasty-bench, tasty-quickcheck @@ -245526,6 +246227,8 @@ self: { pname = "safe-json"; version = "1.1.3.1"; sha256 = "1rwjlyw0ps29ks2lzji0pi0mz86ma5x0zyhpc1xg740s5592rjf9"; + revision = "1"; + editedCabalFile = "0mf2z0rfyyhscrx8cg0yjz87f7xm8bv68c6z1p0pj5kbfnz0pzqs"; libraryHaskellDepends = [ aeson base bytestring containers dlist hashable scientific tasty tasty-hunit tasty-quickcheck text time unordered-containers @@ -246183,6 +246886,19 @@ self: { license = lib.licenses.mit; }) {}; + "salve_2_0_0_1" = callPackage + ({ mkDerivation, base, HUnit }: + mkDerivation { + pname = "salve"; + version = "2.0.0.1"; + sha256 = "0g2y0ng0s3hp9scp080m933yixhl3zd8bsjvyf2k0pn9b9cg0p79"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base HUnit ]; + description = "Semantic version numbers and constraints"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "salvia" = callPackage ({ mkDerivation, base, bytestring, containers, directory, fclabels , MaybeT-transformers, monads-fd, network, old-locale, process @@ -246807,8 +247523,8 @@ self: { pname = "satchmo-toysat"; version = "0.2.1.0"; sha256 = "1g6hzgdiiczwk87928xi42lv2swm218i9hs39f3zqpcp8r7fxh61"; - revision = "1"; - editedCabalFile = "1cyaibpgmzyc2yd6djjll0f2ywc2fkny9f4pbgwl8f1pyl223m67"; + revision = "2"; + editedCabalFile = "1q9kdi7l4nzig91b7gl9vqr8285kdfcbgzbkd22204iih6j6cmmf"; libraryHaskellDepends = [ array base containers satchmo toysolver ]; @@ -248262,13 +248978,13 @@ self: { ({ mkDerivation, base, ditto, ditto-lucid, lucid, scotty, text }: mkDerivation { pname = "scotty-form"; - version = "0.3.0.0"; - sha256 = "0v04j8ffbbm319xh5cfk1zjh3z12n18g38ppmzww0b7n4ixr2f8c"; + version = "0.4.1.0"; + sha256 = "1xfii1ms9z4h52jxv3p784l1ymn9khgxiazaqq6kxyzfkmn5l9zv"; libraryHaskellDepends = [ base ditto ditto-lucid lucid scotty text ]; description = "Html form validation using `ditto`"; - license = lib.licenses.gpl2Only; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -254912,6 +255628,22 @@ self: { broken = true; }) {}; + "sha-validation" = callPackage + ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring + , directory, filepath, template-haskell, text, vector + }: + mkDerivation { + pname = "sha-validation"; + version = "0.1.0.0"; + sha256 = "190z2sgbbnq4p91j1xlc8bnnspz68r1m17vvzxpcifh2ji42al0v"; + libraryHaskellDepends = [ + attoparsec base base16-bytestring bytestring directory filepath + template-haskell text vector + ]; + description = "Validation SHA Implementations"; + license = lib.licenses.mit; + }) {}; + "sha1" = callPackage ({ mkDerivation, base, bytebuild, byteslice, natural-arithmetic , primitive, small-bytearray-builder @@ -257015,6 +257747,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "silently_1_2_5_3" = callPackage + ({ mkDerivation, base, deepseq, directory, nanospec, temporary }: + mkDerivation { + pname = "silently"; + version = "1.2.5.3"; + sha256 = "0wk3yci4r9v0vwyzylj3k07damz17jwc6n6imwqahf4lsapsz7ds"; + libraryHaskellDepends = [ base deepseq directory ]; + testHaskellDepends = [ base deepseq directory nanospec temporary ]; + description = "Prevent or capture writing to stdout and other handles"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "silkscreen" = callPackage ({ mkDerivation, base, prettyprinter }: mkDerivation { @@ -257611,6 +258356,18 @@ self: { license = lib.licenses.mit; }) {}; + "simple-media-timestamp_0_2_1_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "simple-media-timestamp"; + version = "0.2.1.0"; + sha256 = "1d4zx68cz4i3gdah3j7kn2zr3h34mh89a4wkqb0aasxbyiwll4p0"; + libraryHaskellDepends = [ base ]; + description = "A very simple timestamp type"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "simple-media-timestamp-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, simple-media-timestamp }: mkDerivation { @@ -258469,8 +259226,8 @@ self: { pname = "singleton-bool"; version = "0.1.6"; sha256 = "1pc34dbzx5g3vw5w03zifvqva3whyvxzfy3yh78qkpd05f0g98sw"; - revision = "1"; - editedCabalFile = "0wg0js2fn7xpvaxz5jmghhc1al3lpwmhjb43mn731ffrbmfryihx"; + revision = "2"; + editedCabalFile = "1l4nx664awgwzk3ih5idsgnj220jqdr1c55241xjv7fz7lwyhh5r"; libraryHaskellDepends = [ base boring dec deepseq some ]; description = "Type level booleans"; license = lib.licenses.bsd3; @@ -258529,6 +259286,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "singletons_3_0_2" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "singletons"; + version = "3.0.2"; + sha256 = "10jy9phwx3gnl5dx6by7chsln1x3lizz2igi4m1qlhznkq9fws7m"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Basic singleton types and definitions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "singletons-base" = callPackage ({ mkDerivation, base, bytestring, Cabal, deepseq, directory , filepath, pretty, process, singletons, singletons-th, tasty @@ -258551,17 +259321,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "singletons-base_3_1" = callPackage + "singletons-base_3_1_1" = callPackage ({ mkDerivation, base, bytestring, Cabal, deepseq, directory , filepath, pretty, process, singletons, singletons-th, tasty , tasty-golden, template-haskell, text, th-desugar, turtle }: mkDerivation { pname = "singletons-base"; - version = "3.1"; - sha256 = "1bsfbdbfwiq2nis3r95x06r0q9iypyz4hkvmgvk56bwj6421k7kd"; - revision = "1"; - editedCabalFile = "12p0xzmrkn2bjz6wf9i291bh47s9c0ziz6cvvja65vnzwd8l60ry"; + version = "3.1.1"; + sha256 = "0d32c1dmi8mlrli0927g3hy6gip4c9w0myza3x594nlb6cnwdj6f"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base pretty singletons singletons-th template-haskell text @@ -258612,16 +259380,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "singletons-th_3_1" = callPackage + "singletons-th_3_1_1" = callPackage ({ mkDerivation, base, containers, ghc-boot-th, mtl, singletons , syb, template-haskell, th-desugar, th-orphans, transformers }: mkDerivation { pname = "singletons-th"; - version = "3.1"; - sha256 = "1mhx7sadw7zxaf7qhryrhi4fiyf9v3jcaplkh1syaa7b4725dm7a"; - revision = "2"; - editedCabalFile = "19ac6s4k6yv0lfrhkmgpf000k32rpm91lngs4955158792pa6fi6"; + version = "3.1.1"; + sha256 = "1bp9abhbk6ad27p0ksqx2nhrkp6r9dgx20dzyl3bq1zf6nz92ss6"; libraryHaskellDepends = [ base containers ghc-boot-th mtl singletons syb template-haskell th-desugar th-orphans transformers @@ -258992,6 +259758,58 @@ self: { broken = true; }) {}; + "sized-wrapper" = callPackage + ({ mkDerivation, base, hspec, hspec-core, hspec-discover }: + mkDerivation { + pname = "sized-wrapper"; + version = "0.1.0.0"; + sha256 = "0y3fbnpps039g0k2r01h0im2ihbnpdb9h6ik912ri73r15mggldm"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec hspec-core hspec-discover ]; + testToolDepends = [ hspec-discover ]; + description = "Create a Sized version of any container"; + license = lib.licenses.isc; + }) {}; + + "sized-wrapper-aeson" = callPackage + ({ mkDerivation, aeson, base, containers, hspec, hspec-core + , hspec-discover, sized-wrapper + }: + mkDerivation { + pname = "sized-wrapper-aeson"; + version = "0.1.0.0"; + sha256 = "1gymzm9cx3989gpcvphzkam4ndxs54j3pavj46ypm3p8853h1zcn"; + libraryHaskellDepends = [ aeson base sized-wrapper ]; + testHaskellDepends = [ + aeson base containers hspec hspec-core hspec-discover sized-wrapper + ]; + testToolDepends = [ hspec-discover ]; + description = "aeson instances for 'Sized'"; + license = lib.licenses.isc; + }) {}; + + "sized-wrapper-quickcheck" = callPackage + ({ mkDerivation, base, QuickCheck, sized-wrapper }: + mkDerivation { + pname = "sized-wrapper-quickcheck"; + version = "0.1.0.0"; + sha256 = "1z14v55h1bn2imzwk50xv6cjpa9qm5m0cdp7zkfhh2pw9qw51ibc"; + libraryHaskellDepends = [ base QuickCheck sized-wrapper ]; + description = "QuickCheck instance for 'Sized'"; + license = lib.licenses.isc; + }) {}; + + "sized-wrapper-text" = callPackage + ({ mkDerivation, base, bytestring, sized-wrapper, text }: + mkDerivation { + pname = "sized-wrapper-text"; + version = "0.1.0.0"; + sha256 = "03p68x5nxzpqz5zfkjr8qfhmqr49gy11nyrnh5glrifih66f7ljs"; + libraryHaskellDepends = [ base bytestring sized-wrapper text ]; + description = "'Sized' wrappers for text"; + license = lib.licenses.isc; + }) {}; + "sizes" = callPackage ({ mkDerivation, base, bytestring, cmdargs, deepseq, dlist, lens , parallel-io, regex-posix, system-fileio, system-filepath, text @@ -262617,8 +263435,8 @@ self: { ({ mkDerivation, base, byteorder, bytestring, network }: mkDerivation { pname = "sockaddr"; - version = "0.0.0"; - sha256 = "1h74k5pipv9314y1d2wgpwgvyxfp6pcnq5051fdqr1shqlkpwbs2"; + version = "0.0.1"; + sha256 = "0szmfcn2bn76c4c14pb59ll83bwrxg68ybfd142cyqdyv5qy18g4"; libraryHaskellDepends = [ base byteorder bytestring network ]; description = "Printing SockAddr"; license = lib.licenses.bsd3; @@ -263115,6 +263933,8 @@ self: { pname = "sop-core"; version = "0.5.0.2"; sha256 = "0rbj56icbaqlcxx5xwvbx4n4vmyv6cfcv7s45n1fv3drahigvgw7"; + revision = "1"; + editedCabalFile = "1p6zyqja021gyndskn1qnj29glqr0hldyhxplnpxz06hz4xqwngz"; libraryHaskellDepends = [ base deepseq ]; description = "True Sums of Products"; license = lib.licenses.bsd3; @@ -264547,23 +265367,22 @@ self: { }) {}; "spline3" = callPackage - ({ mkDerivation, base, cmdargs, doctest, filepath, MissingH, repa + ({ mkDerivation, base, cmdargs, doctest, MissingH, repa , repa-algorithms, repa-io, tasty, tasty-hunit, tasty-quickcheck , vector }: mkDerivation { pname = "spline3"; - version = "1.0.0"; - sha256 = "02sj4mqgjakmk24fv8swwr06rpl4idgmwwnjwqf257hzlns6lriw"; + version = "1.0.1"; + sha256 = "12jpbzmwixhrd6a67ay7rgqbh61d70ffmcn83k0yl6qqkyn2hqkv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base cmdargs filepath MissingH repa repa-algorithms repa-io tasty + base cmdargs MissingH repa repa-algorithms repa-io tasty tasty-hunit tasty-quickcheck vector ]; testHaskellDepends = [ - base cmdargs doctest filepath MissingH repa repa-algorithms repa-io - tasty tasty-hunit tasty-quickcheck vector + base doctest repa tasty tasty-hunit tasty-quickcheck vector ]; description = "A parallel implementation of the Sorokina/Zeilfelder spline scheme"; license = lib.licenses.agpl3Only; @@ -264604,6 +265423,18 @@ self: { license = lib.licenses.isc; }) {}; + "splint_1_0_2_1" = callPackage + ({ mkDerivation, base, containers, ghc, hlint, stm }: + mkDerivation { + pname = "splint"; + version = "1.0.2.1"; + sha256 = "04887k7ys72gkjkw0l1w3sqxwydk20gvfpl0qfwkrx8xp705710l"; + libraryHaskellDepends = [ base containers ghc hlint stm ]; + description = "HLint as a GHC source plugin"; + license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + }) {}; + "split" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -265523,6 +266354,18 @@ self: { license = lib.licenses.mit; }) {}; + "srt_0_1_2_0" = callPackage + ({ mkDerivation, base, simple-media-timestamp, text }: + mkDerivation { + pname = "srt"; + version = "0.1.2.0"; + sha256 = "0y8aagnc1n2pr4yrq2rj2id031yshi241nfbsrl916i81hw4bcny"; + libraryHaskellDepends = [ base simple-media-timestamp text ]; + description = "The data type for SRT files"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "srt-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, mtl, simple-media-timestamp , simple-media-timestamp-attoparsec, srt, text @@ -267188,6 +268031,8 @@ self: { pname = "statestack"; version = "0.3.1"; sha256 = "0h8kwzf117zb2ffc5phbvlxpgza8h59bjg93ndp7r1ks0jvs5lpr"; + revision = "1"; + editedCabalFile = "1bvx9s7zssczqpwwgqw4cgmfdw1wjy0mwqlndjgnkjjn4nm31ml8"; libraryHaskellDepends = [ base mtl transformers ]; description = "Simple State-like monad transformer with saveable and restorable state"; license = lib.licenses.bsd3; @@ -267280,8 +268125,8 @@ self: { ({ mkDerivation, array, base, containers, hashable, primes }: mkDerivation { pname = "static-hash"; - version = "0.0.1"; - sha256 = "0nkgx4s389027zi23wmbc6wqnmplvjvbrsbyzy7zn41mbwmzqz8l"; + version = "0.0.2"; + sha256 = "1kp832cxhclairdpha9mhxma52102b7x1clw6cnlxjzmjygbqbk3"; libraryHaskellDepends = [ array base containers hashable primes ]; description = "Immutable hash"; license = lib.licenses.bsd3; @@ -267886,8 +268731,8 @@ self: { pname = "step-function"; version = "0.2"; sha256 = "1mg7zqqs32zdh1x1738kk0yydyksbhx3y3x8n31f7byk5fvzqq6j"; - revision = "7"; - editedCabalFile = "0fnzln04c8wvhag730hl3h4wwykizwwg5xzsbw5qd3zzx2fmbywz"; + revision = "8"; + editedCabalFile = "0gailvq05bd7ycmhrqr99p653s5nhfhp4ppj0zg7qsvygwcqg2jf"; libraryHaskellDepends = [ base base-compat-batteries containers deepseq QuickCheck ]; @@ -269094,8 +269939,8 @@ self: { }: mkDerivation { pname = "streaming-bytestring"; - version = "0.2.2"; - sha256 = "01iw8d3lxb72cv6gp6k8w966g9q485zmd5akri2x1n5xdd26lv9h"; + version = "0.2.3"; + sha256 = "026fr6415iaxw3fmjjmczs7fiqw8ckzd4vfpp2rh88ismz8j6s7l"; libraryHaskellDepends = [ base bytestring deepseq exceptions ghc-prim mmorph mtl resourcet streaming transformers transformers-base @@ -269108,15 +269953,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "streaming-bytestring_0_2_3" = callPackage + "streaming-bytestring_0_2_4" = callPackage ({ mkDerivation, base, bytestring, deepseq, exceptions, ghc-prim , mmorph, mtl, resourcet, smallcheck, streaming, tasty, tasty-hunit , tasty-smallcheck, transformers, transformers-base }: mkDerivation { pname = "streaming-bytestring"; - version = "0.2.3"; - sha256 = "026fr6415iaxw3fmjjmczs7fiqw8ckzd4vfpp2rh88ismz8j6s7l"; + version = "0.2.4"; + sha256 = "0iz4h5a1fd9bj2rkpwh5vk37j71frwqlbl2igfyxn4g7irpxipxh"; libraryHaskellDepends = [ base bytestring deepseq exceptions ghc-prim mmorph mtl resourcet streaming transformers transformers-base @@ -270853,6 +271698,24 @@ self: { license = lib.licenses.mit; }) {}; + "strive_6_0_0_4" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline + , http-client, http-client-tls, http-types, template-haskell, text + , time, transformers + }: + mkDerivation { + pname = "strive"; + version = "6.0.0.4"; + sha256 = "1vvv1cc88niciqly68wddpkkly796jyl6hypahyd0rkif53q789l"; + libraryHaskellDepends = [ + aeson base bytestring data-default gpolyline http-client + http-client-tls http-types template-haskell text time transformers + ]; + description = "A client for the Strava V3 API"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "strong-path" = callPackage ({ mkDerivation, base, exceptions, filepath, hashable, hspec, path , tasty, tasty-discover, tasty-hspec, tasty-quickcheck @@ -271007,8 +271870,8 @@ self: { pname = "structured"; version = "0.1.1"; sha256 = "1mz02ys85z79nj24ylsmgh8v2m7zv2rixf7w0iqnwc49lax52w4q"; - revision = "4"; - editedCabalFile = "1ayq9nf0bxx960qmdckxjsyhrz4xd6ymp0cf6v3qih13k8ld74hd"; + revision = "5"; + editedCabalFile = "1saljgwlag0ajhwqblvb459hw2m0n2dc9w3j50b069grbm6v8dr6"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers hashable scientific tagged text time-compat transformers @@ -273446,29 +274309,28 @@ self: { }) {}; "sydtest-yesod" = callPackage - ({ mkDerivation, base, binary, blaze-builder, bytestring - , case-insensitive, conduit, containers, cookie, exceptions - , http-client, http-client-tls, http-types, monad-logger, mtl - , network, network-uri, persistent, persistent-sqlite - , persistent-template, pretty-show, QuickCheck, resourcet, sydtest - , sydtest-discover, sydtest-persistent-sqlite, sydtest-wai, text - , time, wai, xml-conduit, yesod, yesod-core, yesod-form, yesod-test + ({ mkDerivation, base, binary, bytestring, case-insensitive + , conduit, containers, cookie, exceptions, http-client + , http-client-tls, http-types, monad-logger, mtl, network + , network-uri, path, path-io, persistent, persistent-sqlite + , QuickCheck, sydtest, sydtest-discover, sydtest-persistent-sqlite + , sydtest-wai, text, time, xml-conduit, yesod, yesod-core + , yesod-test }: mkDerivation { pname = "sydtest-yesod"; - version = "0.3.0.0"; - sha256 = "19pc9yxfw355xvp27i0g1xdlwg8hck8p4y7mnvxrwvwnp911akkf"; + version = "0.3.0.1"; + sha256 = "1sfq18n25qczhp24hz95spg4ppigajysg0if5ah0k96k1q3p3f51"; libraryHaskellDepends = [ - base binary blaze-builder bytestring case-insensitive containers - cookie exceptions http-client http-client-tls http-types mtl - network network-uri pretty-show sydtest sydtest-wai text time wai - xml-conduit yesod-core yesod-test + base binary bytestring case-insensitive containers cookie + exceptions http-client http-client-tls http-types mtl network + network-uri sydtest sydtest-wai text time xml-conduit yesod-core + yesod-test ]; testHaskellDepends = [ base bytestring conduit cookie http-client http-types monad-logger - mtl persistent persistent-sqlite persistent-template QuickCheck - resourcet sydtest sydtest-persistent-sqlite text yesod yesod-core - yesod-form + mtl path path-io persistent persistent-sqlite QuickCheck sydtest + sydtest-persistent-sqlite sydtest-wai text yesod yesod-core ]; testToolDepends = [ sydtest-discover ]; description = "A yesod companion library for sydtest"; @@ -276484,13 +277346,13 @@ self: { }: mkDerivation { pname = "tasty-autocollect"; - version = "0.3.0.0"; - sha256 = "0yk5qfhfnd0lx42bajlr042pj97gljg6ggi8wd2yr0fh4a7gq0gw"; + version = "0.3.1.0"; + sha256 = "0cvg7010hxrixpz013fb8ky5jgvvqf3l8x8kiwj0b3a31v8lk82d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers directory filepath ghc tasty tasty-expected-failure - template-haskell text transformers + base bytestring containers directory filepath ghc tasty + tasty-expected-failure template-haskell text transformers ]; executableHaskellDepends = [ base text ]; testHaskellDepends = [ @@ -276762,14 +277624,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "tasty-hedgehog_1_2_0_0" = callPackage + "tasty-hedgehog_1_3_0_0" = callPackage ({ mkDerivation, base, hedgehog, tagged, tasty , tasty-expected-failure }: mkDerivation { pname = "tasty-hedgehog"; - version = "1.2.0.0"; - sha256 = "0bqaxchadvrgphv46g9fczg8b1gg832n7np3czqribxma6rhsrfd"; + version = "1.3.0.0"; + sha256 = "1dk4bcm0a8vl1y5d3c89ypc688rp59fn11hyr2jx5kd8yvpzh0bj"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -280405,14 +281267,16 @@ self: { }: mkDerivation { pname = "text-display"; - version = "0.0.2.0"; - sha256 = "093sgyn7jpwk6vkvyxb5f3qbf8zrq6xd0pyqs3a6qd9ci4r1k6dl"; + version = "0.0.3.0"; + sha256 = "1bkgilcszj4jmixlg9vvmxsd3lcz0gl8d9phpd6lz1vnfyx98ysc"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base bytestring hspec quickcheck-text should-not-typecheck text ]; description = "A typeclass for user-facing output"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "text-format" = callPackage @@ -281599,15 +282463,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "th-desugar_1_13_1" = callPackage + "th-desugar_1_14" = callPackage ({ mkDerivation, base, containers, ghc-prim, hspec, HUnit, mtl , ordered-containers, syb, template-haskell, th-abstraction , th-lift, th-orphans, transformers-compat }: mkDerivation { pname = "th-desugar"; - version = "1.13.1"; - sha256 = "03k2kfbzfc87kibzbpp3s1l5xb0ww2vvwj9ngh0qapxm28a01rz3"; + version = "1.14"; + sha256 = "1b57v15xx0z0xjlijv61dh07p6rvfkdpxnxiaaa1iv7zyg2x7cnz"; libraryHaskellDepends = [ base containers ghc-prim mtl ordered-containers syb template-haskell th-abstraction th-lift th-orphans @@ -281862,6 +282726,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "th-lift-instances_0_1_20" = callPackage + ({ mkDerivation, base, bytestring, containers, QuickCheck + , template-haskell, text, th-lift, transformers, vector + }: + mkDerivation { + pname = "th-lift-instances"; + version = "0.1.20"; + sha256 = "0w6qc7xzyjymhh8hv72rlszh3n2xyzzamlfcl1hs9k6xbbww6czm"; + libraryHaskellDepends = [ + base bytestring containers template-haskell text th-lift + transformers vector + ]; + testHaskellDepends = [ + base bytestring containers QuickCheck template-haskell text vector + ]; + description = "Lift instances for template-haskell for common data types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-nowq" = callPackage ({ mkDerivation, base, markdown-unlit, template-haskell, time }: mkDerivation { @@ -281898,6 +282782,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "th-orphans_0_13_14" = callPackage + ({ mkDerivation, base, bytestring, ghc-prim, hspec, hspec-discover + , mtl, template-haskell, th-compat, th-lift, th-reify-many + }: + mkDerivation { + pname = "th-orphans"; + version = "0.13.14"; + sha256 = "0z07qcbbsj2b3j9p1qr4jvlpa7qgjfjvymkjd6vbizka1wd2mnwx"; + libraryHaskellDepends = [ + base mtl template-haskell th-compat th-lift th-reify-many + ]; + testHaskellDepends = [ + base bytestring ghc-prim hspec template-haskell th-lift + ]; + testToolDepends = [ hspec-discover ]; + description = "Orphan instances for TH datatypes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-pprint" = callPackage ({ mkDerivation, base, lens, pretty, template-haskell }: mkDerivation { @@ -282542,6 +283446,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "threads_0_5_1_7" = callPackage + ({ mkDerivation, base, Cabal, concurrent-extra, HUnit, stm + , test-framework, test-framework-hunit + }: + mkDerivation { + pname = "threads"; + version = "0.5.1.7"; + sha256 = "1l226792dqlp772aaxqr3qzz8yq72702g708k16gi8lrkfhgxxp0"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ base stm ]; + testHaskellDepends = [ + base concurrent-extra HUnit stm test-framework test-framework-hunit + ]; + description = "Fork threads and wait for their result"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "threads-extras" = callPackage ({ mkDerivation, base, stm, threads }: mkDerivation { @@ -283572,8 +284494,8 @@ self: { pname = "time-parsers"; version = "0.1.2.1"; sha256 = "102k6l9888kbgng045jk170qjbmdnwv2lbzlc12ncybfk2yk7wdv"; - revision = "4"; - editedCabalFile = "04hc42rkk0n9xapiy5zwac4x55m5cc5a8bgnkf6lkd7sy79k1j9k"; + revision = "5"; + editedCabalFile = "0dbqqlh98m06qj8jh1fs55lcxj4x4555x4p48xi3bjh5fdg4dkw0"; libraryHaskellDepends = [ base parsers template-haskell time ]; testHaskellDepends = [ attoparsec base bifunctors parsec parsers tasty tasty-hunit @@ -286042,6 +286964,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "topograph_1_0_0_2" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, containers + , vector + }: + mkDerivation { + pname = "topograph"; + version = "1.0.0.2"; + sha256 = "08fpwaf6341gaf7niwss08zlfyf8nvfrc4343zlkhscb19l4b7ni"; + libraryHaskellDepends = [ + base base-compat base-orphans containers vector + ]; + description = "Directed acyclic graphs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "torch" = callPackage ({ mkDerivation, base, mtl, parallel, QuickCheck }: mkDerivation { @@ -286587,10 +287525,8 @@ self: { }: mkDerivation { pname = "trackit"; - version = "0.7.2"; - sha256 = "1ha28wdc4dabr9qxkbpg9fasfnplicb2pyrn9zmija204nigbcdj"; - revision = "3"; - editedCabalFile = "07ak29br452qssj5kik8izmny24qw1icz84dq82b5g6xhy31vdrf"; + version = "0.7.3"; + sha256 = "0hlndixyvscmf2161yv2f4xl7qy2vgrikik3dj2nbq4vvi6v940v"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -286599,7 +287535,9 @@ self: { ]; description = "A command-line tool for live monitoring"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "trackit"; + broken = true; }) {}; "traction" = callPackage @@ -287273,8 +288211,8 @@ self: { }: mkDerivation { pname = "trasa-form"; - version = "0.4"; - sha256 = "0d3fkwvjjwvjzaw5n9n4j4mrrrf8zwrg1882gyqjg0bglsd27xzx"; + version = "0.4.1"; + sha256 = "1wz920q7lkibc14hai2ngp81ssp273siynkyxq4d5lan2cvc4dny"; libraryHaskellDepends = [ base bytestring cookie ditto ditto-lucid http-api-data http-types lucid mtl quantification text trasa trasa-server @@ -287537,6 +288475,34 @@ self: { license = lib.licenses.gpl2Plus; }) {}; + "tree-diff_0_2_2" = callPackage + ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base + , base-compat, bytestring, bytestring-builder, containers + , criterion, deepseq, Diff, hashable, parsec, parsers, pretty + , primitive, QuickCheck, scientific, semialign, strict, tagged + , tasty, tasty-golden, tasty-quickcheck, text, these, time + , trifecta, unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "tree-diff"; + version = "0.2.2"; + sha256 = "0g3lsp067dq1ydvj2im4nlfxa65g9zjmjjkv91dhjhnrklir10q0"; + libraryHaskellDepends = [ + aeson ansi-terminal ansi-wl-pprint base base-compat bytestring + bytestring-builder containers deepseq hashable parsec parsers + pretty primitive QuickCheck scientific semialign strict tagged text + these time unordered-containers uuid-types vector + ]; + testHaskellDepends = [ + ansi-terminal ansi-wl-pprint base base-compat parsec primitive + QuickCheck tagged tasty tasty-golden tasty-quickcheck trifecta + ]; + benchmarkHaskellDepends = [ base criterion deepseq Diff ]; + description = "Diffing of (expression) trees"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "tree-fun" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -291470,25 +292436,6 @@ self: { }) {}; "tzdata" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, HUnit - , tasty, tasty-hunit, tasty-th, unix, vector - }: - mkDerivation { - pname = "tzdata"; - version = "0.2.20220810.0"; - sha256 = "0jayyhljnwz7ax4qc7ywlkpsqfm4qkfkbkyl9yc89s6pqnhdg4jd"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers deepseq vector - ]; - testHaskellDepends = [ - base bytestring HUnit tasty tasty-hunit tasty-th unix - ]; - description = "Time zone database (as files and as a module)"; - license = lib.licenses.asl20; - }) {}; - - "tzdata_0_2_20220815_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, HUnit , tasty, tasty-hunit, tasty-th, unix, vector }: @@ -291505,7 +292452,6 @@ self: { ]; description = "Time zone database (as files and as a module)"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "u2f" = callPackage @@ -293841,6 +294787,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "unix-bytestring_0_3_7_8" = callPackage + ({ mkDerivation, base, bytestring }: + mkDerivation { + pname = "unix-bytestring"; + version = "0.3.7.8"; + sha256 = "0x20dzcpmy5qq35fsxiigk4lzad101qkrkckphry2ak0b1ijk4zl"; + libraryHaskellDepends = [ base bytestring ]; + description = "Unix/Posix-specific functions for ByteStrings"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "unix-compat" = callPackage ({ mkDerivation, base, unix }: mkDerivation { @@ -295140,13 +296098,13 @@ self: { "url-bytes" = callPackage ({ mkDerivation, base, byteslice, bytesmith, bytestring, deepseq - , gauge, HUnit, primitive, tasty, tasty-hunit, template-haskell - , uri-bytestring, weigh + , dormouse-uri, HUnit, primitive, tasty, tasty-bench, tasty-hunit + , template-haskell, uri-bytestring, weigh }: mkDerivation { pname = "url-bytes"; - version = "0.1.0.0"; - sha256 = "0nbxnmz1m2icg3vvdndr4zydwr8nbgxhb70ak2jzc6d92c3vhvqi"; + version = "0.1.1.1"; + sha256 = "13z9bgl0i49pj5q4cmf1ydr32mn7vijrksgal8f8jvlsax9zwcdj"; libraryHaskellDepends = [ base byteslice bytesmith primitive template-haskell ]; @@ -295154,8 +296112,8 @@ self: { base byteslice HUnit primitive tasty tasty-hunit ]; benchmarkHaskellDepends = [ - base byteslice bytestring deepseq gauge primitive uri-bytestring - weigh + base byteslice bytestring deepseq dormouse-uri primitive + tasty-bench uri-bytestring weigh ]; description = "Memory efficient url type and parser"; license = lib.licenses.mit; @@ -296079,8 +297037,8 @@ self: { }: mkDerivation { pname = "uuid-bytes"; - version = "0.1.2.0"; - sha256 = "08sfxj0900pgpbvasi2n2x93qwglir2ijc43fpn5xf0gq7z2b25r"; + version = "0.1.3.0"; + sha256 = "1771fjcgvds299ls3myqlgricx9nha0dyaiban39g0sga075w00l"; libraryHaskellDepends = [ base bytebuild byteslice bytesmith natural-arithmetic primitive wide-word @@ -296519,6 +297477,8 @@ self: { pname = "validated-literals"; version = "0.3.1"; sha256 = "0s6ag8wm19qzfhxpz686nsmvrf3lhbq1g5fcck6d97lij559xlvg"; + revision = "1"; + editedCabalFile = "1irh3qd5p1pblklsq9v3468m4rjn0waj5x4mdnfksk4c6mrnj0ri"; libraryHaskellDepends = [ base template-haskell th-compat ]; testHaskellDepends = [ base bytestring deepseq tasty tasty-hunit tasty-travis @@ -297350,6 +298310,8 @@ self: { pname = "vec"; version = "0.4.1"; sha256 = "01v5zd4lak76ymlhi3zjpsy3g01vcchwx1b7cavc4rdzpdjqw58b"; + revision = "1"; + editedCabalFile = "156w28mz6d1gdp907j14v5xvj5y786h5pi4bfgvri592zwd2p46b"; libraryHaskellDepends = [ adjunctions base boring deepseq distributive fin hashable indexed-traversable QuickCheck semigroupoids transformers @@ -297368,8 +298330,8 @@ self: { pname = "vec-lens"; version = "0.4"; sha256 = "1qjv8wg6b8wbldvripn84vyw5cgpcpgh2v6v1nk7pzwrn99lfb7h"; - revision = "1"; - editedCabalFile = "1708aj1b38cd17fmv6giidq8hdpq96imka8hfr7z1y5nq9bf8am3"; + revision = "2"; + editedCabalFile = "0hkwpsfp9v5crmgm2gvrvfi27manyx930v1pd9mp7n64y3brrxqm"; libraryHaskellDepends = [ base fin lens vec ]; description = "Vec: length-indexed (sized) list: lens support"; license = lib.licenses.bsd3; @@ -297381,8 +298343,8 @@ self: { pname = "vec-optics"; version = "0.4"; sha256 = "0vdpxkmhiqbql68rkrfaci6c6n7sbr49p08q0jj6cvbmjy3aa1lg"; - revision = "1"; - editedCabalFile = "0bwian3k668nbp7vnawdzzr9sv8vxhfsd3qjyfk9k112w3y2kjfs"; + revision = "2"; + editedCabalFile = "0gm2xaxbrr4ha8d7lvgddq3iy5fxzx9g6w62rn7dxswbhdaqnp46"; libraryHaskellDepends = [ base fin optics-core vec ]; description = "Vec: length-indexed (sized) list: optics support"; license = lib.licenses.bsd3; @@ -301478,6 +302440,32 @@ self: { license = lib.licenses.mit; }) {}; + "wai-saml2_0_3_0_1" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, c14n + , cryptonite, data-default-class, filepath, http-types, mtl + , pretty-show, tasty, tasty-golden, text, time, vault, wai + , wai-extra, x509, x509-store, xml-conduit + }: + mkDerivation { + pname = "wai-saml2"; + version = "0.3.0.1"; + sha256 = "1j8qldy111q36dwr53pc6jiljfwzwi77n21mglvkpq4cfkcsch92"; + libraryHaskellDepends = [ + base base64-bytestring bytestring c14n cryptonite + data-default-class http-types mtl text time vault wai wai-extra + x509 x509-store xml-conduit + ]; + testHaskellDepends = [ + base base64-bytestring bytestring c14n cryptonite + data-default-class filepath http-types mtl pretty-show tasty + tasty-golden text time vault wai wai-extra x509 x509-store + xml-conduit + ]; + description = "SAML2 assertion validation as WAI middleware"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "wai-secure-cookies" = callPackage ({ mkDerivation, base, bytestring, cryptonite, hspec , hspec-expectations, hspec-wai, http-types, memory, random, split @@ -303417,6 +304405,26 @@ self: { license = lib.licenses.mpl20; }) {}; + "webgear-core_1_0_4" = callPackage + ({ mkDerivation, arrows, base, bytestring, case-insensitive + , filepath, http-api-data, http-media, http-types, jose, mime-types + , network, safe-exceptions, tagged, template-haskell, text + , unordered-containers, wai + }: + mkDerivation { + pname = "webgear-core"; + version = "1.0.4"; + sha256 = "0ah01znv18ll9lhlwn81yxvdy9q1f0xl2pcy4k24d0blrrva0nl7"; + libraryHaskellDepends = [ + arrows base bytestring case-insensitive filepath http-api-data + http-media http-types jose mime-types network safe-exceptions + tagged template-haskell text unordered-containers wai + ]; + description = "Composable, type-safe library to build HTTP APIs"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "webgear-openapi" = callPackage ({ mkDerivation, arrows, base, http-media, http-types , insert-ordered-containers, lens, openapi3, text, webgear-core @@ -303433,6 +304441,23 @@ self: { license = lib.licenses.mpl20; }) {}; + "webgear-openapi_1_0_4" = callPackage + ({ mkDerivation, arrows, base, http-media, http-types + , insert-ordered-containers, lens, openapi3, text, webgear-core + }: + mkDerivation { + pname = "webgear-openapi"; + version = "1.0.4"; + sha256 = "0wqgpq77ak4n0phaaq6mlr06krf9xxv4q26h7v8zni0422y01f4i"; + libraryHaskellDepends = [ + arrows base http-media http-types insert-ordered-containers lens + openapi3 text webgear-core + ]; + description = "Composable, type-safe library to build HTTP API servers"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "webgear-server" = callPackage ({ mkDerivation, aeson, arrows, base, base64-bytestring, bytestring , bytestring-conversion, http-api-data, http-media, http-types @@ -303458,6 +304483,32 @@ self: { license = lib.licenses.mpl20; }) {}; + "webgear-server_1_0_4" = callPackage + ({ mkDerivation, aeson, arrows, base, base64-bytestring, bytestring + , bytestring-conversion, http-api-data, http-media, http-types + , jose, monad-time, mtl, QuickCheck, quickcheck-instances, tasty + , tasty-hunit, tasty-quickcheck, text, unordered-containers, wai + , webgear-core + }: + mkDerivation { + pname = "webgear-server"; + version = "1.0.4"; + sha256 = "106nfvr9saqpl3ngb3216wfig6fx90yl90vsxk9qjnkzi0dk041y"; + libraryHaskellDepends = [ + aeson arrows base base64-bytestring bytestring + bytestring-conversion http-api-data http-media http-types jose + monad-time mtl text unordered-containers wai webgear-core + ]; + testHaskellDepends = [ + base base64-bytestring bytestring http-types QuickCheck + quickcheck-instances tasty tasty-hunit tasty-quickcheck text wai + webgear-core + ]; + description = "Composable, type-safe library to build HTTP API servers"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "webidl" = callPackage ({ mkDerivation, base, bytestring, HSFFIG, LEXER, parsec, pretty , utf8-env, utf8-string @@ -304611,8 +305662,8 @@ self: { pname = "windns"; version = "0.1.0.1"; sha256 = "016d1cf51jqvhbzlf5kbizv4l4dymradac1420rl47q2k5faczq8"; - revision = "4"; - editedCabalFile = "17wzjaj16q4bm8kz2mcs02naj6v89lnbwjfgmrf81c9dw873l9px"; + revision = "5"; + editedCabalFile = "0lc90z7z74hqhjxflnyz0znf1iwvybcqvkglry30k9nxg35qpj71"; libraryHaskellDepends = [ base bytestring deepseq ]; librarySystemDepends = [ dnsapi ]; description = "Domain Name Service (DNS) lookup via the /dnsapi.dll standard library"; @@ -304823,6 +305874,26 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; + "witch_1_0_0_3" = callPackage + ({ mkDerivation, base, bytestring, containers, HUnit + , template-haskell, text, time + }: + mkDerivation { + pname = "witch"; + version = "1.0.0.3"; + sha256 = "1d6wn4ykafq3hi439pf9ap55vjrcv668qq5wmxm5fiq6r78ndn0b"; + libraryHaskellDepends = [ + base bytestring containers template-haskell text time + ]; + testHaskellDepends = [ + base bytestring containers HUnit template-haskell text time + ]; + description = "Convert values from one type into another"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + "with-index" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -305309,12 +306380,33 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "word-array" = callPackage + ({ mkDerivation, base, deepseq, HUnit, mono-traversable, primitive + , QuickCheck, quickcheck-classes, tasty, tasty-bench, tasty-hunit + , tasty-quickcheck, transformers, vector, weigh + }: + mkDerivation { + pname = "word-array"; + version = "0.1.0.0"; + sha256 = "1358a9sihpnrrddzffp3vw8wjrgbs6ff2lmww5yffh0blk7ajlff"; + libraryHaskellDepends = [ base deepseq mono-traversable ]; + testHaskellDepends = [ + base HUnit mono-traversable primitive QuickCheck quickcheck-classes + tasty tasty-hunit tasty-quickcheck vector + ]; + benchmarkHaskellDepends = [ + base deepseq primitive tasty tasty-bench transformers weigh + ]; + description = "treat integral types as arrays of smaller integral types"; + license = lib.licenses.mit; + }) {}; + "word-compat" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "word-compat"; - version = "0.0.4"; - sha256 = "1pb1l8qxl7ys6db3wmp9rflqznjl6x11n477x159d920m7h5gz6k"; + version = "0.0.5"; + sha256 = "0wllk017f02r1prsvzq1qbcr6w6br2pwii4b8xzr7bqkkri0z6rs"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base ]; description = "Compatibility shim for the Int/Word internal change in GHC 9.2"; @@ -306628,8 +307720,8 @@ self: { }: mkDerivation { pname = "wuss"; - version = "2.0.0.1"; - sha256 = "17s6wilzyzsdc174a3an12pkq20cy7x2pfrn4jmdp30f468r47fb"; + version = "2.0.0.2"; + sha256 = "04jqq3blzyxqyymhcjsm5z89whk5y7cvnd9dw6nlc40vq4w4v802"; libraryHaskellDepends = [ base bytestring connection network websockets ]; @@ -310369,6 +311461,8 @@ self: { pname = "yasi"; version = "0.2.0.1"; sha256 = "0j5g5h40qvz2rinka7mrb8nc7dzhnprdfpjmzc4pdlx1w8fzw8xy"; + revision = "2"; + editedCabalFile = "00jc6fgv0r2l91949d9ry094fn45v19kn301hfap5i4n4wks1kmz"; libraryHaskellDepends = [ base ghc-hs-meta template-haskell text text-display ]; @@ -314684,8 +315778,8 @@ self: { pname = "zinza"; version = "0.2"; sha256 = "1sy4chm8zan0ixgvvq4vm3fzvhqykn315l333al84768nly9rjv8"; - revision = "4"; - editedCabalFile = "0w4hy234rbgyc0lsaj3sm11vi13hy1aiqqdbq3dgaq6xkmcb4yal"; + revision = "5"; + editedCabalFile = "1gkfbm06qpcwy17mlk522wlf7jkxsmqdl33c6ckvwkq2z9diy63a"; libraryHaskellDepends = [ base containers parsec text transformers ]; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/patches/hevm-update-deps.patch b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/hevm-update-deps.patch new file mode 100644 index 0000000000..e4a37fc0f4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/hevm-update-deps.patch @@ -0,0 +1,129 @@ +diff --git a/hevm.cabal b/hevm.cabal +index cf36961e..3b31f595 100644 +--- a/hevm.cabal ++++ b/hevm.cabal +@@ -71,6 +71,10 @@ library + -Wall -Wno-deprecations + extra-libraries: + secp256k1, ff ++ if os(darwin) ++ extra-libraries: c++ ++ else ++ extra-libraries: stdc++ + c-sources: + ethjet/tinykeccak.c, ethjet/ethjet.c + cxx-sources: +@@ -88,7 +92,7 @@ library + transformers >= 0.5.6 && < 0.6, + tree-view >= 0.5 && < 0.6, + abstract-par >= 0.3.3 && < 0.4, +- aeson >= 1.5.6 && < 1.6, ++ aeson >= 2.0 && < 2.1, + bytestring >= 0.10.8 && < 0.11, + scientific >= 0.3.6 && < 0.4, + binary >= 0.8.6 && < 0.9, +@@ -97,7 +101,7 @@ library + vector >= 0.12.1 && < 0.13, + ansi-wl-pprint >= 0.6.9 && < 0.7, + base16-bytestring >= 1.0.0 && < 2.0, +- brick >= 0.58 && < 0.63, ++ brick >= 0.58 && < 0.69, + megaparsec >= 9.0.0 && < 10.0, + mtl >= 2.2.2 && < 2.3, + directory >= 1.3.3 && < 1.4, +@@ -105,13 +109,13 @@ library + vty >= 5.25.1 && < 5.34, + cereal >= 0.5.8 && < 0.6, + cryptonite >= 0.27 && <= 0.29, +- memory >= 0.14.18 && < 0.16, ++ memory >= 0.14.18 && < 0.20, + data-dword >= 0.3.1 && < 0.4, + fgl >= 5.7.0 && < 5.8, + free >= 5.1.3 && < 5.2, + haskeline >= 0.8.0 && < 0.9, + process >= 1.6.5 && < 1.7, +- lens >= 4.17.1 && < 4.20, ++ lens >= 4.17.1 && < 5.1, + lens-aeson >= 1.0.2 && < 1.2, + monad-par >= 0.3.5 && < 0.4, + multiset >= 0.3.4 && < 0.4, +@@ -124,7 +128,6 @@ library + sbv >= 8.9, + semver-range >= 0.2.7 && < 0.3, + temporary >= 1.3 && < 1.4, +- text-format >= 0.3.2 && < 0.4, + witherable >= 0.3.5 && < 0.5, + wreq >= 0.5.3 && < 0.6, + regex-tdfa >= 1.2.3 && < 1.4, +@@ -190,7 +193,6 @@ executable hevm + sbv, + temporary, + text, +- text-format, + unordered-containers, + vector, + vty +diff --git a/src/EVM/Solidity.hs b/src/EVM/Solidity.hs +index b7d0f36b..4e9d6892 100644 +--- a/src/EVM/Solidity.hs ++++ b/src/EVM/Solidity.hs +@@ -70,6 +70,7 @@ import Control.Monad + import Control.Lens hiding (Indexed, (.=)) + import qualified Data.String.Here as Here + import Data.Aeson hiding (json) ++import qualified Data.Aeson.KeyMap as KeyMap + import Data.Aeson.Types + import Data.Aeson.Lens + import Data.Scientific +@@ -714,8 +715,8 @@ astIdMap = foldMap f + f :: Value -> Map Int Value + f (Array x) = foldMap f x + f v@(Object x) = +- let t = foldMap f (HMap.elems x) +- in case HMap.lookup "id" x of ++ let t = foldMap f (KeyMap.elems x) ++ in case KeyMap.lookup "id" x of + Nothing -> t + Just (Number i) -> t <> Map.singleton (round i) v + Just _ -> t +diff --git a/src/EVM/SymExec.hs b/src/EVM/SymExec.hs +index 5bbf1c03..b828098e 100644 +--- a/src/EVM/SymExec.hs ++++ b/src/EVM/SymExec.hs +@@ -40,8 +40,8 @@ type EquivalenceResult = ProofResult ([VM], [VM]) VM () + + -- | Convenience functions for generating large symbolic byte strings + sbytes32, sbytes128, sbytes256, sbytes512, sbytes1024 :: Query ([SWord 8]) +-sbytes32 = toBytes <$> freshVar_ @ (WordN 256) +-sbytes128 = toBytes <$> freshVar_ @ (WordN 1024) ++sbytes32 = toBytes <$> freshVar_ @(WordN 256) ++sbytes128 = toBytes <$> freshVar_ @(WordN 1024) + sbytes256 = liftA2 (++) sbytes128 sbytes128 + sbytes512 = liftA2 (++) sbytes256 sbytes256 + sbytes1024 = liftA2 (++) sbytes512 sbytes512 +diff --git a/src/EVM/Types.hs b/src/EVM/Types.hs +index fdd2368d..1dc29e83 100644 +--- a/src/EVM/Types.hs ++++ b/src/EVM/Types.hs +@@ -434,17 +434,17 @@ readN s = fromIntegral (read s :: Integer) + readNull :: Read a => a -> String -> a + readNull x = fromMaybe x . Text.Read.readMaybe + +-wordField :: JSON.Object -> Text -> JSON.Parser W256 ++wordField :: JSON.Object -> Key -> JSON.Parser W256 + wordField x f = ((readNull 0) . Text.unpack) + <$> (x .: f) + +-addrField :: JSON.Object -> Text -> JSON.Parser Addr ++addrField :: JSON.Object -> Key -> JSON.Parser Addr + addrField x f = (read . Text.unpack) <$> (x .: f) + +-addrFieldMaybe :: JSON.Object -> Text -> JSON.Parser (Maybe Addr) ++addrFieldMaybe :: JSON.Object -> Key -> JSON.Parser (Maybe Addr) + addrFieldMaybe x f = (Text.Read.readMaybe . Text.unpack) <$> (x .: f) + +-dataField :: JSON.Object -> Text -> JSON.Parser ByteString ++dataField :: JSON.Object -> Key -> JSON.Parser ByteString + dataField x f = hexText <$> (x .: f) + + toWord512 :: W256 -> Word512 diff --git a/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix index 6740f45872..7fe511373d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.18.0"; + version = "5.19.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-i/ihEPJHyWzRywzpXhYpauA8lL51yjoiWod8Nc/6gV0="; + sha256 = "sha256-sygt30x5S2n24ONMBRzNyLZcnl4hM4tUFpX/Yx6ZSMM="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/glog/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glog/default.nix index f49c8b9829..4e8503b484 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glog/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, gflags, perl }: +{ stdenv, lib, fetchFromGitHub, cmake, gflags, gtest, perl }: stdenv.mkDerivation rec { pname = "glog"; @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + buildInputs = [ gtest ]; + propagatedBuildInputs = [ gflags ]; cmakeFlags = [ @@ -25,6 +27,17 @@ stdenv.mkDerivation rec { enableParallelChecking = false; checkInputs = [ perl ]; + GTEST_FILTER = + let + filteredTests = lib.optionals stdenv.hostPlatform.isMusl [ + "Symbolize.SymbolizeStackConsumption" + "Symbolize.SymbolizeWithDemanglingStackConsumption" + ] ++ lib.optionals stdenv.hostPlatform.isStatic [ + "LogBacktraceAt.DoesBacktraceAtRightLineWhenEnabled" + ]; + in + lib.optionalString doCheck "-${builtins.concatStringsSep ":" filteredTests}"; + meta = with lib; { homepage = "https://github.com/google/glog"; license = licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk/4.x.nix index fc3e39b022..5c4bc0430d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk/4.x.nix @@ -62,7 +62,7 @@ in stdenv.mkDerivation rec { pname = "gtk4"; - version = "4.6.6"; + version = "4.8.0"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "e7/k0TVp98KX7UmDSscmPjGLe/EC0ycctGbVlx9ZrnA="; + sha256 = "yNYgNDfR41nYMSTcWRVG1AP2fjsAVE5T3VCpuqzcvX8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libAfterImage/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libAfterImage/default.nix index b414d79b0a..a569b59621 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libAfterImage/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libAfterImage/default.nix @@ -54,6 +54,13 @@ stdenv.mkDerivation { # workaround '-p0' patchflags below. stripLen = 1; }) + + # fix https://github.com/root-project/root/issues/10990 + (fetchpatch { + url = "https://github.com/root-project/root/pull/11243/commits/e177a477b0be05ef139094be1e96a99ece06350a.diff"; + hash = "sha256-2DQmJGHmATHawl3dk9dExncVe1sXzJQyy4PPwShoLTY="; + stripLen = 5; + }) ]; patchFlags = [ "-p0" ]; @@ -74,7 +81,8 @@ stdenv.mkDerivation { "--disable-mmx-optimization" "--${if static then "enable" else "disable"}-staticlibs" "--${if !static then "enable" else "disable"}-sharedlibs" - ] ++ lib.optional withX "--with-x"; + "--${if withX then "with" else "without"}-x" + ]; meta = with lib; { homepage = "http://www.afterstep.org/afterimage/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libftdi/1.x.nix b/third_party/nixpkgs/pkgs/development/libraries/libftdi/1.x.nix index 30c9e294ec..e19a9764bd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libftdi/1.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libftdi/1.x.nix @@ -29,13 +29,14 @@ stdenv.mkDerivation rec { sha256 = "0vipg3y0kbbzjhxky6hfyxy42mpqhvwn1r010zr5givcfp8ghq26"; }; + strictDeps = true; + nativeBuildInputs = [ cmake pkg-config ] ++ optionals docSupport [ doxygen graphviz ] ++ optionals pythonSupport [ swig ]; buildInputs = [ libconfuse ] - ++ optionals cppSupport [ boost ] - ++ optionals pythonSupport [ python3 ]; + ++ optionals cppSupport [ boost ]; cmakeFlags = [ "-DFTDIPP=${onOff cppSupport}" @@ -43,6 +44,8 @@ stdenv.mkDerivation rec { "-DLINK_PYTHON_LIBRARY=${onOff pythonSupport}" "-DPYTHON_BINDINGS=${onOff pythonSupport}" "-DDOCUMENTATION=${onOff docSupport}" + "-DPYTHON_EXECUTABLE=${python3.pythonForBuild.interpreter}" + "-DPYTHON_LIBRARY=${python3}/lib/libpython${python3.pythonVersion}${stdenv.hostPlatform.extensions.sharedLibrary}" ]; propagatedBuildInputs = [ libusb1 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libixp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libixp/default.nix index cc6c468bed..c4f06b3ea7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libixp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libixp/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { hash = "sha256-S25DmXJ7fN0gXLV0IzUdz8hXPTYEHmaSG7Mnli6GQVc="; }; + postPatch = lib.optionalString stdenv.cc.isClang '' + substituteInPlace mk/ixp.mk \ + --replace "©" "C " + ''; + postConfigure = '' sed -i -e "s|^PREFIX.*=.*$|PREFIX = $out|" config.mk ''; @@ -19,7 +24,6 @@ stdenv.mkDerivation rec { buildInputs = [ txt2tags ]; meta = { - broken = stdenv.isDarwin; homepage = "https://github.com/0intro/libixp"; description = "Portable, simple C-language 9P client and server libary"; maintainers = with lib.maintainers; [ kovirobi ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix index 28b9ff5025..7beade47a3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix @@ -114,13 +114,13 @@ stdenv.mkDerivation rec { # NOTE: You must also bump: # # SysVirt in - version = "8.6.0"; + version = "8.7.0"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-bSId7G2o808WfHGt5ioFEIhPyy4+XW+R349UgHKOvQU="; + sha256 = "sha256-5F6Ibp3k7I1mwv8DNZ7rsW0wOw5q3vHtCUc7jJUNzrs="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix index 81b84e1a11..7f4585c640 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mtxclient"; - version = "0.8.0"; + version = "0.8.2"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "mtxclient"; rev = "v${version}"; - sha256 = "sha256-SQoPeUdDNQU4qYDd8udQnIJ6PrZFtEOmf9uqnw1+fz4="; + sha256 = "sha256-x2c+wZWAWYoKxSqEezoInw3SwcGo9dQNDvuq7racLBA="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix index f2a9833d77..2a8d49d9d1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencascade-occt/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "opencascade-occt"; - version = "7.5.1"; + version = "7.6.2"; commit = "V${builtins.replaceStrings ["."] ["_"] version}"; src = fetchurl { name = "occt-${commit}.tar.gz"; url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz"; - sha256 = "sha256-1whKU+7AMVYabfs15x8MabohKonn5oM54ZEtxF93wAo="; + sha256 = "sha256-n3KFrN/mN1SVXfuhEUAQ1fJzrCvhiclxfEIouyj9Z18="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix index 51f86ef386..13f6052446 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.24"; + version = "1.0.25"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-levPWBSwfw1N2tcBqQXtXznA7dzQRqVf/Rp2owGUamE="; + sha256 = "sha256-8fCz+t+PcZflq3sYdn+J6AdWHkG6UyDNcQmJ21b9p80="; }; nativeBuildInputs = [ cmake python3 pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qtutilities/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qtutilities/default.nix index cce0afc55e..1fd5eed05a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qtutilities/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qtutilities/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "qtutilities"; - version = "6.7.0"; + version = "6.8.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RjVmrdUHDBelwagWD5Mx+S3tdFO7I0+8RmFR7hwoe8o="; + hash = "sha256-I8VvVGlz6rQLWd7Fq0q58VFFj+EHGiwkayam2Cj3aJQ="; }; buildInputs = [ qtbase cpp-utilities ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/range-v3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/range-v3/default.nix index e29fc1f70c..77db5869f6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/range-v3/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/range-v3/default.nix @@ -2,23 +2,15 @@ stdenv.mkDerivation rec { pname = "range-v3"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "ericniebler"; repo = "range-v3"; rev = version; - sha256 = "18230bg4rq9pmm5f8f65j444jpq56rld4fhmpham8q3vr1c1bdjh"; + hash = "sha256-bRSX91+ROqG1C3nB9HSQaKgLzOHEFy9mrD2WW3PRBWU="; }; - patches = [ - ./gcc10.patch - (fetchpatch { - url = "https://github.com/ericniebler/range-v3/commit/66e847d4e14be3a369b7e26a03a172b20e62c003.patch"; - sha256 = "sha256-JOQptVqNicdMhcDhBrWQRf7MfskBv56cICwvMA8g88Y="; - }) - ]; - nativeBuildInputs = [ cmake ]; # Building the tests currently fails on AArch64 due to internal compiler diff --git a/third_party/nixpkgs/pkgs/development/libraries/range-v3/gcc10.patch b/third_party/nixpkgs/pkgs/development/libraries/range-v3/gcc10.patch deleted file mode 100644 index caebf0a631..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/range-v3/gcc10.patch +++ /dev/null @@ -1,133 +0,0 @@ -From a91f0e1be27a31c446452a753001d4518ef83a6b Mon Sep 17 00:00:00 2001 -From: Eric Niebler -Date: Mon, 17 Aug 2020 17:48:09 -0700 -Subject: [PATCH] work around premature instantiation problem on gcc; fixes - #1545 - ---- - include/range/v3/view/chunk.hpp | 6 +++--- - include/range/v3/view/split.hpp | 26 +++++++++++++------------- - 2 files changed, 16 insertions(+), 16 deletions(-) - -diff --git a/include/range/v3/view/chunk.hpp b/include/range/v3/view/chunk.hpp -index 0c03cf1eb..b8df13303 100644 ---- a/include/range/v3/view/chunk.hpp -+++ b/include/range/v3/view/chunk.hpp -@@ -313,8 +313,8 @@ namespace ranges - - public: - inner_view() = default; -- constexpr explicit inner_view(chunk_view_ & view) noexcept -- : rng_{&view} -+ constexpr explicit inner_view(chunk_view_ * view) noexcept -+ : rng_{view} - {} - CPP_auto_member - constexpr auto CPP_fun(size)()( -@@ -338,7 +338,7 @@ namespace ranges - constexpr inner_view read() const - { - RANGES_EXPECT(!done()); -- return inner_view{*rng_}; -+ return inner_view{rng_}; - } - constexpr bool done() const - { -diff --git a/include/range/v3/view/split.hpp b/include/range/v3/view/split.hpp -index facf1b37f..496220e4a 100644 ---- a/include/range/v3/view/split.hpp -+++ b/include/range/v3/view/split.hpp -@@ -389,19 +389,19 @@ namespace ranges - split_outer_iterator() = default; - - CPP_member -- constexpr explicit CPP_ctor(split_outer_iterator)(Parent & parent)( -+ constexpr explicit CPP_ctor(split_outer_iterator)(Parent * parent)( - /// \pre - requires (!forward_range)) -- : parent_(&parent) -+ : parent_(parent) - {} - - CPP_member -- constexpr CPP_ctor(split_outer_iterator)(Parent & parent, -+ constexpr CPP_ctor(split_outer_iterator)(Parent * parent, - iterator_t current)( - /// \pre - requires forward_range) - : Current{std::move(current)} -- , parent_(&parent) -+ , parent_(parent) - {} - - template(bool Other)( -@@ -519,7 +519,7 @@ namespace ranges - ranges::equal_to> && - (forward_range || detail::tiny_range) - #endif -- struct RANGES_EMPTY_BASES split_view -+ struct RANGES_EMPTY_BASES split_view - : view_interface, is_finite::value ? finite : unknown> - , private detail::split_view_base> - { -@@ -537,17 +537,17 @@ namespace ranges - #if RANGES_CXX_IF_CONSTEXPR < RANGES_CXX_IF_CONSTEXPR_17 - outer_iterator()> begin_(std::true_type) - { -- return outer_iterator()>{*this, ranges::begin(base_)}; -+ return outer_iterator()>{this, ranges::begin(base_)}; - } - outer_iterator begin_(std::false_type) - { - this->curr_ = ranges::begin(base_); -- return outer_iterator{*this}; -+ return outer_iterator{this}; - } - - outer_iterator()> end_(std::true_type) const - { -- return outer_iterator{*this, ranges::end(base_)}; -+ return outer_iterator{this, ranges::end(base_)}; - } - default_sentinel_t end_(std::false_type) const - { -@@ -580,11 +580,11 @@ namespace ranges - { - #if RANGES_CXX_IF_CONSTEXPR >= RANGES_CXX_IF_CONSTEXPR_17 - if constexpr(forward_range) -- return outer_iterator()>{*this, ranges::begin(base_)}; -+ return outer_iterator()>{this, ranges::begin(base_)}; - else - { - this->curr_ = ranges::begin(base_); -- return outer_iterator{*this}; -+ return outer_iterator{this}; - } - #else - return begin_(meta::bool_>{}); -@@ -596,7 +596,7 @@ namespace ranges - /// \pre - requires forward_range && forward_range) - { -- return {*this, ranges::begin(base_)}; -+ return {this, ranges::begin(base_)}; - } - CPP_member - constexpr auto end() // -@@ -604,14 +604,14 @@ namespace ranges - /// \pre - requires forward_range && common_range) - { -- return outer_iterator()>{*this, ranges::end(base_)}; -+ return outer_iterator()>{this, ranges::end(base_)}; - } - constexpr auto end() const - { - #if RANGES_CXX_IF_CONSTEXPR >= RANGES_CXX_IF_CONSTEXPR_17 - if constexpr(forward_range && forward_range && - common_range) -- return outer_iterator{*this, ranges::end(base_)}; -+ return outer_iterator{this, ranges::end(base_)}; - else - return default_sentinel; - #else diff --git a/third_party/nixpkgs/pkgs/development/libraries/tagparser/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tagparser/default.nix index deeb755206..06f3165222 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tagparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tagparser/default.nix @@ -1,20 +1,21 @@ { stdenv -, pkgs +, lib , fetchFromGitHub , cmake , cpp-utilities , zlib +, isocodes }: stdenv.mkDerivation rec { pname = "tagparser"; - version = "9.4.0"; + version = "11.5.0"; src = fetchFromGitHub { owner = "Martchus"; repo = "tagparser"; rev = "v${version}"; - sha256 = "097dq9di19d3mvnlrav3fm78gzjni5babswyv10xnrxfhnf14f6x"; + hash = "sha256-qgopl32cFQFQTYu9WBOzPeU69J8K49SREX7X0Pw7Als="; }; nativeBuildInputs = [ cmake ]; @@ -23,7 +24,11 @@ stdenv.mkDerivation rec { cpp-utilities zlib ]; - meta = with pkgs.lib; { + cmakeFlags = [ + "-DLANGUAGE_FILE_ISO_639_2=${isocodes}/share/iso-codes/json/iso_639-2.json" + ]; + + meta = with lib; { homepage = "https://github.com/Martchus/tagparser"; description = "C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska tags"; license = licenses.gpl2; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tkrzw/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tkrzw/default.nix index fc90c6e304..4ede98f750 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tkrzw/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tkrzw/default.nix @@ -10,12 +10,16 @@ stdenv.mkDerivation rec { hash = "sha256-G7SVKgU4b8I5iwAlGHL/w8z0fhI+Awe3V6aqFsOnUrA="; }; + postPatch = '' + substituteInPlace configure \ + --replace 'PATH=".:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:$PATH"' "" + ''; + enableParallelBuilding = true; doCheck = false; # memory intensive meta = with lib; { - broken = stdenv.isDarwin; description = "A set of implementations of DBM"; homepage = "https://dbmx.net/tkrzw/"; maintainers = with maintainers; [ ehmry ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/v8/default.nix b/third_party/nixpkgs/pkgs/development/libraries/v8/default.nix index cf9d597edc..c3f04eae4d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/v8/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/v8/default.nix @@ -2,6 +2,8 @@ , gn, ninja, python3, glib, pkg-config, icu , xcbuild, darwin , fetchpatch +, llvmPackages +, symlinkJoin }: # Use update.sh to update all checksums. @@ -106,6 +108,8 @@ stdenv.mkDerivation rec { touch build/config/gclient_args.gni ''; + llvmCcAndBintools = symlinkJoin { name = "llvmCcAndBintools"; paths = [ stdenv.cc llvmPackages.llvm ]; }; + gnFlags = [ "use_custom_libcxx=false" "is_clang=${lib.boolToString stdenv.cc.isClang}" @@ -123,7 +127,8 @@ stdenv.mkDerivation rec { # ''custom_toolchain="//build/toolchain/linux/unbundle:default"'' ''host_toolchain="//build/toolchain/linux/unbundle:default"'' ''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"'' - ] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${stdenv.cc}"''; + ] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${llvmCcAndBintools}"'' + ++ lib.optional stdenv.isDarwin ''use_lld=false''; NIX_CFLAGS_COMPILE = "-O2"; FORCE_MAC_SDK_MIN = stdenv.targetPlatform.sdkVer or "10.12"; @@ -135,7 +140,7 @@ stdenv.mkDerivation rec { python3 ] ++ lib.optionals stdenv.isDarwin [ xcbuild - darwin.DarwinTools + llvmPackages.llvm python3.pkgs.setuptools ]; buildInputs = [ glib icu ]; @@ -166,7 +171,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ cstrahan proglodyte matthewbauer ]; platforms = platforms.unix; license = licenses.bsd3; - # Fails to build on Darwin, see https://github.com/NixOS/nixpkgs/issues/158076 - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bindlib/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bindlib/default.nix new file mode 100644 index 0000000000..c0d8dd54a3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bindlib/default.nix @@ -0,0 +1,31 @@ +{ lib +, fetchFromGitHub +, buildDunePackage +, earley +, timed +}: + +buildDunePackage rec { + pname = "bindlib"; + version = "6.0.0"; + + minimalOCamlVersion = "4.07"; + + src = fetchFromGitHub { + owner = "rlepigre"; + repo = "ocaml-${pname}"; + rev = version; + hash = "sha256-058yMbz9ExvgNG/kY9tPk70XSeVRSSKVg4n4F4fmPu4="; + }; + + checkInputs = [ earley timed ]; + doCheck = true; + + meta = with lib; { + homepage = "https://rlepigre.github.io/ocaml-bindlib"; + description = "Efficient binder representation in Ocaml"; + license = licenses.gpl3; + changelog = "https://github.com/rlepigre/ocaml-bindlib/raw/${version}/CHANGELOG.md"; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix new file mode 100644 index 0000000000..f7e50ddca7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix @@ -0,0 +1,36 @@ +{ + lib, fetchFromGitLab, buildDunePackage +, integers_stubs_js, ctypes, ppx_expect +, js_of_ocaml-compiler +, nodejs +}: + +buildDunePackage rec { + pname = "ctypes_stubs_js"; + version = "0.1"; + + minimalOCamlVersion = "4.08"; + + src = fetchFromGitLab { + owner = "nomadic-labs"; + repo = pname; + rev = version; + sha256 = "sha256-OJIzg2hnwkXkQHd4bRR051eLf4HNWa/XExxbj46SyUs="; + }; + + propagatedBuildInputs = [ integers_stubs_js ]; + checkInputs = [ + ctypes + js_of_ocaml-compiler + ppx_expect + nodejs + ]; + doCheck = true; + + meta = { + description = "Js_of_ocaml Javascript stubs for the OCaml ctypes library"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bezmuth ]; + homepage = "https://gitlab.com/nomadic-labs/ctypes_stubs_js"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dedukti/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dedukti/default.nix new file mode 100644 index 0000000000..fafeeb4690 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dedukti/default.nix @@ -0,0 +1,33 @@ +{ lib +, fetchFromGitHub +, buildDunePackage +, cmdliner_1_1 +, menhir +}: + +buildDunePackage rec { + pname = "dedukti"; + version = "2.7"; + + minimalOCamlVersion = "4.08"; + + src = fetchFromGitHub { + owner = "Deducteam"; + repo = pname; + rev = "v${version}"; + hash = "sha256-SFxbgq2znO+OCEFzuekVquvtOEuCQanseKy+iZAeWbc="; + }; + + nativeBuildInputs = [ menhir ]; + buildInputs = [ cmdliner_1_1 ]; + + doCheck = false; # requires `tezt` + + meta = with lib; { + homepage = "https://deducteam.github.io"; + description = "Logical framework based on the λΠ-calculus modulo rewriting"; + license = licenses.cecill-b; + changelog = "https://github.com/Deducteam/Dedukti/raw/${version}/CHANGELOG.md"; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/integers_stubs_js/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/integers_stubs_js/default.nix new file mode 100644 index 0000000000..fc06efae7e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/integers_stubs_js/default.nix @@ -0,0 +1,28 @@ +{ + lib, fetchFromGitHub, buildDunePackage +, zarith_stubs_js +}: + +buildDunePackage rec { + pname = "integers_stubs_js"; + version = "1.0"; + + minimalOCamlVersion = "4.08"; + + src = fetchFromGitHub { + owner = "o1-labs"; + repo = pname; + rev = version; + sha256 = "sha256-lg5cX9/LQlVmR42XcI17b6KaatnFO2L9A9ZXfID8mTY="; + }; + + propagatedBuildInputs = [ zarith_stubs_js ]; + doCheck = true; + + meta = { + description = "Javascript stubs for the integers library in js_of_ocaml"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bezmuth ]; + inherit (src.meta) homepage; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lambdapi/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lambdapi/default.nix new file mode 100644 index 0000000000..5827c5d4b7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lambdapi/default.nix @@ -0,0 +1,46 @@ +{ lib +, fetchFromGitHub +, buildDunePackage +, alcotest +, dedukti +, bindlib +, camlp-streams +, cmdliner_1_1 +, menhir +, pratter +, sedlex +, stdlib-shims +, timed +, why3 +, yojson +}: + +buildDunePackage rec { + pname = "lambdapi"; + version = "2.2.1"; + + minimalOCamlVersion = "4.08"; + + src = fetchFromGitHub { + owner = "Deducteam"; + repo = pname; + rev = version; + hash = "sha256-p2ZjSfiZwkf8X4fSNJx7bAVpTFl4UBHIEANIWF7NGCs="; + }; + + nativeBuildInputs = [ menhir ]; + propagatedBuildInputs = [ + bindlib camlp-streams cmdliner_1_1 pratter sedlex stdlib-shims timed why3 yojson + ]; + + checkInputs = [ alcotest dedukti ]; + doCheck = false; # "Error: Unbound module Cmd" + + meta = with lib; { + homepage = "https://github.com/Deducteam/lambdapi"; + description = "Proof assistant based on the λΠ-calculus modulo rewriting"; + license = licenses.cecill21; + changelog = "https://github.com/Deducteam/lambdapi/raw/${version}/CHANGES.md"; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/pratter/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/pratter/default.nix new file mode 100644 index 0000000000..a44e815092 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/pratter/default.nix @@ -0,0 +1,35 @@ +{ lib +, fetchFromGitHub +, buildDunePackage +, camlp-streams +, alcotest +, qcheck +, qcheck-alcotest +}: + +buildDunePackage rec { + version = "2.0.0"; + pname = "pratter"; + + minimalOCamlVersion = "4.08"; + + src = fetchFromGitHub { + owner = "gabrielhdt"; + repo = "pratter"; + rev = version; + hash = "sha256-QEq8Zt2pfsRT04Zd+ugGKcHdzkqYcDDUg/iAFMMDdEE="; + }; + + propagatedBuildInputs = [ camlp-streams ]; + + checkInputs = [ alcotest qcheck qcheck-alcotest ]; + doCheck = true; + + meta = with lib; { + description = "An extended Pratt parser"; + homepage = "https://github.com/gabrielhdt/pratter"; + license = licenses.bsd3; + changelog = "https://github.com/gabrielhdt/pratter/raw/${version}/CHANGELOG.md"; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos-base58/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos-base58/default.nix new file mode 100644 index 0000000000..9a3079fc0e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos-base58/default.nix @@ -0,0 +1,27 @@ +{ buildDunePackage, fetchurl, lib +, zarith, digestif, fmt +}: + +buildDunePackage rec { + pname = "tezos-base58"; + version = "1.0.0"; + + src = fetchurl { + url = "https://github.com/tarides/tezos-base58/releases/download/${version}/${pname}-${version}.tbz"; + sha256 = "14w2pff5dy6mxnz588pxaf2k8xpkd51sbsys065wr51kbv1f36da"; + }; + + minimalOCamlVersion = "4.08"; + + propagatedBuildInputs = [ + zarith digestif fmt + ]; + + meta = with lib; { + description = "Base58 encoding for Tezos"; + homepage = "https://github.com/tarides/tezos-base58/"; + license = licenses.mit; + maintainers = with maintainers; [ bezmuth ]; + }; + +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/timed/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/timed/default.nix new file mode 100644 index 0000000000..988cb3f548 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/timed/default.nix @@ -0,0 +1,28 @@ +{ lib +, fetchFromGitHub +, ocaml +, buildDunePackage +}: + +buildDunePackage rec { + version = "1.1"; + pname = "timed"; + + minimalOCamlVersion = "4.08"; + + src = fetchFromGitHub { + owner = "rlepigre"; + repo = "ocaml-${pname}"; + rev = version; + sha256 = "sha256-wUoI9j/j0IGYW2NfJHmyR2XEYfYejyoYLWnKsuWdFas="; + }; + + doCheck = true; + + meta = with lib; { + description = "Timed references for imperative state"; + homepage = "https://github.com/rlepigre/ocaml-timed"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/php-packages/grpc/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/grpc/default.nix index 0d37ff63ea..1ba0ad75d3 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/grpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/grpc/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "grpc"; - version = "1.48.0"; - sha256 = "sha256-S0zLSRNV+TjSjmOkdt+S1RCSY+pj/+4eAklhZGHiaWM="; + version = "1.48.1"; + sha256 = "sha256-dOIvjq+DPmBecu933z1DK8bZlkffUy2XLxYYdAU4WeA="; doCheck = true; checkTarget = "test"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/pdepend/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/pdepend/default.nix index 4d40e64344..e94d925e28 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/pdepend/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/pdepend/default.nix @@ -2,14 +2,14 @@ let pname = "pdepend"; - version = "2.12.0"; + version = "2.12.1"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/pdepend/pdepend/releases/download/${version}/pdepend.phar"; - sha256 = "sha256-FiCqXQenr4PJ2KydRlKv66xWoi55LTOEunK0m5oxrjA="; + sha256 = "sha256-/fmrmtMBFycN6su/JEdFzB2uTDtHZvhZMYgl7duaaIE="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix index bd223d437d..144ebdf520 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "1.2.11"; + version = "1.5.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-A/exf2XTlogowdeFLmxO/P7JeGIE8CDsOX9tR0HOXws="; + hash = "sha256-2EU7Um3uxGP1LBt/PEg2s6v7iny60NHCg8ixX+lIsZY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioqsw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioqsw/default.nix index 4bc5ae32d7..c2c4b23d95 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioqsw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioqsw/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioqsw"; - version = "0.1.1"; + version = "0.2.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ASFdV/4IH3eaxJJ+Hj7YRZ7Ejp35bqT9DH2NUcD3S9A="; + hash = "sha256-icrgLPn2Nr5rKJ2YzLLL8rhHoTK+ecNyhGd3glOc7tM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/airthings-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/airthings-ble/default.nix index 552ba149be..30c03decf0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/airthings-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/airthings-ble/default.nix @@ -17,10 +17,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vincegio"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-ihNy5Rme20fCO1tG7aqdVFhSF3DI9hAlge54+/nNGLs="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'bleak = "^0.15.1"' 'bleak = "*"' + ''; + nativeBuildInputs = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apsw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apsw/default.nix index e4b4a94bf8..8e8cab580e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apsw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apsw/default.nix @@ -5,11 +5,12 @@ , sqlite , isPyPy , python +, fetchpatch }: buildPythonPackage rec { pname = "apsw"; - version = "3.38.5-r1"; + version = "3.39.2.1"; format = "setuptools"; disabled = isPyPy; @@ -18,13 +19,22 @@ buildPythonPackage rec { owner = "rogerbinns"; repo = "apsw"; rev = "refs/tags/${version}"; - hash = "sha256-pPviSrONGgWZUREMENPt34bpHggR00Kl6DrB40JWm+w="; + hash = "sha256-W1uQFya/IQUBAPAjwdCJ1K5LVc4spcYj0dN2YP2vtN0="; }; buildInputs = [ sqlite ]; + patches = [ + # ongoing issue: https://github.com/rogerbinns/apsw/issues/363 + # apsw needs to know the compile flags of sqlite to match features + (fetchpatch { + url = "https://github.com/rogerbinns/apsw/commit/e92f019ff785d8e52d381dc541d3f4f8236fb356.patch"; + hash = "sha256-Zdy0ukfWkak9lTdU5WMNzWNp7uDROJgXLcfvQdfm2Oo="; + }) + ]; + # Project uses custom test setup to exclude some tests by default, so using pytest # requires more maintenance # https://github.com/rogerbinns/apsw/issues/335 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix index 4d6875ad57..7390d861dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.14.5"; + version = "0.14.6"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-5dmPTN86DtEtGTgvX1T8QfvPdqZNdyBQP3lt4e4tH3o="; + hash = "sha256-sLh9kM4HcsLrvljvdyLBa0FkkJyTT9zbwumKGTHN1UE="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix index bd66c47c6c..cb897b31fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix @@ -1,4 +1,5 @@ { lib +, async-timeout , bluez , buildPythonPackage , dbus-next @@ -10,17 +11,18 @@ buildPythonPackage rec { pname = "bleak"; - version = "0.15.1"; - format = "setuptools"; + version = "0.16.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2MjYjeDyKhW9E1ugVsTlsvufFRGSg97yGx7X1DwA1ZA="; + hash = "sha256-pUn0PjxdjeRkxytLkFU0w/R4F0bpgV7NUxtyVd4uGcc="; }; propagatedBuildInputs = [ + async-timeout dbus-next typing-extensions ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-adapters/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-adapters/default.nix index 1526477644..f07ebd2c2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-adapters/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-adapters/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bluetooth-adapters"; - version = "0.3.0"; + version = "0.3.6"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-PRYu3PTmSg25DiSuLnv1tp1cOZsXHGTmxRA2V39ab4k="; + hash = "sha256-mekruNzoix61idaGv/BIgb1fwKcA/+UGOnjX85jQWDQ="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix index d6cc52d5d9..00cdda89f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bluetooth-auto-recovery"; - version = "0.2.2"; + version = "0.3.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-Td7LT5C7ho/fIT2gnkPA0LLXHtzDjbYAopE4ECTfFKQ="; + hash = "sha256-1lzg4OY2FRCgpOVK79Pi5J2zPsL+zDWYLeSX0Icknkw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bthome-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bthome-ble/default.nix index 268f5b2ca7..4f216bd2ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bthome-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bthome-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "0.5.1"; + version = "1.0.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-G3EZ23bpvt0HBjHtxJnpXgOzv+3/Rl8yWrVR5s3iZQA="; + hash = "sha256-yTbJ69FPMIsc/w7UXfvXPLXGRs9s0F4YiccljRyI5Ek="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/classify-imports/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/classify-imports/default.nix index 3e0245ab58..16a7f361be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/classify-imports/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/classify-imports/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "classify-imports"; - version = "4.1.0"; + version = "4.2.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "asottile"; repo = pname; rev = "v${version}"; - hash = "sha256-w/+Sf2ZVSDmFNPICJfAKzfukcznWyFBhi7hjIELtYGI="; + hash = "sha256-f5wZfisKz9WGdq6u0rd/zg2CfMwWvQeR8xZQNbD7KfU="; }; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deal/default.nix index b9e050187d..a7465d57dc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deal/default.nix @@ -14,11 +14,12 @@ , pygments , typeguard , urllib3 +, flake8 }: buildPythonPackage rec { pname = "deal"; - version = "4.23.3"; + version = "4.23.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "life4"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-duFxe2KSQQb7HB5KrrE32xzTb6QkQcrQssiuXLKao50="; + hash = "sha256-YwozwoTb1JsvrwcTntlpWpQJ9DszH2lmtuKkK8qZiG0="; }; postPatch = '' @@ -58,6 +59,7 @@ buildPythonPackage rec { hypothesis vaa urllib3 + flake8 ]; disabledTests = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/discogs-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/discogs-client/default.nix index f4d80c527b..a07500aba1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/discogs-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/discogs-client/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "discogs-client"; - version = "2.3.15"; + version = "2.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "joalla"; repo = "discogs_client"; rev = "refs/tags/v${version}"; - sha256 = "sha256-teI0sbvluwVFmEOL/V1zLNGFVbeM7QzZ9rCOl3+A+aY="; + sha256 = "sha256-gGAtRhAg/W0dREhCOmif1XlQ4gldIGQ2hIC8gzifRu8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix index b7cc95f7c5..4253d69fea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "django-extensions"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-jibske9cnOn4FPAGNs2EU1w1huF4dNxHAnOzuKSj3/E="; + sha256 = "sha256-i8A/FMba1Lc3IEBzefP3Uu23iGcDGYqo5bNv+u6hKQI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dparse/default.nix index 179d02b150..912ed794ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dparse/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "dparse"; - version = "0.5.2"; + version = "0.6.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-w0iZSh9ByF9mTY9aR0QmR7xOIsWvWxsm7ymv8Ppd3c0="; + sha256 = "sha256-VwaLthhZsWdsa+sQ85mQbuy0GnW10/vJnQMRBZy2chM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix index 6240567e88..7f0d01ec96 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dropbox"; - version = "11.33.0"; + version = "11.34.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "dropbox"; repo = "dropbox-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-re1TYujoLWjvDE0/ikTMQmXufdS1Q5IMViiFY2/QRMw="; + hash = "sha256-bahl78c0MGu4AoANO/FWYq/DQWPC4T8WVdRHKzwg444="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/epson-projector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/epson-projector/default.nix index 7dbe665ede..0bb5eb5adc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/epson-projector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/epson-projector/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "epson-projector"; - version = "0.4.6"; + version = "0.5.0"; src = fetchPypi { pname = "epson_projector"; inherit version; - sha256 = "sha256-F8Dvk5OtlPbFyIedJb+zM2iN9eT0jDQEs06xbL3rlVs="; + sha256 = "sha256-a9pRncC22DCKX+7ObC8PORpR+RGbOBor2lbwzfrU8tk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fireflyalgorithm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fireflyalgorithm/default.nix new file mode 100644 index 0000000000..b0343f2d87 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/fireflyalgorithm/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, poetry-core +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "FireflyAlgorithm"; + version = "0.3.2"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "firefly-cpp"; + repo = pname; + rev = version; + sha256 = "sha256-IlOIoP2aANE8y3+Qtb/H6w/+REnPWiUUQGRiAfxOpcM="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + numpy + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "fireflyalgorithm" + ]; + + meta = with lib; { + description = "An implementation of the stochastic nature-inspired algorithm for optimization"; + homepage = "https://github.com/firefly-cpp/FireflyAlgorithm"; + license = licenses.mit; + maintainers = with maintainers; [ firefly-cpp ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix index 3d4fd154c3..d2d526ea60 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.2.19"; + version = "0.2.20"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "marcelblijleven"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-H3N0hAJsjBX3pQ2i03r4MRBQQLCXjLhftokZQx0bF80="; + sha256 = "sha256-RDd0KR7NjBTlgeQ/E4mnLnB2n4NCPoAt2a62NGdzCZE="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/govee-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/govee-ble/default.nix index 99964db980..4e0b2ef7b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/govee-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/govee-ble/default.nix @@ -1,4 +1,5 @@ { lib +, bluetooth-data-tools , bluetooth-sensor-state-data , buildPythonPackage , fetchFromGitHub @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "govee-ble"; - version = "0.14.1"; + version = "0.17.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-gAhrhHTPwNipAFS22GXKjeVXqx0AGorvsqqEWKwRLzA="; + hash = "sha256-Kj1RCDQiDAt01yjoRVPdpi2dlF8V1rwnx+n7WGTRdQ0="; }; nativeBuildInputs = [ @@ -28,6 +29,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + bluetooth-data-tools bluetooth-sensor-state-data home-assistant-bluetooth sensor-state-data diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix index d41fca17e4..d5101e7ba6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hatasmota"; - version = "0.5.1"; + version = "0.6.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "emontnemery"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-1tCTkmhO9HyfdQuymTtFdCvxG9+Xs5/dEN5tB3/2fpQ="; + hash = "sha256-8B3xdSvvxmbjpPk6aWHQTraf2J1oCBvP0/UxTxaN0jY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hickle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hickle/default.nix index 21af8addaa..8d442544fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hickle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hickle/default.nix @@ -7,43 +7,33 @@ , astropy , scipy , pandas -, codecov -, pytest -, pytest-cov -, pytest-runner -, coveralls -, twine -, check-manifest +, pytestCheckHook , lib }: buildPythonPackage rec { pname = "hickle"; - version = "4.0.4"; + version = "5.0.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0d35030a76fe1c7fa6480088cde932689960ed354a2539ffaf5f3c90c578c06f"; + hash = "sha256-2+7OF/a89jK/zLhbk/Q2A+zsKnfRbq3YMKGycEWsLEQ="; }; postPatch = '' - substituteInPlace requirements_test.txt \ - --replace 'astropy<3.1;' 'astropy;' --replace 'astropy<3.0;' 'astropy;' + substituteInPlace tox.ini --replace "--cov=./hickle" "" ''; propagatedBuildInputs = [ h5py numpy dill ]; - doCheck = false; # incompatible with latest astropy checkInputs = [ - pytest pytest-cov pytest-runner coveralls scipy pandas astropy twine check-manifest codecov + pytestCheckHook scipy pandas astropy ]; pythonImportsCheck = [ "hickle" ]; meta = { - # incompatible with h5py>=3.0, see https://github.com/telegraphic/hickle/issues/143 - broken = true; description = "Serialize Python data to HDF5"; homepage = "https://github.com/telegraphic/hickle"; license = lib.licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix index b33d53abd4..800172340d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.5.3"; + version = "2.5.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7Glq1R0GT2rIFdEpvZdzi4yf4t42ryRIeeTbz8znJmg="; + sha256 = "sha256-Lv2rydAW1qvCa7cFmkmlOEpO2af+kMhsvG4yxTUy3FA="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix index fae5a8abf0..5ab12b4ec6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "ignite"; - version = "0.4.9"; + version = "0.4.10"; src = fetchFromGitHub { owner = "pytorch"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-KBEoMV9lwlEra4DiGDLgPb85+HrnK4Qiy3XYDa9hO3s="; + sha256 = "sha256-mMiEVenDBNmeXMrDSZamUpnSm+4BQEgfK89zxIaFMio="; }; checkInputs = [ pytestCheckHook matplotlib mock pytest-xdist torchvision ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsons/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsons/default.nix new file mode 100644 index 0000000000..9d1083bb47 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsons/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, attrs +, pytestCheckHook +, typish +, tzdata +}: + +buildPythonPackage rec { + pname = "jsons"; + version = "1.6.3"; + + src = fetchFromGitHub { + owner = "ramonhagenaars"; + repo = "jsons"; + rev = "v${version}"; + sha256 = "0sdwc57f3lwzhbcapjdbay9f8rn65rlspxa67a2i5apcgg403qpc"; + }; + + propagatedBuildInputs = [ + typish + ]; + + checkInputs = [ + attrs + pytestCheckHook + tzdata + ]; + + disabledTestPaths = [ + # These tests are based on timings, which fail + # on slow or overloaded machines. + "tests/test_performance.py" + ]; + + pythonImportsCheck = [ + "jsons" + ]; + + meta = with lib; { + description = "Turn Python objects into dicts or json strings and back"; + homepage = "https://github.com/ramonhagenaars/jsons"; + license = licenses.mit; + maintainers = with maintainers; [ fmoda3 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/led-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/led-ble/default.nix new file mode 100644 index 0000000000..b81f62aa94 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/led-ble/default.nix @@ -0,0 +1,57 @@ +{ lib +, async-timeout +, bleak +, bleak-retry-connector +, buildPythonPackage +, fetchFromGitHub +, flux-led +, poetry-core +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "led-ble"; + version = "0.7.1"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Bluetooth-Devices"; + repo = pname; + rev = "v${version}"; + hash = "sha256-WjSMyuxxScJMtrQAvCHX98IXzbO2dWAsAaOwXf6TEDg="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=led_ble --cov-report=term-missing:skip-covered" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + async-timeout + bleak + bleak-retry-connector + flux-led + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "led_ble" + ]; + + meta = with lib; { + description = "Library for LED BLE devices"; + homepage = "https://github.com/Bluetooth-Devices/led-ble"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libvirt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libvirt/default.nix index 34909a2741..5d2b49e548 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libvirt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libvirt/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "libvirt"; - version = "8.6.0"; + version = "8.7.0"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - sha256 = "sha256-eJ0RPxJ4Gm+VGs6NeTWP2FbvDnJy4mURPlFbgvkSgo0="; + sha256 = "sha256-B7pJDFjamFtNAhnPWMzNUWFEBhM48y0QG4MUtX7GP4o="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix index 36b1e9f42d..50516ae32e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "mailchecker"; - version = "5.0.0"; + version = "5.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-d8RG/PSWPHvQy7o9tPLPGrEp0r/Y3JWwWoT3cS4iR38="; + hash = "sha256-fJoV/mNImdcTpJC6c2zmYWZCXlBWLOP+5W5Hsmw2yOQ="; }; # Module has no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/millheater/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/millheater/default.nix index 3968e8bf80..1be28fc98a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/millheater/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/millheater/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "millheater"; - version = "0.9.0"; + version = "0.10.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pymill"; rev = version; - sha256 = "sha256-ocPp9tRghlOb0vZrpELDkwOq8ue+JBCRf2uB0Q7CPF8="; + sha256 = "sha256-ImEg+VEiASQPnMeZzbYMMb+ZgcsxagQcN9IDFGO05Vw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mne-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mne-python/default.nix index c1bd721fc1..c7ceeb0d4f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mne-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mne-python/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "mne-python"; - version = "1.1.0"; + version = "1.1.1"; # PyPI dist insufficient to run tests src = fetchFromGitHub { owner = "mne-tools"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-p4brwO6uERM2vJdkJ34GdeAKk07QeVEmQrZMPcDjI2I="; + sha256 = "sha256-VM7sKcQeAeK20r4/jehhGlvBSHhYwA2SgsNL5Oa/Hug="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix index 59cbd65b48..1643904c31 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix @@ -17,7 +17,7 @@ let nbclient = buildPythonPackage rec { pname = "nbclient"; - version = "0.6.6"; + version = "0.6.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ let nbclient = buildPythonPackage rec { owner = "jupyter"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Rs4Jk4OtexB/NKM1Jo4cV87hBxXDlnX9X+4KO+pGb0E="; + hash = "sha256-+GQkEGWReo9y8bgcysslQdzJUcvQiZkQTQiwmWJ1mx8="; }; propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter-client ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/neo4j/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/neo4j/default.nix index 325196cba9..a85f6a5719 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/neo4j/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/neo4j/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "4.4.5"; + version = "5.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "neo4j"; repo = "neo4j-python-driver"; - rev = version; - hash = "sha256-BtftIpVKnIAwgLgdZUwHiVsKOpgy2bSb+9fC3ycpM4Y="; + rev = "refs/tags/${version}"; + hash = "sha256-I3RAsCpfaDcW0L89lOff2zCQc+6B6eNvuWKgV7G2Bws="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix index 81d80dcd7b..3ae81a4afe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -4,6 +4,7 @@ , buildPythonPackage , dacite , fetchFromGitHub +, aqipy-atmotech , pytest-asyncio , pytest-error-for-skips , pytestCheckHook @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "1.3.0"; + version = "1.4.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,12 +22,13 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = version; - sha256 = "sha256-O/HJTqmNmnx85AVuhRRxNqS1W0dZyKFSPVFqaBXAuhU="; + hash = "sha256-UbknJ+dX+4kzfe6/gg/Nj1Ay8YXtIRj203B6NkhGVys="; }; propagatedBuildInputs = [ aiohttp dacite + aqipy-atmotech ]; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nextcord/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nextcord/default.nix index 140d81c87c..7fca1bd895 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nextcord/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nextcord/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "nextcord"; - version = "2.1.0"; + version = "2.2.0"; format = "setuptools"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "nextcord"; repo = "nextcord"; rev = "refs/tags/v${version}"; - hash = "sha256-/M7Wyb1GW6LPWm41jVnhWA6+dyTrdLyJ6pfsMozw5xI="; + hash = "sha256-2VlmcldbW+BfQRzOjCsh6r29qzwD+SG8H8arbTDg94k="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nextdns/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nextdns/default.nix index c99e7c909c..a0aac69df9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nextdns/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nextdns/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "nextdns"; - version = "1.0.2"; + version = "1.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-joPg5XZ5qEDnON96XCy5j4/OC+EkFw09Db4TH+ThsTY="; + hash = "sha256-hMTafmG3mk6jyrqxI7L/rQxKGpgNgEZ+b6d6/yISCng="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numba-scipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numba-scipy/default.nix index cd01bce1d1..f67d0be922 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numba-scipy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numba-scipy/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { postPatch = '' # https://github.com/numba/numba-scipy/pull/76 substituteInPlace setup.py \ - --replace "scipy>=0.16,<=1.6.2" "scipy>=0.16" + --replace "scipy>=0.16,<=1.7.3" "scipy>=0.16" ''; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ovmfvartool/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ovmfvartool/default.nix new file mode 100644 index 0000000000..12f65fe86c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ovmfvartool/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pyyaml }: + +buildPythonPackage rec { + pname = "ovmfvartool"; + version = "unstable-2022-09-04"; + + src = fetchFromGitHub { + owner = "hlandau"; + repo = pname; + rev = "45e6b1e53967ee6590faae454c076febce096931"; + hash = "sha256-XbvcE/MXNj5S5N7A7jxdwgEE5yMuB82Xg+PYBsFRIm0="; + }; + + propagatedBuildInputs = [ pyyaml ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "ovmfvartool" ]; + + meta = with lib; { + description = "Parse and generate OVMF_VARS.fd from Yaml"; + homepage = "https://github.com/hlandau/ovmfvartool"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ baloo raitobezarius ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pescea/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pescea/default.nix index b80f5058ca..d2accd221d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pescea/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pescea/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pescea"; - version = "1.0.11"; + version = "1.0.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,8 +19,9 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lazdavila"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-yiBtvD7kCqR/F4yoJa5rIOekYy8+zlJh849Jv+HkA4M="; + # https://github.com/lazdavila/pescea/issues/4 + rev = "a3dd7deedc64205e24adbc4ff406a2f6aed3b240"; + hash = "sha256-5TkFrGaSkQOORhf5a7SjkzggFLPyqe9k3M0B4ljhWTQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix index 45fd001dd9..d7a97205f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "plexapi"; - version = "4.12.1"; + version = "4.13.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pkkid"; repo = "python-plexapi"; rev = "refs/tags/${version}"; - sha256 = "sha256-OzHykLpcy+ZA3jfzrDwmCoNb4JhvdHYJErzfWn+zjqo="; + sha256 = "sha256-lFVXWkT6cg0JlFWz5AquEXC6icwTU3bNHMDfKEy/3rQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix index b832b7051e..a4be2b11d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "psd-tools"; - version = "1.9.21"; + version = "1.9.22"; src = fetchFromGitHub { owner = "psd-tools"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-+nqN7DJHbr7XkfG0oUQkWcxv+krR8DlQndAQCvnBk3s="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-T3/KLirU69Mdu7pQ6NFEVzhesaYhYsdK6DjTJQivPBQ="; }; nativeBuildInputs = [ cython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psutil-home-assistant/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psutil-home-assistant/default.nix new file mode 100644 index 0000000000..4e248702f5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/psutil-home-assistant/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, psutil +, pytestCheckHook +}: + + +buildPythonPackage rec { + pname = "psutil-home-assistant"; + version = "0.0.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = "psutil-home-assistant"; + rev = "refs/tags/${version}"; + hash = "sha256-6bj1aaa/JYZFVwUAJfxISRoldgTmumCG8WrlKhkb6kM="; + }; + + propagatedBuildInputs = [ + psutil + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + changelog = "https://github.com/home-assistant-libs/psutil-home-assistant/releases/tag/${version}"; + description = "Wrapper of psutil that removes reliance on globals"; + homepage = "https://github.com/home-assistant-libs/psutil-home-assistant"; + license = licenses.asl20; + maintainers = teams.home-assistant.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix index 352f42a555..5246bf803d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independant of pulumi's. - version = "5.10.0"; + version = "5.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-eybcT7pdc0QED3HrHN+jnxZLXoExEZZUEHSoFmhlsHQ="; + hash = "sha256-Xkf/7V1p98yy5UJnDZgnLMp/8BGLVYINWMommRrqdXk="; }; sourceRoot = "${src.name}/sdk/python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycep-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycep-parser/default.nix index 91722ee89b..aab9f05d93 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycep-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycep-parser/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pycep-parser"; - version = "0.3.8"; + version = "0.3.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "gruebel"; repo = "pycep"; rev = "refs/tags/${version}"; - hash = "sha256-y6npvFh6/QykOAKK8ihTHDcv5dFd4lLU64UXPIhBELA="; + hash = "sha256-CghTNdZZJJOakMySNPRCTYx+1aEY8ROUvS9loc9JcPo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydmd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydmd/default.nix index beb6ef710b..92caf8a0fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydmd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydmd/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pydmd"; - version = "0.4.0.post2207"; + version = "0.4.0.post2209"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mathLab"; repo = "PyDMD"; rev = "refs/tags/v${version}"; - sha256 = "sha256-IiHNn8BXOl+eQdxwTrF8PQhDlsMOTj87ugpQ09kDTO4="; + sha256 = "sha256-09KnVuBNe1aVjO1OW+rhVsHplSO4qBIayy//9Jv0fQM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyduke-energy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyduke-energy/default.nix index 26ac6b51d4..35ab4e5af8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyduke-energy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyduke-energy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyduke-energy"; - version = "1.0.1"; + version = "1.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mjmeli"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-qHVQ7ehvhVM2IL8DcoB6TU2Q4GBn4Ewmzs6Yp46r6xE="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-0fxFZQr8Oti17egBvpvE92YsIZ+Jf8gYRh0J2g5WTIc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylink-square/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylink-square/default.nix index 9de8923527..e572ec542f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylink-square/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylink-square/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pylink-square"; - version = "0.14.1"; + version = "0.14.2"; format = "setuptools"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "square"; repo = "pylink"; rev = "refs/tags/v${version}"; - hash = "sha256-eCVNDPXtZAuzGb4ZOnjEmE1pKPOl52xRfZy+ppfxS3g="; + hash = "sha256-4jmFU8jlrEAYTAQH+uQCWrzqwKX4onb7Xk4iTYzx9dI="; }; propagatedBuildInputs = [ psutil six future ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix index cdb971b6a7..93c5fb3b26 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix @@ -1,45 +1,58 @@ { lib -, authlib +, aiohttp +, aioresponses , buildPythonPackage , fetchFromGitHub -, httpx -, pytest-asyncio +, poetry-core +, pyjwt +, pytest-aiohttp +, pytest-freezegun , pytestCheckHook , pythonOlder -, pytz +, deepdiff }: buildPythonPackage rec { pname = "pylitterbot"; - version = "2022.7.0"; - format = "setuptools"; + version = "2022.9.2"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "natekspencer"; repo = pname; - rev = version; - sha256 = "sha256-iniSlsZVWdDuwM/6asX4xyVrtrQvt7wEBwDVutjCogU="; + rev = "refs/tags/${version}"; + hash = "sha256-iGif349AhrqcJnaZZdGc7x4KD7u4oStmKWxIY/knMww="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ - authlib - httpx - pytz + aiohttp + deepdiff + pyjwt ]; checkInputs = [ - pytest-asyncio + aioresponses + pytest-aiohttp + pytest-freezegun pytestCheckHook ]; + pytestFlagsArray = [ + "--asyncio-mode=legacy" + ]; + pythonImportsCheck = [ "pylitterbot" ]; meta = with lib; { - description = "Python package for controlling a Litter-Robot"; + description = "Modulefor controlling a Litter-Robot"; homepage = "https://github.com/natekspencer/pylitterbot"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymanopt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymanopt/default.nix index cc6cef7766..f299c4900f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymanopt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymanopt/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pymanopt"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-dqyduExNgXIbEFlgkckaPfhLFSVLqPgwAOyBUdowwiQ="; + sha256 = "sha256-VwCUqKI1PkR8nUVaa73bkTw67URKPaza3VU9g+rB+Mg="; }; propagatedBuildInputs = [ numpy scipy torch ]; 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 f3dcdf6c45..d11cf4917d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymetno/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymetno/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pymetno"; - version = "0.9.0"; + version = "0.10.0"; format = "setuptools"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "PyMetno"; - rev = version; - sha256 = "sha256-2LNDFQObGqxrzswnqbmvCGLxEI0j+cIdv8o+RZM/7sM="; + rev = "refs/tags/${version}"; + sha256 = "sha256-Do9RQS4gE2BapQtKQsnMzJ8EJzzxkCBA5r3z1zHXIsA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymysensors/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymysensors/default.nix index d071743d74..e9d6ab74ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymysensors/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymysensors/default.nix @@ -1,4 +1,5 @@ { lib +, awesomeversion , buildPythonPackage , click , crcmod @@ -17,29 +18,35 @@ buildPythonPackage rec { pname = "pymysensors"; - version = "0.23.0"; + version = "0.24.1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "theolind"; repo = pname; rev = version; - sha256 = "0a09w1bzz2pn0w11f7kx8052914kdpgfb7w6hc9s50x8wl9q604h"; + hash = "sha256-3t9YrSJf02kc5CuTqPBc/qNJV7yy7Vke4WqhtuOaAYo="; }; propagatedBuildInputs = [ + awesomeversion click crcmod getmac intelhex - paho-mqtt pyserial pyserial-asyncio voluptuous ]; + passthru.optional-dependencies = { + mqtt-client = [ + paho-mqtt + ]; + }; + checkInputs = [ pytest-sugar pytest-timeout diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyocr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyocr/default.nix index b8f9564a4f..916a22a62e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyocr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyocr/default.nix @@ -2,8 +2,6 @@ , fetchFromGitLab , buildPythonPackage , pillow -, setuptools-scm -, setuptools-scm-git-archive , tesseract , cuneiform , isPy3k @@ -13,7 +11,7 @@ buildPythonPackage rec { pname = "pyocr"; - version = "0.7.2"; + version = "0.8.3"; disabled = !isPy3k; # Don't fetch from PYPI because it doesn't contain tests. @@ -23,7 +21,7 @@ buildPythonPackage rec { owner = "OpenPaperwork"; repo = "pyocr"; rev = version; - sha256 = "09ab86bmizpv94w3mdvdqkjyyvk1vafw3jqhkiw5xx7p180xn3il"; + sha256 = "sha256-gIn50H9liQcTb7SzoWnBwm5LTvkr+R+5OPvITls1B/w="; }; patches = [ @@ -33,9 +31,11 @@ buildPythonPackage rec { }) ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - - buildInputs = [ setuptools-scm setuptools-scm-git-archive ]; + # see the logic in setup.py + ENABLE_SETUPTOOLS_SCM = "0"; + preConfigure = '' + echo 'version = "${version}"' > src/pyocr/_version.py + ''; propagatedBuildInputs = [ pillow ]; @@ -45,6 +45,6 @@ buildPythonPackage rec { inherit (src.meta) homepage; description = "A Python wrapper for Tesseract and Cuneiform"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ symphorien ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyocr/paths.patch b/third_party/nixpkgs/pkgs/development/python-modules/pyocr/paths.patch index 55cbf7d48d..d490607397 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyocr/paths.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyocr/paths.patch @@ -1,3 +1,9 @@ +commit c4bac00441363fcaeb074682d8226ca523614ea2 +Author: Guillaume Girol +Date: Sat Aug 20 17:48:01 2022 +0200 + + Fix finding tesseract and cuneiform + diff --git a/src/pyocr/cuneiform.py b/src/pyocr/cuneiform.py index 2e5b717..35647e2 100644 --- a/src/pyocr/cuneiform.py @@ -19,7 +25,7 @@ index 2e5b717..35647e2 100644 LANGUAGES_LINE_PREFIX = "Supported languages: " LANGUAGES_SPLIT_RE = re.compile("[^a-z]") diff --git a/src/pyocr/libtesseract/tesseract_raw.py b/src/pyocr/libtesseract/tesseract_raw.py -index a068e73..9ebea5c 100644 +index 2002614..9ebea5c 100644 --- a/src/pyocr/libtesseract/tesseract_raw.py +++ b/src/pyocr/libtesseract/tesseract_raw.py @@ -2,7 +2,6 @@ import ctypes @@ -30,7 +36,7 @@ index a068e73..9ebea5c 100644 from ..error import TesseractError -@@ -10,48 +9,16 @@ from ..error import TesseractError +@@ -10,51 +9,16 @@ from ..error import TesseractError logger = logging.getLogger(__name__) TESSDATA_PREFIX = os.getenv('TESSDATA_PREFIX', None) @@ -57,7 +63,7 @@ index a068e73..9ebea5c 100644 - ) - ) - else: -- TESSDATA_PREFIX = tessdata +- TESSDATA_PREFIX = os.path.join(tessdata, "tessdata") - - -if sys.platform[:3] == "win": # pragma: no cover @@ -77,15 +83,18 @@ index a068e73..9ebea5c 100644 - ] -else: - libnames += [ +- "libtesseract.so.5", - "libtesseract.so.4", - "libtesseract.so.3", +- "libtesseract.5.dylib", +- "libtesseract.4.dylib", - ] - +libnames = [ "@tesseract@/lib/libtesseract.so" ] g_libtesseract = None -@@ -364,12 +331,12 @@ def init(lang=None): +@@ -367,12 +331,12 @@ def init(lang=None): try: if lang: lang = lang.encode("utf-8") @@ -103,7 +112,7 @@ index a068e73..9ebea5c 100644 ) g_libtesseract.TessBaseAPISetVariable( diff --git a/src/pyocr/tesseract.py b/src/pyocr/tesseract.py -index 7c30852..44e8446 100644 +index 0fe0d20..c1fdd27 100644 --- a/src/pyocr/tesseract.py +++ b/src/pyocr/tesseract.py @@ -28,8 +28,7 @@ from .builders import DigitBuilder # backward compatibility @@ -193,7 +202,7 @@ index 45b7f6a..95f55c6 100644 stderr=subprocess.STDOUT ) diff --git a/tests/tests_libtesseract.py b/tests/tests_libtesseract.py -index ad7fdc9..57e7a60 100644 +index a5d46d8..8b9e315 100644 --- a/tests/tests_libtesseract.py +++ b/tests/tests_libtesseract.py @@ -165,7 +165,8 @@ class TestLibTesseractRaw(BaseTest): @@ -217,7 +226,7 @@ index ad7fdc9..57e7a60 100644 self.assertEqual( diff --git a/tests/tests_tesseract.py b/tests/tests_tesseract.py -index 1a55567..a24d96f 100644 +index 18d01ef..593cf94 100644 --- a/tests/tests_tesseract.py +++ b/tests/tests_tesseract.py @@ -36,7 +36,7 @@ class TestTesseract(BaseTest): @@ -229,7 +238,7 @@ index 1a55567..a24d96f 100644 @patch("subprocess.Popen") def test_version_error(self, popen): -@@ -156,7 +156,7 @@ class TestTesseract(BaseTest): +@@ -162,7 +162,7 @@ class TestTesseract(BaseTest): for lang in ("eng", "fra", "jpn", "osd"): self.assertIn(lang, langs) popen.assert_called_once_with( @@ -238,7 +247,7 @@ index 1a55567..a24d96f 100644 startupinfo=None, creationflags=0, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) -@@ -171,7 +171,7 @@ class TestTesseract(BaseTest): +@@ -177,7 +177,7 @@ class TestTesseract(BaseTest): self.assertEqual(te.exception.status, 1) self.assertEqual("unable to get languages", te.exception.message) popen.assert_called_once_with( @@ -247,7 +256,7 @@ index 1a55567..a24d96f 100644 startupinfo=None, creationflags=0, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) -@@ -248,7 +248,7 @@ class TestTesseract(BaseTest): +@@ -254,7 +254,7 @@ class TestTesseract(BaseTest): self.assertEqual(status, 0) self.assertEqual(error, message) popen.assert_called_once_with( @@ -256,7 +265,7 @@ index 1a55567..a24d96f 100644 cwd=tmpdir, startupinfo=None, creationflags=0, -@@ -271,7 +271,7 @@ class TestTesseract(BaseTest): +@@ -277,7 +277,7 @@ class TestTesseract(BaseTest): self.assertEqual(status, 0) self.assertEqual(error, message) popen.assert_called_with( @@ -265,7 +274,7 @@ index 1a55567..a24d96f 100644 cwd=tmpdir, startupinfo=None, creationflags=0, -@@ -302,7 +302,7 @@ class TestTesseract(BaseTest): +@@ -308,7 +308,7 @@ class TestTesseract(BaseTest): self.assertEqual(result["angle"], 90) self.assertEqual(result["confidence"], 9.30) popen.assert_called_once_with( @@ -274,7 +283,7 @@ index 1a55567..a24d96f 100644 stdin=subprocess.PIPE, shell=False, startupinfo=None, -@@ -338,7 +338,7 @@ class TestTesseract(BaseTest): +@@ -344,7 +344,7 @@ class TestTesseract(BaseTest): self.assertEqual(result["angle"], 90) self.assertEqual(result["confidence"], 9.30) popen.assert_called_once_with( @@ -283,7 +292,7 @@ index 1a55567..a24d96f 100644 stdin=subprocess.PIPE, shell=False, startupinfo=None, -@@ -371,7 +371,7 @@ class TestTesseract(BaseTest): +@@ -377,7 +377,7 @@ class TestTesseract(BaseTest): self.assertEqual(result["angle"], 90) self.assertEqual(result["confidence"], 9.30) popen.assert_called_once_with( @@ -292,7 +301,7 @@ index 1a55567..a24d96f 100644 "--psm", "0", "-l", "osd"], stdin=subprocess.PIPE, shell=False, -@@ -399,7 +399,7 @@ class TestTesseract(BaseTest): +@@ -405,7 +405,7 @@ class TestTesseract(BaseTest): with self.assertRaises(tesseract.TesseractError) as te: tesseract.detect_orientation(self.image) popen.assert_called_once_with( @@ -301,7 +310,7 @@ index 1a55567..a24d96f 100644 stdin=subprocess.PIPE, shell=False, startupinfo=None, -@@ -433,7 +433,7 @@ class TestTesseract(BaseTest): +@@ -439,7 +439,7 @@ class TestTesseract(BaseTest): with self.assertRaises(tesseract.TesseractError) as te: tesseract.detect_orientation(self.image) popen.assert_called_once_with( @@ -310,7 +319,7 @@ index 1a55567..a24d96f 100644 stdin=subprocess.PIPE, shell=False, startupinfo=None, -@@ -467,7 +467,7 @@ class TestTesseract(BaseTest): +@@ -473,7 +473,7 @@ class TestTesseract(BaseTest): self.assertEqual(result["angle"], 90) self.assertEqual(result["confidence"], 9.30) popen.assert_called_once_with( @@ -319,7 +328,7 @@ index 1a55567..a24d96f 100644 stdin=subprocess.PIPE, shell=False, startupinfo=None, -@@ -500,7 +500,7 @@ class TestTesseract(BaseTest): +@@ -506,7 +506,7 @@ class TestTesseract(BaseTest): self.assertEqual(result["angle"], 90) self.assertEqual(result["confidence"], 9.30) popen.assert_called_once_with( @@ -328,7 +337,7 @@ index 1a55567..a24d96f 100644 stdin=subprocess.PIPE, shell=False, startupinfo=None, -@@ -527,7 +527,7 @@ class TestTesseract(BaseTest): +@@ -533,7 +533,7 @@ class TestTesseract(BaseTest): with self.assertRaises(tesseract.TesseractError) as te: tesseract.detect_orientation(self.image) popen.assert_called_once_with( @@ -337,7 +346,7 @@ index 1a55567..a24d96f 100644 stdin=subprocess.PIPE, shell=False, startupinfo=None, -@@ -561,7 +561,7 @@ class TestTesseract(BaseTest): +@@ -567,7 +567,7 @@ class TestTesseract(BaseTest): with self.assertRaises(tesseract.TesseractError) as te: tesseract.detect_orientation(self.image) popen.assert_called_once_with( diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix index 3401e905a1..3d681c75da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "pyosmium"; - version = "3.3.0"; + version = "3.4.1"; disabled = pythonOlder "3.4" || isPyPy; @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "osmcode"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-vXxRXr+hRrA9oPf8wAS4qQT258Vz+KRSqYwwD6HrDxk="; + sha256 = "sha256-PMQnQe699ZWRR2gevrSCTokyc9xr1TL9Ohuqn7NL8c8="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix index 6c7d10b420..5ff1898c98 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.5.0"; + version = "1.5.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-xshqcAXj6lGpnTIHhx1A2c+Vso1q8kAwZW7v6XIilj0="; + hash = "sha256-3vtyVXWfAIUZuV0kcnT6UniMaHTw11Az7vHdjyouPbI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypdf2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypdf2/default.nix index d9522d63a7..b183b20a52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypdf2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypdf2/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "PyPDF2"; - version = "2.10.4"; + version = "2.10.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8JDF/HmQz1ptY2TOI2KDSXTjITbVIpG6uyNy5dZH0Yg="; + sha256 = "sha256-kSKmRB9sELkrAmKpX5wE9VL+RJjybn3G49JvwKWBU84="; }; LC_ALL = "en_US.UTF-8"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypinyin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypinyin/default.nix index 0f6a9407f4..4f79d50e36 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypinyin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypinyin/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pypinyin"; - version = "0.47.0"; + version = "0.47.1"; src = fetchFromGitHub { owner = "mozillazg"; repo = "python-pinyin"; rev = "refs/tags/v${version}"; - sha256 = "sha256-DsSrWbnBFEGQTXP1+C8j5RqSplDitsFl+13YwwE+3pE="; + sha256 = "sha256-c9pEO9k5tCFWLPismrXrrYEQYmxYKkciXFgpbrDEGzE="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrisco/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrisco/default.nix index b6442c82ba..74101ad3ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyrisco/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrisco/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyrisco"; - version = "0.5.2"; + version = "0.5.4"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "OnFreund"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gRAQARdVZWpFHx0nE4xRktIP2p4ggp9/95VO9nNd/1w="; + sha256 = "sha256-/h0vqclvVjoY/tjAWAYjvSqVaAaXeXNafECygutvACA="; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix index fcac04101e..d5aa54a556 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix @@ -33,7 +33,7 @@ let }); in buildPythonPackage rec { pname = "pysaml2"; - version = "7.1.2"; + version = "7.2.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -42,7 +42,7 @@ in buildPythonPackage rec { owner = "IdentityPython"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nyQcQ1OO9PuuQROg+km2vIRF1sZ22MZhiHpmVXWl+is="; + sha256 = "sha256-lnaizwbtBYdKx1puizah+UWsw54NVW6UhEw/eStl1WI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysensibo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysensibo/default.nix index f5817917c9..5bdf9979de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysensibo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysensibo/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pysensibo"; - version = "1.0.18"; + version = "1.0.19"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "andrey-git"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-sFEeN72+h6yFQFluhOQfxoVJPB5lCpFnlJfLnRxVjFg="; + hash = "sha256-pqg+NsdbSyXgC+4/AtbI4BZ5h2pMhvvBdQI9lHj6HME="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix index 248ccc4103..f1e2a90daa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyslurm/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyslurm"; - version = "21.08.4"; + version = "22.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { repo = "pyslurm"; owner = "PySlurm"; - rev = "v${version}"; - hash = "sha256-9ZYTBO8g+5B9D8Ll5JjkJYFyh0RQNIjxg958UZoCNmA="; + rev = "refs/tags/v${version}"; + hash = "sha256-Uh0P7Kevcc78vWT/Zk+MUCKh2AlDiRR3MO/nOke2yP0="; }; buildInputs = [ cython slurm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix index 677fb0ef35..24f7c6bde6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix @@ -4,11 +4,12 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, pytestCheckHook }: buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.18.14"; + version = "0.18.27"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +18,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-XUdrjhV0AnKV6snb183FrlcSLAvo7U+NyvPDorykkJU="; + hash = "sha256-80GzOKZRsjWHLEGhNrYIWdUMiel5ztcobwRhrlyjzpY="; }; propagatedBuildInputs = [ @@ -25,8 +26,9 @@ buildPythonPackage rec { bleak-retry-connector ]; - # Project has no tests - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "switchbot" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix index e03e0fbe62..11b91e191a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pytest-pylint"; - version = "0.18.0"; + version = "0.19.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "790c7a8019fab08e59bd3812db1657a01995a975af8b1c6ce95b9aa39d61da27"; + sha256 = "sha256-2I6DwQI8ZBVIqew1Z3B87udhZjKphq8TNCbUp00GaTI="; }; nativeBuildInputs = [ pytest-runner ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix index a17c4dee73..5d6117d35e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pytest-testmon"; - version = "1.3.5"; + version = "1.3.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ncgNO76j2Z3766ojYydUoYZzRoTb2XxhR6FkKFzjyhI="; + hash = "sha256-KcDVOKAuQ5iVKgK3o1Vnc+LUVsI1izTnkOmByiyCJ1E="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix index 542b04f15b..19f07ccc03 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "python-benedict"; - version = "0.25.3"; + version = "0.25.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-hvXcww2h83azvC9MnJHje3tnHpcvup709LoKoegdG4I="; + hash = "sha256-q7aQW4XRlKp+X1iItHVEsHEjkl2DU9QG0eMrcuq+rc4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-izone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-izone/default.nix index e3ce431097..b4dac08811 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-izone/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-izone/default.nix @@ -7,11 +7,12 @@ , pytest-aio , pytest-asyncio , pytestCheckHook +, setuptools-scm }: buildPythonPackage rec { pname = "python-izone"; - version = "1.2.7"; + version = "1.2.9"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,10 +20,16 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Swamp-Ig"; repo = "pizone"; - rev = "v${version}"; - hash = "sha256-CvFOhs56dfNerK3junWElQfTJi1YXA86zMbv0tseQC8="; + rev = "refs/tags/v${version}"; + hash = "sha256-0rj+tKn2pbFe+nczTMGLwIwmc4jCznGGF4/IMjlEvQg="; }; + nativeBuildInputs = [ + setuptools-scm + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + propagatedBuildInputs = [ aiohttp netifaces diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pythonocc-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pythonocc-core/default.nix index 8a9433ec89..1bef56a01a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pythonocc-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pythonocc-core/default.nix @@ -12,18 +12,18 @@ , opencascade-occt , rapidjson , smesh -, swig +, swig4 }: stdenv.mkDerivation rec { pname = "pythonocc-core"; - version = "7.5.1"; + version = "7.6.2"; src = fetchFromGitHub { owner = "tpaviot"; repo = "pythonocc-core"; rev = version; - sha256 = "1md6x60pnfq0qv4lsnmjv6i96mzdrcpxcgpb316i7wmv9b5ci01s"; + sha256 = "sha256-45pqPQ07KYlpFwJSAYVHbzuqDQTbAvPpxReal52DCzU="; }; postPatch = '' @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { --replace "/usr/X11R6/lib/libGLU.dylib" "${libGLU}/lib/libGLU.dylib" ''; - nativeBuildInputs = [ cmake swig ]; + nativeBuildInputs = [ cmake swig4 ]; buildInputs = [ python opencascade-occt smesh freetype libGL libGLU libX11 libXext libXmu libXi diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-pfn-extras/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-pfn-extras/default.nix index 639c13508c..e3c27eda9e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-pfn-extras/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-pfn-extras/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pytorch-pfn-extras"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "pfnet"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-w4WSEgNLdVLDnKS4kzJBK9BkrrGzbk2aCIhk4HCM/Bk="; + sha256 = "sha256-wxTs/hfgqJn4DCxZj87V/zDKZc+thx3o5bWAvZe7EJU="; }; propagatedBuildInputs = [ numpy packaging torch typing-extensions ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywick/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywick/default.nix index 6cbb64845d..13a037f345 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywick/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywick/default.nix @@ -1,16 +1,27 @@ { buildPythonPackage , fetchFromGitHub , pythonOlder -, pytest +, pytestCheckHook +, albumentations +, dill , h5py , hickle , numpy +, opencv4 , pandas , pillow +, prodict +, pycm +, pyyaml +, scipy +, requests +, scikitimage , six +, tabulate , torch , torchvision , tqdm +, yacs , lib }: @@ -27,17 +38,34 @@ buildPythonPackage rec { sha256 = "0wnijdvqgdpzfdsy1cga3bsr0n7zzsl8hp4dskqwxx087g5h1r84"; }; + postPatch = '' + substituteInPlace setup.py --replace "opencv-python-headless" "opencv" + ''; + propagatedBuildInputs = [ - h5py hickle numpy pandas pillow six torch torchvision tqdm + albumentations + dill + h5py + hickle + numpy + opencv4 + pandas + pillow + prodict + pycm + pyyaml + scipy + requests + scikitimage + tabulate + torch + torchvision + tqdm + six + yacs ]; - checkInputs = [ pytest ]; - - checkPhase = '' - runHook preCheck - pytest tests/ - runHook postCheck - ''; + checkInputs = [ pytestCheckHook ]; meta = { description = "High-level training framework for Pytorch"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywlroots/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywlroots/default.nix index 60ff8dec45..6bc9c220de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywlroots/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywlroots/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "pywlroots"; - version = "0.15.20"; + version = "0.15.21"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hHZzMK7ge2Hs7tzHo4LV3rumEoEoL2OODRQRM60Vlz0="; + sha256 = "sha256-1wHV1+xrGFJWLoMIaG5jc01FfC7mV0+ArhPmWS5yG04="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix index e9d504f5bc..77ed7f04d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "regenmaschine"; - version = "2022.08.0"; + version = "2022.09.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-JPJ+8h3r1C2fHxVPsQgk0ZuG7VqKfBb4qthAG+GCvcE="; + sha256 = "sha256-DEa9bh6dOBMyqgts9UoFOfC97vaZ4d6NPYlKC8ayrgk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/resampy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/resampy/default.nix index 90dd3e680e..f5d59d0fec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/resampy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/resampy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "resampy"; - version = "0.3.1"; + version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bmcfee"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-kqRWW50VQO8H02vHgbdHo578c2jXX4fgF8AY6JuQOSI="; + hash = "sha256-8qhYhkTtq7DwEvw+B4Ul4SMAPxweTgDIOtebmElkcsg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ropgadget/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ropgadget/default.nix index 3c255e7e8c..9695c2aeaa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ropgadget/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ropgadget/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ropgadget"; - version = "6.9"; + version = "7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "JonathanSalwan"; repo = "ROPgadget"; rev = "refs/tags/v${version}"; - hash = "sha256-qq38NJR27f6lBq5WeR6j6CQrMu4iA7i7zWJ9gWsqbDI="; + hash = "sha256-7pGPi1efgxLoxoiqtxzfcSWuNw0otAVgamEzs8stBtc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix index 7b9707278d..fe87242b9c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.15"; + version = "0.4.20"; format = "pyproject"; # fetch from github as we want the data files @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-cEEtuLmGg/bDRYTUQXQiplzES28+xh8iQge6xZUTWIA="; + sha256 = "sha256-xUXHacUIOr309HCHpzFw0g4i0bgiYcvYTCwBBbVVlR0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scrap-engine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scrap-engine/default.nix index 69351e2e6a..5fe1c2a464 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scrap-engine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scrap-engine/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "scrap_engine"; - version = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rMZRD/fE1ed8R5GwS3aZcHLScQ1+uSpX29LwBXtXEao="; + sha256 = "sha256-5OlnBRFhjFAcVkuuKM5hpeRxi+uvjpzfdhp1+5Nx1IU="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skodaconnect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skodaconnect/default.nix index 292b40f4cb..2d389fa4c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skodaconnect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skodaconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "skodaconnect"; - version = "1.1.21"; + version = "1.1.23"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lendy007"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-4VM1bOiSkmzlDegtIRUh1O9FG2DPyK77MIQgQcGQ+ZM="; + hash = "sha256-nRGuDcllBAJTGjA0CIPOX/WCO04dYCm+AFC/aYKiBdY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix index cb2f87709b..66018d95a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.18.2"; + version = "3.18.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - sha256 = "sha256-DBJyw+im7OyzOCUQ9xyth6Tv0kjXRz+R4YUMay1HF3Y="; + sha256 = "sha256-Up3W0NkN9BY6C9KWD6EPZ2sy+55f4eNFl2cP4IdcIcs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix index fae42ac591..274c8818b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "tatsu"; - version = "5.8.2"; + version = "5.8.3"; # upstream only supports 3.10+ disabled = pythonOlder "3.10"; @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "neogeny"; repo = "TatSu"; rev = "refs/tags/v${version}"; - sha256 = "sha256-eJJ438zjXRZ7dk36RPkFvhcIA5RYo5MsjptZIpjCrVI="; + sha256 = "sha256-cKEMRbH/xNtYM0lmNVazv3i0Q1tmVrVPrB6F2s02Sro="; }; nativeBuildInputs = [ pytest-runner ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/thermopro-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/thermopro-ble/default.nix index a09234c114..8a26660791 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/thermopro-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/thermopro-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "thermopro-ble"; - version = "0.4.1"; + version = "0.4.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bluetooth-devices"; repo = pname; - rev = "v${version}"; - hash = "sha256-5KfR01qsSGF2ZNklhm7he9Hskk8pqC2GEmIcsB4HpRY="; + rev = "refs/tags/v${version}"; + hash = "sha256-y8Uh1REZqfrS3Y/L/uCmHYkdPQzwzdx7eSz003oz05o="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/toml-adapt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/toml-adapt/default.nix new file mode 100644 index 0000000000..0ff06f4309 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/toml-adapt/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, click +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pythonOlder +, toml +}: + +buildPythonPackage rec { + pname = "toml-adapt"; + version = "0.2.8"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "firefly-cpp"; + repo = pname; + rev = version; + sha256 = "sha256-9auZZl6c+EfAO/2QaHW5BI1aDZkIIGU+fwzudIdFWqI="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + click + toml + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "toml_adapt" + ]; + + meta = with lib; { + description = "A simple Command-line interface for manipulating toml files"; + homepage = "https://github.com/firefly-cpp/toml-adapt"; + license = licenses.mit; + maintainers = with maintainers; [ firefly-cpp ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchmetrics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchmetrics/default.nix index 933566fcb3..eee18b2cb7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchmetrics/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchmetrics/default.nix @@ -15,7 +15,7 @@ let pname = "torchmetrics"; - version = "0.9.2"; + version = "0.9.3"; in buildPythonPackage { inherit pname version; @@ -24,7 +24,7 @@ buildPythonPackage { owner = "PyTorchLightning"; repo = "metrics"; rev = "refs/tags/v${version}"; - hash = "sha256-zkdmWxaTPTMyLe7P/zVfgKSYDCec3uh0eqCtahByMlY="; + hash = "sha256-L2p8UftRkuBuRJX4V5+OYkJeJ5pCK3MvfA1OvSfgglY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix index 864245622c..6fa19c410c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.20.1"; + version = "4.21.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3Kx7/3IJM428KXfOPRnPK4TYnAIXVOIMl33j8n5Cw60="; + hash = "sha256-rIiue8GEeZy2tF/cjsXvX9WC9nQnZKNMykNMTeneMjo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix index e3b8069f53..645b495852 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "3.19.22"; + version = "3.20.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0rJoYbDLRqPIZpsN9Qe373Lkh9pm1h+fNXaqds4CioM="; + sha256 = "sha256-z7drXrpRSAd5ZgMAYTTMw2FDLdBhqMy42yz5EIpFQ2k="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix index 12b3815647..6cd1168e34 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.28.9"; + version = "2.28.10"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/q9YG9WASXpH/oRdUG+juRtITPcG/yd3TodlmDfemWI="; + sha256 = "sha256-l9j0CqH/4eWMNybHfWPBgtrqmnLZ8fosr96nVrKhnyw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-urllib3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-urllib3/default.nix index 0d4700d225..972ba79e6f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-urllib3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-urllib3/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-urllib3"; - version = "1.26.23"; + version = "1.26.24"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-t46Bnw41AiHQaJpWZhYuRnujkQc3uv2hS1wshem7HlY="; + hash = "sha256-obOq6n3aPrG1Fpnucjqt0jVIjk3EZI4DDwm8Qp7P9C8="; }; # Module doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ultraheat-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ultraheat-api/default.nix index 9eee34d154..71ebda7f79 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ultraheat-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ultraheat-api/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ultraheat-api"; - version = "0.4.1"; + version = "0.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "ultraheat_api"; inherit version; - hash = "sha256-6idbapqxPgA6st2ayuEiHc6WDDmsb3AJU1FnJjOukaM="; + hash = "sha256-UzDGkLvFqqiBuiCgMA0BItmUhrY0b963o05WDHxsS0Q="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unifi-discovery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unifi-discovery/default.nix index 68d28d0f47..266ae1d876 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unifi-discovery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unifi-discovery/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "unifi-discovery"; - version = "1.1.5"; + version = "1.1.6"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-WO1oLD09fokMR7lVCqs1Qeodjc+Yg431otl9rohtmPo="; + hash = "sha256-C7kCliNLqzkrOoT1oy3scLl3VNdDXwWEqaO0DlGZWmk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix index 50bbb8b6fd..81a6cf99da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "uproot"; - version = "4.3.3"; + version = "4.3.5"; # fetch from github for tests src = fetchFromGitHub { owner = "scikit-hep"; repo = "uproot4"; - rev = "refs/tags/${version}"; - sha256 = "sha256-7wc5KmnjCA90zOaq3qi5V1vvXi4tPwor8tK20i9WrTY="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-oAL4FjrNNm7xCQq275pnY/UjfAxRWgLgYBS/lCq+uwE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vulcan-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vulcan-api/default.nix index b1dc6ac48c..a9a07d738d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vulcan-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vulcan-api/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "vulcan-api"; - version = "2.1.1"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kapi2289"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-XYpQ1uqRmdqsGeKyHKGxFyXMN9HugTiPUx9tFUiGSpU="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-decp3wq/O4QTBE40iSkMaCTJYM6XPP7nLlSAEL1bemY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix index 7f0b61b375..5f745a5210 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "abmantis"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "0b7bqg4h9q9rk3hv2im903xn7jgfyf36kcv31v96ap75yrvip6wa"; + hash = "sha256-M7V+JgbaFxrijaP8znZv8tOoHGVlQmTJIdiBXK6g8LM="; }; propagatedBuildInputs = [ @@ -36,6 +36,9 @@ buildPythonPackage rec { pytestCheckHook ]; + # https://github.com/abmantis/whirlpool-sixth-sense/issues/15 + doCheck = false; + pythonImportsCheck = [ "whirlpool" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix index 7d13d6d3a6..858844023e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -1,5 +1,6 @@ { lib , bleak-retry-connector +, bluetooth-data-tools , bluetooth-sensor-state-data , buildPythonPackage , fetchFromGitHub @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.8.0"; + version = "0.9.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-HwA2NKsrqXBsC5/rUZUNfHDk8QA7I+zQmwqt0SVhw38="; + hash = "sha256-FitHVfl/N2Q9bixmJFyADBytuM3T4A/D+/36lAU9vls="; }; nativeBuildInputs = [ @@ -31,6 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ bleak-retry-connector + bluetooth-data-tools bluetooth-sensor-state-data home-assistant-bluetooth pycryptodomex diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix index 4373d9a2d0..b7a4ee39ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.39.0"; + version = "0.39.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jstasiak"; repo = "python-zeroconf"; - rev = version; - hash = "sha256-R6q5fq8P91q+qhy+lOCuoKUMFBvkKFsKLVCoqIy7Qpk="; + rev = "refs/tags/${version}"; + hash = "sha256-fIp1RLf6qpo9s5fdgFt7yid6M/Sf3hmm8MZikjCiCu0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix index 487ff10ada..241fe67605 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.78"; + version = "0.0.79"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-S54reJhzvDMOC5+N/WZ8bz8XNXH/91jAAy8gCq90MvQ="; + hash = "sha256-7qE0HLp/ehwHdwVWb0H4eCwCCTUUySAPoZewLYE/MUw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix index 3f7c7b46bf..30a08a37a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zigpy-deconz"; - version = "0.18.0"; + version = "0.18.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2M25g3iJWW6kT17P9PVAPD09E5QXuOJN75yjWsLY/cI="; + hash = "sha256-in40vbSupz0DhYZQYkGo5nUBt8sEwJ15wZCMVq4YRbA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix index 15010d80a1..bb748eaec9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.contenttype"; - version = "4.5.0"; + version = "4.6"; src = fetchPypi { inherit pname version; - sha256 = "c12d929c67ab3eaef9b8a7fba3d19cce8500c8fd25afed8058c8e15f324cbd5b"; + sha256 = "sha256-NnVoeLxSWzY2TQ1b2ZovCw/TuaUND+m73Eqxs4rCOAA="; }; checkInputs = [ zope_testrunner ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_dottedname/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_dottedname/default.nix index cbd5cd6d65..aca291669c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_dottedname/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_dottedname/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "zope.dottedname"; - version = "4.3"; + version = "5.0"; src = fetchPypi { inherit pname version; - sha256 = "0cec09844d309550359ac1941abfcd9141e213f67f3c19bb8f90360c40787576"; + sha256 = "sha256-mfWDqAKFhqtMIXlGE+QR0BDNCZF/RdqXa9/udI87++w="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix index 204ac1cfa1..1800e5a6d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.39.0"; + version = "0.41.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qKIlknxzZSHCl5KF8SRVHLB7eFc7ZEzAdzi+tlfcoPg="; + hash = "sha256-V4QEsHkakqYsZ09Q8BJG9fhREdGboirF5sNxm8t+dAQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zwave-me-ws/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zwave-me-ws/default.nix index d6241b593a..5dfc432e52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zwave-me-ws/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zwave-me-ws/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "zwave-me-ws"; - version = "0.2.5.1"; + version = "0.2.6"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Z-Wave-Me"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-BcUUDn7PCpFRtQ3QDx0W3qXB4JmvRxMFoWoCeA8bS6o="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-4c8SHTecX2E8/O7JQ19uT6MFoUVd20sjmR+oYc1ic34="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix index 5a6d885159..c266319fa3 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix @@ -361,6 +361,12 @@ in buildInputs = [ which v8 python2 ]; buildFlags = [ "--with-system-v8=true" ]; dontBuild = false; + # The gem includes broken symlinks which are ignored during unpacking, but + # then fail during build. Since the content is missing anyway, touching the + # files is enough to unblock the build. + preBuild = '' + touch vendor/depot_tools/cbuildbot vendor/depot_tools/chrome_set_ver vendor/depot_tools/cros_sdk + ''; postPatch = '' substituteInPlace ext/libv8/extconf.rb \ --replace "location = Libv8::Location::Vendor.new" \ @@ -633,7 +639,16 @@ in buildInputs = [ args.snappy ]; }; - sqlite3 = attrs: { + sqlite3 = attrs: if lib.versionAtLeast attrs.version "1.5.0" + then { + nativeBuildInputs = [ pkg-config sqlite.dev ]; + buildInputs = [ sqlite.out ]; + buildFlags = [ + "--enable-system-libraries" + "--with-pkg-config=${pkg-config}/bin/pkg-config" + ]; + } + else { buildFlags = [ "--with-sqlite3-include=${sqlite.dev}/include" "--with-sqlite3-lib=${sqlite.out}/lib" diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/jam/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/jam/default.nix index 192c27682a..2a40c59709 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/jam/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/jam/default.nix @@ -1,7 +1,9 @@ -{ lib, stdenv, fetchurl, bison, buildPackages }: +{ lib, stdenv, fetchurl, bison, buildPackages, pkgsBuildTarget }: let - mkJam = { meta ? { }, ... } @ args: stdenv.mkDerivation (args // { + mkJam = { pname, version, src, meta ? { } }: stdenv.mkDerivation { + inherit pname version src; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ bison ]; @@ -10,6 +12,23 @@ let export AR="$AR rc" ''; + # When cross-compiling, we need to set the preprocessor macros + # OSMAJOR/OSMINOR/OSPLAT to the values from the target platform, not the + # host platform. This looks a little ridiculous because the vast majority of + # build tools don't embed target-specific information into their binary, but + # in this case we behave more like a compiler than a make(1)-alike. + postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) '' + cat >>jam.h <hash_next) { - if (map_to_ns(sym->type) == map_to_ns(type) && 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 82fea2f9b5..f42c979417 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 @@ -2,42 +2,42 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.291-hardened1.patch", - "sha256": "04fkfk5kdbqavdg5syyv35xbc8dl5pz8vf1xsvfcv30z5rslsr2c", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.291-hardened1/linux-hardened-4.14.291-hardened1.patch" + "name": "linux-hardened-4.14.292-hardened1.patch", + "sha256": "0l20yxg50azpxm2x4gr37yhkvjw3wlishjm2x8pqwil3g1pxykdi", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.292-hardened1/linux-hardened-4.14.292-hardened1.patch" }, - "sha256": "15h76l81zn733g8dc6gsymf52nz325plhminv3m4x3klwhav34zc", - "version": "4.14.291" + "sha256": "0zc97qy62dhc5xkjnvsfn4lpl4dgrj23hlxvxcr4cr8sj0hxzx3h", + "version": "4.14.292" }, "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.256-hardened1.patch", - "sha256": "1vqdv2xnfr4ccnfvdrdhj7i0yjhjf48kgc9sziz7fwnfdis8zrrf", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.256-hardened1/linux-hardened-4.19.256-hardened1.patch" + "name": "linux-hardened-4.19.257-hardened1.patch", + "sha256": "03hv417v0abn6n0zbmypfsjmxb4aqdz23vrykhgn259w4h45w2z9", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.257-hardened1/linux-hardened-4.19.257-hardened1.patch" }, - "sha256": "0jgm7ydha9achbcq3a6q85wq1nz4qg7phx122jzk0mqb1339bpk7", - "version": "4.19.256" + "sha256": "0izaldl2l2zsshkd07qsnr9x6ikipmj5jp7lxr8dyz7kf2m17pga", + "version": "4.19.257" }, "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.140-hardened1.patch", - "sha256": "0352nh6r9p3djk07lprjpmd8q17kkqb5pi2zwrywlxrzws4wqhzh", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.140-hardened1/linux-hardened-5.10.140-hardened1.patch" + "name": "linux-hardened-5.10.142-hardened1.patch", + "sha256": "074w7j8wx2k3lk3ssm9x14wf4gns85l2p6syq4pigkb67gvdphpv", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.142-hardened1/linux-hardened-5.10.142-hardened1.patch" }, - "sha256": "00v8mdbc8ndx29grfnlf49ifikqxnl25zn0243j3bgclvfyxipx4", - "version": "5.10.140" + "sha256": "0s52vfvw5pgnq7gq9n66ib05ryhkxwv765f16862l5gykbdynirz", + "version": "5.10.142" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.64-hardened1.patch", - "sha256": "08hj5rx37vmw8mapzz15smpp775vrzhbfh2i0xps5qwi9majywrf", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.64-hardened1/linux-hardened-5.15.64-hardened1.patch" + "name": "linux-hardened-5.15.67-hardened1.patch", + "sha256": "1151dry0ia25rq50vnvrkjsxz5h9zsr6lahld3vilk2p01bv2fc3", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.67-hardened1/linux-hardened-5.15.67-hardened1.patch" }, - "sha256": "0l6ylmxhk3lqz2zyqcbyhbfcq1p8i84g0p1d6x0q6yd3dy6d78f6", - "version": "5.15.64" + "sha256": "0h7r2k59jsw8ykb2p7nxrpazbwx1n5p3nmfbbj1lhib91fldjiys", + "version": "5.15.67" }, "5.18": { "patch": { @@ -52,21 +52,21 @@ "5.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.19.6-hardened1.patch", - "sha256": "1lx4li0f0j6wmh3p75hr2qa780ckybhma8s34p6xlbvxz054ncpr", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.19.6-hardened1/linux-hardened-5.19.6-hardened1.patch" + "name": "linux-hardened-5.19.8-hardened1.patch", + "sha256": "1j7wg4hq06drxr42jl89za1f7x52d4ck5i38p4njz4j415ihsiys", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.19.8-hardened1/linux-hardened-5.19.8-hardened1.patch" }, - "sha256": "0fm6xysg5mjfig0jils700ph83mvvkl27ix757260i31mwjgi921", - "version": "5.19.6" + "sha256": "1kl7fifsa6vsm34xg3kd2svhx18n771hfj67nhwnlalmb9whhqv1", + "version": "5.19.8" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.211-hardened1.patch", - "sha256": "061c1c3ha88798l9q3n2dd3ankvw0hlz8f8cisxljpzfj4napk8z", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.211-hardened1/linux-hardened-5.4.211-hardened1.patch" + "name": "linux-hardened-5.4.212-hardened1.patch", + "sha256": "0vdx78n1aggyfia017h40k6xg7bd2spcv3s4m0kiq693skxzlh4x", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.212-hardened1/linux-hardened-5.4.212-hardened1.patch" }, - "sha256": "1v1dgsk66fi6x6v9k6hg9ik3f3b3pv7a3gk8mybmgm9cnx0k5d5z", - "version": "5.4.211" + "sha256": "1hngr4hsrcd6hmlyvc3msy5racniav2jagp5abmp7xsxv0yjxiq9", + "version": "5.4.212" } } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix index cbcb2d04de..71eaa0b5c2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.291"; + version = "4.14.292"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "15h76l81zn733g8dc6gsymf52nz325plhminv3m4x3klwhav34zc"; + sha256 = "0zc97qy62dhc5xkjnvsfn4lpl4dgrj23hlxvxcr4cr8sj0hxzx3h"; }; } // (args.argsOverride or {})) 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 d1923b847e..8dac0b120a 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.256"; + version = "4.19.257"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0jgm7ydha9achbcq3a6q85wq1nz4qg7phx122jzk0mqb1339bpk7"; + sha256 = "0izaldl2l2zsshkd07qsnr9x6ikipmj5jp7lxr8dyz7kf2m17pga"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix index 4fc1ce1f1e..c435a82c50 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.326"; + version = "4.9.327"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0yw83a8nk5abjsvqrz8m2sj699c228j2f2wr5q8m95vgqzfw5wrb"; + sha256 = "1lh63viynf9f7vl0a52mnal8jack9lbqfsfammwkxi3kafpw30r2"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix index 3a08b4a0a4..f17beabecd 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.140"; + version = "5.10.142"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "00v8mdbc8ndx29grfnlf49ifikqxnl25zn0243j3bgclvfyxipx4"; + sha256 = "0s52vfvw5pgnq7gq9n66ib05ryhkxwv765f16862l5gykbdynirz"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix index 8e0edd8273..9b98bb0e4c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.64"; + version = "5.15.67"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0l6ylmxhk3lqz2zyqcbyhbfcq1p8i84g0p1d6x0q6yd3dy6d78f6"; + sha256 = "0h7r2k59jsw8ykb2p7nxrpazbwx1n5p3nmfbbj1lhib91fldjiys"; }; } // (args.argsOverride or { })) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.19.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.19.nix index 42fd32716d..a6fb0aa1f5 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.19.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.19.6"; + version = "5.19.8"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0fm6xysg5mjfig0jils700ph83mvvkl27ix757260i31mwjgi921"; + sha256 = "1kl7fifsa6vsm34xg3kd2svhx18n771hfj67nhwnlalmb9whhqv1"; }; } // (args.argsOverride or { })) 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 f08433e50b..f341bc77d4 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.211"; + version = "5.4.212"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1v1dgsk66fi6x6v9k6hg9ik3f3b3pv7a3gk8mybmgm9cnx0k5d5z"; + sha256 = "1hngr4hsrcd6hmlyvc3msy5racniav2jagp5abmp7xsxv0yjxiq9"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix index 437366d1f6..6de38abd07 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18885"; - sha256 = "1ywd4bhjh6pqxvv20jgadmyvrcrdwf8333z8rzbjy6r0b4fggpra"; + rev = "18904"; + sha256 = "1l200abijg5y15h4vza86sirlcplm7iyhm3igdyxqj3s0169nck9"; } , ... }: diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 58be2be6e9..8b66df9d82 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.131-rt72"; # updated by ./update-rt.sh + version = "5.10.140-rt73"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1ki11mvl3dky7iih90znr47vr66dxnlwrqwg2jkk1hqn5i243i4b"; + sha256 = "00v8mdbc8ndx29grfnlf49ifikqxnl25zn0243j3bgclvfyxipx4"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0ag000h9m7phvgrqa4jcmd94x0rk8z8bh7qhqqlywbiz2b1b91qa"; + sha256 = "1abrxwxx3kfmbyabb1hhjpz1l7idrn2g14zx7qix7ds7n9f6dcgf"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/mac-nvme-t2.patch b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/mac-nvme-t2.patch deleted file mode 100644 index 2f1fa6a0da..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/mac-nvme-t2.patch +++ /dev/null @@ -1,283 +0,0 @@ -diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c -index dd10cf78f2d3..8f006638452b 100644 ---- a/drivers/nvme/host/pci.c -+++ b/drivers/nvme/host/pci.c -@@ -28,8 +28,8 @@ - #include "trace.h" - #include "nvme.h" - --#define SQ_SIZE(depth) (depth * sizeof(struct nvme_command)) --#define CQ_SIZE(depth) (depth * sizeof(struct nvme_completion)) -+#define SQ_SIZE(q) ((q)->q_depth * sizeof(struct nvme_command)) -+#define CQ_SIZE(q) ((q)->q_depth * sizeof(struct nvme_completion)) - - #define SGES_PER_PAGE (PAGE_SIZE / sizeof(struct nvme_sgl_desc)) - -@@ -1344,16 +1344,16 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved) - - static void nvme_free_queue(struct nvme_queue *nvmeq) - { -- dma_free_coherent(nvmeq->dev->dev, CQ_SIZE(nvmeq->q_depth), -+ dma_free_coherent(nvmeq->dev->dev, CQ_SIZE(nvmeq), - (void *)nvmeq->cqes, nvmeq->cq_dma_addr); - if (!nvmeq->sq_cmds) - return; - - if (test_and_clear_bit(NVMEQ_SQ_CMB, &nvmeq->flags)) { - pci_free_p2pmem(to_pci_dev(nvmeq->dev->dev), -- nvmeq->sq_cmds, SQ_SIZE(nvmeq->q_depth)); -+ nvmeq->sq_cmds, SQ_SIZE(nvmeq)); - } else { -- dma_free_coherent(nvmeq->dev->dev, SQ_SIZE(nvmeq->q_depth), -+ dma_free_coherent(nvmeq->dev->dev, SQ_SIZE(nvmeq), - nvmeq->sq_cmds, nvmeq->sq_dma_addr); - } - } -@@ -1433,12 +1433,12 @@ static int nvme_cmb_qdepth(struct nvme_dev *dev, int nr_io_queues, - } - - static int nvme_alloc_sq_cmds(struct nvme_dev *dev, struct nvme_queue *nvmeq, -- int qid, int depth) -+ int qid) - { - struct pci_dev *pdev = to_pci_dev(dev->dev); - - if (qid && dev->cmb_use_sqes && (dev->cmbsz & NVME_CMBSZ_SQS)) { -- nvmeq->sq_cmds = pci_alloc_p2pmem(pdev, SQ_SIZE(depth)); -+ nvmeq->sq_cmds = pci_alloc_p2pmem(pdev, SQ_SIZE(nvmeq)); - if (nvmeq->sq_cmds) { - nvmeq->sq_dma_addr = pci_p2pmem_virt_to_bus(pdev, - nvmeq->sq_cmds); -@@ -1447,11 +1447,11 @@ static int nvme_alloc_sq_cmds(struct nvme_dev *dev, struct nvme_queue *nvmeq, - return 0; - } - -- pci_free_p2pmem(pdev, nvmeq->sq_cmds, SQ_SIZE(depth)); -+ pci_free_p2pmem(pdev, nvmeq->sq_cmds, SQ_SIZE(nvmeq)); - } - } - -- nvmeq->sq_cmds = dma_alloc_coherent(dev->dev, SQ_SIZE(depth), -+ nvmeq->sq_cmds = dma_alloc_coherent(dev->dev, SQ_SIZE(nvmeq), - &nvmeq->sq_dma_addr, GFP_KERNEL); - if (!nvmeq->sq_cmds) - return -ENOMEM; -@@ -1465,12 +1465,13 @@ static int nvme_alloc_queue(struct nvme_dev *dev, int qid, int depth) - if (dev->ctrl.queue_count > qid) - return 0; - -- nvmeq->cqes = dma_alloc_coherent(dev->dev, CQ_SIZE(depth), -+ nvmeq->q_depth = depth; -+ nvmeq->cqes = dma_alloc_coherent(dev->dev, CQ_SIZE(nvmeq), - &nvmeq->cq_dma_addr, GFP_KERNEL); - if (!nvmeq->cqes) - goto free_nvmeq; - -- if (nvme_alloc_sq_cmds(dev, nvmeq, qid, depth)) -+ if (nvme_alloc_sq_cmds(dev, nvmeq, qid)) - goto free_cqdma; - - nvmeq->dev = dev; -@@ -1479,15 +1480,14 @@ static int nvme_alloc_queue(struct nvme_dev *dev, int qid, int depth) - nvmeq->cq_head = 0; - nvmeq->cq_phase = 1; - nvmeq->q_db = &dev->dbs[qid * 2 * dev->db_stride]; -- nvmeq->q_depth = depth; - nvmeq->qid = qid; - dev->ctrl.queue_count++; - - return 0; - - free_cqdma: -- dma_free_coherent(dev->dev, CQ_SIZE(depth), (void *)nvmeq->cqes, -- nvmeq->cq_dma_addr); -+ dma_free_coherent(dev->dev, CQ_SIZE(nvmeq), (void *)nvmeq->cqes, -+ nvmeq->cq_dma_addr); - free_nvmeq: - return -ENOMEM; - } -@@ -1515,7 +1515,7 @@ static void nvme_init_queue(struct nvme_queue *nvmeq, u16 qid) - nvmeq->cq_head = 0; - nvmeq->cq_phase = 1; - nvmeq->q_db = &dev->dbs[qid * 2 * dev->db_stride]; -- memset((void *)nvmeq->cqes, 0, CQ_SIZE(nvmeq->q_depth)); -+ memset((void *)nvmeq->cqes, 0, CQ_SIZE(nvmeq)); - nvme_dbbuf_init(dev, nvmeq, qid); - dev->online_queues++; - wmb(); /* ensure the first interrupt sees the initialization */ -diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index cc09b81fc7f4..716ebe87a2b8 100644 ---- a/drivers/nvme/host/core.c -+++ b/drivers/nvme/host/core.c -@@ -1986,6 +1986,7 @@ int nvme_enable_ctrl(struct nvme_ctrl *ctrl, u64 cap) - ctrl->ctrl_config = NVME_CC_CSS_NVM; - ctrl->ctrl_config |= (page_shift - 12) << NVME_CC_MPS_SHIFT; - ctrl->ctrl_config |= NVME_CC_AMS_RR | NVME_CC_SHN_NONE; -+ /* Use default IOSQES. We'll update it later if needed */ - ctrl->ctrl_config |= NVME_CC_IOSQES | NVME_CC_IOCQES; - ctrl->ctrl_config |= NVME_CC_ENABLE; - -@@ -2698,6 +2699,30 @@ int nvme_init_identify(struct nvme_ctrl *ctrl) - ctrl->hmmin = le32_to_cpu(id->hmmin); - ctrl->hmminds = le32_to_cpu(id->hmminds); - ctrl->hmmaxd = le16_to_cpu(id->hmmaxd); -+ -+ /* Grab required IO queue size */ -+ ctrl->iosqes = id->sqes & 0xf; -+ if (ctrl->iosqes < NVME_NVM_IOSQES) { -+ dev_err(ctrl->device, -+ "unsupported required IO queue size %d\n", ctrl->iosqes); -+ ret = -EINVAL; -+ goto out_free; -+ } -+ /* -+ * If our IO queue size isn't the default, update the setting -+ * in CC:IOSQES. -+ */ -+ if (ctrl->iosqes != NVME_NVM_IOSQES) { -+ ctrl->ctrl_config &= ~(0xfu << NVME_CC_IOSQES_SHIFT); -+ ctrl->ctrl_config |= ctrl->iosqes << NVME_CC_IOSQES_SHIFT; -+ ret = ctrl->ops->reg_write32(ctrl, NVME_REG_CC, -+ ctrl->ctrl_config); -+ if (ret) { -+ dev_err(ctrl->device, -+ "error updating CC register\n"); -+ goto out_free; -+ } -+ } - } - - ret = nvme_mpath_init(ctrl, id); -diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h -index 716a876119c8..34ef35fcd8a5 100644 ---- a/drivers/nvme/host/nvme.h -+++ b/drivers/nvme/host/nvme.h -@@ -244,6 +244,7 @@ struct nvme_ctrl { - u32 hmmin; - u32 hmminds; - u16 hmmaxd; -+ u8 iosqes; - - /* Fabrics only */ - u16 sqsize; -diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c -index 8f006638452b..54b35ea4af88 100644 ---- a/drivers/nvme/host/pci.c -+++ b/drivers/nvme/host/pci.c -@@ -28,7 +28,7 @@ - #include "trace.h" - #include "nvme.h" - --#define SQ_SIZE(q) ((q)->q_depth * sizeof(struct nvme_command)) -+#define SQ_SIZE(q) ((q)->q_depth << (q)->sqes) - #define CQ_SIZE(q) ((q)->q_depth * sizeof(struct nvme_completion)) - - #define SGES_PER_PAGE (PAGE_SIZE / sizeof(struct nvme_sgl_desc)) -@@ -162,7 +162,7 @@ static inline struct nvme_dev *to_nvme_dev(struct nvme_ctrl *ctrl) - struct nvme_queue { - struct nvme_dev *dev; - spinlock_t sq_lock; -- struct nvme_command *sq_cmds; -+ void *sq_cmds; - /* only used for poll queues: */ - spinlock_t cq_poll_lock ____cacheline_aligned_in_smp; - volatile struct nvme_completion *cqes; -@@ -178,6 +178,7 @@ struct nvme_queue { - u16 last_cq_head; - u16 qid; - u8 cq_phase; -+ u8 sqes; - unsigned long flags; - #define NVMEQ_ENABLED 0 - #define NVMEQ_SQ_CMB 1 -@@ -488,7 +489,8 @@ static void nvme_submit_cmd(struct nvme_queue *nvmeq, struct nvme_command *cmd, - bool write_sq) - { - spin_lock(&nvmeq->sq_lock); -- memcpy(&nvmeq->sq_cmds[nvmeq->sq_tail], cmd, sizeof(*cmd)); -+ memcpy(nvmeq->sq_cmds + (nvmeq->sq_tail << nvmeq->sqes), -+ cmd, sizeof(*cmd)); - if (++nvmeq->sq_tail == nvmeq->q_depth) - nvmeq->sq_tail = 0; - nvme_write_sq_db(nvmeq, write_sq); -@@ -1465,6 +1467,7 @@ static int nvme_alloc_queue(struct nvme_dev *dev, int qid, int depth) - if (dev->ctrl.queue_count > qid) - return 0; - -+ nvmeq->sqes = qid ? dev->ctrl.iosqes : NVME_NVM_ADMSQES; - nvmeq->q_depth = depth; - nvmeq->cqes = dma_alloc_coherent(dev->dev, CQ_SIZE(nvmeq), - &nvmeq->cq_dma_addr, GFP_KERNEL); -diff --git a/include/linux/nvme.h b/include/linux/nvme.h -index 01aa6a6c241d..7af18965fb57 100644 ---- a/include/linux/nvme.h -+++ b/include/linux/nvme.h -@@ -141,6 +141,7 @@ enum { - * (In bytes and specified as a power of two (2^n)). - */ - #define NVME_NVM_IOSQES 6 -+#define NVME_NVM_ADMSQES 6 - #define NVME_NVM_IOCQES 4 - - enum { -diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 716ebe87a2b8..480ea24d8cf4 100644 ---- a/drivers/nvme/host/core.c -+++ b/drivers/nvme/host/core.c -@@ -2701,7 +2701,10 @@ int nvme_init_identify(struct nvme_ctrl *ctrl) - ctrl->hmmaxd = le16_to_cpu(id->hmmaxd); - - /* Grab required IO queue size */ -- ctrl->iosqes = id->sqes & 0xf; -+ if (ctrl->quirks & NVME_QUIRK_128_BYTES_SQES) -+ ctrl->iosqes = 7; -+ else -+ ctrl->iosqes = id->sqes & 0xf; - if (ctrl->iosqes < NVME_NVM_IOSQES) { - dev_err(ctrl->device, - "unsupported required IO queue size %d\n", ctrl->iosqes); -diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h -index 34ef35fcd8a5..b2a78d08b984 100644 ---- a/drivers/nvme/host/nvme.h -+++ b/drivers/nvme/host/nvme.h -@@ -92,6 +92,16 @@ enum nvme_quirks { - * Broken Write Zeroes. - */ - NVME_QUIRK_DISABLE_WRITE_ZEROES = (1 << 9), -+ -+ /* -+ * Use only one interrupt vector for all queues -+ */ -+ NVME_QUIRK_SINGLE_VECTOR = (1 << 10), -+ -+ /* -+ * Use non-standard 128 bytes SQEs. -+ */ -+ NVME_QUIRK_128_BYTES_SQES = (1 << 11), - }; - - /* -diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c -index 54b35ea4af88..ab2358137419 100644 ---- a/drivers/nvme/host/pci.c -+++ b/drivers/nvme/host/pci.c -@@ -2080,6 +2080,9 @@ static int nvme_setup_irqs(struct nvme_dev *dev, unsigned int nr_io_queues) - dev->io_queues[HCTX_TYPE_DEFAULT] = 1; - dev->io_queues[HCTX_TYPE_READ] = 0; - -+ if (dev->ctrl.quirks & NVME_QUIRK_SINGLE_VECTOR) -+ irq_queues = 1; -+ - return pci_alloc_irq_vectors_affinity(pdev, 1, irq_queues, - PCI_IRQ_ALL_TYPES | PCI_IRQ_AFFINITY, &affd); - } -@@ -3037,6 +3040,9 @@ static const struct pci_device_id nvme_id_table[] = { - { PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) }, - { PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001) }, - { PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2003) }, -+ { PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2005), -+ .driver_data = NVME_QUIRK_SINGLE_VECTOR | -+ NVME_QUIRK_128_BYTES_SQES }, - { 0, } - }; - MODULE_DEVICE_TABLE(pci, nvme_id_table); diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/p9-fixes.patch b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/p9-fixes.patch deleted file mode 100644 index f6061b6066..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/p9-fixes.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c ---- a/fs/9p/vfs_inode.c -+++ b/fs/9p/vfs_inode.c -@@ -483,6 +483,9 @@ static int v9fs_test_inode(struct inode *inode, void *data) - - if (v9inode->qid.type != st->qid.type) - return 0; -+ -+ if (v9inode->qid.path != st->qid.path) -+ return 0; - return 1; - } - -diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c ---- a/fs/9p/vfs_inode_dotl.c -+++ b/fs/9p/vfs_inode_dotl.c -@@ -87,6 +87,9 @@ static int v9fs_test_inode_dotl(struct inode *inode, void *data) - - if (v9inode->qid.type != st->qid.type) - return 0; -+ -+ if (v9inode->qid.path != st->qid.path) -+ return 0; - return 1; - } - -diff --git a/net/9p/client.c b/net/9p/client.c -index 3ce672af1596..f1c8ad373f90 100644 ---- a/net/9p/client.c -+++ b/net/9p/client.c -@@ -749,8 +749,7 @@ p9_client_rpc(struct p9_client *c, int8_t type, const char *fmt, ...) - } - again: - /* Wait for the response */ -- err = wait_event_interruptible(*req->wq, -- req->status >= REQ_STATUS_RCVD); -+ err = wait_event_killable(*req->wq, req->status >= REQ_STATUS_RCVD); - - /* - * Make sure our req is coherent with regard to updates in other -diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c -index f24b25c25106..f3a4efcf1456 100644 ---- a/net/9p/trans_virtio.c -+++ b/net/9p/trans_virtio.c -@@ -286,8 +286,8 @@ p9_virtio_request(struct p9_client *client, struct p9_req_t *req) - if (err == -ENOSPC) { - chan->ring_bufs_avail = 0; - spin_unlock_irqrestore(&chan->lock, flags); -- err = wait_event_interruptible(*chan->vc_wq, -- chan->ring_bufs_avail); -+ err = wait_event_killable(*chan->vc_wq, -+ chan->ring_bufs_avail); - if (err == -ERESTARTSYS) - return err; - -@@ -327,7 +327,7 @@ static int p9_get_mapped_pages(struct virtio_chan *chan, - * Other zc request to finish here - */ - if (atomic_read(&vp_pinned) >= chan->p9_max_pages) { -- err = wait_event_interruptible(vp_wq, -+ err = wait_event_killable(vp_wq, - (atomic_read(&vp_pinned) < chan->p9_max_pages)); - if (err == -ERESTARTSYS) - return err; -@@ -471,8 +471,8 @@ p9_virtio_zc_request(struct p9_client *client, struct p9_req_t *req, - if (err == -ENOSPC) { - chan->ring_bufs_avail = 0; - spin_unlock_irqrestore(&chan->lock, flags); -- err = wait_event_interruptible(*chan->vc_wq, -- chan->ring_bufs_avail); -+ err = wait_event_killable(*chan->vc_wq, -+ chan->ring_bufs_avail); - if (err == -ERESTARTSYS) - goto err_out; - -@@ -489,8 +489,7 @@ p9_virtio_zc_request(struct p9_client *client, struct p9_req_t *req, - virtqueue_kick(chan->vq); - spin_unlock_irqrestore(&chan->lock, flags); - p9_debug(P9_DEBUG_TRANS, "virtio request kicked\n"); -- err = wait_event_interruptible(*req->wq, -- req->status >= REQ_STATUS_RCVD); -+ err = wait_event_killable(*req->wq, req->status >= REQ_STATUS_RCVD); - /* - * Non kernel buffers are pinned, unpin them - */ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix index f64a0a0ef1..f941ca9f00 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix @@ -29,21 +29,11 @@ patch = ./request-key-helper-updated.patch; }; - p9_fixes = - { name = "p9-fixes"; - patch = ./p9-fixes.patch; - }; - modinst_arg_list_too_long = { name = "modinst-arglist-too-long"; patch = ./modinst-arg-list-too-long.patch; }; - genksyms_fix_segfault = - { name = "genksyms-fix-segfault"; - patch = ./genksyms-fix-segfault.patch; - }; - cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches; hardened = let @@ -56,36 +46,6 @@ patches = lib.importJSON ./hardened/patches.json; in lib.mapAttrs mkPatch patches; - # https://bugzilla.kernel.org/show_bug.cgi?id=197591#c6 - iwlwifi_mvm_support_version_7_scan_req_umac_fw_command = rec { - name = "iwlwifi_mvm_support_version_7_scan_req_umac_fw_command"; - patch = fetchpatch { - name = name + ".patch"; - url = "https://bugzilla.kernel.org/attachment.cgi?id=260597"; - sha256 = "09096npxpgvlwdz3pb3m9brvxh7vy0xc9z9p8hh85xyczyzcsjhr"; - }; - }; - - # https://github.com/NixOS/nixpkgs/issues/42755 - xen-netfront_fix_mismatched_rtnl_unlock = rec { - name = "xen-netfront_fix_mismatched_rtnl_unlock"; - patch = fetchpatch { - name = name + ".patch"; - url = "https://github.com/torvalds/linux/commit/cb257783c2927b73614b20f915a91ff78aa6f3e8.patch"; - sha256 = "0xhblx2j8wi3kpnfpgjjwlcwdry97ji2aaq54r3zirk5g5p72zs8"; - }; - }; - - # https://github.com/NixOS/nixpkgs/issues/42755 - xen-netfront_update_features_after_registering_netdev = rec { - name = "xen-netfront_update_features_after_registering_netdev"; - patch = fetchpatch { - name = name + ".patch"; - url = "https://github.com/torvalds/linux/commit/45c8184c1bed1ca8a7f02918552063a00b909bf5.patch"; - sha256 = "1l8xq02rd7vakxg52xm9g4zng0ald866rpgm8kjlh88mwwyjkrwv"; - }; - }; - # Adapted for Linux 5.4 from: # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=04896832c94aae4842100cafb8d3a73e1bed3a45 rtl8761b_support = @@ -97,10 +57,4 @@ name = "export-rt-sched-migrate"; patch = ./export-rt-sched-migrate.patch; }; - - # patches from https://lkml.org/lkml/2019/7/15/1748 - mac_nvme_t2 = rec { - name = "mac_nvme_t2"; - patch = ./mac-nvme-t2.patch; - }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/open-isns/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/open-isns/default.nix index 3f939024a4..7afe13eea8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/open-isns/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/open-isns/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "open-isns"; - version = "0.101"; + version = "0.102"; src = fetchFromGitHub { owner = "open-iscsi"; repo = "open-isns"; rev = "v${version}"; - sha256 = "1g7kp1j2f8afsach6sbl4k05ybz1yz2s8yg073bv4gnv48gyxb2p"; + sha256 = "sha256-Vz6VqqvEr0f8AdN9NcVnruapswmoOgvAXxXSfrM3yRA="; }; propagatedBuildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix index 0b4acc4440..95e6850f89 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix @@ -24,14 +24,14 @@ assert (!libsOnly) -> kernel != null; stdenv.mkDerivation rec { - version = "18.0.0-53049"; + version = "18.0.1-53056"; pname = "prl-tools"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso src = fetchurl { url = "https://download.parallels.com/desktop/v${lib.versions.major version}/${version}/ParallelsDesktop-${version}.dmg"; - sha256 = "sha256-MGiqCvOsu/sKz6JHJFGP5bT12XYnm2kTMdOiflg9ses="; + sha256 = "sha256-igIRWLKbgU8pQrsK+lyjP8aodylXjRrRlOlaP5KbHm8="; }; hardeningDisable = [ "pic" "format" ]; diff --git a/third_party/nixpkgs/pkgs/servers/dns/coredns/default.nix b/third_party/nixpkgs/pkgs/servers/dns/coredns/default.nix index 54965fd998..208c59a3cc 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/coredns/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/coredns/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "coredns"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "coredns"; repo = "coredns"; rev = "v${version}"; - sha256 = "sha256-9lRZjY85SD1HXAWVCp8fpzV0d1Y+LbodT3Sp21CNp+k="; + sha256 = "sha256-9+DwOSfhX+sNnvLMgHKUQSozXzT9k8u7Q1p8FvbvsTE="; }; - vendorSha256 = "sha256-gNa+dm7n71IiSCztTO5VZ5FnGTGYfNXo/HMichNzek0="; + vendorSha256 = "sha256-L4GzOY7oZlC3Et/kEBXrrQGt5/c3jHZimY7NnjXYSro="; postPatch = '' substituteInPlace test/file_cname_proxy_test.go \ 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 740642de51..2efbd6a5bf 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 = "2022.8.7"; + version = "2022.9.1"; components = { "abode" = ps: with ps; [ abodepy @@ -85,7 +85,6 @@ boto3 ]; "ambee" = ps: with ps; [ - aiohttp-cors ambee ]; "amberelectric" = ps: with ps; [ @@ -124,7 +123,6 @@ "anel_pwrctrl" = ps: with ps; [ ]; # missing inputs: anel_pwrctrl-homeassistant "anthemav" = ps: with ps; [ - aiohttp-cors ]; # missing inputs: anthemav "apache_kafka" = ps: with ps; [ aiokafka @@ -193,6 +191,13 @@ pyatome ]; "august" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev + yalexs-ble yalexs ]; "aurora" = ps: with ps; [ @@ -277,6 +282,15 @@ ]; # missing inputs: python-blockchain-api "bloomsky" = ps: with ps; [ ]; + "bluemaestro" = ps: with ps; [ + aiohttp-cors + bleak + bluemaestro-ble + bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev + ]; "blueprint" = ps: with ps; [ ]; "bluesound" = ps: with ps; [ @@ -286,11 +300,17 @@ aiohttp-cors bleak bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev ]; "bluetooth_le_tracker" = ps: with ps; [ aiohttp-cors bleak bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev ]; "bluetooth_tracker" = ps: with ps; [ bt-proximity @@ -309,8 +329,7 @@ zeroconf ]; "braviatv" = ps: with ps; [ - bravia-tv - ]; + ]; # missing inputs: pybravia "broadlink" = ps: with ps; [ broadlink ]; @@ -332,6 +351,15 @@ ]; # missing inputs: bthomehub5-devicelist "bt_smarthub" = ps: with ps; [ ]; # missing inputs: btsmarthub_devicelist + "bthome" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + bluetooth-auto-recovery + bthome-ble + pyserial + pyudev + ]; "buienradar" = ps: with ps; [ buienradar ]; @@ -498,11 +526,13 @@ async-upnp-client bleak bluetooth-adapters + bluetooth-auto-recovery fnvhash hass-nabucasa home-assistant-frontend ifaddr pillow + psutil-home-assistant pyserial pyudev scapy @@ -657,7 +687,10 @@ pyeconet ]; "ecovacs" = ps: with ps; [ - ]; # missing inputs: sucks + ]; # missing inputs: py-sucks + "ecowitt" = ps: with ps; [ + aioecowitt + ]; "eddystone_temperature" = ps: with ps; [ construct ]; # missing inputs: beacontools @@ -750,12 +783,23 @@ aiohttp-cors bleak bluetooth-adapters + bluetooth-auto-recovery construct + pyserial + pyudev ]; # missing inputs: python-eq3bt + "escea" = ps: with ps; [ + pescea + ]; "esphome" = ps: with ps; [ aioesphomeapi aiohttp-cors + bleak + bluetooth-adapters + bluetooth-auto-recovery ifaddr + pyserial + pyudev zeroconf ]; "etherscan" = ps: with ps; [ @@ -812,6 +856,9 @@ "file" = ps: with ps; [ file-read-backwards ]; + "file_upload" = ps: with ps; [ + aiohttp-cors + ]; "filesize" = ps: with ps; [ ]; "filter" = ps: with ps; [ @@ -841,7 +888,10 @@ aiohttp-cors bleak bluetooth-adapters + bluetooth-auto-recovery fjaraskupan + pyserial + pyudev ]; "fleetgo" = ps: with ps; [ ritassist @@ -867,7 +917,6 @@ pyflume ]; "flunearyou" = ps: with ps; [ - aiohttp-cors pyflunearyou ]; "flux" = ps: with ps; [ @@ -934,6 +983,8 @@ "frontier_silicon" = ps: with ps; [ afsapi ]; + "fully_kiosk" = ps: with ps; [ + ]; # missing inputs: python-fullykiosk "futurenow" = ps: with ps; [ pyfnip ]; @@ -1038,7 +1089,10 @@ aiohttp-cors bleak bluetooth-adapters + bluetooth-auto-recovery govee-ble + pyserial + pyudev ]; "gpsd" = ps: with ps; [ gps3 @@ -1082,9 +1136,11 @@ fnvhash home-assistant-frontend pillow + psutil-home-assistant sqlalchemy ]; "hardware" = ps: with ps; [ + psutil-home-assistant ]; "harman_kardon_avr" = ps: with ps; [ hkavr @@ -1150,13 +1206,19 @@ "homeassistant" = ps: with ps; [ ]; "homeassistant_alerts" = ps: with ps; [ + ]; + "homeassistant_sky_connect" = ps: with ps; [ aiohttp-cors + psutil-home-assistant + pyserial + pyudev ]; "homeassistant_yellow" = ps: with ps; [ aiohttp-cors fnvhash home-assistant-frontend pillow + psutil-home-assistant sqlalchemy ]; "homekit" = ps: with ps; [ @@ -1175,7 +1237,10 @@ aiohttp-cors bleak bluetooth-adapters + bluetooth-auto-recovery ifaddr + pyserial + pyudev zeroconf ]; "homematic" = ps: with ps; [ @@ -1279,7 +1344,10 @@ aiohttp-cors bleak bluetooth-adapters + bluetooth-auto-recovery inkbird-ble + pyserial + pyudev ]; "input_boolean" = ps: with ps; [ ]; @@ -1365,6 +1433,9 @@ "juicenet" = ps: with ps; [ python-juicenet ]; + "justnimbus" = ps: with ps; [ + justnimbus + ]; "kaiterra" = ps: with ps; [ ]; # missing inputs: kaiterra-async-client "kaleidescape" = ps: with ps; [ @@ -1420,8 +1491,13 @@ "lacrosse" = ps: with ps; [ pylacrosse ]; + "lacrosse_view" = ps: with ps; [ + ]; # missing inputs: lacrosse-view "lametric" = ps: with ps; [ - lmnotify + aiohttp-cors + ]; # missing inputs: demetriek + "landisgyr_heat_meter" = ps: with ps; [ + ultraheat-api ]; "lannouncer" = ps: with ps; [ ]; @@ -1437,6 +1513,15 @@ "lcn" = ps: with ps; [ pypck ]; + "led_ble" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + bluetooth-auto-recovery + led-ble + pyserial + pyudev + ]; "lg_netcast" = ps: with ps; [ pylgnetcast ]; @@ -1448,7 +1533,6 @@ ]; "lifx" = ps: with ps; [ aiohttp-cors - aiolifx-connection aiolifx aiolifx-effects ifaddr @@ -1594,6 +1678,14 @@ ]; "melissa" = ps: with ps; [ ]; # missing inputs: py-melissa-climate + "melnor" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev + ]; # missing inputs: melnor-bluetooth "meraki" = ps: with ps; [ aiohttp-cors ]; @@ -1635,7 +1727,6 @@ aiohttp-cors ]; "miflora" = ps: with ps; [ - aiohttp-cors ]; "mikrotik" = ps: with ps; [ librouteros @@ -1655,7 +1746,6 @@ minio ]; "mitemp_bt" = ps: with ps; [ - aiohttp-cors ]; "mjpeg" = ps: with ps; [ ]; @@ -1663,7 +1753,10 @@ aiohttp-cors bleak bluetooth-adapters + bluetooth-auto-recovery moat-ble + pyserial + pyudev ]; "mobile_app" = ps: with ps; [ pynacl @@ -1943,7 +2036,6 @@ "openalpr_cloud" = ps: with ps; [ ]; "openalpr_local" = ps: with ps; [ - aiohttp-cors ]; "opencv" = ps: with ps; [ numpy @@ -1955,6 +2047,7 @@ openevsewifi ]; "openexchangerates" = ps: with ps; [ + aioopenexchangerates ]; "opengarage" = ps: with ps; [ open-garage @@ -2125,6 +2218,8 @@ "proxy" = ps: with ps; [ pillow ]; + "prusalink" = ps: with ps; [ + ]; # missing inputs: pyprusalink "ps4" = ps: with ps; [ ]; # missing inputs: pyps4-2ndscreen "pulseaudio_loopback" = ps: with ps; [ @@ -2157,6 +2252,15 @@ ]; "qbittorrent" = ps: with ps; [ ]; # missing inputs: python-qbittorrent + "qingping" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev + qingping-ble + ]; "qld_bushfire" = ps: with ps; [ georss-qld-bushfire-alert-client ]; @@ -2190,7 +2294,6 @@ radios ]; "radiotherm" = ps: with ps; [ - aiohttp-cors radiotherm ]; "rainbird" = ps: with ps; [ @@ -2213,6 +2316,7 @@ fnvhash home-assistant-frontend pillow + psutil-home-assistant sqlalchemy ]; "raspyrfm" = ps: with ps; [ @@ -2355,6 +2459,8 @@ ]; # missing inputs: satel_integra "scene" = ps: with ps; [ ]; + "schedule" = ps: with ps; [ + ]; "schluter" = ps: with ps; [ ]; # missing inputs: py-schluter "scrape" = ps: with ps; [ @@ -2394,10 +2500,22 @@ fnvhash sqlalchemy ]; + "sensorpro" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev + sensorpro-ble + ]; "sensorpush" = ps: with ps; [ aiohttp-cors bleak bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev sensorpush-ble ]; "sentry" = ps: with ps; [ @@ -2451,7 +2569,6 @@ pysignalclirestapi ]; "simplepush" = ps: with ps; [ - aiohttp-cors ]; # missing inputs: simplepush "simplisafe" = ps: with ps; [ simplisafe-python @@ -2566,7 +2683,6 @@ pysdcp ]; "soundtouch" = ps: with ps; [ - aiohttp-cors libsoundtouch ]; "spaceapi" = ps: with ps; [ @@ -2618,7 +2734,6 @@ statsd ]; "steam_online" = ps: with ps; [ - aiohttp-cors steamodd ]; "steamist" = ps: with ps; [ @@ -2675,6 +2790,9 @@ aiohttp-cors bleak bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev ]; "switcher_kis" = ps: with ps; [ aioswitcher @@ -2771,6 +2889,24 @@ ]; "tfiac" = ps: with ps; [ ]; # missing inputs: pytfiac + "thermobeacon" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev + thermobeacon-ble + ]; + "thermopro" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev + thermopro-ble + ]; "thermoworks_smoke" = ps: with ps; [ stringcase ]; # missing inputs: thermoworks_smoke @@ -2956,7 +3092,6 @@ pyudev ]; "uscis" = ps: with ps; [ - aiohttp-cors ]; # missing inputs: uscisstatus "usgs_earthquakes_feed" = ps: with ps; [ aio-geojson-usgs-earthquakes @@ -3146,6 +3281,9 @@ aiohttp-cors bleak bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev xiaomi-ble ]; "xiaomi_miio" = ps: with ps; [ @@ -3164,6 +3302,15 @@ "yale_smart_alarm" = ps: with ps; [ yalesmartalarmclient ]; + "yalexs_ble" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev + yalexs-ble + ]; "yamaha" = ps: with ps; [ rxv ]; @@ -3290,6 +3437,7 @@ "ambiclimate" "ambient_station" "analytics" + "android_ip_webcam" "androidtv" "apache_kafka" "api" @@ -3319,17 +3467,18 @@ "blackbird" "blebox" "blink" + "bluemaestro" "blueprint" "bluetooth" "bluetooth_le_tracker" "bmw_connected_drive" "bond" "bosch_shc" - "braviatv" "broadlink" "brother" "brunt" "bsblan" + "bthome" "buienradar" "button" "caldav" @@ -3391,6 +3540,7 @@ "eafm" "ecobee" "econet" + "ecowitt" "efergy" "eight_sleep" "elgato" @@ -3405,6 +3555,7 @@ "enphase_envoy" "environment_canada" "epson" + "escea" "esphome" "everlights" "evil_genius_labs" @@ -3419,6 +3570,7 @@ "fibaro" "fido" "file" + "file_upload" "filesize" "filter" "fireservicerota" @@ -3486,6 +3638,7 @@ "harmony" "hassio" "hddtemp" + "hdmi_cec" "heos" "here_travel_time" "hisense_aehw4a1" @@ -3497,6 +3650,7 @@ "home_plus_control" "homeassistant" "homeassistant_alerts" + "homeassistant_sky_connect" "homeassistant_yellow" "homekit" "homekit_controller" @@ -3545,6 +3699,7 @@ "jellyfin" "jewish_calendar" "juicenet" + "justnimbus" "keenetic_ndms2" "kira" "kmtronic" @@ -3553,10 +3708,12 @@ "konnected" "kraken" "kulersky" + "landisgyr_heat_meter" "lastfm" "launch_library" "laundrify" "lcn" + "led_ble" "lg_soundbar" "life360" "lifx" @@ -3655,6 +3812,7 @@ "open_meteo" "openalpr_cloud" "openerz" + "openexchangerates" "opengarage" "openhardwaremonitor" "opentherm_gw" @@ -3689,9 +3847,11 @@ "pure_energie" "push" "pushbullet" + "pushover" "pvoutput" "pvpc_hourly_pricing" "python_script" + "qingping" "qld_bushfire" "qnap_qsw" "rachio" @@ -3730,6 +3890,7 @@ "safe_mode" "samsungtv" "scene" + "schedule" "scrape" "screenlogic" "script" @@ -3740,6 +3901,7 @@ "senseme" "sensibo" "sensor" + "sensorpro" "sensorpush" "sentry" "senz" @@ -3819,6 +3981,8 @@ "tellduslive" "template" "tesla_wall_connector" + "thermobeacon" + "thermopro" "threshold" "tibber" "tile" @@ -3878,6 +4042,7 @@ "vlc_telnet" "voicerss" "volumio" + "volvooncall" "vulcan" "vultr" "wake_on_lan" @@ -3906,6 +4071,7 @@ "xiaomi_ble" "xiaomi_miio" "yale_smart_alarm" + "yalexs_ble" "yamaha" "yamaha_musiccast" "yandex_transport" diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index ecbdc2eadb..599211c398 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -79,18 +79,6 @@ let }); }) - (self: super: { - p1monitor = super.p1monitor.overridePythonAttrs (oldAttrs: rec { - version = "1.0.1"; - src = fetchFromGitHub { - owner = "klaasnicolaas"; - repo = "python-p1monitor"; - rev = "refs/tags/v${version}"; - hash = "sha256-g3isA2gF2AD+VVzTqpnD+YiJQ9Kcl0VKvwd5l5Yx/Uo="; - }; - }); - }) - # pytest-aiohttp>0.3.0 breaks home-assistant tests (self: super: { pytest-aiohttp = super.pytest-aiohttp.overridePythonAttrs (oldAttrs: rec { @@ -104,15 +92,24 @@ let doCheck = false; patches = []; }); + aioecowitt = super.aioecowitt.overridePythonAttrs (oldAttrs: { + doCheck = false; # requires aiohttp>=1.0.0 + }); aiohomekit = super.aiohomekit.overridePythonAttrs (oldAttrs: { doCheck = false; # requires aiohttp>=1.0.0 }); + aioopenexchangerates = super.aioopenexchangerates.overridePythonAttrs (oldAttrs: { + doCheck = false; # requires aiohttp>=1.0.0 + }); gcal-sync = super.gcal-sync.overridePythonAttrs (oldAttrs: { doCheck = false; # requires aiohttp>=1.0.0 }); hass-nabucasa = super.hass-nabucasa.overridePythonAttrs (oldAttrs: { doCheck = false; # requires aiohttp>=1.0.0 }); + pylitterbot = super.pylitterbot.overridePythonAttrs (oldAttrs: { + doCheck = false; # requires pytest-aiohttp>=1.0.0 + }); pynws = super.pynws.overridePythonAttrs (oldAttrs: { doCheck = false; # requires pytest-aiohttp>=1.0.0 }); @@ -245,6 +242,19 @@ let }); }) + # Pinned due to API changes in 0.3.0 + (self: super: { + tailscale = super.tailscale.overridePythonAttrs (oldAttrs: rec { + version = "0.2.0"; + src = fetchFromGitHub { + owner = "frenck"; + repo = "python-tailscale"; + rev = "refs/tags/v${version}"; + hash = "sha256-/tS9ZMUWsj42n3MYPZJYJELzX3h02AIHeRZmD2SuwWE="; + }; + }); + }) + # Pinned due to API changes in 0.4.0 (self: super: { vilfo-api-client = super.vilfo-api-client.overridePythonAttrs (oldAttrs: rec { @@ -271,6 +281,18 @@ let }); }) + (self: super: { + xiaomi-ble = super.xiaomi-ble.overridePythonAttrs (oldAttrs: rec { + version = "0.9.0"; + src = fetchFromGitHub { + owner = "Bluetooth-Devices"; + repo = "xiaomi-ble"; + rev = "refs/tags/v${version}"; + hash = "sha256-xdh8WHrSkbuOGqSiIiufjiVaO719DMDYzbprE3s2kmQ="; + }; + }); + }) + # home-assistant-frontend does not exist in python3.pkgs (self: super: { home-assistant-frontend = self.callPackage ./frontend.nix { }; @@ -300,7 +322,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.8.7"; + hassVersion = "2022.9.1"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -318,7 +340,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-FkI0EHO+M3dpt5xt73QkneQlCqgYUGKuO9MT3bRK2jI="; + hash = "sha256-JXMLIMiwM1givdV6HcSGHI9v3zh8gMiF9khaGWR5e9I="; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -327,7 +349,6 @@ in python.pkgs.buildPythonApplication rec { src = ./patches/ffmpeg-path.patch; ffmpeg = "${lib.getBin ffmpeg}/bin/ffmpeg"; }) - ./patches/wilight-import.patch ]; postPatch = let diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix index 868b8359e7..8654b23ff1 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20220802.0"; + version = "20220907.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - sha256 = "sha256-vUK/apsaJLaR/i6I2EWPxyohps+EazOr9ZuBKoRcyCI="; + sha256 = "sha256-G/2lOUffxKnEmd4mz/qAlNkzTNAUTfjKaGgvj6vG9ro="; }; # there is nothing to strip in this package diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/patches/wilight-import.patch b/third_party/nixpkgs/pkgs/servers/home-assistant/patches/wilight-import.patch deleted file mode 100644 index 2d6626b974..0000000000 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/patches/wilight-import.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/homeassistant/components/wilight/__init__.py b/homeassistant/components/wilight/__init__.py -index 2cdcf20c1e..37b034c9ae 100644 ---- a/homeassistant/components/wilight/__init__.py -+++ b/homeassistant/components/wilight/__init__.py -@@ -2,7 +2,7 @@ - - from typing import Any - --from pywilight.wilight_device import Device as PyWiLightDevice -+from pywilight.wilight_device import PyWiLightDevice - - from homeassistant.config_entries import ConfigEntry - from homeassistant.const import Platform -diff --git a/homeassistant/components/wilight/fan.py b/homeassistant/components/wilight/fan.py -index c598e6db39..3d0c6d0ff3 100644 ---- a/homeassistant/components/wilight/fan.py -+++ b/homeassistant/components/wilight/fan.py -@@ -13,7 +13,7 @@ from pywilight.const import ( - WL_SPEED_LOW, - WL_SPEED_MEDIUM, - ) --from pywilight.wilight_device import Device as PyWiLightDevice -+from pywilight.wilight_device import PyWiLightDevice - - from homeassistant.components.fan import DIRECTION_FORWARD, FanEntity, FanEntityFeature - from homeassistant.config_entries import ConfigEntry -diff --git a/homeassistant/components/wilight/light.py b/homeassistant/components/wilight/light.py -index ea9e19dcb3..2509dc5073 100644 ---- a/homeassistant/components/wilight/light.py -+++ b/homeassistant/components/wilight/light.py -@@ -4,7 +4,7 @@ from __future__ import annotations - from typing import Any - - from pywilight.const import ITEM_LIGHT, LIGHT_COLOR, LIGHT_DIMMER, LIGHT_ON_OFF --from pywilight.wilight_device import Device as PyWiLightDevice -+from pywilight.wilight_device import PyWiLightDevice - - from homeassistant.components.light import ( - ATTR_BRIGHTNESS, -diff --git a/homeassistant/components/wilight/parent_device.py b/homeassistant/components/wilight/parent_device.py -index 17a33fef63..8091e78cc7 100644 ---- a/homeassistant/components/wilight/parent_device.py -+++ b/homeassistant/components/wilight/parent_device.py -@@ -5,7 +5,7 @@ import asyncio - import logging - - import pywilight --from pywilight.wilight_device import Device as PyWiLightDevice -+from pywilight.wilight_device import PyWiLightDevice - import requests - - from homeassistant.config_entries import ConfigEntry diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix index 77bb02662b..7703bc6b28 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix @@ -7,11 +7,13 @@ let extraCheckInputs = with home-assistant.python.pkgs; { alexa = [ av ]; bluetooth = [ pyswitchbot ]; + bthome = [ xiaomi-ble ]; camera = [ av ]; cloud = [ mutagen ]; config = [ pydispatcher ]; generic = [ av ]; google_translate = [ mutagen ]; + homeassistant_sky_connect = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ]; homeassistant_yellow = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ]; lovelace = [ PyChromecast ]; nest = [ av ]; @@ -19,6 +21,7 @@ let raspberry_pi = [ rpi-bad-power ]; tomorrowio = [ pyclimacell ]; version = [ aioaseko ]; + xiaomi_miio = [ arrow ]; voicerss = [ mutagen ]; yandextts = [ mutagen ]; zha = [ pydeconz ]; diff --git a/third_party/nixpkgs/pkgs/servers/jackett/default.nix b/third_party/nixpkgs/pkgs/servers/jackett/default.nix index 3b907917a7..c864a1f776 100644 --- a/third_party/nixpkgs/pkgs/servers/jackett/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.1850"; + version = "0.20.1853"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "lELuwSC0TKsnU5zsUsA0ihBxsJv/IiAs9tf+Yi5aL8E="; + sha256 = "JsqUgp5o5mYByX6ALTbzMrfjDz035vNGBOjQZCseXKY="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index c37ab33e22..45a3cbba16 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "9.1.3"; + version = "9.1.4"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ]; @@ -10,12 +10,12 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-8qIGag0gl4BIuCYUA5T6cDqO4A/mbkQh/EyPyeYMLJg="; + sha256 = "sha256-tMU8xfMbXdPpI8La036tzPozdUK7GsDGZklNetAZ3ho="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-L+MuDb5NIQfpMzUQARSEAihYipDhySH6HSKjAxiXskU="; + sha256 = "sha256-+9Y2ymdlDfSvAsbaFcaTRl7e9NiH2GpNHvZIgssi7/w="; }; vendorSha256 = "sha256-frY84+Tp9qVj9Xs9l0c0u1YyYywMbXO4KS0AF5mpnhQ="; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index ac8ebb8d29..903ae7aa2c 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nginx_exporter"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "nginxinc"; repo = "nginx-prometheus-exporter"; rev = "v${version}"; - sha256 = "sha256-k9sbMIn5N3EJ7ZlfmD9pRV6lfywnKyFvpxC/pGGgNTA="; + sha256 = "sha256-glKjScJoJnFEm7Z9LAVF51haeyHB3wQ946U8RzJXs3k="; }; - vendorSha256 = "sha256-SaaHbn97cb/d8symyrBYLzK+5ukVLfGrFiRIz+tKPhw="; + vendorSha256 = "sha256-YyMySHnrjBHm3hRNJDwWBs86Ih4S5DONYuwlQ3FBjkA="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/servers/nats-server/default.nix b/third_party/nixpkgs/pkgs/servers/nats-server/default.nix index 9e13e3e9c1..ea7ea53c87 100644 --- a/third_party/nixpkgs/pkgs/servers/nats-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nats-server/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.8.4"; + version = "2.9.0"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hybCAVgHSwby8oSO0T2ZuqAYbqtZDc/adSPMOTdeI+w="; + sha256 = "sha256-zKDaem388xngSbpF1cK/hffLWMlrROJ00OBBSjzeMqk="; }; - vendorSha256 = "sha256-sK79szerxz42Y6V6NyDAveeMOx0XFq28Tjx27JkEWW4="; + vendorSha256 = "sha256-p+UMKVHDm6ypr1ftwb6L/kPocUrSp05un71T1WlLWbA="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/0001-Setup-remove-custom-dbuser-creation-behavior.patch b/third_party/nixpkgs/pkgs/servers/nextcloud/0001-Setup-remove-custom-dbuser-creation-behavior.patch new file mode 100644 index 0000000000..328288b39c --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/0001-Setup-remove-custom-dbuser-creation-behavior.patch @@ -0,0 +1,135 @@ +From 045f33745f863ba20acfc3fe335c575d9cd87884 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Sat, 10 Sep 2022 15:18:05 +0200 +Subject: [PATCH] Setup: remove custom dbuser creation behavior + +Both PostgreSQL and MySQL can be authenticated against from Nextcloud by +supplying a database password. Now, during setup the following things +happen: + +* When using postgres and the db user has elevated permissions, a new + unprivileged db user is created and the settings `dbuser`/`dbpass` are + altered in `config.php`. + +* When using MySQL, the password is **always** regenerated since + 24.0.5/23.0.9[1]. + +I consider both cases problematic: the reason why people do configuration +management is to have it as single source of truth! So, IMHO any +application that silently alters config and thus causes deployed +nodes to diverge from the configuration is harmful for that. + +I guess it was sheer luck that it worked for so long in NixOS because +nobody has apparently used password authentication with a privileged +user to operate Nextcloud (which is a good thing in fact). + +[1] https://github.com/nextcloud/server/pull/33513 +--- + lib/private/Setup/MySQL.php | 53 -------------------------------- + lib/private/Setup/PostgreSQL.php | 26 ---------------- + 2 files changed, 79 deletions(-) + +diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php +index 2c16cac3d2..9b2265091f 100644 +--- a/lib/private/Setup/MySQL.php ++++ b/lib/private/Setup/MySQL.php +@@ -142,59 +142,6 @@ class MySQL extends AbstractDatabase { + $rootUser = $this->dbUser; + $rootPassword = $this->dbPassword; + +- //create a random password so we don't need to store the admin password in the config file +- $saveSymbols = str_replace(['\"', '\\', '\'', '`'], '', ISecureRandom::CHAR_SYMBOLS); +- $password = $this->random->generate(22, ISecureRandom::CHAR_ALPHANUMERIC . $saveSymbols) +- . $this->random->generate(2, ISecureRandom::CHAR_UPPER) +- . $this->random->generate(2, ISecureRandom::CHAR_LOWER) +- . $this->random->generate(2, ISecureRandom::CHAR_DIGITS) +- . $this->random->generate(2, $saveSymbols) +- ; +- $this->dbPassword = str_shuffle($password); +- +- try { +- //user already specified in config +- $oldUser = $this->config->getValue('dbuser', false); +- +- //we don't have a dbuser specified in config +- if ($this->dbUser !== $oldUser) { +- //add prefix to the admin username to prevent collisions +- $adminUser = substr('oc_' . $username, 0, 16); +- +- $i = 1; +- while (true) { +- //this should be enough to check for admin rights in mysql +- $query = 'SELECT user FROM mysql.user WHERE user=?'; +- $result = $connection->executeQuery($query, [$adminUser]); +- +- //current dbuser has admin rights +- $data = $result->fetchAll(); +- $result->closeCursor(); +- //new dbuser does not exist +- if (count($data) === 0) { +- //use the admin login data for the new database user +- $this->dbUser = $adminUser; +- $this->createDBUser($connection); +- +- break; +- } else { +- //repeat with different username +- $length = strlen((string)$i); +- $adminUser = substr('oc_' . $username, 0, 16 - $length) . $i; +- $i++; +- } +- } +- } +- } catch (\Exception $ex) { +- $this->logger->info('Can not create a new MySQL user, will continue with the provided user.', [ +- 'exception' => $ex, +- 'app' => 'mysql.setup', +- ]); +- // Restore the original credentials +- $this->dbUser = $rootUser; +- $this->dbPassword = $rootPassword; +- } +- + $this->config->setValues([ + 'dbuser' => $this->dbUser, + 'dbpassword' => $this->dbPassword, +diff --git a/lib/private/Setup/PostgreSQL.php b/lib/private/Setup/PostgreSQL.php +index bc24909dc3..e49e5508e1 100644 +--- a/lib/private/Setup/PostgreSQL.php ++++ b/lib/private/Setup/PostgreSQL.php +@@ -45,32 +45,6 @@ class PostgreSQL extends AbstractDatabase { + $connection = $this->connect([ + 'dbname' => 'postgres' + ]); +- //check for roles creation rights in postgresql +- $builder = $connection->getQueryBuilder(); +- $builder->automaticTablePrefix(false); +- $query = $builder +- ->select('rolname') +- ->from('pg_roles') +- ->where($builder->expr()->eq('rolcreaterole', new Literal('TRUE'))) +- ->andWhere($builder->expr()->eq('rolname', $builder->createNamedParameter($this->dbUser))); +- +- try { +- $result = $query->execute(); +- $canCreateRoles = $result->rowCount() > 0; +- } catch (DatabaseException $e) { +- $canCreateRoles = false; +- } +- +- if ($canCreateRoles) { +- //use the admin login data for the new database user +- +- //add prefix to the postgresql user name to prevent collisions +- $this->dbUser = 'oc_' . strtolower($username); +- //create a new password so we don't need to store the admin config in the config file +- $this->dbPassword = \OC::$server->getSecureRandom()->generate(30, ISecureRandom::CHAR_ALPHANUMERIC); +- +- $this->createDBUser($connection); +- } + + $this->config->setValues([ + 'dbuser' => $this->dbUser, +-- +2.36.2 + diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix index 2ac4be1af5..11bf643e4c 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix @@ -13,6 +13,8 @@ let inherit sha256; }; + patches = [ ./0001-Setup-remove-custom-dbuser-creation-behavior.patch ]; + passthru.tests = nixosTests.nextcloud; installPhase = '' @@ -46,13 +48,13 @@ in { ''; nextcloud23 = generic { - version = "23.0.8"; - sha256 = "ac3d042253399be25a2aa01c799dec75a1459b6ae453874414f6528cc2ee5061"; + version = "23.0.9"; + sha256 = "sha256-Ysxapp8IpRcRBC3CRM4yxoGYCuedAVURT3FhDD4jNBY="; }; nextcloud24 = generic { - version = "24.0.4"; - sha256 = "d107426f8e1c193db882a04c844f9bc7e7eeb7c21e46c46197e5154d6d6ac28e"; + version = "24.0.5"; + sha256 = "sha256-sieIN3zLk5Hn+eztP2mpI2Zprqqy4OpSUKc+318e8CY="; }; # tip: get the sha with: diff --git a/third_party/nixpkgs/pkgs/servers/prowlarr/default.nix b/third_party/nixpkgs/pkgs/servers/prowlarr/default.nix index e849d6c86a..385f7147b8 100644 --- a/third_party/nixpkgs/pkgs/servers/prowlarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/prowlarr/default.nix @@ -16,14 +16,14 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-VUJgf0gxOJH6RKUN5pODxoT6MM4fX43CSApRCDvPjjU="; - arm64-linux_hash = "sha256-rZM9r9CCcB0Q468w4Q5CuTeQS6hmFPCSv/DJ/SPm4Tw="; - x64-osx_hash = "sha256-RjeuINFgtqKcKF6I8K+l9CbYTRKagepZGT3fOLXDtJE="; + x64-linux_hash = "sha256-t5KjzB+dJGNr80mbRRlGvzuC6NvicyScoVeCygzjKeA="; + arm64-linux_hash = "sha256-wj1B573MgLZee3pjzbDyYsEYQ6fIyWQkYQnAbV6IW2Q="; + x64-osx_hash = "sha256-sbaWK5FK9luSpra/8aujd02/8Z1LOKkAm5eAghT6LJk="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "prowlarr"; - version = "0.4.4.1947"; + version = "0.4.5.1960"; src = fetchurl { url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/servers/sickbeard/patches/override-python-version-check.patch b/third_party/nixpkgs/pkgs/servers/sickbeard/patches/override-python-version-check.patch new file mode 100644 index 0000000000..95c6970e0a --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/sickbeard/patches/override-python-version-check.patch @@ -0,0 +1,28 @@ +From e97f418803c1db9a753fa755a9ee0cf04eabaed3 Mon Sep 17 00:00:00 2001 +From: rembo10 +Date: Sun, 11 Sep 2022 13:00:29 +0530 +Subject: [PATCH] Allow running on unsupported Python versions + +--- + sickgear.py | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/sickgear.py b/sickgear.py +index 9d0440bb..6d65e65d 100755 +--- a/sickgear.py ++++ b/sickgear.py +@@ -43,10 +43,7 @@ versions = [((2, 7, 9), (2, 7, 18)), ((3, 7, 1), (3, 8, 14)), + ((3, 9, 0), (3, 9, 2)), ((3, 9, 4), (3, 9, 14)), + ((3, 10, 0), (3, 10, 7))] # inclusive version ranges + if not any(list(map(lambda v: v[0] <= sys.version_info[:3] <= v[1], versions))) and not int(os.environ.get('PYT', 0)): +- print('Python %s.%s.%s detected.' % sys.version_info[:3]) +- print('Sorry, SickGear requires a Python version %s' % ', '.join(map( +- lambda r: '%s - %s' % tuple(map(lambda v: str(v).replace(',', '.')[1:-1], r)), versions))) +- sys.exit(1) ++ pass + + sys.path.insert(1, os.path.abspath(os.path.join(os.path.dirname(__file__), 'lib'))) + is_win = 'win' == sys.platform[0:3] +-- +2.37.2 + diff --git a/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix b/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix index c1c3c6dc05..5ad9f457c1 100644 --- a/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix +++ b/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix @@ -1,23 +1,27 @@ -{ lib, stdenv, fetchFromGitHub, python3, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, python3, makeWrapper, libarchive }: let - pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 ]); + pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 lxml ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.25.35"; + version = "0.25.40"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "0hc43wfa256nkjm7bvsr6b7xsyilm1ks4x16kvpprqmj1symlkz3"; + sha256 = "sha256-AHV/HSKuVWZFdZdkFp9p7okAcFO40d9OqV20MaHKXaU="; }; + patches = [ + ./patches/override-python-version-check.patch + ]; + dontBuild = true; doCheck = false; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ pythonEnv ]; + buildInputs = [ pythonEnv libarchive ]; postPatch = '' substituteInPlace sickgear.py --replace "/usr/bin/env python2" "/usr/bin/env python" diff --git a/third_party/nixpkgs/pkgs/shells/carapace/default.nix b/third_party/nixpkgs/pkgs/shells/carapace/default.nix index 788b1d114d..928b1c5bb2 100644 --- a/third_party/nixpkgs/pkgs/shells/carapace/default.nix +++ b/third_party/nixpkgs/pkgs/shells/carapace/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "carapace"; - version = "0.8.10"; + version = "0.15.0"; src = fetchFromGitHub { owner = "rsteube"; repo = "${pname}-bin"; rev = "v${version}"; - sha256 = "0j60fvrmjm4440gj9hib2ar386zxcblw7yifigsnchr7p3i2187n"; + sha256 = "sha256-3ZWYEfssGq6fBoHrDsp6yvkB9TLF+heELEIbZ1TN2lI="; }; - vendorSha256 = "1s1sws79cyz1rl63wayzf7yhb04x29a4a1mkifqnl4cc2pv806jf"; + vendorSha256 = "sha256-OrbVqCgsVX5b5knN6IdlJBWeGfg2fh09a2xe5+2EGEs="; subPackages = [ "./cmd/carapace" ]; diff --git a/third_party/nixpkgs/pkgs/shells/nushell/default.nix b/third_party/nixpkgs/pkgs/shells/nushell/default.nix index 0a4070d50d..676e1be3ec 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/default.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/default.nix @@ -24,16 +24,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.67.0"; + version = "0.68.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-O5uM27DvcpwlZStFFLYRDRtFXzAzUdG7v0phK9LJsSo="; + sha256 = "sha256-PE6UewAE7z0Ie5aFocDK3Qu0Y4ppuPtpD6tDnYfM11Y="; }; - cargoSha256 = "sha256-eGUI+/Vmqv+BCIQCGoF4Egf3oNyonM3tpt1R3EjIocQ="; + cargoSha256 = "sha256-7guFkR/paL8jk5YwiRNMbWCyA6DqOaLGTmbWHAWDxRw="; # enable pkg-config feature of zstd cargoPatches = [ ./zstd-pkg-config.patch ]; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix index 07b3632d24..c862ffaed4 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { - version = "2022-09-07"; + version = "2022-09-08"; pname = "oh-my-zsh"; - rev = "875a4553204679cc1e3023a7d0e0bf2cf7d60800"; + rev = "dfa88b4d369f6afc7205af0b399a0ef05a4bef2e"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "iPW6u4LxXFNL1n9NzhoA9uGAZvykx+sDI0syYwUf4+k="; + sha256 = "BzJAQIZXKoj1LtQQvM4LEA0V8yKoND4hVxzQA+weESk="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/test/coq/default.nix b/third_party/nixpkgs/pkgs/test/coq/default.nix new file mode 100644 index 0000000000..cf59dd473b --- /dev/null +++ b/third_party/nixpkgs/pkgs/test/coq/default.nix @@ -0,0 +1,6 @@ +{ lib, callPackage }: + +lib.recurseIntoAttrs { + overrideCoqDerivation = callPackage ./overrideCoqDerivation { }; +} + diff --git a/third_party/nixpkgs/pkgs/test/coq/overrideCoqDerivation/default.nix b/third_party/nixpkgs/pkgs/test/coq/overrideCoqDerivation/default.nix new file mode 100644 index 0000000000..c251c498e6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/test/coq/overrideCoqDerivation/default.nix @@ -0,0 +1,40 @@ +{ lib, coq, mkCoqPackages, runCommand }: + +let + + # This is just coq, but with dontFilter set to true. We need to set + # dontFilter to true here so that _all_ packages are visibile in coqPackages. + # There may be some versions of the top-level coq and coqPackages that don't + # build QuickChick, which is what we are using for this test below. + coqWithAllPackages = coq // { dontFilter = true; }; + + coqPackages = mkCoqPackages coqWithAllPackages; + + # This is the main test. This uses overrideCoqDerivation to + # override arguments to mkCoqDerivation. + # + # Here, we override the defaultVersion and release arguments to + # mkCoqDerivation. + overriddenQuickChick = + coqPackages.lib.overrideCoqDerivation + { + defaultVersion = "9999"; + release."9999".sha256 = lib.fakeSha256; + } + coqPackages.QuickChick; +in + +runCommand + "coq-overrideCoqDerivation-test-0.1" + { meta.maintainers = with lib.maintainers; [cdepillabout]; } + '' + # Confirm that the computed version number for the overridden QuickChick does + # actually become 9999, as set above. + if [ "${overriddenQuickChick.version}" -eq "9999" ]; then + echo "overriddenQuickChick version was successfully set to 9999" + touch $out + else + echo "ERROR: overriddenQuickChick version was supposed to be 9999, but was actually: ${overriddenQuickChick.version}" + exit 1 + fi + '' diff --git a/third_party/nixpkgs/pkgs/test/default.nix b/third_party/nixpkgs/pkgs/test/default.nix index 82975efb59..2638bbc37e 100644 --- a/third_party/nixpkgs/pkgs/test/default.nix +++ b/third_party/nixpkgs/pkgs/test/default.nix @@ -75,6 +75,8 @@ with pkgs; dhall = callPackage ./dhall { }; + coq = callPackage ./coq {}; + makeWrapper = callPackage ./make-wrapper { }; makeBinaryWrapper = callPackage ./make-binary-wrapper { makeBinaryWrapper = pkgs.makeBinaryWrapper.override { diff --git a/third_party/nixpkgs/pkgs/tools/X11/xprompt/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xprompt/default.nix index 69149b3889..e8633d1eb3 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xprompt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xprompt/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { in optionalString (conf != null) "cp ${configFile} config.h"; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "CC:=$(CC)" "PREFIX=$(out)" ]; passthru.updateScript = nix-update-script { attrPath = pname; diff --git a/third_party/nixpkgs/pkgs/tools/admin/boulder/default.nix b/third_party/nixpkgs/pkgs/tools/admin/boulder/default.nix index 7629cafec1..b39e565ead 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/boulder/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/boulder/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "boulder"; - version = "2022-08-29"; + version = "2022-09-06"; src = fetchFromGitHub { owner = "letsencrypt"; @@ -19,7 +19,7 @@ buildGoModule rec { git rev-parse --short=8 HEAD 2>/dev/null >$out/COMMIT find "$out" -name .git -print0 | xargs -0 rm -rf ''; - hash = "sha256-DiO7sOcTd8aOld4Pqd0D7yTPrRh/Mhg25I63Vb/gHhM="; + hash = "sha256-BteHJAjIMPckbNIxgZCSSZV2iUc/yKVd0Px+S9ZwwUI="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/tools/admin/docker-credential-gcr/default.nix b/third_party/nixpkgs/pkgs/tools/admin/docker-credential-gcr/default.nix index 02d75ac629..65c850fdca 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/docker-credential-gcr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/docker-credential-gcr/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-credential-gcr"; - version = "2.1.5"; + version = "2.1.6"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "docker-credential-gcr"; rev = "v${version}"; - sha256 = "sha256-NUFSnegLVGNUc6f/WSyIk1U6UQorxRykqojhgE/maw8="; + sha256 = "sha256-SdVAq/i5J21EoCHVrYL0y6zJxlElZRsGoKGJupZN94w="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/admin/fioctl/default.nix b/third_party/nixpkgs/pkgs/tools/admin/fioctl/default.nix index 5f64adfaff..db67408384 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/fioctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/fioctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fioctl"; - version = "0.27"; + version = "0.28"; src = fetchFromGitHub { owner = "foundriesio"; repo = "fioctl"; rev = "v${version}"; - sha256 = "sha256-RnVwvD/Iy6UvztnQ03LFaCLWHrS6Aw5Ir4e033bBW7g="; + sha256 = "sha256-ki00uIGStRRGEG2cEGPJWgt4Vc3pEIpCr37g0SMPc9o="; }; vendorSha256 = "sha256-ObS/100Tfq4rhOrwU+PPBzDwY3tKwH+Z0wm0bX0W8cE="; diff --git a/third_party/nixpkgs/pkgs/tools/admin/fits-cloudctl/default.nix b/third_party/nixpkgs/pkgs/tools/admin/fits-cloudctl/default.nix index 93f94ff04e..7b4f2b05b7 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/fits-cloudctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/fits-cloudctl/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "fits-cloudctl"; - version = "0.10.21"; + version = "0.10.22"; src = fetchFromGitHub { owner = "fi-ts"; repo = "cloudctl"; rev = "v${version}"; - sha256 = "sha256-p9q0NVk+7jZ/DKxDjvvlfRKW9N1bk5jquxxQHmNE/3s="; + sha256 = "sha256-9Vl4FWmKaNWl5QcfFc5KDyLWMRmAEqkBwMqwqhXkjgo="; }; - vendorSha256 = "sha256-DRrf7VR1w35KRwokcDIBYr0pPmNREXiATRu4Cc+xegk="; + vendorSha256 = "sha256-10QeWL3tIcs2E4pK9UAY8C41YYjA3LHlvIbDhWVYATE="; meta = with lib; { description = "Command-line client for FI-TS Finance Cloud Native services"; diff --git a/third_party/nixpkgs/pkgs/tools/backup/borgmatic/default.nix b/third_party/nixpkgs/pkgs/tools/backup/borgmatic/default.nix index a63cdcda7c..136be31d8b 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/borgmatic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/borgmatic/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "borgmatic"; - version = "1.6.4"; + version = "1.7.2"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "sha256-2kQ+KO69RxpIQkrkD6n7l9ti9ITwdpHYK7LuXYUo3ck="; + sha256 = "sha256-0o2tKg7BfhkNt/k8XdZ1agaSJxKO5OxB5aaRgV9IPeU="; }; checkInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ]; diff --git a/third_party/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/default.nix b/third_party/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/default.nix index 56e6e02df1..14c8925a13 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/default.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "discordchatexporter-cli"; - version = "2.35.1"; + version = "2.35.2"; src = fetchFromGitHub { owner = "tyrrrz"; repo = "discordchatexporter"; rev = version; - sha256 = "Zl9uYwbCSMj+hEvZdI57gALegDizwe4Z1k8qa3hSeIc="; + sha256 = "OMJp5HL/fN5NGEgozaQefE503HwYnsGgTY4d4s15ANE="; }; projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj"; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/garage/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/garage/default.nix index 2818c33517..13184afe73 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/garage/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/garage/default.nix @@ -1,22 +1,41 @@ -{ lib, stdenv, rustPlatform, fetchFromGitea, protobuf, testers, Security, garage }: +{ lib, stdenv, rustPlatform, fetchFromGitea, openssl, pkg-config, protobuf +, testers, Security, garage }: rustPlatform.buildRustPackage rec { pname = "garage"; - version = "0.7.0"; + version = "0.7.3"; src = fetchFromGitea { domain = "git.deuxfleurs.fr"; owner = "Deuxfleurs"; repo = "garage"; rev = "v${version}"; - sha256 = "sha256-gs0TW431YUrdsdJ+PYrJgnLiBmDPYnUR0iVnQ/YqIfU="; + sha256 = "sha256-WDhe2L+NalMoIy2rhfmv8KCNDMkcqBC9ezEKKocihJg="; }; - cargoSha256 = "sha256-XGSenT2q3VXNcIT1Lg1e5HTOkEdOb1o3H07ahteQM/o="; + cargoSha256 = "sha256-5m4c8/upBYN8nuysDhGKEnNVJjEGC+yLrraicrAQOfI="; - nativeBuildInputs = [ protobuf ]; + nativeBuildInputs = [ protobuf pkg-config ]; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = [ + openssl + ] ++ lib.optional stdenv.isDarwin Security; + + OPENSSL_NO_VENDOR = true; + + # See https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/v0.7.2/default.nix#L84-L98 + # on version changes for checking if changes are required here + buildFeatures = [ + "kubernetes-discovery" + ]; + + # To make integration tests pass, we include the optional k2v feature here, + # but not in buildFeatures. See: + # https://garagehq.deuxfleurs.fr/documentation/reference-manual/k2v/ + checkFeatures = [ + "k2v" + "kubernetes-discovery" + ]; passthru = { tests.version = testers.testVersion { package = garage; }; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix index 9c17990ee6..2b17fa796e 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "argyllcms"; - version = "2.3.0"; + version = "2.3.1"; src = fetchzip { # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a # while on me. It might be good to find a mirror url = "https://www.argyllcms.com/Argyll_V${version}_src.zip"; - sha256 = "sha256-UNjCcqJgbRSox55OP3pLdKFHY0NPLHEq3nwqvxWre7U="; + sha256 = "sha256-XWsubjdD1tg0o7x/aoAalemAChehWkwh4fkP2WRvhAw="; }; nativeBuildInputs = [ jam unzip ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/audible-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/audible-cli/default.nix index 48fe07fff7..81b071ce0a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/audible-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/audible-cli/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "audible-cli"; - version = "0.2.1"; + version = "0.2.3"; src = fetchFromGitHub { owner = "mkb79"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-KPuAY/QMO2029tD4DMGCwmKuqpnxXAALYT+wE1ApfsI="; + sha256 = "sha256-z7oLY+xu+rTHgIWLFQU/TTSQtxChwhfu8nXoI05QqLw="; }; propagatedBuildInputs = with python3Packages; [ aiofiles audible click httpx pillow tabulate toml tqdm packaging setuptools questionary ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix index 12abcef608..cc52d952ee 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix @@ -12,15 +12,15 @@ rustPlatform.buildRustPackage rec { pname = "bat"; - version = "0.22.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aTW1PheKWjeBtMePMDYeXOqZEaq9k6dMrrPKoT1C70E="; + sha256 = "sha256-xkGGnWjuZ5ZR4Ll+JwgWyKZFboFZ6HKA8GviR3YBAnM="; }; - cargoSha256 = "sha256-tzhtgF/NCvSMqKRFCgkE5iIEM4OmJtmpuqHP5qhTIMI="; + cargoSha256 = "sha256-ye6GH4pcI9h1CNpobUzfJ+2WlqJ98saCdD77AtSGafg="; nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fdupes/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fdupes/default.nix index 30b7f79f04..f92a6a69fe 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fdupes/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fdupes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fdupes"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "adrianlopezroche"; repo = "fdupes"; rev = "v${version}"; - hash = "sha256-w1vIZexuXoCpc509QKdKnUaD4Obs5rsjptYAE4T/T+g="; + hash = "sha256-8GYQfnUxS790pDXw2sjnDZNB55PMDaCcO6daIa/MPMw="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/octosql/default.nix b/third_party/nixpkgs/pkgs/tools/misc/octosql/default.nix new file mode 100644 index 0000000000..8a31ab58fa --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/octosql/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "octosql"; + version = "0.9.3"; + + src = fetchFromGitHub { + owner = "cube2222"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Y6kKYW79415nCJkcIKQjcBQiFZrRCJ8If65lV9wmNFA="; + }; + + vendorSha256 = "sha256-ukNjLk1tTdw0bwXaYAEDuHfzxHuAX1xyqRqC6wmW/H4="; + + ldflags = [ "-s" "-w" "-X github.com/cube2222/octosql/cmd.VERSION=${version}" ]; + + postInstall = '' + rm -v $out/bin/tester + ''; + + meta = with lib; { + description = "Commandline tool for joining, analyzing and transforming data from multiple databases and file formats using SQL"; + homepage = "https://github.com/cube2222/octosql"; + license = licenses.mpl20; + maintainers = with maintainers; [ arikgrahl ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/qmk/default.nix b/third_party/nixpkgs/pkgs/tools/misc/qmk/default.nix index e7c02c6942..144038f60f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/qmk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/qmk/default.nix @@ -5,16 +5,17 @@ , dfu-programmer , dfu-util , gcc-arm-embedded +, gnumake , teensy-loader-cli }: python3.pkgs.buildPythonApplication rec { pname = "qmk"; - version = "1.1.0"; + version = "1.1.1"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "sha256-dxV3yeaOt/4IlpurNq60IHE6UlBi3OUqBu2kDajNpeE="; + sha256 = "sha256-3QKOCevNYfi9+MuCkp36/A4AfZelo4A7RYGbRkF3Mmk="; }; nativeBuildInputs = with python3.pkgs; [ @@ -27,12 +28,13 @@ python3.pkgs.buildPythonApplication rec { appdirs argcomplete colorama - qmk-dotty-dict + dotty-dict hid hjson jsonschema milc pygments + pyserial pyusb pillow ] ++ [ # Binaries need to be in the path so this is in propagatedBuildInputs @@ -41,6 +43,7 @@ python3.pkgs.buildPythonApplication rec { dfu-util teensy-loader-cli gcc-arm-embedded + gnumake pkgsCross.avr.buildPackages.binutils pkgsCross.avr.buildPackages.binutils.bintools pkgsCross.avr.buildPackages.gcc8 diff --git a/third_party/nixpkgs/pkgs/tools/misc/rpi-imager/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rpi-imager/default.nix index 56899ae3c3..ab4933f52d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/rpi-imager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/rpi-imager/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "rpi-imager"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "raspberrypi"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9/kZ9GVfLRdKxzyZ3E11aILkJWIeojt9Ew+vKktveoU="; + sha256 = "sha256-D2FNg8SEUDQA466jfxBFhK0t8/5WJHx1fBTaCH0N+UQ="; }; nativeBuildInputs = [ cmake util-linux ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/theme-sh/default.nix b/third_party/nixpkgs/pkgs/tools/misc/theme-sh/default.nix new file mode 100644 index 0000000000..3d41258731 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/theme-sh/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchFromGitHub, makeWrapper, coreutils, gawk }: + +stdenv.mkDerivation rec { + pname = "theme-sh"; + version = "1.1.5"; + + src = fetchFromGitHub { + owner = "lemnos"; + repo = "theme.sh"; + rev = "v${version}"; + sha256 = "sha256-zDw8WGBzO4/HRCgN7yoUxT49ibTz+QkRa5WpBQbl1nI="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + install -Dm755 bin/theme.sh $out/bin + wrapProgram $out/bin/theme.sh \ + --prefix PATH : ${lib.makeBinPath [ coreutils gawk ]} + + runHook postInstall + ''; + + meta = with lib; { + description = "A script which lets you set your $terminal theme"; + homepage = "https://github.com/lemnos/theme.sh"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "theme.sh"; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/yubico-piv-tool/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yubico-piv-tool/default.nix index 187782fd40..60fc7c2ac7 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -4,13 +4,17 @@ stdenv.mkDerivation rec { pname = "yubico-piv-tool"; - version = "2.2.1"; + version = "2.3.0"; src = fetchurl { url = "https://developers.yubico.com/yubico-piv-tool/Releases/yubico-piv-tool-${version}.tar.gz"; - sha256 = "sha256-t+3k3cPW4x3mey4t3NMZsitAzC4Jc7mGbQUqdUSTsU4="; + hash = "sha256-oCoS2VRdHvehuZhgbYm3tlWl9aFDdzbPUdsIP4dvVak="; }; + postPatch = '' + substituteInPlace CMakeLists.txt --replace "-Werror" "" + ''; + nativeBuildInputs = [ pkg-config cmake gengetopt ]; buildInputs = [ openssl check ] ++ (if withApplePCSC then [ PCSC ] else [ pcsclite ]); @@ -40,6 +44,6 @@ stdenv.mkDerivation rec { ''; license = licenses.bsd2; platforms = platforms.all; - maintainers = with maintainers; [ viraptor ]; + maintainers = with maintainers; [ viraptor anthonyroussel ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix b/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix index a027334db8..f1b7ec062b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.31.3"; + version = "0.31.4"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - sha256 = "sha256-4iljPNw/tS/COStARg2PlrCoeE0lkSQ5+r8BrnxFLMo="; + sha256 = "sha256-eULdBwQNquk4jj1SjdMsAN7S7mBSZs7jVAwMyFvOlWk="; }; - cargoSha256 = "sha256-Ilz7Efa8QXXcNXx+GvYzrOeRFNJDnK4+3HfqFIX4V0Q="; + cargoSha256 = "sha256-bKOY1r5SxAI9D+9YkYhX2l+pm2kZ6GEU2cf5NFqhuSU="; nativeBuildInputs = [ mandown diff --git a/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix b/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix index 2b96be63db..c1db56b067 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.10.1"; + version = "0.10.3"; src = let @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-JAwJOu90mrZhWhxQvfRlaWk7dYTC21Z5KQlKWCDJMQg="; - aarch64-linux = "sha256-nUIWMt5HPexIlQu5n6LFt1I0WogEdnEhLav6UuLRBXo="; - x86_64-darwin = "sha256-rZ2WqbcdcWZ7WXfYowmLZPer3pm74ssK15DEPRA9pPw="; - aarch64-darwin = "sha256-zpxdm1Ix+AUl2YCfgI7U9HC01tXtMEV4T/jSDNGDaq8="; + x86_64-linux = "sha256-MflcfTX0Ap8KEP0NDSZMHKM+fPsCoorUcUHV3WDXmBE="; + aarch64-linux = "sha256-WeSmRpi50dfnv5quLPQTYNKQcQlBwno1iwPUyTeJrW4="; + x86_64-darwin = "sha256-Ff4mu/g2K1wAeBj2IpOMT80gKcIP/dZjhWA8czokpxc="; + aarch64-darwin = "sha256-Ove3Tgj7FnR5ZTzVZlmFDRoUaVlO2xA6CzMqIdobZxQ="; }; in fetchzip { diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix index 2c49c3951c..099c629154 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , substituteAll -, intltool +, gettext , pkg-config , fetchpatch , dbus @@ -24,6 +24,7 @@ , libselinux , audit , gobject-introspection +, perl , modemmanager , openresolv , libndp @@ -57,11 +58,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.38.4"; + version = "1.40.0"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "sha256-hB9k1Bd2qt2SsVH0flD2K+igYRqQVv5r+BiBAk5qlsU="; + sha256 = "sha256-rufgV7wsyl2rhOQfFfHai3lespB0ewTL7ugiutnp/AM="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; @@ -153,10 +154,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - intltool + gettext pkg-config vala gobject-introspection + perl elfutils # used to find jansson soname # Docs gtk-doc diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/fix-install-paths.patch b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/fix-install-paths.patch index 642c386d07..3a2973060a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/fix-install-paths.patch +++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/fix-install-paths.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index 9675cd8d03..a4562b693c 100644 +index 300e71319c..2a9fba7116 100644 --- a/meson.build +++ b/meson.build -@@ -1005,9 +1005,9 @@ meson.add_install_script( +@@ -996,9 +996,9 @@ meson.add_install_script( join_paths('tools', 'meson-post-install.sh'), nm_datadir, nm_bindir, diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/fix-paths.patch b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/fix-paths.patch index 79b1fd3737..5b099e1348 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/fix-paths.patch +++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/fix-paths.patch @@ -24,10 +24,10 @@ index e23b3a5282..c7246a3b61 100644 ExecStart=@sbindir@/NetworkManager --no-daemon Restart=on-failure diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c -index 6b854517e5..7a642e76fe 100644 +index c51da9ac82..ad67a301ef 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c -@@ -13605,14 +13605,14 @@ nm_device_start_ip_check(NMDevice *self) +@@ -13879,14 +13879,14 @@ nm_device_start_ip_check(NMDevice *self) gw = nm_l3_config_data_get_best_default_route(l3cd, AF_INET); if (gw) { _nm_utils_inet4_ntop(NMP_OBJECT_CAST_IP4_ROUTE(gw)->gateway, buf); @@ -45,10 +45,10 @@ index 6b854517e5..7a642e76fe 100644 } } diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build -index 2026f98dc3..8ec6978b8e 100644 +index 46464a6328..d943d4351a 100644 --- a/src/libnm-client-impl/meson.build +++ b/src/libnm-client-impl/meson.build -@@ -170,7 +170,6 @@ if enable_introspection +@@ -171,7 +171,6 @@ if enable_introspection input: libnm_core_settings_sources, output: 'nm-propery-infos-' + info + '.xml', command: [ @@ -56,7 +56,7 @@ index 2026f98dc3..8ec6978b8e 100644 join_paths(meson.source_root(), 'tools', 'generate-docs-nm-property-infos.py'), info, '@OUTPUT@', -@@ -227,7 +226,6 @@ if enable_introspection +@@ -228,7 +227,6 @@ if enable_introspection 'env', 'GI_TYPELIB_PATH=' + gi_typelib_path, 'LD_LIBRARY_PATH=' + ld_library_path, @@ -78,7 +78,7 @@ index bebc53a851..93710455d5 100644 g_ptr_array_add(argv, (char *) arg1); diff --git a/src/libnmc-base/nm-vpn-helpers.c b/src/libnmc-base/nm-vpn-helpers.c -index e2c0c394bd..1a507aa0d4 100644 +index 7ad5bee509..2641dbf637 100644 --- a/src/libnmc-base/nm-vpn-helpers.c +++ b/src/libnmc-base/nm-vpn-helpers.c @@ -198,25 +198,8 @@ nm_vpn_openconnect_authenticate_helper(const char *host, @@ -86,13 +86,13 @@ index e2c0c394bd..1a507aa0d4 100644 const char *const *iter; const char *path; - const char *const DEFAULT_PATHS[] = { -- "/sbin/", -- "/usr/sbin/", -- "/usr/local/sbin/", -- "/bin/", -- "/usr/bin/", -- "/usr/local/bin/", -- NULL, +- "/sbin/", +- "/usr/sbin/", +- "/usr/local/sbin/", +- "/bin/", +- "/usr/bin/", +- "/usr/local/bin/", +- NULL, - }; - path = nm_utils_file_search_in_paths("openconnect", @@ -109,10 +109,10 @@ index e2c0c394bd..1a507aa0d4 100644 if (!g_spawn_sync(NULL, (char **) NM_MAKE_STRV(path, "--authenticate", host), diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build -index 8f07ae634e..a1326b3403 100644 +index 49314cad2e..6d52624699 100644 --- a/src/libnmc-setting/meson.build +++ b/src/libnmc-setting/meson.build -@@ -6,7 +6,6 @@ if enable_docs +@@ -7,7 +7,6 @@ if enable_docs input: [nm_settings_docs_xml_gir, nm_property_infos_xml['nmcli']], output: 'settings-docs-input.xml', command: [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/openvpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/openvpn/default.nix index 2e46d62396..e988fc1352 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/openvpn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/openvpn/default.nix @@ -3,7 +3,7 @@ , fetchurl , substituteAll , openvpn -, intltool +, gettext , libxml2 , pkg-config , file @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "NetworkManager-openvpn"; - version = "1.8.18"; + version = "1.10.0"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager-openvpn/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "U9+wrPZEeK3HKAdPFi9i5gv/YqYFvYl+uIsmfnBXkno="; + sha256 = "V0XUEH8zmKl6+7k/aSObUQyeRet/ti1g2e0Kcpf00QE="; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - intltool + gettext pkg-config file libxml2 diff --git a/third_party/nixpkgs/pkgs/tools/networking/ooniprobe-cli/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ooniprobe-cli/default.nix index ea7a145632..6fd45acbd7 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ooniprobe-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ooniprobe-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ooniprobe-cli"; - version = "3.15.3"; + version = "3.16.0"; src = fetchFromGitHub { owner = "ooni"; repo = "probe-cli"; rev = "v${version}"; - hash = "sha256-21D/1ImKOr9+GeSrIRCUGCcALU0WPohrnz1qqUXLy1A="; + hash = "sha256-UMnhisn/1PfNADNB9nN5+Yj2hmXetHiWULjgQPeHLc8="; }; - vendorSha256 = "sha256-tZHBcVTCll3dSfQnQDfo9z3ALAykRmFvH7vjLLtQHDc="; + vendorSha256 = "sha256-eH+PfclxqgffM/pzIkdl7x+6Ie6UPyUpWkJ7+G5eN/E="; subPackages = [ "cmd/ooniprobe" ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/libdnf/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/libdnf/default.nix index 1cfccdd098..53f7fceb16 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/libdnf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/libdnf/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libdnf"; - version = "0.68.0"; + version = "0.69.0"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = pname; rev = version; - sha256 = "sha256-vXk+ob2lBCXF0+VUSxUpZL60Vn1dJTdyQAgsJkCnml8="; + sha256 = "sha256-Mc9yI18D4OYv8l4axQ8W0XZ8HfmEZ5IhHC6/uKkv0Ec="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/package-management/librepo/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/librepo/default.nix index 9d7683647e..d19b1f868c 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/librepo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/librepo/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - version = "1.14.4"; + version = "1.14.5"; pname = "librepo"; outputs = [ "out" "dev" "py" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "rpm-software-management"; repo = "librepo"; rev = version; - sha256 = "sha256-CdYV/Dj8tqD/4qYvjWo2d1q9TiD7mYZtHNssxOvdIdI="; + sha256 = "sha256-4Y6ht/mKQmjBI9CZuQg4DmuyTM4KbqQcCb9jmUtapLY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/package-management/microdnf/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/microdnf/default.nix index 597fc5cc11..ac3f2b6a08 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/microdnf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/microdnf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microdnf"; - version = "3.9.0"; + version = "3.9.1"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = pname; rev = version; - sha256 = "sha256-PDvA25QSju16d83f0UVpUiDU8XDuC2dKRi3LaItFRmk="; + sha256 = "sha256-/6yMHjB9HNEEQuAc8zEvmjjl6wur0jByS1hLz39+rHI="; }; nativeBuildInputs = [ pkg-config cmake gettext help2man ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/micromamba/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/micromamba/default.nix index 70443695e0..305e996e0d 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/micromamba/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/micromamba/default.nix @@ -44,13 +44,13 @@ let in stdenv.mkDerivation rec { pname = "micromamba"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; rev = "micromamba-" + version; - sha256 = "sha256-CszDmt3SElHo1D2sNy2tPhZ43YD3pDjT8+fp2PVk+7Y="; + sha256 = "sha256-aTScTM1jX1WIrAVkAvp37fMa+05teLJnVdyIwtYq7mY="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-prefetch/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix-prefetch/default.nix index 03d51213b3..d216d35f22 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix-prefetch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix-prefetch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, installShellFiles, makeWrapper, asciidoc +{ lib, stdenv, fetchFromGitHub, fetchpatch, installShellFiles, makeWrapper, asciidoc , docbook_xml_dtd_45, git, docbook_xsl, libxml2, libxslt, coreutils, gawk , gnugrep, gnused, jq, nix }: @@ -17,6 +17,14 @@ stdenv.mkDerivation rec { ''; }; + patches = [ + (fetchpatch { + name = "fix-prefetching-hash-key.patch"; + url = "https://github.com/msteen/nix-prefetch/commit/877f80ac7e91d684857e2c940cdb3c423efa1833.patch"; + hash = "sha256-nkVQ2c+zezPQBOCDeMg+GHW3uz9EBnHIT+ZafdC8nQQ="; + }) + ]; + postPatch = '' lib=$out/lib/${pname} diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-template/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix-template/default.nix index 948f1b8008..034641ab48 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix-template/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix-template/default.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "nix-template"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { name = "${pname}-${version}-src"; owner = "jonringer"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5redgssfwbNEgpjmakIcU8cL4Xg1kPvyK88v+xMqAtw="; + sha256 = "sha256-5Xxv9TH5rGA4VU/64YarrBIOrROWjFu3RYRcoNo70UA="; }; - cargoSha256 = "sha256-d4gxOIpgtVBpqy4QGW4/UB/FP94CS+yzS8GCjRVaXOM="; + cargoSha256 = "sha256-GvIE46NXNWg1kSEbffvOCwVDr0YmVMo8C8+52RDEwco="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/tools/security/cryptomator/default.nix b/third_party/nixpkgs/pkgs/tools/security/cryptomator/default.nix index 19387045e7..1e6833f3a8 100644 --- a/third_party/nixpkgs/pkgs/tools/security/cryptomator/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/cryptomator/default.nix @@ -6,13 +6,13 @@ let pname = "cryptomator"; - version = "1.6.13"; + version = "1.6.14"; src = fetchFromGitHub { owner = "cryptomator"; repo = "cryptomator"; rev = version; - sha256 = "sha256-xQxCSWbovdecTFWFDFu2K+lbA6+bSV2l2kk+R/hFcQ0="; + sha256 = "sha256-ArOYL3xj2HiXXu1Bymd5mciMsmikCDvxr5M3LMqZgYA="; }; # perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB) @@ -37,7 +37,7 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-SFiYHUH1Et7/SgciIvLcQGh54Z3fDVp22jSvDavXPjE="; + outputHash = "sha256-svpz1mHCHNQGWc+CBroAPvW4cXQdYuqFkK4JSmf6kXE="; doCheck = false; }; diff --git a/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix b/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix index 904af7e566..bd0c7a858e 100644 --- a/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix @@ -1,4 +1,10 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule +, doppler +, fetchFromGitHub +, installShellFiles +, lib +, testers +}: buildGoModule rec { pname = "doppler"; @@ -13,15 +19,29 @@ buildGoModule rec { vendorSha256 = "sha256-evG1M0ZHfn9hsMsSncwxF5Hr/VJ7y6Ir0D2gHJaunBo="; - ldflags = [ "-X github.com/DopplerHQ/cli/pkg/version.ProgramVersion=v${version}" ]; + ldflags = [ + "-s -w" + "-X github.com/DopplerHQ/cli/pkg/version.ProgramVersion=v${version}" + ]; + + nativeBuildInputs = [ installShellFiles ]; postInstall = '' mv $out/bin/cli $out/bin/doppler + installShellCompletion --cmd doppler \ + --bash <($out/bin/doppler completion bash) \ + --fish <($out/bin/doppler completion fish) \ + --zsh <($out/bin/doppler completion zsh) ''; + passthru.tests.version = testers.testVersion { + package = doppler; + version = "v${version}"; + }; + meta = with lib; { - homepage = "https://doppler.com"; description = "The official CLI for interacting with your Doppler Enclave secrets and configuration"; + homepage = "https://doppler.com"; license = licenses.asl20; maintainers = with maintainers; [ lucperkins ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/security/echidna/default.nix b/third_party/nixpkgs/pkgs/tools/security/echidna/default.nix index 88deac03a8..ae4a75902a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/echidna/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/echidna/default.nix @@ -1,5 +1,4 @@ { lib -, fetchpatch , fetchFromGitHub # Haskell deps , mkDerivation, aeson, ansi-terminal, base, base16-bytestring, binary, brick @@ -8,19 +7,24 @@ , MonadRandom, mtl, optparse-applicative, process, random, stm, tasty , tasty-hunit, tasty-quickcheck, temporary, text, transformers , unix, unliftio , unliftio-core, unordered-containers, vector, vector-instances, vty -, wl-pprint-annotated, word8, yaml , extra, ListLike, semver +, wl-pprint-annotated, word8, yaml, extra, ListLike, semver }: mkDerivation rec { pname = "echidna"; - version = "1.7.3"; + version = "2.0.3"; src = fetchFromGitHub { owner = "crytic"; repo = "echidna"; rev = "v${version}"; - sha256 = "sha256-NkAAXYa1bbCNUO0eDM7LQbyC3//RRFAKmEHGH2Dhl/M="; + sha256 = "sha256-ZLk3K00O6aERf+G5SagDVUk1/ba9U+9n9dqCImkczJs="; }; + # NOTE: echidna is behind with aeson because of hevm, this patch updates + # the code to work with the major aeson update that broke the build + # it's temporary until hevm version 0.50.0 is released - https://github.com/ethereum/hevm/milestone/1 + patches = [ ./echidna-update-aeson.patch ]; + isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51,4 +55,5 @@ mkDerivation rec { license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ arturcygan ]; platforms = lib.platforms.unix; + mainProgram = "echidna-test"; } diff --git a/third_party/nixpkgs/pkgs/tools/security/echidna/echidna-update-aeson.patch b/third_party/nixpkgs/pkgs/tools/security/echidna/echidna-update-aeson.patch new file mode 100644 index 0000000000..a8c1b8f700 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/echidna/echidna-update-aeson.patch @@ -0,0 +1,38 @@ +diff --git a/lib/Echidna/Config.hs b/lib/Echidna/Config.hs +index f8d5777..3d761fe 100644 +--- a/lib/Echidna/Config.hs ++++ b/lib/Echidna/Config.hs +@@ -13,8 +13,8 @@ import Control.Monad.State (StateT(..), runStateT) + import Control.Monad.Trans (lift) + import Data.Bool (bool) + import Data.Aeson ++import Data.Aeson.KeyMap (keys) + import Data.Has (Has(..)) +-import Data.HashMap.Strict (keys) + import Data.HashSet (fromList, insert, difference) + import Data.Maybe (fromMaybe) + import Data.Text (isPrefixOf) +@@ -23,11 +23,13 @@ import EVM.Types (w256) + + import qualified Control.Monad.Fail as M (MonadFail(..)) + import qualified Data.ByteString as BS ++import qualified Data.Aeson.Key as Key ++import qualified Data.HashSet as HS + import qualified Data.List.NonEmpty as NE + import qualified Data.Yaml as Y + + import Echidna.Test +-import Echidna.Types.Campaign ++import Echidna.Types.Campaign + import Echidna.Mutator.Corpus (defaultMutationConsts) + import Echidna.Types.Config (EConfigWithUsage(..), EConfig(..)) + import Echidna.Types.Solidity +@@ -52,7 +54,7 @@ instance FromJSON EConfigWithUsage where + _ -> mempty + (c, ks) <- runStateT (parser v') $ fromList [] + let found = fromList (keys v') +- return $ EConfigWithUsage c (found `difference` ks) (ks `difference` found) ++ return $ EConfigWithUsage c (HS.map Key.toText $ found `difference` ks) (HS.map Key.toText $ ks `difference` found) + -- this parser runs in StateT and comes equipped with the following + -- equivalent unary operators: + -- x .:? k (Parser) <==> x ..:? k (StateT) diff --git a/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix b/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix index 27f2589fec..b7c909bfcc 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.14.5"; + version = "1.14.6"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -21,10 +21,10 @@ buildGoModule rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MFnenWoInS2vWySa0IxKAFLYF9VHmPaL0eGM27b1wpI="; + sha256 = "sha256-TTifpIZdv2KVsWQGHR1seYL+A8MSmngnvm/zUqrz5CM="; }; - vendorSha256 = "sha256-clJAt/SZCLlLnYf2tmR9nmsbZ0SzMj7x+1Ft9dfEdJ4="; + vendorSha256 = "sha256-57fvb0UF90S+OhZcxi5ZFMOLXW72kKVjls5cia9pitA="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/pass/default.nix b/third_party/nixpkgs/pkgs/tools/security/pass/default.nix index f8692edead..afb6d2e0dc 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pass/default.nix @@ -31,7 +31,8 @@ let selected = [ pass ] ++ extensions passExtensions ++ lib.optional tombPluginSupport passExtensions.tomb; in buildEnv { - name = "pass-extensions-env"; + # lib.getExe looks for name, so we keep it the same as mainProgram + name = "pass"; paths = selected; nativeBuildInputs = [ makeWrapper ]; buildInputs = concatMap (x: x.buildInputs) selected; @@ -156,6 +157,7 @@ stdenv.mkDerivation rec { description = "Stores, retrieves, generates, and synchronizes passwords securely"; homepage = "https://www.passwordstore.org/"; license = licenses.gpl2Plus; + mainProgram = "pass"; maintainers = with maintainers; [ lovek323 fpletz tadfisher globin ma27 ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/tools/security/tor/default.nix b/third_party/nixpkgs/pkgs/tools/security/tor/default.nix index 75492e8773..db6f890eda 100644 --- a/third_party/nixpkgs/pkgs/tools/security/tor/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/tor/default.nix @@ -30,11 +30,11 @@ let in stdenv.mkDerivation rec { pname = "tor"; - version = "0.4.7.8"; + version = "0.4.7.10"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "sha256-nppcZ60qzdXw+L4U7Vkf7QdrFwir+DRAZpkKD6Zv4ZU="; + sha256 = "sha256-ZH5W36Weo22rBSAn/Px2Y5BcgmwDUJNjxFaQDs1DWls="; }; outputs = [ "out" "geoip" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/trueseeing/default.nix b/third_party/nixpkgs/pkgs/tools/security/trueseeing/default.nix index 4aa9e1852a..49b12c3c9d 100644 --- a/third_party/nixpkgs/pkgs/tools/security/trueseeing/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/trueseeing/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "trueseeing"; - version = "2.1.4"; + version = "2.1.5"; format = "flit"; src = fetchFromGitHub { owner = "alterakey"; repo = pname; rev = "v${version}"; - hash = "sha256-zc0AOv7OFmEPLl//eykbh538rM2j4kXBLHt5bgK1IRY="; + hash = "sha256-7iQOQ81k2bPBber4ewyvDy82s26j4P3Vv8MzSs04KAw="; }; nativeBuildInputs = with python3.pkgs; [ @@ -26,8 +26,14 @@ python3.pkgs.buildPythonApplication rec { lxml pypubsub pyyaml + docker ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "attrs~=21.4" "attrs>=21.4" + ''; + # Project has no tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix b/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix index e7b7121270..d554405f89 100644 --- a/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gdu"; - version = "5.16.0"; + version = "5.17.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-e2fZJ1HRoi2uMyCWgjPIXs6Q6neg8XEqtC8YcUev+60="; + sha256 = "sha256-8YC0KUf+kSVnSt1436Ob1CdLJT/w5VYDOEHV0mDkO7E="; }; - vendorSha256 = "sha256-42hXOF/jeOc7WXqq6nBgYv5Qjypszxp9IboxchKQbN8="; + vendorSha256 = "sha256-rppVLeX1VDOW+eUHSM77DgY2KjOrUHdyqGWRAYRIbUE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/natscli/default.nix b/third_party/nixpkgs/pkgs/tools/system/natscli/default.nix index 4b9b313495..8b461fa7f3 100644 --- a/third_party/nixpkgs/pkgs/tools/system/natscli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/natscli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "natscli"; - version = "0.0.33"; + version = "0.0.34"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-x1alZ+184dXXL2GeDSnvRjTW5P6GlJCrWL50663/pDo="; + sha256 = "sha256-tDs0OrMeWLhBUnngJRBmAauwMA/zdMC4ED7xcCED4Zs="; }; - vendorSha256 = "sha256-f5ozwXpryB7+alJ/ydfpZowJGowcOn6dOHK9pmUSf5c="; + vendorSha256 = "sha256-Wv0V1/BbO8cP9Qj1TBCDpPTpbv3xzT8eCLPBhCPxRKo="; meta = with lib; { description = "NATS Command Line Interface"; 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 6ae1567349..7dfe15d67d 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix @@ -13,8 +13,8 @@ let sha256 = "1fv53wikx745kci86xrsq9kfsgv0a65srhywdw32cab1wywwpn2z"; # specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`. - specVersion = "4.133.0"; - specSha256 = "1jcjfnagjihcy03fcmn5sghdf7a80798xjgj1x7z3ncqwd5aggwg"; + specVersion = "4.135.0"; + specSha256 = "082rkpj8yl6s75y5i9zz287059fxf6zh9hdmdwa463lr6ig90kl4"; spec = fetchurl { url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml"; sha256 = specSha256; diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wdomirror/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/wdomirror/default.nix index 5d69ce66f6..10facbca50 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/wdomirror/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/wdomirror/default.nix @@ -40,8 +40,14 @@ stdenv.mkDerivation { runHook postInstall ''; + postPatch = '' + substituteInPlace meson.build \ + --replace "werror=true" "werror=false" + ''; + meta = with lib; { description = "Mirrors an output of a wlroots compositor to a window"; + homepage = "https://github.com/progandy/wdomirror"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ jpas ]; diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index 16b228a27b..5131cdb02b 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -1245,6 +1245,7 @@ mapAliases ({ rimshot = throw "rimshot has been removed, because it is broken and no longer maintained upstream"; # Added 2022-01-15 ring-daemon = jami-daemon; # Added 2021-10-26 rkt = throw "rkt was archived by upstream"; # Added 2020-05-16 + rls = throw "rls was discontinued upstream, use rust-analyzer instead"; # Added 2022-09-06 rng_tools = throw "'rng_tools' has been renamed to/replaced by 'rng-tools'"; # Converted to throw 2022-02-22 robomongo = throw "'robomongo' has been renamed to/replaced by 'robo3t'"; # Converted to throw 2022-02-22 rockbox_utility = rockbox-utility; # Added 2022-03-17 diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index bd81938264..0db927da53 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -546,6 +546,8 @@ with pkgs; erosmb = callPackage ../tools/security/erosmb { }; + octosql = callPackage ../tools/misc/octosql { }; + onesixtyone = callPackage ../tools/security/onesixtyone {}; oletools = with python3.pkgs; toPythonApplication oletools; @@ -5177,6 +5179,8 @@ with pkgs; evdevremapkeys = callPackage ../tools/inputmethods/evdevremapkeys { }; + eyedropper = callPackage ../applications/graphics/eyedropper { }; + persistent-evdev = python3Packages.callPackage ../servers/persistent-evdev { }; evscript = callPackage ../tools/inputmethods/evscript { }; @@ -6627,6 +6631,8 @@ with pkgs; gawkInteractive = gawk.override { interactive = true; }; + gatk = callPackage ../applications/science/biology/gatk {} ; + gbdfed = callPackage ../tools/misc/gbdfed { gtk = gtk2-x11; }; @@ -8284,6 +8290,8 @@ with pkgs; minidlna = callPackage ../tools/networking/minidlna { }; + miniplayer = callPackage ../applications/audio/miniplayer { }; + minipro = callPackage ../tools/misc/minipro { }; minisign = callPackage ../tools/security/minisign { }; @@ -9885,9 +9893,7 @@ with pkgs; pfstools = libsForQt5.callPackage ../tools/graphics/pfstools { }; - phoc = callPackage ../applications/misc/phoc { - wlroots = wlroots_0_14; - }; + phoc = callPackage ../applications/misc/phoc { }; phockup = callPackage ../applications/misc/phockup { }; @@ -11501,6 +11507,8 @@ with pkgs; thefuck = python3Packages.callPackage ../tools/misc/thefuck { }; + theme-sh = callPackage ../tools/misc/theme-sh { }; + thicket = callPackage ../applications/version-management/git-and-tools/thicket { }; thiefmd = callPackage ../applications/editors/thiefmd { }; @@ -14619,7 +14627,6 @@ with pkgs; ograc = callPackage ../development/tools/rust/ograc { }; rhack = callPackage ../development/tools/rust/rhack { }; - inherit (rustPackages) rls; roogle = callPackage ../development/tools/rust/roogle { }; rustfmt = rustPackages.rustfmt; rustracer = callPackage ../development/tools/rust/racer { @@ -15348,8 +15355,6 @@ with pkgs; inherit (darwin) libobjc; }; defaultGemConfig = callPackage ../development/ruby-modules/gem-config { - # recent v8 doesn't build on nixpkgs Darwin yet. https://github.com/NixOS/nixpkgs/issues/158076 - v8 = if stdenv.isDarwin then v8_8_x else v8; inherit (darwin) DarwinTools cctools; inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -16653,6 +16658,8 @@ with pkgs; lenmus = callPackage ../applications/misc/lenmus { }; + lightningcss = callPackage ../development/tools/lightningcss { }; + libtool = libtool_2; libtool_1_5 = callPackage ../development/tools/misc/libtool { }; @@ -16735,7 +16742,6 @@ with pkgs; msitools = callPackage ../development/tools/misc/msitools { }; haskell-ci = haskell.lib.compose.justStaticExecutables haskellPackages.haskell-ci; - haskell-ci-unstable = lowPrio (haskell.lib.compose.justStaticExecutables haskellPackages.haskell-ci-unstable); neoload = callPackage ../development/tools/neoload { licenseAccepted = (config.neoload.accept_license or false); @@ -16748,6 +16754,8 @@ with pkgs; nailgun = callPackage ../development/tools/nailgun { }; + nil = callPackage ../development/tools/nil { }; + ninja = callPackage ../development/tools/build-managers/ninja { }; nimbo = with python3Packages; callPackage ../applications/misc/nimbo { }; @@ -18944,6 +18952,8 @@ with pkgs; json2hcl = callPackage ../development/tools/json2hcl { }; + json2tsv = callPackage ../development/tools/json2tsv { }; + json2yaml = haskell.lib.compose.justStaticExecutables haskellPackages.json2yaml; json-glib = callPackage ../development/libraries/json-glib { }; @@ -21932,7 +21942,7 @@ with pkgs; ucommon = callPackage ../development/libraries/ucommon { }; - v8 = callPackage ../development/libraries/v8 { }; + v8 = darwin.apple_sdk_11_0.callPackage ../development/libraries/v8 { }; v8_8_x = callPackage ../development/libraries/v8/8_x.nix { }; @@ -23368,8 +23378,6 @@ with pkgs; tpmSupport = true; }; - ovmfvartool = callPackage ../applications/virtualization/ovmfvartool { }; - ops = callPackage ../applications/virtualization/ops { }; seabios = callPackage ../applications/virtualization/seabios { }; @@ -23454,10 +23462,7 @@ with pkgs; }; prometheus-nextcloud-exporter = callPackage ../servers/monitoring/prometheus/nextcloud-exporter.nix { }; prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { }; - prometheus-nginxlog-exporter = callPackage ../servers/monitoring/prometheus/nginxlog-exporter.nix { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + prometheus-nginxlog-exporter = callPackage ../servers/monitoring/prometheus/nginxlog-exporter.nix { }; prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; }; @@ -28919,6 +28924,8 @@ with pkgs; ktunnel = callPackage ../applications/networking/cluster/ktunnel { }; + pinniped = callPackage ../applications/networking/cluster/pinniped { }; + pgo-client = callPackage ../applications/networking/cluster/pgo-client { }; popeye = callPackage ../applications/networking/cluster/popeye { }; @@ -29537,6 +29544,8 @@ with pkgs; rofi-mpd = callPackage ../applications/audio/rofi-mpd { }; + rofi-bluetooth = callPackage ../applications/misc/rofi-bluetooth { }; + rofi-calc = callPackage ../applications/science/math/rofi-calc { }; rofi-emoji = callPackage ../applications/misc/rofi-emoji { }; @@ -30322,6 +30331,8 @@ with pkgs; piston-cli = callPackage ../tools/misc/piston-cli { python3Packages = python39Packages; }; + pizarra = callPackage ../applications/graphics/pizarra { }; + plater = libsForQt5.callPackage ../applications/misc/plater { }; plexamp = callPackage ../applications/audio/plexamp { }; @@ -30546,33 +30557,44 @@ with pkgs; quiterss = libsForQt514.callPackage ../applications/networking/newsreaders/quiterss {}; quodlibet = callPackage ../applications/audio/quodlibet { - keybinder3 = null; - libmodplug = null; + inherit (gnome) adwaita-icon-theme; kakasi = null; + keybinder3 = null; libappindicator-gtk3 = null; + libmodplug = null; }; quodlibet-without-gst-plugins = quodlibet.override { - withGstPlugins = false; tag = "-without-gst-plugins"; + withGstPlugins = false; }; - quodlibet-xine = quodlibet.override { xineBackend = true; tag = "-xine"; }; + quodlibet-xine = quodlibet.override { + tag = "-xine"; + withGstreamerBackend = false; + withXineBackend = true; + }; quodlibet-full = quodlibet.override { inherit gtksourceview webkitgtk; + kakasi = kakasi; + keybinder3 = keybinder3; + libappindicator-gtk3 = libappindicator-gtk3; + libmodplug = libmodplug; + tag = "-full"; withDbusPython = true; - withPyInotify = true; withMusicBrainzNgs = true; withPahoMqtt = true; - keybinder3 = keybinder3; - libmodplug = libmodplug; - kakasi = kakasi; - libappindicator-gtk3 = libappindicator-gtk3; - tag = "-full"; + withPyInotify = true; + withPypresence = true; + withSoco = true; }; - quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; }; + quodlibet-xine-full = quodlibet-full.override { + tag = "-xine-full"; + withGstreamerBackend = false; + withXineBackend = true; + }; qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { }; diff --git a/third_party/nixpkgs/pkgs/top-level/beam-packages.nix b/third_party/nixpkgs/pkgs/top-level/beam-packages.nix index 89d2342f0c..b61b69cad9 100644 --- a/third_party/nixpkgs/pkgs/top-level/beam-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/beam-packages.nix @@ -1,93 +1,101 @@ -{ beam, callPackage, wxGTK30, buildPackages, stdenv +{ beam +, callPackage +, wxGTK30 +, buildPackages +, stdenv , wxSupport ? true , systemdSupport ? stdenv.isLinux }: -with beam; { - lib = callPackage ../development/beam-modules/lib.nix { }; +let + self = beam; +in + +{ + beamLib = callPackage ../development/beam-modules/lib.nix { }; # R24 is the default version. # The main switch to change default Erlang version. defaultVersion = "erlangR24"; # Each - interpreters = with beam.interpreters; { + interpreters = { - erlang = beam.interpreters.${defaultVersion}; - erlang_odbc = beam.interpreters."${defaultVersion}_odbc"; - erlang_javac = beam.interpreters."${defaultVersion}_javac"; - erlang_odbc_javac = beam.interpreters."${defaultVersion}_odbc_javac"; + erlang = self.interpreters.${self.defaultVersion}; + erlang_odbc = self.interpreters."${self.defaultVersion}_odbc"; + erlang_javac = self.interpreters."${self.defaultVersion}_javac"; + erlang_odbc_javac = self.interpreters."${self.defaultVersion}_odbc_javac"; # Standard Erlang versions, using the generic builder. # R25 - erlangR25 = lib.callErlang ../development/interpreters/erlang/R25.nix { + erlangR25 = self.beamLib.callErlang ../development/interpreters/erlang/R25.nix { wxGTK = wxGTK30; parallelBuild = true; autoconf = buildPackages.autoconf269; inherit wxSupport systemdSupport; }; - erlangR25_odbc = erlangR25.override { odbcSupport = true; }; - erlangR25_javac = erlangR25.override { javacSupport = true; }; - erlangR25_odbc_javac = erlangR25.override { + erlangR25_odbc = self.interpreters.erlangR25.override { odbcSupport = true; }; + erlangR25_javac = self.interpreters.erlangR25.override { javacSupport = true; }; + erlangR25_odbc_javac = self.interpreters.erlangR25.override { javacSupport = true; odbcSupport = true; }; # R24 - erlangR24 = lib.callErlang ../development/interpreters/erlang/R24.nix { + erlangR24 = self.beamLib.callErlang ../development/interpreters/erlang/R24.nix { wxGTK = wxGTK30; # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; autoconf = buildPackages.autoconf269; inherit wxSupport systemdSupport; }; - erlangR24_odbc = erlangR24.override { odbcSupport = true; }; - erlangR24_javac = erlangR24.override { javacSupport = true; }; - erlangR24_odbc_javac = erlangR24.override { + erlangR24_odbc = self.interpreters.erlangR24.override { odbcSupport = true; }; + erlangR24_javac = self.interpreters.erlangR24.override { javacSupport = true; }; + erlangR24_odbc_javac = self.interpreters.erlangR24.override { javacSupport = true; odbcSupport = true; }; # R23 - erlangR23 = lib.callErlang ../development/interpreters/erlang/R23.nix { + erlangR23 = self.beamLib.callErlang ../development/interpreters/erlang/R23.nix { wxGTK = wxGTK30; # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; autoconf = buildPackages.autoconf269; inherit wxSupport systemdSupport; }; - erlangR23_odbc = erlangR23.override { odbcSupport = true; }; - erlangR23_javac = erlangR23.override { javacSupport = true; }; - erlangR23_odbc_javac = erlangR23.override { + erlangR23_odbc = self.interpreters.erlangR23.override { odbcSupport = true; }; + erlangR23_javac = self.interpreters.erlangR23.override { javacSupport = true; }; + erlangR23_odbc_javac = self.interpreters.erlangR23.override { javacSupport = true; odbcSupport = true; }; # R22 - erlangR22 = lib.callErlang ../development/interpreters/erlang/R22.nix { + erlangR22 = self.beamLib.callErlang ../development/interpreters/erlang/R22.nix { wxGTK = wxGTK30; # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; autoconf = buildPackages.autoconf269; inherit wxSupport systemdSupport; }; - erlangR22_odbc = erlangR22.override { odbcSupport = true; }; - erlangR22_javac = erlangR22.override { javacSupport = true; }; - erlangR22_odbc_javac = erlangR22.override { + erlangR22_odbc = self.interpreters.erlangR22.override { odbcSupport = true; }; + erlangR22_javac = self.interpreters.erlangR22.override { javacSupport = true; }; + erlangR22_odbc_javac = self.interpreters.erlangR22.override { javacSupport = true; odbcSupport = true; }; # R21 - erlangR21 = lib.callErlang ../development/interpreters/erlang/R21.nix { + erlangR21 = self.beamLib.callErlang ../development/interpreters/erlang/R21.nix { wxGTK = wxGTK30; autoconf = buildPackages.autoconf269; inherit wxSupport systemdSupport; }; - erlangR21_odbc = erlangR21.override { odbcSupport = true; }; - erlangR21_javac = erlangR21.override { javacSupport = true; }; - erlangR21_odbc_javac = erlangR21.override { + erlangR21_odbc = self.interpreters.erlangR21.override { odbcSupport = true; }; + erlangR21_javac = self.interpreters.erlangR21.override { javacSupport = true; }; + erlangR21_odbc_javac = self.interpreters.erlangR21.override { javacSupport = true; odbcSupport = true; }; @@ -95,10 +103,10 @@ with beam; { # Other Beam languages. These are built with `beam.interpreters.erlang`. To # access for example elixir built with different version of Erlang, use # `beam.packages.erlangR24.elixir`. - inherit (packages.erlang) + inherit (self.packages.erlang) elixir elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir_ls; - inherit (packages.erlang) lfe lfe_1_3; + inherit (self.packages.erlang) lfe lfe_1_3; }; # Helper function to generate package set with a specific Erlang version. @@ -109,12 +117,12 @@ with beam; { # appropriate Erlang/OTP version. packages = { # Packages built with default Erlang version. - erlang = packages.${defaultVersion}; + erlang = self.packages.${self.defaultVersion}; - erlangR25 = packagesWith interpreters.erlangR25; - erlangR24 = packagesWith interpreters.erlangR24; - erlangR23 = packagesWith interpreters.erlangR23; - erlangR22 = packagesWith interpreters.erlangR22; - erlangR21 = packagesWith interpreters.erlangR21; + erlangR25 = self.packagesWith self.interpreters.erlangR25; + erlangR24 = self.packagesWith self.interpreters.erlangR24; + erlangR23 = self.packagesWith self.interpreters.erlangR23; + erlangR22 = self.packagesWith self.interpreters.erlangR22; + erlangR21 = self.packagesWith self.interpreters.erlangR21; }; } diff --git a/third_party/nixpkgs/pkgs/top-level/config.nix b/third_party/nixpkgs/pkgs/top-level/config.nix index 0ab29d8516..4fedad00f2 100644 --- a/third_party/nixpkgs/pkgs/top-level/config.nix +++ b/third_party/nixpkgs/pkgs/top-level/config.nix @@ -35,6 +35,7 @@ let warnUndeclaredOptions = mkOption { description = "Whether to warn when config contains an unrecognized attribute."; + type = types.bool; default = false; }; diff --git a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix index dbfc7bb1ed..51d883be39 100644 --- a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix @@ -11,7 +11,7 @@ let metaFetch = import ../build-support/coq/meta-fetch/default.nix {inherit lib stdenv fetchzip; }; - mkCoqDerivation = callPackage ../build-support/coq {}; + mkCoqDerivation = lib.makeOverridable (callPackage ../build-support/coq {}); contribs = recurseIntoAttrs (callPackage ../development/coq-modules/contribs {}); diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index 04dfa7365d..a8b5742aae 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -78,6 +78,8 @@ let bigstring = callPackage ../development/ocaml-modules/bigstring { }; + bindlib = callPackage ../development/ocaml-modules/bindlib { }; + biocaml = callPackage ../development/ocaml-modules/biocaml { }; bistro = callPackage ../development/ocaml-modules/bistro { }; @@ -274,6 +276,10 @@ let ctypes = callPackage ../development/ocaml-modules/ctypes { }; + ctypes_stubs_js = callPackage ../development/ocaml-modules/ctypes_stubs_js { + inherit (pkgs) nodejs; + }; + dap = callPackage ../development/ocaml-modules/dap { }; data-encoding = callPackage ../development/ocaml-modules/data-encoding { }; @@ -282,6 +288,8 @@ let decompress = callPackage ../development/ocaml-modules/decompress { }; + dedukti = callPackage ../development/ocaml-modules/dedukti { }; + diet = callPackage ../development/ocaml-modules/diet { }; digestif = callPackage ../development/ocaml-modules/digestif { }; @@ -533,6 +541,8 @@ let integers = callPackage ../development/ocaml-modules/integers { }; + integers_stubs_js = callPackage ../development/ocaml-modules/integers_stubs_js { }; + io-page = callPackage ../development/ocaml-modules/io-page { }; ipaddr = callPackage ../development/ocaml-modules/ipaddr { }; @@ -692,6 +702,8 @@ let ladspa = callPackage ../development/ocaml-modules/ladspa { }; + lambdapi = callPackage ../development/ocaml-modules/lambdapi { }; + lambdasoup = callPackage ../development/ocaml-modules/lambdasoup { }; lambda-term = callPackage ../development/ocaml-modules/lambda-term { }; @@ -1171,6 +1183,8 @@ let ppxlib = callPackage ../development/ocaml-modules/ppxlib { }; + pratter = callPackage ../development/ocaml-modules/pratter { }; + psmt2-frontend = callPackage ../development/ocaml-modules/psmt2-frontend { }; psq = callPackage ../development/ocaml-modules/psq { }; @@ -1221,6 +1235,8 @@ let tcpip = callPackage ../development/ocaml-modules/tcpip { }; + timed = callPackage ../development/ocaml-modules/timed { }; + tiny_httpd = callPackage ../development/ocaml-modules/tiny_httpd { }; tsort = callPackage ../development/ocaml-modules/tsort { }; @@ -1421,6 +1437,8 @@ let terminal_size = callPackage ../development/ocaml-modules/terminal_size { }; + tezos-base58 = callPackage ../development/ocaml-modules/tezos-base58 { }; + theora = callPackage ../development/ocaml-modules/theora { }; toml = callPackage ../development/ocaml-modules/toml { }; diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index 5ba002444a..a1e4469769 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -3251,6 +3251,8 @@ in { fire = callPackage ../development/python-modules/fire { }; + fireflyalgorithm = callPackage ../development/python-modules/fireflyalgorithm { }; + firetv = callPackage ../development/python-modules/firetv { }; first = callPackage ../development/python-modules/first { }; @@ -4804,6 +4806,8 @@ in { jsonrpc-websocket = callPackage ../development/python-modules/jsonrpc-websocket { }; + jsons = callPackage ../development/python-modules/jsons { }; + jsonschema = callPackage ../development/python-modules/jsonschema { }; jsonstreams = callPackage ../development/python-modules/jsonstreams { }; @@ -5057,6 +5061,8 @@ in { leb128 = callPackage ../development/python-modules/leb128 { }; + led-ble = callPackage ../development/python-modules/led-ble { }; + ledger = (toPythonModule (pkgs.ledger.override { usePython = true; python3 = python; @@ -6480,6 +6486,8 @@ in { ovh = callPackage ../development/python-modules/ovh { }; + ovmfvartool = callPackage ../development/python-modules/ovmfvartool { }; + ovoenergy = callPackage ../development/python-modules/ovoenergy { }; owslib = callPackage ../development/python-modules/owslib { }; @@ -7241,6 +7249,8 @@ in { inherit (pkgs.darwin.apple_sdk.frameworks) IOKit; }; + psutil-home-assistant = callPackage ../development/python-modules/psutil-home-assistant { }; + psycopg = callPackage ../development/python-modules/psycopg { }; psycopg2 = callPackage ../development/python-modules/psycopg2 { }; @@ -10963,6 +10973,8 @@ in { toml = callPackage ../development/python-modules/toml { }; + toml-adapt = callPackage ../development/python-modules/toml-adapt { }; + tomli = callPackage ../development/python-modules/tomli { }; tomli-w = callPackage ../development/python-modules/tomli-w { };