diff options
1391 files changed, 29097 insertions, 15249 deletions
diff --git a/.github/workflows/check-nix-format.yml b/.github/workflows/check-nix-format.yml index 6003c9a0b8419..131803213cb57 100644 --- a/.github/workflows/check-nix-format.yml +++ b/.github/workflows/check-nix-format.yml @@ -39,6 +39,9 @@ jobs: pkgs/development/cuda-modules pkgs/test/cuda pkgs/top-level/cuda-packages.nix + NIX_FMT_PATHS_MAINTAINERS: | + maintainers/maintainer-list.nix + maintainers/team-list.nix NIX_FMT_PATHS_K3S: | nixos/modules/services/cluster/k3s nixos/tests/k3s diff --git a/doc/default.nix b/doc/default.nix index 14c828b02a061..fd623cf15b8c8 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -2,6 +2,7 @@ let inherit (pkgs) lib; inherit (lib) hasPrefix removePrefix; + fs = lib.fileset; common = import ./common.nix; @@ -99,20 +100,30 @@ in pkgs.stdenv.mkDerivation { nixos-render-docs ]; - src = ./.; + src = fs.toSource { + root = ./.; + fileset = fs.unions [ + (fs.fileFilter (file: + file.hasExt "md" + || file.hasExt "md.in" + ) ./.) + ./style.css + ./anchor-use.js + ./anchor.min.js + ./manpage-urls.json + ]; + }; postPatch = '' ln -s ${optionsDoc.optionsJSON}/share/doc/nixos/options.json ./config-options.json ''; - buildPhase = let - pythonInterpreterTable = pkgs.callPackage ./doc-support/python-interpreter-table.nix {}; - pythonSection = with lib.strings; replaceStrings - [ "@python-interpreter-table@" ] - [ pythonInterpreterTable ] - (readFile ./languages-frameworks/python.section.md); - in '' - cp ${builtins.toFile "python.section.md" pythonSection} ./languages-frameworks/python.section.md + pythonInterpreterTable = pkgs.callPackage ./doc-support/python-interpreter-table.nix {}; + + passAsFile = [ "pythonInterpreterTable" ]; + + buildPhase = '' + substituteInPlace ./languages-frameworks/python.section.md --subst-var-by python-interpreter-table "$(<"$pythonInterpreterTablePath")" cat \ ./functions/library.md.in \ diff --git a/doc/functions/library/.gitkeep b/doc/functions/library/.gitkeep deleted file mode 100644 index e69de29bb2d1d..0000000000000 --- a/doc/functions/library/.gitkeep +++ /dev/null diff --git a/doc/languages-frameworks/android.section.md b/doc/languages-frameworks/android.section.md index 1c5687f8ebf1b..d6ed1f35cb0a8 100644 --- a/doc/languages-frameworks/android.section.md +++ b/doc/languages-frameworks/android.section.md @@ -3,10 +3,36 @@ The Android build environment provides three major features and a number of supporting features. +## Using androidenv with Android Studio {#using-androidenv-with-android-studio} + +Use the `android-studio-full` attribute for a very complete Android SDK, including system images: + +```nix +buildInputs = [ android-studio-full ]; +``` + +This is identical to: + +```nix +buildInputs = [ androidStudioPackages.stable.full ]; +``` + +Alternatively, you can pass composeAndroidPackages to the `withSdk` passthru: + +```nix +buildInputs = [ + (android-studio.withSdk (androidenv.composeAndroidPackages { + includeNDK = true; + }).androidsdk) +]; +``` + +These will export ANDROID_SDK_ROOT and ANDROID_NDK_ROOT to the SDK and NDK directories +in the specified Android build environment. + ## Deploying an Android SDK installation with plugins {#deploying-an-android-sdk-installation-with-plugins} -The first use case is deploying the SDK with a desired set of plugins or subsets -of an SDK. +Alternatively, you can deploy the SDK separately with a desired set of plugins, or subsets of an SDK. ```nix with import <nixpkgs> {}; @@ -145,16 +171,14 @@ androidComposition.platform-tools ## Using predefined Android package compositions {#using-predefined-android-package-compositions} In addition to composing an Android package set manually, it is also possible -to use a predefined composition that contains all basic packages for a specific -Android version, such as version 9.0 (API-level 28). +to use a predefined composition that contains a fairly complete set of Android packages: -The following Nix expression can be used to deploy the entire SDK with all basic -plugins: +The following Nix expression can be used to deploy the entire SDK: ```nix with import <nixpkgs> {}; -androidenv.androidPkgs_9_0.androidsdk +androidenv.androidPkgs.androidsdk ``` It is also possible to use one plugin only: @@ -162,50 +186,9 @@ It is also possible to use one plugin only: ```nix with import <nixpkgs> {}; -androidenv.androidPkgs_9_0.platform-tools -``` - -## Building an Android application {#building-an-android-application} - -In addition to the SDK, it is also possible to build an Ant-based Android -project and automatically deploy all the Android plugins that a project -requires. - - -```nix -with import <nixpkgs> {}; - -androidenv.buildApp { - name = "MyAndroidApp"; - src = ./myappsources; - release = true; - - # If release is set to true, you need to specify the following parameters - keyStore = ./keystore; - keyAlias = "myfirstapp"; - keyStorePassword = "mykeystore"; - keyAliasPassword = "myfirstapp"; - - # Any Android SDK parameters that install all the relevant plugins that a - # build requires - platformVersions = [ "24" ]; - - # When we include the NDK, then ndk-build is invoked before Ant gets invoked - includeNDK = true; -} +androidenv.androidPkgs.platform-tools ``` -Aside from the app-specific build parameters (`name`, `src`, `release` and -keystore parameters), the `buildApp {}` function supports all the function -parameters that the SDK composition function (the function shown in the -previous section) supports. - -This build function is particularly useful when it is desired to use -[Hydra](https://nixos.org/hydra): the Nix-based continuous integration solution -to build Android apps. An Android APK gets exposed as a build product and can be -installed on any Android device with a web browser by navigating to the build -result page. - ## Spawning emulator instances {#spawning-emulator-instances} For testing purposes, it can also be quite convenient to automatically generate @@ -349,3 +332,44 @@ To update the expressions run the `generate.sh` script that is stored in the ```bash ./generate.sh ``` + +## Building an Android application with Ant {#building-an-android-application-with-ant} + +In addition to the SDK, it is also possible to build an Ant-based Android +project and automatically deploy all the Android plugins that a project +requires. Most newer Android projects use Gradle, and this is included for historical +purposes. + +```nix +with import <nixpkgs> {}; + +androidenv.buildApp { + name = "MyAndroidApp"; + src = ./myappsources; + release = true; + + # If release is set to true, you need to specify the following parameters + keyStore = ./keystore; + keyAlias = "myfirstapp"; + keyStorePassword = "mykeystore"; + keyAliasPassword = "myfirstapp"; + + # Any Android SDK parameters that install all the relevant plugins that a + # build requires + platformVersions = [ "24" ]; + + # When we include the NDK, then ndk-build is invoked before Ant gets invoked + includeNDK = true; +} +``` + +Aside from the app-specific build parameters (`name`, `src`, `release` and +keystore parameters), the `buildApp {}` function supports all the function +parameters that the SDK composition function (the function shown in the +previous section) supports. + +This build function is particularly useful when it is desired to use +[Hydra](https://nixos.org/hydra): the Nix-based continuous integration solution +to build Android apps. An Android APK gets exposed as a build product and can be +installed on any Android device with a web browser by navigating to the build +result page. diff --git a/flake.nix b/flake.nix index 8df05dc91263f..b22cf56a9b5f7 100644 --- a/flake.nix +++ b/flake.nix @@ -46,7 +46,8 @@ checks = forAllSystems (system: { tarball = jobs.${system}.tarball; - } // lib.optionalAttrs (self.legacyPackages.${system}.stdenv.isLinux) { + # Exclude power64 due to "libressl is not available on the requested hostPlatform" with hostPlatform being power64 + } // lib.optionalAttrs (self.legacyPackages.${system}.stdenv.isLinux && !self.legacyPackages.${system}.targetPlatform.isPower64) { # Test that ensures that the nixosSystem function can accept a lib argument # Note: prefer not to extend or modify `lib`, especially if you want to share reusable modules # alternatives include: `import` a file, or put a custom library in an option or in `_module.args.<libname>` diff --git a/lib/licenses.nix b/lib/licenses.nix index 8dbdf27fa845a..4455171e7a4fb 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -362,6 +362,12 @@ in mkLicense lset) ({ fullName = "Creative Commons Attribution Share Alike 4.0"; }; + cc-sa-10 = { + shortName = "CC-SA-1.0"; + fullName = "Creative Commons Share Alike 1.0"; + url = "https://creativecommons.org/licenses/sa/1.0"; + }; + cddl = { spdxId = "CDDL-1.0"; fullName = "Common Development and Distribution License 1.0"; diff --git a/lib/systems/default.nix b/lib/systems/default.nix index d37ff720edce6..0981122388bb1 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -81,7 +81,7 @@ let && final.parsed.kernel == platform.parsed.kernel; isCompatible = _: throw "2022-05-23: isCompatible has been removed in favor of canExecute, refer to the 22.11 changelog for details"; # Derived meta-data - useLLVM = final.isFreeBSD; + useLLVM = final.isFreeBSD || final.isOpenBSD; libc = /**/ if final.isDarwin then "libSystem" diff --git a/lib/systems/flake-systems.nix b/lib/systems/flake-systems.nix index b1988c6a4fbb0..a68580ff1407b 100644 --- a/lib/systems/flake-systems.nix +++ b/lib/systems/flake-systems.nix @@ -16,12 +16,12 @@ "armv6l-linux" "armv7l-linux" "i686-linux" - "mipsel-linux" + # "mipsel-linux" is excluded because it is not bootstrapped # Other platforms with sufficient support in stdenv which is not formally # mandated by their platform tier. "aarch64-darwin" - "armv5tel-linux" + # "armv5tel-linux" is excluded because it is not bootstrapped "powerpc64le-linux" "riscv64-linux" diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index d2e8f77bec03e..403ffc028f0be 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -535,11 +535,9 @@ rec { name = "riscv-multiplatform"; target = "Image"; autoModules = true; + preferBuiltin = true; baseConfig = "defconfig"; DTB = true; - extraConfig = '' - SERIAL_OF_PLATFORM y - ''; }; }; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 897b3b6d93a0c..407a59b6e6854 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1,67 +1,68 @@ -/* List of NixOS maintainers. - ```nix - handle = { - # Required - name = "Your name"; +/* + List of NixOS maintainers. + ```nix + handle = { + # Required + name = "Your name"; - # Optional, but at least one of email, matrix or githubId must be given - email = "address@example.org"; - matrix = "@user:example.org"; - github = "GithubUsername"; - githubId = your-github-id; + # Optional, but at least one of email, matrix or githubId must be given + email = "address@example.org"; + matrix = "@user:example.org"; + github = "GithubUsername"; + githubId = your-github-id; - keys = [{ - fingerprint = "AAAA BBBB CCCC DDDD EEEE FFFF 0000 1111 2222 3333"; - }]; - }; - ``` + keys = [{ + fingerprint = "AAAA BBBB CCCC DDDD EEEE FFFF 0000 1111 2222 3333"; + }]; + }; + ``` - where + where - - `handle` is the handle you are going to use in nixpkgs expressions, - - `name` is a name that people would know and recognize you by, - - `email` is your maintainer email address, - - `matrix` is your Matrix user ID, - - `github` is your GitHub handle (as it appears in the URL of your profile page, `https://github.com/<userhandle>`), - - `githubId` is your GitHub user ID, which can be found at `https://api.github.com/users/<userhandle>`, - - `keys` is a list of your PGP/GPG key fingerprints. + - `handle` is the handle you are going to use in nixpkgs expressions, + - `name` is a name that people would know and recognize you by, + - `email` is your maintainer email address, + - `matrix` is your Matrix user ID, + - `github` is your GitHub handle (as it appears in the URL of your profile page, `https://github.com/<userhandle>`), + - `githubId` is your GitHub user ID, which can be found at `https://api.github.com/users/<userhandle>`, + - `keys` is a list of your PGP/GPG key fingerprints. - Specifying a GitHub account ensures that you automatically: - - get invited to the @NixOS/nixpkgs-maintainers team ; - - once you are part of the @NixOS org, OfBorg will request you review - pull requests that modify a package for which you are a maintainer. + Specifying a GitHub account ensures that you automatically: + - get invited to the @NixOS/nixpkgs-maintainers team ; + - once you are part of the @NixOS org, OfBorg will request you review + pull requests that modify a package for which you are a maintainer. - `handle == github` is strongly preferred whenever `github` is an acceptable attribute name and is short and convenient. + `handle == github` is strongly preferred whenever `github` is an acceptable attribute name and is short and convenient. - If `github` begins with a numeral, `handle` should be prefixed with an underscore. - ```nix - _1example = { - github = "1example"; - }; - ``` + If `github` begins with a numeral, `handle` should be prefixed with an underscore. + ```nix + _1example = { + github = "1example"; + }; + ``` - Add PGP/GPG keys only if you actually use them to sign commits and/or mail. + Add PGP/GPG keys only if you actually use them to sign commits and/or mail. - To get the required PGP/GPG values for a key run - ```shell - gpg --fingerprint <email> | head -n 2 - ``` + To get the required PGP/GPG values for a key run + ```shell + gpg --fingerprint <email> | head -n 2 + ``` - !!! Note that PGP/GPG values stored here are for informational purposes only, don't use this file as a source of truth. + !!! Note that PGP/GPG values stored here are for informational purposes only, don't use this file as a source of truth. - More fields may be added in the future, however, in order to comply with GDPR this file should stay as minimal as possible. + More fields may be added in the future, however, in order to comply with GDPR this file should stay as minimal as possible. - When editing this file: - * keep the list alphabetically sorted, check with: - nix-instantiate --eval maintainers/scripts/check-maintainers-sorted.nix - * test the validity of the format with: - nix-build lib/tests/maintainers.nix + When editing this file: + * keep the list alphabetically sorted, check with: + nix-instantiate --eval maintainers/scripts/check-maintainers-sorted.nix + * test the validity of the format with: + nix-build lib/tests/maintainers.nix - See `./scripts/check-maintainer-github-handles.sh` for an example on how to work with this data. + See `./scripts/check-maintainer-github-handles.sh` for an example on how to work with this data. - When adding a new maintainer, be aware of the current commit conventions - documented at [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#commit-conventions) - file located in the root of the Nixpkgs repo. + When adding a new maintainer, be aware of the current commit conventions + documented at [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#commit-conventions) + file located in the root of the Nixpkgs repo. */ { _0b11stan = { @@ -94,9 +95,7 @@ name = "Joachim Ernst"; github = "0x4A6F"; githubId = 9675338; - keys = [{ - fingerprint = "F466 A548 AD3F C1F1 8C88 4576 8702 7528 B006 D66D"; - }]; + keys = [ { fingerprint = "F466 A548 AD3F C1F1 8C88 4576 8702 7528 B006 D66D"; } ]; }; _0xB10C = { email = "nixpkgs@b10c.me"; @@ -109,9 +108,7 @@ name = "Bela Stoyan"; github = "0xbe7a"; githubId = 6232980; - keys = [{ - fingerprint = "2536 9E86 1AA5 9EB7 4C47 B138 6510 870A 77F4 9A99"; - }]; + keys = [ { fingerprint = "2536 9E86 1AA5 9EB7 4C47 B138 6510 870A 77F4 9A99"; } ]; }; _0xC45 = { email = "jason@0xc45.com"; @@ -203,9 +200,7 @@ github = "4825764518"; githubId = 100122841; name = "Kenzie"; - keys = [{ - fingerprint = "D292 365E 3C46 A5AA 75EE B30B 78DB 7EDE 3540 794B"; - }]; + keys = [ { fingerprint = "D292 365E 3C46 A5AA 75EE B30B 78DB 7EDE 3540 794B"; } ]; }; _48cf = { name = "czapek"; @@ -218,9 +213,7 @@ github = "6543"; githubId = 24977596; name = "6543"; - keys = [{ - fingerprint = "8722 B61D 7234 1082 553B 201C B8BE 6D61 0E61 C862"; - }]; + keys = [ { fingerprint = "8722 B61D 7234 1082 553B 201C B8BE 6D61 0E61 C862"; } ]; }; _6AA4FD = { email = "f6442954@gmail.com"; @@ -252,9 +245,7 @@ github = "999eagle"; githubId = 1221984; name = "Sophie Tauchert"; - keys = [{ - fingerprint = "7B59 F09E 0FE5 BC34 F032 1FB4 5270 1DE5 F5F5 1125"; - }]; + keys = [ { fingerprint = "7B59 F09E 0FE5 BC34 F032 1FB4 5270 1DE5 F5F5 1125"; } ]; }; _9glenda = { email = "plan9git@proton.me"; @@ -262,9 +253,7 @@ github = "9glenda"; githubId = 69043370; name = "9glenda"; - keys = [{ - fingerprint = "DBF4 E6D0 90B8 BEA4 4BFE 1F1C 3442 4321 39B5 0691"; - }]; + keys = [ { fingerprint = "DBF4 E6D0 90B8 BEA4 4BFE 1F1C 3442 4321 39B5 0691"; } ]; }; _9R = { email = "nix@9-r.net"; @@ -364,9 +353,7 @@ github = "wahjava"; githubId = 2255192; name = "Ashish SHUKLA"; - keys = [{ - fingerprint = "F682 CDCC 39DC 0FEA E116 20B6 C746 CFA9 E74F A4B0"; - }]; + keys = [ { fingerprint = "F682 CDCC 39DC 0FEA E116 20B6 C746 CFA9 E74F A4B0"; } ]; }; abbradar = { email = "ab@fmap.me"; @@ -464,9 +451,7 @@ github = "acuteenvy"; githubId = 126529524; name = "Lena"; - keys = [{ - fingerprint = "CE85 54F7 B9BC AC0D D648 5661 AB5F C04C 3C94 443F"; - }]; + keys = [ { fingerprint = "CE85 54F7 B9BC AC0D D648 5661 AB5F C04C 3C94 443F"; } ]; }; adam248 = { email = "adamjbutler091@gmail.com"; @@ -573,18 +558,14 @@ github = "adtya"; githubId = 22346805; name = "Adithya Nair"; - keys = [{ - fingerprint = "51E4 F5AB 1B82 BE45 B422 9CC2 43A5 E25A A5A2 7849"; - }]; + keys = [ { fingerprint = "51E4 F5AB 1B82 BE45 B422 9CC2 43A5 E25A A5A2 7849"; } ]; }; aduh95 = { email = "duhamelantoine1995@gmail.com"; github = "aduh95"; githubId = 14309773; name = "Antoine du Hamel"; - keys = [{ - fingerprint = "C0D6 2484 39F1 D560 4AAF FB40 21D9 00FF DB23 3756"; - }]; + keys = [ { fingerprint = "C0D6 2484 39F1 D560 4AAF FB40 21D9 00FF DB23 3756"; } ]; }; aerialx = { email = "aaron+nixos@aaronlindsay.com"; @@ -694,9 +675,7 @@ matrix = "@aikoo7:matrix.org"; github = "aikooo7"; githubId = 79667753; - keys = [{ - fingerprint = "B0D7 2955 235F 6AB5 ACFA 1619 8C7F F5BB 1ADE F191"; - }]; + keys = [ { fingerprint = "B0D7 2955 235F 6AB5 ACFA 1619 8C7F F5BB 1ADE F191"; } ]; }; aimpizza = { email = "rickomo.us@gmail.com"; @@ -812,9 +791,7 @@ email = "alessandro.barenghi@tuta.io"; github = "akkesm"; githubId = 56970006; - keys = [{ - fingerprint = "50E2 669C AB38 2F4A 5F72 1667 0D6B FC01 D45E DADD"; - }]; + keys = [ { fingerprint = "50E2 669C AB38 2F4A 5F72 1667 0D6B FC01 D45E DADD"; } ]; }; akru = { email = "mail@akru.me"; @@ -844,9 +821,7 @@ github = "al3xtjames"; githubId = 5672538; name = "Alex James"; - keys = [{ - fingerprint = "F354 FFAB EA89 A49D 33ED 2590 4729 B829 AC5F CC72"; - }]; + keys = [ { fingerprint = "F354 FFAB EA89 A49D 33ED 2590 4729 B829 AC5F CC72"; } ]; }; alanpearce = { email = "alan@alanpearce.eu"; @@ -939,10 +914,10 @@ name = "Alexandre Esteves"; }; alex-fu27 = { - email = "alex.fu27@gmail.com"; - github = "alex-fu27"; - githubId = 49982580; - name = "Alexander Fuchs"; + email = "alex.fu27@gmail.com"; + github = "alex-fu27"; + githubId = 49982580; + name = "Alexander Fuchs"; }; alexnortung = { name = "alexnortung"; @@ -960,9 +935,7 @@ email = "ashpilkin@gmail.com"; github = "alexshpilkin"; githubId = 1010468; - keys = [{ - fingerprint = "B595 D74D 6615 C010 469F 5A13 73E9 AA11 4B3A 894B"; - }]; + keys = [ { fingerprint = "B595 D74D 6615 C010 469F 5A13 73E9 AA11 4B3A 894B"; } ]; matrix = "@alexshpilkin:matrix.org"; name = "Alexander Shpilkin"; }; @@ -1044,21 +1017,17 @@ matrix = "@aloisw:kde.org"; github = "alois31"; githubId = 36605164; - keys = [{ - fingerprint = "CA97 A822 FF24 25D4 74AF 3E4B E0F5 9EA5 E521 6914"; - }]; + keys = [ { fingerprint = "CA97 A822 FF24 25D4 74AF 3E4B E0F5 9EA5 E521 6914"; } ]; }; Alper-Celik = { email = "alper@alper-celik.dev"; name = "Alper Çelik"; github = "Alper-Celik"; githubId = 110625473; - keys = [{ - fingerprint = "6B69 19DD CEE0 FAF3 5C9F 2984 FA90 C0AB 738A B873"; - } - { - fingerprint = "DF68 C500 4024 23CC F9C5 E6CA 3D17 C832 4696 FE70"; - }]; + keys = [ + { fingerprint = "6B69 19DD CEE0 FAF3 5C9F 2984 FA90 C0AB 738A B873"; } + { fingerprint = "DF68 C500 4024 23CC F9C5 E6CA 3D17 C832 4696 FE70"; } + ]; }; alternateved = { email = "alternateved@pm.me"; @@ -1071,9 +1040,7 @@ email = "aluisio@aasg.name"; github = "AluisioASG"; githubId = 1904165; - keys = [{ - fingerprint = "7FDB 17B3 C29B 5BA6 E5A9 8BB2 9FAA 63E0 9750 6D9D"; - }]; + keys = [ { fingerprint = "7FDB 17B3 C29B 5BA6 E5A9 8BB2 9FAA 63E0 9750 6D9D"; } ]; }; alunduil = { email = "alunduil@gmail.com"; @@ -1086,9 +1053,7 @@ github = "illfygli"; githubId = 42881386; name = "Alva"; - keys = [{ - fingerprint = "B422 CFB1 C9EF 73F7 E1E2 698D F53E 3233 42F7 A6D3A"; - }]; + keys = [ { fingerprint = "B422 CFB1 C9EF 73F7 E1E2 698D F53E 3233 42F7 A6D3A"; } ]; }; alxsimon = { email = "alexis.simon@normalesup.org"; @@ -1101,9 +1066,7 @@ github = "alyaeanyx"; githubId = 74795488; name = "alyaeanyx"; - keys = [{ - fingerprint = "1F73 8879 5E5A 3DFC E2B3 FA32 87D1 AADC D25B 8DEE"; - }]; + keys = [ { fingerprint = "1F73 8879 5E5A 3DFC E2B3 FA32 87D1 AADC D25B 8DEE"; } ]; }; aman9das = { email = "amandas62640@gmail.com"; @@ -1165,9 +1128,7 @@ email = "matilde@diffyq.xyz"; github = "matilde-ametrine"; githubId = 90799677; - keys = [{ - fingerprint = "7931 EB4E 4712 D7BE 04F8 6D34 07EE 1FFC A58A 11C5"; - }]; + keys = [ { fingerprint = "7931 EB4E 4712 D7BE 04F8 6D34 07EE 1FFC A58A 11C5"; } ]; }; amfl = { email = "amfl@none.none"; @@ -1204,9 +1165,7 @@ github = "amyipdev"; githubId = 46307646; name = "Amy Parker"; - keys = [{ - fingerprint = "7786 034B D521 49F5 1B0A 2A14 B112 2F04 E962 DDC5"; - }]; + keys = [ { fingerprint = "7786 034B D521 49F5 1B0A 2A14 B112 2F04 E962 DDC5"; } ]; }; amz-x = { email = "mail@amz-x.com"; @@ -1219,9 +1178,7 @@ github = "0x61nas"; githubId = 44965145; name = "Anas Elgarhy"; - keys = [{ - fingerprint = "E10B D192 9231 08C7 3C35 7EC3 83E0 3DC6 F383 4086"; - }]; + keys = [ { fingerprint = "E10B D192 9231 08C7 3C35 7EC3 83E0 3DC6 F383 4086"; } ]; }; AnatolyPopov = { email = "aipopov@live.ru"; @@ -1361,18 +1318,14 @@ matrix = "@angryant:envs.net"; github = "AngryAnt"; githubId = 102513; - keys = [{ - fingerprint = "B7B7 582E 564E 789B FCB8 71AB 0C6D FE2F B234 534A"; - }]; + keys = [ { fingerprint = "B7B7 582E 564E 789B FCB8 71AB 0C6D FE2F B234 534A"; } ]; }; anhdle14 = { name = "Le Anh Duc"; email = "anhdle14@icloud.com"; github = "anhdle14"; githubId = 9645992; - keys = [{ - fingerprint = "AA4B 8EC3 F971 D350 482E 4E20 0299 AFF9 ECBB 5169"; - }]; + keys = [ { fingerprint = "AA4B 8EC3 F971 D350 482E 4E20 0299 AFF9 ECBB 5169"; } ]; }; anhduy = { email = "vo@anhduy.io"; @@ -1385,9 +1338,7 @@ email = "i@anillc.cn"; github = "Anillc"; githubId = 23411248; - keys = [{ - fingerprint = "6141 1E4F FE10 CE7B 2E14 CD76 0BE8 A88F 47B2 145C"; - }]; + keys = [ { fingerprint = "6141 1E4F FE10 CE7B 2E14 CD76 0BE8 A88F 47B2 145C"; } ]; }; anirrudh = { email = "anik597@gmail.com"; @@ -1457,9 +1408,7 @@ githubId = 48802534; name = "Anselm Schüler"; matrix = "@schuelermine:matrix.org"; - keys = [{ - fingerprint = "CDBF ECA8 36FE E340 1CEB 58FF BA34 EE1A BA3A 0955"; - }]; + keys = [ { fingerprint = "CDBF ECA8 36FE E340 1CEB 58FF BA34 EE1A BA3A 0955"; } ]; }; anthonyroussel = { email = "anthony@roussel.dev"; @@ -1467,9 +1416,7 @@ githubId = 220084; name = "Anthony Roussel"; matrix = "@anthonyrsl:matrix.org"; - keys = [{ - fingerprint = "472D 368A F107 F443 F3A5 C712 9DC4 987B 1A55 E75E"; - }]; + keys = [ { fingerprint = "472D 368A F107 F443 F3A5 C712 9DC4 987B 1A55 E75E"; } ]; }; antoinerg = { email = "roygobeil.antoine@gmail.com"; @@ -1494,9 +1441,7 @@ github = "antonmosich"; githubId = 27223336; name = "Anton Mosich"; - keys = [ { - fingerprint = "F401 287C 324F 0A1C B321 657B 9B96 97B8 FB18 7D14"; - } ]; + keys = [ { fingerprint = "F401 287C 324F 0A1C B321 657B 9B96 97B8 FB18 7D14"; } ]; }; antono = { email = "self@antono.info"; @@ -1552,9 +1497,7 @@ github = "aplund"; githubId = 1369436; name = "Austin Lund"; - keys = [{ - fingerprint = "7083 E268 4BFD 845F 2B84 9E74 B695 8918 ED23 32CE"; - }]; + keys = [ { fingerprint = "7083 E268 4BFD 845F 2B84 9E74 B695 8918 ED23 32CE"; } ]; }; applejag = { email = "applejag.luminance905@passmail.com"; @@ -1562,12 +1505,8 @@ githubId = 2477952; name = "Kalle Fagerberg"; keys = [ - { - fingerprint = "F68E 6DB3 79FB 1FF0 7C72 6479 9874 DEDD 3592 5ED0"; - } - { - fingerprint = "8DDB 3994 0A34 4FE5 4F3B 3E77 F161 001D EE78 1051"; - } + { fingerprint = "F68E 6DB3 79FB 1FF0 7C72 6479 9874 DEDD 3592 5ED0"; } + { fingerprint = "8DDB 3994 0A34 4FE5 4F3B 3E77 F161 001D EE78 1051"; } ]; }; applePrincess = { @@ -1575,9 +1514,7 @@ github = "applePrincess"; githubId = 17154507; name = "Lein Matsumaru"; - keys = [{ - fingerprint = "BF8B F725 DA30 E53E 7F11 4ED8 AAA5 0652 F047 9205"; - }]; + keys = [ { fingerprint = "BF8B F725 DA30 E53E 7F11 4ED8 AAA5 0652 F047 9205"; } ]; }; appsforartists = { github = "appsforartists"; @@ -1762,9 +1699,7 @@ github = "artemist"; githubId = 1226638; name = "Artemis Tosini"; - keys = [{ - fingerprint = "3D2B B230 F9FA F0C5 1832 46DD 4FDC 96F1 61E7 BA8A"; - }]; + keys = [ { fingerprint = "3D2B B230 F9FA F0C5 1832 46DD 4FDC 96F1 61E7 BA8A"; } ]; }; arthsmn = { name = "Arthur Cerqueira"; @@ -1827,9 +1762,7 @@ email = "ascii@moth.contact"; github = "asciimoth"; githubId = 91414737; - keys = [{ - fingerprint = "C5C8 4658 CCFD 7E8E 71DE E933 AF3A E54F C3A3 5C9F"; - }]; + keys = [ { fingerprint = "C5C8 4658 CCFD 7E8E 71DE E933 AF3A E54F C3A3 5C9F"; } ]; }; ashalkhakov = { email = "artyom.shalkhakov@gmail.com"; @@ -1873,9 +1806,7 @@ github = "ashuramaruzxc"; githubId = 72100551; name = "Mariia Holovata"; - keys = [{ - fingerprint = "409D 201E 9450 8732 A49E D0FC 6BDA F874 0068 08DF"; - }]; + keys = [ { fingerprint = "409D 201E 9450 8732 A49E D0FC 6BDA F874 0068 08DF"; } ]; }; asininemonkey = { email = "nixpkgs@asininemonkey.com"; @@ -1900,9 +1831,7 @@ github = "aspulse"; githubId = 84216737; name = "AsPulse / あすぱる"; - keys = [{ - fingerprint = "C919 E69E A7C0 E147 9E0F C26E 1EDA D0C6 70BD 062D"; - }]; + keys = [ { fingerprint = "C919 E69E A7C0 E147 9E0F C26E 1EDA D0C6 70BD 062D"; } ]; }; assistant = { email = "assistant.moetron@gmail.com"; @@ -1917,12 +1846,6 @@ githubId = 7745457; name = "Astavie"; }; - astindev = { - email = "astindev@pm.me"; - github = "astindev"; - githubId = 52360869; - name = "Astin"; - }; astro = { email = "astro@spaceboyz.net"; github = "astro"; @@ -1934,9 +1857,7 @@ github = "astrobeastie"; githubId = 26362368; name = "Vincent Fischer"; - keys = [{ - fingerprint = "BF47 81E1 F304 1ADF 18CE C401 DE16 C7D1 536D A72F"; - }]; + keys = [ { fingerprint = "BF47 81E1 F304 1ADF 18CE C401 DE16 C7D1 536D A72F"; } ]; }; astronaut0212 = { email = "goatastronaut0212@proton.me"; @@ -1961,9 +1882,7 @@ github = "aszlig"; githubId = 192147; name = "aszlig"; - keys = [{ - fingerprint = "DD52 6BC7 767D BA28 16C0 95E5 6840 89CE 67EB B691"; - }]; + keys = [ { fingerprint = "DD52 6BC7 767D BA28 16C0 95E5 6840 89CE 67EB B691"; } ]; }; atalii = { email = "taliauster@gmail.com"; @@ -1977,9 +1896,7 @@ github = "AtaraxiaSjel"; githubId = 5314145; name = "Dmitriy"; - keys = [{ - fingerprint = "922D A6E7 58A0 FE4C FAB4 E4B2 FD26 6B81 0DF4 8DF2"; - }]; + keys = [ { fingerprint = "922D A6E7 58A0 FE4C FAB4 E4B2 FD26 6B81 0DF4 8DF2"; } ]; }; atemu = { name = "Atemu"; @@ -2016,11 +1933,7 @@ email = "m.abdolirad@gmail.com"; github = "atkrad"; githubId = 351364; - keys = [ - { - fingerprint = "0380 F2F8 DF7A BA1A E7DB D84A 1935 1496 62CA FDB8"; - } - ]; + keys = [ { fingerprint = "0380 F2F8 DF7A BA1A E7DB D84A 1935 1496 62CA FDB8"; } ]; }; atnnn = { email = "etienne@atnnn.com"; @@ -2081,9 +1994,7 @@ email = "sven@autumnal.de"; github = "sevenautumns"; githubId = 20627275; - keys = [{ - fingerprint = "6A2E 7FDD 1037 11A8 B996 E28E B051 064E 2FCA B71B"; - }]; + keys = [ { fingerprint = "6A2E 7FDD 1037 11A8 B996 E28E B051 064E 2FCA B71B"; } ]; }; avakhrenev = { email = "avakhrenev@gmail.com"; @@ -2132,18 +2043,14 @@ github = "aviallon"; githubId = 7479436; name = "Antoine Viallon"; - keys = [{ - fingerprint = "4AC4 A28D 7208 FC6F 2B51 5EA9 D126 B13A B555 E16F"; - }]; + keys = [ { fingerprint = "4AC4 A28D 7208 FC6F 2B51 5EA9 D126 B13A B555 E16F"; } ]; }; avitex = { email = "theavitex@gmail.com"; github = "avitex"; githubId = 5110816; name = "avitex"; - keys = [{ - fingerprint = "271E 136C 178E 06FA EA4E B854 8B36 6C44 3CAB E942"; - }]; + keys = [ { fingerprint = "271E 136C 178E 06FA EA4E B854 8B36 6C44 3CAB E942"; } ]; }; avnik = { email = "avn@avnik.info"; @@ -2180,9 +2087,7 @@ matrix = "@azahi:azahi.cc"; github = "azahi"; githubId = 22211000; - keys = [{ - fingerprint = "2688 0377 C31D 9E81 9BDF 83A8 C8C6 BDDB 3847 F72B"; - }]; + keys = [ { fingerprint = "2688 0377 C31D 9E81 9BDF 83A8 C8C6 BDDB 3847 F72B"; } ]; }; azazak123 = { email = "azazaka2002@gmail.com"; @@ -2208,18 +2113,14 @@ github = "B4dM4n"; githubId = 448169; name = "Fabian Möller"; - keys = [{ - fingerprint = "6309 E212 29D4 DA30 AF24 BDED 754B 5C09 63C4 2C50"; - }]; + keys = [ { fingerprint = "6309 E212 29D4 DA30 AF24 BDED 754B 5C09 63C4 2C50"; } ]; }; babbaj = { name = "babbaj"; email = "babbaj45@gmail.com"; github = "babbaj"; githubId = 12820770; - keys = [{ - fingerprint = "6FBC A462 4EAF C69C A7C4 98C1 F044 3098 48A0 7CAC"; - }]; + keys = [ { fingerprint = "6FBC A462 4EAF C69C A7C4 98C1 F044 3098 48A0 7CAC"; } ]; }; babeuh = { name = "Raphael Le Goaller"; @@ -2246,9 +2147,7 @@ matrix = "@badele:matrix.org"; github = "badele"; githubId = 2806307; - keys = [{ - fingerprint = "00F4 21C4 C537 7BA3 9820 E13F 6B95 E13D E469 CC5D"; - }]; + keys = [ { fingerprint = "00F4 21C4 C537 7BA3 9820 E13F 6B95 E13D E469 CC5D"; } ]; }; badmutex = { email = "github@badi.sh"; @@ -2327,9 +2226,7 @@ github = "wandersoncferreira"; githubId = 17708295; name = "Wanderson Ferreira"; - keys = [{ - fingerprint = "A3E1 C409 B705 50B3 BF41 492B 5684 0A61 4DBE 37AE"; - }]; + keys = [ { fingerprint = "A3E1 C409 B705 50B3 BF41 492B 5684 0A61 4DBE 37AE"; } ]; }; bastaynav = { name = "Ivan Bastrakov"; @@ -2337,9 +2234,7 @@ matrix = "@bastaynav:matrix.org"; github = "bastaynav"; githubId = 6987136; - keys = [{ - fingerprint = "2C6D 37D4 6AA1 DCDA BE8D F346 43E2 CF4C 01B9 4940"; - }]; + keys = [ { fingerprint = "2C6D 37D4 6AA1 DCDA BE8D F346 43E2 CF4C 01B9 4940"; } ]; }; basvandijk = { email = "v.dijk.bas@gmail.com"; @@ -2371,9 +2266,7 @@ matrix = "@baukexyz:matrix.org"; github = "Bauke"; githubId = 19501722; - keys = [{ - fingerprint = "C593 27B5 9D0F 2622 23F6 1D03 C1C0 F299 52BC F558"; - }]; + keys = [ { fingerprint = "C593 27B5 9D0F 2622 23F6 1D03 C1C0 F299 52BC F558"; } ]; }; bb010g = { email = "me@bb010g.com"; @@ -2399,10 +2292,12 @@ github = "bbenne10"; githubId = 687376; name = "Bryan Bennett"; - keys = [{ - # compare with https://keybase.io/bbenne10 - fingerprint = "41EA 00B4 00F9 6970 1CB2 D3AF EF90 E3E9 8B8F 5C0B"; - }]; + keys = [ + { + # compare with https://keybase.io/bbenne10 + fingerprint = "41EA 00B4 00F9 6970 1CB2 D3AF EF90 E3E9 8B8F 5C0B"; + } + ]; }; bbenno = { email = "nix@bbenno.com"; @@ -2500,18 +2395,14 @@ email = "b.broich@posteo.de"; github = "BenediktBroich"; githubId = 32903896; - keys = [{ - fingerprint = "CB5C 7B3C 3E6F 2A59 A583 A90A 8A60 0376 7BE9 5976"; - }]; + keys = [ { fingerprint = "CB5C 7B3C 3E6F 2A59 A583 A90A 8A60 0376 7BE9 5976"; } ]; }; benesim = { name = "Benjamin Isbarn"; email = "benjamin.isbarn@gmail.com"; github = "BeneSim"; githubId = 29384538; - keys = [{ - fingerprint = "D35E C9CE E631 638F F1D8 B401 6F0E 410D C3EE D02"; - }]; + keys = [ { fingerprint = "D35E C9CE E631 638F F1D8 B401 6F0E 410D C3EE D02"; } ]; }; benhiemer = { name = "Benedikt Hiemer"; @@ -2524,9 +2415,7 @@ email = "benjaminedwardwebb@gmail.com"; github = "benjaminedwardwebb"; githubId = 7118777; - keys = [{ - fingerprint = "E9A3 7864 2165 28CE 507C CA82 72EA BF75 C331 CD25"; - }]; + keys = [ { fingerprint = "E9A3 7864 2165 28CE 507C CA82 72EA BF75 C331 CD25"; } ]; }; Benjamin-L = { name = "Benjamin Lee"; @@ -2534,9 +2423,7 @@ matrix = "@benjamin:computer.surgery"; github = "Benjamin-L"; githubId = 6504174; - keys = [{ - fingerprint = "9D84 09A0 44FC 1EEB AE2D FA30 FB96 24E2 885D 55A4"; - }]; + keys = [ { fingerprint = "9D84 09A0 44FC 1EEB AE2D FA30 FB96 24E2 885D 55A4"; } ]; }; benkuhn = { email = "ben@ben-kuhn.com"; @@ -2549,9 +2436,7 @@ github = "benlemasurier"; githubId = 47993; name = "Ben LeMasurier"; - keys = [{ - fingerprint = "0FD4 7407 EFD4 8FD8 8BF5 87B3 248D 430A E8E7 4189"; - }]; + keys = [ { fingerprint = "0FD4 7407 EFD4 8FD8 8BF5 87B3 248D 430A E8E7 4189"; } ]; }; benley = { email = "benley@gmail.com"; @@ -2601,9 +2486,7 @@ email = "nicolas@normie.dev"; github = "berbiche"; githubId = 20448408; - keys = [{ - fingerprint = "D446 E58D 87A0 31C7 EC15 88D7 B461 2924 45C6 E696"; - }]; + keys = [ { fingerprint = "D446 E58D 87A0 31C7 EC15 88D7 B461 2924 45C6 E696"; } ]; }; berce = { email = "bert.moens@gmail.com"; @@ -2640,9 +2523,7 @@ email = "berto.f@protonmail.com"; github = "bertof"; githubId = 9915675; - keys = [{ - fingerprint = "17C5 1EF9 C0FE 2EB2 FE56 BB53 FE98 AE5E C52B 1056"; - }]; + keys = [ { fingerprint = "17C5 1EF9 C0FE 2EB2 FE56 BB53 FE98 AE5E C52B 1056"; } ]; }; betaboon = { email = "betaboon@0x80.ninja"; @@ -2717,10 +2598,10 @@ name = "Alexey Lebedeff"; }; binarycat = { - email = "binarycat@envs.net"; - github = "lolbinarycat"; - githubId = 19915050; - name = "binarycat"; + email = "binarycat@envs.net"; + github = "lolbinarycat"; + githubId = 19915050; + name = "binarycat"; }; binsky = { email = "timo@binsky.org"; @@ -2763,9 +2644,7 @@ email = "blankparticle@gmail.com"; github = "BlankParticle"; githubId = 130567419; - keys = [{ - fingerprint = "1757 64C3 7065 AA8D 614D 41C9 0ACE 126D 7B35 9261"; - }]; + keys = [ { fingerprint = "1757 64C3 7065 AA8D 614D 41C9 0ACE 126D 7B35 9261"; } ]; }; blanky0230 = { email = "blanky0230@gmail.com"; @@ -2877,9 +2756,7 @@ matrix = "@booklearner:matrix.org"; github = "booklearner"; githubId = 103979114; - keys = [{ - fingerprint = "17C7 95D4 871C 2F87 83C8 053D 0C61 C4E5 907F 76C8"; - }]; + keys = [ { fingerprint = "17C7 95D4 871C 2F87 83C8 053D 0C61 C4E5 907F 76C8"; } ]; }; booniepepper = { name = "J.R. Hill"; @@ -2929,9 +2806,7 @@ github = "Br1ght0ne"; githubId = 12615679; name = "Oleksii Filonenko"; - keys = [{ - fingerprint = "F549 3B7F 9372 5578 FDD3 D0B8 A1BC 8428 323E CFE8"; - }]; + keys = [ { fingerprint = "F549 3B7F 9372 5578 FDD3 D0B8 A1BC 8428 323E CFE8"; } ]; }; br337 = { email = "brian.porumb@proton.me"; @@ -3022,9 +2897,7 @@ github = "brhoades"; githubId = 4763746; name = "Billy Rhoades"; - keys = [{ - fingerprint = "BF4FCB85C69989B4ED95BF938AE74787A4B7C07E"; - }]; + keys = [ { fingerprint = "BF4FCB85C69989B4ED95BF938AE74787A4B7C07E"; } ]; }; b-rodrigues = { email = "bruno@brodrigues.co"; @@ -3139,7 +3012,7 @@ githubId = 8891115; name = "Brian Choy"; }; - ByteSudoer = { + ByteSudoer = { email = "bytesudoer@gmail.com"; github = "bytesudoer"; githubId = 88513682; @@ -3188,12 +3061,8 @@ name = "Vladimir Serov"; keys = [ # compare with https://keybase.io/cab404 - { - fingerprint = "1BB96810926F4E715DEF567E6BA7C26C3FDF7BB3"; - } - { - fingerprint = "1EBC648C64D6045463013B3EB7EFFC271D55DB8A"; - } + { fingerprint = "1BB96810926F4E715DEF567E6BA7C26C3FDF7BB3"; } + { fingerprint = "1EBC648C64D6045463013B3EB7EFFC271D55DB8A"; } ]; }; CactiChameleon9 = { @@ -3215,12 +3084,8 @@ github = "cafkafk"; githubId = 89321978; keys = [ - { - fingerprint = "7B9E E848 D074 AE03 7A0C 651A 8ED4 DEF7 375A 30C8"; - } - { - fingerprint = "208A 2A66 8A2F CDE7 B5D3 8F64 CDDC 792F 6552 51ED"; - } + { fingerprint = "7B9E E848 D074 AE03 7A0C 651A 8ED4 DEF7 375A 30C8"; } + { fingerprint = "208A 2A66 8A2F CDE7 B5D3 8F64 CDDC 792F 6552 51ED"; } ]; }; CaitlinDavitt = { @@ -3278,9 +3143,7 @@ github = "cameronraysmith"; githubId = 420942; name = "Cameron Smith"; - keys = [{ - fingerprint = "3F14 C258 856E 88AE E0F9 661E FF04 3B36 8811 DD1C"; - }]; + keys = [ { fingerprint = "3F14 C258 856E 88AE E0F9 661E FF04 3B36 8811 DD1C"; } ]; }; camillemndn = { email = "camillemondon@free.fr"; @@ -3333,9 +3196,7 @@ email = "kiran@ostrolenk.co.uk"; github = "CardboardTurkey"; githubId = 34030186; - keys = [{ - fingerprint = "8BC7 74E4 A2EC 7507 3B61 A647 0BBB 1C8B 1C36 39EE"; - }]; + keys = [ { fingerprint = "8BC7 74E4 A2EC 7507 3B61 A647 0BBB 1C8B 1C36 39EE"; } ]; }; carloscraveiro = { email = "carlos.craveiro@usp.br"; @@ -3458,9 +3319,7 @@ github = "cburstedde"; githubId = 109908; name = "Carsten Burstedde"; - keys = [{ - fingerprint = "1127 A432 6524 BF02 737B 544E 0704 CD9E 550A 6BCD"; - }]; + keys = [ { fingerprint = "1127 A432 6524 BF02 737B 544E 0704 CD9E 550A 6BCD"; } ]; }; ccellado = { email = "annplague@gmail.com"; @@ -3525,12 +3384,8 @@ githubId = 2054509; name = "Constantine Evans"; keys = [ - { - fingerprint = "32B1 6EE7 DBA5 16DE 526E 4C5A B67D B1D2 0A93 A9F9"; - } - { - fingerprint = "669C 1D24 5A87 DB34 6BE4 3216 1A1D 58B8 6AE2 AABD"; - } + { fingerprint = "32B1 6EE7 DBA5 16DE 526E 4C5A B67D B1D2 0A93 A9F9"; } + { fingerprint = "669C 1D24 5A87 DB34 6BE4 3216 1A1D 58B8 6AE2 AABD"; } ]; }; Ch1keen = { @@ -3568,9 +3423,7 @@ github = "LostAttractor"; githubId = 46527539; name = "ChaosAttractor"; - keys = [{ - fingerprint = "A137 4415 DB7C 6439 10EA 5BF1 0FEE 4E47 5940 E125"; - }]; + keys = [ { fingerprint = "A137 4415 DB7C 6439 10EA 5BF1 0FEE 4E47 5940 E125"; } ]; }; charlesbaynham = { email = "charlesbaynham@gmail.com"; @@ -3588,9 +3441,7 @@ email = "chayleaf-nix@pavluk.org"; github = "chayleaf"; githubId = 9590981; - keys = [{ - fingerprint = "4314 3701 154D 9E5F 7051 7ECF 7817 1AD4 6227 E68E"; - }]; + keys = [ { fingerprint = "4314 3701 154D 9E5F 7051 7ECF 7817 1AD4 6227 E68E"; } ]; matrix = "@chayleaf:matrix.pavluk.org"; name = "Anna Pavlyuk"; }; @@ -3624,9 +3475,7 @@ githubId = 20300586; matrix = "@sammy:cherrykitten.dev"; name = "CherryKitten"; - keys = [{ - fingerprint = "264C FA1A 194C 585D F822 F673 C01A 7CBB A617 BD5F"; - }]; + keys = [ { fingerprint = "264C FA1A 194C 585D F822 F673 C01A 7CBB A617 BD5F"; } ]; }; chessai = { email = "chessai1996@gmail.com"; @@ -3644,9 +3493,7 @@ name = "Diego Rodriguez"; github = "Chili-Man"; githubId = 631802; - keys = [{ - fingerprint = "099E 3F97 FA08 3D47 8C75 EBEC E0EB AD78 F019 0BD9"; - }]; + keys = [ { fingerprint = "099E 3F97 FA08 3D47 8C75 EBEC E0EB AD78 F019 0BD9"; } ]; }; chiroptical = { email = "chiroptical@gmail.com"; @@ -3755,9 +3602,7 @@ github = "christoph-heiss"; githubId = 7571069; name = "Christoph Heiss"; - keys = [{ - fingerprint = "9C56 1D64 30B2 8D6B DCBC 9CEB 73D5 E7FD EE3D E49A"; - }]; + keys = [ { fingerprint = "9C56 1D64 30B2 8D6B DCBC 9CEB 73D5 E7FD EE3D E49A"; } ]; }; chrpinedo = { github = "chrpinedo"; @@ -3775,9 +3620,7 @@ email = "nixos@chuang.cz"; github = "chuangzhu"; githubId = 31200881; - keys = [{ - fingerprint = "5D03 A5E6 0754 A3E3 CA57 5037 E838 CED8 1CFF D3F9"; - }]; + keys = [ { fingerprint = "5D03 A5E6 0754 A3E3 CA57 5037 E838 CED8 1CFF D3F9"; } ]; }; chvp = { email = "nixpkgs@cvpetegem.be"; @@ -3797,9 +3640,7 @@ email = "cig0.github@gmail.com"; github = "cig0"; githubId = 394089; - keys = [{ - fingerprint = "1828 B459 DB9A 7EE2 03F4 7E6E AFBE ACC5 5D93 84A0"; - }]; + keys = [ { fingerprint = "1828 B459 DB9A 7EE2 03F4 7E6E AFBE ACC5 5D93 84A0"; } ]; }; cigrainger = { name = "Christopher Grainger"; @@ -3830,9 +3671,7 @@ github = "VertexA115"; githubId = 5567402; name = "Alex Zero"; - keys = [{ - fingerprint = "A0AA 4646 B8F6 9D45 4553 5A88 A515 50ED B450 302C"; - }]; + keys = [ { fingerprint = "A0AA 4646 B8F6 9D45 4553 5A88 A515 50ED B450 302C"; } ]; }; cizra = { email = "todurov+nix@gmail.com"; @@ -3868,9 +3707,7 @@ email = "nixpkgs-0efe364@ckie.dev"; github = "ckiee"; githubId = 25263210; - keys = [{ - fingerprint = "539F 0655 4D35 38A5 429A E253 13E7 9449 C052 5215"; - }]; + keys = [ { fingerprint = "539F 0655 4D35 38A5 429A E253 13E7 9449 C052 5215"; } ]; name = "ckie"; matrix = "@ckie:ckie.dev"; }; @@ -3891,9 +3728,7 @@ github = "clebs"; githubId = 1059661; name = "Borja Clemente"; - keys = [{ - fingerprint = "C4E1 58BD FD33 3C77 B6C7 178E 2539 757E F64C 60DD"; - }]; + keys = [ { fingerprint = "C4E1 58BD FD33 3C77 B6C7 178E 2539 757E F64C 60DD"; } ]; }; cleeyv = { email = "cleeyv@riseup.net"; @@ -3944,9 +3779,7 @@ github = "cmars"; githubId = 23741; name = "Casey Marshall"; - keys = [{ - fingerprint = "6B78 7E5F B493 FA4F D009 5D10 6DEC 2758 ACD5 A973"; - }]; + keys = [ { fingerprint = "6B78 7E5F B493 FA4F D009 5D10 6DEC 2758 ACD5 A973"; } ]; }; cmcdragonkai = { email = "roger.qiu@matrix.ai"; @@ -3983,9 +3816,7 @@ github = "Coca162"; githubId = 62479942; name = "Coca"; - keys = [{ - fingerprint = "99CB 86FF 62BB 7DA4 8903 B16D 0328 2DF8 8179 AB19"; - }]; + keys = [ { fingerprint = "99CB 86FF 62BB 7DA4 8903 B16D 0328 2DF8 8179 AB19"; } ]; }; coconnor = { email = "coreyoconnor@gmail.com"; @@ -3998,20 +3829,16 @@ github = "code-asher"; githubId = 45609798; name = "Asher"; - keys = [{ - fingerprint = "6E3A FA6D 915C C2A4 D26F C53E 7BB4 BA9C 783D 2BBC"; - }]; + keys = [ { fingerprint = "6E3A FA6D 915C C2A4 D26F C53E 7BB4 BA9C 783D 2BBC"; } ]; }; codebam = { - name = "Sean Behan"; - email = "codebam@riseup.net"; - matrix = "@codebam:fedora.im"; - github = "codebam"; - githubId = 6035884; - keys = [{ - fingerprint = "42CD E212 593C F2FD C723 48A8 0F6D 5021 A87F 92BA"; - }]; - }; + name = "Sean Behan"; + email = "codebam@riseup.net"; + matrix = "@codebam:fedora.im"; + github = "codebam"; + githubId = 6035884; + keys = [ { fingerprint = "42CD E212 593C F2FD C723 48A8 0F6D 5021 A87F 92BA"; } ]; + }; codec = { email = "codec@fnord.cx"; github = "codec"; @@ -4029,9 +3856,7 @@ name = "Guy Boldon"; github = "codifryed"; githubId = 27779510; - keys = [{ - fingerprint = "FDF5 EF67 8CC1 FE22 1845 6A22 CF7B BB5B C756 1BD3"; - }]; + keys = [ { fingerprint = "FDF5 EF67 8CC1 FE22 1845 6A22 CF7B BB5B C756 1BD3"; } ]; }; codsl = { email = "codsl@riseup.net"; @@ -4047,7 +3872,7 @@ }; coffeeispower = { email = "tiagodinis33@proton.me"; - github = "coffee-is-power"; + github = "coffeeispower"; name = "Tiago Dinis"; githubId = 92828847; }; @@ -4057,9 +3882,7 @@ matrix = "@cofob:matrix.org"; github = "cofob"; githubId = 49928332; - keys = [{ - fingerprint = "5F3D 9D3D ECE0 8651 DE14 D29F ACAD 4265 E193 794D"; - }]; + keys = [ { fingerprint = "5F3D 9D3D ECE0 8651 DE14 D29F ACAD 4265 E193 794D"; } ]; }; Cogitri = { email = "oss@cogitri.dev"; @@ -4093,9 +3916,7 @@ matrix = "@cole-h:matrix.org"; github = "cole-h"; githubId = 28582702; - keys = [{ - fingerprint = "68B8 0D57 B2E5 4AC3 EC1F 49B0 B37E 0F23 7101 6A4C"; - }]; + keys = [ { fingerprint = "68B8 0D57 B2E5 4AC3 EC1F 49B0 B37E 0F23 7101 6A4C"; } ]; }; colemickens = { email = "cole.mickens@gmail.com"; @@ -4198,12 +4019,8 @@ matrix = "@corbansolo:matrix.org"; name = "Corban Raun"; keys = [ - { - fingerprint = "6607 0B24 8CE5 64ED 22CE 0950 A697 A56F 1F15 1189"; - } - { - fingerprint = "D8CB 816A B678 A4E6 1EC7 5325 230F 4AC1 53F9 0F29"; - } + { fingerprint = "6607 0B24 8CE5 64ED 22CE 0950 A697 A56F 1F15 1189"; } + { fingerprint = "D8CB 816A B678 A4E6 1EC7 5325 230F 4AC1 53F9 0F29"; } ]; }; corngood = { @@ -4252,9 +4069,7 @@ github = "cpu"; githubId = 292650; name = "Daniel McCarney"; - keys = [{ - fingerprint = "8026 D24A A966 BF9C D3CD CB3C 08FB 2BFC 470E 75B4"; - }]; + keys = [ { fingerprint = "8026 D24A A966 BF9C D3CD CB3C 08FB 2BFC 470E 75B4"; } ]; }; Crafter = { email = "crafter@crafter.rocks"; @@ -4309,9 +4124,7 @@ name = "Jan Möller"; github = "Croissong"; githubId = 4162215; - keys = [{ - fingerprint = "CE97 9DEE 904C 26AA 3716 78C2 96A4 38F9 EE72 572F"; - }]; + keys = [ { fingerprint = "CE97 9DEE 904C 26AA 3716 78C2 96A4 38F9 EE72 572F"; } ]; }; crschnick = { email = "crschnick@xpipe.io"; @@ -4325,18 +4138,14 @@ github = "CRTified"; githubId = 2440581; name = "Carl Richard Theodor Schneider"; - keys = [{ - fingerprint = "2017 E152 BB81 5C16 955C E612 45BC C1E2 709B 1788"; - }]; + keys = [ { fingerprint = "2017 E152 BB81 5C16 955C E612 45BC C1E2 709B 1788"; } ]; }; Cryolitia = { name = "Beiyan Cryolitia"; email = "Cryolitia@gmail.com"; github = "Cryolitia"; githubId = 23723294; - keys = [{ - fingerprint = "1C3C 6547 538D 7152 310C 0EEA 84DD 0C01 30A5 4DF7"; - }]; + keys = [ { fingerprint = "1C3C 6547 538D 7152 310C 0EEA 84DD 0C01 30A5 4DF7"; } ]; }; cryptix = { email = "cryptix@riseup.net"; @@ -4378,9 +4187,7 @@ github = "cust0dian"; githubId = 119854490; name = "Serg Nesterov"; - keys = [{ - fingerprint = "6E7D BA30 DB5D BA60 693C 3BE3 1512 F6EB 84AE CC8C"; - }]; + keys = [ { fingerprint = "6E7D BA30 DB5D BA60 693C 3BE3 1512 F6EB 84AE CC8C"; } ]; }; cwoac = { email = "oliver@codersoffortune.net"; @@ -4401,26 +4208,20 @@ github = "CyberShadow"; githubId = 160894; - keys = [{ - fingerprint = "BBED 1B08 8CED 7F95 8917 FBE8 5004 F0FA D051 576D"; - }]; + keys = [ { fingerprint = "BBED 1B08 8CED 7F95 8917 FBE8 5004 F0FA D051 576D"; } ]; }; cynerd = { name = "Karel Kočí"; email = "cynerd@email.cz"; github = "Cynerd"; githubId = 3811900; - keys = [{ - fingerprint = "2B1F 70F9 5F1B 48DA 2265 A7FA A6BC 8B8C EB31 659B"; - }]; + keys = [ { fingerprint = "2B1F 70F9 5F1B 48DA 2265 A7FA A6BC 8B8C EB31 659B"; } ]; }; cyntheticfox = { email = "cyntheticfox@gh0st.sh"; github = "cyntheticfox"; githubId = 17628961; - keys = [{ - fingerprint = "73C1 C5DF 51E7 BB92 85E9 A262 5960 278C E235 F821"; - }]; + keys = [ { fingerprint = "73C1 C5DF 51E7 BB92 85E9 A262 5960 278C E235 F821"; } ]; matrix = "@houstdav000:gh0st.ems.host"; name = "Cynthia Fox"; }; @@ -4436,12 +4237,8 @@ githubId = 2217136; name = "Ștefan D. Mihăilă"; keys = [ - { - fingerprint = "CBC9 C7CC 51F0 4A61 3901 C723 6E68 A39B F16A 3ECB"; - } - { - fingerprint = "7EAB 1447 5BBA 7DDE 7092 7276 6220 AD78 4622 0A52"; - } + { fingerprint = "CBC9 C7CC 51F0 4A61 3901 C723 6E68 A39B F16A 3ECB"; } + { fingerprint = "7EAB 1447 5BBA 7DDE 7092 7276 6220 AD78 4622 0A52"; } ]; }; cyplo = { @@ -4468,9 +4265,7 @@ email = "dadada@dadada.li"; github = "dadada"; githubId = 7216772; - keys = [{ - fingerprint = "D68C 8469 5C08 7E0F 733A 28D0 EEB8 D1CE 62C4 DFEA"; - }]; + keys = [ { fingerprint = "D68C 8469 5C08 7E0F 733A 28D0 EEB8 D1CE 62C4 DFEA"; } ]; }; dalance = { email = "dalance@gmail.com"; @@ -4489,9 +4284,7 @@ github = "DAlperin"; githubId = 16063713; name = "Dov Alperin"; - keys = [{ - fingerprint = "4EED 5096 B925 86FA 1101 6673 7F2C 07B9 1B52 BB61"; - }]; + keys = [ { fingerprint = "4EED 5096 B925 86FA 1101 6673 7F2C 07B9 1B52 BB61"; } ]; }; DamienCassou = { email = "damien@cassou.me"; @@ -4516,9 +4309,7 @@ email = "djc@djc.id.au"; github = "danc86"; githubId = 398575; - keys = [{ - fingerprint = "1C56 01F1 D70A B56F EABB 6BC0 26B5 AA2F DAF2 F30A"; - }]; + keys = [ { fingerprint = "1C56 01F1 D70A B56F EABB 6BC0 26B5 AA2F DAF2 F30A"; } ]; }; dancek = { email = "hannu.hartikainen@gmail.com"; @@ -4599,9 +4390,7 @@ matrix = "@danth:danth.me"; github = "danth"; githubId = 28959268; - keys = [{ - fingerprint = "4779 D1D5 3C97 2EAE 34A5 ED3D D8AF C4BF 0567 0F9D"; - }]; + keys = [ { fingerprint = "4779 D1D5 3C97 2EAE 34A5 ED3D D8AF C4BF 0567 0F9D"; } ]; }; dan-theriault = { email = "nix@theriault.codes"; @@ -4639,9 +4428,7 @@ email = "dasisdormax@mailbox.org"; github = "dasisdormax"; githubId = 3714905; - keys = [{ - fingerprint = "E59B A198 61B0 A9ED C1FA 3FB2 02BA 0D44 80CA 6C44"; - }]; + keys = [ { fingerprint = "E59B A198 61B0 A9ED C1FA 3FB2 02BA 0D44 80CA 6C44"; } ]; name = "Maximilian Wende"; }; das_j = { @@ -4668,12 +4455,8 @@ githubId = 28595242; name = "DataHearth"; keys = [ - { - fingerprint = "A129 2547 0298 BFEE 7EE0 92B3 946E 2D0C 410C 7B3D"; - } - { - fingerprint = "FFC4 92C1 5320 B05D 0F8D 7D58 ABF6 737C 6339 6D35"; - } + { fingerprint = "A129 2547 0298 BFEE 7EE0 92B3 946E 2D0C 410C 7B3D"; } + { fingerprint = "FFC4 92C1 5320 B05D 0F8D 7D58 ABF6 737C 6339 6D35"; } ]; }; davegallant = { @@ -4724,9 +4507,7 @@ github = "david-r-cox"; githubId = 4259949; name = "David Cox"; - keys = [{ - fingerprint = "0056 A3F6 9918 1E0D 8FF0 BCDE 65BB 07FA A4D9 4634"; - }]; + keys = [ { fingerprint = "0056 A3F6 9918 1E0D 8FF0 BCDE 65BB 07FA A4D9 4634"; } ]; }; davidrusu = { email = "davidrusu.me@gmail.com"; @@ -4745,9 +4526,7 @@ github = "davidtwco"; githubId = 1295100; name = "David Wood"; - keys = [{ - fingerprint = "5B08 313C 6853 E5BF FA91 A817 0176 0B4F 9F53 F154"; - }]; + keys = [ { fingerprint = "5B08 313C 6853 E5BF FA91 A817 0176 0B4F 9F53 F154"; } ]; }; davisrichard437 = { email = "davisrichard437@gmail.com"; @@ -4814,9 +4593,7 @@ github = "dbirks"; githubId = 7545665; name = "David Birks"; - keys = [{ - fingerprint = "B26F 9AD8 DA20 3392 EF87 C61A BB99 9F83 D9A1 9A36"; - }]; + keys = [ { fingerprint = "B26F 9AD8 DA20 3392 EF87 C61A BB99 9F83 D9A1 9A36"; } ]; }; dblsaiko = { email = "me@dblsaiko.net"; @@ -4835,9 +4612,7 @@ github = "dbrgn"; githubId = 105168; name = "Danilo B."; - keys = [{ - fingerprint = "20EE 002D 778A E197 EF7D 0D2C B993 FF98 A90C 9AB1"; - }]; + keys = [ { fingerprint = "20EE 002D 778A E197 EF7D 0D2C B993 FF98 A90C 9AB1"; } ]; }; dbrock = { email = "daniel@brockman.se"; @@ -4874,9 +4649,7 @@ email = "dearrude@tfwno.gf"; github = "DearRude"; githubId = 30749142; - keys = [{ - fingerprint = "4E35 F2E5 2132 D654 E815 A672 DB2C BC24 2868 6000"; - }]; + keys = [ { fingerprint = "4E35 F2E5 2132 D654 E815 A672 DB2C BC24 2868 6000"; } ]; }; declan = { name = "Declan Rixon"; @@ -4889,9 +4662,7 @@ github = "deejayem"; githubId = 2564003; name = "David Morgan"; - keys = [{ - fingerprint = "9B43 6B14 77A8 79C2 6CDB 6604 C171 2510 02C2 00F2"; - }]; + keys = [ { fingerprint = "9B43 6B14 77A8 79C2 6CDB 6604 C171 2510 02C2 00F2"; } ]; }; deemp = { email = "deempleton@gmail.com"; @@ -4916,9 +4687,7 @@ matrix = "@defelo:matrix.defelo.de"; github = "Defelo"; githubId = 41747605; - keys = [{ - fingerprint = "6130 3BBA D7D1 BF74 EFA4 4E3B E7FE 2087 E438 0E64"; - }]; + keys = [ { fingerprint = "6130 3BBA D7D1 BF74 EFA4 4E3B E7FE 2087 E438 0E64"; } ]; }; deifactor = { name = "Ash Zahlen"; @@ -5160,9 +4929,7 @@ github = "d-goldin"; githubId = 43349662; name = "Dima"; - keys = [{ - fingerprint = "1C4E F4FE 7F8E D8B7 1E88 CCDF BAB1 D15F B7B4 D4CE"; - }]; + keys = [ { fingerprint = "1C4E F4FE 7F8E D8B7 1E88 CCDF BAB1 D15F B7B4 D4CE"; } ]; }; dgollings = { email = "daniel.gollings+nixpkgs@gmail.com"; @@ -5234,15 +5001,19 @@ github = "diniamo"; githubId = 55629891; }; + diogomdp = { + email = "me@diogodp.dev"; + github = "diogomdp"; + githubId = 52360869; + name = "Diogo"; + }; diogotcorreia = { name = "Diogo Correia"; email = "me@diogotc.com"; matrix = "@dtc:diogotc.com"; github = "diogotcorreia"; githubId = 7467891; - keys = [{ - fingerprint = "111F 91B7 5F61 99D8 985B 4C70 12CF 31FD FF17 2B77"; - }]; + keys = [ { fingerprint = "111F 91B7 5F61 99D8 985B 4C70 12CF 31FD FF17 2B77"; } ]; }; diogox = { name = "Diogo Xavier"; @@ -5284,18 +5055,14 @@ email = "hello@ditsuke.com"; github = "ditsuke"; githubId = 72784348; - keys = [{ - fingerprint = "8FD2 153F 4889 541A 54F1 E09E 71B6 C31C 8A5A 9D21"; - }]; + keys = [ { fingerprint = "8FD2 153F 4889 541A 54F1 E09E 71B6 C31C 8A5A 9D21"; } ]; }; dixslyf = { name = "Dixon Sean Low Yan Feng"; email = "dixonseanlow@protonmail.com"; github = "dixslyf"; githubId = 56017218; - keys = [{ - fingerprint = "E6F4 BFB4 8DE3 893F 68FC A15F FF5F 4B30 A41B BAC8"; - }]; + keys = [ { fingerprint = "E6F4 BFB4 8DE3 893F 68FC A15F FF5F 4B30 A41B BAC8"; } ]; }; djacu = { email = "daniel.n.baker@gmail.com"; @@ -5409,9 +5176,7 @@ email = "silkmoth@protonmail.com"; github = "asciimoth"; githubId = 91414737; - keys = [{ - fingerprint = "7D6B AE0A A98A FDE9 3396 E721 F87E 15B8 3AA7 3087"; - }]; + keys = [ { fingerprint = "7D6B AE0A A98A FDE9 3396 E721 F87E 15B8 3AA7 3087"; } ]; }; dominikh = { email = "dominik@honnef.co"; @@ -5423,17 +5188,13 @@ github = "donovanglover"; githubId = 2374245; name = "Donovan Glover"; - keys = [{ - fingerprint = "EE7D 158E F9E7 660E 0C33 86B2 8FC5 F7D9 0A5D 8F4D"; - }]; + keys = [ { fingerprint = "EE7D 158E F9E7 660E 0C33 86B2 8FC5 F7D9 0A5D 8F4D"; } ]; }; donteatoreo = { name = "DontEatOreo"; github = "DontEatOreo"; githubId = 57304299; - keys = [{ - fingerprint = "33CD 5C0A 673C C54D 661E 5E4C 0DB5 361B EEE5 30AB"; - }]; + keys = [ { fingerprint = "33CD 5C0A 673C C54D 661E 5E4C 0DB5 361B EEE5 30AB"; } ]; }; doriath = { email = "tomasz.zurkowski@gmail.com"; @@ -5465,9 +5226,7 @@ github = "dottedmag"; githubId = 16120; name = "Misha Gusarov"; - keys = [{ - fingerprint = "A8DF 1326 9E5D 9A38 E57C FAC2 9D20 F650 3E33 8888"; - }]; + keys = [ { fingerprint = "A8DF 1326 9E5D 9A38 E57C FAC2 9D20 F650 3E33 8888"; } ]; }; dpaetzel = { email = "david.paetzel@posteo.de"; @@ -5480,9 +5239,7 @@ github = "dpausp"; githubId = 1965950; name = "Tobias Stenzel"; - keys = [{ - fingerprint = "4749 0887 CF3B 85A1 6355 C671 78C7 DD40 DF23 FB16"; - }]; + keys = [ { fingerprint = "4749 0887 CF3B 85A1 6355 C671 78C7 DD40 DF23 FB16"; } ]; }; dpc = { email = "dpc@dpc.pw"; @@ -5490,9 +5247,7 @@ githubId = 9209; matrix = "@dpc:matrix.org"; name = "Dawid Ciężarkiewicz"; - keys = [{ - fingerprint = "0402 11D2 0830 2D71 5792 8197 86BB 1D5B 5575 7D38"; - }]; + keys = [ { fingerprint = "0402 11D2 0830 2D71 5792 8197 86BB 1D5B 5575 7D38"; } ]; }; DPDmancul = { name = "Davide Peressoni"; @@ -5518,9 +5273,7 @@ github = "dr460nf1r3"; githubId = 12834713; name = "Nico Jensch"; - keys = [{ - fingerprint = "D245 D484 F357 8CB1 7FD6 DA6B 67DB 29BF F3C9 6757"; - }]; + keys = [ { fingerprint = "D245 D484 F357 8CB1 7FD6 DA6B 67DB 29BF F3C9 6757"; } ]; }; dragonginger = { email = "dragonginger10@gmail.com"; @@ -5562,9 +5315,7 @@ github = "drperceptron"; githubId = 92106371; name = "Dr Perceptron"; - keys = [{ - fingerprint = "7E38 89D9 B1A8 B381 C8DE A15F 95EB 6DFF 26D1 CEB0"; - }]; + keys = [ { fingerprint = "7E38 89D9 B1A8 B381 C8DE A15F 95EB 6DFF 26D1 CEB0"; } ]; }; DrSensor = { name = "Fahmi Akbar Wildana"; @@ -5579,9 +5330,7 @@ matrix = "@drupol:matrix.org"; github = "drupol"; githubId = 252042; - keys = [{ - fingerprint = "85F3 72DF 4AF3 EF13 ED34 72A3 0AAF 2901 E804 0715"; - }]; + keys = [ { fingerprint = "85F3 72DF 4AF3 EF13 ED34 72A3 0AAF 2901 E804 0715"; } ]; }; dsalaza4 = { email = "podany270895@gmail.com"; @@ -5594,9 +5343,7 @@ email = "dominik.schrempf@gmail.com"; github = "dschrempf"; githubId = 5596239; - keys = [{ - fingerprint = "62BC E2BD 49DF ECC7 35C7 E153 875F 2BCF 163F 1B29"; - }]; + keys = [ { fingerprint = "62BC E2BD 49DF ECC7 35C7 E153 875F 2BCF 163F 1B29"; } ]; }; dsferruzza = { email = "david.sferruzza@gmail.com"; @@ -5610,9 +5357,7 @@ matrix = "@dani0854:matrix.org"; github = "dani0854"; githubId = 32674935; - keys = [{ - fingerprint = "E033 FE26 0E62 224B B35C 75C9 DE8B 9CED 0696 C600"; - }]; + keys = [ { fingerprint = "E033 FE26 0E62 224B B35C 75C9 DE8B 9CED 0696 C600"; } ]; }; dsymbol = { name = "dsymbol"; @@ -5624,9 +5369,7 @@ github = "dtzWill"; githubId = 817330; name = "Will Dietz"; - keys = [{ - fingerprint = "389A 78CB CD88 5E0C 4701 DEB9 FD42 C7D0 D414 94C8"; - }]; + keys = [ { fingerprint = "389A 78CB CD88 5E0C 4701 DEB9 FD42 C7D0 D414 94C8"; } ]; }; dudymas = { email = "jeremy.white@cloudposse.com"; @@ -5645,9 +5388,7 @@ github = "jollheef"; githubId = 1749762; name = "Mikhail Klementev"; - keys = [{ - fingerprint = "5DD7 C6F6 0630 F08E DAE7 4711 1525 585D 1B43 C62A"; - }]; + keys = [ { fingerprint = "5DD7 C6F6 0630 F08E DAE7 4711 1525 585D 1B43 C62A"; } ]; }; dunxen = { email = "git@dunxen.dev"; @@ -5655,9 +5396,7 @@ github = "dunxen"; githubId = 3072149; name = "Duncan Dean"; - keys = [{ - fingerprint = "9484 44FC E03B 05BA 5AB0 591E C37B 1C1D 44C7 86EE"; - }]; + keys = [ { fingerprint = "9484 44FC E03B 05BA 5AB0 591E C37B 1C1D 44C7 86EE"; } ]; }; dvn0 = { email = "git@dvn.me"; @@ -5720,9 +5459,7 @@ github = "e1mo"; githubId = 61651268; name = "Moritz Fromm"; - keys = [{ - fingerprint = "67BE E563 43B6 420D 550E DF2A 6D61 7FD0 A85B AADA"; - }]; + keys = [ { fingerprint = "67BE E563 43B6 420D 550E DF2A 6D61 7FD0 A85B AADA"; } ]; }; eadwu = { email = "edmund.wu@protonmail.com"; @@ -5759,9 +5496,7 @@ github = "ebbertd"; githubId = 20522234; name = "Daniel Ebbert"; - keys = [{ - fingerprint = "E765 FCA3 D9BF 7FDB 856E AD73 47BC 1559 27CB B9C7"; - }]; + keys = [ { fingerprint = "E765 FCA3 D9BF 7FDB 856E AD73 47BC 1559 27CB B9C7"; } ]; }; ebzzry = { email = "ebzzry@ebzzry.io"; @@ -5804,9 +5539,7 @@ github = "eddsteel"; githubId = 206872; name = "Edd Steel"; - keys = [{ - fingerprint = "1BE8 48D7 6C7C 4C51 349D DDCC 3362 0159 D403 85A0"; - }]; + keys = [ { fingerprint = "1BE8 48D7 6C7C 4C51 349D DDCC 3362 0159 D403 85A0"; } ]; }; edef = { email = "edef@edef.eu"; @@ -5843,9 +5576,7 @@ email = "ericdrex@gmail.com"; github = "edrex"; githubId = 14615; - keys = [{ - fingerprint = "AC47 2CCC 9867 4644 A9CF EB28 1C5C 1ED0 9F66 6824"; - }]; + keys = [ { fingerprint = "AC47 2CCC 9867 4644 A9CF EB28 1C5C 1ED0 9F66 6824"; } ]; matrix = "@edrex:matrix.org"; name = "Eric Drechsel"; }; @@ -5920,7 +5651,7 @@ name = "Edvin Källström"; githubId = 84442052; }; - ekimber = { + ekimber = { email = "ekimber@protonmail.com"; github = "ekimber"; name = "Edward Kimber"; @@ -6011,9 +5742,7 @@ email = "fedi.jamoussi@protonmail.ch"; github = "eljamm"; githubId = 83901271; - keys = [{ - fingerprint = "FF59 E027 4EE2 E792 512B BDC8 7630 FDF7 C8FB 1F3F"; - }]; + keys = [ { fingerprint = "FF59 E027 4EE2 E792 512B BDC8 7630 FDF7 C8FB 1F3F"; } ]; }; elkowar = { email = "thereal.elkowar@gmail.com"; @@ -6198,9 +5927,7 @@ email = "eownerdead@disroot.org"; github = "eownerdead"; githubId = 141208772; - keys = [{ - fingerprint = "4715 17D6 2495 A273 4DDB 5661 009E 5630 5CA5 4D63"; - }]; + keys = [ { fingerprint = "4715 17D6 2495 A273 4DDB 5661 009E 5630 5CA5 4D63"; } ]; }; eperuffo = { email = "info@emanueleperuffo.com"; @@ -6231,18 +5958,14 @@ github = "ercao"; githubId = 51725284; name = "ercao"; - keys = [{ - fingerprint = "F3B0 36F7 B0CB 0964 3C12 D3C7 FFAB D125 7ECF 0889"; - }]; + keys = [ { fingerprint = "F3B0 36F7 B0CB 0964 3C12 D3C7 FFAB D125 7ECF 0889"; } ]; }; erdnaxe = { email = "erdnaxe@crans.org"; github = "erdnaxe"; githubId = 2663216; name = "Alexandre Iooss"; - keys = [{ - fingerprint = "2D37 1AD2 7E2B BC77 97E1 B759 6C79 278F 3FCD CC02"; - }]; + keys = [ { fingerprint = "2D37 1AD2 7E2B BC77 97E1 B759 6C79 278F 3FCD CC02"; } ]; }; ereslibre = { email = "ereslibre@ereslibre.es"; @@ -6288,9 +6011,7 @@ github = "erictapen"; githubId = 11532355; name = "Kerstin Humm"; - keys = [{ - fingerprint = "F178 B4B4 6165 6D1B 7C15 B55D 4029 3358 C7B9 326B"; - }]; + keys = [ { fingerprint = "F178 B4B4 6165 6D1B 7C15 B55D 4029 3358 C7B9 326B"; } ]; }; ericthemagician = { email = "eric@ericyen.com"; @@ -6368,9 +6089,7 @@ github = "ethancedwards8"; githubId = 60861925; name = "Ethan Carter Edwards"; - keys = [{ - fingerprint = "0E69 0F46 3457 D812 3387 C978 F93D DAFA 26EF 2458"; - }]; + keys = [ { fingerprint = "0E69 0F46 3457 D812 3387 C978 F93D DAFA 26EF 2458"; } ]; }; ethercrow = { email = "ethercrow@gmail.com"; @@ -6409,9 +6128,7 @@ github = "etu"; githubId = 461970; name = "Elis Hirwing"; - keys = [{ - fingerprint = "67FE 98F2 8C44 CF22 1828 E12F D57E FA62 5C9A 925F"; - }]; + keys = [ { fingerprint = "67FE 98F2 8C44 CF22 1828 E12F D57E FA62 5C9A 925F"; } ]; }; euank = { email = "euank-nixpkg@euank.com"; @@ -6431,9 +6148,7 @@ matrix = "@evalexpr:matrix.org"; github = "evalexpr"; githubId = 23485511; - keys = [{ - fingerprint = "8129 5B85 9C5A F703 C2F4 1E29 2D1D 402E 1776 3DD6"; - }]; + keys = [ { fingerprint = "8129 5B85 9C5A F703 C2F4 1E29 2D1D 402E 1776 3DD6"; } ]; }; evan-goode = { email = "mail@evangoo.de"; @@ -6483,9 +6198,7 @@ github = "evilbulgarian"; githubId = 1960413; name = "Vladi Gergov"; - keys = [{ - fingerprint = "50D5 67C5 D693 15A2 76F5 5634 3758 5F3C A9EC BFA4"; - }]; + keys = [ { fingerprint = "50D5 67C5 D693 15A2 76F5 5634 3758 5F3C A9EC BFA4"; } ]; }; evilmav = { email = "elenskiy.ilya@gmail.com"; @@ -6542,9 +6255,7 @@ github = "expipiplus1"; githubId = 857308; name = "Ellie Hermaszewska"; - keys = [{ - fingerprint = "FC1D 3E4F CBCA 80DF E870 6397 C811 6E3A 0C1C A76A"; - }]; + keys = [ { fingerprint = "FC1D 3E4F CBCA 80DF E870 6397 C811 6E3A 0C1C A76A"; } ]; }; exploitoverload = { email = "nix@exploitoverload.com"; @@ -6589,9 +6300,7 @@ name = "Fabian Affolter"; github = "fabaff"; githubId = 116184; - keys = [{ - fingerprint = "2F6C 930F D3C4 7E38 6AFA 4EB4 E23C D2DD 36A4 397F"; - }]; + keys = [ { fingerprint = "2F6C 930F D3C4 7E38 6AFA 4EB4 E23C D2DD 36A4 397F"; } ]; }; fabiangd = { email = "fabian.g.droege@gmail.com"; @@ -6604,9 +6313,7 @@ github = "fabianhauser"; githubId = 368799; name = "Fabian Hauser"; - keys = [{ - fingerprint = "50B7 11F4 3DFD 2018 DCE6 E8D0 8A52 A140 BEBF 7D2C"; - }]; + keys = [ { fingerprint = "50B7 11F4 3DFD 2018 DCE6 E8D0 8A52 A140 BEBF 7D2C"; } ]; }; fabianhjr = { email = "fabianhjr@protonmail.com"; @@ -6637,9 +6344,7 @@ github = "fangpenlin"; githubId = 201615; name = "Fang-Pen Lin"; - keys = [{ - fingerprint = "7130 3454 A7CD 0F0A 941A F9A3 2A26 9964 AD29 2131"; - }]; + keys = [ { fingerprint = "7130 3454 A7CD 0F0A 941A F9A3 2A26 9964 AD29 2131"; } ]; }; farcaller = { name = "Vladimir Pouzanov"; @@ -6726,16 +6431,14 @@ matrix = "@nico:felbinger.eu"; github = "felbinger"; githubId = 26925347; - keys = [{ - fingerprint = "0797 D238 9769 CA1E 57B7 2ED9 2BA7 8116 87C9 0DE4"; - }]; + keys = [ { fingerprint = "0797 D238 9769 CA1E 57B7 2ED9 2BA7 8116 87C9 0DE4"; } ]; }; felipeqq2 = { name = "Felipe Silva"; email = "nixpkgs@felipeqq2.rocks"; github = "felipeqq2"; githubId = 71830138; - keys = [{ fingerprint = "7391 BF2D A2C3 B2C9 BE25 ACA9 C7A7 4616 F302 5DF4"; }]; + keys = [ { fingerprint = "7391 BF2D A2C3 B2C9 BE25 ACA9 C7A7 4616 F302 5DF4"; } ]; matrix = "@felipeqq2:pub.solar"; }; felixalbrigtsen = { @@ -6768,9 +6471,7 @@ # historical fingerprint = "6AB3 7A28 5420 9A41 82D9 0068 910A CB9F 6BD2 6F58"; } - { - fingerprint = "7E08 6842 0934 AA1D 6821 1F2A 671E 39E6 744C 807D"; - } + { fingerprint = "7E08 6842 0934 AA1D 6821 1F2A 671E 39E6 744C 807D"; } ]; }; fernsehmuell = { @@ -6853,9 +6554,7 @@ github = "Flakebi"; githubId = 6499211; name = "Sebastian Neubauer"; - keys = [{ - fingerprint = "2F93 661D AC17 EA98 A104 F780 ECC7 55EE 583C 1672"; - }]; + keys = [ { fingerprint = "2F93 661D AC17 EA98 A104 F780 ECC7 55EE 583C 1672"; } ]; }; flandweber = { email = "finn@landweber.xyz"; @@ -6955,9 +6654,7 @@ githubId = 34962634; matrix = "@foodogsquared:matrix.org"; name = "Gabriel Arazas"; - keys = [{ - fingerprint = "DDD7 D0BD 602E 564B AA04 FC35 1431 0D91 4115 2B92"; - }]; + keys = [ { fingerprint = "DDD7 D0BD 602E 564B AA04 FC35 1431 0D91 4115 2B92"; } ]; }; fooker = { email = "fooker@lab.sh"; @@ -6970,9 +6667,7 @@ github = "foolnotion"; githubId = 844222; name = "Bogdan Burlacu"; - keys = [{ - fingerprint = "B722 6464 838F 8BDB 2BEA C8C8 5B0E FDDF BA81 6105"; - }]; + keys = [ { fingerprint = "B722 6464 838F 8BDB 2BEA C8C8 5B0E FDDF BA81 6105"; } ]; }; Forden = { email = "forden@zuku.tech"; @@ -6997,9 +6692,7 @@ github = "fpletz"; githubId = 114159; name = "Franz Pletz"; - keys = [{ - fingerprint = "8A39 615D CE78 AF08 2E23 F303 846F DED7 7926 17B4"; - }]; + keys = [ { fingerprint = "8A39 615D CE78 AF08 2E23 F303 846F DED7 7926 17B4"; } ]; }; fps = { email = "mista.tapas@gmx.net"; @@ -7088,12 +6781,6 @@ githubId = 2129135; name = "Frederik Rietdijk"; }; - friedelino = { - email = "friede.mann@posteo.de"; - github = "friedelino"; - githubId = 46672819; - name = "Frido Friedemann"; - }; friedow = { email = "christian@friedow.com"; github = "friedow"; @@ -7117,9 +6804,7 @@ githubId = 10263813; name = "Dominic Shelton"; matrix = "@frogamic:beeper.com"; - keys = [{ - fingerprint = "779A 7CA8 D51C C53A 9C51 43F7 AAE0 70F0 67EC 00A5"; - }]; + keys = [ { fingerprint = "779A 7CA8 D51C C53A 9C51 43F7 AAE0 70F0 67EC 00A5"; } ]; }; frontsideair = { email = "photonia@gmail.com"; @@ -7144,9 +6829,7 @@ email = "luiz@lferraz.com"; github = "Fryuni"; githubId = 11063910; - keys = [{ - fingerprint = "2109 4B0E 560B 031E F539 62C8 2B56 8731 DB24 47EC"; - }]; + keys = [ { fingerprint = "2109 4B0E 560B 031E F539 62C8 2B56 8731 DB24 47EC"; } ]; }; fsagbuya = { email = "fa@m-labs.ph"; @@ -7154,6 +6837,13 @@ githubId = 77672306; name = "Florian Agbuya"; }; + fsnkty = { + name = "fsnkty"; + github = "fsnkty"; + githubId = 153512689; + email = "fsnkty@shimeji.cafe"; + matrix = "@nuko:shimeji.cafe"; + }; fstamour = { email = "fr.st-amour@gmail.com"; github = "fstamour"; @@ -7195,9 +6885,7 @@ github = "funkeleinhorn"; githubId = 103313934; name = "Funkeleinhorn"; - keys = [{ - fingerprint = "689D 1C81 DA0D 1EB2 F029 D24E C7BE A25A 0A33 5A72"; - }]; + keys = [ { fingerprint = "689D 1C81 DA0D 1EB2 F029 D24E C7BE A25A 0A33 5A72"; } ]; }; fusion809 = { email = "brentonhorne77@gmail.com"; @@ -7233,9 +6921,7 @@ github = "fx-chun"; githubId = 40049608; name = "Faye Chun"; - keys = [{ - fingerprint = "ACB8 DB1F E88D A908 6332 BDB1 5A71 B010 2FD7 3FC0"; - }]; + keys = [ { fingerprint = "ACB8 DB1F E88D A908 6332 BDB1 5A71 B010 2FD7 3FC0"; } ]; }; fxfactorial = { email = "edgar.factorial@gmail.com"; @@ -7279,18 +6965,14 @@ github = "gabyx"; githubId = 647437; name = "Gabriel Nützi"; - keys = [{ - fingerprint = "90AE CCB9 7AD3 4CE4 3AED 9402 E969 172A B075 7EB8"; - }]; + keys = [ { fingerprint = "90AE CCB9 7AD3 4CE4 3AED 9402 E969 172A B075 7EB8"; } ]; }; gador = { email = "florian.brandes@posteo.de"; github = "gador"; githubId = 1883533; name = "Florian Brandes"; - keys = [{ - fingerprint = "0200 3EF8 8D2B CF2D 8F00 FFDC BBB3 E40E 5379 7FD9"; - }]; + keys = [ { fingerprint = "0200 3EF8 8D2B CF2D 8F00 FFDC BBB3 E40E 5379 7FD9"; } ]; }; gaelreyrol = { email = "me@gaelreyrol.dev"; @@ -7298,9 +6980,7 @@ name = "Gaël Reyrol"; github = "gaelreyrol"; githubId = 498465; - keys = [{ - fingerprint = "3492 D8FA ACFF 4C5F A56E 50B7 DFB9 B69A 2C42 7F61"; - }]; + keys = [ { fingerprint = "3492 D8FA ACFF 4C5F A56E 50B7 DFB9 B69A 2C42 7F61"; } ]; }; GaetanLepage = { email = "gaetan@glepage.com"; @@ -7320,9 +7000,7 @@ name = "The Galaxy"; github = "ga1aksy"; githubId = 148551648; - keys = [{ - fingerprint = "48CA 3873 9E9F CA8E 76A0 835A E3DE CF85 4212 E1EA"; - }]; + keys = [ { fingerprint = "48CA 3873 9E9F CA8E 76A0 835A E3DE CF85 4212 E1EA"; } ]; }; gal_bolle = { email = "florent.becker@ens-lyon.org"; @@ -7442,18 +7120,14 @@ email = "genericnerdyusername@proton.me"; github = "GenericNerdyUsername"; githubId = 111183546; - keys = [{ - fingerprint = "58CE D4BE 6B10 149E DA80 A990 2F48 6356 A4CB 30F3"; - }]; + keys = [ { fingerprint = "58CE D4BE 6B10 149E DA80 A990 2F48 6356 A4CB 30F3"; } ]; }; genofire = { name = "genofire"; email = "geno+dev@fireorbit.de"; github = "genofire"; githubId = 6905586; - keys = [{ - fingerprint = "386E D1BF 848A BB4A 6B4A 3C45 FC83 907C 125B C2BC"; - }]; + keys = [ { fingerprint = "386E D1BF 848A BB4A 6B4A 3C45 FC83 907C 125B C2BC"; } ]; }; geoffreyfrogeye = { name = "Geoffrey Frogeye"; @@ -7461,18 +7135,14 @@ matrix = "@geoffrey:frogeye.fr"; github = "GeoffreyFrogeye"; githubId = 1685403; - keys = [{ - fingerprint = "4FBA 930D 314A 0321 5E2C DB0A 8312 C8CA C1BA C289"; - }]; + keys = [ { fingerprint = "4FBA 930D 314A 0321 5E2C DB0A 8312 C8CA C1BA C289"; } ]; }; georgesalkhouri = { name = "Georges Alkhouri"; email = "incense.stitch_0w@icloud.com"; github = "GeorgesAlkhouri"; githubId = 6077574; - keys = [{ - fingerprint = "1608 9E8D 7C59 54F2 6A7A 7BD0 8BD2 09DC C54F D339"; - }]; + keys = [ { fingerprint = "1608 9E8D 7C59 54F2 6A7A 7BD0 8BD2 09DC C54F D339"; } ]; }; georgewhewell = { email = "georgerw@gmail.com"; @@ -7485,9 +7155,7 @@ github = "georgyo"; githubId = 19374; name = "George Shammas"; - keys = [{ - fingerprint = "D0CF 440A A703 E0F9 73CB A078 82BB 70D5 41AE 2DB4"; - }]; + keys = [ { fingerprint = "D0CF 440A A703 E0F9 73CB A078 82BB 70D5 41AE 2DB4"; } ]; }; gepbird = { email = "gutyina.gergo.2@gmail.com"; @@ -7572,9 +7240,7 @@ github = "ghthor"; githubId = 160298; name = "Will Owens"; - keys = [{ - fingerprint = "8E98 BB01 BFF8 AEA4 E303 FC4C 8074 09C9 2CE2 3033"; - }]; + keys = [ { fingerprint = "8E98 BB01 BFF8 AEA4 E303 FC4C 8074 09C9 2CE2 3033"; } ]; }; ghuntley = { email = "ghuntley@ghuntley.com"; @@ -7593,9 +7259,7 @@ github = "gigglesquid"; githubId = 3685154; name = "Jack connors"; - keys = [{ - fingerprint = "21DF 8034 B212 EDFF 9F19 9C19 F65B 7583 7ABF D019"; - }]; + keys = [ { fingerprint = "21DF 8034 B212 EDFF 9F19 9C19 F65B 7583 7ABF D019"; } ]; }; gila = { email = "jeffry.molanus@gmail.com"; @@ -7679,9 +7343,7 @@ email = "root@gws.fyi"; github = "glittershark"; githubId = 1481027; - keys = [{ - fingerprint = "0F11 A989 879E 8BBB FDC1 E236 44EF 5B5E 861C 09A7"; - }]; + keys = [ { fingerprint = "0F11 A989 879E 8BBB FDC1 E236 44EF 5B5E 861C 09A7"; } ]; }; gloaming = { email = "ch9871@gmail.com"; @@ -7728,9 +7390,7 @@ github = "Gobidev"; githubId = 50576978; name = "Adrian Groh"; - keys = [{ - fingerprint = "62BD BF30 83E9 7076 9665 B60B 3AA3 153E 98B0 D771"; - }]; + keys = [ { fingerprint = "62BD BF30 83E9 7076 9665 B60B 3AA3 153E 98B0 D771"; } ]; }; goertzenator = { email = "daniel.goertzen@gmail.com"; @@ -7749,9 +7409,7 @@ github = "GoldsteinE"; githubId = 12019211; name = "Maximilian Siling"; - keys = [{ - fingerprint = "0BAF 2D87 CB43 746F 6237 2D78 DE60 31AB A0BB 269A"; - }]; + keys = [ { fingerprint = "0BAF 2D87 CB43 746F 6237 2D78 DE60 31AB A0BB 269A"; } ]; }; Golo300 = { email = "lanzingertm@gmail.com"; @@ -7782,27 +7440,21 @@ email = "gauvain@govanify.com"; github = "GovanifY"; githubId = 6375438; - keys = [{ - fingerprint = "5214 2D39 A7CE F8FA 872B CA7F DE62 E1E2 A614 5556"; - }]; + keys = [ { fingerprint = "5214 2D39 A7CE F8FA 872B CA7F DE62 E1E2 A614 5556"; } ]; }; gp2112 = { email = "me@guip.dev"; github = "gp2112"; githubId = 26512375; name = "Guilherme Paixão"; - keys = [{ - fingerprint = "4382 7E28 86E5 C34F 38D5 7753 8C81 4D62 5FBD 99D1"; - }]; + keys = [ { fingerprint = "4382 7E28 86E5 C34F 38D5 7753 8C81 4D62 5FBD 99D1"; } ]; }; gpanders = { name = "Gregory Anders"; email = "greg@gpanders.com"; github = "gpanders"; githubId = 8965202; - keys = [{ - fingerprint = "B9D5 0EDF E95E ECD0 C135 00A9 56E9 3C2F B6B0 8BDB"; - }]; + keys = [ { fingerprint = "B9D5 0EDF E95E ECD0 C135 00A9 56E9 3C2F B6B0 8BDB"; } ]; }; gpl = { email = "nixos-6c64ce18-bbbc-414f-8dcb-f9b6b47fe2bc@isopleth.org"; @@ -7863,17 +7515,14 @@ github = "GRBurst"; githubId = 4647221; name = "GRBurst"; - keys = [{ - fingerprint = "7FC7 98AB 390E 1646 ED4D 8F1F 797F 6238 68CD 00C2"; - }]; + keys = [ { fingerprint = "7FC7 98AB 390E 1646 ED4D 8F1F 797F 6238 68CD 00C2"; } ]; }; greaka = { email = "git@greaka.de"; github = "greaka"; githubId = 2805834; name = "Greaka"; - keys = - [{ fingerprint = "6275 FB5C C9AC 9D85 FF9E 44C5 EE92 A5CD C367 118C"; }]; + keys = [ { fingerprint = "6275 FB5C C9AC 9D85 FF9E 44C5 EE92 A5CD C367 118C"; } ]; }; greg = { email = "greg.hellings@gmail.com"; @@ -8032,9 +7681,7 @@ matrix = "@h7x4:nani.wtf"; github = "h7x4"; githubId = 14929991; - keys = [{ - fingerprint = "F7D3 7890 228A 9074 40E1 FD48 46B9 228E 814A 2AAC"; - }]; + keys = [ { fingerprint = "F7D3 7890 228A 9074 40E1 FD48 46B9 228E 814A 2AAC"; } ]; }; hacker1024 = { name = "hacker1024"; @@ -8095,9 +7742,7 @@ github = "HaoZeke"; githubId = 4336207; name = "Rohit Goswami"; - keys = [{ - fingerprint = "74B1 F67D 8E43 A94A 7554 0768 9CCC E364 02CB 49A6"; - }]; + keys = [ { fingerprint = "74B1 F67D 8E43 A94A 7554 0768 9CCC E364 02CB 49A6"; } ]; }; happyalu = { email = "alok@parlikar.com"; @@ -8123,9 +7768,7 @@ github = "hardselius"; githubId = 1422583; name = "Martin Hardselius"; - keys = [{ - fingerprint = "3F35 E4CA CBF4 2DE1 2E90 53E5 03A6 E6F7 8693 6619"; - }]; + keys = [ { fingerprint = "3F35 E4CA CBF4 2DE1 2E90 53E5 03A6 E6F7 8693 6619"; } ]; }; harrisonthorne = { email = "harrisonthorne@proton.me"; @@ -8193,9 +7836,7 @@ email = "hdhog@hdhog.ru"; github = "hdhog"; githubId = 386666; - keys = [{ - fingerprint = "A25F 6321 AAB4 4151 4085 9924 952E ACB7 6703 BA63"; - }]; + keys = [ { fingerprint = "A25F 6321 AAB4 4151 4085 9924 952E ACB7 6703 BA63"; } ]; }; hectorj = { email = "hector.jusforgues+nixos@gmail.com"; @@ -8337,9 +7978,7 @@ github = "heyimnova"; githubId = 115728866; name = "Nova Witterick"; - keys = [{ - fingerprint = "4304 6B43 8D83 078E 3DF7 10D6 DEB0 E15C 6D2A 5A7C"; - }]; + keys = [ { fingerprint = "4304 6B43 8D83 078E 3DF7 10D6 DEB0 E15C 6D2A 5A7C"; } ]; }; hh = { email = "hh@m-labs.hk"; @@ -8384,9 +8023,7 @@ github = "vale981"; githubId = 4025991; name = "Valentin Boettcher"; - keys = [{ - fingerprint = "45A9 9917 578C D629 9F5F B5B4 C22D 4DE4 D7B3 2D19"; - }]; + keys = [ { fingerprint = "45A9 9917 578C D629 9F5F B5B4 C22D 4DE4 D7B3 2D19"; } ]; }; hitsmaxft = { name = "Bhe Hongtyu"; @@ -8405,9 +8042,7 @@ name = "Henrik Jonsson"; github = "hkjn"; githubId = 287215; - keys = [{ - fingerprint = "D618 7A03 A40A 3D56 62F5 4B46 03EF BF83 9A5F DC15"; - }]; + keys = [ { fingerprint = "D618 7A03 A40A 3D56 62F5 4B46 03EF BF83 9A5F DC15"; } ]; }; hleboulanger = { email = "hleboulanger@protonmail.com"; @@ -8432,9 +8067,7 @@ email = "hello@haseebmajid.dev"; github = "hmajid2301"; githubId = 998807; - keys = [{ - fingerprint = "A236 785D 59F1 9076 1E9C E8EC 7828 3DB3 D233 E1F9"; - }]; + keys = [ { fingerprint = "A236 785D 59F1 9076 1E9C E8EC 7828 3DB3 D233 E1F9"; } ]; }; hmenke = { name = "Henri Menke"; @@ -8442,9 +8075,7 @@ matrix = "@hmenke:matrix.org"; github = "hmenke"; githubId = 1903556; - keys = [{ - fingerprint = "F1C5 760E 45B9 9A44 72E9 6BFB D65C 9AFB 4C22 4DA3"; - }]; + keys = [ { fingerprint = "F1C5 760E 45B9 9A44 72E9 6BFB D65C 9AFB 4C22 4DA3"; } ]; }; hodapp = { email = "hodapp87@gmail.com"; @@ -8488,9 +8119,7 @@ matrix = "@honnip:matrix.org"; github = "honnip"; githubId = 108175486; - keys = [{ - fingerprint = "E4DD 51F7 FA3F DCF1 BAF6 A72C 576E 43EF 8482 E415"; - }]; + keys = [ { fingerprint = "E4DD 51F7 FA3F DCF1 BAF6 A72C 576E 43EF 8482 E415"; } ]; }; hoppla20 = { email = "privat@vincentcui.de"; @@ -8553,9 +8182,7 @@ matrix = "@huantian:huantian.dev"; github = "huantianad"; githubId = 20760920; - keys = [{ - fingerprint = "731A 7A05 AD8B 3AE5 956A C227 4A03 18E0 4E55 5DE5"; - }]; + keys = [ { fingerprint = "731A 7A05 AD8B 3AE5 956A C227 4A03 18E0 4E55 5DE5"; } ]; }; hubble = { name = "Hubble the Wolverine"; @@ -8587,9 +8214,7 @@ github = "HugoReeves"; githubId = 20039091; name = "Hugo Reeves"; - keys = [{ - fingerprint = "78C2 E81C 828A 420B 269A EBC1 49FA 39F8 A7F7 35F9"; - }]; + keys = [ { fingerprint = "78C2 E81C 828A 420B 269A EBC1 49FA 39F8 A7F7 35F9"; } ]; }; hulr = { github = "hulr"; @@ -8603,7 +8228,7 @@ name = "Akshat Agarwal"; }; hummeltech = { - email = "hummeltech2024@gmail.com"; + email = "hummeltech@sherpaguru.com"; github = "hummeltech"; githubId = 6109326; name = "David Hummel"; @@ -8613,9 +8238,7 @@ github = "Huy-Ngo"; name = "Ngô Ngọc Đức Huy"; githubId = 19296926; - keys = [{ - fingerprint = "DF12 23B1 A9FD C5BE 3DA5 B6F7 904A F1C7 CDF6 95C3"; - }]; + keys = [ { fingerprint = "DF12 23B1 A9FD C5BE 3DA5 B6F7 904A F1C7 CDF6 95C3"; } ]; }; hypersw = { email = "baltic@hypersw.net"; @@ -8634,9 +8257,7 @@ email = "bryan@hyshka.com"; github = "hyshka"; githubId = 2090758; - keys = [{ - fingerprint = "24F4 1925 28C4 8797 E539 F247 DB2D 93D1 BFAA A6EA"; - }]; + keys = [ { fingerprint = "24F4 1925 28C4 8797 E539 F247 DB2D 93D1 BFAA A6EA"; } ]; }; hyzual = { email = "hyzual@gmail.com"; @@ -8660,9 +8281,7 @@ github = "iagocq"; githubId = 18238046; name = "Iago Manoel Brito"; - keys = [{ - fingerprint = "DF90 9D58 BEE4 E73A 1B8C 5AF3 35D3 9F9A 9A1B C8DA"; - }]; + keys = [ { fingerprint = "DF90 9D58 BEE4 E73A 1B8C 5AF3 35D3 9F9A 9A1B C8DA"; } ]; }; iammrinal0 = { email = "nixpkgs@mrinalpurohit.in"; @@ -8700,9 +8319,7 @@ github = "ibizaman"; githubId = 1044950; name = "Pierre Penninckx"; - keys = [{ - fingerprint = "A01F 10C6 7176 B2AE 2A34 1A56 D4C5 C37E 6031 A3FE"; - }]; + keys = [ { fingerprint = "A01F 10C6 7176 B2AE 2A34 1A56 D4C5 C37E 6031 A3FE"; } ]; }; iblech = { email = "iblech@speicherleck.de"; @@ -8900,9 +8517,7 @@ github = "impl"; githubId = 41129; name = "Noah Fontes"; - keys = [{ - fingerprint = "F5B2 BE1B 9AAD 98FE 2916 5597 3665 FFF7 9D38 7BAA"; - }]; + keys = [ { fingerprint = "F5B2 BE1B 9AAD 98FE 2916 5597 3665 FFF7 9D38 7BAA"; } ]; }; imrying = { email = "philiprying@gmail.com"; @@ -8946,9 +8561,7 @@ github = "infinisil"; githubId = 20525370; name = "Silvan Mosberger"; - keys = [{ - fingerprint = "6C2B 55D4 4E04 8266 6B7D DA1A 422E 9EDA E015 7170"; - }]; + keys = [ { fingerprint = "6C2B 55D4 4E04 8266 6B7D DA1A 422E 9EDA E015 7170"; } ]; }; infinitivewitch = { name = "Infinitive Witch"; @@ -8956,9 +8569,7 @@ matrix = "@infinitivewitch:fedora.im"; github = "infinitivewitch"; githubId = 128256833; - keys = [{ - fingerprint = "CF3D F4AD C7BD 1FDB A88B E4B3 CA2D 43DA 939D 94FB"; - }]; + keys = [ { fingerprint = "CF3D F4AD C7BD 1FDB A88B E4B3 CA2D 43DA 939D 94FB"; } ]; }; ingenieroariel = { email = "ariel@nunez.co"; @@ -8971,9 +8582,7 @@ github = "Intuinewin"; githubId = 13691729; name = "Antoine Labarussias"; - keys = [{ - fingerprint = "5CB5 9AA0 D180 1997 2FB3 E0EC 943A 1DE9 372E BE4E"; - }]; + keys = [ { fingerprint = "5CB5 9AA0 D180 1997 2FB3 E0EC 943A 1DE9 372E BE4E"; } ]; }; invokes-su = { email = "nixpkgs-commits@deshaw.com"; @@ -9010,9 +8619,7 @@ matrix = "@irenes:matrix.org"; github = "IreneKnapp"; githubId = 157678; - keys = [{ - fingerprint = "E864 BDFA AB55 36FD C905 5195 DBF2 52AF FB26 19FD"; - }]; + keys = [ { fingerprint = "E864 BDFA AB55 36FD C905 5195 DBF2 52AF FB26 19FD"; } ]; }; ironicbadger = { email = "alexktz@gmail.com"; @@ -9043,9 +8650,7 @@ email = "isgy@teiyg.com"; github = "tgys"; githubId = 13622947; - keys = [{ - fingerprint = "1412 816B A9FA F62F D051 1975 D3E1 B013 B463 1293"; - }]; + keys = [ { fingerprint = "1412 816B A9FA F62F D051 1975 D3E1 B013 B463 1293"; } ]; }; ius = { email = "j.de.gram@gmail.com"; @@ -9077,17 +8682,13 @@ github = "ivanbrennan"; githubId = 1672874; name = "Ivan Brennan"; - keys = [{ - fingerprint = "7311 2700 AB4F 4CDF C68C F6A5 79C3 C47D C652 EA54"; - }]; + keys = [ { fingerprint = "7311 2700 AB4F 4CDF C68C F6A5 79C3 C47D C652 EA54"; } ]; }; ivankovnatsky = { github = "ivankovnatsky"; githubId = 75213; name = "Ivan Kovnatsky"; - keys = [{ - fingerprint = "6BD3 7248 30BD 941E 9180 C1A3 3A33 FA4C 82ED 674F"; - }]; + keys = [ { fingerprint = "6BD3 7248 30BD 941E 9180 C1A3 3A33 FA4C 82ED 674F"; } ]; }; ivanmoreau = { email = "Iván Molina Rebolledo"; @@ -9190,9 +8791,7 @@ email = "contact@ja1den.me"; github = "ja1den"; githubId = 49811314; - keys = [{ - fingerprint = "CC36 4CF4 32DD 443F 27FC 033C 3475 AA20 D72F 6A93"; - }]; + keys = [ { fingerprint = "CC36 4CF4 32DD 443F 27FC 033C 3475 AA20 D72F 6A93"; } ]; }; jab = { name = "Joshua Bronson"; @@ -9248,9 +8847,7 @@ matrix = "@jakehamilton:matrix.org"; github = "jakehamilton"; githubId = 7005773; - keys = [{ - fingerprint = "B982 0250 1720 D540 6A18 2DA8 188E 4945 E85B 2D21"; - }]; + keys = [ { fingerprint = "B982 0250 1720 D540 6A18 2DA8 188E 4945 E85B 2D21"; } ]; }; jakeisnt = { name = "Jacob Chvatal"; @@ -9446,9 +9043,7 @@ github = "jcouyang"; githubId = 1235045; name = "Jichao Ouyang"; - keys = [{ - fingerprint = "A506 C38D 5CC8 47D0 DF01 134A DA8B 833B 5260 4E63"; - }]; + keys = [ { fingerprint = "A506 C38D 5CC8 47D0 DF01 134A DA8B 833B 5260 4E63"; } ]; }; jcs090218 = { email = "jcs090218@gmail.com"; @@ -9484,9 +9079,7 @@ email = "jdanek@redhat.com"; github = "jirkadanek"; githubId = 17877663; - keys = [{ - fingerprint = "D4A6 F051 AD58 2E7C BCED 5439 6927 5CAD F15D 872E"; - }]; + keys = [ { fingerprint = "D4A6 F051 AD58 2E7C BCED 5439 6927 5CAD F15D 872E"; } ]; name = "Jiri Daněk"; }; jdbaldry = { @@ -9627,9 +9220,7 @@ github = "jfchevrette"; githubId = 3001; name = "Jean-Francois Chevrette"; - keys = [{ - fingerprint = "B612 96A9 498E EECD D5E9 C0F0 67A0 5858 0129 0DC6"; - }]; + keys = [ { fingerprint = "B612 96A9 498E EECD D5E9 C0F0 67A0 5858 0129 0DC6"; } ]; }; jflanglois = { email = "yourstruly@julienlanglois.me"; @@ -9642,9 +9233,7 @@ email = "jeremyfleischman@gmail.com"; github = "jfly"; githubId = 277474; - keys = [{ - fingerprint = "F1F1 3395 8E8E 9CC4 D9FC 9647 1931 9CD8 416A 642B"; - }]; + keys = [ { fingerprint = "F1F1 3395 8E8E 9CC4 D9FC 9647 1931 9CD8 416A 642B"; } ]; }; jfroche = { name = "Jean-François Roche"; @@ -9652,9 +9241,7 @@ matrix = "@jfroche:matrix.pyxel.cloud"; github = "jfroche"; githubId = 207369; - keys = [{ - fingerprint = "7EB1 C02A B62B B464 6D7C E4AE D1D0 9DE1 69EA 19A0"; - }]; + keys = [ { fingerprint = "7EB1 C02A B62B B464 6D7C E4AE D1D0 9DE1 69EA 19A0"; } ]; }; jfvillablanca = { email = "jmfv.dev@gmail.com"; @@ -9777,9 +9364,7 @@ github = "jlamur"; githubId = 7054317; name = "Jules Lamur"; - keys = [{ - fingerprint = "B768 6CD7 451A 650D 9C54 4204 6710 CF0C 1CBD 7762"; - }]; + keys = [ { fingerprint = "B768 6CD7 451A 650D 9C54 4204 6710 CF0C 1CBD 7762"; } ]; }; jlbribeiro = { email = "nix@jlbribeiro.com"; @@ -9842,13 +9427,9 @@ name = "João Figueira"; keys = [ # GitHub signing key - { - fingerprint = "EC08 7AA3 DEAD A972 F015 6371 DC7A E56A E98E 02D7"; - } + { fingerprint = "EC08 7AA3 DEAD A972 F015 6371 DC7A E56A E98E 02D7"; } # Email encryption - { - fingerprint = "816D 23F5 E672 EC58 7674 4A73 197F 9A63 2D13 9E30"; - } + { fingerprint = "816D 23F5 E672 EC58 7674 4A73 197F 9A63 2D13 9E30"; } ]; }; jmettes = { @@ -9915,9 +9496,7 @@ github = "JoaquinTrinanes"; name = "Joaquín Triñanes"; githubId = 1385934; - keys = [{ - fingerprint = "3A13 5C15 E1D5 850D 2F90 AB25 6E14 46DD 451C 6BAF"; - }]; + keys = [ { fingerprint = "3A13 5C15 E1D5 850D 2F90 AB25 6E14 46DD 451C 6BAF"; } ]; }; jobojeha = { email = "jobojeha@jeppener.de"; @@ -10010,10 +9589,10 @@ name = "John Children"; }; johnjohnstone = { - email = "jjohnstone@riseup.net"; - github = "johnjohnstone"; - githubId = 3208498; - name = "John Johnstone"; + email = "jjohnstone@riseup.net"; + github = "johnjohnstone"; + githubId = 3208498; + name = "John Johnstone"; }; johnmh = { email = "johnmh@openblox.org"; @@ -10075,9 +9654,7 @@ matrix = "@jojosch:jswc.de"; github = "jojosch"; githubId = 327488; - keys = [{ - fingerprint = "7249 70E6 A661 D84E 8B47 678A 0590 93B1 A278 BCD0"; - }]; + keys = [ { fingerprint = "7249 70E6 A661 D84E 8B47 678A 0590 93B1 A278 BCD0"; } ]; }; jokatzke = { email = "jokatzke@fastmail.com"; @@ -10089,10 +9666,12 @@ email = "ioannis.koutras@gmail.com"; github = "jokogr"; githubId = 1252547; - keys = [{ - # compare with https://keybase.io/joko - fingerprint = "B154 A8F9 0610 DB45 0CA8 CF39 85EA E7D9 DF56 C5CA"; - }]; + keys = [ + { + # compare with https://keybase.io/joko + fingerprint = "B154 A8F9 0610 DB45 0CA8 CF39 85EA E7D9 DF56 C5CA"; + } + ]; name = "Ioannis Koutras"; }; jonaenz = { @@ -10101,9 +9680,7 @@ matrix = "@jona:matrix.jonaenz.de"; github = "JonaEnz"; githubId = 57130301; - keys = [{ - fingerprint = "1CC5 B67C EB9A 13A5 EDF6 F10E 0B4A 3662 FC58 9202"; - }]; + keys = [ { fingerprint = "1CC5 B67C EB9A 13A5 EDF6 F10E 0B4A 3662 FC58 9202"; } ]; }; jonafato = { email = "jon@jonafato.com"; @@ -10353,9 +9930,7 @@ name = "Julien Coolen"; github = "jtcoolen"; githubId = 54635632; - keys = [{ - fingerprint = "4C68 56EE DFDA 20FB 77E8 9169 1964 2151 C218 F6F5"; - }]; + keys = [ { fingerprint = "4C68 56EE DFDA 20FB 77E8 9169 1964 2151 C218 F6F5"; } ]; }; jtobin = { email = "jared@jtobin.io"; @@ -10382,9 +9957,7 @@ github = "jcmuller"; matrix = "@jcmuller@beeper.com"; name = "Juan C. Müller"; - keys = [{ - fingerprint = "D78D 25D8 A1B8 2596 267F 35B8 F44E A51A 28F9 B4A7"; - }]; + keys = [ { fingerprint = "D78D 25D8 A1B8 2596 267F 35B8 F44E A51A 28F9 B4A7"; } ]; }; juaningan = { email = "juaningan@gmail.com"; @@ -10495,9 +10068,7 @@ github = "jvanbruegge"; githubId = 1529052; name = "Jan van Brügge"; - keys = [{ - fingerprint = "3513 5CE5 77AD 711F 3825 9A99 3665 72BE 7D6C 78A2"; - }]; + keys = [ { fingerprint = "3513 5CE5 77AD 711F 3825 9A99 3665 72BE 7D6C 78A2"; } ]; }; jwatt = { email = "jwatt@broken.watch"; @@ -10565,18 +10136,14 @@ github = "kachick"; githubId = 1180335; name = "Kenichi Kamiya"; - keys = [{ - fingerprint = "9121 5D87 20CA B405 C63F 24D2 EF6E 574D 040A E2A5"; - }]; + keys = [ { fingerprint = "9121 5D87 20CA B405 C63F 24D2 EF6E 574D 040A E2A5"; } ]; }; kaction = { name = "Dmitry Bogatov"; email = "KAction@disroot.org"; github = "KAction"; githubId = 44864956; - keys = [{ - fingerprint = "3F87 0A7C A7B4 3731 2F13 6083 749F D4DF A2E9 4236"; - }]; + keys = [ { fingerprint = "3F87 0A7C A7B4 3731 2F13 6083 749F D4DF A2E9 4236"; } ]; }; kaiha = { email = "kai.harries@gmail.com"; @@ -10614,9 +10181,7 @@ email = "kamadorueda@gmail.com"; github = "kamadorueda"; githubId = 47480384; - keys = [{ - fingerprint = "2BE3 BAFD 793E A349 ED1F F00F 04D0 CEAF 916A 9A40"; - }]; + keys = [ { fingerprint = "2BE3 BAFD 793E A349 ED1F F00F 04D0 CEAF 916A 9A40"; } ]; }; kamilchm = { email = "kamil.chm@gmail.com"; @@ -10629,9 +10194,7 @@ email = "me@kamillaova.dev"; github = "Kamillaova"; githubId = 54859825; - keys = [{ - fingerprint = "B2D0 AA53 8DBE 60B0 0811 3FC0 2D52 5F67 791E 5834"; - }]; + keys = [ { fingerprint = "B2D0 AA53 8DBE 60B0 0811 3FC0 2D52 5F67 791E 5834"; } ]; }; kampfschlaefer = { email = "arnold@arnoldarts.de"; @@ -10645,6 +10208,12 @@ githubId = 56224949; name = "Mia Kanashi"; }; + kanielrkirby = { + email = "kanielrkirby@runbox.com"; + github = "kanielrkirby"; + githubId = 77940607; + name = "Kaniel Kirby"; + }; karantan = { name = "Gasper Vozel"; email = "karantan@gmail.com"; @@ -10739,9 +10308,7 @@ github = "kennyballou"; githubId = 2186188; name = "Kenny Ballou"; - keys = [{ - fingerprint = "932F 3E8E 1C0F 4A98 95D7 B8B8 B0CA A28A 0295 8308"; - }]; + keys = [ { fingerprint = "932F 3E8E 1C0F 4A98 95D7 B8B8 B0CA A28A 0295 8308"; } ]; }; kenran = { email = "johannes.maier@mailbox.org"; @@ -10779,9 +10346,7 @@ github = "kevincox"; githubId = 494012; name = "Kevin Cox"; - keys = [{ - fingerprint = "B66B 891D D83B 0E67 7D84 FC30 9BB9 2CC1 552E 99AA"; - }]; + keys = [ { fingerprint = "B66B 891D D83B 0E67 7D84 FC30 9BB9 2CC1 552E 99AA"; } ]; }; kevingriffin = { email = "me@kevin.jp"; @@ -10813,9 +10378,7 @@ github = "kgtkr"; githubId = 17868838; name = "kgtkr"; - keys = [{ - fingerprint = "B30D BE93 81E0 3D5D F301 88C8 1F6E B951 9F57 3241"; - }]; + keys = [ { fingerprint = "B30D BE93 81E0 3D5D F301 88C8 1F6E B951 9F57 3241"; } ]; }; khaneliman = { email = "khaneliman12@gmail.com"; @@ -10846,9 +10409,7 @@ github = "khrj"; githubId = 44947946; name = "Khushraj Rathod"; - keys = [{ - fingerprint = "1988 3FD8 EA2E B4EC 0A93 1E22 B77B 2A40 E770 2F19"; - }]; + keys = [ { fingerprint = "1988 3FD8 EA2E B4EC 0A93 1E22 B77B 2A40 E770 2F19"; } ]; }; KibaFox = { email = "kiba.fox@foxypossibilities.com"; @@ -11005,18 +10566,14 @@ github = "kittywitch"; githubId = 67870215; name = "Kat Inskip"; - keys = [{ - fingerprint = "9CC6 44B5 69CD A59B C874 C4C9 E8DD E3ED 1C90 F3A0"; - }]; + keys = [ { fingerprint = "9CC6 44B5 69CD A59B C874 C4C9 E8DD E3ED 1C90 F3A0"; } ]; }; kiwi = { email = "envy1988@gmail.com"; github = "Kiwi"; githubId = 35715; name = "Robert Djubek"; - keys = [{ - fingerprint = "8992 44FC D291 5CA2 0A97 802C 156C 88A5 B0A0 4B2A"; - }]; + keys = [ { fingerprint = "8992 44FC D291 5CA2 0A97 802C 156C 88A5 B0A0 4B2A"; } ]; }; kjeremy = { email = "kjeremy@gmail.com"; @@ -11048,9 +10605,7 @@ name = "Finn Behrens"; github = "Kloenk"; githubId = 12898828; - keys = [{ - fingerprint = "6881 5A95 D715 D429 659B 48A4 B924 45CF C954 6F9D"; - }]; + keys = [ { fingerprint = "6881 5A95 D715 D429 659B 48A4 B924 45CF C954 6F9D"; } ]; }; kmcopper = { email = "kmcopper@danwin1210.me"; @@ -11318,9 +10873,7 @@ github = "kugland"; githubId = 1173932; name = "André Kugland"; - keys = [{ - fingerprint = "6A62 5E60 E3FF FCAE B3AA 50DC 1DA9 3817 80CD D833"; - }]; + keys = [ { fingerprint = "6A62 5E60 E3FF FCAE B3AA 50DC 1DA9 3817 80CD D833"; } ]; }; kupac = { github = "Kupac"; @@ -11357,6 +10910,14 @@ githubId = 11614750; name = "Alexander Sharov"; }; + kwaa = { + name = "藍+85CD"; + email = "kwa@kwaa.dev"; + matrix = "@kwaa:matrix.org"; + github = "kwaa"; + githubId = 50108258; + keys = [ { fingerprint = "ABCB A12F 1A8E 3CCC F10B 5109 4444 7777 3333 4444"; } ]; + }; kwohlfahrt = { email = "kai.wohlfahrt@gmail.com"; github = "kwohlfahrt"; @@ -11380,9 +10941,7 @@ github = "KyleOndy"; githubId = 1640900; name = "Kyle Ondy"; - keys = [{ - fingerprint = "3C79 9D26 057B 64E6 D907 B0AC DB0E 3C33 491F 91C9"; - }]; + keys = [ { fingerprint = "3C79 9D26 057B 64E6 D907 B0AC DB0E 3C33 491F 91C9"; } ]; }; kylesferrazza = { name = "Kyle Sferrazza"; @@ -11391,9 +10950,7 @@ github = "kylesferrazza"; githubId = 6677292; - keys = [{ - fingerprint = "5A9A 1C9B 2369 8049 3B48 CF5B 81A1 5409 4816 2372"; - }]; + keys = [ { fingerprint = "5A9A 1C9B 2369 8049 3B48 CF5B 81A1 5409 4816 2372"; } ]; }; l0b0 = { email = "victor@engmark.name"; @@ -11418,9 +10975,7 @@ email = "iam@lach.pw"; github = "CertainLach"; githubId = 6235312; - keys = [{ - fingerprint = "323C 95B5 DBF7 2D74 8570 C0B7 40B5 D694 8143 175F"; - }]; + keys = [ { fingerprint = "323C 95B5 DBF7 2D74 8570 C0B7 40B5 D694 8143 175F"; } ]; name = "Yaroslav Bolyukin"; }; lachrymal = { @@ -11433,14 +10988,12 @@ email = "joseph@lafreniere.xyz"; github = "lafrenierejm"; githubId = 11155300; - keys = [{ - fingerprint = "0375 DD9A EDD1 68A3 ADA3 9EBA EE23 6AA0 141E FCA3"; - }]; + keys = [ { fingerprint = "0375 DD9A EDD1 68A3 ADA3 9EBA EE23 6AA0 141E FCA3"; } ]; name = "Joseph LaFreniere"; }; lagoja = { github = "Lagoja"; - githubId =750845; + githubId = 750845; name = "John Lago"; }; laikq = { @@ -11484,9 +11037,7 @@ matrix = "@Las:matrix.org"; github = "L-as"; githubId = 22075344; - keys = [{ - fingerprint = "A093 EA17 F450 D4D1 60A0 1194 AC45 8A7D 1087 D025"; - }]; + keys = [ { fingerprint = "A093 EA17 F450 D4D1 60A0 1194 AC45 8A7D 1087 D025"; } ]; name = "Las Safin"; }; lasandell = { @@ -11592,18 +11143,14 @@ name = "Lucius Hu"; github = "lebensterben"; githubId = 1222865; - keys = [{ - fingerprint = "80C6 77F2 ED0B E732 3835 A8D3 7E47 4E82 E29B 5A7A"; - }]; + keys = [ { fingerprint = "80C6 77F2 ED0B E732 3835 A8D3 7E47 4E82 E29B 5A7A"; } ]; }; lecoqjacob = { name = "Jacob LeCoq"; email = "lecoqjacob@gmail.com"; githubId = 9278174; github = "lecoqjacob"; - keys = [{ - fingerprint = "C505 1E8B 06AC 1776 6875 1B60 93AF DAD0 10B3 CB8D"; - }]; + keys = [ { fingerprint = "C505 1E8B 06AC 1776 6875 1B60 93AF DAD0 10B3 CB8D"; } ]; }; ledif = { email = "refuse@gmail.com"; @@ -11633,9 +11180,7 @@ github = "leifhelm"; githubId = 31693262; name = "Jakob Leifhelm"; - keys = [{ - fingerprint = "4A82 F68D AC07 9FFD 8BF0 89C4 6817 AA02 3810 0822"; - }]; + keys = [ { fingerprint = "4A82 F68D AC07 9FFD 8BF0 89C4 6817 AA02 3810 0822"; } ]; }; leixb = { email = "abone9999+nixpkgs@gmail.com"; @@ -11643,9 +11188,7 @@ github = "Leixb"; githubId = 17183803; name = "Aleix Boné"; - keys = [{ - fingerprint = "63D3 F436 EDE8 7E1F 1292 24AF FC03 5BB2 BB28 E15D"; - }]; + keys = [ { fingerprint = "63D3 F436 EDE8 7E1F 1292 24AF FC03 5BB2 BB28 E15D"; } ]; }; lejonet = { email = "daniel@kuehn.se"; @@ -11660,11 +11203,9 @@ name = "Leonardo Eugênio"; }; leo248 = { - github ="leo248"; + github = "leo248"; githubId = 95365184; - keys = [{ - fingerprint = "81E3 418D C1A2 9687 2C4D 96DC BB1A 818F F295 26D2"; - }]; + keys = [ { fingerprint = "81E3 418D C1A2 9687 2C4D 96DC BB1A 818F F295 26D2"; } ]; name = "leo248"; }; leo60228 = { @@ -11673,9 +11214,7 @@ github = "leo60228"; githubId = 8355305; name = "leo60228"; - keys = [{ - fingerprint = "5BE4 98D5 1C24 2CCD C21A 4604 AC6F 4BA0 78E6 7833"; - }]; + keys = [ { fingerprint = "5BE4 98D5 1C24 2CCD C21A 4604 AC6F 4BA0 78E6 7833"; } ]; }; leona = { email = "nix@leona.is"; @@ -11698,9 +11237,7 @@ leonm1 = { github = "leonm1"; githubId = 32306579; - keys = [{ - fingerprint = "C12D F14B DC9D 64E1 44C3 4D8A 755C DA4E 5923 416A"; - }]; + keys = [ { fingerprint = "C12D F14B DC9D 64E1 44C3 4D8A 755C DA4E 5923 416A"; } ]; matrix = "@mattleon:matrix.org"; name = "Matt Leon"; }; @@ -11740,9 +11277,7 @@ email = "lexugeyky@outlook.com"; github = "LEXUGE"; githubId = 13804737; - keys = [{ - fingerprint = "7FE2 113A A08B 695A C8B8 DDE6 AE53 B4C2 E58E DD45"; - }]; + keys = [ { fingerprint = "7FE2 113A A08B 695A C8B8 DDE6 AE53 B4C2 E58E DD45"; } ]; }; lf- = { email = "nix-maint@lfcode.ca"; @@ -11779,9 +11314,7 @@ github = "Liassica"; githubId = 115422798; name = "Liassica"; - keys = [{ - fingerprint = "83BE 3033 6164 B971 FA82 7036 0D34 0E59 4980 7BDD"; - }]; + keys = [ { fingerprint = "83BE 3033 6164 B971 FA82 7036 0D34 0E59 4980 7BDD"; } ]; }; liberatys = { email = "liberatys@hey.com"; @@ -11840,9 +11373,7 @@ github = "liketechnik"; githubId = 24209689; - keys = [{ - fingerprint = "92D8 A09D 03DD B774 AABD 53B9 E136 2F07 D750 DB5C"; - }]; + keys = [ { fingerprint = "92D8 A09D 03DD B774 AABD 53B9 E136 2F07 D750 DB5C"; } ]; }; lilacious = { email = "yuchenhe126@gmail.com"; @@ -11887,9 +11418,7 @@ matrix = "@me:linj.tech"; github = "jian-lin"; githubId = 75130626; - keys = [{ - fingerprint = "80EE AAD8 43F9 3097 24B5 3D7E 27E9 7B91 E63A 7FF8"; - }]; + keys = [ { fingerprint = "80EE AAD8 43F9 3097 24B5 3D7E 27E9 7B91 E63A 7FF8"; } ]; }; link2xt = { email = "link2xt@testrun.org"; @@ -11940,9 +11469,7 @@ github = "livnev"; githubId = 3964494; name = "Lev Livnev"; - keys = [{ - fingerprint = "74F5 E5CC 19D3 B5CB 608F 6124 68FF 81E6 A785 0F49"; - }]; + keys = [ { fingerprint = "74F5 E5CC 19D3 B5CB 608F 6124 68FF 81E6 A785 0F49"; } ]; }; liyangau = { email = "d@aufomm.com"; @@ -11986,9 +11513,7 @@ github = "lockejan"; githubId = 25434434; name = "Jan Schmitt"; - keys = [{ - fingerprint = "1763 9903 2D7C 5B82 5D5A 0EAD A2BC 3C6F 1435 1991"; - }]; + keys = [ { fingerprint = "1763 9903 2D7C 5B82 5D5A 0EAD A2BC 3C6F 1435 1991"; } ]; }; locochoco = { email = "contact@locochoco.dev"; @@ -12021,9 +11546,7 @@ github = "legendofmiracles"; githubId = 30902201; name = "legendofmiracles"; - keys = [{ - fingerprint = "CC50 F82C 985D 2679 0703 AF15 19B0 82B3 DEFE 5451"; - }]; + keys = [ { fingerprint = "CC50 F82C 985D 2679 0703 AF15 19B0 82B3 DEFE 5451"; } ]; }; longer = { email = "michal@mieszczak.com.pl"; @@ -12084,9 +11607,7 @@ email = "loveisgrief@tuta.io"; github = "LoveIsGrief"; githubId = 2829538; - keys = [{ - fingerprint = "9847 4F48 18C6 4E0A F0C5 3529 E96D 1EDF A053 45EB"; - }]; + keys = [ { fingerprint = "9847 4F48 18C6 4E0A F0C5 3529 E96D 1EDF A053 45EB"; } ]; }; lovek323 = { email = "jason@oconal.id.au"; @@ -12100,9 +11621,7 @@ github = "lovesegfault"; githubId = 7243783; name = "Bernardo Meurer"; - keys = [{ - fingerprint = "F193 7596 57D5 6DA4 CCD4 786B F4C0 D53B 8D14 C246"; - }]; + keys = [ { fingerprint = "F193 7596 57D5 6DA4 CCD4 786B F4C0 D53B 8D14 C246"; } ]; }; lowfatcomputing = { email = "andreas.wagner@lowfatcomputing.org"; @@ -12115,8 +11634,7 @@ github = "loispostula"; githubId = 1423612; name = "Loïs Postula"; - keys = - [{ fingerprint = "0B4A E7C7 D3B7 53F5 3B3D 774C 3819 3C6A 09C3 9ED1"; }]; + keys = [ { fingerprint = "0B4A E7C7 D3B7 53F5 3B3D 774C 3819 3C6A 09C3 9ED1"; } ]; }; lrewega = { email = "lrewega@c32.ca"; @@ -12155,9 +11673,7 @@ githubId = 153414530; matrix = "@ltstf1re:converser.eu"; name = "Little Starfire"; - keys = [{ - fingerprint = "FE6C C3C9 2ACF 4367 2B56 5B22 8603 2ACC 051A 873D"; - }]; + keys = [ { fingerprint = "FE6C C3C9 2ACF 4367 2B56 5B22 8603 2ACC 051A 873D"; } ]; }; lu15w1r7h = { email = "lwirth2000@gmail.com"; @@ -12188,9 +11704,7 @@ github = "lucas-deangelis"; githubId = 55180995; name = "Lucas De Angelis"; - keys = [{ - fingerprint = "3C8B D3AD 93BB 1F36 B8FF 30BD 8627 E5ED F74B 5BF4"; - }]; + keys = [ { fingerprint = "3C8B D3AD 93BB 1F36 B8FF 30BD 8627 E5ED F74B 5BF4"; } ]; }; lucasew = { email = "lucas59356@gmail.com"; @@ -12233,9 +11747,7 @@ github = "ludovicopiero"; githubId = 44255157; name = "Ludovico Piero"; - keys = [{ - fingerprint = "72CA 4F61 46C6 0DAB 6193 4D35 3911 DD27 6CFE 779C"; - }]; + keys = [ { fingerprint = "72CA 4F61 46C6 0DAB 6193 4D35 3911 DD27 6CFE 779C"; } ]; }; lufia = { email = "lufia@lufia.org"; @@ -12248,9 +11760,7 @@ email = "luflosi@luflosi.de"; github = "Luflosi"; githubId = 15217907; - keys = [{ - fingerprint = "66D1 3048 2B5F 2069 81A6 6B83 6F98 7CCF 224D 20B9"; - }]; + keys = [ { fingerprint = "66D1 3048 2B5F 2069 81A6 6B83 6F98 7CCF 224D 20B9"; } ]; }; luftmensch-luftmensch = { email = "valentinobocchetti59@gmail.com"; @@ -12269,9 +11779,7 @@ github = "propet"; githubId = 8515861; name = "Luis D. Aranda Sánchez"; - keys = [{ - fingerprint = "AB7C 81F4 9E07 CC64 F3E7 BC25 DCAC C6F4 AAFC C04E"; - }]; + keys = [ { fingerprint = "AB7C 81F4 9E07 CC64 F3E7 BC25 DCAC C6F4 AAFC C04E"; } ]; }; luisnquin = { email = "lpaandres2020@gmail.com"; @@ -12298,9 +11806,7 @@ name = "Luiz Ribeiro"; github = "luizribeiro"; githubId = 112069; - keys = [{ - fingerprint = "97A0 AE5E 03F3 499B 7D7A 65C6 76A4 1432 37EF 5817"; - }]; + keys = [ { fingerprint = "97A0 AE5E 03F3 499B 7D7A 65C6 76A4 1432 37EF 5817"; } ]; }; lukas-heiligenbrunner = { email = "lukas.heiligenbrunner@gmail.com"; @@ -12369,10 +11875,12 @@ github = "lunik1"; githubId = 13547699; name = "Corin Hoad"; - keys = [{ - # fingerprint = "BA3A 5886 AE6D 526E 20B4 57D6 6A37 DF94 8318 8492"; # old key, superseded - fingerprint = "6E69 6A19 4BD8 BFAE 7362 ACDB 6437 4619 95CA 7F16"; - }]; + keys = [ + { + # fingerprint = "BA3A 5886 AE6D 526E 20B4 57D6 6A37 DF94 8318 8492"; # old key, superseded + fingerprint = "6E69 6A19 4BD8 BFAE 7362 ACDB 6437 4619 95CA 7F16"; + } + ]; }; LunNova = { email = "nixpkgs-maintainer@lunnova.dev"; @@ -12472,18 +11980,14 @@ email = "max@haland.org"; github = "mabster314"; githubId = 5741741; - keys = [{ - fingerprint = "71EF 8F1F 0C24 8B4D 5CDC 1B47 74B3 D790 77EE 37A8"; - }]; + keys = [ { fingerprint = "71EF 8F1F 0C24 8B4D 5CDC 1B47 74B3 D790 77EE 37A8"; } ]; }; macalinao = { email = "me@ianm.com"; name = "Ian Macalinao"; github = "macalinao"; githubId = 401263; - keys = [{ - fingerprint = "1147 43F1 E707 6F3E 6F4B 2C96 B9A8 B592 F126 F8E8"; - }]; + keys = [ { fingerprint = "1147 43F1 E707 6F3E 6F4B 2C96 B9A8 B592 F126 F8E8"; } ]; }; mac-chaffee = { name = "Mac Chaffee"; @@ -12515,9 +12019,7 @@ github = "m-rey"; githubId = 42996147; name = "Mæve"; - keys = [{ - fingerprint = "96C9 D086 CC9D 7BD7 EF24 80E2 9168 796A 1CC3 AEA2"; - }]; + keys = [ { fingerprint = "96C9 D086 CC9D 7BD7 EF24 80E2 9168 796A 1CC3 AEA2"; } ]; }; mafo = { email = "Marc.Fontaine@gmx.de"; @@ -12595,9 +12097,7 @@ github = "makuru-dd"; githubId = 58048293; name = "Makuru"; - keys = [{ - fingerprint = "5B22 7123 362F DEF1 8F79 BF2B 4792 3A0F EEB5 51C7"; - }]; + keys = [ { fingerprint = "5B22 7123 362F DEF1 8F79 BF2B 4792 3A0F EEB5 51C7"; } ]; }; malbarbo = { email = "malbarbo@gmail.com"; @@ -12815,9 +12315,7 @@ github = "marzipankaiser"; githubId = 2551444; name = "Marcial Gaißert"; - keys = [{ - fingerprint = "B573 5118 0375 A872 FBBF 7770 B629 036B E399 EEE9"; - }]; + keys = [ { fingerprint = "B573 5118 0375 A872 FBBF 7770 B629 036B E399 EEE9"; } ]; }; masaeedu = { email = "masaeedu@gmail.com"; @@ -12932,9 +12430,7 @@ github = "matthewpi"; githubId = 26559841; name = "Matthew Penner"; - keys = [{ - fingerprint = "5118 F1CC B7B0 6C17 4DD1 5267 3131 1906 AD4C F6D6"; - }]; + keys = [ { fingerprint = "5118 F1CC B7B0 6C17 4DD1 5267 3131 1906 AD4C F6D6"; } ]; }; matthiasbenaets = { email = "matthias.benaets@gmail.com"; @@ -12960,9 +12456,7 @@ name = "Matthieu Barthel"; github = "MatthieuBarthel"; githubId = 435534; - keys = [{ - fingerprint = "80EB 0F2B 484A BB80 7BEF 4145 BA23 F10E AADC 2E26"; - }]; + keys = [ { fingerprint = "80EB 0F2B 484A BB80 7BEF 4145 BA23 F10E AADC 2E26"; } ]; }; matthuszagh = { email = "huszaghmatt@gmail.com"; @@ -12994,9 +12488,7 @@ githubId = 5046562; matrix = "@mattsturg:matrix.org"; name = "Matt Sturgeon"; - keys = [{ - fingerprint = "7082 22EA 1808 E39A 83AC 8B18 4F91 844C ED1A 8299"; - }]; + keys = [ { fingerprint = "7082 22EA 1808 E39A 83AC 8B18 4F91 844C ED1A 8299"; } ]; }; matusf = { email = "matus.ferech@gmail.com"; @@ -13021,9 +12513,7 @@ github = "mawis"; githubId = 2042030; name = "Matthias Wimmer"; - keys = [{ - fingerprint = "CAEC A12D CE23 37A6 6DFD 17B0 7AC7 631D 70D6 C898"; - }]; + keys = [ { fingerprint = "CAEC A12D CE23 37A6 6DFD 17B0 7AC7 631D 70D6 C898"; } ]; }; max-amb = { email = "max_a@e.email"; @@ -13036,9 +12526,7 @@ github = "maxbrunet"; githubId = 32458727; name = "Maxime Brunet"; - keys = [{ - fingerprint = "E9A2 EE26 EAC6 B3ED 6C10 61F3 4379 62FF 87EC FE2B"; - }]; + keys = [ { fingerprint = "E9A2 EE26 EAC6 B3ED 6C10 61F3 4379 62FF 87EC FE2B"; } ]; }; maxdamantus = { email = "maxdamantus@gmail.com"; @@ -13075,9 +12563,7 @@ github = "max-niederman"; githubId = 19580458; name = "Max Niederman"; - keys = [{ - fingerprint = "1DE4 424D BF77 1192 5DC4 CF5E 9AED 8814 81D8 444E"; - }]; + keys = [ { fingerprint = "1DE4 424D BF77 1192 5DC4 CF5E 9AED 8814 81D8 444E"; } ]; }; maxstrid = { email = "mxwhenderson@gmail.com"; @@ -13185,9 +12671,7 @@ github = "mccurdyc"; githubId = 5546264; name = "Colton J. McCurdy"; - keys = [{ - fingerprint = "D709 03C8 0BE9 ACDC 14F0 3BFB 77BF E531 397E DE94"; - }]; + keys = [ { fingerprint = "D709 03C8 0BE9 ACDC 14F0 3BFB 77BF E531 397E DE94"; } ]; }; mcmtroffaes = { email = "matthias.troffaes@gmail.com"; @@ -13235,9 +12719,7 @@ github = "mdlayher"; githubId = 1926905; name = "Matt Layher"; - keys = [{ - fingerprint = "D709 03C8 0BE9 ACDC 14F0 3BFB 77BF E531 397E DE94"; - }]; + keys = [ { fingerprint = "D709 03C8 0BE9 ACDC 14F0 3BFB 77BF E531 397E DE94"; } ]; }; mdorman = { email = "mdorman@jaunder.io"; @@ -13335,9 +12817,7 @@ github = "melvyn2"; githubId = 9157412; name = "melvyn"; - keys = [{ - fingerprint = "232B 9F00 2153 CA86 849C 9224 25A2 B728 0CE3 AFF6"; - }]; + keys = [ { fingerprint = "232B 9F00 2153 CA86 849C 9224 25A2 B728 0CE3 AFF6"; } ]; }; mephistophiles = { email = "mussitantesmortem@gmail.com"; @@ -13426,9 +12906,7 @@ github = "miangraham"; githubId = 704580; name = "M. Ian Graham"; - keys = [{ - fingerprint = "8CE3 2906 516F C4D8 D373 308A E189 648A 55F5 9A9F"; - }]; + keys = [ { fingerprint = "8CE3 2906 516F C4D8 D373 308A E189 648A 55F5 9A9F"; } ]; }; mib = { name = "mib"; @@ -13436,9 +12914,7 @@ matrix = "@mib:kanp.ai"; github = "mibmo"; githubId = 87388017; - keys = [{ - fingerprint = "AB0D C647 B2F7 86EB 045C 7EFE CF6E 67DE D6DC 1E3F"; - }]; + keys = [ { fingerprint = "AB0D C647 B2F7 86EB 045C 7EFE CF6E 67DE D6DC 1E3F"; } ]; }; mic92 = { email = "joerg@thalheim.io"; @@ -13446,10 +12922,12 @@ github = "Mic92"; githubId = 96200; name = "Jörg Thalheim"; - keys = [{ - # compare with https://keybase.io/Mic92 - fingerprint = "3DEE 1C55 6E1C 3DC5 54F5 875A 003F 2096 411B 5F92"; - }]; + keys = [ + { + # compare with https://keybase.io/Mic92 + fingerprint = "3DEE 1C55 6E1C 3DC5 54F5 875A 003F 2096 411B 5F92"; + } + ]; }; michaeladler = { email = "therisen06@gmail.com"; @@ -13498,9 +12976,7 @@ name = "Michael Pacheco"; github = "MichaelPachec0"; githubId = 48970112; - keys = [{ - fingerprint = "8D12 991F 5558 C501 70B2 779C 7811 46B0 B5F9 5F64"; - }]; + keys = [ { fingerprint = "8D12 991F 5558 C501 70B2 779C 7811 46B0 B5F9 5F64"; } ]; }; michaelpj = { email = "me@michaelpj.com"; @@ -13550,9 +13026,7 @@ github = "midchildan"; githubId = 7343721; name = "midchildan"; - keys = [{ - fingerprint = "FEF0 AE2D 5449 3482 5F06 40AA 186A 1EDA C5C6 3F83"; - }]; + keys = [ { fingerprint = "FEF0 AE2D 5449 3482 5F06 40AA 186A 1EDA C5C6 3F83"; } ]; }; mig4ng = { email = "mig4ng@gmail.com"; @@ -13613,9 +13087,7 @@ github = "mikroskeem"; githubId = 3490861; name = "Mark Vainomaa"; - keys = [{ - fingerprint = "DB43 2895 CF68 F0CE D4B7 EF60 DA01 5B05 B5A1 1B22"; - }]; + keys = [ { fingerprint = "DB43 2895 CF68 F0CE D4B7 EF60 DA01 5B05 B5A1 1B22"; } ]; }; milahu = { email = "milahu@gmail.com"; @@ -13682,9 +13154,7 @@ github = "minijackson"; githubId = 1200507; name = "Rémi Nicole"; - keys = [{ - fingerprint = "3196 83D3 9A1B 4DE1 3DC2 51FD FEA8 88C9 F5D6 4F62"; - }]; + keys = [ { fingerprint = "3196 83D3 9A1B 4DE1 3DC2 51FD FEA8 88C9 F5D6 4F62"; } ]; }; minion3665 = { name = "Skyler Grey"; @@ -13692,9 +13162,7 @@ matrix = "@minion3665:matrix.org"; github = "Minion3665"; githubId = 34243578; - keys = [{ - fingerprint = "D520 AC8D 7C96 9212 5B2B BD3A 1AFD 1025 6B3C 714D"; - }]; + keys = [ { fingerprint = "D520 AC8D 7C96 9212 5B2B BD3A 1AFD 1025 6B3C 714D"; } ]; }; minizilla = { email = "m.billyzaelani@gmail.com"; @@ -13732,9 +13200,7 @@ github = "mirrorwitch"; githubId = 146672255; name = "mirrorwitch"; - keys = [{ - fingerprint = "C3E7 F8C4 9CBC 9320 D360 B117 8516 D0FA 7D8F 58FC"; - }]; + keys = [ { fingerprint = "C3E7 F8C4 9CBC 9320 D360 B117 8516 D0FA 7D8F 58FC"; } ]; }; Misaka13514 = { name = "Misaka13514"; @@ -13742,8 +13208,7 @@ matrix = "@misaka13514:matrix.org"; github = "Misaka13514"; githubId = 54669781; - keys = - [{ fingerprint = "293B 93D8 A471 059F 85D7 16A6 5BA9 2099 D9BE 2DAA"; }]; + keys = [ { fingerprint = "293B 93D8 A471 059F 85D7 16A6 5BA9 2099 D9BE 2DAA"; } ]; }; mislavzanic = { email = "mislavzanic3@gmail.com"; @@ -13757,9 +13222,7 @@ githubId = 5727578; matrix = "@misterio:matrix.org"; name = "Gabriel Fontes"; - keys = [{ - fingerprint = "7088 C742 1873 E0DB 97FF 17C2 245C AB70 B4C2 25E9"; - }]; + keys = [ { fingerprint = "7088 C742 1873 E0DB 97FF 17C2 245C AB70 B4C2 25E9"; } ]; }; mistydemeo = { email = "misty@axo.dev"; @@ -13821,9 +13284,7 @@ github = "mkf"; githubId = 7753506; name = "Michał Krzysztof Feiler"; - keys = [{ - fingerprint = "1E36 9940 CC7E 01C4 CFE8 F20A E35C 2D7C 2C6A C724"; - }]; + keys = [ { fingerprint = "1E36 9940 CC7E 01C4 CFE8 F20A E35C 2D7C 2C6A C724"; } ]; }; mkg = { email = "mkg@vt.edu"; @@ -13837,9 +13298,7 @@ github = "mkg20001"; githubId = 7735145; name = "Maciej Krüger"; - keys = [{ - fingerprint = "E90C BA34 55B3 6236 740C 038F 0D94 8CE1 9CF4 9C5F"; - }]; + keys = [ { fingerprint = "E90C BA34 55B3 6236 740C 038F 0D94 8CE1 9CF4 9C5F"; } ]; }; mksafavi = { name = "MK Safavi"; @@ -13852,9 +13311,7 @@ github = "mktip"; githubId = 45905717; name = "Mohammad Issa"; - keys = [{ - fingerprint = "64BE BF11 96C3 DD7A 443E 8314 1DC0 82FA DE5B A863"; - }]; + keys = [ { fingerprint = "64BE BF11 96C3 DD7A 443E 8314 1DC0 82FA DE5B A863"; } ]; }; mlaradji = { name = "Mohamed Laradji"; @@ -13926,6 +13383,12 @@ githubId = 7831184; name = "John Mercier"; }; + modderme123 = { + email = "modderme123@gmail.com"; + github = "modderme123"; + githubId = 14153763; + name = "modderme123"; + }; modulistic = { email = "modulistic@gmail.com"; github = "modulistic"; @@ -13950,18 +13413,14 @@ matrix = "@moritz.hedtke:matrix.org"; github = "mohe2015"; githubId = 13287984; - keys = [{ - fingerprint = "1248 D3E1 1D11 4A85 75C9 8934 6794 D45A 488C 2EDE"; - }]; + keys = [ { fingerprint = "1248 D3E1 1D11 4A85 75C9 8934 6794 D45A 488C 2EDE"; } ]; }; momeemt = { name = "Mutsuha Asada"; email = "me@momee.mt"; github = "momeemt"; githubId = 43488453; - keys = [{ - fingerprint = "D94F EA9F 5B08 F6A1 7B8F EB8B ACB5 4F0C BC6A A7C6"; - }]; + keys = [ { fingerprint = "D94F EA9F 5B08 F6A1 7B8F EB8B ACB5 4F0C BC6A A7C6"; } ]; }; monaaraj = { name = "Mon Aaraj"; @@ -13994,9 +13453,7 @@ email = "chris@cdom.io"; github = "montchr"; githubId = 1757914; - keys = [{ - fingerprint = "6460 4147 C434 F65E C306 A21F 135E EDD0 F719 34F3"; - }]; + keys = [ { fingerprint = "6460 4147 C434 F65E C306 A21F 135E EDD0 F719 34F3"; } ]; }; moody = { email = "moody@posixcafe.org"; @@ -14021,9 +13478,7 @@ github = "Moredread"; githubId = 100848; name = "André-Patrick Bubel"; - keys = [{ - fingerprint = "4412 38AD CAD3 228D 876C 5455 118C E7C4 24B4 5728"; - }]; + keys = [ { fingerprint = "4412 38AD CAD3 228D 876C 5455 118C E7C4 24B4 5728"; } ]; }; moretea = { email = "maarten@moretea.nl"; @@ -14053,9 +13508,7 @@ email = "motiejus@jakstys.lt"; github = "motiejus"; githubId = 107720; - keys = [{ - fingerprint = "5F6B 7A8A 92A2 60A4 3704 9BEB 6F13 3A0C 1C28 48D7"; - }]; + keys = [ { fingerprint = "5F6B 7A8A 92A2 60A4 3704 9BEB 6F13 3A0C 1C28 48D7"; } ]; matrix = "@motiejus:jakstys.lt"; name = "Motiejus Jakštys"; }; @@ -14142,9 +13595,7 @@ name = "Egor Martynov"; github = "mrtnvgr"; githubId = 48406064; - keys = [{ - fingerprint = "6FAD DB43 D5A5 FE52 6835 0943 5B33 79E9 81EF 48B1"; - }]; + keys = [ { fingerprint = "6FAD DB43 D5A5 FE52 6835 0943 5B33 79E9 81EF 48B1"; } ]; }; mrVanDalo = { email = "contact@ingolf-wagner.de"; @@ -14158,9 +13609,7 @@ name = "Moritz Sanft"; github = "msanft"; githubId = 58110325; - keys = [{ - fingerprint = "3CAC 1D21 3D97 88FF 149A E116 BB8B 30F5 A024 C31C"; - }]; + keys = [ { fingerprint = "3CAC 1D21 3D97 88FF 149A E116 BB8B 30F5 A024 C31C"; } ]; }; mschristiansen = { email = "mikkel@rheosystems.com"; @@ -14294,9 +13743,7 @@ github = "Munksgaard"; githubId = 230613; matrix = "@philip:matrix.munksgaard.me"; - keys = [{ - fingerprint = "5658 4D09 71AF E45F CC29 6BD7 4CE6 2A90 EFC0 B9B2"; - }]; + keys = [ { fingerprint = "5658 4D09 71AF E45F CC29 6BD7 4CE6 2A90 EFC0 B9B2"; } ]; }; mupdt = { email = "nix@pdtpartners.com"; @@ -14316,9 +13763,7 @@ matrix = "@maxime:visonneau.fr"; github = "mvisonneau"; githubId = 1761583; - keys = [{ - fingerprint = "EC63 0CEA E8BC 5EE5 5C58 F2E3 150D 6F0A E919 8D24"; - }]; + keys = [ { fingerprint = "EC63 0CEA E8BC 5EE5 5C58 F2E3 150D 6F0A E919 8D24"; } ]; }; mvnetbiz = { email = "mvnetbiz@gmail.com"; @@ -14391,17 +13836,13 @@ github = "n3oney"; githubId = 30625554; matrix = "@neoney:matrix.org"; - keys = [{ - fingerprint = "9E6A 25F2 C1F2 9D76 ED00 1932 1261 173A 01E1 0298"; - }]; + keys = [ { fingerprint = "9E6A 25F2 C1F2 9D76 ED00 1932 1261 173A 01E1 0298"; } ]; }; n8henrie = { name = "Nathan Henrie"; github = "n8henrie"; githubId = 1234956; - "keys" = [{ - "fingerprint" = "F21A 6194 C9DB 9899 CD09 E24E 434B 2C14 B8C3 3422"; - }]; + "keys" = [ { "fingerprint" = "F21A 6194 C9DB 9899 CD09 E24E 434B 2C14 B8C3 3422"; } ]; }; nadir-ishiguro = { github = "nadir-ishiguro"; @@ -14425,9 +13866,7 @@ github = "nagy"; githubId = 692274; name = "Daniel Nagy"; - keys = [{ - fingerprint = "F6AE 2C60 9196 A1BC ECD8 7108 1B8E 8DCB 576F B671"; - }]; + keys = [ { fingerprint = "F6AE 2C60 9196 A1BC ECD8 7108 1B8E 8DCB 576F B671"; } ]; }; nalbyuites = { email = "ashijit007@gmail.com"; @@ -14435,6 +13874,12 @@ githubId = 1009523; name = "Ashijit Pramanik"; }; + Name = { + name = "Name"; + email = "lasagna@garfunkles.space"; + github = "namescode"; + githubId = 86119896; + }; name-snrl = { github = "name-snrl"; githubId = 72071763; @@ -14467,9 +13912,7 @@ github = "nasirhm"; githubId = 35005234; name = "Nasir Hussain"; - keys = [{ - fingerprint = "7A10 AB8E 0BEC 566B 090C 9BE3 D812 6E55 9CE7 C35D"; - }]; + keys = [ { fingerprint = "7A10 AB8E 0BEC 566B 090C 9BE3 D812 6E55 9CE7 C35D"; } ]; }; nat-418 = { github = "nat-418"; @@ -14504,9 +13947,7 @@ github = "natsukium"; githubId = 25083790; name = "Tomoya Otabi"; - keys = [{ - fingerprint = "3D14 6004 004C F882 D519 6CD4 9EA4 5A31 DB99 4C53"; - }]; + keys = [ { fingerprint = "3D14 6004 004C F882 D519 6CD4 9EA4 5A31 DB99 4C53"; } ]; }; natto1784 = { email = "natto@weirdnatto.in"; @@ -14520,9 +13961,7 @@ matrix = "@naxdy:naxdy.org"; github = "Naxdy"; githubId = 4532582; - keys = [{ - fingerprint = "BDEA AB07 909D B96F 4106 85F1 CC15 0758 46BC E91B"; - }]; + keys = [ { fingerprint = "BDEA AB07 909D B96F 4106 85F1 CC15 0758 46BC E91B"; } ]; }; nayala = { name = "Nia"; @@ -14534,9 +13973,7 @@ matrix = "@nazarewk:matrix.org"; github = "nazarewk"; githubId = 3494992; - keys = [{ - fingerprint = "4BFF 0614 03A2 47F0 AA0B 4BC4 916D 8B67 2418 92AE"; - }]; + keys = [ { fingerprint = "4BFF 0614 03A2 47F0 AA0B 4BC4 916D 8B67 2418 92AE"; } ]; }; nbr = { github = "nbr"; @@ -14562,9 +13999,7 @@ github = "ncfavier"; githubId = 4323933; name = "Naïm Favier"; - keys = [{ - fingerprint = "F3EB 4BBB 4E71 99BC 299C D4E9 95AF CE82 1190 8325"; - }]; + keys = [ { fingerprint = "F3EB 4BBB 4E71 99BC 299C D4E9 95AF CE82 1190 8325"; } ]; }; nckx = { email = "github@tobias.gr"; @@ -14675,9 +14110,7 @@ email = "me@netali.de"; github = "NetaliDev"; githubId = 15304894; - keys = [{ - fingerprint = "F729 2594 6F58 0B05 8FB3 F271 9C55 E636 426B 40A9"; - }]; + keys = [ { fingerprint = "F729 2594 6F58 0B05 8FB3 F271 9C55 E636 426B 40A9"; } ]; }; netcrns = { email = "jason.wing@gmx.de"; @@ -14691,9 +14124,7 @@ matrix = "@netfox:catgirl.cloud"; github = "0xnetfox"; githubId = 97521402; - keys = [{ - fingerprint = "E8E9 43D7 EB83 DB77 E41C D87F 9C77 CB70 F2E6 3EF7"; - }]; + keys = [ { fingerprint = "E8E9 43D7 EB83 DB77 E41C D87F 9C77 CB70 F2E6 3EF7"; } ]; }; netixx = { email = "dev.espinetfrancois@gmail.com"; @@ -14719,9 +14150,7 @@ matrix = "@networkexception:chat.upi.li"; github = "networkException"; githubId = 42888162; - keys = [{ - fingerprint = "A0B9 48C5 A263 55C2 035F 8567 FBB7 2A94 52D9 1A72"; - }]; + keys = [ { fingerprint = "A0B9 48C5 A263 55C2 035F 8567 FBB7 2A94 52D9 1A72"; } ]; }; neverbehave = { email = "i@never.pet"; @@ -14783,9 +14212,7 @@ github = "nicbk"; githubId = 77309427; name = "Nicolás Kennedy"; - keys = [{ - fingerprint = "7BC1 77D9 C222 B1DC FB2F 0484 C061 089E FEBF 7A35"; - }]; + keys = [ { fingerprint = "7BC1 77D9 C222 B1DC FB2F 0484 C061 089E FEBF 7A35"; } ]; }; nicegamer7 = { name = "Kermina Awad"; @@ -14827,18 +14254,14 @@ github = "nicolas-goudry"; githubId = 8753998; name = "Nicolas Goudry"; - keys = [{ - fingerprint = "21B6 A59A 4E89 0B1B 83E3 0CDB 01C8 8C03 5450 9AA9"; - }]; + keys = [ { fingerprint = "21B6 A59A 4E89 0B1B 83E3 0CDB 01C8 8C03 5450 9AA9"; } ]; }; nicoo = { email = "nicoo@debian.org"; github = "nbraud"; githubId = 1155801; name = "nicoo"; - keys = [{ - fingerprint = "E44E 9EA5 4B8E 256A FB73 49D3 EC9D 3708 72BC 7A8C"; - }]; + keys = [ { fingerprint = "E44E 9EA5 4B8E 256A FB73 49D3 EC9D 3708 72BC 7A8C"; } ]; }; nidabdella = { name = "Mohamed Nidabdella"; @@ -14851,9 +14274,7 @@ github = "meithecatte"; githubId = 23580910; name = "Jakub Kądziołka"; - keys = [{ - fingerprint = "E576 BFB2 CF6E B13D F571 33B9 E315 A758 4613 1564"; - }]; + keys = [ { fingerprint = "E576 BFB2 CF6E B13D F571 33B9 E315 A758 4613 1564"; } ]; }; nielsegberts = { email = "nix@nielsegberts.nl"; @@ -14916,9 +14337,7 @@ github = "nim65s"; githubId = 131929; name = "Guilhem Saurel"; - keys = [{ - fingerprint = "9B1A 7906 5D2F 2B80 6C8A 5A1C 7D2A CDAF 4653 CF28"; - }]; + keys = [ { fingerprint = "9B1A 7906 5D2F 2B80 6C8A 5A1C 7D2A CDAF 4653 CF28"; } ]; }; ninjafb = { email = "oscar@oronberg.com"; @@ -14959,9 +14378,7 @@ github = "nixbitcoin"; githubId = 45737139; name = "nixbitcoindev"; - keys = [{ - fingerprint = "577A 3452 7F3E 2A85 E80F E164 DD11 F9AD 5308 B3BA"; - }]; + keys = [ { fingerprint = "577A 3452 7F3E 2A85 E80F E164 DD11 F9AD 5308 B3BA"; } ]; }; nixinator = { email = "33lockdown33@protonmail.com"; @@ -14992,9 +14409,7 @@ email = "n@nk.je"; github = "NKJe"; githubId = 1102306; - keys = [{ - fingerprint = "B956 C6A4 22AF 86A0 8F77 A8CA DE3B ADFE CD31 A89D"; - }]; + keys = [ { fingerprint = "B956 C6A4 22AF 86A0 8F77 A8CA DE3B ADFE CD31 A89D"; } ]; }; nkpvk = { email = "niko.pavlinek@gmail.com"; @@ -15105,9 +14520,7 @@ email = "bandali@gnu.org"; github = "bandali0"; githubId = 1254858; - keys = [{ - fingerprint = "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103"; - }]; + keys = [ { fingerprint = "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103"; } ]; }; not-my-segfault = { email = "michal@tar.black"; @@ -15239,13 +14652,6 @@ github = "numkem"; githubId = 332423; }; - nu-nu-ko = { - email = "nuko@shimeji.cafe"; - matrix = "@nuko:shimeji.cafe"; - github = "nu-nu-ko"; - githubId = 153512689; - name = "nuko"; - }; nviets = { email = "nathan.g.viets@gmail.com"; github = "nviets"; @@ -15302,9 +14708,7 @@ githubId = 7851175; name = "nzbr"; matrix = "@nzbr:nzbr.de"; - keys = [{ - fingerprint = "BF3A 3EE6 3144 2C5F C9FB 39A7 6C78 B50B 97A4 2F8A"; - }]; + keys = [ { fingerprint = "BF3A 3EE6 3144 2C5F C9FB 39A7 6C78 B50B 97A4 2F8A"; } ]; }; nzhang-zh = { email = "n.zhang.hp.au@gmail.com"; @@ -15342,9 +14746,13 @@ github = "obfusk"; githubId = 1260687; name = "FC Stegerman"; - keys = [{ - fingerprint = "D5E4 A51D F8D2 55B9 FAC6 A9BB 2F96 07F0 9B36 0F2D"; - }]; + keys = [ { fingerprint = "D5E4 A51D F8D2 55B9 FAC6 A9BB 2F96 07F0 9B36 0F2D"; } ]; + }; + obreitwi = { + email = "oliver@breitwieser.eu"; + github = "obreitwi"; + githubId = 123140; + name = "Oliver Breitwieser"; }; obsidian-systems-maintenance = { name = "Obsidian Systems Maintenance"; @@ -15357,9 +14765,7 @@ github = "ocfox"; githubId = 47410251; name = "ocfox"; - keys = [{ - fingerprint = "939E F8A5 CED8 7F50 5BB5 B2D0 24BC 2738 5F70 234F"; - }]; + keys = [ { fingerprint = "939E F8A5 CED8 7F50 5BB5 B2D0 24BC 2738 5F70 234F"; } ]; }; octodi = { name = "octodi"; @@ -15373,9 +14779,7 @@ github = "oddlama"; githubId = 31919558; name = "oddlama"; - keys = [{ - fingerprint = "680A A614 E988 DE3E 84E0 DEFA 503F 6C06 8410 4B0A"; - }]; + keys = [ { fingerprint = "680A A614 E988 DE3E 84E0 DEFA 503F 6C06 8410 4B0A"; } ]; }; odi = { email = "oliver.dunkl@gmail.com"; @@ -15481,9 +14885,7 @@ email = "dev@onemoresuza.mailer.me"; github = "onemoresuza"; githubId = 106456302; - keys = [{ - fingerprint = "484F D3B8 BAD7 BF5D 8B68 2AEA A2ED 1159 935E 4D7E"; - }]; + keys = [ { fingerprint = "484F D3B8 BAD7 BF5D 8B68 2AEA A2ED 1159 935E 4D7E"; } ]; }; onixie = { email = "onixie@gmail.com"; @@ -15532,9 +14934,7 @@ email = "oliverwilkes2006@icloud.com"; github = "ooliver1"; githubId = 34910574; - keys = [{ - fingerprint = "D055 8A23 3947 B7A0 F966 B07F 0B41 0348 9833 7273"; - }]; + keys = [ { fingerprint = "D055 8A23 3947 B7A0 F966 B07F 0B41 0348 9833 7273"; } ]; }; opeik = { email = "sandro@stikic.com"; @@ -15565,9 +14965,7 @@ github = "orhun"; githubId = 24392180; name = "Orhun Parmaksız"; - keys = [{ - fingerprint = "165E 0FF7 C48C 226E 1EC3 63A7 F834 2482 4B3E 4B90"; - }]; + keys = [ { fingerprint = "165E 0FF7 C48C 226E 1EC3 63A7 F834 2482 4B3E 4B90"; } ]; }; orichter = { email = "richter-oliver@gmx.net"; @@ -15622,9 +15020,7 @@ github = "ostrolucky"; githubId = 496233; name = "Gabriel Ostrolucký"; - keys = [{ - fingerprint = "6611 22A7 B778 6E4A E99A 9D6E C79A D015 19EF B134"; - }]; + keys = [ { fingerprint = "6611 22A7 B778 6E4A E99A 9D6E C79A D015 19EF B134"; } ]; }; otavio = { email = "otavio.salvador@ossystems.com.br"; @@ -15655,36 +15051,28 @@ github = "oxalica"; githubId = 14816024; name = "oxalica"; - keys = [{ - fingerprint = "F90F FD6D 585C 2BA1 F13D E8A9 7571 654C F88E 31C2"; - }]; + keys = [ { fingerprint = "F90F FD6D 585C 2BA1 F13D E8A9 7571 654C F88E 31C2"; } ]; }; oxapentane = { email = "blame@oxapentane.com"; github = "oxapentane"; githubId = 1297357; name = "Grigory Shipunov"; - keys = [{ - fingerprint = "DD09 98E6 CDF2 9453 7FC6 04F9 91FA 5E5B F9AA 901C"; - }]; + keys = [ { fingerprint = "DD09 98E6 CDF2 9453 7FC6 04F9 91FA 5E5B F9AA 901C"; } ]; }; oxij = { email = "oxij@oxij.org"; github = "oxij"; githubId = 391919; name = "Jan Malakhovski"; - keys = [{ - fingerprint = "514B B966 B46E 3565 0508 86E8 0E6C A66E 5C55 7AA8"; - }]; + keys = [ { fingerprint = "514B B966 B46E 3565 0508 86E8 0E6C A66E 5C55 7AA8"; } ]; }; oxzi = { email = "post@0x21.biz"; github = "oxzi"; githubId = 8402811; name = "Alvar Penning"; - keys = [{ - fingerprint = "EB14 4E67 E57D 27E2 B5A4 CD8C F32A 4563 7FA2 5E31"; - }]; + keys = [ { fingerprint = "EB14 4E67 E57D 27E2 B5A4 CD8C F32A 4563 7FA2 5E31"; } ]; }; oyren = { email = "m.scheuren@oyra.eu"; @@ -15861,9 +15249,7 @@ github = "PatrickDaG"; githubId = 58092422; name = "Patrick"; - keys = [{ - fingerprint = "5E4C 3D74 80C2 35FE 2F0B D23F 7DD6 A72E C899 617D"; - }]; + keys = [ { fingerprint = "5E4C 3D74 80C2 35FE 2F0B D23F 7DD6 A72E C899 617D"; } ]; }; patricksjackson = { email = "patrick@jackson.dev"; @@ -15876,9 +15262,7 @@ github = "Patryk27"; githubId = 3395477; name = "Patryk Wychowaniec"; - keys = [{ - fingerprint = "196A BFEC 6A1D D1EC 7594 F8D1 F625 47D0 75E0 9767"; - }]; + keys = [ { fingerprint = "196A BFEC 6A1D D1EC 7594 F8D1 F625 47D0 75E0 9767"; } ]; }; patryk4815 = { email = "patryk.sondej@gmail.com"; @@ -15939,9 +15323,7 @@ github = "pbek"; githubId = 1798101; name = "Patrizio Bekerle"; - keys = [{ - fingerprint = "E005 48D5 D6AC 812C AAD2 AFFA 9C42 B05E 5913 60DC"; - }]; + keys = [ { fingerprint = "E005 48D5 D6AC 812C AAD2 AFFA 9C42 B05E 5913 60DC"; } ]; }; pbeucher = { email = "pierre@crafteo.io"; @@ -16010,6 +15392,12 @@ githubId = 920910; name = "peelz"; }; + peigongdsd = { + email = "peigong2013@outlook.com"; + github = "peigongdsd"; + githubId = 51317171; + name = "Peilin Lee"; + }; pelme = { email = "andreas@pelme.se"; github = "pelme"; @@ -16087,9 +15475,7 @@ github = "peterwilli"; githubId = 1212814; name = "Peter Willemsen"; - keys = [{ - fingerprint = "A37F D403 88E2 D026 B9F6 9617 5C9D D4BF B96A 28F0"; - }]; + keys = [ { fingerprint = "A37F D403 88E2 D026 B9F6 9617 5C9D D4BF B96A 28F0"; } ]; }; peti = { email = "simons@cryp.to"; @@ -16122,9 +15508,7 @@ matrix = "@phaer:matrix.org"; github = "phaer"; githubId = 101753; - keys = [{ - fingerprint = "5D69 CF04 B7BC 2BC1 A567 9267 00BC F29B 3208 0700"; - }]; + keys = [ { fingerprint = "5D69 CF04 B7BC 2BC1 A567 9267 00BC F29B 3208 0700"; } ]; }; phdcybersec = { name = "Léo Lavaur"; @@ -16132,9 +15516,7 @@ github = "phdcybersec"; githubId = 82591009; - keys = [{ - fingerprint = "7756 E88F 3C6A 47A5 C5F0 CDFB AB54 6777 F93E 20BF"; - }]; + keys = [ { fingerprint = "7756 E88F 3C6A 47A5 C5F0 CDFB AB54 6777 F93E 20BF"; } ]; }; phdyellow = { name = "Phil Dyer"; @@ -16148,9 +15530,7 @@ github = "phfroidmont"; githubId = 8150907; - keys = [{ - fingerprint = "3AC6 F170 F011 33CE 393B CD94 BE94 8AFD 7E78 73BE"; - }]; + keys = [ { fingerprint = "3AC6 F170 F011 33CE 393B CD94 BE94 8AFD 7E78 73BE"; } ]; }; phijor = { name = "Philipp Joram"; @@ -16169,9 +15549,7 @@ matrix = "@phil8o:matrix.org"; github = "philclifford"; githubId = 8797027; - keys = [{ - fingerprint = "FC15 E59F 0CFA 9329 101B 71D9 92F7 A790 E9BA F1F7"; - }]; + keys = [ { fingerprint = "FC15 E59F 0CFA 9329 101B 71D9 92F7 A790 E9BA F1F7"; } ]; name = "Phil Clifford"; }; phile314 = { @@ -16307,9 +15685,7 @@ github = "pingiun"; githubId = 1576660; name = "Jelle Besseling"; - keys = [{ - fingerprint = "A3A3 65AE 16ED A7A0 C29C 88F1 9712 452E 8BE3 372E"; - }]; + keys = [ { fingerprint = "A3A3 65AE 16ED A7A0 C29C 88F1 9712 452E 8BE3 372E"; } ]; }; pinkcreeper100 = { email = "benmoreosm@gmail.com"; @@ -16322,9 +15698,13 @@ github = "pinpox"; githubId = 1719781; name = "Pablo Ovelleiro Corral"; - keys = [{ - fingerprint = "D03B 218C AE77 1F77 D7F9 20D9 823A 6154 4264 08D3"; - }]; + keys = [ { fingerprint = "D03B 218C AE77 1F77 D7F9 20D9 823A 6154 4264 08D3"; } ]; + }; + piotrkwiecinski = { + email = "piokwiecinski+nixpkgs@gmail.com"; + github = "piotrkwiecinski"; + githubId = 2151333; + name = "Piotr Kwiecinski"; }; piperswe = { email = "contact@piperswe.me"; @@ -16404,9 +15784,7 @@ email = "labadens.pierre+nixpkgs@gmail.com"; github = "plabadens"; githubId = 4303706; - keys = [{ - fingerprint = "B00F E582 FD3F 0732 EA48 3937 F558 14E4 D687 4375"; - }]; + keys = [ { fingerprint = "B00F E582 FD3F 0732 EA48 3937 F558 14E4 D687 4375"; } ]; }; plchldr = { email = "mail@oddco.de"; @@ -16462,9 +15840,7 @@ github = "pmenke-de"; githubId = 898922; name = "Philipp Menke"; - keys = [{ - fingerprint = "ED54 5EFD 64B6 B5AA EC61 8C16 EB7F 2D4C CBE2 3B69"; - }]; + keys = [ { fingerprint = "ED54 5EFD 64B6 B5AA EC61 8C16 EB7F 2D4C CBE2 3B69"; } ]; }; pmeunier = { email = "pierre-etienne.meunier@inria.fr"; @@ -16484,9 +15860,7 @@ name = "Philip White"; github = "philipmw"; githubId = 1379645; - keys = [{ - fingerprint = "9AB0 6C94 C3D1 F9D0 B9D9 A832 BC54 6FB3 B16C 8B0B"; - }]; + keys = [ { fingerprint = "9AB0 6C94 C3D1 F9D0 B9D9 A832 BC54 6FB3 B16C 8B0B"; } ]; }; pmy = { email = "pmy@xqzp.net"; @@ -16523,9 +15897,7 @@ github = "pnotequalnp"; githubId = 46154511; name = "Kevin Mullins"; - keys = [{ - fingerprint = "2CD2 B030 BD22 32EF DF5A 008A 3618 20A4 5DB4 1E9A"; - }]; + keys = [ { fingerprint = "2CD2 B030 BD22 32EF DF5A 008A 3618 20A4 5DB4 1E9A"; } ]; }; podocarp = { email = "xdjiaxd@gmail.com"; @@ -16609,9 +15981,7 @@ github = "poscat0x04"; githubId = 53291983; name = "Poscat Tarski"; - keys = [{ - fingerprint = "48AD DE10 F27B AFB4 7BB0 CCAF 2D25 95A0 0D08 ACE0"; - }]; + keys = [ { fingerprint = "48AD DE10 F27B AFB4 7BB0 CCAF 2D25 95A0 0D08 ACE0"; } ]; }; posch = { email = "tp@fonz.de"; @@ -16653,9 +16023,7 @@ github = "pradyuman"; githubId = 9904569; name = "Pradyuman Vig"; - keys = [{ - fingerprint = "240B 57DE 4271 2480 7CE3 EAC8 4F74 D536 1C4C A31E"; - }]; + keys = [ { fingerprint = "240B 57DE 4271 2480 7CE3 EAC8 4F74 D536 1C4C A31E"; } ]; }; preisschild = { email = "florian@florianstroeger.com"; @@ -16669,9 +16037,7 @@ matrix = "@presto8:matrix.org"; github = "presto8"; githubId = 246631; - keys = [{ - fingerprint = "3E46 7EF1 54AA A1D0 C7DF A694 E45C B17F 1940 CA52"; - }]; + keys = [ { fingerprint = "3E46 7EF1 54AA A1D0 C7DF A694 E45C B17F 1940 CA52"; } ]; }; priegger = { email = "philipp@riegger.name"; @@ -16708,9 +16074,7 @@ matrix = "@princemachiavelli:matrix.org"; github = "Princemachiavelli"; githubId = 2730968; - keys = [{ - fingerprint = "DD54 130B ABEC B65C 1F6B 2A38 8312 4F97 A318 EA18"; - }]; + keys = [ { fingerprint = "DD54 130B ABEC B65C 1F6B 2A38 8312 4F97 A318 EA18"; } ]; }; p-rintz = { email = "nix@rintz.net"; @@ -16790,9 +16154,7 @@ github = "prrlvr"; githubId = 33699501; name = "Pierre-Olivier Rey"; - keys = [{ - fingerprint = "40A0 78FD 297B 0AC1 E6D8 A119 4D38 49D9 9555 1307"; - }]; + keys = [ { fingerprint = "40A0 78FD 297B 0AC1 E6D8 A119 4D38 49D9 9555 1307"; } ]; }; prtzl = { email = "matej.blagsic@protonmail.com"; @@ -16805,9 +16167,7 @@ github = "prusnak"; githubId = 42201; name = "Pavol Rusnak"; - keys = [{ - fingerprint = "86E6 792F C27B FD47 8860 C110 91F3 B339 B9A0 2A3D"; - }]; + keys = [ { fingerprint = "86E6 792F C27B FD47 8860 C110 91F3 B339 B9A0 2A3D"; } ]; }; psanford = { email = "psanford@sanford.io"; @@ -16821,9 +16181,7 @@ githubId = 37886; name = "Philipp Schmitt"; matrix = "@pschmitt:one.ems.host"; - keys = [{ - fingerprint = "9FBF 2ABF FB37 F7F3 F502 44E5 DC43 9C47 EACB 17F9"; - }]; + keys = [ { fingerprint = "9FBF 2ABF FB37 F7F3 F502 44E5 DC43 9C47 EACB 17F9"; } ]; }; pshirshov = { email = "pshirshov@eml.cc"; @@ -16940,9 +16298,7 @@ matrix = "@pyrox:pyrox.dev"; github = "pyrox0"; githubId = 35778371; - keys = [{ - fingerprint = "4CA9 72FB ADC8 1416 0F10 3138 FE1D 8A7D 620C 611F"; - }]; + keys = [ { fingerprint = "4CA9 72FB ADC8 1416 0F10 3138 FE1D 8A7D 620C 611F"; } ]; }; pyxels = { email = "pyxels.dev@gmail.com"; @@ -16962,9 +16318,7 @@ github = "qbit"; githubId = 68368; matrix = "@qbit:tapenet.org"; - keys = [{ - fingerprint = "3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE"; - }]; + keys = [ { fingerprint = "3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE"; } ]; }; qdlmcfresh = { name = "Philipp Urlbauer"; @@ -17032,9 +16386,7 @@ github = "quentinmit"; githubId = 115761; name = "Quentin Smith"; - keys = [{ - fingerprint = "1C71 A066 5400 AACD 142E B1A0 04EE 05A8 FCEF B697"; - }]; + keys = [ { fingerprint = "1C71 A066 5400 AACD 142E B1A0 04EE 05A8 FCEF B697"; } ]; }; quentini = { email = "quentini@airmail.cc"; @@ -17072,9 +16424,7 @@ githubId = 2768870; name = "Alyssa Ross"; matrix = "@qyliss:fairydust.space"; - keys = [{ - fingerprint = "7573 56D7 79BB B888 773E 415E 736C CDF9 EF51 BD97"; - }]; + keys = [ { fingerprint = "7573 56D7 79BB B888 773E 415E 736C CDF9 EF51 BD97"; } ]; }; qyriad = { email = "qyriad@qyriad.me"; @@ -17112,9 +16462,7 @@ email = "pr9@tuta.io"; github = "rafa-dot-el"; githubId = 104688305; - keys = [{ - fingerprint = "5F0B 3EAC F1F9 8155 0946 CDF5 469E 3255 A40D 2AD6"; - }]; + keys = [ { fingerprint = "5F0B 3EAC F1F9 8155 0946 CDF5 469E 3255 A40D 2AD6"; } ]; }; rafaelgg = { email = "rafael.garcia.gallego@gmail.com"; @@ -17164,9 +16512,7 @@ github = "rake5k"; githubId = 13007345; name = "Christian Harke"; - keys = [{ - fingerprint = "4EBB 30F1 E89A 541A A7F2 52BE 830A 9728 6309 66F4"; - }]; + keys = [ { fingerprint = "4EBB 30F1 E89A 541A A7F2 52BE 830A 9728 6309 66F4"; } ]; }; rakesh4g = { email = "rakeshgupta4u@gmail.com"; @@ -17192,9 +16538,7 @@ email = "nix@caseylink.com"; github = "Ramblurr"; githubId = 14830; - keys = [{ - fingerprint = "978C 4D08 058B A26E B97C B518 2078 2DBC ACFA ACDA"; - }]; + keys = [ { fingerprint = "978C 4D08 058B A26E B97C B518 2078 2DBC ACFA ACDA"; } ]; }; ramkromberg = { email = "ramkromberg@mail.com"; @@ -17270,9 +16614,7 @@ githubId = 98173832; name = "Balthazar Patiachvili"; matrix = "@ratcornu:skweel.skaven.org"; - keys = [{ - fingerprint = "1B91 F087 3D06 1319 D3D0 7F91 FA47 BDA2 6048 9ADA"; - }]; + keys = [ { fingerprint = "1B91 F087 3D06 1319 D3D0 7F91 FA47 BDA2 6048 9ADA"; } ]; }; ratsclub = { email = "victor@freire.dev.br"; @@ -17332,9 +16674,7 @@ name = "Rocky Breslow"; github = "rbreslow"; githubId = 1774125; - keys = [{ - fingerprint = "B5B7 BCA0 EE6F F31E 263A 69E3 A0D3 2ACC A38B 88ED"; - }]; + keys = [ { fingerprint = "B5B7 BCA0 EE6F F31E 263A 69E3 A0D3 2ACC A38B 88ED"; } ]; }; rbrewer = { email = "rwb123@gmail.com"; @@ -17353,9 +16693,7 @@ github = "rconybea"; githubId = 8570969; name = "Roland Conybeare"; - keys = [{ - fingerprint = "bw5Cr/4ul1C2UvxopphbZbFI1i5PCSnOmPID7mJ/Ogo"; - }]; + keys = [ { fingerprint = "bw5Cr/4ul1C2UvxopphbZbFI1i5PCSnOmPID7mJ/Ogo"; } ]; }; rdnetto = { email = "rdnetto@gmail.com"; @@ -17377,9 +16715,7 @@ githubId = 7413633; keys = [ # compare with https://keybase.io/reckenrode - { - fingerprint = "01D7 5486 3A6D 64EA AC77 0D26 FBF1 9A98 2CCE 0048"; - } + { fingerprint = "01D7 5486 3A6D 64EA AC77 0D26 FBF1 9A98 2CCE 0048"; } ]; }; redbaron = { @@ -17394,6 +16730,12 @@ githubId = 1922770; name = "Tim Engler"; }; + redhawk = { + email = "redhawk76767676@gmail.com"; + github = "Redhawk18"; + githubId = 77415970; + name = "Redhawk"; + }; redvers = { email = "red@infect.me"; github = "redvers"; @@ -17495,9 +16837,7 @@ name = "Tassilo Tanneberger"; github = "tanneberger"; githubId = 32239737; - keys = [{ - fingerprint = "91EB E870 1639 1323 642A 6803 B966 009D 57E6 9CC6"; - }]; + keys = [ { fingerprint = "91EB E870 1639 1323 642A 6803 B966 009D 57E6 9CC6"; } ]; }; rewine = { email = "lhongxu@outlook.com"; @@ -17522,9 +16862,7 @@ email = "nixpkgs@rgbcu.be"; github = "RGBCube"; githubId = 78925721; - keys = [{ - fingerprint = "jPaU3Vpm/GN0tUuDg72n2+bd9dDMWe4bnKM325eP7eI"; - }]; + keys = [ { fingerprint = "jPaU3Vpm/GN0tUuDg72n2+bd9dDMWe4bnKM325eP7eI"; } ]; }; rgnns = { email = "jglievano@gmail.com"; @@ -17677,12 +17015,8 @@ github = "rissson"; githubId = 18313093; keys = [ - { - fingerprint = "8A0E 6A7C 08AB B9DE 67DE 2A13 F6FD 87B1 5C26 3EC9"; - } - { - fingerprint = "C0A7 A9BB 115B C857 4D75 EA99 BBB7 A680 1DF1 E03F"; - } + { fingerprint = "8A0E 6A7C 08AB B9DE 67DE 2A13 F6FD 87B1 5C26 3EC9"; } + { fingerprint = "C0A7 A9BB 115B C857 4D75 EA99 BBB7 A680 1DF1 E03F"; } ]; }; rixed = { @@ -17746,9 +17080,7 @@ github = "rnhmjoj"; githubId = 2817565; name = "Michele Guerini Rocco"; - keys = [{ - fingerprint = "92B2 904F D293 C94D C4C9 3E6B BFBA F4C9 75F7 6450"; - }]; + keys = [ { fingerprint = "92B2 904F D293 C94D C4C9 3E6B BFBA F4C9 75F7 6450"; } ]; }; roastiek = { email = "r.dee.b.b@gmail.com"; @@ -17888,9 +17220,7 @@ github = "Rookeur"; githubId = 57438432; name = "Adrien Langou"; - keys = [{ - fingerprint = "3B8F FC41 0094 2CB4 5A2A 7DF2 5A44 DA8F 9071 91B0"; - }]; + keys = [ { fingerprint = "3B8F FC41 0094 2CB4 5A2A 7DF2 5A44 DA8F 9071 91B0"; } ]; }; roosemberth = { email = "roosembert.palacios+nixpkgs@posteo.ch"; @@ -17898,17 +17228,13 @@ github = "roosemberth"; githubId = 3621083; name = "Roosembert (Roosemberth) Palacios"; - keys = [{ - fingerprint = "78D9 1871 D059 663B 6117 7532 CAAA ECE5 C224 2BB7"; - }]; + keys = [ { fingerprint = "78D9 1871 D059 663B 6117 7532 CAAA ECE5 C224 2BB7"; } ]; }; rople380 = { name = "rople380"; github = "rople380"; githubId = 55679162; - keys = [{ - fingerprint = "1401 1B63 393D 16C1 AA9C C521 8526 B757 4A53 6236"; - }]; + keys = [ { fingerprint = "1401 1B63 393D 16C1 AA9C C521 8526 B757 4A53 6236"; } ]; }; rosehobgoblin = { name = "J. L. Bowden"; @@ -17933,9 +17259,7 @@ matrix = "@rosscomputerguy:matrix.org"; github = "RossComputerGuy"; githubId = 19699320; - keys = [{ - fingerprint = "FD5D F7A8 85BB 378A 0157 5356 B09C 4220 3566 9AF8"; - }]; + keys = [ { fingerprint = "FD5D F7A8 85BB 378A 0157 5356 B09C 4220 3566 9AF8"; } ]; }; rostan-t = { name = "Rostan Tabet"; @@ -18001,9 +17325,7 @@ github = "rrbutani"; githubId = 7833358; matrix = "@rbutani:matrix.org"; - keys = [{ - fingerprint = "7DCA 5615 8AB2 621F 2F32 9FF4 1C7C E491 479F A273"; - }]; + keys = [ { fingerprint = "7DCA 5615 8AB2 621F 2F32 9FF4 1C7C E491 479F A273"; } ]; name = "Rahul Butani"; }; rski = { @@ -18099,9 +17421,7 @@ email = "hi@grass.show"; github = "running-grass"; githubId = 17241154; - keys = [{ - fingerprint = "5156 0FAB FF32 83EC BC8C EA13 9344 3660 9397 0138"; - }]; + keys = [ { fingerprint = "5156 0FAB FF32 83EC BC8C EA13 9344 3660 9397 0138"; } ]; }; rushmorem = { email = "rushmore@webenchanter.com"; @@ -18186,9 +17506,7 @@ github = "ryane"; githubId = 7346; name = "Ryan Eschinger"; - keys = [{ - fingerprint = "E4F4 1EAB BF0F C785 06D8 62EF EF68 CF41 D42A 593D"; - }]; + keys = [ { fingerprint = "E4F4 1EAB BF0F C785 06D8 62EF EF68 CF41 D42A 593D"; } ]; }; ryangibb = { email = "ryan@freumh.org"; @@ -18231,9 +17549,7 @@ github = "rycee"; githubId = 798147; name = "Robert Helgesson"; - keys = [{ - fingerprint = "36CA CF52 D098 CC0E 78FB 0CB1 3573 356C 25C4 24D4"; - }]; + keys = [ { fingerprint = "36CA CF52 D098 CC0E 78FB 0CB1 3573 356C 25C4 24D4"; } ]; }; ryneeverett = { email = "ryneeverett@gmail.com"; @@ -18252,17 +17568,13 @@ github = "rastertail"; githubId = 8082305; name = "Maxwell Beck"; - keys = [{ - fingerprint = "D260 79E3 C2BC 2E43 905B D057 BB3E FA30 3760 A0DB"; - }]; + keys = [ { fingerprint = "D260 79E3 C2BC 2E43 905B D057 BB3E FA30 3760 A0DB"; } ]; }; ryze = { name = "Ryze"; github = "ryze312"; githubId = 50497128; - keys = [{ - fingerprint = "73D5 BFF5 0AD7 F3C1 AF1A AC24 9B29 6C5C EAEA AAC1"; - }]; + keys = [ { fingerprint = "73D5 BFF5 0AD7 F3C1 AF1A AC24 9B29 6C5C EAEA AAC1"; } ]; }; rzetterberg = { email = "richard.zetterberg@gmail.com"; @@ -18283,9 +17595,7 @@ matrix = "@mark.sagikazar:matrix.org"; github = "sagikazarmark"; githubId = 1226384; - keys = [{ - fingerprint = "E628 C811 6FB8 1657 F706 4EA4 F251 ADDC 9D04 1C7E"; - }]; + keys = [ { fingerprint = "E628 C811 6FB8 1657 F706 4EA4 F251 ADDC 9D04 1C7E"; } ]; }; sailord = { name = "Sailord"; @@ -18346,9 +17656,7 @@ github = "samlich"; githubId = 1349989; name = "samlich"; - keys = [{ - fingerprint = "AE8C 0836 FDF6 3FFC 9580 C588 B156 8953 B193 9F1C"; - }]; + keys = [ { fingerprint = "AE8C 0836 FDF6 3FFC 9580 C588 B156 8953 B193 9F1C"; } ]; }; samlukeyes123 = { email = "samlukeyes123@gmail.com"; @@ -18380,18 +17688,14 @@ email = "samuele.facenda@gmail.com"; github = "SamueleFacenda"; githubId = 92163673; - keys = [{ - fingerprint = "3BA5 A3DB 3239 E2AC 1F3B 68A0 0DB8 3F58 B259 6271"; - }]; + keys = [ { fingerprint = "3BA5 A3DB 3239 E2AC 1F3B 68A0 0DB8 3F58 B259 6271"; } ]; }; samuel-martineau = { name = "Samuel Martineau"; email = "samuel@smartineau.me"; github = "Samuel-Martineau"; githubId = 44237969; - keys = [{ - fingerprint = "79A1 CC17 67C7 32B6 A8A2 BF4F 71E0 8761 642D ACD2"; - }]; + keys = [ { fingerprint = "79A1 CC17 67C7 32B6 A8A2 BF4F 71E0 8761 642D ACD2"; } ]; }; samuelrivas = { email = "samuelrivas@gmail.com"; @@ -18416,9 +17720,7 @@ email = "samyak201@gmail.com"; github = "Samyak2"; githubId = 34161949; - keys = [{ - fingerprint = "155C F413 0129 C058 9A5F 5524 3658 73F2 F0C6 153B"; - }]; + keys = [ { fingerprint = "155C F413 0129 C058 9A5F 5524 3658 73F2 F0C6 153B"; } ]; }; sander = { email = "s.vanderburg@tudelft.nl"; @@ -18455,9 +17757,7 @@ github = "sascha8a"; githubId = 6937965; name = "Alexander Lampalzer"; - keys = [{ - fingerprint = "0350 3136 E22C C561 30E3 A4AE 2087 9CCA CD5C D670"; - }]; + keys = [ { fingerprint = "0350 3136 E22C C561 30E3 A4AE 2087 9CCA CD5C D670"; } ]; }; saschagrunert = { email = "mail@saschagrunert.de"; @@ -18575,9 +17875,7 @@ name = "Jamie Quigley"; github = "Sciencentistguy"; githubId = 4983935; - keys = [{ - fingerprint = "30BB FF3F AB0B BB3E 0435 F83C 8E8F F66E 2AE8 D970"; - }]; + keys = [ { fingerprint = "30BB FF3F AB0B BB3E 0435 F83C 8E8F F66E 2AE8 D970"; } ]; }; scm2342 = { name = "Sven Mattsen"; @@ -18622,9 +17920,7 @@ matrix = "@Scrumplex:duckhub.io"; github = "Scrumplex"; githubId = 11587657; - keys = [{ - fingerprint = "E173 237A C782 296D 98F5 ADAC E13D FD4B 4712 7951"; - }]; + keys = [ { fingerprint = "E173 237A C782 296D 98F5 ADAC E13D FD4B 4712 7951"; } ]; }; sdht0 = { email = "nixpkgs@sdht.in"; @@ -18674,20 +17970,14 @@ github = "seberm"; githubId = 212597; name = "Otto Sabart"; - keys = [{ - fingerprint = "0AF6 4C3B 1F12 14B3 8C8C 5786 1FA2 DBE6 7438 7CC3"; - }]; + keys = [ { fingerprint = "0AF6 4C3B 1F12 14B3 8C8C 5786 1FA2 DBE6 7438 7CC3"; } ]; }; sebrut = { email = "kontakt@sebastian-rutofski.de"; github = "sebrut"; githubId = 3962409; name = "Sebastian Rutofski"; - keys = [ - { - fingerprint = "F1D4 8061 2830 3AF6 42DC 3867 C37F 3374 2A95 C547"; - } - ]; + keys = [ { fingerprint = "F1D4 8061 2830 3AF6 42DC 3867 C37F 3374 2A95 C547"; } ]; }; sebtm = { email = "mail@sebastian-sellmeier.de"; @@ -18701,9 +17991,7 @@ matrix = "@sef:exotic.sh"; github = "sefidel"; githubId = 71049646; - keys = [{ - fingerprint = "8BDF DFB5 6842 2393 82A0 441B 9238 BC70 9E05 516A"; - }]; + keys = [ { fingerprint = "8BDF DFB5 6842 2393 82A0 441B 9238 BC70 9E05 516A"; } ]; }; sei40kr = { name = "Seong Yong-ju"; @@ -18765,9 +18053,7 @@ email = "sephi@fhtagn.top"; github = "sephii"; githubId = 754333; - keys = [{ - fingerprint = "2A9D 8E76 5EE2 237D 7B6B A2A5 4228 AB9E C061 2ADA"; - }]; + keys = [ { fingerprint = "2A9D 8E76 5EE2 237D 7B6B A2A5 4228 AB9E C061 2ADA"; } ]; }; sepi = { email = "raffael@mancini.lu"; @@ -18782,15 +18068,13 @@ name = "Sebastian Jordan"; }; septem9er = { - name = "Septem9er"; - email = "develop@septem9er.de"; - matrix = "@septem9er:fairydust.space"; - github = "septem9er"; - githubId = 33379902; - keys = [{ - fingerprint = "C408 07F9 8677 3D98 EFF3 0980 355A 9AFB FD8E AD33"; - }]; -}; + name = "Septem9er"; + email = "develop@septem9er.de"; + matrix = "@septem9er:fairydust.space"; + github = "septem9er"; + githubId = 33379902; + keys = [ { fingerprint = "C408 07F9 8677 3D98 EFF3 0980 355A 9AFB FD8E AD33"; } ]; + }; seqizz = { email = "seqizz@gmail.com"; github = "seqizz"; @@ -18825,9 +18109,7 @@ github = "servalcatty"; githubId = 51969817; name = "Serval"; - keys = [{ - fingerprint = "A317 37B3 693C 921B 480C C629 4A2A AAA3 82F8 294C"; - }]; + keys = [ { fingerprint = "A317 37B3 693C 921B 480C C629 4A2A AAA3 82F8 294C"; } ]; }; sestrella = { email = "sestrella.me@gmail.com"; @@ -18840,9 +18122,7 @@ email = "sable@seyleri.us"; github = "seylerius"; githubId = 1145981; - keys = [{ - fingerprint = "7246 B6E1 ABB9 9A48 4395 FD11 DC26 B921 A9E9 DBDE"; - }]; + keys = [ { fingerprint = "7246 B6E1 ABB9 9A48 4395 FD11 DC26 B921 A9E9 DBDE"; } ]; }; sfrijters = { email = "sfrijters@gmail.com"; @@ -18941,9 +18221,7 @@ github = "shayne"; githubId = 79330; name = "Shayne Sweeney"; - keys = [{ - fingerprint = "AFCB 29A0 F12E F367 9575 DABE 69DA 13E8 6BF4 03B0"; - }]; + keys = [ { fingerprint = "AFCB 29A0 F12E F367 9575 DABE 69DA 13E8 6BF4 03B0"; } ]; }; shazow = { email = "andrey.petrov@shazow.net"; @@ -18992,9 +18270,7 @@ name = "Shiryel"; github = "shiryel"; githubId = 35617139; - keys = [{ - fingerprint = "AB63 4CD9 3322 BD42 6231 F764 C404 1EA6 B326 33DE"; - }]; + keys = [ { fingerprint = "AB63 4CD9 3322 BD42 6231 F764 C404 1EA6 B326 33DE"; } ]; }; shivaraj-bh = { email = "sbh69840@gmail.com"; @@ -19049,9 +18325,7 @@ email = "shreerammodi10@gmail.com"; github = "shrimpram"; githubId = 67710369; - keys = [{ - fingerprint = "EA88 EA07 26E9 6CBF 6365 3966 163B 16EE 76ED 24CE"; - }]; + keys = [ { fingerprint = "EA88 EA07 26E9 6CBF 6365 3966 163B 16EE 76ED 24CE"; } ]; }; shyim = { email = "s.sayakci@gmail.com"; @@ -19119,9 +18393,7 @@ github = "sikmir"; githubId = 688044; name = "Nikolay Korotkiy"; - keys = [{ - fingerprint = "ADF4 C13D 0E36 1240 BD01 9B51 D1DE 6D7F 6936 63A5"; - }]; + keys = [ { fingerprint = "ADF4 C13D 0E36 1240 BD01 9B51 D1DE 6D7F 6936 63A5"; } ]; }; silky = { name = "Noon van der Silk"; @@ -19130,15 +18402,13 @@ githubId = 129525; }; sils = { - name = "Silas Schöffel"; - email = "sils@sils.li"; - matrix = "@sils:vhack.eu"; - github = "s1ls"; - githubId = 91412114; - keys = [{ - fingerprint = "C1DA A551 B422 7A6F 3FD9 6B3A 467B 7D12 9EA7 3AC9"; - }]; - }; + name = "Silas Schöffel"; + email = "sils@sils.li"; + matrix = "@sils:vhack.eu"; + github = "s1ls"; + githubId = 91412114; + keys = [ { fingerprint = "C1DA A551 B422 7A6F 3FD9 6B3A 467B 7D12 9EA7 3AC9"; } ]; + }; Silver-Golden = { name = "Brendan Golden"; email = "github+nixpkgs@brendan.ie"; @@ -19215,9 +18485,7 @@ github = "siriobalmelli"; githubId = 23038812; name = "Sirio Balmelli"; - keys = [{ - fingerprint = "B234 EFD4 2B42 FE81 EE4D 7627 F72C 4A88 7F9A 24CA"; - }]; + keys = [ { fingerprint = "B234 EFD4 2B42 FE81 EE4D 7627 F72C 4A88 7F9A 24CA"; } ]; }; sironheart = { email = "git@beisenherz.dev"; @@ -19321,30 +18589,24 @@ slotThe = { name = "Tony Zorman"; email = "tonyzorman@mailbox.org"; - github= "slotThe"; + github = "slotThe"; matrix = "@slot-:matrix.org"; githubId = 50166980; - keys = [{ - fingerprint = "4896 FB6C 9528 46C3 414C 2475 C927 DE8C 7DFD 57B8"; - }]; + keys = [ { fingerprint = "4896 FB6C 9528 46C3 414C 2475 C927 DE8C 7DFD 57B8"; } ]; }; slwst = { email = "email@slw.st"; github = "slwst"; githubId = 11047377; name = "slwst"; - keys = [{ - fingerprint = "6CEB 4A2F E6DC C345 1B2B 4733 AD52 C5FB 3EFE CC7A"; - }]; + keys = [ { fingerprint = "6CEB 4A2F E6DC C345 1B2B 4733 AD52 C5FB 3EFE CC7A"; } ]; }; smakarov = { email = "setser200018@gmail.com"; github = "SeTSeR"; githubId = 12733495; name = "Sergey Makarov"; - keys = [{ - fingerprint = "6F8A 18AE 4101 103F 3C54 24B9 6AA2 3A11 93B7 064B"; - }]; + keys = [ { fingerprint = "6F8A 18AE 4101 103F 3C54 24B9 6AA2 3A11 93B7 064B"; } ]; }; smancill = { email = "smancill@smancill.dev"; @@ -19357,9 +18619,7 @@ github = "smaret"; githubId = 95471; name = "Sébastien Maret"; - keys = [{ - fingerprint = "4242 834C D401 86EF 8281 4093 86E3 0E5A 0F5F C59C"; - }]; + keys = [ { fingerprint = "4242 834C D401 86EF 8281 4093 86E3 0E5A 0F5F C59C"; } ]; }; smasher164 = { email = "aindurti@gmail.com"; @@ -19385,9 +18645,7 @@ email = "mason.bourgeois@gmail.com"; github = "Smona"; githubId = 7091399; - keys = [{ - fingerprint = "897E 6BE3 0345 B43D CADD 05B7 290F CF08 1AED B3EC"; - }]; + keys = [ { fingerprint = "897E 6BE3 0345 B43D CADD 05B7 290F CF08 1AED B3EC"; } ]; }; smrehman = { name = "Syed Moiz Ur Rehman"; @@ -19436,9 +18694,7 @@ github = "snf1k"; githubId = 149651684; matrix = "@snowflake:mozilla.org"; - keys = [{ - fingerprint = "8223 7B6F 2FF4 8F16 B652 6CA3 934F 9E5F 9701 2C0B"; - }]; + keys = [ { fingerprint = "8223 7B6F 2FF4 8F16 B652 6CA3 934F 9E5F 9701 2C0B"; } ]; }; snpschaaf = { email = "philipe.schaaf@secunet.com"; @@ -19481,9 +18737,7 @@ name = "Soham S Gumaste"; github = "SohamG"; githubId = 7116239; - keys = [{ - fingerprint = "E067 520F 5EF2 C175 3F60 50C0 BA46 725F 6A26 7442"; - }]; + keys = [ { fingerprint = "E067 520F 5EF2 C175 3F60 50C0 BA46 725F 6A26 7442"; } ]; }; soispha = { name = "Soispha"; @@ -19491,9 +18745,7 @@ matrix = "@soispha:vhack.eu"; github = "soispha"; githubId = 132207423; - keys = [{ - fingerprint = "9606 FC74 9FCE 1636 0723 D4AD A5E9 4010 C3A6 42AD"; - }]; + keys = [ { fingerprint = "9606 FC74 9FCE 1636 0723 D4AD A5E9 4010 C3A6 42AD"; } ]; }; solson = { email = "scott@solson.me"; @@ -19540,9 +18792,7 @@ name = "Ruby Iris Juric"; github = "Sorixelle"; githubId = 38685302; - keys = [{ - fingerprint = "2D76 76C7 A28E 16FC 75C7 268D 1B55 6ED8 4B0E 303A"; - }]; + keys = [ { fingerprint = "2D76 76C7 A28E 16FC 75C7 268D 1B55 6ED8 4B0E 303A"; } ]; }; sorki = { email = "srk@48.io"; @@ -19574,9 +18824,7 @@ matrix = "@soywod:matrix.org"; github = "soywod"; githubId = 10437171; - keys = [{ - fingerprint = "75F0 AB7C FE01 D077 AEE6 CAFD 353E 4A18 EE0F AB72"; - }]; + keys = [ { fingerprint = "75F0 AB7C FE01 D077 AEE6 CAFD 353E 4A18 EE0F AB72"; } ]; }; spacefault = { github = "spacefault"; @@ -19637,9 +18885,7 @@ email = "bintangadiputrapratama@gmail.com"; github = "spitulax"; githubId = 96517350; - keys = [{ - fingerprint = "652F FAAD 5CB8 AF1D 3F96 9521 929E D6C4 0414 D3F5"; - }]; + keys = [ { fingerprint = "652F FAAD 5CB8 AF1D 3F96 9521 929E D6C4 0414 D3F5"; } ]; }; spk = { email = "laurent@spkdev.net"; @@ -19736,9 +18982,7 @@ email = "starcraft66@gmail.com"; github = "starcraft66"; githubId = 1858154; - keys = [{ - fingerprint = "8597 4506 EC69 5392 0443 0805 9D98 CDAC FF04 FD78"; - }]; + keys = [ { fingerprint = "8597 4506 EC69 5392 0443 0805 9D98 CDAC FF04 FD78"; } ]; }; stargate01 = { email = "christoph.honal@web.de"; @@ -19800,9 +19044,7 @@ matrix = "@steinybot:matrix.org"; github = "steinybot"; githubId = 4659562; - keys = [{ - fingerprint = "2709 1DEC CC42 4635 4299 569C 21DE 1CAE 5976 2A0F"; - }]; + keys = [ { fingerprint = "2709 1DEC CC42 4635 4299 569C 21DE 1CAE 5976 2A0F"; } ]; }; stelcodes = { email = "stel@stel.codes"; @@ -19815,9 +19057,7 @@ email = "ysun@hey.com"; github = "stepbrobd"; githubId = 81826728; - keys = [{ - fingerprint = "AC7C 52E6 BA2F E8DE 8F0F 5D78 D973 170F 9B86 DB70"; - }]; + keys = [ { fingerprint = "AC7C 52E6 BA2F E8DE 8F0F 5D78 D973 170F 9B86 DB70"; } ]; }; stephank = { email = "nix@stephank.nl"; @@ -19831,9 +19071,7 @@ email = "stephen.huan@cgdct.moe"; github = "stephen-huan"; githubId = 20411956; - keys = [{ - fingerprint = "EA6E 2794 8C7D BF5D 0DF0 85A1 0FBC 2E3B A99D D60E"; - }]; + keys = [ { fingerprint = "EA6E 2794 8C7D BF5D 0DF0 85A1 0FBC 2E3B A99D D60E"; } ]; }; stephenmw = { email = "stephen@q5comm.com"; @@ -19863,9 +19101,7 @@ email = "steven@steshaw.org"; github = "steshaw"; githubId = 45735; - keys = [{ - fingerprint = "0AFE 77F7 474D 1596 EE55 7A29 1D9A 17DF D23D CB91"; - }]; + keys = [ { fingerprint = "0AFE 77F7 474D 1596 EE55 7A29 1D9A 17DF D23D CB91"; } ]; }; stesie = { email = "stesie@brokenpipe.de"; @@ -19914,7 +19150,7 @@ github = "StillerHarpo"; githubId = 25526706; name = "Florian Engel"; - keys = [{ fingerprint = "4E2D9B26940E0DABF376B7AF76762421D45837DE"; }]; + keys = [ { fingerprint = "4E2D9B26940E0DABF376B7AF76762421D45837DE"; } ]; matrix = "@qe7ftcyrpg:matrix.org"; }; stites = { @@ -19977,9 +19213,7 @@ matrix = "@stv0ge:matrix.org"; github = "stv0g"; githubId = 285829; - keys = [{ - fingerprint = "09BE 3BAE 8D55 D4CD 8579 285A 9675 EAC3 4897 E6E2"; - }]; + keys = [ { fingerprint = "09BE 3BAE 8D55 D4CD 8579 285A 9675 EAC3 4897 E6E2"; } ]; }; SubhrajyotiSen = { email = "subhrajyoti12@gmail.com"; @@ -20206,9 +19440,7 @@ github = "t4ccer"; githubId = 64430288; name = "Tomasz Maciosowski"; - keys = [{ - fingerprint = "6866 981C 4992 4D64 D154 E1AC 19E5 A2D8 B1E4 3F19"; - }]; + keys = [ { fingerprint = "6866 981C 4992 4D64 D154 E1AC 19E5 A2D8 B1E4 3F19"; } ]; }; t4sm5n = { email = "t4sm5n@gmail.com"; @@ -20221,9 +19453,7 @@ github = "tadeokondrak"; githubId = 4098453; name = "Tadeo Kondrak"; - keys = [{ - fingerprint = "0F2B C0C7 E77C 5B42 AC5B 4C18 FBE6 07FC C495 16D3"; - }]; + keys = [ { fingerprint = "0F2B C0C7 E77C 5B42 AC5B 4C18 FBE6 07FC C495 16D3"; } ]; }; tadfisher = { email = "tadfisher@gmail.com"; @@ -20248,9 +19478,7 @@ github = "taikx4"; githubId = 94917129; name = "taikx4"; - keys = [{ - fingerprint = "6B02 8103 C4E5 F68C D77C 9E54 CCD5 2C7B 37BB 837E"; - }]; + keys = [ { fingerprint = "6B02 8103 C4E5 F68C D77C 9E54 CCD5 2C7B 37BB 837E"; } ]; }; tailhook = { email = "paul@colomiets.name"; @@ -20385,9 +19613,7 @@ email = "contact@tchekda.fr"; github = "Tchekda"; githubId = 23559888; - keys = [{ - fingerprint = "44CE A8DD 3B31 49CD 6246 9D8F D0A0 07ED A4EA DA0F"; - }]; + keys = [ { fingerprint = "44CE A8DD 3B31 49CD 6246 9D8F D0A0 07ED A4EA DA0F"; } ]; name = "David Tchekachev"; }; tcheronneau = { @@ -20407,12 +19633,6 @@ githubId = 2389333; name = "Andy Tockman"; }; - tcmal = { - email = "me@aria.rip"; - github = "tcmal"; - githubId = 4183876; - name = "Aria Shrimpton"; - }; teatwig = { email = "nix@teatwig.net"; name = "tea"; @@ -20454,7 +19674,7 @@ matrix = "@tejing:matrix.org"; github = "tejing1"; githubId = 5663576; - keys = [{ fingerprint = "6F0F D43B 80E5 583E 60FC 51DC 4936 D067 EB12 AB32"; }]; + keys = [ { fingerprint = "6F0F D43B 80E5 583E 60FC 51DC 4936 D067 EB12 AB32"; } ]; }; telotortium = { email = "rirelan@gmail.com"; @@ -20523,9 +19743,7 @@ github = "teutat3s"; githubId = 10206665; name = "teutat3s"; - keys = [{ - fingerprint = "81A1 1C61 F413 8C84 9139 A4FA 18DA E600 A6BB E705"; - }]; + keys = [ { fingerprint = "81A1 1C61 F413 8C84 9139 A4FA 18DA E600 A6BB E705"; } ]; }; tex = { email = "milan.svoboda@centrum.cz"; @@ -20587,18 +19805,14 @@ matrix = "@thbltp:matrix.org"; github = "thblt"; githubId = 2453136; - keys = [{ - fingerprint = "D2A2 F0A1 E7A8 5E6F B711 DEE5 63A4 4817 A52E AB7B"; - }]; + keys = [ { fingerprint = "D2A2 F0A1 E7A8 5E6F B711 DEE5 63A4 4817 A52E AB7B"; } ]; }; theaninova = { name = "Thea Schöbl"; email = "dev@theaninova.de"; github = "Theaninova"; githubId = 19289296; - keys = [{ - fingerprint = "6C9E EFC5 1AE0 0131 78DE B9C8 68FF FB1E C187 88CA"; - }]; + keys = [ { fingerprint = "6C9E EFC5 1AE0 0131 78DE B9C8 68FF FB1E C187 88CA"; } ]; }; the-argus = { email = "i.mcfarlane2002@gmail.com"; @@ -20649,9 +19863,7 @@ email = "anisimovkosta19@gmail.com"; github = "TheKostins"; githubId = 39405421; - keys = [{ - fingerprint = "B216 7B33 E248 097F D82A 991D C94D 589A 4D0D CDD2"; - }]; + keys = [ { fingerprint = "B216 7B33 E248 097F D82A 991D C94D 589A 4D0D CDD2"; } ]; }; thelegy = { email = "mail+nixos@0jb.de"; @@ -20682,9 +19894,7 @@ github = "therealr5"; githubId = 72568063; name = "Rouven Seifert"; - keys = [{ - fingerprint = "1169 87A8 DD3F 78FF 8601 BF4D B95E 8FE6 B11C 4D09"; - }]; + keys = [ { fingerprint = "1169 87A8 DD3F 78FF 8601 BF4D B95E 8FE6 B11C 4D09"; } ]; }; therishidesai = { email = "desai.rishi1@gmail.com"; @@ -20696,9 +19906,7 @@ email = "me@thesola.io"; github = "Thesola10"; githubId = 7287268; - keys = [{ - fingerprint = "1D05 13A6 1AC4 0D8D C6D6 5F2C 8924 5619 BEBB 95BA"; - }]; + keys = [ { fingerprint = "1D05 13A6 1AC4 0D8D C6D6 5F2C 8924 5619 BEBB 95BA"; } ]; name = "Karim Vergnes"; }; thetallestjj = { @@ -20816,9 +20024,7 @@ github = "Thunderbottom"; githubId = 11243138; name = "Chinmay D. Pai"; - keys = [{ - fingerprint = "7F3E EEAA EE66 93CC 8782 042A 7550 7BE2 56F4 0CED"; - }]; + keys = [ { fingerprint = "7F3E EEAA EE66 93CC 8782 042A 7550 7BE2 56F4 0CED"; } ]; }; thyol = { name = "thyol"; @@ -20930,18 +20136,14 @@ name = "Theodore Ni"; github = "tjni"; githubId = 3806110; - keys = [{ - fingerprint = "4384 B8E1 299F C028 1641 7B8F EC30 EFBE FA7E 84A4"; - }]; + keys = [ { fingerprint = "4384 B8E1 299F C028 1641 7B8F EC30 EFBE FA7E 84A4"; } ]; }; tkerber = { email = "tk@drwx.org"; github = "tkerber"; githubId = 5722198; name = "Thomas Kerber"; - keys = [{ - fingerprint = "556A 403F B0A2 D423 F656 3424 8489 B911 F9ED 617B"; - }]; + keys = [ { fingerprint = "556A 403F B0A2 D423 F656 3424 8489 B911 F9ED 617B"; } ]; }; tljuniper = { email = "tljuniper1@gmail.com"; @@ -20997,9 +20199,7 @@ github = "toastal"; githubId = 561087; name = "toastal"; - keys = [{ - fingerprint = "7944 74B7 D236 DAB9 C9EF E7F9 5CCE 6F14 66D4 7C9E"; - }]; + keys = [ { fingerprint = "7944 74B7 D236 DAB9 C9EF E7F9 5CCE 6F14 66D4 7C9E"; } ]; }; toasteruwu = { email = "Aki@ToasterUwU.com"; @@ -21042,9 +20242,7 @@ githubId = 62384384; matrix = "@tomasajt:matrix.org"; name = "TomaSajt"; - keys = [{ - fingerprint = "8CA9 8016 F44D B717 5B44 6032 F011 163C 0501 22A1"; - }]; + keys = [ { fingerprint = "8CA9 8016 F44D B717 5B44 6032 F011 163C 0501 22A1"; } ]; }; tomaskala = { email = "public+nixpkgs@tomaskala.com"; @@ -21081,9 +20279,7 @@ github = "tomodachi94"; githubId = 68489118; name = "Tomodachi94"; - keys = [{ - fingerprint = "B208 D6E5 B8ED F47D 5687 627B 2E27 5F21 C4D5 54A3"; - }]; + keys = [ { fingerprint = "B208 D6E5 B8ED F47D 5687 627B 2E27 5F21 C4D5 54A3"; } ]; }; tomsiewert = { email = "tom@siewert.io"; @@ -21303,9 +20499,7 @@ github = "tuxinaut"; githubId = 722482; name = "Denny Schäfer"; - keys = [{ - fingerprint = "C752 0E49 4D92 1740 D263 C467 B057 455D 1E56 7270"; - }]; + keys = [ { fingerprint = "C752 0E49 4D92 1740 D263 C467 B057 455D 1E56 7270"; } ]; }; tv = { email = "tv@krebsco.de"; @@ -21354,9 +20548,7 @@ email = "twhitehead@gmail.com"; github = "twhitehead"; githubId = 787843; - keys = [{ - fingerprint = "E631 8869 586F 99B4 F6E6 D785 5942 58F0 389D 2802"; - }]; + keys = [ { fingerprint = "E631 8869 586F 99B4 F6E6 D785 5942 58F0 389D 2802"; } ]; }; twitchy0 = { email = "code@nitinpassa.com"; @@ -21369,9 +20561,7 @@ email = "tom@bibbu.net"; github = "twz123"; githubId = 1215104; - keys = [{ - fingerprint = "B1FD 4E2A 84B2 2379 F4BF 2EF5 FE33 A228 2371 E831"; - }]; + keys = [ { fingerprint = "B1FD 4E2A 84B2 2379 F4BF 2EF5 FE33 A228 2371 E831"; } ]; }; tylerjl = { email = "tyler+nixpkgs@langlois.to"; @@ -21451,36 +20641,28 @@ matrix = "@unhidden0174:matrix.org"; github = "unclamped"; githubId = 104658278; - keys = [{ - fingerprint = "57A2 CC43 3068 CB62 89C1 F1DA 9137 BB2E 77AD DE7E"; - }]; + keys = [ { fingerprint = "57A2 CC43 3068 CB62 89C1 F1DA 9137 BB2E 77AD DE7E"; } ]; }; unclechu = { name = "Viacheslav Lotsmanov"; email = "lotsmanov89@gmail.com"; github = "unclechu"; githubId = 799353; - keys = [{ - fingerprint = "EE59 5E29 BB5B F2B3 5ED2 3F1C D276 FF74 6700 7335"; - }]; + keys = [ { fingerprint = "EE59 5E29 BB5B F2B3 5ED2 3F1C D276 FF74 6700 7335"; } ]; }; undefined-moe = { name = "undefined"; email = "i@undefined.moe"; github = "undefined-moe"; githubId = 29992205; - keys = [{ - fingerprint = "6684 4E7D D213 C75D 8828 6215 C714 A58B 6C1E 0F52"; - }]; + keys = [ { fingerprint = "6684 4E7D D213 C75D 8828 6215 C714 A58B 6C1E 0F52"; } ]; }; unhammer = { email = "unhammer@fsfe.org"; github = "unhammer"; githubId = 56868; name = "Kevin Brubeck Unhammer"; - keys = [{ - fingerprint = "50D4 8796 0B86 3F05 4B6A 12F9 7426 06DE 766A C60C"; - }]; + keys = [ { fingerprint = "50D4 8796 0B86 3F05 4B6A 12F9 7426 06DE 766A C60C"; } ]; }; uniquepointer = { email = "uniquepointer@mailbox.org"; @@ -21518,9 +20700,7 @@ matrix = "@urandom0:matrix.org"; github = "urandom2"; githubId = 2526260; - keys = [{ - fingerprint = "04A3 A2C6 0042 784A AEA7 D051 0447 A663 F7F3 E236"; - }]; + keys = [ { fingerprint = "04A3 A2C6 0042 784A AEA7 D051 0447 A663 F7F3 E236"; } ]; name = "Colin Arnott"; }; urbas = { @@ -21650,9 +20830,7 @@ github = "VergeDX"; githubId = 25173827; name = "Vanilla"; - keys = [{ - fingerprint = "2649 340C C909 F821 D251 6714 3750 028E D04F A42E"; - }]; + keys = [ { fingerprint = "2649 340C C909 F821 D251 6714 3750 028E D04F A42E"; } ]; }; vanschelven = { email = "klaas@vanschelven.com"; @@ -21709,9 +20887,7 @@ matrix = "@vcunat:matrix.org"; github = "vcunat"; githubId = 1785925; - keys = [{ - fingerprint = "B600 6460 B60A 80E7 8206 2449 E747 DF1F 9575 A3AA"; - }]; + keys = [ { fingerprint = "B600 6460 B60A 80E7 8206 2449 E747 DF1F 9575 A3AA"; } ]; }; vdemeester = { email = "vincent@sbr.pm"; @@ -21736,9 +20912,7 @@ email = "mail@vincent-haupert.de"; github = "veehaitch"; githubId = 15069839; - keys = [{ - fingerprint = "4D23 ECDF 880D CADF 5ECA 4458 874B D6F9 16FA A742"; - }]; + keys = [ { fingerprint = "4D23 ECDF 880D CADF 5ECA 4458 874B D6F9 16FA A742"; } ]; }; vel = { email = "llathasa@outlook.com"; @@ -21763,9 +20937,7 @@ email = "me@skye.vg"; github = "vgskye"; githubId = 116078858; - keys = [{ - fingerprint = "CDEA 7E04 69E3 0885 A754 4B05 0104 BC05 F41B 77B8"; - }]; + keys = [ { fingerprint = "CDEA 7E04 69E3 0885 A754 4B05 0104 BC05 F41B 77B8"; } ]; }; victormeriqui = { name = "Victor Meriqui"; @@ -21778,9 +20950,7 @@ github = "victormignot"; githubId = 58660971; name = "Victor Mignot"; - keys = [{ - fingerprint = "CA5D F91A D672 683A 1F65 BBC9 0317 096D 20E0 067B"; - }]; + keys = [ { fingerprint = "CA5D F91A D672 683A 1F65 BBC9 0317 096D 20E0 067B"; } ]; }; vidbina = { email = "vid@bina.me"; @@ -21800,14 +20970,18 @@ githubId = 5837359; name = "Adrian Pistol"; }; + vigress8 = { + email = "vig@disroot.org"; + github = "vigress8"; + githubId = 150687949; + name = "Vigress"; + }; vikanezrimaya = { email = "vika@fireburn.ru"; github = "vikanezrimaya"; githubId = 7953163; name = "Vika Shleina"; - keys = [{ - fingerprint = "5814 50EB 6E17 E715 7C63 E7F1 9879 8C3C 4D68 8D6D"; - }]; + keys = [ { fingerprint = "5814 50EB 6E17 E715 7C63 E7F1 9879 8C3C 4D68 8D6D"; } ]; }; viktornordling = { email = "antique_paler_0i@icloud.com"; @@ -21832,9 +21006,7 @@ github = "vincentbernat"; githubId = 631446; name = "Vincent Bernat"; - keys = [{ - fingerprint = "AEF2 3487 66F3 71C6 89A7 3600 95A4 2FE8 3535 25F9"; - }]; + keys = [ { fingerprint = "AEF2 3487 66F3 71C6 89A7 3600 95A4 2FE8 3535 25F9"; } ]; }; vinetos = { name = "vinetos"; @@ -21937,9 +21109,7 @@ github = "vncsb"; githubId = 19562240; name = "Vinicius Bernardino"; - keys = [{ - fingerprint = "F0D3 920C 722A 541F 0CCD 66E3 A7BA BA05 3D78 E7CA"; - }]; + keys = [ { fingerprint = "F0D3 920C 722A 541F 0CCD 66E3 A7BA BA05 3D78 E7CA"; } ]; }; voidless = { email = "julius.schmitt@yahoo.de"; @@ -22054,9 +21224,7 @@ email = "wackbyte@pm.me"; github = "wackbyte"; githubId = 29505620; - keys = [{ - fingerprint = "E595 7FE4 FEF6 714B 1AD3 1483 937F 2AE5 CCEF BF59"; - }]; + keys = [ { fingerprint = "E595 7FE4 FEF6 714B 1AD3 1483 937F 2AE5 CCEF BF59"; } ]; }; waelwindows = { email = "waelwindows9922@gmail.com"; @@ -22069,9 +21237,7 @@ email = "williamvphan@yahoo.fr"; github = "wahtique"; githubId = 55251330; - keys = [{ - fingerprint = "9262 E3A7 D129 C4DD A7C1 26CE 370D D9BE 9121 F0B3"; - }]; + keys = [ { fingerprint = "9262 E3A7 D129 C4DD A7C1 26CE 370D D9BE 9121 F0B3"; } ]; }; waiting-for-dev = { email = "marc@lamarciana.com"; @@ -22084,9 +21250,7 @@ email = "sheng@a64.work"; github = "wakira"; githubId = 2338339; - keys = [{ - fingerprint = "47F7 009E 3AE3 1DA7 988E 12E1 8C9B 0A8F C0C0 D862"; - }]; + keys = [ { fingerprint = "47F7 009E 3AE3 1DA7 988E 12E1 8C9B 0A8F C0C0 D862"; } ]; }; wamirez = { email = "wamirez@protonmail.com"; @@ -22137,9 +21301,7 @@ matrix = "@weathercold:matrix.org"; github = "Weathercold"; githubId = 49368953; - keys = [{ - fingerprint = "D20F C904 A145 8B28 53D8 FBA0 0422 0096 01E4 87FC"; - }]; + keys = [ { fingerprint = "D20F C904 A145 8B28 53D8 FBA0 0422 0096 01E4 87FC"; } ]; }; wegank = { name = "Weijia Wang"; @@ -22158,9 +21320,7 @@ github = "welteki"; githubId = 16267532; name = "Han Verstraete"; - keys = [{ - fingerprint = "2145 955E 3F5E 0C95 3458 41B5 11F7 BAEA 8567 43FF"; - }]; + keys = [ { fingerprint = "2145 955E 3F5E 0C95 3458 41B5 11F7 BAEA 8567 43FF"; } ]; }; wenngle = { name = "Zeke Stephens"; @@ -22191,9 +21351,7 @@ email = "wgn@wesnel.dev"; github = "wesnel"; githubId = 43357387; - keys = [{ - fingerprint = "F844 80B2 0CA9 D6CC C7F5 2479 A776 D2AD 099E 8BC0"; - }]; + keys = [ { fingerprint = "F844 80B2 0CA9 D6CC C7F5 2479 A776 D2AD 099E 8BC0"; } ]; }; wexder = { email = "wexder19@gmail.com"; @@ -22212,9 +21370,7 @@ github = "WhiteBlackGoose"; githubId = 31178401; name = "WhiteBlackGoose"; - keys = [{ - fingerprint = "640B EDDE 9734 310A BFA3 B257 52ED AE6A 3995 AFAB"; - }]; + keys = [ { fingerprint = "640B EDDE 9734 310A BFA3 B257 52ED AE6A 3995 AFAB"; } ]; }; whiteley = { email = "mattwhiteley@gmail.com"; @@ -22245,19 +21401,19 @@ email = "go.wigust@gmail.com"; github = "wigust"; githubId = 7709598; - keys = [{ - # primary: "C955 CC5D C048 7FB1 7966 40A9 199A F6A3 67E9 4ABB" - fingerprint = "7238 7123 8EAC EB63 4548 5857 167F 8EA5 001A FA9C"; - }]; + keys = [ + { + # primary: "C955 CC5D C048 7FB1 7966 40A9 199A F6A3 67E9 4ABB" + fingerprint = "7238 7123 8EAC EB63 4548 5857 167F 8EA5 001A FA9C"; + } + ]; }; wildsebastian = { name = "Sebastian Wild"; email = "sebastian@wild-siena.com"; github = "wildsebastian"; githubId = 1215623; - keys = [{ - fingerprint = "DA03 D6C6 3F58 E796 AD26 E99B 366A 2940 479A 06FC"; - }]; + keys = [ { fingerprint = "DA03 D6C6 3F58 E796 AD26 E99B 366A 2940 479A 06FC"; } ]; }; willbush = { email = "git@willbush.dev"; @@ -22265,9 +21421,7 @@ github = "willbush"; githubId = 2023546; name = "Will Bush"; - keys = [{ - fingerprint = "4441 422E 61E4 C8F3 EBFE 5E33 3823 864B 54B1 3BDA"; - }]; + keys = [ { fingerprint = "4441 422E 61E4 C8F3 EBFE 5E33 3823 864B 54B1 3BDA"; } ]; }; willcohen = { github = "willcohen"; @@ -22279,9 +21433,7 @@ github = "williamvds"; githubId = 26379999; name = "William Vigolo"; - keys = [{ - fingerprint = "9848 B216 BCBE 29BB 1C6A E0D5 7A4D F5A8 CDBD 49C7"; - }]; + keys = [ { fingerprint = "9848 B216 BCBE 29BB 1C6A E0D5 7A4D F5A8 CDBD 49C7"; } ]; }; willibutz = { email = "willibutz@posteo.de"; @@ -22335,9 +21487,7 @@ email = "jade@witchof.space"; github = "witchof0x20"; githubId = 36118348; - keys = [{ - fingerprint = "69C9 876B 5797 1B2E 11C5 7C39 80A1 F76F C9F9 54AE"; - }]; + keys = [ { fingerprint = "69C9 876B 5797 1B2E 11C5 7C39 80A1 F76F C9F9 54AE"; } ]; }; wizeman = { email = "rcorreia@wizy.org"; @@ -22410,9 +21560,7 @@ email = "walther@technowledgy.de"; github = "wolfgangwalther"; githubId = 9132420; - keys = [{ - fingerprint = "F943 A0BC 720C 5BEF 73CD E02D B398 93FA 5F65 CAE1"; - }]; + keys = [ { fingerprint = "F943 A0BC 720C 5BEF 73CD E02D B398 93FA 5F65 CAE1"; } ]; }; womfoo = { email = "kranium@gikos.net"; @@ -22455,9 +21603,7 @@ email = "Winston@Milli.ng"; github = "wrmilling"; githubId = 6162814; - keys = [{ - fingerprint = "21E1 6B8D 2EE8 7530 6A6C 9968 D830 77B9 9F8C 6643"; - }]; + keys = [ { fingerprint = "21E1 6B8D 2EE8 7530 6A6C 9968 D830 77B9 9F8C 6643"; } ]; }; wscott = { email = "wsc9tt@gmail.com"; @@ -22598,7 +21744,7 @@ xgwq = { name = "XGWQ"; email = "nixos.xgwq@xnee.net"; - keys = [{ fingerprint = "6489 9EF2 A256 5C04 7426 686C 8337 A748 74EB E129"; }]; + keys = [ { fingerprint = "6489 9EF2 A256 5C04 7426 686C 8337 A748 74EB E129"; } ]; matrix = "@xgwq:nerdberg.de"; github = "peterablehmann"; githubId = 36541313; @@ -22744,8 +21890,8 @@ github = "yavko"; githubId = 15178513; keys = [ - {fingerprint = "DC05 7015 ECD7 E68A 6426 EFD8 F07D 19A3 2407 F857";} - {fingerprint = "2874 581F F832 C9E9 AEC6 8D84 E57B F27C 8BB0 80B0";} + { fingerprint = "DC05 7015 ECD7 E68A 6426 EFD8 F07D 19A3 2407 F857"; } + { fingerprint = "2874 581F F832 C9E9 AEC6 8D84 E57B F27C 8BB0 80B0"; } ]; }; yayayayaka = { @@ -22766,14 +21912,12 @@ email = "ydlr@ydlr.io"; github = "ydlr"; githubId = 58453832; - keys = [{ - fingerprint = "FD0A C425 9EF5 4084 F99F 9B47 2ACC 9749 7C68 FAD4"; - }]; + keys = [ { fingerprint = "FD0A C425 9EF5 4084 F99F 9B47 2ACC 9749 7C68 FAD4"; } ]; }; YellowOnion = { name = "Daniel Hill"; email = "daniel@gluo.nz"; - github = "YellowOnion"; + github = "YellowOnion"; githubId = 364160; matrix = "@woobilicious:matrix.org"; }; @@ -22836,9 +21980,7 @@ name = "Yurii Matsiuk"; github = "ymatsiuk"; githubId = 24990891; - keys = [{ - fingerprint = "7BB8 84B5 74DA FDB1 E194 ED21 6130 2290 2986 01AA"; - }]; + keys = [ { fingerprint = "7BB8 84B5 74DA FDB1 E194 ED21 6130 2290 2986 01AA"; } ]; }; ymeister = { name = "Yuri Meister"; @@ -22930,9 +22072,7 @@ github = "Yumasi"; githubId = 24368641; name = "Guillaume Pagnoux"; - keys = [{ - fingerprint = "85F8 E850 F8F2 F823 F934 535B EC50 6589 9AEA AF4C"; - }]; + keys = [ { fingerprint = "85F8 E850 F8F2 F823 F934 535B EC50 6589 9AEA AF4C"; } ]; }; yunfachi = { email = "yunfachi@gmail.com"; @@ -22970,9 +22110,7 @@ github = "yusdacra"; githubId = 19897088; name = "Yusuf Bera Ertan"; - keys = [{ - fingerprint = "9270 66BD 8125 A45B 4AC4 0326 6180 7181 F60E FCB2"; - }]; + keys = [ { fingerprint = "9270 66BD 8125 A45B 4AC4 0326 6180 7181 F60E FCB2"; } ]; }; yuu = { email = "yuunix@grrlz.net"; @@ -22980,17 +22118,13 @@ github = "yuuyins"; githubId = 86538850; name = "Yuu Yin"; - keys = [{ - fingerprint = "9F19 3AE8 AA25 647F FC31 46B5 416F 303B 43C2 0AC3"; - }]; + keys = [ { fingerprint = "9F19 3AE8 AA25 647F FC31 46B5 416F 303B 43C2 0AC3"; } ]; }; yvan-sraka = { email = "yvan@sraka.xyz"; github = "yvan-sraka"; githubId = 705213; - keys = [{ - fingerprint = "FE9A 953C 97E4 54FE 6598 BFDD A4FB 3EAA 6F45 2379"; - }]; + keys = [ { fingerprint = "FE9A 953C 97E4 54FE 6598 BFDD A4FB 3EAA 6F45 2379"; } ]; matrix = "@/yvan:matrix.org"; name = "Yvan Sraka"; }; @@ -23012,6 +22146,13 @@ githubId = 5253988; name = "yvt"; }; + yzx9 = { + email = "yuan.zx@outlook.com"; + github = "yzx9"; + githubId = 41458459; + name = "Zexin Yuan"; + keys = [ { fingerprint = "FE16 B281 90EF 6C3F F661 6441 C2DD 1916 FE47 1BE2"; } ]; + }; zachcoyle = { email = "zach.coyle@gmail.com"; github = "zachcoyle"; @@ -23071,9 +22212,7 @@ email = "zane@zanevaniperen.com"; github = "vs49688"; githubId = 4423262; - keys = [{ - fingerprint = "61AE D40F 368B 6F26 9DAE 3892 6861 6B2D 8AC4 DCC5"; - }]; + keys = [ { fingerprint = "61AE D40F 368B 6F26 9DAE 3892 6861 6B2D 8AC4 DCC5"; } ]; }; zaninime = { email = "francesco@zanini.me"; @@ -23111,9 +22250,7 @@ email = "zacc@ztdp.ca"; github = "zedseven"; githubId = 25164338; - keys = [{ - fingerprint = "065A 0A98 FE61 E1C1 41B0 AFE7 64FA BC62 F457 2875"; - }]; + keys = [ { fingerprint = "065A 0A98 FE61 E1C1 41B0 AFE7 64FA BC62 F457 2875"; } ]; }; zelkourban = { name = "zelkourban"; @@ -23132,9 +22269,7 @@ email = "i@zenithal.me"; github = "ZenithalHourlyRate"; githubId = 19512674; - keys = [{ - fingerprint = "1127 F188 280A E312 3619 3329 87E1 7EEF 9B18 B6C9"; - }]; + keys = [ { fingerprint = "1127 F188 280A E312 3619 3329 87E1 7EEF 9B18 B6C9"; } ]; }; zeorin = { name = "Xandor Schiefer"; @@ -23142,18 +22277,14 @@ matrix = "@zeorin:matrix.org"; github = "zeorin"; githubId = 1187078; - keys = [{ - fingerprint = "863F 093A CF82 D2C8 6FD7 FB74 5E1C 0971 FE4F 665A"; - }]; + keys = [ { fingerprint = "863F 093A CF82 D2C8 6FD7 FB74 5E1C 0971 FE4F 665A"; } ]; }; zeratax = { email = "mail@zera.tax"; github = "zeratax"; githubId = 5024958; name = "Jona Abdinghoff"; - keys = [{ - fingerprint = "44F7 B797 9D3A 27B1 89E0 841E 8333 735E 784D F9D4"; - }]; + keys = [ { fingerprint = "44F7 B797 9D3A 27B1 89E0 841E 8333 735E 784D F9D4"; } ]; }; zeri = { name = "zeri"; @@ -23240,9 +22371,7 @@ githubId = 44469426; name = "Zoey de Souza Pessanha"; email = "zoey.spessanha@outlook.com"; - keys = [{ - fingerprint = "EAA1 51DB 472B 0122 109A CB17 1E1E 889C DBD6 A315"; - }]; + keys = [ { fingerprint = "EAA1 51DB 472B 0122 109A CB17 1E1E 889C DBD6 A315"; } ]; }; zohl = { email = "zohl@fmap.me"; @@ -23336,8 +22465,8 @@ zzzsy = { email = "me@zzzsy.top"; github = "zzzsyyy"; - githubId = 59917878; + githubId = 59917878; name = "Mathias Zhang"; }; } -/* Keep the list alphabetically sorted. */ +# Keep the list alphabetically sorted. diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl index b17cd82f4d1c8..30fbac6f002d9 100755 --- a/maintainers/scripts/copy-tarballs.pl +++ b/maintainers/scripts/copy-tarballs.pl @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i perl -p perl perlPackages.NetAmazonS3 perlPackages.FileSlurp perlPackages.JSON perlPackages.LWPProtocolHttps nixUnstable nixUnstable.perl-bindings +#! nix-shell -i perl -p perl perlPackages.NetAmazonS3 perlPackages.FileSlurp perlPackages.JSON perlPackages.LWPProtocolHttps nix nix.perl-bindings # This command uploads tarballs to tarballs.nixos.org, the # content-addressed cache used by fetchurl as a fallback for when diff --git a/maintainers/scripts/kde/collect-metadata.py b/maintainers/scripts/kde/collect-metadata.py index eaa6196471365..3a7a3e95508e0 100755 --- a/maintainers/scripts/kde/collect-metadata.py +++ b/maintainers/scripts/kde/collect-metadata.py @@ -27,8 +27,13 @@ import utils ), default=pathlib.Path(__file__).parent.parent.parent.parent ) -def main(repo_metadata: pathlib.Path, nixpkgs: pathlib.Path): - metadata = utils.KDERepoMetadata.from_repo_metadata_checkout(repo_metadata) +@click.option( + "--unstable", + default=False, + is_flag=True +) +def main(repo_metadata: pathlib.Path, nixpkgs: pathlib.Path, unstable: bool): + metadata = utils.KDERepoMetadata.from_repo_metadata_checkout(repo_metadata, unstable) out_dir = nixpkgs / "pkgs/kde/generated" metadata.write_json(out_dir) diff --git a/maintainers/scripts/kde/utils.py b/maintainers/scripts/kde/utils.py index b3a00093d7038..14ca61df35543 100644 --- a/maintainers/scripts/kde/utils.py +++ b/maintainers/scripts/kde/utils.py @@ -104,7 +104,7 @@ class KDERepoMetadata: return project @classmethod - def from_repo_metadata_checkout(cls, repo_metadata: pathlib.Path): + def from_repo_metadata_checkout(cls, repo_metadata: pathlib.Path, unstable=False): projects = [ Project.from_yaml(metadata_file) for metadata_file in repo_metadata.glob("projects-invent/**/metadata.yaml") @@ -122,29 +122,32 @@ class KDERepoMetadata: dep_graph={}, ) - dep_specs = ["dependency-data-stable-kf6-qt6"] dep_graph = collections.defaultdict(set) - for spec in dep_specs: - spec_path = repo_metadata / "dependencies" / spec - for line in spec_path.open(): - line = line.strip() - if line.startswith("#"): - continue - if not line: - continue + if unstable: + spec_name = "dependency-data-kf6-qt6" + else: + spec_name = "dependency-data-stable-kf6-qt6" - dependent, dependency = line.split(": ") + spec_path = repo_metadata / "dependencies" / spec_name + for line in spec_path.open(): + line = line.strip() + if line.startswith("#"): + continue + if not line: + continue - dependent = self.try_lookup_package(dependent) - if dependent is None: - continue + dependent, dependency = line.split(": ") - dependency = self.try_lookup_package(dependency) - if dependency is None: - continue + dependent = self.try_lookup_package(dependent) + if dependent is None: + continue - dep_graph[dependent].add(dependency) + dependency = self.try_lookup_package(dependency) + if dependency is None: + continue + + dep_graph[dependent].add(dependency) self.dep_graph = dep_graph diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index b6cc254bd501f..d4b6190f19259 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -100,6 +100,7 @@ luuid,,,,20120509-2,, luv,,,,1.44.2-1,, lush.nvim,,,https://luarocks.org/dev,,,teto lyaml,,,,,,lblasc +lz.n,,,,,,mrcjkb magick,,,,,5.1,donovanglover markdown,,,,,, mediator_lua,,,,,, diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 2bc124d6066a9..26ed7fd6ef510 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -1,4 +1,5 @@ -/* List of maintainer teams. +/* + List of maintainer teams. name = { # Required members = [ maintainer1 maintainer2 ]; @@ -25,10 +26,11 @@ * keep the list alphabetically sorted * test the validity of the format with: nix-build lib/tests/teams.nix - */ +*/ { lib }: -with lib.maintainers; { +with lib.maintainers; +{ acme = { members = [ aanderse @@ -67,9 +69,7 @@ with lib.maintainers; { minijackson yurrriq ]; - githubTeams = [ - "beam" - ]; + githubTeams = [ "beam" ]; scope = "Maintain BEAM-related packages and modules."; shortName = "BEAM"; enableFeatureFreezePing = true; @@ -95,9 +95,7 @@ with lib.maintainers; { }; budgie = { - members = [ - bobby285271 - ]; + members = [ bobby285271 ]; scope = "Maintain Budgie desktop environment"; shortName = "Budgie"; }; @@ -144,9 +142,7 @@ with lib.maintainers; { }; cloudposse = { - members = [ - dudymas - ]; + members = [ dudymas ]; scope = "Maintain atmos and applications made by the Cloud Posse team."; shortName = "CloudPosse"; enableFeatureFreezePing = true; @@ -178,12 +174,8 @@ with lib.maintainers; { }; darwin = { - members = [ - toonn - ]; - githubTeams = [ - "darwin-maintainers" - ]; + members = [ toonn ]; + githubTeams = [ "darwin-maintainers" ]; scope = "Maintain Darwin compatibility of packages and Darwin-only packages."; shortName = "Darwin"; enableFeatureFreezePing = true; @@ -213,9 +205,7 @@ with lib.maintainers; { }; deepin = { - members = [ - rewine - ]; + members = [ rewine ]; scope = "Maintain deepin desktop environment and related packages."; shortName = "DDE"; enableFeatureFreezePing = true; @@ -262,29 +252,21 @@ with lib.maintainers; { docs = { members = [ ]; - githubTeams = [ - "documentation-team" - ]; + githubTeams = [ "documentation-team" ]; scope = "Maintain nixpkgs/NixOS documentation and tools for building it."; shortName = "Docs"; enableFeatureFreezePing = true; }; emacs = { - members = [ - adisbladis - ]; + members = [ adisbladis ]; scope = "Maintain the Emacs editor and packages."; shortName = "Emacs"; }; enlightenment = { - members = [ - romildo - ]; - githubTeams = [ - "enlightenment" - ]; + members = [ romildo ]; + githubTeams = [ "enlightenment" ]; scope = "Maintain Enlightenment desktop environment and related packages."; shortName = "Enlightenment"; enableFeatureFreezePing = true; @@ -303,7 +285,12 @@ with lib.maintainers; { }; flutter = { - members = [ mkg20001 RossComputerGuy FlafyDev hacker1024 ]; + members = [ + mkg20001 + RossComputerGuy + FlafyDev + hacker1024 + ]; scope = "Maintain Flutter and Dart-related packages and build tools"; shortName = "flutter"; enableFeatureFreezePing = false; @@ -373,9 +360,7 @@ with lib.maintainers; { sikmir willcohen ]; - githubTeams = [ - "geospatial" - ]; + githubTeams = [ "geospatial" ]; scope = "Maintain geospatial packages."; shortName = "Geospatial"; enableFeatureFreezePing = true; @@ -400,9 +385,7 @@ with lib.maintainers; { qbit mfrw ]; - githubTeams = [ - "golang" - ]; + githubTeams = [ "golang" ]; scope = "Maintain Golang compilers."; shortName = "Go"; enableFeatureFreezePing = true; @@ -415,9 +398,7 @@ with lib.maintainers; { jtojnar dasj19 ]; - githubTeams = [ - "gnome" - ]; + githubTeams = [ "gnome" ]; scope = "Maintain GNOME desktop environment and platform."; shortName = "GNOME"; enableFeatureFreezePing = true; @@ -443,9 +424,7 @@ with lib.maintainers; { ncfavier sternenseemann ]; - githubTeams = [ - "haskell" - ]; + githubTeams = [ "haskell" ]; scope = "Maintain Haskell packages and infrastructure."; shortName = "Haskell"; enableFeatureFreezePing = true; @@ -472,9 +451,7 @@ with lib.maintainers; { }; infisical = { - members = [ - akhilmhdh - ]; + members = [ akhilmhdh ]; scope = "Maintain Infisical"; shortName = "Infisical"; }; @@ -568,9 +545,7 @@ with lib.maintainers; { uthar hraban ]; - githubTeams = [ - "lisp" - ]; + githubTeams = [ "lisp" ]; scope = "Maintain the Lisp ecosystem."; shortName = "lisp"; enableFeatureFreezePing = true; @@ -586,18 +561,14 @@ with lib.maintainers; { rrbutani sternenseemann ]; - githubTeams = [ - "llvm" - ]; + githubTeams = [ "llvm" ]; scope = "Maintain LLVM package sets and related packages"; shortName = "LLVM"; enableFeatureFreezePing = true; }; lomiri = { - members = [ - OPNA2608 - ]; + members = [ OPNA2608 ]; scope = "Maintain Lomiri desktop environment and related packages."; shortName = "Lomiri"; enableFeatureFreezePing = true; @@ -614,21 +585,15 @@ with lib.maintainers; { }; lua = { - githubTeams = [ - "lua" - ]; + githubTeams = [ "lua" ]; scope = "Maintain the lua ecosystem."; shortName = "lua"; enableFeatureFreezePing = true; }; lumina = { - members = [ - romildo - ]; - githubTeams = [ - "lumina" - ]; + members = [ romildo ]; + githubTeams = [ "lumina" ]; scope = "Maintain lumina desktop environment and related packages."; shortName = "Lumina"; enableFeatureFreezePing = true; @@ -647,12 +612,8 @@ with lib.maintainers; { }; lxqt = { - members = [ - romildo - ]; - githubTeams = [ - "lxqt" - ]; + members = [ romildo ]; + githubTeams = [ "lxqt" ]; scope = "Maintain LXQt desktop environment and related packages."; shortName = "LXQt"; enableFeatureFreezePing = true; @@ -717,9 +678,7 @@ with lib.maintainers; { }; mobile = { - members = [ - samueldr - ]; + members = [ samueldr ]; scope = "Maintain Mobile NixOS."; shortName = "Mobile"; }; @@ -766,21 +725,15 @@ with lib.maintainers; { }; ocaml = { - members = [ - alizter - ]; - githubTeams = [ - "ocaml" - ]; + members = [ alizter ]; + githubTeams = [ "ocaml" ]; scope = "Maintain the OCaml compiler and package set."; shortName = "OCaml"; enableFeatureFreezePing = true; }; openstack = { - members = [ - SuperSandro2000 - ]; + members = [ SuperSandro2000 ]; scope = "Maintain the ecosystem around OpenStack"; shortName = "OpenStack"; }; @@ -801,18 +754,14 @@ with lib.maintainers; { davidak bobby285271 ]; - githubTeams = [ - "pantheon" - ]; + githubTeams = [ "pantheon" ]; scope = "Maintain Pantheon desktop environment and platform."; shortName = "Pantheon"; enableFeatureFreezePing = true; }; perl = { - members = [ - sgo - ]; + members = [ sgo ]; scope = "Maintain the Perl interpreter and Perl packages."; shortName = "Perl"; enableFeatureFreezePing = true; @@ -826,9 +775,7 @@ with lib.maintainers; { patka talyz ]; - githubTeams = [ - "php" - ]; + githubTeams = [ "php" ]; scope = "Maintain PHP related packages and extensions."; shortName = "PHP"; enableFeatureFreezePing = true; @@ -839,17 +786,13 @@ with lib.maintainers; { saschagrunert vdemeester ]; - githubTeams = [ - "podman" - ]; + githubTeams = [ "podman" ]; scope = "Maintain Podman and CRI-O related packages and modules."; shortName = "Podman"; }; postgres = { - members = [ - thoughtpolice - ]; + members = [ thoughtpolice ]; scope = "Maintain the PostgreSQL package and plugins along with the NixOS module."; shortName = "PostgreSQL"; }; @@ -858,7 +801,7 @@ with lib.maintainers; { members = [ hexa jonringer - tjni + natsukium ]; scope = "Maintain the Python interpreter and related packages."; shortName = "Python"; @@ -875,9 +818,7 @@ with lib.maintainers; { SuperSandro2000 ttuegel ]; - githubTeams = [ - "qt-kde" - ]; + githubTeams = [ "qt-kde" ]; scope = "Maintain the Qt framework, KDE application suite, Plasma desktop environment and related projects."; shortName = "Qt / KDE"; enableFeatureFreezePing = true; @@ -907,9 +848,7 @@ with lib.maintainers; { release = { members = [ ]; - githubTeams = [ - "nixos-release-managers" - ]; + githubTeams = [ "nixos-release-managers" ]; scope = "Manage the current nixpkgs/NixOS release."; shortName = "Release"; }; @@ -920,16 +859,13 @@ with lib.maintainers; { Flakebi mschwaig ]; - githubTeams = [ - "rocm-maintainers" - ]; + githubTeams = [ "rocm-maintainers" ]; scope = "Maintain ROCm and related packages."; shortName = "ROCm"; }; ruby = { - members = [ - ]; + members = [ ]; scope = "Maintain the Ruby interpreter and related packages."; shortName = "Ruby"; enableFeatureFreezePing = true; @@ -943,9 +879,7 @@ with lib.maintainers; { winter zowoq ]; - githubTeams = [ - "rust" - ]; + githubTeams = [ "rust" ]; scope = "Maintain the Rust compiler toolchain and nixpkgs integration."; shortName = "Rust"; enableFeatureFreezePing = true; @@ -976,9 +910,7 @@ with lib.maintainers; { serokell = { # Verify additions by approval of an already existing member of the team. - members = [ - balsoft - ]; + members = [ balsoft ]; scope = "Group registration for Serokell employees who collectively maintain packages."; shortName = "Serokell employees"; }; @@ -997,27 +929,21 @@ with lib.maintainers; { systemd = { members = [ ]; - githubTeams = [ - "systemd" - ]; + githubTeams = [ "systemd" ]; scope = "Maintain systemd for NixOS."; shortName = "systemd"; enableFeatureFreezePing = true; }; tests = { - members = [ - tfc - ]; + members = [ tfc ]; scope = "Maintain the NixOS VM test runner."; shortName = "NixOS tests"; enableFeatureFreezePing = true; }; tts = { - members = [ - mic92 - ]; + members = [ mic92 ]; scope = "coqui-ai TTS (formerly Mozilla TTS) and leaf packages"; shortName = "coqui-ai TTS"; }; diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 165e3e13a78ef..8fa59863bf782 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -822,3 +822,4 @@ Module System: ### Internal {#sec-release-24.05-lib-internal} - `lib` now has [Readme for contributing](https://github.com/NixOS/nixpkgs/tree/master/lib#readme). - Some function's documentation is now written using the [accepted doc comment syntax](https://github.com/NixOS/rfcs/pull/145). +- `odoo` has been updated from `16.0.20231024` to `17.0.20240507`. diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 7777df071b182..ab02e6888f8d8 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -15,10 +15,14 @@ - [Quickwit](https://quickwit.io), sub-second search & analytics engine on cloud storage. Available as [services.quickwit](options.html#opt-services.quickwit). +- [Flood](https://flood.js.org/), a beautiful WebUI for various torrent clients. Available as [services.flood](options.html#opt-services.flood). + - [Renovate](https://github.com/renovatebot/renovate), a dependency updating tool for various git forges and language ecosystems. Available as [services.renovate](#opt-services.renovate.enable). ## Backward Incompatibilities {#sec-release-24.11-incompatibilities} +- `androidenv.androidPkgs_9_0` has been removed, and replaced with `androidenv.androidPkgs` for a more complete Android SDK including support for Android 9 and later. + - `nginx` package no longer includes `gd` and `geoip` dependencies. For enabling it, override `nginx` package with the optionals `withImageFilter` and `withGeoIP`. - `openssh` and `openssh_hpn` are now compiled without Kerberos 5 / GSSAPI support in an effort to reduce the attack surface of the components for the majority of users. Users needing this support can @@ -35,6 +39,10 @@ - `services.ddclient.use` has been deprecated: `ddclient` now supports separate IPv4 and IPv6 configuration. Use `services.ddclient.usev4` and `services.ddclient.usev6` instead. +- `vaultwarden` lost the capability to bind to privileged ports. If you rely on + this behavior, override the systemd unit to allow `CAP_NET_BIND_SERVICE` in + your local configuration. + - The Invoiceplane module now only accepts the structured `settings` option. `extraConfig` is now removed. @@ -67,6 +75,10 @@ services.portunus.ldap.package = pkgs.openldap.override { libxcrypt = pkgs.libxcrypt-legacy; }; ``` +- The `tracy` package no longer works on X11, since it's moved to Wayland + support, which is the intended default behavior by Tracy maintainers. + X11 users have to switch to the new package `tracy-x11`. + ## Other Notable Changes {#sec-release-24.11-notable-changes} <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. --> diff --git a/nixos/lib/test-driver/default.nix b/nixos/lib/test-driver/default.nix index 7a88694b3167e..26652db6016e6 100644 --- a/nixos/lib/test-driver/default.nix +++ b/nixos/lib/test-driver/default.nix @@ -13,11 +13,20 @@ , extraPythonPackages ? (_ : []) , nixosTests }: - +let + fs = lib.fileset; +in python3Packages.buildPythonApplication { pname = "nixos-test-driver"; version = "1.1"; - src = ./.; + src = fs.toSource { + root = ./.; + fileset = fs.unions [ + ./pyproject.toml + ./test_driver + ./extract-docstrings.py + ]; + }; pyproject = true; propagatedBuildInputs = [ diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index 87b6fea92ba4a..930e57dbde5bb 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -39,7 +39,7 @@ with lib; # dep of graphviz, libXpm is optional for Xpm support gd = super.gd.override { withXorg = false; }; ghostscript = super.ghostscript.override { cupsSupport = false; x11Support = false; }; - gjs = super.gjs.overrideAttrs { doCheck = false; installTests = false; }; # avoid test dependency on gtk3 + gjs = (super.gjs.override { installTests = false; }).overrideAttrs { doCheck = false; }; # avoid test dependency on gtk3 gobject-introspection = super.gobject-introspection.override { x11Support = false; }; gpg-tui = super.gpg-tui.override { x11Support = false; }; gpsd = super.gpsd.override { guiSupport = false; }; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index b20e98a9f229b..a008c3c5bdeae 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1316,6 +1316,7 @@ ./services/system/zram-generator.nix ./services/torrent/deluge.nix ./services/torrent/flexget.nix + ./services/torrent/flood.nix ./services/torrent/magnetico.nix ./services/torrent/opentracker.nix ./services/torrent/peerflix.nix diff --git a/nixos/modules/programs/kubeswitch.nix b/nixos/modules/programs/kubeswitch.nix index 304df48e3c11a..9348540022f23 100644 --- a/nixos/modules/programs/kubeswitch.nix +++ b/nixos/modules/programs/kubeswitch.nix @@ -29,17 +29,13 @@ in config = let - shell_files = pkgs.stdenv.mkDerivation rec { - name = "kubeswitch-shell-files"; - phases = [ "installPhase" ]; - installPhase = '' - mkdir -p $out/share - for shell in bash zsh; do - ${cfg.package}/bin/switcher init $shell | sed 's/switch(/${cfg.commandName}(/' > $out/share/${cfg.commandName}_init.$shell - ${cfg.package}/bin/switcher --cmd ${cfg.commandName} completion $shell > $out/share/${cfg.commandName}_completion.$shell - done - ''; - }; + shell_files = pkgs.runCommand "kubeswitch-shell-files" {} '' + mkdir -p $out/share + for shell in bash zsh; do + ${cfg.package}/bin/switcher init $shell | sed 's/switch(/${cfg.commandName}(/' > $out/share/${cfg.commandName}_init.$shell + ${cfg.package}/bin/switcher --cmd ${cfg.commandName} completion $shell > $out/share/${cfg.commandName}_completion.$shell + done + ''; in lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; diff --git a/nixos/modules/programs/wayland/hyprland.nix b/nixos/modules/programs/wayland/hyprland.nix index 98779ea7d03a3..5a21bd153b632 100644 --- a/nixos/modules/programs/wayland/hyprland.nix +++ b/nixos/modules/programs/wayland/hyprland.nix @@ -56,6 +56,7 @@ in services.displayManager.sessionPackages = [ cfg.package ]; xdg.portal = { + enable = true; extraPortals = [ cfg.portalPackage ]; configPackages = lib.mkDefault [ cfg.package ]; }; @@ -70,7 +71,7 @@ in (import ./wayland-session.nix { inherit lib pkgs; enableXWayland = cfg.xwayland.enable; - enableWlrPortal = false; # Hyprland has its own portal, wlr is not needed + enableWlrPortal = lib.mkDefault false; # Hyprland has its own portal, wlr is not needed }) ]); diff --git a/nixos/modules/programs/ydotool.nix b/nixos/modules/programs/ydotool.nix index f639e9283de42..643a5d369f3fc 100644 --- a/nixos/modules/programs/ydotool.nix +++ b/nixos/modules/programs/ydotool.nix @@ -14,23 +14,32 @@ in options.programs.ydotool = { enable = lib.mkEnableOption '' - ydotoold system service and install ydotool. - Add yourself to the 'ydotool' group to be able to use it. + ydotoold system service and {command}`ydotool` for members of + {option}`programs.ydotool.group`. ''; + group = lib.mkOption { + type = lib.types.str; + default = "ydotool"; + description = '' + Group which users must be in to use {command}`ydotool`. + ''; + }; }; - config = lib.mkIf cfg.enable { - users.groups.ydotool = { }; + config = let + runtimeDirectory = "ydotoold"; + in lib.mkIf cfg.enable { + users.groups."${config.programs.ydotool.group}" = { }; systemd.services.ydotoold = { description = "ydotoold - backend for ydotool"; wantedBy = [ "multi-user.target" ]; partOf = [ "multi-user.target" ]; serviceConfig = { - Group = "ydotool"; - RuntimeDirectory = "ydotoold"; + Group = config.programs.ydotool.group; + RuntimeDirectory = runtimeDirectory; RuntimeDirectoryMode = "0750"; - ExecStart = "${lib.getExe' pkgs.ydotool "ydotoold"} --socket-path=/run/ydotoold/socket --socket-perm=0660"; + ExecStart = "${lib.getExe' pkgs.ydotool "ydotoold"} --socket-path=${config.environment.variables.YDOTOOL_SOCKET} --socket-perm=0660"; # hardening @@ -76,7 +85,7 @@ in }; environment.variables = { - YDOTOOL_SOCKET = "/run/ydotoold/socket"; + YDOTOOL_SOCKET = "/run/${runtimeDirectory}/socket"; }; environment.systemPackages = with pkgs; [ ydotool ]; }; diff --git a/nixos/modules/security/krb5/default.nix b/nixos/modules/security/krb5/default.nix index 78426c07cbc98..6714c41d8a07c 100644 --- a/nixos/modules/security/krb5/default.nix +++ b/nixos/modules/security/krb5/default.nix @@ -77,8 +77,22 @@ in { }; }; - config = mkIf cfg.enable { - environment = { + config = { + assertions = mkIf (cfg.enable || config.services.kerberos_server.enable) [(let + implementation = cfg.package.passthru.implementation or "<NOT SET>"; + in { + assertion = lib.elem implementation [ "krb5" "heimdal" ]; + message = '' + `security.krb5.package` must be one of: + + - krb5 + - heimdal + + Currently chosen implementation: ${implementation} + ''; + })]; + + environment = mkIf cfg.enable { systemPackages = [ cfg.package ]; etc."krb5.conf".source = format.generate "krb5.conf" cfg.settings; }; diff --git a/nixos/modules/security/krb5/krb5-conf-format.nix b/nixos/modules/security/krb5/krb5-conf-format.nix index 5a6bbed9fd188..3e5e64ae0cb04 100644 --- a/nixos/modules/security/krb5/krb5-conf-format.nix +++ b/nixos/modules/security/krb5/krb5-conf-format.nix @@ -7,17 +7,61 @@ let inherit (lib) boolToString concatMapStringsSep concatStringsSep filter isAttrs isBool isList mapAttrsToList mkOption singleton splitString; - inherit (lib.types) attrsOf bool coercedTo either int listOf oneOf path - str submodule; + inherit (lib.types) attrsOf bool coercedTo either enum int listOf oneOf + path str submodule; in -{ }: { - type = let - section = attrsOf relation; - relation = either (attrsOf value) value; +{ + enableKdcACLEntries ? false +}: rec { + sectionType = let + relation = oneOf [ + (listOf (attrsOf value)) + (attrsOf value) + value + ]; value = either (listOf atom) atom; atom = oneOf [int str bool]; + in attrsOf relation; + + type = let + aclEntry = submodule { + options = { + principal = mkOption { + type = str; + description = "Which principal the rule applies to"; + }; + access = mkOption { + type = either + (listOf (enum ["add" "cpw" "delete" "get" "list" "modify"])) + (enum ["all"]); + default = "all"; + description = "The changes the principal is allowed to make."; + }; + target = mkOption { + type = str; + default = "*"; + description = "The principals that 'access' applies to."; + }; + }; + }; + + realm = submodule ({ name, ... }: { + freeformType = sectionType; + options = { + acl = mkOption { + type = listOf aclEntry; + default = [ + { principal = "*/admin"; access = "all"; } + { principal = "admin"; access = "all"; } + ]; + description = '' + The privileges granted to a user. + ''; + }; + }; + }); in submodule { - freeformType = attrsOf section; + freeformType = attrsOf sectionType; options = { include = mkOption { default = [ ]; @@ -40,7 +84,17 @@ in ''; type = coercedTo path singleton (listOf path); }; - }; + + } + // + (lib.optionalAttrs enableKdcACLEntries { + realms = mkOption { + type = attrsOf realm; + description = '' + The realm(s) to serve keys for. + ''; + }; + }); }; generate = let @@ -71,6 +125,9 @@ in ${name} = { ${indent (concatStringsSep "\n" (mapAttrsToList formatValue relation))} }'' + else if isList relation + then + concatMapStringsSep "\n" (formatRelation name) relation else formatValue name relation; formatValue = name: value: diff --git a/nixos/modules/services/admin/docuum.nix b/nixos/modules/services/admin/docuum.nix index 6f6cd4e027337..51a21740b276a 100644 --- a/nixos/modules/services/admin/docuum.nix +++ b/nixos/modules/services/admin/docuum.nix @@ -2,7 +2,7 @@ let cfg = config.services.docuum; - inherit (lib) mkIf mkEnableOption mkOption getExe types; + inherit (lib) mkIf mkEnableOption mkOption getExe types optionals concatMap; in { options.services.docuum = { @@ -14,6 +14,27 @@ in default = "10 GB"; example = "50%"; }; + + minAge = mkOption { + description = "Sets the minimum age of images to be considered for deletion."; + type = types.nullOr types.str; + default = null; + example = "1d"; + }; + + keep = mkOption { + description = "Prevents deletion of images for which repository:tag matches the specified regex."; + type = types.listOf types.str; + default = []; + example = [ "^my-image" ]; + }; + + deletionChunkSize = mkOption { + description = "Removes specified quantity of images at a time."; + type = types.int; + default = 1; + example = 10; + }; }; config = mkIf cfg.enable { @@ -35,10 +56,13 @@ in DynamicUser = true; StateDirectory = "docuum"; SupplementaryGroups = [ "docker" ]; - ExecStart = utils.escapeSystemdExecArgs [ + ExecStart = utils.escapeSystemdExecArgs ([ (getExe pkgs.docuum) "--threshold" cfg.threshold - ]; + "--deletion-chunk-size" cfg.deletionChunkSize + ] ++ (concatMap (keep: [ "--keep" keep ]) cfg.keep) + ++ (optionals (cfg.minAge != null) [ "--min-age" cfg.minAge ]) + ); }; }; }; diff --git a/nixos/modules/services/audio/navidrome.nix b/nixos/modules/services/audio/navidrome.nix index a9db9228827a2..06d2d174a4df3 100644 --- a/nixos/modules/services/audio/navidrome.nix +++ b/nixos/modules/services/audio/navidrome.nix @@ -157,5 +157,5 @@ in networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.settings.Port ]; }; - meta.maintainers = with maintainers; [ nu-nu-ko ]; + meta.maintainers = with maintainers; [ fsnkty ]; } diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md index 8a587832cd8c0..e76f127335c7b 100644 --- a/nixos/modules/services/databases/postgresql.md +++ b/nixos/modules/services/databases/postgresql.md @@ -244,6 +244,27 @@ The upgrade process is: $ ./delete_old_cluster.sh ``` +## Versioning and End-of-Life {#module-services-postgres-versioning} + +PostgreSQL's versioning policy is described [here](https://www.postgresql.org/support/versioning/). TLDR: + +- Each major version is supported for 5 years. +- Every three months there will be a new minor release, containing bug and security fixes. +- For criticial/security fixes there could be more minor releases inbetween. This happens *very* infrequently. +- After five years, a final minor version is released. This usually happens in early November. +- After that a version is considered end-of-life (EOL). +- Around February each year is the first time an EOL-release will not have received regular updates anymore. + +Technically, we'd not want to have EOL'ed packages in a stable NixOS release, which is to be supported until one month after the previous release. Thus, with NixOS' release schedule in May and November, the oldest PostgreSQL version in nixpkgs would have to be supported until December. It could be argued that a soon-to-be-EOL-ed version should thus be removed in May for the .05 release already. But since new security vulnerabilities are first disclosed in Februrary of the following year, we agreed on keeping the oldest PostgreSQL major version around one more cycle in [#310580](https://github.com/NixOS/nixpkgs/pull/310580#discussion_r1597284693). + +Thus: +- In September/October the new major version will be released and added to nixos-unstable. +- In November the last minor version for the oldest major will be released. +- Both the current stable .05 release and nixos-unstable should be updated to the latest minor. +- In November, before branch-off for the .11 release, the EOL-ed major will be removed from nixos-unstable. + +This leaves a small gap of a couple of weeks after the latest minor release and the end of our support window for the .05 release, in which there could be an emergency release to other major versions of PostgreSQL - but not the oldest major we have in that branch. In that case: If we can't trivially patch the issue, we will mark the package/version as insecure **immediately**. + ## Options {#module-services-postgres-options} A complete list of options for the PostgreSQL module may be found [here](#opt-services.postgresql.enable). diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix index 5bae328accde6..d4f961254f028 100644 --- a/nixos/modules/services/desktop-managers/plasma6.nix +++ b/nixos/modules/services/desktop-managers/plasma6.nix @@ -146,6 +146,7 @@ in { dolphin-plugins spectacle ffmpegthumbs + krdp ]; in requiredPackages diff --git a/nixos/modules/services/games/archisteamfarm.nix b/nixos/modules/services/games/archisteamfarm.nix index c9c41d6f4eb5e..7062332db34ab 100644 --- a/nixos/modules/services/games/archisteamfarm.nix +++ b/nixos/modules/services/games/archisteamfarm.nix @@ -196,7 +196,7 @@ in Group = "archisteamfarm"; WorkingDirectory = cfg.dataDir; Type = "simple"; - ExecStart = "${lib.getExe cfg.package} --no-restart --process-required --service --system-required --path ${cfg.dataDir}"; + ExecStart = "${lib.getExe cfg.package} --no-restart --service --system-required --path ${cfg.dataDir}"; Restart = "always"; # copied from the default systemd service at diff --git a/nixos/modules/services/mail/postsrsd.nix b/nixos/modules/services/mail/postsrsd.nix index 2ebc675ab10af..92f01dd4101e8 100644 --- a/nixos/modules/services/mail/postsrsd.nix +++ b/nixos/modules/services/mail/postsrsd.nix @@ -120,14 +120,9 @@ in { if [ ! -e "${cfg.secretsFile}" ]; then echo "WARNING: secrets file not found, autogenerating!" DIR="$(dirname "${cfg.secretsFile}")" - if [ ! -d "$DIR" ]; then - mkdir -p -m750 "$DIR" - chown "${cfg.user}:${cfg.group}" "$DIR" - fi - dd if=/dev/random bs=18 count=1 | base64 > "${cfg.secretsFile}" - chmod 600 "${cfg.secretsFile}" + install -m 750 -o ${cfg.user} -g ${cfg.group} -d "$DIR" + install -m 600 -o ${cfg.user} -g ${cfg.group} <(dd if=/dev/random bs=18 count=1 | base64) "${cfg.secretsFile}" fi - chown "${cfg.user}:${cfg.group}" "${cfg.secretsFile}" ''; }; diff --git a/nixos/modules/services/misc/amazon-ssm-agent.nix b/nixos/modules/services/misc/amazon-ssm-agent.nix index 9ab4a7f96d087..0da10621d0a09 100644 --- a/nixos/modules/services/misc/amazon-ssm-agent.nix +++ b/nixos/modules/services/misc/amazon-ssm-agent.nix @@ -28,13 +28,7 @@ in { options.services.amazon-ssm-agent = { enable = mkEnableOption "Amazon SSM agent"; - - package = mkOption { - type = types.path; - description = "The Amazon SSM agent package to use"; - default = pkgs.amazon-ssm-agent.override { overrideEtc = false; }; - defaultText = literalExpression "pkgs.amazon-ssm-agent.override { overrideEtc = false; }"; - }; + package = mkPackageOption pkgs "amazon-ssm-agent" {}; }; config = mkIf cfg.enable { diff --git a/nixos/modules/services/misc/anki-sync-server.md b/nixos/modules/services/misc/anki-sync-server.md index f58d3d8ad0dab..5482a4aa0e5ff 100644 --- a/nixos/modules/services/misc/anki-sync-server.md +++ b/nixos/modules/services/misc/anki-sync-server.md @@ -52,7 +52,7 @@ following options: ```nix { - services.anki-sync-server.host = "0.0.0.0"; + services.anki-sync-server.address = "0.0.0.0"; services.anki-sync-server.openFirewall = true; } ``` diff --git a/nixos/modules/services/misc/jellyfin.nix b/nixos/modules/services/misc/jellyfin.nix index a1d3910bd93b0..a006090878422 100644 --- a/nixos/modules/services/misc/jellyfin.nix +++ b/nixos/modules/services/misc/jellyfin.nix @@ -160,5 +160,5 @@ in }; - meta.maintainers = with maintainers; [ minijackson nu-nu-ko ]; + meta.maintainers = with maintainers; [ minijackson fsnkty ]; } diff --git a/nixos/modules/services/misc/snapper.nix b/nixos/modules/services/misc/snapper.nix index a42fca5b60289..4e0b4c551e23f 100644 --- a/nixos/modules/services/misc/snapper.nix +++ b/nixos/modules/services/misc/snapper.nix @@ -235,7 +235,7 @@ in timerConfig.OnUnitActiveSec = cfg.cleanupInterval; }; - systemd.services.snapper-boot = lib.optionalAttrs cfg.snapshotRootOnBoot { + systemd.services.snapper-boot = lib.mkIf cfg.snapshotRootOnBoot { description = "Take snapper snapshot of root on boot"; inherit documentation; serviceConfig.ExecStart = "${pkgs.snapper}/bin/snapper --config root create --cleanup-algorithm number --description boot"; diff --git a/nixos/modules/services/networking/aria2.nix b/nixos/modules/services/networking/aria2.nix index dd4823911f2b3..f0d5c5c8a21e3 100644 --- a/nixos/modules/services/networking/aria2.nix +++ b/nixos/modules/services/networking/aria2.nix @@ -7,12 +7,6 @@ let defaultRpcListenPort = 6800; defaultDir = "${homeDir}/Downloads"; - rangesToStringList = map (x: - if x.from == x.to - then builtins.toString x.from - else builtins.toString x.from + "-" + builtins.toString x.to - ); - portRangesToString = ranges: lib.concatStringsSep "," (map (x: if x.from == x.to @@ -77,6 +71,7 @@ in [0]: https://aria2.github.io/manual/en/html/aria2c.html#synopsis ''; + default = { }; type = lib.types.submodule { freeformType = with lib.types; attrsOf (oneOf [ bool int float singleLineStr ]); options = { diff --git a/nixos/modules/services/search/qdrant.nix b/nixos/modules/services/search/qdrant.nix index f28178a5f1751..41a4e9b41f6d9 100644 --- a/nixos/modules/services/search/qdrant.nix +++ b/nixos/modules/services/search/qdrant.nix @@ -60,6 +60,7 @@ in { config = mkIf cfg.enable { services.qdrant.settings = { + service.static_content_dir = mkDefault pkgs.qdrant-web-ui; storage.storage_path = mkDefault "/var/lib/qdrant/storage"; storage.snapshots_path = mkDefault "/var/lib/qdrant/snapshots"; # The following default values are the same as in the default config, diff --git a/nixos/modules/services/security/oauth2-proxy-nginx.nix b/nixos/modules/services/security/oauth2-proxy-nginx.nix index 44bf56233e95e..2dffeb993803f 100644 --- a/nixos/modules/services/security/oauth2-proxy-nginx.nix +++ b/nixos/modules/services/security/oauth2-proxy-nginx.nix @@ -73,6 +73,7 @@ in virtualHosts.${cfg.domain}.locations."/oauth2/" = { proxyPass = cfg.proxy; extraConfig = '' + auth_request off; proxy_set_header X-Scheme $scheme; proxy_set_header X-Auth-Request-Redirect $scheme://$host$request_uri; ''; diff --git a/nixos/modules/services/security/oauth2-proxy.nix b/nixos/modules/services/security/oauth2-proxy.nix index 3079a1d030c52..a897f04ea6333 100644 --- a/nixos/modules/services/security/oauth2-proxy.nix +++ b/nixos/modules/services/security/oauth2-proxy.nix @@ -586,11 +586,11 @@ in wantedBy = [ "multi-user.target" ]; wants = [ "network-online.target" ] ++ lib.optionals needsKeycloak [ "keycloak.service" ]; after = [ "network-online.target" ] ++ lib.optionals needsKeycloak [ "keycloak.service" ]; - + restartTriggers = [ cfg.keyFile ]; serviceConfig = { User = "oauth2-proxy"; Restart = "always"; - ExecStart = "${cfg.package}/bin/oauth2-proxy ${configString}"; + ExecStart = "${lib.getExe cfg.package} ${configString}"; EnvironmentFile = lib.mkIf (cfg.keyFile != null) cfg.keyFile; }; }; diff --git a/nixos/modules/services/security/vaultwarden/default.nix b/nixos/modules/services/security/vaultwarden/default.nix index 33957be437b30..41f7de5d80fab 100644 --- a/nixos/modules/services/security/vaultwarden/default.nix +++ b/nixos/modules/services/security/vaultwarden/default.nix @@ -5,6 +5,8 @@ let user = config.users.users.vaultwarden.name; group = config.users.groups.vaultwarden.name; + StateDirectory = if lib.versionOlder config.system.stateVersion "24.11" then "bitwarden_rs" else "vaultwarden"; + # Convert name from camel case (e.g. disable2FARemember) to upper case snake case (e.g. DISABLE_2FA_REMEMBER). nameToEnvVar = name: let @@ -23,7 +25,7 @@ let configEnv = lib.concatMapAttrs (name: value: lib.optionalAttrs (value != null) { ${nameToEnvVar name} = if lib.isBool value then lib.boolToString value else toString value; }) cfg.config; - in { DATA_FOLDER = "/var/lib/bitwarden_rs"; } // lib.optionalAttrs (!(configEnv ? WEB_VAULT_ENABLED) || configEnv.WEB_VAULT_ENABLED == "true") { + in { DATA_FOLDER = "/var/lib/${StateDirectory}"; } // lib.optionalAttrs (!(configEnv ? WEB_VAULT_ENABLED) || configEnv.WEB_VAULT_ENABLED == "true") { WEB_VAULT_FOLDER = "${cfg.webVaultPackage}/share/vaultwarden/vault"; } // configEnv; @@ -176,16 +178,45 @@ in { User = user; Group = group; EnvironmentFile = [ configFile ] ++ lib.optional (cfg.environmentFile != null) cfg.environmentFile; - ExecStart = "${vaultwarden}/bin/vaultwarden"; + ExecStart = lib.getExe vaultwarden; LimitNOFILE = "1048576"; - PrivateTmp = "true"; - PrivateDevices = "true"; - ProtectHome = "true"; + CapabilityBoundingSet = [ "" ]; + DeviceAllow = [ "" ]; + DevicePolicy = "closed"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "noaccess"; ProtectSystem = "strict"; - AmbientCapabilities = "CAP_NET_BIND_SERVICE"; - StateDirectory = "bitwarden_rs"; + RemoveIPC = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + inherit StateDirectory; StateDirectoryMode = "0700"; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + ]; Restart = "always"; + UMask = "0077"; }; wantedBy = [ "multi-user.target" ]; }; @@ -193,7 +224,7 @@ in { systemd.services.backup-vaultwarden = lib.mkIf (cfg.backupDir != null) { description = "Backup vaultwarden"; environment = { - DATA_FOLDER = "/var/lib/bitwarden_rs"; + DATA_FOLDER = "/var/lib/${StateDirectory}"; BACKUP_FOLDER = cfg.backupDir; }; path = with pkgs; [ sqlite ]; diff --git a/nixos/modules/services/system/kerberos/default.nix b/nixos/modules/services/system/kerberos/default.nix index 7fe970c9609a9..34c7c6c84f865 100644 --- a/nixos/modules/services/system/kerberos/default.nix +++ b/nixos/modules/services/system/kerberos/default.nix @@ -1,75 +1,59 @@ -{config, lib, ...}: +{ config, pkgs, lib, ... }: let - inherit (lib) mkOption mkIf types length attrNames; + inherit (lib) mkOption types; cfg = config.services.kerberos_server; - kerberos = config.security.krb5.package; + inherit (config.security.krb5) package; - aclEntry = { - options = { - principal = mkOption { - type = types.str; - description = "Which principal the rule applies to"; - }; - access = mkOption { - type = types.either - (types.listOf (types.enum ["add" "cpw" "delete" "get" "list" "modify"])) - (types.enum ["all"]); - default = "all"; - description = "The changes the principal is allowed to make."; - }; - target = mkOption { - type = types.str; - default = "*"; - description = "The principals that 'access' applies to."; - }; - }; - }; - - realm = { - options = { - acl = mkOption { - type = types.listOf (types.submodule aclEntry); - default = [ - { principal = "*/admin"; access = "all"; } - { principal = "admin"; access = "all"; } - ]; - description = '' - The privileges granted to a user. - ''; - }; - }; - }; + format = import ../../../security/krb5/krb5-conf-format.nix { inherit pkgs lib; } { enableKdcACLEntries = true; }; in { imports = [ + (lib.mkRenamedOptionModule [ "services" "kerberos_server" "realms" ] [ "services" "kerberos_server" "settings" "realms" ]) + ./mit.nix ./heimdal.nix ]; - ###### interface options = { services.kerberos_server = { enable = lib.mkEnableOption "the kerberos authentication server"; - realms = mkOption { - type = types.attrsOf (types.submodule realm); + settings = mkOption { + type = format.type; description = '' - The realm(s) to serve keys for. + Settings for the kerberos server of choice. + + See the following documentation: + - Heimdal: {manpage}`kdc.conf(5)` + - MIT Kerberos: <https://web.mit.edu/kerberos/krb5-1.21/doc/admin/conf_files/kdc_conf.html> ''; + default = { }; }; }; }; + config = lib.mkIf cfg.enable { + environment.systemPackages = [ package ]; + assertions = [ + { + assertion = cfg.settings.realms != { }; + message = "The server needs at least one realm"; + } + { + assertion = lib.length (lib.attrNames cfg.settings.realms) <= 1; + message = "Only one realm per server is currently supported."; + } + ]; + + systemd.slices.system-kerberos-server = { }; + systemd.targets.kerberos-server = { + wantedBy = [ "multi-user.target" ]; + }; + }; - ###### implementation - - config = mkIf cfg.enable { - environment.systemPackages = [ kerberos ]; - assertions = [{ - assertion = length (attrNames cfg.realms) <= 1; - message = "Only one realm per server is currently supported."; - }]; + meta = { + doc = ./kerberos-server.md; }; } diff --git a/nixos/modules/services/system/kerberos/heimdal.nix b/nixos/modules/services/system/kerberos/heimdal.nix index ecafc92766704..cec4dd276e6b9 100644 --- a/nixos/modules/services/system/kerberos/heimdal.nix +++ b/nixos/modules/services/system/kerberos/heimdal.nix @@ -1,68 +1,87 @@ { pkgs, config, lib, ... } : let - inherit (lib) mkIf concatStringsSep concatMapStrings toList mapAttrs - mapAttrsToList; + inherit (lib) mapAttrs; cfg = config.services.kerberos_server; - kerberos = config.security.krb5.package; - stateDir = "/var/heimdal"; - aclFiles = mapAttrs - (name: {acl, ...}: pkgs.writeText "${name}.acl" (concatMapStrings (( - {principal, access, target, ...} : - "${principal}\t${concatStringsSep "," (toList access)}\t${target}\n" - )) acl)) cfg.realms; + package = config.security.krb5.package; - kdcConfigs = mapAttrsToList (name: value: '' - database = { - dbname = ${stateDir}/heimdal - acl_file = ${value} - } - '') aclFiles; - kdcConfFile = pkgs.writeText "kdc.conf" '' - [kdc] - ${concatStringsSep "\n" kdcConfigs} - ''; + aclConfigs = lib.pipe cfg.settings.realms [ + (mapAttrs (name: { acl, ... }: lib.concatMapStringsSep "\n" ( + { principal, access, target, ... }: + "${principal}\t${lib.concatStringsSep "," (lib.toList access)}\t${target}" + ) acl)) + (lib.mapAttrsToList (name: text: + { + dbname = "/var/lib/heimdal/heimdal"; + acl_file = pkgs.writeText "${name}.acl" text; + } + )) + ]; + + finalConfig = cfg.settings // { + realms = mapAttrs (_: v: removeAttrs v [ "acl" ]) (cfg.settings.realms or { }); + kdc = (cfg.settings.kdc or { }) // { + database = aclConfigs; + }; + }; + + format = import ../../../security/krb5/krb5-conf-format.nix { inherit pkgs lib; } { enableKdcACLEntries = true; }; + + kdcConfFile = format.generate "kdc.conf" finalConfig; in { - # No documentation about correct triggers, so guessing at them. + config = lib.mkIf (cfg.enable && package.passthru.implementation == "heimdal") { + environment.etc."heimdal-kdc/kdc.conf".source = kdcConfFile; + + systemd.tmpfiles.settings."10-heimdal" = let + databases = lib.pipe finalConfig.kdc.database [ + (map (dbAttrs: dbAttrs.dbname or null)) + (lib.filter (x: x != null)) + lib.unique + ]; + in lib.genAttrs databases (_: { + d = { + user = "root"; + group = "root"; + mode = "0700"; + }; + }); - config = mkIf (cfg.enable && kerberos == pkgs.heimdal) { systemd.services.kadmind = { description = "Kerberos Administration Daemon"; - wantedBy = [ "multi-user.target" ]; - preStart = '' - mkdir -m 0755 -p ${stateDir} - ''; - serviceConfig.ExecStart = - "${kerberos}/libexec/kadmind --config-file=/etc/heimdal-kdc/kdc.conf"; + partOf = [ "kerberos-server.target" ]; + wantedBy = [ "kerberos-server.target" ]; + serviceConfig = { + ExecStart = "${package}/libexec/kadmind --config-file=/etc/heimdal-kdc/kdc.conf"; + Slice = "system-kerberos-server.slice"; + StateDirectory = "heimdal"; + }; restartTriggers = [ kdcConfFile ]; }; systemd.services.kdc = { description = "Key Distribution Center daemon"; - wantedBy = [ "multi-user.target" ]; - preStart = '' - mkdir -m 0755 -p ${stateDir} - ''; - serviceConfig.ExecStart = - "${kerberos}/libexec/kdc --config-file=/etc/heimdal-kdc/kdc.conf"; + partOf = [ "kerberos-server.target" ]; + wantedBy = [ "kerberos-server.target" ]; + serviceConfig = { + ExecStart = "${package}/libexec/kdc --config-file=/etc/heimdal-kdc/kdc.conf"; + Slice = "system-kerberos-server.slice"; + StateDirectory = "heimdal"; + }; restartTriggers = [ kdcConfFile ]; }; systemd.services.kpasswdd = { description = "Kerberos Password Changing daemon"; - wantedBy = [ "multi-user.target" ]; - preStart = '' - mkdir -m 0755 -p ${stateDir} - ''; - serviceConfig.ExecStart = "${kerberos}/libexec/kpasswdd"; + partOf = [ "kerberos-server.target" ]; + wantedBy = [ "kerberos-server.target" ]; + serviceConfig = { + ExecStart = "${package}/libexec/kpasswdd"; + Slice = "system-kerberos-server.slice"; + StateDirectory = "heimdal"; + }; restartTriggers = [ kdcConfFile ]; }; - - environment.etc = { - # Can be set via the --config-file option to KDC - "heimdal-kdc/kdc.conf".source = kdcConfFile; - }; }; } diff --git a/nixos/modules/services/system/kerberos/kerberos-server.md b/nixos/modules/services/system/kerberos/kerberos-server.md new file mode 100644 index 0000000000000..80c71be1541e4 --- /dev/null +++ b/nixos/modules/services/system/kerberos/kerberos-server.md @@ -0,0 +1,55 @@ +# kerberos_server {#module-services-kerberos-server} + +Kerberos is a computer-network authentication protocol that works on the basis of tickets to allow nodes communicating over a non-secure network to prove their identity to one another in a secure manner. + +This module provides both the MIT and Heimdal implementations of the a Kerberos server. + +## Usage {#module-services-kerberos-server-usage} + +To enable a Kerberos server: + +```nix +{ + security.krb5 = { + # Here you can choose between the MIT and Heimdal implementations. + package = pkgs.krb5; + # package = pkgs.heimdal; + + # Optionally set up a client on the same machine as the server + enable = true; + settings = { + libdefaults.default_realm = "EXAMPLE.COM"; + realms."EXAMPLE.COM" = { + kdc = "kerberos.example.com"; + admin_server = "kerberos.example.com"; + }; + }; + } + + services.kerberos-server = { + enable = true; + settings = { + realms."EXAMPLE.COM" = { + acl = [{ principal = "adminuser"; access= ["add" "cpw"]; }]; + }; + }; + }; +} +``` + +## Notes {#module-services-kerberos-server-notes} + +- The Heimdal documentation will sometimes assume that state is stored in `/var/heimdal`, but this module uses `/var/lib/heimdal` instead. +- Due to the heimdal implementation being chosen through `security.krb5.package`, it is not possible to have a system with one implementation of the client and another of the server. +- While `services.kerberos_server.settings` has a common freeform type between the two implementations, the actual settings that can be set can vary between the two implementations. To figure out what settings are available, you should consult the upstream documentation for the implementation you are using. + +## Upstream Documentation {#module-services-kerberos-server-upstream-documentation} + +- MIT Kerberos homepage: https://web.mit.edu/kerberos +- MIT Kerberos docs: https://web.mit.edu/kerberos/krb5-latest/doc/index.html + +- Heimdal Kerberos GitHub wiki: https://github.com/heimdal/heimdal/wiki +- Heimdal kerberos doc manpages (Debian unstable): https://manpages.debian.org/unstable/heimdal-docs/index.html +- Heimdal Kerberos kdc manpages (Debian unstable): https://manpages.debian.org/unstable/heimdal-kdc/index.html + +Note the version number in the URLs, it may be different for the latest version. diff --git a/nixos/modules/services/system/kerberos/mit.nix b/nixos/modules/services/system/kerberos/mit.nix index a654bd1fe7e1b..9ce58986e27af 100644 --- a/nixos/modules/services/system/kerberos/mit.nix +++ b/nixos/modules/services/system/kerberos/mit.nix @@ -1,31 +1,37 @@ { pkgs, config, lib, ... } : let - inherit (lib) mkIf concatStrings concatStringsSep concatMapStrings toList - mapAttrs mapAttrsToList; + inherit (lib) mapAttrs; cfg = config.services.kerberos_server; - kerberos = config.security.krb5.package; - stateDir = "/var/lib/krb5kdc"; + package = config.security.krb5.package; PIDFile = "/run/kdc.pid"; + + format = import ../../../security/krb5/krb5-conf-format.nix { inherit pkgs lib; } { enableKdcACLEntries = true; }; + aclMap = { add = "a"; cpw = "c"; delete = "d"; get = "i"; list = "l"; modify = "m"; all = "*"; }; - aclFiles = mapAttrs - (name: {acl, ...}: (pkgs.writeText "${name}.acl" (concatMapStrings ( - {principal, access, target, ...} : - let access_code = map (a: aclMap.${a}) (toList access); in - "${principal} ${concatStrings access_code} ${target}\n" - ) acl))) cfg.realms; - kdcConfigs = mapAttrsToList (name: value: '' - ${name} = { - acl_file = ${value} - } - '') aclFiles; - kdcConfFile = pkgs.writeText "kdc.conf" '' - [realms] - ${concatStringsSep "\n" kdcConfigs} - ''; + + aclConfigs = lib.pipe cfg.settings.realms [ + (mapAttrs (name: { acl, ... }: lib.concatMapStringsSep "\n" ( + { principal, access, target, ... }: let + access_code = map (a: aclMap.${a}) (lib.toList access); + in "${principal} ${lib.concatStrings access_code} ${target}" + ) acl)) + + (lib.concatMapAttrs (name: text: { + ${name} = { + acl_file = pkgs.writeText "${name}.acl" text; + }; + })) + ]; + + finalConfig = cfg.settings // { + realms = mapAttrs (n: v: (removeAttrs v [ "acl" ]) // aclConfigs.${n}) (cfg.settings.realms or { }); + }; + + kdcConfFile = format.generate "kdc.conf" finalConfig; env = { # What Debian uses, could possibly link directly to Nix store? KRB5_KDC_PROFILE = "/etc/krb5kdc/kdc.conf"; @@ -33,36 +39,38 @@ let in { - config = mkIf (cfg.enable && kerberos == pkgs.krb5) { + config = lib.mkIf (cfg.enable && package.passthru.implementation == "krb5") { + environment = { + etc."krb5kdc/kdc.conf".source = kdcConfFile; + variables = env; + }; + systemd.services.kadmind = { description = "Kerberos Administration Daemon"; - wantedBy = [ "multi-user.target" ]; - preStart = '' - mkdir -m 0755 -p ${stateDir} - ''; - serviceConfig.ExecStart = "${kerberos}/bin/kadmind -nofork"; + partOf = [ "kerberos-server.target" ]; + wantedBy = [ "kerberos-server.target" ]; + serviceConfig = { + ExecStart = "${package}/bin/kadmind -nofork"; + Slice = "system-kerberos-server.slice"; + StateDirectory = "krb5kdc"; + }; restartTriggers = [ kdcConfFile ]; environment = env; }; systemd.services.kdc = { description = "Key Distribution Center daemon"; - wantedBy = [ "multi-user.target" ]; - preStart = '' - mkdir -m 0755 -p ${stateDir} - ''; + partOf = [ "kerberos-server.target" ]; + wantedBy = [ "kerberos-server.target" ]; serviceConfig = { Type = "forking"; PIDFile = PIDFile; - ExecStart = "${kerberos}/bin/krb5kdc -P ${PIDFile}"; + ExecStart = "${package}/bin/krb5kdc -P ${PIDFile}"; + Slice = "system-kerberos-server.slice"; + StateDirectory = "krb5kdc"; }; restartTriggers = [ kdcConfFile ]; environment = env; }; - - environment.etc = { - "krb5kdc/kdc.conf".source = kdcConfFile; - }; - environment.variables = env; }; } diff --git a/nixos/modules/services/torrent/flood.nix b/nixos/modules/services/torrent/flood.nix new file mode 100644 index 0000000000000..213f4ef046483 --- /dev/null +++ b/nixos/modules/services/torrent/flood.nix @@ -0,0 +1,85 @@ +{ config, lib, pkgs, utils, ... }: + +let + cfg = config.services.flood; +in +{ + meta.maintainers = with lib.maintainers; [ thiagokokada ]; + + options.services.flood = { + enable = lib.mkEnableOption "flood"; + package = lib.mkPackageOption pkgs "flood" { }; + openFirewall = lib.mkEnableOption "" // { + description = "Whether to open the firewall for the port in {option}`services.flood.port`."; + }; + port = lib.mkOption { + type = lib.types.int; + description = "Port to bind webserver."; + default = 3000; + example = 3001; + }; + host = lib.mkOption { + type = lib.types.str; + description = "Host to bind webserver."; + default = "localhost"; + example = "::"; + }; + extraArgs = lib.mkOption { + type = with lib.types; listOf str; + description = "Extra arguments passed to `flood`."; + default = [ ]; + example = [ "--baseuri=/" ]; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.flood = { + description = "A modern web UI for various torrent clients."; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + unitConfig = { + Documentation = "https://github.com/jesec/flood/wiki"; + }; + serviceConfig = { + Restart = "on-failure"; + RestartSec = "3s"; + ExecStart = utils.escapeSystemdExecArgs ([ + (lib.getExe cfg.package) + "--host" + cfg.host + "--port" + (toString cfg.port) + "--rundir=/var/lib/flood" + ] ++ cfg.extraArgs); + + CapabilityBoundingSet = [ "" ]; + DynamicUser = true; + LockPersonality = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + StateDirectory = "flood"; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "@pkey" "~@privileged" ]; + }; + }; + + networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ + cfg.port + ]; + }; +} + diff --git a/nixos/modules/services/ttys/getty.nix b/nixos/modules/services/ttys/getty.nix index 011016dd5fd14..e88bb4628635e 100644 --- a/nixos/modules/services/ttys/getty.nix +++ b/nixos/modules/services/ttys/getty.nix @@ -101,7 +101,7 @@ in config = { # Note: this is set here rather than up there so that changing # nixos.label would not rebuild manual pages - services.getty.greetingLine = mkDefault ''<<< Welcome to NixOS ${config.system.nixos.label} (\m) - \l >>>''; + services.getty.greetingLine = mkDefault ''<<< Welcome to ${config.system.nixos.distroName} ${config.system.nixos.label} (\m) - \l >>>''; services.getty.helpLine = mkIf (config.documentation.nixos.enable && config.documentation.doc.enable) "\nRun 'nixos-help' for the NixOS manual."; systemd.services."getty@" = @@ -158,4 +158,5 @@ in }; + meta.maintainers = with maintainers; [ RossComputerGuy ]; } diff --git a/nixos/modules/services/web-apps/akkoma.nix b/nixos/modules/services/web-apps/akkoma.nix index 338e7c7383380..8ba3c7eaa1e6a 100644 --- a/nixos/modules/services/web-apps/akkoma.nix +++ b/nixos/modules/services/web-apps/akkoma.nix @@ -1136,6 +1136,6 @@ in { }; }; - meta.maintainers = with maintainers; [ mvs tcmal ]; + meta.maintainers = with maintainers; [ mvs ]; meta.doc = ./akkoma.md; } diff --git a/nixos/modules/services/web-apps/firefly-iii.nix b/nixos/modules/services/web-apps/firefly-iii.nix index 6b383139c8911..3e51bd226b02e 100644 --- a/nixos/modules/services/web-apps/firefly-iii.nix +++ b/nixos/modules/services/web-apps/firefly-iii.nix @@ -46,7 +46,8 @@ let Type = "oneshot"; User = user; Group = group; - StateDirectory = "${removePrefix "/var/lib/" cfg.dataDir}"; + StateDirectory = "firefly-iii"; + ReadWritePaths = [cfg.dataDir]; WorkingDirectory = cfg.package; PrivateTmp = true; PrivateDevices = true; diff --git a/nixos/modules/services/web-apps/freshrss.nix b/nixos/modules/services/web-apps/freshrss.nix index 1035c961c02c9..021101fecaa48 100644 --- a/nixos/modules/services/web-apps/freshrss.nix +++ b/nixos/modules/services/web-apps/freshrss.nix @@ -10,7 +10,7 @@ in meta.maintainers = with maintainers; [ etu stunkymonkey mattchrist ]; options.services.freshrss = { - enable = mkEnableOption "FreshRSS feed reader"; + enable = mkEnableOption "FreshRSS RSS aggregator and reader with php-fpm backend."; package = mkPackageOption pkgs "freshrss" { }; @@ -108,7 +108,7 @@ in type = types.str; default = poolName; description = '' - Name of the phpfpm pool to use and setup. If not specified, a pool will be created + Name of the php-fpm pool to use and setup. If not specified, a pool will be created with default values. ''; }; diff --git a/nixos/modules/services/web-apps/invoiceplane.nix b/nixos/modules/services/web-apps/invoiceplane.nix index c3dbb88619b33..9a9f180b21021 100644 --- a/nixos/modules/services/web-apps/invoiceplane.nix +++ b/nixos/modules/services/web-apps/invoiceplane.nix @@ -46,10 +46,10 @@ let version = src.version; src = pkgs.invoiceplane; - postPhase = '' + postPatch = '' # Patch index.php file to load additional config file substituteInPlace index.php \ - --replace "require('vendor/autoload.php');" "require('vendor/autoload.php'); \$dotenv = Dotenv\Dotenv::createImmutable(__DIR__, 'extraConfig.php'); \$dotenv->load();"; + --replace-fail "require('vendor/autoload.php');" "require('vendor/autoload.php'); \$dotenv = Dotenv\Dotenv::createImmutable(__DIR__, 'extraConfig.php'); \$dotenv->load();"; ''; installPhase = '' diff --git a/nixos/modules/services/web-apps/nextjs-ollama-llm-ui.nix b/nixos/modules/services/web-apps/nextjs-ollama-llm-ui.nix index d58210c8d9610..9bd2cf310c0af 100644 --- a/nixos/modules/services/web-apps/nextjs-ollama-llm-ui.nix +++ b/nixos/modules/services/web-apps/nextjs-ollama-llm-ui.nix @@ -7,7 +7,7 @@ let cfg = config.services.nextjs-ollama-llm-ui; # we have to override the URL to a Ollama service here, because it gets baked into the web app. - nextjs-ollama-llm-ui = cfg.package.override { ollamaUrl = "https://ollama.lambdablob.com"; }; + nextjs-ollama-llm-ui = cfg.package.override { inherit (cfg) ollamaUrl; }; in { options = { diff --git a/nixos/modules/services/web-apps/pretix.nix b/nixos/modules/services/web-apps/pretix.nix index 498face7456db..9786b61160260 100644 --- a/nixos/modules/services/web-apps/pretix.nix +++ b/nixos/modules/services/web-apps/pretix.nix @@ -310,7 +310,7 @@ in type = types.str; default = "redis+socket://${config.services.redis.servers.pretix.unixSocket}?virtual_host=1"; defaultText = literalExpression '' - optionalString config.services.pretix.celery.enable "redis+socket://''${config.services.redis.servers.pretix.unixSocket}?virtual_host=1" + redis+socket://''${config.services.redis.servers.pretix.unixSocket}?virtual_host=1 ''; description = '' URI to the celery backend used for the asynchronous job queue. @@ -321,7 +321,7 @@ in type = types.str; default = "redis+socket://${config.services.redis.servers.pretix.unixSocket}?virtual_host=2"; defaultText = literalExpression '' - optionalString config.services.pretix.celery.enable "redis+socket://''${config.services.redis.servers.pretix.unixSocket}?virtual_host=2" + redis+socket://''${config.services.redis.servers.pretix.unixSocket}?virtual_host=2 ''; description = '' URI to the celery broker used for the asynchronous job queue. diff --git a/nixos/modules/services/x11/window-managers/qtile.nix b/nixos/modules/services/x11/window-managers/qtile.nix index 700ead8366008..4603ca3fb50f0 100644 --- a/nixos/modules/services/x11/window-managers/qtile.nix +++ b/nixos/modules/services/x11/window-managers/qtile.nix @@ -7,6 +7,10 @@ let in { + imports = [ + (mkRemovedOptionModule [ "services" "xserver" "windowManager" "qtile" "backend" ] "The qtile package now provides separate display sessions for both X11 and Wayland.") + ]; + options.services.xserver.windowManager.qtile = { enable = mkEnableOption "qtile"; @@ -22,14 +26,6 @@ in ''; }; - backend = mkOption { - type = types.enum [ "x11" "wayland" ]; - default = "x11"; - description = '' - Backend to use in qtile: `x11` or `wayland`. - ''; - }; - extraPackages = mkOption { type = types.functionTo (types.listOf types.package); default = _: []; @@ -57,25 +53,14 @@ in }; config = mkIf cfg.enable { - services.xserver.windowManager.qtile.finalPackage = pkgs.python3.withPackages (p: - [ (cfg.package.unwrapped or cfg.package) ] ++ (cfg.extraPackages p) - ); - - services.xserver.windowManager.session = [{ - name = "qtile"; - start = '' - ${cfg.finalPackage}/bin/qtile start -b ${cfg.backend} \ - ${optionalString (cfg.configFile != null) - "--config \"${cfg.configFile}\""} & - waitPID=$! - ''; - }]; + services = { + xserver.windowManager.qtile.finalPackage = pkgs.python3.pkgs.qtile.override { extraPackages = cfg.extraPackages pkgs.python3.pkgs; }; + displayManager.sessionPackages = [ cfg.finalPackage ]; + }; - environment.systemPackages = [ - # pkgs.qtile is currently a buildenv of qtile and its dependencies. - # For userland commands, we want the underlying package so that - # packages such as python don't bleed into userland and overwrite intended behavior. - (cfg.package.unwrapped or cfg.package) - ]; + environment = { + etc."xdg/qtile/config.py" = mkIf (cfg.configFile != null) { source = cfg.configFile; }; + systemPackages = [ cfg.finalPackage ]; + }; }; } diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index cee8663f0040e..e73048dc2ecbe 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -323,15 +323,15 @@ in { assertions = [ { assertion = (hasPrefix "/" efi.efiSysMountPoint); - message = "The ESP mount point '${efi.efiSysMountPoint}' must be an absolute path"; + message = "The ESP mount point '${toString efi.efiSysMountPoint}' must be an absolute path"; } { assertion = cfg.xbootldrMountPoint == null || (hasPrefix "/" cfg.xbootldrMountPoint); - message = "The XBOOTLDR mount point '${cfg.xbootldrMountPoint}' must be an absolute path"; + message = "The XBOOTLDR mount point '${toString cfg.xbootldrMountPoint}' must be an absolute path"; } { assertion = cfg.xbootldrMountPoint != efi.efiSysMountPoint; - message = "The XBOOTLDR mount point '${cfg.xbootldrMountPoint}' cannot be the same as the ESP mount point '${efi.efiSysMountPoint}'"; + message = "The XBOOTLDR mount point '${toString cfg.xbootldrMountPoint}' cannot be the same as the ESP mount point '${toString efi.efiSysMountPoint}'"; } { assertion = (config.boot.kernelPackages.kernel.features or { efiBootStub = true; }) ? efiBootStub; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index a9b6881aab0f8..8d5b865891e4a 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -328,6 +328,7 @@ in { firewall-nftables = handleTest ./firewall.nix { nftables = true; }; fish = handleTest ./fish.nix {}; flannel = handleTestOn ["x86_64-linux"] ./flannel.nix {}; + flood = handleTest ./flood.nix {}; floorp = handleTest ./firefox.nix { firefoxPackage = pkgs.floorp; }; fluentd = handleTest ./fluentd.nix {}; fluidd = handleTest ./fluidd.nix {}; @@ -413,6 +414,7 @@ in { pyload = handleTest ./pyload.nix {}; oci-containers = handleTestOn ["aarch64-linux" "x86_64-linux"] ./oci-containers.nix {}; odoo = handleTest ./odoo.nix {}; + odoo16 = handleTest ./odoo.nix { package = pkgs.odoo16; }; odoo15 = handleTest ./odoo.nix { package = pkgs.odoo15; }; # 9pnet_virtio used to mount /nix partition doesn't support # hibernation. This test happens to work on x86_64-linux but @@ -833,7 +835,7 @@ in { scrutiny = handleTest ./scrutiny.nix {}; sddm = handleTest ./sddm.nix {}; seafile = handleTest ./seafile.nix {}; - searx = handleTest ./searx.nix {}; + searx = runTest ./searx.nix; seatd = handleTest ./seatd.nix {}; service-runner = handleTest ./service-runner.nix {}; sftpgo = runTest ./sftpgo.nix; @@ -1019,7 +1021,7 @@ in { vault-agent = handleTest ./vault-agent.nix {}; vault-dev = handleTest ./vault-dev.nix {}; vault-postgresql = handleTest ./vault-postgresql.nix {}; - vaultwarden = handleTest ./vaultwarden.nix {}; + vaultwarden = discoverTests (import ./vaultwarden.nix); vector = handleTest ./vector {}; vengi-tools = handleTest ./vengi-tools.nix {}; victoriametrics = handleTest ./victoriametrics.nix {}; diff --git a/nixos/tests/firefly-iii.nix b/nixos/tests/firefly-iii.nix index 2373ba8360264..f8e4ca4bfe2b4 100644 --- a/nixos/tests/firefly-iii.nix +++ b/nixos/tests/firefly-iii.nix @@ -39,12 +39,13 @@ in DB_DATABASE = "firefly"; DB_USERNAME = "firefly"; DB_PASSWORD_FILE = "/etc/postgres-pass"; + PGSQL_SCHEMA = "firefly"; }; }; services.postgresql = { enable = true; - package = pkgs.postgresql_15; + package = pkgs.postgresql_16; authentication = '' local all postgres peer local firefly firefly password @@ -52,6 +53,7 @@ in initialScript = pkgs.writeText "firefly-init.sql" '' CREATE USER "firefly" WITH LOGIN PASSWORD '${db-pass}'; CREATE DATABASE "firefly" WITH OWNER "firefly"; + \c firefly CREATE SCHEMA AUTHORIZATION firefly; ''; }; diff --git a/nixos/tests/flood.nix b/nixos/tests/flood.nix new file mode 100644 index 0000000000000..075d37e62835f --- /dev/null +++ b/nixos/tests/flood.nix @@ -0,0 +1,27 @@ +import ./make-test-python.nix ({ pkgs, ... }: +let + port = 3001; +in +{ + name = "flood"; + meta = { + maintainers = with pkgs.lib.maintainers; [ thiagokokada ]; + }; + + nodes.machine = { pkgs, ... }: { + services.flood = { + inherit port; + enable = true; + openFirewall = true; + extraArgs = [ "--baseuri=/" ]; + }; + }; + + testScript = /* python */ '' + machine.start() + machine.wait_for_unit("flood.service") + machine.wait_for_open_port(${toString port}) + + machine.succeed("curl --fail http://localhost:${toString port}") + ''; +}) diff --git a/nixos/tests/kerberos/heimdal.nix b/nixos/tests/kerberos/heimdal.nix index 393289f7a92ca..098080a84592e 100644 --- a/nixos/tests/kerberos/heimdal.nix +++ b/nixos/tests/kerberos/heimdal.nix @@ -4,7 +4,7 @@ import ../make-test-python.nix ({pkgs, ...}: { nodes.machine = { config, libs, pkgs, ...}: { services.kerberos_server = { enable = true; - realms = { + settings.realms = { "FOO.BAR".acl = [{principal = "admin"; access = ["add" "cpw"];}]; }; }; diff --git a/nixos/tests/kerberos/mit.nix b/nixos/tests/kerberos/mit.nix index 1191d047abbf0..172261f95fe6b 100644 --- a/nixos/tests/kerberos/mit.nix +++ b/nixos/tests/kerberos/mit.nix @@ -4,7 +4,7 @@ import ../make-test-python.nix ({pkgs, ...}: { nodes.machine = { config, libs, pkgs, ...}: { services.kerberos_server = { enable = true; - realms = { + settings.realms = { "FOO.BAR".acl = [{principal = "admin"; access = ["add" "cpw"];}]; }; }; diff --git a/nixos/tests/kubo/default.nix b/nixos/tests/kubo/default.nix index d8c0c69dc1fbd..629922fc366db 100644 --- a/nixos/tests/kubo/default.nix +++ b/nixos/tests/kubo/default.nix @@ -1,7 +1,5 @@ { recurseIntoAttrs, runTest }: recurseIntoAttrs { kubo = runTest ./kubo.nix; - # The FUSE functionality is completely broken since Kubo v0.24.0 - # See https://github.com/ipfs/kubo/issues/10242 - # kubo-fuse = runTest ./kubo-fuse.nix; + kubo-fuse = runTest ./kubo-fuse.nix; } diff --git a/nixos/tests/kubo/kubo-fuse.nix b/nixos/tests/kubo/kubo-fuse.nix index 71a5bf61649f6..c8c273fc0dfc7 100644 --- a/nixos/tests/kubo/kubo-fuse.nix +++ b/nixos/tests/kubo/kubo-fuse.nix @@ -23,7 +23,7 @@ with subtest("FUSE mountpoint"): machine.fail("echo a | su bob -l -c 'ipfs add --quieter'") - # The FUSE mount functionality is broken as of v0.13.0 and v0.17.0. + # The FUSE mount functionality is broken as of v0.13.0. This is still the case with v0.29.0. # See https://github.com/ipfs/kubo/issues/9044. # Workaround: using CID Version 1 avoids that. ipfs_hash = machine.succeed( diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix index 428fe0aa10db9..2a32f2b4d1992 100644 --- a/nixos/tests/nextcloud/basic.nix +++ b/nixos/tests/nextcloud/basic.nix @@ -1,27 +1,27 @@ -args@{ pkgs, nextcloudVersion ? 22, ... }: +{ name, pkgs, testBase, system,... }: -(import ../make-test-python.nix ({ pkgs, ...}: let - adminpass = "notproduction"; - adminuser = "root"; -in { - name = "nextcloud-basic"; +with import ../../lib/testing-python.nix { inherit system pkgs; }; +runTest ({ config, ... }: { + inherit name; meta = with pkgs.lib.maintainers; { - maintainers = [ globin eqyiel ]; + maintainers = [ globin eqyiel ma27 ]; }; - nodes = rec { + imports = [ testBase ]; + + nodes = { # The only thing the client needs to do is download a file. client = { ... }: { services.davfs2.enable = true; systemd.tmpfiles.settings.nextcloud = { "/tmp/davfs2-secrets"."f+" = { mode = "0600"; - argument = "http://nextcloud/remote.php/dav/files/${adminuser} ${adminuser} ${adminpass}"; + argument = "http://nextcloud/remote.php/dav/files/${config.adminuser} ${config.adminuser} ${config.adminpass}"; }; }; virtualisation.fileSystems = { "/mnt/dav" = { - device = "http://nextcloud/remote.php/dav/files/${adminuser}"; + device = "http://nextcloud/remote.php/dav/files/${config.adminuser}"; fsType = "davfs"; options = let davfs2Conf = (pkgs.writeText "davfs2.conf" "secrets /tmp/davfs2-secrets"); @@ -30,11 +30,7 @@ in { }; }; - nextcloud = { config, pkgs, ... }: let - cfg = config; - in { - networking.firewall.allowedTCPPorts = [ 80 ]; - + nextcloud = { config, pkgs, ... }: { systemd.tmpfiles.rules = [ "d /var/lib/nextcloud-data 0750 nextcloud nginx - -" ]; @@ -42,14 +38,7 @@ in { services.nextcloud = { enable = true; datadir = "/var/lib/nextcloud-data"; - hostName = "nextcloud"; - database.createLocally = true; - config = { - # Don't inherit adminuser since "root" is supposed to be the default - adminpassFile = "${pkgs.writeText "adminpass" adminpass}"; # Don't try this at home! - dbtableprefix = "nixos_"; - }; - package = pkgs.${"nextcloud" + (toString nextcloudVersion)}; + config.dbtableprefix = "nixos_"; autoUpdateApps = { enable = true; startAt = "20:00"; @@ -57,64 +46,31 @@ in { phpExtraExtensions = all: [ all.bz2 ]; }; - environment.systemPackages = [ cfg.services.nextcloud.occ ]; + specialisation.withoutMagick.configuration = { + services.nextcloud.enableImagemagick = false; + }; }; - - nextcloudWithoutMagick = args@{ config, pkgs, lib, ... }: - lib.mkMerge - [ (nextcloud args) - { services.nextcloud.enableImagemagick = false; } ]; }; - testScript = { nodes, ... }: let - withRcloneEnv = pkgs.writeScript "with-rclone-env" '' - #!${pkgs.runtimeShell} - export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav - export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/dav/files/${adminuser}" - export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud" - export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}" - export RCLONE_CONFIG_NEXTCLOUD_PASS="$(${pkgs.rclone}/bin/rclone obscure ${adminpass})" - "''${@}" - ''; - copySharedFile = pkgs.writeScript "copy-shared-file" '' - #!${pkgs.runtimeShell} - echo 'hi' | ${withRcloneEnv} ${pkgs.rclone}/bin/rclone rcat nextcloud:test-shared-file - ''; - - diffSharedFile = pkgs.writeScript "diff-shared-file" '' - #!${pkgs.runtimeShell} - diff <(echo 'hi') <(${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file) - ''; - + test-helpers.extraTests = { nodes, ... }: let findInClosure = what: drv: pkgs.runCommand "find-in-closure" { exportReferencesGraph = [ "graph" drv ]; inherit what; } '' test -e graph grep "$what" graph >$out || true ''; - nextcloudUsesImagick = findInClosure "imagick" nodes.nextcloud.system.build.vm; - nextcloudWithoutDoesntUseIt = findInClosure "imagick" nodes.nextcloudWithoutMagick.system.build.vm; + nexcloudWithImagick = findInClosure "imagick" nodes.nextcloud.system.build.vm; + nextcloudWithoutImagick = findInClosure "imagick" nodes.nextcloud.specialisation.withoutMagick.configuration.system.build.vm; in '' - assert open("${nextcloudUsesImagick}").read() != "" - assert open("${nextcloudWithoutDoesntUseIt}").read() == "" + with subtest("File is in proper nextcloud home"): + nextcloud.succeed("test -f ${nodes.nextcloud.services.nextcloud.datadir}/data/root/files/test-shared-file") + + with subtest("Closure checks"): + assert open("${nexcloudWithImagick}").read() != "" + assert open("${nextcloudWithoutImagick}").read() == "" + + with subtest("Davfs2"): + assert "hi" in client.succeed("cat /mnt/dav/test-shared-file") - nextcloud.start() - client.start() - nextcloud.wait_for_unit("multi-user.target") - # This is just to ensure the nextcloud-occ program is working - nextcloud.succeed("nextcloud-occ status") - nextcloud.succeed("curl -sSf http://nextcloud/login") - # Ensure that no OpenSSL 1.1 is used. - nextcloud.succeed( - "${nodes.nextcloud.services.phpfpm.pools.nextcloud.phpPackage}/bin/php -i | grep 'OpenSSL Library Version' | awk -F'=>' '{ print $2 }' | awk '{ print $2 }' | grep -v 1.1" - ) - nextcloud.succeed( - "${withRcloneEnv} ${copySharedFile}" - ) - client.wait_for_unit("multi-user.target") - nextcloud.succeed("test -f /var/lib/nextcloud-data/data/root/files/test-shared-file") - client.succeed( - "${withRcloneEnv} ${diffSharedFile}" - ) - assert "hi" in client.succeed("cat /mnt/dav/test-shared-file") - nextcloud.succeed("grep -vE '^HBEGIN:oc_encryption_module' /var/lib/nextcloud-data/data/root/files/test-shared-file") + with subtest("Ensure SSE is disabled by default"): + nextcloud.succeed("grep -vE '^HBEGIN:oc_encryption_module' /var/lib/nextcloud-data/data/root/files/test-shared-file") ''; -})) args +}) diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix index d024adffd9f06..33aa227d2b032 100644 --- a/nixos/tests/nextcloud/default.nix +++ b/nixos/tests/nextcloud/default.nix @@ -5,21 +5,108 @@ with pkgs.lib; -foldl - (matrix: ver: matrix // { - "basic${toString ver}" = import ./basic.nix { inherit system pkgs; nextcloudVersion = ver; }; - "with-postgresql-and-redis${toString ver}" = import ./with-postgresql-and-redis.nix { - inherit system pkgs; - nextcloudVersion = ver; - }; - "with-mysql-and-memcached${toString ver}" = import ./with-mysql-and-memcached.nix { - inherit system pkgs; - nextcloudVersion = ver; - }; - "with-declarative-redis-and-secrets${toString ver}" = import ./with-declarative-redis-and-secrets.nix { - inherit system pkgs; - nextcloudVersion = ver; +let + baseModule = { config, ... }: { + imports = [ + { + options.test-helpers = { + rclone = mkOption { type = types.str; }; + upload-sample = mkOption { type = types.str; }; + check-sample = mkOption { type = types.str; }; + init = mkOption { type = types.str; default = ""; }; + extraTests = mkOption { type = types.either types.str (types.functionTo types.str); default = ""; }; + }; + options.adminuser = mkOption { type = types.str; }; + options.adminpass = mkOption { type = types.str; }; + } + ]; + + adminuser = "root"; + adminpass = "hunter2"; + + test-helpers.rclone = "${pkgs.writeShellScript "rclone" '' + set -euo pipefail + export PATH="${pkgs.rclone}/bin:$PATH" + export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav + export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/dav/files/${config.adminuser}" + export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud" + export RCLONE_CONFIG_NEXTCLOUD_USER="${config.adminuser}" + export RCLONE_CONFIG_NEXTCLOUD_PASS="$(rclone obscure ${config.adminpass})" + exec "$@" + ''}"; + test-helpers.upload-sample = "${pkgs.writeShellScript "rclone-upload" '' + <<<'hi' rclone rcat nextcloud:test-shared-file + ''}"; + test-helpers.check-sample = "${pkgs.writeShellScript "check-sample" '' + set -e + diff <(echo 'hi') <(rclone cat nextcloud:test-shared-file) + ''}"; + + nodes = { + client = { ... }: {}; + nextcloud = { + networking.firewall.allowedTCPPorts = [ 80 ]; + services.nextcloud = { + enable = true; + hostName = "nextcloud"; + https = false; + database.createLocally = true; + config = { + adminpassFile = "${pkgs.writeText "adminpass" config.adminpass}"; # Don't try this at home! + }; + }; + }; }; - }) -{ } - [ 27 28 29 ] + + testScript = args@{ nodes, ... }: let + inherit (config) test-helpers; + in mkBefore '' + nextcloud.start() + client.start() + nextcloud.wait_for_unit("multi-user.target") + + ${test-helpers.init} + + with subtest("Ensure nextcloud-occ is working"): + nextcloud.succeed("nextcloud-occ status") + nextcloud.succeed("curl -sSf http://nextcloud/login") + + with subtest("Upload/Download test"): + nextcloud.succeed( + "${test-helpers.rclone} ${test-helpers.upload-sample}" + ) + client.wait_for_unit("multi-user.target") + client.succeed( + "${test-helpers.rclone} ${test-helpers.check-sample}" + ) + + ${if builtins.isFunction test-helpers.extraTests then test-helpers.extraTests args else test-helpers.extraTests} + ''; + }; + + genTests = version: + let + testBase.imports = [ + baseModule + { + nodes.nextcloud = { pkgs, ... }: { + services.nextcloud.package = pkgs.${"nextcloud${toString version}"}; + }; + } + ]; + + callNextcloudTest = path: + let + name = "${removeSuffix ".nix" (baseNameOf path)}${toString version}"; + in nameValuePair name (import path { + inherit system pkgs testBase; + name = "nextcloud-${name}"; + }); + in map callNextcloudTest [ + ./basic.nix + ./with-mysql-and-memcached.nix + ./with-postgresql-and-redis.nix + ./with-objectstore.nix + ]; +in +listToAttrs (concatMap genTests [ 27 28 29 ]) diff --git a/nixos/tests/nextcloud/with-mysql-and-memcached.nix b/nixos/tests/nextcloud/with-mysql-and-memcached.nix index 035a7fdcb0c80..07a3e56fae4af 100644 --- a/nixos/tests/nextcloud/with-mysql-and-memcached.nix +++ b/nixos/tests/nextcloud/with-mysql-and-memcached.nix @@ -1,79 +1,37 @@ -args@{ pkgs, nextcloudVersion ? 22, ... }: +{ pkgs, testBase, system, ... }: -(import ../make-test-python.nix ({ pkgs, ...}: let - adminpass = "hunter2"; - adminuser = "root"; -in { +with import ../../lib/testing-python.nix { inherit system pkgs; }; +runTest ({ config, ... }: { name = "nextcloud-with-mysql-and-memcached"; meta = with pkgs.lib.maintainers; { maintainers = [ eqyiel ]; }; - nodes = { - # The only thing the client needs to do is download a file. - client = { ... }: {}; + imports = [ testBase ]; + nodes = { nextcloud = { config, pkgs, ... }: { - networking.firewall.allowedTCPPorts = [ 80 ]; - services.nextcloud = { - enable = true; - hostName = "nextcloud"; - https = true; - package = pkgs.${"nextcloud" + (toString nextcloudVersion)}; caching = { apcu = true; redis = false; memcached = true; }; - database.createLocally = true; - config = { - dbtype = "mysql"; - # Don't inherit adminuser since "root" is supposed to be the default - adminpassFile = "${pkgs.writeText "adminpass" adminpass}"; # Don't try this at home! - }; + config.dbtype = "mysql"; }; services.memcached.enable = true; }; }; - testScript = let + test-helpers.init = let configureMemcached = pkgs.writeScript "configure-memcached" '' - #!${pkgs.runtimeShell} nextcloud-occ config:system:set memcached_servers 0 0 --value 127.0.0.1 --type string nextcloud-occ config:system:set memcached_servers 0 1 --value 11211 --type integer nextcloud-occ config:system:set memcache.local --value '\OC\Memcache\APCu' --type string nextcloud-occ config:system:set memcache.distributed --value '\OC\Memcache\Memcached' --type string ''; - withRcloneEnv = pkgs.writeScript "with-rclone-env" '' - #!${pkgs.runtimeShell} - export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav - export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/dav/files/${adminuser}" - export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud" - export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}" - export RCLONE_CONFIG_NEXTCLOUD_PASS="$(${pkgs.rclone}/bin/rclone obscure ${adminpass})" - ''; - copySharedFile = pkgs.writeScript "copy-shared-file" '' - #!${pkgs.runtimeShell} - echo 'hi' | ${pkgs.rclone}/bin/rclone rcat nextcloud:test-shared-file - ''; - - diffSharedFile = pkgs.writeScript "diff-shared-file" '' - #!${pkgs.runtimeShell} - diff <(echo 'hi') <(${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file) - ''; in '' - start_all() - nextcloud.wait_for_unit("multi-user.target") nextcloud.succeed("${configureMemcached}") - nextcloud.succeed("curl -sSf http://nextcloud/login") - nextcloud.succeed( - "${withRcloneEnv} ${copySharedFile}" - ) - client.wait_for_unit("multi-user.target") - client.succeed( - "${withRcloneEnv} ${diffSharedFile}" - ) ''; -})) args +}) diff --git a/nixos/tests/nextcloud/with-objectstore.nix b/nixos/tests/nextcloud/with-objectstore.nix new file mode 100644 index 0000000000000..fc26760b8babd --- /dev/null +++ b/nixos/tests/nextcloud/with-objectstore.nix @@ -0,0 +1,96 @@ +{ name, pkgs, testBase, system, ... }: + +with import ../../lib/testing-python.nix { inherit system pkgs; }; +runTest ({ config, lib, ... }: let + accessKey = "BKIKJAA5BMMU2RHO6IBB"; + secretKey = "V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12"; + + rootCredentialsFile = pkgs.writeText "minio-credentials-full" '' + MINIO_ROOT_USER=${accessKey} + MINIO_ROOT_PASSWORD=${secretKey} + ''; +in { + inherit name; + meta = with pkgs.lib.maintainers; { + maintainers = [ onny ma27 ]; + }; + + imports = [ testBase ]; + + nodes = { + nextcloud = { config, pkgs, ... }: { + networking.firewall.allowedTCPPorts = [ 9000 ]; + environment.systemPackages = [ pkgs.minio-client ]; + + services.nextcloud.config.objectstore.s3 = { + enable = true; + bucket = "nextcloud"; + autocreate = true; + key = accessKey; + secretFile = "${pkgs.writeText "secretKey" secretKey}"; + hostname = "nextcloud"; + useSsl = false; + port = 9000; + usePathStyle = true; + region = "us-east-1"; + }; + + services.minio = { + enable = true; + listenAddress = "0.0.0.0:9000"; + consoleAddress = "0.0.0.0:9001"; + inherit rootCredentialsFile; + }; + }; + }; + + test-helpers.init = '' + nextcloud.wait_for_open_port(9000) + ''; + + test-helpers.extraTests = { nodes, ... }: '' + with subtest("File is not on the filesystem"): + nextcloud.succeed("test ! -e ${nodes.nextcloud.services.nextcloud.home}/data/root/files/test-shared-file") + + with subtest("Check if file is in S3"): + nextcloud.succeed( + "mc config host add minio http://localhost:9000 ${accessKey} ${secretKey} --api s3v4" + ) + files = nextcloud.succeed('mc ls minio/nextcloud|sort').strip().split('\n') + + # Cannot assert an exact number here, nc27 writes more stuff initially into S3. + # For now let's assume it's always the most recently added file. + assert len(files) > 0, f""" + Expected to have at least one object in minio/nextcloud. But `mc ls` gave output: + + '{files}' + """ + + import re + ptrn = re.compile("^\[[A-Z0-9 :-]+\] +(?P<details>[A-Za-z0-9 :]+)$") + match = ptrn.match(files[-1].strip()) + assert match, "Cannot match mc client output!" + size, type_, file = tuple(match.group('details').split(' ')) + + assert size == "3B", f""" + Expected size of uploaded file to be 3 bytes, got {size} + """ + + assert type_ == 'STANDARD', f""" + Expected type of bucket entry to be a file, i.e. 'STANDARD'. Got {type_} + """ + + assert file.startswith('urn:oid'), """ + Expected filename to start with 'urn:oid', instead got '{file}. + """ + + with subtest("Test download from S3"): + client.succeed( + "env AWS_ACCESS_KEY_ID=${accessKey} AWS_SECRET_ACCESS_KEY=${secretKey} " + + f"${lib.getExe pkgs.awscli2} s3 cp s3://nextcloud/{file} test --endpoint-url http://nextcloud:9000 " + + "--region us-east-1" + ) + + client.succeed("test hi = $(cat test)") + ''; +}) diff --git a/nixos/tests/nextcloud/with-postgresql-and-redis.nix b/nixos/tests/nextcloud/with-postgresql-and-redis.nix index 06afc589403dd..24c17f70932d3 100644 --- a/nixos/tests/nextcloud/with-postgresql-and-redis.nix +++ b/nixos/tests/nextcloud/with-postgresql-and-redis.nix @@ -1,45 +1,30 @@ -args@{ pkgs, nextcloudVersion ? 22, ... }: +{ name, pkgs, testBase, system, ... }: -(import ../make-test-python.nix ({ pkgs, ...}: let - adminpass = "hunter2"; - adminuser = "custom-admin-username"; -in { - name = "nextcloud-with-postgresql-and-redis"; +with import ../../lib/testing-python.nix { inherit system pkgs; }; +runTest ({ config, ... }: { + inherit name; meta = with pkgs.lib.maintainers; { - maintainers = [ eqyiel ]; + maintainers = [ eqyiel ma27 ]; }; - nodes = { - # The only thing the client needs to do is download a file. - client = { ... }: {}; + imports = [ testBase ]; + nodes = { nextcloud = { config, pkgs, lib, ... }: { - networking.firewall.allowedTCPPorts = [ 80 ]; - services.nextcloud = { - enable = true; - hostName = "nextcloud"; - package = pkgs.${"nextcloud" + (toString nextcloudVersion)}; caching = { apcu = false; redis = true; memcached = false; }; - database.createLocally = true; - config = { - dbtype = "pgsql"; - inherit adminuser; - adminpassFile = toString (pkgs.writeText "admin-pass-file" '' - ${adminpass} - ''); - }; + config.dbtype = "pgsql"; notify_push = { enable = true; logLevel = "debug"; }; extraAppsEnable = true; - extraApps = { - inherit (pkgs."nextcloud${lib.versions.major config.services.nextcloud.package.version}Packages".apps) notify_push notes; + extraApps = with config.services.nextcloud.package.packages.apps; { + inherit notify_push notes; }; settings.trusted_proxies = [ "::1" ]; }; @@ -49,50 +34,27 @@ in { }; }; - testScript = let + test-helpers.init = let configureRedis = pkgs.writeScript "configure-redis" '' - #!${pkgs.runtimeShell} nextcloud-occ config:system:set redis 'host' --value 'localhost' --type string nextcloud-occ config:system:set redis 'port' --value 6379 --type integer nextcloud-occ config:system:set memcache.local --value '\OC\Memcache\Redis' --type string nextcloud-occ config:system:set memcache.locking --value '\OC\Memcache\Redis' --type string ''; - withRcloneEnv = pkgs.writeScript "with-rclone-env" '' - #!${pkgs.runtimeShell} - export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav - export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/dav/files/${adminuser}" - export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud" - export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}" - export RCLONE_CONFIG_NEXTCLOUD_PASS="$(${pkgs.rclone}/bin/rclone obscure ${adminpass})" - "''${@}" - ''; - copySharedFile = pkgs.writeScript "copy-shared-file" '' - #!${pkgs.runtimeShell} - echo 'hi' | ${pkgs.rclone}/bin/rclone rcat nextcloud:test-shared-file - ''; - - diffSharedFile = pkgs.writeScript "diff-shared-file" '' - #!${pkgs.runtimeShell} - diff <(echo 'hi') <(${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file) - ''; in '' - start_all() - nextcloud.wait_for_unit("multi-user.target") nextcloud.succeed("${configureRedis}") - nextcloud.succeed("curl -sSf http://nextcloud/login") - nextcloud.succeed( - "${withRcloneEnv} ${copySharedFile}" - ) - client.wait_for_unit("multi-user.target") - client.execute("${pkgs.lib.getExe pkgs.nextcloud-notify_push.passthru.test_client} http://nextcloud ${adminuser} ${adminpass} >&2 &") - client.succeed( - "${withRcloneEnv} ${diffSharedFile}" - ) - nextcloud.wait_until_succeeds("journalctl -u nextcloud-notify_push | grep -q \"Sending ping to ${adminuser}\"") + ''; + + test-helpers.extraTests = '' + with subtest("notify-push"): + client.execute("${pkgs.lib.getExe pkgs.nextcloud-notify_push.passthru.test_client} http://nextcloud ${config.adminuser} ${config.adminpass} >&2 &") + nextcloud.wait_until_succeeds("journalctl -u nextcloud-notify_push | grep -q \"Sending ping to ${config.adminuser}\"") - # redis cache should not be empty - nextcloud.fail('test "[]" = "$(redis-cli --json KEYS "*")"') + with subtest("Redis is used for caching"): + # redis cache should not be empty + nextcloud.fail('test "[]" = "$(redis-cli --json KEYS "*")"') - nextcloud.fail("curl -f http://nextcloud/nix-apps/notes/lib/AppInfo/Application.php") + with subtest("No code is returned when requesting PHP files (regression test)"): + nextcloud.fail("curl -f http://nextcloud/nix-apps/notes/lib/AppInfo/Application.php") ''; -})) args +}) diff --git a/nixos/tests/odoo.nix b/nixos/tests/odoo.nix index 00ae4a2137d10..45ec7b7d7a6b7 100644 --- a/nixos/tests/odoo.nix +++ b/nixos/tests/odoo.nix @@ -14,6 +14,18 @@ import ./make-test-python.nix ({ pkgs, lib, package ? pkgs.odoo, ...} : { package = package; domain = "localhost"; }; + + # odoo does not automatically initialize its database, + # even if passing what _should_ be the equivalent of these options: + # settings = { + # options = { + # database = "odoo"; + # init = "base"; + # }; + # }; + systemd.services.odoo.preStart = '' + HOME=$STATE_DIRECTORY ${package}/bin/odoo -d odoo -i base --stop-after-init --without-demo all + ''; }; }; diff --git a/nixos/tests/qtile.nix b/nixos/tests/qtile.nix index b4d8f9d421144..96afaa342c524 100644 --- a/nixos/tests/qtile.nix +++ b/nixos/tests/qtile.nix @@ -10,7 +10,7 @@ import ./make-test-python.nix ({ lib, ...} : { test-support.displayManager.auto.user = "alice"; services.xserver.windowManager.qtile.enable = true; - services.displayManager.defaultSession = lib.mkForce "none+qtile"; + services.displayManager.defaultSession = lib.mkForce "qtile"; environment.systemPackages = [ pkgs.kitty ]; }; diff --git a/nixos/tests/quickwit.nix b/nixos/tests/quickwit.nix index 145959f7d3f51..7e617c63d7973 100644 --- a/nixos/tests/quickwit.nix +++ b/nixos/tests/quickwit.nix @@ -1,5 +1,54 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: +let + # Define an example Quickwit index schema, + # and some `exampleDocs` below, to test if ingesting + # and querying works as expected. + index_yaml = '' + version: 0.7 + index_id: example_server_logs + doc_mapping: + mode: dynamic + field_mappings: + - name: datetime + type: datetime + fast: true + input_formats: + - iso8601 + output_format: iso8601 + fast_precision: seconds + fast: true + - name: git + type: text + tokenizer: raw + - name: hostname + type: text + tokenizer: raw + - name: level + type: text + tokenizer: raw + - name: message + type: text + - name: location + type: text + - name: source + type: text + timestamp_field: datetime + + search_settings: + default_search_fields: [message] + + indexing_settings: + commit_timeout_secs: 10 + ''; + + exampleDocs = '' + {"datetime":"2024-05-03T02:36:41.017674444Z","git":"e6e1f087ce12065e44ed3b87b50784e6f9bcc2f9","hostname":"machine-1","level":"Info","message":"Processing request done","location":"path/to/server.c:6442:32","source":""} + {"datetime":"2024-05-04T02:36:41.017674444Z","git":"e6e1f087ce12065e44ed3b87b50784e6f9bcc2f9","hostname":"machine-1","level":"Info","message":"Got exception processing request: HTTP 404","location":"path/to/server.c:6444:32","source":""} + {"datetime":"2024-05-05T02:36:41.017674444Z","git":"e6e1f087ce12065e44ed3b87b50784e6f9bcc2f9","hostname":"machine-1","level":"Info","message":"Got exception processing request: HTTP 404","location":"path/to/server.c:6444:32","source":""} + {"datetime":"2024-05-06T02:36:41.017674444Z","git":"e6e1f087ce12065e44ed3b87b50784e6f9bcc2f9","hostname":"machine-2","level":"Info","message":"Got exception processing request: HTTP 404","location":"path/to/server.c:6444:32","source":""} + ''; +in { name = "quickwit"; meta.maintainers = [ pkgs.lib.maintainers.happysalada ]; @@ -24,6 +73,29 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: "journalctl -o cat -u quickwit.service | grep 'transitioned to ready state'" ) + with subtest("verify UI installed"): + machine.succeed("curl -sSf http://127.0.0.1:7280/ui/") + + with subtest("injest and query data"): + import json + + # Test CLI ingestion + print(machine.succeed('${pkgs.quickwit}/bin/quickwit index create --index-config ${pkgs.writeText "index.yaml" index_yaml}')) + # Important to use `--wait`, otherwise the queries below race with index processing. + print(machine.succeed('${pkgs.quickwit}/bin/quickwit index ingest --index example_server_logs --input-path ${pkgs.writeText "exampleDocs.json" exampleDocs} --wait')) + + # Test CLI query + cli_query_output = machine.succeed('${pkgs.quickwit}/bin/quickwit index search --index example_server_logs --query "exception"') + print(cli_query_output) + + # Assert query result is as expected. + num_hits = len(json.loads(cli_query_output)["hits"]) + assert num_hits == 3, f"cli_query_output contains unexpected number of results: {num_hits}" + + # Test API query + api_query_output = machine.succeed('curl --fail http://127.0.0.1:7280/api/v1/example_server_logs/search?query=exception') + print(api_query_output) + quickwit.log(quickwit.succeed( "systemd-analyze security quickwit.service | grep -v '✓'" )) diff --git a/nixos/tests/searx.nix b/nixos/tests/searx.nix index 02a88f690db78..0008424f068b2 100644 --- a/nixos/tests/searx.nix +++ b/nixos/tests/searx.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, ...} : +{ pkgs, ... }: { name = "searx"; @@ -7,108 +7,108 @@ import ./make-test-python.nix ({ pkgs, ...} : }; # basic setup: searx running the built-in webserver - nodes.base = { ... }: { - imports = [ ../modules/profiles/minimal.nix ]; - - services.searx = { - enable = true; - environmentFile = pkgs.writeText "secrets" '' - WOLFRAM_API_KEY = sometoken - SEARX_SECRET_KEY = somesecret - ''; + nodes.base = + { ... }: + { + services.searx = { + enable = true; + environmentFile = pkgs.writeText "secrets" '' + WOLFRAM_API_KEY = sometoken + SEARX_SECRET_KEY = somesecret + ''; - settings.server = - { port = "8080"; + settings.server = { + port = "8080"; bind_address = "0.0.0.0"; secret_key = "@SEARX_SECRET_KEY@"; }; - settings.engines = [ - { name = "wolframalpha"; - api_key = "@WOLFRAM_API_KEY@"; - engine = "wolframalpha_api"; - } - { name = "startpage"; - shortcut = "start"; - } - ]; - }; + settings.engines = [ + { + name = "wolframalpha"; + api_key = "@WOLFRAM_API_KEY@"; + engine = "wolframalpha_api"; + } + { + name = "startpage"; + shortcut = "start"; + } + ]; + }; - }; + }; # fancy setup: run in uWSGI and use nginx as proxy - nodes.fancy = { config, ... }: { - imports = [ ../modules/profiles/minimal.nix ]; - - services.searx = { - enable = true; - # searx refuses to run if unchanged - settings.server.secret_key = "somesecret"; - - runInUwsgi = true; - uwsgiConfig = { - # serve using the uwsgi protocol - socket = "/run/searx/uwsgi.sock"; - chmod-socket = "660"; - - # use /searx as url "mountpoint" - mount = "/searx=searx.webapp:application"; - module = ""; - manage-script-name = true; + nodes.fancy = + { config, ... }: + { + services.searx = { + enable = true; + # searx refuses to run if unchanged + settings.server.secret_key = "somesecret"; + + runInUwsgi = true; + uwsgiConfig = { + # serve using the uwsgi protocol + socket = "/run/searx/uwsgi.sock"; + chmod-socket = "660"; + + # use /searx as url "mountpoint" + mount = "/searx=searx.webapp:application"; + module = ""; + manage-script-name = true; + }; }; - }; - # use nginx as reverse proxy - services.nginx.enable = true; - services.nginx.virtualHosts.localhost = { - locations."/searx".extraConfig = - '' + # use nginx as reverse proxy + services.nginx.enable = true; + services.nginx.virtualHosts.localhost = { + locations."/searx".extraConfig = '' include ${pkgs.nginx}/conf/uwsgi_params; uwsgi_pass unix:/run/searx/uwsgi.sock; ''; - locations."/searx/static/".alias = "${config.services.searx.package}/share/static/"; - }; - - # allow nginx access to the searx socket - users.users.nginx.extraGroups = [ "searx" ]; - - }; - - testScript = - '' - base.start() - - with subtest("Settings have been merged"): - base.wait_for_unit("searx-init") - base.wait_for_file("/run/searx/settings.yml") - output = base.succeed( - "${pkgs.yq-go}/bin/yq eval" - " '.engines[] | select(.name==\"startpage\") | .shortcut'" - " /run/searx/settings.yml" - ).strip() - assert output == "start", "Settings not merged" + locations."/searx/static/".alias = "${config.services.searx.package}/share/static/"; + }; - with subtest("Environment variables have been substituted"): - base.succeed("grep -q somesecret /run/searx/settings.yml") - base.succeed("grep -q sometoken /run/searx/settings.yml") - base.copy_from_vm("/run/searx/settings.yml") + # allow nginx access to the searx socket + users.users.nginx.extraGroups = [ "searx" ]; - with subtest("Basic setup is working"): - base.wait_for_open_port(8080) - base.wait_for_unit("searx") - base.succeed( - "${pkgs.curl}/bin/curl --fail http://localhost:8080" - ) - base.shutdown() + }; - with subtest("Nginx+uWSGI setup is working"): - fancy.start() - fancy.wait_for_open_port(80) - fancy.wait_for_unit("uwsgi") - fancy.succeed( - "${pkgs.curl}/bin/curl --fail http://localhost/searx >&2" - ) - fancy.succeed( - "${pkgs.curl}/bin/curl --fail http://localhost/searx/static/themes/simple/js/leaflet.js >&2" - ) - ''; -}) + testScript = '' + base.start() + + with subtest("Settings have been merged"): + base.wait_for_unit("searx-init") + base.wait_for_file("/run/searx/settings.yml") + output = base.succeed( + "${pkgs.yq-go}/bin/yq eval" + " '.engines[] | select(.name==\"startpage\") | .shortcut'" + " /run/searx/settings.yml" + ).strip() + assert output == "start", "Settings not merged" + + with subtest("Environment variables have been substituted"): + base.succeed("grep -q somesecret /run/searx/settings.yml") + base.succeed("grep -q sometoken /run/searx/settings.yml") + base.copy_from_vm("/run/searx/settings.yml") + + with subtest("Basic setup is working"): + base.wait_for_open_port(8080) + base.wait_for_unit("searx") + base.succeed( + "${pkgs.curl}/bin/curl --fail http://localhost:8080" + ) + base.shutdown() + + with subtest("Nginx+uWSGI setup is working"): + fancy.start() + fancy.wait_for_open_port(80) + fancy.wait_for_unit("uwsgi") + fancy.succeed( + "${pkgs.curl}/bin/curl --fail http://localhost/searx >&2" + ) + fancy.succeed( + "${pkgs.curl}/bin/curl --fail http://localhost/searx/static/themes/simple/js/leaflet.js >&2" + ) + ''; +} diff --git a/nixos/tests/snapper.nix b/nixos/tests/snapper.nix index 674523584fdaa..0369419930f15 100644 --- a/nixos/tests/snapper.nix +++ b/nixos/tests/snapper.nix @@ -19,7 +19,9 @@ import ./make-test-python.nix ({ ... }: services.snapper.filters = "/nix"; }; - testScript = '' + testScript = { nodes, ... }: let + inherit (nodes.machine.services.snapper) snapshotRootOnBoot; + in '' machine.succeed("btrfs subvolume create /home/.snapshots") machine.succeed("snapper -c home list") machine.succeed("snapper -c home create --description empty") @@ -31,5 +33,6 @@ import ./make-test-python.nix ({ ... }: machine.succeed("snapper -c home delete 2") machine.succeed("systemctl --wait start snapper-timeline.service") machine.succeed("systemctl --wait start snapper-cleanup.service") + machine.${if snapshotRootOnBoot then "succeed" else "fail"}("systemctl cat snapper-boot.service") ''; }) diff --git a/nixos/tests/vaultwarden.nix b/nixos/tests/vaultwarden.nix index 28ff170e36107..baefa67dbf535 100644 --- a/nixos/tests/vaultwarden.nix +++ b/nixos/tests/vaultwarden.nix @@ -1,38 +1,94 @@ -{ system ? builtins.currentSystem -, config ? { } -, pkgs ? import ../.. { inherit system config; } -}: - # These tests will: # * Set up a vaultwarden server -# * Have Firefox use the web vault to create an account, log in, and save a password to the valut +# * Have Firefox use the web vault to create an account, log in, and save a password to the vault # * Have the bw cli log in and read that password from the vault # # Note that Firefox must be on the same machine as the server for WebCrypto APIs to be available (or HTTPS must be configured) # # The same tests should work without modification on the official bitwarden server, if we ever package that. -with import ../lib/testing-python.nix { inherit system pkgs; }; -with pkgs.lib; let - backends = [ "sqlite" "mysql" "postgresql" ]; - - dbPassword = "please_dont_hack"; - - userEmail = "meow@example.com"; - userPassword = "also_super_secret_ZJWpBKZi668QGt"; # Must be complex to avoid interstitial warning on the signup page - - storedPassword = "seeeecret"; + makeVaultwardenTest = name: { + backend ? name, + withClient ? true, + testScript ? null, + }: import ./make-test-python.nix ({ lib, pkgs, ...}: let + dbPassword = "please_dont_hack"; + userEmail = "meow@example.com"; + userPassword = "also_super_secret_ZJWpBKZi668QGt"; # Must be complex to avoid interstitial warning on the signup page + storedPassword = "seeeecret"; + + testRunner = pkgs.writers.writePython3Bin "test-runner" { + libraries = [ pkgs.python3Packages.selenium ]; + flakeIgnore = [ "E501" ]; + } '' + + from selenium.webdriver.common.by import By + from selenium.webdriver import Firefox + from selenium.webdriver.firefox.options import Options + from selenium.webdriver.support.ui import WebDriverWait + from selenium.webdriver.support import expected_conditions as EC + + options = Options() + options.add_argument('--headless') + driver = Firefox(options=options) + + driver.implicitly_wait(20) + driver.get('http://localhost:8080/#/register') + + wait = WebDriverWait(driver, 10) + + wait.until(EC.title_contains("Vaultwarden Web")) + + driver.find_element(By.CSS_SELECTOR, 'input#register-form_input_email').send_keys( + '${userEmail}' + ) + driver.find_element(By.CSS_SELECTOR, 'input#register-form_input_name').send_keys( + 'A Cat' + ) + driver.find_element(By.CSS_SELECTOR, 'input#register-form_input_master-password').send_keys( + '${userPassword}' + ) + driver.find_element(By.CSS_SELECTOR, 'input#register-form_input_confirm-master-password').send_keys( + '${userPassword}' + ) + if driver.find_element(By.CSS_SELECTOR, 'input#checkForBreaches').is_selected(): + driver.find_element(By.CSS_SELECTOR, 'input#checkForBreaches').click() + + driver.find_element(By.XPATH, "//button[contains(., 'Create account')]").click() + + wait.until_not(EC.title_contains("Create account")) + + driver.find_element(By.XPATH, "//button[contains(., 'Continue')]").click() + + driver.find_element(By.CSS_SELECTOR, 'input#login_input_master-password').send_keys( + '${userPassword}' + ) + driver.find_element(By.XPATH, "//button[contains(., 'Log in')]").click() + + wait.until(EC.title_contains("Vaults")) + + driver.find_element(By.XPATH, "//button[contains(., 'New item')]").click() + + driver.find_element(By.CSS_SELECTOR, 'input#name').send_keys( + 'secrets' + ) + driver.find_element(By.CSS_SELECTOR, 'input#loginPassword').send_keys( + '${storedPassword}' + ) + + driver.find_element(By.XPATH, "//button[contains(., 'Save')]").click() + ''; + in { + inherit name; - makeVaultwardenTest = backend: makeTest { - name = "vaultwarden-${backend}"; meta = { - maintainers = with pkgs.lib.maintainers; [ jjjollyjim ]; + maintainers = with pkgs.lib.maintainers; [ dotlambda SuperSandro2000 ]; }; nodes = { - server = { pkgs, ... }: - let backendConfig = { + server = { pkgs, ... }: lib.mkMerge [ + { mysql = { services.mysql = { enable = true; @@ -53,119 +109,53 @@ let postgresql = { services.postgresql = { enable = true; - initialScript = pkgs.writeText "postgresql-init.sql" '' - CREATE USER bitwardenuser WITH PASSWORD '${dbPassword}'; - CREATE DATABASE bitwarden WITH OWNER bitwardenuser; - ''; + ensureDatabases = [ "vaultwarden" ]; + ensureUsers = [{ + name = "vaultwarden"; + ensureDBOwnership = true; + }]; }; - services.vaultwarden.config.databaseUrl = "postgresql://bitwardenuser:${dbPassword}@localhost/bitwarden"; + services.vaultwarden.config.databaseUrl = "postgresql:///vaultwarden?host=/run/postgresql"; systemd.services.vaultwarden.after = [ "postgresql.service" ]; }; - sqlite = { }; - }; - in - mkMerge [ - backendConfig.${backend} - { - services.vaultwarden = { - enable = true; - dbBackend = backend; - config = { - rocketAddress = "0.0.0.0"; - rocketPort = 80; - }; - }; + sqlite = { + services.vaultwarden.backupDir = "/var/lib/vaultwarden/backups"; + + environment.systemPackages = [ pkgs.sqlite ]; + }; + }.${backend} - networking.firewall.allowedTCPPorts = [ 80 ]; - - environment.systemPackages = - let - testRunner = pkgs.writers.writePython3Bin "test-runner" - { - libraries = [ pkgs.python3Packages.selenium ]; - flakeIgnore = [ - "E501" - ]; - } '' - - from selenium.webdriver.common.by import By - from selenium.webdriver import Firefox - from selenium.webdriver.firefox.options import Options - from selenium.webdriver.support.ui import WebDriverWait - from selenium.webdriver.support import expected_conditions as EC - - options = Options() - options.add_argument('--headless') - driver = Firefox(options=options) - - driver.implicitly_wait(20) - driver.get('http://localhost/#/register') - - wait = WebDriverWait(driver, 10) - - wait.until(EC.title_contains("Vaultwarden Web")) - - driver.find_element(By.CSS_SELECTOR, 'input#register-form_input_email').send_keys( - '${userEmail}' - ) - driver.find_element(By.CSS_SELECTOR, 'input#register-form_input_name').send_keys( - 'A Cat' - ) - driver.find_element(By.CSS_SELECTOR, 'input#register-form_input_master-password').send_keys( - '${userPassword}' - ) - driver.find_element(By.CSS_SELECTOR, 'input#register-form_input_confirm-master-password').send_keys( - '${userPassword}' - ) - if driver.find_element(By.CSS_SELECTOR, 'input#checkForBreaches').is_selected(): - driver.find_element(By.CSS_SELECTOR, 'input#checkForBreaches').click() - - driver.find_element(By.XPATH, "//button[contains(., 'Create account')]").click() - - wait.until_not(EC.title_contains("Create account")) - - driver.find_element(By.XPATH, "//button[contains(., 'Continue')]").click() - - driver.find_element(By.CSS_SELECTOR, 'input#login_input_master-password').send_keys( - '${userPassword}' - ) - driver.find_element(By.XPATH, "//button[contains(., 'Log in')]").click() - - wait.until(EC.title_contains("Vaults")) - - driver.find_element(By.XPATH, "//button[contains(., 'New item')]").click() - - driver.find_element(By.CSS_SELECTOR, 'input#name').send_keys( - 'secrets' - ) - driver.find_element(By.CSS_SELECTOR, 'input#loginPassword').send_keys( - '${storedPassword}' - ) - - driver.find_element(By.XPATH, "//button[contains(., 'Save')]").click() - ''; - in - [ pkgs.firefox-unwrapped pkgs.geckodriver testRunner ]; - - } - ]; - - client = { pkgs, ... }: { - environment.systemPackages = [ pkgs.bitwarden-cli ]; - }; + services.vaultwarden = { + enable = true; + dbBackend = backend; + config = { + rocketAddress = "0.0.0.0"; + rocketPort = 8080; + }; + }; + + networking.firewall.allowedTCPPorts = [ 8080 ]; + + environment.systemPackages = [ pkgs.firefox-unwrapped pkgs.geckodriver testRunner ]; + } + ]; + } // lib.optionalAttrs withClient { + client = { pkgs, ... }: { + environment.systemPackages = [ pkgs.bitwarden-cli ]; + }; }; - testScript = '' + testScript = if testScript != null then testScript else '' start_all() server.wait_for_unit("vaultwarden.service") - server.wait_for_open_port(80) + server.wait_for_open_port(8080) with subtest("configure the cli"): - client.succeed("bw --nointeraction config server http://server") + client.succeed("bw --nointeraction config server http://server:8080") with subtest("can't login to nonexistent account"): client.fail( @@ -184,15 +174,40 @@ let client.succeed(f"bw --nointeraction --raw --session {key} sync -f") with subtest("get the password with the cli"): - password = client.succeed( - f"bw --nointeraction --raw --session {key} list items | ${pkgs.jq}/bin/jq -r .[].login.password" + password = client.wait_until_succeeds( + f"bw --nointeraction --raw --session {key} list items | ${pkgs.jq}/bin/jq -r .[].login.password", + timeout=60 ) assert password.strip() == "${storedPassword}" + + with subtest("Check systemd unit hardening"): + server.log(server.succeed("systemd-analyze security vaultwarden.service | grep -v ✓")) ''; - }; + }); in -builtins.listToAttrs ( - map - (backend: { name = backend; value = makeVaultwardenTest backend; }) - backends -) +builtins.mapAttrs (k: v: makeVaultwardenTest k v) { + mysql = {}; + postgresql = {}; + sqlite = {}; + sqlite-backup = { + backend = "sqlite"; + withClient = false; + + testScript = '' + start_all() + server.wait_for_unit("vaultwarden.service") + server.wait_for_open_port(8080) + + with subtest("Set up vaultwarden"): + server.succeed("PYTHONUNBUFFERED=1 test-runner | systemd-cat -t test-runner") + + with subtest("Run the backup script"): + server.start_job("backup-vaultwarden.service") + + with subtest("Check that backup exists"): + server.succeed('[ -d "/var/lib/vaultwarden/backups" ]') + server.succeed('[ -f "/var/lib/vaultwarden/backups/db.sqlite3" ]') + server.succeed('[ -d "/var/lib/vaultwarden/backups/attachments" ]') + ''; + }; +} diff --git a/nixos/tests/ydotool.nix b/nixos/tests/ydotool.nix index 818ac6f2d50de..45e3d27adeb49 100644 --- a/nixos/tests/ydotool.nix +++ b/nixos/tests/ydotool.nix @@ -1,115 +1,184 @@ -import ./make-test-python.nix ( - { pkgs, lib, ... }: - let - textInput = "This works."; - inputBoxText = "Enter input"; - inputBox = pkgs.writeShellScript "zenity-input" '' - ${lib.getExe pkgs.gnome.zenity} --entry --text '${inputBoxText}:' > /tmp/output & - ''; - in - { - name = "ydotool"; - - meta = { - maintainers = with lib.maintainers; [ - OPNA2608 - quantenzitrone - ]; - }; +{ + system ? builtins.currentSystem, + config ? { }, + pkgs ? import ../.. { inherit system config; }, + lib ? pkgs.lib, +}: +let + makeTest = import ./make-test-python.nix; + textInput = "This works."; + inputBoxText = "Enter input"; + inputBox = pkgs.writeShellScript "zenity-input" '' + ${lib.getExe pkgs.gnome.zenity} --entry --text '${inputBoxText}:' > /tmp/output & + ''; + asUser = '' + def as_user(cmd: str): + """ + Return a shell command for running a shell command as a specific user. + """ + return f"sudo -u alice -i {cmd}" + ''; +in +{ + headless = makeTest { + name = "headless"; - nodes = { - headless = - { config, ... }: - { - imports = [ ./common/user-account.nix ]; + enableOCR = true; - users.users.alice.extraGroups = [ "ydotool" ]; + nodes.machine = { + imports = [ ./common/user-account.nix ]; - programs.ydotool.enable = true; + users.users.alice.extraGroups = [ "ydotool" ]; - services.getty.autologinUser = "alice"; - }; + programs.ydotool.enable = true; - x11 = - { config, ... }: - { - imports = [ - ./common/user-account.nix - ./common/auto.nix - ./common/x11.nix - ]; + services.getty.autologinUser = "alice"; + }; - users.users.alice.extraGroups = [ "ydotool" ]; + testScript = + asUser + + '' + start_all() - programs.ydotool.enable = true; + machine.wait_for_unit("multi-user.target") + machine.wait_for_text("alice") + machine.succeed(as_user("ydotool type 'echo ${textInput} > /tmp/output'")) # text input + machine.succeed(as_user("ydotool key 28:1 28:0")) # text input + machine.screenshot("headless_input") + machine.wait_for_file("/tmp/output") + machine.wait_until_succeeds("grep '${textInput}' /tmp/output") # text input + ''; - test-support.displayManager.auto = { - enable = true; - user = "alice"; - }; + meta.maintainers = with lib.maintainers; [ + OPNA2608 + quantenzitrone + ]; + }; - services.xserver.windowManager.dwm.enable = true; - services.displayManager.defaultSession = lib.mkForce "none+dwm"; - }; + x11 = makeTest { + name = "x11"; - wayland = - { config, ... }: - { - imports = [ ./common/user-account.nix ]; + enableOCR = true; - services.cage = { - enable = true; - user = "alice"; - }; + nodes.machine = { + imports = [ + ./common/user-account.nix + ./common/auto.nix + ./common/x11.nix + ]; - programs.ydotool.enable = true; + users.users.alice.extraGroups = [ "ydotool" ]; - services.cage.program = inputBox; - }; + programs.ydotool.enable = true; + + test-support.displayManager.auto = { + enable = true; + user = "alice"; + }; + + services.xserver.windowManager.dwm.enable = true; + services.displayManager.defaultSession = lib.mkForce "none+dwm"; }; + testScript = + asUser + + '' + start_all() + + machine.wait_for_x() + machine.execute(as_user("${inputBox}")) + machine.wait_for_text("${inputBoxText}") + machine.succeed(as_user("ydotool type '${textInput}'")) # text input + machine.screenshot("x11_input") + machine.succeed(as_user("ydotool mousemove -a 400 110")) # mouse input + machine.succeed(as_user("ydotool click 0xC0")) # mouse input + machine.wait_for_file("/tmp/output") + machine.wait_until_succeeds("grep '${textInput}' /tmp/output") # text input + ''; + + meta.maintainers = with lib.maintainers; [ + OPNA2608 + quantenzitrone + ]; + }; + + wayland = makeTest { + name = "wayland"; + enableOCR = true; - testScript = - { nodes, ... }: - '' - def as_user(cmd: str): - """ - Return a shell command for running a shell command as a specific user. - """ - return f"sudo -u alice -i {cmd}" + nodes.machine = { + imports = [ ./common/user-account.nix ]; + + services.cage = { + enable = true; + user = "alice"; + }; + + programs.ydotool.enable = true; + + services.cage.program = inputBox; + }; + + testScript = '' + start_all() + + machine.wait_for_unit("graphical.target") + machine.wait_for_text("${inputBoxText}") + machine.succeed("ydotool type '${textInput}'") # text input + machine.screenshot("wayland_input") + machine.succeed("ydotool mousemove -a 100 100") # mouse input + machine.succeed("ydotool click 0xC0") # mouse input + machine.wait_for_file("/tmp/output") + machine.wait_until_succeeds("grep '${textInput}' /tmp/output") # text input + ''; + + meta.maintainers = with lib.maintainers; [ + OPNA2608 + quantenzitrone + ]; + }; + + customGroup = + let + name = "customGroup"; + nodeName = "${name}Node"; + insideGroupUsername = "ydotool-user"; + outsideGroupUsername = "other-user"; + groupName = "custom-group"; + in + makeTest { + inherit name; + + nodes."${nodeName}" = { + programs.ydotool = { + enable = true; + group = groupName; + }; + + users.users = { + "${insideGroupUsername}" = { + isNormalUser = true; + extraGroups = [ groupName ]; + }; + "${outsideGroupUsername}".isNormalUser = true; + }; + }; + testScript = '' start_all() - # Headless - headless.wait_for_unit("multi-user.target") - headless.wait_for_text("alice") - headless.succeed(as_user("ydotool type 'echo ${textInput} > /tmp/output'")) # text input - headless.succeed(as_user("ydotool key 28:1 28:0")) # text input - headless.screenshot("headless_input") - headless.wait_for_file("/tmp/output") - headless.wait_until_succeeds("grep '${textInput}' /tmp/output") # text input - - # X11 - x11.wait_for_x() - x11.execute(as_user("${inputBox}")) - x11.wait_for_text("${inputBoxText}") - x11.succeed(as_user("ydotool type '${textInput}'")) # text input - x11.screenshot("x11_input") - x11.succeed(as_user("ydotool mousemove -a 400 110")) # mouse input - x11.succeed(as_user("ydotool click 0xC0")) # mouse input - x11.wait_for_file("/tmp/output") - x11.wait_until_succeeds("grep '${textInput}' /tmp/output") # text input - - # Wayland - wayland.wait_for_unit("graphical.target") - wayland.wait_for_text("${inputBoxText}") - wayland.succeed("ydotool type '${textInput}'") # text input - wayland.screenshot("wayland_input") - wayland.succeed("ydotool mousemove -a 100 100") # mouse input - wayland.succeed("ydotool click 0xC0") # mouse input - wayland.wait_for_file("/tmp/output") - wayland.wait_until_succeeds("grep '${textInput}' /tmp/output") # text input + # Wait for service to start + ${nodeName}.wait_for_unit("multi-user.target") + ${nodeName}.wait_for_unit("ydotoold.service") + + # Verify that user with the configured group can use the service + ${nodeName}.succeed("sudo --login --user=${insideGroupUsername} ydotool type 'Hello, World!'") + + # Verify that user without the configured group can't use the service + ${nodeName}.fail("sudo --login --user=${outsideGroupUsername} ydotool type 'Hello, World!'") ''; - } -) + + meta.maintainers = with lib.maintainers; [ l0b0 ]; + }; +} diff --git a/pkgs/README.md b/pkgs/README.md index 7c79931ae4452..7c99f3f4418f2 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -32,6 +32,7 @@ Before adding a new package, please consider the following questions: * Does the project have a clear license statement? Remember that software is unfree by default (all rights reserved), and merely providing access to the source code does not imply its redistribution. In case of doubt, ask upstream. * How realistic is it that it will be used by other people? It's good that nixpkgs caters to various niches, but if it's a niche of 5 people it's probably too small. * Are you willing to maintain the package? You should care enough about the package to be willing to keep it up and running for at least one complete Nixpkgs' release life-cycle. + * In case you are not able to maintain the package you wrote, you can seek someone to fill that role, effectively adopting the package. If any of these questions' answer is no, then you should probably not add the package. diff --git a/pkgs/applications/accessibility/wvkbd/default.nix b/pkgs/applications/accessibility/wvkbd/default.nix index a918797e2de28..ff8e5626f63ac 100644 --- a/pkgs/applications/accessibility/wvkbd/default.nix +++ b/pkgs/applications/accessibility/wvkbd/default.nix @@ -44,7 +44,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/jjsullivan5196/wvkbd"; description = "On-screen keyboard for wlroots"; - maintainers = [ maintainers.elohmeier ]; platforms = platforms.linux; license = licenses.gpl3Plus; mainProgram = "wvkbd-mobintl"; diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index 34a4ddc64b379..35ba2666f0b6b 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -1,25 +1,65 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, glib, libid3tag, id3lib, taglib -, libvorbis, libogg, opusfile, flac, itstool, libxml2, gsettings-desktop-schemas -, gnome, wrapGAppsHook3 +{ + lib, + stdenv, + fetchurl, + pkg-config, + intltool, + gtk3, + glib, + libid3tag, + id3lib, + taglib, + libvorbis, + libogg, + opusfile, + flac, + itstool, + libxml2, + gsettings-desktop-schemas, + gnome, + wrapGAppsHook3, + fetchpatch, }: -let +stdenv.mkDerivation rec { pname = "easytag"; version = "2.4.3"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1mbxnqrw1fwcgraa1bgik25vdzvf97vma5pzknbwbqq5ly9fwlgw"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + hash = "sha256-/FHukqcF48WXnf8WVfdJbv+2i5jxraBUfoy7wDO2fdU="; }; + patches = [ + # https://gitlab.gnome.org/GNOME/easytag/-/merge_requests/8 + # Borrowed from Gentoo + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-sound/easytag/files/easytag-2.4.3-ogg-corruption.patch?id=b175a159c1138702bdfb009ff4d6565019ed3c4a"; + hash = "sha256-z75dYTEVp1raSFROjpakLeBjF96sgWBxxRB6ut9wYXw="; + }) + ]; + NIX_LDFLAGS = "-lid3tag -lz"; - nativeBuildInputs = [ pkg-config intltool itstool libxml2 wrapGAppsHook3 ]; + nativeBuildInputs = [ + pkg-config + intltool + itstool + libxml2 + wrapGAppsHook3 + ]; buildInputs = [ - gtk3 glib libid3tag id3lib taglib libvorbis libogg opusfile flac - gsettings-desktop-schemas gnome.adwaita-icon-theme + gtk3 + glib + libid3tag + id3lib + taglib + libvorbis + libogg + opusfile + flac + gsettings-desktop-schemas + gnome.adwaita-icon-theme ]; doCheck = false; # fails 1 out of 9 tests @@ -36,7 +76,7 @@ in stdenv.mkDerivation rec { mainProgram = "easytag"; homepage = "https://gitlab.gnome.org/GNOME/easytag"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; + maintainers = with maintainers; [ matteopacini ]; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/audio/famistudio/default.nix b/pkgs/applications/audio/famistudio/default.nix index 3d7b0563ac222..b858edf29bca5 100644 --- a/pkgs/applications/audio/famistudio/default.nix +++ b/pkgs/applications/audio/famistudio/default.nix @@ -6,6 +6,7 @@ , fetchFromGitHub , ffmpeg , glfw +, libglvnd , libogg , libvorbis , makeWrapper @@ -23,13 +24,13 @@ let in buildDotnetModule rec { pname = "famistudio"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "BleuBleu"; repo = "FamiStudio"; rev = "refs/tags/${version}"; - hash = "sha256-ydEWLL05B86672j3MVo/90tgDHg8FJ2EZaesqrBZy4A="; + hash = "sha256-WYy/6cWQg3Ayok/eAdnvlWAvdcuhy/sdlWOVvaYcPkc="; }; postPatch = let @@ -89,6 +90,10 @@ buildDotnetModule rec { dotnet-sdk = dotnetCorePackages.sdk_7_0; dotnet-runtime = dotnetCorePackages.runtime_7_0; + runtimeDeps = lib.optionals stdenv.hostPlatform.isLinux [ + libglvnd + ]; + executables = [ "FamiStudio" ]; postInstall = '' diff --git a/pkgs/applications/audio/midi-visualizer/default.nix b/pkgs/applications/audio/midivisualizer/default.nix index a7a8843f46e69..10a2a5de6a096 100644 --- a/pkgs/applications/audio/midi-visualizer/default.nix +++ b/pkgs/applications/audio/midivisualizer/default.nix @@ -20,14 +20,14 @@ , Kernel }: -stdenv.mkDerivation rec { - pname = "MIDIVisualizer"; +stdenv.mkDerivation (finalAttrs: { + pname = "midivisualizer"; version = "7.0"; src = fetchFromGitHub { owner = "kosua20"; - repo = pname; - rev = "v${version}"; + repo = "MIDIVisualizer"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-wfPSPH+E9cErVvfJZqHttFtjiUYJopM/u6w6NpRHifE="; }; @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = [ maintainers.ericdallo ]; }; -} +}) diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index 25d16a658a7d5..ec79cbefabf0f 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -2,24 +2,25 @@ let pname = "plexamp"; - version = "4.8.3"; + version = "4.10.1"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; - name="${pname}-${version}.AppImage"; - hash = "sha512-CrSXmRVatVSkMyB1QaNSL/tK60rQvT9JraRtYYLl0Fau3M1LJXK9yqvt77AjwIwIvi2Dm5SROG+c4rA1XtI4Yg=="; + name = "${pname}-${version}.AppImage"; + hash = "sha512-Y43W6aPnZEMnkBQwSHbT8PWjuhkfNxce79Y9cixEPnq4VybROHGb9s6ghV7kP81TSWkb9QruFhmXfuJRSkXxTw=="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; -in appimageTools.wrapType2 { +in +appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' install -m 444 -D ${appimageContents}/plexamp.desktop $out/share/applications/plexamp.desktop - install -m 444 -D ${appimageContents}/plexamp.png \ - $out/share/icons/hicolor/512x512/apps/plexamp.png + install -m 444 -D ${appimageContents}/plexamp.svg \ + $out/share/icons/hicolor/scalable/apps/plexamp.svg substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' ''; @@ -29,9 +30,9 @@ in appimageTools.wrapType2 { meta = with lib; { description = "Beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; - changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/53"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/73"; license = licenses.unfree; - maintainers = with maintainers; [ killercup synthetica ]; + maintainers = with maintainers; [ killercup redhawk synthetica ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/audio/plexamp/update-plexamp.sh b/pkgs/applications/audio/plexamp/update-plexamp.sh index b6b8def1e310a..44ad9b9250147 100755 --- a/pkgs/applications/audio/plexamp/update-plexamp.sh +++ b/pkgs/applications/audio/plexamp/update-plexamp.sh @@ -5,7 +5,7 @@ set -Eeuxo pipefail cleanup() { - rm -rf "$TMPDIR" + rm -rf "$TMPDIR" } trap cleanup EXIT @@ -42,9 +42,10 @@ if diff "$DEFAULT_NIX" "$WORKING_NIX"; then fi # update sha hash (convenietly provided) -sed -i "s@sha.* = .*;@sha512 = \"$SHA512\";@g" "$WORKING_NIX" +sed -i "s@hash.* = .*;@hash = \"sha512-$SHA512\";@g" "$WORKING_NIX" # update the changelog ("just" increment the number) +# manually check that the changelog corresponds to our Plexamp version CHANGELOG_URL=$(rg --only-matching 'changelog = "(.+)";' --replace '$1' $WORKING_NIX) CHANGELOG_NUMBER=$(rg --only-matching '.*/([0-9]+)' --replace '$1' <<< $CHANGELOG_URL) NEXT_CHANGELOG=$(($CHANGELOG_NUMBER + 1)) diff --git a/pkgs/applications/audio/pwvucontrol/Cargo.lock b/pkgs/applications/audio/pwvucontrol/Cargo.lock index 2740dac51e135..c07b91890643e 100644 --- a/pkgs/applications/audio/pwvucontrol/Cargo.lock +++ b/pkgs/applications/audio/pwvucontrol/Cargo.lock @@ -1229,7 +1229,7 @@ dependencies = [ [[package]] name = "wireplumber" version = "0.1.0" -source = "git+https://github.com/arcnmx/wireplumber.rs.git?rev=341b0c4e8d177f5f21c109cf88cca4f2dc1f853a#341b0c4e8d177f5f21c109cf88cca4f2dc1f853a" +source = "git+https://github.com/arcnmx/wireplumber.rs.git?rev=2c0ee463d029d3562ee66db90554c5af573565c1#2c0ee463d029d3562ee66db90554c5af573565c1" dependencies = [ "bitflags 2.4.1", "gio", @@ -1245,7 +1245,7 @@ dependencies = [ [[package]] name = "wireplumber-sys" version = "0.1.0" -source = "git+https://github.com/arcnmx/wireplumber.rs.git?rev=341b0c4e8d177f5f21c109cf88cca4f2dc1f853a#341b0c4e8d177f5f21c109cf88cca4f2dc1f853a" +source = "git+https://github.com/arcnmx/wireplumber.rs.git?rev=2c0ee463d029d3562ee66db90554c5af573565c1#2c0ee463d029d3562ee66db90554c5af573565c1" dependencies = [ "gio-sys", "glib-sys", diff --git a/pkgs/applications/audio/pwvucontrol/default.nix b/pkgs/applications/audio/pwvucontrol/default.nix index 98601453bbf2a..f6733b1e4fdfd 100644 --- a/pkgs/applications/audio/pwvucontrol/default.nix +++ b/pkgs/applications/audio/pwvucontrol/default.nix @@ -34,19 +34,19 @@ let in stdenv.mkDerivation rec { pname = "pwvucontrol"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "saivert"; repo = "pwvucontrol"; rev = version; - hash = "sha256-soxB8pbbyYe1EXtopq1OjoklEDJrwK6od4nFLDwb8LY="; + hash = "sha256-cWNWdCMk9hF8Nzq2UFBEKSx1zS8JlplMG7B5gv7BaZA="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "wireplumber-0.1.0" = "sha256-+LZ8xKok2AOegW8WvfrfZGXuQB4xHrLNshcTOHab+xQ="; + "wireplumber-0.1.0" = "sha256-r3p4OpmMgiFgjn1Fj4LeMOhx6R2UWollIdJRy/0kiNM="; }; }; @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { description = "Pipewire Volume Control"; homepage = "https://github.com/saivert/pwvucontrol"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ figsoda ]; + maintainers = with maintainers; [ figsoda Guanran928 ]; mainProgram = "pwvucontrol"; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix index c8a38cdbe960e..c0a30fb900162 100644 --- a/pkgs/applications/audio/sidplayfp/default.nix +++ b/pkgs/applications/audio/sidplayfp/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sidplayfp"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "sidplayfp"; rev = "v${finalAttrs.version}"; - hash = "sha256-bIX9BByUdScbS0NCrUjF5PTHG9T6hrPGjD5XM0eQgfA="; + hash = "sha256-2OgU2J/tot5HK4FV1pvZzI9u/e8p65Ymnqj7IdCcfIs="; }; strictDeps = true; diff --git a/pkgs/applications/audio/x42-avldrums/default.nix b/pkgs/applications/audio/x42-avldrums/default.nix index 16e1a24343c53..3234a719e3c00 100644 --- a/pkgs/applications/audio/x42-avldrums/default.nix +++ b/pkgs/applications/audio/x42-avldrums/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "x42-avldrums"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "x42"; repo = "avldrums.lv2"; rev = "v${version}"; - hash = "sha256-NNqBZTWjIM97qsXTW/+6T7eOAELi/OwXh4mCYPD/C6I="; + hash = "sha256-AZKHjzgw0TtLHh4TF+yOUSa+GlNVwyHCpJWAZikXTy4="; fetchSubmodules = true; }; diff --git a/pkgs/applications/backup/ludusavi/default.nix b/pkgs/applications/backup/ludusavi/default.nix index 29e0950775cba..17b006f38566f 100644 --- a/pkgs/applications/backup/ludusavi/default.nix +++ b/pkgs/applications/backup/ludusavi/default.nix @@ -1,6 +1,8 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub +, installShellFiles , cmake , pkg-config , makeWrapper @@ -34,6 +36,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake + installShellFiles pkg-config makeWrapper ]; @@ -57,6 +60,11 @@ rustPlatform.buildRustPackage rec { install -Dm644 "assets/ludusavi.desktop" -t "$out/share/applications/" install -Dm644 assets/MaterialIcons-Regular.ttf -t "$out/share/fonts/TTF/" install -Dm644 LICENSE -t "$out/share/licenses/ludusavi/" + '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd ludusavi \ + --bash <($out/bin/ludusavi complete bash) \ + --fish <($out/bin/ludusavi complete fish) \ + --zsh <($out/bin/ludusavi complete zsh) ''; postFixup = diff --git a/pkgs/applications/backup/restic-integrity/default.nix b/pkgs/applications/backup/restic-integrity/default.nix index b4900eb31b7d7..d0311e5d40d0a 100644 --- a/pkgs/applications/backup/restic-integrity/default.nix +++ b/pkgs/applications/backup/restic-integrity/default.nix @@ -1,24 +1,25 @@ { lib , rustPlatform -, fetchFromGitLab +, fetchFromGitea }: rustPlatform.buildRustPackage rec { pname = "restic-integrity"; - version = "1.2.1"; - src = fetchFromGitLab { - domain = "gitlab.upi.li"; + version = "1.2.2"; + + src = fetchFromGitea { + domain = "git.nwex.de"; owner = "networkException"; repo = "restic-integrity"; rev = version; - hash = "sha256-/n8muqW9ol0AY9RM3N4nqLDw0U1h0308M1uRCMS2kOM="; + hash = "sha256-QiISJCxxJH8wQeH/klB48POn6W9juQmIMCLGzGSyl6w="; }; - cargoHash = "sha256-TYDPzjWxTK9hQhzSknkCao9lq9UjZN3yQX3wtkMmP6E="; + cargoHash = "sha256-GxehJjDd0AHbEc8kPWyLXAOPbrPCT59LddAL1ydnT5g="; meta = with lib; { description = "CLI tool to check the integrity of a restic repository without unlocking it"; - homepage = "https://gitlab.upi.li/networkException/restic-integrity"; + homepage = "https://git.nwex.de/networkException/restic-integrity"; license = with licenses; [ bsd2 ]; maintainers = with maintainers; [ janik ]; mainProgram = "restic-integrity"; diff --git a/pkgs/applications/backup/urbackup-client/default.nix b/pkgs/applications/backup/urbackup-client/default.nix index e78b02491f071..1b714bdccb2af 100644 --- a/pkgs/applications/backup/urbackup-client/default.nix +++ b/pkgs/applications/backup/urbackup-client/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "urbackup-client"; - version = "2.5.24"; + version = "2.5.25"; src = fetchzip { url = "https://hndl.urbackup.org/Client/${version}/urbackup-client-${version}.tar.gz"; - sha256 = "sha256-n0/NVClZz6ANgEdPCtdZxsEvllIl32vwDjC2nq5R8Z4="; + sha256 = "sha256-+xm2mBcTLMvrstCq2sLgJiU3zbFCassKvln3SMmRH9s="; }; postPatch = '' diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index 7385d4bd9c455..7e995ad60a8c6 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -33,14 +33,14 @@ let in stdenv.mkDerivation rec { pname = if withGui then "bitcoin" else "bitcoind"; - version = "27.0"; + version = "27.1"; src = fetchurl { urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; # hash retrieved from signed SHA256SUMS - sha256 = "9c1ee651d3b157baccc3388be28b8cf3bfcefcd2493b943725ad6040ca6b146b"; + sha256 = "0c1051fd921b8fae912f5c2dfd86b085ab45baa05cd7be4585b10b4d1818f3da"; }; nativeBuildInputs = diff --git a/pkgs/applications/blockchains/lndhub-go/default.nix b/pkgs/applications/blockchains/lndhub-go/default.nix index b236ed5da4424..cb6774fdc3fc1 100644 --- a/pkgs/applications/blockchains/lndhub-go/default.nix +++ b/pkgs/applications/blockchains/lndhub-go/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "lndhub-go"; - version = "0.14.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "getAlby"; repo = "lndhub.go"; rev = version; - sha256 = "sha256-m+Sc/rsYIbvd1oOqG4OT+wPtSxlgFq8m03n28eZIWJU="; + sha256 = "sha256-PHBzM/lYYu6hXa5jiFQR/K5j+vmxaYH7xuoxOhFbhMk="; }; - vendorHash = "sha256-a4yVuEfhLNM8IEYnafWf///SNLqQL5XZfGgJ5AZLx3c="; + vendorHash = "sha256-Vo29w04cRW0syD2tjieKVeZ3srFNuEC3T17birVWn6k="; doCheck = false; # tests require networking diff --git a/pkgs/applications/blockchains/optimism/default.nix b/pkgs/applications/blockchains/optimism/default.nix index 624f08b9a9349..5411d5a06a22d 100644 --- a/pkgs/applications/blockchains/optimism/default.nix +++ b/pkgs/applications/blockchains/optimism/default.nix @@ -6,19 +6,19 @@ buildGoModule rec { pname = "optimism"; - version = "1.7.6"; + version = "1.7.7"; src = fetchFromGitHub { owner = "ethereum-optimism"; repo = "optimism"; rev = "op-node/v${version}"; - hash = "sha256-LpkmNJqPe73qbTNvqxlDDTh9hD/H39ll3Rn2NEFEcg8="; + hash = "sha256-KN6Y8YhYGNGg/t4t599RAo6mF7Wn7GaSnrLEk3WLekc="; fetchSubmodules = true; }; subPackages = [ "op-node/cmd" "op-proposer/cmd" "op-batcher/cmd" ]; - vendorHash = "sha256-2eVwGWw/z6ct3PA8fC0rBwkNaICd20llVE/9essF95Q="; + vendorHash = "sha256-MWGjRj5SMFi3O86l3Gc/oavzWd1TtoKr53eEXbCOamQ="; buildInputs = [ libpcap diff --git a/pkgs/applications/blockchains/polkadot/Cargo.lock b/pkgs/applications/blockchains/polkadot/Cargo.lock index 626f85e8b0ce5..35ecdef1364c3 100644 --- a/pkgs/applications/blockchains/polkadot/Cargo.lock +++ b/pkgs/applications/blockchains/polkadot/Cargo.lock @@ -294,6 +294,9 @@ name = "arbitrary" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] [[package]] name = "ark-bls12-377" @@ -808,6 +811,7 @@ dependencies = [ "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", + "frame-metadata-hash-extension", "frame-support", "frame-system", "frame-system-benchmarking", @@ -894,6 +898,7 @@ dependencies = [ "cumulus-pallet-parachain-system", "cumulus-pallet-xcmp-queue", "emulated-integration-tests-common", + "frame-metadata-hash-extension", "frame-support", "frame-system", "pallet-asset-conversion", @@ -939,6 +944,7 @@ dependencies = [ "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", + "frame-metadata-hash-extension", "frame-support", "frame-system", "frame-system-benchmarking", @@ -1896,7 +1902,7 @@ dependencies = [ "bp-parachains", "bp-polkadot-core", "bp-runtime", - "ed25519-dalek 2.1.0", + "ed25519-dalek 2.1.1", "finality-grandpa", "parity-scale-codec", "sp-application-crypto", @@ -2096,6 +2102,7 @@ dependencies = [ "substrate-wasm-builder", "testnet-parachains-constants", "tuplex", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -2256,6 +2263,7 @@ dependencies = [ "testnet-parachains-constants", "tuplex", "westend-runtime-constants", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -2363,9 +2371,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.4.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "bzip2-sys" @@ -2507,6 +2515,32 @@ dependencies = [ ] [[package]] +name = "chain-spec-guide-runtime" +version = "0.0.0" +dependencies = [ + "docify", + "pallet-balances", + "pallet-sudo", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "parity-scale-codec", + "polkadot-sdk-frame", + "sc-chain-spec", + "scale-info", + "serde", + "serde_json", + "sp-application-crypto", + "sp-core", + "sp-genesis-builder", + "sp-keyring", + "sp-runtime", + "sp-std 14.0.0", + "staging-chain-spec-builder", + "substrate-wasm-builder", +] + +[[package]] name = "chrono" version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2603,15 +2637,6 @@ dependencies = [ ] [[package]] -name = "ckb-merkle-mountain-range" -version = "0.6.0" -source = "git+https://github.com/paritytech/merkle-mountain-range.git?branch=master#537f0e3f67c5adf7afff0800bbb81f02f17570a1" -dependencies = [ - "cfg-if", - "itertools 0.10.5", -] - -[[package]] name = "clang-sys" version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2874,6 +2899,7 @@ dependencies = [ "substrate-wasm-builder", "testnet-parachains-constants", "westend-runtime-constants", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -3129,6 +3155,7 @@ dependencies = [ "staging-xcm-executor", "substrate-wasm-builder", "testnet-parachains-constants", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -3225,6 +3252,7 @@ dependencies = [ "staging-xcm-executor", "substrate-wasm-builder", "testnet-parachains-constants", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -3289,6 +3317,7 @@ dependencies = [ "substrate-wasm-builder", "testnet-parachains-constants", "westend-runtime-constants", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -4363,6 +4392,7 @@ dependencies = [ "sp-std 14.0.0", "sp-transaction-pool", "sp-version", + "staging-parachain-info", "substrate-wasm-builder", ] @@ -4689,6 +4719,17 @@ dependencies = [ ] [[package]] +name = "derive_arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +dependencies = [ + "proc-macro2 1.0.82", + "quote 1.0.35", + "syn 2.0.61", +] + +[[package]] name = "derive_more" version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4961,9 +5002,9 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ "curve25519-dalek 4.1.2", "ed25519 2.2.2", @@ -5345,9 +5386,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fastrlp" @@ -5783,6 +5824,27 @@ dependencies = [ ] [[package]] +name = "frame-metadata-hash-extension" +version = "0.1.0" +dependencies = [ + "array-bytes", + "docify", + "frame-metadata", + "frame-support", + "frame-system", + "log", + "merkleized-metadata", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-runtime", + "sp-tracing 16.0.0", + "sp-transaction-pool", + "substrate-test-runtime-client", + "substrate-wasm-builder", +] + +[[package]] name = "frame-omni-bencher" version = "0.1.0" dependencies = [ @@ -6160,9 +6222,9 @@ checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-timer" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" [[package]] name = "futures-util" @@ -7234,123 +7296,15 @@ checksum = "c33070833c9ee02266356de0c43f723152bd38bd96ddf52c82b3af10c9138b28" name = "kitchensink-runtime" version = "3.0.0-dev" dependencies = [ - "frame-benchmarking", - "frame-benchmarking-pallet-pov", - "frame-election-provider-support", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-benchmarking", - "frame-system-rpc-runtime-api", - "frame-try-runtime", "log", "node-primitives", - "pallet-alliance", - "pallet-asset-conversion", - "pallet-asset-conversion-ops", - "pallet-asset-conversion-tx-payment", - "pallet-asset-rate", - "pallet-asset-tx-payment", - "pallet-assets", - "pallet-authority-discovery", - "pallet-authorship", - "pallet-babe", - "pallet-bags-list", - "pallet-balances", - "pallet-beefy", - "pallet-beefy-mmr", - "pallet-bounties", - "pallet-broker", - "pallet-child-bounties", - "pallet-collective", - "pallet-contracts", - "pallet-conviction-voting", - "pallet-core-fellowship", - "pallet-democracy", - "pallet-election-provider-multi-phase", - "pallet-election-provider-support-benchmarking", - "pallet-elections-phragmen", "pallet-example-mbm", "pallet-example-tasks", - "pallet-fast-unstake", - "pallet-glutton", - "pallet-grandpa", - "pallet-identity", - "pallet-im-online", - "pallet-indices", - "pallet-insecure-randomness-collective-flip", - "pallet-lottery", - "pallet-membership", - "pallet-message-queue", - "pallet-migrations", - "pallet-mixnet", - "pallet-mmr", - "pallet-multisig", - "pallet-nft-fractionalization", - "pallet-nfts", - "pallet-nfts-runtime-api", - "pallet-nis", - "pallet-nomination-pools", - "pallet-nomination-pools-benchmarking", - "pallet-nomination-pools-runtime-api", - "pallet-offences", - "pallet-offences-benchmarking", - "pallet-parameters", - "pallet-preimage", - "pallet-proxy", - "pallet-ranked-collective", - "pallet-recovery", - "pallet-referenda", - "pallet-remark", - "pallet-root-testing", - "pallet-safe-mode", - "pallet-salary", - "pallet-scheduler", - "pallet-session", - "pallet-session-benchmarking", - "pallet-skip-feeless-payment", - "pallet-society", - "pallet-staking", - "pallet-staking-reward-curve", - "pallet-staking-runtime-api", - "pallet-state-trie-migration", - "pallet-statement", - "pallet-sudo", - "pallet-timestamp", - "pallet-tips", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "pallet-transaction-storage", - "pallet-treasury", - "pallet-tx-pause", - "pallet-uniques", - "pallet-utility", - "pallet-vesting", - "pallet-whitelist", "parity-scale-codec", + "polkadot-sdk", "primitive-types", "scale-info", "serde_json", - "sp-api", - "sp-authority-discovery", - "sp-block-builder", - "sp-consensus-babe", - "sp-consensus-beefy", - "sp-consensus-grandpa", - "sp-core", - "sp-genesis-builder", - "sp-inherents", - "sp-io", - "sp-mixnet", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-statement-store", - "sp-std 14.0.0", - "sp-storage 19.0.0", - "sp-transaction-pool", - "sp-version", "static_assertions", "substrate-wasm-builder", ] @@ -7626,7 +7580,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "276bb57e7af15d8f100d3c11cbdd32c6752b7eef4ba7a18ecf464972c07abcce" dependencies = [ "bs58 0.4.0", - "ed25519-dalek 2.1.0", + "ed25519-dalek 2.1.1", "log", "multiaddr", "multihash 0.17.0", @@ -8049,8 +8003,9 @@ dependencies = [ [[package]] name = "litep2p" -version = "0.3.0" -source = "git+https://github.com/paritytech/litep2p?rev=e03a6023882db111beeb24d8c0ceaac0721d3f0f#e03a6023882db111beeb24d8c0ceaac0721d3f0f" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f02542ae3a94b4c4ffa37dc56388c923e286afa3bf65452e3984b50b2a2f316" dependencies = [ "async-trait", "bs58 0.4.0", @@ -8062,7 +8017,7 @@ dependencies = [ "hex-literal", "indexmap 2.2.3", "libc", - "mockall", + "mockall 0.12.1", "multiaddr", "multihash 0.17.0", "network-interface", @@ -8347,6 +8302,20 @@ dependencies = [ ] [[package]] +name = "merkleized-metadata" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f313fcff1d2a4bcaa2deeaa00bf7530d77d5f7bd0467a117dde2e29a75a7a17a" +dependencies = [ + "array-bytes", + "blake3", + "frame-metadata", + "parity-scale-codec", + "scale-decode", + "scale-info", +] + +[[package]] name = "merlin" version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8409,7 +8378,7 @@ dependencies = [ "pallet-minimal-template", "polkadot-sdk-docs", "polkadot-sdk-frame", - "simple-mermaid", + "simple-mermaid 0.1.1", ] [[package]] @@ -8558,12 +8527,27 @@ dependencies = [ "downcast", "fragile", "lazy_static", - "mockall_derive", + "mockall_derive 0.11.4", "predicates 2.1.5", "predicates-tree", ] [[package]] +name = "mockall" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48" +dependencies = [ + "cfg-if", + "downcast", + "fragile", + "lazy_static", + "mockall_derive 0.12.1", + "predicates 3.0.3", + "predicates-tree", +] + +[[package]] name = "mockall_derive" version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8576,6 +8560,18 @@ dependencies = [ ] [[package]] +name = "mockall_derive" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2" +dependencies = [ + "cfg-if", + "proc-macro2 1.0.82", + "quote 1.0.35", + "syn 2.0.61", +] + +[[package]] name = "multiaddr" version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8963,10 +8959,12 @@ dependencies = [ "sc-sync-state-rpc", "sc-transaction-pool-api", "sp-api", + "sp-application-crypto", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", + "sp-consensus-beefy", "sp-keystore", "sp-runtime", "sp-statement-store", @@ -9001,6 +8999,7 @@ dependencies = [ name = "node-testing" version = "3.0.0-dev" dependencies = [ + "frame-metadata-hash-extension", "frame-system", "fs_extra", "futures", @@ -9756,7 +9755,7 @@ dependencies = [ "bp-beefy", "bp-runtime", "bp-test-utils", - "ckb-merkle-mountain-range 0.5.2", + "ckb-merkle-mountain-range", "frame-support", "frame-system", "log", @@ -9877,6 +9876,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std 14.0.0", + "sp-tracing 16.0.0", ] [[package]] @@ -10131,6 +10131,7 @@ dependencies = [ "frame-support", "frame-system", "pallet-balances", + "pallet-nomination-pools", "pallet-staking", "pallet-staking-reward-curve", "pallet-timestamp", @@ -10482,7 +10483,7 @@ dependencies = [ [[package]] name = "pallet-identity" -version = "28.0.0" +version = "29.0.0" dependencies = [ "enumflags2", "frame-benchmarking", @@ -10804,6 +10805,7 @@ dependencies = [ "frame-system", "pallet-bags-list", "pallet-balances", + "pallet-delegated-staking", "pallet-nomination-pools", "pallet-staking", "pallet-staking-reward-curve", @@ -10844,7 +10846,32 @@ dependencies = [ ] [[package]] -name = "pallet-nomination-pools-test-staking" +name = "pallet-nomination-pools-test-delegate-stake" +version = "1.0.0" +dependencies = [ + "frame-election-provider-support", + "frame-support", + "frame-system", + "log", + "pallet-bags-list", + "pallet-balances", + "pallet-delegated-staking", + "pallet-nomination-pools", + "pallet-staking", + "pallet-staking-reward-curve", + "pallet-timestamp", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-staking", + "sp-std 14.0.0", + "sp-tracing 16.0.0", +] + +[[package]] +name = "pallet-nomination-pools-test-transfer-stake" version = "1.0.0" dependencies = [ "frame-election-provider-support", @@ -11798,6 +11825,7 @@ dependencies = [ "docify", "frame-benchmarking", "frame-executive", + "frame-metadata-hash-extension", "frame-support", "frame-system", "frame-system-benchmarking", @@ -11959,9 +11987,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.6.11" +version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1b5927e4a9ae8d6cdb6a69e4e04a0ec73381a358e21b8a576f44769f34e7c24" +checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" dependencies = [ "arrayvec 0.7.4", "bitvec", @@ -11974,11 +12002,11 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.9" +version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b" +checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" dependencies = [ - "proc-macro-crate 2.0.0", + "proc-macro-crate 3.1.0", "proc-macro2 1.0.82", "quote 1.0.35", "syn 1.0.109", @@ -12300,6 +12328,7 @@ dependencies = [ "staging-xcm-executor", "substrate-wasm-builder", "testnet-parachains-constants", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -12400,6 +12429,7 @@ dependencies = [ "substrate-wasm-builder", "testnet-parachains-constants", "westend-runtime-constants", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -12647,6 +12677,7 @@ dependencies = [ "polkadot-primitives-test-helpers", "polkadot-subsystem-bench", "rand 0.8.5", + "rstest", "sc-network", "schnellru", "sp-core", @@ -12663,7 +12694,6 @@ version = "7.0.0" dependencies = [ "assert_matches", "async-trait", - "env_logger 0.11.3", "fatality", "futures", "futures-timer", @@ -12679,17 +12709,29 @@ dependencies = [ "polkadot-primitives-test-helpers", "polkadot-subsystem-bench", "rand 0.8.5", + "rstest", "sc-network", "schnellru", "sp-application-crypto", "sp-core", "sp-keyring", + "sp-tracing 16.0.0", "thiserror", "tokio", "tracing-gum", ] [[package]] +name = "polkadot-ckb-merkle-mountain-range" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4b44320e5f7ce2c18227537a3032ae5b2c476a7e8eddba45333e1011fc31b92" +dependencies = [ + "cfg-if", + "itertools 0.10.5", +] + +[[package]] name = "polkadot-cli" version = "7.0.0" dependencies = [ @@ -12801,6 +12843,7 @@ dependencies = [ "parity-scale-codec", "polkadot-node-primitives", "polkadot-primitives", + "quickcheck", "reed-solomon-novelpoly", "sp-core", "sp-trie", @@ -13447,6 +13490,7 @@ dependencies = [ "async-trait", "bitvec", "derive_more", + "fatality", "futures", "orchestra", "polkadot-node-jaeger", @@ -13489,6 +13533,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "pin-project", + "polkadot-erasure-coding", "polkadot-node-jaeger", "polkadot-node-metrics", "polkadot-node-network-protocol", @@ -13539,7 +13584,7 @@ dependencies = [ [[package]] name = "polkadot-parachain-bin" -version = "1.12.0" +version = "1.13.0" dependencies = [ "assert_cmd", "asset-hub-rococo-runtime", @@ -13710,10 +13755,12 @@ dependencies = [ "sc-sync-state-rpc", "sc-transaction-pool-api", "sp-api", + "sp-application-crypto", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", + "sp-consensus-beefy", "sp-keystore", "sp-runtime", "substrate-frame-rpc-system", @@ -13849,9 +13896,396 @@ dependencies = [ ] [[package]] +name = "polkadot-sdk" +version = "0.1.0" +dependencies = [ + "asset-test-utils", + "assets-common", + "binary-merkle-tree", + "bp-asset-hub-rococo", + "bp-asset-hub-westend", + "bp-bridge-hub-cumulus", + "bp-bridge-hub-kusama", + "bp-bridge-hub-polkadot", + "bp-bridge-hub-rococo", + "bp-bridge-hub-westend", + "bp-header-chain", + "bp-kusama", + "bp-messages", + "bp-parachains", + "bp-polkadot", + "bp-polkadot-bulletin", + "bp-polkadot-core", + "bp-relayers", + "bp-rococo", + "bp-runtime", + "bp-test-utils", + "bp-westend", + "bp-xcm-bridge-hub", + "bp-xcm-bridge-hub-router", + "bridge-hub-common", + "bridge-hub-test-utils", + "bridge-runtime-common", + "cumulus-client-cli", + "cumulus-client-collator", + "cumulus-client-consensus-aura", + "cumulus-client-consensus-common", + "cumulus-client-consensus-proposer", + "cumulus-client-consensus-relay-chain", + "cumulus-client-network", + "cumulus-client-parachain-inherent", + "cumulus-client-pov-recovery", + "cumulus-client-service", + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-parachain-system-proc-macro", + "cumulus-pallet-session-benchmarking", + "cumulus-pallet-solo-to-para", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-ping", + "cumulus-primitives-aura", + "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", + "cumulus-primitives-proof-size-hostfunction", + "cumulus-primitives-storage-weight-reclaim", + "cumulus-primitives-timestamp", + "cumulus-primitives-utility", + "cumulus-relay-chain-inprocess-interface", + "cumulus-relay-chain-interface", + "cumulus-relay-chain-minimal-node", + "cumulus-relay-chain-rpc-interface", + "cumulus-test-relay-sproof-builder", + "emulated-integration-tests-common", + "fork-tree", + "frame-benchmarking", + "frame-benchmarking-cli", + "frame-benchmarking-pallet-pov", + "frame-election-provider-solution-type", + "frame-election-provider-support", + "frame-executive", + "frame-metadata-hash-extension", + "frame-remote-externalities", + "frame-support", + "frame-support-procedural", + "frame-support-procedural-tools", + "frame-support-procedural-tools-derive", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "generate-bags", + "mmr-gadget", + "mmr-rpc", + "pallet-alliance", + "pallet-asset-conversion", + "pallet-asset-conversion-ops", + "pallet-asset-conversion-tx-payment", + "pallet-asset-rate", + "pallet-asset-tx-payment", + "pallet-assets", + "pallet-atomic-swap", + "pallet-aura", + "pallet-authority-discovery", + "pallet-authorship", + "pallet-babe", + "pallet-bags-list", + "pallet-balances", + "pallet-beefy", + "pallet-beefy-mmr", + "pallet-bounties", + "pallet-bridge-grandpa", + "pallet-bridge-messages", + "pallet-bridge-parachains", + "pallet-bridge-relayers", + "pallet-broker", + "pallet-child-bounties", + "pallet-collator-selection", + "pallet-collective", + "pallet-collective-content", + "pallet-contracts", + "pallet-contracts-mock-network", + "pallet-contracts-proc-macro", + "pallet-contracts-uapi", + "pallet-conviction-voting", + "pallet-core-fellowship", + "pallet-delegated-staking", + "pallet-democracy", + "pallet-dev-mode", + "pallet-election-provider-multi-phase", + "pallet-election-provider-support-benchmarking", + "pallet-elections-phragmen", + "pallet-fast-unstake", + "pallet-glutton", + "pallet-grandpa", + "pallet-identity", + "pallet-im-online", + "pallet-indices", + "pallet-insecure-randomness-collective-flip", + "pallet-lottery", + "pallet-membership", + "pallet-message-queue", + "pallet-migrations", + "pallet-mixnet", + "pallet-mmr", + "pallet-multisig", + "pallet-nft-fractionalization", + "pallet-nfts", + "pallet-nfts-runtime-api", + "pallet-nis", + "pallet-node-authorization", + "pallet-nomination-pools", + "pallet-nomination-pools-benchmarking", + "pallet-nomination-pools-runtime-api", + "pallet-offences", + "pallet-offences-benchmarking", + "pallet-paged-list", + "pallet-parameters", + "pallet-preimage", + "pallet-proxy", + "pallet-ranked-collective", + "pallet-recovery", + "pallet-referenda", + "pallet-remark", + "pallet-root-offences", + "pallet-root-testing", + "pallet-safe-mode", + "pallet-salary", + "pallet-scheduler", + "pallet-scored-pool", + "pallet-session", + "pallet-session-benchmarking", + "pallet-skip-feeless-payment", + "pallet-society", + "pallet-staking", + "pallet-staking-reward-curve", + "pallet-staking-reward-fn", + "pallet-staking-runtime-api", + "pallet-state-trie-migration", + "pallet-statement", + "pallet-sudo", + "pallet-timestamp", + "pallet-tips", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-transaction-storage", + "pallet-treasury", + "pallet-tx-pause", + "pallet-uniques", + "pallet-utility", + "pallet-vesting", + "pallet-whitelist", + "pallet-xcm", + "pallet-xcm-benchmarks", + "pallet-xcm-bridge-hub", + "pallet-xcm-bridge-hub-router", + "parachains-common", + "parachains-runtimes-test-utils", + "polkadot-approval-distribution", + "polkadot-availability-bitfield-distribution", + "polkadot-availability-distribution", + "polkadot-availability-recovery", + "polkadot-cli", + "polkadot-collator-protocol", + "polkadot-core-primitives", + "polkadot-dispute-distribution", + "polkadot-erasure-coding", + "polkadot-gossip-support", + "polkadot-network-bridge", + "polkadot-node-collation-generation", + "polkadot-node-core-approval-voting", + "polkadot-node-core-av-store", + "polkadot-node-core-backing", + "polkadot-node-core-bitfield-signing", + "polkadot-node-core-candidate-validation", + "polkadot-node-core-chain-api", + "polkadot-node-core-chain-selection", + "polkadot-node-core-dispute-coordinator", + "polkadot-node-core-parachains-inherent", + "polkadot-node-core-prospective-parachains", + "polkadot-node-core-provisioner", + "polkadot-node-core-pvf", + "polkadot-node-core-pvf-checker", + "polkadot-node-core-pvf-common", + "polkadot-node-core-pvf-execute-worker", + "polkadot-node-core-pvf-prepare-worker", + "polkadot-node-core-runtime-api", + "polkadot-node-jaeger", + "polkadot-node-metrics", + "polkadot-node-network-protocol", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-types", + "polkadot-node-subsystem-util", + "polkadot-overseer", + "polkadot-parachain-primitives", + "polkadot-primitives", + "polkadot-rpc", + "polkadot-runtime-common", + "polkadot-runtime-metrics", + "polkadot-runtime-parachains", + "polkadot-sdk-frame", + "polkadot-service", + "polkadot-statement-distribution", + "polkadot-statement-table", + "rococo-runtime-constants", + "sc-allocator", + "sc-authority-discovery", + "sc-basic-authorship", + "sc-block-builder", + "sc-chain-spec", + "sc-chain-spec-derive", + "sc-cli", + "sc-client-api", + "sc-client-db", + "sc-consensus", + "sc-consensus-aura", + "sc-consensus-babe", + "sc-consensus-babe-rpc", + "sc-consensus-beefy", + "sc-consensus-beefy-rpc", + "sc-consensus-epochs", + "sc-consensus-grandpa", + "sc-consensus-grandpa-rpc", + "sc-consensus-manual-seal", + "sc-consensus-pow", + "sc-consensus-slots", + "sc-executor", + "sc-executor-common", + "sc-executor-polkavm", + "sc-executor-wasmtime", + "sc-informant", + "sc-keystore", + "sc-mixnet", + "sc-network", + "sc-network-common", + "sc-network-gossip", + "sc-network-light", + "sc-network-statement", + "sc-network-sync", + "sc-network-transactions", + "sc-network-types", + "sc-offchain", + "sc-proposer-metrics", + "sc-rpc", + "sc-rpc-api", + "sc-rpc-server", + "sc-rpc-spec-v2", + "sc-service", + "sc-state-db", + "sc-statement-store", + "sc-storage-monitor", + "sc-sync-state-rpc", + "sc-sysinfo", + "sc-telemetry", + "sc-tracing", + "sc-tracing-proc-macro", + "sc-transaction-pool", + "sc-transaction-pool-api", + "sc-utils", + "slot-range-helper", + "snowbridge-beacon-primitives", + "snowbridge-core", + "snowbridge-ethereum", + "snowbridge-outbound-queue-merkle-tree", + "snowbridge-outbound-queue-runtime-api", + "snowbridge-pallet-ethereum-client", + "snowbridge-pallet-ethereum-client-fixtures", + "snowbridge-pallet-inbound-queue", + "snowbridge-pallet-inbound-queue-fixtures", + "snowbridge-pallet-outbound-queue", + "snowbridge-pallet-system", + "snowbridge-router-primitives", + "snowbridge-runtime-common", + "snowbridge-runtime-test-common", + "snowbridge-system-runtime-api", + "sp-api", + "sp-api-proc-macro", + "sp-application-crypto", + "sp-arithmetic", + "sp-authority-discovery", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-consensus-aura", + "sp-consensus-babe", + "sp-consensus-beefy", + "sp-consensus-grandpa", + "sp-consensus-pow", + "sp-consensus-slots", + "sp-core", + "sp-core-hashing", + "sp-core-hashing-proc-macro", + "sp-crypto-ec-utils 0.10.0", + "sp-crypto-hashing", + "sp-crypto-hashing-proc-macro", + "sp-database", + "sp-debug-derive 14.0.0", + "sp-externalities 0.25.0", + "sp-genesis-builder", + "sp-inherents", + "sp-io", + "sp-keyring", + "sp-keystore", + "sp-maybe-compressed-blob", + "sp-metadata-ir", + "sp-mixnet", + "sp-mmr-primitives", + "sp-npos-elections", + "sp-offchain", + "sp-panic-handler", + "sp-rpc", + "sp-runtime", + "sp-runtime-interface 24.0.0", + "sp-runtime-interface-proc-macro 17.0.0", + "sp-session", + "sp-staking", + "sp-state-machine", + "sp-statement-store", + "sp-std 14.0.0", + "sp-storage 19.0.0", + "sp-timestamp", + "sp-tracing 16.0.0", + "sp-transaction-pool", + "sp-transaction-storage-proof", + "sp-trie", + "sp-version", + "sp-version-proc-macro", + "sp-wasm-interface 20.0.0", + "sp-weights", + "staging-chain-spec-builder", + "staging-node-inspect", + "staging-parachain-info", + "staging-tracking-allocator", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "subkey", + "substrate-bip39", + "substrate-build-script-utils", + "substrate-frame-rpc-support", + "substrate-frame-rpc-system", + "substrate-prometheus-endpoint", + "substrate-rpc-client", + "substrate-state-trie-migration-rpc", + "substrate-wasm-builder", + "testnet-parachains-constants", + "tracing-gum", + "tracing-gum-proc-macro", + "westend-runtime-constants", + "xcm-emulator", + "xcm-fee-payment-runtime-api", + "xcm-procedural", + "xcm-simulator", +] + +[[package]] name = "polkadot-sdk-docs" version = "0.0.1" dependencies = [ + "chain-spec-guide-runtime", "cumulus-client-service", "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", @@ -13859,6 +14293,7 @@ dependencies = [ "cumulus-primitives-storage-weight-reclaim", "docify", "frame-executive", + "frame-metadata-hash-extension", "frame-support", "frame-system", "kitchensink-runtime", @@ -13885,7 +14320,9 @@ dependencies = [ "pallet-uniques", "pallet-utility", "parity-scale-codec", + "polkadot-sdk", "polkadot-sdk-frame", + "sc-chain-spec", "sc-cli", "sc-client-db", "sc-consensus-aura", @@ -13900,10 +14337,11 @@ dependencies = [ "sc-rpc-api", "sc-service", "scale-info", - "simple-mermaid", + "simple-mermaid 0.1.1", "sp-api", "sp-arithmetic", "sp-core", + "sp-genesis-builder", "sp-io", "sp-keyring", "sp-offchain", @@ -13915,6 +14353,7 @@ dependencies = [ "staging-xcm", "subkey", "substrate-wasm-builder", + "xcm-docs", ] [[package]] @@ -13960,6 +14399,7 @@ dependencies = [ "env_logger 0.11.3", "frame-benchmarking", "frame-benchmarking-cli", + "frame-metadata-hash-extension", "frame-support", "frame-system", "frame-system-rpc-runtime-api", @@ -14097,6 +14537,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "polkadot-primitives-test-helpers", + "polkadot-subsystem-bench", "rand_chacha 0.3.1", "sc-keystore", "sc-network", @@ -14161,6 +14602,7 @@ dependencies = [ "polkadot-overseer", "polkadot-primitives", "polkadot-primitives-test-helpers", + "polkadot-statement-distribution", "prometheus", "pyroscope", "pyroscope_pprofrs", @@ -14185,6 +14627,7 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-timestamp", + "strum 0.24.1", "substrate-prometheus-endpoint", "tokio", "tracing-gum", @@ -14652,15 +15095,6 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" -dependencies = [ - "toml_edit 0.20.7", -] - -[[package]] -name = "proc-macro-crate" version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" @@ -15481,6 +15915,7 @@ dependencies = [ "jsonpath_lib", "log", "num-traits", + "parking_lot 0.12.1", "serde_json", "sp-runtime", "substrate-prometheus-endpoint", @@ -15720,6 +16155,7 @@ dependencies = [ "bitvec", "frame-benchmarking", "frame-executive", + "frame-metadata-hash-extension", "frame-remote-externalities", "frame-support", "frame-system", @@ -16326,10 +16762,12 @@ name = "sc-chain-spec" version = "28.0.0" dependencies = [ "array-bytes", + "clap 4.5.3", "docify", "log", "memmap2 0.9.3", "parity-scale-codec", + "regex", "sc-chain-spec-derive", "sc-client-api", "sc-executor", @@ -16474,7 +16912,7 @@ dependencies = [ "futures", "futures-timer", "log", - "mockall", + "mockall 0.11.4", "parking_lot 0.12.1", "sc-client-api", "sc-network-types", @@ -16656,6 +17094,7 @@ dependencies = [ "sc-rpc", "serde", "serde_json", + "sp-application-crypto", "sp-consensus-beefy", "sp-core", "sp-runtime", @@ -16999,7 +17438,7 @@ dependencies = [ "linked_hash_set", "litep2p", "log", - "mockall", + "mockall 0.11.4", "multistream-select", "once_cell", "parity-scale-codec", @@ -17137,7 +17576,7 @@ dependencies = [ "futures-timer", "libp2p", "log", - "mockall", + "mockall 0.11.4", "parity-scale-codec", "prost 0.12.4", "prost-build 0.12.4", @@ -17221,12 +17660,15 @@ name = "sc-network-types" version = "0.10.0" dependencies = [ "bs58 0.5.0", + "ed25519-dalek 2.1.1", "libp2p-identity", "litep2p", "multiaddr", "multihash 0.17.0", + "quickcheck", "rand 0.8.5", "thiserror", + "zeroize", ] [[package]] @@ -17722,6 +18164,29 @@ dependencies = [ ] [[package]] +name = "scale-bits" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e57b1e7f6b65ed1f04e79a85a57d755ad56d76fdf1e9bddcc9ae14f71fcdcf54" +dependencies = [ + "parity-scale-codec", + "scale-type-resolver", +] + +[[package]] +name = "scale-decode" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b12ebca36cec2a3f983c46295b282b35e5f8496346fb859a8776dad5389e5389" +dependencies = [ + "derive_more", + "parity-scale-codec", + "scale-bits", + "scale-type-resolver", + "smallvec", +] + +[[package]] name = "scale-info" version = "2.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -17748,6 +18213,12 @@ dependencies = [ ] [[package]] +name = "scale-type-resolver" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0cded6518aa0bd6c1be2b88ac81bf7044992f0f154bfbabd5ad34f43512abcb" + +[[package]] name = "schannel" version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -17856,9 +18327,9 @@ dependencies = [ [[package]] name = "sctp-proto" -version = "0.1.7" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f64cef148d3295c730c3cb340b0b252a4d570b1c7d4bf0808f88540b0a888bc" +checksum = "b6220f78bb44c15f326b0596113305f6101097a18755d53727a575c97e09fb24" dependencies = [ "bytes", "crc", @@ -18364,6 +18835,11 @@ dependencies = [ [[package]] name = "simple-mermaid" +version = "0.1.0" +source = "git+https://github.com/kianenigma/simple-mermaid.git?branch=main#e48b187bcfd5cc75111acd9d241f1bd36604344b" + +[[package]] +name = "simple-mermaid" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "620a1d43d70e142b1d46a929af51d44f383db9c7a2ec122de2cd992ccfcf3c18" @@ -18422,9 +18898,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smol" @@ -19500,7 +19976,7 @@ name = "sp-io" version = "30.0.0" dependencies = [ "bytes", - "ed25519-dalek 2.1.0", + "ed25519-dalek 2.1.1", "libsecp256k1", "log", "parity-scale-codec", @@ -19573,9 +20049,9 @@ name = "sp-mmr-primitives" version = "26.0.0" dependencies = [ "array-bytes", - "ckb-merkle-mountain-range 0.6.0", "log", "parity-scale-codec", + "polkadot-ckb-merkle-mountain-range", "scale-info", "serde", "sp-api", @@ -19654,7 +20130,7 @@ dependencies = [ "scale-info", "serde", "serde_json", - "simple-mermaid", + "simple-mermaid 0.1.1", "sp-api", "sp-application-crypto", "sp-arithmetic", @@ -19801,6 +20277,7 @@ dependencies = [ name = "sp-state-machine" version = "0.35.0" dependencies = [ + "arbitrary", "array-bytes", "assert_matches", "hash-db", @@ -19826,7 +20303,7 @@ version = "10.0.0" dependencies = [ "aes-gcm", "curve25519-dalek 4.1.2", - "ed25519-dalek 2.1.0", + "ed25519-dalek 2.1.1", "hkdf", "parity-scale-codec", "rand 0.8.5", @@ -20113,7 +20590,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "staging-chain-spec-builder" -version = "3.0.0" +version = "1.6.1" dependencies = [ "clap 4.5.3", "log", @@ -20131,101 +20608,26 @@ dependencies = [ "clap 4.5.3", "clap_complete", "criterion", - "frame-benchmarking", - "frame-benchmarking-cli", - "frame-support", - "frame-system", - "frame-system-rpc-runtime-api", "futures", "jsonrpsee", "kitchensink-runtime", "log", - "mmr-gadget", "nix 0.28.0", "node-primitives", "node-rpc", "node-testing", - "pallet-asset-conversion-tx-payment", - "pallet-asset-tx-payment", - "pallet-assets", - "pallet-balances", - "pallet-contracts", - "pallet-glutton", - "pallet-im-online", - "pallet-root-testing", - "pallet-skip-feeless-payment", - "pallet-sudo", - "pallet-timestamp", - "pallet-transaction-payment", - "pallet-treasury", "parity-scale-codec", "platforms", + "polkadot-sdk", "rand 0.8.5", "regex", - "sc-authority-discovery", - "sc-basic-authorship", - "sc-block-builder", - "sc-chain-spec", - "sc-cli", - "sc-client-api", - "sc-client-db", - "sc-consensus", - "sc-consensus-babe", - "sc-consensus-beefy", - "sc-consensus-epochs", - "sc-consensus-grandpa", - "sc-consensus-slots", - "sc-executor", - "sc-keystore", - "sc-mixnet", - "sc-network", - "sc-network-common", - "sc-network-statement", - "sc-network-sync", - "sc-offchain", - "sc-rpc", - "sc-service", "sc-service-test", - "sc-statement-store", - "sc-storage-monitor", - "sc-sync-state-rpc", - "sc-sysinfo", - "sc-telemetry", - "sc-transaction-pool", - "sc-transaction-pool-api", "scale-info", "serde", "serde_json", "soketto", - "sp-api", - "sp-application-crypto", - "sp-authority-discovery", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", - "sp-consensus-beefy", - "sp-consensus-grandpa", - "sp-core", - "sp-crypto-hashing", - "sp-externalities 0.25.0", - "sp-genesis-builder", - "sp-inherents", - "sp-io", - "sp-keyring", - "sp-keystore", - "sp-mixnet", - "sp-mmr-primitives", - "sp-runtime", - "sp-state-machine", - "sp-statement-store", - "sp-timestamp", - "sp-tracing 16.0.0", - "sp-transaction-storage-proof", - "sp-trie", "staging-node-inspect", - "substrate-build-script-utils", "substrate-cli-test-utils", - "substrate-rpc-client", "tempfile", "tokio", "tokio-util", @@ -20374,17 +20776,17 @@ dependencies = [ [[package]] name = "str0m" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3f10d3f68e60168d81110410428a435dbde28cc5525f5f7c6fdec92dbdc2800" +checksum = "6706347e49b13373f7ddfafad47df7583ed52083d6fc8a594eb2c80497ef959d" dependencies = [ "combine", "crc", + "fastrand 2.1.0", "hmac 0.12.1", "once_cell", "openssl", "openssl-sys", - "rand 0.8.5", "sctp-proto", "serde", "sha-1 0.10.1", @@ -20709,6 +21111,7 @@ version = "2.0.0" dependencies = [ "array-bytes", "frame-executive", + "frame-metadata-hash-extension", "frame-support", "frame-system", "frame-system-rpc-runtime-api", @@ -20800,13 +21203,22 @@ dependencies = [ name = "substrate-wasm-builder" version = "17.0.0" dependencies = [ + "array-bytes", "build-helper", "cargo_metadata", "console", "filetime", + "frame-metadata", + "merkleized-metadata", + "parity-scale-codec", "parity-wasm", "polkavm-linker", + "sc-executor", + "sp-core", + "sp-io", "sp-maybe-compressed-blob", + "sp-tracing 16.0.0", + "sp-version", "strum 0.26.2", "tempfile", "toml 0.8.8", @@ -21046,7 +21458,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", - "fastrand 2.0.0", + "fastrand 2.1.0", "redox_syscall 0.4.1", "rustix 0.38.21", "windows-sys 0.48.0", @@ -21078,6 +21490,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] +name = "test-log" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dffced63c2b5c7be278154d76b479f9f9920ed34e7574201407f0b14e2bbb93" +dependencies = [ + "env_logger 0.11.3", + "test-log-macros", + "tracing-subscriber 0.3.18", +] + +[[package]] +name = "test-log-macros" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5" +dependencies = [ + "proc-macro2 1.0.82", + "quote 1.0.35", + "syn 2.0.61", +] + +[[package]] name = "test-parachain-adder" version = "1.0.0" dependencies = [ @@ -21216,9 +21650,9 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] @@ -21245,9 +21679,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2 1.0.82", "quote 1.0.35", @@ -21491,9 +21925,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", @@ -21501,7 +21935,6 @@ dependencies = [ "futures-sink", "pin-project-lite 0.2.12", "tokio", - "tracing", ] [[package]] @@ -21547,17 +21980,6 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.20.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" -dependencies = [ - "indexmap 2.2.3", - "toml_datetime", - "winnow", -] - -[[package]] -name = "toml_edit" version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" @@ -22734,6 +23156,7 @@ dependencies = [ "frame-benchmarking", "frame-election-provider-support", "frame-executive", + "frame-metadata-hash-extension", "frame-remote-externalities", "frame-support", "frame-system", @@ -22752,6 +23175,7 @@ dependencies = [ "pallet-beefy-mmr", "pallet-collective", "pallet-conviction-voting", + "pallet-delegated-staking", "pallet-democracy", "pallet-election-provider-multi-phase", "pallet-election-provider-support-benchmarking", @@ -23302,6 +23726,31 @@ dependencies = [ ] [[package]] +name = "xcm-docs" +version = "0.1.0" +dependencies = [ + "docify", + "pallet-balances", + "pallet-message-queue", + "pallet-xcm", + "parity-scale-codec", + "polkadot-parachain-primitives", + "polkadot-primitives", + "polkadot-runtime-parachains", + "polkadot-sdk-frame", + "scale-info", + "simple-mermaid 0.1.0", + "sp-io", + "sp-runtime", + "sp-std 14.0.0", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "test-log", + "xcm-simulator", +] + +[[package]] name = "xcm-emulator" version = "0.5.0" dependencies = [ @@ -23399,12 +23848,16 @@ name = "xcm-simulator" version = "7.0.0" dependencies = [ "frame-support", + "frame-system", "parity-scale-codec", "paste", "polkadot-core-primitives", "polkadot-parachain-primitives", + "polkadot-primitives", "polkadot-runtime-parachains", + "scale-info", "sp-io", + "sp-runtime", "sp-std 14.0.0", "staging-xcm", "staging-xcm-builder", diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index f247b05eb93ab..6af16ffac8a46 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -17,13 +17,13 @@ let in rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot-sdk"; rev = "polkadot-v${version}"; - hash = "sha256-/m7Tg+9JHbnwKwWPY8gWIJkIHktGFlqcrbLLgNWjfwU="; + hash = "sha256-9ZjiKv+05//Kf6q3mL1P5kOCOm1KCGmQIZkrD54pyeI="; # the build process of polkadot requires a .git folder in order to determine # the git commit hash that is being built and add it to the version string. @@ -48,10 +48,9 @@ rustPlatform.buildRustPackage rec { lockFile = ./Cargo.lock; outputHashes = { "ark-secret-scalar-0.0.2" = "sha256-91sODxaj0psMw0WqigMCGO5a7+NenAsRj5ZmW6C7lvc="; - "ckb-merkle-mountain-range-0.6.0" = "sha256-oTe1l406lTpgOefPai664JYwzezLjkIDXpiZTfjbd28="; "common-0.1.0" = "sha256-LHz2dK1p8GwyMimlR7AxHLz1tjTYolPwdjP7pxork1o="; "fflonk-0.1.0" = "sha256-+BvZ03AhYNP0D8Wq9EMsP+lSgPA6BBlnWkoxTffVLwo="; - "litep2p-0.3.0" = "sha256-y0my2vi0+2CWNOtCh/vtsUbIcU1iNSFAJbLiCktEcOc="; + "simple-mermaid-0.1.0" = "sha256-IekTldxYq+uoXwGvbpkVTXv2xrcZ0TQfyyE2i2zH+6w="; "sp-ark-bls12-381-0.4.2" = "sha256-nNr0amKhSvvI9BlsoP+8v6Xppx/s7zkf0l9Lm3DW8w8="; "sp-crypto-ec-utils-0.4.1" = "sha256-/Sw1ZM/JcJBokFE4y2mv/P43ciTL5DEm0PDG0jZvMkI="; }; diff --git a/pkgs/applications/blockchains/ton/default.nix b/pkgs/applications/blockchains/ton/default.nix index 5c16de8597d2f..07be7664acba2 100644 --- a/pkgs/applications/blockchains/ton/default.nix +++ b/pkgs/applications/blockchains/ton/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "ton"; - version = "2024.04"; + version = "2024.06"; src = fetchFromGitHub { owner = "ton-blockchain"; repo = "ton"; rev = "v${version}"; - hash = "sha256-hh8D4IZX6RS/RXdhVONhgetqp89kpTC2IwDQ2KHdKsE="; + hash = "sha256-5fuRdVayvmM+yK1WsdtWlCZpxz7KKBs+ZRfnueP0Ny0="; fetchSubmodules = true; }; diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix index 3e61e989f3c2f..5884fd2a275da 100644 --- a/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/pkgs/applications/blockchains/trezor-suite/default.nix @@ -8,7 +8,7 @@ let pname = "trezor-suite"; - version = "24.5.3"; + version = "24.5.4"; name = "${pname}-${version}"; suffix = { @@ -19,8 +19,8 @@ let src = fetchurl { url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' - aarch64-linux = "sha512-CFkL7vVYz6cS3iHyfG026+c4T3h9y3yDhNkwMKhbrt7hK33Yj1yLQUBw826DUmUNOgwomRwubz5jigCl2724bw=="; - x86_64-linux = "sha512-JgcnCiq/ozrYDMH7zIns5c6x7TwtpJ6VVg6PUkcoDDgmr9ngIJmAdb+/v9mJUv98WNAPKmhCt0/H9DY2qWJ2Bg=="; + aarch64-linux = "sha512-gkN6e4Ndc96FT6vaCmSxuViTKuOc5vnCqptPN8IRno9Nv8L0k6hB7O+0g5E+9hd+3o5WASXKefYIOZAnPI3RZA=="; + x86_64-linux = "sha512-uHMI0fm02XdOyt6mAXEZuTZkNlNykTQbJNeGATBrlLLR98cxrOj8DQ1S7gPd5dkQCJzdmR7ydylj/XPOHsV2Ug=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index c38a87d8777bc..b010eb1184e74 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "wasabiwallet"; - version = "2.0.8"; + version = "2.0.8.1"; src = fetchurl { url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz"; - sha256 = "sha256-9iNaEvTHvmE4DEh/5jHEOJuTnr2yAZSRR/L/v0ZUZDk="; + sha256 = "sha256-9q93C8Q4MKrpvAs6cb4sgo3PDVhk9ZExeHIZ9Qm8P2w="; }; dontBuild = true; diff --git a/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix b/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix index 655552df3249a..d7054e6f4080a 100644 --- a/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "lightdm-slick-greeter"; - version = "2.0.4"; + version = "2.0.5"; src = fetchFromGitHub { owner = "linuxmint"; repo = "slick-greeter"; rev = version; - sha256 = "sha256-1UOODak5YkoMLdIkN1rBIrlr3Zjj5SS2yx90vmF1prA="; + sha256 = "sha256-Q37CprukHvDRBcuPbfusKg2DY+JCwmjVX1+KnfSH2iw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index f0863b771eba7..87b7a99833dec 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -1,7 +1,7 @@ { channel, pname, version, sha256Hash }: { alsa-lib -, bash +, runtimeShell , buildFHSEnv , cacert , coreutils @@ -65,6 +65,7 @@ , zlib , makeDesktopItem , tiling_wm # if we are using a tiling wm, need to set _JAVA_AWT_WM_NONREPARENTING in wrapper +, androidenv }: let @@ -214,17 +215,52 @@ let '') ]; }; -in runCommand - drvName - { - startScript = '' - #!${bash}/bin/bash - ${fhsEnv}/bin/${drvName}-fhs-env ${androidStudio}/bin/studio.sh "$@" + mkAndroidStudioWrapper = {androidStudio, androidSdk ? null}: runCommand drvName { + startScript = let + hasAndroidSdk = androidSdk != null; + androidSdkRoot = lib.optionalString hasAndroidSdk "${androidSdk}/libexec/android-sdk"; + in '' + #!${runtimeShell} + ${lib.optionalString hasAndroidSdk '' + echo "=== nixpkgs Android Studio wrapper" >&2 + + # Default ANDROID_SDK_ROOT to the packaged one, if not provided. + ANDROID_SDK_ROOT="''${ANDROID_SDK_ROOT-${androidSdkRoot}}" + + if [ -d "$ANDROID_SDK_ROOT" ]; then + export ANDROID_SDK_ROOT + # Legacy compatibility. + export ANDROID_HOME="$ANDROID_SDK_ROOT" + echo " - ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT" >&2 + + # See if we can export ANDROID_NDK_ROOT too. + ANDROID_NDK_ROOT="$ANDROID_SDK_ROOT/ndk-bundle" + if [ ! -d "$ANDROID_NDK_ROOT" ]; then + ANDROID_NDK_ROOT="$(ls "$ANDROID_SDK_ROOT/ndk/"* 2>/dev/null | head -n1)" + fi + + if [ -d "$ANDROID_NDK_ROOT" ]; then + export ANDROID_NDK_ROOT + echo " - ANDROID_NDK_ROOT=$ANDROID_NDK_ROOT" >&2 + else + unset ANDROID_NDK_ROOT + fi + else + unset ANDROID_SDK_ROOT + unset ANDROID_HOME + fi + ''} + exec ${fhsEnv}/bin/${drvName}-fhs-env ${androidStudio}/bin/studio.sh "$@" ''; preferLocalBuild = true; allowSubstitutes = false; - passthru = { + passthru = let + withSdk = androidSdk: mkAndroidStudioWrapper { inherit androidStudio androidSdk; }; + in { unwrapped = androidStudio; + full = withSdk androidenv.androidPkgs.androidsdk; + inherit withSdk; + sdk = androidSdk; }; meta = with lib; { description = "Official IDE for Android (${channel} channel)"; @@ -245,9 +281,9 @@ in runCommand # source-code itself). platforms = [ "x86_64-linux" ]; maintainers = with maintainers; rec { - stable = [ alapshin ]; - beta = [ alapshin ]; - canary = [ alapshin ]; + stable = [ alapshin numinit ]; + beta = [ alapshin numinit ]; + canary = [ alapshin numinit ]; dev = canary; }."${channel}"; mainProgram = pname; @@ -261,4 +297,5 @@ in runCommand ln -s ${androidStudio}/bin/studio.png $out/share/pixmaps/${pname}.png ln -s ${desktopItem}/share/applications $out/share/applications - '' + ''; +in mkAndroidStudioWrapper { inherit androidStudio; } diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix deleted file mode 100644 index e41edcdd66b89..0000000000000 --- a/pkgs/applications/editors/aseprite/default.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ stdenv, lib, callPackage, fetchFromGitHub, cmake, ninja, pkg-config -, curl, freetype, giflib, libjpeg, libpng, libwebp, pixman, tinyxml, zlib -, harfbuzzFull, glib, fontconfig, pcre -, libX11, libXext, libXcursor, libXxf86vm, libGL, libXi -, cmark -}: - -# Unfree version is not redistributable: -# https://dev.aseprite.org/2016/09/01/new-source-code-license/ -# Consider supporting the developer: https://aseprite.org/#buy - -let - skia = callPackage ./skia.nix {}; -in -stdenv.mkDerivation rec { - pname = "aseprite"; - version = "1.3.6"; - - src = fetchFromGitHub { - owner = "aseprite"; - repo = "aseprite"; - rev = "v${version}"; - fetchSubmodules = true; - hash = "sha256-17f6pIGsOIswnyY63pjHKEEYuCo43kf25mPLBv4vQAs="; - }; - - nativeBuildInputs = [ - cmake pkg-config ninja - ]; - - buildInputs = [ - curl freetype giflib libjpeg libpng libwebp pixman tinyxml zlib - libX11 libXext libXcursor libXxf86vm - cmark - harfbuzzFull glib fontconfig pcre - skia libGL libXi - ]; - - patches = [ - ./shared-libwebp.patch - ./shared-skia-deps.patch - ]; - - postPatch = '' - sed -i src/ver/CMakeLists.txt -e "s-set(VERSION \".*\")-set(VERSION \"$version\")-" - ''; - - cmakeFlags = [ - "-DENABLE_UPDATER=OFF" - "-DUSE_SHARED_CURL=ON" - "-DUSE_SHARED_FREETYPE=ON" - "-DUSE_SHARED_GIFLIB=ON" - "-DUSE_SHARED_JPEGLIB=ON" - "-DUSE_SHARED_LIBPNG=ON" - "-DUSE_SHARED_LIBWEBP=ON" - "-DUSE_SHARED_PIXMAN=ON" - "-DUSE_SHARED_TINYXML=ON" - "-DUSE_SHARED_ZLIB=ON" - "-DUSE_SHARED_CMARK=ON" - "-DUSE_SHARED_HARFBUZZ=ON" - "-DUSE_SHARED_WEBP=ON" - # Disable libarchive programs. - "-DENABLE_CAT=OFF" - "-DENABLE_CPIO=OFF" - "-DENABLE_TAR=OFF" - # UI backend. - "-DLAF_WITH_EXAMPLES=OFF" - "-DLAF_OS_BACKEND=skia" - "-DENABLE_DESKTOP_INTEGRATION=ON" - "-DSKIA_DIR=${skia}" - "-DSKIA_LIBRARY_DIR=${skia}/out/Release" - ]; - - postInstall = '' - # Install desktop icons. - src="$out/share/aseprite/data/icons" - for size in 16 32 48 64; do - dst="$out"/share/icons/hicolor/"$size"x"$size" - install -Dm644 "$src"/ase"$size".png "$dst"/apps/aseprite.png - install -Dm644 "$src"/doc"$size".png "$dst"/mimetypes/aseprite.png - done - # Delete unneeded artifacts of bundled libraries. - rm -rf "$out"/include "$out"/lib - ''; - - passthru = { inherit skia; }; - - meta = with lib; { - homepage = "https://www.aseprite.org/"; - description = "Animated sprite editor & pixel art tool"; - license = licenses.unfree; - longDescription = - ''Aseprite is a program to create animated sprites. Its main features are: - - - Sprites are composed by layers & frames (as separated concepts). - - Supported color modes: RGBA, Indexed (palettes up to 256 colors), and Grayscale. - - Load/save sequence of PNG files and GIF animations (and FLC, FLI, JPG, BMP, PCX, TGA). - - Export/import animations to/from Sprite Sheets. - - Tiled drawing mode, useful to draw patterns and textures. - - Undo/Redo for every operation. - - Real-time animation preview. - - Multiple editors support. - - Pixel-art specific tools like filled Contour, Polygon, Shading mode, etc. - - Onion skinning. - - This version is not redistributable: https://dev.aseprite.org/2016/09/01/new-source-code-license/ - Consider supporting the developer: https://aseprite.org/#buy - ''; - maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/editors/aseprite/skia-make-deps.sh b/pkgs/applications/editors/aseprite/skia-make-deps.sh deleted file mode 100755 index bee69cc40d9d8..0000000000000 --- a/pkgs/applications/editors/aseprite/skia-make-deps.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env bash - -FILTER=$1 -OUT=skia-deps.nix -REVISION=861e4743af6d9bf6077ae6dda7274e5a136ee4e2 -DEPS=$(curl -s https://raw.githubusercontent.com/aseprite/skia/$REVISION/DEPS) -THIRD_PARTY_DEPS=$(echo "$DEPS" | grep third_party | grep "#" -v | sed 's/"//g') - -function write_fetch_defs () -{ - while read -r DEP; do - NAME=$(echo "$DEP" | cut -d: -f1 | cut -d/ -f3 | sed 's/ //g') - URL=$(echo "$DEP" | cut -d: -f2- | cut -d@ -f1 | sed 's/ //g') - REV=$(echo "$DEP" | cut -d: -f2- | cut -d@ -f2 | sed 's/[ ,]//g') - - echo "Fetching $NAME@$REV" - PREFETCH=$(nix-prefetch-git --rev "$REV" "$URL") - -( -cat <<EOF - $NAME = fetchgit { - url = "$URL"; - rev = "$REV"; - sha256 = $(echo $PREFETCH | jq '.sha256'); - }; -EOF -) >> "$OUT" - - echo "----------" - echo - done <<< "$1" -} - -echo "{ fetchgit }:" > "$OUT" -echo "{" >> "$OUT" -write_fetch_defs "$(echo "$THIRD_PARTY_DEPS" | grep -E "$FILTER")" -echo "}" >> "$OUT" diff --git a/pkgs/applications/editors/aseprite/skia.nix b/pkgs/applications/editors/aseprite/skia.nix deleted file mode 100644 index 03487aa8941ef..0000000000000 --- a/pkgs/applications/editors/aseprite/skia.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, fetchgit, python3, gn, ninja -, fontconfig, expat, icu, libglvnd, libjpeg, libpng, libwebp, zlib -, mesa, libX11, harfbuzzFull -}: - -let - # skia-deps.nix is generated by: ./skia-make-deps.sh 'angle2|dng_sdk|piex|sfntly' - depSrcs = import ./skia-deps.nix { inherit fetchgit; }; -in -stdenv.mkDerivation { - pname = "skia"; - version = "aseprite-m102"; - - src = fetchFromGitHub { - owner = "aseprite"; - repo = "skia"; - # latest commit from aseprite-m102 branch - rev = "861e4743af6d9bf6077ae6dda7274e5a136ee4e2"; - hash = "sha256-IlZbalmHl549uDUfPG8hlzub8TLWhG0EsV6HVAPdsl0="; - }; - - nativeBuildInputs = [ python3 gn ninja ]; - - buildInputs = [ - fontconfig expat icu libglvnd libjpeg libpng libwebp zlib - mesa libX11 harfbuzzFull - ]; - - preConfigure = with depSrcs; '' - mkdir -p third_party/externals - ln -s ${angle2} third_party/externals/angle2 - ln -s ${dng_sdk} third_party/externals/dng_sdk - ln -s ${piex} third_party/externals/piex - ln -s ${sfntly} third_party/externals/sfntly - ''; - - configurePhase = '' - runHook preConfigure - gn gen out/Release --args="is_debug=false is_official_build=true extra_cflags=[\"-I${harfbuzzFull.dev}/include/harfbuzz\"]" - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - ninja -C out/Release skia modules - runHook postBuild - ''; - - installPhase = '' - mkdir -p $out - - # Glob will match all subdirs. - shopt -s globstar - - # All these paths are used in some way when building aseprite. - cp -r --parents -t $out/ \ - include/codec \ - include/config \ - include/core \ - include/effects \ - include/gpu \ - include/private \ - include/utils \ - include/third_party/skcms/*.h \ - out/Release/*.a \ - src/gpu/**/*.h \ - src/core/*.h \ - modules/skshaper/include/*.h \ - third_party/externals/angle2/include \ - third_party/skcms/**/*.h - ''; - - meta = with lib; { - description = "Skia is a complete 2D graphic library for drawing Text, Geometries, and Images"; - homepage = "https://skia.org/"; - license = licenses.bsd3; - maintainers = with maintainers; [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix index 056f604d5f0d2..148bb9dbc7f98 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix @@ -7,17 +7,17 @@ }: let - rev = "53c40d2395e04761a510aa7007336939538678c0"; + rev = "99067dba625db3ac54ca4d3a3c811c41de207309"; in melpaBuild { pname = "edraw"; - version = "20240606.457"; + version = "20240612.1012"; src = fetchFromGitHub { owner = "misohena"; repo = "el-easydraw"; inherit rev; - hash = "sha256-gJboLPEMTFC3rP0PiJ679Nj8SmfI+qXYkX7kBLU6ywQ="; + hash = "sha256-32N8kXGFCvB6IHKwUsBGpdtAAf/p3nlq8mAdZrxLt0c="; }; commit = rev; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix index 386076cbd7d72..62048d867619c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix @@ -16,7 +16,7 @@ }: let - rev = "e5cf0b704274d3deae8f4a3b6a3d0664a176bc8b"; + rev = "152431c0b1d731d0302e1849690e2361f3caf7c1"; python = python3.withPackages (ps: with ps; [ epc orjson @@ -28,13 +28,13 @@ let in melpaBuild { pname = "lsp-bridge"; - version = "20240609.1553"; + version = "20240615.2321"; src = fetchFromGitHub { owner = "manateelazycat"; repo = "lsp-bridge"; inherit rev; - hash = "sha256-96GgMJPLFoabhlvjTMWKtEpGuctjlcRuChvzDziaq8g="; + hash = "sha256-LIjqr1IntQ6WTFOO3b6cAuB6LslG1HzVa9C+GYUyQOU="; }; commit = rev; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/default.nix index 73fee0dcf3988..48cc866029a8c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/default.nix @@ -5,13 +5,13 @@ trivialBuild { version = "1.11"; src = fetchurl { - url = "http://bigwalter.net/daniel/elisp/sv-kalender.el"; + url = "https://raw.githubusercontent.com/emacsmirror/emacswiki.org/ec4fa36bdba5d2c5c4f5e0400a70768c10e969e8/sv-kalender.el"; sha256 = "0mcx7g1pg6kfp0i4b9rh3q9csgdf3054ijswy368bxwdxsjgfz2m"; }; meta = with lib; { description = "Swedish calendar for Emacs"; - homepage = "http://bigwalter.net/daniel/elisp/sv-kalender.el"; + homepage = "https://www.emacswiki.org/emacs/sv-kalender.el"; platforms = platforms.all; license = licenses.gpl3Plus; maintainers = [ maintainers.rycee ]; diff --git a/pkgs/applications/editors/jetbrains/source/build.nix b/pkgs/applications/editors/jetbrains/source/build.nix index 9b71f73ecf12d..ede98aea221b6 100644 --- a/pkgs/applications/editors/jetbrains/source/build.nix +++ b/pkgs/applications/editors/jetbrains/source/build.nix @@ -30,7 +30,7 @@ let - jbr = jetbrains.jdk-no-jcef; + jbr = jetbrains.jdk-no-jcef-17; ideaSrc = fetchFromGitHub { owner = "jetbrains"; diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json index 64eaf1cb58577..d679dfed6db4c 100644 --- a/pkgs/applications/editors/vim/plugins/deprecated.json +++ b/pkgs/applications/editors/vim/plugins/deprecated.json @@ -12,7 +12,7 @@ "new": "vim-fern" }, "gina-vim": { - "date": "2024-06-11", + "date": "2024-06-19", "new": "vim-gina" }, "gist-vim": { @@ -60,7 +60,7 @@ "new": "vim-suda" }, "vim-fsharp": { - "date": "2024-06-11", + "date": "2024-06-19", "new": "zarchive-vim-fsharp" }, "vim-jade": { diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 24d9b84a78cbd..6c9f4646e45e9 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -77,12 +77,12 @@ final: prev: Coqtail = buildVimPlugin { pname = "Coqtail"; - version = "2024-06-02"; + version = "2024-06-15"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "d77080e17787afe9ad0366d86327658da36febbb"; - sha256 = "03qq50mas5dk3aj1rbv1f0x68rfa9b07cacj12sxp76sda9c0prz"; + rev = "a36352930b5e5f8d33dda09eef0c9d7c96190a02"; + sha256 = "07vy515qgfc6f1y96dn0ykm0kh3ylkhf6igb23f4jv608ylz4f12"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -185,24 +185,24 @@ final: prev: LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2024-06-11"; + version = "2024-06-18"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "d1d24fa077add680bc532e08fd68aaa0841a14dc"; - sha256 = "113z6y6fxq5m45x9sbaa4jsxmxxw769wb207x76qvvph6ixdrdks"; + rev = "67eece6d74f071035ca7b934a753d71d1677dd9b"; + sha256 = "15r8n3ch609lifv8lvyis5kn663c6jjj4zkzhyn4v4cxcxj3lb5d"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2024-06-06"; + version = "2024-06-19"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "98a0d1af8e901342718bd626e94ae4742fa1a937"; - sha256 = "12zkyr24q56mq626g5g7hxzddvah21zy31vm7b5wpzhmamkdb17b"; + rev = "11c08af2ae56fac83772d21aa5133913784ca2c4"; + sha256 = "1yld7h2s1yr5l65iagk51xx4znf1vh5m7c5c4gmmp5zr2px0bn8b"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -317,12 +317,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2024-06-11"; + version = "2024-06-15"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "493250022db69edd8afe8e6d0f17105756a3b721"; - sha256 = "1zc5rqygmwdnvvpqsgj59nyxykjfwab309wzmpc3y3yqwvanh355"; + rev = "35f36c50b9f1e1e916d0e3f004cb48dffd2bf737"; + sha256 = "0a3488c74hrykcmharzza5svy9c0smw9yzafpdsgw10adav2mxqb"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -510,12 +510,12 @@ final: prev: actions-preview-nvim = buildVimPlugin { pname = "actions-preview.nvim"; - version = "2024-06-10"; + version = "2024-06-16"; src = fetchFromGitHub { owner = "aznhe21"; repo = "actions-preview.nvim"; - rev = "d7f490c278982d3c4650b0998772df848df93179"; - sha256 = "1pcs1dzmr4a1q6f9slzpmfi7nm6wdynp32ipy5hnnw4k0wqxz7zd"; + rev = "9f52a01c374318e91337697ebed51c6fae57f8a4"; + sha256 = "0gr3gwmb2mcqphybx1yxsbpdlvvjpchzwich3a9wnz5mrjzyr24m"; }; meta.homepage = "https://github.com/aznhe21/actions-preview.nvim/"; }; @@ -534,12 +534,12 @@ final: prev: aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2024-06-02"; + version = "2024-06-17"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "75de06f8edbd0006997a19b760045753d4f6693c"; - sha256 = "1zjp5w8p0x4rrlfvj3a5al6kgk0h0jq5gybz2gcf7d8j2afwamsi"; + rev = "eb25396dae306cef5b8fffbe9ae98283d2f1c199"; + sha256 = "1byzkpcc77a2zwlypgmcmzik816i4qcaydb8ssy0vxrf3nsjx9s4"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -715,12 +715,12 @@ final: prev: astrotheme = buildVimPlugin { pname = "astrotheme"; - version = "2024-05-27"; + version = "2024-06-17"; src = fetchFromGitHub { owner = "AstroNvim"; repo = "astrotheme"; - rev = "2bcd030c93489a02aab6cff2288e49adb0c84fad"; - sha256 = "0gmj86y9lf824yyvck1qfd61a98p9y0rgw1ncpw9ck4s33903r4j"; + rev = "ab0cb19c32181126f92b8239700cec97ba81b0fd"; + sha256 = "187glbn1lysawl4rs9rzvzqwd26yl6kkc72sabx1hs9wn3xl3x0i"; }; meta.homepage = "https://github.com/AstroNvim/astrotheme/"; }; @@ -835,12 +835,12 @@ final: prev: asynctasks-vim = buildVimPlugin { pname = "asynctasks.vim"; - version = "2023-12-11"; + version = "2024-06-18"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asynctasks.vim"; - rev = "851da4282ffb2ce3d5e4c2f70d2d09da7839d48f"; - sha256 = "12xm92dz599w0imd7flpvay4d73hfvj0hrnz90aq6xvfrry8mzpq"; + rev = "2604a6dd7348cff5bbca869ba68170f67b48159a"; + sha256 = "033x1z1jr2s6cv0ff98qjqn62vz82isajbxbb4hbyihhk4d0zka5"; }; meta.homepage = "https://github.com/skywind3000/asynctasks.vim/"; }; @@ -859,12 +859,12 @@ final: prev: aurora = buildVimPlugin { pname = "aurora"; - version = "2024-05-22"; + version = "2024-06-14"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "fe84aed4bcf6648381adbe1f81ccf3aec752fa45"; - sha256 = "0knj1xvffmnh6h97jz3ypfhikc89wgfyfwz98qld9z3k2c83k4ln"; + rev = "31fc4eb67afca6d88a98cb9a17c206d72224423e"; + sha256 = "13h8xf5f5ny2rc50z1v1kbrypx9xlbfg2l0pafkg9m05w70kmc93"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -1040,12 +1040,12 @@ final: prev: bamboo-nvim = buildVimPlugin { pname = "bamboo.nvim"; - version = "2024-06-08"; + version = "2024-06-18"; src = fetchFromGitHub { owner = "ribru17"; repo = "bamboo.nvim"; - rev = "2fa7eab875bc5cc9e98134f15360aa2d96cdfa65"; - sha256 = "1kzh4az8j7kyrwspdcbr5271ipjaqacxlm8zi8h5ydb4dyjq9jl6"; + rev = "a1b2661f3cb248ae4fafc0cc50ca2588532e231d"; + sha256 = "0f004i98g6jvgnl561bmhzga09gdh1nizk95ahyyg6y5bkqkbrn8"; }; meta.homepage = "https://github.com/ribru17/bamboo.nvim/"; }; @@ -1208,12 +1208,12 @@ final: prev: bluloco-nvim = buildVimPlugin { pname = "bluloco.nvim"; - version = "2024-06-08"; + version = "2024-06-14"; src = fetchFromGitHub { owner = "uloco"; repo = "bluloco.nvim"; - rev = "5e70851f396decd0d28a10655d5235ddf507fd95"; - sha256 = "0al77jp0zjfjqy12vnzv15abykry2yd6pq55r3hwd6njwrv0fsj2"; + rev = "e7586def35c3584f1cc71fecf3e89e53dc4a40c6"; + sha256 = "030n232cbf5fhwddf59fv4jqqwsvbks7a0xksd14sccp8p1d92gc"; }; meta.homepage = "https://github.com/uloco/bluloco.nvim/"; }; @@ -1388,12 +1388,12 @@ final: prev: chadtree = buildVimPlugin { pname = "chadtree"; - version = "2024-06-09"; + version = "2024-06-17"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "fa33b2c6bdb06bf772301a17984498819b52bd92"; - sha256 = "05r19g7472fhk97jxjwg53y0drmnliv0hhm739lyabxnbcrc0dq9"; + rev = "156372cb7485a49b02229bd1e3d07fccc5a1c089"; + sha256 = "1yrncyvfqa16vypdh7ay0nb7wzgidd3cxx81bc01jw4h3f1gfrx0"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -1436,12 +1436,12 @@ final: prev: cinnamon-nvim = buildVimPlugin { pname = "cinnamon.nvim"; - version = "2024-06-02"; + version = "2024-06-19"; src = fetchFromGitHub { owner = "declancm"; repo = "cinnamon.nvim"; - rev = "e48538cba26f079822329a6d12b8cf2b916e925a"; - sha256 = "1p5xh8xkp554l7d4csf3mpwjbg5jhqwxf76k0d1jbi7qx7jg3dxa"; + rev = "513154670f9e174e0b5dc75dd0662c5da493c284"; + sha256 = "0apnz8qmj0173dw4nnxj3zjr5695f20za599pwlmfrld0nfgaqc2"; }; meta.homepage = "https://github.com/declancm/cinnamon.nvim/"; }; @@ -1532,12 +1532,12 @@ final: prev: cloak-nvim = buildVimPlugin { pname = "cloak.nvim"; - version = "2024-03-23"; + version = "2024-06-12"; src = fetchFromGitHub { owner = "laytan"; repo = "cloak.nvim"; - rev = "6e5bcd50bebc5cdb7cd3a00eb3d97ab7c4cc3b94"; - sha256 = "1bplsykmfg923vrywfw0wi1zjy19lc7impch27kcrawji6g838nv"; + rev = "648aca6d33ec011dc3166e7af3b38820d01a71e4"; + sha256 = "1jfjc65iimzy2phm8w1x6m0f6hrmiy3kc0mq9bm02168xqi0vfjp"; }; meta.homepage = "https://github.com/laytan/cloak.nvim/"; }; @@ -1556,12 +1556,12 @@ final: prev: cmake-tools-nvim = buildVimPlugin { pname = "cmake-tools.nvim"; - version = "2024-06-08"; + version = "2024-06-11"; src = fetchFromGitHub { owner = "Civitasv"; repo = "cmake-tools.nvim"; - rev = "56b448e839ee0aa1ff488b2c1f76971bcab9fe8b"; - sha256 = "0llwf8ckkmbqnypli8pfs0wqjhpr91sc1xpcq4a1mls9wwy8wf03"; + rev = "09bd61415ecdba84f378fe734680f69375260985"; + sha256 = "1ygqn0qwmgq19c46aadrqb7kysmwh5igrdj5jwy79zc6f20zh3b7"; }; meta.homepage = "https://github.com/Civitasv/cmake-tools.nvim/"; }; @@ -1759,12 +1759,12 @@ final: prev: cmp-fish = buildVimPlugin { pname = "cmp-fish"; - version = "2022-09-01"; + version = "2024-06-17"; src = fetchFromGitHub { owner = "mtoohey31"; repo = "cmp-fish"; - rev = "8ae7bfb1b3251d433c4adf4e64396ef929fbd91f"; - sha256 = "02yvzj7n8j20x6hxbgj7jy2ddhfqbccg6bg9hfl2yg67prqmz7p5"; + rev = "3a23492e2aead05522a9887ec685d70e8c987323"; + sha256 = "0sl5spsbdmcky4ccvymd0hi1mh4gd3c770y08jiaaqx92vkmp9qm"; }; meta.homepage = "https://github.com/mtoohey31/cmp-fish/"; }; @@ -2287,12 +2287,12 @@ final: prev: codeium-vim = buildVimPlugin { pname = "codeium.vim"; - version = "2024-06-05"; + version = "2024-06-19"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "decfb541c9fd176f467991dcde8923c7db362e02"; - sha256 = "1dk7bzcrf6sxl6rp3npndr63h3hbmyhqdnyg9kvawyhlmpnw1yw5"; + rev = "625a5cf79443a532c81f9290b3344ed8f91d2e20"; + sha256 = "1i2l9ss9i39zdxmfzrpvwsp6lx49ly7synrr2bm6byywmpx1cp37"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; @@ -2467,12 +2467,12 @@ final: prev: compiler-nvim = buildVimPlugin { pname = "compiler.nvim"; - version = "2024-06-10"; + version = "2024-06-14"; src = fetchFromGitHub { owner = "Zeioth"; repo = "compiler.nvim"; - rev = "77687ea0bd438df4a370f4328c47a220b60c20b0"; - sha256 = "1lxiswlxdx8xpz0jn5ihb4dvjyms1bfipi5j85bjsyr9sfj8jmhj"; + rev = "520ca6e0bd924e3ca8bd26e036a3b830955cf52f"; + sha256 = "18086w0hawhf94xzbgrk2h5qsnxx58w9193v5ldwmx55l7dn9i16"; }; meta.homepage = "https://github.com/Zeioth/compiler.nvim/"; }; @@ -2551,12 +2551,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2024-06-10"; + version = "2024-06-19"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "07d1298739cd7c616cb683bfd848f6b369f93297"; - sha256 = "15b98s6i6bzwf5hrwndb2mqf3204nilzcbsihjf1f5jjza3491fy"; + rev = "bde3bee1773c96212b6c49f009e05174f932c23a"; + sha256 = "083a6glk20zj1rxnajchi6v6mah9632qmbzrs270lmjplk6dc2qk"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2564,12 +2564,12 @@ final: prev: conjure = buildVimPlugin { pname = "conjure"; - version = "2024-05-24"; + version = "2024-05-31"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "e97e0db338f76f943f3043089000252adbecc966"; - sha256 = "1lzbkfgvn956dcnc0l2zl910r39hfrpxqrx7l09fhv9d91lqn6w4"; + rev = "934687860a71d1d03e569ce11f880a4d404e69aa"; + sha256 = "1j0rsyw37wc0sh3im1m20akriyj0fmwlhbwfpkzav25wk9c8kmf2"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -2600,36 +2600,36 @@ final: prev: copilot-cmp = buildVimPlugin { pname = "copilot-cmp"; - version = "2023-09-09"; + version = "2024-06-17"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot-cmp"; - rev = "72fbaa03695779f8349be3ac54fa8bd77eed3ee3"; - sha256 = "09j6jm77dw6g0d2yxxg954kbsf7vx4zgjyfjq1n9ls5z36i0vf5j"; + rev = "b6e5286b3d74b04256d0a7e3bd2908eabec34b44"; + sha256 = "1y7qp011rm8nx5qr4r97n1zc64377iipankkmn0qz441cjin03zk"; }; meta.homepage = "https://github.com/zbirenbaum/copilot-cmp/"; }; copilot-lua = buildVimPlugin { pname = "copilot.lua"; - version = "2024-02-28"; + version = "2024-06-15"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "f7612f5af4a7d7615babf43ab1e67a2d790c13a6"; - sha256 = "01xwq4kz4a3m90z29pf5yp8aiax1nv80lpxzxqc3k7nfr5vfqz95"; + rev = "86537b286f18783f8b67bccd78a4ef4345679625"; + sha256 = "13ri0rj0bgs3s5hkh0hc9blk9xv9knv8q97zrx0y90w4b9k50b8w"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; copilot-vim = buildVimPlugin { pname = "copilot.vim"; - version = "2024-06-06"; + version = "2024-06-14"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "1dcaf72099b436b5832d6117d9cd7a4a098a8d77"; - sha256 = "074c9q0isg7763b8170y5zm4mj5i21y81j0rhqqgafc38yhgpiq4"; + rev = "88d08cf54f623341adde4b18362bffc95174dcd5"; + sha256 = "1ih8f8bbivywlaj54jaxnz6i05770qss028fafqsvn3h9cindigi"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; @@ -2672,12 +2672,12 @@ final: prev: coq_nvim = buildVimPlugin { pname = "coq_nvim"; - version = "2024-06-09"; + version = "2024-06-11"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "4ac5c9051e9e133e203a242f345393591fa29eca"; - sha256 = "0rfibvh4r63d36iacnflv0kgmsmyjm00rr1zc8lnnwy74w5ixhi5"; + rev = "83808cfdebca290c84808c85b73f4dbcf5cf981f"; + sha256 = "17l52gd96kfqq4nc0z8qprigvzzrbsa1vijx7kdvgr0qbw4mr5gy"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2720,12 +2720,12 @@ final: prev: crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2024-06-06"; + version = "2024-06-19"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "0c8436cb10e9ac62354baa5874a4a3413f2432c1"; - sha256 = "13ipmpmrmiz4jnaf2a6h459ib22yjli8yy4rqz0sc8gvs9mbxvpx"; + rev = "909d233a8a86fd5ca8ef9eb1e404e89b81e05c41"; + sha256 = "1gbksj75hpkxn5mvvqhyhwx9l2b5xrp2vgwplydxgp3ml4f66rv7"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2816,12 +2816,12 @@ final: prev: cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; - version = "2024-06-10"; + version = "2024-06-18"; src = fetchFromGitHub { owner = "scottmckendry"; repo = "cyberdream.nvim"; - rev = "1801de891253b80e2e5b8fdc7c3faf54f49b93ae"; - sha256 = "14xcxdz3xyjyw3wilyhg4c4hixqlxhmqi0nl37blial8ln1b64p8"; + rev = "db76342d8dff74b9382bf1e9c9e648ee16869809"; + sha256 = "1vzhylvw54jsz3fnmbx85if1izkmzzzbpzmdzw6dvmyqiw4axj7i"; }; meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; }; @@ -2852,24 +2852,24 @@ final: prev: dashboard-nvim = buildVimPlugin { pname = "dashboard-nvim"; - version = "2024-06-04"; + version = "2024-06-12"; src = fetchFromGitHub { owner = "nvimdev"; repo = "dashboard-nvim"; - rev = "5346d023afc4bfc7ff63d05c70bcdb0784bb657a"; - sha256 = "1z26va49qpvihs3h2gkfi6v1plmy952h8ksz56wf5r56c4gmvqhj"; + rev = "b88c997f468a1bacb1e9b13ff3b567638caa06e6"; + sha256 = "0q77lzd9ls62dc3fbzrc401aaxah2sh1p1g9zfsxvimb4y313b7c"; }; meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; debugprint-nvim = buildVimPlugin { pname = "debugprint.nvim"; - version = "2024-05-21"; + version = "2024-06-14"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "debugprint.nvim"; - rev = "375e992064637e6db6da29caab0f90715a5d4d5a"; - sha256 = "1cd7psb7wgy9lz5pgbfp1csbdg98p4cp07yyhlxxw3r41fc6al54"; + rev = "bc691e879a3c1c7b92f62e830d58ec3f40331fbd"; + sha256 = "0paylwmbs15vnj25nxcqn4dw7nzw3xqp7xdq2mr4p6xdhyw4akvx"; }; meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/"; }; @@ -2972,24 +2972,24 @@ final: prev: denops-vim = buildVimPlugin { pname = "denops.vim"; - version = "2024-05-16"; + version = "2024-06-18"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "9dd9ae9da9b8d65916dd44e0e4d881665397de63"; - sha256 = "1cvicx69741jna07vm4rchclnspcbpdj8yyik0bsicf95w5w6blp"; + rev = "c6fa7c615ea7209ece65b2322591f0dd0167358d"; + sha256 = "1qxnk06sxrs1i5rhraiid9v6jr2nw5psgj8f0n42jfbpiadb6m2h"; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; }; deol-nvim = buildVimPlugin { pname = "deol.nvim"; - version = "2024-06-11"; + version = "2024-06-18"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "dcdd22afe5f4522361e5236d8a89a92a44b91dc9"; - sha256 = "0zhy4apb1hbgc7apnky6xrr66f8sczsg26m3jfnadmwcwdvwivmc"; + rev = "7fe1a74a1e9abba978e3a1e02f798bf04de71a5f"; + sha256 = "0s61cwhjacnj5rvg87l263pf8rrla6ym8z89pp43wqj875d8d8s5"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -3274,12 +3274,12 @@ final: prev: diffview-nvim = buildVimPlugin { pname = "diffview.nvim"; - version = "2024-05-29"; + version = "2024-06-13"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "3afa6a053f680e9f1329c4a151db988a482306cd"; - sha256 = "0ws7zn0y54lg8sq66lfrc1ay92xxvxnr283f3dbzrvw77kdz0bph"; + rev = "4516612fe98ff56ae0415a259ff6361a89419b0a"; + sha256 = "0brabpd02596hg98bml118bx6z2sly98kf1cr2p0xzybiinb4zs9"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -3358,24 +3358,24 @@ final: prev: dressing-nvim = buildVimPlugin { pname = "dressing.nvim"; - version = "2024-06-02"; + version = "2024-06-19"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "e3714c8049b2243e792492c4149e4cc395c68eb9"; - sha256 = "02akn2qw6hjqc0gbwayrdwg8ishgbl94lal7r3kc4gakzkd3nv2i"; + rev = "6741f1062d3dc6e4755367a7e9b347b553623f04"; + sha256 = "0mwg7z7gns6gw3b6iq2xs0hynn846k7r4q4fzqba8ky8bzzh8mrf"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2024-05-25"; + version = "2024-06-15"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "2b546383bdf4daa254ac70c760ee1e5524bc60b1"; - sha256 = "0x52s0s0skqim321frhi9kd9h0d391fngmrc25bgn47s4wkfkp38"; + rev = "79847a78ec0c58f5e5c0360192b03d0cee803e95"; + sha256 = "0k92lqkqfah0xgl3yq85f1fr8pryp6cfcgglwdbsqw1jwsh37687"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -3418,12 +3418,12 @@ final: prev: edgy-nvim = buildVimPlugin { pname = "edgy.nvim"; - version = "2024-03-26"; + version = "2024-06-16"; src = fetchFromGitHub { owner = "folke"; repo = "edgy.nvim"; - rev = "de79b7d92a5979cd71a9a1d8b6282515345e5055"; - sha256 = "0z5mb5cnwdpcswy3w099vyfjz0hmb04j4vbkgxnc8g9y6lffn2rs"; + rev = "a8bc1d24798c80a391f1a5d898a50c41a7f93883"; + sha256 = "066963g4jykzw5fg3mhv301ksc67vmjgzw0fm9izip9qrpb9i91h"; }; meta.homepage = "https://github.com/folke/edgy.nvim/"; }; @@ -3467,12 +3467,12 @@ final: prev: elixir-tools-nvim = buildVimPlugin { pname = "elixir-tools.nvim"; - version = "2024-05-23"; + version = "2024-06-14"; src = fetchFromGitHub { owner = "elixir-tools"; repo = "elixir-tools.nvim"; - rev = "815cf0b0aab0421f8490199c0dd7442d22a7c1b7"; - sha256 = "0b8ikabwh8lpmvb1n1w29vq322ibcld8rk4dpbfalqbrz4gzy8hi"; + rev = "ab10b425a4d4b34447b0699bd93aa42f97bdf4b5"; + sha256 = "180h1w5aka6kz9np5l2xr6kiyw9xkj238lqcgqqv2dx7chdssxsi"; }; meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/"; }; @@ -3503,12 +3503,12 @@ final: prev: emmet-vim = buildVimPlugin { pname = "emmet-vim"; - version = "2021-12-04"; + version = "2024-06-14"; src = fetchFromGitHub { owner = "mattn"; repo = "emmet-vim"; - rev = "def5d57a1ae5afb1b96ebe83c4652d1c03640f4d"; - sha256 = "1x9v455q4z71dqzalvswd0l4lsp7ic0h1sr1z6pcgwf8ik3j7f7x"; + rev = "3fb2f63799e1922f7647ed9ff3b32154031a76ee"; + sha256 = "03rlfwfnghqp6bjnpi2mb4f0ki7fyj2im718f51mpfv6wr5c5gac"; fetchSubmodules = true; }; meta.homepage = "https://github.com/mattn/emmet-vim/"; @@ -3781,12 +3781,12 @@ final: prev: flit-nvim = buildVimPlugin { pname = "flit.nvim"; - version = "2024-04-08"; + version = "2024-06-18"; src = fetchFromGitHub { owner = "ggandor"; repo = "flit.nvim"; - rev = "56490317983218b09698f8c960c3669958b12b32"; - sha256 = "1m1l9dh7gwphf7ry7wzvx1hrha3i9b5alp6kpazpjidnjr1mjzb9"; + rev = "a9be4e76c30a128f1e51af448c8321bf8366bcd4"; + sha256 = "0fx2jrnfmr5bl537ha02w3wmkmx89n938h2a4vgc2771kwpb1cy5"; }; meta.homepage = "https://github.com/ggandor/flit.nvim/"; }; @@ -3889,12 +3889,12 @@ final: prev: friendly-snippets = buildVimPlugin { pname = "friendly-snippets"; - version = "2024-06-09"; + version = "2024-06-17"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "700c4a25caacbb4648c9a27972c2fe203948e0c2"; - sha256 = "1c21nax3rrnx86vyby4i8ph09n72j2yaxz6gykmb6fd363caplnk"; + rev = "682157939e57bd6a2c86277dfd4d6fbfce63dbac"; + sha256 = "16fivgnm9vzsk0gqjg8xjp15lrfdlq0w9wa00344yifqvbfam9qi"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3997,12 +3997,12 @@ final: prev: fzf-lua = buildNeovimPlugin { pname = "fzf-lua"; - version = "2024-06-11"; + version = "2024-06-19"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "04a1bb63db5bf7603cdbdd0d8e75a3f2fa8dc301"; - sha256 = "01igpw1xlzka112gikbx4lwrfxl7jlkqr3kvifp3z5zk1az0dfdd"; + rev = "c56717d6833166adadd11cad05d979b1fb370c57"; + sha256 = "17cwiv25qg3lvlm6j5v95pdxd92470kb1495xvp2iaanzzmkl1h8"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -4127,6 +4127,18 @@ final: prev: meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; }; + git-prompt-string-lualine-nvim = buildVimPlugin { + pname = "git-prompt-string-lualine.nvim"; + version = "2024-04-22"; + src = fetchFromGitHub { + owner = "mikesmithgh"; + repo = "git-prompt-string-lualine.nvim"; + rev = "5426ce15462abe4faf5cd76db7476b2686120fe9"; + sha256 = "sha256-BM1AEpIcOd5nr4N/ZoxK9NodiUbUuY9hw7n/wRTXzzk="; + }; + meta.homepage = "https://github.com/mikesmithgh/git-prompt-string-lualine.nvim/"; + }; + git-worktree-nvim = buildVimPlugin { pname = "git-worktree.nvim"; version = "2023-11-07"; @@ -4177,12 +4189,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2024-06-07"; + version = "2024-06-19"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "4a143f13e122ab91abdc88f89eefbe70a4858a56"; - sha256 = "09rqxrw8wcybcd806zgqcgich9x88sdsqvm8638y08bb18bj6rqm"; + rev = "651d5ed082605f3ed96b0f037a768ca06ecf8fc3"; + sha256 = "0fllibgmp1sfargpkswg1h3kg667y0sdazc0z5midaq8skr9crz6"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -4237,12 +4249,12 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2024-05-30"; + version = "2024-06-19"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "8f8ab4b968d08bd70ecda1f2909fb5e6177452ca"; - sha256 = "1i2faj6lz9k13h7qlv1ibq9argd45znvw86jg3iidhqm2g8ajlvh"; + rev = "78c6d7b970a79c34dc0f35149f4bd845e09803d6"; + sha256 = "0pg14jml1n27imy4rdb1ri7wi7bnh2fp8q7rah5az8k80g26ghpg"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -4405,12 +4417,12 @@ final: prev: gruvbox-material-nvim = buildVimPlugin { pname = "gruvbox-material.nvim"; - version = "2024-05-23"; + version = "2024-06-16"; src = fetchFromGitHub { owner = "f4z3r"; repo = "gruvbox-material.nvim"; - rev = "0ecaa68ace7862ff7e0b28371965a760be99e673"; - sha256 = "1azqb5hpjww6sxvwbk5l0q1lzf0dm7ymp665pw93qxxlaijasllr"; + rev = "0ab9d8c7a8b4cd26338ca0c816c4ca1a48f9d5d6"; + sha256 = "0il0rkj3yskfy591phdvyd8kdc14303m1g58hygvdd46ccsxj8kw"; }; meta.homepage = "https://github.com/f4z3r/gruvbox-material.nvim/"; }; @@ -4453,12 +4465,12 @@ final: prev: guess-indent-nvim = buildVimPlugin { pname = "guess-indent.nvim"; - version = "2023-04-03"; + version = "2024-06-19"; src = fetchFromGitHub { owner = "nmac427"; repo = "guess-indent.nvim"; - rev = "b8ae749fce17aa4c267eec80a6984130b94f80b2"; - sha256 = "1i31vbwih28yzjnkmv1xkjrbviyardk7j1dpxmcwa1ch8v4iz93y"; + rev = "6c75506e71836f34fe5c5efa322dfce3e0494e7b"; + sha256 = "0pg2jbksvdh6sy1ygygiax5r1d93axmdg6n0jdk6iyfa1jlzdhrw"; }; meta.homepage = "https://github.com/nmac427/guess-indent.nvim/"; }; @@ -4489,12 +4501,12 @@ final: prev: hardhat-nvim = buildVimPlugin { pname = "hardhat.nvim"; - version = "2024-05-21"; + version = "2024-06-14"; src = fetchFromGitHub { owner = "TheSnakeWitcher"; repo = "hardhat.nvim"; - rev = "6cdda17ff53c947b96e563c26fd81005d95f3328"; - sha256 = "01wccn69wgv979wksmwhkan0zy1z2rc0miz1613c52kyw6fdkcq9"; + rev = "9d5b241261904ae22429877c1459e7c632dba736"; + sha256 = "1xb93g4cxy3w4jjagaqmyvf2qfii4fm5biriadkmf4a08vdxg682"; }; meta.homepage = "https://github.com/TheSnakeWitcher/hardhat.nvim/"; }; @@ -4560,12 +4572,12 @@ final: prev: haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2024-06-03"; + version = "2024-06-16"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "ce95d095fc5abe29868c1bca35ce815803a90148"; - sha256 = "1md4n679h3r9p49n2wvsm49f54grijnkfmn8dd7djjlvdq69g4yx"; + rev = "0223bf4b47ab517030f406617c153e7d1e4a7811"; + sha256 = "1ab3s6lrqh870qcphxjsvj5q8jg7lxv27119r5qyp60rf657q39a"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4751,12 +4763,12 @@ final: prev: hover-nvim = buildVimPlugin { pname = "hover.nvim"; - version = "2024-06-04"; + version = "2024-06-12"; src = fetchFromGitHub { owner = "lewis6991"; repo = "hover.nvim"; - rev = "4d2cef11e03879bbb5514f6fa26fe13ec5a210bd"; - sha256 = "18vzvlcr8005vcdhgwda88gvv3gbkimchqsrlj1gns0byxywjdj0"; + rev = "4339cbbcb572b1934c53dcb66ad4bf6a0abb7918"; + sha256 = "1nnhm8xhkdjvqal7016v22cljhpga8y0mydmvalz954cviskhna3"; }; meta.homepage = "https://github.com/lewis6991/hover.nvim/"; }; @@ -4799,12 +4811,12 @@ final: prev: iceberg-vim = buildVimPlugin { pname = "iceberg.vim"; - version = "2022-11-23"; + version = "2024-06-19"; src = fetchFromGitHub { owner = "cocopon"; repo = "iceberg.vim"; - rev = "e01ac08c2202e7544531f4d806f6893539da6471"; - sha256 = "19a0wk1qjp385jmd3kp3r5mkmly90j0jipz64zkbpdsh0v8fvsnk"; + rev = "23835d5ed696436f716cbfdb56a93a7850fe3b18"; + sha256 = "04cw04yirvbfq1l7wbavpnx46830qsp3cgx6rqidhhj794pn3xvc"; }; meta.homepage = "https://github.com/cocopon/iceberg.vim/"; }; @@ -4847,12 +4859,12 @@ final: prev: image-nvim = buildNeovimPlugin { pname = "image.nvim"; - version = "2024-06-05"; + version = "2024-06-16"; src = fetchFromGitHub { owner = "3rd"; repo = "image.nvim"; - rev = "a2a0849e0b3dbed90f9283603cedb683bda5d4d1"; - sha256 = "18rs9wfckgkkw77hw0j244bl4c3asicbvigcnxv5galph1p1ws4g"; + rev = "bdd5506be7fb39668692e30141f1637b691379af"; + sha256 = "0dfvg393l0rwr8lm25fkw8gh1vx592jc1ccslal81jvyjnvgc237"; }; meta.homepage = "https://github.com/3rd/image.nvim/"; }; @@ -5197,12 +5209,12 @@ final: prev: kanagawa-nvim = buildVimPlugin { pname = "kanagawa.nvim"; - version = "2024-05-26"; + version = "2024-06-12"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "08ed29989834f5f2606cb1ef9d5b24c5ea7b8fa5"; - sha256 = "1whdsamsl0qss92hmby1q8ch6r6hvfsz87kv4gr1aqpi51vdxyrn"; + rev = "fe5b2c9e2549862c3dc3f3c8e9cf7ddece0f40c2"; + sha256 = "1ip8f9i822d6mmaxvzrvap19k5lr9mp8k6lgh2xyspszbgxi0nhg"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -5233,12 +5245,12 @@ final: prev: knap = buildVimPlugin { pname = "knap"; - version = "2024-05-28"; + version = "2024-06-13"; src = fetchFromGitHub { owner = "frabjous"; repo = "knap"; - rev = "00e94c10b5b969b2aca791f1b2d36ad77c89a252"; - sha256 = "0bryyya5wgxh45nh2injmhhrzgkaca62cn9vaifbcyrmpp99y140"; + rev = "0040760bb504a713ea5988c7c490a15faf477c57"; + sha256 = "1l09cc3mi9w9y6g23cylxd5jsrwh451bbmi7w7amymwz17419wsf"; }; meta.homepage = "https://github.com/frabjous/knap/"; }; @@ -5317,16 +5329,28 @@ final: prev: lazy-nvim = buildVimPlugin { pname = "lazy.nvim"; - version = "2024-06-07"; + version = "2024-06-18"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "eb4957442e3182f051b0ae11da32e06d22c190e3"; - sha256 = "11bi66yvmff74102w903z9fx756n7zvkq0nb15ssq0vyikq4m13z"; + rev = "bc620783663ab09d16bff9fdecc07da65b2a1528"; + sha256 = "180rvpy9bv7c7gnimhwgzyxr2hml9v371ki8n73v726ssk4x1pzc"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; + lazydev-nvim = buildVimPlugin { + pname = "lazydev.nvim"; + version = "2024-06-15"; + src = fetchFromGitHub { + owner = "folke"; + repo = "lazydev.nvim"; + rev = "6184ebbbc8045d70077659b7d30c705a588dc62f"; + sha256 = "1kj3p5x7h8k1xp8m5pxjkzbfigcbrschgm1kzlc3qkv0py3i5k5h"; + }; + meta.homepage = "https://github.com/folke/lazydev.nvim/"; + }; + lazygit-nvim = buildVimPlugin { pname = "lazygit.nvim"; version = "2024-05-13"; @@ -5377,24 +5401,24 @@ final: prev: leap-nvim = buildVimPlugin { pname = "leap.nvim"; - version = "2024-06-04"; + version = "2024-06-18"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "0d15057cc47fa49f6609bf364f5ad3842f08c58c"; - sha256 = "0wlrj39ynv6h5sp37zwhvqmz8pvch5xy0jvqlgh724ibkidf7lh8"; + rev = "2ec33f2a38974fe6997c42c5ce61ce84eab84cc8"; + sha256 = "0xavag2c5mq5ii14b5dvm7nm13cs97nhag28gpvjdzwgkzz3c21v"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; - version = "2024-06-07"; + version = "2024-06-14"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "280d5ffa73927317ff44d781ac1becdec6415540"; - sha256 = "0v5nmfz3adzpf5pbr0qf83w5c1fz8s9i2i4a1xqlqfxm77vxj9k8"; + rev = "89e0d00c5aed623c1f29cf2a963fd1737358e92a"; + sha256 = "0i4xh66xydssvr4n2kknrg1qibj8ikfvy5m6ljbmhbvgxim74y48"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -5653,12 +5677,12 @@ final: prev: llm-nvim = buildVimPlugin { pname = "llm.nvim"; - version = "2024-06-10"; + version = "2024-06-18"; src = fetchFromGitHub { owner = "huggingface"; repo = "llm.nvim"; - rev = "1dcf5192f9cd2c1cb5e7c78fbebf45a56e178f66"; - sha256 = "0bi9dlk8wy6nrfjsrvppypl0rg4w154s43y7y2v9wg7sdswn583z"; + rev = "9832a149bdcf0709433ca9c2c3a1c87460e98d13"; + sha256 = "1ywlvpbsgdzn7idv0sjcbp6nh2h18h9a9cmqvl3b3h928651xi53"; }; meta.homepage = "https://github.com/huggingface/llm.nvim/"; }; @@ -5772,12 +5796,12 @@ final: prev: lsp_signature-nvim = buildVimPlugin { pname = "lsp_signature.nvim"; - version = "2024-06-01"; + version = "2024-06-15"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "2ec2ba23882329c1302dff773b0d3620371d634f"; - sha256 = "15nccly483r7sjvbb268y3sy2n81ap40xyryvidll6ghb2yljcvv"; + rev = "a38da0a61c172bb59e34befc12efe48359884793"; + sha256 = "1p6fznwg6pxr39x08lf9qhjkcvfysd58k1as6d4lwibkav7rfkki"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -5808,24 +5832,24 @@ final: prev: lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "2024-06-09"; + version = "2024-06-11"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "343b71768c741432bab47d201624e92126a38686"; - sha256 = "0r0g30096rx5aqzigdlm6brr53lx87vk7bxm0zxnd93wnrqfayxb"; + rev = "6f920cfabddb9b7de5a3a4d0b7cd4f0774ae23e2"; + sha256 = "1zgc53kdc10k7pa67svjw9bndazblmjw1lrsmdprggsxvcd1x2n8"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; ltex_extra-nvim = buildVimPlugin { pname = "ltex_extra.nvim"; - version = "2024-05-30"; + version = "2024-06-15"; src = fetchFromGitHub { owner = "barreiroleo"; repo = "ltex_extra.nvim"; - rev = "3ee08af31bf826c6ae2ca2a294b79f688306c0be"; - sha256 = "0br2bq86a83wrix684agcfrxaf24x9nllmkvwzj6qi73199q1a9c"; + rev = "24acd044ce7a26b3cdb537cbd094de37c3e1ac45"; + sha256 = "1dq93f4aj3xni9xbls8bhsf5jja36dlpgdlkfk1lvkvyh489wrrq"; }; meta.homepage = "https://github.com/barreiroleo/ltex_extra.nvim/"; }; @@ -5869,12 +5893,12 @@ final: prev: luatab-nvim = buildVimPlugin { pname = "luatab.nvim"; - version = "2024-05-19"; + version = "2024-06-16"; src = fetchFromGitHub { owner = "alvarosevilla95"; repo = "luatab.nvim"; - rev = "d771888a061db83f1338fbca827bde4a19658c22"; - sha256 = "1wqvnp273warkvrpbbprz3ndwpfddiwq40hl4qr76l3zacyqhkhb"; + rev = "93504f3eda13fc925834429d4caa419d65bc6a01"; + sha256 = "138wp7qm2w0p7y02hplnl6grgi49p9r9wbxfb6brx1zgyqqcxv09"; }; meta.homepage = "https://github.com/alvarosevilla95/luatab.nvim/"; }; @@ -5903,6 +5927,18 @@ final: prev: meta.homepage = "https://github.com/mkasa/lushtags/"; }; + lz-n = buildNeovimPlugin { + pname = "lz.n"; + version = "2024-06-19"; + src = fetchFromGitHub { + owner = "nvim-neorocks"; + repo = "lz.n"; + rev = "ed1dfca4c69ad84558bace90740b3ea2dd6ac842"; + sha256 = "122rx7khasj0liwrw07m4x7ysq86342b3q5fzg0gdkln7nn5pv4n"; + }; + meta.homepage = "https://github.com/nvim-neorocks/lz.n/"; + }; + magma-nvim-goose = buildVimPlugin { pname = "magma-nvim-goose"; version = "2023-07-04"; @@ -5977,12 +6013,12 @@ final: prev: mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2024-06-07"; + version = "2024-06-12"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "8db12610bcb7ce67013cfdfaba4dd47a23c6e851"; - sha256 = "01d9kpaiap1m59ms810qfsly70rl45168iq6k4z5s248cjpij0dz"; + rev = "37a336b653f8594df75c827ed589f1c91d91ff6c"; + sha256 = "1xiv4km5m3y8znqq2a5f31fqw5aygcdr11lwpg0xrvf359z41g7i"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -6025,12 +6061,12 @@ final: prev: material-nvim = buildVimPlugin { pname = "material.nvim"; - version = "2024-05-17"; + version = "2024-06-15"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "b6407868026175fda8b2e3dfdc524a3c60222a23"; - sha256 = "0iz9d8a20w0jdv1d9lslwpcz7w6rj6n9gdqmlcic8744rcgkqqm2"; + rev = "173bde5eea25e73c5ece9448e19c3e30b5b21ae1"; + sha256 = "0smlnk3d5dv33ww1k96f7mbyy6xs3ma179f86kifv08k1wn7n4xq"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -6121,12 +6157,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2024-06-09"; + version = "2024-06-14"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "f1dd64cf2ac1b348bd440e59446abf680c7188d6"; - sha256 = "04zxj23lsl8fy9pqkr5vkwhb3s90609d76lqp496qxihxhdjnvrm"; + rev = "ebc8cb0c1f73ee6c53e0560957a37a2307a70f98"; + sha256 = "0jvrqs9fmn8m1h5wdnl981dpjyp4w9b5q09ypblg6dp1f817c0nf"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -6157,12 +6193,12 @@ final: prev: mkdnflow-nvim = buildVimPlugin { pname = "mkdnflow.nvim"; - version = "2024-06-05"; + version = "2024-06-14"; src = fetchFromGitHub { owner = "jakewvincent"; repo = "mkdnflow.nvim"; - rev = "ff86169949466bf3e43e87a7c44c696fe7445e7b"; - sha256 = "1fymhj6jgzhzg6md8y0yb3rqajzypbf44d3ganfzifwks8q7gf03"; + rev = "e6179d25f7e696baa612aa35b951b5ca3f3e75b6"; + sha256 = "02mvgvdrq9p80gcgh668qajgc32pxhn5aahw0gkc40mc4f10lzlm"; }; meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/"; }; @@ -6181,12 +6217,12 @@ final: prev: modicator-nvim = buildVimPlugin { pname = "modicator.nvim"; - version = "2024-03-05"; + version = "2024-06-19"; src = fetchFromGitHub { owner = "mawkler"; repo = "modicator.nvim"; - rev = "780ea1e98c9bee8f3816685213b0aac42b34cd75"; - sha256 = "1db48c8yfpvlz5v17c7vxrsjz8n0x0fxjbb59w0bm88n85rd2pnv"; + rev = "d1d327fd4bdfc3af4cfdf83b85c2eaefa71de7a8"; + sha256 = "1w1rybbh6dhzc0qvw5mr0kv0qcpqxasdhwzghl5g1k9rq520q42y"; }; meta.homepage = "https://github.com/mawkler/modicator.nvim/"; }; @@ -6553,12 +6589,12 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2024-06-11"; + version = "2024-06-19"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "c81b91fbb39d4d46aedca2d1eacaa2389ae0eeaa"; - sha256 = "0qrjdxcvhzpra3fdsz29zd5j22y4g1xyda5p14j0chs60r6qzmms"; + rev = "60f6dd6aa1006fa5c3ff4b7bf01586dcecbe9187"; + sha256 = "03hz05kpzrbwy2d9pdmi2yihg7svsh876fv3kk0276v9276hwi1s"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -6625,12 +6661,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2024-06-10"; + version = "2024-06-17"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "e11bd464f3a3b4b3af8ea0a8e54ee1b70fee7371"; - sha256 = "19ih3nisp3hflv0zkwkq0xd12qq28pi6aqx6w2xfj88qf1m2qfhq"; + rev = "11dea1b67bb153cd5b4a2de348ceefa69508dfce"; + sha256 = "07d8kmn19hngl06ak2ch7p0mfjwlgyim0xkjfmnsdhxd0ksqdn49"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6697,24 +6733,24 @@ final: prev: neorg = buildVimPlugin { pname = "neorg"; - version = "2024-06-10"; + version = "2024-06-13"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "5239a98c462fb24201e76305d9d6265e4742a31e"; - sha256 = "1y6vvz86rfk9y58ifk9rx1baqvb05cr5xyyqi7zvjx0hnn3q1kis"; + rev = "ebf75f57fa8dadd8747a678724b273b398143dc4"; + sha256 = "05zq8q88z14hd9y9ywp09kxjxpxfzb72yjm3gl7px8xxh18nqrds"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; neorg-telescope = buildVimPlugin { pname = "neorg-telescope"; - version = "2024-06-05"; + version = "2024-06-19"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg-telescope"; - rev = "329ee31b8d92f252d880d8f607089eb89a1640b8"; - sha256 = "05nrab0qr5llmmbbyyqimxj8zrfcdcgqh5rgy25bgibvc34wcdhs"; + rev = "fe255a3432ce639de7a374ccfb8602f517244dcd"; + sha256 = "0w86sh0pfff7qipjwgfqhsvm95j0hlv1srn9p2fphg1jsixfd5jm"; }; meta.homepage = "https://github.com/nvim-neorg/neorg-telescope/"; }; @@ -6879,12 +6915,12 @@ final: prev: neotest-gtest = buildVimPlugin { pname = "neotest-gtest"; - version = "2024-05-21"; + version = "2024-06-12"; src = fetchFromGitHub { owner = "alfaix"; repo = "neotest-gtest"; - rev = "081787a082abc0a14d53b3baff4aa5964045d204"; - sha256 = "10dfb9jc95zp2vk0avw8g3s0gqxi1nnsgcll8bqfdb545ag82w2x"; + rev = "b44c8afc26cea75ffc80617ce07b4e745a56e589"; + sha256 = "09h94w4s1yp3qx0n342qkksixgilkfmqiqp65jayfxiwa3jpkgya"; fetchSubmodules = true; }; meta.homepage = "https://github.com/alfaix/neotest-gtest/"; @@ -6892,24 +6928,24 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2024-06-10"; + version = "2024-06-16"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "35582894783456a50094086c1c3cfad50d980c1a"; - sha256 = "0y2mdn98jf81zpmzb78kqazss8b518z7ypy4p009vbvz9wv1hzy9"; + rev = "0481d2c79564d6658caa1a4962bdfba3a608b5d1"; + sha256 = "142j5s3fcyggkrx92w8k6d3vas2m7580k9vd6ca913adby5ys2cn"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; neotest-java = buildVimPlugin { pname = "neotest-java"; - version = "2024-05-24"; + version = "2024-06-15"; src = fetchFromGitHub { owner = "rcasia"; repo = "neotest-java"; - rev = "154c937b9bd8613b943a27b989813f0532fd80ed"; - sha256 = "1n3c1lribbzq1w1h08qh51f3173bzganyf45aagb8rq2wdkm5r89"; + rev = "7b9e0419bd92f641f730e31a4236074e53a5ac99"; + sha256 = "1f9a0aa4q6c4armj9fjmbkpk2j2svgiyf1mlmq46g0mqcmhnnbbh"; }; meta.homepage = "https://github.com/rcasia/neotest-java/"; }; @@ -6964,12 +7000,12 @@ final: prev: neotest-playwright = buildVimPlugin { pname = "neotest-playwright"; - version = "2024-06-08"; + version = "2024-06-18"; src = fetchFromGitHub { owner = "thenbe"; repo = "neotest-playwright"; - rev = "e35465a43729dbf9f790c56c9c6e3402ba27a2c0"; - sha256 = "1ghrms2mv1lgmkbyyhcqf3vxjxhx3cvvmhaw1cnw5ba51rg292qg"; + rev = "f61463f5c74d53fc5975b7e086b7c6e9356d9215"; + sha256 = "18d9qqxqrgng373xlkiinxcp9s13zj40sjxsibhdccji75pr3ziy"; }; meta.homepage = "https://github.com/thenbe/neotest-playwright/"; }; @@ -7060,12 +7096,12 @@ final: prev: neotest-zig = buildVimPlugin { pname = "neotest-zig"; - version = "2024-06-09"; + version = "2024-06-17"; src = fetchFromGitHub { owner = "lawrence-laz"; repo = "neotest-zig"; - rev = "7308fc1f7f3d4a876f5b941bc42b2066b7b8edf6"; - sha256 = "0x7hfaafj3iqiyz9jp2prhayinchvfniamvym2x8lnijsfx443z9"; + rev = "7cc48ba642a6acb96f377054cc4439c6a135fb5d"; + sha256 = "0dlc2zd5qwak5gwv1pv1arbpj56scnaz4n1my50i97rvj4yf3vmh"; }; meta.homepage = "https://github.com/lawrence-laz/neotest-zig/"; }; @@ -7276,12 +7312,12 @@ final: prev: nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2024-06-10"; + version = "2024-06-19"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "731654f66617aea9017e8e7fc22a9a7f80b5af61"; - sha256 = "0rfp9kywi6raz9m7ll4y25hm5dn3629r55kv2biang31gyyp16cb"; + rev = "4c068cf7a74d77cc405aedda875f3174f7eb9143"; + sha256 = "1q5wrryf5xp13lljjgm95aavn4s2cq0p52pbxcxykm97vm1zi9n7"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -7336,24 +7372,24 @@ final: prev: noice-nvim = buildVimPlugin { pname = "noice.nvim"; - version = "2024-06-07"; + version = "2024-06-18"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "e5cb20c6e14305d24025ecb77d7d4dd9d61f1a64"; - sha256 = "18r6prl1qba6b21j66zwipn2vz6lc7kc47x72xgf9hln2c93vrpn"; + rev = "88ac36864b5976a64b14a8f156c616f41b32f228"; + sha256 = "0qkm5g6mfaydgbsgkkng79j3zm0nfbnim30ibjpgby74fjpmzp09"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2024-06-04"; + version = "2024-06-14"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "8691504118b252d64fc5023a104aedd100ab754a"; - sha256 = "0ihnnhd6jqhdz5zkbjvm1cahjq16ppsxcm4l8k09qdk5v66syjma"; + rev = "cc0a3c45047e3daf85d07c1571d65476cfce6480"; + sha256 = "1aa2dcrrwmbh8dh8vccwz2jdwyfsy10jagvqbpmh7ax1mnmphnqv"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; }; @@ -7372,12 +7408,12 @@ final: prev: nordic-nvim = buildVimPlugin { pname = "nordic.nvim"; - version = "2024-03-15"; + version = "2024-06-16"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "nordic.nvim"; - rev = "9697dc86e888f603cdb7e3a0742b7814b8a01cd1"; - sha256 = "1rf4z8rvdh4iv4ifq3z1hic2ldcpkja82834w5nhig3x2rn5hw7m"; + rev = "c88388b2a5f6e621df2718c316b856d4971bb89d"; + sha256 = "0js2dmiaa5jwym2c3xwzcwprbnyk7rp61wn7hzl3gkgn239sv6ca"; }; meta.homepage = "https://github.com/andersevenrud/nordic.nvim/"; }; @@ -7814,6 +7850,18 @@ final: prev: meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; + nvim-genghis = buildVimPlugin { + pname = "nvim-genghis"; + version = "2024-06-19"; + src = fetchFromGitHub { + owner = "chrisgrieser"; + repo = "nvim-genghis"; + rev = "6077a6376f9a15eaf3d60a12caca57adb59028b5"; + sha256 = "1lm9mjjqwgf4cqgh4xkq9kfbx9bjz6p68dfimixm3rlsvrxz2wai"; + }; + meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/"; + }; + nvim-gps = buildVimPlugin { pname = "nvim-gps"; version = "2022-07-05"; @@ -7852,12 +7900,12 @@ final: prev: nvim-hlslens = buildVimPlugin { pname = "nvim-hlslens"; - version = "2024-04-05"; + version = "2024-06-14"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "3e8fceb2b030100857ee72741a8f48c9a1d8595e"; - sha256 = "0j6i7rv78xxkmqgmi4w7yqhj4rng7p2skbgs8gq8jcb3k6ghcs3q"; + rev = "1db56afda3e85791a14b096e483dfda699dd9163"; + sha256 = "13mx0p3ia7wajvjk1gvyhnv2v5z900bjr4c82b1wbdpmv68z69yv"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -7995,12 +8043,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2024-06-10"; + version = "2024-06-18"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "4d38bece98300e3e5cd24a9aa0d0ebfea4951c16"; - sha256 = "0aj6bxm43bwgfajg23z6kj32kmihizfg7hs75fjxyzvian2w27km"; + rev = "5c33bf1f708ac8cb839469e1a03d45987fec305c"; + sha256 = "1mdqckjmk1hdxgipa2qwncwmbv6ad8mi5cqisinkz7610k55sxpm"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -8259,12 +8307,12 @@ final: prev: nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2024-05-17"; + version = "2024-06-13"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "9257c3f3ebf7608a8711caf44f878d87cd40395d"; - sha256 = "1nppzm8v7akpz38f9zr22m2281hdxvhxiy8a46kprrhw2030j4k1"; + rev = "fd334e5ad0c616987d1b9114890a59c97165cf83"; + sha256 = "1s8dr79mnqw2ii54myi43fy3knd2i28c2k5g59fln2m8g90j21lg"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -8415,12 +8463,12 @@ final: prev: nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2024-06-11"; + version = "2024-06-19"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "9a7ad2ff7a7ea81016aca2fc89c9b2c1a5365421"; - sha256 = "02jpij2aqg651m7nn1bzncbj49qgpvz78v2627isndyvxlifn0pd"; + rev = "66ae8748fd4e8550c8b17cf115c9739aea1e4067"; + sha256 = "0hll69cjhgjnbyh6xqvk9xk6pr8fna9h1rj4nz3fkmq57iwzs812"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -8499,12 +8547,12 @@ final: prev: nvim-ts-autotag = buildVimPlugin { pname = "nvim-ts-autotag"; - version = "2024-06-10"; + version = "2024-06-11"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-ts-autotag"; - rev = "2692808eca8a4ac3311516a1c4a14bb97ecc6482"; - sha256 = "10cfvdpp6ml6cm64wi6xvcfhgjap526ws94nkjrii22fh318av4p"; + rev = "06fe07d7523ba8c755fac7c913fceba43b1720ee"; + sha256 = "1k23jy33abcxc84qgkw68mzbcl8fxpvg8p5phh5pgvp5n32aspbz"; }; meta.homepage = "https://github.com/windwp/nvim-ts-autotag/"; }; @@ -8631,12 +8679,12 @@ final: prev: obsidian-nvim = buildVimPlugin { pname = "obsidian.nvim"; - version = "2024-06-04"; + version = "2024-06-17"; src = fetchFromGitHub { owner = "epwalsh"; repo = "obsidian.nvim"; - rev = "c6bd6d93e4724ac2dc0cae73ebe1d568bf406537"; - sha256 = "0jkr1mwl2bi0nqr41f5vjm4wwvypwbmm20bznjmah1dq6sjhb11d"; + rev = "7e087da48bd88fb3a6c6229a97713ac35694337a"; + sha256 = "1dgqm7qjnkgz9wm8fv5j6q2f46ip9hac1csbwxv7lqavi1xw9p0l"; }; meta.homepage = "https://github.com/epwalsh/obsidian.nvim/"; }; @@ -8667,24 +8715,24 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2024-06-09"; + version = "2024-06-15"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "22f34582a4eb1fb221eafd0daa9eb1b2bacfb813"; - sha256 = "1zxa89b375vc7zjnbg42fcc7npr2gmpk2d04ld9yqkapy0q8jds0"; + rev = "1f0029d5283443bad9a818fd7d9db253404bf8aa"; + sha256 = "1il6jy83d56lxlgxyklvl76dxk7iikq2941jl6ihbf0v5lbig472"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2024-06-10"; + version = "2024-06-16"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "a62ec258d1c99d354b256a2ec39733ad9109d808"; - sha256 = "1bn2g3argjfiiq3arrdhplm0sx47p1g0yl9vz2xwgxsy7rsvd3yi"; + rev = "64a3a555b40d96faae488ed6cf5d0f8b38520891"; + sha256 = "1wmg72r6ydmrgiy4c8jv8fpgkf2wwxpyq7zv4a2bx4imhly4zccx"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -8860,12 +8908,12 @@ final: prev: orgmode = buildVimPlugin { pname = "orgmode"; - version = "2024-06-09"; + version = "2024-06-14"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "ac9a6e0eac2d298a27ab4f59511e60897cb61a08"; - sha256 = "1c0x4d33gnzpj7kwl0xp00v291g76zavq2bg3f07rzw6wlp4bnx9"; + rev = "cc51c1914e3f0bf20bd543a7176df5bab12ec247"; + sha256 = "1pr5fh2pr3awmxvaw0n811165nf9p3n0pp2cg4f8qs15y6ncbkq7"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -8908,12 +8956,12 @@ final: prev: overseer-nvim = buildVimPlugin { pname = "overseer.nvim"; - version = "2024-06-09"; + version = "2024-06-14"; src = fetchFromGitHub { owner = "stevearc"; repo = "overseer.nvim"; - rev = "6271cab7ccc4ca840faa93f54440ffae3a3918bd"; - sha256 = "04i64hih371psp3abav4vv046fk9ykhr436rh3yxx3wcf46k74px"; + rev = "d78fa84c06d37b1eb3bd42b4b5467c7476e74589"; + sha256 = "130y8gjbyr3bg9l24s0iiiv40wpqq48axzvbjpraalca181zkhcd"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/overseer.nvim/"; @@ -9004,7 +9052,7 @@ final: prev: }; parpar-nvim = buildVimPlugin { - pname = "parpar-nvim"; + pname = "parpar.nvim"; version = "2023-09-12"; src = fetchFromGitHub { owner = "dundalek"; @@ -9041,24 +9089,24 @@ final: prev: persisted-nvim = buildVimPlugin { pname = "persisted.nvim"; - version = "2024-06-03"; + version = "2024-06-15"; src = fetchFromGitHub { owner = "olimorris"; repo = "persisted.nvim"; - rev = "e50e0b65b06298a7b937a3d42550a4bc27d13ce7"; - sha256 = "18vz2i22zf9bl3svhzj4gb9zbpc1l8hxxdycz9xxw81g4nxm26mv"; + rev = "0a9eebf5cc92b1113a382a660ee73f21ffd62ae7"; + sha256 = "0gyacxix6m9wpzlm6a5p1s2aa9916750fd8chgkga8m3q34bdq9a"; }; meta.homepage = "https://github.com/olimorris/persisted.nvim/"; }; persistence-nvim = buildVimPlugin { pname = "persistence.nvim"; - version = "2024-05-16"; + version = "2024-06-12"; src = fetchFromGitHub { owner = "folke"; repo = "persistence.nvim"; - rev = "5fe077056c821aab41f87650bd6e1c48cd7dd047"; - sha256 = "1saanhqa9ldm1xlq5w28w72yxkwh60cay3cazi62zwmph0mgygp9"; + rev = "95d03ad5450389ad7dc2a0fab14ebb3d46bc2c96"; + sha256 = "1hmwrr15w8ybvy8m2jrn34n5dq2svklf498k7j431mw9y1knj68v"; }; meta.homepage = "https://github.com/folke/persistence.nvim/"; }; @@ -9439,11 +9487,11 @@ final: prev: rainbow-delimiters-nvim = buildVimPlugin { pname = "rainbow-delimiters.nvim"; - version = "2024-06-10"; + version = "2024-06-14"; src = fetchgit { url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - rev = "073e45546acaff6b4248e3faea8e67b399d3e864"; - sha256 = "1q88b1l3rcvb4dcs95bxnsb1yqq9g3pg368lpp4pz6m18v78y2ip"; + rev = "5c9660801ce345cd3835e1947c12b54290ab7e71"; + sha256 = "0jm02hp7g5pqfrv2jr93gd4zz8v33w4cb220m7akq07gwhj7fag8"; }; meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; }; @@ -9522,12 +9570,12 @@ final: prev: refactoring-nvim = buildVimPlugin { pname = "refactoring.nvim"; - version = "2024-03-15"; + version = "2024-06-15"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "d2786877c91aa409c824f27b4ce8a9f560dda60a"; - sha256 = "0s0pd2b9hnz4rbgva1xad7lzg8z8mq7j8x15ppnrw6bplx5m35jd"; + rev = "e6b10b2346bd7e469a5f17099775ad906da153ae"; + sha256 = "1m0ah5f1w18g7y78ra78yczzpdb4giwk9hsig3379f26xz5fknp2"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -9546,12 +9594,12 @@ final: prev: remember-nvim = buildVimPlugin { pname = "remember.nvim"; - version = "2023-06-12"; + version = "2024-06-13"; src = fetchFromGitHub { owner = "vladdoster"; repo = "remember.nvim"; - rev = "b7613e14692478a0428dc69ca380b6fbb2448e60"; - sha256 = "1kki1v7bdixkyn53ryqsz4r53j68s9csfdxg8ffchkd7qamwzlsw"; + rev = "1b5176283bcf91d052b5755d9ba6e8ce14dfc95b"; + sha256 = "128ci86rypdnmv2c93qj04pmhdx70b7vdcnzgcr417dmn5212s2l"; }; meta.homepage = "https://github.com/vladdoster/remember.nvim/"; }; @@ -9702,12 +9750,12 @@ final: prev: rustaceanvim = buildNeovimPlugin { pname = "rustaceanvim"; - version = "2024-06-07"; + version = "2024-06-18"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "rustaceanvim"; - rev = "00a9508e8f95b8f8f9f60125a2082a53e0740987"; - sha256 = "1mi11cfcg19yz52g4qz2g47647awq6lylcw3a8rn8bmfis8ph33f"; + rev = "14a5a4bdf23d1971d1a6386b73b89e57590a5e7d"; + sha256 = "098zlwlrdw5icvns5a7qp4bl2ly1imv2fm3981i9wqdvvvzqmn3k"; }; meta.homepage = "https://github.com/mrcjkb/rustaceanvim/"; }; @@ -9738,12 +9786,12 @@ final: prev: satellite-nvim = buildVimPlugin { pname = "satellite.nvim"; - version = "2024-02-16"; + version = "2024-06-11"; src = fetchFromGitHub { owner = "lewis6991"; repo = "satellite.nvim"; - rev = "40eb89743e3439c66192abfc31eb3280622a5d3c"; - sha256 = "1zi3m7zhjl9naggmq9z81x9lfvahjs9bmp43d6b1p1idxa716pij"; + rev = "777ed56e1ef45ec808df701730b6597fc4fb0fbc"; + sha256 = "16byf6fa7amxad3gkwi2xyb2i5q5g7c6q0phmf15pqc1skxnr0nk"; }; meta.homepage = "https://github.com/lewis6991/satellite.nvim/"; }; @@ -9931,24 +9979,24 @@ final: prev: slimv = buildVimPlugin { pname = "slimv"; - version = "2023-07-01"; + version = "2024-06-17"; src = fetchFromGitHub { owner = "kovisoft"; repo = "slimv"; - rev = "f4775f044cbb28ff4a444143cd2e6712b3694f21"; - sha256 = "1k67h7i07xab8f5a0qn0psrmj1xbm42w03gh5kmal8ay3maqvscd"; + rev = "e2c2bbb698c89de8c8aa91ad9ab1fd40ef6add00"; + sha256 = "0da4hcqb2936jby7zx84i0i2qxxg4wfkcfx4xx1fa92bgv79s0mx"; }; meta.homepage = "https://github.com/kovisoft/slimv/"; }; smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2024-06-07"; + version = "2024-06-15"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "d99162711fa619595b8cb0e1f0981e3d301debc9"; - sha256 = "0lmwrsxxj0sys4kkz1ayi4rmkjk030bhnhkbic3jlzkj1kla2fwp"; + rev = "3d9fa9e4b31c30d6b328f2447a4dc7dceffbc2ea"; + sha256 = "1pvi03f98f6lys6l3jlra9l95dpavdc9y8ghl91mlwvlglrnwjrk"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -10292,12 +10340,12 @@ final: prev: statuscol-nvim = buildVimPlugin { pname = "statuscol.nvim"; - version = "2024-06-05"; + version = "2024-06-15"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "statuscol.nvim"; - rev = "2eaca29ef3079dedc484dbd7824ad723e8d35676"; - sha256 = "0mnqwy0mnl1wh4pp73y38kbxrwnd53wvci2zy7pdlyh7damsq31i"; + rev = "d6f7f5437c5404d958b88bb73e0721b1c0e09223"; + sha256 = "0qv4prxfgzn740jjhscafi7dgiirm1w4h2f4ph74j7x28yk94dlk"; }; meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/"; }; @@ -10376,12 +10424,12 @@ final: prev: sved = buildVimPlugin { pname = "sved"; - version = "2024-05-28"; + version = "2024-06-18"; src = fetchFromGitHub { owner = "peterbjorgensen"; repo = "sved"; - rev = "2609d23030a5149b47e49cfabe53196d65ba80bf"; - sha256 = "1b1njhm18j6daljn08a58rfyjwywh2kvrhynj6ip1riqzfznvzlb"; + rev = "3edf1030c28e3a5e3b01aea7f94fa04ac4f0e48a"; + sha256 = "15idmbzbgmvh75l75y6zkhpa6f72978rxqflfr08apz7g56zl9kl"; }; meta.homepage = "https://github.com/peterbjorgensen/sved/"; }; @@ -10703,12 +10751,12 @@ final: prev: telescope-frecency-nvim = buildVimPlugin { pname = "telescope-frecency.nvim"; - version = "2024-06-01"; + version = "2024-06-19"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "1f2e9b07ac7f927f36c17313071cc12759670767"; - sha256 = "0m0bjxdxp6av4i86s0q3ji2dmxfyid1g32h76z19n4dwh9827fgy"; + rev = "78570e237c8b2494dd74ffe196fbd01d0c9e5460"; + sha256 = "1vsfsi39i8f8x6cbsrq491s54p1gh8fh3a0vjgik7x07a9i21l6h"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -10933,12 +10981,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2024-06-09"; + version = "2024-06-15"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "f12b15e1b3a33524eb06a1ae7bc852fb1fd92197"; - sha256 = "12r9sqrwxsmpc9gvckp7n4j55127hkwg9788chjgjrszj90sj8n2"; + rev = "c392f1b78eaaf870ca584bd698e78076ed301b26"; + sha256 = "14k0z9k0d8krs50filg8d38fkcpxv4gy9lilgfj2wrvssd6c9vqy"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -11137,12 +11185,12 @@ final: prev: tmux-nvim = buildVimPlugin { pname = "tmux.nvim"; - version = "2024-06-08"; + version = "2024-06-17"; src = fetchFromGitHub { owner = "aserowy"; repo = "tmux.nvim"; - rev = "3787752613777b96111ba02e24cbcfdcc6ebd57a"; - sha256 = "1wlx6lmw2nkijja530yslqdv8dwqjd8sqasfgmchhpd95fpfb7ny"; + rev = "da618e075f42793400c3ee1e59ef3ebada2cb23c"; + sha256 = "00jbds0fg8aqdfq2swjlch22x6j2ispmj5q11jqgp0h99xdxmvr1"; }; meta.homepage = "https://github.com/aserowy/tmux.nvim/"; }; @@ -11161,12 +11209,12 @@ final: prev: todo-comments-nvim = buildVimPlugin { pname = "todo-comments.nvim"; - version = "2024-06-10"; + version = "2024-06-12"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "9c104cf7868f1c739b43a07e5593666cc9de2d67"; - sha256 = "0js766asdwhimcq1yr1ql02d5jyrj49178cq2yjpi5bbn61b163x"; + rev = "51e10f838e84b4756c16311d0b1ef0972c6482d2"; + sha256 = "06kbz52ddr0nkvzm92c71wghm1kngwa3bnn329k6wl13qy2j7i09"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; @@ -11198,12 +11246,12 @@ final: prev: tokyonight-nvim = buildVimPlugin { pname = "tokyonight.nvim"; - version = "2024-06-10"; + version = "2024-06-13"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "719713b0515c56fcb66ed2c1acd385d3e1de7895"; - sha256 = "1kb13ymdpzdcclj3clwqr8ah7np9s81zcp4ddr73ag3fngddasgs"; + rev = "81c867c5f638597a82c82094dcb90ed42444dabc"; + sha256 = "0bq6yjzv7sza4f2mp5x7bv19pg0mj5j6xh3crz4q20l16f2i3hag"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -11295,12 +11343,12 @@ final: prev: trouble-nvim = buildVimPlugin { pname = "trouble.nvim"; - version = "2024-06-11"; + version = "2024-06-14"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "483eb2d7590b3b87cf159e3bdf96170eaaa361e8"; - sha256 = "1n5xmx6w5vza45flh5zv4gzhacj3lc00ycz8fral7fh82hqb8igf"; + rev = "58a3acfc6d8d819324dab4c87068596319032e64"; + sha256 = "0vs7s7byz80mdww86icvgk7ksvbbgm67afiw8vn19ghf2hr78s8r"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -11379,12 +11427,12 @@ final: prev: typescript-tools-nvim = buildVimPlugin { pname = "typescript-tools.nvim"; - version = "2024-01-16"; + version = "2024-06-18"; src = fetchFromGitHub { owner = "pmizio"; repo = "typescript-tools.nvim"; - rev = "c43d9580c3ff5999a1eabca849f807ab33787ea7"; - sha256 = "1af90ydixj8lpm0q6kkd7yv61wpyd572vgb44a4jpfbsaxhl75wj"; + rev = "3f942ec187523d1d82f813106ceea9be9dac5287"; + sha256 = "0yr8vmfq6rm7xd39jig1k6fjqhzb7pi0x9iy9mv5vvixj4drz21i"; }; meta.homepage = "https://github.com/pmizio/typescript-tools.nvim/"; }; @@ -11475,12 +11523,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2024-06-11"; + version = "2024-06-18"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "a45fc88fb1a7fd3d00d7fc6b16ece53dcc386d07"; - sha256 = "1rr9b5014y5rwwiajanjd02wxws83220sm7cfcrln2cw9bn4ld69"; + rev = "e354912fe85c39ae0b148562ddf31aa622e24638"; + sha256 = "1k17nkcdx5xlsw2r6izsyh1fjjfa9mj1v77yd00wznibczd9jnkq"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -11595,12 +11643,12 @@ final: prev: vim-DetectSpellLang = buildVimPlugin { pname = "vim-DetectSpellLang"; - version = "2024-06-10"; + version = "2024-06-15"; src = fetchFromGitHub { owner = "konfekt"; repo = "vim-DetectSpellLang"; - rev = "548714ade77d1c062b3a876deddb05fd8718131e"; - sha256 = "12w5lmr8c1fq4bjajq17f9hzg5mna98qbn3f9pmc116q15r7p69w"; + rev = "c5ae86e2b010fc4e89d16ae0512b5f01a38dfb3c"; + sha256 = "1m0r0vazqrfg0ap4q4iirgf8j75d4hrn9xa3v75kq5ab0agcihgr"; }; meta.homepage = "https://github.com/konfekt/vim-DetectSpellLang/"; }; @@ -11919,12 +11967,12 @@ final: prev: vim-airline = buildVimPlugin { pname = "vim-airline"; - version = "2024-05-20"; + version = "2024-06-16"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "16c1638f93f93fad41da8cb6eef2bcd8eed0a57a"; - sha256 = "13pxm4mh1sar6332z7w0cimbdcm5hg8yi7p86byg8hp1wwpm0g91"; + rev = "02894b6ef4752afd8579fc837aec5fb4f62409f7"; + sha256 = "07jxqibg8zdir3w5lq2ibjvf6zw9b9386y9pwybgzg91c9pvd9xk"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -12183,12 +12231,12 @@ final: prev: vim-better-whitespace = buildVimPlugin { pname = "vim-better-whitespace"; - version = "2024-01-13"; + version = "2024-06-12"; src = fetchFromGitHub { owner = "ntpeters"; repo = "vim-better-whitespace"; - rev = "029f35c783f1b504f9be086b9ea757a36059c846"; - sha256 = "189s0bhavrsv5im810cdl2723wfjr0k267fl83m8zy5mc8ir156k"; + rev = "86a0579b330b133b8181b8e088943e81c26a809e"; + sha256 = "19717vah1j37b2yqyk3wbwv71ffsh6qgvjzxzgvfljnp8ib0zrls"; }; meta.homepage = "https://github.com/ntpeters/vim-better-whitespace/"; }; @@ -13143,12 +13191,12 @@ final: prev: vim-flog = buildVimPlugin { pname = "vim-flog"; - version = "2024-05-25"; + version = "2024-06-13"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "2f0836128cac9368176a564b237382d1766723f0"; - sha256 = "1nwxia9dcj7kqai1ig3a1z1bkzk6dx56bdr1g070kn5pli7w051b"; + rev = "255631abf7ea132393fc7dd745d6911c37ac6a4c"; + sha256 = "0k92fs7wq1yhbwgf29awv70k06nb36x375b4rjwc4sf559i223mc"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -13203,12 +13251,12 @@ final: prev: vim-fugitive = buildVimPlugin { pname = "vim-fugitive"; - version = "2024-05-19"; + version = "2024-06-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "4f59455d2388e113bd510e85b310d15b9228ca0d"; - sha256 = "0q2ymynp6xjha14g52i01in1lqkhkdvcjl93fp2zqjzcg5pns8wz"; + rev = "64d6cafb9dcbacce18c26d7daf617ebb96b273f3"; + sha256 = "1ddab7xflb08gy168042k8w35z84hdvrbz5kx37v96skayq30rni"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -13335,12 +13383,12 @@ final: prev: vim-glsl = buildVimPlugin { pname = "vim-glsl"; - version = "2022-05-10"; + version = "2024-06-15"; src = fetchFromGitHub { owner = "tikhomirov"; repo = "vim-glsl"; - rev = "bfd330a271933c3372fcfa8ce052970746c8e9dd"; - sha256 = "0nqpg95mh5z0wmiqvc8cfzq1gb99ximc1gbz9bv3x7239f66z5vn"; + rev = "40dd0b143ef93f3930a8a409f60c1bb85e28b727"; + sha256 = "0m7c0z7f4zz4vnl0ls71grnish7m07kqz9n2jsrm6hsq5pjn36bp"; }; meta.homepage = "https://github.com/tikhomirov/vim-glsl/"; }; @@ -13359,12 +13407,12 @@ final: prev: vim-go = buildVimPlugin { pname = "vim-go"; - version = "2024-06-05"; + version = "2024-06-11"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "b5fc46841e818dc118abb5da650b00bd93355290"; - sha256 = "1668szf6jdz1y4nmdb61pys2znz2512hnvky15w2kdhb3mq6nl0j"; + rev = "665ef24144b748b842a0a27c237e63f3447f901a"; + sha256 = "1yh9phdrax4b5v9bb37n8bzxbi6a8ca422c90f73r9cwgvfx4i2v"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -13961,12 +14009,12 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2024-06-05"; + version = "2024-06-17"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "152d4f62e16140183d6b4500b689f6bf851a6029"; - sha256 = "02dxasq5yqqvhk32f2pzsmr2akc1l896qbswm8hazxd0bqjl3i81"; + rev = "5ad2c6b625d40d929d58cddeca9c459d5f380755"; + sha256 = "0bmm3z4njnajv1qzqam9i9lfsaxfw8n792wzdyg7yklp534zaxxn"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; @@ -14225,12 +14273,12 @@ final: prev: vim-lsp-settings = buildVimPlugin { pname = "vim-lsp-settings"; - version = "2024-06-10"; + version = "2024-06-13"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "2cad696eb76755ff00415d97ce4bd5c82d6e2fb3"; - sha256 = "0bkjg5w0856621rbip2wjqwpzxpfpfn00a15w54g7am56pjq4s7w"; + rev = "3debb34bf6fac8e1cb195d9e89a23b7ea98bee47"; + sha256 = "0pdw13m2xn4fih0kk9acbhlgq660a7p6c7ppp4jb310jf0l3xg3i"; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; }; @@ -14982,12 +15030,12 @@ final: prev: vim-plug = buildVimPlugin { pname = "vim-plug"; - version = "2024-06-01"; + version = "2024-06-19"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "db37a8a29a61a55808fb7c6e1af63940d5478199"; - sha256 = "065xlfp4rfqsqdsns6gxjxbdq2aj38xra34k26rjrhma9lll3alq"; + rev = "d863d0783236e1a46291f7791347740891186154"; + sha256 = "0h8np5gfqa1r2089sxmrpfg5rfggsms3d688c2d7fb9vsba8ghhi"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -15102,12 +15150,12 @@ final: prev: vim-prosession = buildVimPlugin { pname = "vim-prosession"; - version = "2024-03-07"; + version = "2024-06-13"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-prosession"; - rev = "1cb2eadde0b79f49eb4b5a54cc78735aea33cbca"; - sha256 = "01ky6lgxcb9ghgmd8bw0ja6rvd0hsds8fzdpa7dn8j6x7yl4mcbv"; + rev = "4b8323d4e9b74afe9132a34b2d7ea6cfa9461550"; + sha256 = "0xhbqphjldw5ygxmblx9r2zgbda1dgc2h0py6h05ss43cdvzikwa"; }; meta.homepage = "https://github.com/dhruvasagar/vim-prosession/"; }; @@ -15654,12 +15702,12 @@ final: prev: vim-snipmate = buildVimPlugin { pname = "vim-snipmate"; - version = "2024-06-06"; + version = "2024-06-16"; src = fetchFromGitHub { owner = "garbas"; repo = "vim-snipmate"; - rev = "8f785fd0bcdc43e5e5402eb15f1cf287ace597dd"; - sha256 = "1g9vdmq4dknhn5alr0lgrgcjv26m1vyzspsfz2mdyw81lc5jnsp2"; + rev = "673e686c46149d947283620847ea64deb2a0be6c"; + sha256 = "08j897l9gpna5x969mgc137vy8ajdq7i8mvz2xwiaf5x13b8db4c"; }; meta.homepage = "https://github.com/garbas/vim-snipmate/"; }; @@ -15726,12 +15774,12 @@ final: prev: vim-spirv = buildVimPlugin { pname = "vim-spirv"; - version = "2024-06-11"; + version = "2024-06-19"; src = fetchFromGitHub { owner = "kbenzie"; repo = "vim-spirv"; - rev = "a2c9040c868d64f1ae92954055cda9719d14b21b"; - sha256 = "0adh47z8x86pa3hyvvlb3g7i947xgfmwz45np70ijyrjkrzg96yp"; + rev = "64b8125fdca0e67cfe7c415f133809a4d23eb8b5"; + sha256 = "01r9wz4sc7qlaibi2hhrymcgzrfjchif3cn9w1q71prbvchjhpnm"; }; meta.homepage = "https://github.com/kbenzie/vim-spirv/"; }; @@ -15918,12 +15966,12 @@ final: prev: vim-teal = buildVimPlugin { pname = "vim-teal"; - version = "2021-01-05"; + version = "2024-06-19"; src = fetchFromGitHub { owner = "teal-language"; repo = "vim-teal"; - rev = "d2aa107b257879e774680792a2aebaf9cd5742e0"; - sha256 = "02ag8vhmh1zj99vhvqslfnasw9i5psx396r7qyag0yyzyp9ynzkc"; + rev = "912602f9fab602234a55ad8b0f5f590f657d3e66"; + sha256 = "0lqr6ss3pvsd9q3w88vy3qf456939crddv17jhc1ynib90ngb59c"; }; meta.homepage = "https://github.com/teal-language/vim-teal/"; }; @@ -15967,12 +16015,12 @@ final: prev: vim-test = buildVimPlugin { pname = "vim-test"; - version = "2024-05-30"; + version = "2024-06-15"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "6acc7d96487abaaa57a19b0d43efaea6633d6bb7"; - sha256 = "02v57iljw8w42gxg31z48iiq38pgyygmniq1qbaxiyh8rvyvcrq9"; + rev = "79c14672b0bfec6f92c626dc331326fdbed62b4f"; + sha256 = "0vbfnqggh2lwcpfx110phlasmdqq66fdjcgvanydj1vqpvfn8fsa"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -16147,12 +16195,12 @@ final: prev: vim-tpipeline = buildVimPlugin { pname = "vim-tpipeline"; - version = "2024-04-12"; + version = "2024-06-13"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "5dd3832bd6e239feccb11cadca583cdcf9d5bda1"; - sha256 = "14f4fjjjjml3rbh99385xzkkcfqa7awa9bjc191qvvvycqipp0hw"; + rev = "f59f144b73e79aae7a73bb86bf527e79ad86de8f"; + sha256 = "0h16bs65ic5iwry8mq22v4xkn1wc2a6xin0vqn5qnlg38q7fgpn1"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -16483,12 +16531,12 @@ final: prev: vim-xkbswitch = buildVimPlugin { pname = "vim-xkbswitch"; - version = "2024-03-12"; + version = "2024-06-19"; src = fetchFromGitHub { owner = "lyokha"; repo = "vim-xkbswitch"; - rev = "42ef558e792e35600e608d1cd7ad8a760f157269"; - sha256 = "0aim4bdznk4iklz67nrbw67x3vjv18nmiqy2730b75kl88v0n6iw"; + rev = "bcd79dd6a1b74efe1a16c70fe6a06bfc6a99e543"; + sha256 = "1ym08zy9lbqakflbif48kvgirfd4fajpaynmx8wgp6q2xhks6xvd"; }; meta.homepage = "https://github.com/lyokha/vim-xkbswitch/"; }; @@ -16712,12 +16760,12 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2024-06-07"; + version = "2024-06-13"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "0587a064f675fd85cdfb8a76d6a3ff698af3944b"; - sha256 = "0wg89y12fir6wndcj7niq454nh0d65lv55r24jkcb6gfm401jvpp"; + rev = "8ed94566e6fe3f5b163131dc374d224d2d320db7"; + sha256 = "13na944xyy8cj6pck6af4p9hhrr3811pa43zmmj42bxrf5kpbqds"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -16796,12 +16844,12 @@ final: prev: vista-vim = buildVimPlugin { pname = "vista.vim"; - version = "2024-04-06"; + version = "2024-06-11"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "04fa99afe865b16324af94fd8a8391121117d8f7"; - sha256 = "0gjma1ba0ds0dznhqdajmhib1i49b08iv7hf0c4vjz833kcjagqj"; + rev = "c07585b588071adc8e9670becadb89307153e4d1"; + sha256 = "0gpa38jn41pa550l30kvb5wb04bac45sl4dxbwhqhnay42wc90fk"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -16892,12 +16940,12 @@ final: prev: wiki-vim = buildVimPlugin { pname = "wiki.vim"; - version = "2024-06-07"; + version = "2024-06-17"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki.vim"; - rev = "5943633f66d8c50834baebd0354d8248df171be6"; - sha256 = "19fm7s3qyixfgpj3hpd157s8f8sgq1199rdxzbvq2yvg6h9wbwa1"; + rev = "da5f1e0a5acd70d4e44c54b4d6286fd8f97742ab"; + sha256 = "0aiy18yw2kkj1xb7ixlw86xlxpn1v1pqa19d05kr4jnbabdajcr4"; }; meta.homepage = "https://github.com/lervag/wiki.vim/"; }; @@ -17145,14 +17193,14 @@ final: prev: zenbones-nvim = buildVimPlugin { pname = "zenbones.nvim"; - version = "2024-05-21"; + version = "2024-06-16"; src = fetchFromGitHub { - owner = "mcchrish"; + owner = "zenbones-theme"; repo = "zenbones.nvim"; - rev = "5746d0277439fe264108a2ecace83f09f1b57e1f"; - sha256 = "0wkc3flhb961q7h09zy8lbq9j851s6fx159bc7gbipx4p33l80kb"; + rev = "e9ba8305f65524f9355515cdd8704b2c6ba2def6"; + sha256 = "0bmj5b4n0rj7i1nh9lccszqv3jbcdcjw5gi6v010d3cf312rkda6"; }; - meta.homepage = "https://github.com/mcchrish/zenbones.nvim/"; + meta.homepage = "https://github.com/zenbones-theme/zenbones.nvim/"; }; zenburn = buildVimPlugin { @@ -17229,12 +17277,12 @@ final: prev: catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2024-06-10"; + version = "2024-06-14"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "cc8e290d4c0d572171243087f8541e49be2c8764"; - sha256 = "0h8kkn27siyifhynw81h8ah2jsvpz3h7xvxzzwms7zgxhsj94k0r"; + rev = "c0bea773a09e49e123136b099bce9ddc1bf395d2"; + sha256 = "15ccqv7r382rk8l50ims0a9m5kn4kzgd3bar5427w12skayp0d09"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -17253,24 +17301,24 @@ final: prev: dracula-vim = buildVimPlugin { pname = "dracula-vim"; - version = "2024-04-14"; + version = "2024-06-13"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "28874a1e9d583eb0b1dfebb9191445b822812ea3"; - sha256 = "1answqiln7pg1f0cpgknjrnnzk4cslhn19vnv2hvji9xm45lvvbv"; + rev = "ada471d684d4acfe803c4e033d7c3ae5d7252db6"; + sha256 = "1w1bxg532l1khgb285xs4y6l40bj4dq0kdh6iwfihw6x0mqsrv1j"; }; meta.homepage = "https://github.com/dracula/vim/"; }; embark-vim = buildVimPlugin { pname = "embark-vim"; - version = "2024-02-14"; + version = "2024-06-17"; src = fetchFromGitHub { owner = "embark-theme"; repo = "vim"; - rev = "d0ce0502c83864721c92d0723dde10f38a09c714"; - sha256 = "01bx2hkxmqi9401n327m9k63m8n2jyqklgl3xkv0w3h0a16wc7h6"; + rev = "2ab955cb0b5eaf0b00cc5064234064f02822f458"; + sha256 = "0ncr3kf7s0j2ghr0321vajsfphs4cp710xxrwdhphfxdpzxjlsbw"; }; meta.homepage = "https://github.com/embark-theme/vim/"; }; @@ -17325,12 +17373,12 @@ final: prev: nightfly = buildVimPlugin { pname = "nightfly"; - version = "2024-06-11"; + version = "2024-06-19"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "1b33693163db64ebba44eb22f30a7fe4c1c467d9"; - sha256 = "055rivg97ccc3f2w4vhq93i9rqrhxf5cqvdwqp9cqxiaab6fhnga"; + rev = "b20ee4855bd3cb9fbe0615cf0e27bbb8b04df13e"; + sha256 = "1wcvnx0s328md2zil1gwxqsl19jin5vmpxvzajjx52yxsrgm0qrm"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; }; @@ -17349,12 +17397,12 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2024-06-09"; + version = "2024-06-15"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "dff8115670efc5051e5db9fef4660b2ceae3a26a"; - sha256 = "032chcri6hi9x01lpyi1qdsxw8qiw2nnpnzpsf1vcgydnkfism20"; + rev = "75a0044e5f4d164d93557fd49863e088f0ecf749"; + sha256 = "1md8gsibb1224df6qi2vnyxp5ja51vfppdziply33zdlh7qa6ycc"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; @@ -17456,17 +17504,4 @@ final: prev: }; - nvim-genghis = buildVimPlugin { - pname = "nvim-genghis"; - version = "2024-05-21"; - src = fetchFromGitHub { - owner = "chrisgrieser"; - repo = "nvim-genghis"; - rev = "7ed82d0d0513946bbc678f326e5750c79a942351"; - sha256 = "sha256-R3YHrcpRJ8bbVctKTWQbouyCYcbKpQ2Sz6NWDOkqLYI="; - }; - meta.homepage = "https://github.com/chrisgrieser/nvim-genghis"; - }; - - } diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index e5369b8539640..c4a0aea589992 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -303,12 +303,12 @@ }; corn = buildGrammar { language = "corn"; - version = "0.0.0+rev=604d73c"; + version = "0.0.0+rev=4646547"; src = fetchFromGitHub { owner = "jakestanger"; repo = "tree-sitter-corn"; - rev = "604d73c38d4c28ca68e9e441ffd405d68cb63051"; - hash = "sha256-ewpLp+se6XTY8aRoz247YlouS1p/kaS7CqVFu412C+Q="; + rev = "464654742cbfd3a3de560aba120998f1d5dfa844"; + hash = "sha256-fI7S+TkI2ofQ/Hal4CJ2HAaeQrjOju1rgJvyc6P3t9k="; }; meta.homepage = "https://github.com/jakestanger/tree-sitter-corn"; }; @@ -325,12 +325,12 @@ }; cpp = buildGrammar { language = "cpp"; - version = "0.0.0+rev=9d412ba"; + version = "0.0.0+rev=7ce8946"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "9d412ba7e597fe158f209da33e60f31b1f0df967"; - hash = "sha256-mMHNRKhfhI+OXmNOf1nlVr7JWmJ8BJMOJdaXqv3pk9w="; + rev = "7ce8946cae4bb25adebe5b50394f702beb007026"; + hash = "sha256-haU0fXNwYh3YaP8VMY1krRHxrGvNkDV4hMcxp5z9TVA="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; @@ -447,12 +447,12 @@ }; djot = buildGrammar { language = "djot"; - version = "0.0.0+rev=ea851b9"; + version = "0.0.0+rev=87bf828"; src = fetchFromGitHub { owner = "treeman"; repo = "tree-sitter-djot"; - rev = "ea851b9cf1a71e475f4e2ac4dc03609a1b9ca56d"; - hash = "sha256-6vekPB1IufGuMhX+n2Ve9EMXqZdX6FlBuI/lh/8/msw="; + rev = "87bf82874c86dcf563f5521069d603ed50e5f0cc"; + hash = "sha256-abAEVbS9hqc1uHx6NxXRBA2SLrCL3gBBPLgAK9Tz3G4="; }; meta.homepage = "https://github.com/treeman/tree-sitter-djot"; }; @@ -503,12 +503,12 @@ }; earthfile = buildGrammar { language = "earthfile"; - version = "0.0.0+rev=b267228"; + version = "0.0.0+rev=b5bdcb5"; src = fetchFromGitHub { owner = "glehmann"; repo = "tree-sitter-earthfile"; - rev = "b2672286174c078eb80cdffc61375d0364e7fafb"; - hash = "sha256-Vyme1ghs61lyitnwukccXbzAOeuiPbS1vvrvT9y1rbs="; + rev = "b5bdcb5813ce0e582fbd8e03eb42c80d3cc8984e"; + hash = "sha256-fhHu8kniYOLhrlHLgfP1NHtBxURrM7GNn51zmPNcTIU="; }; meta.homepage = "https://github.com/glehmann/tree-sitter-earthfile"; }; @@ -1032,12 +1032,12 @@ }; hcl = buildGrammar { language = "hcl"; - version = "0.0.0+rev=e936d3f"; + version = "0.0.0+rev=422cbe1"; src = fetchFromGitHub { owner = "MichaHoffmann"; repo = "tree-sitter-hcl"; - rev = "e936d3fef8bac884661472dce71ad82284761eb1"; - hash = "sha256-lcvs4auZrMb1f9ocrAnLVxX8JnvrPT18LsJBqoNG9Oo="; + rev = "422cbe1d93a8ae3847744b664041fc76876babcd"; + hash = "sha256-PrA/F8IIJDzr2HjX9NToApzbM7nO+NesMcKhOQyOyNU="; }; meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; }; @@ -1165,12 +1165,12 @@ }; hyprlang = buildGrammar { language = "hyprlang"; - version = "0.0.0+rev=e5da7d0"; + version = "0.0.0+rev=c9012d6"; src = fetchFromGitHub { owner = "luckasRanarison"; repo = "tree-sitter-hyprlang"; - rev = "e5da7d0aa44403153e0394d87d9edea4e5bd6609"; - hash = "sha256-jKp880I0XkApB3aFINAPfwn1txuMwalh4NrLUHan3H4="; + rev = "c9012d6dcaaa939f17c21e1fdb17b013d139e6b9"; + hash = "sha256-yI/3DVX2SgvU+mP1KVe7OA8OtqXbaZG9/mTUQjUHCgk="; }; meta.homepage = "https://github.com/luckasRanarison/tree-sitter-hyprlang"; }; @@ -1220,12 +1220,12 @@ }; janet_simple = buildGrammar { language = "janet_simple"; - version = "0.0.0+rev=6bfbaad"; + version = "0.0.0+rev=2a05cab"; src = fetchFromGitHub { owner = "sogaiu"; repo = "tree-sitter-janet-simple"; - rev = "6bfbaadac2ba0da21087041eff85d26129c4c920"; - hash = "sha256-O06k8ruDFf16VVNb44Sz0maRQkrpFgsePzKjPUNteX8="; + rev = "2a05cab838dfec52daa76f10920917d2e69a85bc"; + hash = "sha256-NOnm40FSzTX6Pf4NchH0hYcTwyxX/usEVKxz8KsIlk4="; }; meta.homepage = "https://github.com/sogaiu/tree-sitter-janet-simple"; }; @@ -1452,12 +1452,12 @@ }; liquid = buildGrammar { language = "liquid"; - version = "0.0.0+rev=2933698"; + version = "0.0.0+rev=0419ac4"; src = fetchFromGitHub { owner = "hankthetank27"; repo = "tree-sitter-liquid"; - rev = "293369818da219d97327908aab33707b04b63fd9"; - hash = "sha256-RmpVKvQfk4IQuE3KOTL3nbBS7LSpBlvMpl5JDAAKb5Q="; + rev = "0419ac4868585320eee8615c90b864a1b04ef433"; + hash = "sha256-1FPDsQSPM86NvMrmxIOVnIC65bUOFtKEwRuAtMDbw6M="; }; meta.homepage = "https://github.com/hankthetank27/tree-sitter-liquid"; }; @@ -2099,12 +2099,12 @@ }; qmljs = buildGrammar { language = "qmljs"; - version = "0.0.0+rev=2c57cac"; + version = "0.0.0+rev=febf48a"; src = fetchFromGitHub { owner = "yuja"; repo = "tree-sitter-qmljs"; - rev = "2c57cac27e207425f8df15327884434cb12365a3"; - hash = "sha256-LFOujMN9HMtDqjq2ZOP0oxydQHFS0wvL6ORBqruGXeM="; + rev = "febf48a5b6928600cd8fb2a01254743af550780d"; + hash = "sha256-bRb5h6gBBxbzhxpCxJK8CsQ5BCtPTuKtuZesE/+mDY0="; }; meta.homepage = "https://github.com/yuja/tree-sitter-qmljs"; }; @@ -2165,12 +2165,12 @@ }; rbs = buildGrammar { language = "rbs"; - version = "0.0.0+rev=e5e807a"; + version = "0.0.0+rev=88d8ed4"; src = fetchFromGitHub { owner = "joker1007"; repo = "tree-sitter-rbs"; - rev = "e5e807a50fcd104a2d740d354632fc671700a0bf"; - hash = "sha256-xEh1oHrLPjLT5LSJfOBFgi0nholVr8EFVGlEMPNIxSI="; + rev = "88d8ed487b5449ddda2fc0c4fe23b71cba29ca24"; + hash = "sha256-z7Ls0SXh18bRMX+FpVIzaeeuItyeCTOnGgQ3tDyrtSU="; }; meta.homepage = "https://github.com/joker1007/tree-sitter-rbs"; }; @@ -2209,12 +2209,12 @@ }; rego = buildGrammar { language = "rego"; - version = "0.0.0+rev=23b1da8"; + version = "0.0.0+rev=20b5a59"; src = fetchFromGitHub { owner = "FallenAngel97"; repo = "tree-sitter-rego"; - rev = "23b1da8de9766d766c4f01531e8be14b5c00c493"; - hash = "sha256-h0z060AFhbQJDyJen3yAjMDxi5nY/QX/KPus2y8oFY0="; + rev = "20b5a5958c837bc9f74b231022a68a594a313f6d"; + hash = "sha256-XwlVsOlxYzB0x+T05iuIp7nFAoQkMByKiHXZ0t5QsjI="; }; meta.homepage = "https://github.com/FallenAngel97/tree-sitter-rego"; }; @@ -2253,14 +2253,14 @@ }; roc = buildGrammar { language = "roc"; - version = "0.0.0+rev=7df2c08"; + version = "0.0.0+rev=df46a85"; src = fetchFromGitHub { - owner = "nat-418"; + owner = "faldor20"; repo = "tree-sitter-roc"; - rev = "7df2c0892e62efb81a7504d9799d4e0d0443d241"; - hash = "sha256-8HJH63NcSuqmPviVWO+UE27ydoU7vRXEIXSTjKLSYvk="; + rev = "df46a85abda9f948d38f5d4e3684cec49c42fef2"; + hash = "sha256-4E9ZnMizo+1wnnkYSPNKMkTTyDKRJT+JqtUWoJH45aA="; }; - meta.homepage = "https://github.com/nat-418/tree-sitter-roc"; + meta.homepage = "https://github.com/faldor20/tree-sitter-roc"; }; ron = buildGrammar { language = "ron"; @@ -2397,23 +2397,23 @@ }; snakemake = buildGrammar { language = "snakemake"; - version = "0.0.0+rev=ba1b386"; + version = "0.0.0+rev=5a7b140"; src = fetchFromGitHub { owner = "osthomas"; repo = "tree-sitter-snakemake"; - rev = "ba1b3868eaa960b945593404af9a7c2f296d3643"; - hash = "sha256-7xYevZTRZwhotT2rBigrRT4w5j4TVgyB416a2XWTL+I="; + rev = "5a7b14074bca95b25935e865ca8f1efad32317e4"; + hash = "sha256-mYqftgJOnlWgQZrXaNtFXvjRQgC14PXYyruTVw5J8Zg="; }; meta.homepage = "https://github.com/osthomas/tree-sitter-snakemake"; }; solidity = buildGrammar { language = "solidity"; - version = "0.0.0+rev=1c94fe3"; + version = "0.0.0+rev=ee5a2d2"; src = fetchFromGitHub { owner = "JoranHonig"; repo = "tree-sitter-solidity"; - rev = "1c94fe3d5351dfcff3551ec1f49614cbf758e444"; - hash = "sha256-8UWFIqvd2L0BpVBF/7XLcOyGq5xDd2kJbzfzMpzEZbU="; + rev = "ee5a2d2ba30b487c4bbf613d2ef310a454c09c7c"; + hash = "sha256-q9SFHnxBUDet65WuxxYFS3N8xDHuQz7K2LWED7uSaWA="; }; meta.homepage = "https://github.com/JoranHonig/tree-sitter-solidity"; }; @@ -2553,23 +2553,23 @@ }; svelte = buildGrammar { language = "svelte"; - version = "0.0.0+rev=2c97326"; + version = "0.0.0+rev=7218cf6"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-svelte"; - rev = "2c97326cd96b7c3016c3d249e8dc244c89b4abeb"; - hash = "sha256-rlfLelXjNLtQ2/UACwxB3QO5l+QYFLsfGnBaxTAtgTE="; + rev = "7218cf622b057ae9c530e1f0a7a3ce49806ca55e"; + hash = "sha256-mS4KxJXXb/EzQB5H+Pj+/SEbCTerGFjKiJah8oAGA8c="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-svelte"; }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=13ffaec"; + version = "0.0.0+rev=d657f98"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "13ffaec4068facfff608e3afbdb7a581c185f6a6"; - hash = "sha256-Y1QioBOgrziHsBkbSVt/N1FnjDxYKZK4WulMQcqyrEU="; + rev = "d657f98dd6bbc34cb48438c9e5956f15a6d89f1d"; + hash = "sha256-KE+qjTP3UWKvcLJPYIJmEGeKBWAdpCzgW4/vIccueng="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -2665,12 +2665,12 @@ }; terraform = buildGrammar { language = "terraform"; - version = "0.0.0+rev=e936d3f"; + version = "0.0.0+rev=422cbe1"; src = fetchFromGitHub { owner = "MichaHoffmann"; repo = "tree-sitter-hcl"; - rev = "e936d3fef8bac884661472dce71ad82284761eb1"; - hash = "sha256-lcvs4auZrMb1f9ocrAnLVxX8JnvrPT18LsJBqoNG9Oo="; + rev = "422cbe1d93a8ae3847744b664041fc76876babcd"; + hash = "sha256-PrA/F8IIJDzr2HjX9NToApzbM7nO+NesMcKhOQyOyNU="; }; location = "dialects/terraform"; meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; @@ -2766,12 +2766,12 @@ }; tsx = buildGrammar { language = "tsx"; - version = "0.0.0+rev=4ad3010"; + version = "0.0.0+rev=4f3eb66"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "4ad3010c91d700026d036b5230e2d99ba94ae8a4"; - hash = "sha256-9GCo/xjP6J/tEimx4ce2Qd7XhhbSuWZoTVrysac7BOw="; + rev = "4f3eb6655a1cd1a1f87ef10201f8e22886dcd76e"; + hash = "sha256-f/xk4MdGVvkZv0642aOwA9UFZSb0GvoLu+jgXUp/bhw="; }; location = "tsx"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -2789,23 +2789,23 @@ }; twig = buildGrammar { language = "twig"; - version = "0.0.0+rev=eaf80e6"; + version = "0.0.0+rev=085648e"; src = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-twig"; - rev = "eaf80e6af969e25993576477a9dbdba3e48c1305"; - hash = "sha256-fp7HcdJEFxi/zBFSrM86THwBMpqFwAGugcTVbPk3bd4="; + rev = "085648e01d1422163a1702a44e72303b4e2a0bd1"; + hash = "sha256-87jFYAAnblTeEdlXqTjyiiNee/OgasPam1b2xyKQIHY="; }; meta.homepage = "https://github.com/gbprod/tree-sitter-twig"; }; typescript = buildGrammar { language = "typescript"; - version = "0.0.0+rev=4ad3010"; + version = "0.0.0+rev=4f3eb66"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "4ad3010c91d700026d036b5230e2d99ba94ae8a4"; - hash = "sha256-9GCo/xjP6J/tEimx4ce2Qd7XhhbSuWZoTVrysac7BOw="; + rev = "4f3eb6655a1cd1a1f87ef10201f8e22886dcd76e"; + hash = "sha256-f/xk4MdGVvkZv0642aOwA9UFZSb0GvoLu+jgXUp/bhw="; }; location = "typescript"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -2901,12 +2901,12 @@ }; v = buildGrammar { language = "v"; - version = "0.0.0+rev=7e11a6f"; + version = "0.0.0+rev=e91f8a4"; src = fetchFromGitHub { owner = "vlang"; repo = "v-analyzer"; - rev = "7e11a6f8f369df935664fadd2f0c99d90fe3226f"; - hash = "sha256-zCXfYW8NCsdqKKEMkZUudpCEQM4bLePyCGFS0w86DY0="; + rev = "e91f8a42de7842f24f4ce600754f2b6651985fd4"; + hash = "sha256-38nerR7oZBwxXWd08QqEEMSxAZqXRHCRdLbMEbRhcQI="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/v-analyzer"; @@ -3101,12 +3101,12 @@ }; zig = buildGrammar { language = "zig"; - version = "0.0.0+rev=0d08703"; + version = "0.0.0+rev=7c5a29b"; src = fetchFromGitHub { owner = "maxxnino"; repo = "tree-sitter-zig"; - rev = "0d08703e4c3f426ec61695d7617415fff97029bd"; - hash = "sha256-a3W7eBUN4V3HD3YPr1+3tpuWQfIQy1Wu8qxCQx0hEnI="; + rev = "7c5a29b721d409be8842017351bf007d7e384401"; + hash = "sha256-UXJCh8GvXzn+sssTrIsLViXD3TiBZhLFABYCKM+fNMQ="; }; meta.homepage = "https://github.com/maxxnino/tree-sitter-zig"; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 67ef3f6dc8ffb..2c8147cfce73c 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -457,15 +457,17 @@ dependencies = with self; [ copilot-lua plenary-nvim ]; }; - copilot-vim = super.copilot-vim.overrideAttrs { + copilot-vim = super.copilot-vim.overrideAttrs (old: { postInstall = '' substituteInPlace $out/autoload/copilot/client.vim \ --replace " let node = get(g:, 'copilot_node_command', ''\'''\')" \ " let node = get(g:, 'copilot_node_command', '${nodejs}/bin/node')" ''; - meta.license = lib.licenses.unfree; - }; + meta = old.meta // { + license = lib.licenses.unfree; + }; + }); coq_nvim = super.coq_nvim.overrideAttrs { passthru.python3Dependencies = ps: diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 58d78a0dda5be..09aee5e0dc770 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1,5 +1,4 @@ repo,branch,alias -https://codeberg.org/FelipeLema/cmp-async-path/,, https://github.com/euclidianAce/BetterLua.vim/,, https://github.com/vim-scripts/BufOnly.vim/,, https://github.com/jackMort/ChatGPT.nvim/,HEAD, @@ -132,11 +131,8 @@ https://github.com/laytan/cloak.nvim/,HEAD, https://github.com/asheq/close-buffers.vim/,HEAD, https://github.com/Civitasv/cmake-tools.nvim/,, https://github.com/winston0410/cmd-parser.nvim/,, -<<<<<<< HEAD https://github.com/tzachar/cmp-ai/,HEAD, https://codeberg.org/FelipeLema/cmp-async-path/,, -======= ->>>>>>> 8c49439301ad (vimPlugins.nvim-genghis: init at 2024-05-21) https://github.com/crispgm/cmp-beancount/,HEAD, https://github.com/hrsh7th/cmp-buffer/,, https://github.com/hrsh7th/cmp-calc/,, @@ -347,6 +343,7 @@ https://github.com/lambdalisue/gina.vim/,, https://github.com/f-person/git-blame.nvim/,, https://github.com/akinsho/git-conflict.nvim/,HEAD, https://github.com/rhysd/git-messenger.vim/,, +https://github.com/mikesmithgh/git-prompt-string-lualine.nvim/,HEAD, https://github.com/ThePrimeagen/git-worktree.nvim/,, https://github.com/wintermute-cell/gitignore.nvim/,HEAD, https://github.com/vim-scripts/gitignore.vim/,, @@ -450,6 +447,7 @@ https://github.com/sk1418/last256/,, https://github.com/latex-box-team/latex-box/,, https://github.com/dundalek/lazy-lsp.nvim/,HEAD, https://github.com/folke/lazy.nvim/,HEAD, +https://github.com/folke/lazydev.nvim/,, https://github.com/kdheepak/lazygit.nvim/,, https://github.com/Julian/lean.nvim/,, https://github.com/leanprover/lean.vim/,, @@ -498,6 +496,7 @@ https://github.com/l3mon4d3/luasnip/,, https://github.com/alvarosevilla95/luatab.nvim/,, https://github.com/rktjmp/lush.nvim/,, https://github.com/mkasa/lushtags/,, +https://github.com/nvim-neorocks/lz.n/,, https://github.com/WhiteBlackGoose/magma-nvim-goose/,HEAD, https://github.com/winston0410/mark-radar.nvim/,HEAD, https://github.com/iamcco/markdown-preview.nvim/,, @@ -692,7 +691,7 @@ https://github.com/yamatsum/nvim-nonicons/,, https://github.com/rcarriga/nvim-notify/,, https://github.com/LhKipp/nvim-nu/,HEAD, https://github.com/ojroques/nvim-osc52/,, -https://github.com/julienvincent/nvim-paredit,, +https://github.com/julienvincent/nvim-paredit/,, https://github.com/gpanders/nvim-parinfer/,HEAD, https://github.com/gennaro-tedesco/nvim-peekup/,, https://github.com/yorickpeterse/nvim-pqf/,HEAD, @@ -761,7 +760,7 @@ https://github.com/drewtempelmeyer/palenight.vim/,, https://github.com/JoosepAlviste/palenightfall.nvim/,, https://github.com/roobert/palette.nvim/,HEAD, https://github.com/NLKNguyen/papercolor-theme/,, -https://github.com/dundalek/parpar.nvim,, +https://github.com/dundalek/parpar.nvim/,, https://github.com/tmsvg/pear-tree/,, https://github.com/steelsojka/pears.nvim/,, https://github.com/olimorris/persisted.nvim/,HEAD, diff --git a/pkgs/applications/editors/vscode/extensions/README.md b/pkgs/applications/editors/vscode/extensions/README.md index 656ea1bdb3ae0..12ac4f5f5bb2e 100644 --- a/pkgs/applications/editors/vscode/extensions/README.md +++ b/pkgs/applications/editors/vscode/extensions/README.md @@ -20,6 +20,11 @@ - `description` should mention it is a Visual Studio Code extension. - `downloadPage` is the VSCode marketplace URL. - `homepage` is the source-code URL. + - `maintainers`: + - optionally consider adding yourself as a maintainer to be notified of updates, breakages and help with upkeep. + - recommended format is: + - a `non-nested with`, such as: `with lib.maintainers; [ your-username ];`. + - maintainers are listed in alphabetical order. - verify `license` in upstream. * On commit messages: diff --git a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix index 77f122eb2c58b..d0b27457b68a0 100644 --- a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix @@ -5,7 +5,7 @@ callPackage, }: let - version = "1.52.0"; + version = "1.54.0"; rescript-editor-analysis = callPackage ./rescript-editor-analysis.nix { inherit version; }; arch = if stdenv.isLinux then @@ -21,7 +21,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec { name = "rescript-vscode"; publisher = "chenglou92"; inherit version; - hash = "sha256-3H7JgdmrGMdirVpT08wmwy4G6QLt0H65d3l7o/DuvpI="; + hash = "sha256-c7TJED5YpHRwn7Ooq8sG+N99b7tH6TOgeC9TTYdb4JA="; }; postPatch = '' rm -r ${analysisDir} diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 2a36d78978798..770a646f4d942 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -406,8 +406,8 @@ let mktplcRef = { name = "vscode-neovim"; publisher = "asvetliakov"; - version = "1.15.2"; - hash = "sha256-gurh2DSLH/gM/EZCUACHGlzOf0LPwkc+zYxw7AOcb1E="; + version = "1.17.2"; + hash = "sha256-IA09vUleY7hazu65kadES4iq3XojyJ3sXOOGaw0vJnU="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog"; @@ -484,6 +484,23 @@ let }; }; + banacorn.agda-mode = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "banacorn"; + name = "agda-mode"; + version = "0.4.7"; + hash = "sha256-gNa3n16lP3ooBRvGaugTua4IXcIzpMk7jBYMJDQsY00="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/banacorn.agda-mode/changelog"; + description = "agda-mode on VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=banacorn.agda-mode"; + homepage = "https://github.com/banacorn/agda-mode-vscode"; + maintainers = with lib.maintainers; [ Anillc ]; + license = lib.licenses.mit; + }; + }; + batisteo.vscode-django = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "batisteo"; @@ -542,6 +559,22 @@ let betterthantomorrow.calva = callPackage ./betterthantomorrow.calva { }; + bierner.comment-tagged-templates = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "comment-tagged-templates"; + publisher = "bierner"; + version = "0.3.3"; + hash = "sha256-M2XdMQ2l6oMYiHTdfRJ/n/Ys3LecEPwAozQtLBcn7FY="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/bierner.comment-tagged-templates/changelog"; + description = "VS Code extension that adds basic syntax highlighting for JavaScript and TypeScript tagged template strings using language identifier comments"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=bierner.comment-tagged-templates"; + homepage = "https://github.com/mjbvz/vscode-comment-tagged-templates"; + license = lib.licenses.mit; + }; + }; + bierner.docs-view = buildVscodeMarketplaceExtension { mktplcRef = { name = "docs-view"; @@ -570,6 +603,22 @@ let }; }; + bierner.github-markdown-preview = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "github-markdown-preview"; + publisher = "bierner"; + version = "0.3.0"; + hash = "sha256-7pbl5OgvJ6S0mtZWsEyUzlg+lkUhdq3rkCCpLsvTm4g="; + }; + meta = { + description = "A VSCode extension that changes the markdown preview to support GitHub markdown features"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=bierner.github-markdown-preview"; + homepage = "https://github.com/mjbvz/vscode-github-markdown-preview"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.pandapip1 ]; + }; + }; + bierner.markdown-checkbox = buildVscodeMarketplaceExtension { mktplcRef = { name = "markdown-checkbox"; @@ -594,6 +643,23 @@ let }; }; + bierner.markdown-footnotes = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "markdown-footnotes"; + publisher = "bierner"; + version = "0.1.1"; + hash = "sha256-h/Iyk8CKFr0M5ULXbEbjFsqplnlN7F+ZvnUTy1An5t4="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/bierner.markdown-footnotes/changelog"; + description = "Adds [^1] footnote syntax support to VS Code's built-in Markdown preview"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=bierner.markdown-footnotes"; + homepage = "https://github.com/mjbvz/vscode-markdown-footnotes"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + bierner.markdown-mermaid = buildVscodeMarketplaceExtension { mktplcRef = { name = "markdown-mermaid"; @@ -606,14 +672,59 @@ let }; }; + bierner.markdown-preview-github-styles = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "markdown-preview-github-styles"; + publisher = "bierner"; + version = "2.0.4"; + hash = "sha256-jJulxvjMNsqQqmsb5szQIAUuLWuHw824Caa0KArjUVw="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/bierner.markdown-preview-github-styles/changelog"; + description = "Changes VS Code's built-in markdown preview to match GitHub's styling"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=bierner.markdown-preview-github-styles"; + homepage = "https://github.com/mjbvz/vscode-github-markdown-preview-style"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + + biomejs.biome = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "biome"; + publisher = "biomejs"; + version = "2024.5.251958"; + hash = "sha256-Pxbvj6e3nRwuLKmPEtE02JdHmZbyuXNh4T+FZKjBkWo="; + }; + meta = { + changelog = "https://github.com/biomejs/biome-vscode/blob/main/CHANGELOG.md"; + description = "Biome LSP extension for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=biomejs.biome"; + homepage = "https://github.com/biomejs/biome-vscode"; + license = with lib.licenses; [ + mit + # or + asl20 + ]; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + bmalehorn.vscode-fish = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-fish"; publisher = "bmalehorn"; - version = "1.0.35"; - hash = "sha256-V51Qe6M1CMm9fLOSFEwqeZiC8tWCbVH0AzkLe7kR2vY="; + version = "1.0.38"; + hash = "sha256-QEifCTlzYMX+5H6+k2o1lsQrhW3vxVpn+KFg/3WVVFo="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/bmalehorn.vscode-fish/changelog"; + description = "Fish syntax highlighting and formatting for VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=bmalehorn.vscode-fish"; + homepage = "https://github.com/bmalehorn/vscode-fish"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; }; - meta.license = lib.licenses.mit; }; bmewburn.vscode-intelephense-client = buildVscodeMarketplaceExtension { @@ -948,26 +1059,26 @@ let sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-GQH+KKteWbCz18AlTWjLWrVpPRxumi+iDPS5n+5xy/0="; + hash = "sha256-ZlbPRFQwvZNCp8K/rbHqVa3coXa2dT4nOrNChC9naC8="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-xBwuAtvRdOgYkfxP0JaxhAQZx5AJWymDVQ50piTx608="; + hash = "sha256-hSRdvno8VZNi48rckaqWbAgDXT6RXEcPnkNOT8DV1wA="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-oLLKnNZ+E06PbUrhj5Y0HOdHhUs/fXd+3lZXX/P2C10="; + hash = "sha256-rimE7dKT6zajHo6E42z7IyfP35xBXThIwMHhZjaZwHk="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-nWuyqOIELp8MrjzCFH3yu4pWm5KsNxmx3eacgStWKG0="; + hash = "sha256-7TeUAZLiEnqi5i5nHLhtv5aMxIcw7iiABOAkwP1YYqM="; }; }; in { name = "continue"; publisher = "Continue"; - version = "0.8.25"; + version = "0.8.40"; } // sources.${stdenv.system}; nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; @@ -1291,7 +1402,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=discloud.discloud"; homepage = "https://github.com/discloud/vscode-discloud"; license = lib.licenses.asl20; - maintainers = [ lib.maintainers.astindev ]; + maintainers = [ lib.maintainers.diogomdp ]; }; }; @@ -1628,6 +1739,23 @@ let }; }; + fabiospampinato.vscode-open-in-github = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-open-in-github"; + publisher = "fabiospampinato"; + version = "2.3.0"; + hash = "sha256-vrW6uZyeEJipGtfz7BEeeAwiwtBlfQLjC7jAP1v5GoE="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/fabiospampinato.vscode-open-in-github/changelog"; + description = "VS Code extension to open the current project or file in github.com"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=fabiospampinato.vscode-open-in-github"; + homepage = "https://github.com/fabiospampinato/vscode-open-in-github"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + file-icons.file-icons = buildVscodeMarketplaceExtension { meta = { changelog = "https://marketplace.visualstudio.com/items/file-icons.file-icons/changelog"; @@ -1731,6 +1859,23 @@ let }; }; + fortran-lang.linter-gfortran = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "linter-gfortran"; + publisher = "fortran-lang"; + version = "3.4.2024061701"; + hash = "sha256-i357EzQ8cm8NPsMBbsV5ToMoBDa59Bh6ylC9tNjMY6s="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/fortran-lang.linter-gfortran/changelog"; + description = "Fortran language support for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=fortran-lang.linter-gfortran"; + homepage = "https://github.com/fortran-lang/vscode-fortran-support"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + foxundermoon.shell-format = callPackage ./foxundermoon.shell-format { }; freebroccolo.reasonml = buildVscodeMarketplaceExtension { @@ -1767,6 +1912,22 @@ let }; }; + garlicbreadcleric.pandoc-markdown-syntax = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "pandoc-markdown-syntax"; + publisher = "garlicbreadcleric"; + version = "0.0.2"; + hash = "sha256-YAMH5smLyBuoTdlxSCTPyMIKOWTSIdf2MQVZuOO2V1w="; + }; + meta = { + description = "A VSCode extension that adds syntax highlighting for Pandoc-flavored Markdown"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=garlicbreadcleric.pandoc-markdown-syntax"; + homepage = "https://github.com/garlicbreadcleric/vscode-pandoc-markdown"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.pandapip1 ]; + }; + }; + gencer.html-slim-scss-css-class-completion = buildVscodeMarketplaceExtension { mktplcRef = { name = "html-slim-scss-css-class-completion"; @@ -2564,6 +2725,23 @@ let }; }; + kravets.vscode-publint = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-publint"; + publisher = "Kravets"; + version = "0.0.1"; + hash = "sha256-6nG5Yqi8liumQ2K9ynV8mNXiXGaGo/cp4Cib1kqdp1c="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/Kravets.vscode-publint/changelog"; + description = "Lint packaging errors in VS Code with publint"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Kravets.vscode-publint"; + homepage = "https://github.com/kravetsone/vscode-publint"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + kubukoz.nickel-syntax = buildVscodeMarketplaceExtension { mktplcRef = { name = "nickel-syntax"; @@ -2576,6 +2754,22 @@ let }; }; + lapo.asn1js = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "asn1js"; + publisher = "lapo"; + version = "0.1.4"; + hash = "sha256-utbIKlwNHnJZj/51f8hEDmUA/A26De/gY73iT4tXKRU="; + }; + meta = { + description = "Decode ASN.1 content inside VSCode"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=lapo.asn1js"; + homepage = "https://github.com/lapo-luchini/vscode-asn1js"; + maintainers = with lib.maintainers; [ katexochen ]; + license = lib.licenses.isc; + }; + }; + llvm-org.lldb-vscode = llvmPackages.lldb; llvm-vs-code-extensions.vscode-clangd = buildVscodeMarketplaceExtension { @@ -2736,6 +2930,40 @@ let }; }; + meganrogge.template-string-converter = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "template-string-converter"; + publisher = "meganrogge"; + version = "0.6.1"; + hash = "sha256-w0ppzh0m/9Hw3BPJbAKsNcMStdzoH9ODf3zweRcCG5k="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/meganrogge.template-string-converter/changelog"; + description = "VS Code extension to autocorrect from quotes to backticks"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=meganrogge.template-string-converter"; + homepage = "https://github.com/meganrogge/template-string-converter"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + + mesonbuild.mesonbuild = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "mesonbuild"; + name = "mesonbuild"; + version = "1.24.0"; + hash = "sha256-n7c2CUiTIej2Y/QMGWpv6anuCDjqpo2W+hJylfvvMVE="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/mesonbuild.mesonbuild/changelog"; + description = "Meson language support for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=mesonbuild.mesonbuild"; + homepage = "https://github.com/mesonbuild/vscode-meson"; + maintainers = with lib.maintainers; [ Anillc ]; + license = lib.licenses.asl20; + }; + }; + mgt19937.typst-preview = callPackage ./mgt19937.typst-preview { }; mhutchie.git-graph = buildVscodeMarketplaceExtension { @@ -3118,6 +3346,39 @@ let ms-vscode-remote.remote-ssh = callPackage ./ms-vscode-remote.remote-ssh { }; + ms-vscode-remote.remote-ssh-edit = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "remote-ssh-edit"; + publisher = "ms-vscode-remote"; + version = "0.86.0"; + hash = "sha256-JsbaoIekUo2nKCu+fNbGlh5d1Tt/QJGUuXUGP04TsDI="; + }; + meta = { + description = "A Visual Studio Code extension that complements the Remote SSH extension with syntax colorization, keyword intellisense, and simple snippets when editing SSH configuration files"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-ssh-edit"; + homepage = "https://code.visualstudio.com/docs/remote/ssh"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.pandapip1 ]; + }; + }; + + ms-vscode-remote.remote-wsl = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "remote-wsl"; + publisher = "ms-vscode-remote"; + version = "0.88.2"; + hash = "sha256-fl7fLNd3EHA9eMiPUIL/23SUiA81gveqZLFkqaHTX+Q="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/ms-vscode-remote.remote-wsl/changelog"; + description = "Windows Subsystem for Linux support for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-wsl"; + homepage = "https://code.visualstudio.com/docs/remote/wsl"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare.vsliveshare { }; mshr-h.veriloghdl = buildVscodeMarketplaceExtension { @@ -3212,6 +3473,23 @@ let }; }; + nefrob.vscode-just-syntax = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-just-syntax"; + publisher = "nefrob"; + version = "0.3.0"; + hash = "sha256-WBoqH9TNco9lyjOJfP54DynjmYZmPUY+YrZ1rQlC518="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/nefrob.vscode-just-syntax/changelog"; + description = "Justfile syntax support for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=nefrob.vscode-just-syntax"; + homepage = "https://github.com/nefrob/vscode-just"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + njpwerner.autodocstring = buildVscodeMarketplaceExtension { mktplcRef = { name = "autodocstring"; @@ -3943,8 +4221,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "4.0.2"; - hash = "sha256-k3FxRAtW9Fdhm7jD3ingFXONiBsOia1Whs7OPeDmlSw="; + version = "4.0.3"; + hash = "sha256-CEGwbw5RpFsfB/g2inScIqWB7/3oxgxz7Yuc6V3OiHg="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; @@ -4476,6 +4754,23 @@ let }; }; + vitaliymaz.vscode-svg-previewer = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-svg-previewer"; + publisher = "vitaliymaz"; + version = "0.7.0"; + hash = "sha256-iX+Js2Pqz1gLDwrihuYtDwQG4ek7GiOhL3M0j3jHF/Y="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/vitaliymaz.vscode-svg-previewer/changelog"; + description = "Preview SVGs in VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=vitaliymaz.vscode-svg-previewer"; + homepage = "https://github.com/vitaliymaz/vscode-svg-previewer"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + vlanguage.vscode-vlang = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-vlang"; @@ -4590,8 +4885,8 @@ let mktplcRef = { name = "vscode-icons"; publisher = "vscode-icons-team"; - version = "12.2.0"; - sha256 = "12s5br0s9n99vjn6chivzdsjb71p0lai6vnif7lv13x497dkw4rz"; + version = "12.8.0"; + hash = "sha256-2+Wf0AL9C5xOQCjA9maMt/W/kviNuiyMfaOFDU82KxM="; }; meta = { description = "Bring real icons to your Visual Studio Code"; @@ -4792,6 +5087,22 @@ let }; }; + yoavbls.pretty-ts-errors = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "pretty-ts-errors"; + publisher = "yoavbls"; + version = "0.5.3"; + hash = "sha256-JSCyTzz10eoUNu76wNUuvPVVKq4KaVKobS1CAPqgXUA="; + }; + meta = { + description = "Make TypeScript errors prettier and human-readable in VSCode"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=yoavbls.pretty-ts-errors"; + homepage = "https://github.com/yoavbls/pretty-ts-errors"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + yzhang.dictionary-completion = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "yzhang"; @@ -4829,6 +5140,22 @@ let }; }; + zaaack.markdown-editor = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "markdown-editor"; + publisher = "zaaack"; + version = "0.1.10"; + hash = "sha256-K1nczR059BsiHpT1xdtJjpFLl5krt4H9+CrEsIycq9U="; + }; + meta = { + description = "Visual Studio Code extension for WYSIWYG markdown editing"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=zaaack.markdown-editor"; + homepage = "https://github.com/zaaack/vscode-markdown-editor"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.pandapip1 ]; + }; + }; + zainchen.json = buildVscodeMarketplaceExtension { mktplcRef = { name = "json"; @@ -4845,6 +5172,22 @@ let }; }; + zguolee.tabler-icons = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "tabler-icons"; + publisher = "zguolee"; + version = "0.3.4"; + hash = "sha256-0XvB9UXqKHbL/ejUfciSvFzZ3GacaQ7pq6hJqRaxq+8="; + }; + meta = { + description = "Tabler product icon theme for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=zguolee.tabler-icons"; + homepage = "https://github.com/zguolee/vscode-tabler-icons"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + zhuangtongfa.material-theme = buildVscodeMarketplaceExtension { mktplcRef = { name = "material-theme"; diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix index 7bcbcc11a89da..780b0e12896ea 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-pylance"; publisher = "MS-python"; - version = "2024.5.1"; - hash = "sha256-w+T4dySTt2RpdBYd1Nnxh8RR9wqEu9pkS4R1Ay7Fn+8="; + version = "2024.6.1"; + hash = "sha256-NOx0WJC32MUm6TmLkiN67FHKwBmB0S3feFVIQNxR2PQ="; }; buildInputs = [ pyright ]; diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index ea2276c7e7a3e..99878c88568e7 100644 --- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "tinymist"; publisher = "myriad-dreamin"; inherit (tinymist) version; - hash = "sha256-etPjbmcBhS1dgq5wEoRIekZlRxYoC6KrsV/+owjHu4I="; + hash = "sha256-Oama8FkRhEY4yza77RpWHg0Aeo9WFhveucJqJvCYMJQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix index a74f934705f7d..07616924d18a0 100644 --- a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix +++ b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix @@ -3,15 +3,15 @@ stdenv, vscode-utils, autoPatchelfHook, - libxcrypt-legacy, + zlib, }: vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "sourcery"; publisher = "sourcery"; - version = "1.16.0"; - hash = "sha256-SHgS2C+ElTJW4v90Wg0QcsSL2FoSz+SxZQpgq2J4JiU="; + version = "1.19.0"; + hash = "sha256-Wit2ozgaVwINL3PvPfmZWQ4WN7seQMWfXwXGgEKecn0="; }; postPatch = '' @@ -24,7 +24,7 @@ vscode-utils.buildVscodeMarketplaceExtension { buildInputs = [ stdenv.cc.cc.lib - libxcrypt-legacy + zlib ]; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix index f383ef7dfb4ad..f56f477c8560d 100644 --- a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix @@ -13,19 +13,19 @@ let { x86_64-linux = { arch = "linux-x64"; - hash = "sha256-CPUlJ1QzGiZKd4r46Iioc5svw0oLsMsYnc0KxT1p0zM="; + hash = "sha256-fvDzsFOG1pdmpC3RDY8zGP0yL/TzX6i00LnIX+yceVU="; }; aarch64-linux = { arch = "linux-arm64"; - hash = "sha256-qSTCZHL7nfB300qwuqgl/4u+SYNMA2BFCrD+yQEgN/c="; + hash = "sha256-3yRZzOTuiTbkUUz1D3mZo7G5vayM6W9YBbJxTiVou9g="; }; x86_64-darwin = { arch = "darwin-x64"; - hash = "sha256-FcZH2bB5B3wnu6F76kGp9FBdD3yZtr57TQ5xaUfRcmY="; + hash = "sha256-fKvR2bea4UxvnZ+LlWR/ahpKe8mk5f4mZrjqTFpsC5A="; }; aarch64-darwin = { arch = "darwin-arm64"; - hash = "sha256-3HdK4x2WNdb9Zxqjtn9lmbgrMOzz14rH0ZF0x9B0BHY="; + hash = "sha256-nkK3BH+MRi6KdThq4kYR9ZAfnuSkC2r/lKWpEtmD7Ak="; }; } .${system} or (throw "Unsupported system: ${system}"); @@ -37,7 +37,7 @@ vscode-utils.buildVscodeMarketplaceExtension { # Please update the corresponding binary (typos-lsp) # when updating this extension. # See pkgs/by-name/ty/typos-lsp/package.nix - version = "0.1.18"; + version = "0.1.19"; inherit (extInfo) hash arch; }; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 212bf8f1930ca..2eb93a086ea6d 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -30,21 +30,21 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1ypxzk3p1acv6g9418bchbwi82imnvljgn8h6mjqwqzbf3khf5kd"; - x86_64-darwin = "0nm3765mzqlagbilb01s0zy9zww8rmf8bjlqq0vwvrxxfl7vbyl3"; - aarch64-linux = "0f0cwihiwvpck625s91hc838hzyiylbir3m23r4ncjws298ckyg5"; - aarch64-darwin = "1h7cldjwb8hyx7vq2almplwxl667cc8dw3iv2mqigrx3ibk6sss6"; - armv7l-linux = "0a0iy109qjwj1ri23xmmfa3j3mngz72ljw2m0czaf8rkcaglxa1v"; + x86_64-linux = "039yb1v4vcgsyp3gfvsfm7pxivf20ycyvidhrk26jfm54ghbbnlz"; + x86_64-darwin = "1nkwww12yalkxja8vdln45kzrbybhrca8q0zxj8kk9s8bdzsvr5d"; + aarch64-linux = "0pz8qji6n7j0vrm4l84vxw2sad6q3swz7jda4zyw1n13y7p9kpcj"; + aarch64-darwin = "1a1b233f28x0v7rb7295jdivzxqvp812x585vacxx1qfmpn6mabl"; + armv7l-linux = "12569045nzz5zsmaqd4xvq5lmajcl7w3qdv0n9m5rh2g6s32585c"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.90.0"; + version = "1.90.1"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "89de5a8d4d6205e5b11647eb6a74844ca23d2573"; + rev = "611f9bfce64f25108829dd295f54a6894e87339d"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -68,7 +68,7 @@ in src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "0rwdvbig0a6mzgcn0zb08caaxyx5rk0741f8an3y0vavzgi5k38f"; + sha256 = "1j4fd3281jsm10ngq9lzwph3nil0xwbypc180sh5wifb66bmprf6"; }; }; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index bf97add669060..3461744ec6ebf 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1zmgvadhsnsbmqb559kvf66i7h6iq7vw99m7vdxcfmdl6c1pwyvb"; - x86_64-darwin = "061h423vay3d28d2015llz7pwlqcrjy0lmw47xgy3iy6hfadrra2"; - aarch64-linux = "0n288h6369bazykp6jyapi6yz0k7nivql6wz68fgkagfdyxzl1yb"; - aarch64-darwin = "13k9hvbzj8xyfi29g0x4nz80gmjq3s693zi5fi4lbf4bj7jmcamq"; - armv7l-linux = "19p6k1rgy83vs76hksjx5d4v32jq31r6aw5kzcc8gsq114xj9c2a"; + x86_64-linux = "1r76ikfikagg9v278pgiqhnjsv7pqn0xi372y1l0wsashlxl7kb0"; + x86_64-darwin = "156604xzazmb54p0rdkv5wy9livg0xz2jviycdizablmvsxybs57"; + aarch64-linux = "0cp120pcjpgf9qvmks9f8l2caxqlvnqvmxa7fh9mf83zpkdmnsnl"; + aarch64-darwin = "1k06648jx64irshs0v4qy6xlkd9mk514xf21dlfhvic4aj89kcx9"; + armv7l-linux = "0jy8hkbxh1969kskggg2y86cphly9l9gs7y4plj90jmlvlzjjjxm"; }.${system} or throwSystem; sourceRoot = lib.optionalString (!stdenv.isDarwin) "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.90.0.24158"; + version = "1.90.1.24165"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/editors/xed-editor/default.nix b/pkgs/applications/editors/xed-editor/default.nix index 9034b2eb375c6..d44b07292ca0e 100644 --- a/pkgs/applications/editors/xed-editor/default.nix +++ b/pkgs/applications/editors/xed-editor/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "xed-editor"; - version = "3.6.1"; + version = "3.6.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xed"; rev = version; - sha256 = "sha256-RFauTXwiaSd+J8zoJQmib4bKNR4NC/LSCCqCHv8Hdr8="; + sha256 = "sha256-+yY+vzDMeS4AMMAklzADD4/LAQgav3clM2CCK6xh47Q="; }; patches = [ diff --git a/pkgs/applications/emulators/c64-debugger/default.nix b/pkgs/applications/emulators/c64-debugger/default.nix index fcd3a0aa9b527..ad0da506b4ffb 100644 --- a/pkgs/applications/emulators/c64-debugger/default.nix +++ b/pkgs/applications/emulators/c64-debugger/default.nix @@ -12,7 +12,7 @@ }: stdenv.mkDerivation { - name = "c64-debugger"; + pname = "c64-debugger"; version = "0.64.58.6"; src = fetchgit { diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 6c5269fb53c8f..249d3db287034 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -55,20 +55,20 @@ "src": { "owner": "libretro", "repo": "beetle-pce-libretro", - "rev": "0eb4b423452da40dbf4393e09d4126c3090a1210", - "hash": "sha256-PhhItDKvlvx3uBDx+xEUVr0sW2Y9HiTR/IvsnXVNAqo=" + "rev": "3d91a940b3a48254152a8789b79616ceefe4067f", + "hash": "sha256-6zXl49Rns6wCZmcEUWkWqYeSH6W1+qs6Sb998pQ/+Lo=" }, - "version": "unstable-2024-05-17" + "version": "unstable-2024-06-14" }, "beetle-pce-fast": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "beetle-pce-fast-libretro", - "rev": "414149d335ce2a3284db6cdffbb8ed2ce42dbe5f", - "hash": "sha256-sta71o4NJIPDZlQkAFLzx+XlHVA8MmUjuZ17MuCKhOY=" + "rev": "a653bbbdc5cf2bf960e614efdcf9446a9aa8cdf9", + "hash": "sha256-ty4Uluo8D8x+jB7fOqI/AgpTxdttzpbeARiICd3oh9c=" }, - "version": "unstable-2024-05-17" + "version": "unstable-2024-06-14" }, "beetle-pcfx": { "fetcher": "fetchFromGitHub", @@ -85,10 +85,10 @@ "src": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "b8e10a3039391db6e4fbdc96720d3428a2dbd039", - "hash": "sha256-F38lUBhe9JR3dPwkLqhAAlvLtAeas8bnPuiK6eOpUuU=" + "rev": "6e881f9939dd9b33fb5f5587745524a0828c9ef4", + "hash": "sha256-mFIqsybkpSF17HmrfReazYUqVLzuDGwCjzaV7BTLKJ8=" }, - "version": "unstable-2024-06-07" + "version": "unstable-2024-06-14" }, "beetle-saturn": { "fetcher": "fetchFromGitHub", @@ -115,10 +115,10 @@ "src": { "owner": "libretro", "repo": "beetle-supergrafx-libretro", - "rev": "e3f68c1311d4684a5a59d3d1662d5c4f32662c02", - "hash": "sha256-jTO2SDOefpB+cfahiPkReYID0pjP437h53hZElSLsdY=" + "rev": "29b2a6e12c13d623ad94dcb64e1cb341d93ff02d", + "hash": "sha256-sbpCG3QsSn8NOjWC0snvsd7jZYClSbKI79QUnigQwzc=" }, - "version": "unstable-2024-06-07" + "version": "unstable-2024-06-14" }, "beetle-vb": { "fetcher": "fetchFromGitHub", @@ -165,10 +165,10 @@ "src": { "owner": "libretro", "repo": "bsnes-libretro", - "rev": "44f6ce5dedb138ded8e59d71df18cae5b0655eba", - "hash": "sha256-7iB2VQ3f8YVOV3C+Rkviaj7USoZdO/riDnT9kCdzc8k=" + "rev": "9131a4c705e18f7b96e7dbfcfe70b158d10afed1", + "hash": "sha256-NotqQMBHV6E3LSXJHQ5FqIbq2OQbXx6xCbLYV9g12kQ=" }, - "version": "unstable-2024-05-31" + "version": "unstable-2024-06-16" }, "bsnes-hd": { "fetcher": "fetchFromGitHub", @@ -297,21 +297,21 @@ "src": { "owner": "libretro", "repo": "libretro-fceumm", - "rev": "bc9d865f9427384e40084cb090d94d72d4970e78", - "hash": "sha256-/g7gRNWDbW5LFZ+uBkIf5DMELas0/ilqbmUbvq8YSsE=" + "rev": "fe4a4f8a53cc7f91278f393710abb4f32c4e0a8f", + "hash": "sha256-/rZoARZf3SfN8E0o0qm34FYCYscqeEcLg3eYSXenK8s=" }, - "version": "unstable-2024-06-09" + "version": "unstable-2024-06-15" }, "flycast": { "fetcher": "fetchFromGitHub", "src": { "owner": "flyinghead", "repo": "flycast", - "rev": "4cd62781043cd9193c6c5ec04f6a8084375bed0d", - "hash": "sha256-EKK9PNFHWm1Jakq0E6fIqmcDiiiOSgHEbixB3X/H77g=", + "rev": "ca613db70d8897e06562fe089e3e9543b41526a0", + "hash": "sha256-wYKHC+EvLnq+PnL1/hNcrhDyCY+4kaiSjIUKJ9SGPHc=", "fetchSubmodules": true }, - "version": "unstable-2024-06-08" + "version": "unstable-2024-06-11" }, "fmsx": { "fetcher": "fetchFromGitHub", @@ -338,30 +338,30 @@ "src": { "owner": "libretro", "repo": "fuse-libretro", - "rev": "847dbbd6f787823ac9a5dfacdd68ab181063374e", - "hash": "sha256-jzS7SFALV/YjI77ST+IWHwUsuhT+Zr5w4t6C7O8yzFM=" + "rev": "9fc41a5f153e1f2fa2dbcfdd215c7ec97d98a29c", + "hash": "sha256-eEgPnSIpKC7s+4JoEHDGPlwYPa5Y8EpoxmNhyOIIcU8=" }, - "version": "unstable-2023-06-23" + "version": "unstable-2024-06-16" }, "gambatte": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "gambatte-libretro", - "rev": "e2031a4010463adcd00ce3f34acbbb6db2ad1266", - "hash": "sha256-yFj9ZkvDliaTO43l0fjg8FwD17MxjV4wszY7AVjTiNY=" + "rev": "863002046a812758da6064daaf579fef1cec19a3", + "hash": "sha256-7rkyMcaKDNOESNrmwYCKM71x3WM8eSN9LBX0xOQRhJ0=" }, - "version": "unstable-2024-06-07" + "version": "unstable-2024-06-14" }, "genesis-plus-gx": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "Genesis-Plus-GX", - "rev": "60955a01f601ef73c02b07581dd7d5aa3b6a4788", - "hash": "sha256-h0T6i1kiN58TagFo5XHzXMLaEwkGGTyuZpyS1QGNrb8=" + "rev": "4e54d585d540d461ecc412c91ca4a79e2338f3b6", + "hash": "sha256-7P6w6pXplOfpP7w+JztNd49FdKBPM8eQeSh93YAG0Y4=" }, - "version": "unstable-2024-06-07" + "version": "unstable-2024-06-14" }, "gpsp": { "fetcher": "fetchFromGitHub", @@ -408,11 +408,11 @@ "src": { "owner": "libretro", "repo": "mame", - "rev": "4ee35952a8fdb1332e970fa14c3e79c8c968050c", - "hash": "sha256-UIAMq8AIdLKX8SIF2V0+Vc6kHPJ0rmdx4BeqoSrCfFE=", + "rev": "db65a583bd2da39514a544c58362a6ac170179ac", + "hash": "sha256-FTsoLsx7IhyAw/pdaGAeNzysc7vZ3CcyXKWcBJ0pOb8=", "fetchSubmodules": true }, - "version": "unstable-2024-05-21" + "version": "unstable-2024-06-13" }, "mame2000": { "fetcher": "fetchFromGitHub", @@ -550,10 +550,10 @@ "src": { "owner": "libretro", "repo": "neocd_libretro", - "rev": "71ebe5044639b825e5bd1bd590fef3e918133b80", - "hash": "sha256-YVxt3bJ54DD91VHkeQyYdo/BEq//lnBKd9Y42Vby3qc=" + "rev": "c5a266254ffbaa2730d2814195f60e7be153fc86", + "hash": "sha256-MJhUYFNrtt2SSLun75OXKrT7nZzLBtyslqG9mziQuRk=" }, - "version": "unstable-2024-02-01" + "version": "unstable-2024-06-16" }, "nestopia": { "fetcher": "fetchFromGitHub", @@ -611,10 +611,10 @@ "src": { "owner": "libretro", "repo": "parallel-n64", - "rev": "1b57f9199b1f8a4510f7f89f14afa9cabf9b3bdd", - "hash": "sha256-L20RGav0FJfydOICCNhAMGxIuIvPABDtCs5tWzrh768=" + "rev": "330fa5efd306ad116c44faf6833a8108ed4144b0", + "hash": "sha256-pltPoWfXFh9OhWnQ+XMhHVZCo6BCGr6jCDhiL5T7LNM=" }, - "version": "unstable-2024-01-15" + "version": "unstable-2024-06-10" }, "pcsx2": { "fetcher": "fetchFromGitHub", @@ -631,43 +631,43 @@ "src": { "owner": "libretro", "repo": "pcsx_rearmed", - "rev": "1f8c6be323aa8fad329e38682158197e822d27c1", - "hash": "sha256-f1U7hmSywECmXwRi6vhAFjG971XsDXhsYzSAKMa2ZVY=" + "rev": "1cdeae2b66fc3ef486ec8016ed5fad437f1a4409", + "hash": "sha256-Zw5CWDeAy3pUV4qXFIfs6kFlEaYhNhl+6pu5fOx34j0=" }, - "version": "unstable-2024-05-30" + "version": "unstable-2024-06-17" }, "picodrive": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "picodrive", - "rev": "ad93670449a28825d4b2cebf2eeff72cf03377a9", - "hash": "sha256-AGupXJVUkOt7XjXE1s5Y3SzZjZBAujaAAsR0CgxfKe0=", + "rev": "535217f16bc2848ec70985c41e1d131709352641", + "hash": "sha256-K96eN3Erw1G+vQa8pag72hrtgf+tttoNIMXdgCGNy6k=", "fetchSubmodules": true }, - "version": "unstable-2024-03-26" + "version": "unstable-2024-06-15" }, "play": { "fetcher": "fetchFromGitHub", "src": { "owner": "jpd002", "repo": "Play-", - "rev": "2f3d8252a2ba398078538abfe8a633b667a858a4", - "hash": "sha256-Trr+xJWcWfQW5TnSTxqAsUK3HSMsoLaAkz7UIwp6L4c=", + "rev": "a5753e582963e8555985abdfe6b5692bac52d701", + "hash": "sha256-OabW7OYitDzMh2bbAokfM+HwMaLo2cY3/FB78/ouvrY=", "fetchSubmodules": true }, - "version": "unstable-2024-06-04" + "version": "unstable-2024-06-10" }, "ppsspp": { "fetcher": "fetchFromGitHub", "src": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "5dec3ca2db10943dcdf5e483cc8c28e0524d1a43", - "hash": "sha256-B9/0uGpBrM+qndvO2BC9sQCNkSK3qR2fUtWx5Vx16xU=", + "rev": "cfcca0ed13ca86eb6e1ee7bb4161aabee6c2af06", + "hash": "sha256-K96Ajh/jXxILiKXBaTiNh6FwptPQQG39jGq45aQ7veY=", "fetchSubmodules": true }, - "version": "unstable-2024-06-09" + "version": "unstable-2024-06-16" }, "prboom": { "fetcher": "fetchFromGitHub", @@ -754,10 +754,10 @@ "src": { "owner": "snes9xgit", "repo": "snes9x", - "rev": "c7b77d4a763e8fa3ee2c4ef63b3974527056b7ad", - "hash": "sha256-a9IKbuSrlzrhrRrLRFAnhHWBhaYIf58oRFYjWSqbNTU=" + "rev": "a9e64edf73f36fb1a4ac616b11131f6380d8e968", + "hash": "sha256-3m2YTy1Y/ENhI4qmH3FQBZMEKNHsDJVZeOOLRrLj8lw=" }, - "version": "unstable-2024-06-07" + "version": "unstable-2024-06-13" }, "snes9x2002": { "fetcher": "fetchFromGitHub", @@ -794,10 +794,10 @@ "src": { "owner": "stella-emu", "repo": "stella", - "rev": "1c2dceab2b74980effb8d6497ea64fc3bd6b0be3", - "hash": "sha256-UeuSHHAZV798sSws32PhcBq9q2bGfX758mR+mIEnX+I=" + "rev": "b477cb56bc6fd8b6977dcee279f16de01348bdae", + "hash": "sha256-jGyEah9eBEvNB4HewL60yXZvpHseeScYrHsRtzUtjN8=" }, - "version": "unstable-2024-06-08" + "version": "unstable-2024-06-15" }, "stella2014": { "fetcher": "fetchFromGitHub", diff --git a/pkgs/applications/emulators/sameboy/default.nix b/pkgs/applications/emulators/sameboy/default.nix index d723eaecc20c5..c00a8eef2b8e3 100644 --- a/pkgs/applications/emulators/sameboy/default.nix +++ b/pkgs/applications/emulators/sameboy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sameboy"; - version = "0.16.5"; + version = "0.16.6"; src = fetchFromGitHub { owner = "LIJI32"; repo = "SameBoy"; rev = "v${version}"; - sha256 = "sha256-w/l+L/Gs2ERzXLiGFrNKHBTGBLdr+2zn1ZYRHUtZcHg="; + sha256 = "sha256-URth/0hMfxnBJpfA1k+UU9/jJzfte2UXeLv5JnBDGUs="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index bd6b5e4d080d0..9abb44fd61a4e 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -69,9 +69,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "9.10"; + version = "9.11"; url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz"; - hash = "sha256-r8NLSRv6FMYsP99ifdK13Kxefp8/FFrbFDMleK+M8cA="; + hash = "sha256-36AMJk6nEWnQKoSagz5Iyudh+whCKgDfhkTr1nv4ckA="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -117,7 +117,7 @@ in rec { staging = fetchFromGitLab rec { # https://gitlab.winehq.org/wine/wine-staging inherit (unstable) version; - hash = "sha256-ZqajfgPSKTcNBiDWEc9UgZWWmvkJvTA0S+j98Qz/y08="; + hash = "sha256-vqlikMatRlGxvWJ6BJu2HyBclV4x+vzNPNe8py7jKqo="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; diff --git a/pkgs/applications/file-managers/clifm/default.nix b/pkgs/applications/file-managers/clifm/default.nix index 026c6f52d0207..cd263dd2e851a 100644 --- a/pkgs/applications/file-managers/clifm/default.nix +++ b/pkgs/applications/file-managers/clifm/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "clifm"; - version = "1.18"; + version = "1.19"; src = fetchFromGitHub { owner = "leo-arch"; repo = pname; rev = "v${version}"; - hash = "sha256-tgCGZCLCWcF7ktXqDHjoUkeVqxg6QVOkZb7pbk3nA+U="; + hash = "sha256-QNxEvFZ5e4jQV2Tv2/D9KPRDoCoQlrqStFnbKVgcXxg="; }; buildInputs = [ diff --git a/pkgs/applications/finance/odoo/update.sh b/pkgs/applications/finance/odoo/update.sh deleted file mode 100755 index 0f7ee144cf8a2..0000000000000 --- a/pkgs/applications/finance/odoo/update.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused nix coreutils nix-prefetch - -set -euo pipefail - -DOCKER=$(curl -s https://raw.githubusercontent.com/odoo/docker/master/16.0/Dockerfile) - -get_var() { - echo "$DOCKER" | grep -E "^[A-Z][A-Z][A-Z] ODOO_$1" | sed -r "s|^[A-Z]{3} ODOO_$1.||g" -} - -VERSION=$(get_var VERSION) -RELEASE=$(get_var RELEASE) - -latestVersion="$VERSION.$RELEASE" -currentVersion=$(nix-instantiate --eval -E "with import ./. {}; odoo.version or (lib.getVersion odoo)" | tr -d '"') - -if [[ "$currentVersion" == "$latestVersion" ]]; then - echo "odoo is up-to-date: $currentVersion" - exit 0 -fi - -cd "$(dirname "${BASH_SOURCE[0]}")" - -sed -ri "s| hash.+ # odoo| hash = \"$(nix-prefetch -q fetchzip --url "https://nightly.odoo.com/${VERSION}/nightly/src/odoo_${latestVersion}.zip")\"; # odoo|g" default.nix -sed -ri "s| odoo_version.+| odoo_version = \"$VERSION\";|" default.nix -sed -ri "s| odoo_release.+| odoo_release = \"$RELEASE\";|" default.nix diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix index 8d642c67820e7..c6057ccc285b2 100644 --- a/pkgs/applications/graphics/apitrace/default.nix +++ b/pkgs/applications/graphics/apitrace/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "apitrace"; - version = "11.1"; + version = "12.0"; src = fetchFromGitHub { owner = "apitrace"; repo = "apitrace"; rev = version; - hash = "sha256-rvC6iVWNNxH11hzQvRTo+SQi9jEUCPWGSdJmKJe9SQ0="; + hash = "sha256-Y2ceE0F7q5tP64Mtvkc7JHOZQN30MDVCPHfiWDnfTSQ="; fetchSubmodules = true; }; diff --git a/pkgs/applications/graphics/brlcad/default.nix b/pkgs/applications/graphics/brlcad/default.nix index f30a6acbbbee7..91b063f8fc935 100644 --- a/pkgs/applications/graphics/brlcad/default.nix +++ b/pkgs/applications/graphics/brlcad/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , fontconfig , libX11 @@ -11,15 +12,25 @@ stdenv.mkDerivation rec { pname = "brlcad"; - version = "7.34.2"; + version = "7.38.2"; src = fetchFromGitHub { owner = "BRL-CAD"; - repo = pname; + repo = "brlcad"; rev = "refs/tags/rel-${lib.replaceStrings [ "." ] [ "-" ] version}"; - hash = "sha256-oafu255xElEIk8p4yvNyR2maykUfxQui/L5MkicA+JA="; + hash = "sha256-23UTeH4gY2x/QGYZ64glAkf6LmsXBAppIOHgoUdxgpo="; }; + patches = [ + # This commit was bringing an impurity in the rpath resulting in: + # RPATH of binary /nix/store/rq2hjvfgq2nvh5zxch51ij34rqqdpark-brlcad-7.38.0/bin/tclsh contains a forbidden reference to /build/ + (fetchpatch { + url = "https://github.com/BRL-CAD/brlcad/commit/fbdbf042b2db4c7d46839a17bbf4985cdb81f0ae.patch"; + revert = true; + hash = "sha256-Wfihd7TLkE8aOpLdDtYmhhd7nZijiVGh1nbUjWr/BjQ="; + }) + ]; + nativeBuildInputs = [ cmake ]; @@ -36,11 +47,19 @@ stdenv.mkDerivation rec { "-DBRLCAD_ENABLE_STRICT=OFF" ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=array-bounds" + ]; + meta = with lib; { homepage = "https://brlcad.org"; description = "BRL-CAD is a powerful cross-platform open source combinatorial solid modeling system"; + changelog = "https://github.com/BRL-CAD/brlcad/releases/tag/${src.rev}"; license = with licenses; [ lgpl21 bsd2 ]; maintainers = with maintainers; [ GaetanLepage ]; platforms = platforms.linux; + # error Exactly one of ON_LITTLE_ENDIAN or ON_BIG_ENDIAN should be defined. + broken = stdenv.system == "aarch64-linux"; }; } diff --git a/pkgs/applications/graphics/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix index f66189e0c75c1..eac82182f61dc 100644 --- a/pkgs/applications/graphics/cloudcompare/default.nix +++ b/pkgs/applications/graphics/cloudcompare/default.nix @@ -11,7 +11,7 @@ , flann , gdal , gmp -, LASzip +, laszip , mpfr , pdal , pcl @@ -48,7 +48,7 @@ mkDerivation rec { flann gdal gmp - LASzip + laszip mpfr pdal pcl diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index 115233dd2641c..3678b9760c812 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -1,6 +1,9 @@ { lib, stdenv , mkDerivation , fetchurl +, autoconf +, automake +, libtool , pkg-config , djvulibre , qtbase @@ -12,14 +15,19 @@ mkDerivation rec { pname = "djview"; - version = "4.10.6"; + version = "4.12"; + + outputs = [ "out" "man" ]; src = fetchurl { url = "mirror://sourceforge/djvu/${pname}-${version}.tar.gz"; - sha256 = "08bwv8ppdzhryfcnifgzgdilb12jcnivl4ig6hd44f12d76z6il4"; + hash = "sha256-VnPGqLfhlbkaFyCyQJGRW4FF3jSHnbEVi8k2sQDq8+M="; }; nativeBuildInputs = [ + autoconf + automake + libtool pkg-config qttools ]; @@ -31,24 +39,24 @@ mkDerivation rec { libtiff ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AGL; + preConfigure = '' + NOCONFIGURE=1 ./autogen.sh + ''; + configureFlags = [ "--disable-silent-rules" "--disable-dependency-tracking" "--with-x" "--with-tiff" - # NOTE: 2019-09-19: experimental "--enable-npdjvu" fails + "--disable-nsdejavu" # 2023-11-14: modern browsers have dropped support for NPAPI ] ++ lib.optional stdenv.isDarwin "--enable-mac"; - passthru = { - mozillaPlugin = "/lib/mozilla/plugins"; - }; - meta = with lib; { broken = stdenv.isDarwin; description = "Portable DjVu viewer (Qt5) and browser (nsdejavu) plugin"; mainProgram = "djview"; homepage = "https://djvu.sourceforge.net/djview4.html"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ Anton-Latukha ]; longDescription = '' diff --git a/pkgs/applications/graphics/komikku/default.nix b/pkgs/applications/graphics/komikku/default.nix index ffc612a33bfc7..6d938fe4bddc9 100644 --- a/pkgs/applications/graphics/komikku/default.nix +++ b/pkgs/applications/graphics/komikku/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.47.0"; + version = "1.48.1"; format = "other"; @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; rev = "v${version}"; - hash = "sha256-ZYQjH3NUPeq5XgCZ6L78lJpgbK69ZMf2AzztbCgbYBo="; + hash = "sha256-U4MmVK75tPYJStJ0RRjfbzSbpGLJ07rJg6ClHI+tAfM="; }; nativeBuildInputs = [ @@ -62,6 +62,7 @@ python3.pkgs.buildPythonApplication rec { natsort piexif pillow + pillow-heif curl-cffi pygobject3 python-magic diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index 7c334fb804558..ce23bd8ee3f18 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "ArchiSteamFarm"; # nixpkgs-update: no auto update - version = "6.0.1.24"; + version = "6.0.3.4"; src = fetchFromGitHub { owner = "JustArchiNET"; repo = "ArchiSteamFarm"; rev = version; - hash = "sha256-IgsiL5YUeOWQ/WIaTfs0Kmv2XFori8ntGZhrx7xeMkg="; + hash = "sha256-qYB94SJYCwcUrXdKtD+ZdiPRpwXg3rOHVmFWD+Y1ZXg="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; @@ -26,22 +26,20 @@ buildDotnetModule rec { nugetDeps = ./deps.nix; projectFile = "ArchiSteamFarm.sln"; - executables = [ "ArchiSteamFarm" ]; + executable = "ArchiSteamFarm"; dotnetFlags = [ - "-p:PublishSingleFile=true" - "-p:PublishTrimmed=true" + "-p:UseAppHost=false" ]; dotnetInstallFlags = [ "--framework=net8.0" ]; - selfContainedBuild = true; runtimeDeps = [ libkrb5 zlib openssl ]; doCheck = true; preBuild = '' - export projectFile=(ArchiSteamFarm) + dotnetProjectFiles=(ArchiSteamFarm) ''; preInstall = '' @@ -58,11 +56,17 @@ buildDotnetModule rec { dotnet publish $1 -p:ContinuousIntegrationBuild=true -p:Deterministic=true \ --output $out/lib/ArchiSteamFarm/plugins/$1 --configuration Release \ -p:UseAppHost=false - } + } - buildPlugin ArchiSteamFarm.OfficialPlugins.ItemsMatcher - buildPlugin ArchiSteamFarm.OfficialPlugins.MobileAuthenticator - buildPlugin ArchiSteamFarm.OfficialPlugins.SteamTokenDumper + buildPlugin ArchiSteamFarm.OfficialPlugins.ItemsMatcher + buildPlugin ArchiSteamFarm.OfficialPlugins.MobileAuthenticator + buildPlugin ArchiSteamFarm.OfficialPlugins.Monitoring + buildPlugin ArchiSteamFarm.OfficialPlugins.SteamTokenDumper + + chmod +x $out/lib/ArchiSteamFarm/ArchiSteamFarm.dll + wrapDotnetProgram $out/lib/ArchiSteamFarm/ArchiSteamFarm.dll $out/bin/ArchiSteamFarm + substituteInPlace $out/bin/ArchiSteamFarm \ + --replace-fail "exec " "exec dotnet " ''; passthru = { diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/pkgs/applications/misc/ArchiSteamFarm/deps.nix index cc47f6d75949f..79ed6cdf624a5 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -57,10 +57,14 @@ (fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "2.14.1"; sha256 = "0zn99311zfn602phxyskfjq9vly0w5712z6fly8r4q0h94qa8c85"; }) (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.3.0"; sha256 = "0vp4mpn6gfckn8grzjm1jxlbqiq2fglm2rk9wq787adw7rxs8k7w"; }) - (fetchNuGet { pname = "Markdig.Signed"; version = "0.36.2"; sha256 = "02d658sjxd853lmqhhh13yhycm9nlmghl3p3fdn6iwmwhkly9qvy"; }) - (fetchNuGet { pname = "Microsoft.ApplicationInsights"; version = "2.21.0"; sha256 = "1q034jbqkxb8lddkd0ijp0wp0ymnnf3bg2mjpay027zv7jswnc4x"; }) + (fetchNuGet { pname = "Markdig.Signed"; version = "0.37.0"; sha256 = "0pcysg74pvhqs13087dh5r90xnixklmnz7bwv02304927mkv5345"; }) + (fetchNuGet { pname = "Microsoft.ApplicationInsights"; version = "2.22.0"; sha256 = "0h5qkhmazlvwvjmxxj9pp2404rmvk55yf6npwcmlskv9mgfkli4r"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.0"; sha256 = "05y1xb5fw8lzvb4si77a5qwfwfz1855crqbphrwky6x9llivbhkx"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.0"; sha256 = "18zdbcb2bn7wy1dp14z5jyqiiwr9rkad1lcb158r5ikjfq1rg5iw"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.0"; sha256 = "1nbxzmj6cnccylxis67c54c0ik38ma4rwdvgg6sxd6r04219maqm"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.0"; sha256 = "1wqkbjd1ywv9w397l7rsb89mijc5n0hv7jq9h09xfz6wn9qsp152"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.8.0"; sha256 = "173wjadp3gan4x2jfjchngnc4ca4mb95h1sbb28jydfkfw0z1zvj"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.10.0"; sha256 = "0s0v7jmrq85n356xv7zixvwa4z94fszjcr5vll8x4im1a2lp00f9"; }) (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; sha256 = "080kab87qgq2kh0ijry5kfdiq9afyzb8s0k3jqi5zbbi540yq4zl"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; sha256 = "1jlpa4ggl1gr5fs7fdcw04li3y3iy05w3klr9lrrlc7v8w76kq71"; }) @@ -76,54 +80,60 @@ (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; sha256 = "0p50qn6zhinzyhq9sy5svnmqqwhw2jajs2pbjh9sah504wjvhscz"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; sha256 = "04nm8v5a3zp0ill7hjnwnja3s2676b4wffdri8hdk2341p7mp403"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; sha256 = "0aldaz5aapngchgdr7dax9jw5wy7k7hmjgjpfgfv1wfif27jlkqm"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.5.0"; sha256 = "0nigij1vz1biw1sl64mflx68fgm34lmnvq47z2n5p0qs534kvkhb"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.5.0"; sha256 = "025ixbv7jq294n8yw4y1bbd92iz08q4jqnnzqp0s8lgi49sk9dad"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.5.0"; sha256 = "1qyyfxww980s7xzw048kc8iqzarzbaj11cb5lrsisv777ccipma5"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.5.0"; sha256 = "0ns56pws3zlwjk8mjyfr02zl3nnhzka76wabfabplfci62bgi3h0"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.8.0"; sha256 = "1syvl3g0hbrcgfi9rq6pld8s8hqqww4dflf1lxn59ccddyyx0gmv"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.6.0"; sha256 = "18g4j9n47387k4ym3kl2dzhhhs6fs5rq96757fc4lcdql2rpkmp0"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.6.0"; sha256 = "11znwbbg44hhz3ly6j6q81qz83yqf97jj5zhpldng5zq0h791srl"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.6.0"; sha256 = "1slkzygcn4abpqip4rmi73h9096ihjkkaiwgmkaiba9pidn9lzlx"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.6.0"; sha256 = "1blj1ayw9qpjpsnb4k95s03pdkin0032mxgznfaw1z1qhhiqdnsi"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.10.0"; sha256 = "13g8fwl09li8fc71nk13dgkb7gahd4qhamyg2xby7am63nlchhdf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.0"; sha256 = "0gwqmkmr7jy3sjh9gha82amlry41gp8nwswy2iqfw54f28db63n7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.0"; sha256 = "042cjvnwrrjs3mw5q8q5kinh0cwkks33i3n1vyifaid2jbr3wlc0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.0"; sha256 = "06ndp4wh1cap01dql3nixka4g56bf6ipmqys7xaxvg4xisf79x8d"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.0"; sha256 = "1kh5bnaf6h9mr4swcalrp304625frjiw6mlz1052rxwzsdq98a96"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) - (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.0.2"; sha256 = "00psv2mvynd2bz8xnzvqvb32qr33glqxg4ni5j91b93k84yjy5ma"; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.0.2"; sha256 = "09yn3hi9npgi8rs2vyfyzcl8vbfa1lqcl6lgpymw5d7lg0hc511w"; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.0.2"; sha256 = "0c65fsc23xxw648xh83sjcmrn9hvs9q58l5lb36wflvaajbsjf2r"; }) - (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.0.2"; sha256 = "0bq46f4v2r4nzwly7g0dsakyc1lcql9nh85sp59d1fwzaknf1n94"; }) - (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.0.2"; sha256 = "1vjqrpqjx3z1irqgy0ckmkgyvrzqqqcikxs36q6gadyj643ra1c5"; }) + (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.6.14"; sha256 = "1wr8crmjg4gznm3jqgz9s9p285vrwb8a6baqc6gz3b58rn4m88km"; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.2.1"; sha256 = "1a6hyd3szjjpjkbr0ncfria0x2qijv3lwr4drhxm15xamfy23azw"; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.2.1"; sha256 = "19309m0b9cjy1642m99ipjvr6gxq6qb008bam3l10m1mz8m81j31"; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.2.1"; sha256 = "1bly8375zng21yjbfdi08c14lgapngv06p1dlzbryimxicqzxixx"; }) + (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.2.1"; sha256 = "0zlbqmvdb1vxnvmxh6lk65mz57c7mz6dqb1s8in0cfww8kxg058k"; }) + (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.2.1"; sha256 = "07674xnhc84h36pvzswx6ibjy0bgfi2bxhqm1zyq9fidmim0ch07"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.10.0"; sha256 = "07j69cw8r39533w4p39mnj00kahazz38760in3jfc45kmlcdb26x"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; sha256 = "0qkjyf3ky6xpjg5is2sdsawm99ka7fzgid2bvpglwmmawqgm8gls"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.8.0"; sha256 = "0b0i7lmkrcfvim8i3l93gwqvkhhhfzd53fqfnygdqvkg6np0cg7m"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.8.0"; sha256 = "0f5jah93kjkvxwmhwb78lw11m9pkkq9fvf135hpymmmpxqbdh97q"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.10.0"; sha256 = "1bl471s7fx9jycr0cc8rylwf34mrvlg9qn1an6l86nisavfcyb7v"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "MSTest"; version = "3.2.2"; sha256 = "19pkywdlmgccv2ri52gbpb3pgci1ymb2ba5qhyp9j19vks6gf6cj"; }) - (fetchNuGet { pname = "MSTest.Analyzers"; version = "3.2.2"; sha256 = "1ap7imbqxmz2namgli796pxj91gyn01k6xxnllldpwwbxpd0ijgd"; }) - (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.2.2"; sha256 = "14nrxg1cd3lzaxw7zz8z91168sgnsf1xxnrpdy7wkd6ggk22hi19"; }) - (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.2.2"; sha256 = "0igdrjr300bqz5lnibf9vl8pkaky1l27f889gza3a9xs83mpd06p"; }) + (fetchNuGet { pname = "MSTest"; version = "3.4.3"; sha256 = "070avma2zdxdpn23a9chgz9n1kglxh8nbb1g2ggzk3xxi5sdjj0n"; }) + (fetchNuGet { pname = "MSTest.Analyzers"; version = "3.4.3"; sha256 = "14a6rzh4cvaf9bw63qlxw242fbmk4agyx9qgl19swpciqcaq7pxi"; }) + (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.4.3"; sha256 = "0hsslndnfyb6shgkmgy10f1c9p6b47ry20zr2l1msagmkrk49s5q"; }) + (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.4.3"; sha256 = "0hviglzfv16dd3aczny455sy1k0rikzd5w34smfpjyxc0wqx6xvp"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Nito.AsyncEx.Coordination"; version = "5.1.2"; sha256 = "0sxvmqnv8a94k3pq1w3lh1vgjb8l62h1qamxcjl3pkq634h2fwrl"; }) (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; }) (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; }) (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; }) - (fetchNuGet { pname = "NLog"; version = "5.2.8"; sha256 = "1z3h20m5rjnizm1jbf5j0vpdc1f373rzzkg6478p1lxv5j385c12"; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.8"; sha256 = "1qnz91099f51vk7f5g2ig0041maw5hcbyqllxvj5zj7zkp0qw9b8"; }) - (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.8"; sha256 = "05a6bzvdf63lbnn6sj3yfggxcgv96j91kdbcw0ac5hxl58df58r6"; }) + (fetchNuGet { pname = "NLog"; version = "5.3.2"; sha256 = "01qnzmwvc93yywhvy5g29fb8jnalfi82az7296nblyqjalhbzz3g"; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.11"; sha256 = "0j276q0a14qk9nc3f03265jl5wp38bnm7dyyx0s4kxkyb3kx3z8c"; }) + (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.11"; sha256 = "17xvaj54liyk9zq0f80z1ai6wq4rgj6xy93znvsdcnldmin1icz9"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; }) - (fetchNuGet { pname = "OpenTelemetry"; version = "1.8.0-rc.1"; sha256 = "0scpylqwqmp7lpmixci88v6zf7jzf3zrcbrhl30bd4p7r4alw2lp"; }) - (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.7.0"; sha256 = "099yivazj5078076xydssf38r71c5nk3n7hy0lr51p80gln1vdha"; }) - (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.8.0-rc.1"; sha256 = "0rnl9pkwbz2srkss3ay05jjrfkyzibxa6vx0hg7rzfpyjinhaycs"; }) - (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.7.0"; sha256 = "1j7bxhpwpcrjr4am7s4mavjjpasikv4kp8glmxiw5x9zvc0x0ix7"; }) - (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.8.0-rc.1"; sha256 = "18r7m4zjimkkwjqw8hd9xa85lnj1fy45xyd338fbpp9nm73j9r2g"; }) - (fetchNuGet { pname = "OpenTelemetry.Exporter.Prometheus.AspNetCore"; version = "1.8.0-rc.1"; sha256 = "0fiz7qpzn64by4dlc5r9ha2qrp1j9w9lm6c7bzpvshzwz8ifamv7"; }) - (fetchNuGet { pname = "OpenTelemetry.Extensions.Hosting"; version = "1.8.0-rc.1"; sha256 = "0p5sybp1b8fkccibhlmjlvdnhryscqh9f435c34bwp6vvllxf17z"; }) - (fetchNuGet { pname = "OpenTelemetry.Instrumentation.AspNetCore"; version = "1.7.1"; sha256 = "19r12csxwdrvl5yx88mv68rzj2cy43004pwldy6q89v42sr01kyi"; }) - (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Http"; version = "1.7.1"; sha256 = "0mvrcz2mg3caf4lcwi1ai7i7ldb27p4y2qx9vckfjal203bps352"; }) - (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Runtime"; version = "1.7.0"; sha256 = "0klyd24akymj2hpjlnzmz7x9kggj4amhaqx1zh9nxjvlmmy64gxy"; }) + (fetchNuGet { pname = "OpenTelemetry"; version = "1.7.0-rc.1"; sha256 = "0y16qp3xrypk48f27pfvccic47p9wpl4qx8mar4rf2b78ca21c9p"; }) + (fetchNuGet { pname = "OpenTelemetry"; version = "1.8.1"; sha256 = "1slyjdzbiv179sq91bq6bhbqw20jmk6j9x1g5fhvnqsymfqmnmq2"; }) + (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.7.0-rc.1"; sha256 = "1i09vjjrimg0bwraamsjdqx886apscwj72skds3ysvc9c7n0hpl2"; }) + (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.8.0"; sha256 = "0s402mz4gz1chlg29159awawpi6ms4ln5gdds01y38wx6cia6lb9"; }) + (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.8.1"; sha256 = "0c2dvnnnizn5g50js336lkgfxh6klcdb0h8pppf68v3liwlhxly5"; }) + (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.7.0-rc.1"; sha256 = "1ayy2q9cg6482ahvz3cx7a3cikjrnmr5kr7yk9qnbbwy0wfmb6gw"; }) + (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.8.0"; sha256 = "1vhl02w068ynhpak0pyjn2xmrnisl9m73lmsckwkncrhinplw7hz"; }) + (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.8.1"; sha256 = "0lys1l0qsna2h82j2rbxi5fc8barrq43fs0lradr85r7sy3x91cg"; }) + (fetchNuGet { pname = "OpenTelemetry.Exporter.Prometheus.AspNetCore"; version = "1.7.0-rc.1"; sha256 = "1777nbj78yppmqmwvv0bsl4l0vp8lfc5fpsdmknf6wl354f0z1f8"; }) + (fetchNuGet { pname = "OpenTelemetry.Extensions.Hosting"; version = "1.8.1"; sha256 = "01vi9sqb2j25i6926c581w067nadf4q4hs0hkwjg8wpzhxz0n3xq"; }) + (fetchNuGet { pname = "OpenTelemetry.Instrumentation.AspNetCore"; version = "1.8.1"; sha256 = "0s5kxqjhmwm2p2sblmmsavvmknqb8yr0b07ngq8hk0w8b48kyc0h"; }) + (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Http"; version = "1.8.1"; sha256 = "0p3mw08vi9ljf06239n8b1hfj0cqqb198qn89sf39mdjsy13ca95"; }) + (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Runtime"; version = "1.8.1"; sha256 = "0j2i01378848nvib1krk948lp74x8ykgspka05g37a3s284p1nyd"; }) (fetchNuGet { pname = "protobuf-net"; version = "3.2.30"; sha256 = "08bjdn8dbqpzn5c9fw89y5766irwplgyzhyxcrjzpywkwpj75r4i"; }) (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.30"; sha256 = "01mgw4s0b2vxf55v6fa3n5l9jwk6bkl60aaqv7azl198wwslkjhq"; }) (fetchNuGet { pname = "SteamKit2"; version = "3.0.0-alpha.1"; sha256 = "01lrbkbpfqdkhba9hsfg9fqyh1sa9r2cp54r2wlb83zfr3f5q8l8"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.5.0"; sha256 = "0k61chpz5j59s1yax28vx0mppx20ff8vg8grwja112hfrzj1f45n"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.5.0"; sha256 = "00n8s45xwbayj3p6x3awvs87vqvmzypny21nqc61m7a38d1asijv"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.5.0"; sha256 = "1s6axf6fin8sss3bvzp0s039rxrx71vx4rl559miw12bz3lld8kc"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.5.0"; sha256 = "0hq93gy5vyrigpdk9lhqwxglxwkbxa8ydllwcqs4bwfcsspzrs83"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.5.0"; sha256 = "17hx7kc187higm0gk67dndng3n7932sn3fwyj48l45cvyr3025h7"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.6.2"; sha256 = "0lq774iggpvsmykbrplvv2a5z2ylsslv5wynmvpnlznd4lvgxb4h"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.6.2"; sha256 = "1snz71ws87kr8pz4c3zcla51mqbly015ib6b0y20xvkj25qx7gl8"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.6.2"; sha256 = "0j93y0krn5fzvji0k7g4cxi22b7j8n3brxw4698pjq2pqqf2d8qy"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.6.2"; sha256 = "00lar7246mncidflm15xz5b9hpni9bf8wj37dc0l2sj3hhv9nvwj"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.6.2"; sha256 = "0w0h2cs8n5avczzm5plzmkvkc6xn0pj425f4400fk21h8ysvhg8h"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; }) (fetchNuGet { pname = "System.Composition"; version = "8.0.0"; sha256 = "0y7rp5qwwvh430nr0r15zljw01gny8yvr0gg6w5cmsk3q7q7a3dc"; }) @@ -141,5 +151,4 @@ (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "8.0.0"; sha256 = "1ysjx3b5ips41s32zacf4vs7ig41906mxrsbmykdzi0hvdmjkgbx"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; sha256 = "1lgdd78cik4qyvp2fggaa0kzxasw6kc9a6cjqw46siagrm0qnc3y"; }) - (fetchNuGet { pname = "zxcvbn-core"; version = "7.0.92"; sha256 = "1pbi0n3za8zsnkbvq19njy4h4hy12a6rv4rknf4a2m1kdhxb3cgx"; }) ] diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index 26c3cc5d2d7a5..004aadbe781ea 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -2,7 +2,7 @@ buildNpmPackage rec { pname = "asf-ui"; - version = "f70253c96e76fff5c5537c7be57a57de4e273eb8"; + version = "78188871dfce90fb04096e9fd0b6ce2411312dae"; src = fetchFromGitHub { owner = "JustArchiNET"; @@ -10,10 +10,10 @@ buildNpmPackage rec { # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version rev = version; - hash = "sha256-hw6M8O486vnWqdO4DqljOoGEevykpxhez3QL745VfIk="; + hash = "sha256-NBxN3pQFiDsRYp2Ro0WwWdGzKVjPTKx4/xWQrMNuv0M="; }; - npmDepsHash = "sha256-GpGVM9c5yaLHi77qpShm30/uObg1TdLFCIhmFvLEhaU="; + npmDepsHash = "sha256-9pLbSOMfKwkWtzmKNmeKNrgdtzh3riWWJlrbuoDRUrw="; installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/calcure/default.nix b/pkgs/applications/misc/calcure/default.nix index a9fd65a4d99df..bc82942ffccf7 100644 --- a/pkgs/applications/misc/calcure/default.nix +++ b/pkgs/applications/misc/calcure/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "calcure"; - version = "3.0.1"; + version = "3.0.2"; pyproject = true; src = fetchFromGitHub { owner = "anufrievroman"; repo = "calcure"; rev = "refs/tags/${version}"; - hash = "sha256-rs3TCZjMndeh2N7e+U62baLs+XqWK1Mk7KVnypSnWPg="; + hash = "sha256-2yWg/9NQxFIwoSLj1e0y1+tgKer8GtOmjzwlTRX/Q+c="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/misc/googleearth-pro/default.nix b/pkgs/applications/misc/googleearth-pro/default.nix index d00e45bdeb1e2..4da7bd97ec2f4 100644 --- a/pkgs/applications/misc/googleearth-pro/default.nix +++ b/pkgs/applications/misc/googleearth-pro/default.nix @@ -118,7 +118,7 @@ mkDerivation rec { homepage = "https://www.google.com/earth/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ friedelino shamilton ]; + maintainers = with maintainers; [ shamilton ]; platforms = platforms.linux; knownVulnerabilities = [ "Includes vulnerable versions of bundled libraries: openssl, ffmpeg, gdal, and proj." ]; }; diff --git a/pkgs/applications/misc/gpu-burn/default.nix b/pkgs/applications/misc/gpu-burn/default.nix index fe7bcf3dcb71a..eaf0fc44d29dd 100644 --- a/pkgs/applications/misc/gpu-burn/default.nix +++ b/pkgs/applications/misc/gpu-burn/default.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation { homepage = "http://wili.cc/blog/gpu-burn.html"; description = "Multi-GPU CUDA stress test"; platforms = platforms.linux; - maintainers = with maintainers; [ elohmeier ]; license = licenses.bsd2; mainProgram = "gpu_burn"; }; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 8ff55fda8e2b5..0501d9f707e69 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.21"; + version = "13.22"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = finalAttrs.version; - hash = "sha256-rg4czTni8toAwzppgNdi/lfUDudKkEqZUZziiIiyJm0="; + hash = "sha256-5YoFO1NHduV8qKZ8GPaFnKfRQRlhlG5swZo74SfOpZY="; }; buildInputs = [ diff --git a/pkgs/applications/misc/holochain-launcher/default.nix b/pkgs/applications/misc/holochain-launcher/default.nix index 4fbcad6b8d3d5..23b12f032bd9f 100644 --- a/pkgs/applications/misc/holochain-launcher/default.nix +++ b/pkgs/applications/misc/holochain-launcher/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - name = "holochain-launcher"; + pname = "holochain-launcher"; version = "0.11.5"; prerelease = "beta-2"; diff --git a/pkgs/applications/misc/mission-center/Cargo.lock b/pkgs/applications/misc/mission-center/Cargo.lock index 33ea0c352d293..554a818901516 100644 --- a/pkgs/applications/misc/mission-center/Cargo.lock +++ b/pkgs/applications/misc/mission-center/Cargo.lock @@ -675,7 +675,7 @@ dependencies = [ [[package]] name = "missioncenter" -version = "0.5.1" +version = "0.5.2" dependencies = [ "dbus", "errno-sys", diff --git a/pkgs/applications/misc/mission-center/default.nix b/pkgs/applications/misc/mission-center/default.nix index e13774cf3c881..9188df9e5b3b4 100644 --- a/pkgs/applications/misc/mission-center/default.nix +++ b/pkgs/applications/misc/mission-center/default.nix @@ -1,38 +1,39 @@ -{ lib -, stdenv -, fetchFromGitLab -, fetchFromGitHub -, cargo -, libxml2 -, meson -, ninja -, pkg-config -, python311 -, rustPlatform -, symlinkJoin -, rustc -, wrapGAppsHook4 -, appstream-glib -, blueprint-compiler -, cairo -, cmake -, dbus -, desktop-file-utils -, gdk-pixbuf -, gettext -, glib -, graphene -, gtk4 -, libGL -, libadwaita -, libdrm -, mesa -, pango -, sqlite -, udev -, wayland -, dmidecode -, vulkan-loader +{ + lib, + stdenv, + fetchFromGitLab, + fetchFromGitHub, + cargo, + libxml2, + meson, + ninja, + pkg-config, + python311, + rustPlatform, + symlinkJoin, + rustc, + wrapGAppsHook4, + appstream-glib, + blueprint-compiler, + cairo, + cmake, + dbus, + desktop-file-utils, + gdk-pixbuf, + gettext, + glib, + graphene, + gtk4, + libGL, + libadwaita, + libdrm, + mesa, + pango, + sqlite, + udev, + wayland, + dmidecode, + vulkan-loader, }: let @@ -45,28 +46,23 @@ let in stdenv.mkDerivation rec { pname = "mission-center"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitLab { owner = "mission-center-devs"; repo = "mission-center"; rev = "v${version}"; - hash = "sha256-I/UkHXDGbKiOcn7R0nQVKcgdvyV4ycgQGNoHA6QMAnw="; + hash = "sha256-84D+CttolY5hleCJbDiN3mlk0+nlwwJUJhGoKGVT/lw="; }; cargoDeps = symlinkJoin { name = "cargo-vendor-dir"; paths = [ - (rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - }) - (rustPlatform.importCargoLock { - lockFile = ./gatherer-Cargo.lock; - }) + (rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }) + (rustPlatform.importCargoLock { lockFile = ./gatherer-Cargo.lock; }) ]; }; - nativeBuildInputs = [ blueprint-compiler cargo @@ -139,6 +135,7 @@ stdenv.mkDerivation rec { meta = { description = "Monitor your CPU, Memory, Disk, Network and GPU usage"; homepage = "https://gitlab.com/mission-center-devs/mission-center"; + changelog = "https://gitlab.com/mission-center-devs/mission-center/-/releases/v${version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ GaetanLepage ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/misc/mission-center/gatherer-Cargo.lock b/pkgs/applications/misc/mission-center/gatherer-Cargo.lock index 927b9f29c8169..d6ad543585a4f 100644 --- a/pkgs/applications/misc/mission-center/gatherer-Cargo.lock +++ b/pkgs/applications/misc/mission-center/gatherer-Cargo.lock @@ -383,7 +383,7 @@ dependencies = [ [[package]] name = "gatherer" -version = "0.5.1" +version = "0.5.2" dependencies = [ "anyhow", "arrayvec", diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index 40530d16391ff..a73767492f3fe 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -16,12 +16,12 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4919"; + version = "4921"; src = fetchsvn { url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk"; rev = version; - sha256 = "sha256-WMFZEGTXVAaBlEKUqclmkw3pKnWSdbvulDvSi7TQn8k="; + sha256 = "sha256-s7EKHXh3UNMDzBmWUTZaLR1P21e27cWJNYRlFcpJu50="; }; patches = [ diff --git a/pkgs/applications/misc/polychromatic/default.nix b/pkgs/applications/misc/polychromatic/default.nix index ccd283b6d5f06..24ff669e4f22a 100644 --- a/pkgs/applications/misc/polychromatic/default.nix +++ b/pkgs/applications/misc/polychromatic/default.nix @@ -17,7 +17,7 @@ }: python3Packages.buildPythonApplication rec { - name = "polychromatic"; + pname = "polychromatic"; version = "0.9.1"; format = "other"; diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index 5882057988a4e..14b2f19ccd4bb 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -18,14 +18,14 @@ mkDerivation rec { pname = "qcad"; - version = "3.29.6.5"; + version = "3.30.0.0"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - hash = "sha256-2x3np1cmjJ/IN/vSqKX6mTQbtFROxPzhXPjeJ6mxe9k="; + hash = "sha256-KpY/GjagRx0XkH18dDJcf6JfkT/0V8ZHJ5DHtAEUaF4="; }; patches = [ diff --git a/pkgs/applications/misc/remnote/default.nix b/pkgs/applications/misc/remnote/default.nix index 0c247ffb092f6..0f6be51187fa1 100644 --- a/pkgs/applications/misc/remnote/default.nix +++ b/pkgs/applications/misc/remnote/default.nix @@ -25,7 +25,7 @@ appimageTools.wrapType2 { meta = with lib; { description = "Note-taking application focused on learning and productivity"; homepage = "https://remnote.com/"; - maintainers = with maintainers; [ max-niederman chewblacka ]; + maintainers = with maintainers; [ chewblacka ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; mainProgram = "remnote"; diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index 87925d732e89a..44ba291f31e98 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -18,11 +18,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "safeeyes"; - version = "2.1.6"; + version = "2.1.8"; src = fetchPypi { inherit pname version; - hash = "sha256-tvsBTf6+zKBzB5aL+LUcEvE4jmVHnnoY0L4xoKMJ0vM="; + hash = "sha256-65U/j6P6X4JzhL0aEOnzKa/Al6SYprOOxix2dtcusJQ="; }; postPatch = '' diff --git a/pkgs/applications/misc/sticky/default.nix b/pkgs/applications/misc/sticky/default.nix index 66b4897e30386..62c3c8394b6aa 100644 --- a/pkgs/applications/misc/sticky/default.nix +++ b/pkgs/applications/misc/sticky/default.nix @@ -15,17 +15,16 @@ stdenv.mkDerivation rec { pname = "sticky"; - version = "1.19"; + version = "1.20"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-nvnft62vZ9ivijYnQGULW7ff2aAVJiIx9xq09My2NxE="; + hash = "sha256-HzTXaJgDu72pWM0mGNNBy2yFB0u0rqATFK9JzyOw8oE="; }; postPatch = '' - sed -i -e "s|/usr/bin|$out/bin|" data/org.x.sticky.service sed -i -e "s|/usr/lib|$out/lib|" usr/bin/sticky sed -i -e "s|/usr/share|$out/share|" usr/lib/sticky/*.py ''; @@ -51,20 +50,11 @@ stdenv.mkDerivation rec { xapp ]; - postInstall = '' - # https://github.com/linuxmint/sticky/pull/118 - cp -r ../etc $out - cp -r ../usr/* $out - - glib-compile-schemas $out/share/glib-2.0/schemas - ''; - dontWrapGApps = true; preFixup = '' buildPythonPath "$out $pythonPath" - chmod +x $out/bin/sticky wrapProgram $out/bin/sticky \ --prefix PYTHONPATH : "$program_PYTHONPATH" \ ''${gappsWrapperArgs[@]} diff --git a/pkgs/applications/misc/tickrs/default.nix b/pkgs/applications/misc/tickrs/default.nix index a22f9da07359e..29587be9bcde2 100644 --- a/pkgs/applications/misc/tickrs/default.nix +++ b/pkgs/applications/misc/tickrs/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "tickrs"; - version = "0.14.9"; + version = "0.14.10"; src = fetchFromGitHub { owner = "tarkah"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cN5GtU3bmsdJvfjVdWvWAshiU3Ged7L9pc8wid8GQwA="; + hash = "sha256-6iMThVLIkFoNa7Z0MuyhUNGCwFtCfmG7jHvDfrEZE2I="; }; - cargoHash = "sha256-ngDA085V3+2oBH13Fs+pJez2W2/i1pEKoWdqJ4/3Q0I="; + cargoHash = "sha256-gfBmoN91xUcjBafxBoLP41Fl8FuH2taAu3P6sgJPNWI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/misc/tuckr/default.nix b/pkgs/applications/misc/tuckr/default.nix index 6c9b527294b01..d660248deef88 100644 --- a/pkgs/applications/misc/tuckr/default.nix +++ b/pkgs/applications/misc/tuckr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tuckr"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "RaphGL"; repo = "Tuckr"; rev = version; - hash = "sha256-S4mHNCyK7WGYRBckxQkwA3+eu7QhUyKkOZ/KqhMJf+s="; + hash = "sha256-oQSuR0Zt1T8YU3O2Dq/qHl4ysVDl+3EVvp9r2mD3hRA="; }; - cargoHash = "sha256-aUhiMJUKV+Da3WLUY9Jr3oDB8yqcUm0pP05yKaITjM0="; + cargoHash = "sha256-ESDfUZsoqwBurXuwNIRSqxoDWnA2VpDZ9Q9GGaV8B4Y="; doCheck = false; # test result: FAILED. 5 passed; 3 failed; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 93d02bb556f42..6f432bc71a9e1 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,11 +1,11 @@ { stable = { chromedriver = { - hash_darwin = "sha256-a1gUAyNx0gKNZRKpQrsG3neKIy+xPquKUrzmcVbfQ54="; + hash_darwin = "sha256-BWZaa1+3EUG11RmZjjbwG2UPZhlCpW3X9rkpiWrjgzM="; hash_darwin_aarch64 = - "sha256-8OzxncQs/pXIo7dVLCgOlyO5jjTKRdTMoMaQsAiJeO8="; - hash_linux = "sha256-lpYxCCjPacqZKiRMQrKdEaZJ8DO3jpbUK/6/j1i95a8="; - version = "126.0.6478.55"; + "sha256-wkUIFolVdvcnEQKKehKCyD5GS5Q42fVFKj/iHtiIj8I="; + hash_linux = "sha256-owTmkkgMcmuuhGv23uNjFjBdC49IJt+v6rjWu7xuchQ="; + version = "126.0.6478.62"; }; deps = { gn = { @@ -15,23 +15,23 @@ version = "2024-05-13"; }; }; - hash = "sha256-nXRzISkU37TIgV8rjO0qgnhq8uM37M6IpMoGHdsOGIM="; - version = "126.0.6478.55"; + hash = "sha256-sXP+/KXDoy3QnRoa9acGbsXKVCPspyNGtZTLMHBqxvw="; + version = "126.0.6478.114"; }; ungoogled-chromium = { deps = { gn = { - hash = "sha256-lrVAb6La+cvuUCNI90O6M/sheOEVFTjgpfA3O/6Odp0="; - rev = "d823fd85da3fb83146f734377da454473b93a2b2"; + hash = "sha256-mNoQeHSSM+rhR0UHrpbyzLJC9vFqfxK1SD0X8GiRsqw="; + rev = "df98b86690c83b81aedc909ded18857296406159"; url = "https://gn.googlesource.com/gn"; - version = "2024-04-10"; + version = "2024-05-13"; }; ungoogled-patches = { - hash = "sha256-ZYYizL3hFSEQUdDDZIvsEzidq5td+UoaWdertY/pqOc="; - rev = "125.0.6422.141-1"; + hash = "sha256-vQrUQMmNSw+b9nPzP1RmkncQHasmZvnxNHjfiPoMUXo="; + rev = "126.0.6478.61-1"; }; }; - hash = "sha256-8Qe1hgDEjvdAf2ao4CIieC7l2pTSIPLTZb+vdctUEo0="; - version = "125.0.6422.141"; + hash = "sha256-cB2jrasrtaFWM8tpG9leuC+jUAvoU8g5977cn4r7rbw="; + version = "126.0.6478.61"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 438afcb47f3d1..df8d45d50f1e6 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,1025 +1,1035 @@ { - version = "127.0b2"; + version = "128.0b3"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/ach/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ach/firefox-128.0b3.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "c7aae56e1d11690146e31f73c4f45dcc6cc17b70ee253d13dd9ce8f111056cbc"; + sha256 = "91b9fcf837ffe54df7712f71b608b636464c8222e96d39f6714db4939848e47f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/af/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/af/firefox-128.0b3.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "0ebbde167d241e133bdec7d552e1e788a82162d7c5e132307f638af8e7b42735"; + sha256 = "ccafcb76d6f4635edef530be87d8dd4762c81726b5cad9c2cc3662bd65360ba3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/an/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/an/firefox-128.0b3.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "f5c692093a7a37b197cfed2598dc0c3c9d74251c56a138c50bc1cc0e26aee7ce"; + sha256 = "d45a54fbf050485a3513ed4420d6d79912146fe6255e1bb9d0c8438222d20899"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/ar/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ar/firefox-128.0b3.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "8a92915a3694d414dd784810842d1da28cbc1af13d207c1718fdacfa0bf0c0cf"; + sha256 = "f0304395c3c4e8d8be8dbc5664dffee5c2f788d4bafe304d1ab4db82e76077ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/ast/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ast/firefox-128.0b3.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "e754614bbbd6868318795e43bd067b0dede402c3c40866c6fed4e4ed177aecb8"; + sha256 = "fbd5d17af1d32899de32d5e76f0da6bc9cc232b524f08ed1592eea3f03138e67"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/az/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/az/firefox-128.0b3.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "299ff13944cecb650402946cec2dc28a25ecc4d175932a646e5c8d1f985244de"; + sha256 = "cc41ca3a46ace0c4e5bd2e0d503ddbbf92730dbaf24bb4c32b15481a51331ea5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/be/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/be/firefox-128.0b3.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "ecc04baedce51685f8ecad129fb62563eb6ce4c9f2d889b3ef1b9d99d9485114"; + sha256 = "1aea189544651679d4d590d7eb9de7b59290df85d738dd1e97575f863352ef7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/bg/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/bg/firefox-128.0b3.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "be8464fa878ef4feb42fe5df414577474c3a753763d6956413c1896e014b1aca"; + sha256 = "0c191744aac8dcbea9e7047adba99fca2f44eb2456884ced55daefaaa947e14a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/bn/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/bn/firefox-128.0b3.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "1af698eca255cd94ce65ccac0d0fdf9ebd360706b296b27a7c010f277493efcb"; + sha256 = "83c7fc7558574813a920d3f9fe07bdd7163585eb82a09d77e889cdac6e684b81"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/br/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/br/firefox-128.0b3.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "7ca811f059868cb830c1bf48278583eefb662a4af70d4ad838d695bbc8993cec"; + sha256 = "2cc6397f3c67a46c01f9bc0d891c781239312277d60be79bd3152156fcccaf9a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/bs/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/bs/firefox-128.0b3.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "955a3e8010619360be944c52003d64ab21f87f2fe502dd9a64da927eab18bb95"; + sha256 = "b75ea133c0237d67ae6480a3754d7edb8757e4bfc3517fb04e3d143f0abe70ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/ca-valencia/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ca-valencia/firefox-128.0b3.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "e7d014d5652fdbe7aecf0f03e1bfc7c5faf6162c4db457c173696e085d947fd3"; + sha256 = "658cdcb9fb3b12dae8b8f11458c36955afebd60cc2578b544a02c975ff8522c3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/ca/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ca/firefox-128.0b3.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "78b66d258512ed91ec1264e15a8011d2ebbcf54e8c1b6aa7e938708b4b449561"; + sha256 = "b4c12e3a8d4ceab2eed6f29ac27f3e38ee8410ea49f809021f30915357a237a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/cak/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/cak/firefox-128.0b3.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "254afadecf8023427b35ebb8892bddef4a28c74edb1111fd7463abad3253a2aa"; + sha256 = "496fb9b680714e84895c1d88a56443a9c85fd983d3a95c647a9fdff348db9145"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/cs/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/cs/firefox-128.0b3.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "d9f7f85aa9d206585f569dac9e033203120c1828003cea384eaf029b735c72b3"; + sha256 = "e9a9859fae4b699ea2ede1646f49cfc2663519850f58ddd72c97e8d82dc8b04a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/cy/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/cy/firefox-128.0b3.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "3a14e4e0f24e9171957f17c1c4796ae011ce13be294c4eb9ccee88051337da05"; + sha256 = "806f6d644c8c3dbb7c150ba4b984185ed669ade7841240b2c4135f18b6808923"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/da/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/da/firefox-128.0b3.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "54ff12ab652e7732b399f9467a83958948762b937714e4a063b25584b3da4bf2"; + sha256 = "bea3bd58f51c4e1041e2d4694f56ea27efb7e31b2df24fca43c77c7b5e07e966"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/de/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/de/firefox-128.0b3.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "5f62e89d986ccac338ac3188b50536ca5beccc8917a7fb115e2d375d51ed64d8"; + sha256 = "fce8aedc5386ce726be545ecd6e8ee9aca700fada5b366786a85e48e7e1e477d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/dsb/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/dsb/firefox-128.0b3.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "3278591a5399a8f6e586909b5b5849f2f27fc6399c6be6917e53f067958076a3"; + sha256 = "660553433ef3117f0caef5029e13e9edaa2b7800dd01e3f1f408a34cf5970d5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/el/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/el/firefox-128.0b3.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "5ddbb69bbeccb6457eb4beee49c07d2d5fbb8ec084d1d26ca86bcd2b5d6ac714"; + sha256 = "edfdac7737acf7f3d63a1a65900b16f640b788fd127df19b9796d05c1e6ca630"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/en-CA/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/en-CA/firefox-128.0b3.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "c7ec425ef808857a04eb6bb12edb6efa9aeea69e775aa0cf68c49eabde4f9043"; + sha256 = "ac420dea854ea1e7ac5e408a54fc5590f341edd3d7a2632b56a6b77edab80ba3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/en-GB/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/en-GB/firefox-128.0b3.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "6adabefd8ce08035576c0d27df6fe303265d6e5db3669a50d95588617c2dbd71"; + sha256 = "44efa47918922d1883c7844b91ff03ff756eb5bdd726d35db92875048bf7381d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/en-US/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/en-US/firefox-128.0b3.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "91bfda5ff421d6db1577990555c2da4096c18ea7d7e4faa626bef572b75bd463"; + sha256 = "a44bd8e6c0cbdf28e270190f5dcaab0b803103509f556619047990551b7bea2d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/eo/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/eo/firefox-128.0b3.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "3cebf9a4fd6beae49e82762ecf4d828d91f4c251d016122e8392a088269ccb06"; + sha256 = "2128ff79b43fdc1e8f61135a83c77d2413250a24900c349e520147eaf7bc9152"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/es-AR/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/es-AR/firefox-128.0b3.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "197a15d60bdde213e3ced20797c5d3b9266d107c786b3db754045698aaf79e9a"; + sha256 = "0b4c2cc2a8256665284e3dda0ddb9170fb688ddb5eb02ed0d1e377cef2632b22"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/es-CL/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/es-CL/firefox-128.0b3.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "38c2a4d4809af60082bb76fe339ed083d77021edf3cb7db67466ef15b45be761"; + sha256 = "10be1cdf825a91f337704e4ca5cb94bbf6f1c2d50719a13dc97c24b8f65a129e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/es-ES/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/es-ES/firefox-128.0b3.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "8def6020400ec124ea9aa6c6b790807428651b2a01bd1bb82f59277d4d29b352"; + sha256 = "29cfd6972bc67dfa4e9bf4e57a0c28cba229f35c54457819fc0ce1f661f73ee0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/es-MX/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/es-MX/firefox-128.0b3.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "0057d55bb5dac0fa89c68cd29f530be63fe5e612a164edaaf0f95fa9e647abf1"; + sha256 = "e652e6f9a61a21f992cc81adfdbe506dbd1fafb91da6519e870d65e5356a3951"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/et/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/et/firefox-128.0b3.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "ca1ea211bf93436e7eaaaa271e9fe7d24b594ee02b7213616c5b73e7a04dd18b"; + sha256 = "086736332b848acd6a8c010596331fdd468e59835c202ede90bcbf66a326fb7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/eu/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/eu/firefox-128.0b3.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "e871a40eee14d812b3d1da6b4f09ecfc3418bdd1510a8b6ee1c64284be191c9f"; + sha256 = "817eafa8d1c57a99a2e51dcb813d9d4032bc17ae67e6e48cf1b141e87899049b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/fa/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/fa/firefox-128.0b3.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "e99bbf034d1155a1956b4d9eead8627a0a8a25653f84bcf7c65c5449a36b9c54"; + sha256 = "9d09bc0b7f3f32b483890d67b9991a72b9492e1ad8be3418064f41fde5bcd5be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/ff/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ff/firefox-128.0b3.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "ec6595203a1889062c8fb8fa1b316e5c65277b8a8b5de1af688a7c7f912c5352"; + sha256 = "e6221fe30617ff74633292ddf5b0108e3a2fb7f3dd96b33df53eccb46ba4bd8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/fi/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/fi/firefox-128.0b3.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "cd71f03e43427070536fd717058cae2909c7a853ea380e879a28e4d730eb5400"; + sha256 = "5dfef84c2c997de1da02cb3eed105babc3d981d34649747eb10ee73fc63fa32b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/fr/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/fr/firefox-128.0b3.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "f4327bb8fe27a19d2e075d5ac44d4b1b89d3f2dcec866c336fad6d87d1d32270"; + sha256 = "e6bbe850823430b63b8a9815e2dbab02cc1eb470a9d5c88aa1a079fa3ea12f9c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/fur/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/fur/firefox-128.0b3.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "484706c7851e7631a2b4330e2ffa3a753cf9e3a42266019d09dec6d6888bdcd0"; + sha256 = "1c0e9148fcc302bb29993b0bfb21b330ba6a1b319acb51b7fabc8fb20d0af3cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/fy-NL/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/fy-NL/firefox-128.0b3.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "8b292615492a6cfb221c42395fca9fdeca0c4f1303c87e7c7cd17e5d820b44b5"; + sha256 = "3953327d4bfd475ca743b51cf2613c21362fa48241d9e720dce61c10c6d07a02"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/ga-IE/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ga-IE/firefox-128.0b3.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "035ed8e107a7a5a2c48c11fee7a7adc3acba6c4fd1cb8b1d0474656f8e4e1e2a"; + sha256 = "08a258714e5077881ffdc1f3e2fabdcba46d8eb035c2e45cc5cdf9b78255b698"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/gd/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/gd/firefox-128.0b3.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "687128878140148cb4f84d0efbc64b7d2152213ffcafcf7858c05b8f4f3d8e30"; + sha256 = "a8cfed3eba163eb7d83da7d752752e50a66f763e7bc96947d28c843707e6a815"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/gl/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/gl/firefox-128.0b3.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "360399cc36a3c738aa1c93679fdd6b5310ff2076a53532d72dc6c6eae0bd9494"; + sha256 = "96c78ad70db34895c9b0de2f282818c8a8be9c328ccb86ab4b34a05f7e884756"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/gn/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/gn/firefox-128.0b3.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "5f350d55055e6f34778ea1339ac597cac41a12951265a18c1717f67e337fedf3"; + sha256 = "9ca592bf9d78aedf2bf20213ab1494c6b5c0dc668dcc2a3d1b1291a6cf198468"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/gu-IN/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/gu-IN/firefox-128.0b3.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "3ecf863778a252d8753aa2a05cb9e44b28a618e763b654aeda899d48a745553c"; + sha256 = "ce4bb8c67dfdde7a0f6ade7af2408dfa29af687807e257b756235e8f0ce873cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/he/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/he/firefox-128.0b3.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "fc0f199d8a594cc8b48aebc24e424dda4baa6c56cea4366caa39cc36f4ab742a"; + sha256 = "9ba5ab6c7f2802f70098ce8aa01d575eeb7b0f58dacc10db1c4c99ede96de5b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/hi-IN/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/hi-IN/firefox-128.0b3.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "901d602e9145cc5a639a4968844c25b93bad2781ced750067cca5b5015ea28b2"; + sha256 = "f9a9f3da6cfbeb6aa4a8f1f7865e7283b4870f4540789fbf944143b700686c95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/hr/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/hr/firefox-128.0b3.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "f52fe3d76b09f7ffa42d77d91fffc7d3de93e7c7a3a653fa14648a0024b59068"; + sha256 = "b49e9f643ba870955b696994c552331453a84861f124f37014883c9cb6a544cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/hsb/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/hsb/firefox-128.0b3.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "c6aad5424868d618723f1eb9385d3a520ac320b71e04e3ba8a59fb65fa212d27"; + sha256 = "23ffe338d1aa10d63c577013d393ab6b13cba618affef5d7771712fd0596e51b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/hu/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/hu/firefox-128.0b3.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "66f47258fff3b41f0ac0be736073aa12dccef6d7a8fd33473ac7a795dc75c327"; + sha256 = "6dfbca5bd230abf413a0a149a6cd6cd21a61eae43be69f5402a9ce4baba48620"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/hy-AM/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/hy-AM/firefox-128.0b3.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "afedb515503be143d48f050c0a987369037fb4a0ad53a6220670609faff94a3a"; + sha256 = "27c5564db6989ab00ea76734f375ca795472571d7f4b6fedc5135b071d58d97b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/ia/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ia/firefox-128.0b3.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "634717627c38094a95ca772c6865c5400b2ad1222e22e22c8f3f6b8124a41547"; + sha256 = "8bdfd372040d0e2b2800eb9c66782334875b119f13dff164aa7320ff39856bce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/id/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/id/firefox-128.0b3.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "a4ee1313d38275121361844e5d992ef29d83a98fe4147c3c18caa36c0ed1e9e6"; + sha256 = "c9c2fc719b5502812ba5ee64351b48c10917880625667f0a0f00e02703cd77a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/is/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/is/firefox-128.0b3.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "7933781c4914cc2fa783f5223ed84773f6b9eea9c4e574f31e5235c56f642fa9"; + sha256 = "fae14a04c6625a07bc73956ba990dd7e488e130a60770c89175eca6ac86cd387"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/it/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/it/firefox-128.0b3.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "fd23150d42eab62017c03c60cc14c60bf30a8dd47392f9f3622ae6f316736cbb"; + sha256 = "4a28824f54e51f24ced026f78ee980e2e36802dddc800d1a0b02517a250f7ada"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/ja/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ja/firefox-128.0b3.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "e883e237c2be0be605d3c84c9360a9f7730f3db72beb2950b783718c72dbd6c9"; + sha256 = "30401649d210eb1caf484548de20c260a6a767018135502068cbdea202eebcf6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/ka/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ka/firefox-128.0b3.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "39a9cc928671f26756fe1be706ecc984e0d0e20a2d7801de02d84b183f69929c"; + sha256 = "6355e66d1428fb69d1c900d42440d73b0d59bee89146dffb7af457ca411b2aa1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/kab/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/kab/firefox-128.0b3.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "1901f0511457f0554a157042d880eb655a05d21a9334141d749a0e3fb0a11477"; + sha256 = "52d5431b2d7d5b0b3f0b1bd67251f65146ee653bc78fb16c84f99571c01e6bd6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/kk/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/kk/firefox-128.0b3.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "bffba4678647019c5456b126454cbdfa6005132d2e56fd92731db444144a3c2d"; + sha256 = "03d0e5f8a5b60389448aa74fb94b865237778da749dda7819fc23a585e121b37"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/km/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/km/firefox-128.0b3.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "2bab72d223d23e27adbdd738397a65961aba70bb4305013bcaa781c4697c4950"; + sha256 = "e049a895091f181e91288ab79750d9972e22afb45b5b64c61832a654f9972c57"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/kn/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/kn/firefox-128.0b3.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "b8f989ed111930ed357c5522e1b1713d95dd4bf1507262fa4f1386679ac94780"; + sha256 = "705aa81ae0963aaf689fd5cafa60e293f7d281422d6ad127dbc7c9ddfa0dcfad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/ko/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ko/firefox-128.0b3.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "af2127940913eace7dfdd52db34c2a5d53123822bf50153f5b58ebbb394a54ea"; + sha256 = "82e2cf3543a48a0678338200309730fc3a699f7a984f1014c0ba8c5945bea518"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/lij/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/lij/firefox-128.0b3.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "6ce2e398539e3f4c5241a472a5b16e4cd60430e5d66e693cbb94cf8634f4afde"; + sha256 = "4cfed1c937cfb45b1ac05c4ccbde72275644ab95d4d6bab2943ada5ba81f5b68"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/lt/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/lt/firefox-128.0b3.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "538264101be6493fa266df6aa64342f013eac5f9b2e92c6f61f28727898e1447"; + sha256 = "24f865bb38ad0c2d02e51840649b4d827836edd1f706393d16bb43b63f76a835"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/lv/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/lv/firefox-128.0b3.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "10e4d7da5fabe1187f8d205c7be80f61b10d8209c47f03fd5e4b531cdd110833"; + sha256 = "fbba425695890a2be1736653dc4c49c94efc17d09cd883f5e137afe212fdb25a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/mk/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/mk/firefox-128.0b3.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "8e20a49fc3a0bb9d005e45b21f7c9d0ddf4b4ff5f0641d0884f59dcb61b543d3"; + sha256 = "e8773525b7f2c0fc82afe01457c7074899d968675e9bd293264e22403b4be8b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/mr/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/mr/firefox-128.0b3.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "39d54febce8a2755f01c0fb37b8332080d256d406c9d235207e8956ab4ed9187"; + sha256 = "7a790e94ea8cb0019d72f11d1110e1035799b9e9d2e6ebfc5cac502c94db8f68"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/ms/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ms/firefox-128.0b3.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "bed6d9827609128910ca7d5e8ec754b3a0c80e350ba619e74fdc43f2e59342d4"; + sha256 = "b2c32fa4c9d4eeebefea7b235b91a56e2ca3279c02f64520fd8e68048d190acf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/my/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/my/firefox-128.0b3.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "a88a8b48ee0c5384b5e4ba4a934df39881dd382a6657cd5896537e5ffb5ede05"; + sha256 = "e247dd90ffed9fd6dd8a7cf8667a934f211fdac32ae853b3eea803cb490caa9d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/nb-NO/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/nb-NO/firefox-128.0b3.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "95dfe9aeaad511bccb918fde67cdb816d0fd7be7c7117b085df79feb7d34886d"; + sha256 = "843e3303bd29807c2c4f27368173e0f9c32fdb16bb2c151d47c5b5099b92dcb7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/ne-NP/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ne-NP/firefox-128.0b3.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "d9718cbaf47641167ea6803f878ebe2cee8c328da01d0bb5294f9cb102fcb6d3"; + sha256 = "f88683ca97cc178aad54d921aedad7ba6207f9320a5fbbc2ba0d6d7d7ef8f46e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/nl/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/nl/firefox-128.0b3.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "4573531cae8892e5ce64e550774ec04ef20cfc373e95287105828fe36f43435b"; + sha256 = "4d06e59feb4b38fa08197ba3aa4e57d97265f04c8d7c5f8de31fefccb4b38601"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/nn-NO/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/nn-NO/firefox-128.0b3.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "62fed9500374dc32073b34d7b7e7f9c4a1f025dcd41ccec1bd409a0066bc1184"; + sha256 = "91d60aa0cf396e2f332c2c215c92d0dee58cf484c46ff3e2148e974faed843d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/oc/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/oc/firefox-128.0b3.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "36b6041ed53861d2fad64c8e31d1009d18b318ae046d5586c7fe0330a9500d89"; + sha256 = "e51325109a7d1a4e5277abc42e1bcce67e6872210f46412fda78c56ea0a5ed48"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/pa-IN/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/pa-IN/firefox-128.0b3.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "cd3178a4d6fa15869c8912dbee3c660650d9392a17064c6639ab295d28ae56df"; + sha256 = "c2d0844b1e1dff71ff68498e8a8ed95efb058ff2e9938950d198fca0f01b2465"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/pl/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/pl/firefox-128.0b3.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "fd6e9a84ed6815415a6f9833f17b352d5c580f2dead854b5d050ece4851d19b5"; + sha256 = "417a7f871b5a5ad8292d732382e945fbb5cd52cc114659e78e305dffd532d98a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/pt-BR/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/pt-BR/firefox-128.0b3.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "5cb87e09bb6103642172d1f59eca2b7fe7da39131a4df8c5c5e5d556569624e4"; + sha256 = "f9cc05d47834d2cae826b72efc2c66b7d78fee9d0e1a49ebca4c95f7d15d6efc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/pt-PT/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/pt-PT/firefox-128.0b3.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "8615acec0e99561e1e894b26aec495fcb20b2a86ecf58132ef8a3bbe1661abcd"; + sha256 = "ac12dc95c8558f67dd648d383d6f71d66fd01b408fdbab01f63a4d80e64f4945"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/rm/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/rm/firefox-128.0b3.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "bb3241561ae0127fb8fcb27f6b287089626019e92523fba57111b0d8eb1c5a07"; + sha256 = "727ba61e6d215858c92a9242ff2826d8ca1d63acb92fe9807bc9896495a47e42"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/ro/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ro/firefox-128.0b3.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "2db0820b0e3df8ac8c201cdbe6460de89ba0307762d57b63946b57eb459f2654"; + sha256 = "c53ba875f108a47f0c19e1956f988b1dc2882ae9fd28321c81254b4861b0169a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/ru/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ru/firefox-128.0b3.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "f81b7e3938bff5a3a299ab8e5461890273c2e3e1a6dba82063db4eef9e7dade3"; + sha256 = "015278da272c3c91fd566aec8d7f7d155cd1e38406049b136cc4656fc2a23629"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/sat/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/sat/firefox-128.0b3.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "1fdc6ee7707f3a3fdbc4bdc63be308f07eb3929aa4b3b10c86cb3c36cf7ebefe"; + sha256 = "5954a27e1dbe063dd3959a93d472e73e9b609cf57e3638e0332b354ea3628bfe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/sc/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/sc/firefox-128.0b3.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "6ff69281a6f4c6d76522f7c77bed70c094ac440b9e32dec9d428c53c0b4ef2d5"; + sha256 = "4e8435a0716f906830ac75c9573ecb36279cdc1f6321795a45f75daf08c4b41b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/sco/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/sco/firefox-128.0b3.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "d67d9d93a886d431572d4d5cafd162aae445e51c4b5e2182d04f621f1967ee59"; + sha256 = "ec1bfbeba046492deaf3d42cfeede879413f85b7eb4e85c9ddc064660c088860"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/si/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/si/firefox-128.0b3.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "e86b70eced0f5b03ce1fe607dc2af7157cef886d22fa5b940d293314579bbb7d"; + sha256 = "8fcbd1ef4c1dee115d60649c2c47439e9799ccf8a34d9aa09d6bf0d5d62e143f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/sk/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/sk/firefox-128.0b3.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "7e5ed858cbf865bf58c00995c023810e3af765044c7c3d329eecd097923d767f"; + sha256 = "695616f84bbfe2c7a4dae8d9d30068419fedc5448a26733e4f5f35fd1c5c4002"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/sl/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/skr/firefox-128.0b3.tar.bz2"; + locale = "skr"; + arch = "linux-x86_64"; + sha256 = "0c53f9fcbda34c8df1d3495e447835fc6a6b7e1ef41c1b65c3ffb3f6e92060b1"; + } + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/sl/firefox-128.0b3.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "1f478d69f4ade3a000b06c9bbb55df375a1b19ccd8feab80c355141c3745a3d0"; + sha256 = "8d9b8253d25bc88667c3123a2d4c134a9e8fa4078f992b41ce8b3b8abc192393"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/son/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/son/firefox-128.0b3.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "48ea869f09cafb9cec502f4156a41df9adbd4c129840596029809bcb0f0e2eef"; + sha256 = "ac4706045196b94245466b8ca8ce71215ba23937d675d883ad926c8cf6a3be90"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/sq/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/sq/firefox-128.0b3.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "9015e159779159398ec555278a68d0092064ae1edddc5c3421aaf425ef20a8c7"; + sha256 = "0d40ee306d601eba916d19cf89241e7a7dcf3101d33e3834c4fc39f37f06119a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/sr/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/sr/firefox-128.0b3.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "f28facc0fb7dc5ed720e4b1227cdf7e39023ac8d6e5f72474907e84ef3027bb4"; + sha256 = "c27e8606ae5dac9a957b3dedb453e1dc9bf560b73bde942d84b20ffa51d49339"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/sv-SE/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/sv-SE/firefox-128.0b3.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "9e6d42a3f5a101fefa6c1a304ab139273d9a363c1ea967f58f12b61828101943"; + sha256 = "81f2fa7b349b207482a013a4f693bf05be6ea0baddbc6f5ba0659e6b72fb4f9a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/szl/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/szl/firefox-128.0b3.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "d20841dba01c4a3c8ecea6eea8dcd215b9f428cd0a8fd163166674c2f09b9afe"; + sha256 = "7f6186f6936d343feac7eaa0de4c3e1359011d7a7785c241d56757db9926b186"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/ta/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ta/firefox-128.0b3.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "898c22d8d59395eaed7519eae5b9227283a8cec50b9c899a85129f30575c6cec"; + sha256 = "59414f762f5f5de1e172f71204cd21bc3861c3fac65fb7eee64c1dec1617ecae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/te/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/te/firefox-128.0b3.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "94bfc953d203b49163756fad31b860313060860b6816c9e940ffa419e8a0f1c6"; + sha256 = "511c1d35bb3caade5771e060ada9674a0bc4917d4da806618678b04618ba17c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/tg/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/tg/firefox-128.0b3.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "15a834f7064747052c700c419e337f7d2e6c0c2945ad62ae6d801d6ecca14208"; + sha256 = "4bd660b137d7240f4ae6ccb15ac750556edcbfe47e6a65e1c29d8ee599b953f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/th/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/th/firefox-128.0b3.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "29dc55972c657cd010e993edf30e74b639cce2d18b49dfe24bf7ec9b0f91353e"; + sha256 = "19d1641e4904bc4ea993dbd4d8a84538a4b88294721883e27df8db649a7993e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/tl/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/tl/firefox-128.0b3.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "33cbd2e1126492466f8c7d9759dc632408269ff816450291d2477d26ab087c88"; + sha256 = "4dbdb2c35ab40bcdf43ebfdd51848115dd617306f44878d8b2d0c2f562da8095"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/tr/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/tr/firefox-128.0b3.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "90c3f4025a2805d55c236b366d83d415224fecc63f540af94aff09763ca72621"; + sha256 = "6f267217aec01eacf239957079a792119bdf9ecd988835b4efee68d757db682b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/trs/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/trs/firefox-128.0b3.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "7b741c41db47fad0bf4c63a5f4138cb2835e771cf93cba6a8696d25d9ecace69"; + sha256 = "a0a1c980dcff845c2aa858e1a44a50b00fa0378443736abb3438fc86f9826d7c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/uk/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/uk/firefox-128.0b3.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "a0aa50971cfd3f404b8e5626372b6931c0e317c8f4cebe48f8d2e16a437d95c2"; + sha256 = "d0fdd0b81afb141faff7605d302d1934788968ef3dcff38e1078d3c4e14851c7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/ur/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ur/firefox-128.0b3.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "416c7f1595cb6b530f4b368906cc6b1923346e6e4874742a7dffc43eb7488c94"; + sha256 = "a680e79a663a58fd96e2d103b686efc252d3d9427808c7e760307862be1d145e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/uz/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/uz/firefox-128.0b3.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "9a8f52384037d26e1e41e80f62fec0b53cf8ae963f162d60176fafd4172a3e8b"; + sha256 = "15588e3d356f2bc8adbb69bd53ca9ca38b0304703bbe7a6e16879d334af766d0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/vi/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/vi/firefox-128.0b3.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "27cfd839bd664f24c737da29937cf0eaad742de74983af89dd2816c06e73061a"; + sha256 = "44ee2da45fe203fe8f890c0e6ce8af05accd3f1cf02c97ae3f2f7a49da3aee37"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/xh/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/xh/firefox-128.0b3.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "d1d120e6f6dec19695da0c15e317a1c6fe442e4a4a52f4a21d51bf6364769fc1"; + sha256 = "70a378569879d37fecda5be44e88335fd156a15ed4fc52393956952a914f9744"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/zh-CN/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/zh-CN/firefox-128.0b3.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "962ff97f66f2c77b4efe5fa292df61629c9e47e19fe4cadebcb54d2f80c15eea"; + sha256 = "453f1d607d2584386d91c16d69cb8ccbe752b3017fd472f2370b081baab87949"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-x86_64/zh-TW/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/zh-TW/firefox-128.0b3.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "1e5801ddb6ebdf53fd7707c01c73f22c7a27a5b7fc7536a3610fcd067eb9dfe9"; + sha256 = "3ca21ae9b1b1ea51cc0d3bb1afce4f394752fa957a0f7d8d4fb047c9127d31ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/ach/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ach/firefox-128.0b3.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "802c6d008d96d11e6c71003d276af7e98361a8edcf523b0cad11784cf03f7507"; + sha256 = "f52c6e81e51c03463dc74fca1623c16917ee429fb916f5ce71aac557b7030a3c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/af/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/af/firefox-128.0b3.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "530670e03c7d074d9c8d5d0afb326636961616b27eb7699ec6b25df006d2c7de"; + sha256 = "8bda42497ef0919306ca305b295cd9a85c9344c6be3a4d6b168b7f419bc76cbf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/an/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/an/firefox-128.0b3.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "a65ac8a8079190546f9ee7c69b3ee1a02c399a0489b1c45ac8b4edc75e6196a4"; + sha256 = "5090a3fdb62a77eadbd50722c3be9f56bb407240ea47e248ac56550e3a3b061c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/ar/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ar/firefox-128.0b3.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "321b67c2599e7b6331de8ba121d4bdde3ec769faf28655d862d8ac290a3bd83d"; + sha256 = "64f61f7e9838aeb571170d54b69c239855db32c4410d490275aab16df0c57276"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/ast/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ast/firefox-128.0b3.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "12d6e84029f88fa28c50c2f412636b6efd78e4394b398c11adfcccc1968ac4de"; + sha256 = "816ac6fba66a0f8e185108e8338d59e675bf1262477b416dd76b026ed1ef5f9d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/az/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/az/firefox-128.0b3.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "ff39be5bead1890b2042b438f304f94f7ff034261dc38337638294505952e998"; + sha256 = "cef18031c260d7c00ab43473c1072e7310702df92e40ecacb560a077dc56200f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/be/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/be/firefox-128.0b3.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "a27a07598d0c2c8c829eaded33a78c1005c364bb362ab62a986a9b3dbdc8c499"; + sha256 = "229a9504c02d632a611216f0b64662122aab2618aee4400cb44c162710087548"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/bg/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/bg/firefox-128.0b3.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "57b8d1d00e932c88d0da08e7c8875d5e902face54493adecf78b642a1a674bf3"; + sha256 = "6de9441655c9256b96b38b0c2318237ef7fdc4079d9a0a17370a4b63949f8952"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/bn/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/bn/firefox-128.0b3.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "760753808a4316851201c9b03ae4ba48bcf1453ad55b3cd35be7c59216632865"; + sha256 = "0fa84544a40e254e3b5d363a5fd48e6f00a2bca65e71662ba3bc874db844373c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/br/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/br/firefox-128.0b3.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "d85255a1a0ac8768c30c04c63b5720f99da2e9819beaf16c1d919a94517ee779"; + sha256 = "3c3553966e4b2ebe1ca9fb0a4625f58644fadf660dc38f053c898bba8cd9652f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/bs/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/bs/firefox-128.0b3.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "1e7ad576c18ab7ba06f5096b04aee21894d35aef360f33821d72d32d616344aa"; + sha256 = "1a7b0f5fd82dc2e0efe782d87e442c56c7ce3cc4c3c4ff2118bf11356134aec1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/ca-valencia/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ca-valencia/firefox-128.0b3.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "6c9c9d8f5aa45258db2a83097861e4449ec344363dd9bfa188feef0519c1a3c0"; + sha256 = "73ed405344bbe118a1351834c1e73b0811d76db8e5ab17f59f17425da6e80284"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/ca/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ca/firefox-128.0b3.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "e8dfe5520631c2c58eba5a091751078c14efb52e0133bc3d22d21a0be5d4705b"; + sha256 = "f1d9e5e3ec259b3f860988c96b6c28430346ff91909f6ee4a4de64562d9cf632"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/cak/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/cak/firefox-128.0b3.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "5b390a91a65f791526ad61d7d51283d45ce1f2b53a70a5cffd4e452a8da2bb72"; + sha256 = "85d8e7f0e98b3a0f6c19102cea11d4be590204ab27a5bc801028918aeda7d903"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/cs/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/cs/firefox-128.0b3.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "cd87ac0d87aa06361c56569b9a3958c20e39a065cb5e7eacbf25186b9b031470"; + sha256 = "5552ca41e906180741330360c1875e7d14a6c8ffa436a45440377c4e734a1d66"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/cy/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/cy/firefox-128.0b3.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "4494e4f47da2fcd54309d781e3097467ee38b3a3dc38da11c8aff6b26b33d7ac"; + sha256 = "e7a1796463195e31a7a8caa1f09344780deab06c9a3840fe7ed5a6316ff0052f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/da/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/da/firefox-128.0b3.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "e38bc2ac598c2d5102ca10bd98a2ddf936c02e291e8fb886920c0b0ac8597db3"; + sha256 = "3042716cb2af826d563047e6881ff01eebb9e13c32799c5e64f0a2d9207ef673"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/de/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/de/firefox-128.0b3.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "ef7f7a96869d0e3d020d12b6a6205c9c213028f8cb9275e4ba06db89a0029880"; + sha256 = "952c3133123b81382544f454a76d52b8c42fe42e6a16630c5e7a60e5af004dbb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/dsb/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/dsb/firefox-128.0b3.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "57c0b187aa2addcd44cb9dd7b09f014a3157e645c39ceb2d6f705a9339801c86"; + sha256 = "f7d6e3ef16b75fcb51dbfd940beae3baeb8522b21bebefd56d0916ae79b32efd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/el/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/el/firefox-128.0b3.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "0a269fdebb8a6620b21c9b658ef8aeeac2096b354aeecd3d704782fd52cd50b8"; + sha256 = "57ec8938ac22aec300177f6399aab3f96a54ce6090017531b89a559e374f17f6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/en-CA/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/en-CA/firefox-128.0b3.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "9c7e024a7b57462589ea2acd0899c497ad49af9dc1c4ae87c443535e6cba609f"; + sha256 = "77cd20e4daa94667e040ee418d76abd11fc8927ae667fb15da78d7ae9712b82e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/en-GB/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/en-GB/firefox-128.0b3.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "3bdce7ce9098691eba4772bc666deb1f94bed373896fa15de1f15a8d4e215d09"; + sha256 = "376231eedf5d4804109b6ef5363d77fa6f27ea59e56dd1374c3c499596be6cdc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/en-US/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/en-US/firefox-128.0b3.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "b3158a4159a97b2ff19af94bf5bb7c023f492b5917aa508489be4e5fe5b64e2b"; + sha256 = "263a12886beb8db84e7a5af38ad99061a0de6abd35da3ab186a46c31bb35b222"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/eo/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/eo/firefox-128.0b3.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "2c6bc4bd14e9370b55da8b3e62f875f8702890d346310e4da7c10676b42f4a7b"; + sha256 = "14be7e2ce4b24d218eeb58b0fa84b92097a9f3c271814d890f8d5eec93954d53"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/es-AR/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/es-AR/firefox-128.0b3.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "c24a364747f3908921b30f9123b2d3c4b0ac5ae7ef699e165829dcbab5e1be9a"; + sha256 = "7436d4d5be4d05fddc5e172b42a2722c89d38277b0fa425a691d95561870e979"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/es-CL/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/es-CL/firefox-128.0b3.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "762fab1b8f2a39a21a826ce43bf16e080e1ac7691e4c274fc271e1b3cf034b16"; + sha256 = "11c157f2a52b28812b6c0a81b56d9383ae1401dd1c066c9f940f5ab256bd1a8e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/es-ES/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/es-ES/firefox-128.0b3.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "e7a5b3f9dc59111f24a0bac107c6a93ff5b57a7943a1d71aaae67aa43f3400bb"; + sha256 = "6cd4b9d8b073cf43d249130475f17fbfb2bbfe29017eb5d2d8bd53845213d362"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/es-MX/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/es-MX/firefox-128.0b3.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "1ae2aab1022e231969814476eb8fcc59e5c0fbbea425adf792df732f24f8b6b7"; + sha256 = "56f5ff72178597ba5e5d20aa296046340e2563364cd3ab00a0292c9fbef48e42"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/et/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/et/firefox-128.0b3.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "1051ac29e2bbb640273a0926b18568d71276a3b189f1741ab5e50222e1b47bac"; + sha256 = "6e452e1b70d3d00b21b81b0738e1a7b61a8b2b54b41993b3c55737acad63e519"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/eu/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/eu/firefox-128.0b3.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "8e2de2befda0278010a8dcbcfd97a5463ae3d911bd2c5576a3c1899b7dd284ee"; + sha256 = "32a67b26a26affb5fe294dd07e660e046c1318ea84ccbbf7ce3461c60727fa19"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/fa/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/fa/firefox-128.0b3.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "3c731dc5e9fd464d303abe7ee9c6748e6eaac838433abfc6ee49ba8da4de41a6"; + sha256 = "1bd6f9eb6e427cb4e6d2b11ef0634084dbe496f28753057157d23d05837f6ca7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/ff/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ff/firefox-128.0b3.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "6f5896c468957a97805ca32e6707c0bef05d074e48c0e98c748e437003244591"; + sha256 = "7995c4aac2b688cd52ff5f9bd358c3f12199c95beed9626c24cade384a3a3fbd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/fi/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/fi/firefox-128.0b3.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "239998cd45b41d2891164d51617a17cd8216127d3a74f05b5d518e8fb619e95b"; + sha256 = "26703afd150a9f78c8d6f36c7cce38a2add81c79b66f11d21f998d7db198cce6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/fr/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/fr/firefox-128.0b3.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "8b1e30a397131582378a12d1534d0be8cd977e685419e2ffcd8bea2782802bf1"; + sha256 = "e7ae04d4a77857cd6775e466625d75983d600cc016d4629e353d5e8d280a1b09"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/fur/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/fur/firefox-128.0b3.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "f2523e7bb7e36143bdf9232cb6e764eca8c8b35bac2a36220527361b785a14e4"; + sha256 = "96b35eb88709069b9b18533045576435af1f900ee7b0f00c92c502852b4dc5c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/fy-NL/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/fy-NL/firefox-128.0b3.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "0dca8df8605677b9411860662122413769aaa0df4316a4e25edcb76e24fb56a0"; + sha256 = "999dd239352f0fd6e57029aa8d5308bc9deb25d05d63680255f6019696285ce8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/ga-IE/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ga-IE/firefox-128.0b3.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "f78afd9e6b8bcecd193476e54be34b2ed3073af79f61e2027559521495992c34"; + sha256 = "0fb4d4fcd39d5a853c0e6fbb0521917d17c04e57d848610cd189d0846dc0869b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/gd/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/gd/firefox-128.0b3.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "44dbfdcc965165a5e57f80b25d4ae2fb137f9ecd0b581d35a264fe7b750ac308"; + sha256 = "1c19fd18a531671dd85d8d0ca0c797033dffdb23bef0771c4a828114ca9a80ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/gl/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/gl/firefox-128.0b3.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "1b904594ef61448f9c71455b4ebf8ab6bc5441805d06caa5a147f6980a839b90"; + sha256 = "bbb1eeb336638d898ecb34ff69bfca6f68bb5629584e9cd90af36fb22d3adcdc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/gn/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/gn/firefox-128.0b3.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "56b8ca430ef56cda043e5f07bb2b130175f9faea370a0eba9e953783522cd2be"; + sha256 = "340b80fc5aa46093c4f901058e35eafdc42233e99fc5fcc1473e3fd6dd60b99f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/gu-IN/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/gu-IN/firefox-128.0b3.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "0cb8d510942390b9068aa2ee1118195afbcb05d376802894cbc6497fdc448a16"; + sha256 = "487bdd9bb5b6c25d8052a3dc21325f21a51c4581aed7b51f38e5e459c9ce8ae1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/he/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/he/firefox-128.0b3.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "7c244649f59b76fe9fe4920e6457b730aa5bfb2202997697caeaa1bfa3013842"; + sha256 = "93144b3cc3e7a7b6e929b928446223be25c21ff5faed04f9216f2e7ca716bba3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/hi-IN/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/hi-IN/firefox-128.0b3.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "3831280bc05f5bc1d23d5718c441662b4bda9440b9d32b6a5b42f42265a80349"; + sha256 = "1256ec465f672194c759ed16acb45ead09965a65ad277bca1cc7ae0ad7c811d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/hr/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/hr/firefox-128.0b3.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "ce115265ad6e5345183d1a4e3bf213aa95975a1042f18ae9f85835a231bb4997"; + sha256 = "5fa927c1f64d60cc050377a3d03af7fc49abe13239cbc36f78798f171895aac2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/hsb/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/hsb/firefox-128.0b3.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "ceb3d3c54dd4419c3ae70ad547efa4ed504f30fb881be9be900a8b82babb2ba1"; + sha256 = "f806bb7d0ae916fdb9bb38feb77950c649a9c6312908aa5128f24a0e0690d2b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/hu/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/hu/firefox-128.0b3.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "aa0e8489b91506c0afb6fb586aacf506f0ec240d8c8a1ac0435a68fc6f6b47a5"; + sha256 = "be3a162af629186655464d3c560a7b2b84df17239cb140d42feb23876f320899"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/hy-AM/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/hy-AM/firefox-128.0b3.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "93180a0eb04aec1f415470650762110286b02c25f1644da75caa440625a20073"; + sha256 = "1b343636f58cc56c388a698fcffdb024ccda95b191e0ae6901b093021113d1a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/ia/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ia/firefox-128.0b3.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "bd6a9752759078725b0d3661267026e2e0510be9d03d189ba63fcce5c256600a"; + sha256 = "05ddf494a749b007d34a450e4204bc12e60c7b549e86496d7b4768df4c0cf71b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/id/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/id/firefox-128.0b3.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "11ea58a1bc5e85dcd768b09be677f7295fb00be2b6427407cc57f9e140fcb1b0"; + sha256 = "9119141c2a2a4ff814657a6f24ca3c1d62b3e5e607b5ef2913ab494630458794"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/is/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/is/firefox-128.0b3.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "67a7bb9ae2859d3d851b70ccfdec595ff8c03acb6dbf58f450b1f082ae642f77"; + sha256 = "8b91f199fd4905bb8fe9e1d3f745640975aa58761731fa54b1a24a7e40c5e0d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/it/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/it/firefox-128.0b3.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "3870dc235cd7b3b81d5ac940c31b5a241e8bd09d3c6a318841e7dcef84f7b0ad"; + sha256 = "aa09600d53681b3a2bf512e287d051a2d3306a010835eb677ed754ffd4817d98"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/ja/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ja/firefox-128.0b3.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "81ed603272c859077abb04dcaab22ddf7fd5e7f126b690b746dff4696b3a36fd"; + sha256 = "70fb659b22c26f7ee43113fced3aa98fd66f581227c8d56a5d8bc4c6bf9df863"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/ka/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ka/firefox-128.0b3.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "8f2efc868ae8255c3f7ea58d37a065bb5fe2c54da8f8825e3a79c0aa4452d126"; + sha256 = "652ccc32864b397adcd4b15d2c0da86287004ec7229aa92b65084f1f351c3d2b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/kab/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/kab/firefox-128.0b3.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "2e13952743a01d7be50b25860c32e1a8fb0d85dc72927a1b414445aba8506ae7"; + sha256 = "e91014eaff857b5fc002c45f723e2cbe83b1701cbe9661c6ba0b52a19b621ac6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/kk/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/kk/firefox-128.0b3.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "3b4a9a9a0d269c5252804627af1962a4a0faa1c34c74649a25ed7de8c2e87237"; + sha256 = "92bc97e900fc9d742d182b51f5f08ee39cf40e6875c7a2b9f1aeefc56adb96d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/km/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/km/firefox-128.0b3.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "2cfa1961ba21b569b005265fb1c94fc3160a7471f8afc97376581e9a8d0d002c"; + sha256 = "f06d799edaaefef5277a76537c1f0dffb55416d3733579d9bffd2d658d4c16b8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/kn/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/kn/firefox-128.0b3.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "5949b0f3787cd02e1d7bd67505d44a539d4b6fd51d0bbe2e8e8c39c6779b7599"; + sha256 = "73b00c3ce8795930afb41cc7b714c0601fe6a56fc760b91befa82c490a25ac4a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/ko/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ko/firefox-128.0b3.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "d20a267c8e3456e48f9e55bdd7ce802fbb1dcf10bbff4d7b0d713c69213839bc"; + sha256 = "3b391cd22e89814ffa99aa4cc71902fbe13944f61b216ac1fadc60ef465cebb7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/lij/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/lij/firefox-128.0b3.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "cf93af57e572d19fbf14bf82962e190851f5289e0e7ec880d8430c56d27a15e0"; + sha256 = "847b13a12d7adacf149047dc19b1d55991113b35a1cf506248d6360e25aa1c90"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/lt/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/lt/firefox-128.0b3.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "8e40a6d950e26ed383db3f185f210856cb6275a443035053745dc26bed5d9eca"; + sha256 = "550aa459d8a47c4ad1c33cfc555414d3e7dbaea052b0395972ebd43930db6399"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/lv/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/lv/firefox-128.0b3.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "1a13b48ce78ee7eeff86810a6b61812e1e0a806f1c8d6e83a9bbd9fa3d437014"; + sha256 = "8f3b8a06e4f192591a0ede2ae19f91a4ed914e07e1e4a81bdcb5c279ab0353d8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/mk/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/mk/firefox-128.0b3.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "46058fdd03e603ecd5cc5082b354b8ca6b88f4487fc16363b3266d97716f1692"; + sha256 = "441a3e5186c8179c2bc969499f98e9e2858fb03883aced701b5940d9eb9f5096"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/mr/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/mr/firefox-128.0b3.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "88fc368db21346eca9f9b9313ddcab255345c965cbfeaa67c0b2bc68b7346a3e"; + sha256 = "8d79dd19e2940e92e98352d6a3bbb1b24e2ac288081b5ff27a8800c2158b61d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/ms/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ms/firefox-128.0b3.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "ed11b3b8bfe7b2fc1795840a5c1143010469539de22afe7fa0888f41e47fd2f3"; + sha256 = "42f28f18a690c919c8d24632891eba9be4d76f68d4851f272e6be698b25779ad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/my/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/my/firefox-128.0b3.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "e071ab2630480076419dbdf9b460d7b61f51f8af738a70129da0bd432e89959f"; + sha256 = "a0457857e88c8333fef4a0eb6778868fc9c8b20e5019ea8e9503f32aa3d4cc45"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/nb-NO/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/nb-NO/firefox-128.0b3.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "186bc2408a9c0171f2cdcc165c6760b5f16402af6b50c85e07dbce7995c69d1b"; + sha256 = "5329741c2dba6e06099036fd929098a161fd7840156217fafbd51f2563be7f72"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/ne-NP/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ne-NP/firefox-128.0b3.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "a423eb0406f195122b0907e22bc9061f37c5e0c4ac274e828cce919c2e0bf61a"; + sha256 = "3d38141d0bd291577e5f2a4d50ce0cdb7dd102aeb36ab9e54e01bea20f5ad58e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/nl/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/nl/firefox-128.0b3.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "7ae86d515956d3ea41ed9a4c1b975c954d735d4b91f11d6b0c6e6cda4b98d64c"; + sha256 = "00521293ada2395463ab4ef44cc6269e7a3635c84e3a1a44e598b47ea4d8bd06"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/nn-NO/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/nn-NO/firefox-128.0b3.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "419774970cf5be7976a916cefe01ab19830b3f27ad42c4ce28758a3b65ec87f2"; + sha256 = "f0f4e97fe329841b763a3f4860b3e34764bad64f667455234e3aed77ec577e24"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/oc/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/oc/firefox-128.0b3.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "b3850404a88ebfdaf98fbe6c88e38c6475c92780ee280f347be2acb4e09aa65b"; + sha256 = "a7bc839606bdc91fdef9ad18f574263579437fa3ea260d6f88df62cdbfe2eff0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/pa-IN/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/pa-IN/firefox-128.0b3.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "e0fad8907831ff00a302001717e5930d9a8d7e064671ed4364a55ce5bc752faa"; + sha256 = "5067a3e713640b3864292cfba5f7a181f3aa4183aea98c488072b6f03ca58aa5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/pl/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/pl/firefox-128.0b3.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "b26c59e0257e1c53d2367d9f74f14a51b4e6d95abde0995baa850c5667d36d27"; + sha256 = "c1a19f825218448546cca180631b7684d72152cf172f8d15339c9a477575631f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/pt-BR/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/pt-BR/firefox-128.0b3.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "3e95a3bcc4369199292233d50fdd5670fafd2d5380f1ae5c44d956c0c7416468"; + sha256 = "b62e837f2a504f804d9b09aaf98010d90080d1ff4747dfa9a992c72da3f82a18"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/pt-PT/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/pt-PT/firefox-128.0b3.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "dfb0fd547f97c851b25247434bc4a8bd9c176340dab050036a87bbd074b72328"; + sha256 = "92abdcc28b0bf51eb3a8ab5e43dc9638f26e8692ed69470d97bf45fe5e31ff6a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/rm/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/rm/firefox-128.0b3.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "31f5753dde47f161da02bf347f06161b73805d167a75cb33c5d293b2887c8502"; + sha256 = "3588083df4f708ec937f7eda20da77249aa6fd1ef4e2f6fc86d785756c458da9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/ro/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ro/firefox-128.0b3.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "465b624d0bfa22361167301d8131133e9976bd837c11228491a64a072ad24e33"; + sha256 = "aefec65b1f06bcc23454621e55d9b44de1d3e13afcb170ceef40512f1f1ed7ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/ru/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ru/firefox-128.0b3.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "a0abae3a6f7ce4957d066a66b0107b2911a0276b232b9edfea27ccbfe49ca8df"; + sha256 = "4324d205829c7a697bd83695ac4b4d9b776989c4a5b904e809f67db6bc829f18"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/sat/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/sat/firefox-128.0b3.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "8c3ec37d6e31a28a6320f3d19f372915836bfc166a2b0fcf64e535a60a74b2a7"; + sha256 = "8556dd9b387da18fe3f3408a6df175d704d476967520cbb7899acfd79328f250"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/sc/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/sc/firefox-128.0b3.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "d00ccd6dc27847a2e97f5685f1b33f5172222b79150abbebd1fdbf49dee6890a"; + sha256 = "34e9a7e8a81a2cff22e3e131ae1733c25ccba6563f5e42a25c790f2435ff4a89"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/sco/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/sco/firefox-128.0b3.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "507a36b0eb5d038887562e714d87d833c7cc64c2abb6d0e4e3ea74e0c429ac8b"; + sha256 = "6dbdeda295ca37758d4a531694e995f2bdaba4642ea004d58da0dba5492997ac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/si/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/si/firefox-128.0b3.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "d7a7b33b015b37f44bef599957f51231ec08f5a5d3c00a6504d422c8d3ad87f4"; + sha256 = "c2ea2b2b67ecb74635cc6bf218f3f7cac739d1f98fce7c7b1e4941b8613e67dc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/sk/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/sk/firefox-128.0b3.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "e0ca68f949323840ac6b8ec262a2625f746573edcdbdf4ab22c668b3b4c9efb8"; + sha256 = "9e59b962cccd43f5c600258df7719a7433367018c13637d1e84a09af4a05c60d"; + } + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/skr/firefox-128.0b3.tar.bz2"; + locale = "skr"; + arch = "linux-i686"; + sha256 = "1c1a1435a7ae19216a100a346737a60650ee1a25024b77dfef1a09c0fb3836bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/sl/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/sl/firefox-128.0b3.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "beaf16de3b7ad2ef5630d50728bbd737645b590b2f4b871d63145d9e5241575f"; + sha256 = "9222bd4ff0b4c09b36a0e6cce1fa51ea7a9414651ff9f50c05d227347806ca0e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/son/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/son/firefox-128.0b3.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "91dca715b0c6d54b07888859233a817e4eece005cac56ca33018dd69610a0647"; + sha256 = "8f326cd87ade070d719c78f5e9c25f75fc5b1e03256c8b27c296f0bcc62388b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/sq/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/sq/firefox-128.0b3.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "265aa0678fec2f0ae82fad6cc9146108ee27115e48d7a5bfb6ced4318aa41fa2"; + sha256 = "6618c0d3414a61720606e1599387871ad3f872f12042a5c0117d6181608c2be1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/sr/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/sr/firefox-128.0b3.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "027e4fc73188090fd106f7f087ae8833616267f43d8bcceea7f8e74d91f26c93"; + sha256 = "b2a6c5ce023552ea357c442591157b2293c298b96cb19a1d7638f10205c3426b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/sv-SE/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/sv-SE/firefox-128.0b3.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "225897596c390dcfe359c88ce0a4c8cc9f963ae669c18f4503980dfcbcdf8429"; + sha256 = "0a879700cee518c51853631bab1eda501833fcee87cba41603a3299897119f11"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/szl/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/szl/firefox-128.0b3.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "0426a3cb8f45602c594acd0b31c06916876c9b81f54416aba0664bb5a431759c"; + sha256 = "880e10a03b2feff02642a630c1a5c2d8d2ae7eddc2ac8a53337d63f925b62862"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/ta/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ta/firefox-128.0b3.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "a61b2e58319bc006afd286aa7033991afaa951f391ec318f96c5a78fab08d809"; + sha256 = "077e3166898dffa838726a55ca2dad043c671a9c9d4aa75b6a6fd4854379dec7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/te/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/te/firefox-128.0b3.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "6bf1fe0d350292b0bf8e0062c0d0f7fff686577ae38d7e09f6df623eca2b189d"; + sha256 = "b6b17ac1598959b7e0aaaa18e3154d4328a31f520ebba7110fca44b7cc8b4a39"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/tg/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/tg/firefox-128.0b3.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "8334b57d369f887744b9408d49f7be109383451a9d807269b1b2c385d7289563"; + sha256 = "3279b5bd1a1f3bc4d4ef1461fa9fd8b1132f8dff0cf6c385291b1329b3b5f962"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/th/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/th/firefox-128.0b3.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "fa09f96e57eef946aae291bc8345d3eb756fca006918d15305c5cf8f043b6bbe"; + sha256 = "9d6c24c604934c4162281799c11904cc17cb5e8295c5ed7484e6432ffc0d17e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/tl/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/tl/firefox-128.0b3.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "10818379d02c2e03e689df0e78ce12a16940c5f8f551306033fd25f6959006da"; + sha256 = "a5792ce6dcaa5bc002454700dc2abcbc6f9de580f0a70ec2919c9599e3858ac0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/tr/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/tr/firefox-128.0b3.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "da0245ccbad0ee59b0433430ec593bd16ce9f77acf3bfdb1eea9bb30e38bef94"; + sha256 = "05685a83407f94e15c08a75aa46bf45bfdab1b2ae7626a078848b392586c05c7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/trs/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/trs/firefox-128.0b3.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "7928d1db0d14626428129905c37a1c4c83bc7e654598c95fdf68636601aedb58"; + sha256 = "d7f1cad2b4772ff42c954bf6f8eb78d8787f5aa86be1314cc4b56fcf261159f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/uk/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/uk/firefox-128.0b3.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "62008374b1314d49e9ac5a8af9e5189e77e970ede38ce773d0937c8519ade5e4"; + sha256 = "da0d0c57358ae2bbe196d06358a5f410f814eaad236fbaea1127d2131eb0d054"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/ur/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ur/firefox-128.0b3.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "b5e55f174f1add6720c1259a7f3f29f801c12d27da5c544694a2afef05cf7a99"; + sha256 = "ea70560d84141403a242c3a7fe4b0a50999bc5845a7a239291e1b2a27e0a0aa3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/uz/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/uz/firefox-128.0b3.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "af8394428fe6f17ede74063a4c496dc6cc18dc24f564a8de35b064b438a5c57b"; + sha256 = "8578a45c8f97e3138a7109e8cd2969e036ef08e935ec1e530be823ec3de12d9f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/vi/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/vi/firefox-128.0b3.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "36ed9d2754f411f8c8ded02ba02e22c0f091edc5b40531a4e4efe93b4423fb31"; + sha256 = "6f77bfc640398d00b136dde75f72156d3f4025a916bf16063bc06dcb3e3e1529"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/xh/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/xh/firefox-128.0b3.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "ca49e6e55d7fdae7f1355953720e9727e83b5b0ef73d46e40614a0d753106d6d"; + sha256 = "7f74a0f56e6746a105298de72143597f978f59873071a871748f33e54078f368"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/zh-CN/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/zh-CN/firefox-128.0b3.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "7c03fc982bb854769af190288181ea54cc9e2e642b07cd81738c7e783da94f4d"; + sha256 = "a6708b44fa15dff14ee33f4cc4bbb2e5e550f663d179ecf0e3e4e7d44fc68ef5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0b2/linux-i686/zh-TW/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/zh-TW/firefox-128.0b3.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "c8344aec0ab9d510c36cd134ef46e9bb3bd0f2fdea78453f9eae9bfdc5999825"; + sha256 = "333605566d2c3aae9e411a7fefe08ae6f339ff91fbc6e84a0b3b166a19c5ba90"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix index 1234ddbeb1009..d31488ace0bd3 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix @@ -1,1025 +1,1035 @@ { - version = "127.0b2"; + version = "128.0b3"; sources = [ - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/ach/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ach/firefox-128.0b3.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "1c30d80705710a2733b95a46d906bce469a14794cd4b2036fa1e0f9d76b1733a"; + sha256 = "c90f792f6522e27ba1b104e77bc0826556f4ca1184a7b65ef02cb8900586f857"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/af/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/af/firefox-128.0b3.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "4837c99b89f061b7799b68427cbc9a3099c6f61d7b191534fb6736f716af0193"; + sha256 = "c7c7ea2b9ae48a867806679de41097ef4459e7d35eafc05e0c44f2bbf984c481"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/an/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/an/firefox-128.0b3.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "9f55436840df59e10483445bef81f2b53380e5a7acbc0c85c5167083fc6c222c"; + sha256 = "8ce747dd2bfa52d02d2d2bc80df7cee6a0def973afc39d23724d4873c54e014e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/ar/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ar/firefox-128.0b3.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "243c3f9f4e2f132450446b9452f8ca0f82595c5eab1156ccd79738e3435f2051"; + sha256 = "7c344d960f8670aac4e45a2fd89f136763950d659cb24f16c9d21bbb096eff42"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/ast/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ast/firefox-128.0b3.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "622f1db93bb1f9cb01d63991f7fbf192e80c12ecfd5617cd0cd7d0ef44657321"; + sha256 = "d21fcb8e549cefae78d69196d8c415372baf6844d462d4398790b67dde313977"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/az/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/az/firefox-128.0b3.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "aac2aa13f3c22b499a8dd2783f48c5095bed5ee5f7d0704cc7415910ef812252"; + sha256 = "060539f7cbd3170d17ce0e0d5e2a0850223c27766392632d69a1dcf284b1d48d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/be/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/be/firefox-128.0b3.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "4fbb3ab76de025286c768ad0be9c50b32111caa8e8b18f279eb6c3d9926dfccb"; + sha256 = "b287afc5502c0b6752b6fb2f9d179c135321ebc7af9fe73cf288256add2ccbee"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/bg/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/bg/firefox-128.0b3.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "66e3ff1dfa7334acd55d33f0c2aed72d06d9a60ab47f2d1ad5f876bde167c31a"; + sha256 = "b9beca129129a7f271c5c0274e5923d24fb4704167fbe8d33273cd815d80fbf6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/bn/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/bn/firefox-128.0b3.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "56ea0a236ef4d2bfbc0de6ec74544c87d5e89577bbafad5438c4b90b9df533fb"; + sha256 = "0d32e670d5fe67648eae6ae2656e930f0c39f3e9fbea13ecbd8d2b53ff244e3a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/br/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/br/firefox-128.0b3.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "b26d9498d4daabb52791a33313c75e578892393515ff5832554deb7708446808"; + sha256 = "603bc328de6ca1e265df6cb0c876a9eca355ddfa6cff1cdc9c315322422c5935"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/bs/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/bs/firefox-128.0b3.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "de26000f9441c7d7307d525d976d4e6ea1db422d8053b44a716e6fbb5b624f39"; + sha256 = "78a67e705a9a1f8a5ee8321c7184bd9c15eba5e6d67b3e77bd52cc6339e230f8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/ca-valencia/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ca-valencia/firefox-128.0b3.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "52b7eadd956972d150eac74e33b86ebcad1c0091a11510bb3dfe87685088ba5e"; + sha256 = "9f9739c31f56a42caab55be23946be49e90bce001ad9b633b286f23b791c8abe"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/ca/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ca/firefox-128.0b3.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "fa759d2458a220c9c03dbc85ebb10ab98956cec9e344cd470c74ac3461ce153a"; + sha256 = "6e3103a530a8916967e55e90edd0730497243183144715cbb0d604c63c1e7505"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/cak/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/cak/firefox-128.0b3.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "5f202c4e1fbbba07af31d383860946f94faea1830c8ae39f7cb37b5080d622a5"; + sha256 = "60e6ba8337350b02097a637042516bc2c8bf5a95f23997ac41d89f875cde5af8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/cs/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/cs/firefox-128.0b3.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "ac939957ff1efe4f6d96ec5ae077ddcba83f1d774c8d4615e4a960cac219d654"; + sha256 = "8ac4c0042e24ce4bf079b0de43c8263d93b9be35be70cda2f1f037091cf808ad"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/cy/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/cy/firefox-128.0b3.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "3f95cfa51c6bfed6fdab542f66494dc70972311c4efc21de5437fb759be4da25"; + sha256 = "3b89ba108fc6a0bcce9ab36eb392861cd8b3eed8466b5b68eb5d37c1f29aea5c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/da/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/da/firefox-128.0b3.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "ea7adbca9138439cdaf44ab49788bd5f3f630603c4fb6c0da9dcf80812f084a3"; + sha256 = "eca9420742f9d0522d82b5c9e0bfcba1dc9ff131c72c3fb8e37a34332b2123be"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/de/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/de/firefox-128.0b3.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "4958ecd34b92a03c0177cd65e658e5f6e1c4dc5731bbd9bab447be6c1d6c99b7"; + sha256 = "c411fcb204511dc6a2d381e2522722d9cd67262be71f9ceedc4207463c3425de"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/dsb/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/dsb/firefox-128.0b3.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "8018f3f9ddf1c089f2faf2d6a195fbe5bf4826857d8673e4e1a6e06d73b40186"; + sha256 = "0b285d2c3aedb8a0c8b139ed453d45418394fd6fd02e5e15f9f495edc739a8ed"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/el/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/el/firefox-128.0b3.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "193c8c06baebb8c9b1d892d8f596f31d9d37c5f884a76a98b9d1849a8bedf467"; + sha256 = "227efe5a5c2939c896881298f97f7e0651b647c5c87362319dfb41ccc7c5565a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/en-CA/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/en-CA/firefox-128.0b3.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "888a8a7b8c9375898822ba45eb59f834c06fa9977a6f50826a5206af8e6fce2c"; + sha256 = "acb1f56d76ac68c4b45c9580708c68917f3e318eb6685a8bede22c6adb2d5de5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/en-GB/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/en-GB/firefox-128.0b3.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "ca2ffd9d2464d888f525af46fa0dd1820846bc3fb746e9d7eb4e17207738fb60"; + sha256 = "d9d4692e153e08cc7a7caf04c119c072fc0cd37061efd1f21f0cef9480135c2b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/en-US/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/en-US/firefox-128.0b3.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "4e292c98e7451c6824c772e66392e15c14fefa495c548cf776f604fcd1032ef3"; + sha256 = "0a8bde14893cff97e60303fd081103612d6121747cd6329040f7fbf7e8304a5f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/eo/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/eo/firefox-128.0b3.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "7c7742c2ca61abb5fdc1d360827e63422a8209c0543cb9f92d468bd2472f93f8"; + sha256 = "4376258e69edcf6a2a9eb6cdb5ad38c8eac5547daf894406cfc22c59729d6a37"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/es-AR/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/es-AR/firefox-128.0b3.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "20311f7a35249d2748e876e7259c1183fd1b21d5af8ef35dffea87f6abaa5662"; + sha256 = "9d194fb49e2ee6055b809c61d53aea877b9bdfe62ca2afcf57b564259253c46d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/es-CL/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/es-CL/firefox-128.0b3.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "1d99ca8c0cb353d0e70fa7226960e5edbd1e9633704cfdbded14a35c35ecdd52"; + sha256 = "e6acdb9f6a4807b355187e4cbe06fd8b1def9e2315ae09b4e5a2d429f9512a83"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/es-ES/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/es-ES/firefox-128.0b3.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "5ebd693e23751eb58e22cbc475d4f2dbb7dd8c1947f6622bea9e62e34cd7d9b5"; + sha256 = "a0511e68583e10f1a126a0a4db6d8f443e105d9dfcd21fb9d19d7f57b5300426"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/es-MX/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/es-MX/firefox-128.0b3.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "40f1e0b20d278f9b6ecb27eb92b38d70e30302f55dc7760833f301c8784b02c8"; + sha256 = "3da7f89ee01e2a602a3975aaa51f4a0adb666f741b25a078e69611d92b68287c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/et/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/et/firefox-128.0b3.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "1b62463a5fa33ff427499b0be0ca7bce79ba22267b1e34703ead2ce4d23ab040"; + sha256 = "4895e2432c615b7a1bb573dfd82ed9788bed5b4d94af1877aaf923e9e87f09c5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/eu/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/eu/firefox-128.0b3.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "fd613163704eb0cb42eaa1127414787e4c48867b83271d515f57ee4b02eb6e87"; + sha256 = "2e315bfd1098bc3f45c0668241ee69124210a2f4c5b0cc1520e61de7ee74cc98"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/fa/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/fa/firefox-128.0b3.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "17b8f8fe61498e95e458b9d2484ae2d576536e8bf2e7c400a7a7ff419a895acb"; + sha256 = "bb36ca2cd19780b3435a0a12b544dddea820df9d71b0767f3b58721897275067"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/ff/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ff/firefox-128.0b3.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "ffc6f5d23528e9e5066f0c6cf67913ab1ad9b68b900882c184e974c966a0d6c2"; + sha256 = "b4b11971a848044706f9a8e2f2cd96b9affcdd05ea3f0616a9754488ef27846d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/fi/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/fi/firefox-128.0b3.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "8640338310a43b0aa8c11d9d3bd5004e0dcfa90f079c7a009eb1aeb3d5d02794"; + sha256 = "24e64273a0b29fa68ecb95e3a9fdf88a9b4fa6917441d7218c4a66d48e9e5724"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/fr/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/fr/firefox-128.0b3.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "c18af63aadf7a6b1ea3b3ea61a584be01a10a18323c6d2ef4d81ad91c80816d1"; + sha256 = "19ffdf60a868070f1bf887133643d7e7de62b3000f2d22b4140e0d1564b4f01d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/fur/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/fur/firefox-128.0b3.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "3b38905c0e59a97c0ad91b61a7b7de6a277b2a036190b18c242f34b975bdb1bd"; + sha256 = "d73b3be736513b702ce22e0924e86166b1b479338aa8f26ee460e648a01f0307"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/fy-NL/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/fy-NL/firefox-128.0b3.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "cf81df13bf9e76be89582a5b52def414797a9d19d15dc8a30b3e3d101def9376"; + sha256 = "8063ea3e08c6b495f3274c8b2937a3651ed2f788e6e32d503938b533582f9022"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/ga-IE/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ga-IE/firefox-128.0b3.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "91ba2719606eb3ff5a9210e36886b809d9892a3d18d664def9cadb5ebf19caa5"; + sha256 = "7603f6d03855709224d36f3516b265db2d01caf2c56669435f3c8f67df430a5f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/gd/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/gd/firefox-128.0b3.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "8f7aa1cb682e639eee5d7bc13ca9227bb1826cbef605cde516cef4421f8de02a"; + sha256 = "fc84ae08d0d17ddafa879149eecf62fd9e22fa61f529a38345b49783fa093556"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/gl/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/gl/firefox-128.0b3.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "660b9d9d9d26124a03bebdc0a68889617b9e85bbfa1bd8baf6cd8a52fa9a3fd4"; + sha256 = "ba87ac94b237e7e1ac2817f1074c807d97fdbbfd34e7ab9c4f268826296636c8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/gn/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/gn/firefox-128.0b3.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "71570c4b2159c4ac5fefbd34f51d4e0378ee10e26918ebc09707c267240ef11d"; + sha256 = "47c1226cba2c9462c904307756ea9829bd7ced15669c9b479dd8db7f07a78ddc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/gu-IN/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/gu-IN/firefox-128.0b3.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "21449a33ddb633af1f117349196fecd68be58014ea7f42ec9da64188ad229f82"; + sha256 = "0cb12dffb0436b3bf2a1fd6047b710bc70fa53cb243892944990c6b802fc16a4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/he/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/he/firefox-128.0b3.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "8ebcf8985090e91d04994470e977d281a17823da2fa3756afb087d806dc67759"; + sha256 = "4762e1729f632e78040ecf6101b1d80e0733ea72bdb800081df4829447aca256"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/hi-IN/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/hi-IN/firefox-128.0b3.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "fd1bb13d1bec3520f191b3257fc605435815259a8690c84a91c5aa58cb0afcbc"; + sha256 = "4fde18223d92ce6bbe5736daa20a44629aba864cf0dccde255fed72bd138f12b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/hr/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/hr/firefox-128.0b3.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "74ed4d0986ef34a91503d13c20763485fb8e5fd24576cca048002543036b385d"; + sha256 = "646fb42e3733cdd1236387b9a6a93709ce7c6439f1b9549194e09014e759c744"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/hsb/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/hsb/firefox-128.0b3.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "551c2b5e65017d6393ba8b846d3da77c9ff6c28f063d2a4cf268d9757030577b"; + sha256 = "b1b23002a706ffec926a51655332972c4a25fe3981fe085ac028419f72b8b67a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/hu/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/hu/firefox-128.0b3.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "cacb6956e8bc6470386f9ea29e18a168efbfb89d5e5e0f2e6695bf1c18f04843"; + sha256 = "8e22776d798cabb7beb11198f57b2c482aa605159b0ba309d930a94a25253fe9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/hy-AM/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/hy-AM/firefox-128.0b3.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "a27bb9215094731fbf00ca8d5b8c6ad20aaf6f190420cfd0a8c8f653e0671b22"; + sha256 = "c8270908cb4eb5b7affd11c1d760d858374f4faa0d6e9a53bc983e7ce8b6ba1b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/ia/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ia/firefox-128.0b3.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "c569048fd1a2746fce3783131df479d5343666e32de87b76be198b918492ef9d"; + sha256 = "daed408de1230aa6cca0d5ffec077eee5f4e744d862004c7e81f65161414069f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/id/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/id/firefox-128.0b3.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "73060c390dcf4b1eaf748fe4d1515a31c1f09bb9efe070d8437b695e6cdb681f"; + sha256 = "f38562edee02f984d072117a86f2134ae232bdb4b2a352bbc1e362fcb67fec73"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/is/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/is/firefox-128.0b3.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "146b506486380f36d223cc2b4b9f27a69a5a520cedc3bc89b6ad62e1c740558e"; + sha256 = "c53a562a99e749ea51728361834ce867e84fcff89ec16e771e86124a091b5fe1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/it/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/it/firefox-128.0b3.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "21c1a11e7e61a3fcb022d2a836c2549a8010d75f9321df321d6814aa8406a87e"; + sha256 = "40b057389706897fafc685c9fb3444f7dffe09bf55393fc0f039224377280d78"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/ja/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ja/firefox-128.0b3.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "623af7fc6524b2cbd7b6004106d07cc08fa1880656a158a781a2bc58e6c5f2f9"; + sha256 = "f956f07837670d725d1549366df1c2cba96491b7419662a85658d789bb7b4443"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/ka/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ka/firefox-128.0b3.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "fe4d470dbe0a2f68906fd59d7d8050ff4ed892f32eca6efc9c4e1d8087b92123"; + sha256 = "20126e640f5152688a9116b4a7a0295b53a04a29bcb5161d9cce7824de5e4d40"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/kab/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/kab/firefox-128.0b3.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "352ad29d40d91e9920f361cfa0cd9e568a866e0839e393dce9e5ebd1c4a8d11d"; + sha256 = "03ef7295fba8b50bbe2004da259660bf28d74d2cf3fa5d55d407639fd7e18da3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/kk/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/kk/firefox-128.0b3.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "edb1a446f157add1c8654379252f8bd75b2c8ebffa8665fbcc51bab8ec39432d"; + sha256 = "ce67136dcc37edf39c734d0ea74c1216defa9e127f0e2f87a4ef4e97db4cb7e6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/km/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/km/firefox-128.0b3.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "0aad12c2aabbc32983f5d3163a2bea6b6c2a896d84c7adc49d711ad4d3d13ce7"; + sha256 = "2a40245ccd8c76f755ed2147ad6fd9cfebe16fcde38dd3431580802c9e65c9bd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/kn/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/kn/firefox-128.0b3.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "0803c2ed47e49b0647fa3d1923c5d6efc263860e8477eb18d64cb7bba3fdfdf6"; + sha256 = "8444c74edab27f66c24cda2acbd1068c3ae399b74a6a4806fcec73bfa4c5da80"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/ko/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ko/firefox-128.0b3.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "6cdcd8707ab42730a5f32e5508a8e2dc895e77d1efda48f2eaf3f2f6033b3f66"; + sha256 = "3457ee728c2fdd095864dc0db63241862de40a4797add713fae302ee04992c47"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/lij/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/lij/firefox-128.0b3.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "5bdaab3beb4ce4c198a122a770a4571ce4b182c98b6ef728b83a4bc8a8901a53"; + sha256 = "fffb5026f93d06012de8a5fd8ae8ba1c270490c3ba6208e6e6352193e6731252"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/lt/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/lt/firefox-128.0b3.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "88a6f46a68039f2c546f6c0005e8bb125e94975b500bdd9b46d1cd9641fba2be"; + sha256 = "efeefab433f8b1316b9ca44917b7970876117bedaf307aaaca3314012834e431"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/lv/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/lv/firefox-128.0b3.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "9e93206d7bcffa76b39bb9b05783ab26748de2adb39363d9fec27e6a1538ac57"; + sha256 = "03da80d47d995cd7e1a2168bfadaa33da7e7906bf181030d69dded6658e78180"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/mk/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/mk/firefox-128.0b3.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "b0bdb66867d9f65a577b6dbccc7da07dd937fecd54b81d62d323c6ee430dace6"; + sha256 = "09df6b9e332dacd722943b1b59c33197881712ad1b3031b14eca2448598b43e0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/mr/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/mr/firefox-128.0b3.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "d1cead8f2962c62f8aea10a37fdc1aff01dbda3ff512ec845c64439a73be9fab"; + sha256 = "ba823b31499aa6704e0625ca4ec0697019fce1da5ccfb1623c7aa4008375bdf9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/ms/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ms/firefox-128.0b3.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "f0e5662e0f69ed59a6223b7640083ccae6bd7dc074e81d44470e4c900ff2f8c9"; + sha256 = "e2c56799d0e3d05559f83e1f158857420035ba019d35d01c6e3f826b084fc0c7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/my/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/my/firefox-128.0b3.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "62ba69d29bc5ae973bbecaf8bb7b54159504714e054f5f445c6fbc42c003155e"; + sha256 = "7f375265916ba71f118deea04ef45f9630e63c66a5c37a5f0523ac732ede2472"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/nb-NO/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/nb-NO/firefox-128.0b3.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "babb77e460c5a1929ca7304b593e4ca0ad7c1eef5edad63a5050440f5e89af51"; + sha256 = "315c1b0a5fe50831e25e696ed88301b2ee1021c87c253c807d9f80487b918f98"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/ne-NP/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ne-NP/firefox-128.0b3.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "8a45664de4538143a91803a4e47347d6300eb57fcf8b15940ffde3102532e4a3"; + sha256 = "64ff1ed8a9a6af9e2380984627a32462714930c57ec407a10232972749c09e92"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/nl/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/nl/firefox-128.0b3.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "590ea36cdaeba3a89bee54ee5ca14ec2018923d5671619fef9792ae4eb10b7b7"; + sha256 = "74f41cd79775efcc9e46f302cc4deca589873ccec79793da327fcb6795d29b73"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/nn-NO/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/nn-NO/firefox-128.0b3.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "12aadc65dca6e91f11f48d0178ac05b022c55d607cbb1dd9a579badfb8a3dc1a"; + sha256 = "384475fbec200477f7fcac6f50ee6ced939a655874dccf97e7fe06dbdd17b040"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/oc/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/oc/firefox-128.0b3.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "a1623356d931da57da8a4efdac7ce5fe4c8d970229cb01dda72096e4e44b540d"; + sha256 = "a35de74c3dbc0393d8ef16b26b385029aef7455e8a5086076f44cb6de184b225"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/pa-IN/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/pa-IN/firefox-128.0b3.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "33d0d467e71988396a6f1ba75892da58426db6343ddebec5d4fb9267c8dc26a3"; + sha256 = "5a7440fc60c97646c5be3d54325a1186bfbc76e0240c5952478fedc315e990d6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/pl/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/pl/firefox-128.0b3.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "cfceaef341b7f2b06071ce796191d0750b139c85e53f83e35b997a8bbcc60048"; + sha256 = "d9c32935c78163ae3515a25600050b5b36dca71fe3725f9c750f7a42257a0e0a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/pt-BR/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/pt-BR/firefox-128.0b3.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "fc18b49558806f5bd83dd79cd268660c74c10b68f9d2f306907ff3d70f4eddcc"; + sha256 = "2753107d60854f1d5fcbb2f5b9e9851ea63715530251e10a22c3d3c2dfcfe78c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/pt-PT/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/pt-PT/firefox-128.0b3.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "a8b3d56f1deff85a403f52292ef5bb404d9d879b2a5f104a509b0a8b80c104d7"; + sha256 = "b244e5453043f6090dcfaf9065938ce94da523b5bd6101127236027ccbd24165"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/rm/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/rm/firefox-128.0b3.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "f03d015b74f1c4c59efae1185332fcd375886cfb1879039e952913e0bc01653c"; + sha256 = "38e59a74daa2384b15ff052b711f93986072413b78553e578861ba468ed05baa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/ro/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ro/firefox-128.0b3.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "05b1900bc3371b04f8db1ea040f66b2b9405c3656546c91b50dfb7b409f90576"; + sha256 = "c6ebb19d78728bc4da1a3f5ad1815fa476125ec56be3d52a2181aca3c563cea0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/ru/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ru/firefox-128.0b3.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "0e1e4a5b38ca98c1fd518cb69c870e2b450ce112e78e8507308c44a8b6dc3375"; + sha256 = "5fbede90845e1e9b7174f20df05dad0b50d3b5d7cacb94f9639910de0f2e7a12"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/sat/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/sat/firefox-128.0b3.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "cc41cf5b4b526a9bc895f7554b0b0893839db74b3919fcbe1db4cade1c82ea5b"; + sha256 = "ca311eac3bca2a02c7e8f66ba964f5015c548d2a287969dbea93b0fdee567641"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/sc/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/sc/firefox-128.0b3.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "b344ac9e2da8e6f047c73232965c7c4439266b619f8cea8c19b1ea1ca966a641"; + sha256 = "f34fa641a957195bb73c1f4168801e020fa9be368fc77eafed6dc8c6254a5fdf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/sco/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/sco/firefox-128.0b3.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "1a7fece2bcfb3d98b9208208dc9b7a9d510600aeb70ae11e1ddd1b1b12e3601c"; + sha256 = "22a9b137f752267d7f08faa8256832dc16a6599d7036d8134dbf0bebed625ec5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/si/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/si/firefox-128.0b3.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "56ee33a89ca89666e1472d53efa2a8acff04ec522a3163222dfa1d6d1cf49a57"; + sha256 = "1f692a1632c70e61077b8520d1caaf2adb2460d7350befb342fe14dde45b30a5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/sk/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/sk/firefox-128.0b3.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "902a5924145bdaf90115c2c57431bd1991a6cee462f6987da29d1b8e34db71c3"; + sha256 = "ed469631fa261e6839bd7fb41934a0ecb694bb5e5cb8e745f567ff6b9d3a09c1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/sl/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/skr/firefox-128.0b3.tar.bz2"; + locale = "skr"; + arch = "linux-x86_64"; + sha256 = "29f93b1c9852ee969207cb38ed9caa773866b69a8309fdd9d67680e6bfb824db"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/sl/firefox-128.0b3.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "d311ed3866a915878a16bc533f9ae737ddf3d05c49f24a9b13f4b592f3388219"; + sha256 = "4f5e98d7d6c1d68a9aea0673492b2440e7dcc9b2b6d502e94c5ec5ab10d2d244"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/son/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/son/firefox-128.0b3.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "7428961daa14b04b2f7edd973c71426b18a48fc4ce50242c93a286133296ed36"; + sha256 = "f042cf22fe86e3b3a4d23884c6ddea3a8ff08bbb24f7295cc618f0ebea8dbde2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/sq/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/sq/firefox-128.0b3.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "79012e6a60439783acc6c0eb1728ca9941e74caf4de4124ef92e5b298e24edbf"; + sha256 = "c8908b4df6a785f968a3ee3a5d1605f37c54954cb8badb10dceac3a5412db6f1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/sr/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/sr/firefox-128.0b3.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "4bbc651ff8ee786d86abb4bdc80a3ef1854abe0e11cb6edaef278c9af0f45424"; + sha256 = "c4788512b4c5695dfcb020c897a81817b14a32c3132115dc840c9ebe8c19e016"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/sv-SE/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/sv-SE/firefox-128.0b3.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "9ab669d6ce2f9759fbaa5fdfc3d8484c6be7325b8fea6c10fbb189c79f7d63fa"; + sha256 = "b7851e5104fce808dac901788e0da55b7c513a8cf544bc5917513139d5b7b63e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/szl/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/szl/firefox-128.0b3.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "637490e3ec6f43435acb7be533b96f578787e3a3aa7ba9d442160fea0464c2af"; + sha256 = "ab4a5b7ebf094ffd9b58a5c86fe67fa5ec46d8ff835531b105fcdb4714269572"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/ta/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ta/firefox-128.0b3.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "1829a92df9454ffc74c36b9cc7332fd26719c9d4b92058fc5908d30f68a3f671"; + sha256 = "a572ea53f4fe7f69bc6e87260bb790be0a5dcf95ce1f163443e1e6b0acfb6386"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/te/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/te/firefox-128.0b3.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "72534deb9b488b5603e01a35b30a2b83112f2dd003db42561b7f0399517731a4"; + sha256 = "c8b75f3840bdd7171b09972294a2c3f0d65fa6fa409acf70e261c071d0a46b46"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/tg/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/tg/firefox-128.0b3.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "d24a1ebdcc76cea27f975320edb47e6ce525655b84acae8f280ebbe5631c0219"; + sha256 = "076bc82bedd5839d2adb544fb46c8896785453adb9ad28e930db4e649ea057b3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/th/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/th/firefox-128.0b3.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "719686c8efeacd4b63e7e9aa94209cff67366ccc86c544e4a2bc842567a9e3a9"; + sha256 = "b50a958a94de094ae9b68f69a6cfdafaa1404befb8651d8ec642a5725d61349d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/tl/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/tl/firefox-128.0b3.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "c78cc08b8c1cfe4ffc80a5e807faf4af7e90a57a5b9739f33639a646e28ebacf"; + sha256 = "f65155bde32d3b2ccdb68fac209bae375d07912c299273a7d24aca62f5d7cd74"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/tr/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/tr/firefox-128.0b3.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "2a5853136c6f5dd07afdc08aaebbc60aa4dd456b4aba234cc688954a15774391"; + sha256 = "17e0d6b2ff623ff8abee10e13aec566b6fc8135b7e87ba6012c8f53f661c1436"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/trs/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/trs/firefox-128.0b3.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "6dcf30137ac65487e742da53b78d65c0340499844c2218544b8e7bfb05e97781"; + sha256 = "c10d567b9d315df88df4b75f27baf0a5338418ec64747f9d9ba12916a2847839"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/uk/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/uk/firefox-128.0b3.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "a527e757cce638eee372653ee01ec10bbfad73d82790392fa1ee61af0bbf2597"; + sha256 = "cffff196e1ec88c2bed876b47d370a2d02dcfb305ddb6774f24ada40c3b2045c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/ur/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ur/firefox-128.0b3.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "85cb53b95c31ac441c8ddc94345e8fa9d850c21026983be4c04f5ea9868f6dce"; + sha256 = "4a7ef86a445f717838b0ac24e3f7e453785d2d36e955c007e79065e3dbb11c0c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/uz/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/uz/firefox-128.0b3.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "2c911bfe03d0a0d3fdb916994175e14c364a537ba4f5bbdf99f6f690c3613eb5"; + sha256 = "793b0393fbbde9b03cc48f4b67470e9238941f890ce109a4e2f6dee7c4ce9285"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/vi/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/vi/firefox-128.0b3.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "adb663aed1929e13a453aeecb61c4f4f004ea8371f38c09e92b7d54d748430b4"; + sha256 = "6c471538a27c9587e0015f214a53a35fd308758f468bb3dcf8398a826b2019f1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/xh/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/xh/firefox-128.0b3.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "6bf462938eb5fb8d49c48e184f5369720678fd6b57db637a8caf6e646c902beb"; + sha256 = "e7c602469379c7337ec29a41da891c2d603c30e7e2f5d1027b362dfdd818b00f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/zh-CN/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/zh-CN/firefox-128.0b3.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "c739dfc3c269b15f0908a981a4e3378a60d267749c538f1ea8ace08cf0c6b83f"; + sha256 = "9dec174d1c885a3e9e3b3aaecd64ab6e63c3111787c62338d58bbdafa447345f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-x86_64/zh-TW/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/zh-TW/firefox-128.0b3.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "1c042f3953a99a593fd214fafcfc18cd60106691a220ad763c216c24a24af907"; + sha256 = "ba8d50d3fed019c9e800812e80cc32ace24776c5a07abcfc7d6c2c5829fed857"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/ach/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ach/firefox-128.0b3.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "72d6c4dab751df00c1db3865f2ed9e2eeb74495b8f52f7c3397f00ea3d99b72e"; + sha256 = "b5378932b59e633e838873c1fde0b7f08cf1f5ce9bab4b93bc8d82a7c3338806"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/af/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/af/firefox-128.0b3.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "63b500d84f8e4677a0f12e664d4797d5a5144ab5ea8682a33df0d90672d73ff9"; + sha256 = "d8fe6fe723921447d9d1ae68c6cf403e6ce4673e7f7918a48f1bcaf3c575893d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/an/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/an/firefox-128.0b3.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "324d1cc5c897a779b9d3b884802f552e3dc35e0ddcb6fbe4e103ca16cefc0e06"; + sha256 = "cc1aa23852f5ce598eaab6af0b041cbc39d87959508c8e300e6bfb49f3a6a6cd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/ar/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ar/firefox-128.0b3.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "46698609453be896ebbf525441b93a22649f58b48daaa6497b7c82cf0dced27e"; + sha256 = "abe568b67dd04fb2d44527ff24c76a3cd3993071160f0f2a18dfcf5bfba15250"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/ast/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ast/firefox-128.0b3.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "15334e0e03b14dd1cad216c48ed2647a307d6972c59af2ce8a50c34d8f6536dd"; + sha256 = "e7d422c3fc62fc80d60aa9ea492b5713065cc646a3499b27f67549abbbe7c9ae"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/az/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/az/firefox-128.0b3.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "25832b0e66044c906d3d18e45cc8056829a48d6a258263d57a318fb80f779f47"; + sha256 = "4bdde11382946be34fb0693024deb49762fbd80bbe52e0b3aa79231642a02512"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/be/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/be/firefox-128.0b3.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "5da75213b69375da57461b62b87c74fe1d9338d1d82db15d7595dd0dd47184be"; + sha256 = "9c4b8814876dce2d7104ff0c14a22cd147435144cdacb30629237c3e20eb1038"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/bg/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/bg/firefox-128.0b3.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "1e46f0babb84f05a850fe210a1758a220b36588dfede7acedbfb175fca02efa8"; + sha256 = "06292b301d1aa4c5785796f9785e30a3659b7a4219e02ebba4bf1870823d6f0b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/bn/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/bn/firefox-128.0b3.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "340e7f95b2634f55828bd9ab7aa71fb66aa9286dc6dfe1556b3424ee3d6211e8"; + sha256 = "0f918d2b4e26c49a725792ffe01f8e1bdf9b3960ba1e2cf6b304c00937984536"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/br/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/br/firefox-128.0b3.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "78c61645c894beeb1fc0f8ff0cbe2b5965bd8836e69352dd14c7afc9325c3639"; + sha256 = "cec99e4f2f0a2b111637e0d8fadd0aacb400727bbccef462d16db0f4805ad971"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/bs/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/bs/firefox-128.0b3.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "fef646ca2156fd30c13265cfebb1ae8b2412096d8c49195fbe601f24a3f13b8f"; + sha256 = "0cacc56ee3d17220a3327639de3e107c4e8e574c94fdc8da29ca6770dfdaf7a4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/ca-valencia/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ca-valencia/firefox-128.0b3.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "5db919c4472c9ee6604b5d696307f80803b6c75cb31eae31b5cb0ba0fa6dbce5"; + sha256 = "afed8d6c7751af833cbba0f12e548bedcae1ccf5a3ced5d551db56d79866b1ef"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/ca/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ca/firefox-128.0b3.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "1556e239f46068cd74d09419216c1d80f924099657c528840f0458207c60667a"; + sha256 = "1b3b89346b66eb2126ee628b68f3fa3fba8c625ac333ae87a6482176f867dd71"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/cak/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/cak/firefox-128.0b3.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "ed744ad20501944ea277503aeac81e80eede8f6510bb17b14a4a44fdc221e51e"; + sha256 = "a78c2e9799efb987cf44a4ceee61933432f9979bfdd82fce0de373cf016fe37b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/cs/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/cs/firefox-128.0b3.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "1bd77cd1fbfa98aac9e671207a792b4608ee89ba0a80e3d4c5379b5f8ca6840e"; + sha256 = "bfa3ad2a4778ff6ab52ab7eba6f5219dcc6f7311fd466c68940d92779774467d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/cy/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/cy/firefox-128.0b3.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "aa33ddad03a86c2e86b19c8fc53ff68e47f7258a36db61bf99c7f09689ebd54b"; + sha256 = "7682e913a6bba419cebf21de044dea7c3fe4e2187529d5523373bc1cfb0c7956"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/da/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/da/firefox-128.0b3.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "24d6b807c6e5af3f4f5eb905165c30e4da754fbaf2a77e01703189281575fd6c"; + sha256 = "d133d535195a293dd3a63162d479086ecc451104f62090e2cfd439f590d75fa9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/de/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/de/firefox-128.0b3.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "2b02c27cbfa8757d52fa83a713e34494a8f6d32ed3c06d5a65e80d6c8f61d0e1"; + sha256 = "4b186c5e4e5a6c32ee7f71b25ad68c75973739c1e10541cb79131940efe3fdeb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/dsb/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/dsb/firefox-128.0b3.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "0b88fcbc7ae3c1fa90ac95afaefbabecaa27f3cade1b29601dacd830f85ed027"; + sha256 = "96e9a434fa9ad495a0e337683fd2988177843e3b7d59458d19f0a97a758fd00b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/el/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/el/firefox-128.0b3.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "1a0fd9122a50bb9be44e708445fce01c13ff647d33dd12ad97ebeddab3b48e0b"; + sha256 = "76fed2fe453f5f85185e84c5fab08f46b47e097865a43004bb2dc6a4b43c64f5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/en-CA/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/en-CA/firefox-128.0b3.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "e6a0237854cb5caec800b5891a459ca18d499b6084cbbf2640a058b1de84969a"; + sha256 = "9d7f2c2c4db876c164e1c95d33011cf2e1d09550d6df43fa58fa3c9fc1619981"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/en-GB/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/en-GB/firefox-128.0b3.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "85fd87d1d8c5d36281b9dbd5f6e1b702155bcf01f416840cb855d734499d3e47"; + sha256 = "b433bbd479360ac9624722ec70f1e97fa0d5e25f955244dc5bf03b4fe4554239"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/en-US/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/en-US/firefox-128.0b3.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "5f272b38ea6f9c022fd8de8007e5edd6efd541d4decde664ae8e1384ad08adb3"; + sha256 = "631469743fed440b332af0d16d806795cff7f30b3e7265b2eac98d4bf98db2a8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/eo/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/eo/firefox-128.0b3.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "5d7eae015528d9abd14468be11f2733fec6a414907536a27ab35e55cab85e914"; + sha256 = "cfab9b835f572713b767dfc89327c0371da38fe5106843d88e9b012baf0afb29"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/es-AR/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/es-AR/firefox-128.0b3.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "8341d9c04aae5b53d50e7bd53c1252cc123ae3e8d727c06ebcdb11a9ed4d4c35"; + sha256 = "e0e8c77819aace0322f1fa36a57dde503c19a7104a9660f7179b9cd9ae8f1262"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/es-CL/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/es-CL/firefox-128.0b3.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "7289ef98833d65d87bfb18be5399a957f51309b16f8159c3f2217a190518a519"; + sha256 = "7a58a042a064184a4146da4e29b8063d0a588b64699be180f8e061752bf3c4ee"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/es-ES/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/es-ES/firefox-128.0b3.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "8eb1c37ea72e9b0236eee4358f9f26457779f8380b69df6557326429fef503e2"; + sha256 = "90f55ac2c19aadbed48cc9b8f475896b5bcc3527ed27b5dc75a57e00a1b1eff6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/es-MX/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/es-MX/firefox-128.0b3.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "b0d10daadc2d08055f662fec68214b237132b573ec47e99d2960919722b95570"; + sha256 = "fdf59175bccb34442af1cb5f50a6c2c1e8621523922e6e6a438377f797b8dafa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/et/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/et/firefox-128.0b3.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "9a1416673d108f758e9dec558b0172f51c8a5b89dc404a92ea53771b908e4680"; + sha256 = "b81f13c82bc73367d51155a03bb2b81712a62192785ded86796788578e3ff681"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/eu/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/eu/firefox-128.0b3.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "1e53908af6ab2880153e8e064d41e78e1122e7bf947d66dd8af65a34a0721c25"; + sha256 = "f5edb24a1ad14037ea08d778050f8da3b825bdb8d8a76f57e278acf54a10a5b9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/fa/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/fa/firefox-128.0b3.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "e28778489b5441ea01313a7dbdc90d21364ab96749090920f702a444208e55e3"; + sha256 = "ae33ddc1a4d1ac5837fb138f0b56eb83a4b185eec8417bf19dcba5e1238a21a8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/ff/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ff/firefox-128.0b3.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "e58f6d9b8eddb6d274b4715eb82cbe6899c40e8fa32cbf007f28e4e6650aafe0"; + sha256 = "6f76ddfe3379324650e32452df1f7407a3105ce02bae6ade173a51cf1d478046"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/fi/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/fi/firefox-128.0b3.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "82956e939fe1c1d85c09153365b30edb77eac0e33b330c4d343700b034465076"; + sha256 = "cdc69c23e92616147d43eaf29aec2e5df0079e8721cab027f9651ab34abe2988"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/fr/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/fr/firefox-128.0b3.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "6a1fbec35e84fca5deb28aeef5c39d5549534b3725071663cb0088390beefaa3"; + sha256 = "aeea885a3243c723f0b1cc21e991c8505e2d1aafa58ae0c9bfe1123d24a95ead"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/fur/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/fur/firefox-128.0b3.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "9bc2ce0f10dc3b43d799238e09af614925d4a0040b29811f99f46027ea97f910"; + sha256 = "85537ea245f24b25b110ea968eae5ac6f72605d3bcfd43a445e97410b729925b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/fy-NL/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/fy-NL/firefox-128.0b3.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "48c235ec4e318d3333701cd9fdbfcf25e27134accaf14aabfb7764463dc813c8"; + sha256 = "e007bd725f02de520b5371cfe8056f11ff037b9b5e49525a649087b9f5e8dd6f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/ga-IE/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ga-IE/firefox-128.0b3.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "774edd13527f00028f2e90e5af22f1747bb4a2e1c6b80e7849e9fd4af2031b4f"; + sha256 = "32e1fbe009bac79b7fed9125291e9550608328cf9edf2c4ce652d2e762027670"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/gd/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/gd/firefox-128.0b3.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "ee49542e1c43ab6e85f9c6bf43eebdb1f3e8c26da082f5c8e32883f932ddd6bc"; + sha256 = "1e90d4d5a6236e31fa76ed773760bab8f76d3ad9a13ca89b77c67fe62f367c9d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/gl/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/gl/firefox-128.0b3.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "40e25036b2fa4d1c45287272749b83d8b6997c27968f5154f59d5fd1448d1aed"; + sha256 = "55472c87702c35df3b6511b364ea64eaaea628483d8c214dc2299ee9159148bf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/gn/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/gn/firefox-128.0b3.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "8fe7e211c79b3cef4a2e752ed31f028ba29dea103747b2502b002cf22af97b1a"; + sha256 = "c30bbc39d3c99f5b5b66f8e91afb91e6c4539658da8a0bed1e025acb26329c9a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/gu-IN/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/gu-IN/firefox-128.0b3.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "6174d4d698c06431df17b3f3ca8b40463620f2de8a84c6d60bd7aa37a2202f84"; + sha256 = "9000f9f5501bfcca41e1b76207e559bf160485ecd1370b559d471b1883f06b30"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/he/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/he/firefox-128.0b3.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "aea8d49e71f5567725fd1498d1ada41ee5ddb4a39e984fb82a7a37e6461ddf82"; + sha256 = "1a579627acf37865e1e354c8e2bdbd5222ab3add1a18bd79a869ea237380855d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/hi-IN/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/hi-IN/firefox-128.0b3.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "fb0d1b12197bd756b66b318024f3bd8b6d082460447fa8e25858bcd83709c483"; + sha256 = "06e2f8449087b8466739ae2c1e3623d7e6424f7b49a4feb77e4696336079e871"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/hr/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/hr/firefox-128.0b3.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "0d122bc0c58f6d19e2508d70cf509c06c7fc6eacdf38e7f96d1006f837b97615"; + sha256 = "fb4bcfa65aa2c4e250109f98ec2da08270910707d1ce3c150ef5d125ce84731c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/hsb/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/hsb/firefox-128.0b3.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "a248a771f298fc00b1f752a4f48838e356f1a0be8da21b2eced40cf238a5b574"; + sha256 = "ecec8874f29c42691e991e0e35f29bbdf52e66f63a7eadcd1d14904ff97019ec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/hu/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/hu/firefox-128.0b3.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "6851a94bb5ae5f5b9995bb71f38419faa0a1cd4aeb09f73d839927f440148815"; + sha256 = "097fa497377efd34cafb30fbf7bf309f0ad70f6b37d6ffd1e0ab12e8534747c3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/hy-AM/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/hy-AM/firefox-128.0b3.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "e495954e290bb7159d9583d7de648aaece79bd729bc88b5f3653ebf8edb2e8bb"; + sha256 = "8d721e9f622eaa2e34a6a1e371e27a8a5f52fc14006124e7f1c04ed4ef061bf8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/ia/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ia/firefox-128.0b3.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "5bd7790ed21c2ef82c75ee31ca352701ebeffb7ecb14a73f5a514504980728e7"; + sha256 = "e080b7c91a3d14218dacdcfacac95a8e69688e84215110b313dd6b4f9103bb34"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/id/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/id/firefox-128.0b3.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "c720c3ce0be48455be7738af00c65f63717796b3a61418f91e1fac66cac01488"; + sha256 = "a895763ae3b2376bc7d6475832d6b5a3c7fd489f69714e44c654cc6f1b020689"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/is/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/is/firefox-128.0b3.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "9097e1aba384bf9035ad51b723a61093b2eb97b81c8bddb336c2aacbb35f9470"; + sha256 = "b924d52d0f875d11a5fdb82014d1f3bd6f4dacf59991fab768e3870ebb7d7e15"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/it/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/it/firefox-128.0b3.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "cddbf8afd27f4fc901e9d7a171287a4f82c5e6659df7ab9ad59801f9c8f649e4"; + sha256 = "5af7bb832f155cd3932fa41407befc15842da3c4faf69740e364a5299683a67f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/ja/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ja/firefox-128.0b3.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "5c80ada93f5d568c71e21d9c3bd27995c1669505b981497b1f13bb7b3f02c777"; + sha256 = "ab2abf989843d52fbc958922d607e7107928f19aa8e346717e7b0afe0e8c041d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/ka/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ka/firefox-128.0b3.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "7e68ae94a62328b693d36d657b81fef4211cef4b9e074bd03ee2963bb30f0ab1"; + sha256 = "f281e820191256a778e60b99e3ab21ee0c6a001d19dfdf66f0997d66ae2068a7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/kab/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/kab/firefox-128.0b3.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "884dda123990eaf650eb6838a344f36c7aae7915f3540cb8d252f06a9467e814"; + sha256 = "e7f36ddf2bfba93f0eaea2091f9d19059e469dfb6392059e25c94f3ca6b76c13"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/kk/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/kk/firefox-128.0b3.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "9a633805b09925b1e5a00dd4291680584507ab7e94dfa8ba553641a196f5adb4"; + sha256 = "5b950ddcbd0b0d1d35ccfe513fa75c97c4f03c9492f284aaccb8448913975f17"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/km/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/km/firefox-128.0b3.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "0322b0cbbeb52b2cbd80395ca31d1f08794291f79aedb79e9d9658fad8234e80"; + sha256 = "ed151e02a9e6023584b039c563eaaf5687a0cce2e524d112fd8d0b842ddc5edd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/kn/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/kn/firefox-128.0b3.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "51621c8c9f5b88402c493ce6813b84afe00236c5971155e1952c52e075014ead"; + sha256 = "4eba588e48a099b017525b53fc999a0bbd4414e61299e2bd91c4bc451eeefeec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/ko/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ko/firefox-128.0b3.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "7537bb740007e4e7bf8cdadb72c78e6cd9c4cecf4b1672b9092e9a1a0c04557f"; + sha256 = "b2ae712b38398a1b8c3fd8174a4ae76901f419c4610ab85d9dafbfc92a1e233e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/lij/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/lij/firefox-128.0b3.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "77cc77b6d45440c7beff04dc4c5fc3043f5d62a6d8a7fa5cec1d068aeb74d6d2"; + sha256 = "7bd8e5afe6e8bef9ee917a16c0014153944baad3d4df07604dc67ea21ac2b065"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/lt/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/lt/firefox-128.0b3.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "3dd9ed70c21c268ffa9c39632a0fa8b6f48cfabe9834826abeb120d88fb242fc"; + sha256 = "f9aafb27d854e8ae6eb6e2ff85cf7d14320fa7e2aaca5836be0e7a09dd4df415"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/lv/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/lv/firefox-128.0b3.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "d493c414466ed8a117b40ead6d13caebf32c9c59abb1658db5d87933ecc7ba5c"; + sha256 = "0b0d7e0837f0d9e3f0e9f628df717500079850a69e065f4a6cd3771975b96c59"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/mk/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/mk/firefox-128.0b3.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "adad74ff34d5aca45ca24c39471249c8aba082a3b2cba081def171e6420a2fc7"; + sha256 = "3541015f658ad5275ea503708f4a4daefa66742a011eed36d943ba49e377b278"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/mr/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/mr/firefox-128.0b3.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "fc44b325f0556f6284fa09b9989bb4aee9dde7f2b98c274ec1c876cca54a651d"; + sha256 = "d8cd2c6d7be07c0a0d7686917c2c16f4d7620392616d985405aefac36880d68d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/ms/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ms/firefox-128.0b3.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "665b68f4eca82def832a30f77e206eb6d3ab25959a97c88e94d219652c73a07f"; + sha256 = "0150da21fec66c1da911d1968ff281a97c2d7421b7c3e423066f091bd040c357"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/my/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/my/firefox-128.0b3.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "5317071a0c2e88c84685c220a39e67b1ee410966dbc3d7f352bb37f619ab2ca3"; + sha256 = "0fe17f9023928bbf8845aa476b27513954380e8096fe7cb206be9633cfa3cf19"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/nb-NO/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/nb-NO/firefox-128.0b3.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "00734efcb8d9aa70720bfed3d49718044aba1088c48beb9d3a618439e806bc17"; + sha256 = "4010fb76776bebf6037ce0788946e6098a7bface36c1281f14a7d9a69acb1be1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/ne-NP/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ne-NP/firefox-128.0b3.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "0aa7eaf8cddd8399be7e4361bd700641b4e23c55c5ba571307a5d68a23825d52"; + sha256 = "675cf87d896a9441e3f8ee2bb72853fb261a552766dc49f3422d04c537ab0485"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/nl/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/nl/firefox-128.0b3.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "c45ce8548a7681039d2f8eea1034e34b669f98e8b1ce195f1e97585a75f7add6"; + sha256 = "28caebb6df719979af3cab55730b5b0445b6d855667e06dd235725263aa8c5bd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/nn-NO/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/nn-NO/firefox-128.0b3.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "d43f42e73f98b724652eb7d771bf3766c53337985df41ad3a93bc9dc6ced1c39"; + sha256 = "31ece43a2f1810d7bed9130bd7ca5f81d8b35781bce1555a10f3c80c4a1b562b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/oc/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/oc/firefox-128.0b3.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "dfd0c96c49bf69e55f86d9b81f81c9e61af87323a68624c7ae9d1fe337404e02"; + sha256 = "51c81489325ceb3f17fb48a493247eadc977f53aa82809fbf46240b582d04e3a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/pa-IN/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/pa-IN/firefox-128.0b3.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "704a4534dd144aab5b99a2a1daa42af6ff2fc85ff586d7fefcd90daabd39f691"; + sha256 = "2cb5df6e97c3dfbecee309380b61438c2dd8c1101eed829d72e81a2b3e6d1e83"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/pl/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/pl/firefox-128.0b3.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "dccbf1e6b1c463c60cb321be32a2d169e4669ba295a9e46a24c1fdb1a9a3fc60"; + sha256 = "ab03983056df8b9f86369d60fed694f62d8435913bdd4c9263056744be1f25bb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/pt-BR/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/pt-BR/firefox-128.0b3.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "30954bceb1149e8f0fb1f2572b48e6a812f9040e2956a0a00ba9861eed0419a4"; + sha256 = "cbdd4c98cb163b2f2855d6a9d1044ea58c011bfa635c0dae366e864b4faae805"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/pt-PT/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/pt-PT/firefox-128.0b3.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "3adb9cabe5ef28e532c9876459a7c711bff44e829c555db57f228a2034aee55e"; + sha256 = "7aea218fe428795abe12d23cf1c5253aeab4382c5bdfbec0ca575e2045ef46ed"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/rm/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/rm/firefox-128.0b3.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "c392f15e019222daff27c5be0d5e695d41840e7df3ddeefc3768936a1899c60f"; + sha256 = "6d62a4552a59300f4c72c418a6fd386ca89ff8eb2cd43a10b01271a168c057db"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/ro/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ro/firefox-128.0b3.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "57b2b6e3aa50de0cc122c9612a098adc3d406ae6700af3799d900f6b1099fd16"; + sha256 = "11bd2b72830e876895ba9a53d804641cae08f4ac1c0691f5b75bd8c50627576d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/ru/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ru/firefox-128.0b3.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "b0c0f87f4689c29a5ab1dd05bec2fd890764e8610baf480d48f2bc56c45d8c1a"; + sha256 = "8eb355d2482252bb668dccda8afe3ec4e9416f0ce8b1a7d1bc0b3b1e614bb53d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/sat/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/sat/firefox-128.0b3.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "29f12ee83180384d8480a0ff3b7eb8d8380ba6e80aaa79889ecdb507ba5a18cf"; + sha256 = "56fdfd81f33a17897831e6fbc960ee72b6d4bc5ccdbe0f499bb7040c467d5c98"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/sc/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/sc/firefox-128.0b3.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "feb0ff2b4a5ecb51daf6a9a37f835e50894ba73300242d5f1375e210aed9df09"; + sha256 = "79f9d2dac687d4ebe5c3d89fc142e0fabbb744fe13968e81014e12687f54482c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/sco/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/sco/firefox-128.0b3.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "ce078b281d4f8a57b3bff091ac6e7bb04ecf401885150443945390ef0da30d1c"; + sha256 = "f9676a196a76a269aad93d9960759ff179e21fbacac3957117010fd231b4c49d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/si/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/si/firefox-128.0b3.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "b9dc142b29f4c982e86fb58a7813801fa208386ceadd5f4ce9e46616f524d2d3"; + sha256 = "4c0e4ca10911b46888b1f88ed8922375354c2d6ad549023f7f5150752ef61f68"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/sk/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/sk/firefox-128.0b3.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "9171e3fa56a0611a9e4adc5c2aa4e873b79f0e229ce21f5cd61a855bfe67f228"; + sha256 = "643cfa0f3c65ff2051aadd235042fafd52c5b10ef32d4be79c76e1b02da62bfb"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/skr/firefox-128.0b3.tar.bz2"; + locale = "skr"; + arch = "linux-i686"; + sha256 = "e8a80a7d5dae201e4590ad644dbd9add83a1c4bcf8f592165c6dc87765f17361"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/sl/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/sl/firefox-128.0b3.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "8d6385d9865439c3184b4c6fabe5a205bca7c96facc510e9d0ad37e338a3685c"; + sha256 = "32ab4d5e6df6095aa80184b92fce6bfbe575bd3ebb4c2f9200519c31b67db6c0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/son/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/son/firefox-128.0b3.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "6041cc7f8929ea4e1109b6bfbd5214415333528a2f371d7226f1d6f9c78b7c0b"; + sha256 = "edf2f00e87e992121721fb2b948637650845169dce0a2f98c708489c8f6f0fb2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/sq/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/sq/firefox-128.0b3.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "f3d64bf45a205a52f8ce9da83a8929b8946552d8d9b5b2e44d2c4c54b09eb7cc"; + sha256 = "2317f12916cb73037322c9e8c350b4fb2b1f1e9f035337eb4dd7c6acff35ec95"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/sr/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/sr/firefox-128.0b3.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "1189d0fac0bfab52f2536d61ff5b8e9e6bc456cf64d3c9b5c519bb7db86c6cd2"; + sha256 = "660fe43de82ddd20b7e8ee3090cebd02c3a78a6b42693be19599fc818662c08a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/sv-SE/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/sv-SE/firefox-128.0b3.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "3df8ed2df85ac7cf573518774e6b2d42e4573b9f9396f1cd161072e72135bb0c"; + sha256 = "1479aaba440418cd9763e1b7a7b6c10c05871c69c27a9d5bcbf19c5956eeffb2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/szl/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/szl/firefox-128.0b3.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "159652951edeefc0a9fdd9c2ef4babb0faf846e14c54a06f00c1e393b2d52ad1"; + sha256 = "f0b7b11b448222416e7f8ab46e658727060dedd2fa4114a857800cc6750aefde"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/ta/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ta/firefox-128.0b3.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "b69da473595cb0bf2c540382431f1921d23626902927f6e8433121597954c078"; + sha256 = "f8bb68b199e450945ef262ee364ed6677998f24242e196d04d45b0209469d96e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/te/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/te/firefox-128.0b3.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "8a9537e0643c1bd097e343dd270c900be40829ccddab1f2852afc3f7f5291fcb"; + sha256 = "14db538c4ce10af0c635f7ad05447b104b35d5b8aa2504331b1e3a388b2bb6f2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/tg/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/tg/firefox-128.0b3.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "2b4c01abde3afda35764babfe2314bbc54ff5926d184459fce296de19ae4538c"; + sha256 = "32035ea4399a294509a939501f5cf8d5e9e5bdac24662fd6e5054adddafe843f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/th/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/th/firefox-128.0b3.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "d5b5c5ba8985d964fb618d8a02b00a332d10c88e0c00c0a08392d5152d1a2aee"; + sha256 = "b09e831b65829f63325354bdaa0aa40097a035bedcdf8890464f2cfba1b4bd86"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/tl/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/tl/firefox-128.0b3.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "01126fa975a56c35bd39b18bd5fee40a41f937d6de745e19d43adde8313216f6"; + sha256 = "a7d024c484ab97f4138d6468a60ad0aea86427ba955db0522fd3c93d89becac4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/tr/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/tr/firefox-128.0b3.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "9944290424fec68114cc56e7d7f9461d382999ef9f3aa257b796efc4bc45ed1d"; + sha256 = "95ea9fe51952c17f66171420e42daf69653f50586e50f52794df20ed6dc294f3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/trs/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/trs/firefox-128.0b3.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "2bc7e9a06be8d2ea6e9a9db06456ef7762040a9669657f7715e8abd7ed8cb301"; + sha256 = "727afcc04a981d7a29c97ea2776a519817d69deea0c90a2e692169a1aa363af4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/uk/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/uk/firefox-128.0b3.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "d301919a3f538bd360f471abc2718295a86018fb6c2ef60843373e1eec2b3ac6"; + sha256 = "e23ab0495d135ce16f959c06e5eb497c6589b3398c2b9971d94513feb65b54b1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/ur/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ur/firefox-128.0b3.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "ca49185a9f77b621f7fe3db460181d5dd3f3ffcf5dbfec5e451339efd0ef96d2"; + sha256 = "d7f3a250bdc65e5bd15bac830025d62dadff4f889505abe9778998136b675c3e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/uz/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/uz/firefox-128.0b3.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "0f6c983b18585e1b9b2cdbc47e86a1b56d62126d0b90d770391e9d7502a392aa"; + sha256 = "23422bf0985202b1e64435f1202b81b0a5f11e5c4bd3dd206fa124b3c2ae5aeb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/vi/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/vi/firefox-128.0b3.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "f621f3b433ac410b996f7c7e7e94b680ee7d3425d2e41bdccdfd567ecec094ac"; + sha256 = "a2fe9e8d70e8251e88280cc741292b830d10ed8144713d3a0ea1874e6871927b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/xh/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/xh/firefox-128.0b3.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "631336f561f9153d0fbd941758aae76bd003ad541a8fb28a650610fba0f84ffd"; + sha256 = "d1a06a53bc6f3676fdd0a8f45730209c2bae1bf5729da35b0347197183b9aaca"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/zh-CN/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/zh-CN/firefox-128.0b3.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "7332654e1f050b6eabfca74a9fa9ef024f75f77ccc4ec6b8c042a33d1fa09dd0"; + sha256 = "c3c41c73da2ce5bbdc237d53cde700899ea070d4614e2a7eb3c23aff38ba6e83"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/127.0b2/linux-i686/zh-TW/firefox-127.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/zh-TW/firefox-128.0b3.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "77d4db4421b562f34126da6fe7d26221fabc27b1ca7a413c9fc55ed9d89d1f3a"; + sha256 = "9500a28218045d816828becc5f5b77cda638145e6c3e2e08f848d673d8e77ff0"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 17a35eb797ac0..30cb040f3ed8a 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,1025 +1,1025 @@ { - version = "127.0"; + version = "127.0.1"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/ach/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ach/firefox-127.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "0a67c7dde1f0ab336f61a81a7e00d16522f4f630f83bb212cbaa157daabf8ff7"; + sha256 = "a0c0adf6375c16fb0788c5d2547a58cdf4eb39fa2202490709e828143e253858"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/af/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/af/firefox-127.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "5bca443b096fb57d232d607267cdac3b85ff4988c00b358fe770c10f5f8d1fe5"; + sha256 = "537284719c1ce1f5e5664bc0d7215d70e1ff8ceebebfd8f4de5aca7af6d078e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/an/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/an/firefox-127.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "34e22b87df1217486c3f439fb6e8b443d9d315e4f3702754ca5160b108bedc05"; + sha256 = "ed24dab4577adad1932474182bfc1a4bbc421879b295234c9bfcf12201254e45"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/ar/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ar/firefox-127.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "103d49634a1bbbdce20bde4b11185a2607aa4712027e25a9c983b37479290282"; + sha256 = "7a5d3b7a6519b1a82935486f21ee8bf6802a6bbd5fcc2035674b9881b5b0cba0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/ast/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ast/firefox-127.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "637198f8fa350a53b3ea9f284e9bf9006523f577cf7814add964b47458f05df9"; + sha256 = "b3219057f2b99d0d84225af34dbd35988cf3d462df2e69e3f57aba9bbc87e093"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/az/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/az/firefox-127.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "450e09b45349230677aa82c37a5a7e32fe2f806a2edf821566836aaf8d80f011"; + sha256 = "d16a676d90b8290f2a97fc09cf7edc6ba5c57a33b4b626163a1a2ffc559c444e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/be/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/be/firefox-127.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "c82606883df11382810cf2547e43ba12cec76de58deea725c5c511e078f99ae8"; + sha256 = "9697faa8a0fef7fcf2149d4e27a943b5576ddd1f166d1e9e3436019306b51c0d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/bg/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/bg/firefox-127.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "6171b5ca99b35247578c42f857f64e3fd618121314bb9b28d6125dca747502ec"; + sha256 = "c156390b7821f8e9b818273ef4645b18b0370fb4eff2685c386b28e26035b1ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/bn/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/bn/firefox-127.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "c22061db0e6f8659d4d1372b67d8507d66fcc1427bcb310ebcc665cd958c6740"; + sha256 = "a237d94d62d8310ad6a7f4b44e8560aa70869bacec5eb1ff03ad10b1fa204099"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/br/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/br/firefox-127.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "335fd937e3d15b204ab09aafff283b4cd44de2fe17417792568075d86b970fb8"; + sha256 = "0e8e14857e6fe8f07dab736ca94704f042488aa66f09a34472d2e4db68a1d7fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/bs/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/bs/firefox-127.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "1ea048261669b711f457f8e52ae96af6a05664ef94cb64a9163371ff42eff29b"; + sha256 = "a4533e64c5b28e3b721f6b5d27b226fbf25c781335af9541249a2d4805fdda3c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/ca-valencia/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ca-valencia/firefox-127.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "c233e6274cab4131c5ffb89e10a626a8ea47cf2a64b092b40b41687786746250"; + sha256 = "c06fe9609e60476da4dd993eb56a282c85ba6f6b6ed0334e02ff6fa76792e243"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/ca/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ca/firefox-127.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "5b9d75338e8f32336636c50cd5c0154538f962e75038a05a6aa6e6c67df653b5"; + sha256 = "3d7d25afeb97e4349798642fa2726e54d52a075dab40dc4c8bdf8c1a56a90e9f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/cak/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/cak/firefox-127.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "51b7ceaf4edf5feb223c3ea1e2bb7d61c0871945e9ceffa294d5886f5286a57d"; + sha256 = "091c97903fe7ca206ba6e65432c303ed411e9dee5a58ce4acde78e092c255982"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/cs/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/cs/firefox-127.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "55cc585eb9b35429632dc659cd513c18609ce1a606aa0cfc2a4732980347e256"; + sha256 = "62b1713abeb49e6d2857cdd90ed881df1e406845a021166a2404110b85aca93c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/cy/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/cy/firefox-127.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "f65c007d20f8f4ef76ddf8219e602e6bff78abbadf3eb61bd02067923c68f479"; + sha256 = "7471bdb9c4f8e0ae467674f4a0d962edd6c09514edc02b132c2d99b5684c6f66"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/da/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/da/firefox-127.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "1ee5b89a11a020c3d88e81e7928fd42d71237f1233868919deee331ee49d4301"; + sha256 = "6bfa2559875407261eb3c92a369b40ca4c037a11e8e469625a994fb7121ee6e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/de/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/de/firefox-127.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "54422d0272acb6f36c524669d371a797ceff24a451080cbf3338f41323bbe472"; + sha256 = "8f2b346f972edcba3f0b8e8cd5797ab688a9753b8c518696d5cb48a449d4430f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/dsb/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/dsb/firefox-127.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "080fce82c2e02455ad2d547e04001d497a972abcd20dd026b933e97c7f26ba55"; + sha256 = "954ba4d197384bd088890c5405f153b704b2377e9e831214da195c2d317c8cb4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/el/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/el/firefox-127.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "c1f8823b35b439985eb34dfb52c96e97e103f88d5a57e2defc142a46f5802925"; + sha256 = "fb2e5c257cf29c26b2a9b070324d6545ed2b97d4a7ca2454426081773cbc6fd8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/en-CA/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/en-CA/firefox-127.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "7ea0e26d468e8c29a376d69cbe5ebda6e988b5eb7b21a05cc0ee3584ea3beafe"; + sha256 = "223758c5b6b45dd153655543909d18f0a4e9050d27b101a6609f6bf267c6ce2e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/en-GB/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/en-GB/firefox-127.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "e9afa76b35c2857bea6d9ce325e3fd06a15768dc16c1f79c06e7feeae9f25c89"; + sha256 = "7018c6907f2de68555b167f880a68b37016f55f4b5ac5546faa376c43d4d0dca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/en-US/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/en-US/firefox-127.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "0d1a523f2348cb3068d792ca7cb31b209d0c6c8e4b95bcd708f4c096a88d0ae9"; + sha256 = "57564e6219f8f79418ba49d1e7a6edf44f8e253f777d0ae7de7dbff200c3d5f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/eo/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/eo/firefox-127.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "87005fe22463bf0e259bbc34679f5329e7937602864e5adf6c988435f290b846"; + sha256 = "24a0e8904f7b6cd7609706fde278ccb57cf076d13569f9ac1197b5cbb6f8c6b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/es-AR/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/es-AR/firefox-127.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "32f79d6b7c006ce348ee95c2d7c2870db7404513ca733761a9b31c583f2194d1"; + sha256 = "a29924f5eb27ce2e6907d23e32d95fb1f39c44e377703e558eabd10a0becc6ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/es-CL/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/es-CL/firefox-127.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "f110fccdae7d1b3f524ff22e3fd56117703382986993ff236aa8b2261507449f"; + sha256 = "a273ae90dcdac41bb83ed9024e0c1a7be9e6389c3e43af983b8d1f26f29d72cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/es-ES/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/es-ES/firefox-127.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "663fbe51291245183cb2114d18f834da5b910a60ebf9e070c141a4dbd3c4bcc1"; + sha256 = "904aa7e93abb39ab0357ffd88c1d9c3c1f6fdae45a6fd43fa267999201ecc7b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/es-MX/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/es-MX/firefox-127.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "9980efc749c0342abfec36b7fe7a854586e18c30ec245c5c2a53548930d6f355"; + sha256 = "5b01c5f7d2d5ce93d9095df7c02a10c6f81e458454287b96cca9b65bd5734d3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/et/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/et/firefox-127.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "fefa7edb1ea1db581cff9ce974b92be1098fe9f2fb59873bccd35cd80e3c4464"; + sha256 = "c84be37b30e5f26d1fb0f7a6bedc0765b5c58080668eb763305fae2678c32a7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/eu/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/eu/firefox-127.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "88d13360f7bed2d5354f6d2243e5ae5806f63c4b655588b2316b8767eb81c51c"; + sha256 = "bf46def3eee9f000b4227e8778c6c2ef09b4bb78dd7c8f1ac5d0d94d345a2135"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/fa/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/fa/firefox-127.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "770f9a519b966693950857e50ac9ab8ae672e11672eb3030337c1db5e2625916"; + sha256 = "d87f5f3e532231c80db40904248413b3891e6268042701824fb19abfbd3b5207"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/ff/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ff/firefox-127.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "93333f265bf2901987f511603f83cba950b411c45487ed1213ce2a9f362ba2d4"; + sha256 = "c3c3162929d576c9311ce42d1211c091f8ade66cfc119b961e04d9a278ba4194"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/fi/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/fi/firefox-127.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "befdd842fe342f5b762986dded647445ee86160513a9022a912df40d9c439472"; + sha256 = "f0ef6a70f6ec7f1da1a4b4d695c62fe7dc1d9ca44e7a4f8cdc17d15ccca4ec61"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/fr/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/fr/firefox-127.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "13ada94f41501884cd62185f5e8544bf22a5bdb4de12f768940b576e96851ef8"; + sha256 = "2c9c074c8c9a5b4b7124c683b13f4a2be55bee9f4c9d4eba5fdc9037bfd4ccd3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/fur/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/fur/firefox-127.0.1.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "fd5673cc03c1035a94a19a5dcfd780276259b13d7e425da6c33349c4a6b1d84c"; + sha256 = "7433574cf039d131cb60545c0f32748382c221eff400887360367a16b06a11f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/fy-NL/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/fy-NL/firefox-127.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "3a290d5944461729cd73a1e562499b46addfbd9233da2b9be3f01384e0c59e50"; + sha256 = "083497725c22b842831f80c59ecad6381f27059465f3d34e28acb6b5ebeb4985"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/ga-IE/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ga-IE/firefox-127.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "765297df342dc99ac5739fd2c074afeb7a7be555ed1cb98e2665cdce51f6b20d"; + sha256 = "36221c549b08bf499a367d82543490bd006340cec627382b2314902141a75f0c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/gd/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/gd/firefox-127.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "5b32f3d5a6cf76f1a77bea41b785c5484dfcaea813e30a8214c998dab8dc7fcf"; + sha256 = "a17ac5509f06f7df302cca1f68f2ba2ca8ec5035cd552f6965c566a2000b4b29"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/gl/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/gl/firefox-127.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "b9d8c5b70bbb0417df8820b0e9a2e36590aad4340eb88b64b3d67a7aa278cd44"; + sha256 = "83b3c09c08a178eb62007bc0328bce8983f84d0f250d3687cee03608c4c18f14"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/gn/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/gn/firefox-127.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "6346693b2dff8445d55ae655bd6f8e41081d1abfc212b318985ab663356c7dea"; + sha256 = "465e77519706a75225365d3c4a004aea9279576482e7cec2d62aa8b7a886e9bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/gu-IN/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/gu-IN/firefox-127.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "c95fbc471615faade21aef46708ec2436367f251ef12957c079d391d96c54b90"; + sha256 = "53e09098df9675eb7f55d9423690a59a3772b5903a21634846677613975ae5ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/he/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/he/firefox-127.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "5bde7abb580440224684da2a6a7e816254994de09dcb2cea2ba1e80d96ad9154"; + sha256 = "681dd31829c32ae960afac4cfa39da6c4ed7c68f11359e52b3814d347e30be8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/hi-IN/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/hi-IN/firefox-127.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "1ef88e99ca705d8d0a1d03622b03142f4751797f53e0906769e9a5d174b9a57a"; + sha256 = "e8f25e4ddf824410ef01b25302eb1e6c2fd476bbbfd9ec4de19b6b634d108a5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/hr/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/hr/firefox-127.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "9403bf515ddb261b03d91d8a4c6457729764e8228f40ab2aba355b1e9d9d2e0a"; + sha256 = "386b31c0825eeef34d3743fa627a6b68e54830b376bb28b03487b4c4840e7120"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/hsb/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/hsb/firefox-127.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "5a0f7609f7865ea785b17286570697879f780e10550a5434d945d904fbc96529"; + sha256 = "76807eb27de86c4f3f9a2ac8eb3d2968fa9efcc47d4a948f3327e6a803d78e07"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/hu/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/hu/firefox-127.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "e3d8e431132cfd151374c1d80813bd1b1e9386fb893a1ee83c1da3361efce4fe"; + sha256 = "7379aac9224724195248879a86d12fa5d98fbc4d85b158982cfa8a79526caa6f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/hy-AM/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/hy-AM/firefox-127.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "0cf269d7d0ca2104e060b86dc61bab24c17897683ca74d109840d47a473f3394"; + sha256 = "eb23486d60353cd66efd09a7a05d15ce613279ebb8ce499a958927f0610fa5d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/ia/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ia/firefox-127.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "2387774eb4fe1287b3df9e727a14ff666f9daf2e99e132556de4883bc80305a5"; + sha256 = "a27ded0696059e04cf70c8b601a3bb74c220249c5d83ab28e03bf7a35c3afcab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/id/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/id/firefox-127.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "bb7a9dd17b7f376444db006a8fb8868328756e8f647f673f8285058025833b0c"; + sha256 = "49ef7dd6b3308802fa3e71514ca026ca7a2864aabfc7ac9ec1e8495f65ecd0b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/is/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/is/firefox-127.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "87482a31548b84fafc516032f5fbe18187ca48bf83a00499401163a6df604e98"; + sha256 = "84790d6b71ce317861c8c8405378c4c425aeb14287508d9a5a83daf18749505b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/it/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/it/firefox-127.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "515f58bfe05ca7b16bcad39b1a0c7ba2d1a5266cf93f62c7e7c9ec60cbcb45ff"; + sha256 = "ca16864d24423592ef1c5395abd636651a23b626f360463250667ca5e450d301"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/ja/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ja/firefox-127.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "bd80748d3390b2f149ad927bc60a4a3a13c49cf4d19273cb2b85a2a701e672ac"; + sha256 = "4c50ab7c8391e563f926cd1c40d4baa6321fa66eb69b9ae35ce96434130e0fc2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/ka/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ka/firefox-127.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "36c10ec41eb527dc6070f74f2dc62a0c1eddc0c7f64b3b034cf4753d6f0840d2"; + sha256 = "184caed2b7fface9cf11e5932ce5ab46011ba7c73b01b49e02fa6b99765d8fd8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/kab/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/kab/firefox-127.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "9b747b487b0eb820a3ec8621ab3ff4d17c3330a759ea32629462deac89dd99a1"; + sha256 = "8d8a5773d68b06d55800cc9df11425520d06b5bbb9835dc193768c183a21b111"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/kk/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/kk/firefox-127.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "45eefe4141be47e1b8adc6a74154bde77c7c65360f54b23a47b38b77336a5d87"; + sha256 = "f68784a105ca7356526a93a2127be666231c067aed2b9c5e2f3e1c8905222cf7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/km/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/km/firefox-127.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "c5b3698a2e5d77b9f152c0cf078205f385f523b6fc9543d88a56e7abdaeb1294"; + sha256 = "d218839e9391e990572b1097495b0e541f32f125f156cea594c62f4d835aca8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/kn/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/kn/firefox-127.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "1627d5c147f09cfbd34dc728a7571eee8e969bf1c3a373fb7c44239a1a9a6330"; + sha256 = "fb306ea401e9f4a80346db9e2219019909afcc9a4366656537036d5b5b172846"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/ko/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ko/firefox-127.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "9e57804be451e294b6c09db68e106eb50d61be399a8749527f3d02adfd305798"; + sha256 = "6e072cce5c9bed5401b70e853620499150037e28a7daafa994f7da6375ec69d1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/lij/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/lij/firefox-127.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "0085def7742a0845efd7df0a6030043cc9271e82dbb557a11d10cb4e3ca67fc0"; + sha256 = "ec0633670be69a1567799fc1210b3c2e55a7026b3b06af97689fdccf64ae1a2b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/lt/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/lt/firefox-127.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "e4b10f26d8bfa79cf07e4e42ad91c332909a33dac9588378b4bb36b45051d60a"; + sha256 = "25a2c72a65825704f2ec4848b2ac52f1d17533d97c1da2dd50fa20a05e1ef5b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/lv/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/lv/firefox-127.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "4857c5548246c19dc38bfe069e7311512215a71254763f8ede6ca7c52331f714"; + sha256 = "bd79848cae45a9df2538dd0c469d5b8c90af90804e157977d9d40ed208afe909"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/mk/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/mk/firefox-127.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "d1ec52b52e50a9d2a47b2b54f97a1b8ccae67d5e166d7e2fb1dec88c6a33f8de"; + sha256 = "6b97978be93304c0292e1f337ce93b6da3fb0010864171af8afd4c42a931184f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/mr/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/mr/firefox-127.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "5719b5be8b99919a14c0b4d09f21a9578e474fde0c2d054b738aa808fa77bf49"; + sha256 = "a59d247dea428521aa142ad399cc9ca084ccae10e0bd115c62e3dc8f8929512d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/ms/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ms/firefox-127.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "b31505eed3e575785f6518b22a2bc1b16c2550c3b44766472b5a9deacad02b49"; + sha256 = "cc885d9b95439476ba92fedf0081bc72cd9651113ba6f569972f9a39d4b6c33f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/my/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/my/firefox-127.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "eea9e1b863d4b9f6b7da6d71cb6fc2e746761f7210488a64388abf475c032779"; + sha256 = "4c30bfc50c0e03b529e65b51742d1f0324cd43661f7ff4b4cac1ac84406ef658"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/nb-NO/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/nb-NO/firefox-127.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "5fc6eb12cf854bb30ea8035146bb53097b75cf464379e92ce086186280e755b3"; + sha256 = "dfac26ea8b3f6ccc12d6dff7e6abdb28a160dfeefc369fc4f8c982222eb2f34c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/ne-NP/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ne-NP/firefox-127.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "2838524cc6a20270d84b12e230c7f1aea8d8cf0b0d2112386a357454b2cfd861"; + sha256 = "a5efbf90c642886f41ef0ec9ddb128cdaf4e0823ba8df6a0d5f84e26530374b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/nl/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/nl/firefox-127.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "cdd54dae176be5de485ce4afe26ad2bec1dabd975e598c2510f56db829cbd5f3"; + sha256 = "13c1cd013686b626881ba82a3d38a3c6a5c6c69e64cda53aa4611ae78f8f498f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/nn-NO/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/nn-NO/firefox-127.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "b61abe417f246cff0d345f1f3d6441310abf16e649fab69505b6683af983f575"; + sha256 = "103ca53d1bb93a2d9c4b72fc7737ad8a7ecfcb99c5f0c81ca6bab5f607dffcd2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/oc/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/oc/firefox-127.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "4e361d62187ccc284f24abbadc94caa103f8db02c78353c794422f7b92117885"; + sha256 = "671ccb11cd07be6da9de610f898f07a4a739b594a74db9a400ddd22e39342f73"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/pa-IN/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/pa-IN/firefox-127.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "d185cc5de68cc7eebfed3a277fe8bdfc7be1a73fd1fdf72a9947ec77c8078093"; + sha256 = "601883185a7c172aefaea9614f50e20649035fe619fe43adebdc471724e5358a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/pl/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/pl/firefox-127.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "c994f5cb6b39653eed05d0648122777e6adee95a7a602f8203a88e6c3bb4ded8"; + sha256 = "a5a064b3663a084952f69d5566631ceb3e620b95ce4e068da8ea751644f091f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/pt-BR/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/pt-BR/firefox-127.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "b9bb24a72efb92d2d40b1b85f2d71f544bdd5391da28eb2e0b7d1434816cccba"; + sha256 = "a1d026e73053b77c0a38412c22b9e5621c57342b40568fc873d3bdc1f4a49f25"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/pt-PT/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/pt-PT/firefox-127.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "1304f8c9754b3b092a4355d3a3150e3db6f462c38922b5ae96efb0b0ae61397b"; + sha256 = "74b7a71616584ec2a11502a568e1929854d118c66460f6880f7caa662844f4e4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/rm/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/rm/firefox-127.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "8c2807ab2802c67dce595a03b7b4f9e523509807842dbef47b7fa164663ed9c6"; + sha256 = "3f064c79b273bcd244a3f4a874a6f88244a9519516da54cc83b84ca6a772c2d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/ro/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ro/firefox-127.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "e85584d551688d32e0116fc79c464aec90d1b8d59dc451f99c740e8faad3093d"; + sha256 = "e85fa0c1b384aac2436a6f58d8b40e76ec5394ccccc00d86e39cb21ab49b9a99"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/ru/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ru/firefox-127.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "f3c6ee9f3339ed8c03c717ef54002a11da2df9536786f91c19a8f0000ec5c547"; + sha256 = "06b66880d3b557f97485b953d39b6721cb3b19eeac025248690a756118427b10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/sat/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/sat/firefox-127.0.1.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "c7b29700288f8f4ebc4996c02a80bcda18132350f48ff46ec3d28544f2dfae84"; + sha256 = "973b140ff852f875989082ff4165435a985177b80ef053e1ab001725664a5380"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/sc/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/sc/firefox-127.0.1.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "c543996ba4e1cd0b50d36f35f037e6e82f415a384d22f61a88b10f3b3269a2a4"; + sha256 = "36c7c937fe966e7b53854ced6564cadb7773cecd65e1f0ad9bec7710313e4c00"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/sco/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/sco/firefox-127.0.1.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "79b1215334443d278405aa733b8509650a9b1a142a3e306a561a140788703f88"; + sha256 = "373318a35308b01fbfc7bc6ffd541799ef31e9cf1ac88b7cff8ceff635037665"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/si/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/si/firefox-127.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "36ebc4fcc1375c6c6a2c9148a66d9f61459eb87c47ecf7ca4b0e6f492d53b97b"; + sha256 = "215af3253c9863cfe20be347a423ee9881e18b4e35c33a2966bc8b2fc7b8cc39"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/sk/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/sk/firefox-127.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "ed8e3001cece7f71396a61ae217b3887c87df0389f8bcd8e67630a2e2c09248b"; + sha256 = "016385509ea105821bc2440f6d3255e1728e7ff85146e02b721f4948b0d85d65"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/sl/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/sl/firefox-127.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "9504d0b062d2740397214d13b11740ab247b5e5b4e04fdb1cfec3529fb9167e3"; + sha256 = "aab9e95b7a1e0a772df775aa0ecfb7965381c7a60df7d54e1c6fa06766c6a54c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/son/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/son/firefox-127.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "adb96e9e50dbf1e4aa2ed6b959e6c46896b49bb5dbf4bf05e7ca5dfebb853d0c"; + sha256 = "435b70a26d25111a826615eea61409bb4f4a04d7758cbffd2b13c12fccd1091b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/sq/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/sq/firefox-127.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "d4d507d7f7fa7b16680ffcaeecc220811a920174e74a1438741a5288f702096b"; + sha256 = "f7c10d47f4bba018ea8ed5d0d78069dcfa59d739e6872b3224cfeb2070232196"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/sr/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/sr/firefox-127.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "d17058ceb8c7ef803cccb9936199b6e355850c31255874033d6cf0df86285eaf"; + sha256 = "ed786d719bf32f81389c061853341d390b6e76ae73c32844bc55daf03e2a2c1a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/sv-SE/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/sv-SE/firefox-127.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "dab989bb3774c3d6ef13fd229de85e983307453b0dadfbef541135cbf003f987"; + sha256 = "5b8ae2c28aeb8ed30217a243b4d56a22712b3768445597b081ac7f8a80f7ed49"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/szl/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/szl/firefox-127.0.1.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "3c03e6623a7891ac410cdcdd2d1f1b70b838b101fa11bd0183dbc6df33ec2253"; + sha256 = "423043de87895e6efe4d65e8168ad541f13d9d33066ed91fdbc1658ab917534a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/ta/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ta/firefox-127.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "00efb92c9507671473e44aa9dee7ec5bfe5ee37f298b29da6ad6b5cf2bf2ecf3"; + sha256 = "da080e4ed39a54c9866c64abf899a51aa4f7843db9c32a0a5b83c2991ee97d9b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/te/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/te/firefox-127.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "439b93f357d8b62f0672f42a461b4777233dbf1ac68d0db1060c84254572e527"; + sha256 = "05e5635671b7c2dff7fb1dd315b64d651e4c4f1c1bb319caaeb2f9ec3897c7fb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/tg/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/tg/firefox-127.0.1.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "e0ee1698c7dd05c8eedba187c88016fbf6731dcb79302158052a8782e5b1999d"; + sha256 = "edd6575e8c0275b2dbf69c3a63e3f34ae867dbbc7218980f3e5e65cfe446bd20"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/th/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/th/firefox-127.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "2676fc135f8c3eaeab8a5837fefa3a471d033d2818a435c6f7932227671ed9f7"; + sha256 = "ff6eab71db2cd3a61ac5efcbcf1526623d0581fc8dd4ff084bea68b5a1b547f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/tl/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/tl/firefox-127.0.1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "e704aef6ac9fb718f74afdd8ca7b76c1b0817a03cebaec30b4a1eb59dcf18421"; + sha256 = "1c550f3c9e8f7c67e98c013bc058018fd46a6eee04ca9e36c64ab51e2b9a83eb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/tr/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/tr/firefox-127.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "34dd262e839d05ae743b02fbd7140d55228056ec08828fc2b7464909cd48303f"; + sha256 = "67058b4ef5a68a9359ab6e461b635018df5077606a634d980d6ac88ead2e9711"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/trs/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/trs/firefox-127.0.1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "41a84930d3d0b6cd61a269f6b97e085b24bba71f68314ed48af72eea5f449bf3"; + sha256 = "4df827ad9203d47d671eebe05741407a95a7b8af9a25bfaffcd1b985c996f24e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/uk/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/uk/firefox-127.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "0bbf66c523164d9e4259f2c8c0358bb6f68a922f240b383015cbe1f99eec63aa"; + sha256 = "ac38bc5b1dda7594e6dee4377ba93e6f0aee875d2a1c7dfedfa2e3c4ad11d1b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/ur/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/ur/firefox-127.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "3aad5068e48495d940b588c905624f8784cba7a9019d4bf3a2c0dd650e5a441b"; + sha256 = "f9d93101ccfbaba3861f9dc6bd3cd2686d888c974f721c109f90ec4219de6621"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/uz/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/uz/firefox-127.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "1d2b326d02499759756a862c1cb589e9c80ff25a592a19936116eb12583bce69"; + sha256 = "815164350eda87d24df7c6607c23cea451dad55d4d2d2e9e732981d8bc2d186b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/vi/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/vi/firefox-127.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "d8fb79676bfa3ebd4ba22d50f01e4e4989b795b6c7f36abaa4bd7003008de1e5"; + sha256 = "0804a891b26fa2c0332a68f81a51ca80ebdcf4bf9c298dc2c66bd47107d4d289"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/xh/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/xh/firefox-127.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "32e10987d65b8646f402284e29826acdd6eeefc9b1a27da550cc9602d01faccd"; + sha256 = "ab5e298676d6ac9eeb129bf95606a1149a5fafa32a978a3bcf08bfdf70174f4e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/zh-CN/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/zh-CN/firefox-127.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "5cb20505673c8ecf8bff351242da0e6d98c431205007ef11bd447793846dfc1a"; + sha256 = "089d9286a1109d902cab44581b97233a2e7bef664ea6dec267ffd539fb4e83d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-x86_64/zh-TW/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-x86_64/zh-TW/firefox-127.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "ef55a24670d7455b771f9902d88d3547b7de17442b66dad0321627e462d450c4"; + sha256 = "350406bf0cf848eb0d06188ce6c2ce93ec8ad6b7b159c5b51a8bca94405ea354"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/ach/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ach/firefox-127.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "22f5e3e4345d11f13fcdd2f9a2fbd7b1e1aaa3a3d9533a740158e469ae4e0f99"; + sha256 = "8e5e1be666d364bfd7aaa613826698db1b7df41cf6fa7ec5ef2c458800b67280"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/af/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/af/firefox-127.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "68d8627d2d15bbef4365f3816f61fd6ce5f4b7630ff79019e77ed09778fbffa7"; + sha256 = "e9a00dd060c860403094edeb6e4f5918bb74ed2566fc354a5f27b9c1e4f9219f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/an/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/an/firefox-127.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "6f0ec0e85095d4df87f4fa4966f499be30f717a39811abdef04a6291b1012c7e"; + sha256 = "d2f796ce73bd65263c88a7d6dc65adb2ed89393e85988528f48a7a3844153e19"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/ar/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ar/firefox-127.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "e04d927487b14b26f3d1d6e532a7407823004fd429ba15cfae0fbed61102d993"; + sha256 = "55614e36eb0ae0232355d3cb30d9e92a5cb9688f4f4b0d3a6d4c4f50e42696fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/ast/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ast/firefox-127.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "cbd22cc31dea099ad5a123c545a6909b70fdcfcb031d4a61c244fe3bac49ac8b"; + sha256 = "9275dbbe3f7c70de1a678952b80c88a981b09b552046e9dbd56374f5782378ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/az/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/az/firefox-127.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "4a2fcdc197104af87b950396ff2477e145e175ab1e21d351a31b22b54fdae9c7"; + sha256 = "320f605b88549f87ba681c4f612da7c44e417f4b088e2d2302a8571ff7af3831"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/be/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/be/firefox-127.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "436df5d20e3dc347e244f20a9e33e3976005769f3af7bb2e6e9156d82dec7eb3"; + sha256 = "3e3e3b4dc051f847eda1a9c0a595ed99b34730133c47f4e31967bcc8fb769554"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/bg/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/bg/firefox-127.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "e656b1d0b6b4fd00df717cb93f9558e5b2f833b3d1cb85ca918a0db12abdc7fc"; + sha256 = "79b51cce01b3d45f8ba16cb055e51d916a2fa152cd1c9ba82993a5305d5c1912"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/bn/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/bn/firefox-127.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "0cd1d7cf9cfe819792e129f9f2671d925571635bf542e5f31e361f7b88439328"; + sha256 = "88e0c13b8a4a446e820d3d7bdb8fa0c78a7ab5cde0df91dff34f6a5cfcd8c7a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/br/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/br/firefox-127.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "001d2b23b32e6980bb43d6bdf5b0b2df522fbb1e5936c30e320b0119218c9f79"; + sha256 = "aef8869b56071730b42df7cf77e8323e23b90ced72ea65426c2e0459ac419a01"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/bs/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/bs/firefox-127.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "574c7af72f0b7283b876680dfc3f0d6ef1cf5f22a67652bf4b14893865d71383"; + sha256 = "6b03db27d91ccb544383837f34d53ff5bc20b70fe9175b2c1ff392e28b54c2ac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/ca-valencia/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ca-valencia/firefox-127.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "310795211cb6c9f177eb023559029d94c3296074a01a60476f00f230f57c3271"; + sha256 = "1e7bd2a338efb565efcbaaab096bcc5a8234d453ddb6df892021da74dcf08043"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/ca/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ca/firefox-127.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "f0e52e995945e1e7ef0d524d77195f573bbf2b79e23c8709421dbd5fad4217a3"; + sha256 = "f915d033d90cd92141744be393d87ff763a02b93b0d9019cdb08ad71e8875998"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/cak/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/cak/firefox-127.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "e88eabc82a859f760badbdc576d6757796a3423c68016c65f7369f4d91b627f9"; + sha256 = "8e69658669438c24e29f5cd6ea31109b15b8bee2d65866ee70d891b1524c2df8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/cs/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/cs/firefox-127.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "5b20f7c42f3cb641ac8b0f23f8f6bcd616e4a8a23a2e9f2dfb563dc677159309"; + sha256 = "09d201730514b5217b24ec3c945784eb25196f3bf20edacf3dc414bf6d421e99"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/cy/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/cy/firefox-127.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "680419c5476594baf841fd3771d1addd3f9a3c7aab61093aa90d1183bf85d277"; + sha256 = "d37b0bc8331113539ce1a42ff1e14e7c418461ad27e6fcfedfc2bde668d3b875"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/da/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/da/firefox-127.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "5a054c070fdb6013ea0921e96c7b090f17bdeff184dc653012f56199cb774a36"; + sha256 = "b11404d98763a12d3601c368c8ea3458e596a50c8b28b5a39160a8a65f9821cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/de/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/de/firefox-127.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "8e4a9dda3895b486788dc7559b202d5499370fa13f7be727ea196db798353e07"; + sha256 = "2074038ef968a449ecfc4db5a95daa57d5750e0356af810def7831e0b28820d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/dsb/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/dsb/firefox-127.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "c38ad19e2a36295225cc72a43f2a06ac80fc7fafe9d5a4731d600071e4cbfc32"; + sha256 = "0185438000780f3cdf0fb70ac624ae26d62ff13baaed27c83031a6e80c4b2197"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/el/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/el/firefox-127.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "a1b76a680b678781c4922967f09010b95ca9cbc01eb8f81f186d3c99b2d452c1"; + sha256 = "a859650d0c103293d48b7faf8b5f147d93d85f8e6d0a0837d4a770815f5a772a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/en-CA/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/en-CA/firefox-127.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "cc91c17f01b3a4c7ec64ba133d9eae14507561cece039c036c18ab29f6d76df3"; + sha256 = "7c2ba78c44ddb5766d3a243955e7f124860d66a08c3c9e8985e05828fa8bd8b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/en-GB/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/en-GB/firefox-127.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "18d7bff5323c6f2b2e175652df6f9518063b2798acf717366ceb45903913aa22"; + sha256 = "ffa47fccaf562c5b9283c62beba604613da8c14ee2a7bdf3b02369a08907d852"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/en-US/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/en-US/firefox-127.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "d2f391868b71050d41812da58deba10e68d5340e69a1bf03e9ad632e6d0b8fbb"; + sha256 = "1e6b9cad1a6082b75a0aa8f27c0031a09c7b4aef0a2dc42b66d78e319ca45592"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/eo/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/eo/firefox-127.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "ac69d1b9df9c10085524eb444dc7ee9347f719c838b8ac04fb782a93b898789a"; + sha256 = "704a7bb203752638e637857fd1575bf780c811b202f3d915132fbd140aadb5c3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/es-AR/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/es-AR/firefox-127.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "14c8f95c212dbd6871604f6ad2194e6e7e7c468130a8ab3e67907f6c12471b03"; + sha256 = "ec556966e0cc3baf26bd69bfa8fc95d05a5ecf327b51f5d413dc75e8d57abbe8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/es-CL/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/es-CL/firefox-127.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "c3643857cabafe59f0b155b5b6c9378d17302115114d884232ee56c517d57363"; + sha256 = "2b3428d8df4199f57cae938e2042b07c87bc15fae08b4c6f9320a93cc2accf10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/es-ES/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/es-ES/firefox-127.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "e494e5d9bc6acd013d403c6916cf357c228fa00f022a63959fb45e722173df0a"; + sha256 = "2d763335b0a440b486d3a7787ed327f76a8dfb793dfcae4c011865af229142cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/es-MX/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/es-MX/firefox-127.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "97638fadfdcb4e0da1cac7890caa82f0feb9352d194709c383a054a60ad41e15"; + sha256 = "807a5f264e10bf2d7b7f402453f59986ec9388e81daa1226e6c3c57fce600591"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/et/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/et/firefox-127.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "69f1a578a71777ce314a83ee4851db41d0cf9ccb5363927e123859e1eb153805"; + sha256 = "6d345cd400c33a0abf0ef84133dc758043dc6456c1685399ce008636d0c0c317"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/eu/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/eu/firefox-127.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "8232f5706a4392f88082c01c3c1c45bafe9a3781886195da3ca2d6e44f1de756"; + sha256 = "e2b892bb928ece432b234b5fabb6ef4c5d87beffeba5052ba760f1459d611794"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/fa/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/fa/firefox-127.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "abc6d07cb24e203e643ecc10590cd84acc522b8b282cab82684426ef46fe3dc4"; + sha256 = "a0437c04c9ecf5620da2c680430cfd45c23e2507b83f7fc564ba6b8702b5b652"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/ff/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ff/firefox-127.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "9a0e84a6b2407aa4e17b18e97e453782ca75eff53177e7a01c3868c9f50d7973"; + sha256 = "0b94d624b691d9db36e7fa5773e9bee515361f2e5400f34b7eadd181c37ad8bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/fi/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/fi/firefox-127.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "5f2a4ef27dc4baa56f2f69a5d9c9b974f88d49b9391e962701238f43c814478a"; + sha256 = "54cb7a05dcdcc1ad0a87f232d55a2833e4e21282035d92b31f8268190cf2ccf1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/fr/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/fr/firefox-127.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "538b4c51a3d2ab095c393d5f27ba51f9d23838bb1854bd4efd93968987a6eb02"; + sha256 = "48457fff8307cd2b1066448b545c1971cd084109a27203f660328560dc739e7d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/fur/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/fur/firefox-127.0.1.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "eb742e0172876a437f7b2a7123dfd5c5ba0a204c41ab2b51fa290afb9b4fbc5d"; + sha256 = "2f4b6400b06afa4d80f4c7426914775816f775502d087a75d8b6ac87b8e69242"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/fy-NL/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/fy-NL/firefox-127.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "4ee71afb5102b99fcff8185b60df6cfd2b79de13690444a4fc9468c8e31fe99b"; + sha256 = "f3d68d1caeee683cdfbd8bb64e621c2f73d727ad92f4f0f7af916268b5455e3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/ga-IE/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ga-IE/firefox-127.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "9a3a842fcd7d497d8457cb48e58d716d8d0126b1b378c17cf9e81c6d774f190b"; + sha256 = "97b4f549e6c1f20a81728f5a839f16959d17ee4e6018fb21118433caaec4387e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/gd/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/gd/firefox-127.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "f55e75f5762fe6693c476b87fc4d1c318263c432637d22f7457483c86b1c6751"; + sha256 = "61c767f4f08cec1ff08010b05c917fba22fea771ee15b82bf2196037d2b75a4d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/gl/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/gl/firefox-127.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "daa4f1347214d86cd1cd5e8e6497c24c264c550467bc6c1aec843cd6d6b55764"; + sha256 = "f6376af7b2b56a757a06c38d4a5974c8001ee765c2bf0e5900351a99d9a57689"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/gn/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/gn/firefox-127.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "7a91e3ba0d5f959c508ae75764c3b70e745ed2573205c6ad1b2b1849a3a65f0f"; + sha256 = "4e9014c87d79bfe6243271a1ee7a8c728bab79420dfe8ca92ba310757d0a1c05"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/gu-IN/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/gu-IN/firefox-127.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "f15cf10e242bfcd9683a90518e5e4778e855dfc06b6455375db05e925d443e2b"; + sha256 = "a6b122c076fdeb82f5bc532352f0387876f9edd767cb99a5447347006b001862"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/he/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/he/firefox-127.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "8d0d230368469d683903bbdcfdd4fca52d62a0c39e1205eea31b4dbe138559ee"; + sha256 = "79c827200537fa42597d0f932a7d68ee8779bfec1d18728539f1a7dd5192d9ac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/hi-IN/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/hi-IN/firefox-127.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "479490125f61c15e2fc347893313519830cdb1a83d0c6bf6404d6544f8b2471b"; + sha256 = "b1fbe1760f130ab92236eb4a5ea7e6b0d0518b35157f36f4eafc492c3f9cd0ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/hr/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/hr/firefox-127.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "482bb9a934f2b6d6874d81c91e238862a90a5b9e11ad64e003b14b1d7cb49f18"; + sha256 = "72889a867d9421fc73d9d4f180849d805b01471bddaaa6824e93b07896a768b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/hsb/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/hsb/firefox-127.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "5c0423b9f29ccdc401619cd80ef24a70689e76d509c05423e7ccf400be918133"; + sha256 = "48f07c8429a713dd89ca3c0b4d1559f1eb321f6b39a7e0c3e99879af81145fb7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/hu/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/hu/firefox-127.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "4dcc1df8c363719cafbacd361473612e9a160ffc3489bd3d549899abf0da8d74"; + sha256 = "34d359ea9ff40e7769836aa9738a44d9ea3a4a56d1f24cd3c131377b3c643c20"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/hy-AM/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/hy-AM/firefox-127.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "1c038cc8d9dc81afd97da69794f15ed4a8d87c9f55e622e1cacdd7e2f69d3d24"; + sha256 = "81ff340957317c3e897802270cc518a6958498cd0d2633ea05f8dcaa47f160ac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/ia/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ia/firefox-127.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "303dcdd16f0dd88456eb7eaa6671df495750d33c2ea4e3b1168751d969aa7ad1"; + sha256 = "774377bf071b1b9d8f7fc04bbe3d654d03a4f42aff49703d1ec1c385a95c19f6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/id/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/id/firefox-127.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "b514527f797d3acca79046b731d683c607fc7b74801b0344c767d902168122de"; + sha256 = "5f487dd5c6a71c89d6064b77db21fd114e3d7cc0ae0286d2aadf595f32ecb7a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/is/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/is/firefox-127.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "e4bacf44d55ae749539808a14d4690035e3494f84fd2c4e49d06c9b7771775ef"; + sha256 = "d3ff61dacb107101e468d4409a9a3775e10263580a8b494ca49e7eb633d5a569"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/it/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/it/firefox-127.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "3394fc0f5a64582b19378666ee994fe6940f28ad0a88848f5d57e58728748bf0"; + sha256 = "3da83fff962bb1d9e6bae213fee223b3dc5929ca6ed69e837cc645038eefd950"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/ja/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ja/firefox-127.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "35e4a37609fbbfe18f7971f8f5baf0b730f5e90b731db8e100a7de6b33dece64"; + sha256 = "95a398384cb431048fba43f4651e7590433566ee8f2d7ab45c1d451cec554fd0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/ka/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ka/firefox-127.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "151f984f59bce5885efc1a141f9e8488320e53566d94e62e2ba440af00c95cf4"; + sha256 = "bbf9f1a734548b1424328190c69f82e2d07527dd89b5e79555751496420e30bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/kab/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/kab/firefox-127.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "6ec14cfb56b2ab642d40f5b9b78e890785d1fdf81855f3a1dbffccc423f9c43a"; + sha256 = "fc1d3bd0bfb8ba3469d5524e3339f8ecc28e705a29b39648d45727a9f174a55b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/kk/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/kk/firefox-127.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "faae650197e2babfbdd877a4b4bf3c17d60c8e24ef1763704100e2f35e31164d"; + sha256 = "a4776c548c0101794fba033dd5cf75c81997431ba3e34ea68875d5cf60b38851"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/km/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/km/firefox-127.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "b2cbdd37e6dc00f37399b93a4a804431020fad484295d28263795fa04708eec7"; + sha256 = "18b272504c1dcc6b4019645ca3165653d7461ac8b2eeaa2d207f1bc158c383c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/kn/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/kn/firefox-127.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "3bdb8feb65bb3dca3cc141bf2790593215feba8f6871f4e824887e257964b07a"; + sha256 = "bfed658aad6e2575d348798a227a233e66cf39e85e4e4f66312650d6190f6016"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/ko/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ko/firefox-127.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "1aabdadd8ef63a57355bbbe14c6f9e8b6687cf0e4adbd91cc7d23dc77a191457"; + sha256 = "6284657e60f24a5b34646c88918d67f52d8687da42f4c475bfbf1fe0afa8d524"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/lij/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/lij/firefox-127.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "95e057424b26d593b25ac5ad93b1bc01b54dbd2b75eb53e642e94ae62fb7f64a"; + sha256 = "2041aca3beed2a7090b99bc5aa83596d83d8039127b266f905602a32cb63c690"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/lt/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/lt/firefox-127.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "aef4dc9f10044387438287b01ee036f050a43186910c69043187306842f56151"; + sha256 = "a66df9b76bd7b40fb26b4dfd994608ff539bfb7827624c27cff69ffad0c7ba8e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/lv/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/lv/firefox-127.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "6a7bcf3be7f2e31df3784fdee5925d45c0338504a2041732b94905c2b6c81fd5"; + sha256 = "aa5cdab8803d15e893c3cdd2a4eca2e765920809d628e7e51d8478de3253951f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/mk/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/mk/firefox-127.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "0e8953d140b22c5ce1fe97dc4b1b0bea5784d5a13f7afb2860ce91c96b9b4e36"; + sha256 = "697546a7551cc1e75f2dd82b152c570220def47db1a74ec5ee39f22487983b8f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/mr/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/mr/firefox-127.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "6e2f6b716b1c82f1567d223390bbc5b46b1de85d69ce2cff5b4a67483c8bd6e4"; + sha256 = "c7fb05edd5ed4b3e73b4f9df701ccc87bd2ff608c9365aae92bd2ab32271cfaa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/ms/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ms/firefox-127.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "ea49a7871622b3b45864f3734b08685db41b5b7f3fcd6cc20ae0de45751b6f59"; + sha256 = "cc6ebd7d7238798cde974e1ae493245f5d41ab14e6bc84f56fc44e42718efb39"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/my/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/my/firefox-127.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "c985d9a33878178050215e9342ebc351f4069a9e8a7ca5751afd650a5cefd21b"; + sha256 = "7beec8da14f4920156c7a9d6a140bdc06c5a3dcac8c6151750b9c102f47cc335"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/nb-NO/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/nb-NO/firefox-127.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "04b9e5bca9e82adbcbfe1ce16254f3a031ff550506d6198e67adb24577abe815"; + sha256 = "7e700961054ca2d953fa839d948293854cc02d5e1dafa252ef7edc3bf52026db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/ne-NP/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ne-NP/firefox-127.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "76772cfb43b883aba67f8bc9d1c45162d6fb1f871a6cf39c4196059d19f9f481"; + sha256 = "ac5c875d87853a5d017b09641d828aed7ed3f1a6d35452c63ad222378fdd0368"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/nl/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/nl/firefox-127.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "06dbae89fd74fec804c3e3a3d880a0a5b723d8e7895b7a754a811d128dc671ce"; + sha256 = "01d1459f0bbd32d2e61c35602535c0d90e219a55de9ef80ebe5f0d208fd52c3e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/nn-NO/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/nn-NO/firefox-127.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "f8d90dfc0d3b13b8bbcc02cf7b1dd3e6efb4e540447436874d63994296b3e655"; + sha256 = "d27f03bbf71bba943a8ac8f0c98493fb8fa1007c249b3385f10e6e38b739f36f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/oc/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/oc/firefox-127.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "8379b443f50a7de9df417ad25873cd4f9bd8a1fc7e3273605e78688a319ba241"; + sha256 = "f3daf530493a9ac873c439bdc74db1ae9d54fad808c960334f948c531ae43306"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/pa-IN/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/pa-IN/firefox-127.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "bfb88cca38f2f4b44d701125d56c20bde3e154a38a69f435fc947d0140b60ef7"; + sha256 = "5e04e0ceea94afc0e1e605322db7580cab1e990de1d337264eb27c3ed07a2fab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/pl/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/pl/firefox-127.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "0206805fb238a076266e4e5dc159c7c198549d469b9a5516aabe588b492742f0"; + sha256 = "cafddc502157e74e90f8fba5f46c9aa69bccb2c0bfcf23378452cc0307e09204"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/pt-BR/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/pt-BR/firefox-127.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "9997507518494eb7261aa42ebca71f7f8efae8f814d723ddad33f63f4c3e63ea"; + sha256 = "f671ed2a8e9c50487db012eeeb8fafc92a4751dfd5c583a654ee84638352c1d2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/pt-PT/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/pt-PT/firefox-127.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "21fe7960b70f2bf1ebbdb3b54bef7eac935f1116813d10f3acbb4614c9eff966"; + sha256 = "ce23166b61ba00a56a6691c8ab073983523fcf949fef01c1c468a7b190a260f6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/rm/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/rm/firefox-127.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "1cad7415502780fd6c1525a90348a2d68548356f1264305e5d3d8eef8bf7e43a"; + sha256 = "ddfcba1b9992e8fb03ced07ace63adc34bb26076ebb838f188bf09bb6ab0b3ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/ro/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ro/firefox-127.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "12a48d090a099fd535ccf4ea7ac1e3cfdc3abb8bdd45d3b9977657f0b6b3245b"; + sha256 = "34a268c70aeae57e2ad079ea26da84746c8d19dd0f0d3319a22c697d4ae78adc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/ru/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ru/firefox-127.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "226a5ab69121e01449d1d50542deb2d672113edd6b431d861dfd42cd384afb05"; + sha256 = "9536e8df6d810ce925ee032f2a297ed7c66a6cec12d743092bd6e6cff8f208fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/sat/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/sat/firefox-127.0.1.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "77d65423836ffd810f885b44a701d167aac8a82e210166e8fcc8814836c658b9"; + sha256 = "0a22b550ebd4620753e3151df23c5161eebdb6ad006cf7af5c9cc48153c0a0fb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/sc/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/sc/firefox-127.0.1.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "ea7a3b13e6c6db344b528f80b02a8e49864153d52d35dbf0951bed89dbd168fb"; + sha256 = "a1bee2a69bf591c9b7e802e5eb2f115b27b02c8168ed6e81b80aa3952669789a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/sco/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/sco/firefox-127.0.1.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "2b08c3828f6c60787f5c0b4118ee8845284f810d65b63356fee773a1141308c8"; + sha256 = "3daa935271e5c569b7d8a115720c13e1366185a89da15680396587823d7f3dce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/si/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/si/firefox-127.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "a772957a055a207fd87eb7bc938e9f12cacc5e9b968fd84e69070647762726af"; + sha256 = "2cd15bf9a72b3480a2bbc85b6e5119d873dcc428e1f5b67eebbb67513743b823"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/sk/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/sk/firefox-127.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "e24ea5be3877a03a20131a3220253f32070f63ffe3fe84eb9fa45a4ba043ec43"; + sha256 = "38b73f9ae7127e85ab6b86798eb16294281a8aff356bc3a2e73374ec0d81639d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/sl/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/sl/firefox-127.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "b8fa2913bb80292a4481c3d8c3e02189611f8fecf55ac776e75c7e972fca53cd"; + sha256 = "77b7d3874d4fba89d09de9daeeef67a7dcad39e0a6d210a8c862f549bcf66e47"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/son/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/son/firefox-127.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "e945cc19bfdd639b11b0b600396bae3c145771ece9ea032fab73a15444647418"; + sha256 = "5c44abd114aa9e72e20c33b672801169676cc109798404e8b810ac3ccc472bdd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/sq/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/sq/firefox-127.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "f5d83f55b86aef5d66129b6a9952589b272b3c4cb75368fcff0d9eb80885777f"; + sha256 = "32234c70aba6c5c7e0b9dbd712f63d8e59db130ab4ee8d71dc349997bd018dd5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/sr/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/sr/firefox-127.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "25f53f64f8b9e55a71eee718db717742b2782bdb22c3d4414184f4a0fff04f71"; + sha256 = "f2cdaaf86c87c988222b49ce2029ed95a160313475c72891d404bcb87368c419"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/sv-SE/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/sv-SE/firefox-127.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "46dcdd32bfe8a1cbaa22c8cdecdc79dcd104bf2bbaa7af416362e5212d24bf71"; + sha256 = "99beb21876bf87123f21b4dc5dd7bb77cc181b86359abae4c45b6749e804170d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/szl/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/szl/firefox-127.0.1.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "6eab9180d14d3bcc59fb3029cfca1211e8d244e94d55f1131d2bf65ab2736860"; + sha256 = "12b10f010720db1034207dbda6fbbfc637f7ed60aae2298ea710d3d2db2b9658"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/ta/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ta/firefox-127.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "923edf9ee0a0a57494bc2856efcb9815465e5cd549d5e3f69edec0cde09ea13b"; + sha256 = "c3eeb79eb2e7b7a0dc4951dc9b54b25153c478e9ca86050cbb57e213f5b4037a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/te/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/te/firefox-127.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "26f7571791202b8e9ee87bc5fdbd7c41099d6c7d93f762ba078035162aea9fd3"; + sha256 = "9d32807aa8fed63486fc821b61732206a5e6b1478027bdba68ae46591b165186"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/tg/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/tg/firefox-127.0.1.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "89531acfe914e4dd07dc4406e0c588bef09a274bddd9a6da2c122e3a90955b12"; + sha256 = "5168ba7ba0ee6d0b8452234e2cc25529433d0a34eec04b48c43d19358238ee25"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/th/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/th/firefox-127.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "398270100ca87f052f06a69c786672a740bf36900ac6f5e86d6a97e58a8b7bdc"; + sha256 = "6066b46716c3a0da86e8342597dab33b28ff8a9b02ed5dd2c5ebad0014aa29b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/tl/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/tl/firefox-127.0.1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "cca423014dab68d00b1292c56c2aaf824af624a30a1be749b60820cab048feca"; + sha256 = "b5a33ebe340aafad7fc4c8dff21f947ada60c517c873f96ea659dfd685e79f72"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/tr/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/tr/firefox-127.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "1ee62a698b4fa75eba97e0ec8a09b719e54d75f8232dd4b42fcaedd560bda5b5"; + sha256 = "52b7df2f462ddaa82c3d2d04e7135fb5ce5f18802bd095dbd98b51d52161d113"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/trs/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/trs/firefox-127.0.1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "17c4f71bb68e66f4fd214fda0166e8155b93cb8a146fdfba18aad558440637bc"; + sha256 = "2f98be6cac9542efef5c0b8404143afe46beb90c702426dcd9b4bf15d8b3560b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/uk/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/uk/firefox-127.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "514095b6355d693712e0116a20d574fd9a038aa5ba86d5639bf6e5c0162de82c"; + sha256 = "f5285b7a5dcefd46717cbe5bbbe9e58b6197ace0ef77a3c6bd4e9661cd49c6d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/ur/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/ur/firefox-127.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "f3b3bbf08a9ff53ae69ff5628c348e95395d79604de91e54eebb31f46e7875e5"; + sha256 = "2f90f140ffb61f3990bed58bfa238aeccb7b4bc9364b3fe892adfedfa1eb1b08"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/uz/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/uz/firefox-127.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "01d433fde589aa3d59153bb3b24f16d622d1856a93f89e436fe96d13ae6652dc"; + sha256 = "6efec5797d0e1cb0ef5971d5de550029a507ff8337d3f33baa14ad6cde638040"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/vi/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/vi/firefox-127.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "ab6eeb62c245a2f65f67e155d838cd63d0a01d52f2dbe6aa6fea71b344015f23"; + sha256 = "e0a9d3a491019eca75690c814943c326cc3403d1fda9321c7103f38e343a9338"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/xh/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/xh/firefox-127.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "e364bc82c577582f453fa020a9e807e290fb29e6112cfccd76277f6437497890"; + sha256 = "ec0e2949de14be425f8d621599a710d1b9e17d0dfa657693f3ef15c599dffa7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/zh-CN/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/zh-CN/firefox-127.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "d73dcc173856e93246692b15ec8bcef5a55db927498d38ac42b67dfc135724fa"; + sha256 = "769b437188b4b0869ee385e74898598e07c98b251a948f7a85dd970260540f12"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0/linux-i686/zh-TW/firefox-127.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.1/linux-i686/zh-TW/firefox-127.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "2b088c518a8d1eb3a430384ac94ad37f2f8cbc5255715c2b9f75966985589392"; + sha256 = "0ab4ae5fc776cf44b88237fb84c5d13e4676bf330c07bd8d1b3a1d220d12292e"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index e0c1f218c1e4f..c34124cfb1b1b 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ { firefox = buildMozillaMach rec { pname = "firefox"; - version = "127.0"; + version = "127.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "5a17bce357e7f445c37540115f2c131ad5a055c0cf04f20bc2eaca18f8d241a99ac76739d172b38f2ad2681633f901a0a15893801082ac5db9e20e31fc8b8291"; + sha512 = "13df770a89b703033601cab56892a2fc62427521936b366893008e68cd1f48d7b18917a3cede23764d024208819037ad0d28c2d4b73b99fdc204cbd53bb1297e"; }; extraPatches = [ @@ -33,11 +33,11 @@ firefox-beta = buildMozillaMach rec { pname = "firefox-beta"; - version = "127.0b2"; + version = "128.0b3"; applicationName = "Mozilla Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "ce3bb42674fb5c820ce46a1f86d482d9c7631f1e0f31fe63c0813436cb54b3bbae9b53f397dc6cfc48b28682f720bfd042bb68715a3c653046870f2d50e9ed04"; + sha512 = "d2519052244dd6d5cad39afcf78e86b17e5f1520f3f182db123997f8d126b048cd6862e92558c8f112224c951f706ccf1ccb2cb19b5221d4a47bc7154f562ab2"; }; meta = { @@ -62,13 +62,13 @@ firefox-devedition = buildMozillaMach rec { pname = "firefox-devedition"; - version = "127.0b2"; + version = "128.0b3"; applicationName = "Mozilla Firefox Developer Edition"; requireSigning = false; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "109e834e533db1a815151777170cdc0617a1f725ce8e5af04e63ac9e874edb22a33d51f2d85fcbb0c4132c3884785a54f6ea0ffaf7a0cc764e033fda311c48d6"; + sha512 = "b1313d35218adac5b81059f605b788188454f064c3192a6bb91a7c7b361fb2e087ac49177c48f23de517551b563489adfc7486bc4e6b95e5ae4aeac49aa5ac97"; }; meta = { diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix index 9541153d8cc1a..ff36607709bc3 100644 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -7,7 +7,7 @@ ((buildMozillaMach rec { pname = "floorp"; - packageVersion = "11.13.3"; + packageVersion = "11.14.1"; applicationName = "Floorp"; binaryName = "floorp"; branding = "browser/branding/official"; @@ -15,14 +15,14 @@ allowAddonSideload = true; # Must match the contents of `browser/config/version.txt` in the source tree - version = "115.12.0"; + version = "115.13.0"; src = fetchFromGitHub { owner = "Floorp-Projects"; repo = "Floorp"; fetchSubmodules = true; rev = "v${packageVersion}"; - hash = "sha256-9EDTVckSqv/nyDi4qjMd54I69WiqM8v6om7zQLT+pQc="; + hash = "sha256-PhI+hIypPF6W5RJIXhCAXblSJNwgYavfCgdQozDSXG0="; }; extraConfigureFlags = [ @@ -31,6 +31,13 @@ "--with-unsigned-addon-scopes=app,system" ]; + extraPostPatch = '' + # Fix .desktop files for PWAs generated by Floorp; they hardcode /usr/bin + # https://github.com/NixOS/nixpkgs/issues/314115 + substituteInPlace floorp/browser/base/content/modules/ssb/LinuxSupport.mjs \ + --replace-fail /usr/bin/floorp floorp + ''; + updateScript = ./update.sh; meta = { diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 147eda18aa9c3..c52cb3f44fad7 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { beta = import ./browser.nix { channel = "beta"; - version = "126.0.2592.36"; + version = "126.0.2592.53"; revision = "1"; - hash = "sha256-u9gcTjener35uKt99T27+LK0A4SYNdWCW5FSHWEnaNA="; + hash = "sha256-d1zqZUhk5C/jrdZngQQlGplrSssE/LUR3/AybStNavE="; }; dev = import ./browser.nix { channel = "dev"; - version = "127.0.2620.3"; + version = "127.0.2638.2"; revision = "1"; - hash = "sha256-x5reGA7XZTN3FsCHf7oXstltCDSVANR8VegIuO201qs="; + hash = "sha256-Bv0X30ilcNBI9pblnrO1QA7ElTPMO5/JmIZIjhldO7Y="; }; stable = import ./browser.nix { channel = "stable"; - version = "125.0.2535.85"; + version = "125.0.2535.92"; revision = "1"; - hash = "sha256-4GD/1jAw+nIwI5AOwrkuPNF5zAnnzje9oEQnaHOapPg="; + hash = "sha256-DuVz6+BzGTWZJ4smizIK2dV1OTmv0uTIQpD+yclHDN8="; }; } diff --git a/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/pkgs/applications/networking/browsers/mullvad-browser/default.nix index c641a4cc37956..08385de1bff2c 100644 --- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -90,7 +90,7 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.0.15"; + version = "13.0.16"; sources = { x86_64-linux = fetchurl { @@ -102,7 +102,7 @@ let "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-TypPevAkp1G7GPzBTRUv3N4UJydAqfllNekTsYfiisQ="; + hash = "sha256-+8jur2Fc+fhrWO9xyaSuwzUZnLLhTP/uz15+EX6E7K4="; }; }; diff --git a/pkgs/applications/networking/browsers/tor-browser/default.nix b/pkgs/applications/networking/browsers/tor-browser/default.nix index 2aa01bfe1b960..508946278f923 100644 --- a/pkgs/applications/networking/browsers/tor-browser/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser/default.nix @@ -101,7 +101,7 @@ lib.warnIf (useHardenedMalloc != null) ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.0.15"; + version = "13.0.16"; sources = { x86_64-linux = fetchurl { @@ -111,7 +111,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-e2YFrPzle9s/j3+uxFjoK538pLV1u1a4kD6V8RaqpOU="; + hash = "sha256-gSV2G9U0fh+PAe/vCInIjssBFk0ciiD6h0rpZUxVzs0="; }; i686-linux = fetchurl { @@ -121,7 +121,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" ]; - hash = "sha256-20C4UuSN2PZ2L3AZv7klNClD4RoThpmnKrpoK9An24w="; + hash = "sha256-Lh9rHrqX+eeQ47Z8e9ChRH8qWeDwSbyR5TnNfwHAb9M="; }; }; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index b974b235dfd37..4b97d01e9d4b2 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -128,6 +128,7 @@ in stdenv.mkDerivation rec { homepage = "https://vivaldi.com"; license = licenses.unfree; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + mainProgram = "vivaldi"; maintainers = with maintainers; [ otwieracz badmutex ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; }; diff --git a/pkgs/applications/networking/cluster/argo-rollouts/default.nix b/pkgs/applications/networking/cluster/argo-rollouts/default.nix index ade1527b6e426..60d3be84451d1 100644 --- a/pkgs/applications/networking/cluster/argo-rollouts/default.nix +++ b/pkgs/applications/networking/cluster/argo-rollouts/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "argo-rollouts"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-rollouts"; rev = "v${version}"; - sha256 = "sha256-WJ5vIfQQguwjInS5p+bUYorM90MUAbH8endV/nkgQ00="; + sha256 = "sha256-b1oaLVwom06XUCjMF3/O/SdLt2s0MFuF+et6+MO2jBQ="; }; - vendorHash = "sha256-vBSS1KMfloK5pvVc8nHE5B8PsVZTS/iA9GyrLaeR6ps="; + vendorHash = "sha256-38BLPNc6en70+UxlldmrwtRTMRLh/fCPL6FtuA2ODGM="; # Disable tests since some test fail because of missing test data doCheck = false; diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index e66bfb0a9a10b..61bd14cdc45b7 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -34,16 +34,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.5.7"; + version = "3.5.8"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "refs/tags/v${version}"; - hash = "sha256-OJkC+uqOuXA6NBpVxmQAFs+N99d4Zonh9dcZnuB26Ts="; + hash = "sha256-BYUP/Gu+N8KK9mfjRAXupXqrwfZMZlYPxxuZCmUDFfE="; }; - vendorHash = "sha256-O7Lv5RLcqB4JbdXHKXFWkg/dvids8QH619urpeACuN8="; + vendorHash = "sha256-pVOTeH6fq4Gqarjvi7w2wYJ3FSqV6yNZERmOmbVGxLM="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 9eec21e4d1ddb..aeac7254ef017 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.11.13"; + version = "0.11.15"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - hash = "sha256-mXT0/cDfvzE9fBCy4rY1epeOolXmc50QNNXSn3bHi1I="; + hash = "sha256-tfJ9LTPu8B6xlIkAKmbl2d2GLY9p4VcOQGOC5TTx9Cs="; }; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index 6ae9b8eef5a1d..7ea0c3c6905b7 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.16.9"; + version = "0.16.10"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - hash = "sha256-aER0VLYkHV0mPM4uBaKLPVmQ+Re5KUm8/01l87wMnF8="; + hash = "sha256-SgAqq9tT4Rtg1AvoUsDvR5cCLIOuHwNUFN2NOheciYw="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix index d5079b36886f9..9ea1600bc06ae 100644 --- a/pkgs/applications/networking/cluster/cni/default.nix +++ b/pkgs/applications/networking/cluster/cni/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cni"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "containernetworking"; repo = pname; rev = "v${version}"; - hash = "sha256-32rmfBjPtc9w+B8PIb8sFOIlzZ7PnS6XSZRNLreMVl4="; + hash = "sha256-aS7THDTpfNQPw+70ZgFzvurpq/vMKE6xSxJ19ERbtOA="; }; - vendorHash = "sha256-JWaQacekMQGT710U5UgiIpmEYgyUCh1uks5eSV5nhWc="; + vendorHash = "sha256-5VsJ3Osm9w09t3x0dItC2iWwbPMf/IIBOSqUfcbQKK4="; subPackages = [ "./cnitool" diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index b0cd31e9de019..830ef080492b2 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cni-plugins"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - hash = "sha256-gJp1w2H+hPSSu1Y4BY9Sa8lLnhpiZJu2Dz9OenYlQFo="; + hash = "sha256-Veuv7DwwnSUnz2p5gemqQB9pr05nLLQ6gG4JvqFbZ/U="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index 4058bcee9c302..7fe23d3709200 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "jx"; - version = "3.10.146"; + version = "3.10.150"; src = fetchFromGitHub { owner = "jenkins-x"; repo = "jx"; rev = "v${version}"; - sha256 = "sha256-cbf/prSKHiu4I6w08j/HLD8c7Lrgt3eTC5QRVvuhS5w="; + sha256 = "sha256-Zck06wbe+hLbecFnfY/udi1s712ilt7j0EdoumohOEI="; }; vendorHash = "sha256-AIaZVkWdNj1Vsrv2k4B5lLE0lOFuiTD7lwS/DikmC14="; diff --git a/pkgs/applications/networking/cluster/kontemplate/default.nix b/pkgs/applications/networking/cluster/kontemplate/default.nix deleted file mode 100644 index 14e75829e401c..0000000000000 --- a/pkgs/applications/networking/cluster/kontemplate/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "kontemplate"; - version = "1.8.0"; - goPackagePath = "github.com/tazjin/kontemplate"; - goDeps = ./deps.nix; - - src = fetchFromGitHub { - owner = "tazjin"; - repo = "kontemplate"; - rev = "v${version}"; - sha256 = "123mjmmm4hynraq1fpn3j5i0a1i87l265kkjraxxxbl0zacv74i1"; - }; - - meta = with lib; { - description = "Extremely simple Kubernetes resource templates"; - mainProgram = "kontemplate"; - homepage = "http://kontemplate.works"; - downloadPage = "https://github.com/tazjin/kontemplate/releases"; - license = licenses.gpl3; - maintainers = with maintainers; [ mbode tazjin ]; - platforms = platforms.unix; - - longDescription = '' - Kontemplate is a simple CLI tool that can take sets of - Kubernetes resource files with placeholders and insert values - per environment. - - It can be used as a simple way of deploying the same set of - resources to different Kubernetes contexts with context-specific - configuration. - ''; - }; -} diff --git a/pkgs/applications/networking/cluster/kontemplate/deps.nix b/pkgs/applications/networking/cluster/kontemplate/deps.nix deleted file mode 100644 index 7693968bd550b..0000000000000 --- a/pkgs/applications/networking/cluster/kontemplate/deps.nix +++ /dev/null @@ -1,111 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/Masterminds/goutils"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/goutils"; - rev = "41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0"; - sha256 = "180px47gj936qyk5bkv5mbbgiil9abdjq6kwkf7sq70vyi9mcfiq"; - }; - } - { - goPackagePath = "github.com/Masterminds/semver"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/semver"; - rev = "5bc3b9184d48f1412b300b87a200cf020d9254cf"; - sha256 = "1vdfm653v50jf63cw0kg2hslx50cn4mk6lj3p51bi11jrg48kfng"; - }; - } - { - goPackagePath = "github.com/Masterminds/sprig"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/sprig"; - rev = "6f509977777c33eae63b2136d97f7b976cb971cc"; - sha256 = "05h9k6fhjxnpwlihj3z02q9kvqvnq53jix0ab84sx0666bci3cdh"; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "fb15b899a75114aa79cc930e33c46b577cc664b1"; - sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "c3de453c63f4bdb4dadffab9805ec00426c505f7"; - sha256 = "0js37zlgv37y61j4a2d46jh72xm5kxmpaiw0ya9v944bjpc386my"; - }; - } - { - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "25d852aebe32c875e9c044af3eef9c7dc6bc777f"; - sha256 = "1w9yq0bxzygc4qwkwwiy7k1k1yviaspcqqv18255k2xkjv5ipccz"; - }; - } - { - goPackagePath = "github.com/google/uuid"; - fetch = { - type = "git"; - url = "https://github.com/google/uuid"; - rev = "c2e93f3ae59f2904160ceaab466009f965df46d6"; - sha256 = "0zw8fvl6jqg0fmv6kmvhss0g4gkrbvgyvl2zgy5wdbdlgp4fja0h"; - }; - } - { - goPackagePath = "github.com/huandu/xstrings"; - fetch = { - type = "git"; - url = "https://github.com/huandu/xstrings"; - rev = "8bbcf2f9ccb55755e748b7644164cd4bdce94c1d"; - sha256 = "1ivvc95514z63k7cpz71l0dwlanffmsh1pijhaqmp41kfiby8rsx"; - }; - } - { - goPackagePath = "github.com/imdario/mergo"; - fetch = { - type = "git"; - url = "https://github.com/imdario/mergo"; - rev = "4c317f2286be3bd0c4f1a0e622edc6398ec4656d"; - sha256 = "0bihha1qsgfjk14yv1hwddv3d8dzxpbjlaxwwyys6lhgxz1cr9h9"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "9756ffdc24725223350eb3266ffb92590d28f278"; - sha256 = "0q7hxaaq6lp0v8qqzifvysl47z5rfdlrxkh3d29vsl3wyby3dxl8"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } -] diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index bcd0b78f7a523..5fa09dcb2ce41 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -62,6 +62,12 @@ rec { }; kops_1_28 = mkKops rec { + version = "1.28.5"; + sha256 = "sha256-spw3lTrp6RlxkTNoZ/3Yz/U2tdvBnwiYORS2QtOSX9k="; + rev = "v${version}"; + }; + + kops_1_29 = mkKops rec { version = "1.29.0"; sha256 = "sha256-YneB9pc4IR+tYPRFE5CS+4JK/kPOHMo5/70A3k1x1tg="; rev = "v${version}"; diff --git a/pkgs/applications/networking/cluster/kubefirst/default.nix b/pkgs/applications/networking/cluster/kubefirst/default.nix index 9bcc77663d5cb..7183fb8885b25 100644 --- a/pkgs/applications/networking/cluster/kubefirst/default.nix +++ b/pkgs/applications/networking/cluster/kubefirst/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "kubefirst"; - version = "2.4.9"; + version = "2.4.10"; src = fetchFromGitHub { owner = "kubefirst"; repo = "kubefirst"; rev = "refs/tags/v${version}"; - hash = "sha256-BuGE+SVLklToKnH7pptfuHqwddncUQq523RZtfmtkLg="; + hash = "sha256-EgJ+ymddMsB37ygREwdF6qmGcgJKPz06//dwwa1pXd0="; }; - vendorHash = "sha256-ZcZl4knlyKAwTsiyZvlkN5e2ox30B5aNzutI/2UEE9U="; + vendorHash = "sha256-5UdKjxs0f8dHTzWvHpMbYSCcIqTU5aT5anNVk0O94tw="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index e8af5d6400d9a..08823ff29b0ba 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -20,13 +20,13 @@ buildGoModule rec { pname = "kubernetes"; - version = "1.30.1"; + version = "1.30.2"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - hash = "sha256-nTVjgNMnB6775ubzK7ezOxR5Z0z5PBxx88CxtbxGxrY="; + hash = "sha256-cxWltHCwb01QsIRSieXwYtImrSfvJLBhN3VIJkxOzX8="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kubeshark/default.nix b/pkgs/applications/networking/cluster/kubeshark/default.nix index 1d4c38bdff30c..b888cecc927c2 100644 --- a/pkgs/applications/networking/cluster/kubeshark/default.nix +++ b/pkgs/applications/networking/cluster/kubeshark/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeshark"; - version = "52.3.62"; + version = "52.3.68"; src = fetchFromGitHub { owner = "kubeshark"; repo = "kubeshark"; rev = "v${version}"; - hash = "sha256-mYFjs/6aO7tzopOZij9rNoOu2a/UUQqpDg16gCoeR8w="; + hash = "sha256-GDK+GR3MUYUgfY3cgaxWIYSE3uiEscp9DeeY36/zOYo="; }; vendorHash = "sha256-0WRmAqslZj63m+kCFKIBgoRX47ZyRuU7ZihmF6wmZy4="; diff --git a/pkgs/applications/networking/cluster/kyverno/default.nix b/pkgs/applications/networking/cluster/kyverno/default.nix index 86c1d41d05dca..f9becbdf5bad2 100644 --- a/pkgs/applications/networking/cluster/kyverno/default.nix +++ b/pkgs/applications/networking/cluster/kyverno/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kyverno"; - version = "1.12.3"; + version = "1.12.4"; src = fetchFromGitHub { owner = "kyverno"; repo = "kyverno"; rev = "v${version}"; - hash = "sha256-vJ9HXpvkuZWOZtsoJhcpM0KGGiyd+D5HTQBHwb8l/II="; + hash = "sha256-TVtE1mdOai2G2+KCp9r5G+E9QhGQ5TmUFCN9x5EKM7o="; }; ldflags = [ diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 9fc07b6c19ff0..57d16d577dfc6 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "24.5.5"; - sha256 = "0lgpqx672ics998830y8qklchdmbj272xfbs5r414hqlznbbi8w1"; - vendorHash = "sha256-PV0HbsIcO6FjdczCWJgR6X5THUREDht2R4NJ7HxkBNw="; + version = "24.6.2"; + sha256 = "0qghp8v4lz51yv5j5k8dps4qv58hjdjdc3jzrrq3g239x8b2h6ys"; + vendorHash = "sha256-7Q6V9DKROkSTxU7n511aOpaMDRfhP88p6PJ89Sr6kOQ="; } diff --git a/pkgs/applications/networking/cluster/temporal-cli/default.nix b/pkgs/applications/networking/cluster/temporal-cli/default.nix index fe23809bf5d3e..4bf6a34f1c0bd 100644 --- a/pkgs/applications/networking/cluster/temporal-cli/default.nix +++ b/pkgs/applications/networking/cluster/temporal-cli/default.nix @@ -17,16 +17,16 @@ let tctl-next = buildGoModule rec { pname = "tctl-next"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "temporalio"; repo = "cli"; rev = "v${version}"; - hash = "sha256-rqwDubKNBvtJ4rTQheCoSIcbfQZQN3iD99PcZewmx5c="; + hash = "sha256-2zk+B+GomLZwep5LNRpWJj8JjFC0OxAl1XhAv+8b2kc="; }; - vendorHash = "sha256-bnmlh11gtNdgcrI20gjNqxWB+OQTv0b9lgETucoBaXc="; + vendorHash = "sha256-NLteuVOswIw2ModdE0Ak4XmApkHLoYDt6SDAZGsgwBk="; inherit overrideModAttrs; diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix index 3bef419324d09..3b23b750864cf 100644 --- a/pkgs/applications/networking/cluster/temporal/default.nix +++ b/pkgs/applications/networking/cluster/temporal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "temporal"; - version = "1.24.1"; + version = "1.24.2"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - hash = "sha256-GEmlmVTxQPoKsb9RtS6RcHY/0iDZsj3jG/Les2VPMAc="; + hash = "sha256-hQkus8BZvtR2ObCJbtP2SZST9tRxuPjFwR+jKDYH8Bs="; }; vendorHash = "sha256-u9xQFTwVKEGRPhBwcBgexCQhlNO91yP4m4vchCdBt9E="; diff --git a/pkgs/applications/networking/cluster/tftui/default.nix b/pkgs/applications/networking/cluster/tftui/default.nix index 3bd2c2a138685..9af694c683fd9 100644 --- a/pkgs/applications/networking/cluster/tftui/default.nix +++ b/pkgs/applications/networking/cluster/tftui/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "tftui"; - version = "0.13.3"; + version = "0.13.5"; pyproject = true; src = fetchFromGitHub { owner = "idoavrah"; repo = "terraform-tui"; rev = "refs/tags/v${version}"; - hash = "sha256-ojmq5m2BRB2Jwvg4j4zc0/jtv4rg1OKJpQiUQoBn+s0="; + hash = "sha256-xOlPuPVwfVT7jfBJPqZ5FbOs80HE0k2ZqcA+Jcxh9p4="; }; pythonRelaxDeps = [ diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix deleted file mode 100644 index 58753489ad49f..0000000000000 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ lib -, stdenv -, buildGoModule -, fetchFromGitHub -, installShellFiles -, btrfs-progs -, testers -, werf -}: - -buildGoModule rec { - pname = "werf"; - version = "2.4.1"; - - src = fetchFromGitHub { - owner = "werf"; - repo = "werf"; - rev = "v${version}"; - hash = "sha256-kHNjdwAIGJi1/ryEioRwZIYm4UziT2Ig1y2PgnbA0ZE="; - }; - - vendorHash = "sha256-cWOnIEvVer+USqNQJmhZ7pYSJfzY2xjq2oTxRd/y94w="; - - proxyVendor = true; - - subPackages = [ "cmd/werf" ]; - - nativeBuildInputs = [ installShellFiles ]; - - buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs ] - ++ lib.optionals stdenv.hostPlatform.isGnu [ stdenv.cc.libc.static ]; - - CGO_ENABLED = if stdenv.isLinux then 1 else 0; - - ldflags = [ - "-s" - "-w" - "-X github.com/werf/werf/v2/pkg/werf.Version=${src.rev}" - ] ++ lib.optionals (CGO_ENABLED == 1) [ - "-extldflags=-static" - "-linkmode external" - ]; - - tags = [ - "containers_image_openpgp" - "dfrunmount" - "dfrunnetwork" - "dfrunsecurity" - "dfssh" - ] ++ lib.optionals (CGO_ENABLED == 1) [ - "cni" - "exclude_graphdriver_devicemapper" - "netgo" - "no_devmapper" - "osusergo" - "static_build" - ]; - - preCheck = '' - # Test all targets. - unset subPackages - - # Remove tests that require external services. - rm -rf \ - integration/suites \ - pkg/true_git/*test.go \ - test/e2e - '' + lib.optionalString (CGO_ENABLED == 0) '' - # A workaround for osusergo. - export USER=nixbld - ''; - - postInstall = '' - installShellCompletion --cmd werf \ - --bash <($out/bin/werf completion --shell=bash) \ - --zsh <($out/bin/werf completion --shell=zsh) - ''; - - passthru.tests.version = testers.testVersion { - package = werf; - command = "werf version"; - version = src.rev; - }; - - meta = with lib; { - description = "GitOps delivery tool"; - mainProgram = "werf"; - longDescription = '' - The CLI tool gluing Git, Docker, Helm & Kubernetes with any CI system to - implement CI/CD and Giterminism. - ''; - homepage = "https://werf.io"; - changelog = "https://github.com/werf/werf/releases/tag/${src.rev}"; - license = licenses.asl20; - maintainers = with maintainers; [ azahi ]; - }; -} diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index f69b869835e9b..832133082f778 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "4.11.0"; + version = "4.12.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = "dnscontrol"; rev = "v${version}"; - hash = "sha256-TBLxwHiL3knM+GQoTYD2L/deASPpbUsDlGk4VeVmki4="; + hash = "sha256-W1X/d2Xf31xQWZH7ShH8Y6axhhyTOqxE/EjxNvR6pBU="; }; - vendorHash = "sha256-kmnV1W0HGlxFZYYUeUd9D/zOabUhM5kDoTZTnRYJ2sM="; + vendorHash = "sha256-Dz45h33Rv4Pf5Lo0aok37MNrcbT8f/xrPPkGJMNBo8Y="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 4e28f0750e49d..1c2402f6495b3 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.11.36"; + version = "3.11.37"; pyproject = true; # Fetch from GitHub in order to use `requirements.in` @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-6WZALdKORsa0wahPKgkpzjlktJQxnbiiJLXGv3E9MXM="; + hash = "sha256-bZd/iLEGF5+Zt4kKAvUmjHiPKA1v1FWf5/BEcsLy9MU="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/abaddon/default.nix b/pkgs/applications/networking/instant-messengers/abaddon/default.nix index f28334ffa3c0a..a8db4395645fa 100644 --- a/pkgs/applications/networking/instant-messengers/abaddon/default.nix +++ b/pkgs/applications/networking/instant-messengers/abaddon/default.nix @@ -6,10 +6,12 @@ , makeDesktopItem , makeWrapper , pkg-config +, alsa-lib , curl , gtkmm3 , libhandy , libopus +, libpulseaudio , libsecret , libsodium , nlohmann_json @@ -58,6 +60,7 @@ stdenv.mkDerivation rec { mkdir $out/bin cp abaddon $out/bin wrapProgram $out/bin/abaddon \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ alsa-lib libpulseaudio ]}" \ --chdir $out/share/abaddon runHook postInstall diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 09840fbe61393..ec8bcb5a8d8eb 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,14 +2,14 @@ let versions = if stdenv.isLinux then { - stable = "0.0.54"; - ptb = "0.0.85"; - canary = "0.0.402"; + stable = "0.0.56"; + ptb = "0.0.90"; + canary = "0.0.422"; development = "0.0.19"; } else { - stable = "0.0.305"; - ptb = "0.0.114"; - canary = "0.0.510"; + stable = "0.0.307"; + ptb = "0.0.119"; + canary = "0.0.531"; development = "0.0.41"; }; version = versions.${branch}; @@ -17,15 +17,15 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-ruaotzJ+dvqNUV/e4xpJ1rorGiC4Im57BSSiddP8ZF8="; + hash = "sha256-HpdsvzWtB4AoqZXf7LV0J50/OQDsYgK8bkQ1HGvu7Ec="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-2RyilxldJX2wqKlEcrp6srj0O7UNHMxySRJD1xBfqMk="; + hash = "sha256-75YnLhgNTd7pwpTE9qSIF0rzBwmGJ/CYa+YgN3OQZ2w="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-YE+sHmEkUCHLflSUgf4aotWWdzhbFyzozc3vLcJ96yA="; + hash = "sha256-MTC079WTN0Vw57aLro1WkHRL09IKYjnUsfBAMiiHjI0="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; @@ -35,15 +35,15 @@ let x86_64-darwin = { stable = fetchurl { url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-UEKsweUvtVKXZDrdIYuo3FPSPrnY3ECIilntBs9ZrGU="; + hash = "sha256-FBYxQhtwctMQ8ByOgAVncWh5297k1Vh95w/rWnZg9Fw="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-ahCgJ1aSLL7Mhx5Jjkeuqqlis8gqxHbIhQvlbUK2wIU="; + hash = "sha256-Y5t6ndecfRf3zVfYEvFGiFinQxRSa7VyfnkAors8VPY="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-viWOmu1+6tpzNDN/q0kXRMo+rohOP6/L7ke2EeBEADg="; + hash = "sha256-eMJ/OKi+k92QEk140UW3RIi5G/UFlR6mW9f8kPZbFaw="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; diff --git a/pkgs/applications/networking/instant-messengers/feishu/default.nix b/pkgs/applications/networking/instant-messengers/feishu/default.nix index 67d875ca7a94b..d43320558b2a8 100644 --- a/pkgs/applications/networking/instant-messengers/feishu/default.nix +++ b/pkgs/applications/networking/instant-messengers/feishu/default.nix @@ -176,10 +176,10 @@ stdenv.mkDerivation { # Wrap feishu and vulcan # Feishu is the main executable, vulcan is the builtin browser for executable in $out/opt/bytedance/feishu/{feishu,vulcan/vulcan}; do + # FIXME: Add back NIXOS_OZONE_WL support once upstream fixes the crash on native Wayland (see #318035) wrapProgram $executable \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --prefix LD_LIBRARY_PATH : ${rpath}:$out/opt/bytedance/feishu:${addOpenGLRunpath.driverLink}/share \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ ${lib.optionalString (commandLineArgs!="") "--add-flags ${lib.escapeShellArg commandLineArgs}"} done diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix index e25a94d0bef84..26b0e9c0225db 100644 --- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -53,6 +53,6 @@ buildGoModule rec { description = "A terminal based Matrix client written in Go"; mainProgram = "gomuks"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ chvp emily ]; + maintainers = with maintainers; [ chvp ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 20dc2bfafb800..8a1052d04df4f 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, electron_28 +, electron , makeWrapper }: @@ -52,7 +52,7 @@ stdenv.mkDerivation { substituteInPlace $out/share/applications/Mattermost.desktop \ --replace /share/mattermost-desktop/mattermost-desktop /bin/mattermost-desktop - makeWrapper '${lib.getExe electron_28}' $out/bin/${pname} \ + makeWrapper '${lib.getExe electron}' $out/bin/${pname} \ --set-default ELECTRON_IS_DEV 0 \ --add-flags $out/share/${pname}/app.asar \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 45c7e556a71d3..041a3949d92dc 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , asciidoc , pkg-config @@ -9,6 +8,7 @@ , cmark , coeurl , curl +, kdsingleapplication , libevent , libsecret , lmdb @@ -17,48 +17,29 @@ , nlohmann_json , olm , qtbase -, qtgraphicaleffects , qtimageformats , qtkeychain -, qtmacextras , qtmultimedia -, qtquickcontrols2 , qttools +, qtwayland , re2 , spdlog , wrapQtAppsHook -, voipSupport ? true , gst_all_1 , libnice }: stdenv.mkDerivation rec { pname = "nheko"; - version = "0.11.3"; + version = "0.12.0"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "nheko"; rev = "v${version}"; - hash = "sha256-2daXxTbpSUlig47y901JOkWRxbZGH4qrvNMepJbvS3o="; + hash = "sha256-hQb+K8ogNj/s6ZO2kgS/sZZ35y4CwMeS3lVeMYNucYQ="; }; - patches = [ - # The 2 following patches can be removed with the next version bump. - # Backport of https://github.com/Nheko-Reborn/nheko/commit/e89e65dc17020772eb057414b4f0c5d6f4ad98d0. - (fetchpatch { - name = "nheko-fmt10.patch"; - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/nheko/-/raw/1b0d5c9eff6409dfd82953f346546d36c288a4a9/nheko-0.11.3-fix-for-fmt-10.patch"; - hash = "sha256-UYqAu2iXT3Bn/MxCtybiJrJLfVMOOVRchWqrGuPfapI="; - }) - # https://github.com/Nheko-Reborn/nheko/pull/1552 - (fetchpatch { - name = "nheko-fmt10.1.patch"; - url = "https://github.com/Nheko-Reborn/nheko/commit/614facf93c2b5d6118beb822cc542ac53a883c37.patch"; - hash = "sha256-rjsQNDfj3Lzbv8ow3qiNozGXQFrtYLhArS6a9JCdgBQ="; - }) - ]; - nativeBuildInputs = [ asciidoc cmake @@ -72,6 +53,7 @@ stdenv.mkDerivation rec { cmark coeurl curl + kdsingleapplication libevent libsecret lmdb @@ -79,19 +61,18 @@ stdenv.mkDerivation rec { nlohmann_json olm qtbase - qtgraphicaleffects qtimageformats qtkeychain qtmultimedia - qtquickcontrols2 qttools + qtwayland re2 spdlog - ] ++ lib.optional stdenv.isDarwin qtmacextras - ++ lib.optionals voipSupport (with gst_all_1; [ + ] + ++ (with gst_all_1; [ gstreamer gst-plugins-base - (gst-plugins-good.override { qt5Support = true; }) + (gst-plugins-good.override { qt6Support = true; }) gst-plugins-bad libnice ]); @@ -100,7 +81,7 @@ stdenv.mkDerivation rec { "-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389 ]; - preFixup = lib.optionalString voipSupport '' + preFixup = '' # add gstreamer plugins path to the wrapper qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") ''; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix index 5f84fa7dd9aa8..f982124cb8436 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop-beta"; dir = "Signal Beta"; - version = "7.12.0-beta.2"; + version = "7.13.0-beta.1"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; - hash = "sha256-Hpg9pkRXbwF5uKhLzn1cfHTzlYmsZd5tndtwVFcL7iU="; + hash = "sha256-DvYRvIA+rg4RKXbqWjWj7oFnfLboEiMeP7HgGYkRBDM="; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 7bc13c1f85390..6fdabc3159008 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -64,14 +64,14 @@ let in stdenv.mkDerivation rec { pname = "telegram-desktop"; - version = "5.1.5"; + version = "5.1.7"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-dlPt87SKP17v9QFiRZSSUtSLVGTGbeo05G/p05l2zVc="; + hash = "sha256-OH9+cH5CQyrp4DSKXEMs6csGiH+GAtxJT4P9YidmAcM="; }; patches = [ diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index 8bc0f6f93b442..1889c1825d8c3 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "0-unstable-2023-12-21"; + version = "0-unstable-2024-06-15"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "afd9d5d31798d3eacf9ed6c30601e91d0f1e4d60"; - sha256 = "sha256-/1cghoxmm+6uFEUgCjh1Xhb0CTnd1XAq1M21FruDRek="; + rev = "c9cc4390ab951f2cbc103ff783a11f398b27660b"; + sha256 = "sha256-FfWmSYaeryTDbsGJT3R7YK1oiyJcrR7YKKBOF+9PmpY="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix index c20d8f0a80795..010470c6fbaab 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "Autosort is a weechat script to automatically or manually keep your buffers sorted"; homepage = "https://github.com/de-vri-es/weechat-autosort"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ emily flokli ]; + maintainers = with maintainers; [ flokli ]; }; } diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index b8bb3bc3b2371..a67903c6fe98a 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -99,6 +99,6 @@ in buildPythonPackage { homepage = "https://github.com/poljar/weechat-matrix"; license = licenses.isc; platforms = platforms.unix; - maintainers = with maintainers; [ tilpner emily ]; + maintainers = with maintainers; [ tilpner ]; }; } diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index b662ce400e569..8a26dbb315c74 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -113,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "neomutt"; homepage = "https://www.neomutt.org"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ erikryb vrthra ma27 raitobezarius ]; + maintainers = with lib.maintainers; [ erikryb vrthra raitobezarius ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 1d98adf9a58a6..307a805ddf1ee 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -5,13 +5,13 @@ rec { thunderbird-115 = (buildMozillaMach rec { pname = "thunderbird"; - version = "115.11.1"; + version = "115.12.0"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "1a1f438c7047908788bc983aa681c3293ce02da006477b491a49ced5941433ca3381e01f76afc6bb5572415025acfd0fa657f063ef26b3a63646594c27202717"; + sha512 = "d262ec2cea3fd003e66974b0bd8d61fb268ad2a233e54a6aea4803c5520e235ea308267f0484581ce235063c4fb90e621cdc1eea3f62212574b90427ede1c289"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index 8536cd145f145..78aa173867692 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -5,11 +5,11 @@ appimageTools.wrapType2 rec { pname = "tutanota-desktop"; - version = "229.240517.0"; + version = "230.240603.0"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage"; - hash = "sha256-NVr9OOq5YdqvCkrtjTRIfWWquxJ/sN8MhSlw3RvZVFs="; + hash = "sha256-pgRqlaUbEDEAd4frooSloeiNEX02VESPhqIzRIuQshI="; }; extraPkgs = pkgs: [ pkgs.libsecret ]; diff --git a/pkgs/applications/networking/misc/zammad/default.nix b/pkgs/applications/networking/misc/zammad/default.nix index 350e2fc245297..065749554ea10 100644 --- a/pkgs/applications/networking/misc/zammad/default.nix +++ b/pkgs/applications/networking/misc/zammad/default.nix @@ -17,7 +17,6 @@ , nodejs , yarn , yarn2nix-moretea -, v8 , cacert , redis }: @@ -83,7 +82,7 @@ let }; mini_racer = attrs: { buildFlags = [ - "--with-v8-dir=\"${v8}\"" + "--with-v8-dir=\"${nodejs.libv8}\"" ]; dontBuild = false; postPatch = '' diff --git a/pkgs/applications/networking/p2p/flood/default.nix b/pkgs/applications/networking/p2p/flood/default.nix index 85ef8b2130bba..ada2a69e69472 100644 --- a/pkgs/applications/networking/p2p/flood/default.nix +++ b/pkgs/applications/networking/p2p/flood/default.nix @@ -1,6 +1,7 @@ { lib , buildNpmPackage , fetchFromGitHub +, nixosTests }: buildNpmPackage rec { @@ -16,6 +17,10 @@ buildNpmPackage rec { npmDepsHash = "sha256-md76I7W5QQvfbOmk5ODssMtJAVOj8nvaJ2PakEZ8WUA="; + passthru.tests = { + inherit (nixosTests) flood; + }; + meta = with lib; { description = "Modern web UI for various torrent clients with a Node.js backend and React frontend"; homepage = "https://flood.js.org"; diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 9d6b95754c612..39c160c771d8b 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -46,10 +46,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # fix build with openssl 3.0 - (fetchurl { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/net-p2p/transmission/files/transmission-3.00-openssl-3.patch"; - hash = "sha256-peVrkGck8AfbC9uYNfv1CIu1alIewpca7A6kRXjVlVs="; - }) + ./transmission-3.00-openssl-3.patch ]; outputs = [ "out" "apparmor" ]; diff --git a/pkgs/applications/networking/p2p/transmission/transmission-3.00-openssl-3.patch b/pkgs/applications/networking/p2p/transmission/transmission-3.00-openssl-3.patch new file mode 100644 index 0000000000000..f288298cbf3d4 --- /dev/null +++ b/pkgs/applications/networking/p2p/transmission/transmission-3.00-openssl-3.patch @@ -0,0 +1,37 @@ +From 6ee128b95bacaff20746538dc97c2b8e2b9fcc29 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Sun, 15 May 2022 10:54:38 -0400 +Subject: [PATCH] openssl: load "legacy" provider for RC4 + +--- + libtransmission/crypto-utils-openssl.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/libtransmission/crypto-utils-openssl.c b/libtransmission/crypto-utils-openssl.c +index 45fd71913..14d680654 100644 +--- a/libtransmission/crypto-utils-openssl.c ++++ b/libtransmission/crypto-utils-openssl.c +@@ -20,6 +20,9 @@ + #include <openssl/rand.h> + #include <openssl/ssl.h> + #include <openssl/x509.h> ++#if OPENSSL_VERSION_MAJOR >= 3 ++#include <openssl/provider.h> ++#endif + + #include "transmission.h" + #include "crypto-utils.h" +@@ -184,6 +187,10 @@ static void openssl_evp_cipher_context_free(EVP_CIPHER_CTX* handle) + + tr_rc4_ctx_t tr_rc4_new(void) + { ++#if OPENSSL_VERSION_MAJOR >= 3 ++ OSSL_PROVIDER_load(NULL, "default"); ++ OSSL_PROVIDER_load(NULL, "legacy"); ++#endif + EVP_CIPHER_CTX* handle = EVP_CIPHER_CTX_new(); + + if (check_result(EVP_CipherInit_ex(handle, EVP_rc4(), NULL, NULL, NULL, -1))) +-- +2.35.1 + diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index d5db07a819aca..08cdc3498811d 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -38,13 +38,13 @@ let pname = "pcloud"; - version = "1.14.5"; - code = "XZ0AMJ0ZdrENNeVMNI4Tz3lO1nxr577ryOMV"; + version = "1.14.6"; + code = "XZQDbs0Z4ET1VL0SIUuzr5ewR9LYuf6ssLRk"; # Archive link's codes: https://www.pcloud.com/release-notes/linux.html src = fetchzip { url = "https://api.pcloud.com/getpubzip?code=${code}&filename=pcloud-${version}.zip"; - hash = "sha256-a577iWPrke3EizG03m0+hjSoPzA4wDai/QMX2Zl7MF0="; + hash = "sha256-3HUVIDxeq7svzeWyZrxlE4TjZ8lOwT8bYgyRFRzGnmU="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix index 00c1ff878b960..1b0826c4d2bdf 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -44,6 +44,17 @@ let x86hash = ""; x64suffix = "65"; x86suffix = ""; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest12.html"; + }; + + "24.05.0" = { + major = "24"; + minor = "5"; + patch = "0"; + x64hash = "sha256-pye2JOilSbp8PFCpVXFkrRW98E8klCqoisVSWjR38nE="; + x86hash = ""; + x64suffix = "76"; + x86suffix = ""; homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; }; }; diff --git a/pkgs/applications/networking/sync/lcsync/default.nix b/pkgs/applications/networking/sync/lcsync/default.nix index ac4731d8536a5..9ba34ab6319c0 100644 --- a/pkgs/applications/networking/sync/lcsync/default.nix +++ b/pkgs/applications/networking/sync/lcsync/default.nix @@ -7,7 +7,7 @@ stdenv }: stdenv.mkDerivation (finalAttrs: { - name = "lcsync"; + pname = "lcsync"; version = "0.3.0"; src = fetchFromGitea { diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 0ffd47435ff2f..11e24de45199e 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "rclone"; - version = "1.66.0"; + version = "1.67.0"; src = fetchFromGitHub { owner = "rclone"; repo = "rclone"; rev = "v${version}"; - hash = "sha256-75RnAROICtRUDn95gSCNO0F6wes4CkJteNfUN38GQIY="; + hash = "sha256-rTibyh5z89QuPgZMvv3Y6FCugxMIytAg1gdCxE3+QLE="; }; - vendorHash = "sha256-zGBwgIuabLDqWbutvPHDbPRo5Dd9kNfmgToZXy7KVgI="; + vendorHash = "sha256-Sw9zZf0rup+VyncIpJHp9PKUp60lv+TV4wbWtVTTK3w="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 2535675c64976..24427cb8ed3bf 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -13,16 +13,16 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.27.7"; + version = "1.27.8"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - hash = "sha256-Y/gwQfb3ShOsXsNLomtqUlmYaw7FQQ6IUN1fHSYOouQ="; + hash = "sha256-+uyN/x/nFB/YAOvIqO1IIs3UH+yn/eKMBW1Ap9PvhRM="; }; - vendorHash = "sha256-xVSSFFTqU7jww8YTeXKfa3096c2FmEgkcXvuqFHb12E="; + vendorHash = "sha256-fzNpdriCRr4M3oW8IaImnGEN4G9AQwLZNFHg00zbIs0="; nativeBuildInputs = lib.optionals stdenv.isDarwin [ # Recent versions of macOS seem to require binaries to be signed when diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix index a8e60b9b9439b..678262243e2ae 100644 --- a/pkgs/applications/networking/testssl/default.nix +++ b/pkgs/applications/networking/testssl/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "testssl.sh"; - version = "3.0.8"; + version = "3.0.9"; src = fetchFromGitHub { owner = "drwetter"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gkDtJlAC7woM2HyYDXntD1+bEuqHTEipqrn2EZjxnH8="; + sha256 = "sha256-MZNQ7oOJD/vjOwDiPOZr3k+Mn0XXVdkP7cC/0mnWLic="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 7007b59b30129..d679b168e24ff 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -47,7 +47,7 @@ , libGLU , libGL , bsh -, CoinMP +, coinmp , libwps , libabw , libargon2 @@ -97,7 +97,7 @@ , libetonyek , liborcus , libpng -, langs ? [ "ar" "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fi" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "tr" "uk" "zh-CN" ] +, langs ? [ "ar" "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fi" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sk" "sl" "tr" "uk" "zh-CN" ] , withHelp ? true , kdeIntegration ? false , qtbase ? null @@ -288,7 +288,7 @@ in stdenv.mkDerivation (finalAttrs: { # See: https://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg334080.html (libpng.override { apngSupport = false; }) perlPackages.ArchiveZip - CoinMP + coinmp perlPackages.IOCompress abseil-cpp ant diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index d14fd28d9db14..7bae5b5388d7a 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.4.4"; + version = "3.4.5"; src = fetchurl { url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; - hash = "sha256-l4wHCapIvD3kZk1DqLNWDLjwg6j7g0+qMB/KuMzH+pQ="; + hash = "sha256-5oBIw9PVbEGF1e47GeYNF6gJFm5z3M9KeJ1711cAg2s="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/paperwork/paperwork-backend.nix b/pkgs/applications/office/paperwork/paperwork-backend.nix index b5620d3f40df0..4460e50ab6246 100644 --- a/pkgs/applications/office/paperwork/paperwork-backend.nix +++ b/pkgs/applications/office/paperwork/paperwork-backend.nix @@ -1,7 +1,6 @@ { buildPythonPackage , lib , fetchFromGitLab -, fetchpatch , pyenchant , scikit-learn , pypillowfight @@ -34,13 +33,6 @@ buildPythonPackage rec { sourceRoot = "${src.name}/paperwork-backend"; patches = [ - # fixes building with recent scipy - # remove on next release - (fetchpatch { - url = "https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/commit/abcebfe9714644d4e259e53b10e0e9417b5b864f.patch"; - hash = "sha256-YjVpphThW5Livs+PZJZDSgJvhLSXhZ1bnlWMwfY4HTg="; - }) - # disables a flaky test https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/issues/1035#note_1493700 ./flaky_test.patch ]; diff --git a/pkgs/applications/office/paperwork/src.nix b/pkgs/applications/office/paperwork/src.nix index 2f61689611d60..2f54b435928f6 100644 --- a/pkgs/applications/office/paperwork/src.nix +++ b/pkgs/applications/office/paperwork/src.nix @@ -1,13 +1,13 @@ {fetchFromGitLab}: rec { - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; repo = "paperwork"; group = "World"; owner = "OpenPaperwork"; rev = version; - sha256 = "sha256-fVw+W10yEPLf6IUyaDpnmu7tPOqbvNLE8IK8mjHvurQ="; + sha256 = "sha256-xQN1IUbTQEHtyW5F8Zbg2EUN5K87oYqnSdzo0gEeOfI="; }; sample_documents = fetchFromGitLab { domain = "gitlab.gnome.org"; diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index 760a72e77497a..72cf6cbb57523 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.68.4"; + version = "0.69.0"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-E4uVI2MJ2tD2wuAxxzCZSmNRbKTTzhi44c4ip7uEhCk="; + hash = "sha256-5U1MGZ/CWI0m1utXCak6qWEHIFwMvZSqRt4qrUPCqVo="; }; nativeBuildInputs = [ @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { homepage = "https://www.portfolio-performance.info/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.epl10; - maintainers = with maintainers; [ elohmeier kilianar oyren shawn8901 ]; + maintainers = with maintainers; [ kilianar oyren shawn8901 ]; mainProgram = "portfolio"; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/office/pympress/default.nix b/pkgs/applications/office/pympress/default.nix index eb28bf2dfd920..8ada870912eb9 100644 --- a/pkgs/applications/office/pympress/default.nix +++ b/pkgs/applications/office/pympress/default.nix @@ -8,6 +8,7 @@ , libcanberra-gtk3 , poppler_gi , withGstreamer ? stdenv.isLinux +, gst_all_1 , withVLC ? stdenv.isLinux }: @@ -29,7 +30,16 @@ python3Packages.buildPythonApplication rec { buildInputs = [ gtk3 poppler_gi - ] ++ lib.optional withGstreamer libcanberra-gtk3; + ] ++ lib.optionals withGstreamer [ + libcanberra-gtk3 + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + (gst_all_1.gst-plugins-good.override {gtkSupport = true;}) + gst_all_1.gst-libav + gst_all_1.gst-vaapi + ]; propagatedBuildInputs = with python3Packages; [ pycairo diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 12f76073d410c..53563d72d6584 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -21,14 +21,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "24.6.1"; + version = "24.6.3"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-FS4VJtTh0LIrrIK+IJxSBqcEsNU7/e6KG3190FLAQC4="; + hash = "sha256-UdWyS5DalnGDoNEOx8d9MglKpJeqOXY1mTgLl3r/9gY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index 5f2a117198965..941f34231ca94 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -33,11 +33,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "scribus"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { url = "mirror://sourceforge/scribus/scribus-devel/scribus-${finalAttrs.version}.tar.xz"; - hash = "sha256-4J3Xjm22HQG5MhEI/t7bzNbsCrNS3Vuv24sEHw73npk="; + hash = "sha256-fv+bH0fjcuVrs2nx2+GP5JEBeJtea8/beJDgNGtkE4M="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/ticktick/default.nix b/pkgs/applications/office/ticktick/default.nix index 746a46e2d4a13..2510d42b9a82a 100644 --- a/pkgs/applications/office/ticktick/default.nix +++ b/pkgs/applications/office/ticktick/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ticktick"; - version = "2.0.10"; + version = "2.0.20"; src = fetchurl { url = "https://d2atcrkye2ik4e.cloudfront.net/download/linux/linux_deb_x64/${finalAttrs.pname}-${finalAttrs.version}-amd64.deb"; - hash = "sha256-wign7U1p4HX6/RwnMm2iVSNaYRhn8Ia6QQd5X6m3B0E="; + hash = "sha256-5w50QMSMmkpuhSOqv3LjrcQQDwaD7pIdKUo+8YUgvpk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index d9ca511141f80..cff458a63fd3f 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "0-unstable-2024-06-05"; + version = "0-unstable-2024-06-09"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "1ad0ec1ad235dd00bbd6bfdb27e24f3dcd610da4"; - hash = "sha256-1Xb4Jdw04E2xTg/93zsGse3Yao8h51kDcJpbvx41yp0="; + rev = "c753ce40686c3044eb7fb653bb913d1610096cd1"; + hash = "sha256-WpbG2RY7z71GBSDjv/VjcFsGcb/YK7P4oMVEydsYpuw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/qlog/default.nix b/pkgs/applications/radio/qlog/default.nix index 2f14292e66704..7ec6756f20aa3 100644 --- a/pkgs/applications/radio/qlog/default.nix +++ b/pkgs/applications/radio/qlog/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "qlog"; - version = "0.35.2"; + version = "0.36.0"; src = fetchFromGitHub { owner = "foldynl"; repo = "QLog"; rev = "v${version}"; - hash = "sha256-3ht3/J4uJ7Nyfp0xpVDYa8GnV/EvHjf09XGSEBLRGZU="; + hash = "sha256-YbjtN08zEj8rlRDC5tS/JsBOH70DV98wmL6pFQTehgg="; fetchSubmodules = true; }; diff --git a/pkgs/applications/science/biology/kent/default.nix b/pkgs/applications/science/biology/kent/default.nix index 400e073f69057..56cfa5168a486 100644 --- a/pkgs/applications/science/biology/kent/default.nix +++ b/pkgs/applications/science/biology/kent/default.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation rec { pname = "kent"; - version = "465"; + version = "466"; src = fetchFromGitHub { owner = "ucscGenomeBrowser"; repo = pname; rev = "v${version}_base"; - hash = "sha256-QeHqXSbad5LCmQ8DfLxl2pyXJvKV4G7uLXBtRd7LME0="; + hash = "sha256-zoDZ+8G0SHKfWmkXBqp+WSjQXtmkcTIZjrjPhUIJw1c="; }; buildInputs = [ libpng libuuid zlib bzip2 xz openssl curl libmysqlclient ]; diff --git a/pkgs/applications/science/biology/poretools/default.nix b/pkgs/applications/science/biology/poretools/default.nix deleted file mode 100644 index 27a1b7ed38416..0000000000000 --- a/pkgs/applications/science/biology/poretools/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, python2Packages, fetchFromGitHub }: - -python2Packages.buildPythonPackage rec { - pname = "poretools"; - version = "unstable-2016-07-10"; - - src = fetchFromGitHub { - repo = pname; - owner = "arq5x"; - rev = "e426b1f09e86ac259a00c261c79df91510777407"; - sha256 = "0bglj833wxpp3cq430p1d3xp085ls221js2y90w7ir2x5ay8l7am"; - }; - - propagatedBuildInputs = [ python2Packages.h5py python2Packages.matplotlib python2Packages.seaborn python2Packages.pandas ]; - - meta = { - description = "Toolkit for working with nanopore sequencing data from Oxford Nanopore"; - license = lib.licenses.mit; - homepage = "https://poretools.readthedocs.io/en/latest/"; - maintainers = [ lib.maintainers.rybern ]; - broken = true; # Build error: h5py-3.9.0 not supported for interpreter python2.7 - }; -} diff --git a/pkgs/applications/science/biology/spades/default.nix b/pkgs/applications/science/biology/spades/default.nix deleted file mode 100644 index 0b0491a71aaef..0000000000000 --- a/pkgs/applications/science/biology/spades/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, zlib, bzip2, cmake, python3 }: - -stdenv.mkDerivation rec { - pname = "SPAdes"; - version = "3.15.5"; - - src = fetchurl { - url = "http://cab.spbu.ru/files/release${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-FVw2QNVx8uexmgUDHR/Q0ZvYLfeF04hw+5O9JBsSu/o="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ zlib bzip2 python3 ]; - - doCheck = true; - - sourceRoot = "${pname}-${version}/src"; - - env.CXXFLAGS = toString [ - # GCC 13: error: 'uint32_t' does not name a type - "-include cstdint" - ]; - - meta = with lib; { - description = "St. Petersburg genome assembler: assembly toolkit containing various assembly pipelines"; - license = licenses.gpl2Only; - homepage = "http://cab.spbu.ru/software/spades/"; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - maintainers = [ maintainers.bzizou ]; - }; -} diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix index 8ad9794739559..d500e78b24820 100644 --- a/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -43,13 +43,13 @@ let in stdenv.mkDerivation rec { pname = "openmolcas"; - version = "24.02"; + version = "24.06"; src = fetchFromGitLab { owner = "Molcas"; repo = "OpenMolcas"; rev = "v${version}"; - hash = "sha256-4Ek0cnaRfLEbj1Nj31rRp9b2sois4rIFTcpOUq9h2mw="; + hash = "sha256-/y6vEvA1Zf+p7Z0WpcN4P5voLN8MmfbKz1FuthgVQp0="; }; patches = [ diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 4c55703edccf4..b3ddbd5b604fe 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,23 +3,23 @@ { "kicad" = { kicadVersion = { - version = "8.0.2"; + version = "8.0.3"; src = { - rev = "55a4d4f5e2f54be6ccf74a8919d04684c9df4c50"; - sha256 = "069ycii9zvdxwxd73afd6bp975r1555yvifi9zdb77qyvn0d9nr9"; + rev = "8ba5ba46af8502ea7a7d2a9754363167c2742399"; + sha256 = "0hafvcjjwylgcpgyyasmb2q210k82wvcswvgjvwwh76bwshwcpwa"; }; }; libVersion = { - version = "8.0.2"; + version = "8.0.3"; libSources = { - symbols.rev = "099ac0c8ac402a685fde00b1369e34a116e29661"; - symbols.sha256 = "0w333f89yw2m0zlpkg0k6hfwlj10snm8laihdjnsb22asyz4pbhn"; - templates.rev = "2e2da58e02707d327d59d4101c401a82dc9a26f6"; - templates.sha256 = "073a6cyvzzy0vmkj3ip4ziq7b7pcizs70nm5acw838dxghjfyv3v"; - footprints.rev = "e8c30550cde4945cbe1bf30cccf0b3c1e2bda6c6"; - footprints.sha256 = "10j8qjljc1fv8k4zp3zn0da33g57hn6pgrgmbgp18dsa539xvxcz"; - packages3d.rev = "249f7947587529026e1676cd70c8d7493a8d8162"; - packages3d.sha256 = "04gvfb54jhnww2qwrxc27wpyrvmjasdc4xhr0ridl7dglh4qcp35"; + symbols.rev = "2bc103c46a8daacbba2cded8b9f095b330ba928d"; + symbols.sha256 = "1za0spq09bbj7xwfwr1abmwjnqfd3zx0crayaz7915ja0ifi75hd"; + templates.rev = "0f57b59d365d1f8b8fdd0745e10beb035e88ba37"; + templates.sha256 = "03idwrk3vj9h2az8j8lqpbdbnfxdbkzh4db68kq3644yj3cnlcza"; + footprints.rev = "539ffd8c0898ad8c8c51c2ab85ba56bfd77271c7"; + footprints.sha256 = "0ik4hjl5m65wnpaymg58zbvsfvchhyq5x3psvj6005mgv2hrican"; + packages3d.rev = "3172a1cc0931c1734efad68623374d5277f8ab60"; + packages3d.sha256 = "1yjlg7cxwhlzcdbxjqyqamr140sz8gvzi63k2401mhdbh88c9kii"; }; }; }; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 68b424b32fb4a..af672d500fa6a 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -58,6 +58,7 @@ let "8.18.0".sha256 = "sha256-WhiBs4nzPHQ0R24xAdM49kmxSCPOxiOVMA1iiMYunz4="; "8.19.0".sha256 = "sha256-ixsYCvCXpBHqJ71hLQklphlwoOO3i/6w2PJjllKqf9k="; "8.19.1".sha256 = "sha256-kmZ8Uk8jpzjOd67aAPp3C+vU2oNaBw9pr7+Uixcgg94="; + "8.19.2".sha256 = "sha256-q+i07JsMZp83Gqav6v1jxsgPLN7sPvp5/oszVnavmz0="; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index 19c021684b3ff..c3df8340d20c8 100644 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation { description = "Tooling for Yosys-based verification flows"; homepage = "https://symbiyosys.readthedocs.io/"; license = lib.licenses.isc; - maintainers = with lib.maintainers; [ thoughtpolice emily ]; + maintainers = with lib.maintainers; [ thoughtpolice ]; mainProgram = "sby"; platforms = lib.platforms.all; }; diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index ade5239762518..7f0e70c642134 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "snakemake"; - version = "8.13.0"; + version = "8.14.0"; format = "setuptools"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Xd8mZ8tsemJ53hAMED2biRyDlEw/gG/Hh1iZSwSB1vY="; + hash = "sha256-6oguN4u4OUDXpDsbueSBNwtWgLCaKmgq3w/d/MsMh7Y="; # https://github.com/python-versioneer/python-versioneer/issues/217 postFetch = '' sed -i "$out"/snakemake/_version.py -e 's#git_refnames = ".*"#git_refnames = " (tag: v${version})"#' diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index d5e1674c6a1da..22a7653c6a647 100644 --- a/pkgs/applications/version-management/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.50.0"; + version = "2.51.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-/h3azuMRGqsQrLW+NwqAunQNNqXybZ1CXC8FT4D+sCY="; + hash = "sha256-xd7IZSOgukEyngxHwsOrHW3ifEMpm1OfXoW3/fvVq3I="; }; - vendorHash = "sha256-Y8F9tetkJSI0LyO6wTHR5d8aRP1VOp3/EvtPKDDbqpM="; + vendorHash = "sha256-0NKfDSDV/hyQfgkhHe0E9xu7A9hz4JAT5uF/Q2ipEwg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-credential-oauth/default.nix b/pkgs/applications/version-management/git-credential-oauth/default.nix index edc517b54d59e..62489b6ee2498 100644 --- a/pkgs/applications/version-management/git-credential-oauth/default.nix +++ b/pkgs/applications/version-management/git-credential-oauth/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-credential-oauth"; - version = "0.11.3"; + version = "0.12.1"; src = fetchFromGitHub { owner = "hickford"; repo = pname; rev = "v${version}"; - hash = "sha256-tJJxCtCNuPtoQYABEViS1G6aHrMTLn+r3hlTTkaJvCg="; + hash = "sha256-iDnTjrVDH8qBYkvNjLHYmTaK8vScluDM4+W/5Rdo+Xc="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-interactive-rebase-tool/Cargo.lock b/pkgs/applications/version-management/git-interactive-rebase-tool/Cargo.lock deleted file mode 100644 index 3757eab5de46e..0000000000000 --- a/pkgs/applications/version-management/git-interactive-rebase-tool/Cargo.lock +++ /dev/null @@ -1,1366 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "aho-corasick" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" -dependencies = [ - "memchr", -] - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7ed72e1635e121ca3e79420540282af22da58be50de153d36f81ddc6b83aa9e" -dependencies = [ - "libc", -] - -[[package]] -name = "anyhow" -version = "1.0.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" - -[[package]] -name = "arrayvec" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bumpalo" -version = "3.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" - -[[package]] -name = "captur" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70fab32548d14602e13307a86c41b2dc2fc2ef19c2881bf63598275a7e45b182" - -[[package]] -name = "cc" -version = "1.0.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" -dependencies = [ - "jobserver", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "time", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "claim" -version = "0.5.0" -source = "git+https://github.com/Turbo87/rust-claim.git?rev=23892a3#23892a345d38e1434303143a73033925284ad04d" -dependencies = [ - "autocfg", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" -dependencies = [ - "cfg-if", - "lazy_static", -] - -[[package]] -name = "crossterm" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13" -dependencies = [ - "bitflags", - "crossterm_winapi", - "libc", - "mio", - "parking_lot", - "signal-hook", - "signal-hook-mio", - "winapi", -] - -[[package]] -name = "crossterm_winapi" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c" -dependencies = [ - "winapi", -] - -[[package]] -name = "dashmap" -version = "5.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391b56fbd302e585b7a9494fb70e40949567b1cf9003a8e4a6041a1687c26573" -dependencies = [ - "cfg-if", - "hashbrown", - "lock_api", -] - -[[package]] -name = "diff" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" - -[[package]] -name = "errno" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "fastrand" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" -dependencies = [ - "instant", -] - -[[package]] -name = "form_urlencoded" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" -dependencies = [ - "matches", - "percent-encoding", -] - -[[package]] -name = "futures" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" - -[[package]] -name = "futures-executor" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" - -[[package]] -name = "futures-macro" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.104", -] - -[[package]] -name = "futures-sink" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" - -[[package]] -name = "futures-task" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" - -[[package]] -name = "futures-timer" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" - -[[package]] -name = "futures-util" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "getrandom" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", -] - -[[package]] -name = "girt-config" -version = "2.3.0" -dependencies = [ - "claim", - "girt-git", - "girt-testutils", - "lazy_static", - "proc-macro2", - "rstest", - "rustc_version", - "serial_test", - "tempfile", - "thiserror", -] - -[[package]] -name = "girt-core" -version = "2.3.0" -dependencies = [ - "anyhow", - "bitflags", - "captur", - "chrono", - "claim", - "crossbeam-channel", - "girt-config", - "girt-display", - "girt-git", - "girt-input", - "girt-runtime", - "girt-todo-file", - "girt-view", - "if_chain", - "lazy_static", - "num-format", - "parking_lot", - "pico-args", - "pretty_assertions", - "rstest", - "rustc_version", - "serial_test", - "unicode-segmentation", -] - -[[package]] -name = "girt-display" -version = "2.3.0" -dependencies = [ - "crossterm", - "girt-config", - "rstest", - "rustc_version", - "serial_test", - "thiserror", -] - -[[package]] -name = "girt-git" -version = "2.3.0" -dependencies = [ - "chrono", - "claim", - "girt-testutils", - "git2", - "lazy_static", - "parking_lot", - "pretty_assertions", - "rstest", - "rustc_version", - "serial_test", - "tempfile", - "thiserror", -] - -[[package]] -name = "girt-input" -version = "2.3.0" -dependencies = [ - "anyhow", - "bitflags", - "captur", - "crossbeam-channel", - "crossterm", - "girt-config", - "girt-runtime", - "lazy_static", - "parking_lot", - "rstest", - "rustc_version", - "serial_test", -] - -[[package]] -name = "girt-runtime" -version = "2.3.0" -dependencies = [ - "claim", - "crossbeam-channel", - "girt-testutils", - "parking_lot", - "rustc_version", - "thiserror", -] - -[[package]] -name = "girt-testutils" -version = "2.3.0" -dependencies = [ - "rustc_version", -] - -[[package]] -name = "girt-todo-file" -version = "2.3.0" -dependencies = [ - "claim", - "girt-testutils", - "pretty_assertions", - "rstest", - "rustc_version", - "tempfile", - "thiserror", - "version-track", -] - -[[package]] -name = "girt-view" -version = "2.3.0" -dependencies = [ - "anyhow", - "bitflags", - "captur", - "claim", - "crossbeam-channel", - "girt-config", - "girt-display", - "girt-runtime", - "parking_lot", - "rustc_version", - "unicode-segmentation", - "unicode-width", - "uuid", - "xi-unicode", -] - -[[package]] -name = "git-interactive-rebase-tool" -version = "2.3.0" -dependencies = [ - "girt-core", - "rustc_version", -] - -[[package]] -name = "git2" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2994bee4a3a6a51eb90c218523be382fd7ea09b16380b9312e9dbe955ff7c7d1" -dependencies = [ - "bitflags", - "libc", - "libgit2-sys", - "log", - "url", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hermit-abi" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - -[[package]] -name = "iana-time-zone" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef5528d9c2817db4e10cc78f8d4c8228906e5854f389ff6b076cee3572a09d35" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "js-sys", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "if_chain" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "itoa" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" - -[[package]] -name = "jobserver" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" -dependencies = [ - "libc", -] - -[[package]] -name = "js-sys" -version = "0.3.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.147" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" - -[[package]] -name = "libgit2-sys" -version = "0.14.2+1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4" -dependencies = [ - "cc", - "libc", - "libz-sys", - "pkg-config", -] - -[[package]] -name = "libz-sys" -version = "1.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e7e15d7610cce1d9752e137625f14e61a28cd45929b6e12e47b50fe154ee2e" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "lock_api" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "matches" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "mio" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" -dependencies = [ - "libc", - "log", - "miow", - "ntapi", - "wasi 0.11.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", -] - -[[package]] -name = "ntapi" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" -dependencies = [ - "winapi", -] - -[[package]] -name = "num-format" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" -dependencies = [ - "arrayvec", - "itoa", -] - -[[package]] -name = "num-traits" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" -dependencies = [ - "autocfg", -] - -[[package]] -name = "once_cell" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e" - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "995f667a6c822200b0433ac218e05582f0e2efa1b922a3fd2fbaadc5f87bab37" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.2.13", - "smallvec", - "windows-sys 0.34.0", -] - -[[package]] -name = "percent-encoding" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" - -[[package]] -name = "pico-args" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" - -[[package]] -name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" - -[[package]] -name = "ppv-lite86" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" - -[[package]] -name = "pretty_assertions" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" -dependencies = [ - "diff", - "yansi", -] - -[[package]] -name = "proc-macro2" -version = "1.0.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" -dependencies = [ - "getrandom", -] - -[[package]] -name = "redox_syscall" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags", -] - -[[package]] -name = "regex" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" - -[[package]] -name = "relative-path" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bf2521270932c3c7bed1a59151222bd7643c79310f2916f01925e1e16255698" - -[[package]] -name = "rstest" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b96577ca10cb3eade7b337eb46520108a67ca2818a24d0b63f41fd62bc9651c" -dependencies = [ - "futures", - "futures-timer", - "rstest_macros", - "rustc_version", -] - -[[package]] -name = "rstest_macros" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225e674cf31712b8bb15fdbca3ec0c1b9d825c5a24407ff2b7e005fb6a29ba03" -dependencies = [ - "cfg-if", - "glob", - "proc-macro2", - "quote", - "regex", - "relative-path", - "rustc_version", - "syn 2.0.26", - "unicode-ident", -] - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustix" -version = "0.37.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "semver" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d65bd28f48be7196d222d95b9243287f48d27aca604e08497513019ff0502cc4" - -[[package]] -name = "serial_test" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e56dd856803e253c8f298af3f4d7eb0ae5e23a737252cd90bb4f3b435033b2d" -dependencies = [ - "dashmap", - "futures", - "lazy_static", - "log", - "parking_lot", - "serial_test_derive", -] - -[[package]] -name = "serial_test_derive" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.26", -] - -[[package]] -name = "signal-hook" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "647c97df271007dcea485bb74ffdb57f2e683f1306c854f468a0c244badabf2d" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-mio" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" -dependencies = [ - "libc", - "mio", - "signal-hook", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" -dependencies = [ - "libc", -] - -[[package]] -name = "slab" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" - -[[package]] -name = "smallvec" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" - -[[package]] -name = "syn" -version = "1.0.104" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae548ec36cf198c0ef7710d3c230987c2d6d7bd98ad6edc0274462724c585ce" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tempfile" -version = "3.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" -dependencies = [ - "autocfg", - "cfg-if", - "fastrand", - "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "thiserror" -version = "1.0.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.26", -] - -[[package]] -name = "time" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - -[[package]] -name = "unicode-bidi" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" - -[[package]] -name = "unicode-ident" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" - -[[package]] -name = "unicode-normalization" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "url" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" -dependencies = [ - "form_urlencoded", - "idna", - "matches", - "percent-encoding", -] - -[[package]] -name = "uuid" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" -dependencies = [ - "getrandom", - "rand", -] - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version-track" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9affed6b4e63b1f30ed8f0f2c401fa725f5f511eb00e52269f401c4d5ae12f" -dependencies = [ - "uuid", -] - -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 1.0.104", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.104", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5acdd78cb4ba54c0045ac14f62d8f94a03d10047904ae2a40afa1e99d8f70825" -dependencies = [ - "windows_aarch64_msvc 0.34.0", - "windows_i686_gnu 0.34.0", - "windows_i686_msvc 0.34.0", - "windows_x86_64_gnu 0.34.0", - "windows_x86_64_msvc 0.34.0", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.48.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.48.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" - -[[package]] -name = "windows_i686_gnu" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[package]] -name = "windows_i686_msvc" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" - -[[package]] -name = "xi-unicode" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" - -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" diff --git a/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix b/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix index f450b17535dd8..366f34e10d408 100644 --- a/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix +++ b/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix @@ -2,41 +2,22 @@ rustPlatform.buildRustPackage rec { pname = "git-interactive-rebase-tool"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "MitMaro"; repo = pname; rev = version; - sha256 = "sha256-tMeA2LsNCXxI086y8S+STYwjClWMPaBheP0s0oZ5I5c="; + hash = "sha256-xwvL6QX+eMbxCouE1i86j/PRCxTJVAQnRVeK6fYQo/M="; }; - postPatch = '' - # error: lint `unused_tuple_struct_fields` has been renamed to `dead_code` - substituteInPlace scripts/data/lints.rs src/main.rs src/{config,core,display,git,input,runtime,testutils,todo_file,view}/src/lib.rs \ - --replace-fail "unused_tuple_struct_fields," "" - ''; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "claim-0.5.0" = "sha256-quVV5PnWW1cYK+iSOM/Y0gLu2gPOrZ1ytJif0D5v9g0="; - }; - }; + cargoHash = "sha256-RDGbsmOBVMxInstTrRZK0G5eZR79ZoFK5UlkCj3zpoY="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; # Compilation during tests fails if this env var is not set. preCheck = "export GIRT_BUILD_GIT_HASH=${version}"; postCheck = "unset GIRT_BUILD_GIT_HASH"; - cargoTestFlags = [ - "--workspace" - # build everything except for doctests which are currently broken because - # `config::lib` expects the sourcetree to be a git repo. - "--tests" - "--lib" - "--bins" - ]; meta = with lib; { homepage = "https://github.com/MitMaro/git-interactive-rebase-tool"; diff --git a/pkgs/applications/version-management/git-town/default.nix b/pkgs/applications/version-management/git-town/default.nix index a678e496cdf12..7b362cd7fb254 100644 --- a/pkgs/applications/version-management/git-town/default.nix +++ b/pkgs/applications/version-management/git-town/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-town"; - version = "14.2.1"; + version = "14.2.2"; src = fetchFromGitHub { owner = "git-town"; repo = "git-town"; rev = "v${version}"; - hash = "sha256-7wsN95I8Xa5CXh1Mg3Wv4gyTSRzZMqJ06ALLsud3l2k="; + hash = "sha256-bYCE3Ik0UbbjlZV8EY6pVRZzrTBp2uiZLJjO4UxfGE8="; }; vendorHash = null; diff --git a/pkgs/applications/version-management/gitmux/default.nix b/pkgs/applications/version-management/gitmux/default.nix index cd5a214464ed0..8bb5277dc4ec7 100644 --- a/pkgs/applications/version-management/gitmux/default.nix +++ b/pkgs/applications/version-management/gitmux/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, buildGoModule, lib, testers, gitmux }: +{ fetchFromGitHub, buildGoModule, lib, testers, gitmux, git }: buildGoModule rec { pname = "gitmux"; @@ -13,9 +13,8 @@ buildGoModule rec { vendorHash = "sha256-PHY020MIuLlC1LqNGyBJRNd7J+SzoHbNMPAil7CKP/M="; - # GitHub source does contain a regression test for the module - # but it requires networking as it git clones a repo from github - doCheck = false; + nativeCheckInputs = [ git ]; + doCheck = true; ldflags = [ "-X main.version=${version}" ]; diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index 452c6f5ab2f57..c4ff74a860484 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -16,6 +16,7 @@ let canRunCmd = stdenv.hostPlatform.emulatorAvailable buildPackages; gix = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/gix"; + ein = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/ein"; in rustPlatform.buildRustPackage rec { pname = "gitoxide"; version = "0.36.0"; @@ -40,6 +41,11 @@ in rustPlatform.buildRustPackage rec { --bash <(${gix} completions --shell bash) \ --fish <(${gix} completions --shell fish) \ --zsh <(${gix} completions --shell zsh) + + installShellCompletion --cmd ein \ + --bash <(${ein} completions --shell bash) \ + --fish <(${ein} completions --shell fish) \ + --zsh <(${ein} completions --shell zsh) ''; # Needed to get openssl-sys to use pkg-config. diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index c6e699ac1b513..60f11d5168b19 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "gource"; - version = "0.54"; + version = "0.55"; src = fetchurl { url = "https://github.com/acaudwell/Gource/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - hash = "sha256-HcvO32XSz01p/gtjPlTCApJsCLgpvK0Lc+r54pzW+uU="; + hash = "sha256-yCOSEtKLB1CNnkd2GZdoAmgWKPwl6z4E9mcRdwE8AUI="; }; postPatch = '' diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index bca8bc1e48ed2..be18304386cbd 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/applications/video/davinci-resolve/default.nix @@ -165,11 +165,11 @@ let desktopItems = [ (makeDesktopItem { - name = "davinci-resolve"; - desktopName = "Davinci Resolve"; + name = "davinci-resolve${lib.optionalString studioVariant "-studio"}"; + desktopName = "Davinci Resolve${lib.optionalString studioVariant " Studio"}"; genericName = "Video Editor"; - exec = "resolve"; - # icon = "DV_Resolve"; + exec = "davinci-resolve${lib.optionalString studioVariant "-studio"}"; + icon = "davinci-resolve${lib.optionalString studioVariant "-studio"}"; comment = "Professional video editing, color, effects and audio post-processing"; categories = [ "AudioVideo" @@ -254,6 +254,12 @@ buildFHSEnv { '' }"; + extraInstallCommands = '' + mkdir -p $out/share/applications $out/share/icons/hicolor/128x128/apps + ln -s ${davinci}/share/applications/*.desktop $out/share/applications/ + ln -s ${davinci}/graphics/DV_Resolve.png $out/share/icons/hicolor/128x128/apps/davinci-resolve${lib.optionalString studioVariant "-studio"}.png + ''; + passthru = { inherit davinci; updateScript = lib.getExe (writeShellApplication { @@ -284,6 +290,6 @@ buildFHSEnv { maintainers = with maintainers; [ amarshall jshcmpbll orivej ]; platforms = [ "x86_64-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - mainProgram = "davinci-resolve"; + mainProgram = "davinci-resolve${lib.optionalString studioVariant "-studio"}"; }; } diff --git a/pkgs/applications/video/hypnotix/default.nix b/pkgs/applications/video/hypnotix/default.nix index e164666e85f18..00f8eb6b024ba 100644 --- a/pkgs/applications/video/hypnotix/default.nix +++ b/pkgs/applications/video/hypnotix/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "hypnotix"; - version = "4.4"; + version = "4.5"; src = fetchFromGitHub { owner = "linuxmint"; repo = "hypnotix"; rev = version; - hash = "sha256-SGKa3yo3iEDAjsvfa6dBfM7sAnBVr0pB6zLKQb6e4Ys="; + hash = "sha256-tcBBPJr9C+3FC8VWAM+KzETKAovfyehBvlmn7mIR7VQ="; }; patches = [ diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index d3909c3799bcb..fef1a9ae80f08 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -21,24 +21,21 @@ , qtwebchannel , qtwebengine , qtx11extras -, jellyfin-web , withDbus ? stdenv.isLinux }: mkDerivation rec { pname = "jellyfin-media-player"; - version = "1.10.1"; + version = "1.11.1"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-media-player"; rev = "v${version}"; - sha256 = "sha256-l1jNrEUrDCc4R1CZ0b0Omjka6wTryjWqnEJbfCSJ0ZE="; + sha256 = "sha256-Jsn4kWQzUaQI9MpbsLJr6JSJk9ZSnMEcrebQ2DYegSU="; }; patches = [ - # fix the location of the jellyfin-web path - ./fix-web-path.patch # disable update notifications since the end user can't simply download the release artifacts to update ./disable-update-notifications.patch ]; @@ -77,11 +74,6 @@ mkDerivation rec { "-DLINUX_X11POWER=ON" ]; - preConfigure = '' - # link the jellyfin-web files to be copied by cmake (see fix-web-path.patch) - ln -s ${jellyfin-web}/share/jellyfin-web . - ''; - postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/bin $out/Applications mv "$out/Jellyfin Media Player.app" $out/Applications diff --git a/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch b/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch deleted file mode 100644 index 250a5c0695450..0000000000000 --- a/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 5abca9b..d09176b 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -107,10 +107,8 @@ endif() - set(RESOURCE_ROOT .) - if(APPLE) - set(RESOURCE_ROOT Resources) -- if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/../dist/) -- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DEST ${RESOURCE_ROOT}/web-client/desktop) -- endif() -- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_SOURCE_DIR}/native/ DEST ${RESOURCE_ROOT}/web-client/extension) -+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../jellyfin-web/ DESTINATION ${RESOURCE_ROOT}/web-client/desktop) -+ install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${RESOURCE_ROOT}/web-client/extension) - endif() - - if(NOT APPLE) -@@ -123,9 +121,7 @@ if(NOT APPLE) - install(FILES ${loc}/qtwebengine_devtools_resources.pak DESTINATION resources) - endif() - endforeach() -- if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/../dist/) -- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/desktop) -- endif() -+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../jellyfin-web/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/desktop) - install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/extension) - endif() - diff --git a/pkgs/applications/video/kodi/addons/formula1/default.nix b/pkgs/applications/video/kodi/addons/formula1/default.nix new file mode 100644 index 0000000000000..0d374dc65be1b --- /dev/null +++ b/pkgs/applications/video/kodi/addons/formula1/default.nix @@ -0,0 +1,29 @@ +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, requests }: + +buildKodiAddon rec { + pname = "formula1"; + namespace = "plugin.video.formula1"; + version = "2.0.2"; + + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-aClAgkJKvixeKzrwgEsfDhPXiFv9+ULLmb8c9QTaUgM="; + }; + + propagatedBuildInputs = [ + requests + ]; + + passthru = { + updateScript = addonUpdateScript { + attrPath = "kodi.packages.formula1"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/jaylinski/kodi-addon-formula1"; + description = "Videos from the Formula 1 website"; + license = licenses.mit; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi/addons/infotagger/default.nix b/pkgs/applications/video/kodi/addons/infotagger/default.nix index da4528ed0afc5..7ac5e48071073 100644 --- a/pkgs/applications/video/kodi/addons/infotagger/default.nix +++ b/pkgs/applications/video/kodi/addons/infotagger/default.nix @@ -2,13 +2,13 @@ buildKodiAddon rec { pname = "infotagger"; namespace = "script.module.infotagger"; - version = "0.0.7"; + version = "0.0.8"; src = fetchFromGitHub { owner = "jurialmunkey"; repo = namespace; rev = "v${version}"; - hash = "sha256-Us7ud0QORGn+ALB4uyISekp0kUYY8nN8uFNg8MlxEB0="; + hash = "sha256-Ns1OjrYLKz4znXRxqUErDLcmC0HBjBFVYI9GFqDVurY="; }; passthru = { diff --git a/pkgs/applications/video/kodi/addons/plugin-cache/default.nix b/pkgs/applications/video/kodi/addons/plugin-cache/default.nix new file mode 100644 index 0000000000000..c21f5e136e41e --- /dev/null +++ b/pkgs/applications/video/kodi/addons/plugin-cache/default.nix @@ -0,0 +1,26 @@ +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: + +buildKodiAddon rec { + pname = "plugin-cache"; + namespace = "script.common.plugin.cache"; + version = "3.0.0"; + + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-5QcMNmWOEw2C26OXlvAvxqDxTpjIMBhwmaIFwVgHuIU="; + }; + + passthru = { + pythonPath = "resources/lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.plugin-cache"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/anxdpanic/script.common.plugin.cache"; + description = "Common plugin cache"; + license = licenses.gpl3Only; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi/addons/raiplay/default.nix b/pkgs/applications/video/kodi/addons/raiplay/default.nix new file mode 100644 index 0000000000000..ab5bcfedccfdb --- /dev/null +++ b/pkgs/applications/video/kodi/addons/raiplay/default.nix @@ -0,0 +1,30 @@ +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, inputstreamhelper, plugin-cache }: + +buildKodiAddon rec { + pname = "raiplay"; + namespace = "plugin.video.raitv"; + version = "4.1.2"; + + propagatedBuildInputs = [ + plugin-cache + inputstreamhelper + ]; + + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-9aR1kkl+0+nhP0bOTnaKCgSfuPvJzX5TWHU0WJZIvSM="; + }; + + passthru = { + updateScript = addonUpdateScript { + attrPath = "kodi.packages.raiplay"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/maxbambi/plugin.video.raitv/"; + description = "Live radio and TV channels, latest 7 days of programming, broadcast archive, news"; + license = licenses.gpl3Only; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi/addons/simplecache/default.nix b/pkgs/applications/video/kodi/addons/simplecache/default.nix new file mode 100644 index 0000000000000..35c2cc5a1a336 --- /dev/null +++ b/pkgs/applications/video/kodi/addons/simplecache/default.nix @@ -0,0 +1,26 @@ +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: + +buildKodiAddon rec { + pname = "simplecache"; + namespace = "script.module.simplecache"; + version = "2.0.2"; + + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-xdOBIi99nspcDIKkjxcW1r/BqL8O9NxdDViTuvMtUmo="; + }; + + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.simplecache"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/kodi-community-addons/script.module.simplecache"; + description = "A simple object cache for Kodi addons"; + license = licenses.asl20; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi/addons/upnext/default.nix b/pkgs/applications/video/kodi/addons/upnext/default.nix new file mode 100644 index 0000000000000..dccfce4c3f0f6 --- /dev/null +++ b/pkgs/applications/video/kodi/addons/upnext/default.nix @@ -0,0 +1,26 @@ +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: + +buildKodiAddon rec { + pname = "upnext"; + namespace = "service.upnext"; + version = "1.1.9+matrix.1"; + + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-oNUk80MEzK6Qssn1KjT6psPTazISRoUif1IMo+BKJxo="; + }; + + passthru = { + pythonPath = "resources/lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.upnext"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/im85288/service.upnext"; + description = "Up Next - Proposes to play the next episode automatically"; + license = licenses.gpl2Only; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/losslesscut-bin/build-from-dmg.nix b/pkgs/applications/video/losslesscut-bin/build-from-dmg.nix index 9b3a91b9d029a..12b8205eec343 100644 --- a/pkgs/applications/video/losslesscut-bin/build-from-dmg.nix +++ b/pkgs/applications/video/losslesscut-bin/build-from-dmg.nix @@ -1,7 +1,7 @@ { lib , stdenvNoCC , fetchurl -, undmg +, _7zz , pname , version , hash @@ -19,15 +19,18 @@ in stdenvNoCC.mkDerivation { inherit pname version src; - nativeBuildInputs = [ undmg ]; + nativeBuildInputs = [ _7zz ]; sourceRoot = "LosslessCut.app"; installPhase = '' - mkdir -p "$out/Applications/LosslessCut.app" - cp -R . "$out/Applications/LosslessCut.app" + runHook preInstall + mkdir -p "$out/Applications" + cd .. + mv "$sourceRoot" "$out/Applications" mkdir -p "$out/bin" - ln -s "$out/Applications/LosslessCut.app/Contents/MacOS/LosslessCut" "$out/bin/losslesscut" + ln -s "$out/Applications/$(basename "$sourceRoot")/Contents/MacOS/LosslessCut" "$out/bin/losslesscut" + runHook postInstall ''; meta = metaCommon // (with lib; { diff --git a/pkgs/applications/video/losslesscut-bin/build-from-windows.nix b/pkgs/applications/video/losslesscut-bin/build-from-windows.nix index ddaf873806448..e6520e4a54b99 100644 --- a/pkgs/applications/video/losslesscut-bin/build-from-windows.nix +++ b/pkgs/applications/video/losslesscut-bin/build-from-windows.nix @@ -19,15 +19,20 @@ stdenvNoCC.mkDerivation { nativeBuildInputs = [ p7zip ]; unpackPhase = '' - 7z x $src -oLosslessCut-win-x64 + runHook preUnpack + 7z x "$src" -o"$sourceRoot" + runHook postUnpack ''; sourceRoot = "LosslessCut-win-x64"; installPhase = '' - mkdir -p $out/bin $out/libexec - (cd .. && mv LosslessCut-win-x64 $out/libexec) - ln -s "$out/libexec/LosslessCut-win-x64/LosslessCut.exe" "$out/bin/LosslessCut.exe" + runHook preInstall + mkdir -p "$out/bin" "$out/libexec" + cd .. + mv "$sourceRoot" "$out/libexec" + ln -s "$out/libexec/$(basename "$sourceRoot")/LosslessCut.exe" "$out/bin/LosslessCut.exe" + runHook postInstall ''; meta = metaCommon // (with lib; { diff --git a/pkgs/applications/video/losslesscut-bin/default.nix b/pkgs/applications/video/losslesscut-bin/default.nix index 745f481c6d5d4..c3ed6b306beb3 100644 --- a/pkgs/applications/video/losslesscut-bin/default.nix +++ b/pkgs/applications/video/losslesscut-bin/default.nix @@ -6,7 +6,7 @@ let pname = "losslesscut"; - version = "3.58.0"; + version = "3.61.1"; metaCommon = with lib; { description = "Swiss army knife of lossless video/audio editing"; homepage = "https://mifi.no/losslesscut/"; @@ -17,22 +17,22 @@ let }; x86_64-appimage = callPackage ./build-from-appimage.nix { inherit pname version metaCommon; - hash = "sha256-wmOdW5LdGLs6Wrt/VBlbC1ScFZBmd5gVQaj/cYADnWc="; + hash = "sha256-wKhEB+MfOsBvZRTIt3hLofw37+YO+hWKowlSi1OxSAU="; inherit (buildPackages) makeWrapper; }; x86_64-dmg = callPackage ./build-from-dmg.nix { inherit pname version metaCommon; - hash = "sha256-ZNUkzxpFTmsFcdC4oJWDxvqunpaBKz7Fnmrsa4W12Bg="; + hash = "sha256-yZYmM533D9VzM+a0bnYz/aqocaEJVFOTgLWjbQGOQR0="; isAarch64 = false; }; aarch64-dmg = callPackage ./build-from-dmg.nix { inherit pname version metaCommon; - hash = "sha256-PpQF31qsn9TOIRVzOdDoLUqti+m1uRpBQrrqKtxFleE="; + hash = "sha256-/qa2P0R7xRzDgnPKqkeKN6lrDbPg9WuZ/Nnc51NTzaM="; isAarch64 = true; }; x86_64-windows = callPackage ./build-from-windows.nix { inherit pname version metaCommon; - hash = "sha256-AgWvLU9m2q7fxZYXgHGMgEj1WLP5XzERq7tWcin2/30="; + hash = "sha256-0awYmSGxm8M12X0WQftlapRF9m3GGCZivNwBtRjSa4E="; }; in ( diff --git a/pkgs/applications/video/media-downloader/default.nix b/pkgs/applications/video/media-downloader/default.nix deleted file mode 100644 index 9340d174162df..0000000000000 --- a/pkgs/applications/video/media-downloader/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ aria2 -, cmake -, fetchFromGitHub -, ffmpeg -, lib -, python3 -, qtbase -, stdenv -, wrapQtAppsHook -, yt-dlp -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "media-downloader"; - version = "4.7.0"; - - src = fetchFromGitHub { - owner = "mhogomchungu"; - repo = "media-downloader"; - rev = finalAttrs.version; - hash = "sha256-ykPYxRgzKZrA0KwS1FoxZOkSL+7TbLgy0yLfs7Iqpf4="; - }; - - nativeBuildInputs = [ - cmake - wrapQtAppsHook - ]; - - buildInputs = [ - qtbase - ]; - - qtWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ - aria2 - ffmpeg - python3 - yt-dlp - ]}" - ]; - - meta = { - description = "Qt/C++ GUI front end for yt-dlp and others"; - homepage = "https://github.com/mhogomchungu/media-downloader"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ zendo ]; - platforms = lib.platforms.linux; - mainProgram = "media-downloader"; - }; -}) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix index 79ab2a32e26f1..e464079da93c7 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "obs-move-transition"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-move-transition"; rev = version; - sha256 = "sha256-wvPtcYW++PmDvCpgTIppvwg4Zibrg384yth9da11fMk="; + sha256 = "sha256-LZL9f/pX74rKW+wnNHGKwGuuISOTcFVr6W9h/JEK0U4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 6c104cef676d2..acb652e33cb77 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.7.16"; + version = "1.7.18"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - hash = "sha256-OApJaH11iTvjW4gZaANSCVcxw/VHG7a/6OnYcUcHFME="; + hash = "sha256-IlK5IwniaBhqMgxQzV8btQcbdJkNEQeUMoh6aOsBOHQ="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/ddev/default.nix b/pkgs/applications/virtualization/ddev/default.nix index 35c1f805c8ba3..549022d9908c2 100644 --- a/pkgs/applications/virtualization/ddev/default.nix +++ b/pkgs/applications/virtualization/ddev/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ddev"; - version = "1.23.1"; + version = "1.23.2"; src = fetchFromGitHub { owner = "ddev"; repo = "ddev"; rev = "v${version}"; - hash = "sha256-qGuYH2xYmd3CYoYobjoum+zUImcsiaG5No36FG0H0bA="; + hash = "sha256-pzBSyCIA2r/4zYIYEmKF6c0gryudSKZebSXSpmJUbsQ="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index db1d2ef0619f9..3d096c3389f9d 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -10,7 +10,7 @@ rec { , tiniRev, tiniHash , buildxSupport ? true, composeSupport ? true, sbomSupport ? false # package dependencies - , stdenv, fetchFromGitHub, fetchpatch, buildGoPackage + , stdenv, fetchFromGitHub, fetchpatch, buildGoModule , makeWrapper, installShellFiles, pkg-config, glibc , go-md2man, go, containerd, runc, tini, libtool , sqlite, iproute2, docker-buildx, docker-compose, docker-sbom @@ -23,7 +23,7 @@ rec { , withSeccomp ? stdenv.isLinux, libseccomp }: let - docker-runc = runc.overrideAttrs (oldAttrs: { + docker-runc = runc.overrideAttrs { pname = "docker-runc"; inherit version; @@ -36,7 +36,7 @@ rec { # docker/runc already include these patches / are not applicable patches = []; - }); + }; docker-containerd = containerd.overrideAttrs (oldAttrs: { pname = "docker-containerd"; @@ -53,7 +53,7 @@ rec { ++ lib.optionals withSeccomp [ libseccomp ]; }); - docker-tini = tini.overrideAttrs (oldAttrs: { + docker-tini = tini.overrideAttrs { pname = "docker-init"; inherit version; @@ -70,7 +70,7 @@ rec { buildInputs = [ glibc glibc.static ]; env.NIX_CFLAGS_COMPILE = "-DMINIMAL=ON"; - }); + }; moby-src = fetchFromGitHub { owner = "moby"; @@ -79,13 +79,13 @@ rec { hash = mobyHash; }; - moby = buildGoPackage (lib.optionalAttrs stdenv.isLinux rec { + moby = buildGoModule (lib.optionalAttrs stdenv.isLinux rec { pname = "moby"; inherit version; src = moby-src; - goPackagePath = "github.com/docker/docker"; + vendorHash = null; nativeBuildInputs = [ makeWrapper pkg-config go-md2man go libtool installShellFiles ]; buildInputs = [ sqlite ] @@ -126,16 +126,13 @@ rec { buildPhase = '' export GOCACHE="$TMPDIR/go-cache" # build engine - cd ./go/src/${goPackagePath} export AUTO_GOPATH=1 export DOCKER_GITCOMMIT="${cliRev}" export VERSION="${version}" ./hack/make.sh dynbinary - cd - ''; installPhase = '' - cd ./go/src/${goPackagePath} install -Dm755 ./bundles/dynbinary-daemon/dockerd $out/libexec/docker/dockerd install -Dm755 ./bundles/dynbinary-daemon/docker-proxy $out/libexec/docker/docker-proxy @@ -149,7 +146,7 @@ rec { # systemd install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service - substituteInPlace $out/etc/systemd/system/docker.service --replace /usr/bin/dockerd $out/bin/dockerd + substituteInPlace $out/etc/systemd/system/docker.service --replace-fail /usr/bin/dockerd $out/bin/dockerd install -Dm644 ./contrib/init/systemd/docker.socket $out/etc/systemd/system/docker.socket # rootless Docker @@ -169,7 +166,7 @@ rec { ++ lib.optional sbomSupport docker-sbom; pluginsRef = symlinkJoin { name = "docker-plugins"; paths = plugins; }; in - buildGoPackage (lib.optionalAttrs (!clientOnly) { + buildGoModule (lib.optionalAttrs (!clientOnly) { # allow overrides of docker components # TODO: move packages out of the let...in into top-level to allow proper overrides inherit docker-runc docker-containerd docker-tini moby; @@ -184,7 +181,7 @@ rec { hash = cliHash; }; - goPackagePath = "github.com/docker/cli"; + vendorHash = null; nativeBuildInputs = [ makeWrapper pkg-config go-md2man go libtool installShellFiles @@ -197,9 +194,9 @@ rec { postPatch = '' patchShebangs man scripts/build/ - substituteInPlace ./scripts/build/.variables --replace "set -eu" "" + substituteInPlace ./scripts/build/.variables --replace-fail "set -eu" "" '' + lib.optionalString (plugins != []) '' - substituteInPlace ./cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \ + substituteInPlace ./cli-plugins/manager/manager_unix.go --replace-fail /usr/libexec/docker/cli-plugins \ "${pluginsRef}/libexec/docker/cli-plugins" ''; @@ -207,7 +204,6 @@ rec { buildPhase = '' export GOCACHE="$TMPDIR/go-cache" - cd ./go/src/${goPackagePath} # Mimic AUTO_GOPATH mkdir -p .gopath/src/github.com/docker/ ln -sf $PWD .gopath/src/github.com/docker/cli @@ -215,17 +211,14 @@ rec { export GITCOMMIT="${cliRev}" export VERSION="${version}" export BUILDTIME="1970-01-01T00:00:00Z" - source ./scripts/build/.variables - export CGO_ENABLED=1 - go build -tags pkcs11 --ldflags "$GO_LDFLAGS" github.com/docker/cli/cmd/docker - cd - + make dynbinary + ''; outputs = ["out"] ++ lib.optional (lib.versionOlder version "23") "man"; installPhase = '' - cd ./go/src/${goPackagePath} - install -Dm755 ./docker $out/libexec/docker/docker + install -Dm755 ./build/docker $out/libexec/docker/docker makeWrapper $out/libexec/docker/docker $out/bin/docker \ --prefix PATH : "$out/libexec/docker:$extraPath" @@ -308,11 +301,11 @@ rec { }; docker_26 = callPackage dockerGen rec { - version = "26.1.3"; + version = "26.1.4"; cliRev = "v${version}"; - cliHash = "sha256-xE+g9Gtza4oAIlGUzDmjrqJa42bEkpbKbL2fsFlYzpY="; + cliHash = "sha256-7yCR49Un1i1kB+66IKt/8lgwKNkUjtVh52DH9OY8Pw4="; mobyRev = "v${version}"; - mobyHash = "sha256-s4hOvYV2+wDNKs4iFw6OflK+nemvqNhmfFURzhWaUzY="; + mobyHash = "sha256-0WwlpUECvmNq6DBm7U7rjzYfGKF7pxsfs9+x5uVPV0k="; runcRev = "v1.1.12"; runcHash = "sha256-N77CU5XiGYIdwQNPFyluXjseTeaYuNJ//OsEUS0g/v0="; containerdRev = "v1.7.15"; diff --git a/pkgs/applications/virtualization/docker/distribution.nix b/pkgs/applications/virtualization/docker/distribution.nix deleted file mode 100644 index 1a22aa0fafbff..0000000000000 --- a/pkgs/applications/virtualization/docker/distribution.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "distribution"; - version = "2.8.3"; - rev = "v${version}"; - - goPackagePath = "github.com/docker/distribution"; - - src = fetchFromGitHub { - owner = "docker"; - repo = "distribution"; - inherit rev; - sha256 = "sha256-6/clOTkI1JnDjb+crcHmjbQlaqffP/sntGqUB2ftajU="; - }; - - meta = with lib; { - description = "Docker toolset to pack, ship, store, and deliver content"; - license = licenses.asl20; - maintainers = []; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/virtualization/kraft/default.nix b/pkgs/applications/virtualization/kraft/default.nix index 76e6614dc33cb..1e066477b721b 100644 --- a/pkgs/applications/virtualization/kraft/default.nix +++ b/pkgs/applications/virtualization/kraft/default.nix @@ -38,6 +38,5 @@ buildGoModule rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ dit7ya ]; mainProgram = "kraft"; - broken = stdenv.isDarwin; # > machine/platform/iterator_v1alpha1.go:32:34: undefined: hostSupportedStrategies }; } diff --git a/pkgs/applications/virtualization/kvmtool/default.nix b/pkgs/applications/virtualization/kvmtool/default.nix index ddcc24f3557dc..880334294af66 100644 --- a/pkgs/applications/virtualization/kvmtool/default.nix +++ b/pkgs/applications/virtualization/kvmtool/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchzip, lib, dtc }: +{ stdenv, fetchgit, lib, dtc }: stdenv.mkDerivation { pname = "kvmtool"; - version = "unstable-2023-07-12"; + version = "0-unstable-2024-04-09"; - src = fetchzip { - url = "https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/snapshot/kvmtool-106e2ea7756d980454d68631b87d5e25ba4e4881.tar.gz"; - hash = "sha256-wpc5DfHnui0lBVH4uOq6a7pXVUZStjNLRvauu6QpRvE="; + src = fetchgit { + url = "https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git"; + rev = "da4cfc3e540341b84c4bbad705b5a15865bc1f80"; + hash = "sha256-05tNsZauOXe1L1y1YchzvLZm3xOctPJhHCjyAyRnwy4="; }; patches = [ ./strlcpy-glibc-2.38-fix.patch ]; @@ -17,18 +18,17 @@ stdenv.mkDerivation { makeFlags = [ "prefix=${placeholder "out"}" + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" + "ARCH=${stdenv.hostPlatform.linuxArch}" ] ++ lib.optionals stdenv.hostPlatform.isAarch64 ([ "LIBFDT_DIR=${dtc}/lib" - ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "CROSS_COMPILE=aarch64-unknown-linux-gnu-" - "ARCH=arm64" ]); meta = with lib; { description = "Lightweight tool for hosting KVM guests"; homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/tree/README"; license = licenses.gpl2Only; - maintainers = with maintainers; [ astro mfrw ]; + maintainers = with maintainers; [ astro mfrw peigongdsd ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; mainProgram = "lkvm"; }; diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 23b2a2f6e0f17..0a9a802f70f37 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "runc"; - version = "1.1.12"; + version = "1.1.13"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; rev = "v${version}"; - hash = "sha256-N77CU5XiGYIdwQNPFyluXjseTeaYuNJ//OsEUS0g/v0="; + hash = "sha256-RQsM8Q7HogDVGbNpen3wxXNGR9lfqmNhkXTRoC+LBk8="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/tart/default.nix b/pkgs/applications/virtualization/tart/default.nix index 60a84cd306759..d0f2f3a0127e1 100644 --- a/pkgs/applications/virtualization/tart/default.nix +++ b/pkgs/applications/virtualization/tart/default.nix @@ -10,11 +10,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "tart"; - version = "2.11.1"; + version = "2.12.0"; src = fetchurl { url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart-arm64.tar.gz"; - hash = "sha256-LOU7nCJChXgYq10AeZVAMa/QSUD4AKUSLLUKUBrk4UA="; + hash = "sha256-+33Z7M9Y8fWFfCBNJrXHljwoAn7p70+yvTmBwx1X68M="; }; sourceRoot = "."; diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 3cbc285076fee..c8bedb1e95690 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -28,6 +28,11 @@ python3.pkgs.buildPythonApplication rec { url = "https://github.com/virt-manager/virt-manager/commit/83fcc5b2e8f2cede84564387756fe8971de72188.patch"; hash = "sha256-yEk+md5EkwYpP27u3E+oTJ8thgtH2Uy1x3JIWPBhqeE="; }) + # fix crash with some cursor themes + (fetchpatch { + url = "https://github.com/virt-manager/virt-manager/commit/cc4a39ea94f42bc92765eb3bb56e2b7f9198be67.patch"; + hash = "sha256-dw6yrMaAOnTh8Z6xJQQKmYelOkOl6EBAOfJQU9vQ8Ws="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix index 413de25764114..859ddf6dcecc0 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix @@ -22,27 +22,27 @@ let plugins = { hy3 = { fetchFromGitHub, cmake, hyprland }: - mkHyprlandPlugin hyprland { + mkHyprlandPlugin hyprland rec { pluginName = "hy3"; - version = "0.40.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "outfoxxed"; repo = "hy3"; - rev = "hl0.40.0"; - hash = "sha256-Y9bIML3C5xyKKv+Yel4LUfSkScwGunOVZkg+Z1dPwHI="; + rev = "hl${version}"; + hash = "sha256-gEEWWlQRvejSR2RRg78Lubz6siIgknqj6CslveyyIP4="; }; nativeBuildInputs = [ cmake ]; dontStrip = true; - meta = with lib; { + meta = { homepage = "https://github.com/outfoxxed/hy3"; description = "Hyprland plugin for an i3 / sway like manual tiling layout"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.aacebedo ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ aacebedo ]; }; }; }; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-protocols/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland-protocols/default.nix index 050c1c73d63c4..8815205b0e9d1 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-protocols/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-protocols/default.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "hyprland-protocols"; - version = "0.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-QPzwwlGKX95tl6ZEshboZbEwwAXww6lNLdVYd6T9Mrc="; + hash = "sha256-HUklK5u86w2Yh9dOkk4FdsL8eehcOZ95jPhLixGDRQY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix b/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix index 876c24150036d..4089d82a3b977 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix @@ -24,13 +24,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "hyprpicker" + lib.optionalString debug "-debug"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-bys8S7wuY9FJRLD5WriktWED5Hi7nCKSiNbs1Rvfk4s="; + hash = "sha256-BYQF1zM6bJ44ag9FJ0aTSkhOTY9U7uRdp3SmRCs5fJM="; }; cmakeBuildType = if debug then "Debug" else "Release"; @@ -60,31 +60,9 @@ stdenv.mkDerivation (finalAttrs: { util-linux ]; - configurePhase = '' - runHook preConfigure - - make protocols - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - - make release - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{bin,share/licenses} - - install -Dm755 build/hyprpicker -t $out/bin - install -Dm644 LICENSE -t $out/share/licenses/hyprpicker - - runHook postInstall + postInstall = '' + mkdir -p $out/share/licenses + install -Dm644 $src/LICENSE -t $out/share/licenses/hyprpicker ''; meta = with lib; { diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix index 2825ef3a65636..609da88715661 100644 --- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix @@ -24,13 +24,13 @@ }: stdenv.mkDerivation (self: { pname = "xdg-desktop-portal-hyprland"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "hyprwm"; repo = "xdg-desktop-portal-hyprland"; rev = "v${self.version}"; - hash = "sha256-wP611tGIWBA4IXShWbah7TxqdbvhfcfT2vnXalX/qzk="; + hash = "sha256-KsX7sAwkEFpXiwyjt0HGTnnrUU58wW1jlzj5IA/LRz8="; }; nativeBuildInputs = [ diff --git a/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix b/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix index 16cf029ca3451..7ae9cfc9f6618 100644 --- a/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-global-tool/default.nix @@ -28,7 +28,7 @@ buildDotnetModule (args // { ] ++ (nugetDeps fetchNuGet); }; - projectFile = ""; + dotnetGlobalTool = true; useDotnetFromEnv = true; diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index 6f5df2d34b882..7b88b16064bca 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -69,7 +69,7 @@ , disabledTests ? [ ] # The project file to run unit tests against. This is usually referenced in the regular project file, but sometimes it needs to be manually set. # It gets restored and build, but not installed. You may need to regenerate your nuget lockfile after setting this. -, testProjectFile ? "" +, testProjectFile ? null # The type of build to perform. This is passed to `dotnet` with the `--configuration` flag. Possible values are `Release`, `Debug`, etc. , buildType ? "Release" @@ -88,17 +88,18 @@ } @ args: let + projectFiles = + lib.optionals (projectFile != null) (lib.toList projectFile); + testProjectFiles = + lib.optionals (testProjectFile != null) (lib.toList testProjectFile); + platforms = if args ? meta.platforms then lib.intersectLists args.meta.platforms dotnet-sdk.meta.platforms else dotnet-sdk.meta.platforms; inherit (callPackage ./hooks { - inherit dotnet-sdk disabledTests nuget-source dotnet-runtime runtimeDeps buildType; - runtimeId = - if runtimeId != null - then runtimeId - else dotnetCorePackages.systemToDotnetRid stdenvNoCC.targetPlatform.system; + inherit dotnet-sdk dotnet-runtime; }) dotnetConfigureHook dotnetBuildHook dotnetCheckHook dotnetInstallHook dotnetFixupHook; localDeps = @@ -143,6 +144,19 @@ let nugetDepsFile = _nugetDeps.sourceFile; in stdenvNoCC.mkDerivation (args // { + dotnetInstallPath = installPath; + dotnetExecutables = executables; + dotnetBuildType = buildType; + dotnetProjectFiles = projectFiles; + dotnetTestProjectFiles = testProjectFiles; + dotnetDisabledTests = disabledTests; + dotnetRuntimeId = runtimeId; + nugetSource = nuget-source; + dotnetRuntimeDeps = map lib.getLib runtimeDeps; + dotnetSelfContainedBuild = selfContainedBuild; + dotnetUseAppHost = useAppHost; + inherit useDotnetFromEnv; + nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ dotnetConfigureHook dotnetBuildHook @@ -172,7 +186,7 @@ stdenvNoCC.mkDerivation (args // { else [ ])); makeWrapperArgs = args.makeWrapperArgs or [ ] ++ [ - "--prefix LD_LIBRARY_PATH : ${dotnet-sdk.icu}/lib" + "--prefix" "LD_LIBRARY_PATH" ":" "${dotnet-sdk.icu}/lib" ]; # Stripping breaks the executable @@ -181,8 +195,6 @@ stdenvNoCC.mkDerivation (args // { # gappsWrapperArgs gets included when wrapping for dotnet, as to avoid double wrapping dontWrapGApps = args.dontWrapGApps or true; - inherit selfContainedBuild useAppHost useDotnetFromEnv; - # propagate the runtime sandbox profile since the contents apply to published # executables propagatedSandboxProfile = toString dotnet-runtime.__propagatedSandboxProfile; @@ -267,11 +279,11 @@ stdenvNoCC.mkDerivation (args // { --no-cache \ --force \ ${lib.optionalString (!enableParallelBuilding) "--disable-parallel"} \ - ${lib.optionalString (flags != []) (toString flags)} + ${lib.escapeShellArgs flags} } - declare -a projectFiles=( ${toString (lib.toList projectFile)} ) - declare -a testProjectFiles=( ${toString (lib.toList testProjectFile)} ) + declare -a projectFiles=( ${lib.escapeShellArgs projectFiles} ) + declare -a testProjectFiles=( ${lib.escapeShellArgs testProjectFiles} ) export DOTNET_NOLOGO=1 export DOTNET_CLI_TELEMETRY_OPTOUT=1 diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix index 44091604f5c2c..b9c51a743c6a6 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix @@ -4,28 +4,21 @@ , coreutils , zlib , openssl -, callPackage , makeSetupHook -, makeWrapper +, dotnetCorePackages + # Passed from ../default.nix , dotnet-sdk -, disabledTests -, nuget-source , dotnet-runtime -, runtimeDeps -, buildType -, runtimeId }: -assert (builtins.isString runtimeId); - let - libraryPath = lib.makeLibraryPath runtimeDeps; + runtimeId = dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system; in { dotnetConfigureHook = makeSetupHook { name = "dotnet-configure-hook"; substitutions = { - nugetSource = nuget-source; + runtimeId = lib.escapeShellArg runtimeId; dynamicLinker = "${stdenv.cc}/nix-support/dynamic-linker"; libPath = lib.makeLibraryPath [ stdenv.cc.cc.lib @@ -34,7 +27,6 @@ in zlib openssl ]; - inherit runtimeId; }; } ./dotnet-configure-hook.sh; @@ -43,7 +35,7 @@ in { name = "dotnet-build-hook"; substitutions = { - inherit buildType runtimeId; + runtimeId = lib.escapeShellArg runtimeId; }; } ./dotnet-build-hook.sh; @@ -52,15 +44,7 @@ in { name = "dotnet-check-hook"; substitutions = { - inherit buildType runtimeId libraryPath; - disabledTests = lib.optionalString (disabledTests != [ ]) - ( - let - escapedNames = lib.lists.map (n: lib.replaceStrings [ "," ] [ "%2C" ] n) disabledTests; - filters = lib.lists.map (n: "FullyQualifiedName!=${n}") escapedNames; - in - "${lib.concatStringsSep "&" filters}" - ); + runtimeId = lib.escapeShellArg runtimeId; }; } ./dotnet-check-hook.sh; @@ -69,7 +53,7 @@ in { name = "dotnet-install-hook"; substitutions = { - inherit buildType runtimeId; + runtimeId = lib.escapeShellArg runtimeId; }; } ./dotnet-install-hook.sh; @@ -79,11 +63,7 @@ in name = "dotnet-fixup-hook"; substitutions = { dotnetRuntime = dotnet-runtime; - runtimeDeps = libraryPath; - shell = stdenv.shell; - which = "${which}/bin/which"; - dirname = "${coreutils}/bin/dirname"; - realpath = "${coreutils}/bin/realpath"; + wrapperPath = lib.makeBinPath [ which coreutils ]; }; } ./dotnet-fixup-hook.sh; diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh index 798109291f92a..f209861f79b15 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh @@ -1,12 +1,25 @@ -# inherit arguments from derivation -dotnetBuildFlags=( ${dotnetBuildFlags[@]-} ) - dotnetBuildHook() { echo "Executing dotnetBuildHook" runHook preBuild - if [ "${enableParallelBuilding-}" ]; then + local -r hostRuntimeId=@runtimeId@ + local -r dotnetBuildType="${dotnetBuildType-Release}" + local -r dotnetRuntimeId="${dotnetRuntimeId-$hostRuntimeId}" + + if [[ -n $__structuredAttrs ]]; then + local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" ) + local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" ) + local dotnetFlagsArray=( "${dotnetFlags[@]}" ) + local dotnetBuildFlagsArray=( "${dotnetBuildFlags[@]}" ) + else + local dotnetProjectFilesArray=($dotnetProjectFiles) + local dotnetTestProjectFilesArray=($dotnetTestProjectFiles) + local dotnetFlagsArray=($dotnetFlags) + local dotnetBuildFlagsArray=($dotnetBuildFlags) + fi + + if [[ -n "${enableParallelBuilding-}" ]]; then local -r maxCpuFlag="$NIX_BUILD_CORES" local -r parallelBuildFlag="true" else @@ -14,50 +27,53 @@ dotnetBuildHook() { local -r parallelBuildFlag="false" fi - if [ "${selfContainedBuild-}" ]; then - dotnetBuildFlags+=("-p:SelfContained=true") + if [[ -n ${dotnetSelfContainedBuild-} ]]; then + dotnetBuildFlagsArray+=("-p:SelfContained=true") else - dotnetBuildFlags+=("-p:SelfContained=false") + dotnetBuildFlagsArray+=("-p:SelfContained=false") fi - if [ "${useAppHost-}" ]; then - dotnetBuildFlags+=("-p:UseAppHost=true") + if [[ -n ${dotnetUseAppHost-} ]]; then + dotnetBuildFlagsArray+=("-p:UseAppHost=true") fi - local versionFlags=() - if [ "${version-}" ]; then - versionFlags+=("-p:InformationalVersion=${version-}") + local versionFlagsArray=() + if [[ -n ${version-} ]]; then + versionFlagsArray+=("-p:InformationalVersion=$version") fi - if [ "${versionForDotnet-}" ]; then - versionFlags+=("-p:Version=${versionForDotnet-}") + if [[ -n ${versionForDotnet-} ]]; then + versionFlagsArray+=("-p:Version=$versionForDotnet") fi dotnetBuild() { - local -r project="${1-}" + local -r projectFile="${1-}" - runtimeIdFlags=() - if [[ "$project" == *.csproj ]] || [ "${selfContainedBuild-}" ]; then - runtimeIdFlags+=("--runtime @runtimeId@") + local runtimeIdFlagsArray=() + if [[ $projectFile == *.csproj || -n ${dotnetSelfContainedBuild-} ]]; then + runtimeIdFlagsArray+=("--runtime" "$dotnetRuntimeId") fi - dotnet build ${project-} \ - -maxcpucount:$maxCpuFlag \ - -p:BuildInParallel=$parallelBuildFlag \ + dotnet build ${1+"$projectFile"} \ + -maxcpucount:"$maxCpuFlag" \ + -p:BuildInParallel="$parallelBuildFlag" \ -p:ContinuousIntegrationBuild=true \ -p:Deterministic=true \ - --configuration "@buildType@" \ + --configuration "$dotnetBuildType" \ --no-restore \ - ${versionFlags[@]} \ - ${runtimeIdFlags[@]} \ - ${dotnetBuildFlags[@]} \ - ${dotnetFlags[@]} + "${versionFlagsArray[@]}" \ + "${runtimeIdFlagsArray[@]}" \ + "${dotnetBuildFlagsArray[@]}" \ + "${dotnetFlagsArray[@]}" } - (( "${#projectFile[@]}" == 0 )) && dotnetBuild + if (( ${#dotnetProjectFilesArray[@]} == 0 )); then + dotnetBuild + fi - for project in ${projectFile[@]} ${testProjectFile[@]-}; do - dotnetBuild "$project" + local projectFile + for projectFile in "${dotnetProjectFilesArray[@]}" "${dotnetTestProjectFilesArray[@]}"; do + dotnetBuild "$projectFile" done runHook postBuild @@ -65,6 +81,6 @@ dotnetBuildHook() { echo "Finished dotnetBuildHook" } -if [[ -z "${dontDotnetBuild-}" && -z "${buildPhase-}" ]]; then +if [[ -z ${dontDotnetBuild-} && -z ${buildPhase-} ]]; then buildPhase=dotnetBuildHook fi diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh index f19bf9f620feb..c91251f4f1807 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh @@ -1,39 +1,65 @@ -# inherit arguments from derivation -dotnetTestFlags=( ${dotnetTestFlags[@]-} ) - dotnetCheckHook() { echo "Executing dotnetCheckHook" runHook preCheck - if [ "${disabledTests-}" ]; then - local -r disabledTestsFlag="--filter @disabledTests@" + local -r hostRuntimeId=@runtimeId@ + local -r dotnetBuildType="${dotnetBuildType-Release}" + local -r dotnetRuntimeId="${dotnetRuntimeId-$hostRuntimeId}" + + if [[ -n $__structuredAttrs ]]; then + local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" ) + local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" ) + local dotnetTestFlagsArray=( "${dotnetTestFlags[@]}" ) + local dotnetDisabledTestsArray=( "${dotnetDisabledTests[@]}" ) + local dotnetRuntimeDepsArray=( "${dotnetRuntimeDeps[@]}" ) + else + local dotnetProjectFilesArray=($dotnetProjectFiles) + local dotnetTestProjectFilesArray=($dotnetTestProjectFiles) + local dotnetTestFlagsArray=($dotnetTestFlags) + local dotnetDisabledTestsArray=($dotnetDisabledTests) + local dotnetRuntimeDepsArray=($dotnetRuntimeDeps) + fi + + if (( ${#dotnetDisabledTestsArray[@]} > 0 )); then + local disabledTestsFilters=("${dotnetDisabledTestsArray[@]/#/FullyQualifiedName!=}") + local OLDIFS="$IFS" IFS='&' + dotnetTestFlagsArray+=("--filter:${disabledTestsFilters[*]//,/%2C}") + IFS="$OLDIFS" + fi + + local libraryPath="${LD_LIBRARY_PATH-}" + if (( ${#dotnetRuntimeDepsArray[@]} > 0 )); then + local libraryPathArray=("${dotnetRuntimeDepsArray[@]/%//lib}") + local OLDIFS="$IFS" IFS=':' + libraryPath="${libraryPathArray[*]}${libraryPath:+':'}$libraryPath" + IFS="$OLDIFS" fi - if [ "${enableParallelBuilding-}" ]; then + if [[ -n ${enableParallelBuilding-} ]]; then local -r maxCpuFlag="$NIX_BUILD_CORES" else local -r maxCpuFlag="1" fi - for project in ${testProjectFile[@]-${projectFile[@]}}; do - runtimeIdFlags=() - if [[ "$project" == *.csproj ]]; then - runtimeIdFlags=("--runtime @runtimeId@") + local projectFile + for projectFile in "${dotnetTestProjectFilesArray[@]-${dotnetProjectFilesArray[@]}}"; do + local runtimeIdFlagsArray=() + if [[ $projectFile == *.csproj ]]; then + runtimeIdFlagsArray=("--runtime" "$dotnetRuntimeId") fi - LD_LIBRARY_PATH="@libraryPath@" \ - dotnet test "$project" \ - -maxcpucount:$maxCpuFlag \ + LD_LIBRARY_PATH=$libraryPath \ + dotnet test "$projectFile" \ + -maxcpucount:"$maxCpuFlag" \ -p:ContinuousIntegrationBuild=true \ -p:Deterministic=true \ - --configuration "@buildType@" \ + --configuration "$dotnetBuildType" \ --no-build \ --logger "console;verbosity=normal" \ - ${disabledTestsFlag-} \ - ${runtimeIdFlags[@]} \ - "${dotnetTestFlags[@]}" \ - "${dotnetFlags[@]}" + "${runtimeIdFlagsArray[@]}" \ + "${dotnetTestFlagsArray[@]}" \ + "${dotnetFlagsArray[@]}" done runHook postCheck diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh index 3eb0d4e1f2309..12fa348699865 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh @@ -1,63 +1,103 @@ -declare -a projectFile testProjectFile - -# Inherit arguments from derivation -dotnetFlags=( ${dotnetFlags[@]-} ) -dotnetRestoreFlags=( ${dotnetRestoreFlags[@]-} ) - dotnetConfigureHook() { echo "Executing dotnetConfigureHook" runHook preConfigure - if [ -z "${enableParallelBuilding-}" ]; then + if [[ -z ${nugetSource-} ]]; then + echo + echo "ERROR: no dependencies were specified" + echo 'Hint: set `nugetSource` if using these hooks individually. If this is happening with `buildDotnetModule`, please open an issue.' + echo + + exit 1 + fi + + local nugetSourceSedQuoted="${nugetSource//[\/\\&$'\n']/\\&}" + local nugetSourceXMLQuoted="$nugetSource" + nugetSourceXMLQuoted="${nugetSource//&/\&}" + nugetSourceXMLQuoted="${nugetSourceXMLQuoted//\"/\"}" + + local -r hostRuntimeId=@runtimeId@ + local -r dynamicLinker=@dynamicLinker@ + local -r libPath=@libPath@ + local -r dotnetRuntimeId="${dotnetRuntimeId-$hostRuntimeId}" + + if [[ -n $__structuredAttrs ]]; then + local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" ) + local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" ) + local dotnetFlagsArray=( "${dotnetFlags[@]}" ) + local dotnetRestoreFlagsArray=( "${dotnetRestoreFlags[@]}" ) + else + local dotnetProjectFilesArray=($dotnetProjectFiles) + local dotnetTestProjectFilesArray=($dotnetTestProjectFiles) + local dotnetFlagsArray=($dotnetFlags) + local dotnetRestoreFlagsArray=($dotnetRestoreFlags) + fi + + if [[ -z ${enableParallelBuilding-} ]]; then local -r parallelFlag="--disable-parallel" fi dotnetRestore() { - local -r project="${1-}" - dotnet restore ${project-} \ + local -r projectFile="${1-}" + dotnet restore ${1+"$projectFile"} \ -p:ContinuousIntegrationBuild=true \ -p:Deterministic=true \ - --runtime "@runtimeId@" \ - --source "@nugetSource@/lib" \ + --runtime "$dotnetRuntimeId" \ + --source "$nugetSource/lib" \ ${parallelFlag-} \ - ${dotnetRestoreFlags[@]} \ - ${dotnetFlags[@]} + "${dotnetRestoreFlagsArray[@]}" \ + "${dotnetFlagsArray[@]}" } # Generate a NuGet.config file to make sure everything, # including things like <Sdk /> dependencies, is restored from the proper source -cat <<EOF > "./NuGet.config" + cat >NuGet.config <<EOF <?xml version="1.0" encoding="utf-8"?> <configuration> <packageSources> <clear /> - <add key="nugetSource" value="@nugetSource@/lib" /> + <add key="nugetSource" value="$nugetSourceXMLQuoted/lib" /> </packageSources> </configuration> EOF - # Patch paket.dependencies and paket.lock (if found) to use the proper source. This ensures - # paket restore works correctly - # We use + instead of / in sed to avoid problems with slashes - find -name paket.dependencies -exec sed -i 's+source .*+source @nugetSource@/lib+g' {} \; - find -name paket.lock -exec sed -i 's+remote:.*+remote: @nugetSource@/lib+g' {} \; - - dotnet tool restore --add-source "@nugetSource@/lib" - - (( "${#projectFile[@]}" == 0 )) && dotnetRestore + # Patch paket.dependencies and paket.lock (if found) to use the proper + # source. This ensures paket restore works correctly. Note that the + # nugetSourceSedQuoted abomination below safely escapes nugetSource string + # for use as a sed replacement string to avoid issues with slashes and other + # special characters ('&', '\\' and '\n'). + find -name paket.dependencies -exec sed -i "s/source .*/source $nugetSourceSedQuoted\/lib/g" {} \; + find -name paket.lock -exec sed -i "s/remote:.*/remote: $nugetSourceSedQuoted\/lib/g" {} \; + + dotnet tool restore --add-source "$nugetSource/lib" + + # dotnetGlobalTool is set in buildDotnetGlobalTool to patch dependencies but + # avoid other project-specific logic. This is a hack, but the old behavior + # is worse as it relied on a bug: setting projectFile to an empty string + # made the hooks actually skip all project-specific logic. It’s hard to keep + # backwards compatibility with this odd behavior now since we are using + # arrays, so instead we just pass a variable to indicate that we don’t have + # projects. + if [[ -z ${dotnetGlobalTool-} ]]; then + if (( ${#dotnetProjectFilesArray[@]} == 0 )); then + dotnetRestore + fi - for project in ${projectFile[@]} ${testProjectFile[@]-}; do - dotnetRestore "$project" - done + local projectFile + for projectFile in "${dotnetProjectFilesArray[@]}" "${dotnetTestProjectFilesArray[@]}"; do + dotnetRestore "$projectFile" + done + fi echo "Fixing up native binaries..." # Find all native binaries and nuget libraries, and fix them up, # by setting the proper interpreter and rpath to some commonly used libraries + local binary for binary in $(find "$HOME/.nuget/packages/" -type f -executable); do if patchelf --print-interpreter "$binary" >/dev/null 2>/dev/null; then echo "Found binary: $binary, fixing it up..." - patchelf --set-interpreter "$(cat "@dynamicLinker@")" "$binary" + patchelf --set-interpreter "$(cat "$dynamicLinker")" "$binary" # This makes sure that if the binary requires some specific runtime dependencies, it can find it. # This fixes dotnet-built binaries like crossgen2 @@ -68,7 +108,7 @@ EOF --add-needed libssl.so \ "$binary" - patchelf --set-rpath "@libPath@" "$binary" + patchelf --set-rpath "$libPath" "$binary" fi done diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh index e3671728af35e..f9aba29a43555 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh @@ -1,28 +1,55 @@ -# Inherit arguments from the derivation -declare -a derivationMakeWrapperArgs="( ${makeWrapperArgs-} )" -makeWrapperArgs=( "${derivationMakeWrapperArgs[@]}" ) - # First argument is the executable you want to wrap, # the second is the destination for the wrapper. wrapDotnetProgram() { - local dotnetRootFlags=() + local -r dotnetRuntime=@dotnetRuntime@ + local -r wrapperPath=@wrapperPath@ + + local -r dotnetFromEnvScript='dotnetFromEnv() { + local dotnetPath + if command -v dotnet 2>&1 >/dev/null; then + dotnetPath=$(which dotnet) && \ + dotnetPath=$(realpath "$dotnetPath") && \ + dotnetPath=$(dirname "$dotnetPath") && \ + export DOTNET_ROOT="$dotnetPath" + fi +} +dotnetFromEnv' + + if [[ -n $__structuredAttrs ]]; then + local -r dotnetRuntimeDepsArray=( "${dotnetRuntimeDeps[@]}" ) + local -r makeWrapperArgsArray=( "${makeWrapperArgs[@]}" ) + else + local -r dotnetRuntimeDepsArray=($dotnetRuntimeDeps) + local -r makeWrapperArgsArray=($makeWrapperArgs) + fi - if [ ! "${selfContainedBuild-}" ]; then - if [ "${useDotnetFromEnv-}" ]; then + local dotnetRuntimeDepsFlags=() + if (( ${#dotnetRuntimeDepsArray[@]} > 0 )); then + local libraryPathArray=("${dotnetRuntimeDepsArray[@]/%//lib}") + local OLDIFS="$IFS" IFS=':' + dotnetRuntimeDepsFlags+=("--suffix" "LD_LIBRARY_PATH" ":" "${libraryPathArray[*]}") + IFS="$OLDIFS" + fi + + local dotnetRootFlagsArray=() + if [[ -z ${dotnetSelfContainedBuild-} ]]; then + if [[ -n ${useDotnetFromEnv-} ]]; then # if dotnet CLI is available, set DOTNET_ROOT based on it. Otherwise set to default .NET runtime - dotnetRootFlags+=("--run" 'command -v dotnet &>/dev/null && export DOTNET_ROOT="$(@dirname@ "$(@realpath@ "$(@which@ dotnet)")")" || export DOTNET_ROOT="@dotnetRuntime@"') - dotnetRootFlags+=("--suffix" "PATH" ":" "@dotnetRuntime@/bin") + dotnetRootFlagsArray+=("--suffix" "PATH" ":" "$wrapperPath") + dotnetRootFlagsArray+=("--run" "$dotnetFromEnvScript") + dotnetRootFlagsArray+=("--set-default" "DOTNET_ROOT" "$dotnetRuntime") + dotnetRootFlagsArray+=("--suffix" "PATH" ":" "$dotnetRuntime/bin") else - dotnetRootFlags+=("--set" "DOTNET_ROOT" "@dotnetRuntime@") - dotnetRootFlags+=("--prefix" "PATH" ":" "@dotnetRuntime@/bin") + dotnetRootFlagsArray+=("--set" "DOTNET_ROOT" "$dotnetRuntime") + dotnetRootFlagsArray+=("--prefix" "PATH" ":" "$dotnetRuntime/bin") fi fi makeWrapper "$1" "$2" \ - --suffix "LD_LIBRARY_PATH" : "@runtimeDeps@" \ - "${dotnetRootFlags[@]}" \ + "${dotnetRuntimeDepsFlags[@]}" \ + "${dotnetRootFlagsArray[@]}" \ "${gappsWrapperArgs[@]}" \ - "${makeWrapperArgs[@]}" + "${makeWrapperArgsArray[@]}" echo "installed wrapper to "$2"" } @@ -30,13 +57,24 @@ wrapDotnetProgram() { dotnetFixupHook() { echo "Executing dotnetFixupPhase" - # check if executables is declared (including empty values, in which case we generate no executables) - if declare -p executables &>/dev/null; then - for executable in ${executables[@]}; do - path="${installPath-$out/lib/$pname}/$executable" + local -r dotnetInstallPath="${dotnetInstallPath-$out/lib/$pname}" + + local executable executableBasename + + # check if dotnetExecutables is declared (including empty values, in which case we generate no executables) + if declare -p dotnetExecutables &>/dev/null; then + if [[ -n $__structuredAttrs ]]; then + local dotnetExecutablesArray=( "${dotnetExecutables[@]}" ) + else + local dotnetExecutablesArray=($dotnetExecutables) + fi + for executable in "${dotnetExecutablesArray[@]}"; do + executableBasename=$(basename "$executable") + + local path="$dotnetInstallPath/$executable" if test -x "$path"; then - wrapDotnetProgram "$path" "$out/bin/$(basename "$executable")" + wrapDotnetProgram "$path" "$out/bin/$executableBasename" else echo "Specified binary \"$executable\" is either not an executable or does not exist!" echo "Looked in $path" @@ -45,8 +83,9 @@ dotnetFixupHook() { done else while IFS= read -d '' executable; do - wrapDotnetProgram "$executable" "$out/bin/$(basename "$executable")" \; - done < <(find "${installPath-$out/lib/$pname}" ! -name "*.dll" -executable -type f -print0) + executableBasename=$(basename "$executable") + wrapDotnetProgram "$executable" "$out/bin/$executableBasename" \; + done < <(find "$dotnetInstallPath" ! -name "*.dll" -executable -type f -print0) fi echo "Finished dotnetFixupPhase" diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh index ed754d8ffcad9..4d9b3c502c354 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh @@ -1,70 +1,86 @@ -# inherit arguments from derivation -dotnetInstallFlags=( ${dotnetInstallFlags[@]-} ) - dotnetInstallHook() { echo "Executing dotnetInstallHook" runHook preInstall - if [ "${selfContainedBuild-}" ]; then - dotnetInstallFlags+=("--self-contained") + local -r hostRuntimeId=@runtimeId@ + local -r dotnetInstallPath="${dotnetInstallPath-$out/lib/$pname}" + local -r dotnetBuildType="${dotnetBuildType-Release}" + local -r dotnetRuntimeId="${dotnetRuntimeId-$hostRuntimeId}" + + if [[ -n $__structuredAttrs ]]; then + local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" ) + local dotnetFlagsArray=( "${dotnetFlags[@]}" ) + local dotnetInstallFlagsArray=( "${dotnetInstallFlags[@]}" ) + local dotnetPackFlagsArray=( "${dotnetPackFlags[@]}" ) + else + local dotnetProjectFilesArray=($dotnetProjectFiles) + local dotnetFlagsArray=($dotnetFlags) + local dotnetInstallFlagsArray=($dotnetInstallFlags) + local dotnetPackFlagsArray=($dotnetPackFlags) + fi + + if [[ -n ${dotnetSelfContainedBuild-} ]]; then + dotnetInstallFlagsArray+=("--self-contained") else - dotnetInstallFlags+=("--no-self-contained") + dotnetInstallFlagsArray+=("--no-self-contained") # https://learn.microsoft.com/en-us/dotnet/core/deploying/trimming/trim-self-contained # Trimming is only available for self-contained build, so force disable it here - dotnetInstallFlags+=("-p:PublishTrimmed=false") + dotnetInstallFlagsArray+=("-p:PublishTrimmed=false") fi - if [ "${useAppHost-}" ]; then - dotnetInstallFlags+=("-p:UseAppHost=true") + if [[ -n ${dotnetUseAppHost-} ]]; then + dotnetInstallFlagsArray+=("-p:UseAppHost=true") fi dotnetPublish() { - local -r project="${1-}" + local -r projectFile="${1-}" - runtimeIdFlags=() - if [[ "$project" == *.csproj ]] || [ "${selfContainedBuild-}" ]; then - runtimeIdFlags+=("--runtime @runtimeId@") + runtimeIdFlagsArray=() + if [[ $projectFile == *.csproj || -n ${dotnetSelfContainedBuild-} ]]; then + runtimeIdFlagsArray+=("--runtime" "$dotnetRuntimeId") fi - dotnet publish ${project-} \ + dotnet publish ${1+"$projectFile"} \ -p:ContinuousIntegrationBuild=true \ -p:Deterministic=true \ - --output "${installPath-$out/lib/$pname}" \ - --configuration "@buildType@" \ + --output "$dotnetInstallPath" \ + --configuration "$dotnetBuildType" \ --no-build \ - ${runtimeIdFlags[@]} \ - ${dotnetInstallFlags[@]} \ - ${dotnetFlags[@]} + "${runtimeIdFlagsArray[@]}" \ + "${dotnetInstallFlagsArray[@]}" \ + "${dotnetFlagsArray[@]}" } dotnetPack() { - local -r project="${1-}" - dotnet pack ${project-} \ + local -r projectFile="${1-}" + dotnet pack ${1+"$projectFile"} \ -p:ContinuousIntegrationBuild=true \ -p:Deterministic=true \ --output "$out/share" \ - --configuration "@buildType@" \ + --configuration "$dotnetBuildType" \ --no-build \ - --runtime "@runtimeId@" \ - ${dotnetPackFlags[@]} \ - ${dotnetFlags[@]} + --runtime "$dotnetRuntimeId" \ + "${dotnetPackFlagsArray[@]}" \ + "${dotnetFlagsArray[@]}" } - if (( "${#projectFile[@]}" == 0 )); then + if (( ${#dotnetProjectFilesArray[@]} == 0 )); then dotnetPublish else - for project in ${projectFile[@]}; do - dotnetPublish "$project" + local projectFile + for projectFile in "${dotnetProjectFilesArray[@]}"; do + dotnetPublish "$projectFile" done fi - if [[ "${packNupkg-}" ]]; then - if (( "${#projectFile[@]}" == 0 )); then + if [[ -n ${packNupkg-} ]]; then + if (( ${#dotnetProjectFilesArray[@]} == 0 )); then dotnetPack else - for project in ${projectFile[@]}; do - dotnetPack "$project" + local projectFile + for projectFile in "${dotnetProjectFilesArray[@]}"; do + dotnetPack "$projectFile" done fi fi diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index 49929fd877544..ff6c6b31006f7 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -14,16 +14,28 @@ # absolutely no mac support for now -{ pubGetScript ? "flutter pub get" +{ pubGetScript ? null , flutterBuildFlags ? [ ] , targetFlutterPlatform ? "linux" , extraWrapProgramArgs ? "" +, flutterMode ? null , ... }@args: let + hasEngine = flutter ? engine && flutter.engine != null && flutter.engine.meta.available; + flutterMode = args.flutterMode or (if hasEngine then flutter.engine.runtimeMode else "release"); + + flutterFlags = lib.optional hasEngine "--local-engine host_${flutterMode}${lib.optionalString (!flutter.engine.isOptimized) "_unopt"}"; + + flutterBuildFlags = [ + "--${flutterMode}" + ] ++ (args.flutterBuildFlags or []) ++ flutterFlags; + builderArgs = rec { universal = args // { + inherit flutterMode flutterFlags flutterBuildFlags; + sdkSetupScript = '' # Pub needs SSL certificates. Dart normally looks in a hardcoded path. # https://github.com/dart-lang/sdk/blob/3.1.0/runtime/bin/security_context_linux.cc#L48 @@ -46,11 +58,11 @@ let ''}/bin/dart" export HOME="$NIX_BUILD_TOP" - flutter config --no-analytics &>/dev/null # mute first-run - flutter config --enable-linux-desktop >/dev/null + flutter config $flutterFlags --no-analytics &>/dev/null # mute first-run + flutter config $flutterFlags --enable-linux-desktop >/dev/null ''; - inherit pubGetScript; + pubGetScript = args.pubGetScript or "flutter${lib.optionalString hasEngine " --local-engine $flutterMode"} pub get"; sdkSourceBuilders = { # https://github.com/dart-lang/pub/blob/68dc2f547d0a264955c1fa551fa0a0e158046494/lib/src/sdk/flutter.dart#L81 @@ -67,6 +79,20 @@ let exit 1 fi ''; + # https://github.com/dart-lang/pub/blob/e1fbda73d1ac597474b82882ee0bf6ecea5df108/lib/src/sdk/dart.dart#L80 + "dart" = name: runCommand "dart-sdk-${name}" { passthru.packageRoot = "."; } '' + for path in '${flutter.dart}/pkg/${name}'; do + if [ -d "$path" ]; then + ln -s "$path" "$out" + break + fi + done + + if [ ! -e "$out" ]; then + echo 1>&2 'The Dart SDK does not contain the requested package: ${name}!' + exit 1 + fi + ''; }; extraPackageConfigSetup = '' @@ -108,7 +134,7 @@ let mkdir -p build/flutter_assets/fonts - flutter build linux -v --release --split-debug-info="$debug" ${builtins.concatStringsSep " " (map (flag: "\"${flag}\"") flutterBuildFlags)} + flutter build linux -v --split-debug-info="$debug" $flutterBuildFlags runHook postBuild ''; @@ -117,7 +143,7 @@ let installPhase = universal.installPhase or '' runHook preInstall - built=build/linux/*/release/bundle + built=build/linux/*/$flutterMode/bundle mkdir -p $out/bin mv $built $out/app @@ -159,7 +185,7 @@ let mkdir -p build/flutter_assets/fonts - flutter build web -v --release ${builtins.concatStringsSep " " (map (flag: "\"${flag}\"") flutterBuildFlags)} + flutter build web -v $flutterBuildFlags runHook postBuild ''; diff --git a/pkgs/build-support/node/fetch-yarn-deps/default.nix b/pkgs/build-support/node/fetch-yarn-deps/default.nix index 7f0e0692f81f6..4ef74c0cab884 100644 --- a/pkgs/build-support/node/fetch-yarn-deps/default.nix +++ b/pkgs/build-support/node/fetch-yarn-deps/default.nix @@ -25,7 +25,8 @@ in { tar --strip-components=1 -xf ${yarnpkg-lockfile-tar} package/index.js mv index.js $out/libexec/yarnpkg-lockfile.js - cp ${./.}/common.js ${./.}/index.js $out/libexec/ + cp ${./common.js} $out/libexec/common.js + cp ${./index.js} $out/libexec/index.js patchShebangs $out/libexec makeWrapper $out/libexec/index.js $out/bin/prefetch-yarn-deps \ @@ -53,7 +54,8 @@ in { tar --strip-components=1 -xf ${yarnpkg-lockfile-tar} package/index.js mv index.js $out/libexec/yarnpkg-lockfile.js - cp ${./.}/common.js ${./.}/fixup.js $out/libexec/ + cp ${./common.js} $out/libexec/common.js + cp ${./fixup.js} $out/libexec/fixup.js patchShebangs $out/libexec makeWrapper $out/libexec/fixup.js $out/bin/fixup-yarn-lock @@ -97,7 +99,7 @@ in { ''; outputHashMode = "recursive"; - } // hash_ // (removeAttrs args ["src" "name" "hash" "sha256"])); + } // hash_ // (removeAttrs args (["name" "hash" "sha256"] ++ (lib.optional (src == null) "src")))); in lib.setFunctionArgs f (lib.functionArgs f) // { inherit tests; diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index 6b88271602623..4077ee5ced8e4 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -224,7 +224,7 @@ in '' CRATENAME=$(echo ${crateName} | sed -e "s/\(.*\)-sys$/\U\1/" -e "s/-/_/g") grep -P "^cargo:(?!(rustc-|warning=|rerun-if-changed=|rerun-if-env-changed))" target/build/${crateName}.opt \ - | awk -F= "/^cargo:/ { sub(/^cargo:/, \"\", \$1); gsub(/-/, \"_\", \$1); print \"export \" toupper(\"DEP_$(echo $CRATENAME)_\" \$1) \"=\" \$2 }" > target/env + | awk -F= "/^cargo:/ { sub(/^cargo:/, \"\", \$1); gsub(/-/, \"_\", \$1); print \"export \" toupper(\"DEP_$(echo $CRATENAME)_\" \$1) \"=\" \"\\\"\"\$2\"\\\"\" }" > target/env set -e fi runHook postConfigure diff --git a/pkgs/by-name/_6/_64gram/package.nix b/pkgs/by-name/_6/_64gram/package.nix index 552ac3669aa17..da1357c71e8fb 100644 --- a/pkgs/by-name/_6/_64gram/package.nix +++ b/pkgs/by-name/_6/_64gram/package.nix @@ -7,7 +7,7 @@ telegram-desktop.overrideAttrs (old: rec { pname = "64gram"; - version = "1.1.27"; + version = "1.1.29"; src = fetchFromGitHub { owner = "TDesktop-x64"; @@ -15,7 +15,7 @@ telegram-desktop.overrideAttrs (old: rec { rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-5Q2VxjiT1IpqCC9oXgHbKxcEfV/gPah0ovOpQ9TZJZs="; + hash = "sha256-OJiVmmDIsijK/IHGEdsCoAwvc9JlSth+76r9O1aJbd0="; }; passthru.updateScript = nix-update-script {}; diff --git a/pkgs/by-name/ad/ad-miner/package.nix b/pkgs/by-name/ad/ad-miner/package.nix index f3c3f6778b43f..4a6d93c2d91c3 100644 --- a/pkgs/by-name/ad/ad-miner/package.nix +++ b/pkgs/by-name/ad/ad-miner/package.nix @@ -18,12 +18,15 @@ python3.pkgs.buildPythonApplication rec { # All requirements are pinned pythonRelaxDeps = true; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ poetry-core + ]; + + nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ neo4j numpy pytz diff --git a/pkgs/by-name/am/amazon-ssm-agent/package.nix b/pkgs/by-name/am/amazon-ssm-agent/package.nix index 5845d5c71aa31..62f66302806ff 100644 --- a/pkgs/by-name/am/amazon-ssm-agent/package.nix +++ b/pkgs/by-name/am/amazon-ssm-agent/package.nix @@ -14,7 +14,6 @@ , nixosTests , testers , amazon-ssm-agent -, overrideEtc ? true }: let @@ -96,9 +95,6 @@ buildGoModule rec { --replace "/sbin/shutdown" "shutdown" echo "${version}" > VERSION - '' + lib.optionalString overrideEtc '' - substituteInPlace agent/appconfig/constants_unix.go \ - --replace '"/etc/amazon/ssm/"' '"${placeholder "out"}/etc/amazon/ssm/"' '' + lib.optionalString stdenv.isLinux '' substituteInPlace agent/managedInstances/fingerprint/hardwareInfo_unix.go \ --replace /usr/sbin/dmidecode ${dmidecode}/bin/dmidecode diff --git a/pkgs/by-name/an/ananicy-cpp/package.nix b/pkgs/by-name/an/ananicy-cpp/package.nix index 36f56c6dffaf1..8d3416f69c57c 100644 --- a/pkgs/by-name/an/ananicy-cpp/package.nix +++ b/pkgs/by-name/an/ananicy-cpp/package.nix @@ -75,7 +75,7 @@ clangStdenv.mkDerivation rec { meta = { homepage = "https://gitlab.com/ananicy-cpp/ananicy-cpp"; description = "Rewrite of ananicy in c++ for lower cpu and memory usage"; - license = lib.licenses.gpl3Only; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ artturin diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix index 3329b40dfbf79..e8cd712eda1d2 100644 --- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix +++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "ananicy-rules-cachyos"; - version = "0-unstable-2024-06-07"; + version = "0-unstable-2024-06-14"; src = fetchFromGitHub { owner = "CachyOS"; repo = "ananicy-rules"; - rev = "38b3e8c12801df68ba15c2d96ee96d7d2362b576"; - hash = "sha256-yVKzkASMzJDmgzS0CxEFky2Y4Bs4vlbRJgUI+uG3muY="; + rev = "e3638ebb2320202ede9facfc9657cc8af2098a2d"; + hash = "sha256-lIhXeqPJKC3brxVhIK04K9AAU+RqqqOwN/gUevYmaDM="; }; dontConfigure = true; diff --git a/pkgs/by-name/ap/application-title-bar/package.nix b/pkgs/by-name/ap/application-title-bar/package.nix index 382e5b87f9297..57de40bcf25f1 100644 --- a/pkgs/by-name/ap/application-title-bar/package.nix +++ b/pkgs/by-name/ap/application-title-bar/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "application-title-bar"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "antroids"; repo = "application-title-bar"; rev = "v${version}"; - hash = "sha256-KKODCfLL+T4NdflxUFP++TO3OtQWJpLHAnUVqmvIzrg="; + hash = "sha256-r15wZCioWrTr5mA0WARFd4j8zwWIWU4wEv899RSURa4="; }; propagatedUserEnvPkgs = with kdePackages; [ kconfig ]; diff --git a/pkgs/by-name/ap/apt/package.nix b/pkgs/by-name/ap/apt/package.nix index 28b10c954745d..7c41e4edd4417 100644 --- a/pkgs/by-name/ap/apt/package.nix +++ b/pkgs/by-name/ap/apt/package.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "apt"; - version = "2.9.4"; + version = "2.9.5"; src = fetchurl { url = "mirror://debian/pool/main/a/apt/apt_${finalAttrs.version}.tar.xz"; - hash = "sha256-Ra6jeJM7nkaPZWBR7Sv8+TurArs1D5TodUcn6xe0B6Q="; + hash = "sha256-bSstTP+9gxOhHnO8PIb4/5W8Xg3vc1nvrDAz9WMFGJQ="; }; # cycle detection; lib can't be split diff --git a/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix b/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix index bae622f00fd2b..608a02d70bf02 100644 --- a/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix +++ b/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix @@ -5,13 +5,13 @@ }: python3Packages.buildPythonApplication rec { pname = "arxiv-latex-cleaner"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "google-research"; repo = "arxiv-latex-cleaner"; rev = "refs/tags/v${version}"; - hash = "sha256-Yxp8XtlISVZfEjCEJ/EXsIGMCHDPOwPcjkJxECeXvYk="; + hash = "sha256-S/r5riFIsRG+5za+4kVvUXOLIJ3ELCDWlSpYeSuNs+s="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/as/aseprite/package.nix b/pkgs/by-name/as/aseprite/package.nix new file mode 100644 index 0000000000000..13cd6e6bb0ddb --- /dev/null +++ b/pkgs/by-name/as/aseprite/package.nix @@ -0,0 +1,171 @@ +{ + clangStdenv, + cmake, + cmark, + curl, + fetchFromGitHub, + fetchpatch, + fmt, + fontconfig, + freetype, + giflib, + gitUpdater, + glib, + harfbuzzFull, + lib, + libGL, + libjpeg, + libpng, + libwebp, + libX11, + libXcursor, + libXext, + libXi, + libXxf86vm, + ninja, + pcre2, + pixman, + pkg-config, + skia-aseprite, + tinyxml-2, + zlib, +}: + +clangStdenv.mkDerivation (finalAttrs: { + pname = "aseprite"; + version = "1.3.7"; + + src = fetchFromGitHub { + owner = "aseprite"; + repo = "aseprite"; + rev = "v" + finalAttrs.version; + fetchSubmodules = true; + hash = "sha256-75kYJXmyags0cW2D5Ksq1uUrFSCAkFOdmn7Ya/6jLXc="; + }; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + ]; + + buildInputs = [ + cmark + curl + fmt + fontconfig + freetype + giflib + glib + harfbuzzFull + libGL + libjpeg + libpng + libwebp + libX11 + libXcursor + libXext + libXi + libXxf86vm + pcre2 + pixman + skia-aseprite + tinyxml-2 + zlib + ]; + + patches = [ + # https://github.com/aseprite/aseprite/issues/4486 + # FIXME: remove on next release. + (fetchpatch { + name = "ENABLE_UPDATER-fix.patch"; + url = "https://github.com/aseprite/aseprite/commit/8fce589.patch"; + hash = "sha256-DbL6kK//gQXbsXEn/t+KTuoM7E9ocPAsVqEO+lYrka4="; + }) + ./shared-fmt.patch + ./shared-libwebp.patch + ./shared-skia-deps.patch + ]; + + postPatch = + let + # Translation strings + strings = fetchFromGitHub { + owner = "aseprite"; + repo = "strings"; + rev = "e18a09fefbb6cd904e506183d5fbe08558a52ed4"; + hash = "sha256-GyCCxbhgf0vST20EH/+KkNLrF+U9Xzgpxlao8s925PQ="; + }; + in + '' + sed -i src/ver/CMakeLists.txt -e "s-set(VERSION \".*\")-set(VERSION \"$version\")-" + rm -rf data/strings + cp -r ${strings} data/strings + ''; + + cmakeFlags = [ + "-DENABLE_DESKTOP_INTEGRATION=ON" + "-DENABLE_UPDATER=OFF" + "-DUSE_SHARED_CMARK=ON" + "-DUSE_SHARED_CURL=ON" + "-DUSE_SHARED_FMT=ON" + "-DUSE_SHARED_FREETYPE=ON" + "-DUSE_SHARED_GIFLIB=ON" + "-DUSE_SHARED_HARFBUZZ=ON" + "-DUSE_SHARED_JPEGLIB=ON" + "-DUSE_SHARED_LIBPNG=ON" + "-DUSE_SHARED_LIBWEBP=ON" + "-DUSE_SHARED_PIXMAN=ON" + "-DUSE_SHARED_TINYXML=ON" + "-DUSE_SHARED_WEBP=ON" + "-DUSE_SHARED_ZLIB=ON" + # Disable libarchive programs. + "-DENABLE_CAT=OFF" + "-DENABLE_CPIO=OFF" + "-DENABLE_TAR=OFF" + # UI backend. + "-DLAF_OS_BACKEND=skia" + "-DLAF_WITH_EXAMPLES=OFF" + "-DSKIA_DIR=${skia-aseprite}" + "-DSKIA_LIBRARY_DIR=${skia-aseprite}/lib" + ]; + + postInstall = '' + # Install desktop icons. + src="$out/share/aseprite/data/icons" + for size in 16 32 48 64 128 256; do + dst="$out"/share/icons/hicolor/"$size"x"$size" + install -Dm644 "$src"/ase"$size".png "$dst"/apps/aseprite.png + install -Dm644 "$src"/doc"$size".png "$dst"/mimetypes/image-x-aseprite.png + done + # Delete unneeded artifacts of bundled libraries. + rm -rf "$out"/{include,lib,man} + ''; + + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + + meta = { + homepage = "https://www.aseprite.org/"; + description = "Animated sprite editor & pixel art tool"; + license = lib.licenses.unfree; + longDescription = '' + Aseprite is a program to create animated sprites. Its main features are: + + - Sprites are composed by layers & frames (as separated concepts). + - Supported color modes: RGBA, Indexed (palettes up to 256 colors), and Grayscale. + - Load/save sequence of PNG files and GIF animations (and FLC, FLI, JPG, BMP, PCX, TGA). + - Export/import animations to/from Sprite Sheets. + - Tiled drawing mode, useful to draw patterns and textures. + - Undo/Redo for every operation. + - Real-time animation preview. + - Multiple editors support. + - Pixel-art specific tools like filled Contour, Polygon, Shading mode, etc. + - Onion skinning. + ''; + maintainers = with lib.maintainers; [ + orivej + vigress8 + ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/as/aseprite/shared-fmt.patch b/pkgs/by-name/as/aseprite/shared-fmt.patch new file mode 100644 index 0000000000000..794d8a4adcc16 --- /dev/null +++ b/pkgs/by-name/as/aseprite/shared-fmt.patch @@ -0,0 +1,71 @@ +--- a/CMakeLists.txt 2022-01-08 00:37:08.165330523 +0100 ++++ b/CMakeLists.txt 2022-01-08 00:52:41.163585173 +0100 +@@ -54,6 +54,7 @@ + + option(USE_SHARED_CMARK "Use your installed copy of cmark" off) + option(USE_SHARED_CURL "Use your installed copy of curl" off) ++option(USE_SHARED_FMT "Use your installed copy of fmt" off) + option(USE_SHARED_GIFLIB "Use your installed copy of giflib" off) + option(USE_SHARED_JPEGLIB "Use your installed copy of jpeglib" off) + option(USE_SHARED_ZLIB "Use your installed copy of zlib" off) +@@ -165,6 +165,7 @@ + set(SOURCE_DATA_DIR ${CMAKE_CURRENT_SOURCE_DIR}/data) + set(CMARK_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/cmark) + set(CURL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/curl) ++set(FMT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/fmt) + set(GIFLIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/giflib) + set(LIBJPEG_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/jpeg) + set(LIBPNG_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/libpng) +@@ -204,6 +205,15 @@ + set(CURL_STATICLIB ON BOOL) + endif() + ++if(USE_SHARED_FMT) ++ find_package(FMT REQUIRED) ++ set(FMT_LIBRARIES fmt::fmt) ++else() ++ set(FMT_FOUND) ++ set(FMT_LIBRARIES fmt) ++ # No need to include extra directories, actually ++endif() ++ + # zlib + if(USE_SHARED_ZLIB) + find_package(ZLIB REQUIRED) +--- a/src/app/CMakeLists.txt 2022-01-08 00:37:07.378671200 +0100 ++++ b/src/app/CMakeLists.txt 2022-01-08 00:53:13.669969512 +0100 +@@ -741,7 +741,7 @@ target_link_libraries(app-lib + ${HARFBUZZ_LIBRARIES} + json11 + archive_static +- fmt ++ ${FMT_LIBRARIES} + tinyexpr + qoi) + + if(ENABLE_PSD) +--- a/src/dio/CMakeLists.txt 2022-01-08 00:41:50.712726972 +0100 ++++ b/src/dio/CMakeLists.txt 2022-01-08 00:53:39.936408022 +0100 +@@ -10,7 +10,7 @@ + + target_link_libraries(dio-lib + ${ZLIB_LIBRARIES} +- fmt ++ ${FMT_LIBRARIES} + flic-lib + laf-base + fixmath-lib +--- a/third_party/CMakeLists.txt 2022-01-08 00:37:08.165330523 +0100 ++++ b/third_party/CMakeLists.txt 2022-01-08 00:54:30.455969136 +0100 +@@ -106,7 +106,10 @@ + endif() + + add_subdirectory(simpleini) +-add_subdirectory(fmt) ++ ++if(NOT USE_SHARED_FMT) ++ add_subdirectory(fmt) ++endif() + + # Add cmark without tests + if(NOT USE_SHARED_CMARK) diff --git a/pkgs/applications/editors/aseprite/shared-libwebp.patch b/pkgs/by-name/as/aseprite/shared-libwebp.patch index 20191f46b8b16..20191f46b8b16 100644 --- a/pkgs/applications/editors/aseprite/shared-libwebp.patch +++ b/pkgs/by-name/as/aseprite/shared-libwebp.patch diff --git a/pkgs/applications/editors/aseprite/shared-skia-deps.patch b/pkgs/by-name/as/aseprite/shared-skia-deps.patch index a6ab472bbe95b..a6ab472bbe95b 100644 --- a/pkgs/applications/editors/aseprite/shared-skia-deps.patch +++ b/pkgs/by-name/as/aseprite/shared-skia-deps.patch diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index c817a6125fc7d..e5ffcc27b2ce1 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ast-grep"; - version = "0.22.6"; + version = "0.23.0"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; rev = version; - hash = "sha256-QE8bTFlKlaxUeYJoaZyiuv/7zk+Pi3s64Er5YNTUh7I="; + hash = "sha256-QW3ZwALvfSTcvXuH/ploqUD1UJ5fGySIAc3N/TMlB4g="; }; - cargoHash = "sha256-tTEZUGC4RHjnAK+fMNkVqgsngBSdVAtoZ5ij3VbzKb4="; + cargoHash = "sha256-MUdHDP+1KQBXy2itOhW6pDuOTwIwXHy4oDfifDRdM94="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/at/atlauncher/package.nix b/pkgs/by-name/at/atlauncher/package.nix index 0d0031621fe7e..32a22493b1fa0 100644 --- a/pkgs/by-name/at/atlauncher/package.nix +++ b/pkgs/by-name/at/atlauncher/package.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "atlauncher"; - version = "3.4.36.5"; + version = "3.4.36.6"; src = fetchurl { url = "https://github.com/ATLauncher/ATLauncher/releases/download/v${finalAttrs.version}/ATLauncher-${finalAttrs.version}.jar"; - hash = "sha256-sytUMRp3qkdE5uzfFhuVqwsBYfRPubEG7/X/JqS2uxY="; + hash = "sha256-uux5m9GI+F5yCLF4nk5tk6FJjF4Wc81Uw8xfvt2TE4c="; }; env.ICON = fetchurl { diff --git a/pkgs/by-name/au/audion/package.nix b/pkgs/by-name/au/audion/package.nix index 0f9b05c527ace..39db0f9d452f5 100644 --- a/pkgs/by-name/au/audion/package.nix +++ b/pkgs/by-name/au/audion/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "audion"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "audiusGmbH"; repo = "audion"; rev = "refs/tags/${version}"; - hash = "sha256-j8sQCeHpxrpzyY75DypWI9z+JBWq7aaaXPnZh7ksRjc="; + hash = "sha256-NtAzh7n5bJXMt73L+FJU3vuNoNgga3wYXdZ2TY8AjIA="; }; - cargoHash = "sha256-/x2gjLz73uPY+ouQOxLN2ViET+V/s9jgkgw97yzVj24="; + cargoHash = "sha256-0jPAidJu3f3exXkVCLowR1zHsZ3bctWu+O2mQmSwSpE="; meta = with lib; { description = "Ping the host continuously and write results to a file"; diff --git a/pkgs/by-name/au/autotools-language-server/package.nix b/pkgs/by-name/au/autotools-language-server/package.nix new file mode 100644 index 0000000000000..1cb6f711bbc7c --- /dev/null +++ b/pkgs/by-name/au/autotools-language-server/package.nix @@ -0,0 +1,51 @@ +{ lib +, python3 +, fetchFromGitHub +, fetchpatch +}: + +python3.pkgs.buildPythonApplication rec { + pname = "autotools-language-server"; + version = "0.0.19"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Freed-Wu"; + repo = "autotools-language-server"; + rev = "refs/tags/${version}"; + hash = "sha256-V0EOV1ZmeC+4svc2fqV6AIiL37dkrxUJAnjywMZcENw="; + }; + patches = [ + # Right before the release, upstream decided to replace the + # tree-sitter-languages dependency with tree-sitter-make, which is yanked + # from some reason. Hopefully upstream will fix this dependency a bit + # better in the next release. See also: + # https://github.com/Freed-Wu/autotools-language-server/commit/f149843becfcfd6b2bb4a98eb1f3984c01d5fd33#r142659163 + (fetchpatch { + url = "https://github.com/Freed-Wu/autotools-language-server/commit/f149843becfcfd6b2bb4a98eb1f3984c01d5fd33.patch"; + hash = "sha256-TrzHbfR6GYAEqDIFiCqSX2+Qv4JeFJ5faiKJhNYojf0="; + revert = true; + }) + ]; + + build-system = [ + python3.pkgs.setuptools-generate + python3.pkgs.setuptools-scm + ]; + + dependencies = with python3.pkgs; [ + tree-sitter-languages + lsp-tree-sitter + ]; + nativeCheckInputs = [ + python3.pkgs.pytestCheckHook + ]; + + meta = with lib; { + description = "Autotools language server, support configure.ac, Makefile.am, Makefile"; + homepage = "https://github.com/Freed-Wu/autotools-language-server"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ doronbehar ]; + mainProgram = "autotools-language-server"; + }; +} diff --git a/pkgs/by-name/ay/ayatana-indicator-session/package.nix b/pkgs/by-name/ay/ayatana-indicator-session/package.nix index d2a5860098b4c..7a625b94eb499 100644 --- a/pkgs/by-name/ay/ayatana-indicator-session/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-session/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ayatana-indicator-session"; - version = "24.2.0"; + version = "24.5.0"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "ayatana-indicator-session"; rev = finalAttrs.version; - hash = "sha256-XHJhzL7B+4FnUHbsJVywELoY7xxG19RRryaPYZVao1I="; + hash = "sha256-p4nu7ZgnEjnnxNqyZIg//YcssnQcCY7GFDbpGIu1dz0="; }; postPatch = '' diff --git a/pkgs/by-name/ba/babeltrace/package.nix b/pkgs/by-name/ba/babeltrace/package.nix new file mode 100644 index 0000000000000..2d995df59c91d --- /dev/null +++ b/pkgs/by-name/ba/babeltrace/package.nix @@ -0,0 +1,80 @@ +{ + lib, + stdenv, + fetchurl, + gitUpdater, + autoreconfHook, + pkg-config, + glib, + libuuid, + popt, + elfutils, + enablePython ? false, + pythonPackages ? null, + swig2, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "babeltrace"; + version = "1.5.11"; + + src = fetchurl { + url = "https://www.efficios.com/files/babeltrace/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; + sha256 = "Z7Q6qu9clR+nrxpVfPcgGhH+iYdrfCK6CgPLwxbbWpw="; + }; + + nativeBuildInputs = + [ + # The pre-generated ./configure script uses an old autoconf version which + # breaks cross-compilation (replaces references to malloc with rpl_malloc). + # Re-generate with nixpkgs's autoconf. This requires glib to be present in + # nativeBuildInputs for its m4 macros to be present. + autoreconfHook + glib + pkg-config + ] + ++ lib.optionals enablePython [ + swig2 + pythonPackages.setuptools + ]; + buildInputs = [ + glib + libuuid + popt + elfutils + ]; + + configureFlags = + [ + # --enable-debug-info (default) requires the configure script to run host + # executables to determine the elfutils library version, which cannot be done + # while cross compiling. + (lib.enableFeature (stdenv.hostPlatform == stdenv.buildPlatform) "debug-info") + ] + ++ lib.optionals enablePython [ + # Using (lib.enableFeature enablePython "python-bindings") makes the + # configure script look for python dependencies even when + # enablePython==false. Adding the configure flag conditionally seems to + # solve this. + "--enable-python-bindings" + ]; + # + + passthru.updateScript = gitUpdater { + url = "https://git.efficios.com/babeltrace.git"; + rev-prefix = "v"; + # Versions 2.x are packaged independently as babeltrace2 + ignoredVersions = "^[^1]"; + }; + + meta = { + description = "Command-line tool and library to read and convert LTTng tracefiles"; + homepage = "https://www.efficios.com/babeltrace"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + bjornfor + wentasah + ]; + }; +}) diff --git a/pkgs/by-name/ba/babeltrace2/package.nix b/pkgs/by-name/ba/babeltrace2/package.nix new file mode 100644 index 0000000000000..ec9f15e679f8d --- /dev/null +++ b/pkgs/by-name/ba/babeltrace2/package.nix @@ -0,0 +1,101 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + autoreconfHook, + pkg-config, + glib, + elfutils, + bison, + flex, + asciidoc, + xmlto, + docbook_xml_dtd_45, + docbook_xsl, + enablePython ? false, + python ? null, + pythonPackages ? null, + swig, + ensureNewerSourcesForZipFilesHook, +}: + +stdenv.mkDerivation rec { + pname = "babeltrace2"; + version = "2.0.6"; + + src = fetchFromGitHub { + owner = "efficios"; + repo = "babeltrace"; + rev = "v${version}"; + hash = "sha256-L4YTqPxvWynUBnmAQnlJ2RNbEv9MhBxQOsqbWix8ZwU="; + }; + + patches = [ + # Patches needed for Python 3.12 + (fetchpatch { + # python: Use standalone 'sysconfig' module + url = "https://github.com/efficios/babeltrace/commit/452480eb6820df9973d50431a479ca547815ae08.patch"; + hash = "sha256-YgUKHJzdliNUsTY29E0xxcUjqVWn4EvxyTs0B+O+jrI="; + }) + (fetchpatch { + # python: replace distutils with setuptools + url = "https://github.com/efficios/babeltrace/commit/6ec97181a525a3cd64cedbcd0df905ed9e84ba03.patch"; + hash = "sha256-1hlEkPcRUpf2+iEXqHXcCDOaLTg+eaVcahqZlA8m5QY="; + }) + (fetchpatch { + # fix: python: monkey patch the proper sysconfig implementation + url = "https://github.com/efficios/babeltrace/commit/927263e4ea62877af7240cfdb1514ae949dbfc2e.patch"; + hash = "sha256-HNRQ7uw26FUKCQ/my6//OL2xsHdOGlQUq5zIKtg9OGw="; + }) + ]; + + outputs = [ + "out" + "man" + "dev" + ]; + + nativeBuildInputs = + [ + autoreconfHook + pkg-config + glib + bison + flex + asciidoc + xmlto + docbook_xml_dtd_45 + docbook_xsl + ] + ++ lib.optionals enablePython [ + swig + pythonPackages.setuptools + ensureNewerSourcesForZipFilesHook + ]; + + buildInputs = [ + glib + elfutils + ] ++ lib.optional enablePython python; + + configureFlags = [ + (lib.enableFeature enablePython "python-bindings") + (lib.enableFeature enablePython "python-plugins") + (lib.enableFeature (stdenv.hostPlatform == stdenv.buildPlatform) "debug-info") + ]; + + # For cross-compilation of Python bindings + makeFlags = [ "CFLAGS=-Wno-error=stringop-truncation -Wno-error=null-dereference" ]; + + enableParallelBuilding = true; + + meta = { + description = "Babeltrace /ˈbæbəltreɪs/ is an open-source trace manipulation toolkit"; + homepage = "https://babeltrace.org"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ wentasah ]; + mainProgram = "babeltrace2"; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/ba/baresip/package.nix b/pkgs/by-name/ba/baresip/package.nix index e6dfd4a48ddf5..866958347f192 100644 --- a/pkgs/by-name/ba/baresip/package.nix +++ b/pkgs/by-name/ba/baresip/package.nix @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { meta = { description = "Modular SIP User-Agent with audio and video support"; homepage = "https://github.com/baresip/baresip"; - maintainers = with lib.maintainers; [ elohmeier raskin ehmry ]; + maintainers = with lib.maintainers; [ raskin ehmry ]; mainProgram = "baresip"; license = lib.licenses.bsd3; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/ba/bash-language-server/package.nix b/pkgs/by-name/ba/bash-language-server/package.nix index 0e66b1e268763..eb47dfdd9f6b6 100644 --- a/pkgs/by-name/ba/bash-language-server/package.nix +++ b/pkgs/by-name/ba/bash-language-server/package.nix @@ -5,6 +5,7 @@ , nodejs , npmHooks , makeBinaryWrapper +, shellcheck }: stdenv.mkDerivation (finalAttrs: { @@ -56,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: { # Create the executable, based upon what happens in npmHooks.npmInstallHook makeWrapper ${lib.getExe nodejs} $out/bin/bash-language-server \ + --prefix PATH : ${lib.makeBinPath [ shellcheck ]} \ --inherit-argv0 \ --add-flags $out/lib/bash-language-server/out/cli.js diff --git a/pkgs/by-name/ba/batmon/package.nix b/pkgs/by-name/ba/batmon/package.nix new file mode 100644 index 0000000000000..e41587b1f57b4 --- /dev/null +++ b/pkgs/by-name/ba/batmon/package.nix @@ -0,0 +1,34 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, +}: +rustPlatform.buildRustPackage rec { + pname = "batmon"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "6543"; + repo = "batmon"; + rev = "refs/tags/v${version}"; + hash = "sha256-+kjDNQKlaoI5fQ5FqYF6IPCKeE92WKxIhVCKafqfE0o="; + }; + + cargoSha256 = "sha256-DJpWBset6SW7Ahg60+Tu1VpH34LcVOyrEs9suKyTE9g="; + + meta = with lib; { + description = "Interactive batteries viewer"; + longDescription = '' + An interactive viewer, similar to top, htop and other *top utilities, + but about the batteries installed in your notebook. + ''; + homepage = "https://github.com/6543/batmon/"; + changelog = "https://github.com/6543/batmon/releases/tag/v${version}"; + license = licenses.asl20; + mainProgram = "batmon"; + platforms = with platforms; unix ++ windows; + broken = stdenv.isDarwin && stdenv.isAarch64; + maintainers = with maintainers; [ _6543 ]; + }; +} diff --git a/pkgs/games/BeatSaberModManager/deps.nix b/pkgs/by-name/be/beatsabermodmanager/deps.nix index 64115dd683e94..64115dd683e94 100644 --- a/pkgs/games/BeatSaberModManager/deps.nix +++ b/pkgs/by-name/be/beatsabermodmanager/deps.nix diff --git a/pkgs/games/BeatSaberModManager/default.nix b/pkgs/by-name/be/beatsabermodmanager/package.nix index 5c0f73d329f24..d21283e0952c9 100644 --- a/pkgs/games/BeatSaberModManager/default.nix +++ b/pkgs/by-name/be/beatsabermodmanager/package.nix @@ -18,12 +18,12 @@ }: buildDotnetModule rec { - pname = "BeatSaberModManager"; + pname = "beatsabermodmanager"; version = "0.0.5"; src = fetchFromGitHub { owner = "affederaffe"; - repo = pname; + repo = "BeatSaberModManager"; rev = "v${version}"; sha256 = "sha256-HHWC+MAwJ+AMCuBzSuR7FbW3k+wLri0B9J1DftyfNEU="; fetchSubmodules = true; # It vendors BSIPA-Linux diff --git a/pkgs/by-name/be/beekeeper-studio/package.nix b/pkgs/by-name/be/beekeeper-studio/package.nix index 9c7212345c277..9f6f9ff3d8bee 100644 --- a/pkgs/by-name/be/beekeeper-studio/package.nix +++ b/pkgs/by-name/be/beekeeper-studio/package.nix @@ -7,7 +7,7 @@ let pname = "beekeeper-studio"; - version = "4.3.4"; + version = "4.4.0"; plat = { aarch64-linux = "-arm64"; @@ -16,7 +16,7 @@ let hash = { aarch64-linux = "sha256-RzPw+jsHecOYSBn/TrEFew5V0LvYS15dUuscS7+GraM="; - x86_64-linux = "sha256-RT+A2rq0rMv2o0au5cfcZJysGy+7xYvBDfEJ/TyJmZw="; + x86_64-linux = "sha256-fWr0ezPU5U8G9M3JEjUdBFZksbJL5CUjdNbAyT5dwI8="; }.${stdenv.hostPlatform.system}; src = fetchurl { diff --git a/pkgs/by-name/bi/bicep/deps.nix b/pkgs/by-name/bi/bicep/deps.nix index 490fd2cf150c9..17f84614364f5 100644 --- a/pkgs/by-name/bi/bicep/deps.nix +++ b/pkgs/by-name/bi/bicep/deps.nix @@ -4,7 +4,7 @@ { fetchNuGet }: [ (fetchNuGet { pname = "Azure.Bicep.Internal.RoslynAnalyzers"; version = "0.1.38"; sha256 = "1b13vbl0y851nr7rfhyxc0djihxfr7xv010f9zvvbibyz5wqis7v"; }) (fetchNuGet { pname = "Azure.Bicep.Types"; version = "0.5.9"; sha256 = "02v5jzrap5flk5r6jwbw3mzvkxb51kmz4g71j2nnikqgnc4v5dh2"; }) - (fetchNuGet { pname = "Azure.Bicep.Types.Az"; version = "0.2.686"; sha256 = "08yv067s9cccr7brsw85mdgbq0cyw39vmbmfxcvhhnvrgd7g4mgf"; }) + (fetchNuGet { pname = "Azure.Bicep.Types.Az"; version = "0.2.692"; sha256 = "1cc48z47wsqyhzszpkmm949qk85b9jq04qnahk4xwg643xkysr1b"; }) (fetchNuGet { pname = "Azure.Bicep.Types.K8s"; version = "0.1.626"; sha256 = "1c07igq6jqxkg9iln452fnng2n6ddd0008vb5lgbzdpgp1amz2ji"; }) (fetchNuGet { pname = "Azure.Containers.ContainerRegistry"; version = "1.1.1"; sha256 = "0hn6mq1bffcq7d5w4rj4ffdxb3grvymzrpyl1qrbxksqpfbd0bh4"; }) (fetchNuGet { pname = "Azure.Core"; version = "1.36.0"; sha256 = "14lsc6zik7s5by3gp86pf77wh58fcqrjy2xhx5p03gmhdn6iz2cn"; }) @@ -14,19 +14,18 @@ (fetchNuGet { pname = "Azure.Deployments.Expression"; version = "1.0.1243.1"; sha256 = "1shk9amp9d3v6lbf2s0j1fxf5xm468fvphhnni95v6w2cpv1fdv8"; }) (fetchNuGet { pname = "Azure.Deployments.Internal.GenerateNotice"; version = "0.1.38"; sha256 = "00jzm0c1ch24mh50hqmzs2jxda929zg1j1dgnhs5gbsyk7zjlvrd"; }) (fetchNuGet { pname = "Azure.Deployments.Templates"; version = "1.0.1243.1"; sha256 = "11glwwxq9xzi3vrnqx833dry9n6ykspf6gfab0g23d8fygd5d2rf"; }) - (fetchNuGet { pname = "Azure.Identity"; version = "1.11.2"; sha256 = "1zb18p50l24nr9v0srywqq5cx6xbyrlcib1i244z9vmi1qkjia2h"; }) + (fetchNuGet { pname = "Azure.Identity"; version = "1.11.3"; sha256 = "1hxjr7np25b3pr2z8vnkq6v4dvmrd7brm8zfz2qggvpqr48yyzxf"; }) (fetchNuGet { pname = "Azure.ResourceManager"; version = "1.11.1"; sha256 = "0vfp2rs4r9x3zkvw0za8q6xz3rrb8nywjd1137rpbpy0zx7qnbry"; }) - (fetchNuGet { pname = "Azure.ResourceManager.Resources"; version = "1.7.2"; sha256 = "1cw732wpixh4vrlznc70ld3d1hrw6smk57ar8imh4l7jvd9fn041"; }) + (fetchNuGet { pname = "Azure.ResourceManager.Resources"; version = "1.7.3"; sha256 = "1nlaammdg10xyq7g0kig093l6nl1fxn2yk6dbc7xqagfmdnkbx29"; }) (fetchNuGet { pname = "coverlet.collector"; version = "6.0.2"; sha256 = "0fll8yssdzi2wv8l26qz2zl0qqrp5nlbdqxjwfh5p356nd991m1d"; }) (fetchNuGet { pname = "FluentAssertions"; version = "6.12.0"; sha256 = "04fhn67930zv3i0d8xbrbw5vwz99c83bbvgdwqiir55vw5xlys9c"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; }) (fetchNuGet { pname = "IPNetwork2"; version = "2.6.598"; sha256 = "03nxkiwy1bxgpv5n1lfd06grdyjc10a3k9gyc04rhzysjsswiy0l"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.3.0"; sha256 = "0vp4mpn6gfckn8grzjm1jxlbqiq2fglm2rk9wq787adw7rxs8k7w"; }) - (fetchNuGet { pname = "Json.More.Net"; version = "2.0.1.1"; sha256 = "0i6w5n075qhawqr832hl8bzsdspwkfkmfnnv94c9ilq06srvy1gc"; }) (fetchNuGet { pname = "Json.More.Net"; version = "2.0.1.2"; sha256 = "1fzw9d55hvynrwz01gj0xv6ybjm7nsrm2vxqy6d15wr75w3pyyky"; }) - (fetchNuGet { pname = "JsonPatch.Net"; version = "3.0.0.2"; sha256 = "1pi7qvjpndgxiipn21hbqf0f5ff1rijhqkcjag8pg3lcyrlm1vnl"; }) - (fetchNuGet { pname = "JsonPath.Net"; version = "1.0.1.2"; sha256 = "0br6k35mwc1nisvma5izpig5mc8390fly12sics6yi82xyvhgqx5"; }) - (fetchNuGet { pname = "JsonPointer.Net"; version = "4.0.1.3"; sha256 = "06yvdiwz4j8rg42wlvlflaiq2qyhcm5r3x7gczjvfihfsydvj09f"; }) + (fetchNuGet { pname = "JsonPatch.Net"; version = "3.1.0"; sha256 = "1dq9wl2xvkq8yplq1l9qknfj4jb8824kv8szbjcvnjpn44x8xw3f"; }) + (fetchNuGet { pname = "JsonPath.Net"; version = "1.1.0"; sha256 = "0jn5k2iwr0q8cii63nzxr4m54zrpgd4q9iyx8jghq7xisshqy08m"; }) + (fetchNuGet { pname = "JsonPointer.Net"; version = "5.0.0"; sha256 = "0rwxhyf2brw5x56pndfyxpi8qawx7jv9xsbbhyr9873jj8g9f9rq"; }) (fetchNuGet { pname = "MessagePack"; version = "2.5.108"; sha256 = "0cnaz28lhrdmavnxjkakl9q8p2yv8mricvp1b0wxdfnz8v41gwzs"; }) (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.5.108"; sha256 = "0nb1fx8dwl7304kw0bc375bvlhb7pg351l4cl3vqqd7d8zqjwx5v"; }) (fetchNuGet { pname = "Microsoft.ApplicationInsights"; version = "2.21.0"; sha256 = "1q034jbqkxb8lddkd0ijp0wp0ymnnf3bg2mjpay027zv7jswnc4x"; }) @@ -36,7 +35,7 @@ (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "7.0.0"; sha256 = "1waiggh3g1cclc81gmjrqbh128kwfjky3z79ma4bd2ms9pa3gvfm"; }) (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "8.0.0"; sha256 = "0055f69q3hbagqp8gl3nk0vfn4qyqyxsxyy7pd0g7wm3z28byzmx"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.3.4"; sha256 = "1vzrni7n94f17bzc13lrvcxvgspx9s25ap1p005z6i1ikx6wgx30"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.9.0"; sha256 = "1gljgi69k0fz8vy8bn6xlyxabj6q4vls2zza9wz7ng6ix3irm89r"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.10.0"; sha256 = "0s0v7jmrq85n356xv7zixvwa4z94fszjcr5vll8x4im1a2lp00f9"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) (fetchNuGet { pname = "Microsoft.Diagnostics.Tracing.EventRegister"; version = "1.1.28"; sha256 = "1lh0ifj9xndiqspmnj7x9lcz2c7kdhyjgcmk5wz2yn8gimg0xy03"; }) (fetchNuGet { pname = "Microsoft.Diagnostics.Tracing.TraceEvent"; version = "3.1.3"; sha256 = "1bappkn6vzaaq5yw9fzhds2gz557bhgmxvh38ifw6l39jkar2lii"; }) @@ -60,7 +59,7 @@ (fetchNuGet { pname = "Microsoft.Identity.Client.Extensions.Msal"; version = "4.60.3"; sha256 = "19l92ynvrhb76r0zpj8qhyymxgz45knyhdqr6za4s7rzbssibi08"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.35.0"; sha256 = "0i6kdvqdbzynzrr4g5idx4ph4ckggsbsy0869lwa10fhmyxrh73g"; }) (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.4.0"; sha256 = "1smx30nq22plrn2mw4wb5vfgxk6hyx12b60c4wabmpnr81lq3nzv"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.9.0"; sha256 = "1lls1fly2gr1n9n1xyl9k33l2v4pwfmylyzkq8v4v5ldnwkl1zdb"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.10.0"; sha256 = "13g8fwl09li8fc71nk13dgkb7gahd4qhamyg2xby7am63nlchhdf"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.1.0"; sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; }) @@ -75,9 +74,9 @@ (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.0.2"; sha256 = "0c65fsc23xxw648xh83sjcmrn9hvs9q58l5lb36wflvaajbsjf2r"; }) (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.0.2"; sha256 = "0bq46f4v2r4nzwly7g0dsakyc1lcql9nh85sp59d1fwzaknf1n94"; }) (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.0.2"; sha256 = "1vjqrpqjx3z1irqgy0ckmkgyvrzqqqcikxs36q6gadyj643ra1c5"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.10.0"; sha256 = "07j69cw8r39533w4p39mnj00kahazz38760in3jfc45kmlcdb26x"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; sha256 = "0qkjyf3ky6xpjg5is2sdsawm99ka7fzgid2bvpglwmmawqgm8gls"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.9.0"; sha256 = "1kgsl9w9fganbm9wvlkqgk0ag9hfi58z88rkfybc6kvg78bx89ca"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.9.0"; sha256 = "19ffh31a1jxzn8j69m1vnk5hyfz3dbxmflq77b8x82zybiilh5nl"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.10.0"; sha256 = "1bl471s7fx9jycr0cc8rylwf34mrvlg9qn1an6l86nisavfcyb7v"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.7.35"; sha256 = "1sr2ydgl6clnpf7axjhnffx3z2jz1zhnxfiizsv1prl26r3y52f9"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.10.48"; sha256 = "00p3ywq4ppfl14l9yzxl5id5zmay8fv42b4w3ppr1b3d5ipldxhj"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.6.11"; sha256 = "0qx4nzsx28galgzzjkgf541254d433dgxcaf7y2y1qyyxgsfjj1f"; }) diff --git a/pkgs/by-name/bi/bicep/package.nix b/pkgs/by-name/bi/bicep/package.nix index bdfdd74606fdb..52120d8bcffc1 100644 --- a/pkgs/by-name/bi/bicep/package.nix +++ b/pkgs/by-name/bi/bicep/package.nix @@ -9,15 +9,19 @@ buildDotnetModule rec { pname = "bicep"; - version = "0.27.1"; + version = "0.28.1"; src = fetchFromGitHub { owner = "Azure"; repo = "bicep"; rev = "v${version}"; - hash = "sha256-7yEsxKUG2jhki1u5CObdjN4JMnEcAYR+SoGPaNJ+9Fs="; + hash = "sha256-9yWfzYrs7LxVmb+AZUI+G0TQQteJP7gpISJGdY0qKAg="; }; + postPatch = '' + substituteInPlace src/Directory.Build.props --replace-fail "<TreatWarningsAsErrors>true</TreatWarningsAsErrors>" "" + ''; + projectFile = "src/Bicep.Cli/Bicep.Cli.csproj"; nugetDeps = ./deps.nix; diff --git a/pkgs/by-name/bi/bilibili/package.nix b/pkgs/by-name/bi/bilibili/package.nix index e460a9037da45..e410e92f8d9a4 100644 --- a/pkgs/by-name/bi/bilibili/package.nix +++ b/pkgs/by-name/bi/bilibili/package.nix @@ -2,22 +2,23 @@ , stdenv , fetchurl , electron +, zstd , makeWrapper }: stdenv.mkDerivation rec { pname = "bilibili"; - version = "1.13.2-1"; + version = "1.13.5-2"; src = fetchurl { url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb"; - hash = "sha256-yqgQNsTD4iT54LJYEbV6dk7OD7KoZvX61XERYQ4MsSA="; + hash = "sha256-4p5izaQsax4i2/AnjivDVoY205ITmEx48GhblPOZDjk="; }; unpackPhase = '' runHook preUnpack ar x $src - tar xf data.tar.xz + tar -I ${zstd}/bin/zstd -xvf data.tar.zst runHook postUnpack ''; diff --git a/pkgs/by-name/bi/bitmagnet/package.nix b/pkgs/by-name/bi/bitmagnet/package.nix index 57af9df91642b..c2ce321559c01 100644 --- a/pkgs/by-name/bi/bitmagnet/package.nix +++ b/pkgs/by-name/bi/bitmagnet/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "bitmagnet"; - version = "0.8.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "bitmagnet-io"; repo = "bitmagnet"; rev = "v${version}"; - hash = "sha256-P5GfPRIrwLLMBRgoN6d092HiThMghEj1zcaf6BU+IWU="; + hash = "sha256-Lyogcuehzn19sX2VZWWlJNI38Jn5IA7mJz0RWkoP390="; }; - vendorHash = "sha256-exKQTsyP7LL63WHZ8/WchLh4y0Oj9LC4lxiZTOfWARU="; + vendorHash = "sha256-aauXgHPZbSiTW9utuHXzJr7GsWs/2aFiGuukA/B9BRc="; ldflags = [ "-s" "-w" "-X github.com/bitmagnet-io/bitmagnet/internal/version.GitTag=v${version}" ]; diff --git a/pkgs/by-name/bo/bombsquad/package.nix b/pkgs/by-name/bo/bombsquad/package.nix index 51c104c905367..b5417bdf74a84 100644 --- a/pkgs/by-name/bo/bombsquad/package.nix +++ b/pkgs/by-name/bo/bombsquad/package.nix @@ -33,7 +33,7 @@ let .${targetPlatform.system} or (throw "${targetPlatform.system} is unsupported."); in stdenv.mkDerivation (finalAttrs: { - name = "bombsquad"; + pname = "bombsquad"; version = "1.7.35"; sourceRoot = "."; src = fetchurl { diff --git a/pkgs/by-name/br/breads-ad/package.nix b/pkgs/by-name/br/breads-ad/package.nix new file mode 100644 index 0000000000000..3f897bf108063 --- /dev/null +++ b/pkgs/by-name/br/breads-ad/package.nix @@ -0,0 +1,40 @@ +{ + lib, + python3, + fetchFromGitHub, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "breads-ad"; + version = "1.2.4-unstable-2024-05-27"; + pyproject = true; + + src = fetchFromGitHub { + owner = "oppsec"; + repo = "breads"; + rev = "bdfc8b5f0357a34847767505ddc98734ca3b491f"; + hash = "sha256-U1q15D59N55qBf4NVOpe5RpQjlE1ye2TNNIZf2IZV3U="; + }; + + build-system = with python3.pkgs; [ + setuptools + ]; + + dependencies = with python3.pkgs; [ + impacket + ldap3 + rich + ]; + + # Project has no tests + doCheck = false; + + meta = with lib; { + description = "Tool to evaluate Active Directory Security"; + homepage = "https://github.com/oppsec/breads"; + changelog = "https://github.com/oppsec/breads/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + mainProgram = "breads-ad"; + }; +} diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index d8cd547778f96..83fab6d81e8f2 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -8,6 +8,7 @@ , writeShellScriptBin , makeWrapper , copyDesktopItems +, giflib , makeDesktopItem , pkg-config , pixman @@ -57,6 +58,7 @@ buildNpmPackage' rec { pango ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.CoreText + giflib ]; desktopItems = [ diff --git a/pkgs/by-name/bt/btrfs-assistant/package.nix b/pkgs/by-name/bt/btrfs-assistant/package.nix index f461d67b6f783..fce0bd8fc6eb7 100644 --- a/pkgs/by-name/bt/btrfs-assistant/package.nix +++ b/pkgs/by-name/bt/btrfs-assistant/package.nix @@ -1,17 +1,18 @@ -{ lib -, stdenv -, fetchFromGitLab -, bash -, btrfs-progs -, cmake -, coreutils -, git -, pkg-config -, qt6 -, snapper -, util-linux -, enableSnapper ? true -, nix-update-script +{ + lib, + stdenv, + fetchFromGitLab, + bash, + btrfs-progs, + cmake, + coreutils, + git, + pkg-config, + qt6, + snapper, + util-linux, + enableSnapper ? true, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -29,53 +30,47 @@ stdenv.mkDerivation (finalAttrs: { cmake git pkg-config + qt6.wrapQtAppsHook ]; buildInputs = [ btrfs-progs + coreutils qt6.qtbase qt6.qtsvg qt6.qttools qt6.qtwayland - ]; - - propagatedBuildInputs = [ qt6.wrapQtAppsHook ]; + util-linux + ] ++ lib.optionals enableSnapper [ snapper ]; - prePatch = '' - substituteInPlace src/util/System.cpp \ - --replace '/bin/bash' "${lib.getExe bash}" - '' - + lib.optionalString enableSnapper '' - substituteInPlace src/main.cpp \ - --replace '/usr/bin/snapper' "${lib.getExe snapper}" - ''; + prePatch = + '' + substituteInPlace src/util/System.cpp \ + --replace-fail '/bin/bash' "${lib.getExe bash}" - postPatch = '' - substituteInPlace src/org.btrfs-assistant.pkexec.policy \ - --replace '/usr/bin' "$out/bin" + substituteInPlace src/main.cpp \ + --replace-fail 'if (!qEnvironmentVariableIsEmpty("DISPLAY"))' ' if(!qEnvironmentVariableIsEmpty("DISPLAY") || !qEnvironmentVariableIsEmpty("WAYLAND_DISPLAY"))' + '' + + lib.optionalString enableSnapper '' + substituteInPlace src/main.cpp \ + --replace-fail '/usr/bin/snapper' "${lib.getExe snapper}" + ''; - substituteInPlace src/btrfs-assistant \ - --replace 'btrfs-assistant-bin' "$out/bin/btrfs-assistant-bin" + postPatch = + '' + substituteInPlace src/org.btrfs-assistant.pkexec.policy \ + --replace-fail '/usr/bin' "$out/bin" - substituteInPlace src/btrfs-assistant-launcher \ - --replace 'btrfs-assistant' "$out/bin/btrfs-assistant" - '' - + lib.optionalString enableSnapper '' - substituteInPlace src/btrfs-assistant.conf \ - --replace '/usr/bin/snapper' "${lib.getExe snapper}" - ''; + substituteInPlace src/btrfs-assistant \ + --replace-fail 'btrfs-assistant-bin' "$out/bin/btrfs-assistant-bin" - qtWrapperArgs = - let - runtimeDeps = lib.makeBinPath ([ - coreutils - util-linux - ] - ++ lib.optionals enableSnapper [ snapper ]); - in - [ - "--prefix PATH : ${runtimeDeps}" - ]; + substituteInPlace src/btrfs-assistant-launcher \ + --replace-fail 'btrfs-assistant' "$out/bin/btrfs-assistant" + '' + + lib.optionalString enableSnapper '' + substituteInPlace src/btrfs-assistant.conf \ + --replace-fail '/usr/bin/snapper' "${lib.getExe snapper}" + ''; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ca/cano/package.nix b/pkgs/by-name/ca/cano/package.nix index ba431a541f4e6..2c4d148c70e27 100644 --- a/pkgs/by-name/ca/cano/package.nix +++ b/pkgs/by-name/ca/cano/package.nix @@ -5,7 +5,7 @@ , ncurses }: stdenv.mkDerivation (finalAttrs: { - name = "cano"; + pname = "cano"; version = "0.1.0-alpha"; src = fetchFromGitHub { diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix index 5a5cfb00fac08..d31879bad0910 100644 --- a/pkgs/by-name/ca/cargo-xwin/package.nix +++ b/pkgs/by-name/ca/cargo-xwin/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-xwin"; - version = "0.16.4"; + version = "0.17.0"; src = fetchFromGitHub { owner = "rust-cross"; repo = "cargo-xwin"; rev = "v${version}"; - hash = "sha256-nJgy9KoqrCD4NGFOJMN9f1XDyIrZ0a5WHTRX6G/+tnU="; + hash = "sha256-3vQ7pM7Ui0H6qWFWOCW4LzDLJq8bcoFEJrpoa4Tzk9g="; }; - cargoHash = "sha256-JCCL/QV1DjmXTY3UChZ4BfA9VSyOTQLIfh6DSF/kIuA="; + cargoHash = "sha256-4uWPbwntcD4YKdjTlWfMGqM+rddKzaXH1YTX9qLrWrY="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/data/themes/catppuccin-gtk/default.nix b/pkgs/by-name/ca/catppuccin-gtk/package.nix index 49fbade1a88ad..5bc1ffbcecaba 100644 --- a/pkgs/data/themes/catppuccin-gtk/default.nix +++ b/pkgs/by-name/ca/catppuccin-gtk/package.nix @@ -2,9 +2,8 @@ , stdenvNoCC , fetchFromGitHub , gtk3 +, git , colloid-gtk-theme -, gnome-themes-extra -, gtk-engine-murrine , python3 , sassc , nix-update-script @@ -20,6 +19,7 @@ let validVariants = [ "latte" "frappe" "macchiato" "mocha" ]; pname = "catppuccin-gtk"; + version = "1.0.3"; in lib.checkListOfEnum "${pname}: theme accent" validAccents accents @@ -27,38 +27,29 @@ lib.checkListOfEnum "${pname}: color variant" validVariants [variant] lib.checkListOfEnum "${pname}: size variant" validSizes [size] lib.checkListOfEnum "${pname}: tweaks" validTweaks tweaks -stdenvNoCC.mkDerivation rec { - inherit pname; - version = "0.7.5"; +stdenvNoCC.mkDerivation { + inherit pname version; src = fetchFromGitHub { owner = "catppuccin"; repo = "gtk"; rev = "v${version}"; - hash = "sha256-DIeMdkEjIcPIf/EgE83F5URHY+lR2+hxdc4wSrruFJ8="; + hash = "sha256-8KyZtZqVVz5UKuGdLrUsR2djD3nsJDliHMtvFtUVim8="; }; - nativeBuildInputs = [ gtk3 sassc ]; - - patches = [ - ./colloid-src-git-reset.patch - ]; - - buildInputs = [ - gnome-themes-extra + nativeBuildInputs = [ + gtk3 + sassc + # git is needed here since "git apply" is being used for patches + # see <https://github.com/catppuccin/gtk/blob/4173b70b910bbb3a42ef0e329b3e98d53cef3350/build.py#L465> + git (python3.withPackages (ps: [ ps.catppuccin ])) ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - postUnpack = '' - rm -rf source/colloid - cp -r ${colloid-gtk-theme.src} source/colloid - chmod -R +w source/colloid - ''; - - postPatch = '' - patchShebangs --build colloid/install.sh colloid/build.sh + rm -rf source/sources/colloid + cp -r ${colloid-gtk-theme.src} source/sources/colloid + chmod -R +w source/sources/colloid ''; dontConfigure = true; @@ -67,14 +58,12 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - cp -r colloid colloid-base mkdir -p $out/share/themes - export HOME=$(mktemp -d) - python3 install.py ${variant} \ - ${lib.optionalString (accents != []) "--accent " + builtins.toString accents} \ - ${lib.optionalString (size != []) "--size " + size} \ - ${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks} \ + python3 build.py ${variant} \ + --accent ${builtins.toString accents} \ + ${lib.optionalString (size != [ ]) "--size " + size} \ + ${lib.optionalString (tweaks != [ ]) "--tweaks " + builtins.toString tweaks} \ --dest $out/share/themes runHook postInstall @@ -82,11 +71,11 @@ stdenvNoCC.mkDerivation rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Soothing pastel theme for GTK"; homepage = "https://github.com/catppuccin/gtk"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ fufexan dixslyf ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ fufexan dixslyf isabelroses ]; }; } diff --git a/pkgs/by-name/ca/catppuccin-whiskers/package.nix b/pkgs/by-name/ca/catppuccin-whiskers/package.nix new file mode 100644 index 0000000000000..6ab0b4aaff79c --- /dev/null +++ b/pkgs/by-name/ca/catppuccin-whiskers/package.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, rustPlatform }: +let version = "2.4.0"; +in rustPlatform.buildRustPackage { + pname = "catppuccin-whiskers"; + inherit version; + + src = fetchFromGitHub { + owner = "catppuccin"; + repo = "whiskers"; + rev = "refs/tags/v${version}"; + hash = "sha256-rbPr5eSs99nS70J785SWO7tVBdiX/S7XUNHuo3aOQU4="; + }; + + cargoHash = "sha256-T7dreELSHfJizfbJEvvgkOmkMwlOETZVUdLwRFJOJEo="; + + meta = { + homepage = "https://github.com/catppuccin/whiskers"; + description = "A templating tool to simplify the creation of Catppuccin ports"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Name ]; + mainProgram = "whiskers"; + }; +} diff --git a/pkgs/by-name/ca/cavalier/package.nix b/pkgs/by-name/ca/cavalier/package.nix index e563b14379dd2..0ea3693b72fb8 100644 --- a/pkgs/by-name/ca/cavalier/package.nix +++ b/pkgs/by-name/ca/cavalier/package.nix @@ -11,6 +11,7 @@ , appstream-glib , desktop-file-utils , cava +, libGL }: buildDotnetModule rec { @@ -49,6 +50,7 @@ buildDotnetModule rec { glib gtk4 libadwaita + libGL ]; postInstall = '' diff --git a/pkgs/by-name/cd/cdecl/package.nix b/pkgs/by-name/cd/cdecl/package.nix index d0cc2f2710734..d75f6d994b024 100644 --- a/pkgs/by-name/cd/cdecl/package.nix +++ b/pkgs/by-name/cd/cdecl/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cdecl"; - version = "16.4.1"; + version = "17.0"; src = fetchFromGitHub { owner = "paul-j-lucas"; repo = "cdecl"; rev = "refs/tags/cdecl-${finalAttrs.version}"; - hash = "sha256-QAU/wTVBcSgIuY+fdZUaWGBNGuAvu/xyXuzQUtmn510="; + hash = "sha256-ElMmsFD4VXF6BFjFuuWmgFJaqCPCxpQB7S9tLkeGmMY="; }; strictDeps = true; diff --git a/pkgs/applications/emulators/cemu/cmakelists.patch b/pkgs/by-name/ce/cemu/0000-spirv-tools-opt-cmakelists.patch index a337484277ef8..a337484277ef8 100644 --- a/pkgs/applications/emulators/cemu/cmakelists.patch +++ b/pkgs/by-name/ce/cemu/0000-spirv-tools-opt-cmakelists.patch diff --git a/pkgs/applications/emulators/cemu/default.nix b/pkgs/by-name/ce/cemu/package.nix index c5860d3b0b265..3a009ea0cb3be 100644 --- a/pkgs/applications/emulators/cemu/default.nix +++ b/pkgs/by-name/ce/cemu/package.nix @@ -1,34 +1,37 @@ -{ lib, stdenv, fetchFromGitHub -, addOpenGLRunpath -, wrapGAppsHook3 -, cmake -, glslang -, nasm -, pkg-config - -, SDL2 -, boost -, cubeb -, curl -, fmt_9 -, glm -, gtk3 -, hidapi -, imgui -, libpng -, libusb1 -, libzip -, libXrender -, pugixml -, rapidjson -, vulkan-headers -, wayland -, wxGTK32 -, zarchive -, gamemode -, vulkan-loader - -, nix-update-script +{ + lib, + SDL2, + addOpenGLRunpath, + boost, + cmake, + cubeb, + curl, + fetchFromGitHub, + fmt_9, + gamemode, + glm, + glslang, + gtk3, + hidapi, + imgui, + libXrender, + libpng, + libusb1, + libzip, + nasm, + ninja, + nix-update-script, + pkg-config, + pugixml, + rapidjson, + stdenv, + testers, + vulkan-headers, + vulkan-loader, + wayland, + wrapGAppsHook3, + wxGTK32, + zarchive, }: let @@ -43,31 +46,32 @@ let sha256 = "sha256-gf47uLeNiXQic43buB5ZnMqiotlUfIyAsP+3H7yJuFg="; }; }; - -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "cemu"; - version = "2.0-85"; + version = "2.0-86"; src = fetchFromGitHub { owner = "cemu-project"; repo = "Cemu"; - rev = "v${version}"; - hash = "sha256-uMVbKJhdHLLKsJnj7YFIG+S5pm7rSZfBSWebhTP01Y8="; + rev = "v${finalAttrs.version}"; + hash = "sha256-AS5Qo4J0U1MeTYWl4jiJMi879bhBuioU1BikxGKtUrE="; }; patches = [ # glslangTargets want SPIRV-Tools-opt to be defined: # > The following imported targets are referenced, but are missing: # > SPIRV-Tools-opt - ./cmakelists.patch + ./0000-spirv-tools-opt-cmakelists.patch ]; nativeBuildInputs = [ + SDL2 addOpenGLRunpath wrapGAppsHook3 cmake glslang nasm + ninja pkg-config ]; @@ -94,24 +98,26 @@ in stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_C_FLAGS_RELEASE=-DNDEBUG" - "-DCMAKE_CXX_FLAGS_RELEASE=-DNDEBUG" - "-DENABLE_VCPKG=OFF" - "-DENABLE_FERAL_GAMEMODE=ON" - - # PORTABLE: - # "All data created and maintained by Cemu will be in the directory where the executable file is located" - "-DPORTABLE=OFF" + (lib.cmakeFeature "CMAKE_C_FLAGS_RELEASE" "-DNDEBUG") + (lib.cmakeFeature "CMAKE_CXX_FLAGS_RELEASE" "-DNDEBUG") + (lib.cmakeBool "ENABLE_VCPKG" false) + (lib.cmakeBool "ENABLE_FERAL_GAMEMODE" true) + + # PORTABLE: "All data created and maintained by Cemu will be in + # the directory where the executable file is located" + (lib.cmakeBool "PORTABLE" false) ]; - preConfigure = with lib; let - tag = last (splitString "-" version); + strictDeps = true; + + preConfigure = let + tag = lib.last (lib.splitString "-" finalAttrs.version); in '' rm -rf dependencies/imgui # cemu expects imgui source code, not just header files ln -s ${imgui'.src} dependencies/imgui - substituteInPlace src/Common/version.h --replace " (experimental)" "-${tag} (experimental)" - substituteInPlace dependencies/gamemode/lib/gamemode_client.h --replace "libgamemode.so.0" "${gamemode.lib}/lib/libgamemode.so.0" + substituteInPlace src/Common/version.h --replace-fail " (experimental)" "-${tag} (experimental)" + substituteInPlace dependencies/gamemode/lib/gamemode_client.h --replace-fail "libgamemode.so.0" "${gamemode.lib}/lib/libgamemode.so.0" ''; installPhase = '' @@ -138,14 +144,21 @@ in stdenv.mkDerivation rec { ) ''; - passthru.updateScript = nix-update-script { }; + passthru = { + updateScript = nix-update-script { }; + tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + }; + }; - meta = with lib; { - description = "Cemu is a Wii U emulator"; + meta = { + description = "Software to emulate Wii U games and applications on PC"; homepage = "https://cemu.info"; - license = licenses.mpl20; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ zhaofengli baduhai ]; + license = lib.licenses.mpl20; mainProgram = "cemu"; + maintainers = with lib.maintainers; [ zhaofengli baduhai AndersonTorres ]; + platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/applications/audio/ChowCentaur/default.nix b/pkgs/by-name/ch/chow-centaur/package.nix index 80f5768dc1578..87c8bc35b1b9b 100644 --- a/pkgs/applications/audio/ChowCentaur/default.nix +++ b/pkgs/by-name/ch/chow-centaur/package.nix @@ -2,14 +2,14 @@ , xcbutilcursor, xcbutilkeysyms, xcbutil, libXrandr, libXinerama, libXcursor , alsa-lib, libjack2, lv2, gcc-unwrapped }: -stdenv.mkDerivation rec { - pname = "ChowCentaur"; +stdenv.mkDerivation (finalAttrs: { + pname = "chow-centaur"; version = "1.4.0"; src = fetchFromGitHub { owner = "jatinchowdhury18"; repo = "KlonCentaur"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0mrzlf4a6f25xd7z9xanpyq7ybb4al01dzpjsgi0jkmlmadyhc4h"; fetchSubmodules = true; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ magnetophon ]; }; -} +}) diff --git a/pkgs/applications/audio/ChowKick/default.nix b/pkgs/by-name/ch/chow-kick/package.nix index 0eec7ea32d32a..b9dec059d1f18 100644 --- a/pkgs/applications/audio/ChowKick/default.nix +++ b/pkgs/by-name/ch/chow-kick/package.nix @@ -35,14 +35,14 @@ , webkitgtk }: -stdenv.mkDerivation rec { - pname = "ChowKick"; +stdenv.mkDerivation (finalAttrs: { + pname = "chow-kick"; version = "1.1.1"; src = fetchFromGitHub { owner = "Chowdhury-DSP"; - repo = pname; - rev = "v${version}"; + repo = "ChowKick"; + rev = "v${finalAttrs.version}"; sha256 = "0amnp0p7ckbbr9dcbdnld1ryv46kvza2dj8m6hzmi7c1s4df8x5q"; fetchSubmodules = true; }; @@ -91,9 +91,9 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/lib/lv2 $out/lib/vst3 $out/bin - cp -r ChowKick_artefacts/Release/LV2//${pname}.lv2 $out/lib/lv2 - cp -r ChowKick_artefacts/Release/VST3/${pname}.vst3 $out/lib/vst3 - cp ChowKick_artefacts/Release/Standalone/${pname} $out/bin + cp -r ChowKick_artefacts/Release/LV2/ChowKick.lv2 $out/lib/lv2 + cp -r ChowKick_artefacts/Release/VST3/ChowKick.vst3 $out/lib/vst3 + cp ChowKick_artefacts/Release/Standalone/ChowKick $out/bin ''; meta = with lib; { @@ -104,4 +104,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; mainProgram = "ChowKick"; }; -} +}) diff --git a/pkgs/applications/audio/ChowPhaser/default.nix b/pkgs/by-name/ch/chow-phaser/package.nix index a828a1e1d0410..23cfe684d81f5 100644 --- a/pkgs/applications/audio/ChowPhaser/default.nix +++ b/pkgs/by-name/ch/chow-phaser/package.nix @@ -4,14 +4,14 @@ , libsepol, libsysprof-capture, libthai, libxkbcommon, pcre, pkg-config , python3, sqlite, stdenv }: -stdenv.mkDerivation rec { - pname = "ChowPhaser"; +stdenv.mkDerivation (finalAttrs: { + pname = "chow-phaser"; version = "1.1.1"; src = fetchFromGitHub { owner = "jatinchowdhury18"; repo = "ChowPhaser"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; sha256 = "sha256-9wo7ZFMruG3QNvlpILSvrFh/Sx6J1qnlWc8+aQyS4tQ="; }; @@ -70,7 +70,8 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jatinchowdhury18/ChowPhaser"; description = "Phaser effect based loosely on the Schulte Compact Phasing 'A'"; license = with licenses; [ bsd3 ]; + mainProgram = "ChowPhaserStereo"; maintainers = with maintainers; [ magnetophon ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/applications/audio/CHOWTapeModel/default.nix b/pkgs/by-name/ch/chow-tape-model/package.nix index 29c1b82d9d0e1..44fc35073d364 100644 --- a/pkgs/applications/audio/CHOWTapeModel/default.nix +++ b/pkgs/by-name/ch/chow-tape-model/package.nix @@ -39,14 +39,14 @@ let # See here: https://forum.juce.com/t/build-fails-on-fedora-wrong-c-version/50902/2 stdenv = gcc11Stdenv; in -stdenv.mkDerivation rec { - pname = "CHOWTapeModel"; +stdenv.mkDerivation (finalAttrs: { + pname = "chow-tape-model"; version = "2.11.4"; src = fetchFromGitHub { owner = "jatinchowdhury18"; repo = "AnalogTapeModel"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-WriHi68Y6hAsrwE+74JtVlAKUR9lfTczj6UK9h2FOGM="; fetchSubmodules = true; }; @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/lib/lv2 $out/lib/vst3 $out/lib/clap $out/bin $out/share/doc/CHOWTapeModel/ - cd CHOWTapeModel_artefacts/${cmakeBuildType} + cd CHOWTapeModel_artefacts/${finalAttrs.cmakeBuildType} cp -r LV2/CHOWTapeModel.lv2 $out/lib/lv2 cp -r VST3/CHOWTapeModel.vst3 $out/lib/vst3 cp -r CLAP/CHOWTapeModel.clap $out/lib/clap @@ -129,4 +129,4 @@ stdenv.mkDerivation rec { broken = stdenv.isAarch64; # since 2021-12-27 on hydra (update to 2.10): https://hydra.nixos.org/build/162558991 mainProgram = "CHOWTapeModel"; }; -} +}) diff --git a/pkgs/by-name/ci/cimg/package.nix b/pkgs/by-name/ci/cimg/package.nix index 9bc51a66882ae..1314c37234668 100644 --- a/pkgs/by-name/ci/cimg/package.nix +++ b/pkgs/by-name/ci/cimg/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cimg"; - version = "3.3.6"; + version = "3.4.0"; src = fetchFromGitHub { owner = "GreycLab"; repo = "CImg"; - rev = "v.${finalAttrs.version}"; - hash = "sha256-yNIHCEiLvoNNsYisAKo/jj6Q2mLrLMttZyj2XzrWFU4="; + rev = "refs/tags/v.${finalAttrs.version}"; + hash = "sha256-BnDS1n1aIQh9HJZeZv0hR7vo2l6Kf9B/11fYFbb/cpQ="; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix index 7334d8a5ee08a..9ff956d3c6f04 100644 --- a/pkgs/by-name/co/cockpit/package.nix +++ b/pkgs/by-name/co/cockpit/package.nix @@ -44,13 +44,13 @@ in stdenv.mkDerivation rec { pname = "cockpit"; - version = "317"; + version = "318"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit"; rev = "refs/tags/${version}"; - hash = "sha256-faTV9gOzPZMCLHoohzwOJ7v0gStavhUL6JQ1hFjcvhA="; + hash = "sha256-1SpSzC5wOsv4Ha0ShtuyPsKLm0fVuPt8KFejJHFU8MY="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/co/code2prompt/Cargo.lock b/pkgs/by-name/co/code2prompt/Cargo.lock new file mode 100644 index 0000000000000..1136972201b98 --- /dev/null +++ b/pkgs/by-name/co/code2prompt/Cargo.lock @@ -0,0 +1,1699 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "anstream" +version = "0.6.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" + +[[package]] +name = "anstyle-parse" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bstr" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +dependencies = [ + "memchr", + "regex-automata", + "serde", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "cc" +version = "1.0.99" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" +dependencies = [ + "jobserver", + "libc", + "once_cell", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "4.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9689a29b593160de5bc4aacab7b5d54fb52231de70122626c178e6a368994c7" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e5387378c84f6faa26890ebf9f0a92989f8873d4d380467bcd0d8d8620424df" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "clap_lex" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" + +[[package]] +name = "cli-clipboard" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04087c1d4a2aa259784a563932aee09cbb0869d490775e051096174b070f3e3d" +dependencies = [ + "clipboard-win", + "objc", + "objc-foundation", + "objc_id", + "wl-clipboard-rs", + "x11-clipboard", +] + +[[package]] +name = "clipboard-win" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" +dependencies = [ + "error-code", + "str-buf", + "winapi", +] + +[[package]] +name = "code2prompt" +version = "1.0.0" +dependencies = [ + "anyhow", + "clap", + "cli-clipboard", + "colored", + "git2", + "handlebars", + "ignore", + "indicatif", + "inquire", + "jwalk", + "regex", + "serde_json", + "termtree", + "tiktoken-rs", +] + +[[package]] +name = "colorchoice" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" + +[[package]] +name = "colored" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" +dependencies = [ + "lazy_static", + "windows-sys 0.48.0", +] + +[[package]] +name = "console" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys 0.52.0", +] + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crossbeam" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crossterm" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" +dependencies = [ + "bitflags 1.3.2", + "crossterm_winapi", + "libc", + "mio", + "parking_lot", + "signal-hook", + "signal-hook-mio", + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" +dependencies = [ + "winapi", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "derive-new" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "downcast-rs" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + +[[package]] +name = "dyn-clone" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" + +[[package]] +name = "either" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "error-code" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" +dependencies = [ + "libc", + "str-buf", +] + +[[package]] +name = "fancy-regex" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7493d4c459da9f84325ad297371a6b2b8a162800873a22e3b6b6512e61d18c05" +dependencies = [ + "bit-set", + "regex", +] + +[[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fuzzy-matcher" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94" +dependencies = [ + "thread_local", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "gethostname" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "git2" +version = "0.18.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70" +dependencies = [ + "bitflags 2.5.0", + "libc", + "libgit2-sys", + "log", + "openssl-probe", + "openssl-sys", + "url", +] + +[[package]] +name = "globset" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +dependencies = [ + "aho-corasick", + "bstr", + "log", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "handlebars" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faa67bab9ff362228eb3d00bd024a4965d8231bbb7921167f0cfa66c6626b225" +dependencies = [ + "log", + "pest", + "pest_derive", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "ignore" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" +dependencies = [ + "crossbeam-deque", + "globset", + "log", + "memchr", + "regex-automata", + "same-file", + "walkdir", + "winapi-util", +] + +[[package]] +name = "indexmap" +version = "2.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "indicatif" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" +dependencies = [ + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-width", +] + +[[package]] +name = "inquire" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fddf93031af70e75410a2511ec04d49e758ed2f26dad3404a934e0fb45cc12a" +dependencies = [ + "bitflags 2.5.0", + "crossterm", + "dyn-clone", + "fuzzy-matcher", + "fxhash", + "newline-converter", + "once_cell", + "unicode-segmentation", + "unicode-width", +] + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jobserver" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +dependencies = [ + "libc", +] + +[[package]] +name = "jwalk" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2735847566356cd2179a2a38264839308f7079fa96e6bd5a42d740460e003c56" +dependencies = [ + "crossbeam", + "rayon", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.155" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + +[[package]] +name = "libgit2-sys" +version = "0.16.2+1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" +dependencies = [ + "cc", + "libc", + "libssh2-sys", + "libz-sys", + "openssl-sys", + "pkg-config", +] + +[[package]] +name = "libssh2-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee" +dependencies = [ + "cc", + "libc", + "libz-sys", + "openssl-sys", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "libz-sys" +version = "1.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "memchr" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "newline-converter" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47b6b097ecb1cbfed438542d16e84fd7ad9b0c76c8a65b7f9039212a3d14dc7f" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "nix" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.102" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "os_pipe" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29d73ba8daf8fac13b0501d1abeddcfe21ba7401ada61a819144b6c2a4f32209" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.52.5", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pest" +version = "2.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" +dependencies = [ + "memchr", + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "pest_meta" +version = "2.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" +dependencies = [ + "once_cell", + "pest", + "sha2", +] + +[[package]] +name = "petgraph" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" +dependencies = [ + "fixedbitset", + "indexmap", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "portable-atomic" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" + +[[package]] +name = "proc-macro2" +version = "1.0.85" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "redox_syscall" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +dependencies = [ + "bitflags 2.5.0", +] + +[[package]] +name = "regex" +version = "1.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.5.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "serde" +version = "1.0.203" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.203" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "serde_json" +version = "1.0.117" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +dependencies = [ + "libc", + "mio", + "signal-hook", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "str-buf" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "termtree" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" + +[[package]] +name = "thiserror" +version = "1.0.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "tiktoken-rs" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c314e7ce51440f9e8f5a497394682a57b7c323d0f4d0a6b1b13c429056e0e234" +dependencies = [ + "anyhow", + "base64", + "bstr", + "fancy-regex", + "lazy_static", + "parking_lot", + "rustc-hash", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tree_magic_mini" +version = "3.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469a727cac55b41448315cc10427c069c618ac59bb6a4480283fcd811749bdc2" +dependencies = [ + "fnv", + "home", + "memchr", + "nom", + "once_cell", + "petgraph", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "ucd-trie" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-width" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wayland-client" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" +dependencies = [ + "bitflags 1.3.2", + "downcast-rs", + "libc", + "nix", + "wayland-commons", + "wayland-scanner", + "wayland-sys", +] + +[[package]] +name = "wayland-commons" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" +dependencies = [ + "nix", + "once_cell", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-protocols" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" +dependencies = [ + "bitflags 1.3.2", + "wayland-client", + "wayland-commons", + "wayland-scanner", +] + +[[package]] +name = "wayland-scanner" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" +dependencies = [ + "proc-macro2", + "quote", + "xml-rs", +] + +[[package]] +name = "wayland-sys" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4" +dependencies = [ + "pkg-config", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "winapi-wsapoll" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1eafc5f679c576995526e81635d0cf9695841736712b4e892f87abbe6fed3f28" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + +[[package]] +name = "wl-clipboard-rs" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "981a303dfbb75d659f6612d05a14b2e363c103d24f676a2d44a00d18507a1ad9" +dependencies = [ + "derive-new", + "libc", + "log", + "nix", + "os_pipe", + "tempfile", + "thiserror", + "tree_magic_mini", + "wayland-client", + "wayland-protocols", +] + +[[package]] +name = "x11-clipboard" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "980b9aa9226c3b7de8e2adb11bf20124327c054e0e5812d2aac0b5b5a87e7464" +dependencies = [ + "x11rb", +] + +[[package]] +name = "x11rb" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "592b4883219f345e712b3209c62654ebda0bb50887f330cbd018d0f654bfd507" +dependencies = [ + "gethostname", + "nix", + "winapi", + "winapi-wsapoll", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56b245751c0ac9db0e006dc812031482784e434630205a93c73cfefcaabeac67" +dependencies = [ + "nix", +] + +[[package]] +name = "xml-rs" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" diff --git a/pkgs/by-name/co/code2prompt/package.nix b/pkgs/by-name/co/code2prompt/package.nix new file mode 100644 index 0000000000000..f951b2b1e294b --- /dev/null +++ b/pkgs/by-name/co/code2prompt/package.nix @@ -0,0 +1,47 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + openssl, + stdenv, + darwin, +}: + +rustPlatform.buildRustPackage rec { + pname = "code2prompt"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "mufeedvh"; + repo = "code2prompt"; + rev = "v${version}"; + hash = "sha256-KZqh0Vq4Mn56PhUO1JUzVpNBAGOZqUAsj31Cj5K+Lyk="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + }; + + postPatch = '' + # src is missing Cargo.lock + ln -s ${./Cargo.lock} Cargo.lock + ''; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.AppKit + ]; + + meta = { + description = "A CLI tool that converts your codebase into a single LLM prompt with a source tree, prompt templating, and token counting"; + homepage = "https://github.com/mufeedvh/code2prompt"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ heisfer ]; + mainProgram = "code2prompt"; + }; +} diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix index 9317af08decde..bac7f7d8ce2a6 100644 --- a/pkgs/by-name/co/codeium/package.nix +++ b/pkgs/by-name/co/codeium/package.nix @@ -13,10 +13,10 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-7GOWEvCco8/CxdWmvRsXfMOOSPsfb1/UQpbFEEeQfUc="; - aarch64-linux = "sha256-j+gILUP681hMo0azcbeZwi3Q9dwd9v6ADWow720cWAo="; - x86_64-darwin = "sha256-RNDDzAwf5s2EMTrum1OF6iZ/SUF7cG0Ow2itb0ynaJk="; - aarch64-darwin = "sha256-ac8j5BFEylAe7ApN3+iYW5ldFUh/7UYWf3MlDNOQTvc="; + x86_64-linux = "sha256-38ESKfQXHqHdP+vu/ynCByIPYHcvt8w8SJ/NTmCpm8o="; + aarch64-linux = "sha256-W00MyiBPQa8vClIjDynDgYEeigjWtBuDfNzZKMEzifg="; + x86_64-darwin = "sha256-CkKuEuYfq/vUv8uc4mhKpjqAfGM/B8goJ5EPAsA1gnI="; + aarch64-darwin = "sha256-aX70EfrRzEz2DJIcSEXrd0T0ptHzie21CQx4g6dU7g0="; }.${system} or throwSystem; bin = "$out/bin/codeium_language_server"; @@ -24,7 +24,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "codeium"; - version = "1.8.57"; + version = "1.8.61"; src = fetchurl { name = "${finalAttrs.pname}-${finalAttrs.version}.gz"; url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz"; diff --git a/pkgs/development/libraries/CoinMP/0001-change-more-reinterpret_cast-from-NULL-to-C-cast-see.patch b/pkgs/by-name/co/coinmp/0001-change-more-reinterpret_cast-from-NULL-to-C-cast-see.patch index fccba169df490..fccba169df490 100644 --- a/pkgs/development/libraries/CoinMP/0001-change-more-reinterpret_cast-from-NULL-to-C-cast-see.patch +++ b/pkgs/by-name/co/coinmp/0001-change-more-reinterpret_cast-from-NULL-to-C-cast-see.patch diff --git a/pkgs/development/libraries/CoinMP/0001-use-static_cast-for-static-cast-fixes-319.patch b/pkgs/by-name/co/coinmp/0001-use-static_cast-for-static-cast-fixes-319.patch index 3f1790bd50c39..3f1790bd50c39 100644 --- a/pkgs/development/libraries/CoinMP/0001-use-static_cast-for-static-cast-fixes-319.patch +++ b/pkgs/by-name/co/coinmp/0001-use-static_cast-for-static-cast-fixes-319.patch diff --git a/pkgs/development/libraries/CoinMP/0002-change-reinterpret_cast-of-NULL-to-C-style-case-fixe.patch b/pkgs/by-name/co/coinmp/0002-change-reinterpret_cast-of-NULL-to-C-style-case-fixe.patch index b1ca1806b5a9c..b1ca1806b5a9c 100644 --- a/pkgs/development/libraries/CoinMP/0002-change-reinterpret_cast-of-NULL-to-C-style-case-fixe.patch +++ b/pkgs/by-name/co/coinmp/0002-change-reinterpret_cast-of-NULL-to-C-style-case-fixe.patch diff --git a/pkgs/development/libraries/CoinMP/default.nix b/pkgs/by-name/co/coinmp/package.nix index 7b829305b0319..8c15c5ca62c34 100644 --- a/pkgs/development/libraries/CoinMP/default.nix +++ b/pkgs/by-name/co/coinmp/package.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch }: -stdenv.mkDerivation rec { - pname = "CoinMP"; +stdenv.mkDerivation (finalAttrs: { + pname = "coinmp"; version = "1.8.4"; src = fetchurl { - url = "https://www.coin-or.org/download/source/CoinMP/${pname}-${version}.tgz"; + url = "https://www.coin-or.org/download/source/CoinMP/CoinMP-${finalAttrs.version}.tgz"; sha256 = "13d3j1sdcjzpijp4qks3n0zibk649ac3hhv88hkk8ffxrc6gnn9l"; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.epl10; }; -} +}) diff --git a/pkgs/by-name/co/colorgrind/package.nix b/pkgs/by-name/co/colorgrind/package.nix new file mode 100644 index 0000000000000..1f89ad865583a --- /dev/null +++ b/pkgs/by-name/co/colorgrind/package.nix @@ -0,0 +1,33 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + perl +}: +stdenvNoCC.mkDerivation { + pname = "colorgrind"; + version = "0-unstable-2016-07-05"; + + src = fetchFromGitHub { + owner = "renatocf"; + repo = "colorgrind"; + rev = "6b68367c9713075a40c6719cb24217e9437ffa74"; + hash = "sha256-KVR2IeoAkaTXDjEndPvrKUzOf4Zkha20vcH4TTJqXfM="; + }; + + buildInputs = [ perl ]; + + installPhase = '' + runHook preInstall + install -Dm755 -t $out/bin colorgrind + runHook postInstall + ''; + + meta = { + description = "Perl wrapper for Valgrind with ANSI escape code colored output"; + homepage = "http://renatocf.github.io/colorgrind/"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ pluiedev ]; + mainProgram = "colorgrind"; + }; +} diff --git a/pkgs/by-name/co/commitlint-rs/package.nix b/pkgs/by-name/co/commitlint-rs/package.nix new file mode 100644 index 0000000000000..9b31e6cfd3094 --- /dev/null +++ b/pkgs/by-name/co/commitlint-rs/package.nix @@ -0,0 +1,41 @@ +{ + fetchFromGitHub, + lib, + nix-update-script, + rustPlatform, + testers, + commitlint-rs, +}: +rustPlatform.buildRustPackage rec { + pname = "commitlint-rs"; + version = "0.1.11"; + + src = fetchFromGitHub { + owner = "KeisukeYamashita"; + repo = "commitlint-rs"; + rev = "v${version}"; + hash = "sha256-FrYXEh75H0u1rE1YNDL/B1gMYMG43jPDJGUMv9y5/3g="; + }; + cargoHash = "sha256-W6HkLCUoylgQQc2fFprmJeLH8KtpVUD4+BXWbNECVZ4="; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { package = commitlint-rs; }; + }; + + meta = with lib; { + description = "Lint commit messages with conventional commit messages"; + homepage = "https://keisukeyamashita.github.io/commitlint-rs"; + changelog = "https://github.com/KeisukeYamashita/commitlint-rs/releases/tag/${src.rev}"; + license = with licenses; [ + mit + asl20 + ]; + mainProgram = "commitlint"; + platforms = with platforms; unix ++ windows; + maintainers = with maintainers; [ + croissong + getchoo + ]; + }; +} diff --git a/pkgs/by-name/co/conpass/package.nix b/pkgs/by-name/co/conpass/package.nix new file mode 100644 index 0000000000000..d8870a907541f --- /dev/null +++ b/pkgs/by-name/co/conpass/package.nix @@ -0,0 +1,42 @@ +{ + lib, + python3, + fetchFromGitHub, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "conpass"; + version = "0.1.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "login-securite"; + repo = "conpass"; + rev = "refs/tags/v${version}"; + hash = "sha256-7o4aQ6qpaWimWqgFO35Wht7mQsdVezoPTm7hp54FWR8="; + }; + + build-system = with python3.pkgs; [ + setuptools + ]; + + dependencies = with python3.pkgs; [ + impacket + python-ldap + rich + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "conpass" ]; + + meta = with lib; { + description = "Continuous password spraying tool"; + homepage = "https://github.com/login-securite/conpass"; + changelog = "https://github.com/login-securite/conpass/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + mainProgram = "conpass"; + }; +} diff --git a/pkgs/by-name/co/consul/package.nix b/pkgs/by-name/co/consul/package.nix index edc3db672bd67..5dc8d88afe340 100644 --- a/pkgs/by-name/co/consul/package.nix +++ b/pkgs/by-name/co/consul/package.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "consul"; - version = "1.18.2"; + version = "1.19.0"; # Note: Currently only release tags are supported, because they have the Consul UI # vendored. See @@ -22,7 +22,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9feeWsCAZKip+AYUJTCcqFOTfxsUFMzTRqHjo/Pptho="; + hash = "sha256-GO2BfdozsAo1r4iSyQdAEG8Tm6OkJhSUrH3bZ9lWuO8="; }; # This corresponds to paths with package main - normally unneeded but consul @@ -32,7 +32,7 @@ buildGoModule rec { "connect/certgen" ]; - vendorHash = "sha256-bBc3qgPUOmR8c/sFyiskePKLKjHTQcWVTLY6esFIRTc="; + vendorHash = "sha256-h3eTCj/0FPiY/Dj4cMj9VqKBs28ArnTPjRIC3LT06j0="; doCheck = false; diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/by-name/co/coyim/package.nix index 94606d6087a8a..2906d324c2ae6 100644 --- a/pkgs/applications/networking/instant-messengers/coyim/default.nix +++ b/pkgs/by-name/co/coyim/package.nix @@ -1,6 +1,6 @@ { lib , stdenv -, buildGoPackage +, buildGoModule , fetchFromGitHub , pkg-config , cairo @@ -11,28 +11,28 @@ , gtk3 }: -buildGoPackage rec { +buildGoModule { pname = "coyim"; - version = "0.4.1"; - - goPackagePath = "github.com/coyim/coyim"; + version = "0.4.1-unstable-2023-09-21"; src = fetchFromGitHub { owner = "coyim"; repo = "coyim"; - rev = "v${version}"; - sha256 = "sha256-PmB6POaHKEXzIAaz3lAbUOhtVOzrj5oXRk90giYo6SI="; + rev = "3f84daa8c27277543b1b4ad4536dde5100d9df12"; + sha256 = "sha256-lzhcUSBuAgYwcmdwnqNxKG0P6ZSjWeLS/g/gaF171D4="; }; + vendorHash = "sha256-zG7r/Db6XiwKoHRduGj3tEh/KT1hsuBoSGLYaZ+qO0Y="; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ glib cairo gdk-pixbuf gtk3 gnome.adwaita-icon-theme ]; - meta = with lib; { + meta = { description = "Safe and secure chat client"; mainProgram = "coyim"; homepage = "https://coy.im/"; - license = licenses.gpl3; + license = lib.licenses.gpl3; platforms = [ "x86_64-linux" "x86_64-darwin" ]; broken = stdenv.isDarwin; }; diff --git a/pkgs/by-name/cr/cryptor/package.nix b/pkgs/by-name/cr/cryptor/package.nix index edbaa0903b0a8..b48662b2992fc 100644 --- a/pkgs/by-name/cr/cryptor/package.nix +++ b/pkgs/by-name/cr/cryptor/package.nix @@ -42,6 +42,10 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' wrapProgram $out/bin/cryptor \ --prefix PATH : "${lib.makeBinPath [ gocryptfs ]}" + + install -Dm444 $src/resources/misc/cryptor.desktop -t $out/share/applications + substituteInPlace $out/share/applications/cryptor.desktop \ + --replace-warn '/usr/bin/cryptor' 'cryptor' ''; meta = { diff --git a/pkgs/by-name/cu/cue/package.nix b/pkgs/by-name/cu/cue/package.nix index 7e1493956ca3e..39a506dbc69e4 100644 --- a/pkgs/by-name/cu/cue/package.nix +++ b/pkgs/by-name/cu/cue/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "cue"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "cue-lang"; repo = "cue"; rev = "v${version}"; - hash = "sha256-gjuQ7sp6/GeKSqyyicOtH5Q/1xRy/7cta4KKMn2cfzQ="; + hash = "sha256-hhu66uiBkxyYRw8eruqxVifr2yftDXcYRTK5VYbjRPQ="; }; vendorHash = "sha256-FsFignBh669E60S8l8siQHLzeSfB5X/XOHBXPMDX3Cg="; @@ -24,7 +24,11 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - ldflags = [ "-s" "-w" ]; + ldflags = [ + "-s" + "-w" + "-X cuelang.org/go/cmd/cue/cmd.version=v${version}" + ]; postInstall = '' installShellCompletion --cmd cue \ @@ -48,7 +52,7 @@ buildGoModule rec { meta = with lib; { description = "Data constraint language which aims to simplify tasks involving defining and using data"; homepage = "https://cuelang.org/"; - license = lib.licenses.asl20; + license = licenses.asl20; maintainers = with maintainers; [ aaronjheng ]; mainProgram = "cue"; }; diff --git a/pkgs/by-name/cy/cyme/Cargo.lock b/pkgs/by-name/cy/cyme/Cargo.lock index fd35496ea48fa..c645e23d1563c 100644 --- a/pkgs/by-name/cy/cyme/Cargo.lock +++ b/pkgs/by-name/cy/cyme/Cargo.lock @@ -492,8 +492,9 @@ dependencies = [ [[package]] name = "libusb1-sys" -version = "0.6.4" -source = "git+https://github.com/a1ien/rusb.git#c38563efeb7733f0f8b5ac01703fd2ad1d84fea2" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da050ade7ac4ff1ba5379af847a10a10a8e284181e060105bf8d86960ce9ce0f" dependencies = [ "cc", "libc", @@ -697,8 +698,9 @@ checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" [[package]] name = "rusb" -version = "0.9.3" -source = "git+https://github.com/a1ien/rusb.git#c38563efeb7733f0f8b5ac01703fd2ad1d84fea2" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab9f9ff05b63a786553a4c02943b74b34a988448671001e9a27e2f0565cc05a4" dependencies = [ "libc", "libusb1-sys", diff --git a/pkgs/by-name/cy/cyme/package.nix b/pkgs/by-name/cy/cyme/package.nix index 3b38028f2d112..5c854b55893f3 100644 --- a/pkgs/by-name/cy/cyme/package.nix +++ b/pkgs/by-name/cy/cyme/package.nix @@ -14,20 +14,19 @@ rustPlatform.buildRustPackage rec { pname = "cyme"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "tuna-f1sh"; repo = "cyme"; rev = "v${version}"; - hash = "sha256-97sxK2zhUKBS238F9mNk8a2VbTVpvbDlN1yDas4Fls4="; + hash = "sha256-HIOrdVChTfYX8AKqytWU+EudFDiqoVELb+yL3jsPQwM="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "libudev-sys-0.1.4" = "sha256-7dUqPH8bQ/QSBIppxQbymwQ44Bvi1b6N2AMUylbyKK8="; - "libusb1-sys-0.6.4" = "sha256-Y3K3aEZnpLud/g4Tx+1HDEkNRKi5s4Fo0QSWya/L+L4="; }; }; diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index 4f516930c313a..ee80efd1c3d6f 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -1,23 +1,27 @@ -{ lib -, stdenvNoCC -, fetchurl -, makeWrapper -, openjdk17 -, gnused -, autoPatchelfHook -, wrapGAppsHook3 +{ + lib, + stdenvNoCC, + fetchurl, + undmg, + makeWrapper, + openjdk17, + gnused, + autoPatchelfHook, + wrapGAppsHook3, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbeaver-bin"; version = "24.0.5"; - nativeBuildInputs = [ - makeWrapper - gnused - autoPatchelfHook - wrapGAppsHook3 - ]; + nativeBuildInputs = + [ makeWrapper ] + ++ lib.optionals (!stdenvNoCC.isDarwin) [ + gnused + wrapGAppsHook3 + autoPatchelfHook + ] + ++ lib.optionals stdenvNoCC.isDarwin [ undmg ]; src = let @@ -26,10 +30,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { suffix = selectSystem { x86_64-linux = "linux.gtk.x86_64-nojdk.tar.gz"; aarch64-linux = "linux.gtk.aarch64-nojdk.tar.gz"; + x86_64-darwin = "macos-x86_64.dmg"; + aarch64-darwin = "macos-aarch64.dmg"; }; hash = selectSystem { x86_64-linux = "sha256-q6VIr55hXn47kZrE2i6McEOfp2FBOvwB0CcUnRHFMZs="; aarch64-linux = "sha256-Xn3X1C31UALBAsZIGyMWdp0HNhJEm5N+7Go7nMs8W64="; + x86_64-darwin = "sha256-XOQaMNQHOC4dVJXIUn4l4Oa7Gohbq+JMDFusIy/U+tc="; + aarch64-darwin = "sha256-554ea5p1MR4XIHtSeByd4S/Ke4cKRZbITTNRRDoRqPI="; }; in fetchurl { @@ -40,28 +48,44 @@ stdenvNoCC.mkDerivation (finalAttrs: { dontConfigure = true; dontBuild = true; - installPhase = '' - runHook preInstall - mkdir -p $out/opt/dbeaver $out/bin - cp -r * $out/opt/dbeaver - makeWrapper $out/opt/dbeaver/dbeaver $out/bin/dbeaver \ - --prefix PATH : "${openjdk17}/bin" \ - --set JAVA_HOME "${openjdk17.home}" + sourceRoot = lib.optional stdenvNoCC.isDarwin "dbeaver.app"; - mkdir -p $out/share/icons/hicolor/256x256/apps - ln -s $out/opt/dbeaver/dbeaver.png $out/share/icons/hicolor/256x256/apps/dbeaver.png + installPhase = + if !stdenvNoCC.isDarwin then + '' + runHook preInstall + mkdir -p $out/opt/dbeaver $out/bin + cp -r * $out/opt/dbeaver + makeWrapper $out/opt/dbeaver/dbeaver $out/bin/dbeaver \ + --prefix PATH : "${openjdk17}/bin" \ + --set JAVA_HOME "${openjdk17.home}" - mkdir -p $out/share/applications - ln -s $out/opt/dbeaver/dbeaver-ce.desktop $out/share/applications/dbeaver.desktop + mkdir -p $out/share/icons/hicolor/256x256/apps + ln -s $out/opt/dbeaver/dbeaver.png $out/share/icons/hicolor/256x256/apps/dbeaver.png - substituteInPlace $out/opt/dbeaver/dbeaver-ce.desktop \ - --replace-fail "/usr/share/dbeaver-ce/dbeaver.png" "dbeaver" \ - --replace-fail "/usr/share/dbeaver-ce/dbeaver" "$out/bin/dbeaver" + mkdir -p $out/share/applications + ln -s $out/opt/dbeaver/dbeaver-ce.desktop $out/share/applications/dbeaver.desktop - sed -i '/^Path=/d' $out/share/applications/dbeaver.desktop + substituteInPlace $out/opt/dbeaver/dbeaver-ce.desktop \ + --replace-fail "/usr/share/dbeaver-ce/dbeaver.png" "dbeaver" \ + --replace-fail "/usr/share/dbeaver-ce/dbeaver" "$out/bin/dbeaver" - runHook postInstall - ''; + sed -i '/^Path=/d' $out/share/applications/dbeaver.desktop + + runHook postInstall + '' + else + '' + runHook preInstall + + mkdir -p $out/{Applications/dbeaver.app,bin} + cp -R . $out/Applications/dbeaver.app + makeWrapper $out/{Applications/dbeaver.app/Contents/MacOS,bin}/dbeaver \ + --prefix PATH : "${openjdk17}/bin" \ + --set JAVA_HOME "${openjdk17.home}" + + runHook postInstall + ''; passthru.updateScript = ./update.sh; @@ -76,8 +100,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.asl20; - platforms = platforms.linux; - maintainers = with maintainers; [ gepbird mkg20001 ]; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ + gepbird + mkg20001 + yzx9 + ]; mainProgram = "dbeaver"; }; }) diff --git a/pkgs/by-name/db/dbeaver-bin/update.sh b/pkgs/by-name/db/dbeaver-bin/update.sh index ad8461e5a2eb8..64b965da6db07 100755 --- a/pkgs/by-name/db/dbeaver-bin/update.sh +++ b/pkgs/by-name/db/dbeaver-bin/update.sh @@ -14,7 +14,9 @@ fi for i in \ "x86_64-linux linux.gtk.x86_64-nojdk.tar.gz" \ - "aarch64-linux linux.gtk.aarch64-nojdk.tar.gz" + "aarch64-linux linux.gtk.aarch64-nojdk.tar.gz" \ + "x86_64-darwin macos-x86_64.dmg" \ + "aarch64-darwin macos-aarch64.dmg" do set -- $i prefetch=$(nix-prefetch-url "https://github.com/dbeaver/dbeaver/releases/download/$latestVersion/dbeaver-ce-$latestVersion-$2") diff --git a/pkgs/by-name/db/dbgate/package.nix b/pkgs/by-name/db/dbgate/package.nix index affb17056c4e3..1b46f007aecce 100644 --- a/pkgs/by-name/db/dbgate/package.nix +++ b/pkgs/by-name/db/dbgate/package.nix @@ -7,39 +7,37 @@ }: let pname = "dbgate"; - version = "5.2.8"; + version = "5.3.0"; src = fetchurl { aarch64-linux = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_arm64.AppImage"; - hash = "sha256-gxojSSk7prhnd9fy56B9H+Cj6COBLc7xPfV8dTvSO0c="; + hash = "sha256-FoNph6phZEMjndX6KNtSH8TpOpI0x4rmpTBh11bYV3c="; }; x86_64-linux = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_x86_64.AppImage"; - hash = "sha256-/Vfd0R+Mzx1CJKkC7dj99pbuuyh8PJtbYlH3wtwVxSM="; + hash = "sha256-HsWT099apLtL5KAy3Shw0uEoXzpWGAyD63L3NhT/JlU="; }; x86_64-darwin = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_x64.dmg"; - hash = "sha256-1kC5CNgD3KGR3nd14cBHhYKCThualLKR3CE4KGKh/Hs="; + hash = "sha256-bdCwvfmfOCpVW1yTFxsLxveg9uQW1O8ODkCGpiujRCE="; }; } .${stdenv.system} or (throw "dbgate: ${stdenv.system} is unsupported."); - - meta = with lib; { + meta = { description = "Database manager for MySQL, PostgreSQL, SQL Server, MongoDB, SQLite and others"; - homepage = "https://github.com/dbgate/dbgate"; - license = licenses.mit; - maintainers = with maintainers; [ luftmensch-luftmensch ]; - changelog = "https://github.com/dbgate/dbgate/blob/master/CHANGELOG.md"; + homepage = "https://dbgate.org/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; + changelog = "https://github.com/dbgate/dbgate/releases/tag/v${version}"; mainProgram = "dbgate"; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; - - sourceProvenance = [ sourceTypes.binaryNativeCode ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; in if stdenv.isDarwin then diff --git a/pkgs/by-name/de/debianutils/package.nix b/pkgs/by-name/de/debianutils/package.nix index 5696499777fa3..c4e968902cba3 100644 --- a/pkgs/by-name/de/debianutils/package.nix +++ b/pkgs/by-name/de/debianutils/package.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "debianutils"; - version = "5.18"; + version = "5.19"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "debianutils"; rev = "debian/${finalAttrs.version}"; - hash = "sha256-rZEDUwx8ldCTVUB1CqghYgaZ4kMGxWCtiFCdoxQDwpo="; + hash = "sha256-2YJgHwjD1JyqzdYaicrgKHA/a5KdkdPJnhGQxoq/KpU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/de/decker/package.nix b/pkgs/by-name/de/decker/package.nix index 4469b285e8aae..0d079c9ae2d02 100644 --- a/pkgs/by-name/de/decker/package.nix +++ b/pkgs/by-name/de/decker/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "decker"; - version = "1.43"; + version = "1.44"; src = fetchFromGitHub { owner = "JohnEarnest"; repo = "Decker"; rev = "v${version}"; - hash = "sha256-8P8P5hakIMR+9ug61hkXyt6q1DrcwylKbDCvgFmQPdA="; + hash = "sha256-C3CWzrKhZWEud0N2p56U+zhGjwTJ5xCfZsz+NlkdQG4="; }; buildInputs = [ diff --git a/pkgs/by-name/de/devcontainer/package.nix b/pkgs/by-name/de/devcontainer/package.nix index affb09cad6d0c..5d80b7a9576a6 100644 --- a/pkgs/by-name/de/devcontainer/package.nix +++ b/pkgs/by-name/de/devcontainer/package.nix @@ -1,40 +1,46 @@ -{ lib -, stdenv -, fetchYarnDeps -, fetchFromGitHub -, fixup-yarn-lock -, nodejs -, python3 -, makeWrapper -, git -, docker -, yarn -, docker-compose +{ + lib, + stdenv, + fetchYarnDeps, + fetchFromGitHub, + fixup-yarn-lock, + nodejs, + python3, + makeBinaryWrapper, + git, + docker, + yarn, + docker-compose, }: stdenv.mkDerivation (finalAttrs: { pname = "devcontainer"; - version = "0.60.0"; + version = "0.64.0"; src = fetchFromGitHub { owner = "devcontainers"; repo = "cli"; - rev = "v${finalAttrs.version}"; - hash = "sha256-/QznJhw+DYwnj/kdP6f4liJlOFhNQO0y7r4i55bJPug="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-kO5bRLbHNObDLGURrEgNLK70ml2FVDQioLa8cbBBurk="; }; yarnOfflineCache = fetchYarnDeps { - yarnLock = finalAttrs.src + "/yarn.lock"; + yarnLock = "${finalAttrs.src}/yarn.lock"; hash = "sha256-tN7qAvfYmDz5ZtgZL5+ZZtkuxZxvlS9FM3+dGl+daUQ="; }; - nativeBuildInputs = [ yarn fixup-yarn-lock python3 makeWrapper ]; + nativeBuildInputs = [ + yarn + fixup-yarn-lock + python3 + makeBinaryWrapper + nodejs + ]; buildPhase = '' runHook preBuild export HOME=$(mktemp -d) yarn config --offline set yarn-offline-mirror ${finalAttrs.yarnOfflineCache} - # Without this, yarn will try to download the dependencies fixup-yarn-lock yarn.lock @@ -44,27 +50,39 @@ stdenv.mkDerivation (finalAttrs: { yarn --offline --frozen-lockfile yarn --offline --frozen-lockfile compile-prod - mkdir -p $out/bin - mkdir -p $out/libexec + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,libexec} cp -r dist $out/libexec cp devcontainer.js $out/libexec/devcontainer.js cp -r node_modules $out/libexec/node_modules cp -r $src/scripts $out/libexec/scripts - runHook postBuild + + runHook postInstall ''; postInstall = '' - makeWrapper "${nodejs}/bin/node" "$out/bin/devcontainer" \ + makeWrapper "${lib.getExe nodejs}" "$out/bin/devcontainer" \ --add-flags "$out/libexec/devcontainer.js" \ - --prefix PATH : ${lib.makeBinPath [ git docker docker-compose ]} + --prefix PATH : ${ + lib.makeBinPath [ + git + docker + docker-compose + ] + } ''; - meta = with lib; { + meta = { description = "Dev container CLI, run and manage your dev environments via a devcontainer.json"; homepage = "https://containers.dev/"; - license = licenses.mit; - maintainers = with maintainers; [ rucadi ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ rucadi ]; + platforms = lib.platforms.unix; mainProgram = "devcontainer"; }; }) diff --git a/pkgs/by-name/di/discord-gamesdk/package.nix b/pkgs/by-name/di/discord-gamesdk/package.nix index b2f9a08dc7724..40756d68e1e54 100644 --- a/pkgs/by-name/di/discord-gamesdk/package.nix +++ b/pkgs/by-name/di/discord-gamesdk/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ (stdenv.cc.cc.libgcc or null) ]; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = lib.optional stdenv.isLinux autoPatchelfHook; installPhase = let diff --git a/pkgs/by-name/di/disko/package.nix b/pkgs/by-name/di/disko/package.nix index cc493065f3d1a..4df0c8b11c342 100644 --- a/pkgs/by-name/di/disko/package.nix +++ b/pkgs/by-name/di/disko/package.nix @@ -8,7 +8,7 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { - name = "disko"; + pname = "disko"; version = "1.6.1"; src = fetchFromGitHub { owner = "nix-community"; diff --git a/pkgs/by-name/di/dissent/package.nix b/pkgs/by-name/di/dissent/package.nix index fdcc4ad37ce41..f3c0f81133888 100644 --- a/pkgs/by-name/di/dissent/package.nix +++ b/pkgs/by-name/di/dissent/package.nix @@ -1,16 +1,10 @@ { buildGoModule -, cairo , fetchFromGitHub -, gdk-pixbuf -, glib , gobject-introspection -, graphene , gst_all_1 -, gtk4 , lib , libadwaita , libcanberra-gtk3 -, pango , pkg-config , sound-theme-freedesktop , wrapGAppsHook4 @@ -18,13 +12,13 @@ buildGoModule rec { pname = "dissent"; - version = "0.0.24"; + version = "0.0.25"; src = fetchFromGitHub { owner = "diamondburned"; repo = "dissent"; rev = "v${version}"; - hash = "sha256-XoppHkKQhWZbqVIViGIV0e0W/NhZW0v6ufmXlVtmzvI="; + hash = "sha256-ysI7zgducK52XbSzsaCnffSC9BRd/aaybMif/GkkhcI="; }; nativeBuildInputs = [ @@ -34,34 +28,31 @@ buildGoModule rec { ]; buildInputs = [ - cairo - gdk-pixbuf - glib - graphene - gtk4 - pango # Optional according to upstream but required for sound and video gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-ugly gst_all_1.gstreamer + libadwaita libcanberra-gtk3 sound-theme-freedesktop - libadwaita ]; postInstall = '' install -D -m 444 -t $out/share/applications nix/so.libdb.dissent.desktop - install -D -m 444 internal/icons/hicolor/scalable/apps/so.libdb.dissent.svg $out/share/icons/hicolor/scalable/apps/so.libdb.dissent.svg + install -D -m 444 -t $out/share/icons/hicolor/scalable/apps internal/icons/hicolor/scalable/apps/so.libdb.dissent.svg + install -D -m 444 -t $out/share/icons/hicolor/symbolic/apps internal/icons/symbolic/apps/so.libdb.dissent-symbolic.svg + install -D -m 444 -t $out/share/metainfo so.libdb.dissent.metainfo.xml + install -D -m 444 -t $out/share/dbus-1/services nix/so.libdb.dissent.service ''; - vendorHash = "sha256-8/k9auM7+rceV26f3pNjEK1trzzAM530CX008pLZ1OA="; + vendorHash = "sha256-qBgj3h+WKWxVahRXyO/w2zGY4UCVkjP7XKFk/9GOFqs="; meta = with lib; { - description = "GTK4 Discord client in Go, attempt #4 (formerly gtkcord4)"; + description = "A third-party Discord client designed for a smooth, native experience (formerly gtkcord4)"; homepage = "https://github.com/diamondburned/dissent"; - license = licenses.gpl3Only; + license = with licenses; [ gpl3Plus cc0 ]; mainProgram = "dissent"; maintainers = with maintainers; [ hmenke urandom aleksana ]; }; diff --git a/pkgs/by-name/di/distribution/package.nix b/pkgs/by-name/di/distribution/package.nix new file mode 100644 index 0000000000000..9da917b512180 --- /dev/null +++ b/pkgs/by-name/di/distribution/package.nix @@ -0,0 +1,67 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, fetchpatch +, nix-update-script +, testers +, distribution +}: + +buildGoModule rec { + pname = "distribution"; + version = "3.0.0-alpha.1"; + + src = fetchFromGitHub { + owner = "distribution"; + repo = "distribution"; + rev = "v${version}"; + hash = "sha256-reguAtBkEC9OMUTdCtFY6l0fkk28VoA0IlPcQ0sz84I="; + }; + + patches = [ + # fix: load gcs credentials and client inside DriverConstructor + # Needed to pass the tests. Remove with next update. + (fetchpatch { + url = "https://github.com/distribution/distribution/commit/14366a2dff6a8f595e39d258085381731b43cec6.diff"; + hash = "sha256-0ns9JuIeLBzRLMVxY6uaWTIYcRRbuwQ+n9tmK+Pvf4U="; + }) + # fix: add missing skip in s3 driver test + # Needed to pass the tests. Remove with next update. + (fetchpatch { + url = "https://github.com/distribution/distribution/commit/6908e0d5facd31ed32046df03a09040c964be0b3.patch"; + hash = "sha256-ww+BwBGw+dkZ2FhVzynehR+sNYCgq8/KkPDP9ac6NWg="; + }) + ]; + + vendorHash = null; + + checkFlags = [ + # TestHTTPChecker: requires internet access. + # TestInMemoryDriverSuite: timeout after 10 minutes, looks like a deadlock. + "-skip=^TestHTTPChecker$|^TestInMemoryDriverSuite$" + ]; + + passthru = { + tests.version = testers.testVersion { + package = distribution; + version = "v${version}"; + }; + updateScript = nix-update-script { }; + }; + + meta = with lib; { + description = "Toolkit to pack, ship, store, and deliver container content"; + longDescription = '' + Distribution is a Open Source Registry implementation for storing and distributing container + images and other content using the OCI Distribution Specification. The goal of this project + is to provide a simple, secure, and scalable base for building a large scale registry solution + or running a simple private registry. + ''; + homepage = "https://distribution.github.io/distribution/"; + changelog = "https://github.com/distribution/distribution/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = [ ]; + mainProgram = "registry"; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/dm/dmarc-report-converter/package.nix b/pkgs/by-name/dm/dmarc-report-converter/package.nix index e91c35698cc53..8121f554a2918 100644 --- a/pkgs/by-name/dm/dmarc-report-converter/package.nix +++ b/pkgs/by-name/dm/dmarc-report-converter/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "dmarc-report-converter"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "tierpod"; repo = "dmarc-report-converter"; rev = "v${version}"; - hash = "sha256-TqvAqMZEXhMO3/0VNY3Mr/E15QQbucuKyG95j2jWU5g="; + hash = "sha256-j1uFPCyxLqO3BMxl/02wILj5HGag9qjxCTB8ZxZHEGo="; }; vendorHash = null; diff --git a/pkgs/by-name/do/docfd/package.nix b/pkgs/by-name/do/docfd/package.nix index c8c3e193c360f..3636296b8de44 100644 --- a/pkgs/by-name/do/docfd/package.nix +++ b/pkgs/by-name/do/docfd/package.nix @@ -21,7 +21,7 @@ let in buildDunePackage' rec { pname = "docfd"; - version = "6.0.1"; + version = "7.0.0"; minimalOCamlVersion = "5.1"; @@ -29,7 +29,7 @@ buildDunePackage' rec { owner = "darrenldl"; repo = "docfd"; rev = version; - hash = "sha256-pNBWSPII+r9MMmyXBzxQ6hMNrN7nwcdhrpufzj00s2E="; + hash = "sha256-R/UOA1rf9NnEQQWn/ToCZuUSC48DPqglrb+5ZjCdpb0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/do/docuum/package.nix b/pkgs/by-name/do/docuum/package.nix index 62a46f0a97e13..3eae913da1e1f 100644 --- a/pkgs/by-name/do/docuum/package.nix +++ b/pkgs/by-name/do/docuum/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "docuum"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "stepchowfun"; repo = "docuum"; rev = "v${version}"; - hash = "sha256-/30wuLnCcomgJ14c5rNbitD1dEpvyRal3L60gQdZPBU="; + hash = "sha256-nWd6h39jU1eZWPFMxhxActsmrs9k0TDMlealuzTa+o0="; }; - cargoHash = "sha256-BvZM0tAgwoOO0VFQEoifgmENnW3cfKV3Zj872/Lki6A="; + cargoHash = "sha256-uoQ1qUII6TSZsosAdNfs2CREVuN2kuT9Bmi5vuDT/rY="; checkFlags = [ # fails, no idea why diff --git a/pkgs/by-name/do/doppler/package.nix b/pkgs/by-name/do/doppler/package.nix index 5fc87846ba4b4..29537bcb9abb3 100644 --- a/pkgs/by-name/do/doppler/package.nix +++ b/pkgs/by-name/do/doppler/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.68.0"; + version = "3.69.0"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-IKfLoCFJOGE200Mef660CQNMukEmpgIWo6ngOYvX5Hw="; + sha256 = "sha256-lijVKNmqTcmjgIzlcMdm/DUrBA+0xV6Wge9dt5xdWFY="; }; vendorHash = "sha256-NUHWKPszQH/pvnA+j65+bJ6t+C0FDRRbTviqkYztpE4="; diff --git a/pkgs/by-name/do/dorion/package.nix b/pkgs/by-name/do/dorion/package.nix index e498be5ea43c4..f31256ad85811 100644 --- a/pkgs/by-name/do/dorion/package.nix +++ b/pkgs/by-name/do/dorion/package.nix @@ -12,7 +12,7 @@ }: stdenv.mkDerivation (finalAttrs: { - name = "dorion"; + pname = "dorion"; version = "4.3.0"; src = fetchurl { diff --git a/pkgs/by-name/do/doublecmd/package.nix b/pkgs/by-name/do/doublecmd/package.nix index a77be53cd2119..aedfa563e61e9 100644 --- a/pkgs/by-name/do/doublecmd/package.nix +++ b/pkgs/by-name/do/doublecmd/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doublecmd"; - version = "1.1.14"; + version = "1.1.15"; src = fetchFromGitHub { owner = "doublecmd"; repo = "doublecmd"; rev = "v${finalAttrs.version}"; - hash = "sha256-2ZFLQoz25q3uwjQkogSyuLxSNJQ6Gh553Yj4zl70jno="; + hash = "sha256-GFjswA0COhZCMY6KMtthGSA16sKwScXm7x+CjZ0hXl8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/dt/dtools/package.nix b/pkgs/by-name/dt/dtools/package.nix index feb4dc740b80a..8db3a14cf6173 100644 --- a/pkgs/by-name/dt/dtools/package.nix +++ b/pkgs/by-name/dt/dtools/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtools"; - version = "2.108.0"; + version = "2.109.0"; src = fetchFromGitHub { owner = "dlang"; repo = "tools"; rev = "v${finalAttrs.version}"; - hash = "sha256-YEBUgJPG/+WN4MnQUNAVftZM0ULxZZzpHoOozXua46U="; + hash = "sha256-C4hSs4zsFC8hWkhmDmNzVfK7Ctfnd1IQUphibUPiVzE="; name = "dtools"; }; diff --git a/pkgs/development/tools/eask/default.nix b/pkgs/by-name/ea/eask/package.nix index b0ff5461f12f1..3f7fb419795b5 100644 --- a/pkgs/development/tools/eask/default.nix +++ b/pkgs/by-name/ea/eask/package.nix @@ -1,20 +1,21 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub +{ + lib, + buildNpmPackage, + fetchFromGitHub, }: buildNpmPackage rec { pname = "eask"; - version = "0.9.9"; + version = "0.10.0"; src = fetchFromGitHub { owner = "emacs-eask"; repo = "cli"; rev = version; - hash = "sha256-BW2Kw5arYJStz468uLokNj7c1nFVdvYMPdVoaU6dRts="; + hash = "sha256-bTig1g9G/2NYlvlo6TBMIQjmCqaC8AOwvTiPDbLv//Q="; }; - npmDepsHash = "sha256-lgkPyu7kM6ZW/MgO2eBsf46Z767wDObrgh8dCLl+dGA="; + npmDepsHash = "sha256-JEk+dbLndXn8Bfz9HZWzY9Blk2ZyEf5AH6M4+X1uwaM="; dontBuild = true; @@ -24,6 +25,9 @@ buildNpmPackage rec { homepage = "https://emacs-eask.github.io/"; license = lib.licenses.gpl3Plus; mainProgram = "eask"; - maintainers = with lib.maintainers; [ jcs090218 ]; + maintainers = with lib.maintainers; [ + jcs090218 + piotrkwiecinski + ]; }; } diff --git a/pkgs/by-name/ed/eduvpn-client/nix-python-prefix.patch b/pkgs/by-name/ed/eduvpn-client/nix-python-prefix.patch deleted file mode 100644 index 4d5fc53b0993a..0000000000000 --- a/pkgs/by-name/ed/eduvpn-client/nix-python-prefix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/eduvpn/utils.py b/eduvpn/utils.py -index db0bf0c..76fc52a 100644 ---- a/eduvpn/utils.py -+++ b/eduvpn/utils.py -@@ -69,7 +69,7 @@ def get_prefix() -> str: - """ - target = "share/eduvpn/builder/mainwindow.ui" - local = path.dirname(path.dirname(path.abspath(__file__))) -- options = [local, path.expanduser("~/.local"), "/usr/local", prefix] -+ options = ["@out@"] - for option in options: - logger.debug(f"looking for '{target}' in '{option}'") - if path.isfile(path.join(option, target)): diff --git a/pkgs/by-name/ed/eduvpn-client/package.nix b/pkgs/by-name/ed/eduvpn-client/package.nix index 8a4fd7db89e82..3211636b8440c 100644 --- a/pkgs/by-name/ed/eduvpn-client/package.nix +++ b/pkgs/by-name/ed/eduvpn-client/package.nix @@ -12,11 +12,12 @@ python3Packages.buildPythonApplication rec { pname = "eduvpn-client"; - version = "4.2.1"; + version = "4.3.1"; + format = "pyproject"; src = fetchurl { url = "https://github.com/eduvpn/python-${pname}/releases/download/${version}/python-${pname}-${version}.tar.xz"; - hash = "sha256-57EKWOzGfA4ihVYTyfLF2yoe7hN/7OnEkG+zLz7QtxI="; + hash = "sha256-8k5ZbbN2OvoFFq0nn+fftQfQJbGhb2MEvZNokMXegr0="; }; nativeBuildInputs = [ @@ -38,12 +39,6 @@ python3Packages.buildPythonApplication rec { setuptools ]; - patches = [ ./nix-python-prefix.patch ]; - - postPatch = '' - substituteInPlace eduvpn/utils.py --subst-var-by out $out - ''; - checkInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/pkgs/development/libraries/epoll-shim/default.nix b/pkgs/by-name/ep/epoll-shim/package.nix index d303f814b2718..bbb49c8ec7c02 100644 --- a/pkgs/development/libraries/epoll-shim/default.nix +++ b/pkgs/by-name/ep/epoll-shim/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "epoll-shim"; - version = "0.0.20230411"; + version = "0.0.20240608"; src = fetchFromGitHub { owner = "jiixyj"; - repo = finalAttrs.pname; + repo = "epoll-shim"; rev = "v${finalAttrs.version}"; - hash = "sha256-TOfybtUEp+EtY2l/UGwVFIESDe9kELJCZHlcz22Cmi8="; + hash = "sha256-PIVzVjXOECGv41KtAUmGzUiQ+4lVIyzGEOzVQQ1Pc54="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/er/errands/package.nix b/pkgs/by-name/er/errands/package.nix index 3c695781d28ee..5c43079ed0f1b 100644 --- a/pkgs/by-name/er/errands/package.nix +++ b/pkgs/by-name/er/errands/package.nix @@ -17,7 +17,7 @@ }: python3Packages.buildPythonApplication rec { pname = "errands"; - version = "46.2.2"; + version = "46.2.3"; pyproject = false; @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { owner = "mrvladus"; repo = "Errands"; rev = "refs/tags/${version}"; - hash = "sha256-lX0exxZMbq/iC41bByMfT478vhOQadPJAN72PHiznKc="; + hash = "sha256-JBvyMWEUKUKeAOTCbzNwqpv2ox7bS9p+QsLkJv/lK8k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/es/escambo/package.nix b/pkgs/by-name/es/escambo/package.nix new file mode 100644 index 0000000000000..24341716dd787 --- /dev/null +++ b/pkgs/by-name/es/escambo/package.nix @@ -0,0 +1,62 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + meson, + ninja, + pkg-config, + gobject-introspection, + blueprint-compiler, + wrapGAppsHook4, + desktop-file-utils, + libadwaita, + gtksourceview5, +}: + +python3Packages.buildPythonApplication rec { + pname = "escambo"; + version = "0.1.2"; + pyproject = false; # built with meson + + src = fetchFromGitHub { + owner = "CleoMenezesJr"; + repo = "escambo"; + rev = version; + hash = "sha256-jMlix8nlCaVLZEhqzb6LRNrD3DUZMTIjqrRKo6nFbQA="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + blueprint-compiler + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ + libadwaita + gtksourceview5 + ]; + + dependencies = with python3Packages; [ + pygobject3 + requests + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = { + description = "HTTP-based APIs test application for GNOME"; + homepage = "https://github.com/CleoMenezesJr/escambo"; + license = lib.licenses.gpl3Plus; + mainProgram = "escambo"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index 7d0d675a410ee..e2f8f6ccebf0b 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.18.17"; + version = "0.18.18"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-ig1sLcWEwzF8PnqDoeC103kC6l6SINtZQdJcLiTe5fw="; + hash = "sha256-MBu5zwidjIWs9z6DXYNGsHIwic3ipScAw6TZjSvEvJk="; }; - cargoHash = "sha256-C1xaSdM3mtIk8moOP8drDpdFDs9pYk+ChyI5il5RaqE="; + cargoHash = "sha256-TsW3Rl4EKvrPPhEYzp0K3lBkDYJiehctT/FnkL3yazU="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] diff --git a/pkgs/by-name/fa/fantomas/package.nix b/pkgs/by-name/fa/fantomas/package.nix index c89ee66848459..804e93aa58065 100644 --- a/pkgs/by-name/fa/fantomas/package.nix +++ b/pkgs/by-name/fa/fantomas/package.nix @@ -2,9 +2,9 @@ buildDotnetGlobalTool { pname = "fantomas"; - version = "6.3.8"; + version = "6.3.9"; - nugetSha256 = "sha256-dNbs5+gzjjMw2fl0ZRB9qzj9d+rz1o3Wi/qUvBDoz2E="; + nugetSha256 = "sha256-XRPC5cXMoTJLLHe3f5A3+uXakbL+D7DlX0sA52KMZKw="; meta = with lib; { description = "F# source code formatter"; diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix index df8e216e34bb2..73ec95ab3bf94 100644 --- a/pkgs/by-name/ff/fflogs/package.nix +++ b/pkgs/by-name/ff/fflogs/package.nix @@ -5,10 +5,10 @@ let pname = "fflogs"; - version = "8.5.12"; + version = "8.5.16"; src = fetchurl { url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage"; - hash = "sha256-mlqQm9o001+pSMfMbOwa+gKcIIC6SBg7Rott9+XkB2E="; + hash = "sha256-eUXri4aVMnZtXzCDL3NZTdCR7y0VD5kG4D9YfXQVuzo="; }; extracted = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/applications/audio/FIL-plugins/default.nix b/pkgs/by-name/fi/fil-plugins/package.nix index 7aec4cff35580..1d819fd8b7639 100644 --- a/pkgs/applications/audio/FIL-plugins/default.nix +++ b/pkgs/by-name/fi/fil-plugins/package.nix @@ -4,12 +4,12 @@ , ladspaH }: -stdenv.mkDerivation rec { - pname = "FIL-plugins"; +stdenv.mkDerivation (finalAttrs: { + pname = "fil-plugins"; version = "0.3.0"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; + url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/FIL-plugins-${finalAttrs.version}.tar.bz2"; hash = "sha256-HAvycSEZZfZwoVp3g7QWcwfbdyZKwWJKBuVmeWTajuk="; }; @@ -34,10 +34,9 @@ stdenv.mkDerivation rec { All switches and controls are internally smoothed, so they can be used 'live' whithout any clicks or zipper noises. This should make this plugin a good candidate for use in systems that allow automation of plugin control ports, such as Ardour, or for stage use. ''; - version = version; homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/ladspa/index.html"; license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index 089adefd8bba3..3d78e105cecf5 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "files-cli"; - version = "2.13.65"; + version = "2.13.72"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${version}"; - hash = "sha256-SUxITjWgUQcF7G6w5PZUpjvBH3tGhK/A1sOVg6SEfTU="; + hash = "sha256-u5hAUGGaMpUub4WL8CGEzbnfXPRouaGbb8SQ6ep3X3Q="; }; - vendorHash = "sha256-QVQi60j0XR1OApLG/WPq9aAP4P/2hYCbTLL/3sHAisw="; + vendorHash = "sha256-y4XZeugjqy6ydAq6KQ8iIgMgE6iHAEqzzi2A+N1LB3M="; ldflags = [ "-s" diff --git a/pkgs/by-name/fi/fira-mono/package.nix b/pkgs/by-name/fi/fira-mono/package.nix index 5d059dbf88e08..5925b665eb81c 100644 --- a/pkgs/by-name/fi/fira-mono/package.nix +++ b/pkgs/by-name/fi/fira-mono/package.nix @@ -1,24 +1,27 @@ -{ lib, stdenvNoCC, fetchzip }: +{ lib +, stdenvNoCC +, fetchzip +}: stdenvNoCC.mkDerivation rec { pname = "fira-mono"; - version = "4.202"; + version = "3.2"; src = fetchzip { - url = "https://github.com/mozilla/Fira/archive/${version}.zip"; - hash = "sha256-HLReqgL0PXF5vOpwLN0GiRwnzkjGkEVEyOEV2Z4R0oQ="; + url = "https://bboxtype.com/downloads/Fira/Fira_Mono_${lib.replaceStrings ["."] ["_"] version}.zip"; + hash = "sha256-Ukc+K2sdSz+vUQFD8mmwJHZQ3N68oM4fk6YzGLwzAfQ="; }; installPhase = '' runHook preInstall - install -Dm644 otf/FiraMono*.otf -t $out/share/fonts/opentype + install -Dm644 Fonts/FiraMono_OTF*/*.otf -t $out/share/fonts/opentype runHook postInstall ''; meta = with lib; { - homepage = "https://mozilla.github.io/Fira/"; + homepage = "https://bboxtype.com/fira/"; description = "Monospace font for Firefox OS"; longDescription = '' Fira Mono is a monospace font designed by Erik Spiekermann, diff --git a/pkgs/by-name/fi/fira-sans/package.nix b/pkgs/by-name/fi/fira-sans/package.nix index c07cc15c97cce..0a2bc0e0f6284 100644 --- a/pkgs/by-name/fi/fira-sans/package.nix +++ b/pkgs/by-name/fi/fira-sans/package.nix @@ -1,22 +1,28 @@ { lib , stdenvNoCC -, fira-mono +, fetchzip }: -stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation rec { pname = "fira-sans"; - inherit (fira-mono) version src; + version = "4.301"; + + src = fetchzip { + url = "https://bboxtype.com/downloads/Fira/Download_Folder_FiraSans_${lib.replaceStrings ["."] [""] version}.zip"; + hash = "sha256-WBt3oqPK7ACqMhilYkyFx9Ek2ugwdCDFZN+8HLRnGRs"; + stripRoot = false; + }; installPhase = '' runHook preInstall - install --mode=-x -Dt $out/share/fonts/opentype otf/FiraSans*.otf + install --mode=-x -Dt $out/share/fonts/opentype Download_Folder_FiraSans*/Fonts/Fira_Sans_OTF*/*/*/*.otf runHook postInstall ''; meta = with lib; { - homepage = "https://mozilla.github.io/Fira/"; + homepage = "https://bboxtype.com/fira/"; description = "Sans-serif font for Firefox OS"; longDescription = '' Fira Sans is a sans-serif font designed by Erik Spiekermann, diff --git a/pkgs/by-name/fi/fira/package.nix b/pkgs/by-name/fi/fira/package.nix index 405189ba2e99f..9d2869ac53570 100644 --- a/pkgs/by-name/fi/fira/package.nix +++ b/pkgs/by-name/fi/fira/package.nix @@ -6,7 +6,7 @@ symlinkJoin rec { pname = "fira"; - inherit (fira-mono) version; + inherit (fira-sans) version; name = "${pname}-${version}"; paths = [ @@ -16,7 +16,7 @@ symlinkJoin rec { meta = { description = "Fira font family including Fira Sans and Fira Mono"; - homepage = "https://mozilla.github.io/Fira/"; + homepage = "https://bboxtype.com/fira/"; license = lib.licenses.ofl; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/fi/firefly-iii/package.nix b/pkgs/by-name/fi/firefly-iii/package.nix index f1c88db5c3bbe..6d94cf3ad4ebc 100644 --- a/pkgs/by-name/fi/firefly-iii/package.nix +++ b/pkgs/by-name/fi/firefly-iii/package.nix @@ -8,20 +8,20 @@ let pname = "firefly-iii"; - version = "6.1.16"; + version = "6.1.17"; phpPackage = php83; src = fetchFromGitHub { owner = "firefly-iii"; repo = "firefly-iii"; rev = "v${version}"; - hash = "sha256-1I4Wm10mmloqeWcpc4XloNATpvroiw6m8MiSVsoB6xo="; + hash = "sha256-KbTHbhv+8Lv5fk1Z8nxICySk6MK6Xc3TNATSIUnENa4="; }; assets = buildNpmPackage { pname = "${pname}-assets"; inherit version src; - npmDepsHash = "sha256-Ff7pDKoXvyj/gR+ljQsCjtyzxzJ7/zN6hRMEAderqOg="; + npmDepsHash = "sha256-Nlz+zsvUx9X70uofh8dWEvru8SAQzIh+XxGGOH5npyY="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -36,7 +36,7 @@ in phpPackage.buildComposerProject (finalAttrs: { inherit pname src version; - vendorHash = "sha256-BanSEqE3KN46VtEZH0TVWUBrgPCwmd2TjheYq+e+lzo="; + vendorHash = "sha256-mDVmZUCER1eaTXhh8VIbGbPkkpOeE6fTBhq8UnTlWPc="; passthru = { inherit phpPackage; diff --git a/pkgs/by-name/fl/flashmq/package.nix b/pkgs/by-name/fl/flashmq/package.nix index eddaf63f30603..4cf312476d801 100644 --- a/pkgs/by-name/fl/flashmq/package.nix +++ b/pkgs/by-name/fl/flashmq/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flashmq"; - version = "1.14.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "halfgaar"; repo = "FlashMQ"; rev = "v${version}"; - hash = "sha256-rOhH3mRPW4LweQmzztr6/xGqSfo02nFBWrAVd0/oQGA="; + hash = "sha256-6ShMYTynqIVm7EH3b9Jzy5UKE7SH/Lq5uWV3VaDVREQ="; }; nativeBuildInputs = [ cmake installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/by-name/fl/fluxcd/package.nix index 75689b47710fb..712f075459b60 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/by-name/fl/fluxcd/package.nix @@ -1,9 +1,10 @@ -{ lib -, stdenv -, buildGoModule -, fetchFromGitHub -, fetchzip -, installShellFiles +{ + buildGoModule, + fetchFromGitHub, + fetchzip, + installShellFiles, + lib, + stdenv, }: let @@ -12,13 +13,13 @@ let manifestsSha256 = "sha256-PdhR+UDquIJWtpSymtT6V7qO5fVJOkFz6RGzAx7xeb4="; manifests = fetchzip { - url = - "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; - sha256 = manifestsSha256; + url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; + hash = manifestsSha256; stripRoot = false; }; +in -in buildGoModule rec { +buildGoModule rec { pname = "fluxcd"; inherit version; @@ -26,7 +27,7 @@ in buildGoModule rec { owner = "fluxcd"; repo = "flux2"; rev = "v${version}"; - inherit sha256; + hash = sha256; }; vendorHash = "sha256-0YH3pgFrsnh5jIsZpj/sIgfiOCTtIlPltMS5mdGz1eM="; @@ -38,7 +39,11 @@ in buildGoModule rec { rm source/cmd/flux/create_secret_git_test.go ''; - ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X main.VERSION=${version}" + ]; subPackages = [ "cmd/flux" ]; @@ -53,7 +58,7 @@ in buildGoModule rec { $out/bin/flux --version | grep ${version} > /dev/null ''; - postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' for shell in bash fish zsh; do $out/bin/flux completion $shell > flux.$shell installShellCompletion flux.$shell @@ -62,18 +67,22 @@ in buildGoModule rec { passthru.updateScript = ./update.sh; - meta = with lib; { - description = - "Open and extensible continuous delivery solution for Kubernetes"; + meta = { + changelog = "https://github.com/fluxcd/flux2/releases/tag/v${version}"; + description = "Open and extensible continuous delivery solution for Kubernetes"; + downloadPage = "https://github.com/fluxcd/flux2/"; longDescription = '' Flux is a tool for keeping Kubernetes clusters in sync with sources of configuration (like Git repositories), and automating updates to configuration when there is new code to deploy. ''; homepage = "https://fluxcd.io"; - downloadPage = "https://github.com/fluxcd/flux2/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ bryanasdev000 jlesquembre ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + bryanasdev000 + jlesquembre + superherointj + ]; mainProgram = "flux"; }; } diff --git a/pkgs/applications/networking/cluster/fluxcd/update.sh b/pkgs/by-name/fl/fluxcd/update.sh index 1763b37d33285..1763b37d33285 100755 --- a/pkgs/applications/networking/cluster/fluxcd/update.sh +++ b/pkgs/by-name/fl/fluxcd/update.sh diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index 94e3dc8781993..d084deca1f444 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -2,6 +2,7 @@ , brotli , buildGoModule , forgejo +, fetchpatch , git , gzip , lib @@ -55,11 +56,21 @@ buildGoModule rec { outputs = [ "out" "data" ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + git # checkPhase + openssh # checkPhase + ]; buildInputs = lib.optional pamSupport pam; patches = [ ./static-root-path.patch + # Fix TestAddRecursiveExclude go test. + # This will be part of the upcoming v7.0.5 release at which point this needs to be removed again. + (fetchpatch { + url = "https://codeberg.org/forgejo/forgejo/commit/f01dc4b271f54201e60a7c795d784813eac3f7ce.patch"; + sha256 = "sha256-1lPLVHBad+Fmk+6EFXKuMnmDUl5BkEYJuMkTPfdrCgU="; + }) ]; postPatch = '' @@ -80,6 +91,33 @@ buildGoModule rec { export ldflags+=" -X main.ForgejoVersion=$(GITEA_VERSION=${version} make show-version-api)" ''; + preCheck = '' + # $HOME is required for ~/.ssh/authorized_keys and such + export HOME="$TMPDIR/home" + + # expose and use the GO_TEST_PACKAGES var from the Makefile + # instead of manually copying over the entire list: + # https://codeberg.org/forgejo/forgejo/src/tag/v7.0.4/Makefile#L124 + echo -e 'show-backend-tests:\n\t@echo ''${GO_TEST_PACKAGES}' >> Makefile + getGoDirs() { + make show-backend-tests + } + ''; + + checkFlags = + let + skippedTests = [ + "Test_SSHParsePublicKey/dsa-1024/SSHKeygen" # dsa-1024 is deprecated in openssh and requires opting-in at compile time + "Test_calcFingerprint/dsa-1024/SSHKeygen" # dsa-1024 is deprecated in openssh and requires opting-in at compile time + "TestPamAuth" # we don't have PAM set up in the build sandbox + "TestPassword" # requires network: api.pwnedpasswords.com + "TestCaptcha" # requires network: hcaptcha.com + "TestDNSUpdate" # requires network: release.forgejo.org + "TestMigrateWhiteBlocklist" # requires network: gitlab.com (DNS) + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + postInstall = '' mkdir $data cp -R ./{templates,options} ${frontend}/public $data diff --git a/pkgs/by-name/fr/freecell-solver/package.nix b/pkgs/by-name/fr/freecell-solver/package.nix index 1864c2641075b..1cb06e59636fa 100644 --- a/pkgs/by-name/fr/freecell-solver/package.nix +++ b/pkgs/by-name/fr/freecell-solver/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "freecell-solver"; - version = "6.8.0"; + version = "6.10.0"; src = fetchurl { url = "https://fc-solve.shlomifish.org/downloads/fc-solve/freecell-solver-${finalAttrs.version}.tar.xz"; - hash = "sha256-lfeKSxXS+jQCcf5PzFNUBlloGRuiLbDUDoGykbjVPTI="; + hash = "sha256-RDuineCL51GmD6ykKoF7ZbNCzqkxiP12UXQbdQSDebQ="; }; outputs = [ "out" "dev" "doc" "man" ]; diff --git a/pkgs/by-name/fu/furmark/package.nix b/pkgs/by-name/fu/furmark/package.nix index bc7e18d3c021f..c3e84546f826b 100644 --- a/pkgs/by-name/fu/furmark/package.nix +++ b/pkgs/by-name/fu/furmark/package.nix @@ -1,6 +1,7 @@ { autoPatchelfHook, copyDesktopItems, + fetchurl, fetchzip, lib, libGL, @@ -79,6 +80,10 @@ stdenv.mkDerivation (finalAttrs: { comment = description; desktopName = name; genericName = name; + icon = fetchurl { + url = "https://www.geeks3d.com/furmark/i/20240220-furmark-logo-02.png"; + hash = "sha256-EqhWQgTEmF/2AcqDxgGtr2m5SMYup28hPEhI6ssFw7g="; + }; categories = [ "System" "Monitor" diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix index a691b94f24884..b5e985b3d45b4 100644 --- a/pkgs/by-name/fw/fwupd/package.nix +++ b/pkgs/by-name/fw/fwupd/package.nix @@ -120,7 +120,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fwupd"; - version = "1.9.20"; + version = "1.9.21"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -131,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "fwupd"; repo = "fwupd"; rev = finalAttrs.version; - hash = "sha256-uPHZtl1jzx3rRHADXcQmpXwQrbUbIXuoww3fN4BUviE="; + hash = "sha256-V3v3lTz3KUt/zEv5BuUcN7S2ZXHPbhYN5vsFPNuxbFY="; }; patches = [ @@ -371,10 +371,11 @@ stdenv.mkDerivation (finalAttrs: { }; }; - meta = with lib; { + meta = { homepage = "https://fwupd.org/"; - maintainers = with maintainers; [ rvdp ]; - license = licenses.lgpl21Plus; - platforms = platforms.linux; + changelog = "https://github.com/fwupd/fwupd/releases/tag/${finalAttrs.version}"; + maintainers = with lib.maintainers; [ rvdp ]; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/fz/fzf-make/package.nix b/pkgs/by-name/fz/fzf-make/package.nix index 9960f2cad6534..5bc3552fcc36c 100644 --- a/pkgs/by-name/fz/fzf-make/package.nix +++ b/pkgs/by-name/fz/fzf-make/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "fzf-make"; - version = "0.33.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "kyu08"; repo = "fzf-make"; rev = "v${version}"; - hash = "sha256-ct4ugHqSekAZrkuFotjzMzcoJ0+P7d0Qhi79SqVZHPM="; + hash = "sha256-x+y0K6b/yCskowOuvjcSCJXM5ym2Qn84/Thui0ahUKU="; }; - cargoHash = "sha256-0VhcpW56OePvHVFPG4QaK8ezvNUAuWyI5gztjuKFKVQ="; + cargoHash = "sha256-cIoc3sGy33iTkVAln4oSYSBGB0iAFanv746upxnv0ZA="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix index d1c62b5609611..4a07becaedc06 100644 --- a/pkgs/by-name/ga/gamescope/package.nix +++ b/pkgs/by-name/ga/gamescope/package.nix @@ -24,7 +24,6 @@ , openvr , stb , wlroots -, libliftoff , libdecor , libdisplay-info , lib @@ -55,9 +54,6 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ - # Unvendor dependencies - ./use-pkgconfig.patch - # Make it look for shaders in the right place ./shaders-path.patch ]; @@ -116,7 +112,6 @@ stdenv.mkDerivation (finalAttrs: { libavif libdrm libei - libliftoff SDL2 libdecor libinput diff --git a/pkgs/by-name/ga/gamescope/use-pkgconfig.patch b/pkgs/by-name/ga/gamescope/use-pkgconfig.patch deleted file mode 100644 index 2b4de54ae54df..0000000000000 --- a/pkgs/by-name/ga/gamescope/use-pkgconfig.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -6,7 +6,6 @@ project( - default_options: [ - 'cpp_std=c++20', - 'warning_level=2', -- 'force_fallback_for=wlroots,libliftoff,vkroots', - ], - ) diff --git a/pkgs/by-name/ge/geopard/package.nix b/pkgs/by-name/ge/geopard/package.nix index 6ec0127afbe60..4966ee60aa432 100644 --- a/pkgs/by-name/ge/geopard/package.nix +++ b/pkgs/by-name/ge/geopard/package.nix @@ -2,71 +2,55 @@ , cargo , rustc , fetchFromGitHub -, glib -, gtk4 , libadwaita , rustPlatform -, openssl , pkg-config , lib , wrapGAppsHook4 , meson , ninja -, gdk-pixbuf -, cmake , desktop-file-utils -, gettext , blueprint-compiler -, appstream-glib +, glib-networking }: stdenv.mkDerivation rec { pname = "geopard"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "ranfdev"; - repo = pname; - rev = version; - hash = "sha256-elHxtFEGkdhEPHxuJtcMYwWnvo6vDaHiOyN51EOzym0="; + repo = "geopard"; + rev = "v${version}"; + hash = "sha256-QHqhjoiKiwTBDMDhb7Agqe0/o2LyLDs2kl/HC4UfayY="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit pname version src; - hash = "sha256-80YujPjcmAxH1gITT4OJk8w4m8Z/pAYtBUpCPQOKe3E="; + hash = "sha256-AmGwsSRrZK+oSnkn9Xzmia/Kbkw19v0nb1kFJtymqOs="; }; nativeBuildInputs = [ - openssl - gettext - glib # for glib-compile-schemas meson ninja pkg-config wrapGAppsHook4 - cmake blueprint-compiler desktop-file-utils - appstream-glib - blueprint-compiler cargo rustc rustPlatform.cargoSetupHook ]; buildInputs = [ - desktop-file-utils - gdk-pixbuf - glib - gtk4 libadwaita - openssl + glib-networking ]; meta = with lib; { homepage = "https://github.com/ranfdev/Geopard"; description = "Colorful, adaptive gemini browser"; - maintainers = with maintainers; [ jfvillablanca ]; + maintainers = with maintainers; [ jfvillablanca aleksana ]; license = licenses.gpl3Plus; platforms = platforms.linux; mainProgram = "geopard"; diff --git a/pkgs/by-name/ge/getmail6/package.nix b/pkgs/by-name/ge/getmail6/package.nix index 08742f9ea0404..d6e5c5dc23a10 100644 --- a/pkgs/by-name/ge/getmail6/package.nix +++ b/pkgs/by-name/ge/getmail6/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "getmail6"; - version = "6.19.00"; + version = "6.19.01"; pyproject = true; src = fetchFromGitHub { owner = "getmail6"; repo = "getmail6"; rev = "refs/tags/v${version}"; - hash = "sha256-cAho0fAvxUoxKrvS7XJaKYGEGgtA8Xl6dOEtVtUvK10="; + hash = "sha256-Q3FQmliWQ8BB/U4RWw1z5I721jw8LGRLPjI9eKELd0g="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/gh/ghciwatch/package.nix b/pkgs/by-name/gh/ghciwatch/package.nix index cf01e89b4c34c..55ee9b79ea9df 100644 --- a/pkgs/by-name/gh/ghciwatch/package.nix +++ b/pkgs/by-name/gh/ghciwatch/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ghciwatch"; - version = "0.5.16"; + version = "1.0.0"; src = fetchFromGitHub { owner = "MercuryTechnologies"; repo = "ghciwatch"; rev = "v${version}"; - hash = "sha256-XKR/X27oScB9XdyXeYKD6nlnkBTLJLXkzsRgfS3ygVE="; + hash = "sha256-SV2QRFXXXwWZGd2pe+7aK+p3X+EviDrykqceZ+24t4I="; }; - cargoHash = "sha256-BKPzOv2RtcE4MzRyvHs3VmNME2uKtGXCqGrULfryacM="; + cargoHash = "sha256-/N1R8/qRIt0AiIzTKt/vPlSLxPdKU+oeuE4eZTjwJlA="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation diff --git a/pkgs/by-name/gi/gitu/package.nix b/pkgs/by-name/gi/gitu/package.nix index 51724f2685737..c5729b5dbe74b 100644 --- a/pkgs/by-name/gi/gitu/package.nix +++ b/pkgs/by-name/gi/gitu/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "gitu"; - version = "0.20.1"; + version = "0.21.0"; src = fetchFromGitHub { owner = "altsem"; repo = "gitu"; rev = "v${version}"; - hash = "sha256-H1REl6DkWYwZ1s8FLyHlsFi1DQY0C3Zizz/o9KUO7XQ="; + hash = "sha256-2YcQl9aPFPE/t/Pzoo0mWkCjOE6b4BJH0oT8Gbx+vIg="; }; - cargoHash = "sha256-/u6VmcaQpVagz7W/eAFql9sKF+9dn/o1VGvFGJAJkaA="; + cargoHash = "sha256-RldCa0UITX8zj5tliww1xiL1Y60t9EN6o1ZA5eVEaT4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gl/glock/package.nix b/pkgs/by-name/gl/glock/package.nix new file mode 100644 index 0000000000000..c573d06af7d00 --- /dev/null +++ b/pkgs/by-name/gl/glock/package.nix @@ -0,0 +1,40 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, fetchpatch +}: + +buildGoModule { + pname = "glock"; + version = "0-unstable-2021-03-19"; + + src = fetchFromGitHub { + owner = "robfig"; + repo = "glock"; + rev = "0ac7e52a4c8a9a7039a72b3c6a10e8be59bc6599"; + hash = "sha256-EDaLk83u1gRcvEjrfBrLZBQZ5unyD9LQA2TccOawXII="; + }; + + patches = [ + # Migrate to Go modules + (fetchpatch { + url = "https://github.com/robfig/glock/commit/943afe5e26dd64ebad5ca17613ae3700c53fb25d.patch"; + hash = "sha256-nk+5uHlCv7Hxbo0Axvi15nJVzEcb++gOJpF3w06yQsk="; + }) + ]; + + vendorHash = "sha256-v3lfb+CXbTxzObDpubufD3Q1h6IhULcC/6spA6StfGw="; + + checkFlags = [ "-skip=^TestSave$" ]; + + meta = { + homepage = "https://github.com/robfig/glock"; + description = "Command-line tool to lock Go dependencies to specific revisions"; + mainProgram = "glock"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + luftmensch-luftmensch + rushmorem + ]; + }; +} diff --git a/pkgs/by-name/gm/gmic-qt/package.nix b/pkgs/by-name/gm/gmic-qt/package.nix index 389f366680c14..9c3d74cbe566c 100644 --- a/pkgs/by-name/gm/gmic-qt/package.nix +++ b/pkgs/by-name/gm/gmic-qt/package.nix @@ -49,13 +49,13 @@ assert lib.assertMsg stdenv.mkDerivation (finalAttrs: { pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}"; - version = "3.3.6"; + version = "3.4.0"; src = fetchFromGitHub { owner = "c-koi"; repo = "gmic-qt"; rev = "v.${finalAttrs.version}"; - hash = "sha256-0MtQTc2nUF8N1IDIcRxGqfXKULl9ZjnqDt4q84jA5ow="; + hash = "sha256-IZMvvhWQwbnyxF3CkvEjySl3o3DB6UucpjqOFR9NjQ0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gm/gmic/package.nix b/pkgs/by-name/gm/gmic/package.nix index 2afb1f4d40e99..1ed7224ac5d6c 100644 --- a/pkgs/by-name/gm/gmic/package.nix +++ b/pkgs/by-name/gm/gmic/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gmic"; - version = "3.3.6"; + version = "3.4.0"; outputs = [ "out" "lib" "dev" "man" ]; @@ -34,15 +34,15 @@ stdenv.mkDerivation (finalAttrs: { owner = "GreycLab"; repo = "gmic"; rev = "v.${finalAttrs.version}"; - hash = "sha256-gyQP+ulXLMVkNn1Bss7zlQINcTunwbP+MAsftADqtOk="; + hash = "sha256-uK/kgzlUvEAxRB8Wc3Inspv4/8vnjXrCilP1g/QMuCs="; }; # TODO: build this from source # Reference: src/Makefile, directive gmic_stdlib_community.h gmic_stdlib = fetchurl { name = "gmic_stdlib_community.h"; - url = "http://gmic.eu/gmic_stdlib_community${lib.replaceStrings ["."] [""] finalAttrs.version}.h"; - hash = "sha256-mj6yOGc+CGY6oFDv9PJ7y9KABdn9DG32m2IVlLAhrsc="; + url = "https://gmic.eu/gmic_stdlib_community${lib.replaceStrings ["."] [""] finalAttrs.version}.h"; + hash = "sha256-LoqK8ADwzPpxhy2GvaxVjGyYEHAbhspyoIXuBXCLRtQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gm/gmid/package.nix b/pkgs/by-name/gm/gmid/package.nix index 6c73773b6e11a..f6f9996b73838 100644 --- a/pkgs/by-name/gm/gmid/package.nix +++ b/pkgs/by-name/gm/gmid/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gmid"; - version = "2.0.4"; + version = "2.0.5"; src = fetchFromGitHub { owner = "omar-polo"; repo = pname; rev = version; - hash = "sha256-ioyQS5jjOICAWtZG8no+WUmLybEVLvum6TFFFdnMdfY="; + hash = "sha256-xuA5yLtRu9GDrSr7FBlAwEjCjFVRmnOuBM62AHOHDhc="; }; nativeBuildInputs = [ bison ]; diff --git a/pkgs/by-name/gn/gnome-online-accounts-gtk/package.nix b/pkgs/by-name/gn/gnome-online-accounts-gtk/package.nix index d8dbbc5806b27..f10af60422c1a 100644 --- a/pkgs/by-name/gn/gnome-online-accounts-gtk/package.nix +++ b/pkgs/by-name/gn/gnome-online-accounts-gtk/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-online-accounts-gtk"; - version = "3.50.2"; + version = "3.50.3"; src = fetchFromGitHub { owner = "xapp-project"; repo = "gnome-online-accounts-gtk"; rev = finalAttrs.version; - hash = "sha256-6yGesg/L/9syX990uDuw5Or/uEQ8DGPQYiCRRw4OMzY="; + hash = "sha256-peElSkGl2dYeJmMUeB+xDoOY3MhHs7IsIQYr0iJZP58="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/go/go-secdump/package.nix b/pkgs/by-name/go/go-secdump/package.nix new file mode 100644 index 0000000000000..1539511a191c7 --- /dev/null +++ b/pkgs/by-name/go/go-secdump/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "go-secdump"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "jfjallid"; + repo = "go-secdump"; + rev = "refs/tags/${version}"; + hash = "sha256-mb44v79BH9wW8+b1Le0lyVtl5iHIEzGvgVzaf0zEG20="; + }; + + vendorHash = "sha256-xgvT+RnaTzkVql7js/Mb5vZM5BV+B3OJbCTfDWDmt7c="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = with lib; { + description = "Tool to remotely dump secrets from the Windows registry"; + homepage = "https://github.com/jfjallid/go-secdump"; + changelog = "https://github.com/jfjallid/go-secdump/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + mainProgram = "go-secdump"; + }; +} diff --git a/pkgs/by-name/go/goofcord/package.nix b/pkgs/by-name/go/goofcord/package.nix index d4103a09a08e8..57819ebfbc0f8 100644 --- a/pkgs/by-name/go/goofcord/package.nix +++ b/pkgs/by-name/go/goofcord/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "goofcord"; - version = "1.4.2"; + version = "1.4.3"; src = let @@ -48,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: { { x86_64-linux = fetchurl { url = "${base}/v${finalAttrs.version}/GoofCord-${finalAttrs.version}-linux-amd64.deb"; - hash = "sha256-fUP/se3hOhs+aAoew25YhRyxnodYPrgqN68RIg1A1Kw="; + hash = "sha256-XO/T5O6+hJ6QT8MCVorrdXPZZlrywa6u0UKPk9WIQBE="; }; aarch64-linux = fetchurl { url = "${base}/v${finalAttrs.version}/GoofCord-${finalAttrs.version}-linux-arm64.deb"; - hash = "sha256-hVpXmBSIgoON683f/sRtmpHwqxcO6IrFCCRPZjsUqjw="; + hash = "sha256-4mJ3kDQ+eh9LnyzxyNYvd2hMmgiJtBMXKup7ILlHk0Y="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index d8e2f3770c9d0..283c61e90e58b 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -64,11 +64,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "google-chrome"; - version = "125.0.6422.141"; + version = "126.0.6478.61"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-nIdzl3DkvGy9EsNS8nvPi8yK0gvx9mFaxYSxuYZZzxI="; + hash = "sha256-L7gBl4SMHIq0x+GZiaaK5Dxs+UJDandz0xYET7YO73o="; }; nativeBuildInputs = [ patchelf makeWrapper ]; diff --git a/pkgs/by-name/gp/gptscript/package.nix b/pkgs/by-name/gp/gptscript/package.nix index f76c765987425..8d4928891b370 100644 --- a/pkgs/by-name/gp/gptscript/package.nix +++ b/pkgs/by-name/gp/gptscript/package.nix @@ -2,19 +2,24 @@ lib, buildGo122Module, fetchFromGitHub, + darwin, + stdenv, }: buildGo122Module rec { pname = "gptscript"; - version = "0.5.0"; + version = "0.8.2"; src = fetchFromGitHub { owner = "gptscript-ai"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-teZQhGYKJ5Ma5by3Wug5B1hAV1tox94MF586ZeEXp6o="; + hash = "sha256-BqGoIDFquVMGMkKe2IO3Se4IeqgVSqjv00gfhJf8evs="; }; - vendorHash = "sha256-0irUcEomQzo9+vFJEk28apLNuJdsX1RHEqB7T88X7Ks="; + vendorHash = "sha256-oI2agy8FOyoNl0zQzvXMsHY5tG1QNvkQf+n2GVGyNz8="; + + propagatedBuildInputs = with darwin; + lib.optionals stdenv.isDarwin [Security]; ldflags = [ "-s" @@ -26,9 +31,9 @@ buildGo122Module rec { doCheck = false; meta = with lib; { - homepage = "https://gptscript.ai"; + homepage = "https://github.com/gptscript-ai/gptscript"; changelog = "https://github.com/gptscript-ai/gptscript/releases/tag/v{version}"; - description = "Natural Language Programming"; + description = "Build AI assistants that interact with your systems"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ jamiemagee ]; mainProgram = "gptscript"; diff --git a/pkgs/by-name/gr/graphite-cli/package.nix b/pkgs/by-name/gr/graphite-cli/package.nix index 147e6de68def7..7e5b98ebab867 100644 --- a/pkgs/by-name/gr/graphite-cli/package.nix +++ b/pkgs/by-name/gr/graphite-cli/package.nix @@ -7,11 +7,11 @@ buildNpmPackage rec { pname = "graphite-cli"; - version = "1.3.6"; + version = "1.3.8"; src = fetchurl { url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz"; - hash = "sha256-rD/YWFRHzoM9Gsd9tnCF56RChckaeWGFphYgHa0UvUU="; + hash = "sha256-FJaDSg+scrmqYkCGCrb+yT8TtKT09xu6BS5AjTlfhzo="; }; npmDepsHash = "sha256-WyV0f5thWG7hg7Vm1UUIlcFCgP83HfXQFBUVHcQdjRo="; diff --git a/pkgs/by-name/gr/graphqlmaker/package.nix b/pkgs/by-name/gr/graphqlmaker/package.nix new file mode 100644 index 0000000000000..265b63112dfe5 --- /dev/null +++ b/pkgs/by-name/gr/graphqlmaker/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "graphqlmaker"; + version = "0-unstable-2024-05-18"; + + src = fetchFromGitHub { + owner = "xssdoctor"; + repo = "graphqlMaker"; + rev = "ff884ce39156d8458da35c0b0b5d7eb1e1146bb5"; + hash = "sha256-H3AFCS1WoeVXUdXBV1JKrGIraJP/ql6XG++PxmWUico="; + }; + + vendorHash = "sha256-1mDOqTsQ3kHs3MEWlRcdqhjIRul7um2mfBAxObhoSlE="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = with lib; { + description = "Tool to find graphql queries in Javascript files"; + homepage = "https://github.com/xssdoctor/graphqlMaker"; + # https://github.com/xssdoctor/graphqlMaker/issues/1 + license = licenses.unfree; + maintainers = with maintainers; [ fab ]; + mainProgram = "graphqlMaker"; + }; +} diff --git a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix index d2f9abb0605c6..cba18f06de6d8 100644 --- a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix +++ b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix @@ -1,27 +1,24 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -, gnome-themes-extra -, gtk-engine-murrine +{ + lib, + stdenvNoCC, + fetchFromGitHub, + gnome-themes-extra, + gtk-engine-murrine, }: stdenvNoCC.mkDerivation { pname = "gruvbox-gtk-theme"; - version = "unstable-2023-05-28"; + version = "0-unstable-2024-06-12"; src = fetchFromGitHub { owner = "Fausto-Korpsvart"; repo = "Gruvbox-GTK-Theme"; - rev = "c0b7fb501938241a3b6b5734f8cb1f0982edc6b4"; - hash = "sha256-Y+6HuWaVkNqlYc+w5wLkS2LpKcDtpeOpdHnqBmShm5Q="; + rev = "1a0f6672283e1846ec307addd4647f2daad29402"; + hash = "sha256-bbL4bHAdkmReogUQML9sMpSallZ7wrgbK3R64xiAYRo="; }; - propagatedUserEnvPkgs = [ - gtk-engine-murrine - ]; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - buildInputs = [ - gnome-themes-extra - ]; + buildInputs = [ gnome-themes-extra ]; dontBuild = true; @@ -32,11 +29,14 @@ stdenvNoCC.mkDerivation { runHook postInstall ''; - meta = with lib; { + meta = { description = "Gtk theme based on the Gruvbox colour pallete"; homepage = "https://www.pling.com/p/1681313/"; - license = licenses.gpl3Only; - platforms = platforms.unix; - maintainers = [ maintainers.math-42 ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ + luftmensch-luftmensch + math-42 + ]; }; } diff --git a/pkgs/by-name/gr/gruvbox-plus-icons/package.nix b/pkgs/by-name/gr/gruvbox-plus-icons/package.nix index 7525953259311..e244c4856f30c 100644 --- a/pkgs/by-name/gr/gruvbox-plus-icons/package.nix +++ b/pkgs/by-name/gr/gruvbox-plus-icons/package.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "gruvbox-plus-icons"; - version = "5.3.1"; + version = "5.4.0"; src = fetchFromGitHub { owner = "SylEleuth"; repo = "gruvbox-plus-icon-pack"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Y+wNmZTVWsg6Hn+fak71jnoZ72Cz/8YYpGWkKr4+C9Q="; + sha256 = "sha256-mtOYoaejK6ZGPcM4IxXs6l6oXGP9WSMw5N7JIF3n67s="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix index 2394ba2465722..dd851078933cc 100644 --- a/pkgs/by-name/gr/grype/package.nix +++ b/pkgs/by-name/gr/grype/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "grype"; - version = "0.77.4"; + version = "0.79.0"; src = fetchFromGitHub { owner = "anchore"; repo = "grype"; rev = "refs/tags/v${version}"; - hash = "sha256-xD6G4DGimmYVVCZHpXlvC24zaRwpRpQ0iRc4Yxac3O8="; + hash = "sha256-fFiZ6GOKaHcBnxakhd3Mdm1hHmfAwyq/ScBNUwrm0vw="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -30,7 +30,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-WosgdN49MEXSfK42l4em+Cpk8iAQphf9KOhY0mgBQ7U="; + vendorHash = "sha256-PIs+6P7w6vjOOpH96KEdG6tHRCU7ijtdyS/1C77BPDw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ha/hacompanion/package.nix b/pkgs/by-name/ha/hacompanion/package.nix index eeb1cd7fe8a2c..d9ad59aeabe79 100644 --- a/pkgs/by-name/ha/hacompanion/package.nix +++ b/pkgs/by-name/ha/hacompanion/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "hacompanion"; - version = "1.0.12"; + version = "1.0.15"; src = fetchFromGitHub { owner = "tobias-kuendig"; repo = "hacompanion"; rev = "v${version}"; - hash = "sha256-3uPn139e8TyP0rE9hfRKw192YyexG+f3KmlHMmgCN7A="; + hash = "sha256-FR2IowbaHXr9x/eMt+NCuGusMwX2iVxPOuWEkhH2GFM="; }; vendorHash = "sha256-ZZ8nxN+zUeFhSXyoHLMgzeFllnIkKdoVnbVK5KjrLEQ="; diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix index b7e8f17419fe3..e66027b8dc7fa 100644 --- a/pkgs/by-name/ha/halo/package.nix +++ b/pkgs/by-name/ha/halo/package.nix @@ -7,10 +7,10 @@ }: stdenv.mkDerivation rec { pname = "halo"; - version = "2.16.2"; + version = "2.16.3"; src = fetchurl { url = "https://github.com/halo-dev/halo/releases/download/v${version}/${pname}-${version}.jar"; - hash = "sha256-bHMcJvM+ZBjiGUAZzjnEupWW9L8viE/Ix8IK2y4KDoA="; + hash = "sha256-sl2b9zKugnCEMHyvEqBWZPidoANth5gRfh34NAaqg7A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ha/hatsu/package.nix b/pkgs/by-name/ha/hatsu/package.nix new file mode 100644 index 0000000000000..ec88f6aea5bba --- /dev/null +++ b/pkgs/by-name/ha/hatsu/package.nix @@ -0,0 +1,40 @@ +{ cmake +, fetchFromGitHub +, gitUpdater +, lib +, openssl +, pkg-config +, rustPlatform +}: +rustPlatform.buildRustPackage rec { + pname = "hatsu"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "importantimport"; + repo = "hatsu"; + rev = "v${version}"; + hash = "sha256-gBzhuV0SDmNwl5PkpdGxkMBn5m4vEXfv23WK7+ZzQs8="; + }; + + cargoHash = "sha256-A2tl0jjKODA/qodxkIe/3V4ZDGV4X0myiduJsLtd7r0="; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ openssl ]; + + env = { OPENSSL_NO_VENDOR = true; }; + + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + ignoredVersions = "beta"; + }; + + meta = { + description = "Self-hosted and fully-automated ActivityPub bridge for static sites"; + homepage = "https://github.com/importantimport/hatsu"; + license = lib.licenses.agpl3Only; + mainProgram = "hatsu"; + maintainers = with lib.maintainers; [ kwaa ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/ha/havn/package.nix b/pkgs/by-name/ha/havn/package.nix index d2f6819d3211c..81f0f37190fe5 100644 --- a/pkgs/by-name/ha/havn/package.nix +++ b/pkgs/by-name/ha/havn/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "havn"; - version = "0.1.11"; + version = "0.1.12"; src = fetchFromGitHub { owner = "mrjackwills"; repo = "havn"; rev = "refs/tags/v${version}"; - hash = "sha256-iotSSKId2y3Y7Dh8iSW1/y3xDbXHHPl6RQ3uA/+JdE8="; + hash = "sha256-BCg572435CdQMOldm3Ao4D+sDxbXUlDxMWmxa+aqTY0="; }; - cargoHash = "sha256-Tec1YeP1zwE8nurQOYxa9hzGBy3uxkjDUFlh0BppUTo="; + cargoHash = "sha256-JaAlWiaOUoXSV6O4wmU7zCR5h5olO2zkB5WEGk2/ZdE="; checkFlags = [ # Skip tests that require network access diff --git a/pkgs/by-name/he/hednsextractor/package.nix b/pkgs/by-name/he/hednsextractor/package.nix new file mode 100644 index 0000000000000..8f8fb9f4f6055 --- /dev/null +++ b/pkgs/by-name/he/hednsextractor/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "hednsextractor"; + version = "1.0.7"; + + src = fetchFromGitHub { + owner = "HuntDownProject"; + repo = "HEDnsExtractor"; + rev = "refs/tags/v${version}"; + hash = "sha256-Uj5TNQ+X0+ip1DcLanMmFzr5ROuXhuZJSPF9tile+ZQ="; + }; + + vendorHash = "sha256-8yD/yHSqesyS71YeRBv4ARyXyIbTcan7YjBeKBrg0Vc="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = with lib; { + description = "Tool suite for hunting suspicious targets, expose domains and phishing discovery"; + homepage = "https://github.com/HuntDownProject/HEDnsExtractor"; + changelog = "https://github.com/HuntDownProject/HEDnsExtractor/releases/tag/v${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + mainProgram = "hednsextractor"; + }; +} diff --git a/pkgs/applications/misc/HentaiAtHome/default.nix b/pkgs/by-name/he/hentai-at-home/package.nix index bca7697f758ae..29809e10ab64f 100644 --- a/pkgs/applications/misc/HentaiAtHome/default.nix +++ b/pkgs/by-name/he/hentai-at-home/package.nix @@ -1,28 +1,32 @@ -{ buildPackages -, fetchzip -, javaOpts ? "-XX:+UseZGC" -, jdk -, jre_headless -, lib -, makeWrapper -, stdenvNoCC -, +{ + lib, + stdenvNoCC, + fetchzip, + jdk, + makeWrapper, + buildPackages, + jre_headless, + javaOpts ? "-XX:+UseZGC", }: -stdenvNoCC.mkDerivation rec { - pname = "HentaiAtHome"; +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "hentai-at-home"; version = "1.6.3"; src = fetchzip { - url = "https://repo.e-hentai.org/hath/HentaiAtHome_${version}_src.zip"; + url = "https://repo.e-hentai.org/hath/HentaiAtHome_${finalAttrs.version}_src.zip"; hash = "sha512-kBB5mn9MwpkZ0z+Fl5ABs4YWBkXkMRcADYSAPkeifyhbYQQPOnijXKYZCkzE4UB3uQ1j6Kj6WnpO/4jquYEiOQ=="; stripRoot = false; }; - nativeBuildInputs = [ jdk makeWrapper ]; + nativeBuildInputs = [ + jdk + makeWrapper + ]; LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = lib.optionalString (stdenvNoCC.buildPlatform.libc == "glibc") - "${buildPackages.glibcLocales}/lib/locale/locale-archive"; + LOCALE_ARCHIVE = lib.optionalString ( + stdenvNoCC.buildPlatform.libc == "glibc" + ) "${buildPackages.glibcLocales}/lib/locale/locale-archive"; buildPhase = '' make all @@ -48,10 +52,10 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { homepage = "https://ehwiki.org/wiki/Hentai@Home"; - description = - "Hentai@Home is an open-source P2P gallery distribution system which reduces the load on the E-Hentai Galleries"; + description = "Open-source P2P gallery distribution system which reduces the load on the E-Hentai Galleries"; license = licenses.gpl3; maintainers = with maintainers; [ terrorjack ]; mainProgram = "HentaiAtHome"; + platforms = jdk.meta.platforms; }; -} +}) diff --git a/pkgs/by-name/hn/hn-text/package.nix b/pkgs/by-name/hn/hn-text/package.nix new file mode 100644 index 0000000000000..e07f31a342308 --- /dev/null +++ b/pkgs/by-name/hn/hn-text/package.nix @@ -0,0 +1,35 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule rec { + pname = "hn-text"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "piqoni"; + repo = "hn-text"; + rev = "v${version}"; + hash = "sha256-YoPdYuNlWrLITyd2XeCOeGy70Ews1rvtOQzYZAQTI+Y="; + }; + + vendorHash = "sha256-lhghteKspXK1WSZ3dVHaTgx2BRx9S7yGNbvRYZKeA+s="; + + ldflags = [ + "-s" + "-w" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Fast, easy-to-use and distraction-free Hacker News terminal client"; + homepage = "https://github.com/piqoni/hn-text"; + license = lib.licenses.mit; + mainProgram = "hn-text"; + maintainers = with lib.maintainers; [ Guanran928 ]; + }; +} diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix index 25370cf2a4d2a..b12d6420c1b95 100644 --- a/pkgs/by-name/ho/home-manager/package.nix +++ b/pkgs/by-name/ho/home-manager/package.nix @@ -16,14 +16,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "0-unstable-2024-06-04"; + version = "0-unstable-2024-06-13"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "a7117efb3725e6197dd95424136f79147aa35e5b"; - hash = "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws="; + rev = "8d5e27b4807d25308dfe369d5a923d87e7dbfda3"; + hash = "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hy/hyprland/info.json b/pkgs/by-name/hy/hyprland/info.json new file mode 100644 index 0000000000000..ef4aabbe6b03a --- /dev/null +++ b/pkgs/by-name/hy/hyprland/info.json @@ -0,0 +1,7 @@ +{ + "branch": "main", + "commit_hash": "9e781040d9067c2711ec2e9f5b47b76ef70762b3", + "commit_message": "props: bump version to 0.41.1", + "date": "2024-06-13", + "tag": "v0.41.1" +} diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix b/pkgs/by-name/hy/hyprland/package.nix index 958e84ac78f0e..ae3e38de9a6ce 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -9,21 +9,29 @@ , binutils , cairo , epoll-shim +, expat +, fribidi , git , hyprcursor , hyprland-protocols , hyprlang +, hyprutils , hyprwayland-scanner , jq , libGL , libdrm +, libdatrie , libexecinfo , libinput +, libselinux +, libsepol +, libthai , libuuid , libxkbcommon , mesa , pango , pciutils +, pcre2 , pkgconf , python3 , systemd @@ -47,30 +55,41 @@ , hidpiXWayland ? false , enableNvidiaPatches ? false }: +let + info = builtins.fromJSON (builtins.readFile ./info.json); +in assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been removed."; assert lib.assertMsg (!enableNvidiaPatches) "The option `enableNvidiaPatches` has been removed."; assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland"; stdenv.mkDerivation (finalAttrs: { pname = "hyprland" + lib.optionalString debug "-debug"; - version = "0.40.0-unstable-2024-05-05"; + version = "0.41.1"; src = fetchFromGitHub { owner = "hyprwm"; repo = finalAttrs.pname; fetchSubmodules = true; - rev = "f15513309b24790099d42974274eb23f66f7c985"; - hash = "sha256-zKOfgXPTlRqCR+EME4qjN9rgAnC3viI5KWx10dhKszw="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-hLnnNBWP1Qjs1I3fndMgp8rbWJruxdnGTq77A4Rv4R4="; }; postPatch = '' # Fix hardcoded paths to /usr installation sed -i "s#/usr#$out#" src/render/OpenGL.cpp + + # Remove extra @PREFIX@ to fix pkg-config paths + sed -i "s#@PREFIX@/##g" hyprland.pc.in ''; - # used by version.sh - DATE = "2024-05-05"; - HASH = finalAttrs.src.rev; + # variables used by generateVersion.sh script, and shown in `hyprctl version` + BRANCH = info.branch; + COMMITS = info.commit_hash; + DATE = info.date; + DIRTY = ""; + HASH = info.commit_hash; + MESSAGE = info.commit_message; + TAG = info.tag; depsBuildBuild = [ # to find wayland-scanner when cross-compiling @@ -98,13 +117,20 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cairo + expat + fribidi git - hyprcursor + hyprcursor.dev hyprland-protocols hyprlang + hyprutils libGL + libdatrie libdrm libinput + libselinux + libsepol + libthai libuuid libxkbcommon mesa @@ -112,6 +138,7 @@ stdenv.mkDerivation (finalAttrs: { wayland-protocols pango pciutils + pcre2 tomlplusplus # for subproject wlroots-hyprland seatd @@ -152,11 +179,16 @@ stdenv.mkDerivation (finalAttrs: { passthru.providedSessions = [ "hyprland" ]; - meta = with lib; { + passthru.updateScript = ./update.sh; + + meta = { homepage = "https://github.com/hyprwm/Hyprland"; description = "Dynamic tiling Wayland compositor that doesn't sacrifice on its looks"; - license = licenses.bsd3; - maintainers = with maintainers; [ wozeparrot fufexan ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ + wozeparrot + fufexan + ]; mainProgram = "Hyprland"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/hy/hyprland/update.sh b/pkgs/by-name/hy/hyprland/update.sh new file mode 100755 index 0000000000000..c729705f6b1d0 --- /dev/null +++ b/pkgs/by-name/hy/hyprland/update.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p common-updater-scripts fd jq + +set -eou pipefail + +latest_release="$(curl --silent 'https://api.github.com/repos/hyprwm/Hyprland/releases/latest')" +latest_tag="$(curl --silent 'https://api.github.com/repos/hyprwm/Hyprland/tags?per_page=1')" +commit_hash="$(jq -r '.[0].commit.sha' <<<"$latest_tag")" +latest_commit="$(curl --silent 'https://api.github.com/repos/hyprwm/Hyprland/commits/'"$commit_hash"'')" +commit_message="$(jq -r '.commit.message' <<<"$latest_commit")" + +tag=$(jq -r '.tag_name' <<<"$latest_release") +# drop 'v' prefix +version="${tag#v}" + +branch=$(jq -r '.target_commitish' <<<"$latest_release") + +date=$(jq -r '.created_at' <<<"$latest_release") +# truncate time +date=${date%T*} + +# update version; otherwise fail +update-source-version hyprland "$version" --ignore-same-hash + +# find hyprland dir +files="$(fd --full-path /hyprland/ | head -1)" +dir="${files%/*}" + +echo -e '{ + "branch": "'"$branch"'", + "commit_hash": "'"$commit_hash"'", + "commit_message": "'"$commit_message"'", + "date": "'"$date"'", + "tag": "'"$tag"'" +}' >"$dir/info.json" diff --git a/pkgs/by-name/hy/hyprutils/package.nix b/pkgs/by-name/hy/hyprutils/package.nix new file mode 100644 index 0000000000000..f29cb3665fbda --- /dev/null +++ b/pkgs/by-name/hy/hyprutils/package.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenv, + cmake, + fetchFromGitHub, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hyprutils"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "hyprwm"; + repo = "hyprutils"; + rev = "v${finalAttrs.version}"; + hash = "sha256-8KvVqtApNt4FWTdn1TqVvw00rpqyG9UuUPA2ilPVD1U="; + }; + + nativeBuildInputs = [ cmake ]; + + outputs = [ "out" "dev" ]; + + doCheck = false; + + meta = { + homepage = "https://github.com/hyprwm/hyprutils"; + description = "Small C++ library for utilities used across the Hypr* ecosystem"; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + donovanglover + johnrtitor + ]; + }; +}) diff --git a/pkgs/by-name/hy/hyprwayland-scanner/package.nix b/pkgs/by-name/hy/hyprwayland-scanner/package.nix index 1aebc8b626000..ec295b2d72859 100644 --- a/pkgs/by-name/hy/hyprwayland-scanner/package.nix +++ b/pkgs/by-name/hy/hyprwayland-scanner/package.nix @@ -4,17 +4,18 @@ , cmake , pkg-config , pugixml +, nix-update-script , }: stdenv.mkDerivation (finalAttrs: { pname = "hyprwayland-scanner"; - version = "0.3.4"; + version = "0.3.10"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprwayland-scanner"; rev = "v${finalAttrs.version}"; - hash = "sha256-D0pg+ZRwrt4lavZ97Ca8clsgbPA3duLj8iEM7riaIFY="; + hash = "sha256-YxmfxHfWed1fosaa7fC1u7XoKp1anEZU+7Lh/ojRKoM="; }; nativeBuildInputs = [ @@ -28,12 +29,15 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { homepage = "https://github.com/hyprwm/hyprwayland-scanner"; description = "Hyprland version of wayland-scanner in and for C++"; - license = licenses.bsd3; - maintainers = with maintainers; [ fufexan ]; + changelog = "https://github.com/hyprwm/hyprwayland-scanner/releases/tag/${finalAttrs.version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fufexan ]; mainProgram = "hyprwayland-scanner"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/ic/icewm/package.nix b/pkgs/by-name/ic/icewm/package.nix index 997382c89745e..cf39b6613f068 100644 --- a/pkgs/by-name/ic/icewm/package.nix +++ b/pkgs/by-name/ic/icewm/package.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "icewm"; - version = "3.5.1"; + version = "3.6.0"; src = fetchFromGitHub { owner = "ice-wm"; repo = "icewm"; rev = finalAttrs.version; - hash = "sha256-5rDOmhXMc7B67rMa9s55LV/T9B8yb2vVNGM2fnFG6u8="; + hash = "sha256-gxRKLukwdyCvqQ+gRYb4cv/8B52nRAFwdcps6FcKFXk="; }; strictDeps = true; diff --git a/pkgs/by-name/id/ida-free/package.nix b/pkgs/by-name/id/ida-free/package.nix index aac31480a08f1..a103480d72476 100644 --- a/pkgs/by-name/id/ida-free/package.nix +++ b/pkgs/by-name/id/ida-free/package.nix @@ -50,8 +50,11 @@ stdenv.mkDerivation rec { desktopName = "IDA Free"; genericName = "Interactive Disassembler"; categories = [ "Development" ]; + startupWMClass = "IDA"; }; + desktopItems = [ desktopItem ]; + nativeBuildInputs = [ makeWrapper copyDesktopItems autoPatchelfHook libsForQt5.wrapQtAppsHook ]; # We just get a runfile in $src, so no need to unpack it. diff --git a/pkgs/by-name/im/immich-go/package.nix b/pkgs/by-name/im/immich-go/package.nix index 017bef88c9a2e..8a39a6202fcdb 100644 --- a/pkgs/by-name/im/immich-go/package.nix +++ b/pkgs/by-name/im/immich-go/package.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, nix-update-script, testers, immich-go }: buildGoModule rec { pname = "immich-go"; - version = "0.16.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "simulot"; repo = "immich-go"; rev = "${version}"; - hash = "sha256-9b9eQ1ufVQsg9hzwK0570HKmWTPcTag6DM2NB7mutjk="; + hash = "sha256-7F2TbZoD7RLG8jaQBGbLb6q/BOVyWxaCGq+mouBBNSg="; # Inspired by: https://github.com/NixOS/nixpkgs/blob/f2d7a289c5a5ece8521dd082b81ac7e4a57c2c5c/pkgs/applications/graphics/pdfcpu/default.nix#L20-L32 # The intention here is to write the information into files in the `src`'s diff --git a/pkgs/by-name/im/impala/package.nix b/pkgs/by-name/im/impala/package.nix new file mode 100644 index 0000000000000..b322e6f0f366a --- /dev/null +++ b/pkgs/by-name/im/impala/package.nix @@ -0,0 +1,26 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: +rustPlatform.buildRustPackage rec { + pname = "impala"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "pythops"; + repo = "impala"; + rev = "v${version}"; + hash = "sha256-7UMHkm3AtPqUILrsUnM0SbZT4Sq55dEElMN0KonjwtE="; + }; + + cargoHash = "sha256-CtEirsSQAg2Fv44YoKKmSjQs85++QWFRcWoA4VrBbgU="; + + meta = { + description = "TUI for managing wifi"; + homepage = "https://github.com/pythops/impala"; + platforms = lib.platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.nydragon ]; + }; +} diff --git a/pkgs/by-name/im/impression/package.nix b/pkgs/by-name/im/impression/package.nix index dea3d287468f9..c92d7aab02141 100644 --- a/pkgs/by-name/im/impression/package.nix +++ b/pkgs/by-name/im/impression/package.nix @@ -22,19 +22,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "impression"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitLab { owner = "adhami3310"; repo = "Impression"; rev = "v${finalAttrs.version}"; - hash = "sha256-5hBpe8D3DVXP6Hq5L4OUL9rCml0MoLdK7uZzbIIkNh0="; + hash = "sha256-cNkc/z0hVNYdyuCw0nHKEQKdQVeRouk/K7gIp0xpjt4="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) src; name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-lbpbggf4DEjpXJ52aM7qNd01XCEY3xj8dKGMfCZ9i3A="; + hash = "sha256-IcmJAD/55dOdN04N/wd6gZ9DO/UdUire1eXSuNMxu9M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ip/iplookup-gtk/package.nix b/pkgs/by-name/ip/iplookup-gtk/package.nix new file mode 100644 index 0000000000000..3d2486fe5b98b --- /dev/null +++ b/pkgs/by-name/ip/iplookup-gtk/package.nix @@ -0,0 +1,58 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + meson, + ninja, + pkg-config, + gobject-introspection, + wrapGAppsHook4, + desktop-file-utils, + libadwaita, +}: + +python3Packages.buildPythonPackage rec { + pname = "iplookup-gtk"; + version = "0.3.4"; + pyproject = false; # Built with meson + + src = fetchFromGitHub { + owner = "Bytezz"; + repo = "IPLookup-gtk"; + rev = "v${version}"; + hash = "sha256-NqFE6vRdLpnlCzGAUE4iOfLmTnUgX3CHtoXfsbT3zm4="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ + libadwaita + ]; + + dependencies = with python3Packages; [ + pygobject3 + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = { + description = "Find info about an IP address"; + homepage = "https://github.com/Bytezz/IPLookup-gtk"; + changelog = "https://github.com/Bytezz/IPLookup-gtk/releases/tag/${src.rev}"; + license = lib.licenses.gpl3Plus; + mainProgram = "iplookup"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/ja/jailer/package.nix b/pkgs/by-name/ja/jailer/package.nix index 9da7c29efe1d5..4a41c0eb9dfcf 100644 --- a/pkgs/by-name/ja/jailer/package.nix +++ b/pkgs/by-name/ja/jailer/package.nix @@ -12,7 +12,7 @@ wrapGAppsHook4, }: stdenv.mkDerivation (finalAttrs: { - name = "jailer"; + pname = "jailer"; version = "16.2"; src = fetchFromGitHub { diff --git a/pkgs/by-name/je/jellyfin/package.nix b/pkgs/by-name/je/jellyfin/package.nix index ecf1c6bda7923..0360ff53e367f 100644 --- a/pkgs/by-name/je/jellyfin/package.nix +++ b/pkgs/by-name/je/jellyfin/package.nix @@ -36,12 +36,10 @@ buildDotnetModule rec { dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; dotnetBuildFlags = [ "--no-self-contained" ]; - preInstall = '' - makeWrapperArgs+=( - --add-flags "--ffmpeg ${jellyfin-ffmpeg}/bin/ffmpeg" - --add-flags "--webdir ${jellyfin-web}/share/jellyfin-web" - ) - ''; + makeWrapperArgs = [ + "--add-flags" "--ffmpeg=${jellyfin-ffmpeg}/bin/ffmpeg" + "--add-flags" "--webdir=${jellyfin-web}/share/jellyfin-web" + ]; passthru.tests = { smoke-test = nixosTests.jellyfin; diff --git a/pkgs/by-name/jo/joularjx/package.nix b/pkgs/by-name/jo/joularjx/package.nix new file mode 100644 index 0000000000000..df0d66290a8dc --- /dev/null +++ b/pkgs/by-name/jo/joularjx/package.nix @@ -0,0 +1,42 @@ +{ + fetchFromGitHub, + maven, + makeWrapper, + jre, + lib, +}: + +maven.buildMavenPackage rec { + pname = "joularjx"; + version = "2.9.0"; + + src = fetchFromGitHub { + owner = "joular"; + repo = pname; + rev = version; + hash = "sha256-/Drv6PVMmz3QNEu8zMokTKBZeYWMjuKczu18qKqNAx4="; + }; + + mvnHash = "sha256-TKHo0hZBjgBeUWYvbjF3MZ6Egp3qB2LGwWfrGrcVkOk="; + + mvnParameters = "-DskipTests"; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/share + cp target/joularjx-${version}.jar $out/share/joularjx.jar + makeWrapper ${jre}/bin/java $out/bin/joularjx \ + --add-flags "-javaagent:$out/share/joularjx.jar" + runHook postInstall + ''; + + meta = with lib; { + description = "Java-based agent for software power monitoring at the source code level"; + homepage = "https://github.com/joular/joularjx"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ julienmalka ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/jt/jtdx/package.nix b/pkgs/by-name/jt/jtdx/package.nix index a058c52c15446..09f88ddf0f5c4 100644 --- a/pkgs/by-name/jt/jtdx/package.nix +++ b/pkgs/by-name/jt/jtdx/package.nix @@ -1,6 +1,6 @@ { wsjtx, fetchgit, qt5, lib }: wsjtx.overrideAttrs (old: { - name = "jtdx"; + pname = "jtdx"; version = "unstable-2022-03-01"; src = fetchgit { url = "https://github.com/jtdx-project/jtdx.git"; diff --git a/pkgs/by-name/ju/just/package.nix b/pkgs/by-name/ju/just/package.nix index df425fb5e4171..bfd8127b34063 100644 --- a/pkgs/by-name/ju/just/package.nix +++ b/pkgs/by-name/ju/just/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.28.0"; + version = "1.29.1"; outputs = [ "out" "man" "doc" ]; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-GdDpFY9xdjA60zr+i5O9wBWF682tvi4N/pxEob5tYoA="; + hash = "sha256-R797aRLsaDjNSaYVFUSmKCUr+HQ5xarrssHJe3fwhTw="; }; - cargoHash = "sha256-Cvl4EY57TanJK1XGVahPHGtuEAIR44qwGEPDkXfgw5I="; + cargoHash = "sha256-DVjhmJPyIRHwKTBWoIBYMJbigLpakDrXeCHQ9Y8/T48="; nativeBuildInputs = [ installShellFiles mdbook ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/development/compilers/jwasm/default.nix b/pkgs/by-name/jw/jwasm/package.nix index a8ffc3164a662..8a1390aac9f5c 100644 --- a/pkgs/development/compilers/jwasm/default.nix +++ b/pkgs/by-name/jw/jwasm/package.nix @@ -1,17 +1,18 @@ -{ lib -, stdenv -, fetchFromGitHub +{ + lib, + fetchFromGitHub, + stdenv, }: stdenv.mkDerivation (finalAttrs: { pname = "jwasm"; - version = "2.17"; + version = "2.18"; src = fetchFromGitHub { owner = "Baron-von-Riedesel"; repo = "JWasm"; rev = "v${finalAttrs.version}"; - hash = "sha256-22eNtHXF+RQT4UbXIVjn1JP/s6igp5O1oQT7sVl7c1U="; + hash = "sha256-xbiyGBTzIkAfUy45JdAl77gbvArzVUQNPOxa+H2uGFo="; }; outputs = [ "out" "doc" ]; @@ -31,13 +32,13 @@ stdenv.mkDerivation (finalAttrs: { -t $doc/share/doc/jwasm/ ''; - meta = with lib; { + meta = { homepage = "https://github.com/Baron-von-Riedesel/JWasm/"; description = "MASM-compatible x86 assembler"; - changelog = "https://github.com/Baron-von-Riedesel/JWasm/releases/tag/v${finalAttrs.version}"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; + changelog = "https://github.com/Baron-von-Riedesel/JWasm/releases/tag/${finalAttrs.src.rev}"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; broken = stdenv.isDarwin; }; }) diff --git a/pkgs/by-name/ki/kitex/package.nix b/pkgs/by-name/ki/kitex/package.nix new file mode 100644 index 0000000000000..2890eff5f882e --- /dev/null +++ b/pkgs/by-name/ki/kitex/package.nix @@ -0,0 +1,42 @@ +{ buildGoModule +, fetchFromGitHub +, lib +, testers +, kitex +}: + +buildGoModule rec { + pname = "kitex"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "cloudwego"; + repo = "kitex"; + rev = "v${version}"; + hash = "sha256-U61n+zaTnABujDSTPcKr4zfMmPVQwxQAotBXZaOVZSo="; + }; + + vendorHash = "sha256-luZH7ynFni5J3CmLRM3jJPshs/u3zahkS1qS2phopLc="; + + subPackages = [ "tool/cmd/kitex" ]; + + ldflags = [ "-s" "-w" ]; + + postInstall = '' + ln -s $out/bin/kitex $out/bin/protoc-gen-kitex + ln -s $out/bin/kitex $out/bin/thrift-gen-kitex + ''; + + passthru.tests.version = testers.testVersion { + package = kitex; + version = "v${version}"; + }; + + meta = with lib; { + description = "A high-performance and strong-extensibility Golang RPC framework"; + homepage = "https://github.com/cloudwego/kitex"; + license = licenses.asl20; + maintainers = with maintainers; [ aaronjheng ]; + mainProgram = "kitex"; + }; +} diff --git a/pkgs/by-name/ko/kontemplate/package.nix b/pkgs/by-name/ko/kontemplate/package.nix new file mode 100644 index 0000000000000..6ab1a96f3ad2a --- /dev/null +++ b/pkgs/by-name/ko/kontemplate/package.nix @@ -0,0 +1,37 @@ +{ lib +, buildGoModule +, fetchgit +}: +buildGoModule { + pname = "kontemplate"; + version = "1.8.0-unstable-2024-06-09"; + + src = fetchgit { + url = "https://code.tvl.fyi/depot.git"; + sha256 = "sha256-Cv/y1Tj+hUKP0gi9ceS1Gml1WRYbUGSeWfJfXyX6dLA="; + rev = "b16ddb54b0327606cec2df220eaabb1328e18e3e"; + }; + + modRoot = "ops/kontemplate"; + + vendorHash = "sha256-xPGVM2dq5fAVOiuodOXhDm3v3k+ncNLhlk6aCtF5S9E="; + + meta = { + description = "Extremely simple Kubernetes resource templates"; + mainProgram = "kontemplate"; + homepage = "https://code.tvl.fyi/about/ops/kontemplate"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ mbode tazjin ]; + platforms = lib.platforms.unix; + + longDescription = '' + Kontemplate is a simple CLI tool that can take sets of + Kubernetes resource files with placeholders and insert values + per environment. + + It can be used as a simple way of deploying the same set of + resources to different Kubernetes contexts with context-specific + configuration. + ''; + }; +} diff --git a/pkgs/by-name/ko/kor/package.nix b/pkgs/by-name/ko/kor/package.nix index 1ab029e08dc01..0f39d9e2049f7 100644 --- a/pkgs/by-name/ko/kor/package.nix +++ b/pkgs/by-name/ko/kor/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kor"; - version = "0.4.2"; + version = "0.5.0"; src = fetchFromGitHub { owner = "yonahd"; repo = pname; rev = "v${version}"; - hash = "sha256-fyVMRHDzP7od+cwC01vNP/TOiDctD8E0y8uNWtgiEeA="; + hash = "sha256-5x0Zyk4gPMKcZtpgT0QbIm6NeWX+uJwT2NM+yS2oC3o="; }; - vendorHash = "sha256-NPmsXS7P+pCF97N8x3nQhCRoHJLMO5plNtcUqxxexVE="; + vendorHash = "sha256-9aZy1i0VrDRySt5A5aQHBXa0mPgD+rsyeqQrd6snWKc="; preCheck = '' HOME=$(mktemp -d) diff --git a/pkgs/by-name/kt/ktls-utils/package.nix b/pkgs/by-name/kt/ktls-utils/package.nix index 5d773a75ab9e4..d25c72f360821 100644 --- a/pkgs/by-name/kt/ktls-utils/package.nix +++ b/pkgs/by-name/kt/ktls-utils/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "ktls-utils"; - version = "0.10"; + version = "0.11"; src = fetchFromGitHub { owner = "oracle"; repo = "ktls-utils"; rev = "ktls-utils-${version}"; - hash = "sha256-1HceFajSSq1D3IMeGQF+i/iW1lL2opLLWFfsRHW9atg="; + hash = "sha256-QPKBJEuXYDuOhlFhc0zQ4hAq1owFNe9b3BUKliNFgu0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ku/kubo/package.nix b/pkgs/by-name/ku/kubo/package.nix index fde2afa89c831..9b0163a1ae601 100644 --- a/pkgs/by-name/ku/kubo/package.nix +++ b/pkgs/by-name/ku/kubo/package.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "kubo"; - version = "0.28.0"; # When updating, also check if the repo version changed and adjust repoVersion below + version = "0.29.0"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; passthru.repoVersion = "15"; # Also update kubo-migrator when changing the repo version @@ -15,7 +15,7 @@ buildGoModule rec { # Kubo makes changes to its source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz"; - hash = "sha256-nq9NpbK9Fql0o1TG8p9lIlnKUnxvMMimz8AYKVozkwY="; + hash = "sha256-udCVyA3NN3RCmVtdIjccfy/RymvrsGJoxlF8DiapP4g="; }; # tarball contains multiple files/directories @@ -41,9 +41,9 @@ buildGoModule rec { postPatch = '' substituteInPlace 'misc/systemd/ipfs.service' \ - --replace '/usr/local/bin/ipfs' "$out/bin/ipfs" + --replace-fail '/usr/local/bin/ipfs' "$out/bin/ipfs" substituteInPlace 'misc/systemd/ipfs-hardened.service' \ - --replace '/usr/local/bin/ipfs' "$out/bin/ipfs" + --replace-fail '/usr/local/bin/ipfs' "$out/bin/ipfs" ''; postInstall = '' diff --git a/pkgs/development/libraries/LASzip/default.nix b/pkgs/by-name/la/laszip/package.nix index ee6e74aa7bc23..65c2e6934a244 100644 --- a/pkgs/development/libraries/LASzip/default.nix +++ b/pkgs/by-name/la/laszip/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { version = "3.4.3"; - pname = "LASzip"; + pname = "laszip"; src = fetchFromGitHub { owner = "LASzip"; diff --git a/pkgs/development/libraries/LASzip/LASzip2.nix b/pkgs/by-name/la/laszip_2/package.nix index 4f63dfe8059c8..8af9cae261fea 100644 --- a/pkgs/development/libraries/LASzip/LASzip2.nix +++ b/pkgs/by-name/la/laszip_2/package.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "2.2.0"; - pname = "LASzip"; + pname = "laszip"; src = fetchFromGitHub { owner = "LASzip"; repo = "LASzip"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-TXzse4oLjNX5R2xDR721iV+gW/rP5z3Zciv4OgxfeqA="; }; @@ -20,4 +20,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.michelk ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/by-name/la/lazysql/package.nix b/pkgs/by-name/la/lazysql/package.nix new file mode 100644 index 0000000000000..6f78d0994d352 --- /dev/null +++ b/pkgs/by-name/la/lazysql/package.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, xorg ? null +, darwin ? null +}: + +buildGoModule rec { + pname = "lazysql"; + version = "0.1.8"; + + src = fetchFromGitHub { + owner = "jorgerojas26"; + repo = "lazysql"; + rev = "v${version}"; + hash = "sha256-yPf9/SM4uET/I8FsDU1le9JgxELu0DR9k7mv8PnBwvQ="; + }; + + vendorHash = "sha256-tgD6qoCVC1ox15VPJWVvhe4yg3R81ktMuW2dsaU69rY="; + + buildInputs = lib.optionals stdenv.isLinux [ xorg.libX11 ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + + meta = with lib; { + description = "A cross-platform TUI database management tool written in Go"; + homepage = "https://github.com/jorgerojas26/lazysql"; + license = licenses.mit; + maintainers = with maintainers; [ kanielrkirby ]; + mainProgram = "lazysql"; + }; +} diff --git a/pkgs/by-name/lc/lc0/package.nix b/pkgs/by-name/lc/lc0/package.nix index 4ccb1927534bf..df4a59346f66d 100644 --- a/pkgs/by-name/lc/lc0/package.nix +++ b/pkgs/by-name/lc/lc0/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "lc0"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "LeelaChessZero"; repo = "lc0"; rev = "refs/tags/v${version}"; - hash = "sha256-Q85hXNSexHhk6W48tgJLk0Sf32xBipfg2P2SH1FF89Q="; + hash = "sha256-kHLO6xM1q/CQIBcGIFXVkvtGEx75sqA7atGYfvnJcso="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix index 8655d31e67269..2931a41cc3efd 100644 --- a/pkgs/by-name/le/lefthook/package.nix +++ b/pkgs/by-name/le/lefthook/package.nix @@ -6,7 +6,7 @@ let pname = "lefthook"; - version = "1.6.15"; + version = "1.6.16"; in buildGoModule { inherit pname version; @@ -15,7 +15,7 @@ buildGoModule { owner = "evilmartians"; repo = "lefthook"; rev = "v${version}"; - hash = "sha256-Pc4m4T/+hABX3eGgni12EC8lD9xl5j/eALhfuSVbEJc="; + hash = "sha256-5sGhm+ioH9hQLDuk7a0oUB1CqiiTt88UKAmBqUeCfic="; }; vendorHash = "sha256-ralnfqrP6R58Wjc/AWRf1motWZICPagZxHCkqVcwYoo="; diff --git a/pkgs/by-name/le/less/package.nix b/pkgs/by-name/le/less/package.nix index 0844188ff775d..f94e4b0cad796 100644 --- a/pkgs/by-name/le/less/package.nix +++ b/pkgs/by-name/le/less/package.nix @@ -25,6 +25,12 @@ stdenv.mkDerivation (finalAttrs: { url = "https://gitlab.archlinux.org/archlinux/packaging/packages/less/-/raw/1d570db0c84fe95799f460526492e45e24c30ad0/backport-007521ac3c95bc76.patch"; hash = "sha256-BT8DLIu7oVhL5XL50uFVUp97qjklcvRHy85UQwVKAmc="; }) + (fetchpatch { + # https://github.com/gwsw/less/pull/416 + name = "freebsd.patch"; + url = "https://github.com/gwsw/less/commit/3ecff3752078fda90fd46c9f020f2a2bb548dd71.patch"; + hash = "sha256-Iv2Jm/7wwRsyLchoEvYz9VziySJ6sI4YbSgFTdQrV+I="; + }) ]; buildInputs = [ diff --git a/pkgs/by-name/li/libeduvpn-common/package.nix b/pkgs/by-name/li/libeduvpn-common/package.nix index cafe417348cb3..a0b559fa31e7a 100644 --- a/pkgs/by-name/li/libeduvpn-common/package.nix +++ b/pkgs/by-name/li/libeduvpn-common/package.nix @@ -5,11 +5,11 @@ buildGoModule rec { pname = "libeduvpn-common"; - version = "1.2.1"; + version = "2.0.1"; src = fetchurl { url = "https://github.com/eduvpn/eduvpn-common/releases/download/${version}/eduvpn-common-${version}.tar.xz"; - hash = "sha256-MCMbOVDx9nQwTLH8EjCFD2T6mFwwFX8Jvae8PIrstvU="; + hash = "sha256-hTF9CSqU9c0+TOK+/oRGjY1fBCKpisiiTJnWZqcdvjA="; }; vendorHash = null; diff --git a/pkgs/by-name/li/liblapin/package.nix b/pkgs/by-name/li/liblapin/package.nix index 97bcb1d1e181b..f736bb2d42687 100644 --- a/pkgs/by-name/li/liblapin/package.nix +++ b/pkgs/by-name/li/liblapin/package.nix @@ -9,7 +9,7 @@ }: stdenv.mkDerivation { - name = "liblapin"; + pname = "liblapin"; version = "0-unstable-2024-05-20"; src = fetchFromGitHub { diff --git a/pkgs/by-name/li/liboqs/package.nix b/pkgs/by-name/li/liboqs/package.nix index f6d996bc1b1df..36d9d042ca4e1 100644 --- a/pkgs/by-name/li/liboqs/package.nix +++ b/pkgs/by-name/li/liboqs/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "liboqs"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "open-quantum-safe"; repo = "liboqs"; rev = finalAttrs.version; - hash = "sha256-BFDa5NUr02lFPcT4Hnb2rjGAi+2cXvh1SHLfqX/zLlI="; + hash = "sha256-zsSKFUs75K0Byxh3KVCZ8lIOf/vpbyMJXfk6fa2u+aE="; }; patches = [ diff --git a/pkgs/applications/audio/LibreArp/lv2.nix b/pkgs/by-name/li/librearp-lv2/package.nix index b723683b7ec6b..82c78aa76d7ec 100644 --- a/pkgs/applications/audio/LibreArp/lv2.nix +++ b/pkgs/by-name/li/librearp-lv2/package.nix @@ -2,14 +2,14 @@ , xcbutilcursor, xcbutilkeysyms, xcbutil, libXrandr, libXinerama, libXcursor , alsa-lib, libjack2, lv2, gcc-unwrapped, curl}: -stdenv.mkDerivation rec { - pname = "LibreArp-lv2"; +stdenv.mkDerivation (finalAttrs: { + pname = "librearp-lv2"; version = "2.4"; src = fetchFromGitLab { owner = "LibreArp"; repo = "LibreArp"; - rev = "${version}-lv2"; + rev = "${finalAttrs.version}-lv2"; hash = "sha256-x+ZPiU/ZFzrXb8szMS9Ts4JEEyXYpM8CLZHT4lNJWY8="; fetchSubmodules = true; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ magnetophon ]; }; -} +}) diff --git a/pkgs/applications/audio/LibreArp/default.nix b/pkgs/by-name/li/librearp/package.nix index 0736745aaaf40..9bd1beac345d4 100644 --- a/pkgs/applications/audio/LibreArp/default.nix +++ b/pkgs/by-name/li/librearp/package.nix @@ -2,14 +2,14 @@ , xcbutilcursor, xcbutilkeysyms, xcbutil, libXrandr, libXinerama, libXcursor , alsa-lib, libjack2, lv2, gcc-unwrapped, curl}: -stdenv.mkDerivation rec { - pname = "LibreArp"; +stdenv.mkDerivation (finalAttrs: { + pname = "librearp"; version = "2.4"; src = fetchFromGitLab { owner = "LibreArp"; repo = "LibreArp"; - rev = version; + rev = finalAttrs.version; hash = "sha256-jEpES68NuHhelUq/L46CxEeadk3LbuPZ72JaGDbw8fg="; fetchSubmodules = true; }; @@ -44,10 +44,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = - "A pattern-based arpeggio generator plugin."; + "A pattern-based arpeggio generator plugin"; homepage = "https://librearp.gitlab.io/"; license = licenses.gpl3Plus; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ magnetophon ]; }; -} +}) diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index 269deb264bd46..f313ab80863f1 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -12,7 +12,7 @@ }: let - version = "7.7.0"; + version = "7.7.2"; in # The output of the derivation is a tool to create bootable images using Limine # as bootloader for various platforms and corresponding binary and helper files. @@ -24,7 +24,7 @@ stdenv.mkDerivation { # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://github.com/limine-bootloader/limine/releases/download/v${version}/limine-${version}.tar.gz"; - sha256 = "sha256-GD66BuplRyIDCy6J9Lys8z7GDshaz50O1Lu//lO+nf0="; + sha256 = "sha256-t3ymsKn+pFW2xOn+BKJriqx2cMbCjtnGGgvCF82/8TE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/literate-programming/Literate/dub-lock.json b/pkgs/by-name/li/literate/dub-lock.json index 18a1e415e5622..18a1e415e5622 100644 --- a/pkgs/development/tools/literate-programming/Literate/dub-lock.json +++ b/pkgs/by-name/li/literate/dub-lock.json diff --git a/pkgs/development/tools/literate-programming/Literate/default.nix b/pkgs/by-name/li/literate/package.nix index 0892d9f64485b..29b177ec53a83 100644 --- a/pkgs/development/tools/literate-programming/Literate/default.nix +++ b/pkgs/by-name/li/literate/package.nix @@ -5,7 +5,7 @@ }: buildDubPackage { - pname = "Literate"; + pname = "literate"; version = "unstable-2021-01-22"; src = fetchFromGitHub { diff --git a/pkgs/by-name/li/litmusctl/package.nix b/pkgs/by-name/li/litmusctl/package.nix index 4cdfe6384b5bd..a1ed962521ce4 100644 --- a/pkgs/by-name/li/litmusctl/package.nix +++ b/pkgs/by-name/li/litmusctl/package.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "litmusctl"; - version = "1.6.0"; + version = "1.7.0"; nativeBuildInputs = [ installShellFiles @@ -21,10 +21,10 @@ buildGoModule rec { owner = "litmuschaos"; repo = "litmusctl"; rev = "${version}"; - hash = "sha256-aJcnK4VhtqVFaSUf0A40qGb0TBKiqlgkwY2nRdfTl2E="; + hash = "sha256-g3g0wVjtVIF56N1gTillHMkNDHt58tpRQa2ds+3rHAE="; }; - vendorHash = "sha256-U4dp2E2TZ3rds63PS6GzUVhb2qDSv92bf9JCkWpdLew="; + vendorHash = "sha256-7FYOQ89aUFPX+5NCPYKg+YGCXstQ6j9DK4V2mCgklu0="; postInstall = '' installShellCompletion --cmd litmusctl \ diff --git a/pkgs/by-name/lm/lmstudio/darwin.nix b/pkgs/by-name/lm/lmstudio/darwin.nix index 91c2ce3b4ca9f..f08d2d1510b7f 100644 --- a/pkgs/by-name/lm/lmstudio/darwin.nix +++ b/pkgs/by-name/lm/lmstudio/darwin.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://releases.lmstudio.ai/mac/arm64/${version}/latest/LM-Studio-${version}-arm64.dmg"; - hash = "sha256-wl3uyRtqY5w8NnESBKcP+CicIh8cCkKmrcVuiijzzTQ="; + hash = "sha256-byS0LNJQjs/+sf2anhTAdsXUWad9HujxmLx5uEfdlo8="; }; nativeBuildInputs = [ undmg ]; diff --git a/pkgs/by-name/lm/lmstudio/linux.nix b/pkgs/by-name/lm/lmstudio/linux.nix index fce43718b00a7..abca76ac032a8 100644 --- a/pkgs/by-name/lm/lmstudio/linux.nix +++ b/pkgs/by-name/lm/lmstudio/linux.nix @@ -7,8 +7,8 @@ }: let src = fetchurl { - url = "https://releases.lmstudio.ai/linux/${version}/beta/LM_Studio-${version}.AppImage"; - hash = "sha256-1ahPRRgcYfW9eD04yeF4ft+yLn9+nIPOV5Vkv7rMiT8="; + url = "https://releases.lmstudio.ai/linux/x86/${version}/beta/LM_Studio-${version}.AppImage"; + hash = "sha256-2a3ac+0m3C/YyPM0Waia+x2Q/lodfbyHNvlbB2AHT78="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index 4b48cc01ee2a6..962bd58a94f0a 100644 --- a/pkgs/by-name/lm/lmstudio/package.nix +++ b/pkgs/by-name/lm/lmstudio/package.nix @@ -5,14 +5,14 @@ }: let pname = "lmstudio"; - version = "0.2.24"; + version = "0.2.25"; meta = { description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)"; homepage = "https://lmstudio.ai/"; license = lib.licenses.unfree; mainProgram = "lmstudio"; maintainers = with lib.maintainers; [ cig0 eeedean ]; - platforms = lib.platforms.linux ++ [ "aarch64-darwin" ]; + platforms = [ "x86_64-linux" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; in diff --git a/pkgs/by-name/lo/local-ai/package.nix b/pkgs/by-name/lo/local-ai/package.nix index 5d582f3604a65..418a9a638419e 100644 --- a/pkgs/by-name/lo/local-ai/package.nix +++ b/pkgs/by-name/lo/local-ai/package.nix @@ -94,13 +94,33 @@ let ''; }; + llama-cpp-rpc = (llama-cpp-grpc.overrideAttrs (prev: { + name = "llama-cpp-rpc"; + cmakeFlags = prev.cmakeFlags ++ [ + (lib.cmakeBool "LLAMA_AVX" false) + (lib.cmakeBool "LLAMA_AVX2" false) + (lib.cmakeBool "LLAMA_AVX512" false) + (lib.cmakeBool "LLAMA_FMA" false) + (lib.cmakeBool "LLAMA_F16C" false) + (lib.cmakeBool "LLAMA_RPC" true) + ]; + postPatch = prev.postPatch + '' + sed -i examples/rpc/CMakeLists.txt \ + -e '$a\install(TARGETS rpc-server RUNTIME)' + ''; + })).override { + cudaSupport = false; + openclSupport = false; + blasSupport = true; # TODO: set to false, when dropping 23.11 support + }; + llama-cpp-grpc = (llama-cpp.overrideAttrs (final: prev: { name = "llama-cpp-grpc"; src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; - rev = "c12452c7aec8a02264afc00196a13caa591a13ac"; - hash = "sha256-Kji8dlz7OfhPeNXnYgBHzpGGMhCsRLJ9d+EFf77Q6Co="; + rev = "74f33adf5f8b20b08fc5a6aa17ce081abe86ef2f"; + hash = "sha256-hSdHhsC5Q8pLEC2bj8Gke4/ffCts5l7LtYa9RDrpGBI="; fetchSubmodules = true; }; postPatch = prev.postPatch + '' @@ -253,8 +273,8 @@ let src = fetchFromGitHub { owner = "ggerganov"; repo = "whisper.cpp"; - rev = "73d13ad19a8c9c4da4f405088a85169b1a171e66"; - hash = "sha256-7g/J3a3behGgcJXy9ryAYXxgOYnsRMlGmux13re28AY="; + rev = "22d46b7ba4620e2db1281e210d0186863cffcec0"; + hash = "sha256-JC3GHRBjFvfQSUWRdAcMc0pol54RsqUF1+zIZYAsbC4="; }; nativeBuildInputs = [ cmake pkg-config ] @@ -285,8 +305,8 @@ let src = fetchFromGitHub { owner = "go-skynet"; repo = "go-bert.cpp"; - rev = "6abe312cded14042f6b7c3cd8edf082713334a4d"; - hash = "sha256-lh9cvXc032Eq31kysxFOkRd0zPjsCznRl0tzg9P2ygo="; + rev = "710044b124545415f555e4260d16b146c725a6e4"; + hash = "sha256-UNrs3unYjvSzCVaVISFFBDD+s37lmN6/7ajmGNcYgrU="; fetchSubmodules = true; }; buildFlags = [ "libgobert.a" ]; @@ -372,18 +392,18 @@ let stdenv; pname = "local-ai"; - version = "2.15.0"; + version = "2.16.0"; src = fetchFromGitHub { owner = "go-skynet"; repo = "LocalAI"; rev = "v${version}"; - hash = "sha256-AjNgfZjVxlw0LtPbUTbJuLcUfqJdPzn6vOmUDz/v7Jc="; + hash = "sha256-3SfU68wGyYIX0haKfuHGKHhthuDSeSdr18ReDkFzhH0="; }; self = buildGoModule.override { stdenv = effectiveStdenv; } { inherit pname version src; - vendorHash = "sha256-+ZPZkOpaTsKrL2HDOEtAr8sT6uqTiQXo/XS+MBNZq5E="; + vendorHash = "sha256-UjqEsgRZ+xv4Thwh4u3juvg3JI3+RdGyCZlsk7ddgTU="; env.NIX_CFLAGS_COMPILE = lib.optionalString with_stablediffusion " -isystem ${opencv}/include/opencv4"; @@ -403,12 +423,20 @@ let -e 's;git clone.*go-tiny-dream$;${cp} ${if with_tinydream then go-tiny-dream else go-tiny-dream.src} sources/go-tiny-dream;' \ -e 's, && git checkout.*,,g' \ -e '/mod download/ d' \ - -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/llama-cpp-/ d' \ + -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/llama-cpp-fallback/ d' \ + -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/llama-cpp-avx/ d' \ + -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/llama-cpp-cuda/ d' \ + ''; postConfigure = '' + shopt -s extglob mkdir -p backend-assets/grpc - cp ${llama-cpp-grpc}/bin/*grpc-server backend-assets/grpc/llama-cpp + cp ${llama-cpp-grpc}/bin/?(llama-cpp-)grpc-server backend-assets/grpc/llama-cpp-avx2 + cp ${llama-cpp-rpc}/bin/?(llama-cpp-)grpc-server backend-assets/grpc/llama-cpp-grpc + + mkdir -p backend-assets/util + cp ${llama-cpp-rpc}/bin/?(llama-cpp-)rpc-server backend-assets/util/llama-cpp-rpc-server ''; buildInputs = [ ] @@ -496,7 +524,7 @@ let inherit go-tiny-dream go-rwkv go-bert go-llama gpt4all go-piper llama-cpp-grpc whisper-cpp go-tiny-dream-ncnn espeak-ng' piper-phonemize - piper-tts'; + piper-tts' llama-cpp-rpc; }; passthru.features = { diff --git a/pkgs/by-name/lo/louvre/package.nix b/pkgs/by-name/lo/louvre/package.nix index 8235de4ef3578..5b7ad4a2f64fe 100644 --- a/pkgs/by-name/lo/louvre/package.nix +++ b/pkgs/by-name/lo/louvre/package.nix @@ -22,9 +22,9 @@ }: stdenv.mkDerivation (self: { pname = "louvre"; - version = "2.0.0-1"; + version = "2.1.0-1"; rev = "v${self.version}"; - hash = "sha256-tDpgFtccMlGYrahEC4vlj5cfIzkqUl664ccRhcKIVTQ="; + hash = "sha256-qRvAryZ6SIhh5yDugcosVYOM2Tq0XPuaA6ib8/jWxNI="; src = fetchFromGitHub { inherit (self) rev hash; diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix index e5b9f7e22cfb1..8ff8671f5c11c 100644 --- a/pkgs/by-name/lu/lunar-client/package.nix +++ b/pkgs/by-name/lu/lunar-client/package.nix @@ -6,11 +6,11 @@ appimageTools.wrapType2 rec { pname = "lunar-client"; - version = "3.2.9"; + version = "3.2.10"; src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; - hash = "sha512-7D7rGYJc6q5cPlgDjWkd76TwJ4QPSf99buoeJOfhP/e/clnWvfmLHK6CaAPAPDnOjijMuAEM9XkDYH8U5tlvMQ=="; + hash = "sha512-XsHMe4+TeTowxnMRby4W44YRa3Q/OgDf2QOVMjPel4wy3O9TSfNBTzpP7NM07BKVDmNJ7GJrF8WMXewfT3YU8g=="; }; extraInstallCommands = diff --git a/pkgs/by-name/ma/marcel/package.nix b/pkgs/by-name/ma/marcel/package.nix index a86df180c1b5e..d2468fcb6fab4 100644 --- a/pkgs/by-name/ma/marcel/package.nix +++ b/pkgs/by-name/ma/marcel/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "marcel"; - version = "0.28"; + version = "0.29.0"; pyproject = true; src = fetchFromGitHub { owner = "geophile"; repo = "marcel"; rev = "refs/tags/v${version}"; - hash = "sha256-aJq8FAW1/Vo2x3st+/cxAzo4jHYPBDx/2i/2h1GVnrs="; + hash = "sha256-hUI5dUqelmRuk65s67rJXrZoPDWAcnNVIHlzxAgRExs="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/ma/marwaita-x/package.nix b/pkgs/by-name/ma/marwaita-x/package.nix index 794e9f07acb24..ddeeb5e39b514 100644 --- a/pkgs/by-name/ma/marwaita-x/package.nix +++ b/pkgs/by-name/ma/marwaita-x/package.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "marwaita-x"; - version = "1.2"; + version = "1.2.1"; src = fetchFromGitHub { owner = "darkomarko42"; repo = "marwaita-x"; rev = finalAttrs.version; - sha256 = "sha256-HQsIF9CNFROaxl5hnmat2VWEXFT8gW4UWSi/A1dFi6Y="; + sha256 = "sha256-x5b3aaasYbxFGvdNNF6vIrF/ZZWBGbdS2kEuB1rwOlA="; }; buildInputs = [ diff --git a/pkgs/by-name/md/mdsh/package.nix b/pkgs/by-name/md/mdsh/package.nix index e97b8eee51fef..8b482d7e714e7 100644 --- a/pkgs/by-name/md/mdsh/package.nix +++ b/pkgs/by-name/md/mdsh/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdsh"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "zimbatm"; repo = "mdsh"; rev = "v${version}"; - hash = "sha256-ammLbKEKXDSuZMr4DwPpcRSkKh7BzNC+4ZRCqTNNCQk="; + hash = "sha256-vN8nFhbZgJIhFuFET9IOmdxT7uBKq/9X+TO9lZsDw6g="; }; - cargoHash = "sha256-wLHMccxk3ceZyGK27t5Kyal48yj9dQNgmEHjH9hR9Pc="; + cargoHash = "sha256-0D1RSUJw7fszc9d4nrp+zCzr9l0xF4Ed8DbK5/O5bEY="; meta = with lib; { description = "Markdown shell pre-processor"; diff --git a/pkgs/by-name/me/media-downloader/package.nix b/pkgs/by-name/me/media-downloader/package.nix new file mode 100644 index 0000000000000..8053f6a93adaf --- /dev/null +++ b/pkgs/by-name/me/media-downloader/package.nix @@ -0,0 +1,67 @@ +{ + aria2, + cmake, + # https://github.com/mhogomchungu/media-downloader?tab=readme-ov-file#extensions + extraPackages ? [ + aria2 + yt-dlp + ffmpeg + python3 + ], + fetchFromGitHub, + ffmpeg, + lib, + libsForQt5, + python3, + stdenv, + yt-dlp, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "media-downloader"; + version = "4.7.0"; + + src = fetchFromGitHub { + owner = "mhogomchungu"; + repo = "media-downloader"; + rev = finalAttrs.version; + hash = "sha256-ykPYxRgzKZrA0KwS1FoxZOkSL+7TbLgy0yLfs7Iqpf4="; + }; + + # Disable automatically updating extensions when starting the program because this will + # invalidate the dependence on extensions and may cause potential security issues + # Can still be enabled in Configure > Actions At Startup + postPatch = '' + substituteInPlace src/settings.cpp \ + --replace-fail '"ShowVersionInfoAndAutoDownloadUpdates",true' '"ShowVersionInfoAndAutoDownloadUpdates",false' \ + ''; + + nativeBuildInputs = [ + cmake + libsForQt5.wrapQtAppsHook + ]; + + buildInputs = [ libsForQt5.qtbase ]; + + qtWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath extraPackages}" ]; + + meta = { + description = "Qt/C++ GUI front end for yt-dlp and others"; + longDescription = '' + Media Downloader is a GUI front end to yt-dlp, youtube-dl, gallery-dl, + lux, you-get, svtplay-dl, aria2c, wget and safari books. + + Read https://github.com/mhogomchungu/media-downloader/wiki/Extensions + for further information. We have packaged most of them, and they can + be added by overriding `extraPackages`. + ''; + homepage = "https://github.com/mhogomchungu/media-downloader"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ + zendo + aleksana + ]; + platforms = lib.platforms.linux; + mainProgram = "media-downloader"; + }; +}) diff --git a/pkgs/by-name/me/meletrix-udev-rules/meletrix.rules b/pkgs/by-name/me/meletrix-udev-rules/meletrix.rules new file mode 100644 index 0000000000000..fc7cafd1e563f --- /dev/null +++ b/pkgs/by-name/me/meletrix-udev-rules/meletrix.rules @@ -0,0 +1,26 @@ +# Download VIA jsons from https://drive.google.com/drive/folders/1ky4kmGxZo1i0WyRZiY9V6FQlGzjegcPk for USB vendor and product ids + +# Zoom 65 Olivia Wired +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="806c", ATTRS{idProduct}=="0005", MODE:="0660", GROUP="input" + +# Zoom 65 EE +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1ea7", ATTRS{idProduct}=="7777", MODE:="0660", GROUP="input" +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1ea7", ATTRS{idProduct}=="cc65", MODE:="0660", GROUP="input" + +# Zoom 65 V2 +# also 1ea7:7777 +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1ea7", ATTRS{idProduct}=="ccbb", MODE:="0660", GROUP="input" + +# Zoom 65 V2.5 +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1ea7", ATTRS{idProduct}=="ccc3", MODE:="0660", GROUP="input" + +# Zoom 75 (production unit) +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1ea7", ATTRS{idProduct}=="ced3", MODE:="0660", GROUP="input" + +# Zoom 75 (prototype) +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1ea7", ATTRS{idProduct}=="ce81", MODE:="0660", GROUP="input" + +# ZoomTKL +# also 1ea7:7777 +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1ea7", ATTRS{idProduct}=="cd87", MODE:="0660", GROUP="input" + diff --git a/pkgs/by-name/me/meletrix-udev-rules/package.nix b/pkgs/by-name/me/meletrix-udev-rules/package.nix new file mode 100644 index 0000000000000..43fd2b94cdd5b --- /dev/null +++ b/pkgs/by-name/me/meletrix-udev-rules/package.nix @@ -0,0 +1,24 @@ +{ + lib, + stdenvNoCC, +}: +stdenvNoCC.mkDerivation { + pname = "meletrix-udev-rules"; + version = "0-unstable-2023-10-20"; + + src = [./meletrix.rules]; + + dontUnpack = true; + dontBuild = true; + + installPhase = '' + install -Dpm644 $src $out/lib/udev/rules.d/70-meletrix.rules + ''; + + meta = with lib; { + description = "udev rules to configure Meletrix keyboards"; + license = licenses.cc0; + maintainers = with maintainers; [Scrumplex]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/me/meli/package.nix b/pkgs/by-name/me/meli/package.nix index 3a61a3958bc79..ab5542bb8cb69 100644 --- a/pkgs/by-name/me/meli/package.nix +++ b/pkgs/by-name/me/meli/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { pname = "meli"; - version = "0.8.5"; + version = "0.8.6"; src = fetchzip { urls = [ @@ -31,10 +31,10 @@ rustPlatform.buildRustPackage rec { "https://codeberg.org/meli/meli/archive/v${version}.tar.gz" "https://github.com/meli/meli/archive/refs/tags/v${version}.tar.gz" ]; - hash = "sha256-xfc4DZGKQi/n87JcjTl+s2UFJ20v+6JmzSL36pZlSc0="; + hash = "sha256-7lSxXv2i8B6vRWIJqMiXlMqHH6fmgACy9X5qNKuj+IU="; }; - cargoHash = "sha256-7ax3VQ+McmzxdG8TeKnMnD0uJmM0pi9Sskfdl2SZkz4="; + cargoHash = "sha256-vZkMfaALnRBK9ZwMB2uvvJgQq+BdUX7enNnr9t5H+MY="; # Needed to get openssl-sys to use pkg-config OPENSSL_NO_VENDOR=1; diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix index 3ccecc1bab337..74a7cc4a7f68e 100644 --- a/pkgs/by-name/me/melonDS/package.nix +++ b/pkgs/by-name/me/melonDS/package.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "melonDS"; - version = "0.9.5-unstable-2024-05-15"; + version = "0.9.5-unstable-2024-06-08"; src = fetchFromGitHub { owner = "melonDS-emu"; repo = "melonDS"; - rev = "a72b79a55ad2d61811af11b1b911f6af863f66c2"; - hash = "sha256-cdKfJ316iuRajdrRESt68oR8vkHISFRdHXxVuvGSUqE="; + rev = "8e9b88d01da0d21c3c35db051d7e44d8ee0c7715"; + hash = "sha256-zlOK5yhg9rmLMDnCxQ9CDAy+qWZdvKwTaKxzna1zxxk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/me/menulibre/package.nix b/pkgs/by-name/me/menulibre/package.nix index e3ea0877eb538..b8ad319c89576 100644 --- a/pkgs/by-name/me/menulibre/package.nix +++ b/pkgs/by-name/me/menulibre/package.nix @@ -12,7 +12,7 @@ }: python3Packages.buildPythonApplication rec { - name = "menulibre"; + pname = "menulibre"; version = "2.4.0"; src = fetchFromGitHub { diff --git a/pkgs/by-name/mi/miru/package.nix b/pkgs/by-name/mi/miru/package.nix index e8bcb7729d999..c96def129eb09 100644 --- a/pkgs/by-name/mi/miru/package.nix +++ b/pkgs/by-name/mi/miru/package.nix @@ -5,12 +5,12 @@ appimageTools.wrapType2 rec { pname = "miru"; - version = "5.1.0"; + version = "5.1.3"; src = fetchurl { url = "https://github.com/ThaUnknown/miru/releases/download/v${version}/linux-Miru-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-N9I5YNFIfBmANCnJA3gUmgq04cc5LLfOsYiEdwJupf8="; + sha256 = "sha256-F2wFCZvuANoeBNO+o3Rs/DJtyIVQl46MQCpXQcRiDHs="; }; extraInstallCommands = diff --git a/pkgs/by-name/mu/multiplex/package.nix b/pkgs/by-name/mu/multiplex/package.nix new file mode 100644 index 0000000000000..8486bf9441246 --- /dev/null +++ b/pkgs/by-name/mu/multiplex/package.nix @@ -0,0 +1,67 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + pkg-config, + gobject-introspection, + wrapGAppsHook4, + libadwaita, +}: + +buildGoModule rec { + pname = "multiplex"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "pojntfx"; + repo = "multiplex"; + rev = "v${version}"; + hash = "sha256-6xZ46LeFuJXwd7s63YKekUIdb8ytdLk+rp+tFox27zY="; + }; + + vendorHash = "sha256-S14dMAejoVTVn3rRdZyG+npM5kNehHwntJkeW3M7Stk="; + + nativeBuildInputs = [ + pkg-config + gobject-introspection + wrapGAppsHook4 + ]; + + buildInputs = [ libadwaita ]; + + # recursively generate all files requested by go:generate + preBuild = '' + go generate ./... + ''; + + postInstall = '' + install -Dm644 -t $out/share/applications com.pojtinger.felicitas.Multiplex.desktop + install -Dm644 -t $out/share/metainfo com.pojtinger.felicitas.Multiplex.metainfo.xml + # The provided pixmap icons appears to be a bit blurry so not installing them + install -Dm644 docs/icon.svg $out/share/icons/hicolor/scalable/apps/com.pojtinger.felicitas.Multiplex.svg + install -Dm644 docs/icon-symbolic.svg $out/share/icons/hicolor/symbolic/apps/com.pojtinger.felicitas.Multiplex-symbolic.svg + ''; + + meta = { + description = "Watch torrents with your friends"; + longDescription = '' + Multiplex is an app to watch torrents together, providing an experience similar + to Apple's SharePlay and Amazon's Prime Video Watch Party. + + It enables you to: + - Stream any file directly using a wide range of video and audio formats with + the mpv video player. + - Host online watch parties while preserving your privacy by synchronizing + video playback with friends without a central server using weron. + - Bypass internet restrictions by optionally separating the hTorrent HTTP to + BitTorrent gateway and user interface into two separate components. + ''; + homepage = "https://github.com/pojntfx/multiplex"; + license = with lib.licenses; [ + agpl3Plus + cc0 + ]; + mainProgram = "multiplex"; + maintainers = with lib.maintainers; [ aleksana ]; + }; +} diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix index 232b78f0ff8b3..df2e495c329b8 100644 --- a/pkgs/by-name/my/myks/package.nix +++ b/pkgs/by-name/my/myks/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "myks"; - version = "4.1.3"; + version = "4.2.0"; src = fetchFromGitHub { owner = "mykso"; repo = "myks"; rev = "refs/tags/v${version}"; - hash = "sha256-keXtMO5EhCaG5lNoCf5vmnhidH4+sDQ2na4f76jELnw="; + hash = "sha256-98JkyRszWls2fWS3JxlYa8MRHKpC2ViiDoH8VEk6r3Q="; }; - vendorHash = "sha256-0Xk7B0rfngld9tfgMmq2EiuUym7LE89TvJVSdDo4HD4="; + vendorHash = "sha256-blx/Q787h1eBUmg45VFydqH8hmrCpcobJwIWvTUNDEo="; subPackages = "."; diff --git a/pkgs/applications/editors/neovim/neovim-qt.nix b/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix index 75067585653bf..0cd07e2711bc9 100644 --- a/pkgs/applications/editors/neovim/neovim-qt.nix +++ b/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix @@ -1,6 +1,6 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, doxygen, msgpack, neovim, python3Packages, qtbase, qtsvg }: +{ stdenv, lib, libsForQt5, fetchFromGitHub, cmake, doxygen, msgpack, neovim, python3Packages }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "neovim-qt-unwrapped"; version = "0.2.18"; @@ -16,16 +16,16 @@ mkDerivation rec { "-DENABLE_TESTS=0" # tests fail because xcb platform plugin is not found ]; + nativeBuildInputs = [ cmake doxygen libsForQt5.wrapQtAppsHook ]; + buildInputs = [ neovim.unwrapped # only used to generate help tags at build time - qtbase - qtsvg + libsForQt5.qtbase + libsForQt5.qtsvg ] ++ (with python3Packages; [ jinja2 python msgpack ]); - nativeBuildInputs = [ cmake doxygen ]; - preCheck = '' # The GUI tests require a running X server, disable them sed -i ../test/CMakeLists.txt -e '/^add_xtest_gui/d' diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/by-name/ne/neovim-qt/package.nix index 728c364d40061..aa7b2607fb709 100644 --- a/pkgs/applications/editors/neovim/qt.nix +++ b/pkgs/by-name/ne/neovim-qt/package.nix @@ -1,9 +1,9 @@ -{ stdenv, makeWrapper, neovim, neovim-qt-unwrapped }: +{ stdenv, libsForQt5, makeWrapper, neovim, neovim-qt-unwrapped }: let unwrapped = neovim-qt-unwrapped; in -stdenv.mkDerivation { +libsForQt5.mkDerivation { pname = "neovim-qt"; version = unwrapped.version; buildCommand = if stdenv.isDarwin then '' diff --git a/pkgs/by-name/ne/netclient/package.nix b/pkgs/by-name/ne/netclient/package.nix index 456a422fabdd1..5b2dc7b8024ee 100644 --- a/pkgs/by-name/ne/netclient/package.nix +++ b/pkgs/by-name/ne/netclient/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "netclient"; - version = "0.24.1"; + version = "0.24.2"; src = fetchFromGitHub { owner = "gravitl"; repo = "netclient"; rev = "v${version}"; - hash = "sha256-oS0DqrlOyab0MS7qSEquEIixcOYnlGuCYtCBmfEURm0="; + hash = "sha256-7+r2fuFNVvOC0Zl1kqAiAh9C3qqhg7KGrbnOp4Jk+Is="; }; - vendorHash = "sha256-09pRwsB2ycB/MK3isXZLBZDpga95SHYkNPjWWYtUuoU="; + vendorHash = "sha256-eTiNBs8xcfrth/E44URhD8uSgdoXZT1+MD3H24dzI1A="; buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa ++ lib.optional stdenv.isLinux libX11; diff --git a/pkgs/by-name/ne/nextpnr/package.nix b/pkgs/by-name/ne/nextpnr/package.nix index e164a38d95642..49c86cfc2ab3b 100644 --- a/pkgs/by-name/ne/nextpnr/package.nix +++ b/pkgs/by-name/ne/nextpnr/package.nix @@ -89,6 +89,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/yosyshq/nextpnr"; license = licenses.isc; platforms = platforms.all; - maintainers = with maintainers; [ thoughtpolice emily ]; + maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/by-name/nh/nh/package.nix b/pkgs/by-name/nh/nh/package.nix index 209f700a376ae..14c22003e64cc 100644 --- a/pkgs/by-name/nh/nh/package.nix +++ b/pkgs/by-name/nh/nh/package.nix @@ -10,7 +10,7 @@ , nix-output-monitor }: let - version = "3.5.16"; + version = "3.5.17"; runtimeDeps = [ nvd nix-output-monitor ]; in rustPlatform.buildRustPackage { @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage { owner = "viperML"; repo = "nh"; rev = "refs/tags/v${version}"; - hash = "sha256-uAoD6tW1lSMt5X6hzouZ1qWzImmg4VAMy663BLcOALs="; + hash = "sha256-o4K6QHBjXrmcYkX9MIw9gZ+DHM3OaEVswswHRX9h8Is="; }; strictDeps = true; @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage { --prefix PATH : ${lib.makeBinPath runtimeDeps} ''; - cargoHash = "sha256-610gS1T7i5rBEWeWzolRz/mUTGw5EJf1B68CWc4gkm4="; + cargoHash = "sha256-6Y5vpXEuHZXe9HKk6KomujlibzwtZJbtn6YgOqbmInk="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/nh/nhost-cli/package.nix b/pkgs/by-name/nh/nhost-cli/package.nix index bc8a14d9a496f..d3a88416983da 100644 --- a/pkgs/by-name/nh/nhost-cli/package.nix +++ b/pkgs/by-name/nh/nhost-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "nhost-cli"; - version = "1.18.2"; + version = "1.18.3"; src = fetchFromGitHub { owner = "nhost"; repo = "cli"; rev = "v${version}"; - hash = "sha256-WIkuYmNXpKLsHY6de6PDa56NFTkgpXt1aGouJrEiyUo="; + hash = "sha256-TYi0Cth4GWEIT9QRUC4z3Uwnh4EmywY+XCOM5oJP+4g="; }; vendorHash = null; diff --git a/pkgs/by-name/ni/nickel/Cargo.lock b/pkgs/by-name/ni/nickel/Cargo.lock index a9577c251fd78..2bc24165ac017 100644 --- a/pkgs/by-name/ni/nickel/Cargo.lock +++ b/pkgs/by-name/ni/nickel/Cargo.lock @@ -1287,33 +1287,33 @@ dependencies = [ [[package]] name = "lalrpop" -version = "0.19.12" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a1cbf952127589f2851ab2046af368fd20645491bb4b376f04b7f94d7a9837b" +checksum = "55cb077ad656299f160924eb2912aa147d7339ea7d69e1b5517326fdcec3c1ca" dependencies = [ "ascii-canvas", "bit-set", - "diff", "ena", - "is-terminal", - "itertools 0.10.5", + "itertools 0.11.0", "lalrpop-util", "petgraph", + "pico-args", "regex", - "regex-syntax 0.6.29", + "regex-syntax 0.8.2", "string_cache", "term", "tiny-keccak", "unicode-xid 0.2.4", + "walkdir", ] [[package]] name = "lalrpop-util" -version = "0.19.12" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3c48237b9604c5a4702de6b824e02006c3214327564636aef27c1028a8fa0ed" +checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" dependencies = [ - "regex", + "regex-automata", ] [[package]] @@ -1649,7 +1649,7 @@ dependencies = [ [[package]] name = "nickel-lang-cli" -version = "1.6.0" +version = "1.7.0" dependencies = [ "clap 4.5.2", "clap_complete", @@ -1667,7 +1667,7 @@ dependencies = [ [[package]] name = "nickel-lang-core" -version = "0.7.0" +version = "0.8.0" dependencies = [ "ansi_term", "assert_matches", @@ -1722,7 +1722,7 @@ dependencies = [ [[package]] name = "nickel-lang-lsp" -version = "1.6.0" +version = "1.7.0" dependencies = [ "anyhow", "assert_cmd", @@ -1736,6 +1736,7 @@ dependencies = [ "csv", "derive_more", "env_logger", + "git-version", "glob", "insta", "lalrpop", @@ -1769,7 +1770,7 @@ dependencies = [ [[package]] name = "nickel-wasm-repl" -version = "0.7.0" +version = "0.8.0" dependencies = [ "nickel-lang-core", ] @@ -1936,6 +1937,12 @@ dependencies = [ ] [[package]] +name = "pico-args" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" + +[[package]] name = "pin-project-lite" version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2114,7 +2121,7 @@ dependencies = [ [[package]] name = "pyckel" -version = "1.6.0" +version = "1.7.0" dependencies = [ "codespan-reporting", "nickel-lang-core", @@ -3010,8 +3017,9 @@ dependencies = [ [[package]] name = "topiary-core" -version = "0.3.0" -source = "git+https://github.com/tweag/topiary.git?rev=82a94a9f57104b89d4316afaeeab271cc51f7698#82a94a9f57104b89d4316afaeeab271cc51f7698" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b26541394bdbcd5a039deb917b2096a69c6604f733f0d41f534fc6975987040d" dependencies = [ "futures", "itertools 0.11.0", @@ -3028,13 +3036,15 @@ dependencies = [ [[package]] name = "topiary-queries" -version = "0.3.0" -source = "git+https://github.com/tweag/topiary.git?rev=82a94a9f57104b89d4316afaeeab271cc51f7698#82a94a9f57104b89d4316afaeeab271cc51f7698" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89106b9c504a9e3247b8e40f879a73a922f0d516e1051a6ef739b4cf7d54c8d9" [[package]] name = "topiary-tree-sitter-facade" -version = "0.3.0" -source = "git+https://github.com/tweag/topiary.git?rev=82a94a9f57104b89d4316afaeeab271cc51f7698#82a94a9f57104b89d4316afaeeab271cc51f7698" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea7c870d9a844bbba0f55be40eaa89624a9f627c155cd22eea70dd808bd71b3d" dependencies = [ "js-sys", "topiary-web-tree-sitter-sys", @@ -3045,8 +3055,9 @@ dependencies = [ [[package]] name = "topiary-web-tree-sitter-sys" -version = "0.3.0" -source = "git+https://github.com/tweag/topiary.git?rev=82a94a9f57104b89d4316afaeeab271cc51f7698#82a94a9f57104b89d4316afaeeab271cc51f7698" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc9e35caeeb7f07e97b71ee7ea204c89516e7cc490d1c2ae318eca3ff3c08d46" dependencies = [ "js-sys", "wasm-bindgen", @@ -3066,8 +3077,9 @@ dependencies = [ [[package]] name = "tree-sitter-nickel" -version = "0.1.0" -source = "git+https://github.com/nickel-lang/tree-sitter-nickel?rev=58baf89db8fdae54a84bcf22c80ff10ee3f929ed#58baf89db8fdae54a84bcf22c80ff10ee3f929ed" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "449daa9ac0e2a18d7243eaf21d7299d6683ce6750ca225ebd557412d22d106cf" dependencies = [ "cc", "tree-sitter", diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix index bd829aa6ba43f..c55cc55cf3ea3 100644 --- a/pkgs/by-name/ni/nickel/package.nix +++ b/pkgs/by-name/ni/nickel/package.nix @@ -8,21 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "nickel"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "tweag"; repo = "nickel"; rev = "refs/tags/${version}"; - hash = "sha256-AL5YkdITO9CPFYzMGQwHbuFZrMDUvF1yTt2XTotoymM="; + hash = "sha256-EwiZg0iyF9EQ0Z65Re5WgeV7xgs/wPtTQ9XA0iEMEIQ="; }; cargoLock = { lockFile = ./Cargo.lock; - outputHashes = { - "topiary-core-0.3.0" = "sha256-KWfgbVFV2zbCuNNFp9yeSgAa0Cc7cT090KK2J1ynfKg="; - "tree-sitter-nickel-0.1.0" = "sha256-WuY6X1mnXdjiy4joIcY8voK2sqICFf0GvudulZ9lwqg="; - }; }; cargoBuildFlags = [ "-p nickel-lang-cli" "-p nickel-lang-lsp" ]; diff --git a/pkgs/by-name/no/nom/package.nix b/pkgs/by-name/no/nom/package.nix index 4e9e9c844064c..deeb3df4291bd 100644 --- a/pkgs/by-name/no/nom/package.nix +++ b/pkgs/by-name/no/nom/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "nom"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "guyfedwards"; repo = "nom"; rev = "v${version}"; - hash = "sha256-uy4c3NLBZY0ybjoK/AYilAZ4bA0+Jkh7OLScH5cVRHI="; + hash = "sha256-kIm0q4/D80skFjlj2ABq4d2PKnATDt53x4fLU6kmA9U="; }; vendorHash = "sha256-xolhwdWRjYZMgwI4jq0fGzvxnNjx6EplvZC7XMvBw+M="; diff --git a/pkgs/by-name/no/novelwriter/package.nix b/pkgs/by-name/no/novelwriter/package.nix index 33b3c76e2535e..7f578f54a4421 100644 --- a/pkgs/by-name/no/novelwriter/package.nix +++ b/pkgs/by-name/no/novelwriter/package.nix @@ -7,7 +7,7 @@ nix-update-script, }: let - version = "2.4.3"; + version = "2.4.4"; in python3.pkgs.buildPythonApplication { pname = "novelwriter"; @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication { owner = "vkbo"; repo = "novelWriter"; rev = "v${version}"; - hash = "sha256-PuoI/2JnbOFuSDTY3uDrySqPl/MGYna+QvSI7WQ8QMk="; + hash = "sha256-vYvrSRQTp/8jcCQIL6HgxdSJwogiPJKfVO+9hhK6emc="; }; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; diff --git a/pkgs/by-name/nr/nrf-udev/package.nix b/pkgs/by-name/nr/nrf-udev/package.nix new file mode 100644 index 0000000000000..848199811c086 --- /dev/null +++ b/pkgs/by-name/nr/nrf-udev/package.nix @@ -0,0 +1,40 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gitUpdater +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "nrf-udev"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "NordicSemiconductor"; + repo = "nrf-udev"; + rev = "v${finalAttrs.version}"; + hash = "sha256-bEIAsz9ZwX6RTzhv5/waFZ5a3KlnwX4kQs29+475zN0="; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -r nrf-udev_*/lib $out + + runHook postInstall + ''; + + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + + meta = with lib; { + description = "Udev rules for nRF (Nordic Semiconductor) development kits"; + homepage = "https://github.com/NordicSemiconductor/nrf-udev"; + changelog = "https://github.com/NordicSemiconductor/nrf-udev/releases/tag/${finalAttrs.src.rev}"; + license = licenses.unfree; + platforms = platforms.all; + maintainers = with maintainers; [ h7x4 ]; + }; +}) diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix index c21a3f877b323..98ccc3f451a87 100644 --- a/pkgs/by-name/nu/nuclei-templates/package.nix +++ b/pkgs/by-name/nu/nuclei-templates/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nuclei-templates"; - version = "9.8.8"; + version = "9.8.9"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei-templates"; rev = "refs/tags/v${version}"; - hash = "sha256-6oY22IQKCV00MtxUw4YwY2U/xH+N06n371DSK7C0nj8="; + hash = "sha256-BdlS0gBeGI+5hEgUvkdJPEuZhXpA7Spd2wJ2PtmCkpM="; }; installPhase = '' diff --git a/pkgs/by-name/nw/nwg-drawer/package.nix b/pkgs/by-name/nw/nwg-drawer/package.nix index 647ca14b3c2b7..000d86b4baf4d 100644 --- a/pkgs/by-name/nw/nwg-drawer/package.nix +++ b/pkgs/by-name/nw/nwg-drawer/package.nix @@ -12,16 +12,16 @@ let pname = "nwg-drawer"; - version = "0.4.7"; + version = "0.4.8"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-drawer"; rev = "v${version}"; - hash = "sha256-rBb2ArjllCBO2+9hx3f/c+uUQD1nCZzzfQGz1Wovy/0="; + hash = "sha256-ZfWl9DfU8h300WbvFNOCs7QGp11NB49ShPRxY5hpNFE="; }; - vendorHash = "sha256-L8gdJd5cPfQrcSXLxFx6BAVWOXC8HRuk5fFQ7MsKpIc="; + vendorHash = "sha256-J7r3YyfV5lRZbjKo7ZNHQrOqR1GNbUB7GxRMlXuuw/c="; in buildGoModule { inherit pname version src vendorHash; diff --git a/pkgs/applications/misc/nwg-panel/default.nix b/pkgs/by-name/nw/nwg-panel/package.nix index c7091b00c7dc5..e37539b12cea3 100644 --- a/pkgs/applications/misc/nwg-panel/default.nix +++ b/pkgs/by-name/nw/nwg-panel/package.nix @@ -16,13 +16,13 @@ python3Packages.buildPythonApplication rec { pname = "nwg-panel"; - version = "0.9.32"; + version = "0.9.34"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; rev = "refs/tags/v${version}"; - hash = "sha256-7UROYXmDDWW/NFmKy3h1PfkQGB74DogcgTQXGXojY4U="; + hash = "sha256-Mn3HXm6hPKxvf98do177dCN+RJgRc02AQ1ILjkZwBVc="; }; # No tests diff --git a/pkgs/by-name/od/odoo/package.nix b/pkgs/by-name/od/odoo/package.nix new file mode 100644 index 0000000000000..f2239bd5d59e3 --- /dev/null +++ b/pkgs/by-name/od/odoo/package.nix @@ -0,0 +1,111 @@ +{ stdenv +, lib +, fetchgit +, fetchzip +, python310 +, rtlcss +, wkhtmltopdf +, nixosTests +, odoo_version ? "17.0" +, odoo_release ? "20240610" +}: + +let + python = python310.override { + packageOverrides = final: prev: { + # requirements.txt fixes docutils at 0.17; the default 0.21.1 tested throws exceptions + docutils-0_17 = prev.docutils.overridePythonAttrs (old: rec { + version = "0.17"; + src = fetchgit { + url = "git://repo.or.cz/docutils.git"; + rev = "docutils-${version}"; + hash = "sha256-O/9q/Dg1DBIxKdNBOhDV16yy5ez0QANJYMjeovDoWX8="; + }; + buildInputs = with prev; [setuptools]; + }); + }; + }; +in python.pkgs.buildPythonApplication rec { + pname = "odoo"; + version = "${odoo_version}.${odoo_release}"; + + format = "setuptools"; + + src = fetchzip { + # find latest version on https://nightly.odoo.com/${odoo_version}/nightly/src + url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.zip"; + name = "${pname}-${version}"; + hash = "sha256-blibGJyaz+MxMazOXhPbGBAJWZoGubirwSnjVYyLBJs="; # odoo + }; + + # needs some investigation + doCheck = false; + + makeWrapperArgs = [ + "--prefix" "PATH" ":" "${lib.makeBinPath [ wkhtmltopdf rtlcss ]}" + ]; + + propagatedBuildInputs = with python.pkgs; [ + babel + chardet + cryptography + decorator + docutils-0_17 # sphinx has a docutils requirement >= 18 + ebaysdk + freezegun + gevent + greenlet + idna + jinja2 + libsass + lxml + markupsafe + num2words + ofxparse + passlib + pillow + polib + psutil + psycopg2 + pydot + pyopenssl + pypdf2 + pyserial + python-dateutil + python-ldap + python-stdnum + pytz + pyusb + qrcode + reportlab + requests + rjsmin + urllib3 + vobject + werkzeug + xlrd + xlsxwriter + xlwt + zeep + + setuptools + mock + ]; + + # takes 5+ minutes and there are not files to strip + dontStrip = true; + + passthru = { + updateScript = ./update.sh; + tests = { + inherit (nixosTests) odoo; + }; + }; + + meta = with lib; { + description = "Open Source ERP and CRM"; + homepage = "https://www.odoo.com/"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ mkg20001 siriobalmelli ]; + }; +} diff --git a/pkgs/by-name/od/odoo/update.sh b/pkgs/by-name/od/odoo/update.sh new file mode 100755 index 0000000000000..e9c50ccb50815 --- /dev/null +++ b/pkgs/by-name/od/odoo/update.sh @@ -0,0 +1,26 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused nix coreutils nix-prefetch + +set -euo pipefail + +VERSION="17.0" # must be incremented manually + +RELEASE="$( + curl "https://nightly.odoo.com/$VERSION/nightly/src/" | + sed -nE 's/.*odoo_'"$VERSION"'.(20[0-9]{6}).tar.gz.*/\1/p' | + tail -n 1 +)" + +latestVersion="$VERSION.$RELEASE" +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; odoo.version or (lib.getVersion odoo)" | tr -d '"') + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "odoo is up-to-date: $currentVersion" + exit 0 +fi + +cd "$(dirname "${BASH_SOURCE[0]}")" + +sed -ri "s| hash.+ # odoo| hash = \"$(nix-prefetch -q fetchzip --url "https://nightly.odoo.com/${VERSION}/nightly/src/odoo_${latestVersion}.zip")\"; # odoo|g" package.nix +sed -ri "s|, odoo_version \? .+|, odoo_version ? \"$VERSION\"|" package.nix +sed -ri "s|, odoo_release \? .+|, odoo_release ? \"$RELEASE\"|" package.nix diff --git a/pkgs/applications/finance/odoo/odoo15.nix b/pkgs/by-name/od/odoo15/package.nix index a3255c4aa101c..a3255c4aa101c 100644 --- a/pkgs/applications/finance/odoo/odoo15.nix +++ b/pkgs/by-name/od/odoo15/package.nix diff --git a/pkgs/applications/finance/odoo/default.nix b/pkgs/by-name/od/odoo16/package.nix index b9829326768a5..6e68228d73479 100644 --- a/pkgs/applications/finance/odoo/default.nix +++ b/pkgs/by-name/od/odoo16/package.nix @@ -23,6 +23,9 @@ let inherit version; hash = "sha256-K4wORHtLnbzIXdl7butNy69si2w74L1lTiVVPgohV9g="; }; + disabledTests = old.disabledTests ++ [ + "test_response_body" + ]; }); }; }; @@ -99,7 +102,6 @@ in python.pkgs.buildPythonApplication rec { dontStrip = true; passthru = { - updateScript = ./update.sh; tests = { inherit (nixosTests) odoo; }; diff --git a/pkgs/by-name/oh/oh-my-posh/package.nix b/pkgs/by-name/oh/oh-my-posh/package.nix index 76e7f69317eff..bc33e030dead3 100644 --- a/pkgs/by-name/oh/oh-my-posh/package.nix +++ b/pkgs/by-name/oh/oh-my-posh/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "21.3.0"; + version = "21.9.1"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6HWAlGT1xUNjt0uxh09DdwOZtyOO8ZlVY8/jr7CsJVM="; + hash = "sha256-QzIKxvG1fg6f4Xk18XBXYirvD1cPmvzwXZoaLhSeuTI="; }; - vendorHash = "sha256-MEQS2wpRbexSJa324lSWEkaqlTF7CfzlrODXoGdfQ6M="; + vendorHash = "sha256-N71kM9T8EHh/i8NUSxfPaIRlWk/WADieCkObhVcSyEU="; sourceRoot = "${src.name}/src"; diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 87548214d4e93..95c79f3c5b506 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -31,13 +31,13 @@ let pname = "ollama"; # don't forget to invalidate all hashes each update - version = "0.1.43"; + version = "0.1.44"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; rev = "v${version}"; - hash = "sha256-+WCyRZPm4EyLH68uXDUJEW76v6FXq2WS5fqt4momKDA="; + hash = "sha256-HM7xtVdhRwhsLEBLvCgjU1iwdaqowRdrxh/Z0BzTPn8="; fetchSubmodules = true; }; @@ -85,7 +85,7 @@ let rocmLibs = [ rocmPackages.clr rocmPackages.hipblas - (rocmPackages.rocblas.override { tensileSepArch = true; tensileLazyLib = true; }) + rocmPackages.rocblas rocmPackages.rocsolver rocmPackages.rocsparse rocmPackages.rocm-device-libs @@ -192,8 +192,8 @@ goBuild ((lib.optionalAttrs enableRocm { ldflags = [ "-s" "-w" - "-X=github.com/jmorganca/ollama/version.Version=${version}" - "-X=github.com/jmorganca/ollama/server.mode=release" + "-X=github.com/ollama/ollama/version.Version=${version}" + "-X=github.com/ollama/ollama/server.mode=release" ]; passthru.tests = { diff --git a/pkgs/by-name/ol/ols/package.nix b/pkgs/by-name/ol/ols/package.nix index 46e0dec0d1116..26d4ff979645e 100644 --- a/pkgs/by-name/ol/ols/package.nix +++ b/pkgs/by-name/ol/ols/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "ols"; - version = "0-unstable-2024-06-05"; + version = "0-unstable-2024-06-13"; src = fetchFromGitHub { owner = "DanielGavin"; repo = "ols"; - rev = "c4996b10d88aed9a0028c92ea54c42e4e9aeb39f"; - hash = "sha256-PnajCKfk4XVR1FwG5ySzL/ibpwie+Xhr6MxHeXZiKmg="; + rev = "09f865e685f8ebddaf994e51baeabed795e7f849"; + hash = "sha256-JdKmXMyRZCf6UYo5sKmiIaeZNgnbUm5ALP39tf6z36w="; }; postPatch = '' diff --git a/pkgs/by-name/om/omnictl/package.nix b/pkgs/by-name/om/omnictl/package.nix index b29cc5e2c04a1..ece16ef86b0ae 100644 --- a/pkgs/by-name/om/omnictl/package.nix +++ b/pkgs/by-name/om/omnictl/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "omnictl"; - version = "0.37.0"; + version = "0.37.5"; src = fetchFromGitHub { owner = "siderolabs"; repo = "omni"; rev = "v${version}"; - hash = "sha256-sUxeKrtFZDzD68C7yrbnwOnz3jZ+XLOuhs08FvPGINM="; + hash = "sha256-eM3Tq314B4cb4fL7XdJacn2lmsEGvNwPXROoKvwzIKU="; }; - vendorHash = "sha256-ZeFumtIxRaHtKzsVgBMNpikcOKJ1G5MoFgerKlKXNQo="; + vendorHash = "sha256-4G47S/Mb0zjiAiD7QsXzmbdNmb8hcfGwhuFMfwRuHnY="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/by-name/on/onthespot/package.nix b/pkgs/by-name/on/onthespot/package.nix index 7e52d4892fa5f..138ac6e94b7c5 100644 --- a/pkgs/by-name/on/onthespot/package.nix +++ b/pkgs/by-name/on/onthespot/package.nix @@ -4,6 +4,7 @@ , makeDesktopItem , python3 , libsForQt5 +, ffmpeg }: python3.pkgs.buildPythonApplication rec { @@ -27,6 +28,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ charset-normalizer defusedxml + ffmpeg librespot music-tag packaging @@ -52,16 +54,32 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = true; + postInstall = '' + install -Dm444 $src/src/onthespot/resources/icon.png $out/share/icons/hicolor/256x256/apps/onthespot.png + ''; + preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; + desktopItems = [ + (makeDesktopItem { + name = "Onthespot"; + exec = "onthespot_gui"; + icon = "onthespot"; + desktopName = "Onthespot"; + comment = meta.description; + categories = [ "Audio" ]; + }) + ]; + meta = with lib; { - description = " QT based Spotify music downloader written in Python"; + description = "QT based Spotify music downloader written in Python"; homepage = "https://github.com/casualsnek/onthespot"; changelog = "https://github.com/casualsnek/onthespot/releases/tag/v${version}"; license = licenses.gpl2Only; maintainers = with maintainers; [ onny ]; platforms = platforms.linux; + mainProgram = "onthespot_gui"; }; } diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index 353984f5fbc20..1292ff3c27923 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -7,19 +7,19 @@ }: let pname = "open-webui"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; rev = "v${version}"; - hash = "sha256-HO7kvJB4GDdAtb0jq8XPU94sP8QbyYlxAmhpLAshMng="; + hash = "sha256-copxy9fgHTHfF14bh9ddF4eTWx2GP2Mkw3lr+1NKKkI="; }; frontend = buildNpmPackage { inherit pname version src; - npmDepsHash = "sha256-EZvFslntBjpxsjXYyfPGNa2SmYth56cjy8zg+fmiCGo="; + npmDepsHash = "sha256-whddW3ThC/zlttqhV3wf15roaCgp0H/BELWLs9/c5Jc="; # Disabling `pyodide:fetch` as it downloads packages during `buildPhase` # Until this is solved, running python packages from the browser will not work. @@ -59,8 +59,6 @@ python3.pkgs.buildPythonApplication rec { "opencv-python-headless" # using `psycopg2` instead "psycopg2-binary" - # package request: https://github.com/NixOS/nixpkgs/issues/317065 - "rapidocr-onnxruntime" ]; dependencies = with python3.pkgs; [ @@ -106,6 +104,7 @@ python3.pkgs.buildPythonApplication rec { pytube pyxlsb rank-bm25 + rapidocr-onnxruntime requests sentence-transformers unstructured diff --git a/pkgs/by-name/op/openpgp-card-tools/package.nix b/pkgs/by-name/op/openpgp-card-tools/package.nix index 0493268f3b9a8..a0dbd7e10a253 100644 --- a/pkgs/by-name/op/openpgp-card-tools/package.nix +++ b/pkgs/by-name/op/openpgp-card-tools/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "openpgp-card-tools"; - version = "0.11.0"; + version = "0.11.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "openpgp-card"; repo = "openpgp-card-tools"; rev = "v${version}"; - hash = "sha256-GKBli6ybMDqB105POFEocU2X/xvd56V87k6Y6BsNt18="; + hash = "sha256-4PRUBzVy1sb15sYsbitBrOfQnsdbGKoR2OA4EjSc8B8="; }; - cargoHash = "sha256-mLZErQhgRWDMdDC5tWjG9NCvLaSdF4A3uCdN8+QMWjU="; + cargoHash = "sha256-Jm1181WQfYZPKnu0f2om/hxkJ8Bm5AA/3IwBgZkpF0I="; nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; diff --git a/pkgs/by-name/op/openvas-scanner/package.nix b/pkgs/by-name/op/openvas-scanner/package.nix index 7d356c5f71dce..3b75b44a6ef81 100644 --- a/pkgs/by-name/op/openvas-scanner/package.nix +++ b/pkgs/by-name/op/openvas-scanner/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "openvas-scanner"; - version = "23.4.0"; + version = "23.4.1"; src = fetchFromGitHub { owner = "greenbone"; repo = "openvas-scanner"; rev = "refs/tags/v${version}"; - hash = "sha256-8/a8OkaulT0uZb3CllLo0CWqloVbYF/6CY7a/Xn48T8="; + hash = "sha256-D0HQ00NCep0hAQ+dDWoinIxivloqgjPbp2lUunTxoyM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/orbiton/default.nix b/pkgs/by-name/or/orbiton/package.nix index 1e64c5950798a..eedbfac9e8a6c 100644 --- a/pkgs/applications/editors/orbiton/default.nix +++ b/pkgs/by-name/or/orbiton/package.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles, makeWrapper, pkg-config +{ lib, stdenv, buildGo122Module, fetchFromGitHub, installShellFiles, makeWrapper, pkg-config , withGui ? true, vte }: -buildGoModule rec { +buildGo122Module rec { pname = "orbiton"; - version = "2.65.11"; + version = "2.65.12"; src = fetchFromGitHub { owner = "xyproto"; repo = "orbiton"; rev = "v${version}"; - hash = "sha256-eb7Ku1hgvYdmRgemXcEZMl53oNXYcomh4wYHpRzLTUc="; + hash = "sha256-1KVw2dj//6vwUUj1jVWe2J/9F6J8BQsvCAEbJZnW26c="; }; vendorHash = null; diff --git a/pkgs/by-name/or/orchard/package.nix b/pkgs/by-name/or/orchard/package.nix index f5996ccbbd169..37bcebe9e4302 100644 --- a/pkgs/by-name/or/orchard/package.nix +++ b/pkgs/by-name/or/orchard/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "orchard"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = version; - hash = "sha256-rzfGECRa3IPt9LRX8Av7NabaIzaKfxzkOR85q9zl9sk="; + hash = "sha256-8E5U+2JTc0GYteoKqYn3JRrMx6ta1J+0GR3Jtn+NkYk="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -19,7 +19,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-dVWCxEmqzJw9oN6mCwFVn81Mhq4XfBEM3iXHQn4NXko="; + vendorHash = "sha256-icV4MOVzPSCGhFTIixWA02Jcf/7qhQwG4sBx1kRoJks="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix index 12d096690e349..9651b8d9cf3ba 100644 --- a/pkgs/by-name/ot/oterm/package.nix +++ b/pkgs/by-name/ot/oterm/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "oterm"; - version = "0.2.8"; + version = "0.2.9"; pyproject = true; src = fetchFromGitHub { owner = "ggozad"; repo = "oterm"; rev = "refs/tags/${version}"; - hash = "sha256-6UFNsEc6bYBrBYfCbeiDfemueeRMEXHGCT8junZVFtk="; + hash = "sha256-UOZxktgpuTxkE1+DVnd5T1Fye+2SS2hUDmWtCaGEol0="; }; pythonRelaxDeps = [ @@ -22,6 +22,7 @@ python3Packages.buildPythonApplication rec { "ollama" "packaging" "pillow" + "textual" "typer" ]; @@ -29,7 +30,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ aiohttp aiosql aiosqlite @@ -54,7 +55,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/ggozad/oterm"; changelog = "https://github.com/ggozad/oterm/releases/tag/${version}"; license = lib.licenses.mit; - mainProgram = "oterm"; maintainers = with lib.maintainers; [ suhr ]; + mainProgram = "oterm"; }; } diff --git a/pkgs/by-name/pd/pdpmake/package.nix b/pkgs/by-name/pd/pdpmake/package.nix index 94b4ba36cde49..af6960be9e68a 100644 --- a/pkgs/by-name/pd/pdpmake/package.nix +++ b/pkgs/by-name/pd/pdpmake/package.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "pdpmake"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "rmyorston"; repo = "pdpmake"; rev = version; - hash = "sha256-zp2o/wFYvUbCRwxHbggcGMwoCMNEJuwen8HYkn7AEwc="; + hash = "sha256-drHo8IUC3xQ/O6T4xCMQSK9m+O/6hTOJSw0OMl1W9WA="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/by-name/pg/pgraphs/package.nix b/pkgs/by-name/pg/pgraphs/package.nix new file mode 100644 index 0000000000000..0f9e5bc2dbf42 --- /dev/null +++ b/pkgs/by-name/pg/pgraphs/package.nix @@ -0,0 +1,29 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: + +buildNpmPackage rec { + pname = "pgraphs"; + version = "0.6.12"; + + src = fetchFromGitHub { + owner = "pg-format"; + repo = "pgraphs"; + rev = "refs/tags/v${version}"; + hash = "sha256-rhNXASSHgdL9knq9uPFhAGlh0ZAKo5TNh/2a4u6Mh1U="; + }; + + npmDepsHash = "sha256-S1pCmRaRuprqIjaylIsuHyguhgQC5vvp7pDq2KJgrHQ="; + dontNpmBuild = true; + + meta = { + description = "Property Graph Exchange Format (PG) converter"; + changelog = "https://github.com/pg-format/pgraphs/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/pg-format/pgraphs"; + license = lib.licenses.mit; + mainProgram = "pgraphs"; + maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; + }; +} diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix index ab4966ecf417e..a598f69853421 100644 --- a/pkgs/by-name/ph/phpunit/package.nix +++ b/pkgs/by-name/ph/phpunit/package.nix @@ -6,13 +6,13 @@ php.buildComposerProject (finalAttrs: { pname = "phpunit"; - version = "11.2.0"; + version = "11.2.2"; src = fetchFromGitHub { owner = "sebastianbergmann"; repo = "phpunit"; rev = finalAttrs.version; - hash = "sha256-5MWhHMKCy9rrVO1bqyGykWFGw9zI1t6QGVkenvFpGbY="; + hash = "sha256-MhQxPZeg0mKDmy/iIUj+2oybBC3CoIYj2PWB+RBWq10="; }; vendorHash = "sha256-w2Yu0T8omr8F7r5nBZOmRJE0LEdGQ3XAdxNZoK1sx1M="; diff --git a/pkgs/by-name/ph/physac/package.nix b/pkgs/by-name/ph/physac/package.nix index 292d5ce6bd24e..3040c9eda2532 100644 --- a/pkgs/by-name/ph/physac/package.nix +++ b/pkgs/by-name/ph/physac/package.nix @@ -5,7 +5,7 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { - name = "physac"; + pname = "physac"; version = "2.5-unstable-2023-12-11"; src = fetchFromGitHub { diff --git a/pkgs/by-name/pi/pixel-code/package.nix b/pkgs/by-name/pi/pixel-code/package.nix index 3ce24afc67744..7c08deca93c24 100644 --- a/pkgs/by-name/pi/pixel-code/package.nix +++ b/pkgs/by-name/pi/pixel-code/package.nix @@ -1,7 +1,7 @@ { lib, stdenvNoCC, fetchzip }: stdenvNoCC.mkDerivation rec { - name = "pixel-code"; + pname = "pixel-code"; version = "2.2"; src = fetchzip { diff --git a/pkgs/by-name/pl/plasticity/update.sh b/pkgs/by-name/pl/plasticity/update.sh index 8980f632e3ee4..2b778658739d2 100755 --- a/pkgs/by-name/pl/plasticity/update.sh +++ b/pkgs/by-name/pl/plasticity/update.sh @@ -5,7 +5,7 @@ set -eu -o pipefail version=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ - curl -s https://api.github.com/repos/nkallen/plasticity/releases/latest | jq -e -r ".tag_name | .[1:]") + https://api.github.com/repos/nkallen/plasticity/releases/latest | jq -e -r ".tag_name | .[1:]") old_version=$(nix-instantiate --eval -A plasticity.version | jq -e -r) if [[ $version == "$old_version" ]]; then diff --git a/pkgs/by-name/pl/plattenalbum/package.nix b/pkgs/by-name/pl/plattenalbum/package.nix index 51977c84a321f..200bc55569da2 100644 --- a/pkgs/by-name/pl/plattenalbum/package.nix +++ b/pkgs/by-name/pl/plattenalbum/package.nix @@ -13,14 +13,14 @@ python3Packages.buildPythonApplication rec { pname = "plattenalbum"; - version = "2.1.0"; + version = "2.1.1"; pyproject = false; src = fetchFromGitHub { owner = "SoongNoonien"; repo = "plattenalbum"; - rev = "v${version}"; - hash = "sha256-vRBlShbNuPpL29huhzYSuUcMJmSLljO4nc6cSAp3NB4="; + rev = "refs/tags/v${version}"; + hash = "sha256-M4WjRQQYu8ixUYV6LgiyAPyvCS1Vk+UpLq/Sek0qBlw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pl/plumber/package.nix b/pkgs/by-name/pl/plumber/package.nix index a682fa8324068..8571bd7ca096b 100644 --- a/pkgs/by-name/pl/plumber/package.nix +++ b/pkgs/by-name/pl/plumber/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "plumber"; - version = "2.6.1"; + version = "2.7.0"; src = fetchFromGitHub { owner = "streamdal"; repo = pname; rev = "v${version}"; - hash = "sha256-7sOj21ZTmo3KJ8CduH25jA4gmXLMKi5QWAng6nP0dsQ="; + hash = "sha256-20rc9TLiCkt9k/Gtr5aoheGiiqOp1eURSqg4p1jTnkE="; }; vendorHash = null; diff --git a/pkgs/by-name/pm/pm2/package.nix b/pkgs/by-name/pm/pm2/package.nix index 12473ffc21965..20ad72df78533 100644 --- a/pkgs/by-name/pm/pm2/package.nix +++ b/pkgs/by-name/pm/pm2/package.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "pm2"; - version = "5.4.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "Unitech"; repo = "pm2"; rev = "v${version}"; - hash = "sha256-hmciDjlmlIaqOWl9rYWQ6muq6LFzQb5tfpdzL0vV/ZM="; + hash = "sha256-LMBQ1+VyGjq76Qs5HtELSvEuml3XfzLBbvcuAFuJzw4="; }; - npmDepsHash = "sha256-je+GwPkUiGPWgKQgSPlx2OEWMbDKdwEM/idTjgINLHY="; + npmDepsHash = "sha256-hXP+rXXn0Ds81D2iLWVkgfFiFA3dDD5wrAoVivHaRHA="; dontNpmBuild = true; diff --git a/pkgs/by-name/po/poutine/package.nix b/pkgs/by-name/po/poutine/package.nix new file mode 100644 index 0000000000000..617454ae468ee --- /dev/null +++ b/pkgs/by-name/po/poutine/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "poutine"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "boostsecurityio"; + repo = "poutine"; + rev = "refs/tags/v${version}"; + hash = "sha256-T81Qi79VaZzfKL4niTZQW+gwwiBcyInALrvyUg1V4Ck="; + }; + + vendorHash = "sha256-/chq40j+puAI3KdI15vbZwrnzCKrU7g+Z/t9aOXQ1Sg="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = with lib; { + description = "Security scanner that detects misconfigurations and vulnerabilities in build pipelines of repositories"; + homepage = "https://github.com/boostsecurityio/poutine"; + changelog = "https://github.com/boostsecurityio/poutine/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + mainProgram = "poutine"; + }; +} diff --git a/pkgs/by-name/po/powerjoular/package.nix b/pkgs/by-name/po/powerjoular/package.nix new file mode 100644 index 0000000000000..62313198f92b1 --- /dev/null +++ b/pkgs/by-name/po/powerjoular/package.nix @@ -0,0 +1,45 @@ +{ + stdenv, + lib, + fetchFromGitHub, + gnat, + gprbuild, +}: + +stdenv.mkDerivation rec { + pname = "powerjoular"; + version = "0.7.3"; + + src = fetchFromGitHub { + owner = "joular"; + repo = pname; + rev = version; + hash = "sha256-UjoGY1C58xhINmji7R63wqkWK9yCeXa0wwosnIcfYdA="; + }; + + nativeBuildInputs = [ + gnat + gprbuild + ]; + + buildPhase = '' + runHook preBuild + gprbuild + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp obj/powerjoular $out/bin + runHook postInstall + ''; + + meta = with lib; { + description = "CLI software to monitor the power consumption of software and hardware components"; + homepage = "https://github.com/joular/powerjoular"; + maintainers = [ maintainers.julienmalka ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/pr/prometheus-jmx-javaagent/package.nix b/pkgs/by-name/pr/prometheus-jmx-javaagent/package.nix new file mode 100644 index 0000000000000..179acfe520ace --- /dev/null +++ b/pkgs/by-name/pr/prometheus-jmx-javaagent/package.nix @@ -0,0 +1,36 @@ +{ + lib, + stdenv, + fetchurl, +}: +stdenv.mkDerivation ( + finalAttrs: + let + jarName = "jmx_prometheus_javaagent-${finalAttrs.version}.jar"; + in + { + pname = "jmx-prometheus-javaagent"; + version = "0.20.0"; + src = fetchurl { + url = "mirror://maven/io/prometheus/jmx/jmx_prometheus_javaagent/${finalAttrs.version}/${jarName}"; + sha256 = "sha256-i2ftQEhdR1ZIw20R0hRktIRAb4X6+RKzNj9xpqeGEyA="; + }; + + dontUnpack = true; + + installPhase = '' + env + mkdir -p $out/lib + cp $src $out/lib/${jarName} + ''; + + meta = { + homepage = "https://github.com/prometheus/jmx_exporter"; + description = "A process for exposing JMX Beans via HTTP for Prometheus consumption"; + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.srhb ]; + platforms = lib.platforms.unix; + }; + } +) diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix index dde30bfe29d46..4aa6059ad9556 100644 --- a/pkgs/by-name/pr/proto/package.nix +++ b/pkgs/by-name/pr/proto/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "proto"; - version = "0.36.0"; + version = "0.36.2"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-UziA1TlsVbFqdsg8A4ClNOioZFHMzmiA4N4bHqCiwZw="; + hash = "sha256-k1aVz3eiZHE92cPKtxEZhCN8I3hcNEr2HN3Z70zPT+I="; }; - cargoHash = "sha256-Eehx5wXQcdLKVfVp4vB3kzOAZ9SDJn5BweTe1d1KKHM="; + cargoHash = "sha256-HFYISBB+5lyNtWcYNBj3rTX0C52YNC6bBsVT+OpWa+c="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/by-name/pu/purescm/package.nix b/pkgs/by-name/pu/purescm/package.nix index c03f1339d18a2..0eebd7f23e179 100644 --- a/pkgs/by-name/pu/purescm/package.nix +++ b/pkgs/by-name/pu/purescm/package.nix @@ -15,11 +15,24 @@ let package = buildNpmPackage { inherit pname version; - src = ./.; + src = fileset.toSource { + root = ./.; + fileset = fileset.unions [ + ./package.json + ./package-lock.json + ./.gitignore + ]; + }; dontNpmBuild = true; npmDeps = fetchNpmDeps { - src = ./.; + src = fileset.toSource { + root = ./.; + fileset = fileset.unions [ + ./package-lock.json + ./package.json + ]; + }; hash = "sha256-ljeFcLvIET77Q0OR6O5Ok1fGnaxaKaoywpcy2aHq/6o="; }; diff --git a/pkgs/by-name/py/pyprland/package.nix b/pkgs/by-name/py/pyprland/package.nix index 34718ddaddaba..9162724b7a758 100644 --- a/pkgs/by-name/py/pyprland/package.nix +++ b/pkgs/by-name/py/pyprland/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "pyprland"; - version = "2.3.7"; + version = "2.3.8"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.10"; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { owner = "hyprland-community"; repo = "pyprland"; rev = "refs/tags/${version}"; - hash = "sha256-Mcn5d0p+vu1I9oKHUdOH/v1+wC9UTGZaejbsgurrrhg="; + hash = "sha256-0YUI2/gJmBoummiHGpq2p2sT25SwCdnsRwfGK2pcm4s="; }; nativeBuildInputs = with python3Packages; [ poetry-core ]; diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix index d790b51d52eb3..3fc15b45b72f2 100644 --- a/pkgs/by-name/py/pyright/package.nix +++ b/pkgs/by-name/py/pyright/package.nix @@ -1,13 +1,13 @@ { lib, buildNpmPackage, fetchFromGitHub, runCommand, jq }: let - version = "1.1.366"; + version = "1.1.367"; src = fetchFromGitHub { owner = "Microsoft"; repo = "pyright"; rev = "${version}"; - hash = "sha256-xs93PnDTtDsdi9YeZk0nyinCs4+eJJNFg7NagHF15rI="; + hash = "sha256-ILhY6O5B38P5PYdCK1DeuvQzTU5SbhL3F4X0KFne9UM="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -37,7 +37,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-jGLzsrf5RuqfyI3BJpmVsqijxtNlFexsub0186cUR+8="; + npmDepsHash = "sha256-MskvUwzlREmTR8qmLlWGxNWVlveIIyHhihigkQ+5seY="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -51,7 +51,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-8d3gRx93wfusvI3mov2B0jJuG+WpVaL8b+jdFzmqA3w="; + npmDepsHash = "sha256-kpqV81iafKWROtdPxLZqi6YVT0WJf82salTFl46Iu24="; postPatch = '' chmod +w ../../ diff --git a/pkgs/by-name/qd/qdrant-web-ui/package.nix b/pkgs/by-name/qd/qdrant-web-ui/package.nix new file mode 100644 index 0000000000000..333d9eed042d2 --- /dev/null +++ b/pkgs/by-name/qd/qdrant-web-ui/package.nix @@ -0,0 +1,35 @@ +{ + buildNpmPackage, + fetchFromGitHub, + lib, +}: +buildNpmPackage rec { + pname = "qdrant-web-ui"; + version = "0.1.28"; + + src = fetchFromGitHub { + owner = "qdrant"; + repo = "qdrant-web-ui"; + rev = "refs/tags/v${version}"; + hash = "sha256-jbr1PdoYcBxT7EOksLOPYNGz+GG5HVG406S+GRyWeiE="; + }; + + npmDepsHash = "sha256-8sk2QyunSrKE5/kjSoo0whdVbY9IXCF+n7ZIjP4Mgq8="; + + npmBuildScript = "build-qdrant"; + + installPhase = '' + runHook preInstall + cp -r dist $out + runHook postInstall + ''; + + meta = { + description = "Self-hosted web UI for Qdrant"; + homepage = "https://github.com/qdrant/qdrant-web-ui"; + changelog = "https://github.com/qdrant/qdrant-web-ui/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ xzfc ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/r0/r0vm/package.nix b/pkgs/by-name/r0/r0vm/package.nix index caca6c16df07d..75a8ab6e5976c 100644 --- a/pkgs/by-name/r0/r0vm/package.nix +++ b/pkgs/by-name/r0/r0vm/package.nix @@ -10,12 +10,12 @@ }: rustPlatform.buildRustPackage rec { pname = "r0vm"; - version = "0.21.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "risc0"; repo = "risc0"; rev = "v${version}"; - sha256 = "sha256-BIQd6yX453v4w8aU+2awcngOE6t4oIf7BseVLgPG4Bw="; + sha256 = "sha256-0Y7+Z2TEm5ZbEkbO8nSOZulGuZAgl9FdyEVNmqV7S8U="; }; buildAndTestSubdir = "risc0/r0vm"; @@ -33,16 +33,16 @@ rustPlatform.buildRustPackage rec { doCheck = false; - cargoHash = "sha256-OsxCIFgJiHfx52nRYRNLTB501RGKSBPQs2MQAs/BFfc="; + cargoHash = "sha256-3DwrWkjPCE4f/FHjzWyRGAXJPv30B4Ce8fh2oKDhpMM="; postPatch = let - # see https://github.com/risc0/risc0/blob/v0.21.0/risc0/circuit/recursion/build.rs - sha256Hash = "3504a2542626acb974dea1ae5542c90c032c4ef42f230977f40f245442a1ec23"; + # see https://github.com/risc0/risc0/blob/v1.0.1/risc0/circuit/recursion/build.rs + sha256Hash = "4e8496469e1efa00efb3630d261abf345e6b2905fb64b4f3a297be88ebdf83d2"; recursionZkr = fetchurl { name = "recursion_zkr.zip"; url = "https://risc0-artifacts.s3.us-west-2.amazonaws.com/zkr/${sha256Hash}.zip"; - sha256 = "sha256:08zcl515890gyivhj8rgyi72q0qcr515bbm1vrsbkb164raa411m"; + sha256 = "sha256-ToSWRp4e+gDvs2MNJhq/NF5rKQX7ZLTzope+iOvfg9I="; }; in '' diff --git a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix index afad529c8261f..4c72c2a4fd5ed 100644 --- a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix +++ b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix @@ -12,13 +12,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "raspberrypi-eeprom"; - version = "2024.02.16-2712"; + version = "2024.06.05-2712"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "rpi-eeprom"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-R3X7JaS8Ob6KwN1KYaJDZA8aI4Hv6Y3R+nOMSPjt2ew="; + hash = "sha256-VcMDDnM0VNr+Y+16ZChZdlEcmlHx6mYNCK0mrPMJHes="; }; buildInputs = [ python3 ]; diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/by-name/ra/rav1e/package.nix index fae72b0266cb5..b90dd2d56a617 100644 --- a/pkgs/tools/video/rav1e/default.nix +++ b/pkgs/by-name/ra/rav1e/package.nix @@ -1,16 +1,18 @@ -{ lib -, rust -, stdenv -, rustPlatform -, fetchCrate -, pkg-config -, cargo-c -, libgit2 -, nasm -, zlib -, libiconv -, Security -, buildPackages +{ + lib, + rust, + stdenv, + rustPlatform, + fetchCrate, + pkg-config, + cargo-c, + darwin, + libgit2, + libiconv, + nasm, + testers, + zlib, + rav1e, }: rustPlatform.buildRustPackage rec { @@ -19,22 +21,26 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-Db7qb7HBAy6lniIiN07iEzURmbfNtuhmgJRv7OUagUM="; + hash = "sha256-Db7qb7HBAy6lniIiN07iEzURmbfNtuhmgJRv7OUagUM="; }; cargoHash = "sha256-VyQ6n2kIJ7OjK6Xlf0T0GNsBvgESRETzKZDZzAn8ZuY="; depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ cargo-c libgit2 nasm ]; - - buildInputs = [ - zlib - ] ++ lib.optionals stdenv.isDarwin [ - libiconv - Security + nativeBuildInputs = [ + cargo-c + libgit2 + nasm ]; + buildInputs = + [ zlib ] + ++ lib.optionals stdenv.isDarwin [ + libiconv + darwin.apple_sdk.frameworks.Security + ]; + # Darwin uses `llvm-strip`, which results in link errors when using `-x` to strip the asm library # and linking it with cctools ld64. postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' @@ -43,7 +49,7 @@ rustPlatform.buildRustPackage rec { checkType = "debug"; - postBuild = '' + postBuild = '' ${rust.envVars.setEnv} cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} ''; @@ -51,7 +57,11 @@ rustPlatform.buildRustPackage rec { ${rust.envVars.setEnv} cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} ''; - meta = with lib; { + passthru = { + tests.version = testers.testVersion { package = rav1e; }; + }; + + meta = { description = "Fastest and safest AV1 encoder"; longDescription = '' rav1e is an AV1 video encoder. It is designed to eventually cover all use @@ -61,8 +71,8 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/xiph/rav1e"; changelog = "https://github.com/xiph/rav1e/releases/tag/v${version}"; - license = licenses.bsd2; - maintainers = [ ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ getchoo ]; mainProgram = "rav1e"; }; } diff --git a/pkgs/by-name/rc/rclip/package.nix b/pkgs/by-name/rc/rclip/package.nix index 2d4cf0c975aa3..09790b93cbcc6 100644 --- a/pkgs/by-name/rc/rclip/package.nix +++ b/pkgs/by-name/rc/rclip/package.nix @@ -4,14 +4,14 @@ }: python3Packages.buildPythonApplication rec { pname = "rclip"; - version = "1.9.0"; + version = "1.10.0"; pyproject = true; src = fetchFromGitHub { owner = "yurijmikhalevich"; repo = "rclip"; rev = "refs/tags/v${version}"; - hash = "sha256-q6z/JEIPnVnaHx9x53f9KyCKt7nZRxQGPeVTT1SqxkU="; + hash = "sha256-l3KsOX5IkU4/wQyXXHR+09KPSD6nsnBaiGjSi7fMyqA="; }; nativeBuildInputs = with python3Packages; [ @@ -38,6 +38,13 @@ python3Packages.buildPythonApplication rec { "tests/e2e/test_rclip.py" ]; + disabledTests = [ + # requires network + "test_text_model_produces_the_same_vector_as_the_main_model" + "test_loads_text_model_when_text_processing_only_requested_and_checkpoint_exists" + "test_loads_full_model_when_text_processing_only_requested_and_checkpoint_doesnt_exist" + ]; + meta = with lib; { description = "AI-Powered Command-Line Photo Search Tool"; homepage = "https://github.com/yurijmikhalevich/rclip"; diff --git a/pkgs/by-name/rc/rcp/package.nix b/pkgs/by-name/rc/rcp/package.nix index d48b399c48ca0..9d2f64c9b22b2 100644 --- a/pkgs/by-name/rc/rcp/package.nix +++ b/pkgs/by-name/rc/rcp/package.nix @@ -7,20 +7,20 @@ rustPlatform.buildRustPackage rec { pname = "rcp"; - version = "0.9.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "wykurz"; repo = "rcp"; rev = "v${version}"; - hash = "sha256-e6m3E1R7o4X9cPEy/ayUIsK0xhRaVsAFDAwObJrDJPA="; + hash = "sha256-nNMcZyJAvqxVSoytmfSqsfk1yVzzZ5aIOj72L+jFAAM="; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit ]); - cargoHash = "sha256-croFSe37yQa9LijaNxKHrZlcJdExz9SweOoG21PPn9E="; + cargoHash = "sha256-3+w+pTws8WjrUqIWYGbE2V438mVUUyrjBH9mHI8uRMQ="; RUSTFLAGS = "--cfg tokio_unstable"; diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix index 4ae6c6894d089..3398236ec6a57 100644 --- a/pkgs/by-name/rc/rcu/package.nix +++ b/pkgs/by-name/rc/rcu/package.nix @@ -14,14 +14,14 @@ python3Packages.buildPythonApplication rec { pname = "rcu"; - version = "2024.001o"; + version = "2024.001p"; format = "other"; src = let src-tarball = requireFile { name = "rcu-d${version}-source.tar.gz"; - sha256 = "1smi4cfnwbdil0f77244dfq65i173vb4g3kk451lwh35s91ar628"; + sha256 = "1njsfj4pfqh4c9gppkdlkkfba31v186wjz3zm94adhhpdwzx2ybb"; url = "http://www.davisr.me/projects/rcu/"; }; in runCommand "${src-tarball.name}-unpacked" {} '' diff --git a/pkgs/by-name/re/redocly/package.nix b/pkgs/by-name/re/redocly/package.nix index 948c783d5fe99..2d23539271eea 100644 --- a/pkgs/by-name/re/redocly/package.nix +++ b/pkgs/by-name/re/redocly/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "redocly"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "Redocly"; repo = "redocly-cli"; rev = "@redocly/cli@${version}"; - hash = "sha256-R5GSkRbe7GpdQ9y3PvRcWcl27HgEJMHyOLgR0zVF6jA="; + hash = "sha256-qGjFueL05f7DgDa0/B+w1Ix2tRx7PicMneub2sWJ7Gw="; }; - npmDepsHash = "sha256-o1Z8v/LR77TUKufv60B/P4XWR7Ebf0PTX7ee3YgjnBs="; + npmDepsHash = "sha256-pO1ewVInuPCLDk2V4HRqOCFmT1VTVa/qRkJ5rxREWMU="; npmBuildScript = "prepare"; diff --git a/pkgs/by-name/re/release-plz/package.nix b/pkgs/by-name/re/release-plz/package.nix new file mode 100644 index 0000000000000..f2ea059714da1 --- /dev/null +++ b/pkgs/by-name/re/release-plz/package.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, installShellFiles +, pkg-config +, perl +, openssl +}: +rustPlatform.buildRustPackage rec { + pname = "release-plz"; + version = "0.3.72"; + + src = fetchFromGitHub { + owner = "MarcoIeni"; + repo = "release-plz"; + rev = "release-plz-v${version}"; + hash = "sha256-wc/+X/P/FKDpvw0U7ItIgzHbqsEnngHk4wt7Pjzk594="; + }; + + cargoHash = "sha256-RB+NXuASfpx6tZJfG18Hj7JOfXK9FIqSD7QaDfGUHi4="; + + nativeBuildInputs = [ installShellFiles pkg-config perl ]; + buildInputs = [ openssl ]; + + buildAndTestSubdir = "crates/release_plz"; + + # Tests depend on additional infrastructure to be running locally + doCheck = false; + + postInstall = '' + installShellCompletion --cmd ${meta.mainProgram} \ + --bash <($out/bin/${meta.mainProgram} generate-completions bash) \ + --fish <($out/bin/${meta.mainProgram} generate-completions fish) \ + --zsh <($out/bin/${meta.mainProgram} generate-completions zsh) + ''; + + meta = { + description = "Publish Rust crates from CI with a Release PR"; + homepage = "https://release-plz.ieni.dev"; + license = with lib.licenses; [ asl20 mit ]; + maintainers = with lib.maintainers; [ dannixon ]; + mainProgram = "release-plz"; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix index 41fae8a852444..92bf643dc4219 100644 --- a/pkgs/by-name/re/renode-dts2repl/package.nix +++ b/pkgs/by-name/re/renode-dts2repl/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication { pname = "renode-dts2repl"; - version = "0-unstable-2024-06-03"; + version = "0-unstable-2024-06-11"; pyproject = true; src = fetchFromGitHub { owner = "antmicro"; repo = "dts2repl"; - rev = "f3a5ca54a6642c7e8e539bc5e62e676a4c6aa2a1"; - hash = "sha256-fi/ihHXCFFNhEPO9EcdxTmNun96TbvXUup3V5lbxN0g="; + rev = "7360c07d2ef1e32661a0efa04323e799d400a58e"; + hash = "sha256-lN3IgLOAeMexWG5zQB9RxRld7Snl3aqNJt3fZV5hdnM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix index 9938de1d8d85d..6fb753a1cbadd 100644 --- a/pkgs/by-name/re/renode-unstable/package.nix +++ b/pkgs/by-name/re/renode-unstable/package.nix @@ -5,11 +5,11 @@ renode.overrideAttrs (finalAttrs: _: { pname = "renode-unstable"; - version = "1.15.0+20240609git09f623310"; + version = "1.15.1+20240615gitdd55f8ea4"; src = fetchurl { url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz"; - hash = "sha256-jbPvMzGXdBXT92aPXBQzw74hXW9JJeTZQgXKvILMlo0="; + hash = "sha256-CxV92sGxRlITi0jhi/O0J/FwLGyJVS7niIzlO3s3pis="; }; passthru.updateScript = diff --git a/pkgs/by-name/re/renode/package.nix b/pkgs/by-name/re/renode/package.nix index 0a514587f8384..c296d7c85967d 100644 --- a/pkgs/by-name/re/renode/package.nix +++ b/pkgs/by-name/re/renode/package.nix @@ -31,11 +31,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "renode"; - version = "1.15.0"; + version = "1.15.1"; src = fetchurl { url = "https://github.com/renode/renode/releases/download/v${finalAttrs.version}/renode-${finalAttrs.version}.linux-portable.tar.gz"; - hash = "sha256-w3HKYctW1LmiAse/27Y1Gmz9hDprQ1CK7+TXIexCrkg="; + hash = "sha256-W+JtyaXcYZD+iaVEFX6eatxV3/Vr4aZrsCLm1Aj+ISs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ri/ricochet-refresh/package.nix b/pkgs/by-name/ri/ricochet-refresh/package.nix index 1dcff630f5e58..6072f05e06c19 100644 --- a/pkgs/by-name/ri/ricochet-refresh/package.nix +++ b/pkgs/by-name/ri/ricochet-refresh/package.nix @@ -3,24 +3,21 @@ , fetchFromGitHub , qt5 , openssl -, protobuf3_20 # https://github.com/blueprint-freespeech/ricochet-refresh/issues/178 +, protobuf , pkg-config , cmake }: -let - protobuf = protobuf3_20; -in stdenv.mkDerivation (finalAttrs: { pname = "ricochet-refresh"; - version = "3.0.23"; + version = "3.0.24"; src = fetchFromGitHub { owner = "blueprint-freespeech"; repo = "ricochet-refresh"; rev = "v${finalAttrs.version}-release"; - hash = "sha256-Wz53KeI3t12MqnvGuGS8Jd9gDY4eCTc5wcXBDHp5m0U="; fetchSubmodules = true; + hash = "sha256-xz1cyNQgmXUIZc56OHwWZCGVNpp7CFFyCd0EvAas4zw="; }; sourceRoot = "${finalAttrs.src.name}/src"; diff --git a/pkgs/by-name/ri/river/build.zig.zon.nix b/pkgs/by-name/ri/river/build.zig.zon.nix index 424b5ad35eddf..6ce16a1dd10ea 100644 --- a/pkgs/by-name/ri/river/build.zig.zon.nix +++ b/pkgs/by-name/ri/river/build.zig.zon.nix @@ -4,31 +4,31 @@ linkFarm "zig-packages" [ { - name = "122014eeb4600a059bdcfe1c864862f17e6d5e4237e3bb7d6818f2a5583f6f4eb843"; + name = "1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242"; path = fetchzip { - url = "https://codeberg.org/ifreund/zig-pixman/archive/v0.1.0.tar.gz"; - hash = "sha256-Atfkiyt9v+GWry3xA2Y0Iv6AvwbZ+EHfHLmX0AUEz6Y="; + url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.2.0.tar.gz"; + hash = "sha256-dvit+yvc0MnipqWjxJdfIsA6fJaJZOaIpx4w4woCxbE="; }; } { - name = "1220714d1cc39c3abb1d9c22a0b838d847ead099cb7d9931821490483f30c022e827"; + name = "12209db20ce873af176138b76632931def33a10539387cba745db72933c43d274d56"; path = fetchzip { - url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.17.0.tar.gz"; - hash = "sha256-C1D2dBn65Z9PmDacpeYbdX574fcOyYi/BJVDUMibkPA="; + url = "https://codeberg.org/ifreund/zig-pixman/archive/v0.2.0.tar.gz"; + hash = "sha256-zcfZEMnipWDPuptl9UN0PoaJDjy2EHc7Wwi4GQq3hkY="; }; } { - name = "1220840390382c88caf9b0887f6cebbba3a7d05960b8b2ee6d80567b2950b71e5017"; + name = "1220c65ab884c236cc950b564c70f6cd04046d86485ee76e0cde886cef7438021b4f"; path = fetchzip { - url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.1.0.tar.gz"; - hash = "sha256-xilmsDGWlkfpTiGff+/nb76jx87ANdr4zqYy6rKOBMg="; + url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.17.1.tar.gz"; + hash = "sha256-rVI/tJD3cx8b+nGTG5u08/RYoI179oDY7AY0riTntA0="; }; } { - name = "1220b0f8f822c1625af7aae4cb3ab2c4ec1a4c0e99ef32867b2a8d88bb070b3e7f6d"; + name = "1220c90b2228d65fd8427a837d31b0add83e9fade1dcfa539bb56fd06f1f8461605f"; path = fetchzip { - url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.1.0.tar.gz"; - hash = "sha256-VLEx8nRgmJZWgLNBRqrR7bZEkW0m5HTRv984HKwoIfA="; + url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.2.0.tar.gz"; + hash = "sha256-T+EZiStBfmxFUjaX05WhYkFJ8tRok/UQtpc9QY9NxZk="; }; } ] diff --git a/pkgs/by-name/ri/river/package.nix b/pkgs/by-name/ri/river/package.nix index 886ec6a18d080..e28161b0b02c4 100644 --- a/pkgs/by-name/ri/river/package.nix +++ b/pkgs/by-name/ri/river/package.nix @@ -15,14 +15,14 @@ , wayland-protocols , wlroots_0_17 , xwayland -, zig_0_12 +, zig_0_13 , withManpages ? true , xwaylandSupport ? true }: stdenv.mkDerivation (finalAttrs: { pname = "river"; - version = "0.3.2"; + version = "0.3.3"; outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "river"; rev = "refs/tags/v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-I09cR5aN7qXOzV9HDXaL4TjoeJcVa0Ch00zxOJokdDE="; + hash = "sha256-DYaxtYJLZQqE2SyPfWec/zXsZKRnxK2QNgOkM7GJkLI="; }; deps = callPackage ./build.zig.zon.nix { }; @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config wayland xwayland - zig_0_12.hook + zig_0_13.hook ] ++ lib.optional withManpages scdoc; diff --git a/pkgs/by-name/ro/rofimoji/package.nix b/pkgs/by-name/ro/rofimoji/package.nix index f0c8339b9e355..610292c2105ac 100644 --- a/pkgs/by-name/ro/rofimoji/package.nix +++ b/pkgs/by-name/ro/rofimoji/package.nix @@ -15,14 +15,14 @@ python3Packages.buildPythonApplication rec { pname = "rofimoji"; - version = "6.3.1"; + version = "6.3.2"; pyproject = true; src = fetchFromGitHub { owner = "fdw"; repo = "rofimoji"; rev = "refs/tags/${version}"; - hash = "sha256-gYLUUbT6OHMo2nzJ//Pa0vZ9WPcHs6YnAjTKNO07VNk="; + hash = "sha256-LJJWHn3UnrCJaowHHuYksD2MHqClLc2MmYYXQfUxTgQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix index ef9b5965aff7f..8a88b4b202f75 100644 --- a/pkgs/by-name/rp/rpcs3/package.nix +++ b/pkgs/by-name/rp/rpcs3/package.nix @@ -32,10 +32,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "16391-39e946630"; - rpcs3Version = "0.0.31-16391-39e946630"; - rpcs3Revision = "39e946630da8e23c4d2d2b763f63145eb9205e43"; - rpcs3Hash = "sha256-CIPUmcpBc6iRMzZJZ5vKty/Uh4TYiR65xXD4aKRPSKc="; + rpcs3GitVersion = "16614-5b973448b"; + rpcs3Version = "0.0.32-16614-5b973448b"; + rpcs3Revision = "5b973448bf75a239f34fd9c7698c8a02b04e2ea9"; + rpcs3Hash = "sha256-6rDHOK3KZkLaDcdG6dFlicWLFeuQUhCiRG1Y0grOvmA="; inherit (qt6Packages) qtbase qtmultimedia wrapQtAppsHook qtwayland; in diff --git a/pkgs/by-name/ru/rusty-diceware/package.nix b/pkgs/by-name/ru/rusty-diceware/package.nix new file mode 100644 index 0000000000000..acc271e0f7a1f --- /dev/null +++ b/pkgs/by-name/ru/rusty-diceware/package.nix @@ -0,0 +1,29 @@ +{ fetchFromGitLab +, lib +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "rusty-diceware"; + version = "0.5.8"; + + src = fetchFromGitLab { + owner = "yuvallanger"; + repo = "rusty-diceware"; + rev = "diceware-v${version}"; + hash = "sha256-GDWvHHl4EztTaR0jI4XL1I9qE2KSL+q9C8IvLWQF4Ys="; + }; + + cargoHash = "sha256-5SAKrNgFG3O+hLKvEGhawyRi7wiEPWmxPsLtEX0OkDM="; + + doCheck = true; + + meta = with lib; { + description = "Commandline diceware, with or without dice, written in Rustlang"; + homepage = "https://gitlab.com/yuvallanger/rusty-diceware"; + changelog = "https://gitlab.com/yuvallanger/rusty-diceware/-/blob/v${version}/CHANGELOG.md?ref_type=heads"; + license = licenses.gpl3; + maintainers = with maintainers; [ cherrykitten ]; + mainProgram = "diceware"; + }; +} diff --git a/pkgs/by-name/rw/rwpspread/package.nix b/pkgs/by-name/rw/rwpspread/package.nix index 954bdd4092d1a..31f37735e2547 100644 --- a/pkgs/by-name/rw/rwpspread/package.nix +++ b/pkgs/by-name/rw/rwpspread/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { description = "Multi-Monitor Wallpaper Utility"; homepage = "https://github.com/0xk1f0/rwpspread"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ nu-nu-ko ]; + maintainers = with lib.maintainers; [ fsnkty ]; platforms = lib.platforms.linux; mainProgram = "rwpspread"; }; diff --git a/pkgs/by-name/sa/sarasa-gothic/package.nix b/pkgs/by-name/sa/sarasa-gothic/package.nix index 6f2e4cad10a0a..ff1447e49203f 100644 --- a/pkgs/by-name/sa/sarasa-gothic/package.nix +++ b/pkgs/by-name/sa/sarasa-gothic/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sarasa-gothic"; - version = "1.0.13"; + version = "1.0.14"; src = fetchurl { # Use the 'ttc' files here for a smaller closure size. # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}/Sarasa-TTC-${finalAttrs.version}.zip"; - hash = "sha256-dsYYzE5NrJgFCzV8fp6eUD+8bDf6qDP8/tBNRKhnytY="; + hash = "sha256-1LWooboM+vPbft1+Gvg9Cp24RFEeJPG4yvNiexRi/pg="; }; sourceRoot = "."; diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix index 7bca3ca181a79..4270088a5d293 100644 --- a/pkgs/by-name/se/searxng/package.nix +++ b/pkgs/by-name/se/searxng/package.nix @@ -1,84 +1,97 @@ -{ lib -, python3 -, fetchFromGitHub +{ + lib, + python3, + fetchFromGitHub, + nixosTests }: -python3.pkgs.toPythonModule (python3.pkgs.buildPythonApplication rec { - pname = "searxng"; - version = "0-unstable-2024-05-31"; +python3.pkgs.toPythonModule ( + python3.pkgs.buildPythonApplication rec { + pname = "searxng"; + version = "0-unstable-2024-06-19"; - src = fetchFromGitHub { - owner = "searxng"; - repo = "searxng"; - rev = "18fb701be225560b3fb1011cc533f785823f26a4"; - hash = "sha256-okE/Uxl7YqcM99kLJ4KAlMQi50x5m0bPfYp5bv62WEw="; - }; + src = fetchFromGitHub { + owner = "searxng"; + repo = "searxng"; + rev = "acf3f109b2a99a5e6f25f5f2975016a36673c6ef"; + hash = "sha256-NdFnB5JEaWo7gt+RwxKxkVtEL8uGLlc4z0ROHN+zoL4="; + }; - postPatch = '' - sed -i 's/==.*$//' requirements.txt + postPatch = '' + sed -i 's/==.*$//' requirements.txt + ''; - # can't be fetchpatched as it is essentially empty and it complains about that - # TODO: drop when updating to a version that includes https://github.com/searxng/searxng/pull/3563 - touch searx/answerers/random/__init__.py - touch searx/answerers/statistics/__init__.py - ''; + preBuild = + let + versionString = lib.concatStringsSep "." ( + builtins.tail (lib.splitString "-" (lib.removePrefix "0-" version)) + ); + commitAbbrev = builtins.substring 0 8 src.rev; + in + '' + export SEARX_DEBUG="true"; - preBuild = - let - versionString = lib.concatStringsSep "." (builtins.tail (lib.splitString "-" (lib.removePrefix "0-" version))); - commitAbbrev = builtins.substring 0 8 src.rev; - in - '' - export SEARX_DEBUG="true"; + cat > searx/version_frozen.py <<EOF + VERSION_STRING="${versionString}+${commitAbbrev}" + VERSION_TAG="${versionString}+${commitAbbrev}" + DOCKER_TAG="${versionString}-${commitAbbrev}" + GIT_URL="https://github.com/searxng/searxng" + GIT_BRANCH="master" + EOF + ''; - cat > searx/version_frozen.py <<EOF - VERSION_STRING="${versionString}+${commitAbbrev}" - VERSION_TAG="${versionString}+${commitAbbrev}" - DOCKER_TAG="${versionString}-${commitAbbrev}" - GIT_URL="https://github.com/searxng/searxng" - GIT_BRANCH="master" - EOF - ''; + dependencies = + with python3.pkgs; + [ + babel + certifi + python-dateutil + fasttext-predict + flask + flask-babel + brotli + jinja2 + lxml + pygments + pytomlpp + pyyaml + redis + uvloop + setproctitle + httpx + httpx-socks + markdown-it-py + ] + ++ httpx.optional-dependencies.http2 + ++ httpx-socks.optional-dependencies.asyncio; - propagatedBuildInputs = with python3.pkgs; [ - babel - certifi - python-dateutil - fasttext-predict - flask - flask-babel - brotli - jinja2 - lxml - pygments - pytomlpp - pyyaml - redis - uvloop - setproctitle - httpx - httpx-socks - markdown-it-py - ] ++ httpx.optional-dependencies.http2 - ++ httpx-socks.optional-dependencies.asyncio; + # tests try to connect to network + doCheck = false; - # tests try to connect to network - doCheck = false; + postInstall = '' + # Create a symlink for easier access to static data + mkdir -p $out/share + ln -s ../${python3.sitePackages}/searx/static $out/share/ - postInstall = '' - # Create a symlink for easier access to static data - mkdir -p $out/share - ln -s ../${python3.sitePackages}/searx/static $out/share/ + # copy config schema for the limiter + cp searx/limiter.toml $out/${python3.sitePackages}/searx/limiter.toml + ''; - # copy config schema for the limiter - cp searx/limiter.toml $out/${python3.sitePackages}/searx/limiter.toml - ''; + passthru = { + tests = { + searxng = nixosTests.searx; + }; + }; - meta = with lib; { - homepage = "https://github.com/searxng/searxng"; - description = "Fork of Searx, a privacy-respecting, hackable metasearch engine"; - license = licenses.agpl3Plus; - mainProgram = "searxng-run"; - maintainers = with maintainers; [ SuperSandro2000 _999eagle ]; - }; -}) + meta = with lib; { + homepage = "https://github.com/searxng/searxng"; + description = "Fork of Searx, a privacy-respecting, hackable metasearch engine"; + license = licenses.agpl3Plus; + mainProgram = "searxng-run"; + maintainers = with maintainers; [ + SuperSandro2000 + _999eagle + ]; + }; + } +) diff --git a/pkgs/by-name/se/seclists/package.nix b/pkgs/by-name/se/seclists/package.nix index 1d41e6343ea77..7a149ca92a74e 100644 --- a/pkgs/by-name/se/seclists/package.nix +++ b/pkgs/by-name/se/seclists/package.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation { pname = "seclists"; - version = "2024.1"; + version = "2024.2"; src = fetchFromGitHub { owner = "danielmiessler"; repo = "SecLists"; - rev = "2024.1"; - hash = "sha256-0wK/8cJC9FSFrQUPhRy1/uwQONx2dR3U0XOdnMpxBuA="; + rev = "2024.2"; + hash = "sha256-qqXOLuZOj+mF7kXrdO62HZTrGsyepOSWr5v6j4WFGcc="; }; installPhase = '' diff --git a/pkgs/by-name/sh/show-midi/package.nix b/pkgs/by-name/sh/show-midi/package.nix index 4e3029921321c..f3f64967e627b 100644 --- a/pkgs/by-name/sh/show-midi/package.nix +++ b/pkgs/by-name/sh/show-midi/package.nix @@ -9,6 +9,8 @@ , libXinerama , libXext , libXcursor +, makeDesktopItem +, copyDesktopItems }: stdenv.mkDerivation (finalAttrs: { @@ -23,7 +25,10 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + copyDesktopItems + ]; buildInputs = [ alsa-lib freetype @@ -53,6 +58,8 @@ stdenv.mkDerivation (finalAttrs: { install -Dt $out/share/ShowMIDI/themes Themes/* + install -D Design/icon.png $out/share/icons/hicolor/1024x1024/apps/show-midi.png + mkdir -p $out/bin $out/lib/lv2 $out/lib/vst3 cd Builds/LinuxMakefile/build/ cp -r ShowMIDI.lv2 $out/lib/lv2 @@ -62,6 +69,16 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + desktopItems = [(makeDesktopItem { + name = "ShowMIDI"; + exec = finalAttrs.meta.mainProgram; + comment = finalAttrs.meta.description; + type = "Application"; + icon = "show-midi"; + desktopName = "ShowMIDI"; + categories = [ "Audio" ]; + })]; + # JUCE dlopens these, make sure they are in rpath # Otherwise, segfault will happen env.NIX_LDFLAGS = toString [ diff --git a/pkgs/applications/editors/aseprite/skia-deps.nix b/pkgs/by-name/sk/skia-aseprite/deps.nix index 3c92c649bebf3..a51fe82d9bcec 100644 --- a/pkgs/applications/editors/aseprite/skia-deps.nix +++ b/pkgs/by-name/sk/skia-aseprite/deps.nix @@ -3,21 +3,21 @@ angle2 = fetchgit { url = "https://chromium.googlesource.com/angle/angle.git"; rev = "8718783526307a3fbb35d4c1ad4e8101262a0d73"; - sha256 = "0c90q8f4syvwcayw58743sa332dcpkmblwh3ffkjqn5ygym04xji"; + hash = "sha256-UXYCqn++WCyncwNyuuq8rIkxlB7koMK9Ynx7TRzCIDE="; }; dng_sdk = fetchgit { url = "https://android.googlesource.com/platform/external/dng_sdk.git"; rev = "c8d0c9b1d16bfda56f15165d39e0ffa360a11123"; - sha256 = "1nlq082aij7q197i5646bi4vd2il7fww6sdwhqisv2cs842nyfwm"; + hash = "sha256-lTtvBUGaia0jhrxpw7k7NIq2SVyGmBJPCvjIqAQCmNo="; }; piex = fetchgit { url = "https://android.googlesource.com/platform/external/piex.git"; rev = "bb217acdca1cc0c16b704669dd6f91a1b509c406"; - sha256 = "05ipmag6k55jmidbyvg5mkqm69zfw03gfkqhi9jnjlmlbg31y412"; + hash = "sha256-IhAfxlu0UmllihBP9wbg7idT8azlbb9arLKUaZ6qNxY="; }; sfntly = fetchgit { url = "https://chromium.googlesource.com/external/github.com/googlei18n/sfntly.git"; rev = "b55ff303ea2f9e26702b514cf6a3196a2e3e2974"; - sha256 = "1qi5rfzmwfrji46x95g6dsb03i1v26700kifl2hpgm3pqhr7afpz"; + hash = "sha256-/zp1MsR31HehoC5OAI4RO8QBlm7mldQNiTI7Xr/LJeI="; }; } diff --git a/pkgs/by-name/sk/skia-aseprite/package.nix b/pkgs/by-name/sk/skia-aseprite/package.nix new file mode 100644 index 0000000000000..3b34ad631862f --- /dev/null +++ b/pkgs/by-name/sk/skia-aseprite/package.nix @@ -0,0 +1,115 @@ +{ + aseprite, + clangStdenv, + expat, + fetchFromGitHub, + fetchgit, + fontconfig, + gn, + harfbuzzFull, + icu, + lib, + libglvnd, + libjpeg, + libpng, + libwebp, + libX11, + mesa, + ninja, + python3, + zlib, +}: + +let + # deps.nix is generated by ./update.sh + depSrcs = import ./deps.nix { inherit fetchgit; }; +in +clangStdenv.mkDerivation (finalAttrs: { + pname = "skia-aseprite"; + version = "m102-861e4743af"; + + src = fetchFromGitHub { + owner = "aseprite"; + repo = "skia"; + rev = finalAttrs.version; + hash = "sha256-IlZbalmHl549uDUfPG8hlzub8TLWhG0EsV6HVAPdsl0="; + }; + + nativeBuildInputs = [ + gn + ninja + python3 + ]; + + preConfigure = with depSrcs; '' + mkdir -p third_party/externals + ln -s ${angle2} third_party/externals/angle2 + ln -s ${dng_sdk} third_party/externals/dng_sdk + ln -s ${piex} third_party/externals/piex + ln -s ${sfntly} third_party/externals/sfntly + ''; + + configurePhase = '' + runHook preConfigure + gn gen lib --args="is_debug=false is_official_build=true extra_cflags=[\"-I${harfbuzzFull.dev}/include/harfbuzz\"]" + runHook postConfigure + ''; + + buildInputs = [ + expat + fontconfig + harfbuzzFull + icu + libglvnd + libjpeg + libpng + libwebp + libX11 + mesa + zlib + ]; + + buildPhase = '' + runHook preBuild + ninja -C lib skia modules + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out + + # Glob will match all subdirs. + shopt -s globstar + + # All these paths are used in some way when building Aseprite. + cp -r --parents -t $out/ \ + include/codec \ + include/config \ + include/core \ + include/effects \ + include/gpu \ + include/private \ + include/utils \ + include/third_party/skcms/*.h \ + lib/*.a \ + modules/skshaper/include/*.h \ + src/core/*.h \ + src/gpu/**/*.h \ + third_party/externals/angle2/include \ + third_party/skcms/**/*.h + + runHook postInstall + ''; + + passthru.updateScript = [ ./update.sh ] ++ builtins.attrNames depSrcs; + + meta = { + description = "Complete 2D graphic library for drawing Text, Geometries, and Images (Aseprite's fork)"; + homepage = "https://skia.org/"; + downloadPage = "https://github.com/aseprite/skia"; + license = lib.licenses.bsd3; + inherit (aseprite.meta) maintainers; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/sk/skia-aseprite/update.sh b/pkgs/by-name/sk/skia-aseprite/update.sh new file mode 100755 index 0000000000000..78f7e67da6e90 --- /dev/null +++ b/pkgs/by-name/sk/skia-aseprite/update.sh @@ -0,0 +1,71 @@ +#!/usr/bin/env nix-shell +#!nix-shell --pure -i bash +#!nix-shell -p cacert curl git jq nix-prefetch-git +# shellcheck shell=bash +# vim: set tabstop=2 shiftwidth=2 expandtab: +set -euo pipefail +shopt -s inherit_errexit + +[ $# -gt 0 ] || { + printf >&2 'usage: %s <deps>' "$0" + exit 1 +} + +pkgpath=$(git rev-parse --show-toplevel)/pkgs/by-name/sk/skia-aseprite +depfilter=$(tr ' ' '|' <<< "$*") +depfile=$pkgpath/deps.nix +pkgfile=$pkgpath/package.nix + +update_deps() { + local deps third_party_deps name url rev hash prefetch + + version=$(sed -n 's|.*version = "\(.*\)".*|\1|p' < "$pkgfile") + deps=$(curl -fsS https://raw.githubusercontent.com/aseprite/skia/$version/DEPS) + third_party_deps=$(sed -n 's|[ ",]||g; s|:| |; s|@| |; s|^third_party/externals/||p' <<< "$deps") + filtered=$(grep -E -- "$depfilter" <<< "$third_party_deps") + if [[ -z $filtered ]]; then + printf >&2 '%s: error: filter "%s" matched nothing' "$0" "$depfilter" + return 1 + fi + + printf '{ fetchgit }:\n{\n' + while read -r name url rev; do + printf >&2 'Fetching %s@%s\n' "$name" "$rev" + prefetch=$(nix-prefetch-git --quiet --rev "$rev" "$url") + hash=$(jq -r '.hash' <<< "$prefetch") + + cat << EOF + $name = fetchgit { + url = "$url"; + rev = "$rev"; + hash = "$hash"; + }; +EOF + # `read` could exit with a non-zero code without a newline at the end + done < <(printf '%s\n' "$filtered") + printf '}\n' +} + +update_version() { + local newver newrev + newver=$( + curl --fail \ + --header 'Accept: application/vnd.github+json' \ + --location --show-error --silent \ + ${GITHUB_TOKEN:+ --user \":$GITHUB_TOKEN\"} \ + https://api.github.com/repos/aseprite/skia/releases/latest \ + | jq -r .tag_name + ) + newhash=$(nix-prefetch-git --quiet --rev "$newver" https://github.com/aseprite/skia.git | jq -r '.hash') + sed \ + -e 's|version = ".*"|version = "'$newver'"|' \ + -e 's|hash = ".*"|hash = "'$newhash'"|' \ + -- "$pkgfile" +} + +temp=$(mktemp) +trap 'ret=$?; rm -rf -- "$temp"; exit $ret' EXIT +update_version > "$temp" +cp "$temp" "$pkgfile" +update_deps > "$temp" +cp "$temp" "$depfile" diff --git a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix b/pkgs/by-name/sk/skypeexport/package.nix index de70f49fe6040..2e6d72866073f 100644 --- a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix +++ b/pkgs/by-name/sk/skypeexport/package.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost }: -stdenv.mkDerivation rec { - pname = "SkypeExport"; +stdenv.mkDerivation (finalAttrs: { + pname = "skypeexport"; version = "1.4.0"; src = fetchFromGitHub { owner = "Temptin"; repo = "SkypeExport"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1ilkh0s3dz5cp83wwgmscnfmnyck5qcwqg1yxp9zv6s356dxnbak"; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ yana ]; }; -} +}) diff --git a/pkgs/by-name/sl/slumber/package.nix b/pkgs/by-name/sl/slumber/package.nix index fb485e4986248..b992ffe48c1f6 100644 --- a/pkgs/by-name/sl/slumber/package.nix +++ b/pkgs/by-name/sl/slumber/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "slumber"; - version = "1.3.2"; + version = "1.5.0"; src = fetchFromGitHub { owner = "LucasPickering"; repo = "slumber"; rev = "v${version}"; - hash = "sha256-aYNsTAqMcoOSRXWclrVR5DWQCTSDHXSQsSJn37yYPY8="; + hash = "sha256-7JXkyRhoSjGYhse+2/v3Ndogar10K4N3ZUZNGpMiQ/A="; }; - cargoHash = "sha256-uSKE8jFLYCEac2PR97VSPBnqllTsXkYZUO0b+xHR/CA="; + cargoHash = "sha256-wZcnaT8EjbdSX6Y/UNS7v9/hQ9ISxkyRwRqRotXPCWU="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; diff --git a/pkgs/by-name/sn/snx-rs/Cargo.lock b/pkgs/by-name/sn/snx-rs/Cargo.lock index e14f3e3e6c577..6ae6f4b141f87 100644 --- a/pkgs/by-name/sn/snx-rs/Cargo.lock +++ b/pkgs/by-name/sn/snx-rs/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -19,14 +19,13 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aes" -version = "0.7.5" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", "cpufeatures", - "opaque-debug", ] [[package]] @@ -85,9 +84,9 @@ dependencies = [ [[package]] name = "anstyle-query" -version = "1.0.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" +checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" dependencies = [ "windows-sys 0.52.0", ] @@ -104,9 +103,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "async-broadcast" @@ -120,25 +119,24 @@ dependencies = [ [[package]] name = "async-broadcast" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" dependencies = [ - "event-listener 5.3.0", - "event-listener-strategy 0.5.2", + "event-listener 5.3.1", + "event-listener-strategy", "futures-core", "pin-project-lite", ] [[package]] name = "async-channel" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f2776ead772134d55b62dd45e59a79e21612d85d0af729b8b7d3967d601a62a" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 5.3.0", - "event-listener-strategy 0.5.2", + "event-listener-strategy", "futures-core", "pin-project-lite", ] @@ -165,17 +163,17 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" dependencies = [ - "async-lock 3.3.0", + "async-lock 3.4.0", "cfg-if", "concurrent-queue", "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.7.0", + "polling 3.7.1", "rustix 0.38.34", "slab", "tracing", @@ -193,12 +191,12 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy 0.4.0", + "event-listener 5.3.1", + "event-listener-strategy", "pin-project-lite", ] @@ -221,18 +219,18 @@ dependencies = [ [[package]] name = "async-process" -version = "2.2.2" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a53fc6301894e04a92cb2584fedde80cb25ba8e02d9dc39d4a87d036e22f397d" +checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" dependencies = [ "async-channel", - "async-io 2.3.2", - "async-lock 3.3.0", + "async-io 2.3.3", + "async-lock 3.4.0", "async-signal", "async-task", "blocking", "cfg-if", - "event-listener 5.3.0", + "event-listener 5.3.1", "futures-lite 2.3.0", "rustix 0.38.34", "tracing", @@ -247,17 +245,17 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] name = "async-signal" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" +checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" dependencies = [ - "async-io 2.3.2", - "async-lock 3.3.0", + "async-io 2.3.3", + "async-lock 3.4.0", "atomic-waker", "cfg-if", "futures-core", @@ -282,7 +280,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -322,9 +320,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11" dependencies = [ "addr2line", "cc", @@ -372,29 +370,21 @@ dependencies = [ ] [[package]] -name = "block-modes" -version = "0.8.1" +name = "block-padding" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb03d1bed155d89dce0f845b7899b18a9a163e148fd004e1c28421a783e2d8e" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" dependencies = [ - "block-padding", - "cipher", + "generic-array", ] [[package]] -name = "block-padding" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" - -[[package]] name = "blocking" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ "async-channel", - "async-lock 3.3.0", "async-task", "futures-io", "futures-lite 2.3.0", @@ -476,10 +466,19 @@ dependencies = [ ] [[package]] +name = "cbc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" +dependencies = [ + "cipher", +] + +[[package]] name = "cc" -version = "1.0.97" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" +checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" [[package]] name = "cfg-expr" @@ -504,6 +503,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] name = "chrono" version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -520,18 +525,19 @@ dependencies = [ [[package]] name = "cipher" -version = "0.3.0" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "generic-array", + "crypto-common", + "inout", ] [[package]] name = "clap" -version = "4.5.4" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" dependencies = [ "clap_builder", "clap_derive", @@ -539,9 +545,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" dependencies = [ "anstream", "anstyle", @@ -551,21 +557,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.4" +version = "4.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" [[package]] name = "cocoa" @@ -663,27 +669,27 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crypto-common" @@ -762,13 +768,24 @@ dependencies = [ ] [[package]] -name = "dirs-next" -version = "2.0.0" +name = "dirs" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" dependencies = [ - "cfg-if", - "dirs-sys-next", + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", ] [[package]] @@ -783,6 +800,17 @@ dependencies = [ ] [[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] name = "dpi" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -790,9 +818,9 @@ checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" [[package]] name = "either" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "encoding_rs" @@ -818,14 +846,14 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] name = "enumflags2" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" dependencies = [ "enumflags2_derive", "serde", @@ -833,13 +861,13 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -877,20 +905,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "5.3.0" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", @@ -899,21 +916,11 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" -dependencies = [ - "event-listener 4.0.3", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 5.3.0", + "event-listener 5.3.1", "pin-project-lite", ] @@ -994,7 +1001,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -1102,7 +1109,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -1216,9 +1223,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "gio" @@ -1286,7 +1293,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -1359,20 +1366,20 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] name = "h2" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" dependencies = [ + "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "futures-util", "http", "indexmap", "slab", @@ -1452,12 +1459,12 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", - "futures-core", + "futures-util", "http", "http-body", "pin-project-lite", @@ -1465,9 +1472,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "9f3935c160d00ac752e09787e6e6bfc26494c2183cc922f1bc678a60d4733bc2" [[package]] name = "hyper" @@ -1507,9 +1514,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" dependencies = [ "bytes", "futures-channel", @@ -1549,13 +1556,133 @@ dependencies = [ ] [[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] name = "idna" -version = "0.5.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "icu_normalizer", + "icu_properties", + "smallvec", + "utf8_iter", ] [[package]] @@ -1569,10 +1696,20 @@ dependencies = [ ] [[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "block-padding", + "generic-array", +] + +[[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", ] @@ -1612,7 +1749,7 @@ checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" [[package]] name = "isakmp" version = "0.1.0" -source = "git+https://github.com/ancwrd1/isakmp.git#4733332e4a532c9d222fe16a7182d6787269c801" +source = "git+https://github.com/ancwrd1/isakmp.git#f958a02bd70bcaae8556ec9d5f8c0bdc97957cbd" dependencies = [ "anyhow", "async-trait", @@ -1632,9 +1769,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] @@ -1720,9 +1857,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.154" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libdbus-sys" @@ -1772,9 +1909,15 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "litemap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" [[package]] name = "lock_api" @@ -1833,9 +1976,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", "simd-adler32", @@ -1854,9 +1997,9 @@ dependencies = [ [[package]] name = "muda" -version = "0.13.2" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fde56ead0971b4caae4aa0f19502e49d1fac2af9d0c60068e2d235e26ce709" +checksum = "86b959f97c97044e4c96e32e1db292a7d594449546a3c6b77ae613dc3a5b5145" dependencies = [ "cocoa", "crossbeam-channel", @@ -1872,11 +2015,10 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -1908,12 +2050,24 @@ checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ "bitflags 2.5.0", "cfg-if", - "cfg_aliases", + "cfg_aliases 0.1.1", "libc", "memoffset 0.9.1", ] [[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "cfg_aliases 0.2.1", + "libc", +] + +[[package]] name = "normpath" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2026,9 +2180,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e" dependencies = [ "memchr", ] @@ -2040,16 +2194,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] -name = "opaque-debug" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" - -[[package]] name = "opener" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9901cb49d7fc923b256db329ee26ffed69130bf05d74b9efdd1875c92d6af01" +checksum = "f8df34be653210fbe9ffaff41d3b92721c56ce82dfee58ee684f9afb5e3a90c0" dependencies = [ "bstr", "dbus", @@ -2080,7 +2228,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -2102,6 +2250,12 @@ dependencies = [ ] [[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] name = "ordered-stream" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2150,9 +2304,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -2232,7 +2386,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -2263,7 +2417,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -2280,9 +2434,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" dependencies = [ "atomic-waker", "fastrand 2.1.0", @@ -2326,9 +2480,9 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" +checksum = "5e6a007746f34ed64099e88783b0ae369eaa3da6392868ba262e2af9b8fbaea1" dependencies = [ "cfg-if", "concurrent-queue", @@ -2399,9 +2553,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.82" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] @@ -2467,9 +2621,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -2479,9 +2633,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -2490,9 +2644,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "reqwest" @@ -2574,7 +2728,7 @@ dependencies = [ "bitflags 2.5.0", "errno", "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] @@ -2626,12 +2780,12 @@ dependencies = [ [[package]] name = "secret-service" -version = "3.0.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5da1a5ad4d28c03536f82f77d9f36603f5e37d8869ac98f0a750d5b5686d8d95" +checksum = "b5204d39df37f06d1944935232fd2dfe05008def7ca599bf28c0800366c8a8f9" dependencies = [ "aes", - "block-modes", + "cbc", "futures-util", "generic-array", "hkdf", @@ -2640,7 +2794,7 @@ dependencies = [ "rand", "serde", "sha2", - "zbus 3.15.1", + "zbus 3.15.2", ] [[package]] @@ -2674,22 +2828,22 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.201" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.201" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -2711,14 +2865,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -2747,6 +2901,12 @@ dependencies = [ ] [[package]] +name = "sha1_smol" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" + +[[package]] name = "sha2" version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2798,7 +2958,7 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "snx-rs" -version = "2.2.0" +version = "2.2.3" dependencies = [ "anyhow", "clap", @@ -2813,11 +2973,12 @@ dependencies = [ [[package]] name = "snx-rs-gui" -version = "2.2.0" +version = "2.2.3" dependencies = [ "anyhow", "async-channel", "clap", + "futures", "gtk", "hex", "ipnet", @@ -2829,11 +2990,12 @@ dependencies = [ "tracing-subscriber", "tray-icon", "webkit2gtk", + "zbus 4.2.2", ] [[package]] name = "snxcore" -version = "2.2.0" +version = "2.2.3" dependencies = [ "anyhow", "async-recursion", @@ -2849,7 +3011,7 @@ dependencies = [ "ipnet", "isakmp", "libc", - "nix 0.28.0", + "nix 0.29.0", "num-traits", "once_cell", "parking_lot", @@ -2868,12 +3030,13 @@ dependencies = [ "tokio-util", "tracing", "tun", - "zbus 4.2.1", + "uuid", + "zbus 4.2.2", ] [[package]] name = "snxctl" -version = "2.2.0" +version = "2.2.3" dependencies = [ "anyhow", "clap", @@ -2931,6 +3094,12 @@ dependencies = [ ] [[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] name = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2961,9 +3130,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.63" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf5be731623ca1a1fb7d8be6f261a3be6d3e2337b8a1f97be944d020c8fcb704" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -2977,6 +3146,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] name = "system-configuration" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3030,22 +3210,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -3059,25 +3239,20 @@ dependencies = [ ] [[package]] -name = "tinyvec" -version = "1.6.0" +name = "tinystr" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ - "tinyvec_macros", + "displaydoc", + "zerovec", ] [[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] name = "tokio" -version = "1.37.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", @@ -3094,13 +3269,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -3128,21 +3303,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.12", + "toml_edit 0.22.14", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] @@ -3182,15 +3357,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.12" +version = "0.22.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.8", + "winnow 0.6.13", ] [[package]] @@ -3206,7 +3381,6 @@ dependencies = [ "tokio", "tower-layer", "tower-service", - "tracing", ] [[package]] @@ -3227,7 +3401,6 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -3241,7 +3414,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", ] [[package]] @@ -3281,14 +3454,14 @@ dependencies = [ [[package]] name = "tray-icon" -version = "0.13.5" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39240037d755a1832e752d64f99078c3b0b21c09a71c12405070c75ef4e7cd3c" +checksum = "3ad8319cca93189ea9ab1b290de0595960529750b6b8b501a399ed1ec3775d60" dependencies = [ "cocoa", "core-graphics", "crossbeam-channel", - "dirs-next", + "dirs", "libappindicator", "muda", "objc", @@ -3346,27 +3519,12 @@ dependencies = [ ] [[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[package]] name = "unicode-segmentation" version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3374,9 +3532,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "url" -version = "2.5.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56" dependencies = [ "form_urlencoded", "idna", @@ -3384,10 +3542,32 @@ dependencies = [ ] [[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + +[[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "uuid" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +dependencies = [ + "getrandom", + "sha1_smol", +] [[package]] name = "valuable" @@ -3455,7 +3635,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -3489,7 +3669,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3754,9 +3934,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.8" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" dependencies = [ "memchr", ] @@ -3785,20 +3965,56 @@ dependencies = [ ] [[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + +[[package]] name = "xdg-home" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" dependencies = [ "libc", - "winapi", + "windows-sys 0.52.0", +] + +[[package]] +name = "yoke" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", + "synstructure", ] [[package]] name = "zbus" -version = "3.15.1" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5acecd3f8422f198b1a2f954bcc812fe89f3fa4281646f3da1da7925db80085d" +checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" dependencies = [ "async-broadcast 0.5.1", "async-process 1.8.1", @@ -3825,23 +4041,23 @@ dependencies = [ "uds_windows", "winapi", "xdg-home", - "zbus_macros 3.15.1", + "zbus_macros 3.15.2", "zbus_names 2.6.1", - "zvariant 3.15.1", + "zvariant 3.15.2", ] [[package]] name = "zbus" -version = "4.2.1" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5915716dff34abef1351d2b10305b019c8ef33dcf6c72d31a6e227d5d9d7a21" +checksum = "989c3977a7aafa97b12b9a35d21cdcff9b0d2289762b14683f45d66b1ba6c48f" dependencies = [ - "async-broadcast 0.7.0", - "async-process 2.2.2", + "async-broadcast 0.7.1", + "async-process 2.2.3", "async-recursion", "async-trait", "enumflags2", - "event-listener 5.3.0", + "event-listener 5.3.1", "futures-core", "futures-sink", "futures-util", @@ -3858,36 +4074,36 @@ dependencies = [ "uds_windows", "windows-sys 0.52.0", "xdg-home", - "zbus_macros 4.2.1", + "zbus_macros 4.2.2", "zbus_names 3.0.0", - "zvariant 4.1.0", + "zvariant 4.1.1", ] [[package]] name = "zbus_macros" -version = "3.15.1" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2207eb71efebda17221a579ca78b45c4c5f116f074eb745c3a172e688ccf89f5" +checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", "regex", "syn 1.0.109", - "zvariant_utils", + "zvariant_utils 1.0.1", ] [[package]] name = "zbus_macros" -version = "4.2.1" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66fceb36d0c1c4a6b98f3ce40f410e64e5a134707ed71892e1b178abc4c695d4" +checksum = "6fe9de53245dcf426b7be226a4217dd5e339080e5d46e64a02d6e5dcbf90fca1" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 1.0.109", - "zvariant_utils", + "syn 2.0.66", + "zvariant_utils 2.0.0", ] [[package]] @@ -3898,7 +4114,7 @@ checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" dependencies = [ "serde", "static_assertions", - "zvariant 3.15.1", + "zvariant 3.15.2", ] [[package]] @@ -3909,75 +4125,129 @@ checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" dependencies = [ "serde", "static_assertions", - "zvariant 4.1.0", + "zvariant 4.1.1", +] + +[[package]] +name = "zerofrom" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", + "synstructure", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + +[[package]] +name = "zerovec" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] [[package]] name = "zvariant" -version = "3.15.1" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5b4fcf3660d30fc33ae5cd97e2017b23a96e85afd7a1dd014534cd0bf34ba67" +checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" dependencies = [ "byteorder", "enumflags2", "libc", "serde", "static_assertions", - "zvariant_derive 3.15.1", + "zvariant_derive 3.15.2", ] [[package]] name = "zvariant" -version = "4.1.0" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877ef94e5e82b231d2a309c531f191a8152baba8241a7939ee04bd76b0171308" +checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7" dependencies = [ "endi", "enumflags2", "serde", "static_assertions", - "zvariant_derive 4.1.0", + "zvariant_derive 4.1.1", ] [[package]] name = "zvariant_derive" -version = "3.15.1" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0277758a8a0afc0e573e80ed5bfd9d9c2b48bd3108ffe09384f9f738c83f4a55" +checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", - "zvariant_utils", + "zvariant_utils 1.0.1", ] [[package]] name = "zvariant_derive" -version = "4.1.0" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7ca98581cc6a8120789d8f1f0997e9053837d6aa5346cbb43454d7121be6e39" +checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 1.0.109", - "zvariant_utils", + "syn 2.0.66", + "zvariant_utils 2.0.0", ] [[package]] name = "zvariant_utils" -version = "1.1.1" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75fa7291bdd68cd13c4f97cc9d78cbf16d96305856dfc7ac942aeff4c2de7d5a" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" dependencies = [ "proc-macro2", "quote", "syn 1.0.109", ] + +[[package]] +name = "zvariant_utils" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix index 65bf8ee2d1045..ff8ee2deb50e7 100644 --- a/pkgs/by-name/sn/snx-rs/package.nix +++ b/pkgs/by-name/sn/snx-rs/package.nix @@ -1,13 +1,13 @@ { fetchFromGitHub, rustPlatform, lib, pkg-config, openssl, glib, atk, gtk3, libsoup, webkitgtk_4_1 }: rustPlatform.buildRustPackage { pname = "snx-rs"; - version = "2.2.0"; + version = "2.2.3"; src = fetchFromGitHub { owner = "ancwrd1"; repo = "snx-rs"; - rev = "v2.2.0"; - hash = "sha256-9aBJM20+G1U2NuJXBmax50o3M/lwRpLeqdcHCA28iAw="; + rev = "v2.2.3"; + hash = "sha256-tBl67uDeYVmVBwi8NQVclfFQ0Sj1dl+hR8Jct1iE2LI="; }; nativeBuildInputs = [ pkg-config ]; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "isakmp-0.1.0" = "sha256-Gk0/tyIQ62kH6ZSW6ov8SMVR2UBEWkz8HfqeWjSXmlY="; + "isakmp-0.1.0" = "sha256-6v5xhkt9iaQg3Eh8S1tXW55oLv4YFDYvY0cfsepMuIM="; }; }; diff --git a/pkgs/by-name/so/sourcery/package.nix b/pkgs/by-name/so/sourcery/package.nix index 69cd4f5af5f21..79f469347a89a 100644 --- a/pkgs/by-name/so/sourcery/package.nix +++ b/pkgs/by-name/so/sourcery/package.nix @@ -4,25 +4,25 @@ python3Packages, fetchPypi, autoPatchelfHook, - libxcrypt-legacy, + zlib, }: let platformInfos = { "x86_64-linux" = { platform = "manylinux1_x86_64"; - hash = "sha256-gr5z8VYkuCqgmcnyA01/Ez6aX9NrKR4MgA0Bc6IHnfs="; + hash = "sha256-IJFuMtrddHciuHGeiCuv4hgco9E3GJveegL7dBmVmAw="; }; "x86_64-darwin" = { platform = "macosx_10_9_universal2"; - hash = "sha256-5LsxeozPgInUC1QAxDSlr8NIfmRSl5BN+g9/ZYAxiRE="; + hash = "sha256-eTD8NnmDTMSB0dt5skPOlWbnW6AexxEkKZ9ABc+kUas="; }; }; platformInfo = platformInfos.${stdenv.system} or (throw "Unsupported platform ${stdenv.system}"); in python3Packages.buildPythonApplication rec { pname = "sourcery"; - version = "1.16.0"; + version = "1.19.0"; format = "wheel"; src = fetchPypi { @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; - buildInputs = [ libxcrypt-legacy ]; + buildInputs = [ zlib ]; meta = { changelog = "https://sourcery.ai/changelog/"; diff --git a/pkgs/by-name/sp/spades/package.nix b/pkgs/by-name/sp/spades/package.nix new file mode 100644 index 0000000000000..9a60ee499a645 --- /dev/null +++ b/pkgs/by-name/sp/spades/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchurl, + zlib, + bzip2, + cmake, + python3, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "spades"; + version = "3.15.5"; + + src = fetchurl { + url = "https://github.com/ablab/spades/releases/download/v${finalAttrs.version}/SPAdes-${finalAttrs.version}.tar.gz"; + hash = "sha256-FVw2QNVx8uexmgUDHR/Q0ZvYLfeF04hw+5O9JBsSu/o="; + }; + sourceRoot = "SPAdes-${finalAttrs.version}/src"; + + env.CXXFLAGS = toString [ + # GCC 13: error: 'uint32_t' does not name a type + "-include cstdint" + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + zlib + bzip2 + python3 + ]; + + doCheck = true; + + meta = { + description = "St. Petersburg genome assembler, a toolkit for assembling and analyzing sequencing data"; + license = lib.licenses.gpl2Only; + homepage = "http://ablab.github.io/spades"; + platforms = [ + "x86_64-linux" + "x86_64-darwin" + ]; + maintainers = with lib.maintainers; [ bzizou ]; + }; +}) diff --git a/pkgs/by-name/sp/spatial-shell/package.nix b/pkgs/by-name/sp/spatial-shell/package.nix new file mode 100644 index 0000000000000..4b741f8aaec2b --- /dev/null +++ b/pkgs/by-name/sp/spatial-shell/package.nix @@ -0,0 +1,37 @@ +{ lib +, ocamlPackages +, fetchFromGitHub +, scdoc +}: + +ocamlPackages.buildDunePackage rec { + pname = "spatial-shell"; + version = "7"; + + src = fetchFromGitHub { + owner = "lthms"; + repo = "spatial-shell"; + rev = version; + hash = "sha256-OeNBP/jea1ABh/WpvCP7We+L20WoTfLZH71raH7bKPI="; + }; + + nativeBuildInputs = [ + scdoc + ]; + + buildInputs = with ocamlPackages; [ + cmdliner + ezjsonm-encoding + poll + ]; + + meta = { + description = "Implementing a spatial model inspired by Material Shell, for i3 and sway"; + homepage = "https://spatial-shell.app"; + changelog = "https://github.com/lthms/spatial-shell/blob/${src.rev}/CHANGES.md"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ fgaz ]; + mainProgram = "spatial"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/sp/sploitscan/package.nix b/pkgs/by-name/sp/sploitscan/package.nix new file mode 100644 index 0000000000000..85477ba19b6d2 --- /dev/null +++ b/pkgs/by-name/sp/sploitscan/package.nix @@ -0,0 +1,45 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "sploitscan"; + version = "0.9.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "xaitax"; + repo = "SploitScan"; + rev = "refs/tags/v${version}"; + hash = "sha256-l2nLqQoM5TuOezobipBV+s/nXTw37xhop/xpipLL1Bs="; + }; + + pythonRelaxDeps = [ + "openai" + "requests" + ]; + + build-system = with python3.pkgs; [ + setuptools + ]; + + nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; + + dependencies = with python3.pkgs; [ + jinja2 + openai + requests + ]; + + pythonImportsCheck = [ "sploitscan" ]; + + meta = with lib; { + description = "Cybersecurity utility designed to provide detailed information on vulnerabilities and associated exploits"; + homepage = "https://github.com/xaitax/SploitScan"; + changelog = "https://github.com/xaitax/SploitScan/releases/tag/v${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + mainProgram = "sploitscan"; + }; +} diff --git a/pkgs/by-name/sp/spoof/package-lock.json b/pkgs/by-name/sp/spoof/package-lock.json new file mode 100644 index 0000000000000..9604e8fcf4af7 --- /dev/null +++ b/pkgs/by-name/sp/spoof/package-lock.json @@ -0,0 +1,3472 @@ +{ + "name": "spoof", + "version": "2.0.4", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "spoof", + "version": "2.0.4", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "chalk": "^4.1.0", + "common-tags": "^1.8.0", + "minimist": "^1.2.5", + "shell-quote": "^1.7.2", + "winreg": "^1.2.4", + "zero-fill": "^2.2.4" + }, + "bin": { + "spoof": "bin/cmd.js" + }, + "devDependencies": { + "standard": "*", + "tape": "^5.0.1" + } + }, + "node_modules/@aashutoshrathi/word-wrap": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", + "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", + "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", + "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", + "dev": true, + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "dev": true, + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^9.6.0", + "globals": "^13.19.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint/js": { + "version": "8.56.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz", + "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.11.14", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", + "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", + "dev": true, + "dependencies": { + "@humanwhocodes/object-schema": "^2.0.2", + "debug": "^4.3.1", + "minimatch": "^3.0.5" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@humanwhocodes/object-schema": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz", + "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==", + "dev": true + }, + "node_modules/@ljharb/resumer": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/@ljharb/resumer/-/resumer-0.0.1.tgz", + "integrity": "sha512-skQiAOrCfO7vRTq53cxznMpks7wS1va95UCidALlOVWqvBAzwPVErwizDwoMqNVMEn1mDq0utxZd02eIrvF1lw==", + "dev": true, + "dependencies": { + "@ljharb/through": "^2.3.9" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/@ljharb/through": { + "version": "2.3.12", + "resolved": "https://registry.npmjs.org/@ljharb/through/-/through-2.3.12.tgz", + "integrity": "sha512-ajo/heTlG3QgC8EGP6APIejksVAYt4ayz4tqoP3MolFELzcH1x1fzwEYRJTPO0IELutZ5HQ0c26/GqAYy79u3g==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.5" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@types/json5": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", + "dev": true + }, + "node_modules/@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "dev": true + }, + "node_modules/acorn": { + "version": "8.11.3", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", + "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/array-buffer-byte-length": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz", + "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "is-array-buffer": "^3.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array-includes": { + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz", + "integrity": "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1", + "is-string": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.every": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/array.prototype.every/-/array.prototype.every-1.1.5.tgz", + "integrity": "sha512-FfMQJ+/joFGXpRCltbzV3znaP5QxIhLFySo0fEPn3GuoYlud9LhknMCIxdYKC2qsM/6VHoSp6YGwe3EZXrEcwQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "is-string": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.findlastindex": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz", + "integrity": "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "es-shim-unscopables": "^1.0.0", + "get-intrinsic": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.flat": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz", + "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "es-shim-unscopables": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.flatmap": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz", + "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "es-shim-unscopables": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.tosorted": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.2.tgz", + "integrity": "sha512-HuQCHOlk1Weat5jzStICBCd83NxiIMwqDg/dHEsoefabn/hJRj5pVdWcPUSpRrwhwxZOsQassMpgN/xRYFBMIg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "es-shim-unscopables": "^1.0.0", + "get-intrinsic": "^1.2.1" + } + }, + "node_modules/arraybuffer.prototype.slice": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz", + "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==", + "dev": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.0", + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1", + "is-array-buffer": "^3.0.2", + "is-shared-array-buffer": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/asynciterator.prototype": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/asynciterator.prototype/-/asynciterator.prototype-1.0.0.tgz", + "integrity": "sha512-wwHYEIS0Q80f5mosx3L/dfG5t5rjEa9Ft51GTaNt862EnpyGHpgz2RkZvLPp1oF5TnAiTohkEKVEu8pQPJI7Vg==", + "dev": true, + "dependencies": { + "has-symbols": "^1.0.3" + } + }, + "node_modules/available-typed-arrays": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.6.tgz", + "integrity": "sha512-j1QzY8iPNPG4o4xmO3ptzpRxTciqD3MgEHtifP/YnJpIo58Xu+ne4BejlbkuaLfXn/nz6HFiw29bLpj2PNMdGg==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/builtins": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz", + "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==", + "dev": true, + "dependencies": { + "semver": "^7.0.0" + } + }, + "node_modules/builtins/node_modules/semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/call-bind": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz", + "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.1", + "set-function-length": "^1.1.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/common-tags": { + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz", + "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==", + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true + }, + "node_modules/cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/deep-equal": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz", + "integrity": "sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==", + "dev": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.0", + "call-bind": "^1.0.5", + "es-get-iterator": "^1.1.3", + "get-intrinsic": "^1.2.2", + "is-arguments": "^1.1.1", + "is-array-buffer": "^3.0.2", + "is-date-object": "^1.0.5", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.2", + "isarray": "^2.0.5", + "object-is": "^1.1.5", + "object-keys": "^1.1.1", + "object.assign": "^4.1.4", + "regexp.prototype.flags": "^1.5.1", + "side-channel": "^1.0.4", + "which-boxed-primitive": "^1.0.2", + "which-collection": "^1.0.1", + "which-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true + }, + "node_modules/define-data-property": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz", + "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/define-properties": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", + "dev": true, + "dependencies": { + "define-data-property": "^1.0.1", + "has-property-descriptors": "^1.0.0", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/defined": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz", + "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/dotignore": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/dotignore/-/dotignore-0.1.2.tgz", + "integrity": "sha512-UGGGWfSauusaVJC+8fgV+NVvBXkCTmVv7sk6nojDZZvuOUNGUy0Zk4UpHQD6EDjS0jpBwcACvH4eofvyzBcRDw==", + "dev": true, + "dependencies": { + "minimatch": "^3.0.4" + }, + "bin": { + "ignored": "bin/ignored" + } + }, + "node_modules/error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dev": true, + "dependencies": { + "is-arrayish": "^0.2.1" + } + }, + "node_modules/es-abstract": { + "version": "1.22.3", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz", + "integrity": "sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==", + "dev": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.0", + "arraybuffer.prototype.slice": "^1.0.2", + "available-typed-arrays": "^1.0.5", + "call-bind": "^1.0.5", + "es-set-tostringtag": "^2.0.1", + "es-to-primitive": "^1.2.1", + "function.prototype.name": "^1.1.6", + "get-intrinsic": "^1.2.2", + "get-symbol-description": "^1.0.0", + "globalthis": "^1.0.3", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0", + "internal-slot": "^1.0.5", + "is-array-buffer": "^3.0.2", + "is-callable": "^1.2.7", + "is-negative-zero": "^2.0.2", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.2", + "is-string": "^1.0.7", + "is-typed-array": "^1.1.12", + "is-weakref": "^1.0.2", + "object-inspect": "^1.13.1", + "object-keys": "^1.1.1", + "object.assign": "^4.1.4", + "regexp.prototype.flags": "^1.5.1", + "safe-array-concat": "^1.0.1", + "safe-regex-test": "^1.0.0", + "string.prototype.trim": "^1.2.8", + "string.prototype.trimend": "^1.0.7", + "string.prototype.trimstart": "^1.0.7", + "typed-array-buffer": "^1.0.0", + "typed-array-byte-length": "^1.0.0", + "typed-array-byte-offset": "^1.0.0", + "typed-array-length": "^1.0.4", + "unbox-primitive": "^1.0.2", + "which-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/es-get-iterator": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz", + "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.3", + "has-symbols": "^1.0.3", + "is-arguments": "^1.1.1", + "is-map": "^2.0.2", + "is-set": "^2.0.2", + "is-string": "^1.0.7", + "isarray": "^2.0.5", + "stop-iteration-iterator": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/es-iterator-helpers": { + "version": "1.0.15", + "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.15.tgz", + "integrity": "sha512-GhoY8uYqd6iwUl2kgjTm4CZAf6oo5mHK7BPqx3rKgx893YSsy0LGHV6gfqqQvZt/8xM8xeOnfXBCfqclMKkJ5g==", + "dev": true, + "dependencies": { + "asynciterator.prototype": "^1.0.0", + "call-bind": "^1.0.2", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.1", + "es-set-tostringtag": "^2.0.1", + "function-bind": "^1.1.1", + "get-intrinsic": "^1.2.1", + "globalthis": "^1.0.3", + "has-property-descriptors": "^1.0.0", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "internal-slot": "^1.0.5", + "iterator.prototype": "^1.1.2", + "safe-array-concat": "^1.0.1" + } + }, + "node_modules/es-set-tostringtag": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz", + "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.2", + "has-tostringtag": "^1.0.0", + "hasown": "^2.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-shim-unscopables": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz", + "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==", + "dev": true, + "dependencies": { + "hasown": "^2.0.0" + } + }, + "node_modules/es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, + "dependencies": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint": { + "version": "8.56.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz", + "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==", + "dev": true, + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.56.0", + "@humanwhocodes/config-array": "^0.11.13", + "@humanwhocodes/module-importer": "^1.0.1", + "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", + "ajv": "^6.12.4", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "doctrine": "^3.0.0", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", + "esquery": "^1.4.2", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "globals": "^13.19.0", + "graphemer": "^1.4.0", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "is-path-inside": "^3.0.3", + "js-yaml": "^4.1.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3", + "strip-ansi": "^6.0.1", + "text-table": "^0.2.0" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-config-standard": { + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz", + "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "eslint": "^8.0.1", + "eslint-plugin-import": "^2.25.2", + "eslint-plugin-n": "^15.0.0 || ^16.0.0 ", + "eslint-plugin-promise": "^6.0.0" + } + }, + "node_modules/eslint-config-standard-jsx": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-11.0.0.tgz", + "integrity": "sha512-+1EV/R0JxEK1L0NGolAr8Iktm3Rgotx3BKwgaX+eAuSX8D952LULKtjgZD3F+e6SvibONnhLwoTi9DPxN5LvvQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "peerDependencies": { + "eslint": "^8.8.0", + "eslint-plugin-react": "^7.28.0" + } + }, + "node_modules/eslint-import-resolver-node": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", + "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", + "dev": true, + "dependencies": { + "debug": "^3.2.7", + "is-core-module": "^2.13.0", + "resolve": "^1.22.4" + } + }, + "node_modules/eslint-import-resolver-node/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-module-utils": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz", + "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==", + "dev": true, + "dependencies": { + "debug": "^3.2.7" + }, + "engines": { + "node": ">=4" + }, + "peerDependenciesMeta": { + "eslint": { + "optional": true + } + } + }, + "node_modules/eslint-module-utils/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-plugin-es": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz", + "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==", + "dev": true, + "dependencies": { + "eslint-utils": "^2.0.0", + "regexpp": "^3.0.0" + }, + "engines": { + "node": ">=8.10.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=4.19.1" + } + }, + "node_modules/eslint-plugin-es/node_modules/eslint-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^1.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + } + }, + "node_modules/eslint-plugin-es/node_modules/eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-plugin-import": { + "version": "2.29.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz", + "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==", + "dev": true, + "dependencies": { + "array-includes": "^3.1.7", + "array.prototype.findlastindex": "^1.2.3", + "array.prototype.flat": "^1.3.2", + "array.prototype.flatmap": "^1.3.2", + "debug": "^3.2.7", + "doctrine": "^2.1.0", + "eslint-import-resolver-node": "^0.3.9", + "eslint-module-utils": "^2.8.0", + "hasown": "^2.0.0", + "is-core-module": "^2.13.1", + "is-glob": "^4.0.3", + "minimatch": "^3.1.2", + "object.fromentries": "^2.0.7", + "object.groupby": "^1.0.1", + "object.values": "^1.1.7", + "semver": "^6.3.1", + "tsconfig-paths": "^3.15.0" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8" + } + }, + "node_modules/eslint-plugin-import/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-plugin-import/node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eslint-plugin-n": { + "version": "15.7.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz", + "integrity": "sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==", + "dev": true, + "dependencies": { + "builtins": "^5.0.1", + "eslint-plugin-es": "^4.1.0", + "eslint-utils": "^3.0.0", + "ignore": "^5.1.1", + "is-core-module": "^2.11.0", + "minimatch": "^3.1.2", + "resolve": "^1.22.1", + "semver": "^7.3.8" + }, + "engines": { + "node": ">=12.22.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=7.0.0" + } + }, + "node_modules/eslint-plugin-n/node_modules/semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint-plugin-promise": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.1.1.tgz", + "integrity": "sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" + } + }, + "node_modules/eslint-plugin-react": { + "version": "7.33.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz", + "integrity": "sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==", + "dev": true, + "dependencies": { + "array-includes": "^3.1.6", + "array.prototype.flatmap": "^1.3.1", + "array.prototype.tosorted": "^1.1.1", + "doctrine": "^2.1.0", + "es-iterator-helpers": "^1.0.12", + "estraverse": "^5.3.0", + "jsx-ast-utils": "^2.4.1 || ^3.0.0", + "minimatch": "^3.1.2", + "object.entries": "^1.1.6", + "object.fromentries": "^2.0.6", + "object.hasown": "^1.1.2", + "object.values": "^1.1.6", + "prop-types": "^15.8.1", + "resolve": "^2.0.0-next.4", + "semver": "^6.3.1", + "string.prototype.matchall": "^4.0.8" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8" + } + }, + "node_modules/eslint-plugin-react/node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eslint-plugin-react/node_modules/resolve": { + "version": "2.0.0-next.5", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz", + "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==", + "dev": true, + "dependencies": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/eslint-scope": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "dev": true, + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-utils": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", + "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^2.0.0" + }, + "engines": { + "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=5" + } + }, + "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/espree": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "dev": true, + "dependencies": { + "acorn": "^8.9.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/esquery": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", + "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", + "dev": true, + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true + }, + "node_modules/fastq": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.0.tgz", + "integrity": "sha512-zGygtijUMT7jnk3h26kUms3BkSDp4IfIKjmnqI2tvx6nuBfiF1UqOxbnLfzdv+apBy+53oaImsKtMw/xYbW+1w==", + "dev": true, + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "dependencies": { + "flat-cache": "^3.0.4" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat-cache": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "dev": true, + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.3", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/flatted": { + "version": "3.2.9", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", + "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", + "dev": true + }, + "node_modules/for-each": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", + "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", + "dev": true, + "dependencies": { + "is-callable": "^1.1.3" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/function.prototype.name": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", + "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "functions-have-names": "^1.2.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/functions-have-names": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", + "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-intrinsic": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz", + "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-package-type": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", + "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", + "dev": true, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/get-stdin": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz", + "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/get-symbol-description": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", + "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/globals": { + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "dev": true, + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globalthis": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz", + "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==", + "dev": true, + "dependencies": { + "define-properties": "^1.1.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.1.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true + }, + "node_modules/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true + }, + "node_modules/has-bigints": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", + "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-dynamic-import": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/has-dynamic-import/-/has-dynamic-import-2.1.0.tgz", + "integrity": "sha512-su0anMkNEnJKZ/rB99jn3y6lV/J8Ro96hBJ28YAeVzj5rWxH+YL/AdCyiYYA1HDLV9YhmvqpWSJJj2KLo1MX6g==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.5", + "get-intrinsic": "^1.2.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/has-property-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz", + "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", + "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-symbols": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-tostringtag": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "dev": true, + "dependencies": { + "has-symbols": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hasown": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz", + "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/ignore": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", + "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", + "dev": true, + "engines": { + "node": ">= 4" + } + }, + "node_modules/import-fresh": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "dev": true, + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "dev": true, + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true + }, + "node_modules/internal-slot": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz", + "integrity": "sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.2", + "hasown": "^2.0.0", + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/is-arguments": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", + "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-array-buffer": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", + "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.0", + "is-typed-array": "^1.1.10" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "dev": true + }, + "node_modules/is-async-function": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz", + "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-bigint": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", + "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", + "dev": true, + "dependencies": { + "has-bigints": "^1.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-boolean-object": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", + "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-callable": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-core-module": { + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", + "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", + "dev": true, + "dependencies": { + "hasown": "^2.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-date-object": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", + "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-finalizationregistry": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz", + "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-generator-function": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", + "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-map": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz", + "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-negative-zero": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", + "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-number-object": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", + "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-regex": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", + "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-set": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz", + "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-shared-array-buffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", + "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-string": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", + "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-symbol": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", + "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", + "dev": true, + "dependencies": { + "has-symbols": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-typed-array": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz", + "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==", + "dev": true, + "dependencies": { + "which-typed-array": "^1.1.14" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakmap": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz", + "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakref": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", + "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakset": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz", + "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true + }, + "node_modules/iterator.prototype": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz", + "integrity": "sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==", + "dev": true, + "dependencies": { + "define-properties": "^1.2.1", + "get-intrinsic": "^1.2.1", + "has-symbols": "^1.0.3", + "reflect.getprototypeof": "^1.0.4", + "set-function-name": "^2.0.1" + } + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true + }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true + }, + "node_modules/json-parse-better-errors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", + "dev": true + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true + }, + "node_modules/json5": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", + "dev": true, + "dependencies": { + "minimist": "^1.2.0" + }, + "bin": { + "json5": "lib/cli.js" + } + }, + "node_modules/jsx-ast-utils": { + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", + "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==", + "dev": true, + "dependencies": { + "array-includes": "^3.1.6", + "array.prototype.flat": "^1.3.1", + "object.assign": "^4.1.4", + "object.values": "^1.1.6" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "dependencies": { + "json-buffer": "3.0.1" + } + }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/load-json-file": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz", + "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.1.15", + "parse-json": "^4.0.0", + "pify": "^4.0.1", + "strip-bom": "^3.0.0", + "type-fest": "^0.3.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/load-json-file/node_modules/type-fest": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz", + "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true + }, + "node_modules/loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "dev": true, + "dependencies": { + "js-tokens": "^3.0.0 || ^4.0.0" + }, + "bin": { + "loose-envify": "cli.js" + } + }, + "node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/mock-property": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/mock-property/-/mock-property-1.0.3.tgz", + "integrity": "sha512-2emPTb1reeLLYwHxyVx993iYyCHEiRRO+y8NFXFPL5kl5q14sgTK76cXyEKkeKCHeRw35SfdkUJ10Q1KfHuiIQ==", + "dev": true, + "dependencies": { + "define-data-property": "^1.1.1", + "functions-have-names": "^1.2.3", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0", + "hasown": "^2.0.0", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true + }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-inspect": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", + "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object-is": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz", + "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.assign": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz", + "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "has-symbols": "^1.0.3", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.entries": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.7.tgz", + "integrity": "sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.fromentries": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz", + "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.groupby": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.1.tgz", + "integrity": "sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1" + } + }, + "node_modules/object.hasown": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.3.tgz", + "integrity": "sha512-fFI4VcYpRHvSLXxP7yiZOMAd331cPfd2p7PFDVbgUsYOfCT3tICVqXWngbjr4m49OvsBwUBQ6O2uQoJvy3RexA==", + "dev": true, + "dependencies": { + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.values": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz", + "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/optionator": { + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", + "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", + "dev": true, + "dependencies": { + "@aashutoshrathi/word-wrap": "^1.2.3", + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==", + "dev": true, + "dependencies": { + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true + }, + "node_modules/pify": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-3.1.0.tgz", + "integrity": "sha512-m0OTbR/5VPNPqO1ph6Fqbj7Hv6QU7gR/tQW40ZqrL1rjgCU85W6C1bJn0BItuJqnR98PWzw7Z8hHeChD1WrgdQ==", + "dev": true, + "dependencies": { + "find-up": "^3.0.0", + "load-json-file": "^5.2.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "dependencies": { + "locate-path": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "dependencies": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-conf/node_modules/p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "dependencies": { + "p-limit": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/prop-types": { + "version": "15.8.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", + "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", + "dev": true, + "dependencies": { + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.13.1" + } + }, + "node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "dev": true + }, + "node_modules/reflect.getprototypeof": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.4.tgz", + "integrity": "sha512-ECkTw8TmJwW60lOTR+ZkODISW6RQ8+2CL3COqtiJKLd6MmB45hN51HprHFziKLGkAuTGQhBb91V8cy+KHlaCjw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1", + "globalthis": "^1.0.3", + "which-builtin-type": "^1.1.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/regexp.prototype.flags": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz", + "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "set-function-name": "^2.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/regexpp": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", + "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + } + }, + "node_modules/resolve": { + "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + "dev": true, + "dependencies": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true, + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/safe-array-concat": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.0.tgz", + "integrity": "sha512-ZdQ0Jeb9Ofti4hbt5lX3T2JcAamT9hfzYU1MNB+z/jaEbB6wfFfPIR/zEORmZqobkCCJhSjodobH6WHNmJ97dg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.5", + "get-intrinsic": "^1.2.2", + "has-symbols": "^1.0.3", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">=0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safe-regex-test": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.2.tgz", + "integrity": "sha512-83S9w6eFq12BBIJYvjMux6/dkirb8+4zJRA9cxNBVb7Wq5fJBW+Xze48WqR8pxua7bDuAaaAxtVVd4Idjp1dBQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.5", + "get-intrinsic": "^1.2.2", + "is-regex": "^1.1.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/set-function-length": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.0.tgz", + "integrity": "sha512-4DBHDoyHlM1IRPGYcoxexgh67y4ueR53FKV1yyxwFMY7aCqcN/38M1+SwZ/qJQ8iLv7+ck385ot4CcisOAPT9w==", + "dev": true, + "dependencies": { + "define-data-property": "^1.1.1", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.2", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/set-function-name": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz", + "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==", + "dev": true, + "dependencies": { + "define-data-property": "^1.0.1", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/shell-quote": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz", + "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", + "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.0", + "get-intrinsic": "^1.0.2", + "object-inspect": "^1.9.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/standard": { + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/standard/-/standard-17.1.0.tgz", + "integrity": "sha512-jaDqlNSzLtWYW4lvQmU0EnxWMUGQiwHasZl5ZEIwx3S/ijZDjZOzs1y1QqKwKs5vqnFpGtizo4NOYX2s0Voq/g==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "eslint": "^8.41.0", + "eslint-config-standard": "17.1.0", + "eslint-config-standard-jsx": "^11.0.0", + "eslint-plugin-import": "^2.27.5", + "eslint-plugin-n": "^15.7.0", + "eslint-plugin-promise": "^6.1.1", + "eslint-plugin-react": "^7.32.2", + "standard-engine": "^15.0.0", + "version-guard": "^1.1.1" + }, + "bin": { + "standard": "bin/cmd.cjs" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/standard-engine": { + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-15.1.0.tgz", + "integrity": "sha512-VHysfoyxFu/ukT+9v49d4BRXIokFRZuH3z1VRxzFArZdjSCFpro6rEIU3ji7e4AoAtuSfKBkiOmsrDqKW5ZSRw==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "get-stdin": "^8.0.0", + "minimist": "^1.2.6", + "pkg-conf": "^3.1.0", + "xdg-basedir": "^4.0.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/stop-iteration-iterator": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz", + "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==", + "dev": true, + "dependencies": { + "internal-slot": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/string.prototype.matchall": { + "version": "4.0.10", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.10.tgz", + "integrity": "sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1", + "has-symbols": "^1.0.3", + "internal-slot": "^1.0.5", + "regexp.prototype.flags": "^1.5.0", + "set-function-name": "^2.0.0", + "side-channel": "^1.0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trim": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz", + "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimend": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz", + "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimstart": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz", + "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/tape": { + "version": "5.7.4", + "resolved": "https://registry.npmjs.org/tape/-/tape-5.7.4.tgz", + "integrity": "sha512-uaigP+5H9+E8aaMLKMbGkDd33G5TKu4UFpapqT7um+8xSHQQUS2lJNd+hTj9fFVQLg8bmcIofwc8b9f6+ISSfQ==", + "dev": true, + "dependencies": { + "@ljharb/resumer": "^0.0.1", + "@ljharb/through": "^2.3.11", + "array.prototype.every": "^1.1.5", + "call-bind": "^1.0.5", + "deep-equal": "^2.2.3", + "defined": "^1.0.1", + "dotignore": "^0.1.2", + "for-each": "^0.3.3", + "get-package-type": "^0.1.0", + "glob": "^7.2.3", + "has-dynamic-import": "^2.1.0", + "hasown": "^2.0.0", + "inherits": "^2.0.4", + "is-regex": "^1.1.4", + "minimist": "^1.2.8", + "mock-property": "^1.0.3", + "object-inspect": "^1.13.1", + "object-is": "^1.1.5", + "object-keys": "^1.1.1", + "object.assign": "^4.1.5", + "resolve": "^2.0.0-next.5", + "string.prototype.trim": "^1.2.8" + }, + "bin": { + "tape": "bin/tape" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/tape/node_modules/resolve": { + "version": "2.0.0-next.5", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz", + "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==", + "dev": true, + "dependencies": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true + }, + "node_modules/tsconfig-paths": { + "version": "3.15.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz", + "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==", + "dev": true, + "dependencies": { + "@types/json5": "^0.0.29", + "json5": "^1.0.2", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + } + }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/typed-array-buffer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz", + "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.1", + "is-typed-array": "^1.1.10" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/typed-array-byte-length": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz", + "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "has-proto": "^1.0.1", + "is-typed-array": "^1.1.10" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-byte-offset": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz", + "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==", + "dev": true, + "dependencies": { + "available-typed-arrays": "^1.0.5", + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "has-proto": "^1.0.1", + "is-typed-array": "^1.1.10" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-length": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz", + "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "is-typed-array": "^1.1.9" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/unbox-primitive": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", + "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "has-bigints": "^1.0.2", + "has-symbols": "^1.0.3", + "which-boxed-primitive": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/version-guard": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/version-guard/-/version-guard-1.1.1.tgz", + "integrity": "sha512-MGQLX89UxmYHgDvcXyjBI0cbmoW+t/dANDppNPrno64rYr8nH4SHSuElQuSYdXGEs0mUzdQe1BY+FhVPNsAmJQ==", + "dev": true, + "engines": { + "node": ">=0.10.48" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/which-boxed-primitive": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", + "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", + "dev": true, + "dependencies": { + "is-bigint": "^1.0.1", + "is-boolean-object": "^1.1.0", + "is-number-object": "^1.0.4", + "is-string": "^1.0.5", + "is-symbol": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-builtin-type": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.3.tgz", + "integrity": "sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==", + "dev": true, + "dependencies": { + "function.prototype.name": "^1.1.5", + "has-tostringtag": "^1.0.0", + "is-async-function": "^2.0.0", + "is-date-object": "^1.0.5", + "is-finalizationregistry": "^1.0.2", + "is-generator-function": "^1.0.10", + "is-regex": "^1.1.4", + "is-weakref": "^1.0.2", + "isarray": "^2.0.5", + "which-boxed-primitive": "^1.0.2", + "which-collection": "^1.0.1", + "which-typed-array": "^1.1.9" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-collection": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz", + "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==", + "dev": true, + "dependencies": { + "is-map": "^2.0.1", + "is-set": "^2.0.1", + "is-weakmap": "^2.0.1", + "is-weakset": "^2.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-typed-array": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.14.tgz", + "integrity": "sha512-VnXFiIW8yNn9kIHN88xvZ4yOWchftKDsRJ8fEPacX/wl1lOvBrhsJ/OeJCXq7B0AaijRuqgzSKalJoPk+D8MPg==", + "dev": true, + "dependencies": { + "available-typed-arrays": "^1.0.6", + "call-bind": "^1.0.5", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-tostringtag": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/winreg": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/winreg/-/winreg-1.2.5.tgz", + "integrity": "sha512-uf7tHf+tw0B1y+x+mKTLHkykBgK2KMs3g+KlzmyMbLvICSHQyB/xOFjTT8qZ3oeTFyU7Bbj4FzXitGG6jvKhYw==" + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true + }, + "node_modules/xdg-basedir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", + "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/zero-fill": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/zero-fill/-/zero-fill-2.2.4.tgz", + "integrity": "sha512-/N5GEDauLHz2uGnuJXWO1Wfib4EC+q4yp9C1jojM7RubwEKADqIqMcYpETMm1lRop403fi3v1qTOdgDE8DIOdw==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + } + } +} diff --git a/pkgs/by-name/sp/spoof/package.nix b/pkgs/by-name/sp/spoof/package.nix new file mode 100644 index 0000000000000..e7586483d2d49 --- /dev/null +++ b/pkgs/by-name/sp/spoof/package.nix @@ -0,0 +1,34 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "spoof"; + version = "2.0.4"; + + src = fetchFromGitHub { + owner = "feross"; + repo = "spoof"; + rev = "v${version}"; + hash = "sha256-oysURKLQ/rbGAvsy3K0OmDRHUqRKa8S8l5ihBjNqYXc="; + }; + + npmDepsHash = "sha256-jf0tcsftXoYy6K3PcXgSU+3PAb6Ux9BsVpOX79TI4/o="; + + postPatch = '' + cp ${./package-lock.json} package-lock.json + ''; + + npmFlags = [ "--ignore-scripts" ]; + + dontNpmBuild = true; + + meta = { + description = "Easily spoof your MAC address in OS X & Linux"; + homepage = "https://github.com/feross/spoof"; + license = lib.licenses.mit; + mainProgram = "spoof"; + maintainers = with lib.maintainers; [ modderme123 ]; + }; +} diff --git a/pkgs/by-name/sq/sqlite-vss/package.nix b/pkgs/by-name/sq/sqlite-vss/package.nix index b619e8ae6ed5e..e1c65b63407af 100644 --- a/pkgs/by-name/sq/sqlite-vss/package.nix +++ b/pkgs/by-name/sq/sqlite-vss/package.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/asg017/sqlite-vss"; changelog = "https://github.com/asg017/sqlite-vss/releases/tag/v${finalAttrs.version}"; license = licenses.mit; - maintainers = with maintainers; [ elohmeier ]; platforms = platforms.unix; }; }) diff --git a/pkgs/by-name/sr/srm-cuarzo/package.nix b/pkgs/by-name/sr/srm-cuarzo/package.nix index d8d3f4622a1ea..af1468b42850f 100644 --- a/pkgs/by-name/sr/srm-cuarzo/package.nix +++ b/pkgs/by-name/sr/srm-cuarzo/package.nix @@ -14,9 +14,9 @@ }: stdenv.mkDerivation (self: { pname = "srm-cuarzo"; - version = "0.5.6-2"; + version = "0.5.7-1"; rev = "v${self.version}"; - hash = "sha256-shYYmXTWa0cd0zTsdCDw536BkEtm6UdbUz/lQFURi90="; + hash = "sha256-TUYiReCWryNFfJ0lFBKNJiauil8ZwRSG8X9Bsdtwswc="; src = fetchFromGitHub { inherit (self) rev hash; diff --git a/pkgs/by-name/st/stackql/package.nix b/pkgs/by-name/st/stackql/package.nix index fb3f8f65998e3..d1d749d971fae 100644 --- a/pkgs/by-name/st/stackql/package.nix +++ b/pkgs/by-name/st/stackql/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "stackql"; - version = "0.5.652"; + version = "0.5.665"; src = fetchFromGitHub { owner = "stackql"; repo = "stackql"; rev = "v${version}"; - hash = "sha256-yE+XMAEsEYj2W3My2gXzZ2QD+YXj62BrzOa/mL+yMCE="; + hash = "sha256-oX1WB6XkjEPzbj3qqXoD8urp827LAU7Cc7lLcpTTZJE="; }; - vendorHash = "sha256-Tcfj1A3W07GkF7CECc5Tu9Er8n+OxsDrUgv7eSlu+wA="; + vendorHash = "sha256-JCWXs3tfTG+aj4hG0eFhl52FmNFvPiBuWpQG2RC6FTM="; ldflags = [ "-s" diff --git a/pkgs/by-name/st/starlark/package.nix b/pkgs/by-name/st/starlark/package.nix index 060a9013a05ea..214c97edf5bf1 100644 --- a/pkgs/by-name/st/starlark/package.nix +++ b/pkgs/by-name/st/starlark/package.nix @@ -1,16 +1,16 @@ { lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "starlark"; - version = "0-unstable-2023-11-21"; + version = "0-unstable-2024-05-21"; src = fetchFromGitHub { owner = "google"; repo = "starlark-go"; - rev = "90ade8b19d09805d1b91a9687198869add6dfaa1"; - hash = "sha256-ZNOPx7L21A4BR5WshMMAHGm6j1ukWC9waJ1lYLvxBw0="; + rev = "046347dcd1044f5e568fcf64884b0344f27910c0"; + hash = "sha256-qpJPCcMxrsspiN5FeQDZRaNchYPawMNJHtKK8fmrRug="; }; - vendorHash = "sha256-jQE5fSqJeiDV7PW7BY/dzCxG6b/KEVIobcjJsaL2zMw="; + vendorHash = "sha256-8drlCBy+KROyqXzm/c+HBe/bMVOyvwRoLHxOApJhMfo="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix index af74d5bdf1030..a85e7d36f9828 100644 --- a/pkgs/by-name/st/stats/package.nix +++ b/pkgs/by-name/st/stats/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "stats"; - version = "2.10.16"; + version = "2.10.18"; src = fetchurl { url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg"; - hash = "sha256-fSn4qZMXRlWxqIZ2Jh1anLQPbx/TqHA7UFRq+pR3o+4="; + hash = "sha256-iBo6rP8V7jGTFaKyd3er3L2EWW3slCyV6eFoJT3w7z8="; }; sourceRoot = "."; diff --git a/pkgs/by-name/st/step-cli/package.nix b/pkgs/by-name/st/step-cli/package.nix index 11a8ab6284707..c33aec603b1e3 100644 --- a/pkgs/by-name/st/step-cli/package.nix +++ b/pkgs/by-name/st/step-cli/package.nix @@ -3,7 +3,7 @@ buildGoModule, fetchFromGitHub, }: let - version = "0.26.1"; + version = "0.26.2"; in buildGoModule { pname = "step-cli"; @@ -13,7 +13,7 @@ in owner = "smallstep"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-BVxdgyQsfCwHw/zjP3AKNib3sRWoBpMlZ7vh71nso94="; + hash = "sha256-CrV6kWgq2ldeOh5G0SgO8+q0HC1l8RuTELT3YXLxClU="; }; ldflags = [ @@ -27,7 +27,7 @@ in rm command/certificate/remote_test.go ''; - vendorHash = "sha256-Z6wrWkyAGi01gH7+v2+VkyqRNqDwLFVwXm/1FIMzURg="; + vendorHash = "sha256-pqwrjreysMLfVmzPE7Tj/hLdM1HO13UfmbMXvNgLd5Y="; meta = { description = "Zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc"; diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/by-name/su/sublime-music/package.nix index a1c74abeca1c8..e2a7874a0eb05 100644 --- a/pkgs/applications/audio/sublime-music/default.nix +++ b/pkgs/by-name/su/sublime-music/package.nix @@ -12,26 +12,32 @@ , libnotify , networkSupport ? true , networkmanager +, fetchpatch }: python3.pkgs.buildPythonApplication rec { pname = "sublime-music"; - version = "0.12.0"; + version = "0.12.0-unstable-2024-01-06"; pyproject = true; src = fetchFromGitHub { owner = "sublime-music"; repo = "sublime-music"; - rev = "refs/tags/v${version}"; - hash = "sha256-FPzeFqDOcaiariz7qJwz6P3Wd+ZDxNP57uj+ptMtEyM="; + rev = "0b4ba69a7ff7ad2dfcb0a264587921f323030766"; + hash = "sha256-NoJ50n/AjM738ebQ/Wccwp2l0sC3VBvKovJvDhDa5SU="; }; + patches = [ + # Fix loadfile command https://github.com/sublime-music/sublime-music/pull/461 + (fetchpatch { + url = "https://github.com/sublime-music/sublime-music/commit/1d107fec2ac7f83e0c49bab663273b31c9072411.patch"; + hash = "sha256-fUss4kqlFiXRr37AIaeWEv/4Bpzx5xkW28OEnsjQqzY="; + }) + ]; + postPatch = '' sed -i "/--cov/d" setup.cfg sed -i "/--no-cov-on-fail/d" setup.cfg - - # https://github.com/sublime-music/sublime-music/commit/f477659d24e372ed6654501deebad91ae4b0b51c - sed -i "s/python-mpv/mpv/g" pyproject.toml ''; build-system = with python3.pkgs; [ @@ -94,7 +100,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "GTK3 Subsonic/Airsonic client"; - homepage = "https://sublimemusic.app/"; + homepage = "https://sublimemusic.app"; changelog = "https://github.com/sublime-music/sublime-music/blob/v${version}/CHANGELOG.rst"; license = licenses.gpl3Plus; maintainers = with maintainers; [ albakham sumnerevans ]; diff --git a/pkgs/by-name/su/subprober/package.nix b/pkgs/by-name/su/subprober/package.nix new file mode 100644 index 0000000000000..6b2cc439439e1 --- /dev/null +++ b/pkgs/by-name/su/subprober/package.nix @@ -0,0 +1,53 @@ +{ + lib, + python3, + fetchFromGitHub, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "subprober"; + version = "1.0.9"; + pyproject = true; + + src = fetchFromGitHub { + owner = "RevoltSecurities"; + repo = "SubProber"; + rev = "refs/tags/v${version}"; + hash = "sha256-CxmePd1dw9H/XLQZ16JMF1pdFFOI59Qa2knTnKKzFvM="; + }; + + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ + aiodns + aiofiles + aiohttp + alive-progress + anyio + appdirs + arsenic + beautifulsoup4 + colorama + fake-useragent + httpx + requests + rich + structlog + urllib3 + uvloop + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "subprober" ]; + + meta = with lib; { + description = "Subdomain scanning tool"; + homepage = "https://github.com/RevoltSecurities/SubProber"; + changelog = "https://github.com/RevoltSecurities/SubProber/releases/tag/v${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + mainProgram = "subprober"; + }; +} diff --git a/pkgs/by-name/su/subtitlecomposer/package.nix b/pkgs/by-name/su/subtitlecomposer/package.nix index d681213e275d7..ce6e7fe6e6356 100644 --- a/pkgs/by-name/su/subtitlecomposer/package.nix +++ b/pkgs/by-name/su/subtitlecomposer/package.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "subtitlecomposer"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "multimedia"; repo = "subtitlecomposer"; rev = "v${version}"; - hash = "sha256-RKS3VTtpxnox0hzessMHmoGPpT+Ho0b3fxtQMGw9OrM="; + hash = "sha256-5RBrxOy1EIgDLb21r1y+Pou8d/j05a1YYMRJh1n8vSA="; }; nativeBuildInputs = [ cmake extra-cmake-modules libsForQt5.wrapQtAppsHook ]; diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix index 68ace2e6ce979..b31e604754444 100644 --- a/pkgs/by-name/su/surrealdb/package.nix +++ b/pkgs/by-name/su/surrealdb/package.nix @@ -16,16 +16,16 @@ let in rustPlatform.buildRustPackage rec { pname = "surrealdb"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "surrealdb"; repo = "surrealdb"; rev = "v${version}"; - hash = "sha256-yXC1qlZTR5qWcbyfQ2jR2QlEnaxlNn0U3VGHdh2har0="; + hash = "sha256-lRXQq834KYDW/ugpFudrmSDPlzBaGDuS/pC2riElF04="; }; - cargoHash = "sha256-npo/tlqnq8vzFeOfpVryzwJkFaDJ9WG1iwMgcv3tRCQ="; + cargoHash = "sha256-XQu1I4ufQZKpeDBTb13g2vECmdWAGRckQjWz8BbHMHA="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/by-name/sw/swiftlint/package.nix b/pkgs/by-name/sw/swiftlint/package.nix new file mode 100644 index 0000000000000..aa6c641e32415 --- /dev/null +++ b/pkgs/by-name/sw/swiftlint/package.nix @@ -0,0 +1,42 @@ +{ + stdenvNoCC, + lib, + fetchurl, + unzip, + nix-update-script, +}: +stdenvNoCC.mkDerivation rec { + pname = "swiftlint"; + version = "0.55.1"; + + src = fetchurl { + url = "https://github.com/realm/SwiftLint/releases/download/${version}/portable_swiftlint.zip"; + hash = "sha256-Tmhw30CJaVQlcYnHjzmwrDpugHgR2/ihHIV8M+O2zwI="; + }; + + dontPatch = true; + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ unzip ]; + + sourceRoot = "."; + + installPhase = '' + runHook preInstall + install -Dm755 swiftlint $out/bin/swiftlint + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "A tool to enforce Swift style and conventions"; + homepage = "https://realm.github.io/SwiftLint/"; + license = licenses.mit; + mainProgram = "swiftlint"; + maintainers = with maintainers; [ matteopacini ]; + platforms = platforms.darwin; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix index db459c26d00e8..e3c9cf532184a 100644 --- a/pkgs/by-name/sy/syft/package.nix +++ b/pkgs/by-name/sy/syft/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "syft"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "anchore"; repo = "syft"; rev = "refs/tags/v${version}"; - hash = "sha256-qh+iuqnLX8Qr8sOP3YobwcFdOhnlIrnoBR53ZeCPdB4="; + hash = "sha256-fTqyFsFWSsVt2Thd15nlsmnNIhQSLAv9SaaaVJWto/8="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -28,7 +28,7 @@ buildGoModule rec { # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-CmkxbyXUvFqa3sRcT7aao+pdZxJVFQiNcwmCmWzgF5c="; + vendorHash = "sha256-U4PZPUsfWCJB2YFJkirF8Q46pRmhKqzSnk7GpKOrfbU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/Sylk/default.nix b/pkgs/by-name/sy/sylk/package.nix index a83742cf937cc..ab32ef5463ff2 100644 --- a/pkgs/applications/networking/Sylk/default.nix +++ b/pkgs/by-name/sy/sylk/package.nix @@ -1,12 +1,8 @@ { appimageTools, fetchurl, lib }: -let - pname = "Sylk"; - version = "3.0.1"; -in - appimageTools.wrapType2 rec { - inherit pname version; + pname = "sylk"; + version = "3.0.1"; src = fetchurl { url = "http://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage"; @@ -17,12 +13,13 @@ appimageTools.wrapType2 rec { export LC_ALL=C.UTF-8 ''; - meta = with lib; { - description = "Sylk WebRTC client"; + meta = { + description = "Desktop client for SylkServer, a multiparty conferencing tool"; homepage = "https://sylkserver.com/"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ zimbatm ]; - platforms = [ "i386-linux" "x86_64-linux" ]; + license = lib.licenses.agpl3Plus; mainProgram = "Sylk"; + maintainers = with lib.maintainers; [ zimbatm ]; + platforms = [ "i386-linux" "x86_64-linux" ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; } diff --git a/pkgs/by-name/sy/symfony-cli/package.nix b/pkgs/by-name/sy/symfony-cli/package.nix index 567e4fa36c862..2d9a28bf14100 100644 --- a/pkgs/by-name/sy/symfony-cli/package.nix +++ b/pkgs/by-name/sy/symfony-cli/package.nix @@ -10,14 +10,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.8.19"; + version = "5.9.1"; vendorHash = "sha256-oo4lLJTF44hBb8QaIMONj+2WRdDSlhImZaC/nniWAhs="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - hash = "sha256-TOtz/IPeNmWqDRtenWm+58NWxeIq1gihHnpawOa66YE="; + hash = "sha256-uJbX1IzZtcXH7mZuqh2YZy9wYZHNWfUHRZ8Tlm5zEac="; leaveDotGit = true; postFetch = '' git --git-dir $out/.git log -1 --pretty=%cd --date=format:'%Y-%m-%dT%H:%M:%SZ' > $out/SOURCE_DATE diff --git a/pkgs/by-name/sy/symphony/package.nix b/pkgs/by-name/sy/symphony/package.nix index 51d3316c7d17b..cb75fae961b1c 100644 --- a/pkgs/by-name/sy/symphony/package.nix +++ b/pkgs/by-name/sy/symphony/package.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake , coin-utils -, CoinMP +, coinmp , gfortran , libtool , glpk @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-OdTUMG3iVhjhw5uKtUnsLCZ4DfMjYHm8+/ozfmw7J6c="; }; - nativeBuildInputs = [ libtool pkg-config glpk gfortran CoinMP osi coin-utils ]; + nativeBuildInputs = [ libtool pkg-config glpk gfortran coinmp osi coin-utils ]; meta = { description = "SYMPHONY is an open-source solver, callable library, and development framework for mixed-integer linear programs (MILPs) written in C with a number of unique features"; diff --git a/pkgs/by-name/sy/syncstorage-rs/Cargo.lock b/pkgs/by-name/sy/syncstorage-rs/Cargo.lock index e0b2cb8d34b80..fc7f8f744bd11 100644 --- a/pkgs/by-name/sy/syncstorage-rs/Cargo.lock +++ b/pkgs/by-name/sy/syncstorage-rs/Cargo.lock @@ -21,9 +21,9 @@ dependencies = [ [[package]] name = "actix-cors" -version = "0.6.5" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0346d8c1f762b41b458ed3145eea914966bb9ad20b9be0d6d463b20d45586370" +checksum = "f9e772b3bcafe335042b5db010ab7c09013dad6eac4915c91d8d50902769f331" dependencies = [ "actix-utils", "actix-web", @@ -45,7 +45,7 @@ dependencies = [ "actix-service", "actix-utils", "ahash", - "base64", + "base64 0.21.7", "bitflags 2.5.0", "brotli", "bytes", @@ -55,7 +55,7 @@ dependencies = [ "flate2", "futures-core", "h2", - "http", + "http 0.2.12", "httparse", "httpdate", "itoa", @@ -80,7 +80,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -90,9 +90,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d22475596539443685426b6bdadb926ad0ecaefdfc5fb05e5e3441f15463c511" dependencies = [ "bytestring", - "http", + "http 0.2.12", "regex", - "serde 1.0.197", + "serde 1.0.200", "tracing", ] @@ -176,7 +176,7 @@ dependencies = [ "once_cell", "pin-project-lite", "regex", - "serde 1.0.197", + "serde 1.0.200", "serde_json", "serde_urlencoded", "smallvec", @@ -194,7 +194,7 @@ dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -274,10 +274,59 @@ dependencies = [ ] [[package]] +name = "anstream" +version = "0.6.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" + +[[package]] +name = "anstyle-parse" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] name = "anyhow" -version = "1.0.81" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" +checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" [[package]] name = "arc-swap" @@ -297,19 +346,19 @@ version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" dependencies = [ - "serde 1.0.197", + "serde 1.0.200", "serde_json", ] [[package]] name = "async-trait" -version = "0.1.79" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -325,9 +374,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" @@ -351,6 +400,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] name = "bindgen" version = "0.59.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -453,21 +508,22 @@ dependencies = [ [[package]] name = "cadence" -version = "0.29.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f39286bc075b023101dccdb79456a1334221c768b8faede0c2aff7ed29a9482d" +checksum = "2f338b979d9ebfff4bb9801ae8f3af0dc3615f7f1ca963f2e4782bcf9acb3753" dependencies = [ "crossbeam-channel", ] [[package]] name = "cc" -version = "1.0.92" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41" +checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -487,16 +543,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", - "num-traits 0.2.18", + "num-traits 0.2.19", "wasm-bindgen", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -535,6 +591,12 @@ dependencies = [ ] [[package]] +name = "colorchoice" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" + +[[package]] name = "colored" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -552,7 +614,7 @@ checksum = "19b076e143e1d9538dde65da30f8481c2a6c44040edb8e02b9bf1351edb92ce3" dependencies = [ "lazy_static", "nom 5.1.3", - "serde 1.0.197", + "serde 1.0.200", ] [[package]] @@ -564,7 +626,7 @@ dependencies = [ "lazy_static", "nom 5.1.3", "rust-ini", - "serde 1.0.197", + "serde 1.0.200", "serde-hjson", "serde_json", "toml", @@ -589,16 +651,6 @@ dependencies = [ ] [[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] name = "core-foundation-sys" version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -695,7 +747,7 @@ dependencies = [ "config 0.10.1", "crossbeam-queue", "num_cpus", - "serde 1.0.197", + "serde 1.0.200", "tokio", ] @@ -705,7 +757,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" dependencies = [ - "serde 1.0.197", + "serde 1.0.200", "uuid", ] @@ -821,7 +873,7 @@ checksum = "7f3f119846c823f9eafcf953a8f6ffb6ed69bf6240883261a7f13b634579a51f" dependencies = [ "lazy_static", "regex", - "serde 1.0.197", + "serde 1.0.200", "strsim 0.10.0", ] @@ -833,20 +885,30 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "either" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] [[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", + "regex", +] + +[[package]] name = "env_logger" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -861,15 +923,15 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.10.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" dependencies = [ + "anstream", + "anstyle", + "env_filter", "humantime", - "is-terminal", "log", - "regex", - "termcolor", ] [[package]] @@ -884,7 +946,7 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" dependencies = [ - "serde 1.0.197", + "serde 1.0.200", ] [[package]] @@ -911,9 +973,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -996,7 +1058,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -1042,9 +1104,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -1118,7 +1180,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.12", "indexmap", "slab", "tokio", @@ -1128,9 +1190,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hawk" @@ -1139,7 +1201,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ba86b7cbed4f24e509c720688eaf4963eac20d9341689bf69bcf5ee5e0f1cd2" dependencies = [ "anyhow", - "base64", + "base64 0.21.7", "log", "once_cell", "ring", @@ -1203,13 +1265,13 @@ dependencies = [ [[package]] name = "hostname" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" dependencies = [ + "cfg-if", "libc", - "match_cfg", - "winapi", + "windows", ] [[package]] @@ -1224,13 +1286,36 @@ dependencies = [ ] [[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] name = "http-body" -version = "0.4.6" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" dependencies = [ "bytes", - "http", + "futures-core", + "http 1.1.0", + "http-body", "pin-project-lite", ] @@ -1254,40 +1339,58 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.28" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", - "h2", - "http", + "http 1.1.0", "http-body", "httparse", - "httpdate", "itoa", "pin-project-lite", - "socket2", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] [[package]] name = "hyper-rustls" -version = "0.24.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" dependencies = [ "futures-util", - "http", + "http 1.1.0", "hyper", + "hyper-util", "rustls", + "rustls-pki-types", "tokio", "tokio-rustls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -1384,6 +1487,12 @@ dependencies = [ ] [[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + +[[package]] name = "itoa" version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1391,9 +1500,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -1413,10 +1522,10 @@ version = "9.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f" dependencies = [ - "base64", + "base64 0.21.7", "js-sys", "ring", - "serde 1.0.197", + "serde 1.0.200", "serde_json", ] @@ -1453,9 +1562,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "libloading" @@ -1464,7 +1573,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -1520,9 +1629,9 @@ checksum = "4d873d7c67ce09b42110d801813efbc9364414e356be9935700d368351657487" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -1535,12 +1644,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] -name = "match_cfg" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" - -[[package]] name = "matches" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1676,14 +1779,14 @@ version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" dependencies = [ - "num-traits 0.2.18", + "num-traits 0.2.19", ] [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -1738,15 +1841,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" dependencies = [ "log", - "serde 1.0.197", + "serde 1.0.200", "windows-sys 0.52.0", ] [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" dependencies = [ "lock_api", "parking_lot_core", @@ -1754,15 +1857,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -1790,6 +1893,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] name = "pin-project-lite" version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1851,9 +1974,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] @@ -1911,7 +2034,7 @@ dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -1924,14 +2047,14 @@ dependencies = [ "proc-macro2", "pyo3-build-config", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -1979,11 +2102,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", ] [[package]] @@ -2028,20 +2151,20 @@ checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "reqwest" -version = "0.11.27" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" dependencies = [ - "base64", + "base64 0.22.1", "bytes", - "encoding_rs", "futures-core", "futures-util", - "h2", - "http", + "http 1.1.0", "http-body", + "http-body-util", "hyper", "hyper-rustls", + "hyper-util", "ipnet", "js-sys", "log", @@ -2051,11 +2174,11 @@ dependencies = [ "pin-project-lite", "rustls", "rustls-pemfile", - "serde 1.0.197", + "rustls-pki-types", + "serde 1.0.200", "serde_json", "serde_urlencoded", "sync_wrapper", - "system-configuration", "tokio", "tokio-rustls", "tower-service", @@ -2111,9 +2234,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.5.0", "errno", @@ -2124,32 +2247,42 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.10" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", "ring", + "rustls-pki-types", "rustls-webpki", - "sct", + "subtle", + "zeroize", ] [[package]] name = "rustls-pemfile" -version = "1.0.4" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64", + "base64 0.22.1", + "rustls-pki-types", ] [[package]] +name = "rustls-pki-types" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" + +[[package]] name = "rustls-webpki" -version = "0.101.7" +version = "0.102.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" dependencies = [ "ring", + "rustls-pki-types", "untrusted", ] @@ -2199,16 +2332,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] name = "semver" version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2216,9 +2339,9 @@ checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "sentry" -version = "0.31.8" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce4b57f1b521f674df7a1d200be8ff5d74e3712020ee25b553146657b5377d5" +checksum = "00421ed8fa0c995f07cde48ba6c89e80f2b312f74ff637326f392fbfd23abe02" dependencies = [ "curl", "httpdate", @@ -2231,9 +2354,9 @@ dependencies = [ [[package]] name = "sentry-backtrace" -version = "0.31.8" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58cc8d4e04a73de8f718dc703943666d03f25d3e9e4d0fb271ca0b8c76dfa00e" +checksum = "a79194074f34b0cbe5dd33896e5928bbc6ab63a889bd9df2264af5acb186921e" dependencies = [ "backtrace", "once_cell", @@ -2243,9 +2366,9 @@ dependencies = [ [[package]] name = "sentry-contexts" -version = "0.31.8" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6436c1bad22cdeb02179ea8ef116ffc217797c028927def303bc593d9320c0d1" +checksum = "eba8870c5dba2bfd9db25c75574a11429f6b95957b0a78ac02e2970dd7a5249a" dependencies = [ "hostname", "libc", @@ -2257,22 +2380,22 @@ dependencies = [ [[package]] name = "sentry-core" -version = "0.31.8" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901f761681f97db3db836ef9e094acdd8756c40215326c194201941947164ef1" +checksum = "46a75011ea1c0d5c46e9e57df03ce81f5c7f0a9e199086334a1f9c0a541e0826" dependencies = [ "once_cell", "rand", "sentry-types", - "serde 1.0.197", + "serde 1.0.200", "serde_json", ] [[package]] name = "sentry-debug-images" -version = "0.31.8" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afdb263e73d22f39946f6022ed455b7561b22ff5553aca9be3c6a047fa39c328" +checksum = "7ec2a486336559414ab66548da610da5e9626863c3c4ffca07d88f7dc71c8de8" dependencies = [ "findshlibs", "once_cell", @@ -2281,9 +2404,9 @@ dependencies = [ [[package]] name = "sentry-tracing" -version = "0.31.8" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82eabcab0a047040befd44599a1da73d3adb228ff53b5ed9795ae04535577704" +checksum = "f715932bf369a61b7256687c6f0554141b7ce097287e30e3f7ed6e9de82498fe" dependencies = [ "sentry-backtrace", "sentry-core", @@ -2293,14 +2416,14 @@ dependencies = [ [[package]] name = "sentry-types" -version = "0.31.8" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da956cca56e0101998c8688bc65ce1a96f00673a0e58e663664023d4c7911e82" +checksum = "4519c900ce734f7a0eb7aba0869dfb225a7af8820634a7dd51449e3b093cfb7c" dependencies = [ "debugid", "hex", "rand", - "serde 1.0.197", + "serde 1.0.200", "serde_json", "thiserror", "time", @@ -2316,9 +2439,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" dependencies = [ "serde_derive", ] @@ -2337,24 +2460,24 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "itoa", "ryu", - "serde 1.0.197", + "serde 1.0.200", ] [[package]] @@ -2366,7 +2489,7 @@ dependencies = [ "form_urlencoded", "itoa", "ryu", - "serde 1.0.197", + "serde 1.0.200", ] [[package]] @@ -2399,9 +2522,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -2458,7 +2581,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f400f1c5db96f1f52065e8931ca0c524cceb029f7537c9e6d5424488ca137ca0" dependencies = [ "chrono", - "serde 1.0.197", + "serde 1.0.200", "serde_json", "slog", ] @@ -2506,9 +2629,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -2557,9 +2680,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.58" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -2574,7 +2697,7 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "syncserver" -version = "0.15.2" +version = "0.17.0" dependencies = [ "actix-cors", "actix-http", @@ -2582,23 +2705,25 @@ dependencies = [ "actix-web", "async-trait", "backtrace", - "base64", + "base64 0.22.1", "cadence", "chrono", "docopt", "dyn-clone", "futures 0.3.30", + "futures-util", "hawk", "hex", "hmac", "hostname", + "http 1.1.0", "lazy_static", "mime", "rand", "regex", "sentry", "sentry-backtrace", - "serde 1.0.197", + "serde 1.0.200", "serde_derive", "serde_json", "sha2", @@ -2629,13 +2754,14 @@ dependencies = [ [[package]] name = "syncserver-common" -version = "0.15.2" +version = "0.17.0" dependencies = [ "actix-web", + "backtrace", "cadence", "futures 0.3.30", "hkdf", - "serde 1.0.197", + "serde 1.0.200", "serde_json", "sha2", "slog", @@ -2644,25 +2770,25 @@ dependencies = [ [[package]] name = "syncserver-db-common" -version = "0.15.2" +version = "0.17.0" dependencies = [ "backtrace", "deadpool", "diesel", "diesel_migrations", "futures 0.3.30", - "http", + "http 1.1.0", "syncserver-common", "thiserror", ] [[package]] name = "syncserver-settings" -version = "0.15.2" +version = "0.17.0" dependencies = [ "config 0.11.0", "num_cpus", - "serde 1.0.197", + "serde 1.0.200", "slog-scope", "syncserver-common", "syncstorage-settings", @@ -2672,11 +2798,11 @@ dependencies = [ [[package]] name = "syncstorage-db" -version = "0.15.2" +version = "0.17.0" dependencies = [ "async-trait", "cadence", - "env_logger 0.10.2", + "env_logger 0.11.3", "futures 0.3.30", "hostname", "lazy_static", @@ -2695,7 +2821,7 @@ dependencies = [ [[package]] name = "syncstorage-db-common" -version = "0.15.2" +version = "0.17.0" dependencies = [ "async-trait", "backtrace", @@ -2703,9 +2829,9 @@ dependencies = [ "diesel", "diesel_migrations", "futures 0.3.30", - "http", + "http 1.1.0", "lazy_static", - "serde 1.0.197", + "serde 1.0.200", "serde_json", "syncserver-common", "syncserver-db-common", @@ -2714,17 +2840,17 @@ dependencies = [ [[package]] name = "syncstorage-mysql" -version = "0.15.2" +version = "0.17.0" dependencies = [ "async-trait", "backtrace", - "base64", + "base64 0.22.1", "diesel", "diesel_logger", "diesel_migrations", - "env_logger 0.10.2", + "env_logger 0.11.3", "futures 0.3.30", - "http", + "http 1.1.0", "slog-scope", "syncserver-common", "syncserver-db-common", @@ -2737,28 +2863,28 @@ dependencies = [ [[package]] name = "syncstorage-settings" -version = "0.15.2" +version = "0.17.0" dependencies = [ "rand", - "serde 1.0.197", + "serde 1.0.200", "syncserver-common", "time", ] [[package]] name = "syncstorage-spanner" -version = "0.15.2" +version = "0.17.0" dependencies = [ "async-trait", "backtrace", "cadence", "deadpool", - "env_logger 0.10.2", + "env_logger 0.11.3", "form_urlencoded", "futures 0.3.30", "google-cloud-rust-raw", "grpcio", - "http", + "http 1.1.0", "log", "protobuf", "slog-scope", @@ -2773,27 +2899,6 @@ dependencies = [ ] [[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] name = "take_mut" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2836,22 +2941,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -2866,15 +2971,15 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", "num-conv", "powerfmt", - "serde 1.0.197", + "serde 1.0.200", "time-core", "time-macros", ] @@ -2887,9 +2992,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", @@ -2912,10 +3017,10 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokenserver-auth" -version = "0.15.2" +version = "0.17.0" dependencies = [ "async-trait", - "base64", + "base64 0.22.1", "dyn-clone", "futures 0.3.30", "hex", @@ -2926,7 +3031,7 @@ dependencies = [ "pyo3", "reqwest", "ring", - "serde 1.0.197", + "serde 1.0.200", "serde_json", "sha2", "slog-scope", @@ -2939,30 +3044,32 @@ dependencies = [ [[package]] name = "tokenserver-common" -version = "0.15.2" +version = "0.17.0" dependencies = [ "actix-web", "backtrace", + "http 1.1.0", "jsonwebtoken", - "serde 1.0.197", + "serde 1.0.200", "serde_json", "syncserver-common", "thiserror", + "tokio", ] [[package]] name = "tokenserver-db" -version = "0.15.2" +version = "0.17.0" dependencies = [ "async-trait", "backtrace", "diesel", "diesel_logger", "diesel_migrations", - "env_logger 0.10.2", + "env_logger 0.11.3", "futures 0.3.30", - "http", - "serde 1.0.197", + "http 1.1.0", + "serde 1.0.200", "serde_derive", "serde_json", "slog-scope", @@ -2977,10 +3084,10 @@ dependencies = [ [[package]] name = "tokenserver-settings" -version = "0.15.2" +version = "0.17.0" dependencies = [ "jsonwebtoken", - "serde 1.0.197", + "serde 1.0.200", "tokenserver-common", ] @@ -3010,31 +3117,31 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] name = "tokio-rustls" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ "rustls", + "rustls-pki-types", "tokio", ] [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] @@ -3043,10 +3150,32 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ - "serde 1.0.197", + "serde 1.0.200", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", + "tracing", ] [[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] name = "tower-service" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3126,9 +3255,9 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" [[package]] name = "unindent" @@ -3162,7 +3291,7 @@ dependencies = [ "form_urlencoded", "idna 0.5.0", "percent-encoding 2.3.1", - "serde 1.0.197", + "serde 1.0.200", ] [[package]] @@ -3172,13 +3301,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] name = "uuid" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "getrandom", - "serde 1.0.197", + "serde 1.0.200", ] [[package]] @@ -3190,7 +3325,7 @@ dependencies = [ "idna 0.4.0", "lazy_static", "regex", - "serde 1.0.197", + "serde 1.0.200", "serde_derive", "serde_json", "url 2.5.0", @@ -3292,7 +3427,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", "wasm-bindgen-shared", ] @@ -3326,7 +3461,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3349,9 +3484,12 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.4" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] [[package]] name = "which" @@ -3383,11 +3521,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -3397,12 +3535,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-targets 0.52.5", +] + +[[package]] name = "windows-core" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -3420,7 +3568,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -3440,17 +3588,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -3461,9 +3610,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -3473,9 +3622,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -3485,9 +3634,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -3497,9 +3652,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -3509,9 +3664,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -3521,9 +3676,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -3533,15 +3688,15 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winreg" -version = "0.50.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" dependencies = [ "cfg-if", "windows-sys 0.48.0", @@ -3568,25 +3723,31 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "087eca3c1eaf8c47b94d02790dd086cd594b912d2043d4de4bfdd466b3befb7c" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "6f4b6c273f496d8fd4eaf18853e6b448760225dc030ff2c485a786859aea6393" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" + +[[package]] name = "zstd" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/by-name/sy/syncstorage-rs/package.nix b/pkgs/by-name/sy/syncstorage-rs/package.nix index 47619e2c61568..2c3f8415d3493 100644 --- a/pkgs/by-name/sy/syncstorage-rs/package.nix +++ b/pkgs/by-name/sy/syncstorage-rs/package.nix @@ -20,13 +20,13 @@ in rustPlatform.buildRustPackage rec { pname = "syncstorage-rs"; - version = "0.15.2"; + version = "0.17.0"; src = fetchFromGitHub { owner = "mozilla-services"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-YKWXr10cVOqQm6XvugwarE3I1gtAyLOlUqPGbLDhHxY="; + hash = "sha256-8MxGrE8BaqSN0vPORKupKQuqHiv2vcqQhTX+SnmWFoM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ta/tabiew/package.nix b/pkgs/by-name/ta/tabiew/package.nix new file mode 100644 index 0000000000000..3c562a146666a --- /dev/null +++ b/pkgs/by-name/ta/tabiew/package.nix @@ -0,0 +1,41 @@ +{ lib, fetchFromGitHub, rustPlatform, stdenv, installShellFiles }: + +rustPlatform.buildRustPackage rec { + pname = "tabiew"; + version = "0.3.4"; + + src = fetchFromGitHub { + owner = "shshemi"; + repo = "tabiew"; + rev = "v${version}"; + hash = "sha256-sJQlvJxVXHgkE4RUtlM3BNL1rZKvQa7C5wlPHjFSuus="; + }; + + cargoHash = "sha256-QpeCGeId6pPYSGQvcI06zFC013RLcv7ryZlEn3F9dAI="; + + nativeBuildInputs = [ installShellFiles ]; + + outputs = [ "out" "man" ]; + + postInstall = '' + installManPage target/manual/tabiew.1 + + installShellCompletion \ + --bash target/completion/tw.bash \ + --zsh target/completion/_tw \ + --fish target/completion/tw.fish + ''; + + doCheck = false; # there are no tests + + meta = { + description = + "Lightweight, terminal-based application to view and query delimiter separated value formatted documents, such as CSV and TSV files"; + homepage = "https://github.com/shshemi/tabiew"; + changelog = "https://github.com/shshemi/tabiew/releases/tag/v${version}"; + license = lib.licenses.mit; + mainProgram = "tw"; + maintainers = with lib.maintainers; [ anas ]; + platforms = with lib.platforms; unix ++ windows; + }; +} diff --git a/pkgs/by-name/ta/tailscale-nginx-auth/package.nix b/pkgs/by-name/ta/tailscale-nginx-auth/package.nix index 3705a40ef096a..f16f01b2b92e3 100644 --- a/pkgs/by-name/ta/tailscale-nginx-auth/package.nix +++ b/pkgs/by-name/ta/tailscale-nginx-auth/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildGoModule, fetchFromGitHub }: let - version = "1.66.4"; + version = "1.68.0"; in buildGoModule { pname = "tailscale-nginx-auth"; @@ -11,9 +11,9 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-ETBca3qKO2iS30teIF5sr/oyJdRSKFqLFVO3+mmm7bo="; + hash = "sha256-GTl5RCwIoDuzbaigy0/++xaPPEMLRDbBi/z82xCDOZY="; }; - vendorHash = "sha256-Hd77xy8stw0Y6sfk3/ItqRIbM/349M/4uf0iNy1xJGw="; + vendorHash = "sha256-SUjoeOFYz6zbEgv/vND7kEXbuWlZDrUKF2Dmqsf/KVw="; CGO_ENABLED = 0; diff --git a/pkgs/by-name/te/tenv/package.nix b/pkgs/by-name/te/tenv/package.nix index d3443e856b370..042c389ac42e3 100644 --- a/pkgs/by-name/te/tenv/package.nix +++ b/pkgs/by-name/te/tenv/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tenv"; - version = "2.0.3"; + version = "2.0.7"; src = fetchFromGitHub { owner = "tofuutils"; repo = "tenv"; rev = "v${version}"; - hash = "sha256-Bx5E/vJe2SjYRJ2o3enBrzMMellRWapu99hH4HRr8nM="; + hash = "sha256-654ZaQ7KzAWEXwN9Xwzdmg4KsCCLCm+i2M0730gP/zM="; }; vendorHash = "sha256-OrMCzqqOFQkI8IwcfO/JVPyd/sw+Ud0VySV7UPiucwc="; diff --git a/pkgs/by-name/ti/tinymist/Cargo.lock b/pkgs/by-name/ti/tinymist/Cargo.lock index 917c5358bf463..ae658912bf603 100644 --- a/pkgs/by-name/ti/tinymist/Cargo.lock +++ b/pkgs/by-name/ti/tinymist/Cargo.lock @@ -3743,7 +3743,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.11.10" +version = "0.11.11" dependencies = [ "insta", "lsp-server", @@ -3840,7 +3840,7 @@ dependencies = [ [[package]] name = "tinymist" -version = "0.11.10" +version = "0.11.11" dependencies = [ "anyhow", "async-trait", @@ -3891,7 +3891,7 @@ dependencies = [ [[package]] name = "tinymist-query" -version = "0.11.10" +version = "0.11.11" dependencies = [ "anyhow", "biblatex", @@ -3935,7 +3935,7 @@ dependencies = [ [[package]] name = "tinymist-render" -version = "0.11.10" +version = "0.11.11" dependencies = [ "base64 0.22.1", "log", @@ -4530,9 +4530,9 @@ dependencies = [ [[package]] name = "typstyle" -version = "0.11.23" +version = "0.11.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb15ec2ba1f804eab4f8f2ae1bbbe8a7d2f882bb8acabaee0b101de46ee28c56" +checksum = "b08c00b01698330e3c46dd9454c3472e4107866de14fc52aeb1a55aa260bfc7b" dependencies = [ "anyhow", "clap", diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix index 702ac9abbe8c9..7d1397d91ea9e 100644 --- a/pkgs/by-name/ti/tinymist/package.nix +++ b/pkgs/by-name/ti/tinymist/package.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "tinymist"; # Please update the corresponding vscode extension when updating # this derivation. - version = "0.11.10"; + version = "0.11.11"; src = fetchFromGitHub { owner = "Myriad-Dreamin"; repo = "tinymist"; rev = "refs/tags/v${version}"; - hash = "sha256-lmT0da517dVaXGeObyCXZyte8DNBh+/vaqV7hA+SJR4="; + hash = "sha256-uXrV3tvv9fXoEdFH+ajHECfNy4uTvUZBkhkfzGzj3HE="; }; cargoLock = { diff --git a/pkgs/by-name/tp/tparse/package.nix b/pkgs/by-name/tp/tparse/package.nix new file mode 100644 index 0000000000000..981f536a16c63 --- /dev/null +++ b/pkgs/by-name/tp/tparse/package.nix @@ -0,0 +1,29 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +let + pname = "tparse"; + version = "0.13.3"; +in +buildGoModule { + inherit pname version; + + src = fetchFromGitHub { + owner = "mfridman"; + repo = pname; + rev = "v${version}"; + hash = "sha256-MTaxEWRNAXem/DIirrd53YEHA/A5S4wNX4osuMV3gtc="; + }; + + vendorHash = "sha256-j+1B2zWONjFEGoyesX0EW964kD33Jy3O1aB1WEwlESA="; + + meta = { + description = "CLI tool for summarizing go test output. Pipe friendly. CI/CD friendly"; + mainProgram = "tparse"; + homepage = "https://github.com/mfridman/tparse"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ obreitwi ]; + }; +} diff --git a/pkgs/development/tools/tracy/0001-remove-unifiedtypeidentifiers-framework b/pkgs/by-name/tr/tracy/0001-remove-unifiedtypeidentifiers-framework index 0dc5a7eb68f16..0dc5a7eb68f16 100644 --- a/pkgs/development/tools/tracy/0001-remove-unifiedtypeidentifiers-framework +++ b/pkgs/by-name/tr/tracy/0001-remove-unifiedtypeidentifiers-framework diff --git a/pkgs/development/tools/tracy/default.nix b/pkgs/by-name/tr/tracy/package.nix index 63df201f16193..82d4b9c285b82 100644 --- a/pkgs/development/tools/tracy/default.nix +++ b/pkgs/by-name/tr/tracy/package.nix @@ -10,6 +10,10 @@ , hicolor-icon-theme , pkg-config , tbb + +, withWayland ? stdenv.isLinux +, libxkbcommon +, wayland }: stdenv.mkDerivation rec { @@ -33,6 +37,9 @@ stdenv.mkDerivation rec { capstone freetype glfw + ] ++ lib.optionals (stdenv.isLinux && withWayland) [ + libxkbcommon + wayland ] ++ lib.optionals stdenv.isLinux [ dbus hicolor-icon-theme @@ -60,7 +67,8 @@ stdenv.mkDerivation rec { make -j $NIX_BUILD_CORES -C csvexport/build/unix release make -j $NIX_BUILD_CORES -C import-chrome/build/unix release make -j $NIX_BUILD_CORES -C library/unix release - make -j $NIX_BUILD_CORES -C profiler/build/unix release LEGACY=1 + make -j $NIX_BUILD_CORES -C profiler/build/unix release \ + ${lib.optionalString (stdenv.isLinux && !withWayland) "LEGACY=1"} make -j $NIX_BUILD_CORES -C update/build/unix release runHook postBuild diff --git a/pkgs/by-name/tr/treefmt2/package.nix b/pkgs/by-name/tr/treefmt2/package.nix index 036f9875b9798..ab61349bcf7f2 100644 --- a/pkgs/by-name/tr/treefmt2/package.nix +++ b/pkgs/by-name/tr/treefmt2/package.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "treefmt"; - version = "2.0.0-rc4"; + version = "2.0.0-rc5"; src = fetchFromGitHub { owner = "numtide"; repo = "treefmt"; rev = "v${version}"; - hash = "sha256-8l4d3ABd7XEu3ZrtBPS15N0zNHcb+A36j2EV/QZmA9U="; + hash = "sha256-Ckvpb2at7lg7AB0XNtIxeo8lWXX+04MVHHKoUs876dg="; }; vendorHash = "sha256-rjdGNfR2DpLZCzL/+3xiZ7gGDd4bPyBT5qMCO+NyWbg="; diff --git a/pkgs/by-name/tr/troubadix/package.nix b/pkgs/by-name/tr/troubadix/package.nix index 67d337255d6b2..0906dd4becb23 100644 --- a/pkgs/by-name/tr/troubadix/package.nix +++ b/pkgs/by-name/tr/troubadix/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "troubadix"; - version = "24.6.1"; + version = "24.6.5"; pyproject = true; src = fetchFromGitHub { owner = "greenbone"; repo = "troubadix"; rev = "refs/tags/v${version}"; - hash = "sha256-R747RD7jye2SANZoUk/bpHwXviBEBF2c+LeCwQBxlH8="; + hash = "sha256-W6RC0JKTBLlPSgWlAggU8HRNY+nRAYtLlG0cnnYMaFM="; }; pythonRelaxDeps = [ "validators" ]; diff --git a/pkgs/by-name/ty/typos-lsp/package.nix b/pkgs/by-name/ty/typos-lsp/package.nix index 0c69a0cf1a4ce..46e370cfa291c 100644 --- a/pkgs/by-name/ty/typos-lsp/package.nix +++ b/pkgs/by-name/ty/typos-lsp/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "typos-lsp"; # Please update the corresponding VSCode extension too. # See pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix - version = "0.1.18"; + version = "0.1.19"; src = fetchFromGitHub { owner = "tekumara"; repo = "typos-lsp"; rev = "refs/tags/v${version}"; - hash = "sha256-6ELn2Q7pAUgnwe8+vAUbuRjaKFWvbGZ1SMfXQ1qKp5c="; + hash = "sha256-3bXOMW6aU4ryJqrUmpCIbBqRWrh4R6tlkEHPqpPSsVI="; }; - cargoHash = "sha256-UDID+dI8ETP084WR482uWli2++bI4mRiMvpFpWUlvZE="; + cargoHash = "sha256-3GHVGjn4upI7U8GyxwlrLpchWALGFuMSektCrwLiIIM="; # fix for compilation on aarch64 # see https://github.com/NixOS/nixpkgs/issues/145726 diff --git a/pkgs/by-name/un/unciv/package.nix b/pkgs/by-name/un/unciv/package.nix index ab6ba743e75c6..2f41aa57ecbac 100644 --- a/pkgs/by-name/un/unciv/package.nix +++ b/pkgs/by-name/un/unciv/package.nix @@ -15,9 +15,15 @@ let exec = "unciv"; comment = "An open-source Android/Desktop remake of Civ V"; desktopName = "Unciv"; + icon = "unciv"; categories = [ "Game" ]; }; + desktopIcon = fetchurl { + url = "https://github.com/yairm210/Unciv/blob/4.11.16/extraImages/Icons/Unciv%20icon%20v6.png?raw=true"; + hash = "sha256-Zuz+HGfxjGviGBKTiHdIFXF8UMRLEIfM8f+LIB/xonk="; + }; + envLibPath = lib.makeLibraryPath (lib.optionals stdenv.isLinux [ libGL libpulseaudio @@ -46,6 +52,8 @@ stdenv.mkDerivation rec { --prefix PATH : ${lib.makeBinPath [ jre ]} \ --add-flags "-jar ${src}" + install -Dm444 ${desktopIcon} $out/share/icons/hicolor/512x512/apps/unciv.png + runHook postInstall ''; diff --git a/pkgs/by-name/up/upbound/package.nix b/pkgs/by-name/up/upbound/package.nix index 421be958b1687..8fb31b33df332 100644 --- a/pkgs/by-name/up/upbound/package.nix +++ b/pkgs/by-name/up/upbound/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "upbound"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = pname; repo = "up"; rev = "v${version}"; - sha256 = "sha256-KAWyHlqgj4xz3abSSa1cezpeDTmJbGSZAMffq3p/CyI="; + sha256 = "sha256-nXP97J0DdcXPAD/gB3py5UXhe48Kaec7CRTHmalo+RQ="; }; - vendorHash = "sha256-4o1WJHGHiO9r8RC8hr4KWZBiC8h52la1gKdYaYxEjbk="; + vendorHash = "sha256-9HnKpofJPxCieG5thNcLC7diA51ohzy7xgtniL7FEgo="; subPackages = [ "cmd/docker-credential-up" "cmd/up" ]; diff --git a/pkgs/by-name/up/updatecli/package.nix b/pkgs/by-name/up/updatecli/package.nix index 8a040b0c00c05..2b509597d2d51 100644 --- a/pkgs/by-name/up/updatecli/package.nix +++ b/pkgs/by-name/up/updatecli/package.nix @@ -1,9 +1,12 @@ -{ lib -, go -, buildGoModule -, fetchFromGitHub -, nix-update-script -, installShellFiles +{ + lib, + go, + buildGoModule, + fetchFromGitHub, + nix-update-script, + installShellFiles, + testers, + updatecli, }: buildGoModule rec { @@ -12,7 +15,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "updatecli"; - repo = pname; + repo = "updatecli"; rev = "v${version}"; hash = "sha256-VpMi+r7QUSD99PRzbTeIxXn1O9GdfHNJM1F0OBzvNmc="; }; @@ -32,7 +35,13 @@ buildGoModule rec { "-X github.com/updatecli/updatecli/pkg/core/version.Version=${version}" ]; - passthru.updateScript = nix-update-script { }; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = updatecli; + command = "updatecli version"; + }; + }; nativeBuildInputs = [ installShellFiles ]; @@ -52,7 +61,7 @@ buildGoModule rec { Updatecli is a command-line tool used to define and apply update strategies. ''; homepage = "https://www.updatecli.io"; - changelog = "https://github.com/updatecli/updatecli/releases/tag/v${version}"; + changelog = "https://github.com/updatecli/updatecli/releases/tag/${src.rev}"; license = licenses.asl20; mainProgram = "updatecli"; maintainers = with maintainers; [ croissong ]; diff --git a/pkgs/by-name/us/usql/package.nix b/pkgs/by-name/us/usql/package.nix index 4071e6510d90b..3206f6216f207 100644 --- a/pkgs/by-name/us/usql/package.nix +++ b/pkgs/by-name/us/usql/package.nix @@ -11,18 +11,18 @@ buildGoModule rec { pname = "usql"; - version = "0.19.2"; + version = "0.19.3"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - hash = "sha256-ahaRrSRk8n8gjFy/B/yG1ORUlNcmMuUF9eyirZMhxeI="; + hash = "sha256-VenqDYkBJ4XJ2zV7kaVvwlgDyCaTY77zQ5hPq5cOZKg="; }; buildInputs = [ unixODBC icu ]; - vendorHash = "sha256-f0rpkYGaorOaIikUVcibyDMTbBJK6DF5EguSPHolsIk="; + vendorHash = "sha256-KdLUxgNGMkkWBhUpXSecu0m3fsKl7Qj8Aw3z8WcdnSs="; proxyVendor = true; # Exclude drivers from the bad group diff --git a/pkgs/by-name/uv/uv/Cargo.lock b/pkgs/by-name/uv/uv/Cargo.lock index 5509695a21944..174a1d9d682cd 100644 --- a/pkgs/by-name/uv/uv/Cargo.lock +++ b/pkgs/by-name/uv/uv/Cargo.lock @@ -313,9 +313,9 @@ dependencies = [ [[package]] name = "axoupdater" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "669a5ea910fb9b97e3df709c7d0f626fc9e5e9cb83c00bd3a1b4c54835ed8b66" +checksum = "8cc5997cf9d00fa790ba6f19688d93b89760bd641d1c2482bcfbc2bf56988576" dependencies = [ "axoasset", "axoprocess", @@ -683,9 +683,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.6" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9689a29b593160de5bc4aacab7b5d54fb52231de70122626c178e6a368994c7" +checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" dependencies = [ "clap_builder", "clap_derive", @@ -693,9 +693,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.6" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e5387378c84f6faa26890ebf9f0a92989f8873d4d380467bcd0d8d8620424df" +checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" dependencies = [ "anstream", "anstyle", @@ -827,9 +827,9 @@ dependencies = [ [[package]] name = "configparser" -version = "3.0.4" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec6d3da8e550377a85339063af6e3735f4b1d9392108da4e083a1b3b9820288" +checksum = "e57e3272f0190c3f1584272d613719ba5fc7df7f4942fe542e63d949cf3a649b" [[package]] name = "console" @@ -1618,12 +1618,12 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", - "futures-core", + "futures-util", "http", "http-body", "pin-project-lite", @@ -1670,19 +1670,21 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.26.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" dependencies = [ "futures-util", "http", "hyper", "hyper-util", "rustls", + "rustls-native-certs", "rustls-pki-types", "tokio", "tokio-rustls", "tower-service", + "webpki-roots", ] [[package]] @@ -2710,7 +2712,7 @@ dependencies = [ "indoc", "libc", "memoffset 0.9.1", - "parking_lot 0.12.3", + "parking_lot 0.11.2", "portable-atomic", "pyo3-build-config", "pyo3-ffi", @@ -2798,6 +2800,53 @@ dependencies = [ ] [[package]] +name = "quinn" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe" +dependencies = [ + "bytes", + "rand", + "ring", + "rustc-hash", + "rustls", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46" +dependencies = [ + "libc", + "once_cell", + "socket2", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] name = "quote" version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2923,13 +2972,13 @@ dependencies = [ [[package]] name = "reflink-copy" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c3138c30c59ed9b8572f82bed97ea591ecd7e45012566046cc39e72679cff22" +checksum = "6d731e7e3ebfcf422d96b8473e507d5b64790900dd5464772d38d1da9da24d3a" dependencies = [ "cfg-if", "rustix", - "windows 0.56.0", + "windows 0.57.0", ] [[package]] @@ -3017,9 +3066,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" dependencies = [ "async-compression", "base64 0.22.1", @@ -3040,6 +3089,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "quinn", "rustls", "rustls-native-certs", "rustls-pemfile", @@ -3267,11 +3317,11 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.4" +version = "0.23.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" dependencies = [ - "log", + "once_cell", "ring", "rustls-pki-types", "rustls-webpki", @@ -3695,9 +3745,9 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "0.1.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" [[package]] name = "sys-info" @@ -3976,9 +4026,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ "rustls", "rustls-pki-types", @@ -4368,7 +4418,7 @@ checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" [[package]] name = "uv" -version = "0.2.10" +version = "0.2.13" dependencies = [ "anstream", "anyhow", @@ -4384,6 +4434,7 @@ dependencies = [ "filetime", "flate2", "fs-err", + "futures", "ignore", "indicatif", "indoc", @@ -4404,7 +4455,6 @@ dependencies = [ "rustc-hash", "serde", "serde_json", - "tempfile", "textwrap", "thiserror", "tikv-jemallocator", @@ -4428,11 +4478,11 @@ dependencies = [ "uv-normalize", "uv-requirements", "uv-resolver", + "uv-settings", "uv-toolchain", "uv-types", "uv-virtualenv", "uv-warnings", - "uv-workspace", ] [[package]] @@ -4545,7 +4595,6 @@ dependencies = [ "serde", "serde_json", "sys-info", - "tempfile", "thiserror", "tl", "tokio", @@ -4591,7 +4640,6 @@ dependencies = [ "distribution-filename", "distribution-types", "fs-err", - "futures", "install-wheel-rs", "mimalloc", "owo-colors", @@ -4616,13 +4664,12 @@ dependencies = [ "uv-configuration", "uv-dispatch", "uv-distribution", - "uv-fs", "uv-git", "uv-installer", "uv-resolver", + "uv-settings", "uv-toolchain", "uv-types", - "uv-workspace", "walkdir", ] @@ -4682,6 +4729,7 @@ dependencies = [ "tokio", "tokio-util", "toml", + "toml_edit", "tracing", "url", "uv-cache", @@ -4795,6 +4843,14 @@ dependencies = [ ] [[package]] +name = "uv-macros" +version = "0.0.1" +dependencies = [ + "quote", + "syn 2.0.66", +] + +[[package]] name = "uv-normalize" version = "0.0.1" dependencies = [ @@ -4857,6 +4913,7 @@ dependencies = [ "itertools 0.13.0", "once-map", "owo-colors", + "path-slash", "pep440_rs", "pep508_rs", "petgraph", @@ -4888,6 +4945,29 @@ dependencies = [ ] [[package]] +name = "uv-settings" +version = "0.0.1" +dependencies = [ + "dirs-sys", + "distribution-types", + "fs-err", + "install-wheel-rs", + "pep508_rs", + "pypi-types", + "schemars", + "serde", + "thiserror", + "toml", + "tracing", + "uv-configuration", + "uv-fs", + "uv-macros", + "uv-normalize", + "uv-resolver", + "uv-toolchain", +] + +[[package]] name = "uv-state" version = "0.0.1" dependencies = [ @@ -4922,6 +5002,7 @@ dependencies = [ "schemars", "serde", "serde_json", + "target-lexicon", "temp-env", "tempfile", "test-log", @@ -4962,7 +5043,7 @@ dependencies = [ [[package]] name = "uv-version" -version = "0.2.10" +version = "0.2.13" [[package]] name = "uv-virtualenv" @@ -4991,29 +5072,6 @@ dependencies = [ ] [[package]] -name = "uv-workspace" -version = "0.0.1" -dependencies = [ - "dirs-sys", - "distribution-types", - "fs-err", - "install-wheel-rs", - "pep508_rs", - "pypi-types", - "schemars", - "serde", - "thiserror", - "toml", - "tracing", - "uv-configuration", - "uv-fs", - "uv-normalize", - "uv-resolver", - "uv-toolchain", - "uv-warnings", -] - -[[package]] name = "valuable" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5241,11 +5299,11 @@ dependencies = [ [[package]] name = "windows" -version = "0.56.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" +checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" dependencies = [ - "windows-core 0.56.0", + "windows-core 0.57.0", "windows-targets 0.52.5", ] @@ -5260,12 +5318,12 @@ dependencies = [ [[package]] name = "windows-core" -version = "0.56.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" +checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" dependencies = [ - "windows-implement 0.56.0", - "windows-interface 0.56.0", + "windows-implement 0.57.0", + "windows-interface 0.57.0", "windows-result", "windows-targets 0.52.5", ] @@ -5283,9 +5341,9 @@ dependencies = [ [[package]] name = "windows-implement" -version = "0.56.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" +checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", @@ -5305,9 +5363,9 @@ dependencies = [ [[package]] name = "windows-interface" -version = "0.56.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" +checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index a62a32036edda..5329a60df8b1c 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -16,14 +16,14 @@ python3Packages.buildPythonApplication rec { pname = "uv"; - version = "0.2.10"; + version = "0.2.13"; pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; rev = "refs/tags/${version}"; - hash = "sha256-xVddhsCGJcESZhkZnu6tcwwifT9+MQz53qV00B9oHA0="; + hash = "sha256-/YRmaPNTw3RsaB4bTb5UO0qXtRe2h1oD4Bav6VQ4W04="; }; cargoDeps = rustPlatform.importCargoLock { diff --git a/pkgs/by-name/ux/uxn/package.nix b/pkgs/by-name/ux/uxn/package.nix index d5c03309f2586..098c8c4f96d5b 100644 --- a/pkgs/by-name/ux/uxn/package.nix +++ b/pkgs/by-name/ux/uxn/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uxn"; - version = "1.0-unstable-2024-06-05"; + version = "1.0-unstable-2024-06-14"; src = fetchFromSourcehut { owner = "~rabbits"; repo = "uxn"; - rev = "598846a1b820b398e820d53c060a360d5ead9e18"; - hash = "sha256-6VaWFf3hXZ7hj7DbO+abyyDnNIpKo+9SDzJjBgmrhXc="; + rev = "07112d8f264ecb423a9cadf403c224a8a0eac3cb"; + hash = "sha256-AMqMeiJsRsoZKOEZVLojgeaaUiyulacwiNFIKUCwhFk="; }; outputs = [ "out" "projects" ]; diff --git a/pkgs/by-name/vc/vcpkg-tool/package.nix b/pkgs/by-name/vc/vcpkg-tool/package.nix index 327366ddd8bb5..c9b7aafc2ee50 100644 --- a/pkgs/by-name/vc/vcpkg-tool/package.nix +++ b/pkgs/by-name/vc/vcpkg-tool/package.nix @@ -18,13 +18,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vcpkg-tool"; - version = "2024-04-23"; + version = "2024-06-10"; src = fetchFromGitHub { owner = "microsoft"; repo = "vcpkg-tool"; rev = finalAttrs.version; - hash = "sha256-PqmkQcpxuYJGZJs2qemv0hshvO4KTiKc1ZY0//Gq0pY="; + hash = "sha256-TGRTzUd1FtErD+h/ksUsUm1Rhank9/yVy06JbAgEEw0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 6998f0ab8847e..2c60537b0cb44 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -117,7 +117,7 @@ stdenv.mkDerivation (finalAttrs: { cp -r dist/*unpacked/resources $out/opt/Vesktop/ for file in build/icon_*x32.png; do - file_suffix=''${file//icon_} + file_suffix=''${file//build\/icon_} install -Dm0644 $file $out/share/icons/hicolor/''${file_suffix//x32.png}/apps/vesktop.png done '' diff --git a/pkgs/by-name/vk/vkd3d/package.nix b/pkgs/by-name/vk/vkd3d/package.nix new file mode 100644 index 0000000000000..eba5b7014300a --- /dev/null +++ b/pkgs/by-name/vk/vkd3d/package.nix @@ -0,0 +1,63 @@ +{ + lib, + autoreconfHook, + bison, + fetchFromGitLab, + flex, + pkg-config, + spirv-headers, + stdenv, + vulkan-headers, + vulkan-loader, + wine, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "vkd3d"; + version = "1.12"; + + src = fetchFromGitLab { + domain = "gitlab.winehq.org"; + owner = "wine"; + repo = "vkd3d"; + rev = "vkd3d-${finalAttrs.version}"; + hash = "sha256-9FNuWtfJJqkSZ3O11G22aNp8PfseLHH4oyL6MulNwMY="; + }; + + outputs = [ "out" "dev" "lib" ]; + + nativeBuildInputs = [ + autoreconfHook + bison + flex + pkg-config + wine + ]; + + buildInputs = [ + spirv-headers + vulkan-headers + vulkan-loader + ]; + + strictDeps = true; + + meta = { + homepage = "https://gitlab.winehq.org/wine/vkd3d"; + description = "Direct3D to Vulkan translation library"; + longDescription = '' + Vkd3d is a 3D graphics library built on top of Vulkan. It has an API very + similar, but not identical, to Direct3D 12. + + Vkd3d can be used by projects that target Direct3D 12 as a drop-in + replacement at build-time with some modest source modifications. + + If vkd3d is available when building Wine, then Wine will use it to support + Direct3D 12 applications. + ''; + license = with lib.licenses; [ lgpl21Plus ]; + mainProgram = "vkd3d-compiler"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + inherit (wine.meta) platforms; + }; +}) diff --git a/pkgs/by-name/vl/vlc/package.nix b/pkgs/by-name/vl/vlc/package.nix index eb6608d0664ff..7c8b1e6469856 100644 --- a/pkgs/by-name/vl/vlc/package.nix +++ b/pkgs/by-name/vl/vlc/package.nix @@ -5,6 +5,7 @@ , alsa-lib , autoreconfHook , avahi +, curl , dbus , faad2 , fetchpatch @@ -15,6 +16,7 @@ , freefont_ttf , freetype , fribidi +, genericUpdater , gnutls , libSM , libXext @@ -78,6 +80,7 @@ , wayland , wayland-protocols , wrapGAppsHook3 +, writeShellScript , xcbutilkeysyms , zlib @@ -289,6 +292,12 @@ stdenv.mkDerivation (finalAttrs: { remove-references-to -t "${libsForQt5.qtbase.dev}" $out/lib/vlc/plugins/gui/libqt_plugin.so ''; + passthru.updateScript = genericUpdater { + versionLister = writeShellScript "vlc-versionLister" '' + ${curl}/bin/curl -s https://get.videolan.org/vlc/ | sed -En 's/^.*href="([0-9]+(\.[0-9]+)+)\/".*$/\1/p' + ''; + }; + meta = { description = "Cross-platform media player and streaming server"; homepage = "https://www.videolan.org/vlc/"; diff --git a/pkgs/by-name/vp/vpl-gpu-rt/package.nix b/pkgs/by-name/vp/vpl-gpu-rt/package.nix index 388574a4f955c..8c46715b023a5 100644 --- a/pkgs/by-name/vp/vpl-gpu-rt/package.nix +++ b/pkgs/by-name/vp/vpl-gpu-rt/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "vpl-gpu-rt"; - version = "24.2.2"; + version = "24.2.3"; outputs = [ "out" "dev" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "vpl-gpu-rt"; rev = "intel-onevpl-${version}"; - sha256 = "sha256-JtvRh4p4wPRnqFfE86tJW+yS9AKMoi3TPZO+LZ2Q7Mo="; + sha256 = "sha256-n2lkt7zRlpbPedNxa21EQvFdYyOAPF//TsY4srbGHQE="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/by-name/vs/vscode-js-debug/package.nix b/pkgs/by-name/vs/vscode-js-debug/package.nix index 613350da9b8d2..542b5cbfc8111 100644 --- a/pkgs/by-name/vs/vscode-js-debug/package.nix +++ b/pkgs/by-name/vs/vscode-js-debug/package.nix @@ -1,7 +1,7 @@ { lib , buildNpmPackage , fetchFromGitHub -, jq +, buildPackages , libsecret , pkg-config , nodePackages @@ -23,12 +23,12 @@ buildNpmPackage rec { npmDepsHash = "sha256-DfeaiqKadTnGzOObK01ctlavwqTMa0tqn59sLZMPvUM="; - nativeBuildInputs = [ pkg-config nodePackages.node-gyp jq ]; + nativeBuildInputs = [ pkg-config nodePackages.node-gyp ]; buildInputs = [ libsecret ]; postPatch = '' - jq ' + ${lib.getExe buildPackages.jq} ' .scripts.postinstall |= empty | # tries to install playwright, not necessary for build .scripts.build |= "gulp dapDebugServer" | # there is no build script defined .bin |= "./dist/src/dapDebugServer.js" # there is no bin output defined diff --git a/pkgs/by-name/wa/wait4x/package.nix b/pkgs/by-name/wa/wait4x/package.nix index 1255e772b056f..a5b804e3c9074 100644 --- a/pkgs/by-name/wa/wait4x/package.nix +++ b/pkgs/by-name/wa/wait4x/package.nix @@ -4,7 +4,7 @@ }: let pname = "wait4x"; - version = "2.14.0"; + version = "2.14.1"; in buildGoModule { inherit pname version; @@ -13,10 +13,10 @@ buildGoModule { owner = "atkrad"; repo = pname; rev = "v${version}"; - hash = "sha256-4lv6nYeyjjGGQksi2Ffx+Yu0OazNsJ0QEZG5BfuyrJ8="; + hash = "sha256-7dm1KERBYkASuRWlCbpbLuHVc4uCMPWbSwegjZ8LwVU="; }; - vendorHash = "sha256-D8s42YArp0IGi7I6qB9eQEh1ZQptSrKLLVIIdqk5Kq0="; + vendorHash = "sha256-CYE5wvBgNLYzCiibd9SWubIQ+22nffr4jpwgwSxhtGo="; # Tests make network access doCheck = false; diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index 04e8175bba602..ed1b85f3755ac 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,10 +1,10 @@ { "darwin": { - "hash": "sha256-PWcsgYnq8dCyAPJPPWeWXi1HpEgpKBt8OS4VH7XcLFM=", - "version": "0.2024.06.04.08.02.stable_02" + "hash": "sha256-ZfW4pTFmEEA/IRBfEMfnVDOxWm3SxGqUCec2nC6MADA=", + "version": "0.2024.06.11.08.02.stable_03" }, "linux": { - "hash": "sha256-65H9SVcsco282MA//URP6gBuFjDc3R5elL2oZ0ae4W4=", - "version": "0.2024.06.04.08.02.stable_02" + "hash": "sha256-xyE/Rc23+ael2oy0Hdq+kGzPYuq5+V8G3jAu3waA1Tk=", + "version": "0.2024.06.11.08.02.stable_03" } } diff --git a/pkgs/by-name/wa/waybar/package.nix b/pkgs/by-name/wa/waybar/package.nix index cf8eb3b9b350e..134742caa2c86 100644 --- a/pkgs/by-name/wa/waybar/package.nix +++ b/pkgs/by-name/wa/waybar/package.nix @@ -150,9 +150,10 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = (lib.mapAttrsToList lib.mesonEnable { - "cava" = cavaSupport; + "cava" = cavaSupport && lib.asserts.assertMsg sndioSupport "Sndio support is required for Cava"; "dbusmenu-gtk" = traySupport; "jack" = jackSupport; + "libevdev" = evdevSupport; "libinput" = inputSupport; "libnl" = nlSupport; "libudev" = udevSupport; diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix new file mode 100644 index 0000000000000..0e9e45603f70f --- /dev/null +++ b/pkgs/by-name/we/werf/package.nix @@ -0,0 +1,105 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + installShellFiles, + btrfs-progs, + testers, + werf, +}: + +buildGoModule rec { + pname = "werf"; + version = "2.6.1"; + + src = fetchFromGitHub { + owner = "werf"; + repo = "werf"; + rev = "v${version}"; + hash = "sha256-10RyCVF1w5xj/qhFXQTlyrt9HG/4di2fUwUtDHU6t44="; + }; + + vendorHash = "sha256-d1Dn+JN8tiBVx7YDbtvLW0YgIW2ENrEdx4gKatYy1hw="; + + proxyVendor = true; + + subPackages = [ "cmd/werf" ]; + + nativeBuildInputs = [ installShellFiles ]; + + buildInputs = + lib.optionals stdenv.isLinux [ btrfs-progs ] + ++ lib.optionals stdenv.hostPlatform.isGnu [ stdenv.cc.libc.static ]; + + CGO_ENABLED = if stdenv.isLinux then 1 else 0; + + ldflags = + [ + "-s" + "-w" + "-X github.com/werf/werf/v2/pkg/werf.Version=v${version}" + ] + ++ lib.optionals (CGO_ENABLED == 1) [ + "-extldflags=-static" + "-linkmode external" + ]; + + tags = + [ + "containers_image_openpgp" + "dfrunmount" + "dfrunnetwork" + "dfrunsecurity" + "dfssh" + ] + ++ lib.optionals (CGO_ENABLED == 1) [ + "cni" + "exclude_graphdriver_devicemapper" + "netgo" + "no_devmapper" + "osusergo" + "static_build" + ]; + + preCheck = + '' + # Test all targets. + unset subPackages + + # Remove tests that require external services. + rm -rf \ + integration/suites \ + pkg/true_git/*test.go \ + test/e2e + '' + + lib.optionalString (CGO_ENABLED == 0) '' + # A workaround for osusergo. + export USER=nixbld + ''; + + postInstall = '' + installShellCompletion --cmd werf \ + --bash <($out/bin/werf completion --shell=bash) \ + --zsh <($out/bin/werf completion --shell=zsh) + ''; + + passthru.tests.version = testers.testVersion { + package = werf; + command = "werf version"; + version = src.rev; + }; + + meta = with lib; { + description = "GitOps delivery tool"; + mainProgram = "werf"; + longDescription = '' + The CLI tool gluing Git, Docker, Helm & Kubernetes with any CI system to + implement CI/CD and Giterminism. + ''; + homepage = "https://werf.io"; + changelog = "https://github.com/werf/werf/releases/tag/${src.rev}"; + license = licenses.asl20; + maintainers = with maintainers; [ azahi ]; + }; +} diff --git a/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix b/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix index bc3ff4646af61..7ef69e5b1342f 100644 --- a/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix +++ b/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix @@ -31,51 +31,52 @@ in lib.checkListOfEnum "where-is-my-sddm-theme: variant" validVariants variants -stdenvNoCC.mkDerivation rec { - pname = "where-is-my-sddm-theme"; - version = "1.9.1"; + stdenvNoCC.mkDerivation + (finalAttrs: { + pname = "where-is-my-sddm-theme"; + version = "1.9.2"; - src = fetchFromGitHub { - owner = "stepanzubkov"; - repo = pname; - rev = "v${version}"; - hash = "sha256-o9SpzSmHygHix3BUaMQRwLvgy2BdDsBXmiLDU+9u/6Q="; - }; + src = fetchFromGitHub { + owner = "stepanzubkov"; + repo = "where-is-my-sddm-theme"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-7I8ucPuPPpUH/KyJoiwlfS7r4Bsh8ZnkHdOEED12TOQ="; + }; - propagatedUserEnvPkgs = - [ ] - ++ lib.optional (lib.elem "qt5" variants) [ libsForQt5.qtgraphicaleffects ] - ++ lib.optional (lib.elem "qt6" variants) [ - qt6.qt5compat - qt6.qtsvg - ]; + propagatedUserEnvPkgs = + [ ] + ++ lib.optionals (lib.elem "qt5" variants) [ libsForQt5.qtgraphicaleffects ] + ++ lib.optionals (lib.elem "qt6" variants) [ + qt6.qt5compat + qt6.qtsvg + ]; - installPhase = - '' - mkdir -p $out/share/sddm/themes/ - '' - + lib.optionalString (lib.elem "qt6" variants) ( - '' - cp -r where_is_my_sddm_theme/ $out/share/sddm/themes/ - '' - + lib.optionalString (lib.isAttrs themeConfig) '' - ln -sf ${user-cfg} $out/share/sddm/themes/where_is_my_sddm_theme/theme.conf.user - '' - ) - + lib.optionalString (lib.elem "qt5" variants) ( - '' - cp -r where_is_my_sddm_theme_qt5/ $out/share/sddm/themes/ + installPhase = '' - + lib.optionalString (lib.isAttrs themeConfig) '' - ln -sf ${user-cfg} $out/share/sddm/themes/where_is_my_sddm_theme_qt5/theme.conf.user + mkdir -p $out/share/sddm/themes/ '' - ); + + lib.optionalString (lib.elem "qt6" variants) ( + '' + cp -r where_is_my_sddm_theme/ $out/share/sddm/themes/ + '' + + lib.optionalString (lib.isAttrs themeConfig) '' + ln -sf ${user-cfg} $out/share/sddm/themes/where_is_my_sddm_theme/theme.conf.user + '' + ) + + lib.optionalString (lib.elem "qt5" variants) ( + '' + cp -r where_is_my_sddm_theme_qt5/ $out/share/sddm/themes/ + '' + + lib.optionalString (lib.isAttrs themeConfig) '' + ln -sf ${user-cfg} $out/share/sddm/themes/where_is_my_sddm_theme_qt5/theme.conf.user + '' + ); - meta = with lib; { - description = "Most minimalistic SDDM theme among all themes"; - homepage = "https://github.com/stepanzubkov/where-is-my-sddm-theme"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ name-snrl ]; - }; -} + meta = { + description = "Most minimalistic SDDM theme among all themes"; + homepage = "https://github.com/stepanzubkov/where-is-my-sddm-theme"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ name-snrl ]; + }; + }) diff --git a/pkgs/by-name/wh/whistle/package.nix b/pkgs/by-name/wh/whistle/package.nix index 5dbbd597207b8..041442cff9255 100644 --- a/pkgs/by-name/wh/whistle/package.nix +++ b/pkgs/by-name/wh/whistle/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "whistle"; - version = "2.9.71"; + version = "2.9.73"; src = fetchFromGitHub { owner = "avwo"; repo = "whistle"; rev = "v${version}"; - hash = "sha256-98gQHnGvMuGCs3HzbT9Jtio40HyY5+rPXFs+NpdVuo0="; + hash = "sha256-KDw6axnjwMnXeTKaG2GIF2C4dKiZ/MW2q0SlZGlBIoI="; }; - npmDepsHash = "sha256-mptPD9BgkJU+xn5CM7YDA6f3p3NLFCUQdxyZ9ibH5b8="; + npmDepsHash = "sha256-U7gZNKUIU3wS8DaVdxi1/Ik+dzwPfyoI3m//2MgPvt4="; dontNpmBuild = true; diff --git a/pkgs/by-name/wo/workout-tracker/package.nix b/pkgs/by-name/wo/workout-tracker/package.nix index a756f7c38b385..ad5cb683c4ce7 100644 --- a/pkgs/by-name/wo/workout-tracker/package.nix +++ b/pkgs/by-name/wo/workout-tracker/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "workout-tracker"; - version = "0.15.0"; + version = "1.15.2"; src = fetchFromGitHub { owner = "jovandeginste"; repo = "workout-tracker"; rev = "refs/tags/v${version}"; - hash = "sha256-pZe3X2W885MIV0stDTjQgcDDNgM4OUpUbReY+9RrYsw="; + hash = "sha256-NYRoIfhdOjyC9WPp3hsHFZWpAsDjbMk2vLn79PixhvE="; }; vendorHash = null; diff --git a/pkgs/by-name/wp/wpaperd/package.nix b/pkgs/by-name/wp/wpaperd/package.nix index f059b22640a7c..fce9bc27cd857 100644 --- a/pkgs/by-name/wp/wpaperd/package.nix +++ b/pkgs/by-name/wp/wpaperd/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/danyspin97/wpaperd"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ DPDmancul nu-nu-ko ]; + maintainers = with maintainers; [ DPDmancul fsnkty ]; mainProgram = "wpaperd"; }; } diff --git a/pkgs/by-name/wx/wxc/package.nix b/pkgs/by-name/wx/wxc/package.nix new file mode 100644 index 0000000000000..42de45ecfcf17 --- /dev/null +++ b/pkgs/by-name/wx/wxc/package.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitea +, cmake +, libGL +, wxGTK32 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "wxc"; + version = "1.0.0.2"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "wxHaskell"; + repo = "wxHaskell"; + rev = "wxc-${finalAttrs.version}"; + hash = "sha256-wjby7F+Xi+H4avLGZxKJ7/LY2CJAGMIwBM7mfVzI1Bg="; + }; + + sourceRoot = finalAttrs.src.name + "/wxc"; + + nativeBuildInputs = [ + cmake + wxGTK32 # in nativeBuildInputs because of wx-config + ]; + + buildInputs = [ + libGL + ]; + + preConfigure = '' + bash generate-version-header.sh + ''; + + meta = { + description = "C language binding for wxWidgets"; + homepage = "https://wiki.haskell.org/WxHaskell"; + license = lib.licenses.wxWindows; + maintainers = with lib.maintainers; [ fgaz ]; + platforms = wxGTK32.meta.platforms; + }; +}) diff --git a/pkgs/by-name/xe/xemu/package.nix b/pkgs/by-name/xe/xemu/package.nix index 9d9500d507d0e..ee14a60ab4429 100644 --- a/pkgs/by-name/xe/xemu/package.nix +++ b/pkgs/by-name/xe/xemu/package.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "xemu"; - version = "0.7.122"; + version = "0.7.123"; src = fetchFromGitHub { owner = "xemu-project"; repo = "xemu"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-TxtkLdUSIbDu9uqPq4s64HtXFyT3ntN8Su9bEGPS3f0="; + hash = "sha256-8Nfy6x3+8n1AlXnZmbISZrncnU04iaQPx69e46XgxUU="; }; nativeBuildInputs = diff --git a/pkgs/tools/misc/xmonad-log/default.nix b/pkgs/by-name/xm/xmonad-log/package.nix index 9ba7941b45f79..385d5edf90cfd 100644 --- a/pkgs/tools/misc/xmonad-log/default.nix +++ b/pkgs/by-name/xm/xmonad-log/package.nix @@ -1,19 +1,18 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule { pname = "xmonad-log"; - version = "0.1.0"; - - goPackagePath = "github.com/xintron/xmonad-log"; + version = "0.1.0-unstable-2024-06-14"; src = fetchFromGitHub { owner = "xintron"; repo = "xmonad-log"; - rev = version; - sha256 = "1il6v0zcjw0pfb1hjj198y94jmlcx255h422ph0f1zr7afqkzmaw"; + rev = "70c76d59c22cf5f412467cd42fa9ff34eeb2bd1b"; + sha256 = "sha256-hDYb3mSX2+FX/2uazCKPXmNj0avDlutwSMjST7wLBVY="; }; - goDeps = ./deps.nix; + vendorHash = "sha256-58zK6t3rb+19ilaQaNgsMVFQBYKPIV40ww8klrGbpnw="; + proxyVendor = true; meta = with lib; { description = "xmonad DBus monitoring solution"; diff --git a/pkgs/by-name/xp/xplr/package.nix b/pkgs/by-name/xp/xplr/package.nix index 924d1bc71dcc8..b03cec6e5effa 100644 --- a/pkgs/by-name/xp/xplr/package.nix +++ b/pkgs/by-name/xp/xplr/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.21.8"; + version = "0.21.9"; src = fetchFromGitHub { owner = "sayanarijit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GpGYCGXSCQhFEPDUnHaOdz0LZ0jjRcCRnRCyOrulDVs="; + sha256 = "sha256-0c2QJUEQwKEzzDBDP5XdX7xe1rivazsoZtepB4Dxp/c="; }; - cargoHash = "sha256-eCIoUUWHpFk+O5ipswwiQxf1H1ygkj07Sjyj4L8Ui6I="; + cargoHash = "sha256-RZgdWhVBZozYxbbNslCBLhN6EnogpyVXvht6GbzLnPs="; # fixes `thread 'main' panicked at 'cannot find strip'` on x86_64-darwin env = lib.optionalAttrs (stdenv.isx86_64 && stdenv.isDarwin) { diff --git a/pkgs/by-name/xu/xunit-viewer/package.nix b/pkgs/by-name/xu/xunit-viewer/package.nix new file mode 100644 index 0000000000000..7c31b82aac7b3 --- /dev/null +++ b/pkgs/by-name/xu/xunit-viewer/package.nix @@ -0,0 +1,42 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, + callPackage, + testers, xunit-viewer, +}: +let + version = "10.6.1"; +in +buildNpmPackage { + pname = "xunit-viewer"; + inherit version; + + src = fetchFromGitHub { + owner = "lukejpreston"; + repo = "xunit-viewer"; + rev = "v${version}"; + hash = "sha256-n9k1Z/wofExG6k/BxtkU8M+Lo3XdCgCh8VFj9jcwL1Q="; + }; + + npmDepsHash = "sha256-6PV0+G1gzUWUjOfwRtVeALVFFiwkCAB33yB9W0PCGfc="; + + passthru.updateScript = nix-update-script { }; + + passthru.tests = { + version = testers.testVersion { + package = xunit-viewer; + version = "unknown"; # broken, but at least it runs + }; + example = callPackage ./test/example.nix { }; + }; + + meta = { + description = "View your xunit results using JavaScript"; + homepage = "https://lukejpreston.github.io/xunit-viewer"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ pluiedev ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/xu/xunit-viewer/test/example.junit.xml b/pkgs/by-name/xu/xunit-viewer/test/example.junit.xml new file mode 100644 index 0000000000000..a87b270fe2f3f --- /dev/null +++ b/pkgs/by-name/xu/xunit-viewer/test/example.junit.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- taken from the nix test suite and then stripped down --> +<testsuites tests="280" failures="0" disabled="2" errors="0" time="0.2" timestamp="2024-06-16T13:50:02.511" name="AllTests"> + <testsuite name="parseShebangContent" tests="14" failures="0" disabled="0" skipped="0" errors="0" time="0.001" timestamp="2024-06-16T13:50:02.511"> + <testcase name="basic" file="tests/unit/libutil/args.cc" line="10" status="run" result="completed" time="0." timestamp="2024-06-16T13:50:02.511" classname="parseShebangContent" /> + <testcase name="empty" file="tests/unit/libutil/args.cc" line="18" status="run" result="completed" time="0." timestamp="2024-06-16T13:50:02.511" classname="parseShebangContent" /> + </testsuite> +</testsuites> diff --git a/pkgs/by-name/xu/xunit-viewer/test/example.nix b/pkgs/by-name/xu/xunit-viewer/test/example.nix new file mode 100644 index 0000000000000..574b9d784951e --- /dev/null +++ b/pkgs/by-name/xu/xunit-viewer/test/example.nix @@ -0,0 +1,16 @@ +{ xunit-viewer, runCommand, ... }: + +runCommand "test-xunit-viewer" { + nativeBuildInputs = [ xunit-viewer ]; +} '' + mkdir $out + xunit-viewer -r ${./example.junit.xml} -o $out/index.html + ( set -x + grep '<body' $out/index.html + # Can't easily grep for parts of the original data, because it ends up + # embedded as base64 encoded data (and slightly modified?). + # We'd have to really dissect it or render it with a browser. + # Fortunately, we've already caught the most severe packaging problems + # with just this. + ) +'' diff --git a/pkgs/by-name/ya/yamlscript/package.nix b/pkgs/by-name/ya/yamlscript/package.nix index 603f6c88371fa..1ae39b8e636cb 100644 --- a/pkgs/by-name/ya/yamlscript/package.nix +++ b/pkgs/by-name/ya/yamlscript/package.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "yamlscript"; - version = "0.1.59"; + version = "0.1.61"; src = fetchurl { url = "https://github.com/yaml/yamlscript/releases/download/${version}/yamlscript.cli-${version}-standalone.jar"; - hash = "sha256-I5Z9QB8ZmTyeMs/WxUhJZM65VpUIx+t7QKzCRuRdRG4="; + hash = "sha256-NuZxIuj7N7zKBOaBPn8g/cKoRmNMkpH75YMHBjFFM8g="; }; executable = "ys"; diff --git a/pkgs/by-name/yo/youtrack/package.nix b/pkgs/by-name/yo/youtrack/package.nix index 7cc98504d557e..9695dd3e0a8fb 100644 --- a/pkgs/by-name/yo/youtrack/package.nix +++ b/pkgs/by-name/yo/youtrack/package.nix @@ -1,12 +1,12 @@ -{ lib, stdenvNoCC, fetchzip, makeBinaryWrapper, jdk17_headless, gawk, statePath ? "/var/lib/youtrack" }: +{ lib, stdenvNoCC, fetchzip, makeBinaryWrapper, jdk21_headless, gawk, statePath ? "/var/lib/youtrack" }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "youtrack"; - version = "2024.1.32323"; + version = "2024.2.34646"; src = fetchzip { url = "https://download.jetbrains.com/charisma/youtrack-${finalAttrs.version}.zip"; - hash = "sha256-eBjh0jp2Pb40IkjKZSBiaPWh5xXXRYUVjgmoVGrVLrg="; + hash = "sha256-9htjtB1TC+p+eETsXH5B36NKnZsFA/Og/PIW9gHQefc="; }; nativeBuildInputs = [ makeBinaryWrapper ]; @@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { cp -r * $out makeWrapper $out/bin/youtrack.sh $out/bin/youtrack \ --prefix PATH : "${lib.makeBinPath [ gawk ]}" \ - --set JRE_HOME ${jdk17_headless} + --set JRE_HOME ${jdk21_headless} rm -rf $out/internal/java mv $out/conf $out/conf.orig ln -s ${statePath}/backups $out/backups diff --git a/pkgs/by-name/yt/yt-dlg/package.nix b/pkgs/by-name/yt/yt-dlg/package.nix index e245cba7c2a2b..8cc4d65b2a914 100644 --- a/pkgs/by-name/yt/yt-dlg/package.nix +++ b/pkgs/by-name/yt/yt-dlg/package.nix @@ -40,6 +40,11 @@ python3Packages.buildPythonApplication rec { wxpython ]; + postInstall = '' + install -Dm444 yt-dlg.desktop -t $out/share/applications + cp -r youtube_dl_gui/data/* $out/share + ''; + meta = { description = "Cross platform front-end GUI of the popular youtube-dl written in wxPython"; homepage = "https://oleksis.github.io/youtube-dl-gui"; diff --git a/pkgs/by-name/zf/zfind/package.nix b/pkgs/by-name/zf/zfind/package.nix new file mode 100644 index 0000000000000..8cf9697ce1070 --- /dev/null +++ b/pkgs/by-name/zf/zfind/package.nix @@ -0,0 +1,37 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "zfind"; + version = "0.4.3"; + + src = fetchFromGitHub { + owner = "laktak"; + repo = "zfind"; + rev = "v${version}"; + hash = "sha256-Nc7C0aauv/SChChAtyA089y6qTuaC9ClVz/u5QgJLPk="; + }; + + vendorHash = "sha256-WF5jeTeTK99MRNrIW80jYuyH60Rc/EVBW6owUCIyosE="; + + ldflags = [ + "-X" + "main.appVersion=${version}" + ]; + + meta = with lib; { + description = "CLI for file search with SQL like syntax."; + longDescription = '' + zfind allows you to search for files, including inside tar, zip, 7z and rar archives. + It makes finding files easy with a filter syntax that is similar to an SQL-WHERE clause. + ''; + homepage = "https://github.com/laktak/zfind"; + changelog = "https://github.com/laktak/zfind/releases/tag/v${version}"; + license = licenses.mit; + mainProgram = "zfind"; + maintainers = with maintainers; [ eeedean ]; + }; +} diff --git a/pkgs/by-name/zp/zpaqfranz/package.nix b/pkgs/by-name/zp/zpaqfranz/package.nix index 0801c920c653d..e951b59eb4679 100644 --- a/pkgs/by-name/zp/zpaqfranz/package.nix +++ b/pkgs/by-name/zp/zpaqfranz/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zpaqfranz"; - version = "59.7"; + version = "59.8"; src = fetchFromGitHub { owner = "fcorbelli"; repo = "zpaqfranz"; rev = finalAttrs.version; - hash = "sha256-BP9aAzS5ZeT0mZeheQY7tcnTLuJZMWz3se1phv5u5BI="; + hash = "sha256-N3R/M0TS8XzRilQT4NFqIlfo2NqfunA38IrQBz5uaPg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/zs/zsh-wd/package.nix b/pkgs/by-name/zs/zsh-wd/package.nix index c55830b655c2f..dec73b7227656 100644 --- a/pkgs/by-name/zs/zsh-wd/package.nix +++ b/pkgs/by-name/zs/zsh-wd/package.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "wd"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "mfaerevaag"; repo = "wd"; rev = "v${version}"; - sha256 = "sha256-u3n+JzInv8VajWAFXECuEOWuQurX8iWklwV2LG4Tj24="; + sha256 = "sha256-Zc49X/8T66xnDkfotf0p6AVyHHd4P3eNDMOsO1sUryY="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/zx/zxtune/package.nix b/pkgs/by-name/zx/zxtune/package.nix index e406afbb681bd..11a283a4eb2ba 100644 --- a/pkgs/by-name/zx/zxtune/package.nix +++ b/pkgs/by-name/zx/zxtune/package.nix @@ -25,6 +25,8 @@ , withQt ? true , qt5 , zip +, makeDesktopItem +, copyDesktopItems }: let dlopenBuildInputs = [] @@ -58,7 +60,11 @@ in stdenv.mkDerivation rec { strictDeps = true; - nativeBuildInputs = lib.optionals withQt [ zip qt5.wrapQtAppsHook ]; + nativeBuildInputs = lib.optionals withQt [ + zip + qt5.wrapQtAppsHook + copyDesktopItems + ]; buildInputs = staticBuildInputs ++ dlopenBuildInputs; @@ -118,6 +124,7 @@ in stdenv.mkDerivation rec { install -Dm755 bin/linux/release/zxtune123 -t $out/bin '' + lib.optionalString withQt '' install -Dm755 bin/linux/release/zxtune-qt -t $out/bin + install -Dm755 apps/zxtune-qt/res/theme_default/zxtune.png -t $out/share/icons/hicolor/48x48/apps '' + '' runHook postInstall ''; @@ -128,6 +135,17 @@ in stdenv.mkDerivation rec { wrapQtApp "$out/bin/zxtune-qt" ''; + desktopItems = lib.optionals withQt [(makeDesktopItem { + name = "ZXTune"; + exec = "zxtune-qt"; + icon = "zxtune"; + desktopName = "ZXTune"; + genericName = "ZXTune"; + comment = meta.description; + categories = [ "Audio" ]; + type = "Application"; + })]; + meta = with lib; { description = "Crossplatform chiptunes player"; longDescription = '' diff --git a/pkgs/common-updater/unstable-updater.nix b/pkgs/common-updater/unstable-updater.nix index d7a9c73fbc2d6..e6981f633534b 100644 --- a/pkgs/common-updater/unstable-updater.nix +++ b/pkgs/common-updater/unstable-updater.nix @@ -14,7 +14,7 @@ { url ? null # The git url, if empty it will be set to src.gitRepoUrl , branch ? null -, hardcodeZeroVersion ? false # Use a made-up version "0" instead of latest tag. Use when there is no previous release, or the project's tagging system is incompatible with what we expect from versions +, hardcodeZeroVersion ? false # Use a made-up version "0" instead of latest tag. Use when the project's tagging system is incompatible with what we expect from versions , tagFormat ? "*" # A `git describe --tags --match '<format>'` pattern that tags must match to be considered , tagPrefix ? null # strip this prefix from a tag name , tagConverter ? null # A command to convert more complex tag formats. It receives the git tag via stdin and should convert it into x.y.z format to stdout diff --git a/pkgs/data/fonts/catamaran/default.nix b/pkgs/data/fonts/catamaran/default.nix new file mode 100644 index 0000000000000..253f458bc4b60 --- /dev/null +++ b/pkgs/data/fonts/catamaran/default.nix @@ -0,0 +1,43 @@ +{ + stdenvNoCC, + lib, + fetchzip, +}: +stdenvNoCC.mkDerivation rec { + pname = "catamaran"; + version = "0-unstable-2024-03-02"; + + src = fetchzip { + url = "https://www.1001fonts.com/download/catamaran.zip"; + stripRoot = false; + hash = "sha256-9s11lZSS4pYJZwl8Uk7qtdwfZ2bkoZkSIf1MkQlv7H4="; + }; + + stripRoot = false; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts/truetype + mv *.ttf $out/share/fonts/truetype/ + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://fonts.google.com/specimen/Catamaran"; + description = "A stylish sans-serif Tamil and Latin typeface"; + longDescription = '' + Catamaran is a Unicode-compliant Latin and Tamil text type family designed for the digital age. + The Tamil is monolinear and was designed alongside the sans serif Latin and Devanagari family Palanquin. + + It currently comprises of 9 text weights, making it a versatile family that strikes a balance between typographic conventions and that bit of sparkle. + (A catamaran is a multihulled vessel consisting of two parallel hulls of equal size. + The catamaran concept is a relative newcomer for Western boat designers, been used since time immemorial among the Dravidian people, in South India.) + ''; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [wyred50]; + }; +} + diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 245006f199041..2377636d77417 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = "Iosevka${toString set}"; - version = "30.1.1"; + version = "30.2.0"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-PVPr/mI13UDJfXy+vmj3DfZ1vkcE7r7YoWTeXokJz50="; + hash = "sha256-L08xBKZHFFByemEa4GgwQRr+wRCocuT/RO+hV/S+hFA="; }; - npmDepsHash = "sha256-/MWONDfq+2TqwcOJFnjLatSdGvMqcgMjJnuuAduWJ14="; + npmDepsHash = "sha256-oRV6QVcJiVKvUtfrewTtnmlIMDaGknn0lEHdcNM3V2g="; nativeBuildInputs = [ remarshal diff --git a/pkgs/data/icons/arc-icon-theme/default.nix b/pkgs/data/icons/arc-icon-theme/default.nix index 2950f929912a6..a185160d4a3e9 100644 --- a/pkgs/data/icons/arc-icon-theme/default.nix +++ b/pkgs/data/icons/arc-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "arc-icon-theme"; - version = "2016-11-22"; + version = "20161122"; src = fetchFromGitHub { owner = "horst3180"; - repo = pname; - rev = "55a575386a412544c3ed2b5617a61f842ee4ec15"; - sha256 = "1ch3hp08qri93510hypzz6m2x4xgg2h15wvnhjwh1x1s1b7jvxjd"; + repo = "arc-icon-theme"; + rev = version; + hash = "sha256-TfYtzwo69AC5hHbzEqB4r5Muqvn/eghCGSlmjMCFA7I="; }; nativeBuildInputs = [ diff --git a/pkgs/data/misc/clash-geoip/default.nix b/pkgs/data/misc/clash-geoip/default.nix index 1fd39897a0af5..8be4f99748eba 100644 --- a/pkgs/data/misc/clash-geoip/default.nix +++ b/pkgs/data/misc/clash-geoip/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "clash-geoip"; - version = "20240512"; + version = "20240612"; src = fetchurl { url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb"; - sha256 = "sha256-vWtiTcuTcAL6E083rHPVhqduIs6tuAOph/EdwLFXHek="; + sha256 = "sha256-uLXdQUrhBZC7av5MWvlVC0W8UQBWDsYhdmKwKEfOQfk="; }; dontUnpack = true; diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 0389ac7026595..c8fb95c87720a 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20240510"; + version = "20240523"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - hash = "sha256-CKLVIcSFaH9r45lA1bP2G8D1g7t+NlWhMcZYOF635co="; + hash = "sha256-ne/y39KUskzsnw1iBC8EQ62P3GYG+L6pUePlMXCpBsU="; }; nativeBuildInputs = [ diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 8e18822299fd9..d603364335f56 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20240508170917"; + version = "20240614093027"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-fxiKd4bnEqUsqiBkU6EiMe8dd1uaopqU52CgclDFiuI="; + hash = "sha256-IWBih6SyS9rpf6qiQmQSXKsiQeVoBMO9PfB0ZT1FV9c="; }; vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg="; meta = with lib; { diff --git a/pkgs/data/themes/andromeda-gtk-theme/default.nix b/pkgs/data/themes/andromeda-gtk-theme/default.nix index deaf33c20907e..479a0c29b5e5b 100644 --- a/pkgs/data/themes/andromeda-gtk-theme/default.nix +++ b/pkgs/data/themes/andromeda-gtk-theme/default.nix @@ -2,22 +2,22 @@ stdenvNoCC.mkDerivation { pname = "andromeda-gtk-theme"; - version = "0-unstable-2024-03-04"; + version = "0-unstable-2024-06-08"; srcs = [ (fetchFromGitHub { owner = "EliverLara"; repo = "Andromeda-gtk"; - rev = "250751a546dd0fa2e67eef86d957fbf993b61dfe"; - hash = "sha256-exr9j/jW2P9cBhKUPQy3AtK5Vgav5vOyWInXUyVhBk0="; + rev = "8efb8ffef7118adf7a22d34a287594499d62b9b8"; + hash = "sha256-AlPSD6tPNYY8iqPFS5IVOO5Zd3UqR3uS5h4l48UZ+dw="; name = "Andromeda"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "Andromeda-gtk"; - rev = "11a6194d19cb846447db048455a5e782ec830ae1"; - hash = "sha256-Yy3mih0nyA+ahLqj2D99EKqtmWYJRsvQMkmlLfUPcqQ="; + rev = "b8c1a8bd0ba8d3e35dcd43f3fc3c177844b02c9c"; + hash = "sha256-51IWJtbAHA8jNbrGbudiwqQ9SC4dpj9CTHqovNWOtc8="; name = "Andromeda-standard-buttons"; }) ]; diff --git a/pkgs/data/themes/catppuccin-gtk/colloid-src-git-reset.patch b/pkgs/data/themes/catppuccin-gtk/colloid-src-git-reset.patch deleted file mode 100644 index 7ee1f4bd9b6f7..0000000000000 --- a/pkgs/data/themes/catppuccin-gtk/colloid-src-git-reset.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/scripts/create_theme.py b/scripts/create_theme.py -index 074dc43..7e7a8eb 100644 ---- a/scripts/create_theme.py -+++ b/scripts/create_theme.py -@@ -34,7 +34,11 @@ def create_theme(types: List[str], accents: List[str], dest: str, link: bool = F - os.chdir(work_dir) - subprocess.call("./build.sh", shell=True) # Rebuild all scss - subprocess.call(install_cmd, shell=True) # Install the theme globally for you -- subprocess.call("git reset --hard HEAD", shell=True) # reset colloid repo to original state -+ # subprocess.call("git reset --hard HEAD", shell=True) # reset colloid repo to original state -+ # recreate git reset -+ os.chdir(repo_dir) -+ shutil.rmtree("colloid") -+ shutil.copytree("colloid-base", "colloid") - - try: - # Rename colloid generated files as per catppuccin diff --git a/pkgs/data/themes/colloid-gtk-theme/default.nix b/pkgs/data/themes/colloid-gtk-theme/default.nix index 10725058e1c2a..978500ef6a213 100644 --- a/pkgs/data/themes/colloid-gtk-theme/default.nix +++ b/pkgs/data/themes/colloid-gtk-theme/default.nix @@ -18,17 +18,17 @@ in lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all" ] themeVariants lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants -lib.checkListOfEnum "${pname}: tweaks" [ "nord" "dracula" "gruvbox" "everforest" "all" "black" "rimless" "normal" "float" ] tweaks +lib.checkListOfEnum "${pname}: tweaks" [ "nord" "dracula" "gruvbox" "everforest" "catppuccin" "all" "black" "rimless" "normal" "float" ] tweaks stdenvNoCC.mkDerivation rec { inherit pname; - version = "2024-05-13"; + version = "2024-06-18"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - hash = "sha256-24U1iMByy+cFQuLUWYPBSuvJwYzwS0rCr7L6OWyMUz0="; + hash = "sha256-2saj/QfiYCxthGHauaSvRv9VVptlKbXoRTMYs3FWZsc="; }; nativeBuildInputs = [ diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index d22064014ebaf..c49a35e85dab4 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "yaru"; - version = "24.04.2"; + version = "24.04.3"; src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; rev = version; - hash = "sha256-nvNJ0ppx3oete+CsklJtpDOLyUA0Oj/oUmcLjsR54MU="; + hash = "sha256-Z0qW3hW5Sije5Hn6OB9f5M6xnmMmRnP76p0kjiQZznw="; }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; diff --git a/pkgs/desktops/cinnamon/bulky/default.nix b/pkgs/desktops/cinnamon/bulky/default.nix index c3927ece25485..587018695d59b 100644 --- a/pkgs/desktops/cinnamon/bulky/default.nix +++ b/pkgs/desktops/cinnamon/bulky/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "bulky"; - version = "3.2"; + version = "3.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = "bulky"; rev = version; - hash = "sha256-Zt5J8+CYiPxp/e1wDaJp7R91vYJmGNqPQs39J/OIwiQ="; + hash = "sha256-S4wAcwlJnXHYQEnP9WApCTjvVHKMrAt7gQ2l8zvFrs0="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/mint-x-icons/default.nix b/pkgs/desktops/cinnamon/mint-x-icons/default.nix index 50819783db57f..8b045980c44a1 100644 --- a/pkgs/desktops/cinnamon/mint-x-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-x-icons/default.nix @@ -11,13 +11,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-x-icons"; - version = "1.6.8"; + version = "1.6.9"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-cxBZsAcGgoIY9KhjR/BWnMcttrywN6qap4lu5b2hauo="; + hash = "sha256-J5Osy+VosyBhwiiwELMtjDTf3/J6DpuQ4c9DO06fo+4="; }; propagatedBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/pkgs/desktops/cinnamon/mint-y-icons/default.nix index a5b9911045c8d..f12800e384b43 100644 --- a/pkgs/desktops/cinnamon/mint-y-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-y-icons/default.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-y-icons"; - version = "1.7.5"; + version = "1.7.6"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-ZStRvT0qP8W1RCSJoXZHMrECp6k8dh/18UvgmV87oNQ="; + hash = "sha256-baBacAatUP/jtU/SEVRa6HceGooMwI9N9arDWqPHR2Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/pix/default.nix b/pkgs/desktops/cinnamon/pix/default.nix index e02d43ba16c03..8d74bdbe7122e 100644 --- a/pkgs/desktops/cinnamon/pix/default.nix +++ b/pkgs/desktops/cinnamon/pix/default.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "pix"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-XXt5tq+Zfm6fqorsFAWV3guii6gTK5JRgw26GkNkoos="; + sha256 = "sha256-QkgjUzoBOXE3mxXy/Lq3YkHq7f9oE97FeP7PHIBDHvc="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/warpinator/default.nix b/pkgs/desktops/cinnamon/warpinator/default.nix index 6f9a7e5a24d38..ca93799f58008 100644 --- a/pkgs/desktops/cinnamon/warpinator/default.nix +++ b/pkgs/desktops/cinnamon/warpinator/default.nix @@ -36,13 +36,13 @@ let in stdenv.mkDerivation rec { pname = "warpinator"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-qtz8/vO6LJ19NcuFf9p3DWNy41kkoBWlgZGChlnTOvI="; + hash = "sha256-T1boMqzAGMjUD62ZAlWNOe3xUx5H5ZwpR7MNipy/LKA="; }; nativeBuildInputs = [ @@ -78,9 +78,9 @@ stdenv.mkDerivation rec { # We make bubblewrap mode always available since # landlock mode is not supported in old kernels. substituteInPlace src/warpinator-launch.py \ - --replace '"/bin/python3"' '"${pythonEnv.interpreter}"' \ - --replace "/bin/bwrap" "${bubblewrap}/bin/bwrap" \ - --replace 'GLib.find_program_in_path("bwrap")' "True" + --replace-fail '"/usr/bin/python3"' '"${pythonEnv.interpreter}"' \ + --replace-fail "/usr/bin/bwrap" "${bubblewrap}/bin/bwrap" \ + --replace-fail 'GLib.find_program_in_path("bwrap")' "True" ''; passthru.updateScript = gitUpdater { diff --git a/pkgs/desktops/cinnamon/xviewer/default.nix b/pkgs/desktops/cinnamon/xviewer/default.nix index a7d65980d97e4..5f45ed4f6bfa3 100644 --- a/pkgs/desktops/cinnamon/xviewer/default.nix +++ b/pkgs/desktops/cinnamon/xviewer/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "xviewer"; - version = "3.4.4"; + version = "3.4.5"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-Kr3GoroQUzOePJiYeJYE9wrqWKcfX7ncu3tZSxOdnvU="; + sha256 = "sha256-J6KDkGPbcRBofsJVmd+1IEapSfSd3ftjz0AggvBI8ck="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix b/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix index d01c45c654d21..fd50f71ac2013 100644 --- a/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix +++ b/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix @@ -41,9 +41,9 @@ buildGoModule rec { ]; postPatch = '' - sed -i 's|iniparser/||' */*.c + sed -i '1i#include <stdlib.h>\n#include <string.h>' tool/pwd_conf_update.c substituteInPlace misc/{pkgconfig/libdeepin_pw_check.pc,system-services/org.deepin.dde.PasswdConf1.service} \ - --replace "/usr" "$out" + --replace-fail "/usr" "$out" ''; buildPhase = '' diff --git a/pkgs/desktops/lomiri/data/lomiri-session/1001-Unset-QT_QPA_PLATFORMTHEME.patch b/pkgs/desktops/lomiri/data/lomiri-session/1001-Unset-QT_QPA_PLATFORMTHEME.patch new file mode 100644 index 0000000000000..8edf093d4ed34 --- /dev/null +++ b/pkgs/desktops/lomiri/data/lomiri-session/1001-Unset-QT_QPA_PLATFORMTHEME.patch @@ -0,0 +1,33 @@ +From 30b5391c3f20180fe7427fe179ba26f846200d96 Mon Sep 17 00:00:00 2001 +From: OPNA2608 <opna2608@protonmail.com> +Date: Mon, 3 Jun 2024 20:50:03 +0200 +Subject: [PATCH] Unset QT_QPA_PLATFORMTHEME + +gtk3 value breaks Lomiri startup +--- + lomiri-session | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lomiri-session b/lomiri-session +index 9d68249..b103840 100755 +--- a/lomiri-session ++++ b/lomiri-session +@@ -47,6 +47,7 @@ fi + + # Set some envs + export QT_QPA_PLATFORM=wayland ++export QT_QPA_PLATFORMTHEME= + export QT_IM_MODULE=maliit + export MALIIT_FORCE_DBUS_CONNECTION=1 + export UITK_ICON_THEME=suru +@@ -55,6 +56,7 @@ dbus-update-activation-environment --systemd MALIIT_FORCE_DBUS_CONNECTION=1 + dbus-update-activation-environment --systemd QT_IM_MODULE=maliit + dbus-update-activation-environment --systemd GTK_IM_MODULE=maliit + dbus-update-activation-environment --systemd QT_QPA_PLATFORM=wayland ++dbus-update-activation-environment --systemd QT_QPA_PLATFORMTHEME= + dbus-update-activation-environment --systemd SDL_VIDEODRIVER=wayland + dbus-update-activation-environment --systemd QT_WAYLAND_DISABLE_WINDOWDECORATION=1 + dbus-update-activation-environment --systemd QT_ACCESSIBILITY=1 +-- +2.44.1 + diff --git a/pkgs/desktops/lomiri/data/lomiri-session/default.nix b/pkgs/desktops/lomiri/data/lomiri-session/default.nix index c62e4ab572bd8..351aed9de8241 100644 --- a/pkgs/desktops/lomiri/data/lomiri-session/default.nix +++ b/pkgs/desktops/lomiri/data/lomiri-session/default.nix @@ -135,6 +135,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { excludes = [ "systemd/lomiri.service" ]; hash = "sha256-BICb6ZwU/sUBzmM4udsOndIgw1A03I/UEG000YvMZ9Y="; }) + + ./1001-Unset-QT_QPA_PLATFORMTHEME.patch ]; postPatch = '' diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 4534a8af27ee1..8d7a4afb69de2 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -1,17 +1,16 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , meson , ninja , pkg-config , vala -, desktop-file-utils , gtk3 , libexif , libgee , libhandy +, libportal-gtk3 , geocode-glib_2 , gexiv2 , libgphoto2 @@ -22,50 +21,21 @@ , sqlite , python3 , libwebp -, appstream , wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "elementary-photos"; - version = "2.8.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "photos"; rev = version; - sha256 = "sha256-VhJggQMy1vk21zNA5pR4uAPGCwnIxLUHVO58AZs+h6s="; + sha256 = "sha256-EULNLtoZ8M68cp1DT11G6O2TONH/0DXWNX0k4AUqa/w="; }; - patches = [ - # The following 5 patches allow building this without webkit2gtk-4.0. - # https://github.com/elementary/photos/pull/743, https://github.com/elementary/photos/pull/746 - (fetchpatch { - url = "https://github.com/elementary/photos/commit/c48f49869bbf44aa37e64c0c1e25aff887783a02.patch"; - hash = "sha256-CeKRONVevJqVEIchgxyPqnM16Y2zUJ1+wnL2jLdJqec="; - }) - (fetchpatch { - url = "https://github.com/elementary/photos/commit/d7a8265ecb562e439d003b61b0823de8348fb10d.patch"; - hash = "sha256-6M3t0l8BUhoaowUSfaiz6xjQBHliO13i+qi5cgfEY04="; - }) - (fetchpatch { - url = "https://github.com/elementary/photos/commit/d8e13e8e803ed7ab1bd23527866567d998744f57.patch"; - hash = "sha256-BGBDIHR5iYtd+rJG9sur1oWa4FK/lF0vLdjyPbyNbdU="; - }) - (fetchpatch { - url = "https://github.com/elementary/photos/commit/075f983a65e9c6d4e80ee07f0c05309badef526a.patch"; - excludes = [ ".github/workflows/ci.yml" ]; - hash = "sha256-QOtssVwwHxFdtfhcVyaN33LMZdOkg/DoAC+UAbrkmDk="; - }) - (fetchpatch { - url = "https://github.com/elementary/photos/commit/ea11cf23db6945df6cc3495fd698456054389371.patch"; - hash = "sha256-4a/CRx7Dmyyda6SUr0QF++R73v7FBzjXfyxvspynnG0="; - }) - ]; - nativeBuildInputs = [ - appstream - desktop-file-utils meson ninja pkg-config @@ -84,6 +54,7 @@ stdenv.mkDerivation rec { libgphoto2 libgudev libhandy + libportal-gtk3 libraw libwebp sqlite diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix index 32628886f11f6..66462f639f1ef 100644 --- a/pkgs/development/beam-modules/hex/default.nix +++ b/pkgs/development/beam-modules/hex/default.nix @@ -8,13 +8,13 @@ let pkg = self: stdenv.mkDerivation rec { pname = "hex"; - version = "2.0.6"; + version = "2.1.1"; src = fetchFromGitHub { owner = "hexpm"; repo = "hex"; rev = "v${version}"; - sha256 = "sha256-fSADQDrqh5U/TdhaHXsMiLMk1wtQ0gEiTqEclJ2w2nY="; + sha256 = "sha256-pEfd2BqkVwZVbnka98MafJ/NRn94BHh+wM0i2Q5duTo="; }; setupHook = writeText "setupHook.sh" '' diff --git a/pkgs/development/compilers/ballerina/default.nix b/pkgs/development/compilers/ballerina/default.nix index 4b75fb377a751..f32cc203b67d4 100644 --- a/pkgs/development/compilers/ballerina/default.nix +++ b/pkgs/development/compilers/ballerina/default.nix @@ -1,6 +1,6 @@ { ballerina, lib, writeText, runCommand, makeWrapper, fetchzip, stdenv, openjdk }: let - version = "2201.9.0"; + version = "2201.9.1"; codeName = "swan-lake"; in stdenv.mkDerivation { pname = "ballerina"; @@ -8,7 +8,7 @@ in stdenv.mkDerivation { src = fetchzip { url = "https://dist.ballerina.io/downloads/${version}/ballerina-${version}-${codeName}.zip"; - hash = "sha256-HLZqhVHBghVd52rbbsEoM4FxoEslxPSJ/oimBPNnmMM="; + hash = "sha256-5ATrR2TZHu4xr+XuGaiSZpIKTDQt6MTxg2DdU1qVjMI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/compilers/c3c/default.nix b/pkgs/development/compilers/c3c/default.nix index 4310ad931792e..2577f1321d749 100644 --- a/pkgs/development/compilers/c3c/default.nix +++ b/pkgs/development/compilers/c3c/default.nix @@ -7,16 +7,17 @@ , libxml2 , libffi , xar +, testers }: -llvmPackages.stdenv.mkDerivation rec { +llvmPackages.stdenv.mkDerivation (finalAttrs: { pname = "c3c"; version = "0.5.5"; src = fetchFromGitHub { owner = "c3lang"; - repo = pname; - rev = "refs/tags/${version}"; + repo = "c3c"; + rev = "refs/tags/${finalAttrs.version}"; hash = "sha256-iOljE1BRVc92NJZj+nr1G6KkBTCwJEUOadXHUDNoPGk="; }; @@ -50,11 +51,18 @@ llvmPackages.stdenv.mkDerivation rec { runHook postCheck ''; + passthru.tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + }; + meta = with lib; { description = "Compiler for the C3 language"; homepage = "https://github.com/c3lang/c3c"; license = licenses.lgpl3Only; maintainers = with maintainers; [ luc65r ]; platforms = platforms.all; + mainProgram = "c3c"; }; -} +}) diff --git a/pkgs/development/compilers/dotnet/9/deps.nix b/pkgs/development/compilers/dotnet/9/deps.nix index fe8a5ffff5d98..969b92810ebf2 100644 --- a/pkgs/development/compilers/dotnet/9/deps.nix +++ b/pkgs/development/compilers/dotnet/9/deps.nix @@ -1,14 +1,10 @@ { fetchNuGet }: [ - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; sha256 = "8da8c9ac5a27821b1f84865630037566565a3a428f6d3098e061cf6530b32684"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-arm64.microsoft.dotnet.ilcompiler/9.0.0-preview.4.24178.3/runtime.linux-arm64.microsoft.dotnet.ilcompiler.9.0.0-preview.4.24178.3.nupkg"; version = "9.0.0-preview.4.24178.3"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILAsm"; sha256 = "4bdb3f8d5e79f9005bf2ec400c4ac568e705b79b6a30e105518601d2bc34903d"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/9.0.0-preview.4.24178.3/runtime.linux-arm64.microsoft.netcore.ilasm.9.0.0-preview.4.24178.3.nupkg"; version = "9.0.0-preview.4.24178.3"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "a64fdf69c38170171ad953f6dbf574148b49250c58d0924b6cf8b31bd8075bd5"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/9.0.0-preview.4.24178.3/runtime.linux-arm64.microsoft.netcore.ildasm.9.0.0-preview.4.24178.3.nupkg"; version = "9.0.0-preview.4.24178.3"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; sha256 = "1scxjf10sp9v1qd4di9fhgz25bkz5wfycsqw67ss436m5zi2jqk7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-x64.microsoft.dotnet.ilcompiler/9.0.0-preview.4.24178.3/runtime.linux-x64.microsoft.dotnet.ilcompiler.9.0.0-preview.4.24178.3.nupkg"; version = "9.0.0-preview.4.24178.3"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.ILAsm"; sha256 = "0va18cvcw0363y7bhc7phkv14jgic0sijipyayq9gjjmmii4mlyq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/9.0.0-preview.4.24178.3/runtime.linux-x64.microsoft.netcore.ilasm.9.0.0-preview.4.24178.3.nupkg"; version = "9.0.0-preview.4.24178.3"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.ILDAsm"; sha256 = "07ykhb6x5j3j72ghnyx509lckmjxzamss0i95rs3bfz9v7ysj96c"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/9.0.0-preview.4.24178.3/runtime.linux-x64.microsoft.netcore.ildasm.9.0.0-preview.4.24178.3.nupkg"; version = "9.0.0-preview.4.24178.3"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; sha256 = "982e4180fd9e2f72f5b391a57ea0135f13606cbef86139acf281e414eaa68541"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-arm64.microsoft.dotnet.ilcompiler/9.0.0-preview.4.24178.3/runtime.osx-arm64.microsoft.dotnet.ilcompiler.9.0.0-preview.4.24178.3.nupkg"; version = "9.0.0-preview.4.24178.3"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILAsm"; sha256 = "abcae0134c2ceb067213d516020efca190c1bdfddb705718361c670c339d29f3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/9.0.0-preview.4.24178.3/runtime.osx-arm64.microsoft.netcore.ilasm.9.0.0-preview.4.24178.3.nupkg"; version = "9.0.0-preview.4.24178.3"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "ee8e084cbbc12081b1954c230cf715113e1d5ee138f1c25d0a15173fa7488f37"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/9.0.0-preview.4.24178.3/runtime.osx-arm64.microsoft.netcore.ildasm.9.0.0-preview.4.24178.3.nupkg"; version = "9.0.0-preview.4.24178.3"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; sha256 = "7b390c2be4e2625542dd0a7b9ef306f0f7e49e1a4fe2a8d77833c5da4d103035"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-x64.microsoft.dotnet.ilcompiler/9.0.0-preview.4.24178.3/runtime.osx-x64.microsoft.dotnet.ilcompiler.9.0.0-preview.4.24178.3.nupkg"; version = "9.0.0-preview.4.24178.3"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILAsm"; sha256 = "4139a98cfbc264193eab5792690d6561c2325a5cb20fee663e70624e1661ee40"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/9.0.0-preview.4.24178.3/runtime.osx-x64.microsoft.netcore.ilasm.9.0.0-preview.4.24178.3.nupkg"; version = "9.0.0-preview.4.24178.3"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILDAsm"; sha256 = "43bf2b28c49b991a759d19e608a9e1d805dac8eec12ad9bb4e2e6bd7ca7707ac"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/9.0.0-preview.4.24178.3/runtime.osx-x64.microsoft.netcore.ildasm.9.0.0-preview.4.24178.3.nupkg"; version = "9.0.0-preview.4.24178.3"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILAsm"; sha256 = "5f3c7c39b0cc257afdf7a72e4ce8def0467bb7a857cb255dda34adc58c3b76e8"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/9.0.0-preview.5.24256.1/runtime.linux-arm64.microsoft.netcore.ilasm.9.0.0-preview.5.24256.1.nupkg"; version = "9.0.0-preview.5.24256.1"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "0ab21ff07d4321d9c4d0de0371d85265adbd8854d3d467ab8be92baf48be295a"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/9.0.0-preview.5.24256.1/runtime.linux-arm64.microsoft.netcore.ildasm.9.0.0-preview.5.24256.1.nupkg"; version = "9.0.0-preview.5.24256.1"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.ILAsm"; sha256 = "1f65al2nk2qzip1k8hjx6i9ls4sbx86qv0pbvaswambxqd4rc7dj"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/9.0.0-preview.5.24256.1/runtime.linux-x64.microsoft.netcore.ilasm.9.0.0-preview.5.24256.1.nupkg"; version = "9.0.0-preview.5.24256.1"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.ILDAsm"; sha256 = "1dlhchclghq19ryb0sz6md77y1hbkhd9p1wig8fg57im04w62s1n"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/9.0.0-preview.5.24256.1/runtime.linux-x64.microsoft.netcore.ildasm.9.0.0-preview.5.24256.1.nupkg"; version = "9.0.0-preview.5.24256.1"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILAsm"; sha256 = "83af33efeb28280b2af68fea1dd84c087095420a2c21a1f439bc0cdeef9b8c47"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/9.0.0-preview.5.24256.1/runtime.osx-arm64.microsoft.netcore.ilasm.9.0.0-preview.5.24256.1.nupkg"; version = "9.0.0-preview.5.24256.1"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "b77560cd71f013fe211aaf1f3c300a53a123b1e1d852059675b5aa5d7e20ac94"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/9.0.0-preview.5.24256.1/runtime.osx-arm64.microsoft.netcore.ildasm.9.0.0-preview.5.24256.1.nupkg"; version = "9.0.0-preview.5.24256.1"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILAsm"; sha256 = "0f85a64c48baa58f6ef66bffba85689c5c698d390092ab5d0a71ce02d65a37be"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/9.0.0-preview.5.24256.1/runtime.osx-x64.microsoft.netcore.ilasm.9.0.0-preview.5.24256.1.nupkg"; version = "9.0.0-preview.5.24256.1"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILDAsm"; sha256 = "077f88a286227e1bef45ccb166fe3ffcb7bbcb8dc8d56956e0ffe775e45f49ad"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/9.0.0-preview.5.24256.1/runtime.osx-x64.microsoft.netcore.ildasm.9.0.0-preview.5.24256.1.nupkg"; version = "9.0.0-preview.5.24256.1"; }) ] diff --git a/pkgs/development/compilers/dotnet/9/release-info.json b/pkgs/development/compilers/dotnet/9/release-info.json index 7da9e30a58961..2722b9bc079d8 100644 --- a/pkgs/development/compilers/dotnet/9/release-info.json +++ b/pkgs/development/compilers/dotnet/9/release-info.json @@ -1,5 +1,5 @@ { - "tarballHash": "sha256-gUFeHgtPfyaqqbKASmZqbmKLTjP+GUewa1D/xNuR+b0=", - "artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.100-preview.4.24179.1.centos.8-x64.tar.gz", - "artifactsHash": "sha256-P3hk1NfC+Pha1e2NBeDkM1kNNu46jsWAE1XRdzRvP4w=" + "tarballHash": "sha256-RD63MT28wOY+EjN8mlGrhKenAdvoSnzHYqzqyvWmZSI=", + "artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.100-preview.5.24257.1.centos.9-x64.tar.gz", + "artifactsHash": "sha256-SHhAFlSlRRoUIR/qCox71t5d1PaqSPcfiCSvRiSpDMw=" } diff --git a/pkgs/development/compilers/dotnet/9/release.json b/pkgs/development/compilers/dotnet/9/release.json index 5b3f327136bfc..8777362f335c1 100644 --- a/pkgs/development/compilers/dotnet/9/release.json +++ b/pkgs/development/compilers/dotnet/9/release.json @@ -1,10 +1,10 @@ { - "release": "9.0.0-preview.4", + "release": "9.0.0-preview.5", "channel": "9.0", - "tag": "v9.0.0-preview.4.24266.19", - "sdkVersion": "9.0.100-preview.4.24267.1", - "runtimeVersion": "9.0.0-preview.4.24266.19", - "aspNetCoreVersion": "9.0.0-preview.4.24267.6", + "tag": "v9.0.0-preview.5.24306.7", + "sdkVersion": "9.0.100-preview.5.24307.1", + "runtimeVersion": "9.0.0-preview.5.24306.7", + "aspNetCoreVersion": "9.0.0-preview.5.24306.11", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "7b92d4092abc8b04f79a9412a712257966724494" + "sourceVersion": "78f4e02d8b749da1168368a232b858448545928f" } diff --git a/pkgs/development/compilers/dotnet/update.nix b/pkgs/development/compilers/dotnet/update.nix index 29206ecbe7682..58304188afa8d 100644 --- a/pkgs/development/compilers/dotnet/update.nix +++ b/pkgs/development/compilers/dotnet/update.nix @@ -101,7 +101,7 @@ in writeScript "update-dotnet-vmr.sh" '' | .[] | .PrivateSourceBuiltArtifactsVersion' eng/Versions.props) if [[ "$artifactsVersion" != "" ]]; then - artifactsUrl=https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.$artifactsVersion.centos.8-x64.tar.gz + artifactsUrl=https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.$artifactsVersion.centos.9-x64.tar.gz else artifactsUrl=$(xq -r '.Project.PropertyGroup | map(select(.PrivateSourceBuiltArtifactsUrl)) diff --git a/pkgs/development/compilers/dotnet/versions/9.0.nix b/pkgs/development/compilers/dotnet/versions/9.0.nix index c5ab45fb4fefe..2cf73e2a4a7a1 100644 --- a/pkgs/development/compilers/dotnet/versions/9.0.nix +++ b/pkgs/development/compilers/dotnet/versions/9.0.nix @@ -4,143 +4,143 @@ let packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "9.0.0-preview.4.24267.6"; sha256 = "1mk35a5gq5rl9gmj28qbhq4bpasnarzvv5ahqjj2qg8cvj9pizkg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "9.0.0-preview.4.24267.6"; sha256 = "0izgyf61gr59zgbxzqlfwkd6by1h7zjksm9y5mgz891m4b6klp71"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-preview.4.24267.6"; sha256 = "1b6dbb5bcxvr40cgqrnmkm6d9bwiy3b7dbfknxsm2dr85bwg6k77"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "9.0.0-preview.4.24267.6"; sha256 = "1fzkp4n1646218i9iqw1cz9sk36wk3s06y7c6lgpml2wxwvkx1vi"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "9.0.0-preview.4.24267.6"; sha256 = "0yknkbjyr6mqjfn8wml6plnkpr3cfcgxa9l4b6ysk9v44x514lh1"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "9.0.0-preview.4.24267.6"; sha256 = "1zmzih8276hdk3pr6sqrbdp60z8qzjg1yasviq6jcvbw86jsdpki"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "9.0.0-preview.4.24267.6"; sha256 = "1ffvpw79k306sydlyqi39fchjr7iyl8bkd689vvnqk3y51zq6x30"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "9.0.0-preview.4.24267.6"; sha256 = "0z2vqgkmv41pbqv9s73f1whc995v1pliii7yn1m3jqfmrbjm0mhx"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "9.0.0-preview.4.24267.6"; sha256 = "04ff0iwk09xflmmmmm9vwd87k5gpaqn4xqgr1gfq0kjaf3f38bbw"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "9.0.0-preview.4.24267.6"; sha256 = "1g0kjad0d1drgsm4dqji2fk8npj6grbwsqlqw2xfhjb2v451mssv"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "9.0.0-preview.4.24267.6"; sha256 = "0n4vhg5yzwg7rnly29504inkjp0xygynp29n04wdwxzajwf235gi"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "9.0.0-preview.4.24267.6"; sha256 = "0cygbmv53j9nyy14gxp35a27kbcakvnyzgiyicq6r64n6y4dhdin"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "9.0.0-preview.4.24266.19"; sha256 = "1lskbq8piijz0l80cd4gsplhm4hmqpn432awha0g4qrmk1zlk91x"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "9.0.0-preview.4.24266.19"; sha256 = "0aid69wcqyv53nxxvl353j01cfi7l9ywgjxs8q51jkbnd1r499v8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "9.0.0-preview.4.24266.19"; sha256 = "016vdk29s6wgfklr9swbc4c8zba4cyv7f9nh2nbk8c67q3hyqann"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "9.0.0-preview.4.24266.19"; sha256 = "1bffb76snadzpak7z01dxm9ij1ks6xfjg3fc4s1dkfldq4gv3bl4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "9.0.0-preview.4.24266.19"; sha256 = "0jqk8zirqbkxd6dvra7h5alkxx857260d6p13ylw2kwqib5mhym5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "9.0.0-preview.4.24266.19"; sha256 = "04h65p4ckrf4p371jb8zh23p8llc82jyib6rkc9s6nwmz1yfbyvj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "9.0.0-preview.4.24266.19"; sha256 = "089z1g4bw1w78awdpk98h95mdn5j2ngfzryjh0d2s6ypga9r4wib"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "9.0.0-preview.4.24266.19"; sha256 = "0nv1ha9jswpm7ck8ry4g0xdmnssxxiwr13n18yh9645idfdxfjhp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "9.0.0-preview.4.24266.19"; sha256 = "1kch2j544ad5y6akzqpcgidmfrz5yrglw9yblgcaai5d8m6n5sad"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "9.0.0-preview.4.24266.19"; sha256 = "1k6kcbjppxbnv0b205s7i3hjpy9q94q7nvm7ni8zxaw3w6jb9vq0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "9.0.0-preview.4.24266.19"; sha256 = "1c6q5k9bvgr7w5p1908nk7rm68ryzvvdxxb87r06kmr5zwkqrs75"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-preview.4.24266.19"; sha256 = "019vfmirn4asngsays81q0dfnrnlk1mcwbfkvp7p89gqpri8svyp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "9.0.0-preview.4.24266.19"; sha256 = "1d3fr9yn84ib6431k3jhna1iajak2hvkq4jyi3byrlpb7a07hhxm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "9.0.0-preview.4.24266.19"; sha256 = "0l15nnxjsinhccvzp0bziffqs827lbrjk6ivx5lwjn8yj6cgi3y1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "9.0.0-preview.4.24266.19"; sha256 = "1ndga03pksafyprivvib8ma17slmmpk7yfr67n0rg440dzzfv1l2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "9.0.0-preview.4.24266.19"; sha256 = "1cdjh0mc6shs89ai3a713lasmr2bim3r1nrscyqxwhhcca9k9chp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "9.0.0-preview.4.24266.19"; sha256 = "0xga9s2f4xh8c6snlpgyb7w71h1q9xxn1xf1r4mcnzrmlyb3k67j"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "9.0.0-preview.4.24266.19"; sha256 = "0y44nk9jy4pvv7hkrlq0wmzb8r41kmk11ifvjpwh9lvq42ac7knl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.4.24266.19"; sha256 = "1l21vi04yr6f9dw26gmmgch36dp89whl4amrsfn89l3f0qk85ll0"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.4.24266.19"; sha256 = "001zv6cba1pgg5y00nx0pczl3svl0s31xfszar5068kikvqyi4ln"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.4.24266.19"; sha256 = "0n6qvc74qd3w31v32sibl19q37rlfbb5hxsjsiz8kxrjcic280l5"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.4.24266.19"; sha256 = "0whm0c3l91dq2zdh8cqzpnj38lnxcrxdqir994adzgbp67a8r787"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.4.24266.19"; sha256 = "1wsy82wv7vs5g4rx5ak6r7nwbhrdjk1z0svjdnb84xd1kvlqk60a"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.4.24266.19"; sha256 = "0r7n0lbkn3gzxkfr5rs9lj86zzib6ij3sbxq2mjgdgmjs3lldxs8"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.4.24266.19"; sha256 = "06ssvqs6rvzfcj2rvqdhdf2lg5djn2jjzl9jfadkqlci9plf5cbx"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.4.24266.19"; sha256 = "19iglvppa79433676isxhkbcib65mvx7bsx43m91vphp17yai6f4"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.4.24266.19"; sha256 = "0zx8g8hhav0sphrhjqqijh9awybkxgi5q7h00cld5cnf0g7ppjg4"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.4.24266.19"; sha256 = "176vymq9nz41c8g3rcb8d22wm315nz3blww66afl502yx39q0qqr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "9.0.0-preview.4.24266.19"; sha256 = "0ssfhdsdz86d2dpbf3fkzd9020gfbnnj6g83i6dw7h9nrg164lmj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "9.0.0-preview.4.24266.19"; sha256 = "1ni22lfm4c1784hq19qbfjqx8nqpkf4v810qkqjac7nb5lhxch3h"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "9.0.0-preview.4.24266.19"; sha256 = "0rc1f7ibvlrwgpyjm3dxnqqxnpwlzyp0b30dm3001rilc4vab6cp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "9.0.0-preview.4.24266.19"; sha256 = "0r0hyq38fpb91rqkvr31490g5ladg5jdb785r6ihybfdf6fx39jx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "9.0.0-preview.4.24266.19"; sha256 = "124rrv9bjvcsgznwyqi7kswr74hjnkag1a4kqvxkg45rhzpry5if"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "9.0.0-preview.4.24266.19"; sha256 = "0l6qkgwfwy4q8w2kbijvxgy4wz87nm83g56amqrjdzsv325sv6n8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "9.0.0-preview.4.24266.19"; sha256 = "1g90ali4yxm4rmb8069k1zbg7w60x8izcm2qawmyggcxyrwi4rmn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "9.0.0-preview.4.24266.19"; sha256 = "0spdpbq357ql7rkzhm5m9c7mcbz12yqq9qy6j199k9n5615b1igl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "9.0.0-preview.4.24266.19"; sha256 = "0426bcfnkd3czshnvk44xiarxibbmzab8lvlk1csl9h0gj1i2lsd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "9.0.0-preview.4.24266.19"; sha256 = "08gphb4pq48qhpwym45j8xd38xd4jn94nqf53ap4kwl6ajinb0kj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "9.0.0-preview.4.24266.19"; sha256 = "12x1j7dyfwb3rvjdkvzip9rilrc3klkj4589n8lr4d736sv8jmd7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "9.0.0-preview.4.24266.19"; sha256 = "10sigmdn5yyah8hp8yd07qi1k7m4s8r20ndnl5fh79kd1slm08cs"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "9.0.0-preview.4.24266.19"; sha256 = "1p0spiz588b8wv2rdq65m0l70k62s9g25j346q80dpqqp3gpicvw"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.4.24266.19"; sha256 = "1jb4pps4sg2sb04s8w25nzv17x9hsrnkkgwjcqxc70s59vnva2z8"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.4.24266.19"; sha256 = "14zf89ji0ikp71p9c8ryn51i70v262z3jj3fdjgj27hyrir6mcrv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "9.0.0-preview.4.24266.19"; sha256 = "0c7l5ln186n8v5q5cfnd8dcwk78x8n87slpb0zgk7hci4j00im79"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "9.0.0-preview.4.24266.19"; sha256 = "03g6jcmnzd9f9hzgw8yyvwlbmk5a4lbmi1bjsg8384f69ckiywyh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "9.0.0-preview.4.24266.19"; sha256 = "09v5h6ip89li6b4y58gxjj98m71d4mkshxdm3nh5g91vl0mb5gkl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "9.0.0-preview.4.24266.19"; sha256 = "1qw9ksddn4y8kmf3kl1b4a5bmf86jvbv6yzbqfgmf44m80d6kqgn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "9.0.0-preview.4.24266.19"; sha256 = "0vj734vhq43kc97w87afqnpi0mymj01rfyrwd1cxnkja1csfs3vj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "9.0.0-preview.4.24266.19"; sha256 = "0w70251ril85hk5gyxflmkacy53zscpnnzvj145iz23j3gz392z9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "9.0.0-preview.4.24266.19"; sha256 = "0yh1s8ydnf0h7vyfpbp571pcmk53357x4f2lg277s112nygvq1c2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "9.0.0-preview.4.24266.19"; sha256 = "1q9gizqsyn6viqby3c0f8l4fmv2hiy2kh17g2kbf1krsp6wcxwmv"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.4.24266.19"; sha256 = "0d59q4yc9hbzmpighh9dbpcalrbwwgmzfanvz6sgfr4536pnrb14"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.4.24266.19"; sha256 = "1vza6ylc64pr7ahyh16q8q8ia5q30pm4k02ni9vlb1wcxawmz29c"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.4.24266.19"; sha256 = "03aicxklpi081lm7xnwaii37dfyiy8q9aap77lr92argz5hdf7wk"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.4.24266.19"; sha256 = "0blk1h5gng9nqx5lmidmy9cr3qd80dnlkzrp9fcy3jr3qr11f8aq"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.4.24266.19"; sha256 = "1qrcvby9bq9z3i0an13vmjm33msxalawdv6xr1393nky13zb808j"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.4.24266.19"; sha256 = "0g2hfxa0pdxinffkfcb1nz9qllaraavmrnfyk78gvvysszs441xj"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.4.24266.19"; sha256 = "1a0anv73bw2h5v1mh5h43ixskfh7y8qkgc2bnl7ad3x43ndbnyy0"; }) - (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "9.0.0-preview.4.24266.19"; sha256 = "1h2734krsqjzgid9ha3bcjwbax3cvfvwff35jg01n6ihs9x0d6vb"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "9.0.0-preview.5.24306.11"; sha256 = "12mq2k54nijycjmgb9c299bcad7iwgc5prff3cv4ilc8zf0db058"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "9.0.0-preview.5.24306.11"; sha256 = "0z0nby81zf1gzvwkm9hk6xxhbxgjxbcqbfw1k6f6dkhq4r52b19m"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-preview.5.24306.11"; sha256 = "0aa2i7kdq2czz8j4r3qf3qkq7kzi07ga19bm5kj35das4v66srn4"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "9.0.0-preview.5.24306.11"; sha256 = "1inc6v7kk43yy68gwa0vg04j9jr71rbzdpi486xvv4zf29d3nnyc"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "9.0.0-preview.5.24306.11"; sha256 = "0a4bmfdl3paqb8sh3w5pbahsfifdvdx48m52vsi4qjpbaz37jqqm"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "9.0.0-preview.5.24306.11"; sha256 = "0man1h54lwqid1rpaxr7v811alm1cn6hdyamw5h9sy5k43d6q4jc"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "9.0.0-preview.5.24306.11"; sha256 = "1kn4ghd0rcik6zncqj7a8yx4hldc8ms5dz40zcyz8zpnjr0jalgy"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "9.0.0-preview.5.24306.11"; sha256 = "1vvm6fjnb4b07a6s78qrpc0h2xgzkc5n7xd0n8pl8vf221i36cjz"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "9.0.0-preview.5.24306.11"; sha256 = "1ixzkjrrp63dzgx4bpdphcxmwb4bkvpghn2xblsq55lnqgsqrk1c"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "9.0.0-preview.5.24306.11"; sha256 = "12ly0aq7w3ysaz1lgafsj8b3xz60h1sx80112h016cm9x8qaj60s"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "9.0.0-preview.5.24306.11"; sha256 = "1jar76bi0apskqva4xvb21mpkm2spar8zg6dijsb1sfckhvprwg5"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "9.0.0-preview.5.24306.11"; sha256 = "16igqkvzbmiz18y2pxbxjdbn55505i38ci4dlxk2gc90q9ly9hmp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "9.0.0-preview.5.24306.7"; sha256 = "0yjhaflyvwla7bfc5r0f241lpdgs8f07idgw17c27py3jak4z7nc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "9.0.0-preview.5.24306.7"; sha256 = "0xqpixi7klisihnnx0nxadxskryh1fk7p998sib3yvp9r02jnqvn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "9.0.0-preview.5.24306.7"; sha256 = "0wjdwmqkphrz421mvqmv30nkpji6zkyv53n0n58s7cg1xhrysgn5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "9.0.0-preview.5.24306.7"; sha256 = "17xmgdysdsf9x1b5bbyk92fb0m49q2qxqsabdn0dj7apbnappflv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "9.0.0-preview.5.24306.7"; sha256 = "05l7iccmn56hfjfdzw6g2xyhwqn86pmfi0bhxs8zkvfmcxff01km"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "9.0.0-preview.5.24306.7"; sha256 = "0f8ifac136v8lrqg6p49c6v1fbzs7066d2x1gf70wxr5572s53zz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "9.0.0-preview.5.24306.7"; sha256 = "1i02qz80mk278wyj19m6s05xzzyz11q2yrbanark541b5nvp7f74"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "9.0.0-preview.5.24306.7"; sha256 = "02bk2wwlm262v6mz3k2dx1pj02sdmdmmic79bbkjksfpw1pbg4rm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "9.0.0-preview.5.24306.7"; sha256 = "03f18kc1kdm6aglcwc60757prmcb8csw5gvl594kgpgmsh819vdf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "9.0.0-preview.5.24306.7"; sha256 = "04yw10x9lkma4jkhaylwi8scxpifvhyq47mv316m49fas2r7xl96"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "9.0.0-preview.5.24306.7"; sha256 = "01jwa6idxn9jv5vp7am34gzf984jvd72cyns1w367p0v3c6yragl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "9.0.0-preview.5.24306.7"; sha256 = "19bgk42zkrb6q0nss1c4fxs5ii7pwjb85zrzsscgsvy3hjqqwzrk"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "9.0.0-preview.5.24306.7"; sha256 = "10xdihmr8nd1jyqwrfsrym8285ngg5z2apbawy92s14bwjy51cj9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "9.0.0-preview.5.24306.7"; sha256 = "10bxll4zphrd2bvyp38z55rcl1fbdd64s53bv7hsjkcfsv26c4wc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "9.0.0-preview.5.24306.7"; sha256 = "0a530mpk29cl8iz1k6rwhgrspa5ssjkqnky5ivbx5hz9iq541bq4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "9.0.0-preview.5.24306.7"; sha256 = "1l2ak1kiq2515x16wdijk2rrjrzxc9jkbwd0ip7j3fqkm0wj62b2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "9.0.0-preview.5.24306.7"; sha256 = "065lhbwjmzf8gcqll5f2lbvgkiiqfjliypvgi4sab0r0m3gjchdb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "9.0.0-preview.5.24306.7"; sha256 = "02yli22m04wyr418na5mjs2ln6zawva8i8ixcij5bynqdfw2rakv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.5.24306.7"; sha256 = "1ix5nw7z8ymnxk1vj101namd4r18bqx6dkzv0zrqj4dx2zpadhd4"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.5.24306.7"; sha256 = "1janx1brnv64cfjvjmdk4zinqbkmmx525l04fmy7pi6c3hq93fr5"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.5.24306.7"; sha256 = "1m8cml0zk772i5a5yy909sb5089h7afphmcn95hm03i6f52kmmf3"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.5.24306.7"; sha256 = "0n04zf1xhdqm0nia3ja3kjz0aq2kasghqw6gamfpd68ln9yimi9q"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.5.24306.7"; sha256 = "0h29s18r4n09l8f2znpd2s9p12f8s2winnqqgn80nynsja5zb34q"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.5.24306.7"; sha256 = "05cf012c37q9vlq7fd2n76gps9dg20lk88dama26jlbpczj7gv81"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.5.24306.7"; sha256 = "0lgfnh0w31afi7ijsbjc305yxp7klxhz61pxcf27pxh7y9vcrvnn"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.5.24306.7"; sha256 = "1h12scdq455rb1ffy339a1fmjkgpp7hp4bjhr2fb7lp8kmsppwxl"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.5.24306.7"; sha256 = "1z1csk8z1yh4w697ghzk73vm4ry2a0d2sy4b5sk34r0bpxw5lbhh"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.5.24306.7"; sha256 = "13p6vi44agpzjq0qghjc4xydy1xy2985v4b0dl5v9j3pgrd1s8qk"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "9.0.0-preview.5.24306.7"; sha256 = "0dakyl9dl1609jpwc5h6rkbl5s1s2fcfn3isf69z8m5n36vlz2xl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "9.0.0-preview.5.24306.7"; sha256 = "0nc6xh9xcqg64xf14f95mwxqki4ing5hpwwyd30d1j0ndbdf4xyc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "9.0.0-preview.5.24306.7"; sha256 = "1rjqx0mdf4jd5g613mxmjzjjyzl7gj6wnixhz8x6k21fwmsrn496"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "9.0.0-preview.5.24306.7"; sha256 = "059s063nfxn98cgym7zfn18icd2f7bky1n1b3pbz2d8bc2y6b6qd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "9.0.0-preview.5.24306.7"; sha256 = "1584xdik4q3bdgsnshmwxsy7sx9zjh112m1nvrc8sjm3vy4hpl5c"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "9.0.0-preview.5.24306.7"; sha256 = "0l5n8k8zzw3wjgp0mf85jv470cmvp5cs4m7azf4x2x8p4q5j3pzf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "9.0.0-preview.5.24306.7"; sha256 = "0mryfw8svnmzxnvwkd2vs9f1mxdyami5dlcnibvjgylj0ggi8l53"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "9.0.0-preview.5.24306.7"; sha256 = "04zy5396cm98h5gf9rdar7mx6c96fx3lh3k6vm86bcs6y4pvmib8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "9.0.0-preview.5.24306.7"; sha256 = "00np825qdxnqq6vwazs66afdyvz668lyhsyl1hsflwg312h26kfx"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "9.0.0-preview.5.24306.7"; sha256 = "1b8m4r2xzlsrja4w12np2wi71bwh38crvjy80md1gc5g67qkh0nc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "9.0.0-preview.5.24306.7"; sha256 = "1j5qpqy7fsg7m637i5p0mfaar6jrfcnwl8kz4virby6an3kgn2fs"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "9.0.0-preview.5.24306.7"; sha256 = "1n9m33v04hbbvg7cac5s31sc6733amsafg8kv39b1v5bmfid6m7w"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "9.0.0-preview.5.24306.7"; sha256 = "0lz2z4gx54zy8sffwbys1ls1qh03xjgzxzkmsngjdhpzbipyslng"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.5.24306.7"; sha256 = "0faq6h29s4l9lgjkhp82wygxjhjmqpigpc2rzhkw519vkc9a38jp"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "9.0.0-preview.5.24306.7"; sha256 = "19al895aca67a681zm4ppznpdrf4mcs3qqkpwngmcv13jx9mydzf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "9.0.0-preview.5.24306.7"; sha256 = "1ds8w00nxq9i06xklh9klv47q79c0b9blzafkvbay9gclxib310k"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "9.0.0-preview.5.24306.7"; sha256 = "19xabxhnb22g6pj8c7bx2zv9ys6qca561fmxq2ac8jl8bdwjzw20"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "9.0.0-preview.5.24306.7"; sha256 = "0g57liiiavqg3s1j4ra0ppd21ldfwihahqd69mai5h37yr7wggn2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "9.0.0-preview.5.24306.7"; sha256 = "15vv4bhdvki49y4zhqpvz1vr8d1iznrbbxk5hypq13k6aypsb3nr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "9.0.0-preview.5.24306.7"; sha256 = "0q5ircv3lrcrjdvkv50gknaix55l9z24rr8x8cb54zcq3fjfn2li"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "9.0.0-preview.5.24306.7"; sha256 = "0hxf3xk6yn8n04fwj9j7c6a70y9apf31aafn2nhd3yykvvf7618d"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "9.0.0-preview.5.24306.7"; sha256 = "1pw27c0czrrgp0vqnlcz6zhyrhbjbqh14wbcknrcn1smlm6fl77x"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "9.0.0-preview.5.24306.7"; sha256 = "14k0sd0b6rpngw8s1gz833kq89qghnhszgvk9v2rabncb1qlhanv"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.5.24306.7"; sha256 = "0c2spsh6m236cmpf6c2hafcrr4w2ks433g024cmpa93a3s6dfvcp"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.5.24306.7"; sha256 = "0wla1jr95b7hm6wa2yx080wgy8iaqr7r3q83jp3qdnp3k2y0rgpk"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.5.24306.7"; sha256 = "00mkrwlx48dis7fg73gxj1c99zs1na4k6y11q1908a674hni8qlx"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.5.24306.7"; sha256 = "02aqy5fjy8r8n1acvmixmlwif5jg6fhaygnk5ishlmw18yvhzp7m"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.5.24306.7"; sha256 = "1qbjvdmlg3hj1p9v8nzgcpp5cr7nakn14nksighqc8ck4nf9i68g"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.5.24306.7"; sha256 = "1s8m140xbwc2pmyhrrmgfd4r2lppld26m6x3k1kz9gfn7kk4ayjx"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.0-preview.5.24306.7"; sha256 = "1f9hn43fs25fbzzhrawfjgz56mknsnmhmdgf1f1pqlpfzwb2bvvn"; }) + (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "9.0.0-preview.5.24306.7"; sha256 = "0ck2agia8lmhvwvzh73yh2ydkqfz4g21404cv4qxjj28l618cjl5"; }) ]; in rec { - release_9_0 = "9.0.0-preview.4"; + release_9_0 = "9.0.0-preview.5"; aspnetcore_9_0 = buildAspNetCore { - version = "9.0.0-preview.4.24267.6"; + version = "9.0.0-preview.5.24306.11"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/6f889c70-8c50-44d0-9877-0d0376c031ab/d73ca2ec30f5fc3e537b16f37c029daa/aspnetcore-runtime-9.0.0-preview.4.24267.6-linux-x64.tar.gz"; - sha512 = "ee65f640c894ac6e67589c40682b2fc215f2ab7037695589b9f92801073a0f8a8d071c3caf4608679f61e10830f02d21e916107f77b68c58e59b1f191ec8039a"; + url = "https://download.visualstudio.microsoft.com/download/pr/f43de71b-3bf6-49ae-99ec-66499bfa6990/438e1533bbb47d3d7e1f58983677a4f6/aspnetcore-runtime-9.0.0-preview.5.24306.11-linux-x64.tar.gz"; + sha512 = "b4358041bfc42bf614644e7f3c38a4fb73185a8d3541065bfd6758622860b0d0addff6a7ab6e7439d029b0b54238864279d19f1b5096b5d7c0fd10c0435e652e"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/bc6ae1a6-a98c-446f-8aa9-fe4bdd18412d/569b1a10883293eaa5aae3275d8a4e2f/aspnetcore-runtime-9.0.0-preview.4.24267.6-linux-arm64.tar.gz"; - sha512 = "6f457cfc870a8ea3a8f9e5cbc6b4554dd98c7380ced6f4c6f05bf918545e22937b1c446cc696125e08f964f78dacb2215c0d9e42fdd86ea1c3a4a57af199dac1"; + url = "https://download.visualstudio.microsoft.com/download/pr/e8849fb4-309b-4008-b697-4b5af127cc8e/285762b4db9cfb18abad4e005b37f2cb/aspnetcore-runtime-9.0.0-preview.5.24306.11-linux-arm64.tar.gz"; + sha512 = "6e6198d26b16ebae7bf7f7a428b0026d3c7edb20fa0acf844670a98cdb78a8b0d37cad5df22f35dc3379de8069fdc95318f5eeebcd5b03ad99cf595699116abb"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/7ccc886e-61cc-475e-9ab4-b1723078e7e4/093617db718ce4669b6a93f2d8934b1f/aspnetcore-runtime-9.0.0-preview.4.24267.6-osx-x64.tar.gz"; - sha512 = "614fc10a69d3c78a1b1478b1d49d1e5d7dcadb02b6edd1ece510b81075e19f6267a53c7252ee4cdba1c5df1353f17ad64a54a08459d3a3a8a4baf707e4bef7f2"; + url = "https://download.visualstudio.microsoft.com/download/pr/f07ad200-6654-4341-a594-9a1eb1ca66f9/929c2533f6fe9c402fcb5fee99ee1103/aspnetcore-runtime-9.0.0-preview.5.24306.11-osx-x64.tar.gz"; + sha512 = "104b0b8f216bd36710ee912c92c89c4a5be97774eb21cf090c5c12acbe3ff8a8ec22a2b2bca56feda8aa21690c734d5a4b8293569cbf45172ead6b587d3858fd"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/57b0954f-d550-42af-b1b5-8c9ef5da0d58/a4c7f9677ac41fa3421050bf9822c56a/aspnetcore-runtime-9.0.0-preview.4.24267.6-osx-arm64.tar.gz"; - sha512 = "2440f43ec72f5298679126527af6c1c410cc542a98ab4e0c5aca0ffda40d29b7dc52e1f1aaa869b2d5b86b7bcd80579bada8fe20d0ba9e48a64ea147ed3b4c0c"; + url = "https://download.visualstudio.microsoft.com/download/pr/b4c5eec1-4026-4e58-adfd-64dbf4426b1e/1f05059da0484ade0ba1ce6a3e8f6bd5/aspnetcore-runtime-9.0.0-preview.5.24306.11-osx-arm64.tar.gz"; + sha512 = "f6ed6cc22e20e986cf54ddd0c8868b524efcf84ccbcd5335bdb4ac44fbb08641850448aed5d85bcfd2d403b3a89a73cb932d73db1b590cfc704a58aa8ec79d5f"; }; }; }; runtime_9_0 = buildNetRuntime { - version = "9.0.0-preview.4.24266.19"; + version = "9.0.0-preview.5.24306.7"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/bd635e31-a279-4078-ac0d-f82ad8940f84/2e9b04bbe40e28507e8483c73eafdd7c/dotnet-runtime-9.0.0-preview.4.24266.19-linux-x64.tar.gz"; - sha512 = "b366a4f19f25281c5b325e737f8c9fe0fa97ca4e19e0e8f00cd42cac84f4134469d02558b07412c66cde62e53f1cb1a7efd68357713ce4d3e816c19ee538e9b6"; + url = "https://download.visualstudio.microsoft.com/download/pr/acc83ac1-a75a-453d-beb1-ab0eef7544b6/fc1c9260c812441c5c51370aa57ea1f9/dotnet-runtime-9.0.0-preview.5.24306.7-linux-x64.tar.gz"; + sha512 = "6d5a313eb3213bca2ac209021218d978a7d8291041f4572780dfb48b5ccb7efe9ace509c75dad1db8e6a427c0bd5e4b2596c3e9f66eec5df4e717a66f8c3d7fa"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/18801fdd-b1f5-4856-8288-c306b11f0f43/5c62f28b9a269b1a840cfb310a9a9f86/dotnet-runtime-9.0.0-preview.4.24266.19-linux-arm64.tar.gz"; - sha512 = "ce8c21b6c854b6772578e84d42e2df5f5144d5a15aff3e6d48953feb1aad517215b6349c20fc22542364a9c439fe19a562f070f88eabf14b5d95ab50fe1ecc00"; + url = "https://download.visualstudio.microsoft.com/download/pr/7ac3c308-bdeb-4fff-98b8-b22ff6c479aa/31e3d32e7732b17506d41cb6cd7a51b2/dotnet-runtime-9.0.0-preview.5.24306.7-linux-arm64.tar.gz"; + sha512 = "8e49eb2e279684c665031e04c915d63c19e617bf44194655374c957bb13d7f22c8c0e233196711c029653958f98788732e1bbf200d22fad27f76523d7506a91e"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/6bd91ad7-ac3c-4027-8674-239367730906/007b8c98680c550fb801c34dea28bc9f/dotnet-runtime-9.0.0-preview.4.24266.19-osx-x64.tar.gz"; - sha512 = "9e7364e1448d98df03922bd315f788ce564dfcbec1a9e83c9e1437c22d8d52f72f061750de2f9e149e7662c168b7a781e7450d2c1e8b7f048cb62b360f12d6f6"; + url = "https://download.visualstudio.microsoft.com/download/pr/4a7db5f1-a6b4-4232-ba81-f848a8f6dde7/20b9502eb9b73e2f7ae047ae53cd1f21/dotnet-runtime-9.0.0-preview.5.24306.7-osx-x64.tar.gz"; + sha512 = "617847ec35016e4c51359fb8585563a432b8a9ff2c6656d6c10f2e3db70c20dada36509a73b31622c91ccfd5246f51c1c0df79852035f65521ac3f78943f37ca"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/c53cab87-a771-422e-be8e-f33a8a6ca637/6e72c3d16f517c6e692572a5cc9546c2/dotnet-runtime-9.0.0-preview.4.24266.19-osx-arm64.tar.gz"; - sha512 = "f9e8188c71ab47631c28d3fb9314b382eec31ae5592a73eaf8c944fcdc240147ac23ef4530a871e9a5deaf311b84ac5b0d5a1f4b6ff22134a8f4eda4555c43a2"; + url = "https://download.visualstudio.microsoft.com/download/pr/42df8bc2-3414-4253-99f0-50d52d4b0c36/a9b0b1664e2dcba0622b9dc6c6a8a8e8/dotnet-runtime-9.0.0-preview.5.24306.7-osx-arm64.tar.gz"; + sha512 = "7c61293b719016dc8212e5564a80a3686a6947d220e2243438616559995c2d415629bf583148513d0691325ebdac91b6a13cbf4d37d7328426b73989edd8ef7c"; }; }; }; sdk_9_0_1xx = buildNetSdk { - version = "9.0.100-preview.4.24267.66"; + version = "9.0.100-preview.5.24307.3"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/87f2eabb-8ba2-4677-9f91-526672f51857/9ed7fb997d40a369c038269a514fc4e4/dotnet-sdk-9.0.100-preview.4.24267.66-linux-x64.tar.gz"; - sha512 = "28b63633a1e6f4078ccc60218b9f7b6663eb960f0ab1c41069ed8f7f67757fa22ce9f4c04d88b9015c417aad34a7a57986451682bd7aa7b966eda45ace23d283"; + url = "https://download.visualstudio.microsoft.com/download/pr/96e19e8f-579e-4a1d-a18e-6773a44d7cd1/092cfc588686cc698c449998b7d5ae35/dotnet-sdk-9.0.100-preview.5.24307.3-linux-x64.tar.gz"; + sha512 = "13b9934b3e7b736ab802a8c580aad95ed4dff6b8f31047c71ce9ffcf4d07e55105d4b0170d309551707b9d232d297cb305c67ed5b5f7026f47ec072ee1bbc121"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/098a764a-8756-47c5-97e9-118431c31b9f/2e1b737cb4750deadb0136283346c7ed/dotnet-sdk-9.0.100-preview.4.24267.66-linux-arm64.tar.gz"; - sha512 = "519d529c74a972484af49ea72053466e09fbfaec0142cd924705dddc117dc40901ac22ddcb11c05caf7b43ef8cf44ec8a0a9dd4c56fbd329b0f750513ae3100c"; + url = "https://download.visualstudio.microsoft.com/download/pr/25f41d0d-d27c-4dc5-8884-6c49897d89d1/c51387b8bde1d278a0982b03c3e8c1b1/dotnet-sdk-9.0.100-preview.5.24307.3-linux-arm64.tar.gz"; + sha512 = "3c6f7e6f2f56e86bc8a9633f50129cfa992c52c287dc89551b23cd62fa471199e90392eba7414659c8ff8eecf1dad04016615a98cf85f6c2045d61f6f14c9e73"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/c3cee1ac-1bb3-48b0-8a35-813e511d1d41/dbcba8b2e6d28886d07bec53ab509225/dotnet-sdk-9.0.100-preview.4.24267.66-osx-x64.tar.gz"; - sha512 = "da35a51180e75a238b7a4b5d1a5b7e3e33f1a1c179b40957deee98c8e01a9bfade62e2c909d2e5b377f43cf2dc78687b34b349b27b2f8f841165c3c05b3fe443"; + url = "https://download.visualstudio.microsoft.com/download/pr/a6731f1c-ffd0-4cca-a309-89576e55552c/3000f43ca4b3b51bb034bd7daa514841/dotnet-sdk-9.0.100-preview.5.24307.3-osx-x64.tar.gz"; + sha512 = "ebb84f920a7bb663238a10007d784a7c90f66d073089371fc2c9d5556cba945918fd8b193e02eb3d889676952b79616398aa2555d7d46d080088f01f67ede43e"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/e003d2d1-abfd-45f6-aca2-e3f2199e3633/dcefd0cccdfb48a3fbb20b14fd2fe22c/dotnet-sdk-9.0.100-preview.4.24267.66-osx-arm64.tar.gz"; - sha512 = "3791e2134f7cae53c430ae5306f325eecb84058da07d90f276f8d4045701c6c85567472ffc2c535002bb3066817683c0a8e82d23ba6ce32a52f7217867db30d2"; + url = "https://download.visualstudio.microsoft.com/download/pr/090175ff-fe42-4064-98fe-b6d90e08162d/bc72a57ada79f0ee7b71d74f5deb66a0/dotnet-sdk-9.0.100-preview.5.24307.3-osx-arm64.tar.gz"; + sha512 = "8c1a13d14f2502d3897871f82abd2c2df8cb41ff9d754e79693b99d0780deb910dad7486e05ec065c4a38490de00d251c64b0b2a734863e0a452f0ed23b1e1a0"; }; }; inherit packages; diff --git a/pkgs/development/compilers/erg/default.nix b/pkgs/development/compilers/erg/default.nix index e70f768e29ed3..3cf038159b323 100644 --- a/pkgs/development/compilers/erg/default.nix +++ b/pkgs/development/compilers/erg/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "erg"; - version = "0.6.37"; + version = "0.6.38"; src = fetchFromGitHub { owner = "erg-lang"; repo = "erg"; rev = "v${version}"; - hash = "sha256-uwIMUdV2zAyKRwjH83VE+cYgvRGoO+XyD8rA6974mC8="; + hash = "sha256-byoOvJ4SsRxFSbF4SwdDPlXNdMhypOgktnj4CkmAZuU="; }; - cargoHash = "sha256-Ep+aO9qgZN9ToKuRRQFqCzagzSXZ1VYQQQk41ZqP7Wo="; + cargoHash = "sha256-QNykB9tXXlEyJupO5hkSN2ZqBZDwi0kl6IPHxkkaUxo="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/development/compilers/flix/default.nix b/pkgs/development/compilers/flix/default.nix index 3aeb169a0c27f..37aade7464c93 100644 --- a/pkgs/development/compilers/flix/default.nix +++ b/pkgs/development/compilers/flix/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "flix"; - version = "0.47.0"; + version = "0.48.0"; src = fetchurl { url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar"; - sha256 = "sha256-HlVJR8SPwhOFn3yuxJzUWSS+xascf4pGsoKCqzBDG6Y="; + sha256 = "sha256-piwCEqUt4inhn4Ju2FaRjYtvkrNszCaTRE34eXERFLU="; }; dontUnpack = true; diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index 6d2d904660338..3f2bb2e5cec83 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchzip, fetchFromGitHub, dart, lib, stdenv }: +{ useNixpkgsEngine ? false, callPackage, fetchzip, fetchFromGitHub, dart, lib, stdenv }@args: let mkCustomFlutter = args: callPackage ./flutter.nix args; wrapFlutter = flutter: callPackage ./wrapper.nix { inherit flutter; }; @@ -8,34 +8,37 @@ let mkFlutter = { version , engineVersion + , engineHashes + , enginePatches , dartVersion , flutterHash , dartHash , patches , pubspecLock , artifactHashes - }: + , channel + }@fargs: let args = { - inherit version engineVersion patches pubspecLock artifactHashes; + inherit version engineVersion engineHashes enginePatches patches pubspecLock artifactHashes useNixpkgsEngine channel; dart = dart.override { version = dartVersion; sources = { "${dartVersion}-x86_64-linux" = fetchzip { - url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip"; + url = "https://storage.googleapis.com/dart-archive/channels/${channel}/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip"; sha256 = dartHash.x86_64-linux; }; "${dartVersion}-aarch64-linux" = fetchzip { - url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip"; + url = "https://storage.googleapis.com/dart-archive/channels/${channel}/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip"; sha256 = dartHash.aarch64-linux; }; "${dartVersion}-x86_64-darwin" = fetchzip { - url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-macos-x64-release.zip"; + url = "https://storage.googleapis.com/dart-archive/channels/${channel}/release/${dartVersion}/sdk/dartsdk-macos-x64-release.zip"; sha256 = dartHash.x86_64-darwin; }; "${dartVersion}-aarch64-darwin" = fetchzip { - url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-macos-arm64-release.zip"; + url = "https://storage.googleapis.com/dart-archive/channels/${channel}/release/${dartVersion}/sdk/dartsdk-macos-arm64-release.zip"; sha256 = dartHash.aarch64-darwin; }; }; @@ -63,10 +66,15 @@ let in lib.nameValuePair "v${version}" (wrapFlutter (mkFlutter ({ patches = (getPatches ./patches) ++ (getPatches (versionDir + "/patches")); + enginePatches = (getPatches ./engine/patches) ++ (getPatches (versionDir + "/engine/patches")); } // data)))) (builtins.readDir ./versions); + + stableFlutterVersions = lib.attrsets.filterAttrs (_: v: v.channel == "stable") flutterVersions; + betaFlutterVersions = lib.attrsets.filterAttrs (_: v: v.channel == "beta") flutterVersions; in flutterVersions // { - stable = flutterVersions.${lib.last (lib.naturalSort (builtins.attrNames flutterVersions))}; + beta = flutterVersions.${lib.last (lib.naturalSort (builtins.attrNames betaFlutterVersions))}; + stable = flutterVersions.${lib.last (lib.naturalSort (builtins.attrNames stableFlutterVersions))}; inherit wrapFlutter mkFlutter; } diff --git a/pkgs/development/compilers/flutter/engine/constants.nix b/pkgs/development/compilers/flutter/engine/constants.nix new file mode 100644 index 0000000000000..9b7907fc337f7 --- /dev/null +++ b/pkgs/development/compilers/flutter/engine/constants.nix @@ -0,0 +1,41 @@ +{ lib, targetPlatform }: +rec { + os = + if targetPlatform.isLinux then + "linux" + else if targetPlatform.isDarwin then + "macos" + else if targetPlatform.isWindows then + "windows" + else + throw "Unsupported OS \"${targetPlatform.parsed.kernel.name}\""; + + arch = + if targetPlatform.isx86_64 then + "amd64" + else if targetPlatform.isx86 && targetPlatform.is32bit then + "386" + else if targetPlatform.isAarch64 then + "arm64" + else if targetPlatform.isMips && targetPlatform.parsed.cpu.significantByte == "littleEndian" then + "mipsle" + else if targetPlatform.isMips64 then + "mips64${lib.optionalString (targetPlatform.parsed.cpu.significantByte == "littleEndian") "le"}" + else if targetPlatform.isPower64 then + "ppc64${lib.optionalString (targetPlatform.parsed.cpu.significantByte == "littleEndian") "le"}" + else if targetPlatform.isS390x then + "s390x" + else + throw "Unsupported CPU \"${targetPlatform.parsed.cpu.name}\""; + + alt-arch = + if targetPlatform.isx86_64 then + "x64" + else if targetPlatform.isAarch64 then + "arm64" + else + targetPlatform.parsed.cpu.name; + + platform = "${os}-${arch}"; + alt-platform = "${os}-${alt-arch}"; +} diff --git a/pkgs/development/compilers/flutter/engine/default.nix b/pkgs/development/compilers/flutter/engine/default.nix new file mode 100644 index 0000000000000..cea41933e4343 --- /dev/null +++ b/pkgs/development/compilers/flutter/engine/default.nix @@ -0,0 +1,74 @@ +{ + callPackage, + dartSdkVersion, + flutterVersion, + version, + hashes, + url, + patches, + runtimeModes, + isOptimized ? true, + lib, + stdenv, +}: +let + mainRuntimeMode = builtins.elemAt runtimeModes 0; + altRuntimeMode = builtins.elemAt runtimeModes 1; + + runtimeModesBuilds = lib.genAttrs runtimeModes ( + runtimeMode: + callPackage ./package.nix { + inherit + dartSdkVersion + flutterVersion + version + hashes + url + patches + runtimeMode + isOptimized + ; + } + ); +in +stdenv.mkDerivation ( + { + pname = "flutter-engine"; + inherit url runtimeModes; + inherit (runtimeModesBuilds.${mainRuntimeMode}) + meta + src + version + dartSdkVersion + isOptimized + runtimeMode + ; + inherit altRuntimeMode; + + dontUnpack = true; + dontBuild = true; + + installPhase = + '' + mkdir -p $out/out + + for dir in $(find $src/src -mindepth 1 -maxdepth 1); do + ln -sf $dir $out/$(basename $dir) + done + + '' + + lib.concatMapStrings ( + runtimeMode: + let + runtimeModeBuild = runtimeModesBuilds.${runtimeMode}; + runtimeModeOut = "host_${runtimeMode}${ + lib.optionalString (!runtimeModeBuild.isOptimized) "_unopt" + }"; + in + '' + ln -sf ${runtimeModeBuild}/out/${runtimeModeOut} $out/out/${runtimeModeOut} + '' + ) runtimeModes; + } + // runtimeModesBuilds +) diff --git a/pkgs/development/compilers/flutter/engine/package.nix b/pkgs/development/compilers/flutter/engine/package.nix new file mode 100644 index 0000000000000..6f87b28f19098 --- /dev/null +++ b/pkgs/development/compilers/flutter/engine/package.nix @@ -0,0 +1,311 @@ +{ + lib, + callPackage, + writeText, + symlinkJoin, + targetPlatform, + hostPlatform, + darwin, + clang, + llvm, + tools ? callPackage ./tools.nix { inherit hostPlatform; }, + stdenv, + stdenvNoCC, + runCommand, + patchelf, + xorg, + libglvnd, + libepoxy, + wayland, + freetype, + pango, + glib, + harfbuzz, + cairo, + gdk-pixbuf, + at-spi2-atk, + zlib, + gtk3, + pkg-config, + ninja, + python3, + git, + version, + flutterVersion, + dartSdkVersion, + hashes, + patches, + url, + runtimeMode ? "release", + isOptimized ? true, +}: +with lib; +let + expandSingleDep = + dep: lib.optionals (lib.isDerivation dep) ([ dep ] ++ map (output: dep.${output}) dep.outputs); + + expandDeps = deps: flatten (map expandSingleDep deps); + + constants = callPackage ./constants.nix { inherit targetPlatform; }; + + src = callPackage ./source.nix { + inherit + tools + version + hashes + url + ; + }; +in +stdenv.mkDerivation { + pname = "flutter-engine-${runtimeMode}${lib.optionalString (!isOptimized) "-unopt"}"; + inherit + version + runtimeMode + patches + isOptimized + dartSdkVersion + src; + + toolchain = symlinkJoin { + name = "flutter-engine-toolchain-${version}"; + + paths = + expandDeps ( + optionals (stdenv.isLinux) [ + gtk3 + wayland + libepoxy + libglvnd + freetype + at-spi2-atk + glib + gdk-pixbuf + harfbuzz + pango + cairo + xorg.libxcb + xorg.libX11 + xorg.libXcursor + xorg.libXrandr + xorg.libXrender + xorg.libXinerama + xorg.libXi + xorg.libXext + xorg.libXfixes + xorg.libXxf86vm + xorg.xorgproto + zlib + ] + ++ optionals (stdenv.isDarwin) [ + clang + llvm + ] + ) + ++ [ + stdenv.cc.libc_dev + stdenv.cc.libc_lib + ]; + + postBuild = '' + ln -s /nix $out/nix + ''; + }; + + nativeBuildInputs = + [ + python3 + (tools.vpython python3) + git + pkg-config + ninja + ] + ++ lib.optionals (stdenv.isLinux) [ patchelf ] + ++ optionals (stdenv.isDarwin) [ + darwin.system_cmds + darwin.xcode + tools.xcode-select + ] + ++ lib.optionals (stdenv.cc.libc ? bin) [ stdenv.cc.libc.bin ]; + + buildInputs = [ gtk3 ]; + + patchtools = + let + buildtoolsPath = + if lib.versionAtLeast flutterVersion "3.21" then "flutter/buildtools" else "buildtools"; + in + [ + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/clang-apply-replacements" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/clang-doc" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/clang-format" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/clang-include-fixer" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/clang-refactor" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/clang-scan-deps" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/clang-tidy" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/clangd" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/dsymutil" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/find-all-symbols" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/lld" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-ar" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-bolt" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-cov" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-cxxfilt" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-debuginfod-find" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-dwarfdump" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-dwp" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-gsymutil" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-ifs" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-libtool-darwin" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-lipo" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-ml" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-mt" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-nm" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-objcopy" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-objdump" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-pdbutil" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-profdata" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-rc" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-readobj" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-size" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-symbolizer" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-undname" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm-xray" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/llvm" + "${buildtoolsPath}/${constants.alt-platform}/clang/bin/sancov" + "flutter/prebuilts/${constants.alt-platform}/dart-sdk/bin/dartaotruntime" + "flutter/prebuilts/${constants.alt-platform}/dart-sdk/bin/dart" + "flutter/third_party/gn/gn" + "third_party/dart/tools/sdks/dart-sdk/bin/dart" + ]; + + dontPatch = true; + + patchgit = [ + "third_party/dart" + "flutter" + "." + ] ++ lib.optional (lib.versionAtLeast flutterVersion "3.21") "flutter/third_party/skia"; + + postUnpack = '' + pushd ${src.name} + ${lib.optionalString (stdenv.isLinux) '' + for patchtool in ''${patchtools[@]}; do + patchelf src/$patchtool --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) + done + ''} + + for dir in ''${patchgit[@]}; do + pushd src/$dir + rev=$(cat .git/HEAD) + rm -rf .git + git init + git add . + git config user.name "nobody" + git config user.email "nobody@local.host" + git commit -a -m "$rev" + popd + done + + src/flutter/prebuilts/${constants.alt-platform}/dart-sdk/bin/dart src/third_party/dart/tools/generate_package_config.dart + cp ${./pkg-config.py} src/build/config/linux/pkg-config.py + echo "${dartSdkVersion}" >src/third_party/dart/sdk/version + + rm -rf src/third_party/angle/.git + python3 src/flutter/tools/pub_get_offline.py + + pushd src/flutter + + for p in ''${patches[@]}; do + patch -p1 -i $p + done + + popd + popd + ''; + + configureFlags = + [ + "--no-prebuilt-dart-sdk" + "--embedder-for-target" + "--no-goma" + ] + ++ optionals (targetPlatform.isx86_64 == false) [ + "--linux" + "--linux-cpu ${constants.alt-arch}" + ]; + + # NOTE: Once https://github.com/flutter/flutter/issues/127606 is fixed, use "--no-prebuilt-dart-sdk" + configurePhase = + '' + runHook preConfigure + + export PYTHONPATH=$src/src/build + '' + + lib.optionalString stdenv.isDarwin '' + export PATH=${darwin.xcode}/Contents/Developer/usr/bin/:$PATH + '' + + '' + python3 ./src/flutter/tools/gn $configureFlags \ + --runtime-mode $runtimeMode \ + --out-dir $out \ + --target-sysroot $toolchain \ + --target-dir host_$runtimeMode${lib.optionalString (!isOptimized) "_unopt --unoptimized"} \ + --verbose + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + export TERM=dumb + for tool in flatc scenec gen_snapshot dart impellerc shader_archiver gen_snapshot_product; do + ninja -C $out/out/host_$runtimeMode${ + lib.optionalString (!isOptimized) "_unopt" + } -j$NIX_BUILD_CORES $tool + ${lib.optionalString (stdenv.isLinux) '' + patchelf $out/out/host_$runtimeMode${ + lib.optionalString (!isOptimized) "_unopt" + }/$tool --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) + ''} + done + + ninja -C $out/out/host_$runtimeMode${lib.optionalString (!isOptimized) "_unopt"} -j$NIX_BUILD_CORES + + ${lib.optionalString (stdenv.isLinux) '' + patchelf $out/out/host_$runtimeMode${ + lib.optionalString (!isOptimized) "_unopt" + }/dart-sdk/bin/dartaotruntime \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) + ''} + + runHook postBuild + ''; + + # Link sources so we can set $FLUTTER_ENGINE to this derivation + installPhase = '' + runHook preInstall + + for dir in $(find $src/src -mindepth 1 -maxdepth 1); do + ln -sf $dir $out/$(basename $dir) + done + + runHook postInstall + ''; + + meta = { + # Very broken on Darwin + broken = stdenv.isDarwin; + description = "The Flutter engine"; + homepage = "https://flutter.dev"; + maintainers = with maintainers; [ RossComputerGuy ]; + license = licenses.bsd3; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + }; +} diff --git a/pkgs/development/compilers/flutter/engine/pkg-config.py b/pkgs/development/compilers/flutter/engine/pkg-config.py new file mode 100644 index 0000000000000..1df08211e570d --- /dev/null +++ b/pkgs/development/compilers/flutter/engine/pkg-config.py @@ -0,0 +1,247 @@ +#!/usr/bin/env python3 +# +# Copyright (c) 2013 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + + + +import json +import os +import subprocess +import sys +import re +from optparse import OptionParser + +# This script runs pkg-config, optionally filtering out some results, and +# returns the result. +# +# The result will be [ <includes>, <cflags>, <libs>, <lib_dirs>, <ldflags> ] +# where each member is itself a list of strings. +# +# You can filter out matches using "-v <regexp>" where all results from +# pkgconfig matching the given regular expression will be ignored. You can +# specify more than one regular expression my specifying "-v" more than once. +# +# You can specify a sysroot using "-s <sysroot>" where sysroot is the absolute +# system path to the sysroot used for compiling. This script will attempt to +# generate correct paths for the sysroot. +# +# When using a sysroot, you must also specify the architecture via +# "-a <arch>" where arch is either "x86" or "x64". +# +# CrOS systemroots place pkgconfig files at <systemroot>/usr/share/pkgconfig +# and one of <systemroot>/usr/lib/pkgconfig or <systemroot>/usr/lib64/pkgconfig +# depending on whether the systemroot is for a 32 or 64 bit architecture. They +# specify the 'lib' or 'lib64' of the pkgconfig path by defining the +# 'system_libdir' variable in the args.gn file. pkg_config.gni communicates this +# variable to this script with the "--system_libdir <system_libdir>" flag. If no +# flag is provided, then pkgconfig files are assumed to come from +# <systemroot>/usr/lib/pkgconfig. +# +# Additionally, you can specify the option --atleast-version. This will skip +# the normal outputting of a dictionary and instead print true or false, +# depending on the return value of pkg-config for the given package. + + +def SetConfigPath(options): + """Set the PKG_CONFIG_LIBDIR environment variable. + + This takes into account any sysroot and architecture specification from the + options on the given command line. + """ + + sysroot = options.sysroot + assert sysroot + + # Compute the library path name based on the architecture. + arch = options.arch + if sysroot and not arch: + print("You must specify an architecture via -a if using a sysroot.") + sys.exit(1) + + libdir = sysroot + '/' + options.system_libdir + '/pkgconfig' + libdir += ':' + sysroot + '/share/pkgconfig' + os.environ['PKG_CONFIG_LIBDIR'] = libdir + return libdir + + +def GetPkgConfigPrefixToStrip(options, args): + """Returns the prefix from pkg-config where packages are installed. + + This returned prefix is the one that should be stripped from the beginning of + directory names to take into account sysroots. + """ + # Some sysroots, like the Chromium OS ones, may generate paths that are not + # relative to the sysroot. For example, + # /path/to/chroot/build/x86-generic/usr/lib/pkgconfig/pkg.pc may have all + # paths relative to /path/to/chroot (i.e. prefix=/build/x86-generic/usr) + # instead of relative to /path/to/chroot/build/x86-generic (i.e prefix=/usr). + # To support this correctly, it's necessary to extract the prefix to strip + # from pkg-config's |prefix| variable. + prefix = subprocess.check_output([options.pkg_config, + "--variable=prefix"] + args, env=os.environ).decode('utf-8') + return prefix + + +def MatchesAnyRegexp(flag, list_of_regexps): + """Returns true if the first argument matches any regular expression in the + given list.""" + for regexp in list_of_regexps: + if regexp.search(flag) != None: + return True + return False + + +def RewritePath(path, strip_prefix, sysroot): + """Rewrites a path by stripping the prefix and prepending the sysroot.""" + if os.path.isabs(path) and not path.startswith(sysroot): + if path.startswith(strip_prefix): + path = path[len(strip_prefix):] + path = path.lstrip('/') + return os.path.join(sysroot, path) + else: + return path + + +def main(): + # If this is run on non-Linux platforms, just return nothing and indicate + # success. This allows us to "kind of emulate" a Linux build from other + # platforms. + if "linux" not in sys.platform: + print("[[],[],[],[],[]]") + return 0 + + parser = OptionParser() + parser.add_option('-d', '--debug', action='store_true') + parser.add_option('-p', action='store', dest='pkg_config', type='string', + default='pkg-config') + parser.add_option('-v', action='append', dest='strip_out', type='string') + parser.add_option('-s', action='store', dest='sysroot', type='string') + parser.add_option('-a', action='store', dest='arch', type='string') + parser.add_option('--system_libdir', action='store', dest='system_libdir', + type='string', default='lib') + parser.add_option('--atleast-version', action='store', + dest='atleast_version', type='string') + parser.add_option('--libdir', action='store_true', dest='libdir') + parser.add_option('--dridriverdir', action='store_true', dest='dridriverdir') + parser.add_option('--version-as-components', action='store_true', + dest='version_as_components') + (options, args) = parser.parse_args() + + # Make a list of regular expressions to strip out. + strip_out = [] + if options.strip_out != None: + for regexp in options.strip_out: + strip_out.append(re.compile(regexp)) + + if options.sysroot: + libdir = SetConfigPath(options) + if options.debug: + sys.stderr.write('PKG_CONFIG_LIBDIR=%s\n' % libdir) + prefix = GetPkgConfigPrefixToStrip(options, args) + else: + prefix = '' + + if options.atleast_version: + # When asking for the return value, just run pkg-config and print the return + # value, no need to do other work. + if not subprocess.call([options.pkg_config, + "--atleast-version=" + options.atleast_version] + + args): + print("true") + else: + print("false") + return 0 + + if options.version_as_components: + cmd = [options.pkg_config, "--modversion"] + args + try: + version_string = subprocess.check_output(cmd).decode('utf-8') + except: + sys.stderr.write('Error from pkg-config.\n') + return 1 + print(json.dumps(list(map(int, version_string.strip().split("."))))) + return 0 + + + if options.libdir: + cmd = [options.pkg_config, "--variable=libdir"] + args + if options.debug: + sys.stderr.write('Running: %s\n' % cmd) + try: + libdir = subprocess.check_output(cmd).decode('utf-8') + except: + print("Error from pkg-config.") + return 1 + sys.stdout.write(libdir.strip()) + return 0 + + if options.dridriverdir: + cmd = [options.pkg_config, "--variable=dridriverdir"] + args + if options.debug: + sys.stderr.write('Running: %s\n' % cmd) + try: + dridriverdir = subprocess.check_output(cmd).decode('utf-8') + except: + print("Error from pkg-config.") + return 1 + sys.stdout.write(dridriverdir.strip()) + return + + cmd = [options.pkg_config, "--cflags", "--libs"] + args + if options.debug: + sys.stderr.write('Running: %s\n' % ' '.join(cmd)) + + try: + flag_string = subprocess.check_output(cmd).decode('utf-8') + except: + sys.stderr.write('Could not run pkg-config.\n') + return 1 + + # For now just split on spaces to get the args out. This will break if + # pkgconfig returns quoted things with spaces in them, but that doesn't seem + # to happen in practice. + all_flags = flag_string.strip().split(' ') + + + sysroot = options.sysroot + if not sysroot: + sysroot = '' + + includes = [] + cflags = [] + libs = [] + lib_dirs = [] + + for flag in all_flags[:]: + if len(flag) == 0 or MatchesAnyRegexp(flag, strip_out): + continue; + + if flag[:2] == '-l': + libs.append(RewritePath(flag[2:], prefix, sysroot)) + elif flag[:2] == '-L': + lib_dirs.append(RewritePath(flag[2:], prefix, sysroot)) + elif flag[:2] == '-I': + includes.append(RewritePath(flag[2:], prefix, sysroot)) + elif flag[:3] == '-Wl': + # Don't allow libraries to control ld flags. These should be specified + # only in build files. + pass + elif flag == '-pthread': + # Many libs specify "-pthread" which we don't need since we always include + # this anyway. Removing it here prevents a bunch of duplicate inclusions + # on the command line. + pass + else: + cflags.append(flag) + + # Output a GN array, the first one is the cflags, the second are the libs. The + # JSON formatter prints GN compatible lists when everything is a list of + # strings. + print(json.dumps([includes, cflags, libs, lib_dirs])) + return 0 + + +if __name__ == '__main__': + sys.exit(main()) diff --git a/pkgs/development/compilers/flutter/engine/source.nix b/pkgs/development/compilers/flutter/engine/source.nix new file mode 100644 index 0000000000000..4b9b5aaa5adb2 --- /dev/null +++ b/pkgs/development/compilers/flutter/engine/source.nix @@ -0,0 +1,78 @@ +{ + callPackage, + hostPlatform, + targetPlatform, + tools ? callPackage ./tools.nix { inherit hostPlatform; }, + curl, + pkg-config, + git, + python3, + runCommand, + writeText, + cacert, + version, + hashes, + url, +}: +let + constants = callPackage ./constants.nix { inherit targetPlatform; }; +in +runCommand "flutter-engine-source-${version}-${targetPlatform.system}" + { + pname = "flutter-engine-source"; + inherit version; + + inherit (tools) depot_tools; + + nativeBuildInputs = [ + curl + pkg-config + git + tools.cipd + (python3.withPackages ( + ps: with ps; [ + httplib2 + six + ] + )) + ]; + + gclient = writeText "flutter-engine-${version}.gclient" '' + solutions = [{ + "managed": False, + "name": "src/flutter", + "url": "${url}", + }] + ''; + + NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + DEPOT_TOOLS_UPDATE = "0"; + DEPOT_TOOLS_COLLECT_METRICS = "0"; + PYTHONDONTWRITEBYTECODE = "1"; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = hashes.${targetPlatform.system} or (throw "Hash not set for ${targetPlatform.system}"); + } + '' + source ${../../../../build-support/fetchgit/deterministic-git} + export -f clean_git + export -f make_deterministic_repo + + mkdir -p $out + cp $gclient $out/.gclient + cd $out + + export PATH=$PATH:$depot_tools + python3 $depot_tools/gclient.py sync --no-history --shallow --nohooks >/dev/null + find $out -name '.git' -exec dirname {} \; | xargs bash -c 'make_deterministic_repo $@' _ + find $out -path '*/.git/*' ! -name 'HEAD' -prune -exec rm -rf {} \; + find $out -name '.git' -exec mkdir {}/logs \; + find $out -name '.git' -exec cp {}/HEAD {}/logs/HEAD \; + + python3 src/build/linux/sysroot_scripts/install-sysroot.py --arch=${constants.arch} >/dev/null + + rm -rf $out/.cipd $out/.gclient $out/.gclient_entries $out/.gclient_previous_custom_vars $out/.gclient_previous_sync_commits + '' diff --git a/pkgs/development/compilers/flutter/engine/tools.nix b/pkgs/development/compilers/flutter/engine/tools.nix new file mode 100644 index 0000000000000..a35398058181b --- /dev/null +++ b/pkgs/development/compilers/flutter/engine/tools.nix @@ -0,0 +1,62 @@ +{ + callPackage, + fetchgit, + fetchurl, + writeText, + runCommand, + hostPlatform, + darwin, + writeShellScriptBin, + depot_toolsCommit ? "7d95eb2eb054447592585c73a8ff7adad97ecba1", + depot_toolsHash ? "sha256-F7KDuVg11qLKkohIjuXpNdxpnSsT6Z3hE9+wFIG2sSk=", + cipdCommit ? "89ada246fcbf10f330011e4991d017332af2365b", + cipdHashes ? { + "linux-386" = "7f264198598af2ef9d8878349d33c1940f1f3739e46d986962c352ec4cce2690"; + "linux-amd64" = "2ada6b46ad1cd1350522c5c05899d273f5c894c7665e30104e7f57084a5aeeb9"; + "linux-arm64" = "96eca7e49f6732c50122b94b793c3a5e62ed77bce1686787a8334906791b4168"; + "linux-armv6l" = "06394601130652c5e1b055a7e4605c21fc7c6643af0b3b3cac8d2691491afa81"; + "linux-mips64" = "f3eda6542b381b7aa8f582698498b0e197972c894590ec35f18faa467c868f5c"; + "linux-mips64le" = "74229ada8e2afd9c8e7c58991126869b2880547780d4a197a27c1dfa96851622"; + "linux-mipsle" = "2f3c18ec0ad48cd44a9ff39bb60e9afded83ca43fb9c7a5ea9949f6fdd4e1394"; + "linux-ppc64" = "79425c0795fb8ba12b39a8856bf7ccb853e85def4317aa6413222f307d4c2dbd"; + "linux-ppc64le" = "f9b3d85dde70f1b78cd7a41d2477834c15ac713a59317490a4cdac9f8f092325"; + "linux-riscv64" = "bd695164563a66e8d3799e8835f90a398fbae9a4eec24e876c92d5f213943482"; + "linux-s390x" = "6f501af80541e733fda23b4208a21ea05919c95d236036a2121e6b6334a2792c"; + "macos-amd64" = "41d05580c0014912d6c32619c720646fd136e4557c9c7d7571ecc8c0462733a1"; + "macos-arm64" = "dc672bd16d9faf277dd562f1dc00644b10c03c5d838d3cc3d3ea29925d76d931"; + "windows-386" = "fa6ed0022a38ffc51ff8a927e3947fe7e59a64b2019dcddca9d3afacf7630444"; + "windows-amd64" = "b5423e4b4429837f7fe4d571ce99c068aa0ccb37ddbebc1978a423fd2b0086df"; + }, +}: +let + constants = callPackage ./constants.nix { targetPlatform = hostPlatform; }; +in +{ + depot_tools = fetchgit { + url = "https://chromium.googlesource.com/chromium/tools/depot_tools.git"; + rev = depot_toolsCommit; + hash = depot_toolsHash; + }; + + cipd = + runCommand "cipd-${cipdCommit}" + { + unwrapped = fetchurl { + name = "cipd-${cipdCommit}-unwrapped"; + url = "https://chrome-infra-packages.appspot.com/client?platform=${constants.platform}&version=git_revision:${cipdCommit}"; + sha256 = cipdHashes.${constants.platform}; + }; + } + '' + mkdir -p $out/bin + install -m755 $unwrapped $out/bin/cipd + ''; + + vpython = + pythonPkg: + runCommand "vpython3" { } "mkdir -p $out/bin && ln -s ${pythonPkg}/bin/python $out/bin/vpython3"; + + xcode-select = writeShellScriptBin "xcode-select" '' + echo ${darwin.xcode}/Contents/Developer + ''; +} diff --git a/pkgs/development/compilers/flutter/flutter-tools.nix b/pkgs/development/compilers/flutter/flutter-tools.nix index cf35ed8cbc455..306765cd0a42a 100644 --- a/pkgs/development/compilers/flutter/flutter-tools.nix +++ b/pkgs/development/compilers/flutter/flutter-tools.nix @@ -2,6 +2,7 @@ , stdenv , systemPlatform , buildDartApplication +, runCommand , git , which , dart @@ -54,5 +55,22 @@ buildDartApplication.override { inherit dart; } rec { popd ''; + sdkSourceBuilders = { + # https://github.com/dart-lang/pub/blob/e1fbda73d1ac597474b82882ee0bf6ecea5df108/lib/src/sdk/dart.dart#L80 + "dart" = name: runCommand "dart-sdk-${name}" { passthru.packageRoot = "."; } '' + for path in '${dart}/pkg/${name}'; do + if [ -d "$path" ]; then + ln -s "$path" "$out" + break + fi + done + + if [ ! -e "$out" ]; then + echo 1>&2 'The Dart SDK does not contain the requested package: ${name}!' + exit 1 + fi + ''; + }; + inherit pubspecLock; } diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index 3eabf71a8912e..757766d031524 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -1,6 +1,12 @@ -{ version +{ useNixpkgsEngine ? false +, version , engineVersion +, engineHashes ? {} +, engineUrl ? "https://github.com/flutter/engine.git@${engineVersion}" +, enginePatches ? [] +, engineRuntimeModes ? [ "release" "debug" ] , patches +, channel , dart , src , pubspecLock @@ -20,9 +26,20 @@ inherit pubspecLock; systemPlatform = stdenv.hostPlatform.system; } -}: +}@args: let + engine = if args.useNixpkgsEngine or false then + callPackage ./engine/default.nix { + dartSdkVersion = dart.version; + flutterVersion = version; + version = engineVersion; + hashes = engineHashes; + url = engineUrl; + patches = enginePatches; + runtimeModes = engineRuntimeModes; + } else null; + unwrapped = stdenv.mkDerivation { name = "flutter-${version}-unwrapped"; @@ -74,7 +91,7 @@ let "devToolsVersion": "$(cat "${dart}/bin/resources/devtools/version.json" | jq -r .version)", "flutterVersion": "${version}", "frameworkVersion": "${version}", - "channel": "stable", + "channel": "${channel}", "repositoryUrl": "https://github.com/flutter/flutter.git", "frameworkRevision": "nixpkgs000000000000000000000000000000000", "frameworkCommitDate": "1970-01-01 00:00:00", @@ -124,12 +141,15 @@ let ''; passthru = { - inherit dart engineVersion artifactHashes; + # TODO: rely on engine.version instead of engineVersion + inherit dart engineVersion artifactHashes channel; tools = flutterTools; # The derivation containing the original Flutter SDK files. # When other derivations wrap this one, any unmodified files # found here should be included as-is, for tooling compatibility. sdk = unwrapped; + } // lib.optionalAttrs (engine != null && engine.meta.available) { + inherit engine; }; meta = with lib; { diff --git a/pkgs/development/compilers/flutter/update/get-dart-hashes.nix.in b/pkgs/development/compilers/flutter/update/get-dart-hashes.nix.in index f900c863195ab..941a9769a9cb2 100644 --- a/pkgs/development/compilers/flutter/update/get-dart-hashes.nix.in +++ b/pkgs/development/compilers/flutter/update/get-dart-hashes.nix.in @@ -1,26 +1,27 @@ let dartVersion = "@dart_version@"; platform = "@platform@"; + channel = "@channel@"; in { x86_64-linux = { fetchzip }: fetchzip { - url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip"; + url = "https://storage.googleapis.com/dart-archive/channels/${channel}/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip"; sha256 = "0000000000000000000000000000000000000000000000000000"; }; aarch64-linux = { fetchzip }: fetchzip { - url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip"; + url = "https://storage.googleapis.com/dart-archive/channels/${channel}/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip"; sha256 = "0000000000000000000000000000000000000000000000000000"; }; x86_64-darwin = { fetchzip }: fetchzip { - url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-macos-x64-release.zip"; + url = "https://storage.googleapis.com/dart-archive/channels/${channel}/release/${dartVersion}/sdk/dartsdk-macos-x64-release.zip"; sha256 = "0000000000000000000000000000000000000000000000000000"; }; aarch64-darwin = { fetchzip }: fetchzip { - url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-macos-arm64-release.zip"; + url = "https://storage.googleapis.com/dart-archive/channels/${channel}/release/${dartVersion}/sdk/dartsdk-macos-arm64-release.zip"; sha256 = "0000000000000000000000000000000000000000000000000000"; }; }.${platform} diff --git a/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in b/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in new file mode 100644 index 0000000000000..f61b9b14fd07a --- /dev/null +++ b/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in @@ -0,0 +1,23 @@ +{ callPackage, symlinkJoin, lib }: +let + nixpkgsRoot = "@nixpkgs_root@"; + engineVersion = "@engine_version@"; + + systemPlatforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + + derivations = builtins.map + (systemPlatform: callPackage "${nixpkgsRoot}/pkgs/development/compilers/flutter/engine/source.nix" { + targetPlatform = lib.systems.elaborate systemPlatform; + version = engineVersion; + url = "https://github.com/flutter/engine.git@${engineVersion}"; + hashes."${systemPlatform}" = lib.fakeSha256; + }) + systemPlatforms; +in +symlinkJoin { + name = "evaluate-derivations"; + paths = derivations; +} diff --git a/pkgs/development/compilers/flutter/update/update.py b/pkgs/development/compilers/flutter/update/update.py index 618fae5468e5b..a782b46514a92 100755 --- a/pkgs/development/compilers/flutter/update/update.py +++ b/pkgs/development/compilers/flutter/update/update.py @@ -85,6 +85,32 @@ def nix_build_to_fail(code): return stderr +def get_engine_hashes(engine_version): + code = load_code("get-engine-hashes.nix", + nixpkgs_root=NIXPKGS_ROOT, + engine_version=engine_version) + + stderr = nix_build_to_fail(code) + + pattern = re.compile( + r"/nix/store/.*-flutter-engine-source-(.+?)-(.+?).drv':\n\s+specified: .*\n\s+got:\s+(.+?)\n") + matches = pattern.findall(stderr) + result_dict = {} + + for match in matches: + _, system, got = match + result_dict[system] = got + + def sort_dict_recursive(d): + return { + k: sort_dict_recursive(v) if isinstance( + v, dict) else v for k, v in sorted( + d.items())} + result_dict = sort_dict_recursive(result_dict) + + return result_dict + + def get_artifact_hashes(flutter_compact_version): code = load_code("get-artifact-hashes.nix", nixpkgs_root=NIXPKGS_ROOT, @@ -111,7 +137,7 @@ def get_artifact_hashes(flutter_compact_version): return result_dict -def get_dart_hashes(dart_version): +def get_dart_hashes(dart_version, channel): platforms = [ "x86_64-linux", "aarch64-linux", @@ -122,6 +148,7 @@ def get_dart_hashes(dart_version): code = load_code( "get-dart-hashes.nix", dart_version=dart_version, + channel=channel, platform=platform) stderr = nix_build_to_fail(code) @@ -177,7 +204,9 @@ def get_pubspec_lock(flutter_compact_version, flutter_src): def write_data( nixpkgs_flutter_version_directory, flutter_version, + channel, engine_hash, + engine_hashes, dart_version, dart_hash, flutter_hash, @@ -187,6 +216,8 @@ def write_data( f.write(json.dumps({ "version": flutter_version, "engineVersion": engine_hash, + "channel": channel, + "engineHashes": engine_hashes, "dartVersion": dart_version, "dartHash": dart_hash, "flutterHash": flutter_hash, @@ -202,7 +233,9 @@ def update_all_packages(): int(x.split('_')[0]), int(x.split('_')[1])), reverse=True) new_content = [ - "flutterPackages = recurseIntoAttrs (callPackage ../development/compilers/flutter { });", + "flutterPackages-bin = recurseIntoAttrs (callPackage ../development/compilers/flutter { });", + "flutterPackages-source = recurseIntoAttrs (callPackage ../development/compilers/flutter { useNixpkgsEngine = true; });", + "flutterPackages = flutterPackages-bin;" "flutter = flutterPackages.stable;", ] + [f"flutter{version.replace('_', '')} = flutterPackages.v{version};" for version in versions] @@ -212,7 +245,7 @@ def update_all_packages(): start = -1 end = -1 for i, line in enumerate(lines): - if "flutterPackages = recurseIntoAttrs (callPackage ../development/compilers/flutter { });" in line: + if "flutterPackages-bin = recurseIntoAttrs (callPackage ../development/compilers/flutter { });" in line: start = i if start != -1 and len(line.strip()) == 0: end = i @@ -229,18 +262,21 @@ def update_all_packages(): # Finds Flutter version, Dart version, and Engine hash. # If the Flutter version is given, it uses that. Otherwise finds the # latest stable Flutter version. -def find_versions(flutter_version=None): +def find_versions(flutter_version=None, channel=None): engine_hash = None dart_version = None releases = json.load(urllib.request.urlopen( "https://storage.googleapis.com/flutter_infra_release/releases/releases_linux.json")) + if not channel: + channel = 'stable' + if not flutter_version: - stable_hash = releases['current_release']['stable'] + hash = releases['current_release'][channel] release = next( filter( - lambda release: release['hash'] == stable_hash, + lambda release: release['hash'] == hash, releases['releases'])) flutter_version = release['version'] @@ -265,21 +301,25 @@ def find_versions(flutter_version=None): filter( lambda release: release['version'] == flutter_version, releases['releases']))['dart_sdk_version'] + + if " " in dart_version: + dart_version = dart_version.split(' ')[2][:-1] except StopIteration: exit( f"Couldn't find Dart version for Flutter version: {flutter_version}") - return (flutter_version, engine_hash, dart_version) + return (flutter_version, engine_hash, dart_version, channel) def main(): parser = argparse.ArgumentParser(description='Update Flutter in Nixpkgs') parser.add_argument('--version', type=str, help='Specify Flutter version') + parser.add_argument('--channel', type=str, help='Specify Flutter release channel') parser.add_argument('--artifact-hashes', action='store_true', help='Whether to get artifact hashes') args = parser.parse_args() - (flutter_version, engine_hash, dart_version) = find_versions(args.version) + (flutter_version, engine_hash, dart_version, channel) = find_versions(args.version, args.channel) flutter_compact_version = '_'.join(flutter_version.split('.')[:2]) @@ -291,11 +331,11 @@ def main(): "\n") return - print(f"Flutter version: {flutter_version} ({flutter_compact_version})") + print(f"Flutter version: {flutter_version} ({flutter_compact_version}) on ({channel})") print(f"Engine hash: {engine_hash}") print(f"Dart version: {dart_version}") - dart_hash = get_dart_hashes(dart_version) + dart_hash = get_dart_hashes(dart_version, channel) (flutter_hash, flutter_src) = get_flutter_hash_and_src(flutter_version) nixpkgs_flutter_version_directory = f"{NIXPKGS_ROOT}/pkgs/development/compilers/flutter/versions/{flutter_compact_version}" @@ -309,6 +349,7 @@ def main(): common_data_args = { "nixpkgs_flutter_version_directory": nixpkgs_flutter_version_directory, "flutter_version": flutter_version, + "channel": channel, "dart_version": dart_version, "engine_hash": engine_hash, "flutter_hash": flutter_hash, @@ -318,6 +359,7 @@ def main(): write_data( pubspec_lock={}, artifact_hashes={}, + engine_hashes={}, **common_data_args) pubspec_lock = get_pubspec_lock(flutter_compact_version, flutter_src) @@ -325,6 +367,7 @@ def main(): write_data( pubspec_lock=pubspec_lock, artifact_hashes={}, + engine_hashes={}, **common_data_args) artifact_hashes = get_artifact_hashes(flutter_compact_version) @@ -332,6 +375,15 @@ def main(): write_data( pubspec_lock=pubspec_lock, artifact_hashes=artifact_hashes, + engine_hashes={}, + **common_data_args) + + engine_hashes = get_engine_hashes(engine_hash) + + write_data( + pubspec_lock=pubspec_lock, + artifact_hashes=artifact_hashes, + engine_hashes=engine_hashes, **common_data_args) diff --git a/pkgs/development/compilers/flutter/versions/3_13/data.json b/pkgs/development/compilers/flutter/versions/3_13/data.json index 7d8f285f0b211..eb707f74f7c26 100644 --- a/pkgs/development/compilers/flutter/versions/3_13/data.json +++ b/pkgs/development/compilers/flutter/versions/3_13/data.json @@ -1,6 +1,10 @@ { "version": "3.13.8", "engineVersion": "767d8c75e898091b925519803830fc2721658d07", + "channel": "stable", + "engineHashes": { + "aarch64-linux": "sha256-1s7I+AWb2kNDzJ5k2XYm7rSK8yj1wqTjPUuS0f85Jig=" + }, "dartVersion": "3.1.4", "dartHash": { "x86_64-linux": "sha256-42wrqzjRcFDWw2aEY6+/faX+QE9PA8FmRWP4M/NkgBE=", diff --git a/pkgs/development/compilers/flutter/versions/3_16/data.json b/pkgs/development/compilers/flutter/versions/3_16/data.json index afc0225d49a7f..477328b4aa6b2 100644 --- a/pkgs/development/compilers/flutter/versions/3_16/data.json +++ b/pkgs/development/compilers/flutter/versions/3_16/data.json @@ -1,6 +1,10 @@ { "version": "3.16.7", "engineVersion": "4a585b79294e830fa89c24924d58a27cc8fbf406", + "channel": "stable", + "engineHashes": { + "aarch64-linux": "sha256-xqniT1rYrzCuq6542KfqWRigYtLnmaT0z5Es/59iFMw=" + }, "dartVersion": "3.2.4", "dartHash": { "x86_64-linux": "sha256-qslf+wgmNz9r+e45o3Bg9/vDj75GkM9gQE2tb5rbIvw=", diff --git a/pkgs/development/compilers/flutter/versions/3_19/data.json b/pkgs/development/compilers/flutter/versions/3_19/data.json index 9eeddd3361ddf..c09d3e99a3cac 100644 --- a/pkgs/development/compilers/flutter/versions/3_19/data.json +++ b/pkgs/development/compilers/flutter/versions/3_19/data.json @@ -1,6 +1,12 @@ { "version": "3.19.4", "engineVersion": "a5c24f538d05aaf66f7972fb23959d8cafb9f95a", + "channel": "stable", + "engineHashes": { + "x86_64-linux": "sha256-xhihh4v9bh2ZxAewKEdhpXerLDoXFm8YO72+tGRnkCw=", + "aarch64-linux": "sha256-mUimQRg0UqvTueuDWO8Isy0FKOxJLvVZrehv4SMj0XY=", + "aarch64-darwin": "sha256-5DcD7ebrANznB++QOQOoynr1aOgJqTF8QfSihQnghoY=" + }, "dartVersion": "3.3.2", "dartHash": { "x86_64-linux": "sha256-eO8qcSQNWGEz/5oVaJ5tjRMnGy2aq3PbcF15z/Pi3xQ=", diff --git a/pkgs/development/compilers/flutter/versions/3_19/engine/patches/flutter-140969.patch b/pkgs/development/compilers/flutter/versions/3_19/engine/patches/flutter-140969.patch new file mode 100644 index 0000000000000..bf5d9320a0a39 --- /dev/null +++ b/pkgs/development/compilers/flutter/versions/3_19/engine/patches/flutter-140969.patch @@ -0,0 +1,41 @@ +From dd74740ddceac81e748a7e7834c28135abc59454 Mon Sep 17 00:00:00 2001 +From: Brandon DeRosier <bdero@google.com> +Date: Tue, 16 Jan 2024 11:00:34 -0800 +Subject: [PATCH] [Flutter GPU] Fix playground shader paths. (#49790) + +Resolves https://github.com/flutter/flutter/issues/140969. + +Makes the shader paths absolute to prevent issues caused by the working +directory differing across build environments. +--- + impeller/fixtures/BUILD.gn | 3 ++- + impeller/tools/impeller.gni | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/impeller/fixtures/BUILD.gn b/impeller/fixtures/BUILD.gn +index 9165f06542a2a..5ea90ab3969f3 100644 +--- a/impeller/fixtures/BUILD.gn ++++ b/impeller/fixtures/BUILD.gn +@@ -131,7 +131,8 @@ + "flutter_gpu_texture.vert", + ] + shader_target_flags = [ "--runtime-stage-metal" ] +- shader_bundle = "{\"UnlitFragment\": {\"type\": \"fragment\", \"file\": \"../../flutter/impeller/fixtures/flutter_gpu_unlit.frag\"}, \"UnlitVertex\": {\"type\": \"vertex\", \"file\": \"../../flutter/impeller/fixtures/flutter_gpu_unlit.vert\"}, \"TextureFragment\": {\"type\": \"fragment\", \"file\": \"../../flutter/impeller/fixtures/flutter_gpu_texture.frag\"}, \"TextureVertex\": {\"type\": \"vertex\", \"file\": \"../../flutter/impeller/fixtures/flutter_gpu_texture.vert\"}}" ++ fixtures = rebase_path("//flutter/impeller/fixtures") ++ shader_bundle = "{\"UnlitFragment\": {\"type\": \"fragment\", \"file\": \"${fixtures}/flutter_gpu_unlit.frag\"}, \"UnlitVertex\": {\"type\": \"vertex\", \"file\": \"${fixtures}/flutter_gpu_unlit.vert\"}, \"TextureFragment\": {\"type\": \"fragment\", \"file\": \"${fixtures}/flutter_gpu_texture.frag\"}, \"TextureVertex\": {\"type\": \"vertex\", \"file\": \"${fixtures}/flutter_gpu_texture.vert\"}}" + shader_bundle_output = "playground.shaderbundle" + } + +diff --git a/impeller/tools/impeller.gni b/impeller/tools/impeller.gni +index 6541c3b12173b..2ab7ec0f0b07a 100644 +--- a/impeller/tools/impeller.gni ++++ b/impeller/tools/impeller.gni +@@ -313,7 +313,7 @@ + if (defined(invoker.shader_bundle)) { + assert( + defined(invoker.shader_bundle_output), +- "When shader_bundle is specified, shader_output_bundle must also be specified.") ++ "When shader_bundle is specified, shader_bundle_output must also be specified.") + } + + sksl = false diff --git a/pkgs/development/compilers/flutter/versions/3_22/data.json b/pkgs/development/compilers/flutter/versions/3_22/data.json index 19c1ddd532b8f..968fde9d7b27c 100644 --- a/pkgs/development/compilers/flutter/versions/3_22/data.json +++ b/pkgs/development/compilers/flutter/versions/3_22/data.json @@ -1,6 +1,11 @@ { "version": "3.22.2", "engineVersion": "edd8546116457bdf1c5bdfb13ecb9463d2bb5ed4", + "channel": "stable", + "engineHashes": { + "aarch64-linux": "sha256-xPVhLxO9AgXC2+Hwm1lWRfNZhLwZHdKW92WXgv3ImZk=", + "x86_64-linux": "sha256-klODJpmlWynYx+MqqGGeTzzPtmQTEUV47hnzjIVDCK8=" + }, "dartVersion": "3.4.3", "dartHash": { "x86_64-linux": "sha256-wDIdoWoKlutP8kixd12Lppzv2aYeiTJ1A1Sy6lguXgg=", diff --git a/pkgs/development/compilers/flutter/versions/3_23/data.json b/pkgs/development/compilers/flutter/versions/3_23/data.json new file mode 100644 index 0000000000000..3c3fedbdecaeb --- /dev/null +++ b/pkgs/development/compilers/flutter/versions/3_23/data.json @@ -0,0 +1,1027 @@ +{ + "version": "3.23.0-0.1.pre", + "engineVersion": "bb10c5466638e963479ba5e64e601e42d1a43447", + "channel": "beta", + "engineHashes": { + "aarch64-linux": "sha256-WHWxYOHd3jxE5CQNt0+9qxlsCLK5y9iJsVERtJ4Ylbk=" + }, + "dartVersion": "3.5.0-180.3.beta", + "dartHash": { + "x86_64-linux": "sha256-DXGyUTu9I602lLnDz9BKLfHEAeaMKtbZjxgmPPSTEv0=", + "aarch64-linux": "sha256-WFTHw5V6zWrpF7bx5wOQNOMJe+yn1j4rnfRSkW7hN9c=", + "x86_64-darwin": "sha256-nUFd3jMj1Totc2WPSToLvtSVNjmhKKWEXwzSKo1yT1w=", + "aarch64-darwin": "sha256-O5HYmZVveYGktks7we4uht9ZyaWJli5dSC22lrVqi58=" + }, + "flutterHash": "sha256-OFDPPoLvKG+H4Jylc6/NvvEe5g5I/lo4ViYNIUrgQXw=", + "artifactHashes": { + "android": { + "aarch64-darwin": "sha256-UWZ6/XGOoTjfoENRs2f6ZbTcke76ieme4MnTqKVKYXo=", + "aarch64-linux": "sha256-orYFnnwdiN0jKTff34moVkBmAc2TWNz053mp0IVehmk=", + "x86_64-darwin": "sha256-UWZ6/XGOoTjfoENRs2f6ZbTcke76ieme4MnTqKVKYXo=", + "x86_64-linux": "sha256-orYFnnwdiN0jKTff34moVkBmAc2TWNz053mp0IVehmk=" + }, + "fuchsia": { + "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", + "aarch64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", + "x86_64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", + "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=" + }, + "ios": { + "aarch64-darwin": "sha256-lAo3yua8IbGiaVLt0JqDtehKROnibx60HtaBLupvILI=", + "aarch64-linux": "sha256-lAo3yua8IbGiaVLt0JqDtehKROnibx60HtaBLupvILI=", + "x86_64-darwin": "sha256-lAo3yua8IbGiaVLt0JqDtehKROnibx60HtaBLupvILI=", + "x86_64-linux": "sha256-lAo3yua8IbGiaVLt0JqDtehKROnibx60HtaBLupvILI=" + }, + "linux": { + "aarch64-darwin": "sha256-2d3gPOT2kBgHeTXOFOdEOAHkbv7ctXx51rtX497FEmU=", + "aarch64-linux": "sha256-2d3gPOT2kBgHeTXOFOdEOAHkbv7ctXx51rtX497FEmU=", + "x86_64-darwin": "sha256-LcEITSWg5VdUs9nXRu+mPGxxWqAuRRSbt9RCDeBa+74=", + "x86_64-linux": "sha256-LcEITSWg5VdUs9nXRu+mPGxxWqAuRRSbt9RCDeBa+74=" + }, + "macos": { + "aarch64-darwin": "sha256-b6ETaOTHSU58yLsMorKKhOOA7DkD+RtQ3DIqAJhSDjs=", + "aarch64-linux": "sha256-b6ETaOTHSU58yLsMorKKhOOA7DkD+RtQ3DIqAJhSDjs=", + "x86_64-darwin": "sha256-b6ETaOTHSU58yLsMorKKhOOA7DkD+RtQ3DIqAJhSDjs=", + "x86_64-linux": "sha256-b6ETaOTHSU58yLsMorKKhOOA7DkD+RtQ3DIqAJhSDjs=" + }, + "universal": { + "aarch64-darwin": "sha256-umn+onoRSmfuoL+ls/68xhCo34mgD1xMdMjUstmMC74=", + "aarch64-linux": "sha256-IKGrSAweOTwgesVt2PjUvYeTkpeSDRqXTeZWwd6ikvk=", + "x86_64-darwin": "sha256-C7/NtLOpFwyvUMBk7imz0Ovj/AjJ7vf2v6Sd2PZujiA=", + "x86_64-linux": "sha256-3W/S7/K30xJC6mA9S2n1rgD7lhUvz2ZDSKq7k/uRi2A=" + }, + "web": { + "aarch64-darwin": "sha256-dyT9Cj33MmZdOhQwVuqkrxYjWeZxMXE35BKkRHjSKtQ=", + "aarch64-linux": "sha256-dyT9Cj33MmZdOhQwVuqkrxYjWeZxMXE35BKkRHjSKtQ=", + "x86_64-darwin": "sha256-dyT9Cj33MmZdOhQwVuqkrxYjWeZxMXE35BKkRHjSKtQ=", + "x86_64-linux": "sha256-dyT9Cj33MmZdOhQwVuqkrxYjWeZxMXE35BKkRHjSKtQ=" + }, + "windows": { + "x86_64-darwin": "sha256-0V63HjDy3mqNmGKM/5VVSibg8k7JtSaJ5RXXgk1XltQ=", + "x86_64-linux": "sha256-0V63HjDy3mqNmGKM/5VVSibg8k7JtSaJ5RXXgk1XltQ=" + } + }, + "pubspecLock": { + "packages": { + "_fe_analyzer_shared": { + "dependency": "direct main", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "5aaf60d96c4cd00fe7f21594b5ad6a1b699c80a27420f8a837f4d68473ef09e3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "68.0.0" + }, + "_macros": { + "dependency": "transitive", + "description": "dart", + "source": "sdk", + "version": "0.1.5" + }, + "analyzer": { + "dependency": "direct main", + "description": { + "name": "analyzer", + "sha256": "21f1d3720fd1c70316399d5e2bccaebb415c434592d778cce8acb967b8578808", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "archive": { + "dependency": "direct main", + "description": { + "name": "archive", + "sha256": "80e5141fafcb3361653ce308776cfd7d45e6e9fbb429e14eec571382c0c5fecb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.3.2" + }, + "args": { + "dependency": "direct main", + "description": { + "name": "args", + "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.0" + }, + "async": { + "dependency": "direct main", + "description": { + "name": "async", + "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.11.0" + }, + "boolean_selector": { + "dependency": "direct main", + "description": { + "name": "boolean_selector", + "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "browser_launcher": { + "dependency": "direct main", + "description": { + "name": "browser_launcher", + "sha256": "6ee4c6b1f68a42e769ef6e663c4f56708522f7bce9d2ab6e308a37b612ffa4ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "built_collection": { + "dependency": "direct main", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "direct main", + "description": { + "name": "built_value", + "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.9.2" + }, + "checked_yaml": { + "dependency": "direct dev", + "description": { + "name": "checked_yaml", + "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "cli_config": { + "dependency": "direct main", + "description": { + "name": "cli_config", + "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "clock": { + "dependency": "direct main", + "description": { + "name": "clock", + "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "collection": { + "dependency": "direct dev", + "description": { + "name": "collection", + "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.18.0" + }, + "completion": { + "dependency": "direct main", + "description": { + "name": "completion", + "sha256": "f11b7a628e6c42b9edc9b0bc3aa490e2d930397546d2f794e8e1325909d11c60", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "convert": { + "dependency": "direct main", + "description": { + "name": "convert", + "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.1" + }, + "coverage": { + "dependency": "direct main", + "description": { + "name": "coverage", + "sha256": "3945034e86ea203af7a056d98e98e42a5518fff200d6e8e6647e1886b07e936e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.8.0" + }, + "crypto": { + "dependency": "direct main", + "description": { + "name": "crypto", + "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "csslib": { + "dependency": "direct main", + "description": { + "name": "csslib", + "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "dap": { + "dependency": "direct main", + "description": { + "name": "dap", + "sha256": "fb7c8a64857d90bedf5c51954b83bee9304b607bcb8a03a89ec37afbf2d683a7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "dds": { + "dependency": "direct main", + "description": { + "name": "dds", + "sha256": "cf3868c2223864529d6e5aa0c07ce9ba0016b9d0e8cb67480c0eb810a42f56bd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.1" + }, + "dds_service_extensions": { + "dependency": "direct main", + "description": { + "name": "dds_service_extensions", + "sha256": "390ae1d0128bb43ffe11f8e3c6cd3a481c1920492d1026883d379cee50bdf1a2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "devtools_shared": { + "dependency": "direct main", + "description": { + "name": "devtools_shared", + "sha256": "fbe1657c88dd476a70116e33b0d19f8a23b35fd6db93eab9f01fa32cc21a0c49", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.0-dev.1" + }, + "dtd": { + "dependency": "direct main", + "description": { + "name": "dtd", + "sha256": "58ac5c2d628e575dbcdfda44a698cd4c1212663e27fe5f8ced37aea85faa0d30", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "dwds": { + "dependency": "direct main", + "description": { + "name": "dwds", + "sha256": "61ebaabb04d779d040b47d3b4d0b3963449ced0920fb8efd81ca6d5e51ccfc1a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "24.0.0" + }, + "extension_discovery": { + "dependency": "direct main", + "description": { + "name": "extension_discovery", + "sha256": "20735622d0763865f9d94c3ecdce4441174530870760253e9d364fb4f3da8688", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "fake_async": { + "dependency": "direct main", + "description": { + "name": "fake_async", + "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.1" + }, + "ffi": { + "dependency": "direct main", + "description": { + "name": "ffi", + "sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "file": { + "dependency": "direct main", + "description": { + "name": "file", + "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "file_testing": { + "dependency": "direct dev", + "description": { + "name": "file_testing", + "sha256": "0aaadb4025bd350403f4308ad6c4cea953278d9407814b8342558e4946840fb5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "fixnum": { + "dependency": "direct main", + "description": { + "name": "fixnum", + "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "flutter_template_images": { + "dependency": "direct main", + "description": { + "name": "flutter_template_images", + "sha256": "fd3e55af73c577b9e3f88d4080d3e366cb5c8ef3fbd50b94dfeca56bb0235df6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.0" + }, + "frontend_server_client": { + "dependency": "direct main", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "glob": { + "dependency": "direct main", + "description": { + "name": "glob", + "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "graphs": { + "dependency": "direct main", + "description": { + "name": "graphs", + "sha256": "aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.1" + }, + "html": { + "dependency": "direct main", + "description": { + "name": "html", + "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.15.4" + }, + "http": { + "dependency": "direct main", + "description": { + "name": "http", + "sha256": "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.13.6" + }, + "http_multi_server": { + "dependency": "direct main", + "description": { + "name": "http_multi_server", + "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "http_parser": { + "dependency": "direct main", + "description": { + "name": "http_parser", + "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.2" + }, + "intl": { + "dependency": "direct main", + "description": { + "name": "intl", + "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.19.0" + }, + "io": { + "dependency": "direct main", + "description": { + "name": "io", + "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "js": { + "dependency": "direct dev", + "description": { + "name": "js", + "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.1" + }, + "json_annotation": { + "dependency": "direct dev", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "json_rpc_2": { + "dependency": "direct main", + "description": { + "name": "json_rpc_2", + "sha256": "5e469bffa23899edacb7b22787780068d650b106a21c76db3c49218ab7ca447e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "logging": { + "dependency": "direct main", + "description": { + "name": "logging", + "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "macros": { + "dependency": "transitive", + "description": { + "name": "macros", + "sha256": "a8403c89b36483b4cbf9f1fcd24562f483cb34a5c9bf101cf2b0d8a083cf1239", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.0-main.5" + }, + "matcher": { + "dependency": "direct main", + "description": { + "name": "matcher", + "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.16+1" + }, + "meta": { + "dependency": "direct main", + "description": { + "name": "meta", + "sha256": "25dfcaf170a0190f47ca6355bdd4552cb8924b430512ff0cafb8db9bd41fe33b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.14.0" + }, + "mime": { + "dependency": "direct main", + "description": { + "name": "mime", + "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "multicast_dns": { + "dependency": "direct main", + "description": { + "name": "multicast_dns", + "sha256": "316cc47a958d4bd3c67bd238fe8b44fdfb6133bad89cb191c0c3bd3edb14e296", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.2+6" + }, + "mustache_template": { + "dependency": "direct main", + "description": { + "name": "mustache_template", + "sha256": "a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "native_assets_builder": { + "dependency": "direct main", + "description": { + "name": "native_assets_builder", + "sha256": "e6612ad01cbc3c4d1b00a1a42aa25aa567950ab10ae1f95721574923540f3bd8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.0" + }, + "native_assets_cli": { + "dependency": "direct main", + "description": { + "name": "native_assets_cli", + "sha256": "f54ddc4a3f8cff1d8d63723b4938902da7586a5a47fe3c1bfa226eb80223f32e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.0" + }, + "native_stack_traces": { + "dependency": "direct main", + "description": { + "name": "native_stack_traces", + "sha256": "64d2f4bcf3b69326fb9bc91b4dd3a06f94bb5bbc3a65e25ae6467ace0b34bfd3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.7" + }, + "node_preamble": { + "dependency": "direct dev", + "description": { + "name": "node_preamble", + "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "package_config": { + "dependency": "direct main", + "description": { + "name": "package_config", + "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "path": { + "dependency": "direct main", + "description": { + "name": "path", + "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.0" + }, + "petitparser": { + "dependency": "direct main", + "description": { + "name": "petitparser", + "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.2" + }, + "platform": { + "dependency": "direct main", + "description": { + "name": "platform", + "sha256": "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.4" + }, + "pool": { + "dependency": "direct main", + "description": { + "name": "pool", + "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.1" + }, + "process": { + "dependency": "direct main", + "description": { + "name": "process", + "sha256": "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.2" + }, + "pub_semver": { + "dependency": "direct main", + "description": { + "name": "pub_semver", + "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "pubspec_parse": { + "dependency": "direct dev", + "description": { + "name": "pubspec_parse", + "sha256": "c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.3" + }, + "shelf": { + "dependency": "direct main", + "description": { + "name": "shelf", + "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "shelf_packages_handler": { + "dependency": "direct main", + "description": { + "name": "shelf_packages_handler", + "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "shelf_proxy": { + "dependency": "direct main", + "description": { + "name": "shelf_proxy", + "sha256": "a71d2307f4393211930c590c3d2c00630f6c5a7a77edc1ef6436dfd85a6a7ee3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "shelf_static": { + "dependency": "direct main", + "description": { + "name": "shelf_static", + "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "shelf_web_socket": { + "dependency": "direct main", + "description": { + "name": "shelf_web_socket", + "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "source_map_stack_trace": { + "dependency": "direct main", + "description": { + "name": "source_map_stack_trace", + "sha256": "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "source_maps": { + "dependency": "direct main", + "description": { + "name": "source_maps", + "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.12" + }, + "source_span": { + "dependency": "direct main", + "description": { + "name": "source_span", + "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.0" + }, + "sse": { + "dependency": "direct main", + "description": { + "name": "sse", + "sha256": "fdce3a4ac3ae1c01083d05ded0bcdb7e02857ca2323823548e9e76d2f61638f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.5" + }, + "stack_trace": { + "dependency": "direct main", + "description": { + "name": "stack_trace", + "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.11.1" + }, + "standard_message_codec": { + "dependency": "direct main", + "description": { + "name": "standard_message_codec", + "sha256": "fc7dd712d191b7e33196a0ecf354c4573492bb95995e7166cb6f73b047f9cae0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.1+4" + }, + "stream_channel": { + "dependency": "direct main", + "description": { + "name": "stream_channel", + "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "string_scanner": { + "dependency": "direct main", + "description": { + "name": "string_scanner", + "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "sync_http": { + "dependency": "direct main", + "description": { + "name": "sync_http", + "sha256": "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.1" + }, + "term_glyph": { + "dependency": "direct main", + "description": { + "name": "term_glyph", + "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "test": { + "dependency": "direct dev", + "description": { + "name": "test", + "sha256": "d11b55850c68c1f6c0cf00eabded4e66c4043feaf6c0d7ce4a36785137df6331", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.25.5" + }, + "test_api": { + "dependency": "direct main", + "description": { + "name": "test_api", + "sha256": "2419f20b0c8677b2d67c8ac4d1ac7372d862dc6c460cdbb052b40155408cd794", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.1" + }, + "test_core": { + "dependency": "direct main", + "description": { + "name": "test_core", + "sha256": "4d070a6bc36c1c4e89f20d353bfd71dc30cdf2bd0e14349090af360a029ab292", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.2" + }, + "typed_data": { + "dependency": "direct main", + "description": { + "name": "typed_data", + "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.2" + }, + "unified_analytics": { + "dependency": "direct main", + "description": { + "name": "unified_analytics", + "sha256": "0271998bc95be272accda218841af6dfc7bb4ef666f6c21dd73d6807c2dfff0e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.0" + }, + "usage": { + "dependency": "direct main", + "description": { + "name": "usage", + "sha256": "0bdbde65a6e710343d02a56552eeaefd20b735e04bfb6b3ee025b6b22e8d0e15", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.1" + }, + "uuid": { + "dependency": "direct main", + "description": { + "name": "uuid", + "sha256": "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.7" + }, + "vm_service": { + "dependency": "direct main", + "description": { + "name": "vm_service", + "sha256": "7475cb4dd713d57b6f7464c0e13f06da0d535d8b2067e188962a59bac2cf280b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.2.2" + }, + "vm_service_interface": { + "dependency": "direct main", + "description": { + "name": "vm_service_interface", + "sha256": "f827453d9a3f8ceae04e389810da26f9b67636bdd13aa2dd9405b110c4daf59c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "vm_snapshot_analysis": { + "dependency": "direct main", + "description": { + "name": "vm_snapshot_analysis", + "sha256": "5a79b9fbb6be2555090f55b03b23907e75d44c3fd7bdd88da09848aa5a1914c8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.6" + }, + "watcher": { + "dependency": "direct main", + "description": { + "name": "watcher", + "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "web": { + "dependency": "direct main", + "description": { + "name": "web", + "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.1" + }, + "web_socket_channel": { + "dependency": "direct main", + "description": { + "name": "web_socket_channel", + "sha256": "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.5" + }, + "webdriver": { + "dependency": "direct main", + "description": { + "name": "webdriver", + "sha256": "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "webkit_inspection_protocol": { + "dependency": "direct main", + "description": { + "name": "webkit_inspection_protocol", + "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "xml": { + "dependency": "direct main", + "description": { + "name": "xml", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "yaml": { + "dependency": "direct main", + "description": { + "name": "yaml", + "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "yaml_edit": { + "dependency": "direct main", + "description": { + "name": "yaml_edit", + "sha256": "e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + } + }, + "sdks": { + "dart": ">=3.4.0-282.1.beta <4.0.0" + } + } +} diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix index f5b8b2e2059da..4b20cf7f43f06 100644 --- a/pkgs/development/compilers/flutter/wrapper.nix +++ b/pkgs/development/compilers/flutter/wrapper.nix @@ -145,7 +145,10 @@ in mkdir -p $out/bin makeWrapper '${immutableFlutter}' $out/bin/flutter \ --set-default ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ - --suffix PATH : '${lib.makeBinPath (tools ++ buildTools)}' \ + '' + lib.optionalString (flutter ? engine && flutter.engine.meta.available) '' + --set-default FLUTTER_ENGINE "${flutter.engine}" \ + --add-flags "--local-engine-host host_${flutter.engine.runtimeMode}${lib.optionalString (!flutter.engine.isOptimized) "_unopt"}" \ + '' + '' --suffix PATH : '${lib.makeBinPath (tools ++ buildTools)}' \ --suffix PKG_CONFIG_PATH : "$FLUTTER_PKG_CONFIG_PATH" \ --suffix LIBRARY_PATH : '${lib.makeLibraryPath appStaticBuildDeps}' \ --prefix CXXFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCxxFlags)}' \ diff --git a/pkgs/development/compilers/gcc/common/platform-flags.nix b/pkgs/development/compilers/gcc/common/platform-flags.nix index cc6a67d640578..9bcdb3070d6b9 100644 --- a/pkgs/development/compilers/gcc/common/platform-flags.nix +++ b/pkgs/development/compilers/gcc/common/platform-flags.nix @@ -8,8 +8,9 @@ let in lib.concatLists [ # --with-arch= is unknown flag on x86_64 and aarch64-darwin. (lib.optional (!targetPlatform.isx86_64 && !isAarch64Darwin && p ? arch) "--with-arch=${p.arch}") + # See supported_defaults in gcc/config.gcc for architecture support. # --with-cpu on aarch64-darwin fails with "Unknown cpu used in --with-cpu=apple-a13". - (lib.optional (!isAarch64Darwin && p ? cpu) "--with-cpu=${p.cpu}") + (lib.optional (with targetPlatform; !isLoongArch64 && !isMips && !isRiscV && !isS390 && !isAarch64Darwin && p ? cpu) "--with-cpu=${p.cpu}") (lib.optional (p ? abi) "--with-abi=${p.abi}") (lib.optional (p ? fpu) "--with-fpu=${p.fpu}") (lib.optional (p ? float) "--with-float=${p.float}") diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index ee162260929b2..b8c48c5c6a018 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -6,13 +6,15 @@ stdenv.mkDerivation rec { pname = "ispc"; - version = "1.23.0"; + version = "1.24.0"; + + dontFixCmake = true; # https://github.com/NixOS/nixpkgs/pull/232522#issuecomment-2133803566 src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-zixPt7YICCG0N8t1pcXEu/sPKCVLQVPCiJsQEqEXl+A="; + sha256 = "sha256-1Ns8w34fXgYrSu3XE89uowjaVoW3MOgKYV1Jb/XRj1Q="; }; nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ] ++ lib.lists.optionals stdenv.isDarwin [ xcode ]; diff --git a/pkgs/development/compilers/jasmin-compiler/default.nix b/pkgs/development/compilers/jasmin-compiler/default.nix index 412e27478a51e..3e5ff09a70900 100644 --- a/pkgs/development/compilers/jasmin-compiler/default.nix +++ b/pkgs/development/compilers/jasmin-compiler/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jasmin-compiler"; - version = "2023.06.3"; + version = "2023.06.4"; src = fetchurl { url = "https://github.com/jasmin-lang/jasmin/releases/download/v${version}/jasmin-compiler-v${version}.tar.bz2"; - hash = "sha256-Fp3QMsBaPOA6L6kOgffoHaJAypJDt8JxT8EVDDpPAKs="; + hash = "sha256-b1lrVbXJQeg+7tI7JcR9JTuiel/b/mctU1caT/y/4SA="; }; sourceRoot = "jasmin-compiler-v${version}/compiler"; diff --git a/pkgs/development/compilers/jetbrains-jdk/17.nix b/pkgs/development/compilers/jetbrains-jdk/17.nix new file mode 100644 index 0000000000000..76d4079baafbf --- /dev/null +++ b/pkgs/development/compilers/jetbrains-jdk/17.nix @@ -0,0 +1,156 @@ +{ lib +, stdenv +, fetchFromGitHub +, jetbrains +, openjdk17 +, openjdk17-bootstrap +, git +, autoconf +, unzip +, rsync +, debugBuild ? false +, withJcef ? true + +, libXdamage +, libXxf86vm +, libXrandr +, libXi +, libXcursor +, libXrender +, libX11 +, libXext +, libxcb +, nss +, nspr +, libdrm +, mesa +, wayland +, udev +}: + +assert debugBuild -> withJcef; + +let + arch = { + "aarch64-linux" = "aarch64"; + "x86_64-linux" = "x64"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + cpu = stdenv.hostPlatform.parsed.cpu.name; +in +openjdk17.overrideAttrs (oldAttrs: rec { + pname = "jetbrains-jdk" + lib.optionalString withJcef "-jcef"; + javaVersion = "17.0.11"; + build = "1207.24"; + # To get the new tag: + # git clone https://github.com/jetbrains/jetbrainsruntime + # cd jetbrainsruntime + # git reset --hard [revision] + # git log --simplify-by-decoration --decorate=short --pretty=short | grep "jbr-" --color=never | cut -d "(" -f2 | cut -d ")" -f1 | awk '{print $2}' | sort -t "-" -k 2 -g | tail -n 1 | tr -d "," + openjdkTag = "jbr-17.0.8+7"; + version = "${javaVersion}-b${build}"; + + src = fetchFromGitHub { + owner = "JetBrains"; + repo = "JetBrainsRuntime"; + rev = "jb${version}"; + hash = "sha256-a7cJF2iCW/1GK0/GmVbaY5pYcn3YtZy5ngFkyAGRhu0="; + }; + + BOOT_JDK = openjdk17-bootstrap.home; + # run `git log -1 --pretty=%ct` in jdk repo for new value on update + SOURCE_DATE_EPOCH = 1715809405; + + patches = [ ]; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + + ${lib.optionalString withJcef "cp -r ${jetbrains.jcef} jcef_linux_${arch}"} + + sed \ + -e "s/OPENJDK_TAG=.*/OPENJDK_TAG=${openjdkTag}/" \ + -e "s/SOURCE_DATE_EPOCH=.*//" \ + -e "s/export SOURCE_DATE_EPOCH//" \ + -i jb/project/tools/common/scripts/common.sh + sed -i "s/STATIC_CONF_ARGS/STATIC_CONF_ARGS \$configureFlags/" jb/project/tools/linux/scripts/mkimages_${arch}.sh + sed \ + -e "s/create_image_bundle \"jb/#/" \ + -e "s/echo Creating /exit 0 #/" \ + -i jb/project/tools/linux/scripts/mkimages_${arch}.sh + + patchShebangs . + ./jb/project/tools/linux/scripts/mkimages_${arch}.sh ${build} ${if debugBuild then "fd" else (if withJcef then "jcef" else "nomod")} + + runHook postBuild + ''; + + installPhase = + let + buildType = if debugBuild then "fastdebug" else "release"; + debugSuffix = if debugBuild then "-fastdebug" else ""; + jcefSuffix = if debugBuild || !withJcef then "" else "_jcef"; + jbrsdkDir = "jbrsdk${jcefSuffix}-${javaVersion}-linux-${arch}${debugSuffix}-b${build}"; + in + '' + runHook preInstall + + mv build/linux-${cpu}-server-${buildType}/images/jdk/man build/linux-${cpu}-server-${buildType}/images/${jbrsdkDir} + rm -rf build/linux-${cpu}-server-${buildType}/images/jdk + mv build/linux-${cpu}-server-${buildType}/images/${jbrsdkDir} build/linux-${cpu}-server-${buildType}/images/jdk + '' + oldAttrs.installPhase + "runHook postInstall"; + + postInstall = lib.optionalString withJcef '' + chmod +x $out/lib/openjdk/lib/chrome-sandbox + ''; + + dontStrip = debugBuild; + + postFixup = '' + # Build the set of output library directories to rpath against + LIBDIRS="${lib.makeLibraryPath [ + libXdamage libXxf86vm libXrandr libXi libXcursor libXrender libX11 libXext libxcb + nss nspr libdrm mesa wayland udev + ]}" + for output in $outputs; do + if [ "$output" = debug ]; then continue; fi + LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS" + done + # Add the local library paths to remove dependencies on the bootstrap + for output in $outputs; do + if [ "$output" = debug ]; then continue; fi + OUTPUTDIR=$(eval echo \$$output) + BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) + echo "$BINLIBS" | while read i; do + patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true + patchelf --shrink-rpath "$i" || true + done + done + ''; + + nativeBuildInputs = [ git autoconf unzip rsync ] ++ oldAttrs.nativeBuildInputs; + + meta = with lib; { + description = "An OpenJDK fork to better support Jetbrains's products."; + longDescription = '' + JetBrains Runtime is a runtime environment for running IntelliJ Platform + based products on Windows, Mac OS X, and Linux. JetBrains Runtime is + based on OpenJDK project with some modifications. These modifications + include: Subpixel Anti-Aliasing, enhanced font rendering on Linux, HiDPI + support, ligatures, some fixes for native crashes not presented in + official build, and other small enhancements. + JetBrains Runtime is not a certified build of OpenJDK. Please, use at + your own risk. + ''; + homepage = "https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime"; + inherit (openjdk17.meta) license platforms mainProgram; + maintainers = with maintainers; [ edwtjo ]; + + broken = stdenv.isDarwin; + }; + + passthru = oldAttrs.passthru // { + home = "${jetbrains.jdk}/lib/openjdk"; + }; +}) diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index a1e536909a0a6..5a5b4c2886557 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -2,8 +2,7 @@ , stdenv , fetchFromGitHub , jetbrains -, openjdk17 -, openjdk17-bootstrap +, jdk , git , autoconf , unzip @@ -37,28 +36,28 @@ let }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); cpu = stdenv.hostPlatform.parsed.cpu.name; in -openjdk17.overrideAttrs (oldAttrs: rec { +jdk.overrideAttrs (oldAttrs: rec { pname = "jetbrains-jdk" + lib.optionalString withJcef "-jcef"; - javaVersion = "17.0.11"; - build = "1207.24"; + javaVersion = "21.0.3"; + build = "465.3"; # To get the new tag: # git clone https://github.com/jetbrains/jetbrainsruntime # cd jetbrainsruntime - # git reset --hard [revision] + # git checkout jbr-release-${javaVersion}b${build} # git log --simplify-by-decoration --decorate=short --pretty=short | grep "jbr-" --color=never | cut -d "(" -f2 | cut -d ")" -f1 | awk '{print $2}' | sort -t "-" -k 2 -g | tail -n 1 | tr -d "," - openjdkTag = "jbr-17.0.8+7"; + openjdkTag = "jbr-21.0.2+3"; version = "${javaVersion}-b${build}"; src = fetchFromGitHub { owner = "JetBrains"; repo = "JetBrainsRuntime"; rev = "jb${version}"; - hash = "sha256-a7cJF2iCW/1GK0/GmVbaY5pYcn3YtZy5ngFkyAGRhu0="; + hash = "sha256-Pup/XeHExCE6yy2o74wF7VlYU6MI9cg8gb69V3bclIo="; }; - BOOT_JDK = openjdk17-bootstrap.home; + BOOT_JDK = jdk.home; # run `git log -1 --pretty=%ct` in jdk repo for new value on update - SOURCE_DATE_EPOCH = 1715809405; + SOURCE_DATE_EPOCH = 1717225235; patches = [ ]; @@ -74,7 +73,8 @@ openjdk17.overrideAttrs (oldAttrs: rec { -e "s/SOURCE_DATE_EPOCH=.*//" \ -e "s/export SOURCE_DATE_EPOCH//" \ -i jb/project/tools/common/scripts/common.sh - sed -i "s/STATIC_CONF_ARGS/STATIC_CONF_ARGS \$configureFlags/" jb/project/tools/linux/scripts/mkimages_${arch}.sh + configureFlags=$(echo $configureFlags | sed 's/--host=[^ ]*//') + sed -i "s|STATIC_CONF_ARGS|STATIC_CONF_ARGS \$configureFlags|" jb/project/tools/linux/scripts/mkimages_${arch}.sh sed \ -e "s/create_image_bundle \"jb/#/" \ -e "s/echo Creating /exit 0 #/" \ @@ -144,7 +144,7 @@ openjdk17.overrideAttrs (oldAttrs: rec { your own risk. ''; homepage = "https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime"; - inherit (openjdk17.meta) license platforms mainProgram; + inherit (jdk.meta) license platforms mainProgram; maintainers = with maintainers; [ edwtjo ]; broken = stdenv.isDarwin; diff --git a/pkgs/development/compilers/jetbrains-jdk/jcef.nix b/pkgs/development/compilers/jetbrains-jdk/jcef.nix index 1c0348e4f44c4..0ed9c159b128e 100644 --- a/pkgs/development/compilers/jetbrains-jdk/jcef.nix +++ b/pkgs/development/compilers/jetbrains-jdk/jcef.nix @@ -4,7 +4,7 @@ , stdenv , cmake , python3 -, jdk17 +, jdk , git , libcef , rsync @@ -101,20 +101,20 @@ let in stdenv.mkDerivation rec { pname = "jcef-jetbrains"; - rev = "5e368cf6456d6319967e466e96ad5fa99f412c85"; + rev = "34dfd656652c24da31b89c39d0885f284722eeaa"; # This is the commit number - # Currently from the branch: https://github.com/JetBrains/jcef/tree/232 + # Currently from the branch: https://github.com/JetBrains/jcef/tree/242 # Run `git rev-list --count HEAD` - version = "767"; + version = "867"; - nativeBuildInputs = [ cmake python3 jdk17 git rsync ant ninja strip-nondeterminism stripJavaArchivesHook ]; + nativeBuildInputs = [ cmake python3 jdk git rsync ant ninja strip-nondeterminism stripJavaArchivesHook ]; buildInputs = [ boost libX11 libXdamage nss nspr thrift ]; src = fetchFromGitHub { owner = "jetbrains"; repo = "jcef"; inherit rev; - hash = "sha256-n+zwxHkyjkjaFhnYWcDNfsqRZIXzZplZiyeHNExfxKU="; + hash = "sha256-JlTGKqvgdBpBs2xtFMTVJ/ZksT1uME/8a2g7niH2sq8="; }; cef-bin = let @@ -130,6 +130,7 @@ stdenv.mkDerivation rec { url = "https://cef-builds.spotifycdn.com/${urlName}.tar.bz2"; inherit name hash; }; + # Find the hash in tools/buildtools/linux64/clang-format.sha1 clang-fmt = fetchurl { url = "https://storage.googleapis.com/chromium-clang-format/dd736afb28430c9782750fc0fd5f0ed497399263"; hash = "sha256-4H6FVO9jdZtxH40CSfS+4VESAHgYgYxfCBFSMHdT0hE="; @@ -180,11 +181,15 @@ stdenv.mkDerivation rec { ../tools/compile.sh ${platform} Release ''; - # Mostly taken from jb/tools/common/create_modules.sh + # N.B. For new versions, manually synchronize the following + # definitions with jb/tools/common/create_modules.sh to include + # newly added modules installPhase = '' runHook preInstall export JCEF_ROOT_DIR=$(realpath ..) + export THRIFT_DIR="$JCEF_ROOT_DIR"/third_party/thrift + export THRIFT_JAR=libthrift-0.19.0.jar export OUT_NATIVE_DIR=$JCEF_ROOT_DIR/jcef_build/native/${buildType} export JB_TOOLS_DIR=$(realpath ../jb/tools) export JB_TOOLS_OS_DIR=$JB_TOOLS_DIR/linux @@ -244,6 +249,11 @@ stdenv.mkDerivation rec { '' + '' cd ../jcef + cp "$THRIFT_DIR"/"$THRIFT_JAR" . + cp "$JB_TOOLS_DIR"/common/thrift-module-info.java module-info.java + javac --patch-module org.apache.thrift=$THRIFT_JAR module-info.java + jar uf $THRIFT_JAR module-info.class + rm module-info.class module-info.java cp "$OUT_CLS_DIR"/jcef.jar . mkdir lib cp -R "$OUT_NATIVE_DIR"/* lib @@ -264,6 +274,7 @@ stdenv.mkDerivation rec { jmod create --module-path . --class-path jogl-all.jar --libs lib $out/jmods/jogl.all.jmod cd ../jcef jmod create --module-path . --class-path jcef.jar --libs lib $out/jmods/jcef.jmod + jmod create --module-path . --class-path $THRIFT_JAR $out/jmods/org.apache.thrift.jmod # stripJavaArchivesHook gets rid of jar file timestamps, but not of jmod file timestamps # We have to manually call strip-nondeterminism to do this for jmod files too diff --git a/pkgs/development/compilers/koka/default.nix b/pkgs/development/compilers/koka/default.nix index 23b7ced0a15eb..c280d2fb7e701 100644 --- a/pkgs/development/compilers/koka/default.nix +++ b/pkgs/development/compilers/koka/default.nix @@ -32,12 +32,12 @@ }: let - version = "3.1.0"; + version = "3.1.2"; src = fetchFromGitHub { owner = "koka-lang"; repo = "koka"; rev = "v${version}"; - sha256 = "sha256-Twm2Hr8BQ0xTdA30e2Az/57525jTUkmv2Zs/+SNiQns="; + sha256 = "sha256-BNkMtYf5maWtKEZzob+218ke1SIkrP7/nboQ2sZKkxI="; fetchSubmodules = true; }; kklib = stdenv.mkDerivation { @@ -65,14 +65,6 @@ mkDerivation rec { isLibrary = false; isExecutable = true; libraryToolDepends = [ hpack ]; - patches = [ - (fetchpatch { - name = "koka-stackage-22.patch"; - url = "https://github.com/koka-lang/koka/commit/95f9b360544996e06d4bb33321a83a6b9605d092.patch"; - sha256 = "1a1sv1r393wkhsnj56awsi8mqxakqdy86p7dg9i9xfv13q2g4h6x"; - includes = [ "src/**" ]; - }) - ]; executableHaskellDepends = [ aeson array diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index 82a9d63ab3300..d3b823215c52f 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -17,29 +17,32 @@ then null else pkgs.bintools , darwin -}: +}@args: let - release_version = "12.0.1"; candidate = ""; # empty or "rcN" dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; - version = "${release_version}${dash-candidate}"; # differentiating these (variables) is important for RCs - fetch = name: sha256: fetchurl { - url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/${name}-${release_version}${candidate}.src.tar.xz"; - inherit sha256; + metadata = rec { + release_version = "12.0.1"; + version = "${release_version}${dash-candidate}"; # differentiating these (variables) is important for RCs + inherit (import ../common/common-let.nix { inherit lib release_version; }) llvm_meta; + fetch = name: sha256: fetchurl { + url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${metadata.version}/${name}-${metadata.release_version}${candidate}.src.tar.xz"; + inherit sha256; + }; + clang-tools-extra_src = fetch "clang-tools-extra" "1r9a4fdz9ci58b5z2inwvm4z4cdp6scrivnaw05dggkxz7yrwrb5"; }; - clang-tools-extra_src = fetch "clang-tools-extra" "1r9a4fdz9ci58b5z2inwvm4z4cdp6scrivnaw05dggkxz7yrwrb5"; + inherit (metadata) fetch; - inherit (import ../common/common-let.nix { inherit lib release_version; }) llvm_meta; tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch buildLlvmTools; }); + callPackage = newScope (tools // args // metadata); mkExtraBuildCommands0 = cc: '' rsrc="$out/resource-root" mkdir "$rsrc" - ln -s "${cc.lib}/lib/clang/${release_version}/include" "$rsrc" + ln -s "${cc.lib}/lib/clang/${metadata.release_version}/include" "$rsrc" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags ''; mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' @@ -104,7 +107,6 @@ let pollyPatches = [ ./llvm/gnu-install-dirs-polly.patch ]; - inherit llvm_meta; }; # `llvm` historically had the binaries. When choosing an output explicitly, @@ -122,7 +124,6 @@ let libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; - inherit clang-tools-extra_src llvm_meta; }; clang-unwrapped = tools.libclang; @@ -175,7 +176,6 @@ let patches = [ ./lld/gnu-install-dirs.patch ]; - inherit llvm_meta; inherit (libraries) libunwind; }; @@ -196,7 +196,6 @@ let resourceDirPatch ./lldb/gnu-install-dirs.patch ]; - inherit llvm_meta; }; # Below, is the LLVM bootstrapping logic. It handles building a @@ -287,7 +286,7 @@ let }); libraries = lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); + callPackage = newScope (libraries // buildLlvmTools // args // metadata); in { compiler-rt-libc = callPackage ../common/compiler-rt { @@ -306,7 +305,6 @@ let ../common/compiler-rt/armv6-sync-ops-no-thumb.patch ../common/compiler-rt/armv6-no-ldrexd-strexd.patch ]; - inherit llvm_meta; stdenv = if stdenv.hostPlatform.useLLVM or false then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc else stdenv; @@ -328,7 +326,6 @@ let ../common/compiler-rt/armv6-sync-ops-no-thumb.patch ../common/compiler-rt/armv6-no-ldrexd-strexd.patch ]; - inherit llvm_meta; stdenv = if stdenv.hostPlatform.useLLVM or false then overrideCC stdenv buildLlvmTools.clangNoCompilerRt else stdenv; @@ -347,7 +344,7 @@ let src = fetchFromGitHub { owner = "llvm"; repo = "llvm-project"; - rev = "refs/tags/llvmorg-${version}"; + rev = "refs/tags/llvmorg-${metadata.version}"; sparseCheckout = [ "libcxx" "libcxxabi" @@ -372,7 +369,6 @@ let ]; }) ]; - inherit llvm_meta; stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; }; @@ -381,7 +377,6 @@ let patches = [ ./libunwind/gnu-install-dirs.patch ]; - inherit llvm_meta; stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; }; @@ -394,9 +389,8 @@ let hash = "sha256-UxIlAifXnexF/MaraPW0Ut6q+sf3e7y1fMdEv1q103A="; }) ]; - inherit llvm_meta targetLlvm; }; }); noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) +in { inherit tools libraries; inherit (metadata) release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/13/default.nix b/pkgs/development/compilers/llvm/13/default.nix index 9348e19e6de39..0b231a91512b8 100644 --- a/pkgs/development/compilers/llvm/13/default.nix +++ b/pkgs/development/compilers/llvm/13/default.nix @@ -41,7 +41,7 @@ # specified. , monorepoSrc ? null -}: +}@args: assert lib.assertMsg @@ -53,19 +53,23 @@ assert let monorepoSrc' = monorepoSrc; in let - # Import releaseInfo separately to avoid infinite recursion - inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; - inherit (releaseInfo) release_version version; - inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; - - src = monorepoSrc; + metadata = rec { + # Import releaseInfo separately to avoid infinite recursion + inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; + inherit (releaseInfo) release_version version; + inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; + src = monorepoSrc; + }; tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version src buildLlvmTools; }); + callPackage = newScope (tools // args // metadata + # Previously monorepoSrc was erroneously not being passed through. + // { monorepoSrc = null; } # Preserve a bug during #307211, TODO: remove; causes llvm 13 rebuild. + ); mkExtraBuildCommands0 = cc: '' rsrc="$out/resource-root" mkdir "$rsrc" - ln -s "${cc.lib}/lib/clang/${release_version}/include" "$rsrc" + ln -s "${cc.lib}/lib/clang/${metadata.release_version}/include" "$rsrc" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags ''; mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' @@ -125,7 +129,6 @@ in let pollyPatches = [ ./llvm/gnu-install-dirs-polly.patch ]; - inherit llvm_meta; }; # `llvm` historically had the binaries. When choosing an output explicitly, @@ -148,7 +151,6 @@ in let libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; - inherit llvm_meta; }; clang-unwrapped = tools.libclang; @@ -199,7 +201,6 @@ in let patches = [ ./lld/gnu-install-dirs.patch ]; - inherit llvm_meta; }; lldb = callPackage ../common/lldb.nix { @@ -232,7 +233,6 @@ in let && !stdenv.targetPlatform.isAarch64 && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") ) ./lldb/cpu_subtype_arm64e_replacement.patch; - inherit llvm_meta; }; # Below, is the LLVM bootstrapping logic. It handles building a @@ -323,7 +323,10 @@ in let }); libraries = lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version src; }); + callPackage = newScope (libraries // buildLlvmTools // args // metadata + # Previously monorepoSrc was erroneously not being passed through. + // { monorepoSrc = null; } # Preserve a bug during #307211, TODO: remove; causes llvm 13 rebuild. + ); in { compiler-rt-libc = callPackage ../common/compiler-rt { @@ -344,7 +347,6 @@ in let ../common/compiler-rt/armv6-scudo-no-yield.patch ../common/compiler-rt/armv6-scudo-libatomic.patch ]; - inherit llvm_meta; stdenv = if stdenv.hostPlatform.useLLVM or false then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc else stdenv; @@ -368,7 +370,6 @@ in let ../common/compiler-rt/armv6-scudo-no-yield.patch ../common/compiler-rt/armv6-scudo-libatomic.patch ]; - inherit llvm_meta; stdenv = if stdenv.hostPlatform.useLLVM or false then overrideCC stdenv buildLlvmTools.clangNoCompilerRt else stdenv; @@ -399,16 +400,15 @@ in let ]; }) ]; - inherit llvm_meta; stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; - monorepoSrc = src; + # TODO: remove this, causes LLVM 13 packages rebuild. + inherit (metadata) monorepoSrc; # Preserve bug during #307211 refactor. }; libunwind = callPackage ../common/libunwind { patches = [ ./libunwind/gnu-install-dirs.patch ]; - inherit llvm_meta; stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; }; @@ -420,9 +420,8 @@ in let hash = "sha256-UxIlAifXnexF/MaraPW0Ut6q+sf3e7y1fMdEv1q103A="; }) ]; - inherit llvm_meta targetLlvm; }; }); noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) +in { inherit tools libraries; inherit (metadata) release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/14/default.nix b/pkgs/development/compilers/llvm/14/default.nix index f7368050d6149..a80b3aa4ffff7 100644 --- a/pkgs/development/compilers/llvm/14/default.nix +++ b/pkgs/development/compilers/llvm/14/default.nix @@ -39,7 +39,7 @@ # to you to make sure that the LLVM repo given matches the release configuration # specified. , monorepoSrc ? null -}: +}@args: assert lib.assertMsg @@ -51,17 +51,20 @@ assert let monorepoSrc' = monorepoSrc; in let - # Import releaseInfo separately to avoid infinite recursion - inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; - inherit (releaseInfo) release_version version; - inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; + + metadata = rec { + # Import releaseInfo separately to avoid infinite recursion + inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; + inherit (releaseInfo) release_version version; + inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; + }; tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 release_version version monorepoSrc buildLlvmTools; }); + callPackage = newScope (tools // args // metadata); mkExtraBuildCommands0 = cc: '' rsrc="$out/resource-root" mkdir "$rsrc" - ln -s "${cc.lib}/lib/clang/${release_version}/include" "$rsrc" + ln -s "${cc.lib}/lib/clang/${metadata.release_version}/include" "$rsrc" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags ''; mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' @@ -100,7 +103,6 @@ in let pollyPatches = [ ./llvm/gnu-install-dirs-polly.patch ]; - inherit llvm_meta; }; # `llvm` historically had the binaries. When choosing an output explicitly, @@ -118,7 +120,6 @@ in let libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; - inherit llvm_meta; }; clang-unwrapped = tools.libclang; @@ -170,7 +171,6 @@ in let ./lld/gnu-install-dirs.patch ./lld/fix-root-src-dir.patch ]; - inherit llvm_meta; }; lldb = callPackage ../common/lldb.nix { @@ -203,7 +203,6 @@ in let && !stdenv.targetPlatform.isAarch64 && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") ) ./lldb/cpu_subtype_arm64e_replacement.patch; - inherit llvm_meta; }; # Below, is the LLVM bootstrapping logic. It handles building a @@ -296,7 +295,7 @@ in let }); libraries = lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 release_version version monorepoSrc; }); + callPackage = newScope (libraries // buildLlvmTools // args // metadata); in { compiler-rt-libc = callPackage ../common/compiler-rt { @@ -318,7 +317,6 @@ in let ../common/compiler-rt/armv6-scudo-no-yield.patch ../common/compiler-rt/armv6-scudo-libatomic.patch ]; - inherit llvm_meta; stdenv = if stdenv.hostPlatform.useLLVM or false then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc else stdenv; @@ -343,7 +341,6 @@ in let ../common/compiler-rt/armv6-scudo-no-yield.patch ../common/compiler-rt/armv6-scudo-libatomic.patch ]; - inherit llvm_meta; stdenv = if stdenv.hostPlatform.useLLVM or false then overrideCC stdenv buildLlvmTools.clangNoCompilerRt else stdenv; @@ -374,7 +371,6 @@ in let ]; }) ]; - inherit llvm_meta; stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; }; @@ -382,7 +378,6 @@ in let patches = [ ./libunwind/gnu-install-dirs.patch ]; - inherit llvm_meta; stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; }; @@ -391,9 +386,8 @@ in let ./openmp/gnu-install-dirs.patch ./openmp/run-lit-directly.patch ]; - inherit llvm_meta targetLlvm; }; }); noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) +in { inherit tools libraries; inherit (metadata) release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/15/default.nix b/pkgs/development/compilers/llvm/15/default.nix index 5003ef32d1ee0..e30e9f9a59db7 100644 --- a/pkgs/development/compilers/llvm/15/default.nix +++ b/pkgs/development/compilers/llvm/15/default.nix @@ -39,7 +39,7 @@ # to you to make sure that the LLVM repo given matches the release configuration # specified. , monorepoSrc ? null -}: +}@args: assert lib.assertMsg @@ -51,10 +51,13 @@ assert let monorepoSrc' = monorepoSrc; in let - # Import releaseInfo separately to avoid infinite recursion - inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; - inherit (releaseInfo) release_version version; - inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; + + metadata = rec { + # Import releaseInfo separately to avoid infinite recursion + inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; + inherit (releaseInfo) release_version version; + inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; + }; lldbPlugins = lib.makeExtensible (lldbPlugins: let callPackage = newScope (lldbPlugins // { inherit stdenv; inherit (tools) lldb; }); @@ -63,11 +66,11 @@ in let }); tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc buildLlvmTools; }); + callPackage = newScope (tools // args // metadata); mkExtraBuildCommands0 = cc: '' rsrc="$out/resource-root" mkdir "$rsrc" - ln -s "${cc.lib}/lib/clang/${release_version}/include" "$rsrc" + ln -s "${cc.lib}/lib/clang/${metadata.release_version}/include" "$rsrc" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags ''; mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' @@ -144,7 +147,6 @@ in let # Just like the `llvm-lit-cfg` patch, but for `polly`. ./llvm/polly-lit-cfg-add-libs-to-dylib-path.patch ]; - inherit llvm_meta; }; # `llvm` historically had the binaries. When choosing an output explicitly, @@ -162,7 +164,6 @@ in let libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; - inherit llvm_meta; }; clang-unwrapped = tools.libclang; @@ -212,7 +213,6 @@ in let patches = [ ./lld/gnu-install-dirs.patch ]; - inherit llvm_meta; }; lldb = callPackage ../common/lldb.nix { @@ -245,7 +245,6 @@ in let && !stdenv.targetPlatform.isAarch64 && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") ) ./lldb/cpu_subtype_arm64e_replacement.patch; - inherit llvm_meta; }; # Below, is the LLVM bootstrapping logic. It handles building a @@ -348,7 +347,7 @@ in let }); libraries = lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc; }); + callPackage = newScope (libraries // buildLlvmTools // args // metadata); in { compiler-rt-libc = callPackage ../common/compiler-rt { @@ -365,7 +364,6 @@ in let # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 ../common/compiler-rt/armv7l-15.patch ]; - inherit llvm_meta; stdenv = if stdenv.hostPlatform.useLLVM or false then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc else stdenv; @@ -385,7 +383,6 @@ in let # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 ../common/compiler-rt/armv7l-15.patch ]; - inherit llvm_meta; stdenv = if stdenv.hostPlatform.useLLVM or false then overrideCC stdenv buildLlvmTools.clangNoCompilerRt else stdenv; @@ -427,7 +424,6 @@ in let ]; }) ]; - inherit llvm_meta; stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; }; @@ -435,7 +431,6 @@ in let patches = [ ./libunwind/gnu-install-dirs.patch ]; - inherit llvm_meta; stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; }; @@ -445,9 +440,8 @@ in let ./openmp/gnu-install-dirs.patch ./openmp/run-lit-directly.patch ]; - inherit llvm_meta targetLlvm; }; }); noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version lldbPlugins; } // (noExtend libraries) // (noExtend tools) +in { inherit tools libraries lldbPlugins; inherit (metadata) release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/16/default.nix b/pkgs/development/compilers/llvm/16/default.nix index 79d5f8589044c..426bcb4c46d88 100644 --- a/pkgs/development/compilers/llvm/16/default.nix +++ b/pkgs/development/compilers/llvm/16/default.nix @@ -39,7 +39,7 @@ # to you to make sure that the LLVM repo given matches the release configuration # specified. , monorepoSrc ? null -}: +}@args: assert lib.assertMsg @@ -51,10 +51,13 @@ assert let monorepoSrc' = monorepoSrc; in let - # Import releaseInfo separately to avoid infinite recursion - inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; - inherit (releaseInfo) release_version version; - inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; + + metadata = rec { + # Import releaseInfo separately to avoid infinite recursion + inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; + inherit (releaseInfo) release_version version; + inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; + }; lldbPlugins = lib.makeExtensible (lldbPlugins: let callPackage = newScope (lldbPlugins // { inherit stdenv; inherit (tools) lldb; }); @@ -63,8 +66,8 @@ in let }); tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc buildLlvmTools; }); - major = lib.versions.major release_version; + callPackage = newScope (tools // args // metadata); + major = lib.versions.major metadata.release_version; mkExtraBuildCommands0 = cc: '' rsrc="$out/resource-root" mkdir "$rsrc" @@ -138,7 +141,6 @@ in let # Just like the `llvm-lit-cfg` patch, but for `polly`. ./llvm/polly-lit-cfg-add-libs-to-dylib-path.patch ]; - inherit llvm_meta; }; # `llvm` historically had the binaries. When choosing an output explicitly, @@ -156,7 +158,6 @@ in let libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; - inherit llvm_meta; }; clang-unwrapped = tools.libclang; @@ -206,15 +207,12 @@ in let ./lld/gnu-install-dirs.patch ./lld/add-table-base.patch ]; - inherit llvm_meta; }; - mlir = callPackage ../common/mlir { - inherit llvm_meta; - }; + mlir = callPackage ../common/mlir {}; lldb = callPackage ../common/lldb.nix { - src = callPackage ({ runCommand }: runCommand "lldb-src-${version}" {} '' + src = callPackage ({ runCommand }: runCommand "lldb-src-${metadata.version}" {} '' mkdir -p "$out" cp -r ${monorepoSrc}/cmake "$out" cp -r ${monorepoSrc}/lldb "$out" @@ -248,7 +246,6 @@ in let && !stdenv.targetPlatform.isAarch64 && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") ) ./lldb/cpu_subtype_arm64e_replacement.patch; - inherit llvm_meta; }; # Below, is the LLVM bootstrapping logic. It handles building a @@ -351,13 +348,11 @@ in let # Has to be in tools despite mostly being a library, # because we use a native helper executable from a # non-cross build in cross builds. - libclc = callPackage ../common/libclc.nix { - inherit buildLlvmTools; - }; + libclc = callPackage ../common/libclc.nix {}; }); libraries = lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc; }); + callPackage = newScope (libraries // buildLlvmTools // args // metadata); in { compiler-rt-libc = callPackage ../common/compiler-rt { @@ -374,7 +369,6 @@ in let # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 # ../common/compiler-rt/armv7l-15.patch ]; - inherit llvm_meta; stdenv = if stdenv.hostPlatform.useLLVM or false || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic) then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc else stdenv; @@ -394,7 +388,6 @@ in let # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 # ../common/compiler-rt/armv7l-15.patch ]; - inherit llvm_meta; stdenv = if stdenv.hostPlatform.useLLVM or false then overrideCC stdenv buildLlvmTools.clangNoCompilerRt else stdenv; @@ -413,7 +406,6 @@ in let # so: we use the clang from this LLVM package set instead of the regular # stdenv's compiler. libcxx = callPackage ../common/libcxx { - inherit llvm_meta; stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; }; @@ -421,7 +413,6 @@ in let patches = [ ./libunwind/gnu-install-dirs.patch ]; - inherit llvm_meta; stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; }; @@ -431,9 +422,8 @@ in let ./openmp/gnu-install-dirs.patch ./openmp/run-lit-directly.patch ]; - inherit llvm_meta targetLlvm; }; }); noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version lldbPlugins; } // (noExtend libraries) // (noExtend tools) +in { inherit tools libraries lldbPlugins; inherit (metadata) release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/17/default.nix b/pkgs/development/compilers/llvm/17/default.nix index b4039540badf4..a6d7f48eb800c 100644 --- a/pkgs/development/compilers/llvm/17/default.nix +++ b/pkgs/development/compilers/llvm/17/default.nix @@ -39,7 +39,7 @@ # to you to make sure that the LLVM repo given matches the release configuration # specified. , monorepoSrc ? null -}: +}@args: assert lib.assertMsg @@ -51,15 +51,17 @@ assert let monorepoSrc' = monorepoSrc; in let - inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; - inherit (releaseInfo) release_version version; - - inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; + metadata = rec { + # Import releaseInfo separately to avoid infinite recursion + inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; + inherit (releaseInfo) release_version version; + inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub gitRelease release_version officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; + }; tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc buildLlvmTools; }); - major = lib.versions.major release_version; + callPackage = newScope (tools // args // metadata); + major = lib.versions.major metadata.release_version; mkExtraBuildCommands0 = cc: '' rsrc="$out/resource-root" mkdir "$rsrc" @@ -133,7 +135,6 @@ in let # Just like the `llvm-lit-cfg` patch, but for `polly`. ./llvm/polly-lit-cfg-add-libs-to-dylib-path.patch ]; - inherit llvm_meta; }; # `llvm` historically had the binaries. When choosing an output explicitly, @@ -151,7 +152,6 @@ in let libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; - inherit llvm_meta; }; clang-unwrapped = tools.libclang; @@ -201,15 +201,12 @@ in let ./lld/gnu-install-dirs.patch ./lld/add-table-base.patch ]; - inherit llvm_meta; }; - mlir = callPackage ../common/mlir { - inherit llvm_meta; - }; + mlir = callPackage ../common/mlir {}; lldb = callPackage ../common/lldb.nix { - src = callPackage ({ runCommand }: runCommand "lldb-src-${version}" {} '' + src = callPackage ({ runCommand }: runCommand "lldb-src-${metadata.version}" {} '' mkdir -p "$out" cp -r ${monorepoSrc}/cmake "$out" cp -r ${monorepoSrc}/lldb "$out" @@ -233,7 +230,6 @@ in let && !stdenv.targetPlatform.isAarch64 && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") ) ./lldb/cpu_subtype_arm64e_replacement.patch; - inherit llvm_meta; }; # Below, is the LLVM bootstrapping logic. It handles building a @@ -336,13 +332,11 @@ in let # Has to be in tools despite mostly being a library, # because we use a native helper executable from a # non-cross build in cross builds. - libclc = callPackage ../common/libclc.nix { - inherit buildLlvmTools; - }; + libclc = callPackage ../common/libclc.nix {}; }); libraries = lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc; }); + callPackage = newScope (libraries // buildLlvmTools // args // metadata); in { compiler-rt-libc = callPackage ../common/compiler-rt { @@ -359,7 +353,6 @@ in let # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 # ../common/compiler-rt/armv7l-15.patch ]; - inherit llvm_meta; stdenv = if stdenv.hostPlatform.useLLVM or false || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic) then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc else stdenv; @@ -379,7 +372,6 @@ in let # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 # ../common/compiler-rt/armv7l-15.patch ]; - inherit llvm_meta; stdenv = if stdenv.hostPlatform.useLLVM or false then overrideCC stdenv buildLlvmTools.clangNoCompilerRt else stdenv; @@ -406,12 +398,10 @@ in let hash = "sha256-jo+DYA6zuSv9OH3A0bYwY5TlkWprup4OKQ7rfK1WHBI="; }) ]; - inherit llvm_meta; stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; }; libunwind = callPackage ../common/libunwind { - inherit llvm_meta; stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; }; @@ -421,9 +411,8 @@ in let ./openmp/gnu-install-dirs.patch ./openmp/run-lit-directly.patch ]; - inherit llvm_meta targetLlvm; }; }); noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) +in { inherit tools libraries; inherit (metadata) release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/18/default.nix b/pkgs/development/compilers/llvm/18/default.nix index f74a92f61cdc1..d62ae9c820b21 100644 --- a/pkgs/development/compilers/llvm/18/default.nix +++ b/pkgs/development/compilers/llvm/18/default.nix @@ -39,7 +39,7 @@ # to you to make sure that the LLVM repo given matches the release configuration # specified. , monorepoSrc ? null -}: +}@args: assert lib.assertMsg @@ -51,15 +51,17 @@ assert let monorepoSrc' = monorepoSrc; in let - inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; - inherit (releaseInfo) release_version version; - - inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; + metadata = rec { + # Import releaseInfo separately to avoid infinite recursion + inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; + inherit (releaseInfo) release_version version; + inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub gitRelease release_version officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; + }; tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc buildLlvmTools; }); - major = lib.versions.major release_version; + callPackage = newScope (tools // args // metadata); + major = lib.versions.major metadata.release_version; mkExtraBuildCommands0 = cc: '' rsrc="$out/resource-root" mkdir "$rsrc" @@ -133,7 +135,6 @@ in let # Just like the `llvm-lit-cfg` patch, but for `polly`. ./llvm/polly-lit-cfg-add-libs-to-dylib-path.patch ]; - inherit llvm_meta; }; # `llvm` historically had the binaries. When choosing an output explicitly, @@ -151,7 +152,6 @@ in let libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; - inherit llvm_meta; }; clang-unwrapped = tools.libclang; @@ -200,15 +200,12 @@ in let patches = [ ./lld/gnu-install-dirs.patch ]; - inherit llvm_meta; }; - mlir = callPackage ../common/mlir { - inherit llvm_meta; - }; + mlir = callPackage ../common/mlir {}; lldb = callPackage ../common/lldb.nix { - src = callPackage ({ runCommand }: runCommand "lldb-src-${version}" {} '' + src = callPackage ({ runCommand }: runCommand "lldb-src-${metadata.version}" {} '' mkdir -p "$out" cp -r ${monorepoSrc}/cmake "$out" cp -r ${monorepoSrc}/lldb "$out" @@ -232,7 +229,6 @@ in let && !stdenv.targetPlatform.isAarch64 && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") ) ./lldb/cpu_subtype_arm64e_replacement.patch; - inherit llvm_meta; }; # Below, is the LLVM bootstrapping logic. It handles building a @@ -335,13 +331,11 @@ in let # Has to be in tools despite mostly being a library, # because we use a native helper executable from a # non-cross build in cross builds. - libclc = callPackage ../common/libclc.nix { - inherit buildLlvmTools; - }; + libclc = callPackage ../common/libclc.nix {}; }); libraries = lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc; }); + callPackage = newScope (libraries // buildLlvmTools // args // metadata); in { compiler-rt-libc = callPackage ../common/compiler-rt { @@ -355,7 +349,6 @@ in let # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 # ../common/compiler-rt/armv7l-15.patch ]; - inherit llvm_meta; stdenv = if stdenv.hostPlatform.useLLVM or false || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic) then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc else stdenv; @@ -372,7 +365,6 @@ in let # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 # ../common/compiler-rt/armv7l-15.patch ]; - inherit llvm_meta; stdenv = if stdenv.hostPlatform.useLLVM or false then overrideCC stdenv buildLlvmTools.clangNoCompilerRt else stdenv; @@ -395,12 +387,10 @@ in let # https://github.com/llvm/llvm-project/issues/64226 ./libcxx/0001-darwin-10.12-mbstate_t-fix.patch ]; - inherit llvm_meta; stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; }; libunwind = callPackage ../common/libunwind { - inherit llvm_meta; stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; }; @@ -409,9 +399,8 @@ in let ./openmp/fix-find-tool.patch ./openmp/run-lit-directly.patch ]; - inherit llvm_meta targetLlvm; }; }); noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) +in { inherit tools libraries; inherit (metadata) release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/common/clang/default.nix b/pkgs/development/compilers/llvm/common/clang/default.nix index 87234dfe7f172..e597ec4d604b1 100644 --- a/pkgs/development/compilers/llvm/common/clang/default.nix +++ b/pkgs/development/compilers/llvm/common/clang/default.nix @@ -93,6 +93,8 @@ let mkdir -p $lib/lib/clang mv $lib/lib/17 $lib/lib/clang/17 + '') + (lib.optionalString (lib.versionAtLeast release_version "19") '' + mv $out/lib/clang $lib/lib/clang '') + '' # Move libclang to 'lib' output diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index 3decc70bb69ac..89ea8f6e7a564 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -210,7 +210,7 @@ stdenv.mkDerivation (rec { '') + # This test fails with a `dysmutil` crash; have not yet dug into what's # going on here (TODO(@rrbutani)). - '' + lib.optionalString (lib.versionOlder release_version "19") '' rm test/tools/dsymutil/ARM/obfuscated.test '')) + # FileSystem permissions tests fail with various special bits diff --git a/pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch index 9517df973ad09..b8c1c110cf22d 100644 --- a/pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch @@ -1,5 +1,5 @@ diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake -index 75b0080f6715..c895b884cd27 100644 +index 75b0080f6..c895b884c 100644 --- a/cmake/modules/AddClang.cmake +++ b/cmake/modules/AddClang.cmake @@ -119,8 +119,8 @@ macro(add_clang_library name) @@ -14,22 +14,22 @@ index 75b0080f6715..c895b884cd27 100644 if (NOT LLVM_ENABLE_IDE) diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt -index f2b0c5cddcbb..52f37fc368ce 100644 +index e6ae4e19e..5ef01aea2 100644 --- a/lib/Headers/CMakeLists.txt +++ b/lib/Headers/CMakeLists.txt -@@ -473,6 +473,7 @@ add_header_target("windows-resource-headers" ${windows_only_files}) - add_header_target("utility-resource-headers" ${utility_files}) +@@ -337,6 +337,7 @@ set(llvm_libc_wrapper_files - get_clang_resource_dir(header_install_dir SUBDIR include) + include(GetClangResourceDir) + get_clang_resource_dir(output_dir PREFIX ${LLVM_LIBRARY_OUTPUT_INTDIR}/.. SUBDIR include) +set(header_install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION_MAJOR}/include) + set(out_files) + set(generated_files) - ############################################################# - # Install rules for the catch-all clang-resource-headers target diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt -index 4f23065a2472..6a0f55991e24 100644 +index b5b6d2807..6b592d255 100644 --- a/tools/libclang/CMakeLists.txt +++ b/tools/libclang/CMakeLists.txt -@@ -234,7 +234,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS}) +@@ -246,7 +246,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS}) COMPONENT libclang-python-bindings DESTINATION @@ -39,7 +39,7 @@ index 4f23065a2472..6a0f55991e24 100644 if(NOT LLVM_ENABLE_IDE) add_custom_target(libclang-python-bindings) diff --git a/tools/scan-build-py/CMakeLists.txt b/tools/scan-build-py/CMakeLists.txt -index 3aca22c0b0a8..3115353e3fe3 100644 +index 3aca22c0b..3115353e3 100644 --- a/tools/scan-build-py/CMakeLists.txt +++ b/tools/scan-build-py/CMakeLists.txt @@ -88,7 +88,7 @@ foreach(lib ${LibScanbuild}) diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix index c995845fb6b38..464c405dc0606 100644 --- a/pkgs/development/compilers/llvm/git/default.nix +++ b/pkgs/development/compilers/llvm/git/default.nix @@ -19,9 +19,9 @@ # LLVM release information; specify one of these but not both: , gitRelease ? { version = "19.0.0-git"; - rev = "cebf77fb936a7270c7e3fa5c4a7e76216321d385"; - rev-version = "19.0.0-unstable-2024-04-07"; - sha256 = "sha256-616tscgsiFgHQcXW4KzK5srrudYizQFnJVM6K0qRf+I="; + rev = "78ee473784e5ef6f0b19ce4cb111fb6e4d23c6b2"; + rev-version = "19.0.0-unstable-2024-06-12"; + sha256 = "sha256-oLVMwWjo6Nt8ZsTnDTfoiM5U0+1lVIc1NO+4qBNYlzs="; } # i.e.: # { @@ -44,7 +44,7 @@ # to you to make sure that the LLVM repo given matches the release configuration # specified. , monorepoSrc ? null -}: +}@args: assert lib.assertMsg @@ -56,15 +56,17 @@ assert let monorepoSrc' = monorepoSrc; in let - inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; - inherit (releaseInfo) release_version version; - - inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; + metadata = rec { + # Import releaseInfo separately to avoid infinite recursion + inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; + inherit (releaseInfo) release_version version; + inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub gitRelease release_version officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; + }; tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc buildLlvmTools; }); - major = lib.versions.major release_version; + callPackage = newScope (tools // args // metadata); + major = lib.versions.major metadata.release_version; mkExtraBuildCommands0 = cc: '' rsrc="$out/resource-root" mkdir "$rsrc" @@ -138,7 +140,6 @@ in let # Just like the `llvm-lit-cfg` patch, but for `polly`. ./llvm/polly-lit-cfg-add-libs-to-dylib-path.patch ]; - inherit llvm_meta; }; # `llvm` historically had the binaries. When choosing an output explicitly, @@ -156,7 +157,6 @@ in let libllvmLibdir = "${tools.libllvm.lib}/lib"; }) ]; - inherit llvm_meta; }; clang-unwrapped = tools.libclang; @@ -205,15 +205,12 @@ in let patches = [ ./lld/gnu-install-dirs.patch ]; - inherit llvm_meta; }; - mlir = callPackage ../common/mlir { - inherit llvm_meta; - }; + mlir = callPackage ../common/mlir {}; lldb = callPackage ../common/lldb.nix { - src = callPackage ({ runCommand }: runCommand "lldb-src-${version}" {} '' + src = callPackage ({ runCommand }: runCommand "lldb-src-${metadata.version}" {} '' mkdir -p "$out" cp -r ${monorepoSrc}/cmake "$out" cp -r ${monorepoSrc}/lldb "$out" @@ -237,7 +234,6 @@ in let && !stdenv.targetPlatform.isAarch64 && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") ) ./lldb/cpu_subtype_arm64e_replacement.patch; - inherit llvm_meta; }; # Below, is the LLVM bootstrapping logic. It handles building a @@ -340,13 +336,11 @@ in let # Has to be in tools despite mostly being a library, # because we use a native helper executable from a # non-cross build in cross builds. - libclc = callPackage ../common/libclc.nix { - inherit buildLlvmTools; - }; + libclc = callPackage ../common/libclc.nix {}; }); libraries = lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc; }); + callPackage = newScope (libraries // buildLlvmTools // args // metadata); in { compiler-rt-libc = callPackage ../common/compiler-rt { @@ -360,7 +354,6 @@ in let # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 # ../common/compiler-rt/armv7l-15.patch ]; - inherit llvm_meta; stdenv = if stdenv.hostPlatform.useLLVM or false || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic) then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc else stdenv; @@ -377,7 +370,6 @@ in let # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 # ../common/compiler-rt/armv7l-15.patch ]; - inherit llvm_meta; stdenv = if stdenv.hostPlatform.useLLVM or false then overrideCC stdenv buildLlvmTools.clangNoCompilerRt else stdenv; @@ -400,12 +392,10 @@ in let # https://github.com/llvm/llvm-project/issues/64226 ./libcxx/0001-darwin-10.12-mbstate_t-fix.patch ]; - inherit llvm_meta; stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; }; libunwind = callPackage ../common/libunwind { - inherit llvm_meta; stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; }; @@ -414,9 +404,8 @@ in let ./openmp/fix-find-tool.patch ./openmp/run-lit-directly.patch ]; - inherit llvm_meta targetLlvm; }; }); noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) +in { inherit tools libraries; inherit (metadata) release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/odin/default.nix b/pkgs/development/compilers/odin/default.nix index 25d08ce06e682..d8a608508c553 100644 --- a/pkgs/development/compilers/odin/default.nix +++ b/pkgs/development/compilers/odin/default.nix @@ -1,6 +1,6 @@ { lib , fetchFromGitHub -, llvmPackages_13 +, llvmPackages , makeBinaryWrapper , libiconv , MacOSX-SDK @@ -9,7 +9,6 @@ }: let - llvmPackages = llvmPackages_13; inherit (llvmPackages) stdenv; in stdenv.mkDerivation rec { pname = "odin"; diff --git a/pkgs/development/compilers/openjdk/22.nix b/pkgs/development/compilers/openjdk/22.nix index 9cdec758544c1..97d1a3b3b44df 100644 --- a/pkgs/development/compilers/openjdk/22.nix +++ b/pkgs/development/compilers/openjdk/22.nix @@ -59,219 +59,218 @@ let # when building a headless jdk, also bootstrap it with a headless jdk openjdk-bootstrap = openjdk22-bootstrap.override { gtkSupport = !headless; }; +in - openjdk = stdenv.mkDerivation (finalAttrs: { - pname = "openjdk" + lib.optionalString headless "-headless"; - inherit version; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = info.repo; - rev = "jdk-${version}"; - hash = info.hash; - }; - - nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ]; - buildInputs = [ - cpio - file - which - zip - perl - zlib - cups - freetype - alsa-lib - libjpeg - giflib - libpng - zlib - lcms2 - libX11 - libICE - libXrender - libXext - libXtst - libXt - libXtst - libXi - libXinerama - libXcursor - libXrandr - fontconfig - openjdk-bootstrap - ] ++ lib.optionals (!headless && enableGnome2) [ - gtk3 - gnome_vfs - GConf - glib - ]; - - patches = [ - ./fix-java-home-jdk21.patch - ./read-truststore-from-env-jdk10.patch - ./currency-date-range-jdk10.patch - ./increase-javadoc-heap-jdk13.patch - ./ignore-LegalNoticeFilePlugin-jdk18.patch - - # -Wformat etc. are stricter in newer gccs, per - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677 - # so grab the work-around from - # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24 - (fetchurl { - url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; - sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; - }) - - # Fix build for gnumake-4.4.1: - # https://github.com/openjdk/jdk/pull/12992 - (fetchpatch { - name = "gnumake-4.4.1"; - url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch"; - hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg="; - }) - ] ++ lib.optionals (!headless && enableGnome2) [ - ./swing-use-gtk-jdk13.patch - ]; - - postPatch = '' - chmod +x configure - patchShebangs --build configure - ''; - - # JDK's build system attempts to specifically detect - # and special-case WSL, and we don't want it to do that, - # so pass the correct platform names explicitly - configurePlatforms = [ "build" "host" ]; - - - # https://openjdk.org/groups/build/doc/building.html - configureFlags = [ - "--with-boot-jdk=${openjdk-bootstrap.home}" - "--with-version-string=${version}" - "--with-vendor-version-string=(nix)" - "--enable-unlimited-crypto" - "--with-native-debug-symbols=internal" - "--with-libjpeg=system" - "--with-giflib=system" - "--with-libpng=system" - "--with-zlib=system" - "--with-lcms=system" - "--with-stdc++lib=dynamic" - ] - ++ lib.optional headless "--enable-headless-only" - ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; - - separateDebugInfo = true; - - env.NIX_CFLAGS_COMPILE = "-Wno-error"; - - NIX_LDFLAGS = toString (lib.optionals (!headless) [ - "-lfontconfig" - "-lcups" - "-lXinerama" - "-lXrandr" - "-lmagic" - ] ++ lib.optionals (!headless && enableGnome2) [ - "-lgtk-3" - "-lgio-2.0" - "-lgnomevfs-2" - "-lgconf-2" - ]); - - # -j flag is explicitly rejected by the build system: - # Error: 'make -jN' is not supported, use 'make JOBS=N' - # Note: it does not make build sequential. Build system - # still runs in parallel. - enableParallelBuilding = false; - - buildFlags = [ "images" ]; - - installPhase = '' - mkdir -p $out/lib - - mv build/*/images/jdk $out/lib/openjdk - - # Remove some broken manpages. - rm -rf $out/lib/openjdk/man/ja* - - # Mirror some stuff in top-level. - mkdir -p $out/share - ln -s $out/lib/openjdk/include $out/include - ln -s $out/lib/openjdk/man $out/share/man - - # IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081) - ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip - - # jni.h expects jni_md.h to be in the header search path. - ln -s $out/include/linux/*_md.h $out/include/ - - # Remove crap from the installation. - rm -rf $out/lib/openjdk/demo - ${lib.optionalString headless '' - rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so - ''} - - ln -s $out/lib/openjdk/bin $out/bin - ''; - - preFixup = '' - # Propagate the setJavaClassPath setup hook so that any package - # that depends on the JDK has $CLASSPATH set up properly. - mkdir -p $out/nix-support - #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 - echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs - - # Set JAVA_HOME automatically. - mkdir -p $out/nix-support - cat <<EOF > $out/nix-support/setup-hook - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi - EOF - ''; - - postFixup = '' - # Build the set of output library directories to rpath against - LIBDIRS="" - for output in $(getAllOutputNames); do - if [ "$output" = debug ]; then continue; fi - LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS" - done - # Add the local library paths to remove dependencies on the bootstrap - for output in $(getAllOutputNames); do - if [ "$output" = debug ]; then continue; fi - OUTPUTDIR=$(eval echo \$$output) - BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) - echo "$BINLIBS" | while read i; do - patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true - patchelf --shrink-rpath "$i" || true - done +stdenv.mkDerivation (finalAttrs: { + pname = "openjdk" + lib.optionalString headless "-headless"; + inherit version; + + src = fetchFromGitHub { + owner = "openjdk"; + repo = info.repo; + rev = "jdk-${version}"; + hash = info.hash; + }; + + nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ]; + buildInputs = [ + cpio + file + which + zip + perl + zlib + cups + freetype + alsa-lib + libjpeg + giflib + libpng + zlib + lcms2 + libX11 + libICE + libXrender + libXext + libXtst + libXt + libXtst + libXi + libXinerama + libXcursor + libXrandr + fontconfig + openjdk-bootstrap + ] ++ lib.optionals (!headless && enableGnome2) [ + gtk3 + gnome_vfs + GConf + glib + ]; + + patches = [ + ./fix-java-home-jdk21.patch + ./read-truststore-from-env-jdk10.patch + ./currency-date-range-jdk10.patch + ./increase-javadoc-heap-jdk13.patch + ./ignore-LegalNoticeFilePlugin-jdk18.patch + + # -Wformat etc. are stricter in newer gccs, per + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677 + # so grab the work-around from + # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24 + (fetchurl { + url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; + sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; + }) + + # Fix build for gnumake-4.4.1: + # https://github.com/openjdk/jdk/pull/12992 + (fetchpatch { + name = "gnumake-4.4.1"; + url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch"; + hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg="; + }) + ] ++ lib.optionals (!headless && enableGnome2) [ + ./swing-use-gtk-jdk13.patch + ]; + + postPatch = '' + chmod +x configure + patchShebangs --build configure + ''; + + # JDK's build system attempts to specifically detect + # and special-case WSL, and we don't want it to do that, + # so pass the correct platform names explicitly + configurePlatforms = [ "build" "host" ]; + + + # https://openjdk.org/groups/build/doc/building.html + configureFlags = [ + "--with-boot-jdk=${openjdk-bootstrap.home}" + "--with-version-string=${version}" + "--with-vendor-version-string=(nix)" + "--enable-unlimited-crypto" + "--with-native-debug-symbols=internal" + "--with-libjpeg=system" + "--with-giflib=system" + "--with-libpng=system" + "--with-zlib=system" + "--with-lcms=system" + "--with-stdc++lib=dynamic" + ] + ++ lib.optional headless "--enable-headless-only" + ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; + + separateDebugInfo = true; + + env.NIX_CFLAGS_COMPILE = "-Wno-error"; + + NIX_LDFLAGS = toString (lib.optionals (!headless) [ + "-lfontconfig" + "-lcups" + "-lXinerama" + "-lXrandr" + "-lmagic" + ] ++ lib.optionals (!headless && enableGnome2) [ + "-lgtk-3" + "-lgio-2.0" + "-lgnomevfs-2" + "-lgconf-2" + ]); + + # -j flag is explicitly rejected by the build system: + # Error: 'make -jN' is not supported, use 'make JOBS=N' + # Note: it does not make build sequential. Build system + # still runs in parallel. + enableParallelBuilding = false; + + buildFlags = [ "images" ]; + + installPhase = '' + mkdir -p $out/lib + + mv build/*/images/jdk $out/lib/openjdk + + # Remove some broken manpages. + rm -rf $out/lib/openjdk/man/ja* + + # Mirror some stuff in top-level. + mkdir -p $out/share + ln -s $out/lib/openjdk/include $out/include + ln -s $out/lib/openjdk/man $out/share/man + + # IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081) + ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/linux/*_md.h $out/include/ + + # Remove crap from the installation. + rm -rf $out/lib/openjdk/demo + ${lib.optionalString headless '' + rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so + ''} + + ln -s $out/lib/openjdk/bin $out/bin + ''; + + preFixup = '' + # Propagate the setJavaClassPath setup hook so that any package + # that depends on the JDK has $CLASSPATH set up properly. + mkdir -p $out/nix-support + #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 + echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs + + # Set JAVA_HOME automatically. + mkdir -p $out/nix-support + cat <<EOF > $out/nix-support/setup-hook + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi + EOF + ''; + + postFixup = '' + # Build the set of output library directories to rpath against + LIBDIRS="" + for output in $(getAllOutputNames); do + if [ "$output" = debug ]; then continue; fi + LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS" + done + # Add the local library paths to remove dependencies on the bootstrap + for output in $(getAllOutputNames); do + if [ "$output" = debug ]; then continue; fi + OUTPUTDIR=$(eval echo \$$output) + BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) + echo "$BINLIBS" | while read i; do + patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true + patchelf --shrink-rpath "$i" || true done - ''; - - disallowedReferences = [ openjdk-bootstrap ]; - - pos = __curPos; - meta = import ./meta.nix lib featureVersion; - - passthru = { - updateScript = - let - java-json = fetchurl { - url = "https://search.maven.org/remotecontent?filepath=org/json/json/20240303/json-20240303.jar"; - hash = "sha256-PPbNaJLjLitMHDng9S9SSKL1s3ZG/fu3mma0a2GEFO0="; - }; - in - writeShellScript "update-java" '' - ${finalAttrs.finalPackage}/bin/java \ - -cp ${java-json} \ - ${./JavaUpdater.java} \ - 22 pkgs/development/compilers/openjdk/info.json - ''; - - home = "${finalAttrs.finalPackage}/lib/openjdk"; - - inherit gtk3; - }; - }); -in -openjdk + done + ''; + + disallowedReferences = [ openjdk-bootstrap ]; + + pos = __curPos; + meta = import ./meta.nix lib featureVersion; + + passthru = { + updateScript = + let + java-json = fetchurl { + url = "https://search.maven.org/remotecontent?filepath=org/json/json/20240303/json-20240303.jar"; + hash = "sha256-PPbNaJLjLitMHDng9S9SSKL1s3ZG/fu3mma0a2GEFO0="; + }; + in + writeShellScript "update-java" '' + ${finalAttrs.finalPackage}/bin/java \ + -cp ${java-json} \ + ${./JavaUpdater.java} \ + 22 pkgs/development/compilers/openjdk/info.json + ''; + + home = "${finalAttrs.finalPackage}/lib/openjdk"; + + inherit gtk3; + }; +}) diff --git a/pkgs/development/compilers/reason/tests/hello/default.nix b/pkgs/development/compilers/reason/tests/hello/default.nix index 3def42ec08f78..831b528c6ba95 100644 --- a/pkgs/development/compilers/reason/tests/hello/default.nix +++ b/pkgs/development/compilers/reason/tests/hello/default.nix @@ -1,10 +1,18 @@ -{ buildDunePackage, ppxlib, reason }: +{ lib, buildDunePackage, ppxlib, reason }: buildDunePackage rec { pname = "helloreason"; version = "0.0.1"; - src = ./.; + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ + ./helloreason.opam + ./helloreason.re + ./dune-project + ./dune + ]; + }; nativeBuildInputs = [ reason diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix index e4eb62f736190..89e68ece7e6b6 100644 --- a/pkgs/development/compilers/rgbds/default.nix +++ b/pkgs/development/compilers/rgbds/default.nix @@ -2,15 +2,18 @@ stdenv.mkDerivation rec { pname = "rgbds"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "gbdev"; repo = "rgbds"; rev = "v${version}"; - sha256 = "sha256-3mx4yymrOQnP5aJCzPWl5G96WBxt1ixU6tdzhhOsF04="; + hash = "sha256-aktKJlwXpHpjSFxoz5wZJPGWZIcn4ax5iBP0GQEux78="; }; nativeBuildInputs = [ bison flex pkg-config ]; buildInputs = [ libpng ]; + postPatch = '' + patchShebangs --host src/bison.sh + ''; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fno-lto"; installFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index fab12e06bcc60..587ca9d7f35e0 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -13,17 +13,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "unison-code-manager"; - version = "0.5.21"; + version = "0.5.22"; src = if stdenv.isDarwin then fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos.tar.gz"; - hash = "sha256-AtLky8RevRRAZFAzGz4UqWhBP+Qm/kRu4fMTdx9KB+w="; + hash = "sha256-Exgi0eKk+ZngpnbfY/btHf+uiXcmummnWKfmCUESWgc="; } else fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux.tar.gz"; - hash = "sha256-ninkfYB9dmOD6+LsQNDJW89FrwZn2GrZkLGbafMsrHg="; + hash = "sha256-EWfyqaFtGJJ5GE0mRTtNC9hHOzbqG9MsvRh5sFq5pRY="; }; # The tarball is just the prebuilt binary, in the archive root. diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index ee8fe6cee576f..3205f5b22dcda 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -171,6 +171,6 @@ in stdenv.mkDerivation (finalAttrs: { homepage = "https://yosyshq.net/yosys/"; license = licenses.isc; platforms = platforms.all; - maintainers = with maintainers; [ shell thoughtpolice emily Luflosi ]; + maintainers = with maintainers; [ shell thoughtpolice Luflosi ]; }; }) diff --git a/pkgs/development/compilers/yosys/plugins/synlig.nix b/pkgs/development/compilers/yosys/plugins/synlig.nix index 665421af21f3f..0c6fc5e3f89ef 100644 --- a/pkgs/development/compilers/yosys/plugins/synlig.nix +++ b/pkgs/development/compilers/yosys/plugins/synlig.nix @@ -97,5 +97,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.asl20; maintainers = with maintainers; [ hzeller ]; platforms = platforms.all; + broken = versionAtLeast yosys.version "0.39"; }; }) diff --git a/pkgs/development/compilers/zig/0.12/default.nix b/pkgs/development/compilers/zig/0.12/default.nix index 831366419a934..092b416c7903e 100644 --- a/pkgs/development/compilers/zig/0.12/default.nix +++ b/pkgs/development/compilers/zig/0.12/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zig"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig"; rev = finalAttrs.version; - hash = "sha256-RNZiUZtaKXoab5kFrDij6YCAospeVvlLWheTc3FGMks="; + hash = "sha256-C56jyVf16Co/XCloMLSRsbG9r/gBc8mzCdeEMHV2T2s="; }; nativeBuildInputs = [ @@ -56,7 +56,9 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; - strictDeps = true; + # strictDeps breaks zig when clang is being used. + # https://github.com/NixOS/nixpkgs/issues/317055#issuecomment-2148438395 + strictDeps = !stdenv.cc.isClang; # Zig's build looks at /usr/bin/env to find dynamic linking info. This doesn't # work in Nix's sandbox. Use env from our coreutils instead. diff --git a/pkgs/development/compilers/zig/0.13/default.nix b/pkgs/development/compilers/zig/0.13/default.nix new file mode 100644 index 0000000000000..bdc01ba47f9ff --- /dev/null +++ b/pkgs/development/compilers/zig/0.13/default.nix @@ -0,0 +1,105 @@ +{ + lib, + callPackage, + cmake, + coreutils, + fetchFromGitHub, + libxml2, + llvmPackages, + stdenv, + testers, + zlib, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "zig"; + version = "0.13.0"; + + src = fetchFromGitHub { + owner = "ziglang"; + repo = "zig"; + rev = finalAttrs.version; + hash = "sha256-5qSiTq+UWGOwjDVZMIrAt2cDKHkyNPBSAEjpRQUByFM="; + }; + + nativeBuildInputs = [ + cmake + (lib.getDev llvmPackages.llvm) + ]; + + buildInputs = + [ + libxml2 + zlib + ] + ++ (with llvmPackages; [ + libclang + lld + llvm + ]); + + outputs = [ + "out" + "doc" + ]; + + cmakeFlags = [ + # file RPATH_CHANGE could not write new RPATH + (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true) + # ensure determinism in the compiler build + (lib.cmakeFeature "ZIG_TARGET_MCPU" "baseline") + # always link against static build of LLVM + (lib.cmakeBool "ZIG_STATIC_LLVM" true) + ]; + + env.ZIG_GLOBAL_CACHE_DIR = "$TMPDIR/zig-cache"; + + doInstallCheck = true; + + # strictDeps breaks zig when clang is being used. + # https://github.com/NixOS/nixpkgs/issues/317055#issuecomment-2148438395 + strictDeps = !stdenv.cc.isClang; + + # Zig's build looks at /usr/bin/env to find dynamic linking info. This doesn't + # work in Nix's sandbox. Use env from our coreutils instead. + postPatch = '' + substituteInPlace lib/std/zig/system.zig \ + --replace "/usr/bin/env" "${lib.getExe' coreutils "env"}" + ''; + + postBuild = '' + stage3/bin/zig build langref + ''; + + postInstall = '' + install -Dm444 ../zig-out/doc/langref.html -t $doc/share/doc/zig-${finalAttrs.version}/html + ''; + + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/zig test --cache-dir "$TMPDIR/zig-test-cache" -I $src/test $src/test/behavior.zig + + runHook postInstallCheck + ''; + + passthru = { + hook = callPackage ./hook.nix { zig = finalAttrs.finalPackage; }; + tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "zig version"; + }; + }; + }; + + meta = { + description = "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software"; + changelog = "https://ziglang.org/download/${finalAttrs.version}/release-notes.html"; + homepage = "https://ziglang.org/"; + license = lib.licenses.mit; + mainProgram = "zig"; + maintainers = with lib.maintainers; [ andrewrk ] ++ lib.teams.zig.members; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/development/compilers/zig/0.13/hook.nix b/pkgs/development/compilers/zig/0.13/hook.nix new file mode 100644 index 0000000000000..a56b1a21e961d --- /dev/null +++ b/pkgs/development/compilers/zig/0.13/hook.nix @@ -0,0 +1,32 @@ +{ + lib, + makeSetupHook, + zig, +}: + +makeSetupHook { + name = "zig-hook"; + + propagatedBuildInputs = [ zig ]; + + substitutions = { + # This zig_default_flags below is meant to avoid CPU feature impurity in + # Nixpkgs. However, this flagset is "unstable": it is specifically meant to + # be controlled by the upstream development team - being up to that team + # exposing or not that flags to the outside (especially the package manager + # teams). + zig_default_flags = [ + "-Dcpu=baseline" + "--release=safe" + ]; + }; + + passthru = { + inherit zig; + }; + + meta = { + description = "A setup hook for using the Zig compiler in Nixpkgs"; + inherit (zig.meta) maintainers platforms broken; + }; +} ./setup-hook.sh diff --git a/pkgs/development/compilers/zig/0.13/setup-hook.sh b/pkgs/development/compilers/zig/0.13/setup-hook.sh new file mode 100644 index 0000000000000..689ebec8a3077 --- /dev/null +++ b/pkgs/development/compilers/zig/0.13/setup-hook.sh @@ -0,0 +1,70 @@ +# shellcheck shell=bash disable=SC2154,SC2086 + +readonly zigDefaultFlagsArray=(@zig_default_flags@) + +function zigSetGlobalCacheDir { + ZIG_GLOBAL_CACHE_DIR=$(mktemp -d) + export ZIG_GLOBAL_CACHE_DIR +} + +function zigBuildPhase { + runHook preBuild + + local flagsArray=( + "${zigDefaultFlagsArray[@]}" + $zigBuildFlags "${zigBuildFlagsArray[@]}" + ) + + echoCmd 'zig build flags' "${flagsArray[@]}" + zig build "${flagsArray[@]}" + + runHook postBuild +} + +function zigCheckPhase { + runHook preCheck + + local flagsArray=( + "${zigDefaultFlagsArray[@]}" + $zigCheckFlags "${zigCheckFlagsArray[@]}" + ) + + echoCmd 'zig check flags' "${flagsArray[@]}" + zig build test "${flagsArray[@]}" + + runHook postCheck +} + +function zigInstallPhase { + runHook preInstall + + local flagsArray=( + "${zigDefaultFlagsArray[@]}" + $zigBuildFlags "${zigBuildFlagsArray[@]}" + $zigInstallFlags "${zigInstallFlagsArray[@]}" + ) + + if [ -z "${dontAddPrefix-}" ]; then + # Zig does not recognize `--prefix=/dir/`, only `--prefix /dir/` + flagsArray+=("${prefixKey:---prefix}" "$prefix") + fi + + echoCmd 'zig install flags' "${flagsArray[@]}" + zig build install "${flagsArray[@]}" + + runHook postInstall +} + +addEnvHooks "$targetOffset" zigSetGlobalCacheDir + +if [ -z "${dontUseZigBuild-}" ] && [ -z "${buildPhase-}" ]; then + buildPhase=zigBuildPhase +fi + +if [ -z "${dontUseZigCheck-}" ] && [ -z "${checkPhase-}" ]; then + checkPhase=zigCheckPhase +fi + +if [ -z "${dontUseZigInstall-}" ] && [ -z "${installPhase-}" ]; then + installPhase=zigInstallPhase +fi diff --git a/pkgs/development/coq-modules/VST/default.nix b/pkgs/development/coq-modules/VST/default.nix index 706d117863540..8cfe5e9f764e9 100644 --- a/pkgs/development/coq-modules/VST/default.nix +++ b/pkgs/development/coq-modules/VST/default.nix @@ -43,7 +43,7 @@ mkCoqDerivation { preConfigure = '' patchShebangs util substituteInPlace Makefile \ - --replace 'COQVERSION= ' 'COQVERSION= 8.17.1 or-else 8.16.1 or-else 8.16.0 or-else 8.15.2 or-else 8.15.1 or-else '\ + --replace 'COQVERSION= ' 'COQVERSION= 8.19.2 or-else 8.17.1 or-else 8.16.1 or-else 8.16.0 or-else 8.15.2 or-else 8.15.1 or-else '\ --replace 'FLOYD_FILES=' 'FLOYD_FILES= ${toString extra_floyd_files}' ''; diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index 1f2ec1cdfd1cb..59cfd680427b6 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -193,6 +193,20 @@ compcert.overrideAttrs (o: url = "https://github.com/AbsInt/CompCert/commit/a2e4ed62fc558d565366845f9d135bd7db5e23c4.patch"; hash = "sha256-ufk0bokuayLfkSvK3cK4E9iXU5eZpp9d/ETSa/zCfMg="; }) + # Support for Coq 8.19.2 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/8fcfb7d2a6e9ba44003ccab0dfcc894982779af1.patch"; + hash = "sha256-m/kcnDBBPWFriipuGvKZUqLQU8/W1uqw8j4qfCwnTZk="; + }) + ]; + } + { cases = [ (isEq "8.19") (isEq "3.14") ]; + out = [ + # Support for Coq 8.19.2 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/8fcfb7d2a6e9ba44003ccab0dfcc894982779af1.patch"; + hash = "sha256-m/kcnDBBPWFriipuGvKZUqLQU8/W1uqw8j4qfCwnTZk="; + }) ]; } ] []; diff --git a/pkgs/development/cuda-modules/saxpy/default.nix b/pkgs/development/cuda-modules/saxpy/default.nix index 9dbf61d3c06a3..9b7326cd321fa 100644 --- a/pkgs/development/cuda-modules/saxpy/default.nix +++ b/pkgs/development/cuda-modules/saxpy/default.nix @@ -18,12 +18,19 @@ let setupCudaHook ; inherit (lib) getDev getLib getOutput; + fs = lib.fileset; in backendStdenv.mkDerivation { pname = "saxpy"; version = "unstable-2023-07-11"; - src = ./.; + src = fs.toSource { + root = ./.; + fileset = fs.unions [ + ./CMakeLists.txt + ./saxpy.cu + ]; + }; __structuredAttrs = true; strictDeps = true; diff --git a/pkgs/development/embedded/blackmagic/default.nix b/pkgs/development/embedded/blackmagic/default.nix index 893a0c889fada..bb09ade35f2ff 100644 --- a/pkgs/development/embedded/blackmagic/default.nix +++ b/pkgs/development/embedded/blackmagic/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/blacksphere/blackmagic"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ pjones emily sorki ]; + maintainers = with maintainers; [ pjones sorki ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/embedded/fpga/ecpdap/default.nix b/pkgs/development/embedded/fpga/ecpdap/default.nix index 33cd013986cde..ef1ba75c45b1f 100644 --- a/pkgs/development/embedded/fpga/ecpdap/default.nix +++ b/pkgs/development/embedded/fpga/ecpdap/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ecpdap"; - version = "0.1.8"; + version = "0.2.0"; src = fetchFromGitHub { owner = "adamgreig"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KXfEQnbhUUKsCDKhPBjwjF9eJMuiCx5o7gOSzyWv36s="; + sha256 = "sha256-pgQqDRdewBSCm1/9/r8E9DBzwSKAaons3e6OLNv5gHM="; }; - cargoSha256 = "sha256-BEfsNSzrdV/tnzWk4oOwchOupW6PzZ8TEx7zUzwLBV8="; + cargoHash = "sha256-70Aq/gNfRv9JQyYWb7amYkfzFcNGCGbmCfJH4chbyyc="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/embedded/fpga/icestorm/default.nix b/pkgs/development/embedded/fpga/icestorm/default.nix index b660571eb3e5f..f6f7e46db56c0 100644 --- a/pkgs/development/embedded/fpga/icestorm/default.nix +++ b/pkgs/development/embedded/fpga/icestorm/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/YosysHQ/icestorm/"; license = lib.licenses.isc; - maintainers = with lib.maintainers; [ shell thoughtpolice emily ]; + maintainers = with lib.maintainers; [ shell thoughtpolice ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/development/embedded/fpga/tinyprog/default.nix b/pkgs/development/embedded/fpga/tinyprog/default.nix index e5a448b6fb3d3..b5a9937ad2af4 100644 --- a/pkgs/development/embedded/fpga/tinyprog/default.nix +++ b/pkgs/development/embedded/fpga/tinyprog/default.nix @@ -34,7 +34,7 @@ with python3Packages; buildPythonApplication rec { homepage = "https://github.com/tinyfpga/TinyFPGA-Bootloader/tree/master/programmer"; description = "Programmer for FPGA boards using the TinyFPGA USB Bootloader"; mainProgram = "tinyprog"; - maintainers = with maintainers; [ emily ]; + maintainers = with maintainers; [ ]; license = licenses.asl20; }; } diff --git a/pkgs/development/embedded/fpga/trellis/default.nix b/pkgs/development/embedded/fpga/trellis/default.nix index f0ff4a47b4c35..b652f57fa81a1 100644 --- a/pkgs/development/embedded/fpga/trellis/default.nix +++ b/pkgs/development/embedded/fpga/trellis/default.nix @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { ''; homepage = "https://github.com/YosysHQ/prjtrellis"; license = licenses.isc; - maintainers = with maintainers; [ q3k thoughtpolice emily rowanG077 ]; + maintainers = with maintainers; [ q3k thoughtpolice rowanG077 ]; platforms = platforms.all; }; } diff --git a/pkgs/development/embedded/platformio/chrootenv.nix b/pkgs/development/embedded/platformio/chrootenv.nix index 6e99c78dfdfe7..50be791a951e7 100644 --- a/pkgs/development/embedded/platformio/chrootenv.nix +++ b/pkgs/development/embedded/platformio/chrootenv.nix @@ -11,6 +11,7 @@ let git xdg-user-dirs ncurses + udev ]) ++ (with python.pkgs; [ python setuptools diff --git a/pkgs/development/interpreters/duktape/default.nix b/pkgs/development/interpreters/duktape/default.nix index 0a076aaa22b82..8e33a5013ff54 100644 --- a/pkgs/development/interpreters/duktape/default.nix +++ b/pkgs/development/interpreters/duktape/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, validatePkgConfig }: +{ lib, stdenv, fetchurl, fixDarwinDylibNames, validatePkgConfig }: stdenv.mkDerivation (finalAttrs: { pname = "duktape"; @@ -11,7 +11,8 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/svaarala/duktape/issues/2464 LDFLAGS = [ "-lm" ]; - nativeBuildInputs = [ validatePkgConfig ]; + nativeBuildInputs = [ validatePkgConfig ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; buildPhase = '' make -f Makefile.sharedlibrary diff --git a/pkgs/development/interpreters/elixir/1.17.nix b/pkgs/development/interpreters/elixir/1.17.nix index 2e79b6b0c7e34..32b09d76384ee 100644 --- a/pkgs/development/interpreters/elixir/1.17.nix +++ b/pkgs/development/interpreters/elixir/1.17.nix @@ -1,8 +1,8 @@ { mkDerivation }: mkDerivation { - version = "1.17.0"; - sha256 = "sha256-RBylCfD+aCsvCqWUIvqXi3izNqqQoNfQNnQiZxz0Igg="; - # https://hexdocs.pm/elixir/1.17.0/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp + version = "1.17.1"; + sha256 = "sha256-a7A+426uuo3bUjggkglY1lqHmSbZNpjPaFpQUXYtW9k="; + # https://hexdocs.pm/elixir/1.17.1/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp minimumOTPVersion = "25"; escriptPath = "lib/elixir/scripts/generate_app.escript"; } diff --git a/pkgs/development/interpreters/kamilalisp/default.nix b/pkgs/development/interpreters/kamilalisp/default.nix index 088e095df4559..5b4d392d62f75 100644 --- a/pkgs/development/interpreters/kamilalisp/default.nix +++ b/pkgs/development/interpreters/kamilalisp/default.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation rec { - name = "kamilalisp"; + pname = "kamilalisp"; version = "0.3.0.1"; src = fetchurl { @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -pv $out/share/java $out/bin - cp ${src} $out/share/java/${name}-${version}.jar + cp ${src} $out/share/java/kamilalisp-${version}.jar makeWrapper ${jre}/bin/java $out/bin/kamilalisp \ - --add-flags "-jar $out/share/java/${name}-${version}.jar" \ + --add-flags "-jar $out/share/java/kamilalisp-${version}.jar" \ --set _JAVA_OPTIONS '-Dawt.useSystemAAFontSettings=on' \ --set _JAVA_AWT_WM_NONREPARENTING 1 ''; diff --git a/pkgs/development/interpreters/nelua/default.nix b/pkgs/development/interpreters/nelua/default.nix index 07494f121b029..96101dc66ecfb 100644 --- a/pkgs/development/interpreters/nelua/default.nix +++ b/pkgs/development/interpreters/nelua/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nelua"; - version = "0-unstable-2024-04-20"; + version = "0-unstable-2024-06-11"; src = fetchFromGitHub { owner = "edubart"; repo = "nelua-lang"; - rev = "9f75e009db190feda0f90ae858b48fd82f51b8b1"; - hash = "sha256-JwuZZXYcH8KRPxt4PBwhYDjZlwqe6VfaONU8rdLIDs4="; + rev = "c344dbdcdc4a6fed964e60fbde39d1cebe23c05a"; + hash = "sha256-goNiw/JlLJfgwVI+0dfdnBymAAKCU7u0Mjo1CyCFsSc="; }; postPatch = '' diff --git a/pkgs/development/interpreters/perl/interpreter.nix b/pkgs/development/interpreters/perl/interpreter.nix index fb835b22f1de9..ff95ac83a3010 100644 --- a/pkgs/development/interpreters/perl/interpreter.nix +++ b/pkgs/development/interpreters/perl/interpreter.nix @@ -115,6 +115,11 @@ stdenv.mkDerivation (rec { "-Dprefix=${placeholder "out"}" "-Dman1dir=${placeholder "out"}/share/man/man1" "-Dman3dir=${placeholder "out"}/share/man/man3" + ] + ++ lib.optionals (stdenv.isFreeBSD && crossCompiling && enableCrypt) [ + # https://github.com/Perl/perl5/issues/22295 + # configure cannot figure out that we have crypt automatically, but we really do + "-Dd_crypt" ]; configureScript = lib.optionalString (!crossCompiling) "${stdenv.shell} ./Configure"; diff --git a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/default.nix b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/default.nix index 8d330fcdbfc94..fcb17dcbca381 100644 --- a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/default.nix +++ b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, pythonOlder }: +{ lib, buildPythonPackage, pythonOlder }: buildPythonPackage { @@ -6,7 +6,13 @@ buildPythonPackage { pname = "typeddep"; version = "1.3.3.7"; - src = ./.; + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ + ./setup.py + ./typeddep + ]; + }; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index 030aa67fc2e37..4b855186bc312 100644 --- a/pkgs/development/interpreters/wasmer/default.nix +++ b/pkgs/development/interpreters/wasmer/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "wasmer"; - version = "4.3.1"; + version = "4.3.2"; src = fetchFromGitHub { owner = "wasmerio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1bxxy0Dso54cYQIZC9UUjtkgL1eyd3oRbhaYCwI0otw="; + hash = "sha256-FxbODuIWGHdhGAt6EFDwrashmYFy+ldkfUucUkLzyms="; }; - cargoHash = "sha256-3MwQZdFIWqHvELpIGlqsn/VKyobWki7OcMXQrjbxwKk="; + cargoHash = "sha256-ZPYqMXzX7yMaNrFUKuvUPyfQovd/E5/3T3n535oD+Tw="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/development/julia-modules/tests/julia-top-n/default.nix b/pkgs/development/julia-modules/tests/julia-top-n/default.nix index ab8ed948e1ea9..9e42e19dd309b 100644 --- a/pkgs/development/julia-modules/tests/julia-top-n/default.nix +++ b/pkgs/development/julia-modules/tests/julia-top-n/default.nix @@ -4,7 +4,16 @@ mkDerivation { pname = "julia-top-n"; version = "0.1.0.0"; - src = ./.; + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ + ./app + ./julia-top-n.cabal + ./package.yaml + ./stack.yaml + ./stack.yaml.lock + ]; + }; isLibrary = false; isExecutable = true; executableHaskellDepends = [ diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index ba5b3d6ddd515..60f11fd23d84c 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -189,6 +189,7 @@ in rec { fullName = "Afrikaans"; filename = "aspell"; sha256 = "00p6k2ndi0gzfr5fkbvx4hkcpj223pidjvmxg0r384arrap00q4x"; + meta.license = lib.licenses.lgpl21Only; }; am = buildOfficialDict { @@ -197,6 +198,7 @@ in rec { fullName = "Amharic"; filename = "aspell6"; sha256 = "11ylp7gjq94wfacyawvp391lsq26rl1b84f268rjn7l7z0hxs9xz"; + meta.license = lib.licenses.publicDomain; }; ar = buildOfficialDict { @@ -205,6 +207,7 @@ in rec { fullName = "Arabic"; filename = "aspell6"; sha256 = "1avw40bp8yi5bnkq64ihm2rldgw34lk89yz281q9bmndh95a47h4"; + meta.license = lib.licenses.gpl2Only; }; ast = buildOfficialDict { @@ -213,6 +216,7 @@ in rec { fullName = "Asturian"; filename = "aspell6"; sha256 = "14hg85mxcyvdigf96yvslk7f3v9ngdsxn85qpgwkg31k3k83xwj3"; + meta.license = lib.licenses.gpl2Only; }; az = buildOfficialDict { @@ -221,6 +225,7 @@ in rec { fullName = "Azerbaijani"; filename = "aspell6"; sha256 = "1hs4h1jscpxf9f9iyk6mvjqsnhkf0yslkbjhjkasqqcx8pn7cc86"; + meta.license = lib.licenses.gpl2Only; }; be = buildOfficialDict { @@ -229,6 +234,7 @@ in rec { fullName = "Belarusian"; filename = "aspell5"; sha256 = "1svls9p7rsfi3hs0afh0cssj006qb4v1ik2yzqgj8hm10c6as2sm"; + meta.license = lib.licenses.gpl2Only; }; bg = buildOfficialDict { @@ -237,6 +243,7 @@ in rec { fullName = "Bulgarian"; filename = "aspell6"; sha256 = "1alacmgpfk0yrgq83y23d16fhav1bxmb98kg8d2a5r9bvh2h0mvl"; + meta.license = lib.licenses.gpl2Only; }; bn = buildOfficialDict { @@ -245,6 +252,7 @@ in rec { fullName = "Bengali"; filename = "aspell6"; sha256 = "1nc02jd67iggirwxnhdvlvaqm0xfyks35c4psszzj3dhzv29qgxh"; + meta.license = lib.licenses.gpl2Only; }; br = buildOfficialDict { @@ -253,6 +261,7 @@ in rec { fullName = "Breton"; filename = "aspell"; sha256 = "0fradnm8424bkq9a9zhpl2132dk7y95xmw45sy1c0lx6rinjl4n2"; + meta.license = lib.licenses.gpl2Only; }; ca = buildOfficialDict { @@ -261,6 +270,7 @@ in rec { fullName = "Catalan"; filename = "aspell6"; sha256 = "1fb5y5kgvk25nlsfvc8cai978hg66x3pbp9py56pldc7vxzf9npb"; + meta.license = lib.licenses.gpl2Only; }; cs = buildOfficialDict { @@ -269,6 +279,7 @@ in rec { fullName = "Czech"; filename = "aspell6"; sha256 = "0rihj4hsw96pd9casvmpvw3r8040pfa28p1h73x4vyn20zwr3h01"; + meta.license = lib.licenses.gpl2Only; }; csb = buildOfficialDict { @@ -277,6 +288,7 @@ in rec { fullName = "Kashubian"; filename = "aspell6"; sha256 = "1612ypkm684wjvc7n081i87mlrrzif9simc7kyn177hfsl3ssrn1"; + meta.license = lib.licenses.gpl2Only; }; cy = buildOfficialDict { @@ -285,6 +297,7 @@ in rec { fullName = "Welsh"; filename = "aspell"; sha256 = "15vq601lzz1gi311xym4bv9lv1k21xcfn50jmzamw7h6f36rsffm"; + meta.license = lib.licenses.gpl2Only; }; da = buildOfficialDict { @@ -293,6 +306,7 @@ in rec { fullName = "Danish"; filename = "aspell5"; sha256 = "1hfkmiyhgrx5lgrb2mffjbdn1hivrm73wcg7x0iid74p2yb0fjpp"; + meta.license = lib.licenses.gpl2Only; }; de = buildOfficialDict { @@ -301,6 +315,7 @@ in rec { fullName = "German"; filename = "aspell6"; sha256 = "0wamclvp66xfmv5wff96v6gdlnfv4y8lx3f8wvxyzm5imwgms4n2"; + meta.license = lib.licenses.gpl2Plus; }; de-alt = buildOfficialDict { @@ -309,6 +324,7 @@ in rec { fullName = "German - Old Spelling"; filename = "aspell6"; sha256 = "0wwc2l29svv3fv041fh6vfa5m3hi9q9pkbxibzq1ysrsfin3rl9n"; + meta.license = lib.licenses.gpl2Only; }; el = buildOfficialDict { @@ -317,6 +333,7 @@ in rec { fullName = "Greek"; filename = "aspell6"; sha256 = "1ljcc30zg2v2h3w5h5jr5im41mw8jbsgvvhdd2cii2yzi8d0zxja"; + meta.license = lib.licenses.gpl2Only; }; en = buildOfficialDict { @@ -325,6 +342,13 @@ in rec { fullName = "English"; filename = "aspell6"; sha256 = "1cwzqkm8gr1w51rpckwlvb43sb0b5nbwy7s8ns5vi250515773sc"; + # some parts are under a custom free license others are just stated to be"public domain" + # see the Copyright file in the source for further information + meta.license = with lib.licenses; [ + free + publicDomain + bsdOriginalUC + ]; }; eo = buildOfficialDict { @@ -333,6 +357,7 @@ in rec { fullName = "Esperanto"; filename = "aspell6"; sha256 = "09vf0mbiicbmyb4bwb7v7lgpabnylg0wy7m3hlhl5rjdda6x3lj1"; + meta.license = lib.licenses.gpl2Only; }; es = buildOfficialDict { @@ -341,6 +366,7 @@ in rec { fullName = "Spanish"; filename = "aspell6"; sha256 = "1k5g328ac1hdpp6fsg57d8md6i0aqcwlszp3gbmp5706wyhpydmd"; + meta.license = lib.licenses.gpl2Only; }; et = buildOfficialDict { @@ -349,6 +375,7 @@ in rec { fullName = "Estonian"; filename = "aspell6"; sha256 = "0jdjfa2fskirhnb70fy86xryp9r6gkl729ib8qcjmsma7nm5gs5i"; + meta.license = lib.licenses.lgpl21Only; }; fa = buildOfficialDict { @@ -357,6 +384,7 @@ in rec { fullName = "Persian"; filename = "aspell6"; sha256 = "0nz1ybwv56q7nl9ip12hfmdch1vyyq2j55bkjcns13lshzm2cba8"; + meta.license = lib.licenses.gpl2Only; }; fi = buildOfficialDict { @@ -365,6 +393,7 @@ in rec { fullName = "Finnish"; filename = "aspell6"; sha256 = "07d5s08ba4dd89cmwy9icc01i6fjdykxlb9ravmhdrhi8mxz1mzq"; + meta.license = lib.licenses.gpl2Only; }; fo = buildOfficialDict { @@ -373,6 +402,7 @@ in rec { fullName = "Faroese"; filename = "aspell5"; sha256 = "022yz5lll20xrzizcyb7wksm3fgwklnvgnir5la5qkxv770dvq7p"; + meta.license = lib.licenses.gpl2Only; }; fr = buildOfficialDict { @@ -381,6 +411,7 @@ in rec { fullName = "French"; filename = "aspell"; sha256 = "14ffy9mn5jqqpp437kannc3559bfdrpk7r36ljkzjalxa53i0hpr"; + meta.license = lib.licenses.gpl2Only; }; fy = buildOfficialDict { @@ -389,6 +420,7 @@ in rec { fullName = "Frisian"; filename = "aspell6"; sha256 = "1almi6n4ni91d0rzrk8ig0473m9ypbwqmg56hchz76j51slwyirl"; + meta.license = lib.licenses.gpl2Only; }; ga = buildOfficialDict { @@ -397,6 +429,7 @@ in rec { fullName = "Irish"; filename = "aspell5"; sha256 = "0y869mmvfb3bzadfgajwa2rfb0xfhi6m9ydwgxkb9v2claydnps5"; + meta.license = lib.licenses.gpl2Only; }; gd = buildOfficialDict { @@ -405,6 +438,7 @@ in rec { fullName = "Scottish Gaelic"; filename = "aspell5"; sha256 = "0a89irv5d65j5m9sb0k36851x5rs0wij12gb2m6hv2nsfn5a05p3"; + meta.license = lib.licenses.gpl2Only; }; gl = buildOfficialDict { @@ -413,6 +447,7 @@ in rec { fullName = "Galician"; filename = "aspell6"; sha256 = "12pwghmy18fcdvf9hvhb4q6shi339hb1kwxpkz0bhw0yjxjwzkdk"; + meta.license = lib.licenses.gpl2Only; }; grc = buildOfficialDict { @@ -421,6 +456,7 @@ in rec { fullName = "Ancient Greek"; filename = "aspell6"; sha256 = "1zxr8958v37v260fkqd4pg37ns5h5kyqm54hn1hg70wq5cz8h512"; + meta.license = lib.licenses.gpl3Only; }; gu = buildOfficialDict { @@ -429,6 +465,7 @@ in rec { fullName = "Gujarati"; filename = "aspell6"; sha256 = "04c38jnl74lpj2jhjz4zpqbs2623vwc71m6wc5h4b1karid14b23"; + meta.license = lib.licenses.gpl2Only; }; gv = buildOfficialDict { @@ -437,6 +474,7 @@ in rec { fullName = "Manx Gaelic"; filename = "aspell"; sha256 = "1rknf4yaw9s29c77sdzg98nhnmjwpicdb69igmz1n768npz2drmv"; + meta.license = lib.licenses.gpl2Only; }; he = buildOfficialDict { @@ -445,6 +483,7 @@ in rec { fullName = "Hebrew"; filename = "aspell6"; sha256 = "13bhbghx5b8g0119g3wxd4n8mlf707y41vlf59irxjj0kynankfn"; + meta.license = lib.licenses.gpl2Only; }; hi = buildOfficialDict { @@ -453,6 +492,7 @@ in rec { fullName = "Hindi"; filename = "aspell6"; sha256 = "0drs374qz4419zx1lf2k281ydxf2750jk5ailafj1x0ncz27h1ys"; + meta.license = lib.licenses.gpl2Only; }; hil = buildOfficialDict { @@ -461,6 +501,7 @@ in rec { fullName = "Hiligaynon"; filename = "aspell5"; sha256 = "1s482fsfhzic9qa80al4418q3ni3gfn2bkwkd2y46ydrs17kf2jp"; + meta.license = lib.licenses.gpl2Only; }; hr = buildOfficialDict { @@ -469,6 +510,7 @@ in rec { fullName = "Croatian"; filename = "aspell"; sha256 = "09aafyf1vqhaxvcf3jfzf365k394b5pf0iivsr2ix5npah1h7i1a"; + meta.license = lib.licenses.lgpl21Only; }; hsb = buildOfficialDict { @@ -477,6 +519,7 @@ in rec { fullName = "Upper Sorbian"; filename = "aspell6"; sha256 = "0bi2vhz7n1vmg43wbbh935pmzihv80iyz9z65j94lxf753j2m7wd"; + meta.license = lib.licenses.gpl2Only; }; hu = buildOfficialDict { @@ -485,6 +528,7 @@ in rec { fullName = "Hungarian"; filename = "aspell6"; sha256 = "1d9nybip2k1dz69zly3iv0npbi3yxgfznh1py364nxzrbjsafd9k"; + meta.license = lib.licenses.gpl2Only; }; hus = buildOfficialDict { @@ -493,6 +537,7 @@ in rec { fullName = "Huastec"; filename = "aspell6"; sha256 = "09glipfpkz9xch17z11zw1yn2z7jx1f2svfmjn9l6wm1s5qz6a3d"; + meta.license = lib.licenses.gpl3Only; }; hy = buildOfficialDict { @@ -501,6 +546,7 @@ in rec { fullName = "Armenian"; filename = "aspell6"; sha256 = "1w5wq8lfl2xp1nid30b1j5qmya4vjyidq0vpr4y3gf53jc08vsid"; + meta.license = lib.licenses.gpl2Only; }; ia = buildOfficialDict { @@ -509,6 +555,7 @@ in rec { fullName = "Interlingua"; filename = "aspell"; sha256 = "0bqcpgsa72pga24fv4fkw38b4qqdvqsw97jvzvw7q03dc1cwp5sp"; + meta.license = lib.licenses.lgpl21Only; }; id = buildOfficialDict { @@ -517,6 +564,7 @@ in rec { fullName = "Indonesian"; filename = "aspell5"; sha256 = "023knfg0q03f7y5w6xnwa1kspnrcvcnky8xvdms93n2850414faj"; + meta.license = lib.licenses.gpl2Only; }; is = buildOfficialDict { @@ -525,6 +573,7 @@ in rec { fullName = "Icelandic"; filename = "aspell"; sha256 = "1mp3248lhbr13cj7iq9zs7h5ix0dcwlprp5cwrkcwafrv8lvsd9h"; + meta.license = lib.licenses.gpl2Only; }; it = buildOfficialDict { @@ -533,6 +582,7 @@ in rec { fullName = "Italian"; filename = "aspell6"; sha256 = "1gdf7bc1a0kmxsmphdqq8pl01h667mjsj6hihy6kqy14k5qdq69v"; + meta.license = lib.licenses.gpl2Plus; }; kn = buildOfficialDict { @@ -541,6 +591,7 @@ in rec { fullName = "Kannada"; filename = "aspell6"; sha256 = "10sk0wx4x4ds1403kf9dqxv9yjvh06w8qqf4agx57y0jlws0n0fb"; + meta.license = lib.licenses.gpl3Only; }; ku = buildOfficialDict { @@ -549,6 +600,7 @@ in rec { fullName = "Kurdi"; filename = "aspell5"; sha256 = "09va98krfbgdaxl101nmd85j3ysqgg88qgfcl42c07crii0pd3wn"; + meta.license = lib.licenses.gpl2Only; }; ky = buildOfficialDict { @@ -557,6 +609,7 @@ in rec { fullName = "Kirghiz"; filename = "aspell6"; sha256 = "0kzv2syjnnn6pnwx0d578n46hg2l0j62977al47y6wabnhjjy3z1"; + meta.license = lib.licenses.gpl2Only; }; la = buildOfficialDict { @@ -565,6 +618,7 @@ in rec { fullName = "Latin"; filename = "aspell6"; sha256 = "1199inwi16dznzl087v4skn66fl7h555hi2palx6s1f3s54b11nl"; + meta.license = lib.licenses.gpl2Only; }; lt = buildOfficialDict { @@ -573,6 +627,7 @@ in rec { fullName = "Lithuanian"; filename = "aspell6"; sha256 = "1asjck911l96q26zj36lmz0jp4b6pivvrf3h38zgc8lc85p3pxgn"; + meta.license = lib.licenses.bsd3; }; lv = buildOfficialDict { @@ -581,6 +636,7 @@ in rec { fullName = "Latvian"; filename = "aspell6"; sha256 = "12pvs584a6437ijndggdqpp5s7d0w607cimpkxsjwasnx83f4c1w"; + meta.license = lib.licenses.gpl2Only; }; mg = buildOfficialDict { @@ -589,6 +645,7 @@ in rec { fullName = "Malagasy"; filename = "aspell5"; sha256 = "0hdhbk9b5immjp8l5h4cy82gwgsqzcqbb0qsf7syw333w4rgi0ji"; + meta.license = lib.licenses.gpl2Only; }; mi = buildOfficialDict { @@ -597,6 +654,7 @@ in rec { fullName = "Maori"; filename = "aspell"; sha256 = "12bxplpd348yx8d2q8qvahi9dlp7qf28qmanzhziwc7np8rixvmy"; + meta.license = lib.licenses.lgpl21Only; }; mk = buildOfficialDict { @@ -605,6 +663,7 @@ in rec { fullName = "Macedonian"; filename = "aspell"; sha256 = "0wcr9n882xi5b7a7ln1hnhq4vfqd5gpqqp87v01j0gb7zf027z0m"; + meta.license = lib.licenses.gpl2Only; }; ml = buildOfficialDict { @@ -613,6 +672,7 @@ in rec { fullName = "Malayalam"; filename = "aspell6"; sha256 = "1zcn4114gwia085fkz77qk13z29xrbp53q2qvgj2cvcbalg5bkg4"; + meta.license = lib.licenses.gpl3Only; }; mn = buildOfficialDict { @@ -621,6 +681,7 @@ in rec { fullName = "Mongolian"; filename = "aspell6"; sha256 = "150j9y5c9pw80fwp5rzl5q31q9vjbxixaqljkfwxjb5q93fnw6rg"; + meta.license = lib.licenses.gpl2Only; }; mr = buildOfficialDict { @@ -629,6 +690,7 @@ in rec { fullName = "Marathi"; filename = "aspell6"; sha256 = "0cvgb2l40sppqbi842ivpznsh2xzp1d4hxc371dll8z0pr05m8yk"; + meta.license = lib.licenses.gpl2Only; }; ms = buildOfficialDict { @@ -637,6 +699,7 @@ in rec { fullName = "Malay"; filename = "aspell"; sha256 = "0vr4vhipcfhsxqfs8dim2ph7iiixn22gmlmlb375bx5hgd9y7i1w"; + meta.license = lib.licenses.fdl12Only; }; mt = buildOfficialDict { @@ -645,6 +708,7 @@ in rec { fullName = "Maltese"; filename = "aspell"; sha256 = "1d2rl1nlfjq6rfywblvx8m88cyy2x0mzc0mshzbgw359c2nwl3z0"; + meta.license = lib.licenses.lgpl21Only; }; nb = buildOfficialDict { @@ -653,6 +717,7 @@ in rec { fullName = "Norwegian Bokmal"; filename = "aspell"; sha256 = "12i2bmgdnlkzfinb20j2a0j4a20q91a9j8qpq5vgabbvc65nwx77"; + meta.license = lib.licenses.gpl2Only; }; nds = buildOfficialDict { @@ -661,6 +726,7 @@ in rec { fullName = "Low Saxon"; filename = "aspell6"; sha256 = "1nkjhwzn45dizi89d19q4bqyd87cim8xyrgr655fampgkn31wf6f"; + meta.license = lib.licenses.lgpl21Only; }; nl = buildOfficialDict { @@ -673,6 +739,11 @@ in rec { postInstall = '' echo "add nl.rws" > $out/lib/aspell/nederlands.multi ''; + # from the Copyright file: + # > The nl-aspell package includes the GPL COPYRIGHT file but no explicit copyright + # > notice. Since he was using autoconf this could have been added automatically. + # wtf whatever + meta.license = lib.licenses.free; }; nn = buildOfficialDict { @@ -681,6 +752,7 @@ in rec { fullName = "Norwegian Nynorsk"; filename = "aspell"; sha256 = "0w2k5l5rbqpliripgqwiqixz5ghnjf7i9ggbrc4ly4vy1ia10rmc"; + meta.license = lib.licenses.gpl2Only; }; ny = buildOfficialDict { @@ -689,6 +761,7 @@ in rec { fullName = "Chichewa"; filename = "aspell5"; sha256 = "0gjb92vcg60sfgvrm2f6i89sfkgb179ahvwlgs649fx3dc7rfvqp"; + meta.license = lib.licenses.gpl2Only; }; or = buildOfficialDict { @@ -697,6 +770,7 @@ in rec { fullName = "Oriya"; filename = "aspell6"; sha256 = "0kzj9q225z0ccrlbkijsrafy005pbjy14qcnxb6p93ciz1ls7zyn"; + meta.license = lib.licenses.gpl2Only; }; pa = buildOfficialDict { @@ -705,6 +779,7 @@ in rec { fullName = "Punjabi"; filename = "aspell6"; sha256 = "0if93zk10pyrs38wwj3vpcdm01h51m5z9gm85h3jxrpgqnqspwy7"; + meta.license = lib.licenses.gpl2Only; }; pl = buildOfficialDict { @@ -713,6 +788,12 @@ in rec { fullName = "Polish"; filename = "aspell6"; sha256 = "0kap4kh6bqbb22ypja1m5z3krc06vv4n0hakiiqmv20anzy42xq1"; + meta.license = with lib.licenses; [ + gpl2Only + lgpl21Only + mpl11 + cc-sa-10 + ]; }; pt_BR = buildOfficialDict { @@ -721,6 +802,11 @@ in rec { fullName = "Brazilian Portuguese"; filename = "aspell6"; sha256 = "1xqlpk21s93c6blkdnpk7l62q9fxjvzdv2x86chl8p2x1gdrj3gb"; + meta.license = with lib.licenses; [ + lgpl21Only + lgpl21Plus + gpl3Plus + ]; }; pt_PT = buildOfficialDict { @@ -729,6 +815,11 @@ in rec { fullName = "Portuguese"; filename = "aspell6"; sha256 = "0ld0d0ily4jqifjfsxfv4shbicz6ymm2gk56fq9gbzra1j4qnw75"; + meta.license = with lib.licenses; [ + lgpl21Plus + gpl3Plus + mpl11 + ]; }; qu = buildOfficialDict { @@ -737,6 +828,7 @@ in rec { fullName = "Quechua"; filename = "aspell6"; sha256 = "009z0zsvzq7r3z3m30clyibs94v77b92h5lmzmzxlns2p0lpd5w0"; + meta.license = lib.licenses.gpl2Only; }; ro = buildOfficialDict { @@ -745,6 +837,7 @@ in rec { fullName = "Romanian"; filename = "aspell5"; sha256 = "0gb8j9iy1acdl11jq76idgc2lbc1rq3w04favn8cyh55d1v8phsk"; + meta.license = lib.licenses.gpl2Only; }; ru = buildOfficialDict { @@ -753,6 +846,7 @@ in rec { fullName = "Russian"; filename = "aspell6"; sha256 = "0ip6nq43hcr7vvzbv4lwwmlwgfa60hrhsldh9xy3zg2prv6bcaaw"; + meta.license = lib.licenses.free; }; rw = buildOfficialDict { @@ -761,6 +855,7 @@ in rec { fullName = "Kinyarwanda"; filename = "aspell"; sha256 = "10gh8g747jbrvfk2fn3pjxy1nhcfdpwgmnvkmrp4nd1k1qp101il"; + meta.license = lib.licenses.gpl2Only; }; sc = buildOfficialDict { @@ -769,6 +864,7 @@ in rec { fullName = "Sardinian"; filename = "aspell5"; sha256 = "0hl7prh5rccsyljwrv3m1hjcsphyrrywk2qvnj122irbf4py46jr"; + meta.license = lib.licenses.gpl2Only; }; sk = buildOfficialDict { @@ -777,6 +873,11 @@ in rec { fullName = "Slovak"; filename = "aspell6"; sha256 = "19k0m1v5pcf7xr4lxgjkzqkdlks8nyb13bvi1n7521f3i4lhma66"; + meta.license = with lib.licenses; [ + lgpl21Only + gpl2Only + mpl11 + ]; }; sl = buildOfficialDict { @@ -785,6 +886,7 @@ in rec { fullName = "Slovenian"; filename = "aspell"; sha256 = "1l9kc5g35flq8kw9jhn2n0bjb4sipjs4qkqzgggs438kywkx2rp5"; + meta.license = lib.licenses.gpl2Only; }; sr = buildOfficialDict { @@ -793,6 +895,7 @@ in rec { fullName = "Serbian"; filename = "aspell6"; sha256 = "12cj01p4nj80cpf7m3s4jsaf0rsfng7s295j9jfchcq677xmhpkh"; + meta.license = lib.licenses.lgpl21Only; }; sv = buildOfficialDict { @@ -801,6 +904,7 @@ in rec { fullName = "Swedish"; filename = "aspell"; sha256 = "02jwkjhr32kvyibnyzgx3smbnm576jwdzg3avdf6zxwckhy5fw4v"; + meta.license = lib.licenses.lgpl21Only; }; sw = buildOfficialDict { @@ -809,6 +913,7 @@ in rec { fullName = "Swahili"; filename = "aspell"; sha256 = "15zjh7hdj2b4dgm5bc12w1ims9q357p1q3gjalspnyn5gl81zmby"; + meta.license = lib.licenses.lgpl21Only; }; ta = buildOfficialDict { @@ -817,6 +922,7 @@ in rec { fullName = "Tamil"; filename = "aspell6"; sha256 = "0sj8ygjsyvnr93cs6324y7az7k2vyw7rjxdc9vnm7z60lbqm5xaj"; + meta.license = lib.licenses.gpl2Only; }; te = buildOfficialDict { @@ -825,6 +931,7 @@ in rec { fullName = "Telugu"; filename = "aspell6"; sha256 = "0pgcgxz7dz34zxp9sb85jjzbg3ky6il5wmhffz6ayrbsfn5670in"; + meta.license = lib.licenses.gpl2Only; }; tet = buildOfficialDict { @@ -833,6 +940,7 @@ in rec { fullName = "Tetum"; filename = "aspell5"; sha256 = "17n0y4fhjak47j9qnqf4m4z6zra6dn72rwhp7ig0hhlgqk4ldmcx"; + meta.license = lib.licenses.gpl2Only; }; tk = buildOfficialDict { @@ -841,6 +949,7 @@ in rec { fullName = "Turkmen"; filename = "aspell5"; sha256 = "02vad4jqhr0xpzqi5q5z7z0xxqccbn8j0c5dhpnm86mnr84l5wl6"; + meta.license = lib.licenses.gpl2Only; }; tl = buildOfficialDict { @@ -849,6 +958,7 @@ in rec { fullName = "Tagalog"; filename = "aspell5"; sha256 = "1kca6k7qnpfvvwjnq5r1n242payqsjy96skmw78m7ww6d0n5vdj8"; + meta.license = lib.licenses.gpl2Only; }; tn = buildOfficialDict { @@ -857,6 +967,7 @@ in rec { fullName = "Setswana"; filename = "aspell5"; sha256 = "0q5x7c6z88cn0kkpk7q1craq34g4g03v8x3xcj5a5jia3l7c5821"; + meta.license = lib.licenses.gpl2Only; }; tr = buildOfficialDict { @@ -865,6 +976,7 @@ in rec { fullName = "Turkish"; filename = "aspell"; sha256 = "0jpvpm96ga7s7rmsm6rbyrrr22b2dicxv2hy7ysv5y7bbq757ihb"; + meta.license = lib.licenses.gpl2Only; }; uk = buildOfficialDict { @@ -873,6 +985,10 @@ in rec { fullName = "Ukrainian"; filename = "aspell6"; sha256 = "137i4njvnslab6l4s291s11xijr5jsy75lbdph32f9y183lagy9m"; + meta.license = with lib.licenses; [ + lgpl2Plus + gpl2Plus + ]; }; uz = buildOfficialDict { @@ -881,6 +997,7 @@ in rec { fullName = "Uzbek"; filename = "aspell6"; sha256 = "0sg3wlyply1idpq5ypyj7kgnaadaiskci1sqs811yhg2gzyc3092"; + meta.license = lib.licenses.gpl2Only; }; vi = buildOfficialDict { @@ -889,6 +1006,7 @@ in rec { fullName = "Vietnamese"; filename = "aspell6"; sha256 = "05vwgvf1cj45azhflywx69javqdvqd1f20swrc2d3c32pd9mvn1w"; + meta.license = lib.licenses.gpl2Only; }; wa = buildOfficialDict { @@ -897,6 +1015,7 @@ in rec { fullName = "Walloon"; filename = "aspell"; sha256 = "1r1zwz7xkx40dga9vf5wc9ja3jwk1dkpcr1kaa7wryvslf5al5ss"; + meta.license = lib.licenses.gpl2Only; }; yi = buildOfficialDict { @@ -905,6 +1024,7 @@ in rec { fullName = "Yiddish"; filename = "aspell6"; sha256 = "0mi842l4038bx3ll2wx9nz44nqrg1x46h5b02zigi1hbbddd6ycq"; + meta.license = lib.licenses.gpl2Only; }; zu = buildOfficialDict { @@ -913,6 +1033,7 @@ in rec { fullName = "Zulu"; filename = "aspell"; sha256 = "15k7gaxrnqnssdyk9l6g27dq317dqp9jz5yzafd25ri01g6mb8iz"; + meta.license = lib.licenses.lgpl21Only; }; ### Jargons @@ -937,6 +1058,7 @@ in rec { meta = { homepage = "https://mrsatterly.com/spelling.html"; + license = lib.licenses.wtfpl; # as a comment the source file }; }; @@ -945,13 +1067,13 @@ in rec { fullName = "English Scientific Jargon"; src1 = fetchurl { - url = "http://jpetrie.net/wp-content/uploads/custom_scientific_US.txt"; - sha256 = "1nf4py2mg0mlv9s5a7had2wn29z2v6bcca0fs6rbpdn4nqc4s7dm"; + url = "https://web.archive.org/web/20180806094650if_/http://jpetrie.net/wp-content/uploads/custom_scientific_US.txt"; + hash = "sha256-I5d/jf/5v9Nptu2H9qfvMBzSwJYoQOTEzJfQTxKoWN8="; }; src2 = fetchurl { - url = "http://jpetrie.net/wp-content/uploads/custom_scientific_UK.txt"; - sha256 = "0f88il1ds6qazy1ghxviqcwsywrbf6pzl2lmzf4f3qvhdfb6f1y0"; + url = "https://web.archive.org/web/20180131231829if_/http://jpetrie.net/wp-content/uploads/custom_scientific_UK.txt"; + hash = "sha256-oT4nUiev5q4QjHeuF8jNVBcyyHE9fdH9+uDMkZsOWp8="; }; langInputs = [ en ]; @@ -965,7 +1087,9 @@ in rec { installPhase = "aspell-install en_US-science en_GB-science"; meta = { - homepage = "http://www.jpetrie.net/scientific-word-list-for-spell-checkersspelling-dictionaries/"; + homepage = "https://web.archive.org/web/20210425104207/http://www.jpetrie.net/scientific-word-list-for-spell-checkersspelling-dictionaries/"; + # no license is given so we have to assume it is unfree + license = lib.licenses.unfree; }; }; diff --git a/pkgs/development/libraries/audio/roc-toolkit/default.nix b/pkgs/development/libraries/audio/roc-toolkit/default.nix index cbb580413c2b0..4654e29a835fd 100644 --- a/pkgs/development/libraries/audio/roc-toolkit/default.nix +++ b/pkgs/development/libraries/audio/roc-toolkit/default.nix @@ -16,12 +16,14 @@ opensslSupport ? true, openssl, soxSupport ? true, - sox + sox, + libsndfileSupport ? true, + libsndfile }: stdenv.mkDerivation rec { pname = "roc-toolkit"; - version = "0.3.0"; + version = "0.4.0"; outputs = [ "out" "dev" ]; @@ -29,7 +31,7 @@ stdenv.mkDerivation rec { owner = "roc-streaming"; repo = "roc-toolkit"; rev = "v${version}"; - hash = "sha256-tC0rjb3eDtEciUk0NmVye+N//Y/RFsi5d3kFS031y8I="; + hash = "sha256-53irDq803dTg0YqtC1SOXmYNGypSMAEK+9HJ65pR5PA="; }; nativeBuildInputs = [ @@ -46,7 +48,8 @@ stdenv.mkDerivation rec { ++ lib.optional libunwindSupport libunwind ++ lib.optional pulseaudioSupport libpulseaudio ++ lib.optional opensslSupport openssl - ++ lib.optional soxSupport sox; + ++ lib.optional soxSupport sox + ++ lib.optional libsndfileSupport libsndfile; sconsFlags = [ "--build=${stdenv.buildPlatform.config}" @@ -56,6 +59,7 @@ stdenv.mkDerivation rec { lib.optional (!soxSupport) "--disable-sox" ++ lib.optional (!libunwindSupport) "--disable-libunwind" ++ lib.optional (!pulseaudioSupport) "--disable-pulseaudio" ++ + lib.optional (!libsndfileSupport) "--disable-sndfile" ++ (if (!openfecSupport) then ["--disable-openfec"] else [ "--with-libraries=${openfec}/lib" diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 9a9b774ad265e..e7915ad652144 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -11,6 +11,7 @@ , config , guiSupport ? false , libX11 +, enableShared ? !stdenv.hostPlatform.isStatic # dlib has a build system that forces the user to choose between either shared or static libraries. See https://github.com/davisking/dlib/issues/923#issuecomment-2175865174 , sse4Support ? stdenv.hostPlatform.sse4_1Support , avxSupport ? stdenv.hostPlatform.avxSupport , cudaSupport ? config.cudaSupport @@ -32,6 +33,7 @@ ''; cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" enableShared) (lib.cmakeBool "USE_SSE4_INSTRUCTIONS" sse4Support) (lib.cmakeBool "USE_AVX_INSTRUCTIONS" avxSupport) (lib.cmakeBool "DLIB_USE_CUDA" cudaSupport) diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix index 370b4267bdb45..1afdd23923ddf 100644 --- a/pkgs/development/libraries/ffms/default.nix +++ b/pkgs/development/libraries/ffms/default.nix @@ -3,19 +3,19 @@ , fetchFromGitHub , autoreconfHook , pkg-config -, ffmpeg_4 +, ffmpeg , zlib }: stdenv.mkDerivation rec { pname = "ffms"; - version = "2.40"; + version = "5.0"; src = fetchFromGitHub { owner = "FFMS"; repo = "ffms2"; rev = version; - sha256 = "sha256-3bPxt911T0bGpAIS2RxBjo+VV84xW06eKcCj3ZAcmvw="; + sha256 = "sha256-Ildl8hbKSFGh4MUBK+k8uYMDrOZD9NSMdPAWIIaGy4E="; }; env.NIX_CFLAGS_COMPILE = "-fPIC"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - ffmpeg_4 + ffmpeg zlib ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/FFMS/ffms2/"; + homepage = "https://github.com/FFMS/ffms2"; description = "FFmpeg based source library for easy frame accurate access"; mainProgram = "ffmsindex"; license = licenses.mit; diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 226cc1ebd3494..d6c38b555dd6e 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.4.15"; + version = "1.4.17"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - hash = "sha256-32GhThVaLjIkCfHAaPWtZjZJ8Cmk7LM6KEHxVSYIrEg="; + hash = "sha256-P3CoRV6zopAtQDmtkbk0o0jKHu4jpKkqPeCCSQWn0aI="; }; buildInputs = [ diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index e7a9994888275..f8bf3f7c075aa 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -80,20 +80,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal"; - version = "3.8.5"; + version = "3.9.0"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${finalAttrs.version}"; - hash = "sha256-Z+mYlyOX9vJ772qwZMQfCbD/V7RL6+9JLHTzoZ55ot0="; + hash = "sha256-xEekgF9GzsPYkwk7Nny9b1DMLTxBqTSdudYxaz4jl/c="; }; patches = [ - # bump java source option to fix build with JDK 21 + # HDF5: add support for libhdf5 >= 1.14.4.2 when built with Float16 (fetchpatch { - url = "https://github.com/OSGeo/gdal/commit/ca2eb4130750b0e6365f738a5f8ff77081f5c5bb.patch"; - sha256 = "sha256-wShYm9yA7twJR72co+Tvf/IuYXqbI0OrjWl0uqC3bwo="; + url = "https://github.com/OSGeo/gdal/commit/16ade8253f26200246abb5ab24d17e18216e7a11.patch"; + sha256 = "sha256-N6YqfcOUWeaJXVE9RUo1dzulxqIY5Q/UygPnZHau3Lc="; }) ]; @@ -229,8 +229,8 @@ stdenv.mkDerivation (finalAttrs: { export GDAL_DOWNLOAD_TEST_DATA=OFF # allows to skip tests that fail because of file handle leak # the issue was not investigated - # https://github.com/OSGeo/gdal/blob/v3.7.0/autotest/gdrivers/bag.py#L61 - export BUILD_NAME=fedora + # https://github.com/OSGeo/gdal/blob/v3.9.0/autotest/gdrivers/bag.py#L54 + export CI=1 ''; nativeInstallCheckInputs = with python3.pkgs; [ pytestCheckHook diff --git a/pkgs/development/libraries/httplib/default.nix b/pkgs/development/libraries/httplib/default.nix index 3fe076c39b6fb..95c15fdc610af 100644 --- a/pkgs/development/libraries/httplib/default.nix +++ b/pkgs/development/libraries/httplib/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "httplib"; - version = "0.15.3"; + version = "0.16.0"; src = fetchFromGitHub { owner = "yhirose"; repo = "cpp-httplib"; rev = "v${version}"; - hash = "sha256-+YAjmsZvBkOk5bsjE07weTNUmevHd1ZXP0bv5QbkZMs="; + hash = "sha256-1w7uu2E4YIcGWNq//BZ2wtDKj9/tgmIhkJgadvCKmVg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix index 62deaeb1c2815..18057753efbd0 100644 --- a/pkgs/development/libraries/iniparser/default.nix +++ b/pkgs/development/libraries/iniparser/default.nix @@ -1,51 +1,79 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib +, stdenv +, fetchFromGitLab +, fetchpatch +, fetchFromGitHub +, substituteAll +, symlinkJoin +, cmake +, doxygen +, ruby +, validatePkgConfig +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "iniparser"; - version = "4.1"; + version = "4.2.3"; - src = fetchFromGitHub { - owner = "ndevilla"; + src = fetchFromGitLab { + owner = "iniparser"; repo = "iniparser"; - rev = "v${version}"; - sha256 = "0dhab6pad6wh816lr7r3jb6z273njlgw2vpw8kcfnmi7ijaqhnr5"; + rev = "v${finalAttrs.version}"; + hash = "sha256-rCp9whYPYmVd7saVFILmpdn041u6fYGqe1/Oqc7RaeA="; }; - patches = ./no-usr.patch; + patches = [ + (fetchpatch { + name = "fix-paths-pkgconfig-file.patch"; + url = "https://gitlab.com/iniparser/iniparser/-/commit/6a76cd5e97b32014b22d87039bf6f4ee425c79a2.patch"; + hash = "sha256-KlTxeOzwBZiLNmuwbbem5c/xspxsflyYfeUaQnGyarI="; + }) + ] ++ lib.optionals finalAttrs.doCheck [ + (substituteAll { + # Do not let cmake's fetchContent download unity + src = ./remove-fetchcontent-usage.patch; + unitySrc = symlinkJoin { + name = "unity-with-iniparser-config"; + paths = [ + (fetchFromGitHub { + owner = "throwtheswitch"; + repo = "unity"; + rev = "v2.6.0"; + hash = "sha256-SCcUGNN/UJlu3ALJiZ9bQKxYRZey3cm9QG+NOehp6Ow="; + }) + ]; + postBuild = '' + ln -s ${finalAttrs.src}/test/unity_config.h $out/src/unity_config.h + ''; + }; + }) + ]; - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace Makefile \ - --replace -Wl,-soname= -Wl,-install_name, - ''; - - doCheck = true; - preCheck = "patchShebangs test/make-tests.sh"; - - installPhase = '' - mkdir -p $out/lib + nativeBuildInputs = [ cmake doxygen validatePkgConfig ] ++ lib.optionals finalAttrs.doCheck [ ruby ]; - mkdir -p $out/include - cp src/*.h $out/include + cmakeFlags = [ + "-DBUILD_TESTING=${if finalAttrs.doCheck then "ON" else "OFF"}" + ]; - mkdir -p $out/share/doc/${pname}-${version} - for i in AUTHORS INSTALL LICENSE README.md; do - bzip2 -c -9 $i > $out/share/doc/${pname}-${version}/$i.bz2; - done; - cp -r html $out/share/doc/${pname}-${version} + doCheck = false; - cp libiniparser.a $out/lib - cp libiniparser.so.1 $out/lib - ln -s libiniparser.so.1 $out/lib/libiniparser.so - - mkdir -p $out/lib/pkgconfig - substituteAll ${./iniparser.pc.in} $out/lib/pkgconfig/iniparser.pc + postFixup = '' + ln -sv $out/include/iniparser/*.h $out/include/ ''; + passthru.tests = { + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + iniparser-with-tests = finalAttrs.overrideAttrs (_: { doCheck = true; }); + }; + meta = with lib; { - inherit (src.meta) homepage; + homepage = "https://gitlab.com/iniparser/iniparser"; description = "Free standalone ini file parsing library"; + changelog = "https://gitlab.com/iniparser/iniparser/-/releases/v${finalAttrs.version}"; license = licenses.mit; platforms = platforms.unix; + pkgConfigModules = [ "iniparser" ]; maintainers = [ maintainers.primeos ]; }; -} +}) diff --git a/pkgs/development/libraries/iniparser/iniparser.pc.in b/pkgs/development/libraries/iniparser/iniparser.pc.in deleted file mode 100644 index fb94188fff711..0000000000000 --- a/pkgs/development/libraries/iniparser/iniparser.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -prefix=@out@ -exec_prefix=@out@ -libdir=${exec_prefix}/lib -includedir=${prefix}/include -datarootdir=${prefix}/share -datadir=${datarootdir} - -Name: libiniparser -Description: Iniparser library -Version: @version@ -Libs: -L${libdir} -liniparser -Cflags: -I${includedir} diff --git a/pkgs/development/libraries/iniparser/no-usr.patch b/pkgs/development/libraries/iniparser/no-usr.patch deleted file mode 100644 index a3c568cdde436..0000000000000 --- a/pkgs/development/libraries/iniparser/no-usr.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/Makefile 2017-10-20 20:30:41.494608284 +0200 -+++ b/Makefile 2017-10-20 20:33:22.279212026 +0200 -@@ -20,8 +20,8 @@ - ARFLAGS = rcv - - SHLD = ${CC} ${CFLAGS} --LDSHFLAGS = -shared -Wl,-Bsymbolic --LDFLAGS += -Wl,-rpath -Wl,/usr/lib -Wl,-rpath,/usr/lib -+LDSHFLAGS = -shared -+LDFLAGS = - - # .so.0 is for version 3.x, .so.1 is 4.x - SO_TARGET ?= libiniparser.so.1 diff --git a/pkgs/development/libraries/iniparser/remove-fetchcontent-usage.patch b/pkgs/development/libraries/iniparser/remove-fetchcontent-usage.patch new file mode 100644 index 0000000000000..db96c37e6b2ca --- /dev/null +++ b/pkgs/development/libraries/iniparser/remove-fetchcontent-usage.patch @@ -0,0 +1,17 @@ +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index b28d151..33a6bcf 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -28,10 +28,8 @@ set(FETCHCONTENT_QUIET OFF) + + FetchContent_Declare( + unity +- GIT_REPOSITORY "https://github.com/throwtheswitch/unity.git" +- GIT_PROGRESS TRUE +- PATCH_COMMAND ${CMAKE_COMMAND} -E copy +- ${CMAKE_CURRENT_LIST_DIR}/unity_config.h ./src/) ++ SOURCE_DIR @unitySrc@ ++) + + FetchContent_MakeAvailable(unity) + target_compile_definitions(unity PUBLIC UNITY_INCLUDE_CONFIG_H) diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 483b6c46a0cec..73bb856de4163 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -89,6 +89,8 @@ stdenv.mkDerivation { ]; configureFlags = [ + "--with-hdbdir=/var/lib/heimdal" + "--with-libedit-include=${libedit.dev}/include" "--with-libedit-lib=${libedit}/lib" "--with-berkeley-db-include=${db.dev}/include" diff --git a/pkgs/development/libraries/lcrq/default.nix b/pkgs/development/libraries/lcrq/default.nix index 3829bbff6ce51..3d1818cf779db 100644 --- a/pkgs/development/libraries/lcrq/default.nix +++ b/pkgs/development/libraries/lcrq/default.nix @@ -4,7 +4,7 @@ lib }: stdenv.mkDerivation (finalAttrs: { - name = "lcrq"; + pname = "lcrq"; version = "0.1.2"; src = fetchFromGitea { diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index 195f77d19231e..4b00de8115735 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, boost, cmake, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }: +{ lib, stdenv, fetchurl, fetchpatch, boost, cmake, libgeotiff, libtiff, laszip_2, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "libLAS"; @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ boost libgeotiff libtiff LASzip2 ]; + buildInputs = [ boost libgeotiff libtiff laszip_2 ]; cmakeFlags = [ "-DWITH_LASZIP=ON" # libLAS is currently not compatible with LASzip 3, # see https://github.com/libLAS/libLAS/issues/144. - "-DLASZIP_INCLUDE_DIR=${LASzip2}/include" + "-DLASZIP_INCLUDE_DIR=${laszip_2}/include" "-DCMAKE_EXE_LINKER_FLAGS=-pthread" ]; diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 9e80d17b8a033..fa8b6b65950bc 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -35,6 +35,9 @@ stdenv.mkDerivation rec { url = "https://gitlab.freedesktop.org/libbsd/libbsd.git"; }; + # Fix undefined reference errors with version script under LLVM. + configureFlags = lib.optionals (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") [ "LDFLAGS=-Wl,--undefined-version" ]; + meta = with lib; { description = "Common functions found on BSD systems"; homepage = "https://libbsd.freedesktop.org/"; diff --git a/pkgs/development/libraries/libdevil/0001-il_endian.h-Fix-endian-handling.patch b/pkgs/development/libraries/libdevil/0001-il_endian.h-Fix-endian-handling.patch new file mode 100644 index 0000000000000..a1826354f88ba --- /dev/null +++ b/pkgs/development/libraries/libdevil/0001-il_endian.h-Fix-endian-handling.patch @@ -0,0 +1,35 @@ +From 85ca659a59ae5be6fc0824b0684967ec94727e2a Mon Sep 17 00:00:00 2001 +From: toonn <toonn@toonn.io> +Date: Wed, 12 Jun 2024 11:39:35 +0000 +Subject: [PATCH] il_endian.h: Fix endian handling + +Based on https://sourceforge.net/p/resil/tickets/8/, which has also been +incorporated in the MacPort for libdevil 1.7.8, +https://trac.macports.org/export/154482/trunk/dports/devel/libdevil/files/patch-src-IL-include-il_endian.h.diff, +but updated for the header included in release 1.8.0 of libdevil. +--- + src-IL/include/il_endian.h | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src-IL/include/il_endian.h b/src-IL/include/il_endian.h +index c4e6d86..a3cd57f 100644 +--- a/src-IL/include/il_endian.h ++++ b/src-IL/include/il_endian.h +@@ -23,9 +23,13 @@ extern "C" { + #ifndef __BIG_ENDIAN__ + #define __BIG_ENDIAN__ 1 + #endif ++#else ++#ifndef __LITTLE_ENDIAN__ ++#define __LITTLE_ENDIAN__ 1 ++#endif + #endif + +-#if (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __BIG_ENDIAN__) \ ++#if (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) \ + || (defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)) + #undef __LITTLE_ENDIAN__ + #define Short(s) iSwapShort(s) +-- +2.44.0 + diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index ea030e9c6359c..63ca4877da65f 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, cmake , libjpeg , libpng , libmng @@ -18,16 +19,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "libdevil"; - version = "1.7.8"; + version = "1.8.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://sourceforge/openil/DevIL-${finalAttrs.version}.tar.gz"; - sha256 = "1zd850nn7nvkkhasrv7kn17kzgslr5ry933v6db62s4lr0zzlbv8"; + hash = "sha256-AHWXPufdifBQeHPiWArHgzZFLSnTSgcTSyCPROL+twk="; }; - nativeBuildInputs = [ pkg-config ]; + sourceRoot = "DevIL/DevIL"; + + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr ] ++ lib.optionals withXorg [ libX11 libGL ] @@ -38,29 +41,17 @@ stdenv.mkDerivation (finalAttrs: { CXXFLAGS = lib.optionalString stdenv.cc.isClang "-Wno-register"; preConfigure = '' - sed -i 's, -std=gnu99,,g' configure sed -i 's,malloc.h,stdlib.h,g' src-ILU/ilur/ilur.c - '' + lib.optionalString stdenv.cc.isClang '' - sed -i 's/libIL_la_CXXFLAGS = $(AM_CFLAGS)/libIL_la_CXXFLAGS =/g' lib/Makefile.in - ''; - - postConfigure = '' - sed -i '/RESTRICT_KEYWORD/d' include/IL/config.h ''; patches = [ - (fetchurl { - url = "https://sources.debian.org/data/main/d/devil/1.7.8-10/debian/patches/03_CVE-2009-3994.diff"; - sha256 = "0qkx2qfv02igbrmsn6z5a3lbrbwjfh3rb0c2sj54wy0j1f775hbc"; - }) - ./ftbfs-libpng15.patch - ./il_endian.h.patch + ./0001-il_endian.h-Fix-endian-handling.patch ]; enableParallelBuilding = true; postPatch = '' - for a in test/Makefile.in test/format_test/format_checks.sh.in ; do + for a in test/Makefile.am test/format_test/format_checks.sh.in ; do substituteInPlace $a \ --replace /bin/bash ${runtimeShell} done diff --git a/pkgs/development/libraries/libdevil/ftbfs-libpng15.patch b/pkgs/development/libraries/libdevil/ftbfs-libpng15.patch deleted file mode 100644 index 5fc53c2dc6a70..0000000000000 --- a/pkgs/development/libraries/libdevil/ftbfs-libpng15.patch +++ /dev/null @@ -1,31 +0,0 @@ -Source: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=649554 ---- devil-1.7.8.orig/src-IL/src/il_icon.c -+++ devil-1.7.8/src-IL/src/il_icon.c -@@ -525,7 +525,11 @@ - - // Expand low-bit-depth grayscale images to 8 bits - if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ png_set_expand_gray_1_2_4_to_8(ico_png_ptr); -+#else - png_set_gray_1_2_4_to_8(ico_png_ptr); -+#endif - } - - // Expand RGB images with transparency to full alpha channels -only in patch2: -unchanged: ---- devil-1.7.8.orig/src-IL/src/il_png.c -+++ devil-1.7.8/src-IL/src/il_png.c -@@ -278,7 +278,11 @@ - - // Expand low-bit-depth grayscale images to 8 bits - if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { -+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 -+ png_set_expand_gray_1_2_4_to_8(png_ptr); -+#else - png_set_gray_1_2_4_to_8(png_ptr); -+#endif - } - - // Expand RGB images with transparency to full alpha channels diff --git a/pkgs/development/libraries/libdevil/il_endian.h.patch b/pkgs/development/libraries/libdevil/il_endian.h.patch deleted file mode 100644 index c220e6802fd9f..0000000000000 --- a/pkgs/development/libraries/libdevil/il_endian.h.patch +++ /dev/null @@ -1,27 +0,0 @@ -Source: http://sourceforge.net/p/resil/tickets/8/ ---- devil-1.7.8.orig/src-IL/include/il_endian.h.orig 2009-03-08 01:10:08.000000000 -0600 -+++ devil-1.7.8/src-IL/include/il_endian.h 2013-11-03 01:52:37.000000000 -0600 -@@ -19,9 +19,13 @@ - #ifndef __BIG_ENDIAN__ - #define __BIG_ENDIAN__ 1 - #endif -+#else -+ #ifndef __LITTLE_ENDIAN__ -+ #define __LITTLE_ENDIAN__ 1 -+ #endif - #endif - --#if (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __BIG_ENDIAN__) \ -+#if (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) \ - || (defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)) - #undef __LITTLE_ENDIAN__ - #define Short(s) iSwapShort(s) -@@ -39,8 +43,6 @@ - #define BigDouble(d) - #else - #undef __BIG_ENDIAN__ -- #undef __LITTLE_ENDIAN__ // Not sure if it's defined by any compiler... -- #define __LITTLE_ENDIAN__ - #define Short(s) - #define UShort(s) - #define Int(i) diff --git a/pkgs/development/libraries/libdvdnav/4.2.1.nix b/pkgs/development/libraries/libdvdnav/4.2.1.nix index 5ee1d423fd3ff..852ab2ea73099 100644 --- a/pkgs/development/libraries/libdvdnav/4.2.1.nix +++ b/pkgs/development/libraries/libdvdnav/4.2.1.nix @@ -12,12 +12,31 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [libdvdread]; - configureScript = "./configure2"; # wtf? + # The upstream supports two configuration workflow: + # one is to generate ./configure via `autoconf`, + # the other is to run ./configure2. + # ./configure2 is a configureation script included in the upstream source + # that supports common "--<name>" flags and generates config.mak and config.h. + # See INSTALL inside the upstream source for detail. + configureScript = "./configure2"; + + configureFlags = [ + "--cc=${stdenv.cc.targetPrefix}cc" + # Let's strip the binaries ourselves, + # as unprefixed `strip` command is not available during cross compilation. + "--disable-strip" + ]; preConfigure = '' mkdir -p $out ''; + makeFlags = [ + "AR=${stdenv.cc.targetPrefix}ar" + "LD=${stdenv.cc.targetPrefix}ld" + "RANLIB=${stdenv.cc.targetPrefix}ranlib" + ]; + meta = { homepage = "http://dvdnav.mplayerhq.hu/"; description = "Library that implements DVD navigation features such as DVD menus"; diff --git a/pkgs/development/libraries/libgourou/default.nix b/pkgs/development/libraries/libgourou/default.nix index 78b5654873bdb..bfd483e5d31c8 100644 --- a/pkgs/development/libraries/libgourou/default.nix +++ b/pkgs/development/libraries/libgourou/default.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation rec { - name = "libgourou"; + pname = "libgourou"; version = "0.8.2"; src = fetchzip { - url = "https://indefero.soutade.fr/p/${name}/source/download/v${version}/"; + url = "https://indefero.soutade.fr/p/libgourou/source/download/v${version}/"; sha256 = "sha256-adkrvBCgN07Ir+J3JFCy+X9p9609lj1w8nElrlHXTxc"; extension = "zip"; }; diff --git a/pkgs/development/libraries/liblxi/default.nix b/pkgs/development/libraries/liblxi/default.nix index 8531c8ea7c4c5..24c454d4ee7e8 100644 --- a/pkgs/development/libraries/liblxi/default.nix +++ b/pkgs/development/libraries/liblxi/default.nix @@ -3,17 +3,24 @@ , libtirpc, rpcsvc-proto, avahi, libxml2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "liblxi"; version = "1.20"; src = fetchFromGitHub { owner = "lxi-tools"; repo = "liblxi"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-jS0huNkbyKrsJ3NkenrYtjkzLakOsTJpwlgSo98ribE="; }; + postPatch = '' + # needed by darwin + sed -e 1i'#include <string.h>' \ + -e 1i'#include <stdlib.h>' \ + -i src/bonjour.c + ''; + nativeBuildInputs = [ meson ninja cmake pkg-config rpcsvc-proto ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ @@ -36,4 +43,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = [ maintainers.vq ]; }; -} +}) diff --git a/pkgs/development/libraries/libplctag/default.nix b/pkgs/development/libraries/libplctag/default.nix index 7a26cfe92705c..1e0fa3160e5a1 100644 --- a/pkgs/development/libraries/libplctag/default.nix +++ b/pkgs/development/libraries/libplctag/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libplctag"; - version = "2.5.6"; + version = "2.6.0"; src = fetchFromGitHub { owner = "libplctag"; repo = "libplctag"; rev = "v${version}"; - sha256 = "sha256-xrXgLdGY7pQ5m+X5kmkL6BRHJCxp7PYJuuowC+i2qxM="; + sha256 = "sha256-+lsRYKA1FIXQXv0nfDNCAqIbqPunrzlpSC5FoF3VIsg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 4a8c52ae279dd..11e3fb31604f7 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -20,7 +20,11 @@ in stdenv.mkDerivation (finalAttrs: { url = "mirror://sourceforge/libpng/libpng-${finalAttrs.version}.tar.xz"; hash = "sha256-alygZSOSotfJ2yrltAIQhDwLvAgcvUEIJasAzFnxSmw="; }; - postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1"; + postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1" + + lib.optionalString stdenv.isFreeBSD '' + + sed -i 1i'int feenableexcept(int __mask);' contrib/libtests/pngvalid.c + ''; outputs = [ "out" "dev" "man" ]; outputBin = "dev"; diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index 73565ba0311b0..fa419830f3c7c 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for real-time communications with async IO support and a complete SIP stack"; homepage = "https://github.com/baresip/re"; - maintainers = with lib.maintainers; [ elohmeier raskin ]; + maintainers = with lib.maintainers; [ raskin ]; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/libraries/librecast/default.nix b/pkgs/development/libraries/librecast/default.nix index 045b0bb309db0..df053e0ad9031 100644 --- a/pkgs/development/libraries/librecast/default.nix +++ b/pkgs/development/libraries/librecast/default.nix @@ -6,7 +6,7 @@ libsodium, }: stdenv.mkDerivation (finalAttrs: { - name = "librecast"; + pname = "librecast"; version = "0.8.0"; src = fetchFromGitea { diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix index 723708d353ede..10dba7e7a59dd 100644 --- a/pkgs/development/libraries/librem/default.nix +++ b/pkgs/development/libraries/librem/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for real-time audio and video processing"; homepage = "https://github.com/baresip/rem"; - maintainers = with lib.maintainers; [ elohmeier raskin ]; + maintainers = with lib.maintainers; [ raskin ]; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix index 26eb29493a494..095406cd5fbb9 100644 --- a/pkgs/development/libraries/libsidplayfp/default.nix +++ b/pkgs/development/libraries/libsidplayfp/default.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "libsidplayfp"; - version = "2.7.1"; + version = "2.8.0"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "libsidplayfp"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-NYdV70YEepjGMmeTALTQvlRvK3R7JjA4VJYYjOwO4AA="; + hash = "sha256-qZharhEZ16q3Vd2PwVsKQaP/b6bT/okwEPKKwvRl5D8="; }; outputs = [ diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index dda6b13c1bf6c..5f5fc710d14dc 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -54,12 +54,26 @@ let else if stdenv.hostPlatform.osxMinVersion == "10.5" then "9" else "8"; + cpu = + /**/ if stdenv.hostPlatform.isArmv7 then "armv7" + else if stdenv.hostPlatform.isAarch64 then "arm64" + else if stdenv.hostPlatform.isx86_32 then "x86" + else stdenv.hostPlatform.parsed.cpu.name; + kernel = # Build system doesn't understand BSD, so pretend to be Linux. /**/ if stdenv.isBSD then "linux" else if stdenv.isDarwin then "darwin${darwinVersion}" else stdenv.hostPlatform.parsed.kernel.name; + isGeneric = + /**/ (stdenv.hostPlatform.isPower && stdenv.hostPlatform.isLittleEndian) + || stdenv.hostPlatform.parsed.cpu.name == "armv6l"; + + target = + /**/ if (stdenv.isBSD || stdenv.hostPlatform != stdenv.buildPlatform) then + (if isGeneric then "generic-gnu" else "${cpu}-${kernel}-gcc") + else null; in assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport; @@ -163,8 +177,8 @@ stdenv.mkDerivation rec { (enableFeature (experimentalSpatialSvcSupport || experimentalFpMbStatsSupport || experimentalEmulateHardwareSupport) "experimental") - ] ++ optionals (stdenv.isBSD || stdenv.hostPlatform != stdenv.buildPlatform) [ - "--force-target=${stdenv.hostPlatform.parsed.cpu.name}-${kernel}-gcc" + ] ++ optionals (target != null) [ + "--target=${target}" (lib.optionalString stdenv.hostPlatform.isCygwin "--enable-static-msvcrt") ] # Experimental features ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc" diff --git a/pkgs/development/libraries/mapnik/datasource-ogr-test-should-fail.patch b/pkgs/development/libraries/mapnik/datasource-ogr-test-should-fail.patch deleted file mode 100644 index 1df64216d20b3..0000000000000 --- a/pkgs/development/libraries/mapnik/datasource-ogr-test-should-fail.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/test/unit/datasource/ogr.cpp b/test/unit/datasource/ogr.cpp -index 8441ecc55..8dabc67b0 100644 ---- a/test/unit/datasource/ogr.cpp -+++ b/test/unit/datasource/ogr.cpp -@@ -30,7 +30,7 @@ - #include <mapnik/image_util.hpp> - #include <mapnik/datasource_cache.hpp> - --TEST_CASE("ogr") -+TEST_CASE("ogr", "[!shouldfail]") - { - const bool have_ogr_plugin = mapnik::datasource_cache::instance().plugin_registered("ogr"); - if (have_ogr_plugin) diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 301b7946d2bce..0428dd585c661 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -22,17 +22,19 @@ , zlib , catch2 , postgresql +, protozero +, sparsehash }: stdenv.mkDerivation rec { pname = "mapnik"; - version = "unstable-2023-11-28"; + version = "4.0.0"; src = fetchFromGitHub { owner = "mapnik"; repo = "mapnik"; - rev = "2e1b32512b1f8b52331994f2a809d8a383c0c984"; - hash = "sha256-qGdUfu6gFWum/Id/W3ICeGZroMQ3Tz9PQf1tt+gaaXM="; + rev = "v${version}"; + hash = "sha256-CNFNGMJU3kzkRrOGsf8/uv5ebHPEQ0tkA+5OubRVEjs="; fetchSubmodules = true; }; @@ -40,6 +42,8 @@ stdenv.mkDerivation rec { substituteInPlace configure \ --replace '$PYTHON scons/scons.py' ${buildPackages.scons}/bin/scons rm -r scons + # Remove bundled 'sparsehash' directory in favor of 'sparsehash' package + rm -r deps/mapnik/sparsehash ''; # a distinct dev output makes python-mapnik fail @@ -57,11 +61,10 @@ stdenv.mkDerivation rec { src = ./catch2-src.patch; catch2_src = catch2.src; }) - # Disable broken test - # See discussion: https://github.com/mapnik/mapnik/issues/4329#issuecomment-1248778398 - ./datasource-ogr-test-should-fail.patch # Account for full paths when generating libmapnik.pc ./export-pkg-config-full-paths.patch + # Use 'sparsehash' package. + ./use-sparsehash-package.patch ]; nativeBuildInputs = [ cmake pkg-config ]; @@ -83,21 +86,31 @@ stdenv.mkDerivation rec { zlib libxml2 postgresql + protozero + sparsehash ]; cmakeFlags = [ - # Would require qt otherwise. - "-DBUILD_DEMO_VIEWER:BOOL=OFF" + # Save time by not building some development-related code. + (lib.cmakeBool "BUILD_BENCHMARK" false) + (lib.cmakeBool "BUILD_DEMO_CPP" false) + ## Would require QT otherwise. + (lib.cmakeBool "BUILD_DEMO_VIEWER" false) + # Use 'protozero' package. + (lib.cmakeBool "USE_EXTERNAL_MAPBOX_PROTOZERO" true) + # macOS builds fail when using memory mapped file cache. + (lib.cmakeBool "USE_MEMORY_MAPPED_FILE" (!stdenv.isDarwin)) ]; doCheck = true; # mapnik-config is currently not build with CMake. So we use the SCons for # this one. We can't add SCons to nativeBuildInputs though, as stdenv would - # then try to build everything with scons. + # then try to build everything with scons. C++17 is the minimum supported + # C++ version. preBuild = '' cd .. - ${buildPackages.scons}/bin/scons utils/mapnik-config + env CXX_STD=17 ${buildPackages.scons}/bin/scons utils/mapnik-config cd build ''; diff --git a/pkgs/development/libraries/mapnik/use-sparsehash-package.patch b/pkgs/development/libraries/mapnik/use-sparsehash-package.patch new file mode 100644 index 0000000000000..3bb5d3e996cfc --- /dev/null +++ b/pkgs/development/libraries/mapnik/use-sparsehash-package.patch @@ -0,0 +1,19 @@ +commit c1cea9e10ffec54d0f675478e541ee4a6e87f653 +Author: Tom Hughes <tom@compton.nu> +Date: Wed Jun 5 18:45:57 2013 +0100 + + Use system sparsehash + +diff --git a/include/mapnik/palette.hpp b/include/mapnik/palette.hpp +index 5f96272..44d06aa 100644 +--- a/include/mapnik/palette.hpp ++++ b/include/mapnik/palette.hpp +@@ -33,7 +33,7 @@ + #pragma GCC diagnostic push + #include <mapnik/warning_ignore.hpp> + #ifdef USE_DENSE_HASH_MAP +-#include <mapnik/sparsehash/dense_hash_map> ++#include <google/dense_hash_map> + using rgba_hash_table = google::dense_hash_map<unsigned int, unsigned char>; + #else + #include <unordered_map> diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index fb3709d2e0e2d..dff005d9eb1bc 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "mtxclient"; - version = "0.9.2"; + version = "0.10.0"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "mtxclient"; rev = "v${version}"; - hash = "sha256-r+bD2L5+3AwkdYa3FwsM+yf7V5w+6ZJC92CMdVeYLJQ="; + hash = "sha256-luWcbYCv5OM3aidxiO7glqD+VYnCZMElZYaPKbtvMYI="; }; postPatch = '' diff --git a/pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix b/pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix index 9eca4dbb93688..c2ffe6135fbb5 100644 --- a/pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix +++ b/pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix @@ -1,9 +1,12 @@ -{ stdenv, protobuf, nanopb }: +{ lib, stdenv, protobuf, nanopb }: stdenv.mkDerivation { name = "nanopb-test-message-with-annotations"; meta.timeout = 60; - src = ./.; + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ ./withannotations.proto ]; + }; # protoc requires any .proto file to be compiled to reside within it's # proto_path. By default the current directory is automatically added to the diff --git a/pkgs/development/libraries/nanopb/test-message-with-options/default.nix b/pkgs/development/libraries/nanopb/test-message-with-options/default.nix index 0030158df91b3..f6bf28f3b6457 100644 --- a/pkgs/development/libraries/nanopb/test-message-with-options/default.nix +++ b/pkgs/development/libraries/nanopb/test-message-with-options/default.nix @@ -1,9 +1,15 @@ -{ stdenv, protobuf, nanopb }: +{ lib, stdenv, protobuf, nanopb }: stdenv.mkDerivation { name = "nanopb-test-message-with-options"; meta.timeout = 60; - src = ./.; + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ + ./withoptions.proto + ./withoptions.options + ]; + }; # protoc requires any .proto file to be compiled to reside within it's # proto_path. By default the current directory is automatically added to the diff --git a/pkgs/development/libraries/nanopb/test-simple-proto2/default.nix b/pkgs/development/libraries/nanopb/test-simple-proto2/default.nix index d1d3e1a855a70..f8cd35cbf3979 100644 --- a/pkgs/development/libraries/nanopb/test-simple-proto2/default.nix +++ b/pkgs/development/libraries/nanopb/test-simple-proto2/default.nix @@ -1,9 +1,12 @@ -{ stdenv, protobuf, nanopb }: +{ lib, stdenv, protobuf, nanopb }: stdenv.mkDerivation { name = "nanopb-test-simple-proto2"; meta.timeout = 60; - src = ./.; + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ ./simple.proto ]; + }; # protoc requires any .proto file to be compiled to reside within it's # proto_path. By default the current directory is automatically added to the diff --git a/pkgs/development/libraries/nanopb/test-simple-proto3/default.nix b/pkgs/development/libraries/nanopb/test-simple-proto3/default.nix index 71507054458fe..d92698d21ece5 100644 --- a/pkgs/development/libraries/nanopb/test-simple-proto3/default.nix +++ b/pkgs/development/libraries/nanopb/test-simple-proto3/default.nix @@ -1,10 +1,12 @@ -{ stdenv, protobuf, nanopb }: +{ lib, stdenv, protobuf, nanopb }: stdenv.mkDerivation { name = "nanopb-test-simple-proto3"; meta.timeout = 60; - src = ./.; - + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ ./simple.proto ]; + }; # protoc requires any .proto file to be compiled to reside within it's # proto_path. By default the current directory is automatically added to the # proto_path. I tried using --proto_path ${./.} ${./simple.proto} and it did diff --git a/pkgs/development/libraries/nghttp3/default.nix b/pkgs/development/libraries/nghttp3/default.nix index 4981e1f0e85a9..cff650f5971df 100644 --- a/pkgs/development/libraries/nghttp3/default.nix +++ b/pkgs/development/libraries/nghttp3/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "nghttp3"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - hash = "sha256-MPycG8Fd7GJnp7WyFlGzbuTCYIF+xq6I7oeqXKFOehQ="; + hash = "sha256-ZbgByLTkQWd3gfWW2V1kkboblfF9v+0HcNhxrjYpX28="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index e3b8d5813b15c..25b35bd72fe47 100644 --- a/pkgs/development/libraries/ngtcp2/default.nix +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - hash = "sha256-Ez97uFzXvI7cE2TIk4/RCAwbAf+vXG1PlPaSvdSrcnE="; + hash = "sha256-alS6M4sSyyytnzu9RTjDAioqkafEmgt/HpFUQ4MniCI="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 59a3b49757932..586c4ddb94fc1 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/Reference/NSPR_functions"; + homepage = "https://firefox-source-docs.mozilla.org/nspr/index.html"; description = "Netscape Portable Runtime, a platform-neutral API for system-level and libc-like functions"; maintainers = with maintainers; [ ajs124 hexa ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix index 1fcf4a1f00e2a..639ff62887a0b 100644 --- a/pkgs/development/libraries/oneDNN/default.nix +++ b/pkgs/development/libraries/oneDNN/default.nix @@ -9,13 +9,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation (finalAttrs: { pname = "oneDNN"; - version = "3.4.1"; + version = "3.4.3"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${finalAttrs.version}"; - hash = "sha256-6iPcytsRWvDn2hg5tkSG6A3cv/aOhmEVd5rS2uOKCPk="; + hash = "sha256-Ak49oFZkWNVjt98KXKqBGwKh7nz13/FO5riY7MIDR8g="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/openvino/default.nix b/pkgs/development/libraries/openvino/default.nix index 280c1b7ef934c..14ad6c166e551 100644 --- a/pkgs/development/libraries/openvino/default.nix +++ b/pkgs/development/libraries/openvino/default.nix @@ -5,6 +5,7 @@ , cudaSupport ? opencv.cudaSupport or false # build +, scons , addOpenGLRunpath , autoPatchelfHook , cmake @@ -25,7 +26,7 @@ , protobuf , pugixml , snappy -, tbb +, tbb_2021_5 , cudaPackages }: @@ -36,6 +37,9 @@ let stdenv = gcc12Stdenv; + # prevent scons from leaking in the default python version + scons' = scons.override { python3 = python3Packages.python; }; + tbbbind_version = "2_5"; tbbbind = fetchurl { url = "https://storage.openvinotoolkit.org/dependencies/thirdparty/linux/tbbbind_${tbbbind_version}_static_lin_v4.tgz"; @@ -54,14 +58,14 @@ in stdenv.mkDerivation rec { pname = "openvino"; - version = "2024.1.0"; + version = "2024.2.0"; src = fetchFromGitHub { owner = "openvinotoolkit"; repo = "openvino"; rev = "refs/tags/${version}"; fetchSubmodules = true; - hash = "sha256-OOSxXpLjmhOgKvrSO6SmY7xLhJSzGXT8w/Y4FnfwTqU="; + hash = "sha256-HiKKvmqgbwW625An+Su0EOHqVrP18yvG2aOzrS0jWr4="; }; outputs = [ @@ -78,6 +82,7 @@ stdenv.mkDerivation rec { patchelf pkg-config python + scons' shellcheck ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc @@ -91,7 +96,9 @@ stdenv.mkDerivation rec { popd ''; - dontUseCmakeBuildDir = true; + dontUseSconsCheck = true; + dontUseSconsBuild = true; + dontUseSconsInstall = true; cmakeFlags = [ "-Wno-dev" @@ -109,7 +116,7 @@ stdenv.mkDerivation rec { (cmakeBool "ENABLE_SAMPLES" false) # features - (cmakeBool "ENABLE_INTEL_CPU" true) + (cmakeBool "ENABLE_INTEL_CPU" stdenv.isx86_64) (cmakeBool "ENABLE_JS" false) (cmakeBool "ENABLE_LTO" true) (cmakeBool "ENABLE_ONEDNN_FOR_GPU" false) @@ -125,8 +132,6 @@ stdenv.mkDerivation rec { (cmakeBool "ENABLE_SYSTEM_TBB" true) ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-Wno-narrowing"; - autoPatchelfIgnoreMissingDeps = [ "libngraph_backend.so" ]; @@ -140,7 +145,7 @@ stdenv.mkDerivation rec { opencv.cxxdev pugixml snappy - tbb + tbb_2021_5 ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ]; @@ -172,8 +177,7 @@ stdenv.mkDerivation rec { homepage = "https://docs.openvinotoolkit.org/"; license = with licenses; [ asl20 ]; platforms = platforms.all; - broken = (stdenv.isLinux && stdenv.isAarch64) # requires scons, then fails with *** Source directory cannot be under variant directory. - || stdenv.isDarwin; # Cannot find macos sdk + broken = stdenv.isDarwin; # Cannot find macos sdk maintainers = with maintainers; [ tfmoraes ]; }; } diff --git a/pkgs/development/libraries/pdal/default.nix b/pkgs/development/libraries/pdal/default.nix index 86d976531cb37..c035460fafae7 100644 --- a/pkgs/development/libraries/pdal/default.nix +++ b/pkgs/development/libraries/pdal/default.nix @@ -10,7 +10,7 @@ , curl , gdal , hdf5-cpp -, LASzip +, laszip , libe57format , libgeotiff , libtiff @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { curl gdal hdf5-cpp - LASzip + laszip libgeotiff libtiff libxml2 @@ -87,6 +87,12 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; disabledTests = [ + # Failing due to GDAL 3.9 change in coordinates precision. + # See: https://github.com/PDAL/PDAL/issues/4403 + # This test should be re-enabled once https://github.com/PDAL/PDAL/pull/4411 + # is merged ! + "pdal_io_ogr_writer_test" + # Tests failing due to TileDB library implementation, disabled also # by upstream CI. # See: https://github.com/PDAL/PDAL/blob/bc46bc77f595add4a6d568a1ff923d7fe20f7e74/.github/workflows/linux.yml#L81 diff --git a/pkgs/development/libraries/science/chemistry/harminv/default.nix b/pkgs/development/libraries/science/chemistry/harminv/default.nix index dc8289e14ce91..f9d8573ca6d5f 100644 --- a/pkgs/development/libraries/science/chemistry/harminv/default.nix +++ b/pkgs/development/libraries/science/chemistry/harminv/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "NanoComp"; repo = pname; rev = "v${version}"; - hash = "sha256-EXEt7l69etcBdDdEDlD1ODOdhTBZCVjgY1jhRUDd/W0="; + hash = "sha256-HV8xylK2IOvbONYGgyaqAabp6xA7/uvN4DU7upIlZh0="; }; # File is missing in the git checkout but required by autotools @@ -30,11 +30,13 @@ stdenv.mkDerivation rec { buildInputs = [ blas lapack ]; - configureFlags = [ "--enable-shared" ]; + configureFlags = [ + "--enable-shared" + "--enable-maintainer-mode" + ]; meta = with lib; { description = "Harmonic inversion algorithm of Mandelshtam: decompose signal into sum of decaying sinusoids"; - mainProgram = "GDSIIConvert"; homepage = "https://github.com/NanoComp/harminv"; license = with licenses; [ gpl2Only ]; maintainers = with maintainers; [ sheepforce markuskowa ]; diff --git a/pkgs/development/libraries/science/chemistry/mstore/default.nix b/pkgs/development/libraries/science/chemistry/mstore/default.nix index e187a9a9833f0..c77667a8d71ae 100644 --- a/pkgs/development/libraries/science/chemistry/mstore/default.nix +++ b/pkgs/development/libraries/science/chemistry/mstore/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "mstore"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "grimme-lab"; repo = pname; rev = "v${version}"; - hash = "sha256-dN2BulLS/ENRFVdJIrZRxgBV8S4d5+7BjTCGnhBbf4I="; + hash = "sha256-zfrxdrZ1Um52qTRNGJoqZNQuHhK3xM/mKfk0aBLrcjw="; }; nativeBuildInputs = [ gfortran meson ninja pkg-config python3 ]; diff --git a/pkgs/development/libraries/science/math/faiss/default.nix b/pkgs/development/libraries/science/math/faiss/default.nix index aedb240caadd7..59494fadfd900 100644 --- a/pkgs/development/libraries/science/math/faiss/default.nix +++ b/pkgs/development/libraries/science/math/faiss/default.nix @@ -97,20 +97,21 @@ stdenv.mkDerivation { "-DCUDAToolkit_INCLUDE_DIR=${cudaJoined}/include" ]; + buildFlags = [ + "faiss" + "demo_ivfpq_indexing" + ] ++ lib.optionals pythonSupport [ + "swigfaiss" + ]; # pip wheel->pip install commands copied over from opencv4 - buildPhase = '' - make -j faiss - make demo_ivfpq_indexing - '' + lib.optionalString pythonSupport '' - make -j swigfaiss + postBuild = lib.optionalString pythonSupport '' (cd faiss/python && python -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist .) ''; - installPhase = '' - make install + postInstall = '' mkdir -p $demos/bin cp ./demos/demo_ivfpq_indexing $demos/bin/ '' + lib.optionalString pythonSupport '' @@ -118,7 +119,7 @@ stdenv.mkDerivation { (cd faiss/python && python -m pip install dist/*.whl --no-index --no-warn-script-location --prefix="$out" --no-cache) ''; - fixupPhase = lib.optionalString (pythonSupport && cudaSupport) '' + postFixup = lib.optionalString (pythonSupport && cudaSupport) '' addOpenGLRunpath $out/${pythonPackages.python.sitePackages}/faiss/*.so addOpenGLRunpath $demos/bin/* ''; diff --git a/pkgs/development/libraries/science/math/libtorch/test/default.nix b/pkgs/development/libraries/science/math/libtorch/test/default.nix index a7940cd1db8d7..a4b8c2f79140d 100644 --- a/pkgs/development/libraries/science/math/libtorch/test/default.nix +++ b/pkgs/development/libraries/science/math/libtorch/test/default.nix @@ -27,7 +27,13 @@ in stdenv.mkDerivation { pname = "libtorch-test"; version = libtorch-bin.version; - src = ./.; + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ + ./CMakeLists.txt + ./test.cpp + ]; + }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch b/pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch index cbcf18b4cdb23..97c0a7dad3005 100644 --- a/pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch +++ b/pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch @@ -13,18 +13,18 @@ Date: Tue Mar 2 22:07:11 2021 -0300 mechanism already in sympow to trim this new message. diff --git a/Configure b/Configure -index 1ef9756..776bec2 100755 +index 53b556e..53999ae 100755 --- a/Configure +++ b/Configure @@ -322,7 +322,7 @@ echo "datafiles/param_data: \$(OTHERb)" >> $FILE echo " \$(MKDIR) -p datafiles" >> $FILE echo " \$(TOUCH) datafiles/param_data" >> $FILE echo " \$(SH) armd.sh" >> $FILE --echo " \$(SED) -i -e '/logfile =/d' datafiles/*.txt" >> $FILE +-echo " \$(SED) -i -e '/logfile =/d' datafiles/*.txt" >> $FILE +echo " \$(SED) -i -e '/logfile /d' datafiles/*.txt" >> $FILE + echo " \$(SED) -i -e '/logfile is/d' datafiles/*.txt" >> $FILE echo "sympow.1: sympow" >> $FILE echo " \$(HELP2MAN) \$(H2MFLAGS) -s 1 -n \"SYMPOW program\" -I sympow.h2m -o \$@ ./\$<" >> $FILE - echo "clean:" >> $FILE diff --git a/generate.c b/generate.c index dbb811f..783320c 100644 --- a/generate.c diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix index 1033f26f43603..91daf30686f8f 100644 --- a/pkgs/development/libraries/science/math/sympow/default.nix +++ b/pkgs/development/libraries/science/math/sympow/default.nix @@ -1,16 +1,17 @@ -{ lib, stdenv -, fetchFromGitLab -, fetchpatch -, makeWrapper -, which -, autoconf -, help2man -, file -, pari +{ + lib, + stdenv, + fetchFromGitLab, + makeWrapper, + which, + autoconf, + help2man, + file, + pari, }: stdenv.mkDerivation rec { - version = "2.023.6"; + version = "2.023.7"; pname = "sympow"; src = fetchFromGitLab { @@ -18,17 +19,10 @@ stdenv.mkDerivation rec { owner = "forks"; repo = "sympow"; rev = "v${version}"; - sha256 = "132l0xv00ld1svvv9wh99wfra4zzjv2885h2sq0dsl98wiyvi5zl"; + hash = "sha256-sex8gRiBdTcVMV3nSeiTYamAjPoXQdiiZwjRmeKA+mc="; }; - patches = [ - ./clean-extra-logfile-output-from-pari.patch - (fetchpatch { - name = "null-terminate-dupdirname.patch"; - url = "https://gitlab.com/rezozer/forks/sympow/-/merge_requests/5.diff"; - sha256 = "sha256-yKjio+qN9teL8L+mb7WOBN/iv545vRIxW20FJU37oO4="; - }) - ]; + patches = [ ./clean-extra-logfile-output-from-pari.patch ]; postUnpack = '' patchShebangs . @@ -66,12 +60,11 @@ stdenv.mkDerivation rec { # Example from the README as a sanity check. doInstallCheck = true; installCheckPhase = '' - export HOME="$TMP/home" - mkdir -p "$HOME" + export HOME=$TMPDIR "$out/bin/sympow" -sp 2p16 -curve "[1,2,3,4,5]" | grep '8.3705' ''; - meta = with lib; { + meta = { description = "Compute special values of symmetric power elliptic curve L-functions"; mainProgram = "sympow"; license = { @@ -79,7 +72,7 @@ stdenv.mkDerivation rec { fullName = "Custom, BSD-like. See COPYING file."; free = true; }; - maintainers = teams.sage.members; - platforms = platforms.linux; + maintainers = lib.teams.sage.members; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/tbb/2020_3.nix b/pkgs/development/libraries/tbb/2020_3.nix index aa526591eb9e8..dcd21b27ff334 100644 --- a/pkgs/development/libraries/tbb/2020_3.nix +++ b/pkgs/development/libraries/tbb/2020_3.nix @@ -60,6 +60,9 @@ stdenv.mkDerivation rec { else if stdenv.hostPlatform.isi686 then "arch=ia32" else throw "Unsupported cross architecture")); + # Fix undefined reference errors with version script under LLVM. + NIX_LDFLAGS = lib.optionalString (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") "--undefined-version"; + enableParallelBuilding = true; installPhase = '' diff --git a/pkgs/development/libraries/tbb/2021_5.nix b/pkgs/development/libraries/tbb/2021_5.nix new file mode 100644 index 0000000000000..3bfa9278106d9 --- /dev/null +++ b/pkgs/development/libraries/tbb/2021_5.nix @@ -0,0 +1,71 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +}: + +stdenv.mkDerivation rec { + pname = "tbb"; + version = "2021.5.0"; + + outputs = [ "out" "dev" ]; + + src = fetchFromGitHub { + owner = "oneapi-src"; + repo = "oneTBB"; + rev = "v${version}"; + hash = "sha256-TJ/oSSMvgtKuz7PVyIoFEbBW6EZz7t2wr/kP093HF/w="; + }; + + nativeBuildInputs = [ + cmake + ]; + + patches = [ + # port of https://github.com/oneapi-src/oneTBB/pull/1031 + ./gcc13-fixes-2021.5.0.patch + + (fetchpatch { + # Fix "field used uninitialized" on modern gcc versions (https://github.com/oneapi-src/oneTBB/pull/958) + url = "https://github.com/oneapi-src/oneTBB/commit/3003ec07740703e6aed12b028af20f4b0f16adae.patch"; + hash = "sha256-l4+9IxIEdRX/q8JyDY9CPKWzSLatpIVSiNjmIM7ilj0="; + }) + ]; + + # Disable failing test on musl + # test/conformance/conformance_resumable_tasks.cpp:37:24: error: ‘suspend’ is not a member of ‘tbb::v1::task’; did you mean ‘tbb::detail::r1::suspend’? + postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace test/CMakeLists.txt \ + --replace-fail 'conformance_resumable_tasks' "" + ''; + + # Fix build with modern gcc + # In member function 'void std::__atomic_base<_IntTp>::store(__int_type, std::memory_order) [with _ITp = bool]', + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-error=array-bounds" "-Wno-error=stringop-overflow" "-Wno-address" ] ++ + # error: variable 'val' set but not used + lib.optionals stdenv.cc.isClang [ "-Wno-error=unused-but-set-variable" ] ++ + # Workaround for gcc-12 ICE when using -O3 + # https://gcc.gnu.org/PR108854 + lib.optionals (stdenv.cc.isGNU && stdenv.isx86_32) [ "-O2" ]; + + # Fix undefined reference errors with version script under LLVM. + NIX_LDFLAGS = lib.optionalString (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") "--undefined-version"; + + + meta = with lib; { + description = "Intel Thread Building Blocks C++ Library"; + homepage = "http://threadingbuildingblocks.org/"; + license = licenses.asl20; + longDescription = '' + Intel Threading Building Blocks offers a rich and complete approach to + expressing parallelism in a C++ program. It is a library that helps you + take advantage of multi-core processor performance without having to be a + threading expert. Intel TBB is not just a threads-replacement library. It + represents a higher-level, task-based parallelism that abstracts platform + details and threading mechanisms for scalability and performance. + ''; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice tmarkus ]; + }; +} diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index c02a9ed49577e..73ea56b306869 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -39,6 +39,9 @@ stdenv.mkDerivation rec { # https://gcc.gnu.org/PR108854 lib.optionals (stdenv.cc.isGNU && stdenv.isx86_32) [ "-O2" ]; + # Fix undefined reference errors with version script under LLVM. + NIX_LDFLAGS = lib.optionalString (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") "--undefined-version"; + # Disable failing test on musl # test/conformance/conformance_resumable_tasks.cpp:37:24: error: ‘suspend’ is not a member of ‘tbb::v1::task’; did you mean ‘tbb::detail::r1::suspend’? postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' diff --git a/pkgs/development/libraries/tbb/gcc13-fixes-2021.5.0.patch b/pkgs/development/libraries/tbb/gcc13-fixes-2021.5.0.patch new file mode 100644 index 0000000000000..28b5a0e695f70 --- /dev/null +++ b/pkgs/development/libraries/tbb/gcc13-fixes-2021.5.0.patch @@ -0,0 +1,13 @@ +diff --git a/test/common/utils_assert.h b/test/common/utils_assert.h +index 33bc8ab4..a3d21baf 100644 +--- a/test/common/utils_assert.h ++++ b/test/common/utils_assert.h +@@ -20,6 +20,8 @@ + #include "config.h" + #include "utils_report.h" + ++#include <cstdlib> ++ + #define REPORT_FATAL_ERROR REPORT + + namespace utils { diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/development/libraries/ucx/default.nix index 71a1b2a2001f4..464ea6e374c37 100644 --- a/pkgs/development/libraries/ucx/default.nix +++ b/pkgs/development/libraries/ucx/default.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation rec { pname = "ucx"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "openucx"; repo = "ucx"; rev = "v${version}"; - sha256 = "sha256-dihWwGlQclfa2ke+1V5c6coqfFjjuMyI8QRzNdx33zQ="; + sha256 = "sha256-Qd3c51LeF04haZA4wK6loNZwX2a3ju+ljwdPYPoUKCQ="; }; outputs = [ "out" "doc" "dev" ]; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index e633be6ac2ea7..9320fe34bb64a 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -190,5 +190,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ proglodyte matthewbauer ]; platforms = platforms.unix; license = licenses.bsd3; + knownVulnerabilities = [ "Severely outdated with multiple publicly known vulnerabilities" ]; }; } diff --git a/pkgs/development/libraries/vkd3d/default.nix b/pkgs/development/libraries/vkd3d/default.nix deleted file mode 100644 index 4f1ddd6f12a63..0000000000000 --- a/pkgs/development/libraries/vkd3d/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, wine, flex, bison -, vulkan-headers, spirv-headers, vulkan-loader }: - -stdenv.mkDerivation rec { - pname = "vkd3d"; - version = "1.10"; - - nativeBuildInputs = [ autoreconfHook pkg-config wine flex bison ]; - buildInputs = [ vulkan-loader vulkan-headers spirv-headers ]; - - src = fetchFromGitLab { - domain = "gitlab.winehq.org"; - owner = "wine"; - repo = pname; - rev = "${pname}-${version}"; - sha256 = "sha256-/5tc8agqpRbFRnfv8O1fBo2SPNOuO6exs0BZ9MnOTA0="; - }; - - meta = with lib; { - homepage = "https://gitlab.winehq.org/wine/vkd3d"; - description = "3D graphics library with an API very similar, but not identical, to Direct3D 12"; - license = licenses.lgpl21; - maintainers = with maintainers; [ expipiplus1 ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index 6eb67cfa30b07..b968af23c0dad 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "wxsqlite3"; - version = "4.9.10"; + version = "4.9.11"; src = fetchFromGitHub { owner = "utelle"; repo = "wxsqlite3"; rev = "v${version}"; - hash = "sha256-L7GpDAqx7hF/PBLy6h10pAydpjaJU3JFgTZ2bJhZtG0="; + hash = "sha256-aX1YU35ATL+f18tGIba6cgNYZvYm3TshHsN7RFD+vI4="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix index 90caed15cb698..7afc6cb871379 100644 --- a/pkgs/development/lisp-modules/packages.nix +++ b/pkgs/development/lisp-modules/packages.nix @@ -419,8 +419,8 @@ let src = pkgs.fetchFromGitHub { owner = "andy128k"; repo = "cl-gobject-introspection"; - rev = "83beec4492948b52aae4d4152200de5d5c7ac3e9"; - sha256 = "sha256-g/FwWE+Rzmzm5Y+irvd1AJodbp6kPHJIFOFDPhaRlXc="; + rev = "4908a84c16349929b309c50409815ff81fb9b3c4"; + sha256 = "sha256-krVU5TQsVAbglxXMq29WJriWBIgQDLy1iCvB5iNziEc="; };})) (cl-webkit2.overrideAttrs (final: prev: { src = pkgs.fetchFromGitHub { @@ -882,6 +882,64 @@ let meta.mainProgram = "qlot"; }; + misc-extensions = super.misc-extensions.overrideLispAttrs (old: rec { + version = "4.0.3"; + src = pkgs.fetchFromGitLab { + domain = "gitlab.common-lisp.net"; + owner = "misc-extensions"; + repo = "misc-extensions"; + rev = "v${version}"; + hash = "sha256-bDNI4mIaNw/rf7ZwvwolKo6+mUUxsgubGUd/988sHAo="; + }; + }); + + fset = super.fset.overrideLispAttrs (old: rec { + version = "1.4.0"; + src = pkgs.fetchFromGitHub { + owner = "slburson"; + repo = "fset"; + rev = "v${version}"; + hash = "sha256-alO8Ek5Xpyl5N99/LgyIZ50aoRbY7bKh3XBntFV6Q5k="; + }; + lispLibs = with super; [ + self.misc-extensions + mt19937 + named-readtables + ]; + meta = { + description = "functional collections library"; + homepage = "https://gitlab.common-lisp.net/fset/fset/-/wikis/home"; + license = pkgs.lib.licenses.llgpl21; + }; + }); + + coalton = build-asdf-system { + pname = "coalton"; + version = "trunk"; + src = pkgs.fetchFromGitHub { + owner = "coalton-lang"; + repo = "coalton"; + rev = "05111b8a59e3f7346b175ce1ec621bff588e1e1f"; + hash = "sha256-L9o7Y3zDx9qLXGe/70c1LWEKUWsSRgBQru66mIuaCFw="; + }; + lispLibs = with super; [ + alexandria + eclector-concrete-syntax-tree + fiasco + float-features + self.fset + named-readtables + trivial-garbage + ]; + nativeLibs = [ pkgs.mpfr ]; + systems = [ "coalton" "coalton/tests" ]; + meta = { + description = "statically typed functional programming language that supercharges Common Lisp"; + homepage = "https://coalton-lang.github.io"; + license = pkgs.lib.licenses.mit; + }; + }; + }); in packages diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 8aea13bf0cbd9..2c44bf7f7f83b 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2388,6 +2388,29 @@ buildLuarocksPackage { }; }) {}; +lz-n = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: +buildLuarocksPackage { + pname = "lz.n"; + version = "1.3.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/lz.n-1.3.0-1.rockspec"; + sha256 = "03rbinqs0za9193v0l06csvxkcfd93ikks6pnvfs2p6f64abdic9"; + }).outPath; + src = fetchzip { + url = "https://github.com/nvim-neorocks/lz.n/archive/v1.3.0.zip"; + sha256 = "1hdayr06ni2zzjyciv0f36k82zlkmwnvl0imrlqxqr6hq9yqcwvx"; + }; + + disabled = luaOlder "5.1"; + + meta = { + homepage = "https://github.com/nvim-neorocks/lz.n"; + description = "🦥 A dead simple lazy-loading Lua library for Neovim plugins."; + maintainers = with lib.maintainers; [ mrcjkb ]; + license.fullName = "GPL-2+"; + }; +}) {}; + magick = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, lua }: buildLuarocksPackage { pname = "magick"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 60095997cadec..34338bf96b84d 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -530,6 +530,17 @@ in }; }); + lz-n = prev.lz-n.overrideAttrs(oa: { + doCheck = lua.luaversion == "5.1"; + nativeCheckInputs = [ final.nlua final.busted ]; + checkPhase = '' + runHook preCheck + export HOME=$(mktemp -d) + busted --lua=nlua + runHook postCheck + ''; + }); + neotest = prev.neotest.overrideAttrs(oa: { # A few tests fail for strange reasons on darwin doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix index 654f2382ca3fb..c2b35ed722045 100644 --- a/pkgs/development/misc/avr/libc/default.nix +++ b/pkgs/development/misc/avr/libc/default.nix @@ -2,11 +2,12 @@ stdenv.mkDerivation rec { pname = "avr-libc"; - version = "2.1.0"; + version = "2.2.0"; + tag_version = builtins.replaceStrings ["."] ["_"] version; src = fetchurl { - url = "https://download.savannah.gnu.org/releases/avr-libc/avr-libc-${version}.tar.bz2"; - sha256 = "1s2lnqsbr1zs7dvsbyyckay52lm8mbjjaqf3cyx5qpcbq3jwx10b"; + url = "https://github.com/avrdudes/avr-libc/releases/download/avr-libc-${tag_version}-release/avr-libc-${version}.tar.bz2"; + hash = "sha256-Bxjv1PVCeId9ploLIDtAIHOzDgTf6piObyqINa0HHTU="; }; nativeBuildInputs = [ automake autoconf ]; diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index 985ef9a8e23de..72dc64a7e0c22 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -11,8 +11,8 @@ , platformVersions ? [] , includeSources ? false , includeSystemImages ? false -, systemImageTypes ? [ "google_apis_playstore" ] -, abiVersions ? [ "armeabi-v7a" "arm64-v8a" ] +, systemImageTypes ? [ "google_apis" "google_apis_playstore" ] +, abiVersions ? [ "x86" "x86_64" "armeabi-v7a" "arm64-v8a" ] , cmakeVersions ? [ ] , includeNDK ? false , ndkVersion ? "26.3.11579264" diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 3de6bf6e478cd..6c6f974be706b 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -15,9 +15,11 @@ rec { inherit composeAndroidPackages; }; - androidPkgs_9_0 = composeAndroidPackages { - platformVersions = [ "28" ]; - abiVersions = [ "x86" "x86_64"]; + androidPkgs = composeAndroidPackages { + platformVersions = [ "28" "29" "30" "31" "32" "33" "34" ]; + includeEmulator = true; + includeSystemImages = true; + includeNDK = true; }; test-suite = pkgs.callPackage ./test-suite.nix {}; diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index d2b2da19a2dd6..20102095ffc98 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -20,7 +20,6 @@ "@webassemblyjs/wasm-text-gen-1.11.1" = "wasmgen"; "@webassemblyjs/wast-refmt-1.11.1" = "wast-refmt"; aws-cdk = "cdk"; - bash-language-server = "bash-language-server"; cdk8s-cli = "cdk8s"; cdktf-cli = "cdktf"; clipboard-cli = "clipboard"; diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index fb70d6ab2ebf9..c8ffc441ade2b 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -65546,61 +65546,6 @@ in bypassCache = true; reconstructLock = true; }; - bash-language-server = nodeEnv.buildNodePackage { - name = "bash-language-server"; - packageName = "bash-language-server"; - version = "5.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-5.3.4.tgz"; - sha512 = "9GEzJVOOyU7ZQbDI/uFc8N9FGuun6UZv1qB9bNUbehIb1gA4pOpkIYtqtfSq0XQSO25hMp8d/tzsmFJmeX+dQg=="; - }; - dependencies = [ - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."braces-3.0.3" - sources."domino-2.1.6" - sources."encoding-0.1.13" - sources."fast-glob-3.3.2" - sources."fastq-1.17.1" - sources."fill-range-7.1.1" - sources."fuzzy-search-3.2.1" - sources."glob-parent-5.1.2" - sources."iconv-lite-0.6.3" - sources."is-extglob-2.1.1" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."merge2-1.4.1" - sources."micromatch-4.0.7" - sources."node-fetch-2.7.0" - sources."picomatch-2.3.1" - sources."queue-microtask-1.2.3" - sources."reusify-1.0.4" - sources."run-parallel-1.2.0" - sources."safer-buffer-2.1.2" - sources."to-regex-range-5.0.1" - sources."tr46-0.0.3" - sources."turndown-7.1.3" - sources."vscode-jsonrpc-8.0.2" - sources."vscode-languageserver-8.0.2" - sources."vscode-languageserver-protocol-3.17.2" - sources."vscode-languageserver-textdocument-1.0.11" - sources."vscode-languageserver-types-3.17.2" - sources."web-tree-sitter-0.22.5" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - sources."zod-3.22.4" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A language server for Bash"; - homepage = "https://github.com/bash-lsp/bash-language-server#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; bower = nodeEnv.buildNodePackage { name = "bower"; packageName = "bower"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 8d9c6e07cb0a3..7021dbb0df1e4 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -40,14 +40,6 @@ final: prev: { }; }; - bash-language-server = prev.bash-language-server.override { - nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; - postInstall = '' - wrapProgram "$out/bin/bash-language-server" \ - --prefix PATH : ${lib.makeBinPath [ pkgs.shellcheck ]} - ''; - }; - bower2nix = prev.bower2nix.override { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postInstall = '' diff --git a/pkgs/development/ocaml-modules/apron/default.nix b/pkgs/development/ocaml-modules/apron/default.nix index 5ad98224962e3..fb93fd2f18753 100644 --- a/pkgs/development/ocaml-modules/apron/default.nix +++ b/pkgs/development/ocaml-modules/apron/default.nix @@ -4,26 +4,23 @@ stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-apron"; - version = "0.9.14"; + version = "0.9.15"; src = fetchFromGitHub { owner = "antoinemine"; repo = "apron"; rev = "v${version}"; - hash = "sha256-e8bSf0FPB6E3MFHHoSrE0x/6nrUStO+gOKxJ4LDHBi0="; + hash = "sha256-gHLCurydxX1pS66DTAWUJGl9Yqu9RWRjkZh6lXzM7YY="; }; nativeBuildInputs = [ ocaml findlib perl ]; buildInputs = [ gmp mpfr ppl camlidl flint pplite ]; propagatedBuildInputs = [ mlgmpidl ]; - # TODO: Doesn't produce the library correctly if true - strictDeps = false; - outputs = [ "out" "dev" ]; configurePhase = '' runHook preConfigure - ./configure -prefix $out ${lib.optionalString stdenv.isDarwin "-no-strip"} + ./configure -prefix $out ${lib.optionalString stdenv.isDarwin "--no-strip"} mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs runHook postConfigure ''; diff --git a/pkgs/development/ocaml-modules/ezjsonm-encoding/default.nix b/pkgs/development/ocaml-modules/ezjsonm-encoding/default.nix new file mode 100644 index 0000000000000..ec81d52da687e --- /dev/null +++ b/pkgs/development/ocaml-modules/ezjsonm-encoding/default.nix @@ -0,0 +1,20 @@ +{ lib, fetchurl, buildDunePackage, ezjsonm }: + +buildDunePackage rec { + pname = "ezjsonm-encoding"; + version = "2.0.0"; + + src = fetchurl { + url = "https://github.com/lthms/ezjsonm-encoding/releases/download/${version}/ezjsonm-encoding-${version}.tbz"; + hash = "sha256-e5OPcbbQLr16ANFNZ5i10LjlHgwcRTCYhyvOhVk22yI="; + }; + + propagatedBuildInputs = [ ezjsonm ]; + + meta = { + description = "Encoding combinators a la Data_encoding for Ezjsonm"; + homepage = "https://github.com/lthms/ezjsonmi-encoding"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix index a5c89c76db27a..f8e8efdaae678 100644 --- a/pkgs/development/ocaml-modules/uri/default.nix +++ b/pkgs/development/ocaml-modules/uri/default.nix @@ -11,7 +11,7 @@ buildDunePackage rec { src = fetchurl { url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; - sha256 = "0szifda6yism5vn5jdizkha3ad0xk6zw4xgfl8g77dnv83ci7h65"; + sha256 = "cdabaf6ef5cd2161e59cc7b74c6e4a68ecb80a9f4e96002e338e1b6bf17adec4"; }; checkInputs = [ ounit ]; diff --git a/pkgs/development/perl-modules/Tirex/default.nix b/pkgs/development/perl-modules/Tirex/default.nix index 655610e898f27..48e63bb5932c4 100644 --- a/pkgs/development/perl-modules/Tirex/default.nix +++ b/pkgs/development/perl-modules/Tirex/default.nix @@ -7,6 +7,7 @@ , JSON , LWP , mapnik +, boost , nix-update-script }: @@ -22,11 +23,18 @@ buildPerlPackage rec { }; patches = [ + # Support Mapnik >= v4.0.0 (`mapnik/box2d.hpp` -> `mapnik/geometry/box2d.hpp`) # https://github.com/openstreetmap/tirex/pull/54 (fetchpatch { - url = "https://github.com/openstreetmap/tirex/commit/da0c5db926bc0939c53dd902a969b689ccf9edde.patch"; + url = "https://github.com/openstreetmap/tirex/commit/5f131231c9c12e88793afba471b150ca8af8d587.patch"; hash = "sha256-bnL1ZGy8ZNSZuCRbZn59qRVLg3TL0GjFYnhRKroeVO0="; }) + # Support Mapnik >= v4.0.0 (boost:filesystem no longer indirectly linked) + # https://github.com/openstreetmap/tirex/pull/59 + (fetchpatch { + url = "https://github.com/openstreetmap/tirex/commit/137903be9b7b35dde4c7010e65faa16bcf6ad476.patch"; + hash = "sha256-JDqwWVnzExPwLpzv4LbSmGYah956uko+Zdicahua9oQ="; + }) ]; buildInputs = [ @@ -35,6 +43,7 @@ buildPerlPackage rec { JSON LWP mapnik + boost ] ++ mapnik.buildInputs; installPhase = '' diff --git a/pkgs/development/php-packages/grumphp/default.nix b/pkgs/development/php-packages/grumphp/default.nix index 6390abb5c9388..e8506e9e008cb 100644 --- a/pkgs/development/php-packages/grumphp/default.nix +++ b/pkgs/development/php-packages/grumphp/default.nix @@ -6,16 +6,16 @@ php.buildComposerProject (finalAttrs: { pname = "grumphp"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "phpro"; repo = "grumphp"; rev = "v${finalAttrs.version}"; - hash = "sha256-STTMqOzWE6c+EXA7PGoJTGVCyB3PtNVj5wSZ6igudro="; + hash = "sha256-W4LNzdgWxXDPL46/C8SX99lpRMp/xL5q5v6vX3H80XU="; }; - vendorHash = "sha256-CrcDJb5SfTBxVkFPTLq0PSzqNtkZWDPkH0IW7Crr4Pw="; + vendorHash = "sha256-bpIG3P1BdsYNI59xANaihmjsT7WDKiss3mhi/brA0Mc="; meta = { changelog = "https://github.com/phpro/grumphp/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index c4b395369b398..95b2929abca08 100644 --- a/pkgs/development/php-packages/mongodb/default.nix +++ b/pkgs/development/php-packages/mongodb/default.nix @@ -16,13 +16,13 @@ buildPecl rec { pname = "mongodb"; - version = "1.19.2"; + version = "1.19.3"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-php-driver"; rev = version; - hash = "sha256-dsX7AMcbSfgzN6TfpJTaRAbhyBpOECvaok+CCOb4hyI="; + hash = "sha256-gpnL4mXOD/MDG7xWxUpLLKfRD2w6HqNokC5358OkFSg="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index cf941b68d4025..81a48bcc62950 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.69.0"; + version = "3.70.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "adafruit_platformdetect"; inherit version; - hash = "sha256-J+4VSA+2xZCNoLrICNXpmIG8tU6cnOn4EjEnN1VFGYU="; + hash = "sha256-hbvTu3rVleM6OFQb70mq1OlJoe3xpfRJ7JA6djvMr7U="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix index 63815d39e47ad..f3304a4b617c0 100644 --- a/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone-cloud"; - version = "0.5.1"; + version = "0.5.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone-cloud"; rev = "refs/tags/${version}"; - hash = "sha256-L5Gb+V0W+9duGV6lRc01jrAfh4U+MS77Y238EeXe0TU="; + hash = "sha256-06r6Q+MdEirLiPrx71NDp8oeRJzqgDg8FtXt46vHutE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiohttp-swagger/default.nix b/pkgs/development/python-modules/aiohttp-swagger/default.nix index c97a3a27c7a34..0b7dc5c6ea2e2 100644 --- a/pkgs/development/python-modules/aiohttp-swagger/default.nix +++ b/pkgs/development/python-modules/aiohttp-swagger/default.nix @@ -54,6 +54,5 @@ buildPythonPackage rec { description = "Swagger API Documentation builder for aiohttp"; homepage = "https://github.com/cr0hn/aiohttp-swagger"; license = licenses.mit; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix index 284866dc921a6..8f30f735364b5 100644 --- a/pkgs/development/python-modules/aiolifx-themes/default.nix +++ b/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiolifx-themes"; - version = "0.4.17"; + version = "0.4.18"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Djelibeybi"; repo = "aiolifx-themes"; rev = "refs/tags/v${version}"; - hash = "sha256-nKzvdDzwizF1Db8qFQuOH7gLnYHmdCYdQZPN+gNg8mU="; + hash = "sha256-6oV6pyVwSS6sYrTokcJ/1KBkuv7EHNr+2bJ5ujengTY="; }; prePatch = '' diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix index 8f3a773b713e1..62853267d54b0 100644 --- a/pkgs/development/python-modules/aiolifx/default.nix +++ b/pkgs/development/python-modules/aiolifx/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "aiolifx"; - version = "1.0.2"; + version = "1.0.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-E3UxNTqss3urpMTwhLhIoAnBekGOIyFy0+sOj3mGlss="; + hash = "sha256-Lzdd4UPyu3/avxKO0XPCFI8zhTjDF7zwSKf6RL1/k9M="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiortm/default.nix b/pkgs/development/python-modules/aiortm/default.nix index 9e1384acc6792..4498c27080c38 100644 --- a/pkgs/development/python-modules/aiortm/default.nix +++ b/pkgs/development/python-modules/aiortm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aiortm"; - version = "0.8.13"; + version = "0.8.14"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiortm"; rev = "refs/tags/v${version}"; - hash = "sha256-JoolmxZFN0UG8wAMxMAYL8APFjpEcMECirCKUA/UBlY="; + hash = "sha256-x/QTmFNPnazyAmJQ9zLzAFB9V3NUwDeTJdrJqQ54jGE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiowatttime/default.nix b/pkgs/development/python-modules/aiowatttime/default.nix index 74e85adc69131..9932f9f822206 100644 --- a/pkgs/development/python-modules/aiowatttime/default.nix +++ b/pkgs/development/python-modules/aiowatttime/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiowatttime"; - version = "2023.12.0"; + version = "2024.06.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-sodgFveVE2Z894z36AzXF6c3iI4UhaqMJK+H6CjsvGA="; + hash = "sha256-c5L+Nx+CoWEc6Bs61GOHPBelExe5I7EOlMQ+QV6nktI="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/amaranth-boards/default.nix b/pkgs/development/python-modules/amaranth-boards/default.nix index 19e61f789cbb2..3e9548bfe5b61 100644 --- a/pkgs/development/python-modules/amaranth-boards/default.nix +++ b/pkgs/development/python-modules/amaranth-boards/default.nix @@ -45,7 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/amaranth-lang/amaranth-boards"; license = licenses.bsd2; maintainers = with maintainers; [ - emily thoughtpolice pbsds ]; diff --git a/pkgs/development/python-modules/amaranth-soc/default.nix b/pkgs/development/python-modules/amaranth-soc/default.nix index 78cdea45edff0..597a1829161fc 100644 --- a/pkgs/development/python-modules/amaranth-soc/default.nix +++ b/pkgs/development/python-modules/amaranth-soc/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "amaranth-soc"; - version = "0.1a-unstable-2024-05-17"; + version = "0.1a-unstable-2024-06-10"; pyproject = true; # from `pdm show` realVersion = let @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth-soc"; - rev = "45ff663b83694b09b2b8f3fc0f10c555a12ba987"; - hash = "sha256-Ql8XYC13wscPL96HY0kXselq78D747BpLK8X1sxpwz0="; + rev = "e1b842800533f44924f21c3867bc2290084d100f"; + hash = "sha256-GAGQEncONY566v8hLjGeZ7CRlOt36vHg+0a5xcB+g1Y="; }; nativeBuildInputs = [ pdm-backend ]; @@ -38,7 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/amaranth-lang/amaranth-soc"; license = licenses.bsd2; maintainers = with maintainers; [ - emily thoughtpolice pbsds ]; diff --git a/pkgs/development/python-modules/amaranth/default.nix b/pkgs/development/python-modules/amaranth/default.nix index 00d40dd1460bb..1a096f01606f4 100644 --- a/pkgs/development/python-modules/amaranth/default.nix +++ b/pkgs/development/python-modules/amaranth/default.nix @@ -58,7 +58,6 @@ buildPythonPackage rec { homepage = "https://amaranth-lang.org/docs/amaranth"; license = licenses.bsd2; maintainers = with maintainers; [ - emily thoughtpolice pbsds ]; diff --git a/pkgs/development/python-modules/anova-wifi/default.nix b/pkgs/development/python-modules/anova-wifi/default.nix index a9c7e5bbf9c4b..fa0b7074094a3 100644 --- a/pkgs/development/python-modules/anova-wifi/default.nix +++ b/pkgs/development/python-modules/anova-wifi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "anova-wifi"; - version = "0.12.0"; + version = "0.13.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Lash-L"; repo = "anova_wifi"; rev = "refs/tags/v${version}"; - hash = "sha256-0RRnQBLglPnPin9/gqWDKIsfi5V7ydrdDKwm93WEnvk="; + hash = "sha256-5BSkUg36k2gNfOrVNkeRwU/4SlfEua3ZU4KTZmKSq4Q="; }; postPatch = '' diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index b3ca7780c696b..b1fa512928c39 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "approvaltests"; - version = "12.2.0"; + version = "12.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "approvals"; repo = "ApprovalTests.Python"; rev = "refs/tags/v${version}"; - hash = "sha256-ePItKdDnKX3283EiK8hOqwFDxi3ULByHEQj9XOKMsWM="; + hash = "sha256-Hd0cEAL5RGmAhob1oZwOVC+eXOxc9OTeUnrTTNCpL2E="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/asyncwhois/default.nix b/pkgs/development/python-modules/asyncwhois/default.nix index cc8879e35df4e..f2c341a3b593c 100644 --- a/pkgs/development/python-modules/asyncwhois/default.nix +++ b/pkgs/development/python-modules/asyncwhois/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "asyncwhois"; - version = "1.1.3"; + version = "1.1.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pogzyb"; repo = "asyncwhois"; rev = "refs/tags/v${version}"; - hash = "sha256-+FSf2H+IlLJlbZvzSH/Speyt+D2ZdXhQIKJpZYRfIyg="; + hash = "sha256-BjHGp94vad5qTvffiU8ZEOxYeXNzQHlNq1SaxviYfps="; }; postPatch = '' diff --git a/pkgs/development/python-modules/avwx-engine/default.nix b/pkgs/development/python-modules/avwx-engine/default.nix index ccaaa09e5b099..0d0be882efe8f 100644 --- a/pkgs/development/python-modules/avwx-engine/default.nix +++ b/pkgs/development/python-modules/avwx-engine/default.nix @@ -3,11 +3,11 @@ buildPythonPackage, fetchFromGitHub, geopy, + hatchling, httpx, numpy, - poetry-core, - pytestCheckHook, pytest-asyncio, + pytestCheckHook, python-dateutil, pythonOlder, rapidfuzz, @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "avwx-engine"; - version = "1.8.28"; + version = "1.9.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,14 +28,14 @@ buildPythonPackage rec { owner = "avwx-rest"; repo = "avwx-engine"; rev = "refs/tags/${version}"; - hash = "sha256-sxOLhcmTJg/dTrtemr9BcfcBoHTP1eGo8U1ab8iSvUM="; + hash = "sha256-CUnUz2SsXtWaqGzaB1PH+EoHqebSue6e8GXhRZRcXLs="; }; postPatch = '' sed -i -e "/--cov/d" -e "/--no-cov/d" pyproject.toml ''; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ geopy diff --git a/pkgs/development/python-modules/azure-eventgrid/default.nix b/pkgs/development/python-modules/azure-eventgrid/default.nix index 6dbeaf5bb4df7..786156d4c118f 100644 --- a/pkgs/development/python-modules/azure-eventgrid/default.nix +++ b/pkgs/development/python-modules/azure-eventgrid/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-eventgrid"; - version = "4.19.0"; + version = "4.20.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-a9fVQBbMo6Zwdp6WTYKiQBlqJcQRs+nxqKqBVcPbBew="; + hash = "sha256-we2rkHabxOei+wogN88EVXVNUK95NnTAiz/sIpMkjEw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-monitor-ingestion/default.nix b/pkgs/development/python-modules/azure-monitor-ingestion/default.nix index 43e3c13022b11..e77ae5df94d3d 100644 --- a/pkgs/development/python-modules/azure-monitor-ingestion/default.nix +++ b/pkgs/development/python-modules/azure-monitor-ingestion/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-monitor-ingestion"; - version = "1.0.3"; + version = "1.0.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-idAEqP+HaZs/0fzyBaqO8enTTySg88w3TSIUceiYdDs="; + hash = "sha256-JU11mTof5wfRmPAUrvWhT6pXDO5zabNbsDriqo+Zvnk="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix index 3e628b3cbeb1b..0cc9e72a984dd 100644 --- a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix +++ b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-synapse-artifacts"; - version = "0.18.0"; + version = "0.19.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-qgiHMzW7T5NuQl0jwZheMXp7wHhNOHyH24J6wfc4VqQ="; + hash = "sha256-UvCSsiZ315IoDwvMI02JLJ9zjpPI4Ut0wZUQG5uicYQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index efb76645c7876..9d95e4ecd957b 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.39.0"; + version = "0.39.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-lmSILV7xb3aHC+Rd8/SYzoA/t6DgdClccoK8ESdvNq0="; + hash = "sha256-e7DGAA2/6tc2+iH/14y/QT7k9a7pgrE5bplTPL3xm2Q="; }; postPatch = '' diff --git a/pkgs/development/python-modules/bentoml/default.nix b/pkgs/development/python-modules/bentoml/default.nix index 439309b4bd420..ab5d4025dbf99 100644 --- a/pkgs/development/python-modules/bentoml/default.nix +++ b/pkgs/development/python-modules/bentoml/default.nix @@ -1,7 +1,10 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, + pythonOlder, + pythonRelaxDepsHook, hatchling, hatch-vcs, aiohttp, @@ -14,9 +17,11 @@ deepmerge, fs, httpx, + httpx-ws, inflection, jinja2, numpy, + nvidia-ml-py, opentelemetry-api, opentelemetry-instrumentation, opentelemetry-instrumentation-aiohttp-client, @@ -30,16 +35,16 @@ pip-tools, prometheus-client, psutil, - nvidia-ml-py, python-dateutil, python-json-logger, python-multipart, pyyaml, - requests, rich, schema, simple-di, starlette, + tomli, + tomli-w, uvicorn, watchfiles, fs-s3fs, @@ -49,7 +54,6 @@ protobuf, grpcio-channelz, grpcio-reflection, - filetype, pillow, pydantic, pandas, @@ -62,6 +66,8 @@ tritonclient, # native check inputs pytestCheckHook, + pytest-xdist, + google-api-python-client, scikit-learn, lxml, orjson, @@ -70,7 +76,7 @@ }: let - version = "1.2.5"; + version = "1.2.18"; aws = [ fs-s3fs ]; grpc = [ grpcio @@ -78,9 +84,7 @@ let opentelemetry-instrumentation-grpc protobuf ]; - io-file = [ filetype ]; - io-image = io-file ++ [ pillow ]; - io-json = [ pydantic ]; + io-image = [ pillow ]; io-pandas = [ pandas pyarrow @@ -91,16 +95,14 @@ let # tracing-jaeger = [ opentelemetry-exporter-jaeger ]; tracing-otlp = [ opentelemetry-exporter-otlp ]; # tracing-zipkin = [ opentelemetry-exporter-zipkin ]; - io = io-json ++ io-image ++ io-pandas ++ io-file; + io = io-image ++ io-pandas; tracing = tracing-otlp; # ++ tracing-zipkin ++ tracing-jaeger optional-dependencies = { all = aws ++ io ++ grpc ++ grpc-reflection ++ grpc-channelz ++ tracing ++ monitor-otlp; inherit aws grpc - io-file io-image - io-json io-pandas io grpc-reflection @@ -109,37 +111,45 @@ let tracing-otlp tracing ; - triton = [ - tritonclient - ] ++ tritonclient.optional-dependencies.http ++ tritonclient.optional-dependencies.grpc; + triton = + [ tritonclient ] + ++ lib.optionals stdenv.hostPlatform.isLinux ( + tritonclient.optional-dependencies.http ++ tritonclient.optional-dependencies.grpc + ); }; in buildPythonPackage { pname = "bentoml"; inherit version; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "bentoml"; repo = "BentoML"; rev = "refs/tags/v${version}"; - hash = "sha256-GBKxyjCs02mxYiMK4GhgFUATRCUSVf8mFbWjuPVD7SU="; + hash = "sha256-giZteSikwS9YEcVMPCC9h2khbBgvUPRW1biAyixO13Y="; }; - # https://github.com/bentoml/BentoML/pull/4227 should fix this test - postPatch = '' - substituteInPlace tests/unit/_internal/utils/test_analytics.py \ - --replace "requests" "httpx" - ''; + nativeBuildInputs = [ pythonRelaxDepsHook ]; - pythonRelaxDeps = [ "opentelemetry-semantic-conventions" ]; + pythonRelaxDeps = [ + "cattrs" + "nvidia-ml-py" + "opentelemetry-api" + "opentelemetry-instrumentation-aiohttp-client" + "opentelemetry-instrumentation-asgi" + "opentelemetry-instrumentation" + "opentelemetry-sdk" + "opentelemetry-semantic-conventions" + "opentelemetry-util-http" + ]; - nativeBuildInputs = [ + build-system = [ hatchling hatch-vcs ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp attrs cattrs @@ -150,9 +160,11 @@ buildPythonPackage { deepmerge fs httpx + httpx-ws inflection jinja2 numpy + nvidia-ml-py opentelemetry-api opentelemetry-instrumentation opentelemetry-instrumentation-aiohttp-client @@ -166,21 +178,21 @@ buildPythonPackage { pip-tools prometheus-client psutil - nvidia-ml-py + pydantic python-dateutil python-json-logger python-multipart pyyaml - requests rich schema simple-di starlette + tomli-w uvicorn watchfiles - ]; + ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - passthru.optional-dependencies = optional-dependencies; + inherit optional-dependencies; pythonImportsCheck = [ "bentoml" ]; @@ -201,16 +213,16 @@ buildPythonPackage { ]; nativeCheckInputs = [ - pytestCheckHook - pandas - pydantic - scikit-learn + fastapi + google-api-python-client lxml orjson - pytest-asyncio + pandas pillow - fastapi - starlette + pytest-asyncio + pytest-xdist + pytestCheckHook + scikit-learn ] ++ optional-dependencies.grpc; meta = with lib; { @@ -222,7 +234,8 @@ buildPythonPackage { happysalada natsukium ]; - # https://github.com/bentoml/BentoML/issues/3885 - broken = versionAtLeast pydantic.version "2"; + # AttributeError: 'dict' object has no attribute 'schemas' + # https://github.com/bentoml/BentoML/issues/4290 + broken = versionAtLeast cattrs.version "23.2"; }; } diff --git a/pkgs/development/python-modules/blebox-uniapi/default.nix b/pkgs/development/python-modules/blebox-uniapi/default.nix index 978d80cd9a84a..bf1b15ffcd639 100644 --- a/pkgs/development/python-modules/blebox-uniapi/default.nix +++ b/pkgs/development/python-modules/blebox-uniapi/default.nix @@ -6,6 +6,7 @@ aiohttp, semver, deepmerge, + jmespath, pytest-asyncio, pytestCheckHook, pythonOlder, @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "blebox-uniapi"; - version = "2.3.0"; + version = "2.4.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "blebox"; repo = "blebox_uniapi"; rev = "refs/tags/v${version}"; - hash = "sha256-nqxbwHzx2cnojw/XX9XQoVvOCCd88tulY0m9xEHU3m4="; + hash = "sha256-/NXAyEv4RR12/aoSodKiexKlC83GB1YQVAii8vf6U8c="; }; postPatch = '' @@ -34,6 +35,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + jmespath semver ]; diff --git a/pkgs/development/python-modules/bork/default.nix b/pkgs/development/python-modules/bork/default.nix index d3368634604d5..b48ff6603f337 100644 --- a/pkgs/development/python-modules/bork/default.nix +++ b/pkgs/development/python-modules/bork/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { ]; pythonRelaxDeps = [ + "build" "packaging" "readme-renderer" "twine" diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index d5f683371d504..4811bda0370fa 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -366,7 +366,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.124"; + version = "1.34.129"; pyproject = true; disabled = pythonOlder "3.7"; @@ -374,7 +374,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-X+092AtE6I/k6MLyFiBVGJRGNty8vSgG0E4NGVN68Ws="; + hash = "sha256-CXHgszlO4agOSfTcLoUI3JqHi/kbNNlbsx6Mw0CdFvk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 270249458c849..ee72f50008bf6 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.124"; + version = "1.34.129"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-naShit9yT/YXT0/TaEwb4bFhe8fdWPSsBPghiY1SuX8="; + hash = "sha256-Ub/NAA2bafFkucZMYhUYmvx6hgm8Jj+Tmr0QcEzah6Q="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/branca/default.nix b/pkgs/development/python-modules/branca/default.nix index 627939521ab30..4c16cd2a88937 100644 --- a/pkgs/development/python-modules/branca/default.nix +++ b/pkgs/development/python-modules/branca/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "branca"; - version = "0.7.2"; + version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "python-visualization"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ipu0JZIx/YgR7F5Z7sl/9YEEHkyiDllR5dHko7AlSe8="; + hash = "sha256-9imrW4u2Ea1q7VKgk6Vs8y2OiSzAPr3W6471pi/gVm4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/buienradar/default.nix b/pkgs/development/python-modules/buienradar/default.nix index 7c65753d448f1..4ecf5a6abd221 100644 --- a/pkgs/development/python-modules/buienradar/default.nix +++ b/pkgs/development/python-modules/buienradar/default.nix @@ -13,15 +13,15 @@ buildPythonPackage rec { pname = "buienradar"; - version = "1.0.5"; + version = "1.0.6"; format = "setuptools"; src = fetchFromGitHub { owner = "mjj4791"; repo = "python-buienradar"; # https://github.com/mjj4791/python-buienradar/issues/14 - rev = "caa66ea855dbcc7cf6ee13291d9b2ed7ac01ef98"; - hash = "sha256:0xz03xj5qjayriaah20adh0ycvlvb8jdvgh7w5gm236n64g6krj0"; + rev = "6081a860e190eb59c2ea3ebdcb8a50f6133a0b53"; + hash = "sha256-5bFGPR8StyQTMRcvECdHGC33oAR/9noeCbpwx3DSquQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 0670369db9c56..28843f9887755 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.36.1"; + version = "1.36.2"; pyproject = true; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "casbin"; repo = "pycasbin"; rev = "refs/tags/v${version}"; - hash = "sha256-MeTOxDrk6pvJ1L9ZOKzWhXK8WXo0jWXGKEKR7y0ejbQ="; + hash = "sha256-RQYMQ1Zt+MJ3PyVGSTGo/Qi95M+NVGn7oC2gqXJdlEU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/clickclick/default.nix b/pkgs/development/python-modules/clickclick/default.nix index a05570b39a336..117e5c0c41966 100644 --- a/pkgs/development/python-modules/clickclick/default.nix +++ b/pkgs/development/python-modules/clickclick/default.nix @@ -40,6 +40,5 @@ buildPythonPackage rec { description = "Click command line utilities"; homepage = "https://github.com/hjacobs/python-clickclick/"; license = licenses.asl20; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/development/python-modules/cloup/default.nix b/pkgs/development/python-modules/cloup/default.nix index 88ffe3d8b9fef..3d21118aca376 100644 --- a/pkgs/development/python-modules/cloup/default.nix +++ b/pkgs/development/python-modules/cloup/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { Enriches Click with option groups, constraints, command aliases, help sections for subcommands, themes for --help and other stuff. ''; license = licenses.bsd3; - maintainers = with maintainers; [ friedelino ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/clustershell/default.nix b/pkgs/development/python-modules/clustershell/default.nix index 5617813d74434..284e5a0eb53ae 100644 --- a/pkgs/development/python-modules/clustershell/default.nix +++ b/pkgs/development/python-modules/clustershell/default.nix @@ -69,10 +69,9 @@ buildPythonPackage rec { rm tests/TaskDistantPdshMixin.py rm tests/TaskDistantPdshTest.py rm tests/TaskRLimitsTest.py + rm tests/TreeGatewayTest.py nosetests -v \ - -e test_channel_ctl_shell_remote1 \ - -e test_channel_ctl_shell_remote2 \ -e test_fromall_grouplist \ -e test_rank_placeholder \ -e test_engine_on_the_fly_launch \ @@ -92,9 +91,6 @@ buildPythonPackage rec { -e testClushConfigSetRlimit \ -e testTimerInvalidateInHandler \ -e testTimerSetNextFireInHandler \ - -e test_channel_ctl_shell_mlocal1 \ - -e test_channel_ctl_shell_mlocal2 \ - -e test_channel_ctl_shell_mlocal3 \ -e test_node_placeholder \ tests/*.py ''; diff --git a/pkgs/development/python-modules/color-operations/default.nix b/pkgs/development/python-modules/color-operations/default.nix index e4189e06809a5..e92bcfe70b70d 100644 --- a/pkgs/development/python-modules/color-operations/default.nix +++ b/pkgs/development/python-modules/color-operations/default.nix @@ -1,35 +1,42 @@ { lib, buildPythonPackage, - fetchFromGitHub, - pytestCheckHook, pythonOlder, + fetchFromGitHub, - colormath, + # build-system cython, oldest-supported-numpy, setuptools, + + # dependencies + numpy, + + # checks + colormath, + pytestCheckHook, }: buildPythonPackage rec { pname = "color-operations"; - version = "0.1.3"; + version = "0.1.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "vincentsarago"; repo = "color-operations"; - rev = version; - hash = "sha256-KsrgilcNK2ufPKrhtGdf8mdlFzhsHB2jHN+WDlZqabc="; + rev = "refs/tags/${version}"; + hash = "sha256-qqOTmVYD3VfjeVJtYvDQw+cxjcTsmqTYQNL1qMX+fL4="; }; - nativeBuildInputs = [ + build-system = [ cython + oldest-supported-numpy setuptools ]; - propagatedBuildInputs = [ oldest-supported-numpy ]; + dependencies = [ numpy ]; nativeCheckInputs = [ colormath diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index 2159735ed2ebf..95cf2c7bf0b69 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "confluent-kafka"; - version = "2.3.0"; + version = "2.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "confluentinc"; repo = "confluent-kafka-python"; rev = "refs/tags/v${version}"; - hash = "sha256-sPlLlp0niR45lQPCvVd6NPtGI1cFbmPeQpIF1RnnY0I="; + hash = "sha256-JlPWh46WjY4GHRKtamB+qigVvVzvbRagbigyCol6lfg="; }; buildInputs = [ rdkafka ]; diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix index f48debb7582e4..6c8373b3fad24 100644 --- a/pkgs/development/python-modules/connexion/default.nix +++ b/pkgs/development/python-modules/connexion/default.nix @@ -95,6 +95,5 @@ buildPythonPackage rec { homepage = "https://github.com/spec-first/connexion"; changelog = "https://github.com/spec-first/connexion/releases/tag/${version}"; license = licenses.asl20; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/development/python-modules/curl-cffi/default.nix b/pkgs/development/python-modules/curl-cffi/default.nix index 76a4566cce7cb..82a521898a63d 100644 --- a/pkgs/development/python-modules/curl-cffi/default.nix +++ b/pkgs/development/python-modules/curl-cffi/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "curl-cffi"; - version = "0.7.0"; + version = "0.7.0b4"; src = fetchFromGitHub { owner = "yifeikong"; diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 5b3dac5c094dc..30629ee89e91d 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "7.4.0"; + version = "7.4.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = "cyclonedx-python-lib"; rev = "refs/tags/v${version}"; - hash = "sha256-cR/E0xVPl2iBgjhX9xv8nftmmTDWjDUqRgvNqcAWzRo="; + hash = "sha256-ATeSMS8WaJS/2CaeNQgaK/6zyQBw07+6YYTZdhZPJug="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix index 0e89c528057bd..479f57d744a20 100644 --- a/pkgs/development/python-modules/cyclopts/default.nix +++ b/pkgs/development/python-modules/cyclopts/default.nix @@ -11,6 +11,7 @@ pytest-mock, pytestCheckHook, pythonOlder, + pyyaml, rich, rich-rst, typing-extensions, @@ -18,7 +19,7 @@ buildPythonPackage rec { pname = "cyclopts"; - version = "2.6.2"; + version = "2.7.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +28,7 @@ buildPythonPackage rec { owner = "BrianPugh"; repo = "cyclopts"; rev = "refs/tags/v${version}"; - hash = "sha256-GWUD9Qu2EKrT7nwlmSpJ31LWSvv6mASxsXGznumusdw="; + hash = "sha256-oYYsHT8VZdqcOkMj++Bh7xjZ3JfJ9CiacFt92lBiQmc="; }; build-system = [ @@ -48,6 +49,7 @@ buildPythonPackage rec { pydantic pytest-mock pytestCheckHook + pyyaml ]; pythonImportsCheck = [ "cyclopts" ]; diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix index a5699289f24bd..0965dacd42326 100644 --- a/pkgs/development/python-modules/daphne/default.nix +++ b/pkgs/development/python-modules/daphne/default.nix @@ -10,24 +10,32 @@ pytest-asyncio, pytestCheckHook, pythonOlder, + setuptools, twisted, }: buildPythonPackage rec { pname = "daphne"; - version = "4.0.0"; - format = "setuptools"; + version = "4.1.2"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "django"; - repo = pname; - rev = version; - hash = "sha256-vPMrmC2B0Pcvk8Y1FsJ4PXnzIMtPod7lL2u0IYNVUxc="; + repo = "daphne"; + rev = "refs/tags/${version}"; + hash = "sha256-RAK2CaKKVmVIv1MBK+9xyADOrHq664MQOry4KaGTNCw="; }; - propagatedBuildInputs = [ + postPatch = '' + substituteInPlace setup.cfg \ + --replace-fail "pytest-runner" "" + ''; + + build-system = [ setuptools ]; + + dependencies = [ asgiref autobahn twisted @@ -40,11 +48,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "pytest-runner" "" - ''; - # Most tests fail on darwin doCheck = !stdenv.isDarwin; @@ -52,9 +55,10 @@ buildPythonPackage rec { meta = with lib; { description = "Django ASGI (HTTP/WebSocket) server"; - mainProgram = "daphne"; homepage = "https://github.com/django/daphne"; + changelog = "https://github.com/django/daphne/blob/${version}/CHANGELOG.txt"; license = licenses.bsd3; maintainers = with maintainers; [ ]; + mainProgram = "daphne"; }; } diff --git a/pkgs/development/python-modules/dash-bootstrap-components/default.nix b/pkgs/development/python-modules/dash-bootstrap-components/default.nix new file mode 100644 index 0000000000000..9e6cfa1daaead --- /dev/null +++ b/pkgs/development/python-modules/dash-bootstrap-components/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + dash, + setuptools, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "dash-bootstrap-components"; + version = "1.6.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "facultyai"; + repo = "dash-bootstrap-components"; + rev = "refs/tags/${version}"; + hash = "sha256-6tx7rOB5FVj44NbTznyZd1Q0HOc8QdxiZOhja5kgpAE="; + }; + + build-system = [ setuptools ]; + + dependencies = [ dash ]; + + # Tests a additional requirements + doCheck = false; + + # Circular import + # pythonImportsCheck = [ "dash_bootstrap_components" ]; + + meta = with lib; { + description = "Bootstrap components for Plotly Dash"; + homepage = "https://github.com/facultyai/dash-bootstrap-components"; + changelog = "https://github.com/facultyai/dash-bootstrap-components/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index f6e9245d89bb7..125c25d8a6b59 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "dash"; - version = "2.17.0"; + version = "2.17.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -46,7 +46,7 @@ buildPythonPackage rec { owner = "plotly"; repo = "dash"; rev = "refs/tags/v${version}"; - hash = "sha256-45nSQ3N7VcPsXthmMj3gMWFPi/i9z0peI1Wc6fUT7So="; + hash = "sha256-51/nMnXUhb+hTL4xS9x4urI+2eENo/8sEKtk/kt6xTk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix index 4663d25cffcfc..99bf5858bf680 100644 --- a/pkgs/development/python-modules/dask-awkward/default.nix +++ b/pkgs/development/python-modules/dask-awkward/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "dask-awkward"; - version = "2024.3.0"; + version = "2024.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,18 +30,18 @@ buildPythonPackage rec { owner = "dask-contrib"; repo = "dask-awkward"; rev = "refs/tags/${version}"; - hash = "sha256-Lkbp/XrDHOekMpT71pbxtuozgzU9iiGF2GJZ+tuV/yM="; + hash = "sha256-m/KvPo4IGn19sA5RcA/+OhLMCDBU+9BbMQtK3gHOoEc="; }; pythonRelaxDeps = [ "awkward" ]; - nativeBuildInputs = [ + build-system = [ hatch-vcs hatchling pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ awkward cachetools dask @@ -74,11 +74,11 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { description = "Native Dask collection for awkward arrays, and the library to use it"; homepage = "https://github.com/dask-contrib/dask-awkward"; changelog = "https://github.com/dask-contrib/dask-awkward/releases/tag/${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ veprbl ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/python-modules/dask-expr/default.nix b/pkgs/development/python-modules/dask-expr/default.nix index 872b88820c959..930581b563a61 100644 --- a/pkgs/development/python-modules/dask-expr/default.nix +++ b/pkgs/development/python-modules/dask-expr/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dask-expr"; - version = "1.1.2"; + version = "1.1.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "dask"; repo = "dask-expr"; rev = "refs/tags/v${version}"; - hash = "sha256-Gvib8fyogIiOllDp4SoVQkGcIPHMo9e9AfJWDaZ5sTU="; + hash = "sha256-20gVzmOnVWoPGrGcLp8nhAoiHWunaYZIXOxYho7ZhUs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 851bc43241dd0..08ce62f9e701f 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -41,7 +41,7 @@ let self = buildPythonPackage rec { pname = "dask"; - version = "2024.5.2"; + version = "2024.6.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -50,7 +50,7 @@ let owner = "dask"; repo = "dask"; rev = "refs/tags/${version}"; - hash = "sha256-8U+njWp1g+rmOEuUgh+qz1QyVCZ/gdEPky206cVp7fw="; + hash = "sha256-HtWxVWMk0G2OeBnZKLF5tuOohPbg20Ufl+VH/MX8vK0="; }; build-system = [ diff --git a/pkgs/development/python-modules/dataclasses-json/default.nix b/pkgs/development/python-modules/dataclasses-json/default.nix index 9c8c350185de6..bb8a949bc8ae2 100644 --- a/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/pkgs/development/python-modules/dataclasses-json/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dataclasses-json"; - version = "0.6.6"; + version = "0.6.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "lidatong"; repo = "dataclasses-json"; rev = "refs/tags/v${version}"; - hash = "sha256-JpZwRln7QC0SO/+8xFxc6xrC+ZBFSHVQ9NJscAO+Lf8="; + hash = "sha256-AH/T6pa/CHtQNox67fqqs/BBnUcmThvbnSHug2p33qM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix index f075b767500eb..697758093fef3 100644 --- a/pkgs/development/python-modules/deebot-client/default.nix +++ b/pkgs/development/python-modules/deebot-client/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "deebot-client"; - version = "7.3.0"; + version = "8.0.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "DeebotUniverse"; repo = "client.py"; rev = "refs/tags/${version}"; - hash = "sha256-zXe110cGrrnwZvQ3pI9Zka7bcuUS/Js+7A3k6OljAYI="; + hash = "sha256-iAUGk7ErRG7ZgvjbmEZRLAOFlMHKZ/iM8pkwAtFla2E="; }; build-system = [ diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 3cad3562be1ae..0d5da20cccfbe 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "distributed"; - version = "2024.5.0"; + version = "2024.6.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "dask"; repo = "distributed"; rev = "refs/tags/${version}"; - hash = "sha256-9W5BpBQHw1ZXCOWiFPeIlMns/Yys1gtdwQ4Lhd7qjK8="; + hash = "sha256-8TShbpH+DB73G7D4pz8MHC/SPd3RaRttML0S4WaCE4k="; }; postPatch = '' @@ -76,11 +76,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "distributed" ]; - meta = with lib; { + meta = { description = "Distributed computation in Python"; homepage = "https://distributed.readthedocs.io/"; changelog = "https://github.com/dask/distributed/blob/${version}/docs/source/changelog.rst"; - license = licenses.bsd3; - maintainers = with maintainers; [ teh ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ teh ]; }; } diff --git a/pkgs/development/python-modules/django-crispy-forms/default.nix b/pkgs/development/python-modules/django-crispy-forms/default.nix index 3437a6474a1bb..823bf6efd9940 100644 --- a/pkgs/development/python-modules/django-crispy-forms/default.nix +++ b/pkgs/development/python-modules/django-crispy-forms/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "django-crispy-forms"; - version = "2.1"; + version = "2.2"; format = "pyproject"; src = fetchFromGitHub { owner = "django-crispy-forms"; repo = "django-crispy-forms"; rev = "refs/tags/${version}"; - hash = "sha256-UQ5m0JWir20TdLgS+DVVLcMBlIEIfmzv8pkMJtaC0LA="; + hash = "sha256-6S/Pscwi6AEQnmJf6JTT5Q5vxoZ3PC65ZjT2XszwVZM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index b95ff428d39f7..fd4be9238aaf6 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "django-import-export"; - version = "4.0.7"; + version = "4.0.8"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "django-import-export"; repo = "django-import-export"; rev = "refs/tags/${version}"; - hash = "sha256-yN47HwIHGciE4w0xN+l/dOsbHNf5DZrYjrmJgZeWlE0="; + hash = "sha256-FejU0k2/fmR5QdAJy2xxx3MKgu89/pOj4cIWsMGUw0M="; }; pythonRelaxDeps = [ "tablib" ]; diff --git a/pkgs/development/python-modules/django-sesame/default.nix b/pkgs/development/python-modules/django-sesame/default.nix index 71ee75a9f6b9a..5aad0ccdc321d 100644 --- a/pkgs/development/python-modules/django-sesame/default.nix +++ b/pkgs/development/python-modules/django-sesame/default.nix @@ -45,6 +45,5 @@ buildPythonPackage rec { homepage = "https://github.com/aaugustin/django-sesame"; changelog = "https://github.com/aaugustin/django-sesame/blob/${version}/docs/changelog.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/development/python-modules/dnf-plugins-core/default.nix b/pkgs/development/python-modules/dnf-plugins-core/default.nix index 4ad92ba664065..8c518bfe4f93f 100644 --- a/pkgs/development/python-modules/dnf-plugins-core/default.nix +++ b/pkgs/development/python-modules/dnf-plugins-core/default.nix @@ -23,7 +23,7 @@ in buildPythonPackage rec { pname = "dnf-plugins-core"; - version = "4.7.0"; + version = "4.8.0"; format = "other"; outputs = [ @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "rpm-software-management"; repo = "dnf-plugins-core"; rev = "refs/tags/${version}"; - hash = "sha256-AQnnXjkUajztbyoKzKhxiKxZsb2o2+7C15fsrxGkWcM="; + hash = "sha256-8RkTSO+F5fc3T8r79PRoW5KfEG2DmIzN2ylC9Np6LrQ="; }; patches = [ ./fix-python-install-dir.patch ]; diff --git a/pkgs/development/python-modules/dpath/default.nix b/pkgs/development/python-modules/dpath/default.nix index 2a9409aa260ab..808a83238c36b 100644 --- a/pkgs/development/python-modules/dpath/default.nix +++ b/pkgs/development/python-modules/dpath/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "dpath"; - version = "2.1.6"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8eB8cuhgXGqegLZLyPQnFN4Ip4nH3kF+ScP4ehlpLkc="; + hash = "sha256-NPfmMNxV6j8hnlVXJvXaS0sl8iADGcjmkCw5Qljdaj4="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/duckduckgo-search/default.nix b/pkgs/development/python-modules/duckduckgo-search/default.nix index c97b3fc9c551a..f39a99ed5f309 100644 --- a/pkgs/development/python-modules/duckduckgo-search/default.nix +++ b/pkgs/development/python-modules/duckduckgo-search/default.nix @@ -6,6 +6,7 @@ pythonOlder, setuptools, orjson, + pyreqwest-impersonate, curl-cffi, # Optional dependencies @@ -32,6 +33,7 @@ buildPythonPackage rec { click curl-cffi orjson + pyreqwest-impersonate ]; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/dunamai/default.nix b/pkgs/development/python-modules/dunamai/default.nix index 6631ac27fda12..2ac7229c325b8 100644 --- a/pkgs/development/python-modules/dunamai/default.nix +++ b/pkgs/development/python-modules/dunamai/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dunamai"; - version = "1.19.2"; + version = "1.20.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mtkennerly"; repo = "dunamai"; rev = "refs/tags/v${version}"; - hash = "sha256-oLJlBytdp9uVdKEdYDMz/IYnPP7XVnCUcThKO3IiW10="; + hash = "sha256-K7G5BiUm8QTRbw0W3ebTld7CAZI8sYSnRsD7vQhCptE="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/dwdwfsapi/default.nix b/pkgs/development/python-modules/dwdwfsapi/default.nix index f903f7502147e..8f72d8c974b77 100644 --- a/pkgs/development/python-modules/dwdwfsapi/default.nix +++ b/pkgs/development/python-modules/dwdwfsapi/default.nix @@ -37,6 +37,5 @@ buildPythonPackage rec { homepage = "https://github.com/stephan192/dwdwfsapi"; changelog = "https://github.com/stephan192/dwdwfsapi/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/development/python-modules/editables/default.nix b/pkgs/development/python-modules/editables/default.nix index 06b93554322de..32030cff7d467 100644 --- a/pkgs/development/python-modules/editables/default.nix +++ b/pkgs/development/python-modules/editables/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "editables"; version = "0.5"; - format = "pyproject"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-MJYn2bXErcDmaNjG+nusG6fIxdQVwtJ/YPCB+OgNHeI="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -25,10 +25,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "editables" ]; - meta = with lib; { + meta = { description = "Editable installations"; - maintainers = with maintainers; [ ]; homepage = "https://github.com/pfmoore/editables"; - license = licenses.mit; + changelog = "https://github.com/pfmoore/editables/blob/${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ getchoo ]; }; } diff --git a/pkgs/development/python-modules/eduvpn-common/use-nix-lib.patch b/pkgs/development/python-modules/eduvpn-common/use-nix-lib.patch index a8f4975280c2f..ea40fe496e963 100644 --- a/pkgs/development/python-modules/eduvpn-common/use-nix-lib.patch +++ b/pkgs/development/python-modules/eduvpn-common/use-nix-lib.patch @@ -1,25 +1,10 @@ -diff --git a/eduvpn_common/loader.py b/eduvpn_common/loader.py -index 673d180..195f8c1 100644 --- a/eduvpn_common/loader.py +++ b/eduvpn_common/loader.py -@@ -21,6 +21,7 @@ def load_lib() -> CDLL: +@@ -22,6 +22,7 @@ def load_lib() -> CDLL: :return: The Go shared library loaded with cdll.LoadLibrary from ctypes :rtype: CDLL """ + return cdll.LoadLibrary("@libeduvpn-common@") - lib_prefixes = defaultdict( - lambda: "lib", - { -diff --git a/setup.py b/setup.py -index 0d23379..a9d7926 100755 ---- a/setup.py -+++ b/setup.py -@@ -92,4 +92,6 @@ class bdist_wheel(_bdist_wheel): - self.exports_lib_path = "../../exports/lib" # default - - def run(self): -+ _bdist_wheel.run(self) -+ return - self.plat_name_supplied = True # Force use platform - - libpath = getlibpath(self.plat_name) + libfile = f"libeduvpn_common-{__version__}.so" + + lib = None diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix index a9eccc7bbbc6f..93fd450edfa4b 100644 --- a/pkgs/development/python-modules/elastic-apm/default.nix +++ b/pkgs/development/python-modules/elastic-apm/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "elastic-apm"; - version = "6.22.2"; + version = "6.22.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "elastic"; repo = "apm-agent-python"; rev = "refs/tags/v${version}"; - hash = "sha256-AHKF+o0iZ+c1JFq3lL5XdHBDAae9qTR1OJvwuUVsaeU="; + hash = "sha256-nA+c2ycSVVJyfcNcj5W7Z2VSVcCzyCtoi3B/T4QZWnw="; }; pythonRelaxDeps = [ "wrapt" ]; diff --git a/pkgs/development/python-modules/elasticsearch8/default.nix b/pkgs/development/python-modules/elasticsearch8/default.nix index e36ec5eab06ce..8c36c4af08d6e 100644 --- a/pkgs/development/python-modules/elasticsearch8/default.nix +++ b/pkgs/development/python-modules/elasticsearch8/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "elasticsearch8"; - version = "8.13.2"; + version = "8.14.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-rl8IoV8kt68AJSkPMDx3d9eB6+2yPBgFpGEU6g+RjQ4="; + hash = "sha256-JiiJSjdWAocHvQ9RCGTUJD05hoSE23LYxvzMlELJUfM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/etils/default.nix b/pkgs/development/python-modules/etils/default.nix index 834b2ae93be01..f1df16ed59337 100644 --- a/pkgs/development/python-modules/etils/default.nix +++ b/pkgs/development/python-modules/etils/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "etils"; - version = "1.9.0"; + version = "1.9.2"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-XQ+N2qjg5kDGhe16f+H8XIFiUz+hL7lF8J7MU5sLNmw="; + hash = "sha256-FdzTWsDAzCQEtGrAhGrzzE6Hb9PYDzb1eVHifoudY3k="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index 1e560b59895bd..1ee6dcfb3215e 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "exchangelib"; - version = "5.4.0"; + version = "5.4.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "ecederstrand"; repo = "exchangelib"; rev = "refs/tags/v${version}"; - hash = "sha256-GBfSdX9gFLx+CCV8DWHWtVpWi6zI3fg/3g/MiIvRoVM="; + hash = "sha256-FPn2l+PkTXFqzjqF4kQ8KE49BXZUzDDIcFI3UqoxqQM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix index 5677c8002b3c5..5c67eb0444646 100644 --- a/pkgs/development/python-modules/execnet/default.nix +++ b/pkgs/development/python-modules/execnet/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "execnet"; version = "2.1.1"; - format = "pyproject"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -31,7 +31,7 @@ buildPythonPackage rec { rm testing/test_multi.py ''; - nativeBuildInputs = [ + build-system = [ hatchling hatch-vcs ]; @@ -57,11 +57,11 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - meta = with lib; { - changelog = "https://github.com/pytest-dev/execnet/blob/v${version}/CHANGELOG.rst"; + meta = { description = "Distributed Python deployment and communication"; homepage = "https://execnet.readthedocs.io/"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + changelog = "https://github.com/pytest-dev/execnet/blob/v${version}/CHANGELOG.rst"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ getchoo ]; }; } diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index ae6b255259fe6..4bd725f1865d3 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.5.45"; + version = "1.5.46"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fastai"; repo = "fastcore"; rev = "refs/tags/${version}"; - hash = "sha256-8fpH676g36d+VgJNmlGQf4uwPMAXQpxq7F4fwO0PsZk="; + hash = "sha256-Jcnex5gDNTQqF0cL9FEdLx5vuNSsAicl0RvivC8QwSM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/fastembed/default.nix b/pkgs/development/python-modules/fastembed/default.nix index 3aab5ddc6a298..005e514ff3c23 100644 --- a/pkgs/development/python-modules/fastembed/default.nix +++ b/pkgs/development/python-modules/fastembed/default.nix @@ -1,23 +1,31 @@ { lib, buildPythonPackage, - fetchFromGitHub, - huggingface-hub, - loguru, pythonOlder, + fetchFromGitHub, pythonRelaxDepsHook, + + # build-system poetry-core, + + # dependencies + huggingface-hub, + loguru, + mmh3, + numpy, onnx, onnxruntime, + pillow, + pystemmer, requests, + snowballstemmer, tokenizers, tqdm, - pytestCheckHook, }: buildPythonPackage rec { pname = "fastembed"; - version = "0.2.7"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +34,7 @@ buildPythonPackage rec { owner = "qdrant"; repo = "fastembed"; rev = "refs/tags/v${version}"; - hash = "sha256-ArLilvixzpHIGGAom4smX0jZ6lJSZe6tSGreeD+Pzmk="; + hash = "sha256-Tfj0YdUW/Nnvn4+RoOWj9l0gDkWbpVgiADA09ht4xxM="; }; build-system = [ poetry-core ]; @@ -36,30 +44,32 @@ buildPythonPackage rec { dependencies = [ huggingface-hub loguru + mmh3 + numpy onnx onnxruntime + pillow + pystemmer requests + snowballstemmer tokenizers tqdm ]; pythonImportsCheck = [ "fastembed" ]; - pythonRelaxDeps = [ - "huggingface-hub" - "onnxruntime" - "tokenizers" - ]; - - nativeCheckInputs = [ pytestCheckHook ]; + pythonRelaxDeps = [ "onnxruntime" ]; # there is one test and it requires network doCheck = false; - meta = with lib; { + meta = { description = "Fast, Accurate, Lightweight Python library to make State of the Art Embedding"; homepage = "https://github.com/qdrant/fastembed"; - license = licenses.asl20; - maintainers = with maintainers; [ happysalada ]; + changelog = "https://github.com/qdrant/fastembed/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ happysalada ]; + # terminate called after throwing an instance of 'onnxruntime::OnnxRuntimeException' + badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/development/python-modules/favicon/default.nix b/pkgs/development/python-modules/favicon/default.nix index 69e9aa04d8467..46c9517337104 100644 --- a/pkgs/development/python-modules/favicon/default.nix +++ b/pkgs/development/python-modules/favicon/default.nix @@ -42,6 +42,5 @@ buildPythonPackage rec { homepage = "https://github.com/scottwernervt/favicon"; changelog = "https://github.com/scottwernervt/favicon/blob/${version}/CHANGELOG.rst"; license = licenses.mit; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/development/python-modules/fints/default.nix b/pkgs/development/python-modules/fints/default.nix index 25b906c7fe45b..098cbce956fec 100644 --- a/pkgs/development/python-modules/fints/default.nix +++ b/pkgs/development/python-modules/fints/default.nix @@ -42,7 +42,6 @@ buildPythonPackage rec { description = "Pure-python FinTS (formerly known as HBCI) implementation"; license = licenses.lgpl3Only; maintainers = with maintainers; [ - elohmeier dotlambda ]; }; diff --git a/pkgs/development/python-modules/fipy/default.nix b/pkgs/development/python-modules/fipy/default.nix index 3c21d738f2fc5..a78c772c74a24 100644 --- a/pkgs/development/python-modules/fipy/default.nix +++ b/pkgs/development/python-modules/fipy/default.nix @@ -14,6 +14,7 @@ stdenv, openssh, fetchFromGitHub, + pythonAtLeast, pythonOlder, }: @@ -22,7 +23,10 @@ buildPythonPackage rec { version = "3.4.4"; format = "setuptools"; - disabled = pythonOlder "3.7"; + # Python 3.12 is not yet supported. + # https://github.com/usnistgov/fipy/issues/997 + # https://github.com/usnistgov/fipy/pull/1023 + disabled = pythonOlder "3.7" || pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "usnistgov"; @@ -45,12 +49,18 @@ buildPythonPackage rec { nativeCheckInputs = lib.optionals (!stdenv.isDarwin) [ gmsh ]; + # NOTE: Two of the doctests in fipy.matrices.scipyMatrix._ScipyMatrix.CSR fail, and there is no + # clean way to disable them. + doCheck = false; + checkPhase = '' export OMPI_MCA_plm_rsh_agent=${openssh}/bin/ssh ${python.interpreter} setup.py test --modules ''; - pythonImportsCheck = [ "fipy" ]; + # NOTE: Importing fipy within the sandbox will fail because plm_rsh_agent isn't set and the process isn't able + # to start a daemon on the builder. + # pythonImportsCheck = [ "fipy" ]; meta = with lib; { homepage = "https://www.ctcms.nist.gov/fipy/"; diff --git a/pkgs/development/python-modules/frigidaire/default.nix b/pkgs/development/python-modules/frigidaire/default.nix index b8c82f26cb2f7..89140e97a432e 100644 --- a/pkgs/development/python-modules/frigidaire/default.nix +++ b/pkgs/development/python-modules/frigidaire/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "frigidaire"; - version = "0.18.16"; + version = "0.18.19"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bm1549"; repo = "frigidaire"; rev = "refs/tags/${version}"; - hash = "sha256-PQrQM9AuudDmmsmMcZJjBm+rLA/juDgr3+SORuVurqQ="; + hash = "sha256-wbYijFiMk+EIAjD6+mKt/c6JwN9oQLfeL1Pk30RbKKs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/fx2/default.nix b/pkgs/development/python-modules/fx2/default.nix index 6b2dcccc67af3..52711cead2d0b 100644 --- a/pkgs/development/python-modules/fx2/default.nix +++ b/pkgs/development/python-modules/fx2/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { mainProgram = "fx2tool"; homepage = "https://github.com/whitequark/libfx2"; license = licenses.bsd0; - maintainers = with maintainers; [ emily ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/galois/default.nix b/pkgs/development/python-modules/galois/default.nix index aee28fb25159e..331785dd9e201 100644 --- a/pkgs/development/python-modules/galois/default.nix +++ b/pkgs/development/python-modules/galois/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "galois"; - version = "0.3.8"; + version = "0.3.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mhostetter"; repo = "galois"; rev = "refs/tags/v${version}"; - hash = "sha256-Nfr9gD2FLZ+KvHh1mcpReUWnzFr/NxpvperzZPoFeT4="; + hash = "sha256-vgOsFEocgBvYba9Aq4HDYsnK1w+iQm1QDTzln68Tqss="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/genie-partner-sdk/default.nix b/pkgs/development/python-modules/genie-partner-sdk/default.nix new file mode 100644 index 0000000000000..0a70a198e25ab --- /dev/null +++ b/pkgs/development/python-modules/genie-partner-sdk/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + hatchling, + aiohttp, + fetchPypi, +}: + +buildPythonPackage rec { + pname = "genie-partner-sdk"; + version = "1.0.3"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchPypi { + inherit version; + pname = "genie_partner_sdk"; + hash = "sha256-/Pu0pULepRpAdUfu2SQjK4xCSe3FWWNT9AqZEASoZSE="; + }; + + nativeBuildInputs = [ hatchling ]; + + propagatedBuildInputs = [ aiohttp ]; + + # No tests + doCheck = false; + + pythonImportsCheck = [ "genie_partner_sdk" ]; + + meta = with lib; { + description = "An SDK to interact with the AladdinConnect (or OHD) partner API"; + homepage = "https://github.com/Genie-Garage/aladdin-python-sdk"; + license = licenses.unfree; + maintainers = with maintainers; [ jamiemagee ]; + }; +} diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index 021292f8c4ac8..e4b958d424618 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch, pytestCheckHook, pythonOlder, setuptools, @@ -29,6 +30,20 @@ buildPythonPackage rec { hash = "sha256-FBhPcae8bnNnsfr14I1p22VhoOf9USF9DAcrAqx+zso="; }; + patches = [ + # GDAL 3.9 compat for boolean array in shp + (fetchpatch { + url = "https://github.com/geopandas/geopandas/commit/f1be60532bed31cb410ce4db2da6b733bc8713c9.patch"; + sha256 = "sha256-DZhC7sSOki0XTcojSRvVVSlsnYnxCw/Ee7vHBmDCsbA="; + }) + + # GDAL 3.9 compat for boolean array in shp for fiona + (fetchpatch { + url = "https://github.com/geopandas/geopandas/commit/1e08422d8aee4877752047a8a08f41e3a67188f2.patch"; + sha256 = "sha256-SpNqe7jL1rA79YhhSUfEzt30plt56Tux5v1h7IHp31I="; + }) + ]; + build-system = [ setuptools ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/glcontext/default.nix b/pkgs/development/python-modules/glcontext/default.nix index db5530e3c5e8f..4ad9fa3060900 100644 --- a/pkgs/development/python-modules/glcontext/default.nix +++ b/pkgs/development/python-modules/glcontext/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { description = "OpenGL implementation for ModernGL"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ friedelino ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix index 9de834fab5d76..1ee6497fd1817 100644 --- a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix +++ b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-ai-generativelanguage"; - version = "0.6.4"; + version = "0.6.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-F1CEjBKvlsskrhw90F5L/iSGfcRXcAntA+EELYQh6HQ="; + hash = "sha256-xAicJ3+k4mci92qwPuMDnyi+i/HJvigpSLlYOhVMbXk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index d218ea2e2aaed..35de32bea6c51 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "3.23.1"; + version = "3.24.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-S0WX+SkbQhAslmfTtFKPgB1MjyTvKxLdHsuIEnMzCVU="; + hash = "sha256-6V5vbgqjLmxFPUTisymJMf3XlHwwnqMpoxtv8fk54X4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index dd6485aa5d24a..30c5087f0d4a2 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.23.1"; + version = "2.24.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FHWiK/zhY7XELN9O717AUyPuozWFUpT5zk4j+qIk8Cg="; + hash = "sha256-rOdfYso8UtZhnU/3rtmCEpyuUIuvd22BszMT9PnqXtQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 51d7ef7eee586..5ec6a9d49cd06 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.46.0"; + version = "2.47.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-3kbZ+y22ml8j4NVjfEzzl1JcAsbyVJGCRJuitv7K7lw="; + hash = "sha256-tvzOKTu2n5b9JDo9EJw48BUrJuOwOR9JK6PQyi44HfI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index c9b794fd1c8e6..f9ce73cf823c2 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.21.2"; + version = "2.21.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/HIiaxRzHbKHP3xAMcx1fidLvNq8rHUjss1uRhMNYJY="; + hash = "sha256-30THmk17+1rfpnVBPjuRu74G6R0nFaFfklFAsFcVu30="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-generativeai/default.nix b/pkgs/development/python-modules/google-generativeai/default.nix index 2d8673ad3fdfb..13f9386eb135c 100644 --- a/pkgs/development/python-modules/google-generativeai/default.nix +++ b/pkgs/development/python-modules/google-generativeai/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "google-generativeai"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "google"; repo = "generative-ai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-LPT7pyI1crgLCMHZmjGLFvDwuLwdPNGojgvli6qUOy8="; + hash = "sha256-cK5Go5mFy+dC5/B4aMLDjZytNZn79r+ZvOEwAW0FPrI="; }; pythonRelaxDeps = [ "google-ai-generativelanguage" ]; diff --git a/pkgs/development/python-modules/gpsoauth/default.nix b/pkgs/development/python-modules/gpsoauth/default.nix index cfda3e8db2d59..28d364c2650d9 100644 --- a/pkgs/development/python-modules/gpsoauth/default.nix +++ b/pkgs/development/python-modules/gpsoauth/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "gpsoauth"; - version = "1.1.0"; + version = "1.1.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-BA+2aFxpFpi6cWGl4yepba7s7BmZ1ijvSBhtS23v3QM="; + hash = "sha256-WCAu0wM5fSkntGTcleJxS///haGw+Iv2jzrWOFnr5DU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/graph-tool/default.nix b/pkgs/development/python-modules/graph-tool/default.nix index a7bc311ae031c..126a259a95653 100644 --- a/pkgs/development/python-modules/graph-tool/default.nix +++ b/pkgs/development/python-modules/graph-tool/default.nix @@ -22,6 +22,7 @@ python, scipy, sparsehash, + gitUpdater, }: let @@ -33,12 +34,12 @@ let in buildPythonPackage rec { pname = "graph-tool"; - version = "2.68"; + version = "2.70"; format = "other"; src = fetchurl { url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2"; - hash = "sha256-jB+/R6yZVhU0iohxYVNHdD205MauRxMoohbj4a2T+rw="; + hash = "sha256-hohGgOnxP1nb8NfkDRYPJ08sx0EH8PxX7Rblk1PLlIk="; }; # Remove error messages about tput during build process without adding ncurses, @@ -88,6 +89,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "graph_tool" ]; + passthru.updateScript = gitUpdater { + url = "https://git.skewed.de/count0/graph-tool"; + rev-prefix = "release-"; + }; + meta = { description = "Python module for manipulation and statistical analysis of graphs"; homepage = "https://graph-tool.skewed.de"; diff --git a/pkgs/development/python-modules/greynoise/default.nix b/pkgs/development/python-modules/greynoise/default.nix index 80cc088e7c91a..44eadbdb6d3ca 100644 --- a/pkgs/development/python-modules/greynoise/default.nix +++ b/pkgs/development/python-modules/greynoise/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "greynoise"; - version = "2.1.0"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "GreyNoise-Intelligence"; repo = "pygreynoise"; rev = "refs/tags/v${version}"; - hash = "sha256-bMQfGkCjMBimNaYzSi78GaLiDiLdmxMB8RfFCVTxD5U="; + hash = "sha256-jsLvq0GndprdYL5mxHDRtZmNkeKT/rIV+dAnRPEmsV8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index 640d4ec5f29cd..64694b89471cb 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.45.3"; + version = "0.47.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "griffe"; rev = "refs/tags/${version}"; - hash = "sha256-iJ/yovyaLS2zdXbqUZU8lY59EHZZoSxQGDOS5JW0jt0="; + hash = "sha256-NkS8cD0G/nbquQfMVcdbTLnJx26PQnqWB8UnBTNIBdE="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix index 9489be94213c6..25296b64d9baa 100644 --- a/pkgs/development/python-modules/gunicorn/default.nix +++ b/pkgs/development/python-modules/gunicorn/default.nix @@ -38,11 +38,11 @@ buildPythonPackage rec { --replace "--cov=gunicorn --cov-report=xml" "" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ packaging ]; + dependencies = [ packaging ]; - passthru.optional-dependencies = { + optional-dependencies = { gevent = [ gevent ]; eventlet = [ eventlet ]; tornado = [ tornado ]; @@ -52,16 +52,14 @@ buildPythonPackage rec { pythonImportsCheck = [ "gunicorn" ]; - nativeCheckInputs = [ - pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); - meta = with lib; { - changelog = "https://github.com/benoitc/gunicorn/releases/tag/${version}"; - homepage = "https://github.com/benoitc/gunicorn"; + meta = { description = "gunicorn 'Green Unicorn' is a WSGI HTTP Server for UNIX, fast clients and sleepy applications"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + homepage = "https://github.com/benoitc/gunicorn"; + changelog = "https://github.com/benoitc/gunicorn/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ getchoo ]; mainProgram = "gunicorn"; }; } diff --git a/pkgs/development/python-modules/gvm-tools/default.nix b/pkgs/development/python-modules/gvm-tools/default.nix index 35cd9afd44031..8e1e2124c1036 100644 --- a/pkgs/development/python-modules/gvm-tools/default.nix +++ b/pkgs/development/python-modules/gvm-tools/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "gvm-tools"; - version = "24.3.0"; + version = "24.6.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = "gvm-tools"; rev = "refs/tags/v${version}"; - hash = "sha256-LLXMdT1q6IWsbsRjflpGN5pcjUCXWzdFK3gMw4mBm0U="; + hash = "sha256-R8wpkzL2QxGdvc6vWtrbIGEiryc+QQ3OitdxMcpH+F4="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/hatch-vcs/default.nix b/pkgs/development/python-modules/hatch-vcs/default.nix index 5743b35c2b80e..ec89847abc248 100644 --- a/pkgs/development/python-modules/hatch-vcs/default.nix +++ b/pkgs/development/python-modules/hatch-vcs/default.nix @@ -38,6 +38,11 @@ buildPythonPackage rec { # incompatible with setuptools-scm>=7 # https://github.com/ofek/hatch-vcs/issues/8 "test_write" + ] ++ lib.optionals (pythonOlder "3.11") [ + # https://github.com/pypa/setuptools_scm/issues/1038, fixed in setuptools_scm@8.1.0 + "test_basic" + "test_root" + "test_metadata" ]; pythonImportsCheck = [ "hatch_vcs" ]; diff --git a/pkgs/development/python-modules/hdate/default.nix b/pkgs/development/python-modules/hdate/default.nix index 0a005cba2ac6b..214aa83fbbc06 100644 --- a/pkgs/development/python-modules/hdate/default.nix +++ b/pkgs/development/python-modules/hdate/default.nix @@ -3,7 +3,7 @@ astral, buildPythonPackage, fetchFromGitHub, - poetry-core, + pdm-backend, pythonRelaxDepsHook, pytestCheckHook, pythonOlder, @@ -12,26 +12,25 @@ buildPythonPackage rec { pname = "hdate"; - version = "0.10.8"; + version = "0.10.9"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "py-libhdate"; repo = "py-libhdate"; rev = "refs/tags/v${version}"; - hash = "sha256-SANCZl+1ghUuuxZAl6oycvo7hB7mIagjVEmwzarsspk="; + hash = "sha256-Cni8GegB8GAhtIKKCgSn3QavE/Gi9Rcm9v0grToMyq4="; }; - build-system = [ - poetry-core - pythonRelaxDepsHook - ]; - pythonRelaxDeps = [ "astral" - "pytz" + ]; + + build-system = [ + pdm-backend + pythonRelaxDepsHook ]; dependencies = [ @@ -49,7 +48,7 @@ buildPythonPackage rec { description = "Python module for Jewish/Hebrew date and Zmanim"; homepage = "https://github.com/py-libhdate/py-libhdate"; changelog = "https://github.com/py-libhdate/py-libhdate/releases/tag/v${version}"; - license = with licenses; [ gpl3Plus ]; + license = licenses.gpl3Plus; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/hepunits/default.nix b/pkgs/development/python-modules/hepunits/default.nix index 5056c6867868d..8664d4b23665b 100644 --- a/pkgs/development/python-modules/hepunits/default.nix +++ b/pkgs/development/python-modules/hepunits/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "hepunits"; - version = "2.3.3"; + version = "2.3.4"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Z9fMd81U1ytpwmpo5e+teEK29o+ovGJ7uQ5BF3q+aUU="; + hash = "sha256-qEK4hqZ7oFY6NHFVJ3z9yPtnAggjNmG8urnyip34zWA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 4fa22965e5cb0..50beaa7df2668 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.50"; + version = "0.51"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "python-holidays"; rev = "refs/tags/v${version}"; - hash = "sha256-C5DZzLfxTzo+s2HWvqWbtEUT0/CLKPQXyEUN4vgRmBA="; + hash = "sha256-0zLoxXgp4gby2pj96CJ2TOZBMmzuWKczotma7Q/3/ys="; }; build-system = [ diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index 692cd31354ed0..59da4385026f9 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2024.5.1"; + version = "2024.6.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sethmlarson"; repo = "hstspreload"; rev = "refs/tags/${version}"; - hash = "sha256-Ut2VhU2+o4wm4WY4zz/25EyDLvrYoBu3iVFkx3FZVYo="; + hash = "sha256-eeZR+UDQ6Cp1WTcz2duSTgQ+7vrF9T08aVT0mJk6ctA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index 18d2efa4bd062..0f09ffe98a4e3 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.23.3"; + version = "0.23.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "huggingface_hub"; rev = "refs/tags/v${version}"; - hash = "sha256-878ijhVxvVvytYZTpCBbmo3GsU1bvOl2HXlPu0E/xtQ="; + hash = "sha256-6UAuNKeltaclhnQ7J2X0EziGitROMKmOlIWGw87y66E="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/humanfriendly/default.nix b/pkgs/development/python-modules/humanfriendly/default.nix index 766fb13391597..8c217e3ac228b 100644 --- a/pkgs/development/python-modules/humanfriendly/default.nix +++ b/pkgs/development/python-modules/humanfriendly/default.nix @@ -2,18 +2,30 @@ lib, buildPythonPackage, fetchPypi, + fetchpatch2, + setuptools, }: buildPythonPackage rec { pname = "humanfriendly"; version = "10.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "6b0b831ce8f15f7300721aa49829fc4e83921a9a301cc7f606be6686a2288ddc"; }; + patches = [ + (fetchpatch2 { + # https://github.com/xolox/python-humanfriendly/pull/75 + url = "https://github.com/musicinmybrain/python-humanfriendly/commit/13d05b8057010121acd2a402a337ef4ee5834062.patch"; + hash = "sha256-m7cySiIx0gNhh6KKhT71DJFOtFu2Copk9ic2yaiCulk="; + }) + ]; + + build-system = [ setuptools ]; + # humanfriendly tests depends on coloredlogs which itself depends on # humanfriendly. This lead to infinite recursion when trying to # build this package so we have to disable the test suite :( diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index 53e96f9dfbd47..abaabb11f1bb1 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -12,9 +12,7 @@ datafusion, db-dtypes, duckdb, - duckdb-engine, filelock, - geoalchemy2, geopandas, google-cloud-bigquery, google-cloud-bigquery-storage, @@ -51,9 +49,6 @@ rich, shapely, snowflake-connector-python, - snowflake-sqlalchemy, - sqlalchemy, - sqlalchemy-views, sqlglot, sqlite, toolz, @@ -72,25 +67,25 @@ let name = "ibis-testing-data"; owner = "ibis-project"; repo = "testing-data"; - # https://github.com/ibis-project/ibis/blob/9.0.0/nix/overlay.nix#L20-L26 - rev = "1922bd4617546b877e66e78bb2b87abeb510cf8e"; - hash = "sha256-l5d7r/6Voy6N2pXq3IivLX3N0tNfKKwsbZXRexzc8Z8="; + # https://github.com/ibis-project/ibis/blob/9.1.0/nix/overlay.nix#L20-L26 + rev = "6737d1cb5951cabaccd095a3ae62a93dbd11ecb9"; + hash = "sha256-MoVTZPWh4KVlrICYACrgfeLdl/fqoa1iweNg3zUtdrs="; }; in buildPythonPackage rec { pname = "ibis-framework"; - version = "9.0.0-unstable-2024-06-03"; + version = "9.1.0"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { name = "ibis-source"; repo = "ibis"; owner = "ibis-project"; - rev = "395c8b539bcd541d36892d95f413dcc3f93ca0bc"; - hash = "sha256-PPjp8HOwM4IaBz7TBGDgkVytHmX9fKO+ZBR33BoB55s="; + rev = "refs/tags/${version}"; + hash = "sha256-GmzmXzYMs7K7B//is3ZoD4muPAkb0tM56zFBbsA+NEo="; }; nativeBuildInputs = [ @@ -139,28 +134,16 @@ buildPythonPackage rec { ]; disabledTests = [ - # breakage from sqlalchemy2 truediv changes - "test_tpc_h17" # tries to download duckdb extensions "test_attach_sqlite" "test_connect_extensions" "test_load_extension" "test_read_sqlite" "test_register_sqlite" - # duckdb does not respect sample_size=2 (reads 3 lines of csv). - "test_csv_reregister_schema" - # duckdb fails with: - # "This function can not be called with an active transaction!, commit or abort the existing one first" - "test_vectorized_udf" + # requires network connection "test_s3_403_fallback" - "test_map_merge_udf" - "test_udf" - "test_map_udf" - # DataFusion error - "datafusion" - # pluggy.PluggyTeardownRaisedWarning - "test_repr_png_is_not_none_in_not_interactive" - "test_interval_arithmetic" + # requires pytest 8.2+ + "test_roundtrip_delta" ]; # patch out tests that check formatting with black @@ -192,78 +175,42 @@ buildPythonPackage rec { google-cloud-bigquery-storage pydata-google-auth ]; - clickhouse = [ - clickhouse-connect - sqlalchemy - ]; + clickhouse = [ clickhouse-connect ]; dask = [ dask regex + packaging ]; datafusion = [ datafusion ]; - druid = [ - pydruid - sqlalchemy - ]; - duckdb = [ - duckdb - duckdb-engine - sqlalchemy - sqlalchemy-views - ]; + druid = [ pydruid ]; + duckdb = [ duckdb ]; flink = [ ]; geospatial = [ - geoalchemy2 geopandas shapely ]; - mssql = [ - sqlalchemy - pyodbc - sqlalchemy-views - ]; - mysql = [ - sqlalchemy - pymysql - sqlalchemy-views - ]; + mssql = [ pyodbc ]; + mysql = [ pymysql ]; oracle = [ - sqlalchemy oracledb packaging - sqlalchemy-views ]; - pandas = [ regex ]; + pandas = [ + regex + packaging + ]; polars = [ polars packaging ]; - postgres = [ - psycopg2 - sqlalchemy - sqlalchemy-views - ]; + postgres = [ psycopg2 ]; pyspark = [ pyspark - sqlalchemy - packaging - ]; - snowflake = [ - snowflake-connector-python - snowflake-sqlalchemy - sqlalchemy-views packaging ]; - sqlite = [ - regex - sqlalchemy - sqlalchemy-views - ]; - trino = [ - trino-python-client - sqlalchemy - sqlalchemy-views - ]; + snowflake = [ snowflake-connector-python ]; + sqlite = [ regex ]; + trino = [ trino-python-client ]; visualization = [ graphviz ]; decompiler = [ black ]; examples = [ pins ] ++ pins.optional-dependencies.gcs; diff --git a/pkgs/development/python-modules/incomfort-client/default.nix b/pkgs/development/python-modules/incomfort-client/default.nix index e208e47479be0..86f59510ba260 100644 --- a/pkgs/development/python-modules/incomfort-client/default.nix +++ b/pkgs/development/python-modules/incomfort-client/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "incomfort-client"; - version = "0.6.1"; + version = "0.6.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zxdavb"; repo = "incomfort-client"; rev = "refs/tags/v${version}"; - hash = "sha256-kdPue3IfF85O+0dgvX+dN6S4WoQmjxdCfwfv83SnO8E="; + hash = "sha256-2hTH0haG8ja0Hgomj7kbbHUij9w3jbhHeKeMCtsgeEE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/inline-snapshot/default.nix b/pkgs/development/python-modules/inline-snapshot/default.nix new file mode 100644 index 0000000000000..37e3657815732 --- /dev/null +++ b/pkgs/development/python-modules/inline-snapshot/default.nix @@ -0,0 +1,73 @@ +{ + lib, + asttokens, + black, + buildPythonPackage, + click, + dirty-equals, + executing, + fetchFromGitHub, + hypothesis, + poetry-core, + pyright, + pytest-subtests, + pytest-xdist, + pytestCheckHook, + pythonOlder, + rich, + time-machine, + toml, + types-toml, +}: + +buildPythonPackage rec { + pname = "inline-snapshot"; + version = "0.10.2"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "15r10nk"; + repo = "inline-snapshot"; + rev = "refs/tags/v${version}"; + hash = "sha256-19rvhqYkM3QiD0La5TRi/2uKza8HW/bnXeGAhOZ/bgs="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + asttokens + black + click + executing + rich + toml + types-toml + ]; + + nativeCheckInputs = [ + dirty-equals + hypothesis + pyright + pytest-subtests + pytest-xdist + pytestCheckHook + time-machine + ]; + + pythonImportsCheck = [ "inline_snapshot" ]; + + disabledTestPaths = [ + # Tests don't play nice with pytest-xdist + "tests/test_typing.py" + ]; + + meta = with lib; { + description = "Create and update inline snapshots in Python tests"; + homepage = "https://github.com/15r10nk/inline-snapshot/"; + changelog = "https://github.com/15r10nk/inline-snapshot/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/insightface/default.nix b/pkgs/development/python-modules/insightface/default.nix index 1403f094807ab..1199e09eae0d9 100644 --- a/pkgs/development/python-modules/insightface/default.nix +++ b/pkgs/development/python-modules/insightface/default.nix @@ -19,12 +19,13 @@ tensorboard, testers, tqdm, + stdenv, }: buildPythonPackage rec { pname = "insightface"; version = "0.7.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -33,9 +34,9 @@ buildPythonPackage rec { hash = "sha256-8ZH3GWEuuzcBj0GTaBRQBUTND4bm/NZ2wCPzVMZo3fc="; }; - nativeBuildInputs = [ cython ]; + build-system = [ cython ]; - propagatedBuildInputs = [ + dependencies = [ easydict matplotlib mxnet @@ -67,11 +68,13 @@ buildPythonPackage rec { doCheck = false; # Upstream has no tests - meta = with lib; { + meta = { description = "State-of-the-art 2D and 3D Face Analysis Project"; mainProgram = "insightface-cli"; homepage = "https://github.com/deepinsight/insightface"; - license = licenses.mit; - maintainers = with maintainers; [ oddlama ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ oddlama ]; + # terminate called after throwing an instance of 'onnxruntime::OnnxRuntimeException' + broken = stdenv.system == "aarch64-linux"; }; } diff --git a/pkgs/development/python-modules/isosurfaces/default.nix b/pkgs/development/python-modules/isosurfaces/default.nix index a7352c590bc10..7356db3a27449 100644 --- a/pkgs/development/python-modules/isosurfaces/default.nix +++ b/pkgs/development/python-modules/isosurfaces/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { many far from the implicit surface. ''; license = licenses.mit; - maintainers = with maintainers; [ friedelino ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/jsonmerge/default.nix b/pkgs/development/python-modules/jsonmerge/default.nix index 9f636ab57f4e1..5879be3b53592 100644 --- a/pkgs/development/python-modules/jsonmerge/default.nix +++ b/pkgs/development/python-modules/jsonmerge/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { homepage = "https://github.com/avian2/jsonmerge"; changelog = "https://github.com/avian2/jsonmerge/blob/jsonmerge-${version}/ChangeLog"; license = licenses.mit; - maintainers = with maintainers; [ emily ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix index 0903e7a1f12a1..5cf7fe1f5b803 100644 --- a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix +++ b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "jsonrpclib-pelix"; - version = "0.4.3.2"; + version = "0.4.3.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-6eCzPvqPog2BfdeN/Z5M2zlnyKXTy1p4O+HugcSonHw="; + hash = "sha256-xJT+cQCxE5sTEUacKLwy0cuS5P8fRRH7cdaAcgXcN3M="; }; doCheck = false; # test_suite="tests" in setup.py but no tests in pypi. diff --git a/pkgs/development/python-modules/jupyter-packaging/default.nix b/pkgs/development/python-modules/jupyter-packaging/default.nix index a0f3174f1c682..b4220824ae93a 100644 --- a/pkgs/development/python-modules/jupyter-packaging/default.nix +++ b/pkgs/development/python-modules/jupyter-packaging/default.nix @@ -68,6 +68,5 @@ buildPythonPackage rec { description = "Jupyter Packaging Utilities"; homepage = "https://github.com/jupyter/jupyter-packaging"; license = licenses.bsd3; - maintainers = [ maintainers.elohmeier ]; }; } diff --git a/pkgs/development/python-modules/jupyter-ui-poll/default.nix b/pkgs/development/python-modules/jupyter-ui-poll/default.nix index 0aafb336d6778..4a3c69c553046 100644 --- a/pkgs/development/python-modules/jupyter-ui-poll/default.nix +++ b/pkgs/development/python-modules/jupyter-ui-poll/default.nix @@ -9,29 +9,30 @@ buildPythonPackage rec { pname = "jupyter-ui-poll"; - version = "0.2.2"; - format = "pyproject"; + version = "1.0.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "Kirill888"; repo = "jupyter-ui-poll"; rev = "refs/tags/v${version}"; - hash = "sha256-DWZFvzx0aNTmf1x8Rq19OT0PFRxdpKefWYFh8C116Fw"; + hash = "sha256-mlgLd6uFDSxRBj4+Eidea2CE7FuG6NzJLWGec4KPd9k="; }; - nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ ipython ]; + build-system = [ setuptools ]; + + dependencies = [ ipython ]; doCheck = false; # no tests in package :( pythonImportsCheck = [ "jupyter_ui_poll" ]; - meta = with lib; { + meta = { description = "Block jupyter cell execution while interacting with widgets"; homepage = "https://github.com/Kirill888/jupyter-ui-poll"; changelog = "https://github.com/Kirill888/jupyter-ui-poll/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ bcdarwin ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcdarwin ]; }; } diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix index 7346d6fbbf326..063ee482ddb5c 100644 --- a/pkgs/development/python-modules/langchain-community/default.nix +++ b/pkgs/development/python-modules/langchain-community/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "langchain-community"; - version = "0.2.4"; + version = "0.2.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -37,8 +37,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - rev = "langchain-community==${version}"; - hash = "sha256-rqlYaSfDZIQHCndsnydeR1oeVZNIOH6NAgXeOSdBF5A="; + rev = "refs/tags/${pname}==${version}"; + hash = "sha256-SVqhNfRAQoVyUsPw55ByPtVzU/h1II/ox8I79QJsci8="; }; sourceRoot = "${src.name}/libs/community"; @@ -85,6 +85,11 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; + disabledTests = [ + # Test require network access + "test_ovhcloud_embed_documents" + ]; + meta = { description = "Community contributed LangChain integrations"; homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/community"; diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index c8566dd441f39..954ddd477f4ae 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "langchain-core"; - version = "0.2.5"; + version = "0.2.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langchain"; rev = "langchain-core==${version}"; - hash = "sha256-EBs6BHxBPBR1TfSyesM2gJJtxgClM6lLXko1qisrz7A="; + hash = "sha256-MmWgnpOO+OWUyRUBqIKuIHG2/p8NfSlVJVbUXfF4spg="; }; sourceRoot = "${src.name}/libs/core"; diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index 91b7a54b1d0fe..b6d34154583d2 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.2.3"; + version = "0.2.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain==${version}"; - hash = "sha256-9WrWQuZxtl/eBEDdgKCUqT7fYBl6gSsW9rB8tTBqMso="; + hash = "sha256-WaJRXvA/SImTSgAkk06vmOtTbsYYs8nTChFLzmsFz7Q="; }; sourceRoot = "${src.name}/libs/langchain"; diff --git a/pkgs/development/python-modules/langfuse/default.nix b/pkgs/development/python-modules/langfuse/default.nix index e820964e5e1ed..ceff4e3ba26e3 100644 --- a/pkgs/development/python-modules/langfuse/default.nix +++ b/pkgs/development/python-modules/langfuse/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "langfuse"; - version = "2.35.0"; + version = "2.36.1"; pyproject = true; src = fetchFromGitHub { owner = "langfuse"; repo = "langfuse-python"; rev = "refs/tags/v${version}"; - hash = "sha256-u1gnv2eDYhF0C4r88VMIedxUEk6WU88Q0mlweVKLaoc="; + hash = "sha256-qPSkATK+IRgtK43B9nr5rC3zZ7qm+/uBJrm7mVhZyUE="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index c81ff1cc538c3..d86c96eb87ade 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -4,6 +4,7 @@ anthropic, attr, buildPythonPackage, + dataclasses-json, fastapi, fetchFromGitHub, freezegun, @@ -22,7 +23,7 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.1.64"; + version = "0.1.77"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,17 +32,16 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-oAAbki0Mo4qmjIFpD4girpRuSKr9eLPU6Da6muG0NNk="; + hash = "sha256-Tkqo0BbBqFMsEDtEo0sVgSQOoa/J+ECw/7T7yALnL84="; }; sourceRoot = "${src.name}/python"; pythonRelaxDeps = [ "orjson" ]; - build-system = [ - poetry-core - pythonRelaxDepsHook - ]; + build-system = [ poetry-core ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ orjson @@ -51,6 +51,7 @@ buildPythonPackage rec { nativeCheckInputs = [ anthropic + dataclasses-json fastapi freezegun httpx diff --git a/pkgs/development/python-modules/laszip/default.nix b/pkgs/development/python-modules/laszip/default.nix index bd9a89ce2414a..97c268d956ba0 100644 --- a/pkgs/development/python-modules/laszip/default.nix +++ b/pkgs/development/python-modules/laszip/default.nix @@ -7,7 +7,7 @@ scikit-build-core, pybind11, cmake, - LASzip, + laszip, ninja, pythonOlder, }: @@ -48,7 +48,7 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - buildInputs = [ LASzip ]; + buildInputs = [ laszip ]; # There are no tests doCheck = false; diff --git a/pkgs/development/python-modules/libpysal/default.nix b/pkgs/development/python-modules/libpysal/default.nix index 89388893e8b26..8ec004d6c4810 100644 --- a/pkgs/development/python-modules/libpysal/default.nix +++ b/pkgs/development/python-modules/libpysal/default.nix @@ -22,15 +22,15 @@ buildPythonPackage rec { pname = "libpysal"; - version = "4.10"; + version = "4.11.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "pysal"; repo = "libpysal"; - rev = "v${version}"; - hash = "sha256-jzSkIFSIXc039KR4fS1HOI/Rj0mHwbArn2hD+zfAZDg="; + rev = "refs/tags/v${version}"; + hash = "sha256-1JZ82wO0kisbTrhsn+BYeNZpkMJUEzuflQ6GqpAYH/c="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix index 8a669dac6bb89..3d0d9921c6881 100644 --- a/pkgs/development/python-modules/llama-index-core/default.nix +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -46,7 +46,7 @@ in buildPythonPackage rec { pname = "llama-index-core"; - version = "0.10.43"; + version = "0.10.45"; pyproject = true; disabled = pythonOlder "3.8"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = "run-llama"; repo = "llama_index"; rev = "refs/tags/v${version}"; - hash = "sha256-eqT3PR1yOrMU/lWGOr70OcekTeHveDfM9C8VOJEx1ps="; + hash = "sha256-mI2Cx3ZMW8cLiA7wIo/QwxZrlBVR9W/TMAD5l0TjBQo="; }; sourceRoot = "${src.name}/${pname}"; diff --git a/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix index bea5dec85e19f..3bd7ddbef4601 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "llama-index-embeddings-gemini"; - version = "0.1.7"; + version = "0.1.8"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_embeddings_gemini"; inherit version; - hash = "sha256-0ob6t9pFaIsbDyt9+QOKFQctS6s99tEvdstn39iyVpA="; + hash = "sha256-rQKyPqZnyVYH2h5TTVV53kYYldGURWARWjYBrBb4d5M="; }; pythonRelaxDeps = [ "google-generativeai" ]; diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix index cf76dd2e810ee..95045b4d31546 100644 --- a/pkgs/development/python-modules/llama-index-readers-file/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "llama-index-readers-file"; - version = "0.1.23"; + version = "0.1.25"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_file"; inherit version; - hash = "sha256-/ejstYjnA4SeUdwPB19W0fXbO8FHndAMIbQuk7gbYmc="; + hash = "sha256-I43dmKo3fWpEMiAT64SAVgN8gK2EVx6lv0UaZA//TVw="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix index 9a0dc4a656e8e..e08c5bdaedaa6 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-chroma"; - version = "0.1.8"; + version = "0.1.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_chroma"; inherit version; - hash = "sha256-nFdLrzcPr0Vry2e51eonOm+h8rT9IFpZxHtoESNkuec="; + hash = "sha256-alwnqzriXPUEvtlRPB8DU2XftXa4hv4zTUaQjKJKWc8="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix index 4c95a9bfcefb7..63e8b5d9992d0 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-postgres"; - version = "0.1.10"; + version = "0.1.11"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_postgres"; inherit version; - hash = "sha256-mtEAl4e3NAx5rILQu7BAv/4+kxth5IybHeKUAwFZQbs="; + hash = "sha256-ziP/lUnFJpvcy6Y4h1uSH6qkpYHO+3U+mfg2XIJIeg4="; }; pythonRemoveDeps = [ "psycopg2-binary" ]; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix index 6cd34d2fd0b67..47fbc28659176 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-qdrant"; - version = "0.2.9"; + version = "0.2.10"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_qdrant"; inherit version; - hash = "sha256-Iju/6Mh/dooQb8u3MHFc8XgNel2FBOI0VAGh6/dNZT4="; + hash = "sha256-kFUZiE7rtVQQzaTstKOaM2XkKZQ7ydqVR/2xyPdVtt8="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/llama-index/default.nix b/pkgs/development/python-modules/llama-index/default.nix index 800143b8277ab..575c61c89f41f 100644 --- a/pkgs/development/python-modules/llama-index/default.nix +++ b/pkgs/development/python-modules/llama-index/default.nix @@ -1,6 +1,8 @@ { lib, buildPythonPackage, + poetry-core, + pythonRelaxDepsHook, llama-index-agent-openai, llama-index-cli, llama-index-core, @@ -13,19 +15,26 @@ llama-index-question-gen-openai, llama-index-readers-file, llama-index-readers-llama-parse, - poetry-core, }: -buildPythonPackage rec { +buildPythonPackage { pname = "llama-index"; inherit (llama-index-core) version src meta; pyproject = true; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "llama-index-core" + ]; - propagatedBuildInputs = [ + dependencies = [ llama-index-agent-openai llama-index-cli llama-index-core diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix index b1a980782c742..b3ec041169fe6 100644 --- a/pkgs/development/python-modules/loguru/default.nix +++ b/pkgs/development/python-modules/loguru/default.nix @@ -7,6 +7,7 @@ freezegun, pytestCheckHook, pythonOlder, + pytest-xdist }: buildPythonPackage rec { @@ -25,6 +26,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pytest-xdist # massive speedup, not tested by upstream colorama freezegun ]; @@ -38,6 +40,8 @@ buildPythonPackage rec { # fails on some machine configurations # AssertionError: assert '' != '' "test_file_buffering" + # Slow test + "test_time_rotation" ] ++ lib.optionals stdenv.isDarwin [ "test_rotation_and_retention" diff --git a/pkgs/development/python-modules/lsp-tree-sitter/default.nix b/pkgs/development/python-modules/lsp-tree-sitter/default.nix new file mode 100644 index 0000000000000..2dc8597727590 --- /dev/null +++ b/pkgs/development/python-modules/lsp-tree-sitter/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools-generate +, setuptools-scm +, colorama +, jinja2 +, jsonschema +, pygls +, tree-sitter0_21 +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "lsp-tree-sitter"; + version = "0.0.15"; + pyproject = true; + + src = fetchFromGitHub { + owner = "neomutt"; + repo = "lsp-tree-sitter"; + rev = version; + hash = "sha256-yzScgix3BtSCBzlDoE1kMYGtVzkup/+ZK9L1C7VA3do="; + }; + + build-system = [ + setuptools-generate + setuptools-scm + ]; + + dependencies = [ + colorama + jinja2 + jsonschema + pygls + # The build won't fail if we had used tree-sitter (version > 0.21), but + # this package is only a dependency of autotools-language-server which also + # depends on tree-sitter-languages which must use tree-sitter0_21 and not + # tree-sitter. Hence we avoid different tree-sitter versions dependency + # mismatch by defaulting here to this lower version. + tree-sitter0_21 + ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "lsp_tree_sitter" ]; + + meta = with lib; { + description = "A library to create language servers"; + homepage = "https://github.com/neomutt/lsp-tree-sitter"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/manim/default.nix b/pkgs/development/python-modules/manim/default.nix index d099cbb4b21e3..69aee1f41c3df 100644 --- a/pkgs/development/python-modules/manim/default.nix +++ b/pkgs/development/python-modules/manim/default.nix @@ -273,6 +273,6 @@ buildPythonPackage rec { ''; homepage = "https://github.com/ManimCommunity/manim"; license = licenses.mit; - maintainers = with maintainers; [ friedelino ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/mapbox-earcut/default.nix b/pkgs/development/python-modules/mapbox-earcut/default.nix index 6169a4d9019e6..b7fe03e24f8af 100644 --- a/pkgs/development/python-modules/mapbox-earcut/default.nix +++ b/pkgs/development/python-modules/mapbox-earcut/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { library, which provides very fast and quite robust triangulation of 2D polygons. ''; - maintainers = with maintainers; [ friedelino ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 13bcdb06ccce0..220affe7be676 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.6.17"; + version = "0.6.19"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-vK4pa7CnVQp78DhEFIkNLNS5y35x9YV2nV3d0JOBTIA="; + hash = "sha256-PQrqOqWhQ4sz2kSX8A4NWhLJegAkCBE7Im+u11KkmB0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 738f05f28e8aa..ce9aded24b3b9 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -112,7 +112,6 @@ buildPythonPackage rec { license = licenses.isc; maintainers = with maintainers; [ tilpner - emily symphorien ]; }; diff --git a/pkgs/development/python-modules/mdformat-mkdocs/default.nix b/pkgs/development/python-modules/mdformat-mkdocs/default.nix index f787faacd2c9b..cd5a89c825122 100644 --- a/pkgs/development/python-modules/mdformat-mkdocs/default.nix +++ b/pkgs/development/python-modules/mdformat-mkdocs/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "mdformat-mkdocs"; - version = "2.1.0"; + version = "2.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "KyleKing"; repo = "mdformat-mkdocs"; rev = "refs/tags/v${version}"; - hash = "sha256-vJdkPNUW7d+H6hEgsAV7L0dV09+mq0Nvzih8aKoU8F8="; + hash = "sha256-hBkHVYlcHCXfE8Z2gLv6Rt0tQSkx2LYqbEtCncDByrI="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix b/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix index ef9aaa6d1a9fc..f35fa16cd400e 100644 --- a/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "mkdocs-rss-plugin"; - version = "1.13.0"; + version = "1.13.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Guts"; repo = "mkdocs-rss-plugin"; rev = "refs/tags/${version}"; - hash = "sha256-CUgUiLVrKI+i9F+Bc0a4r2jaW7e65JHGxOi8xGhZxWI="; + hash = "sha256-FxVyPks42hoj2y2epZjSNuTOvhDk3Vxm895a4teeSuw="; }; postPatch = '' @@ -49,7 +49,7 @@ buildPythonPackage rec { disabledTests = [ # Tests require network access "test_plugin_config_through_mkdocs" - "test_remote_image_ok" + "test_remote_image" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index 62ae19e2a49ab..f471c1027dbf0 100644 --- a/pkgs/development/python-modules/mne-python/default.nix +++ b/pkgs/development/python-modules/mne-python/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "mne-python"; - version = "1.7.0"; + version = "1.7.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "mne-tools"; repo = "mne-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Nrar6Iw/jROuo4QTI7TktJSR5IdPSOQcbR+lycH52LI="; + hash = "sha256-piCFynpKh7gTWIGh2g0gJICLS+eg/0XAxaDkyu7v5vs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/molecule/default.nix b/pkgs/development/python-modules/molecule/default.nix index 170d0bd2f7413..84cbbf48157b6 100644 --- a/pkgs/development/python-modules/molecule/default.nix +++ b/pkgs/development/python-modules/molecule/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "molecule"; - version = "24.2.1"; + version = "24.6.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-g1IrqpuRVg6phic8qxScORVpdunWEkVxciYyCTWtVuQ="; + hash = "sha256-jey0xoT8r7hae08DjaEl7UJb3RDbdr8M20E/m4TkG1g="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/monzopy/default.nix b/pkgs/development/python-modules/monzopy/default.nix index d0ba250671317..78b46a115f53c 100644 --- a/pkgs/development/python-modules/monzopy/default.nix +++ b/pkgs/development/python-modules/monzopy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "monzopy"; - version = "1.3.0"; + version = "1.3.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "JakeMartin-ICL"; repo = "monzopy"; rev = "refs/tags/v${version}"; - hash = "sha256-IphTVtmoeqRe6EJRpI0Y0R9NzxgfAOtpXrUpq7oAUBU="; + hash = "sha256-AoBfcQ0rilUPMvLCjU2Y+P/wVnb+I40vmq+5lS5eSto="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/mplhep/default.nix b/pkgs/development/python-modules/mplhep/default.nix index bda83366dd6bc..1daa1bc2170fa 100644 --- a/pkgs/development/python-modules/mplhep/default.nix +++ b/pkgs/development/python-modules/mplhep/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "mplhep"; - version = "0.3.48"; + version = "0.3.49"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-rAIiaTTSf1xINdadjHk32KOpW4SMg8jdwFt8z1oiLis="; + hash = "sha256-Hxqk0eSEOWSpomrS/vTdJV9/1mKQ/yCJQOBpm9tAvqo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix index 40e2abe609e56..07b88859e2edd 100644 --- a/pkgs/development/python-modules/msal/default.nix +++ b/pkgs/development/python-modules/msal/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "msal"; - version = "1.28.0"; + version = "1.28.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gLur40Vny3NO/S7BhpstmBlcknRVNp2Ad7PFQgiMXJ0="; + hash = "sha256-1yu/4tXC8lVfS8YgW+RFDd/RKXZhDdmhapqw8Fxotk0="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/nbclassic/default.nix b/pkgs/development/python-modules/nbclassic/default.nix index 71cf418e13a2b..6ac18bef59372 100644 --- a/pkgs/development/python-modules/nbclassic/default.nix +++ b/pkgs/development/python-modules/nbclassic/default.nix @@ -54,6 +54,5 @@ buildPythonPackage rec { description = "Jupyter lab environment notebook server extension"; homepage = "https://github.com/jupyter/nbclassic"; license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index bb1541fe72345..1dc1de3daab13 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.20.0"; + version = "5.21.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-ebWEtsgVj2NLYAKe8z6ge6TvnPmXh0Mqkx0b+ZcOePY="; + hash = "sha256-SGRe5O+6HqLFu4VQc0QC+91KVjqKeqNt5hIBwophvP0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/niworkflows/default.nix b/pkgs/development/python-modules/niworkflows/default.nix index 28e6cffca08b0..d6eb920d36d4c 100644 --- a/pkgs/development/python-modules/niworkflows/default.nix +++ b/pkgs/development/python-modules/niworkflows/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "niworkflows"; - version = "1.10.1"; + version = "1.10.2"; pyproject = true; src = fetchFromGitHub { owner = "nipreps"; repo = "niworkflows"; rev = "refs/tags/${version}"; - hash = "sha256-ZOn3KSaPAA8zTdyexrjF9Wkb5C5qA/5eSJahg2DcX20="; + hash = "sha256-29ZxLuKrvgCIOMMCUpi0HHhlNlgqUrUrSCiikwecmKw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/nodeenv/default.nix b/pkgs/development/python-modules/nodeenv/default.nix index 82a33716b2199..6ee3b9033f3dd 100644 --- a/pkgs/development/python-modules/nodeenv/default.nix +++ b/pkgs/development/python-modules/nodeenv/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "nodeenv"; - version = "1.9.0"; + version = "1.9.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "ekalinin"; repo = "nodeenv"; rev = "refs/tags/${version}"; - hash = "sha256-85Zr4RbmNeW3JAdtvDblWaPTivWWUJKh+mJbtsGJVO4="; + hash = "sha256-nud8HSfx1ri0UZf25VPCy7swfaSM13u5+HzozK+ikeY="; }; build-system = [ diff --git a/pkgs/development/python-modules/notebook-shim/default.nix b/pkgs/development/python-modules/notebook-shim/default.nix index 470c9d91586d6..11c17bd7516f7 100644 --- a/pkgs/development/python-modules/notebook-shim/default.nix +++ b/pkgs/development/python-modules/notebook-shim/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { ''; homepage = "https://github.com/jupyter/notebook_shim"; license = licenses.bsd3; - maintainers = with maintainers; [ friedelino ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index b8caf2c9bcfe0..1f4ff0ea627f7 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "16.3.0"; + version = "16.3.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QMddGJUfafXoBxMCjlx1lH45a4Bab3AP4j8Px7JxYaQ="; + hash = "sha256-gFhhOCcmorkrLxrup9fICh5ueCrc64fxfuZXTQG1tMk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 0da31b1a51704..e9b5287193362 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.128.0"; + version = "2.128.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-vdVfufsABznSgTMgbeTAFqGWo4JXAZoFaMXpvs3stmE="; + hash = "sha256-Df8DwzB/pOyixBS5dx9MeBa8IsZw/8q1Dk8itmsHGSM="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pdfplumber/default.nix b/pkgs/development/python-modules/pdfplumber/default.nix index d35bf4f2ad1b3..b42070e321707 100644 --- a/pkgs/development/python-modules/pdfplumber/default.nix +++ b/pkgs/development/python-modules/pdfplumber/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pdfplumber"; - version = "0.11.0"; + version = "0.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "jsvine"; repo = "pdfplumber"; rev = "refs/tags/v${version}"; - hash = "sha256-sjiCxE2WcvBASANCeookNn1n9M+mY0/8QGOCen+pzqM="; + hash = "sha256-5A1hjmC6GCS0Uqq5AiCEGqDTwASbJBX0pJGNNyvP3+4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 0d063c06eaf53..24fdc105e18b0 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.3.2"; + version = "2.4.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-X3tbTh1bK34QYmDz0oxAoMTs6kGWFPLNjfW+jyfEYAw="; + hash = "sha256-WH6aklJP8Wk1XgxULedM/rIt6XWAV5ur9hOAta7TsD4="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/piccolo-theme/default.nix b/pkgs/development/python-modules/piccolo-theme/default.nix index 6bb794e7f567d..49dd8b2c3c4d7 100644 --- a/pkgs/development/python-modules/piccolo-theme/default.nix +++ b/pkgs/development/python-modules/piccolo-theme/default.nix @@ -2,32 +2,38 @@ lib, buildPythonPackage, fetchPypi, + pythonOlder, sphinx, }: buildPythonPackage rec { pname = "piccolo-theme"; - version = "0.22.0"; + version = "0.23.0"; format = "setuptools"; - src = fetchPypi { + disabled = pythonOlder "3.9"; + + src = fetchPypi { pname = "piccolo_theme"; inherit version; - hash = "sha256-TAbaUnPfAH17BYJqbkSYgNzwmpJkIXGCx1UkJmDML4g="; + hash = "sha256-jlnKZK2wuEM+n+3Y59U6+LyQJRBUwQAn0NarAGlNdx0="; }; - propagatedBuildInputs = [ sphinx ]; + dependencies = [ sphinx ]; + + # Module has no tests + doCheck = false; pythonImportsCheck = [ "piccolo_theme" ]; meta = with lib; { description = "Clean and modern Sphinx theme"; homepage = "https://piccolo-theme.readthedocs.io"; + changelog = "https://github.com/piccolo-orm/piccolo_theme/releases/tag/${version}"; license = with licenses; [ mit asl20 ]; maintainers = with maintainers; [ loicreynier ]; - platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/pims/default.nix b/pkgs/development/python-modules/pims/default.nix index 579035c1df5d2..ca8a72fff516b 100644 --- a/pkgs/development/python-modules/pims/default.nix +++ b/pkgs/development/python-modules/pims/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pims"; - version = "0.6.1"; + version = "0.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "soft-matter"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-QdllA1QTSJ8vWaSJ0XoUanX53sb4RaOmdXBCFEsoWMU="; + hash = "sha256-3SBZk11w6eTZFmETMRJaYncxY38CYne1KzoF5oRgzuY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix index e7494472a12dd..7414085188995 100644 --- a/pkgs/development/python-modules/pipdeptree/default.nix +++ b/pkgs/development/python-modules/pipdeptree/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pipdeptree"; - version = "2.22.0"; + version = "2.23.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pipdeptree"; rev = "refs/tags/${version}"; - hash = "sha256-Kvse8eSlhzIBJvvJ7KoV0FCf9muQHkFS4ozwWp0WLz0="; + hash = "sha256-Er47yUaRCtTYQOhttOMIaM2EFf0l5rMH5YV1kpMCDls="; }; build-system = [ diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 1979066c8fabd..75c281ae22b9f 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.38.2"; + version = "0.38.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "plugwise"; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-OURmdTxSxgEh0OsRnbznZB6uy+J/CkwaMD+e/tlv7nk="; + hash = "sha256-DFHKycFWtR8moLyGaiDVqnrlg+ydgR8/UVgkUpzqAuY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/polyswarm-api/default.nix b/pkgs/development/python-modules/polyswarm-api/default.nix index cde3bcc8ca347..64aa9d27933ba 100644 --- a/pkgs/development/python-modules/polyswarm-api/default.nix +++ b/pkgs/development/python-modules/polyswarm-api/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "polyswarm-api"; - version = "3.6.0"; + version = "3.7.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "polyswarm"; repo = "polyswarm-api"; rev = "refs/tags/${version}"; - hash = "sha256-iY0I5z+aDLQekjgHT5v/ZprCkCgNPkyImmmaCQgnoYc="; + hash = "sha256-zEh8qus/+3mcAaY+SK6FLT6wB6UtGLKPoR1WVZdn9vM="; }; pythonRelaxDeps = [ "future" ]; diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index 9250aaacc4718..1f28bf2a244d9 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "psd-tools"; - version = "1.9.32"; + version = "1.9.33"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "psd-tools"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-H235bZOzTxmmLEFje8hhYxrN4l1S34tD1LMhsymRy9w="; + hash = "sha256-4Y4VLfGwopfeIppxwvGKSuelUDAXg67rM/ES9BrTP24="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ptyprocess/default.nix b/pkgs/development/python-modules/ptyprocess/default.nix index 7cdc7aebeba35..e707086e259cb 100644 --- a/pkgs/development/python-modules/ptyprocess/default.nix +++ b/pkgs/development/python-modules/ptyprocess/default.nix @@ -28,17 +28,17 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "ptyprocess" ]; - meta = with lib; { + meta = { description = "Run a subprocess in a pseudo terminal"; homepage = "https://github.com/pexpect/ptyprocess"; changelog = "https://github.com/pexpect/ptyprocess/releases/tag/${version}"; - license = licenses.isc; - maintainers = with maintainers; [ ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ getchoo ]; }; } diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index f618ad602b5e2..9d594dbede783 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.1.20240605"; + version = "0.10.1.20240618"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ro7Ei9ijvq2wX8lE6+YJhl2co2Ls8qpcn+4gUfSmY1Y="; + hash = "sha256-+wJoH/vCwNPmQlQfikDmnqbNQlMLA315N+U4Yvy/mMw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/puremagic/default.nix b/pkgs/development/python-modules/puremagic/default.nix index fc54dbdaa6ec1..b3bcbbacec39c 100644 --- a/pkgs/development/python-modules/puremagic/default.nix +++ b/pkgs/development/python-modules/puremagic/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "puremagic"; - version = "1.23"; + version = "1.24"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "cdgriffith"; repo = "puremagic"; rev = "refs/tags/${version}"; - hash = "sha256-DhOTx4Zpux2IiHkw/0nWwWfpnoqxrqqMJw4hrS4ZNGE="; + hash = "sha256-omVSSxMAQQm+Sy023xIGBYm55qrb1dbds1Jj9WCtNfw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/py-canary/default.nix b/pkgs/development/python-modules/py-canary/default.nix index 44db50c93bfe5..ecfb6a8d072af 100644 --- a/pkgs/development/python-modules/py-canary/default.nix +++ b/pkgs/development/python-modules/py-canary/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "py-canary"; - version = "0.5.3"; + version = "0.5.4"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "snjoetw"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-873XAf0jOX5pjrNRELEcTWCauk80FUYxTu7G7jc3MHE="; + hash = "sha256-zylWkssU85eSfR+Di7vQGTr6hOQkqXCObv/PCDHoKHA="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 9659da0e0aaa0..e5f32b9507560 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pytelegrambotapi"; - version = "4.18.0"; + version = "4.19.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "eternnoir"; repo = "pyTelegramBotAPI"; rev = "refs/tags/${version}"; - hash = "sha256-MlKLLLoEbB+ju+ewYDSEUCLVpCt+MsRKzTDVDuxDr8I="; + hash = "sha256-vyhX6TG3B6f1u49ngzdaCOZwSnEUQ2XMiq80bqCSmxU="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index 7adc58c43e77d..c86678cbc499f 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.21"; + version = "0.2.22"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-r57zNuKRUfZy+ipttQSfE/+LKOSnH6/4u/ZC1NzgGt8="; + hash = "sha256-zLGJ8MYfyXrJwy8GywOq9fM9rMMmRTgPrgiByGwQ+gM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyfftw/default.nix b/pkgs/development/python-modules/pyfftw/default.nix deleted file mode 100644 index 5d5182da0ccdf..0000000000000 --- a/pkgs/development/python-modules/pyfftw/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - fftw, - fftwFloat, - fftwLongDouble, - numpy, - scipy, - cython_0, - dask, -}: - -buildPythonPackage rec { - version = "0.13.1"; - pname = "pyFFTW"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-CRVekKDG0MHy0fNmgYCn3pX7n4P+9RN6ES+wWXjocyA="; - }; - - preConfigure = '' - export LDFLAGS="-L${fftw.out}/lib -L${fftwFloat.out}/lib -L${fftwLongDouble.out}/lib" - export CFLAGS="-I${fftw.dev}/include -I${fftwFloat.dev}/include -I${fftwLongDouble.dev}/include" - ''; - - buildInputs = [ - fftw - fftwFloat - fftwLongDouble - ]; - - propagatedBuildInputs = [ - numpy - scipy - cython_0 - dask - ]; - - # Tests cannot import pyfftw. pyfftw works fine though. - doCheck = false; - pythonImportsCheck = [ "pyfftw" ]; - - meta = with lib; { - description = "Pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms"; - homepage = "http://hgomersall.github.com/pyFFTW/"; - license = with licenses; [ - bsd2 - bsd3 - ]; - }; -} diff --git a/pkgs/development/python-modules/pyhaversion/default.nix b/pkgs/development/python-modules/pyhaversion/default.nix index 26aff0187e29e..c4c5417ae47bc 100644 --- a/pkgs/development/python-modules/pyhaversion/default.nix +++ b/pkgs/development/python-modules/pyhaversion/default.nix @@ -5,32 +5,35 @@ awesomeversion, buildPythonPackage, fetchFromGitHub, - pythonOlder, + poetry-core, pytest-asyncio, pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { pname = "pyhaversion"; - version = "23.1.0"; - format = "setuptools"; + version = "24.6.1"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.12"; src = fetchFromGitHub { owner = "ludeeus"; - repo = pname; + repo = "pyhaversion"; rev = "refs/tags/${version}"; - hash = "sha256-HMJqZn0yzN2dP5WTRCbem1Xw8nyH2Hy7oVP4kEKHHAo="; + hash = "sha256-UZ9236mERoz3WG9MfeN1ALKc8OjqpcbbIhiEsRYzn4I="; }; postPatch = '' # Upstream doesn't set a version for the tagged releases - substituteInPlace setup.py \ - --replace "main" ${version} + substituteInPlace pyproject.toml \ + --replace-fail 'version = "0"' 'version = "${version}"' ''; - propagatedBuildInputs = [ + build-system = [ poetry-core ]; + + dependencies = [ aiohttp awesomeversion ]; diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index 0f52f3dbf45ce..af11516e851a1 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pyinsteon"; - version = "1.6.1"; + version = "1.6.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "pyinsteon"; repo = "pyinsteon"; rev = "refs/tags/${version}"; - hash = "sha256-s8YRDu+UpU1sisdscd87CpcLl3csOUDdIuKqx48GZsw="; + hash = "sha256-V1sYLKKlTMG9Km53uNCU34e8D/owxuDNT+HGZxtK21I="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix index c9e1647f823ca..892e24c621225 100644 --- a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix +++ b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pylibjpeg-libjpeg"; - version = "2.02"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,17 +21,17 @@ buildPythonPackage rec { owner = "pydicom"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mGwku19Xe605fF3UU59712rYp+s/pP79lBRl79fhhTI="; + hash = "sha256-iU40QdAY5931YM3h3P+WCbiBfX88iVi2QdUvZLptsFs="; fetchSubmodules = true; }; - nativeBuildInputs = [ + build-system = [ cython poetry-core setuptools ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pynmeagps/default.nix b/pkgs/development/python-modules/pynmeagps/default.nix index fa306cf7b52bc..6129f591009d1 100644 --- a/pkgs/development/python-modules/pynmeagps/default.nix +++ b/pkgs/development/python-modules/pynmeagps/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pynmeagps"; - version = "1.0.36"; + version = "1.0.38"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,12 +18,12 @@ buildPythonPackage rec { owner = "semuconsulting"; repo = "pynmeagps"; rev = "refs/tags/v${version}"; - hash = "sha256-n7dCr85TeBLxdrD1ZAA7PGJd9+3+xFJ8gjRU/JOFysY="; + hash = "sha256-sD33fcYqTGsLLSsz6ULM5FsHHen4uROJzaWGCDrIsFI="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "--cov --cov-report html --cov-fail-under 95" "" + --replace-fail "--cov --cov-report html --cov-fail-under 98" "" ''; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyopenweathermap/default.nix b/pkgs/development/python-modules/pyopenweathermap/default.nix index f0e41e9e3b353..a683857c12bff 100644 --- a/pkgs/development/python-modules/pyopenweathermap/default.nix +++ b/pkgs/development/python-modules/pyopenweathermap/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, # build-system poetry-core, @@ -17,26 +16,17 @@ buildPythonPackage rec { pname = "pyopenweathermap"; - version = "0.0.9"; + version = "0.0.10"; pyproject = true; src = fetchFromGitHub { owner = "freekode"; repo = "pyopenweathermap"; # https://github.com/freekode/pyopenweathermap/issues/2 - rev = "f8541960571591f47d74268d400dfd0d6c9adf67"; - hash = "sha256-hQotoRbTbcsDTwZ3/A4HkWi2ma3b9L0vvwH9ej8k1eE="; + rev = "refs/tags/v${version}"; + hash = "sha256-wEcE4IYVvxEwW5Hhz+DqDIqbjd5/O1hEr7dGgiuMI00="; }; - patches = [ - (fetchpatch2 { - # https://github.com/freekode/pyopenweathermap/pull/3 - name = "pytest-network-mark.patch"; - url = "https://github.com/freekode/pyopenweathermap/commit/580ce4317fdffb267fc9122c3c2f8355f1178502.patch"; - hash = "sha256-dHopNTVO1sZgcMUYE1GrrMjbkwSFxNELIfXe2SyQrhw="; - }) - ]; - build-system = [ poetry-core ]; dependencies = [ aiohttp ]; diff --git a/pkgs/development/python-modules/pyorthanc/default.nix b/pkgs/development/python-modules/pyorthanc/default.nix index 0c33fc2319744..a65d8d6b983bd 100644 --- a/pkgs/development/python-modules/pyorthanc/default.nix +++ b/pkgs/development/python-modules/pyorthanc/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - pythonRelaxDepsHook, poetry-core, httpx, pydicom, @@ -11,30 +10,25 @@ buildPythonPackage rec { pname = "pyorthanc"; - version = "1.16.1"; + version = "1.18.0"; disabled = pythonOlder "3.8"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "gacou54"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6l3L0YUAqedyRjlQ6K3SaAMdGK2C0AeKpJj6MyXi4RA="; + hash = "sha256-ObZjTiEB4a7ForsugzKZDdIsTEWOX1zbv53ZJ4AllHE="; }; - nativeBuildInputs = [ - pythonRelaxDepsHook - poetry-core - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ httpx pydicom ]; - pythonRelaxDeps = [ "httpx" ]; - doCheck = false; # requires orthanc server (not in Nixpkgs) pythonImportsCheck = [ "pyorthanc" ]; diff --git a/pkgs/development/python-modules/pyreqwest-impersonate/default.nix b/pkgs/development/python-modules/pyreqwest-impersonate/default.nix new file mode 100644 index 0000000000000..39e57b633170e --- /dev/null +++ b/pkgs/development/python-modules/pyreqwest-impersonate/default.nix @@ -0,0 +1,61 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + rustPlatform, + pytest, + runCommand, + boringssl, +}: + +let + # boring-sys expects the static libraries in build/ instead of lib/ + boringssl-wrapper = runCommand "boringssl-wrapper" { } '' + mkdir $out + cd $out + ln -s ${boringssl.out}/lib build + ln -s ${boringssl.dev}/include include + ''; +in +buildPythonPackage rec { + pname = "pyreqwest-impersonate"; + version = "0.4.7"; + pyproject = true; + + src = fetchFromGitHub { + owner = "deedy5"; + repo = "pyreqwest_impersonate"; + rev = "v${version}"; + hash = "sha256-ck5RqSUgnLAjZ+1A1wQRyRMahJRq3nzYvE+WBpu6wk0="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-eGmx4ftS1D7qb2pPZxp4XE44teXcRwKs3tcKm8otsaM="; + }; + + nativeBuildInputs = [ + rustPlatform.bindgenHook + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + env.BORING_BSSL_PATH = boringssl-wrapper; + + optional-dependencies = { + dev = [ pytest ]; + }; + + # Test use network + doCheck = false; + + pythonImportsCheck = [ "pyreqwest_impersonate" ]; + + meta = { + description = "HTTP client that can impersonate web browsers (Chrome/Edge/OkHttp/Safari), mimicking their headers and TLS/JA3/JA4/HTTP2 fingerprints"; + homepage = "https://github.com/deedy5/pyreqwest_impersonate"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/development/python-modules/pyrisco/default.nix b/pkgs/development/python-modules/pyrisco/default.nix index 129d5935fb351..f01ff7b0f2e44 100644 --- a/pkgs/development/python-modules/pyrisco/default.nix +++ b/pkgs/development/python-modules/pyrisco/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyrisco"; - version = "0.6.2"; + version = "0.6.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "OnFreund"; repo = "pyrisco"; rev = "refs/tags/v${version}"; - hash = "sha256-sksM84BvBVfegYtRo1NNRbDvqNCr/V4K2Ol9X2Il8D0="; + hash = "sha256-E/KVQSoyJWJJ+UFtu3SzJDfXu2cj7A0puYgcUxrHKRo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix b/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix index ad4421a5382b7..882c761d191e6 100644 --- a/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix +++ b/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pyserial-asyncio-fast"; - version = "0.11"; + version = "0.12"; pyproject = true; src = fetchFromGitHub { owner = "bdraco"; repo = "pyserial-asyncio-fast"; rev = version; - hash = "sha256-B1CLk7ggI7l+DaMDlnMjl2tfh+evvaf1nxzBpmqMBZk="; + hash = "sha256-37dbJq+9Ex+/uiRR2esgOP15CjySA0MLvxnjiPDTF08="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix index daeff84ea7f29..6fbb4b8b93ed3 100644 --- a/pkgs/development/python-modules/pysigma/default.nix +++ b/pkgs/development/python-modules/pysigma/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pysigma"; - version = "0.11.6"; + version = "0.11.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "refs/tags/v${version}"; - hash = "sha256-BPDwGwwstGEBN3FIteyFX05TC/vBhWDiZJJh56Uoclo="; + hash = "sha256-vc2f5qrPHSU/CUENj+MuD0rjsEj68JPnL39fuOOcRCU="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/python-box/default.nix b/pkgs/development/python-modules/python-box/default.nix index 1167204729bc7..7d1e2c47c9018 100644 --- a/pkgs/development/python-modules/python-box/default.nix +++ b/pkgs/development/python-modules/python-box/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "python-box"; - version = "7.1.1"; + version = "7.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "cdgriffith"; repo = "Box"; rev = "refs/tags/${version}"; - hash = "sha256-oxT2y3um6BZ3bwYa+LWBoTgU+9b+V7XtQdCdECU3Gu0="; + hash = "sha256-5aORpuh0ezA3mUEpAPANDkdeN8ujNRfCUCV5qamMk68="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-ethtool/default.nix b/pkgs/development/python-modules/python-ethtool/default.nix index d028d1af2429d..b140db8c9f220 100644 --- a/pkgs/development/python-modules/python-ethtool/default.nix +++ b/pkgs/development/python-modules/python-ethtool/default.nix @@ -31,6 +31,5 @@ buildPythonPackage rec { description = "Python bindings for the ethtool kernel interface"; homepage = "https://github.com/fedora-python/python-ethtool"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/development/python-modules/python-fullykiosk/default.nix b/pkgs/development/python-modules/python-fullykiosk/default.nix index 8bb0eac6da139..3e3a65ff9815e 100644 --- a/pkgs/development/python-modules/python-fullykiosk/default.nix +++ b/pkgs/development/python-modules/python-fullykiosk/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python-fullykiosk"; - version = "0.0.12"; + version = "0.0.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "cgarwood"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-88PsJ1qAlOpxDtZyQe8pFC2Y3ygg3boiPxmYad58Fm8="; + hash = "sha256-GElLaSSr/EEhtjgasP2C79kf+HluVPuQ21I8La7IvLs="; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix index 6d79230236894..098bc746f5539 100644 --- a/pkgs/development/python-modules/python-gvm/default.nix +++ b/pkgs/development/python-modules/python-gvm/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "python-gvm"; - version = "24.3.0"; + version = "24.6.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = "python-gvm"; rev = "refs/tags/v${version}"; - hash = "sha256-GIEsP8+RJMIehsBbZWpIRXCdqxm042lPbYTHY7/fknM="; + hash = "sha256-4Wa8O6kt4FsQk6VvE1dCdl9hQReO3YCf/4hTGcGaQxE="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/python-linux-procfs/default.nix b/pkgs/development/python-modules/python-linux-procfs/default.nix index 0b074adf94a5c..f4306acedf710 100644 --- a/pkgs/development/python-modules/python-linux-procfs/default.nix +++ b/pkgs/development/python-modules/python-linux-procfs/default.nix @@ -26,6 +26,5 @@ buildPythonPackage rec { mainProgram = "pflags"; homepage = "https://git.kernel.org/pub/scm/libs/python/python-linux-procfs/python-linux-procfs.git/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix index c93adc9f09db8..d2d0ae00f08cd 100644 --- a/pkgs/development/python-modules/python-mapnik/default.nix +++ b/pkgs/development/python-modules/python-mapnik/default.nix @@ -23,21 +23,20 @@ sqlite, nose, pytestCheckHook, - stdenv, + darwin, + sparsehash, }: buildPythonPackage rec { pname = "python-mapnik"; - version = "unstable-2023-02-23"; + version = "3.0.16-unstable-2024-02-22"; format = "setuptools"; src = fetchFromGitHub { owner = "mapnik"; repo = "python-mapnik"; - # Use proj6 branch in order to support Proj >= 6 (excluding commits after 2023-02-23) - # https://github.com/mapnik/python-mapnik/compare/master...proj6 - rev = "687b2c72a24c59d701d62e4458c380f8c54f0549"; - hash = "sha256-q3Snd3K/JndckwAVwSKU+kFK5E1uph78ty7mwVo/7Ik="; + rev = "5ab32f0209909cc98c26e1d86ce0c8ef29a9bf3d"; + hash = "sha256-OqijA1WcyBcyWO8gntqp+xNIaV1Jqa0n1eMDip2OCvY="; # Only needed for test data fetchSubmodules = true; }; @@ -49,8 +48,13 @@ buildPythonPackage rec { src = ./find-libmapnik.patch; libmapnik = "${mapnik}/lib"; }) + # Use `std::optional` rather than `boost::optional` + # https://github.com/mapnik/python-mapnik/commit/e9f88a95a03dc081826a69da67bbec3e4cccd5eb + ./python-mapnik_std_optional.patch ]; + stdenv = if python.stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else python.stdenv; + nativeBuildInputs = [ mapnik # for mapnik_config pkg-config @@ -70,6 +74,7 @@ buildPythonPackage rec { zlib libxml2 sqlite + sparsehash ]; propagatedBuildInputs = [ @@ -107,14 +112,19 @@ buildPythonPackage rec { # https://github.com/mapnik/python-mapnik/issues/255 disabledTests = [ "test_geometry_type" - "test_marker_ellipse_render1" - "test_marker_ellipse_render2" - "test_normalizing_definition" "test_passing_pycairo_context_pdf" "test_pdf_printing" - "test_visual_zoom_all_rendering2" - "test_wgs84_inverse_forward" - ] ++ lib.optionals stdenv.isDarwin [ "test_passing_pycairo_context_svg" ]; + "test_render_with_scale_factor" + ] ++ lib.optionals stdenv.isDarwin [ + "test_passing_pycairo_context_png" + "test_passing_pycairo_context_svg" + "test_pycairo_pdf_surface1" + "test_pycairo_pdf_surface2" + "test_pycairo_pdf_surface3" + "test_pycairo_svg_surface1" + "test_pycairo_svg_surface2" + "test_pycairo_svg_surface3" + ]; pythonImportsCheck = [ "mapnik" ]; diff --git a/pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch b/pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch new file mode 100644 index 0000000000000..c285e77ca57b6 --- /dev/null +++ b/pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch @@ -0,0 +1,176 @@ +diff --git a/src/mapnik_image.cpp b/src/mapnik_image.cpp +index 9add692c9..488427b56 100644 +--- a/src/mapnik_image.cpp ++++ b/src/mapnik_image.cpp +@@ -230,7 +230,7 @@ unsigned get_type(mapnik::image_any & im) + + std::shared_ptr<image_any> open_from_file(std::string const& filename) + { +- boost::optional<std::string> type = type_from_filename(filename); ++ auto type = type_from_filename(filename); + if (type) + { + std::unique_ptr<image_reader> reader(get_image_reader(filename,*type)); +diff --git a/src/mapnik_layer.cpp b/src/mapnik_layer.cpp +index 4fc7ea579..fbd277a81 100644 +--- a/src/mapnik_layer.cpp ++++ b/src/mapnik_layer.cpp +@@ -95,7 +95,7 @@ struct layer_pickle_suite : boost::python::pickle_suite + + std::vector<std::string> & (mapnik::layer::*_styles_)() = &mapnik::layer::styles; + +-void set_maximum_extent(mapnik::layer & l, boost::optional<mapnik::box2d<double> > const& box) ++void set_maximum_extent(mapnik::layer & l, std::optional<mapnik::box2d<double> > const& box) + { + if (box) + { +@@ -107,7 +107,7 @@ void set_maximum_extent(mapnik::layer & l, boost::optional<mapnik::box2d<double> + } + } + +-void set_buffer_size(mapnik::layer & l, boost::optional<int> const& buffer_size) ++void set_buffer_size(mapnik::layer & l, std::optional<int> const& buffer_size) + { + if (buffer_size) + { +@@ -121,7 +121,7 @@ void set_buffer_size(mapnik::layer & l, boost::optional<int> const& buffer_size) + + PyObject * get_buffer_size(mapnik::layer & l) + { +- boost::optional<int> buffer_size = l.buffer_size(); ++ std::optional<int> buffer_size = l.buffer_size(); + if (buffer_size) + { + #if PY_VERSION_HEX >= 0x03000000 +diff --git a/src/mapnik_map.cpp b/src/mapnik_map.cpp +index 3587e5d8a..cfa523b03 100644 +--- a/src/mapnik_map.cpp ++++ b/src/mapnik_map.cpp +@@ -105,7 +105,7 @@ mapnik::featureset_ptr query_map_point(mapnik::Map const& m, int index, double x + return m.query_map_point(idx, x, y); + } + +-void set_maximum_extent(mapnik::Map & m, boost::optional<mapnik::box2d<double> > const& box) ++void set_maximum_extent(mapnik::Map & m, std::optional<mapnik::box2d<double> > const& box) + { + if (box) + { +diff --git a/src/python_optional.hpp b/src/python_optional.hpp +index d690b7c51..9d86c340e 100644 +--- a/src/python_optional.hpp ++++ b/src/python_optional.hpp +@@ -28,7 +28,7 @@ + #include <mapnik/util/noncopyable.hpp> + #pragma GCC diagnostic pop + +-// boost::optional<T> to/from converter from John Wiegley ++// std::optional<T> to/from converter from John Wiegley + + template <typename T, typename TfromPy> + struct object_from_python +@@ -54,7 +54,7 @@ struct python_optional : public mapnik::util::noncopyable + { + struct optional_to_python + { +- static PyObject * convert(const boost::optional<T>& value) ++ static PyObject * convert(const std::optional<T>& value) + { + return (value ? boost::python::to_python_value<T>()(*value) : + boost::python::detail::none()); +@@ -90,9 +90,9 @@ struct python_optional : public mapnik::util::noncopyable + data)->storage.bytes; + + if (data->convertible == source) // == None +- new (storage) boost::optional<T>(); // A Boost uninitialized value ++ new (storage) std::optional<T>(); // A Boost uninitialized value + else +- new (storage) boost::optional<T>(*static_cast<T *>(data->convertible)); ++ new (storage) std::optional<T>(*static_cast<T *>(data->convertible)); + + data->convertible = storage; + } +@@ -100,18 +100,18 @@ struct python_optional : public mapnik::util::noncopyable + + explicit python_optional() + { +- register_python_conversion<boost::optional<T>, ++ register_python_conversion<std::optional<T>, + optional_to_python, optional_from_python>(); + } + }; + +-// to/from boost::optional<bool> ++// to/from std::optional<bool> + template <> + struct python_optional<float> : public mapnik::util::noncopyable + { + struct optional_to_python + { +- static PyObject * convert(const boost::optional<float>& value) ++ static PyObject * convert(const std::optional<float>& value) + { + return (value ? PyFloat_FromDouble(*value) : + boost::python::detail::none()); +@@ -133,30 +133,30 @@ struct python_optional<float> : public mapnik::util::noncopyable + boost::python::converter::rvalue_from_python_stage1_data * data) + { + using namespace boost::python::converter; +- void * const storage = ((rvalue_from_python_storage<boost::optional<bool> > *) ++ void * const storage = ((rvalue_from_python_storage<std::optional<bool> > *) + data)->storage.bytes; + if (source == Py_None) // == None +- new (storage) boost::optional<float>(); // A Boost uninitialized value ++ new (storage) std::optional<float>(); // A Boost uninitialized value + else +- new (storage) boost::optional<float>(PyFloat_AsDouble(source)); ++ new (storage) std::optional<float>(PyFloat_AsDouble(source)); + data->convertible = storage; + } + }; + + explicit python_optional() + { +- register_python_conversion<boost::optional<float>, ++ register_python_conversion<std::optional<float>, + optional_to_python, optional_from_python>(); + } + }; + +-// to/from boost::optional<float> ++// to/from std::optional<float> + template <> + struct python_optional<bool> : public mapnik::util::noncopyable + { + struct optional_to_python + { +- static PyObject * convert(const boost::optional<bool>& value) ++ static PyObject * convert(const std::optional<bool>& value) + { + if (value) + { +@@ -181,13 +181,13 @@ struct python_optional<bool> : public mapnik::util::noncopyable + boost::python::converter::rvalue_from_python_stage1_data * data) + { + using namespace boost::python::converter; +- void * const storage = ((rvalue_from_python_storage<boost::optional<bool> > *) ++ void * const storage = ((rvalue_from_python_storage<std::optional<bool> > *) + data)->storage.bytes; + if (source == Py_None) // == None +- new (storage) boost::optional<bool>(); // A Boost uninitialized value ++ new (storage) std::optional<bool>(); // A Boost uninitialized value + else + { +- new (storage) boost::optional<bool>(source == Py_True ? true : false); ++ new (storage) std::optional<bool>(source == Py_True ? true : false); + } + data->convertible = storage; + } +@@ -195,7 +195,7 @@ struct python_optional<bool> : public mapnik::util::noncopyable + + explicit python_optional() + { +- register_python_conversion<boost::optional<bool>, ++ register_python_conversion<std::optional<bool>, + optional_to_python, optional_from_python>(); + } + }; diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index a5b5537868c70..8fc1bcc15bcfc 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, loguru, @@ -45,8 +44,8 @@ buildPythonPackage rec { pytestFlagsArray = [ "_python_utils_tests" ]; - disabledTests = lib.optionals stdenv.isDarwin [ - # Flaky tests on darwin + disabledTests = [ + # Flaky tests "test_timeout_generator" ]; diff --git a/pkgs/development/python-modules/pyvcd/default.nix b/pkgs/development/python-modules/pyvcd/default.nix index 1a1e912c9b502..3b4c2db066360 100644 --- a/pkgs/development/python-modules/pyvcd/default.nix +++ b/pkgs/development/python-modules/pyvcd/default.nix @@ -32,7 +32,6 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ sb0 - emily ]; }; } diff --git a/pkgs/development/python-modules/pywerview/default.nix b/pkgs/development/python-modules/pywerview/default.nix index 3e92420c5423f..edd1534e6f667 100644 --- a/pkgs/development/python-modules/pywerview/default.nix +++ b/pkgs/development/python-modules/pywerview/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pywerview"; - version = "0.6"; + version = "0.6.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "the-useless-one"; repo = "pywerview"; rev = "refs/tags/v${version}"; - hash = "sha256-WZE6qWq9v4A78YELMEcbgyufBRrVFRTqlhGmknpKn1Y="; + hash = "sha256-hsilBqk73txYIlgRtbn/l/kWORMGft7ne5BffchDLPc="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyxlsb/default.nix b/pkgs/development/python-modules/pyxlsb/default.nix index a6d14a1aff3c0..36e33930d47d4 100644 --- a/pkgs/development/python-modules/pyxlsb/default.nix +++ b/pkgs/development/python-modules/pyxlsb/default.nix @@ -22,6 +22,5 @@ buildPythonPackage rec { description = "Excel 2007-2010 Binary Workbook (xlsb) parser"; homepage = "https://github.com/willtrnr/pyxlsb"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix b/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix index 10ae5affa430c..eb9d0e74021ec 100644 --- a/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix +++ b/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix @@ -1,39 +1,44 @@ { lib, - fetchFromGitHub, - pythonOlder, buildPythonPackage, + pythonOlder, + fetchFromGitHub, setuptools, versioningit, + cffi, qcodes, packaging, + pandas, pytestCheckHook, pytest-mock, pyvisa-sim, + stdenv, }: buildPythonPackage rec { pname = "qcodes-contrib-drivers"; - version = "0.21.0"; + version = "0.22.0"; + pyproject = true; - disabled = pythonOlder "3.8"; - format = "pyproject"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "QCoDeS"; repo = "Qcodes_contrib_drivers"; rev = "refs/tags/v${version}"; - sha256 = "sha256-7WkG6Bq4J4PU4eWX52RaupQ8cNzE+sJ7s3PoXFRxG2w="; + sha256 = "sha256-/W5oC5iqYifMR3/s7aSQ2yTJNmkemkc0KVxIU0Es3zY="; }; - nativeBuildInputs = [ + build-system = [ setuptools versioningit ]; - propagatedBuildInputs = [ + dependencies = [ + cffi qcodes packaging + pandas ]; nativeCheckInputs = [ @@ -44,17 +49,20 @@ buildPythonPackage rec { pythonImportsCheck = [ "qcodes_contrib_drivers" ]; - # should be fixed starting with 0.19.0, remove at next release - disabledTestPaths = [ "qcodes_contrib_drivers/tests/test_Keysight_M3201A.py" ]; + disabledTests = lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [ + # At index 13 diff: 'sour6:volt 0.29000000000000004' != 'sour6:volt 0.29' + "test_stability_diagram_external" + ]; postInstall = '' export HOME="$TMPDIR" ''; - meta = with lib; { + meta = { description = "User contributed drivers for QCoDeS"; homepage = "https://github.com/QCoDeS/Qcodes_contrib_drivers"; - license = licenses.mit; - maintainers = with maintainers; [ evilmav ]; + changelog = "https://github.com/QCoDeS/Qcodes_contrib_drivers/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ evilmav ]; }; } diff --git a/pkgs/development/python-modules/qcodes/default.nix b/pkgs/development/python-modules/qcodes/default.nix index a33da9b4bedd0..ede69b5ebeb61 100644 --- a/pkgs/development/python-modules/qcodes/default.nix +++ b/pkgs/development/python-modules/qcodes/default.nix @@ -1,55 +1,69 @@ { lib, - broadbean, buildPythonPackage, + pythonOlder, + fetchFromGitHub, + + # build-system + setuptools, + versioningit, + wheel, + + # dependencies + broadbean, cf-xarray, dask, - deepdiff, - fetchFromGitHub, h5netcdf, h5py, - hypothesis, - importlib-metadata, ipykernel, ipython, ipywidgets, jsonschema, - lxml, matplotlib, numpy, - opencensus, - opencensus-ext-azure, opentelemetry-api, packaging, pandas, pillow, - pip, - pytest-asyncio, - pytest-mock, - pytest-rerunfailures, - pytest-xdist, - pytestCheckHook, - pythonOlder, + pyarrow, pyvisa, - pyvisa-sim, - rsa, ruamel-yaml, - setuptools, - sphinx, tabulate, tqdm, typing-extensions, uncertainties, - versioningit, websockets, - wheel, wrapt, xarray, + importlib-metadata, + + # optional-dependencies + jinja2, + nbsphinx, + pyvisa-sim, + scipy, + sphinx, + sphinx-issues, + sphinx-rtd-theme, + towncrier, + opencensus, + opencensus-ext-azure, + + # checks + deepdiff, + hypothesis, + lxml, + pip, + pytest-asyncio, + pytest-mock, + pytest-rerunfailures, + pytest-xdist, + pytestCheckHook, }: buildPythonPackage rec { pname = "qcodes"; - version = "0.44.1"; + version = "0.45.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -58,16 +72,16 @@ buildPythonPackage rec { owner = "microsoft"; repo = "Qcodes"; rev = "refs/tags/v${version}"; - hash = "sha256-AggAVq/yfJUZRwoQb29QoIbVIAdV3solKCjivqucLZk="; + hash = "sha256-H91CpvxGQW0X+m/jlqXMc1RdI9w62lt5jgYOxZ2iPQg="; }; - nativeBuildInputs = [ + build-system = [ setuptools versioningit wheel ]; - propagatedBuildInputs = [ + dependencies = [ broadbean cf-xarray dask @@ -79,14 +93,12 @@ buildPythonPackage rec { jsonschema matplotlib numpy - opencensus - opencensus-ext-azure opentelemetry-api packaging pandas pillow + pyarrow pyvisa - rsa ruamel-yaml tabulate tqdm @@ -97,6 +109,34 @@ buildPythonPackage rec { xarray ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; + optional-dependencies = { + docs = [ + # autodocsumm + jinja2 + nbsphinx + pyvisa-sim + # qcodes-loop + scipy + sphinx + # sphinx-favicon + sphinx-issues + # sphinx-jsonschema + sphinx-rtd-theme + # sphinxcontrib-towncrier + towncrier + ]; + loop = [ + # qcodes-loop + ]; + opencensus = [ + opencensus + opencensus-ext-azure + ]; + zurichinstruments = [ + # zhinst-qcodes + ]; + }; + nativeCheckInputs = [ deepdiff hypothesis @@ -160,12 +200,12 @@ buildPythonPackage rec { export HOME="$TMPDIR" ''; - meta = with lib; { + meta = { description = "Python-based data acquisition framework"; changelog = "https://github.com/QCoDeS/Qcodes/releases/tag/v${version}"; downloadPage = "https://github.com/QCoDeS/Qcodes"; homepage = "https://qcodes.github.io/Qcodes/"; - license = licenses.mit; - maintainers = with maintainers; [ evilmav ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ evilmav ]; }; } diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix index c252601e8a250..e65aad91904a7 100644 --- a/pkgs/development/python-modules/qtile/default.nix +++ b/pkgs/development/python-modules/qtile/default.nix @@ -30,6 +30,7 @@ xcffib, xkbcommon, nixosTests, + extraPackages ? [ ], }: buildPythonPackage rec { @@ -66,7 +67,7 @@ buildPythonPackage rec { pkg-config ]; - dependencies = [ + dependencies = extraPackages ++ [ (cairocffi.override { withXcffib = true; }) dbus-next iwlib @@ -97,6 +98,11 @@ buildPythonPackage rec { providedSessions = [ "qtile" ]; }; + postInstall = '' + install resources/qtile.desktop -Dt $out/share/xsessions + install resources/qtile-wayland.desktop -Dt $out/share/wayland-sessions + ''; + meta = with lib; { homepage = "http://www.qtile.org/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/qtile/wrapper.nix b/pkgs/development/python-modules/qtile/wrapper.nix deleted file mode 100644 index b4f6e4c2e23b2..0000000000000 --- a/pkgs/development/python-modules/qtile/wrapper.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ python3 }: - -(python3.withPackages (_: [ python3.pkgs.qtile ])).overrideAttrs (_: { - # restore some qtile attrs, beautify name - inherit (python3.pkgs.qtile) pname version meta; - name = with python3.pkgs.qtile; "${pname}-${version}"; - passthru.unwrapped = python3.pkgs.qtile; -}) diff --git a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix new file mode 100644 index 0000000000000..48209fc9efca3 --- /dev/null +++ b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix @@ -0,0 +1,129 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + + fetchzip, + substitute, + pythonRelaxDepsHook, + pytestCheckHook, + + setuptools, + pyclipper, + opencv4, + numpy, + six, + shapely, + pyyaml, + pillow, + onnxruntime, +}: +let + version = "1.3.22"; + + src = fetchFromGitHub { + owner = "RapidAI"; + repo = "RapidOCR"; + rev = "v${version}"; + hash = "sha256-8h4DFhnI9imr+bYQZdlrl8UKUdpwnGK+SGxLXSMmcag="; + }; + + models = fetchzip { + url = "https://github.com/RapidAI/RapidOCR/releases/download/v1.1.0/required_for_whl_v1.3.0.zip"; + hash = "sha256-j/0nzyvu/HfNTt5EZ+2Phe5dkyPOdQw/OZTz0yS63aA="; + stripRoot = false; + } + "/required_for_whl_v1.3.0/resources/models"; +in +buildPythonPackage { + pname = "rapidocr-onnxruntime"; + inherit version src; + pyproject = true; + + sourceRoot = "${src.name}/python"; + + # HACK: + # Upstream uses a very unconventional structure to organize the packages, and we have to coax the + # existing infrastructure to work with it. + # See https://github.com/RapidAI/RapidOCR/blob/02829ef986bc2a5c4f33e9c45c9267bcf2d07a1d/.github/workflows/gen_whl_to_pypi_rapidocr_ort.yml#L80-L92 + # for the "intended" way of building this package. + + # The setup.py supplied by upstream tries to determine the current version by + # fetching the latest version of the package from PyPI, and then bumping the version number. + # This is not allowed in the Nix build environment as we do not have internet access, + # hence we patch that out and get the version from the build environment directly. + patches = [ + (substitute { + src = ./setup-py-override-version-checking.patch; + substitutions = [ + "--subst-var-by" + "version" + version + ]; + }) + ]; + + postPatch = '' + mv setup_onnxruntime.py setup.py + mkdir -p rapidocr_onnxruntime/models + + ln -s ${models}/* rapidocr_onnxruntime/models + + # Magic patch from upstream - what does this even do?? + echo "from .rapidocr_onnxruntime.main import RapidOCR, VisRes" > __init__.py + ''; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + # Upstream expects the source files to be under rapidocr_onnxruntime/rapidocr_onnxruntime + # instead of rapidocr_onnxruntime for the wheel to build correctly. + preBuild = '' + mkdir rapidocr_onnxruntime_t + mv rapidocr_onnxruntime rapidocr_onnxruntime_t + mv rapidocr_onnxruntime_t rapidocr_onnxruntime + ''; + + # Revert the above hack + postBuild = '' + mv rapidocr_onnxruntime rapidocr_onnxruntime_t + mv rapidocr_onnxruntime_t/* . + ''; + + build-system = [ setuptools ]; + + dependencies = [ + pyclipper + opencv4 + numpy + six + shapely + pyyaml + pillow + onnxruntime + ]; + + # Remove because we have adopted the `opencv4` as an attribute name. + pythonRemoveDeps = [ "opencv-python" ]; + + pythonImportsCheck = [ "rapidocr_onnxruntime" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + # These are tests for different backends. + disabledTestPaths = [ + "tests/test_vino.py" + "tests/test_paddle.py" + ]; + + meta = { + # This seems to be related to https://github.com/microsoft/onnxruntime/issues/10038 + # Also some related issue: https://github.com/NixOS/nixpkgs/pull/319053#issuecomment-2167713362 + broken = (stdenv.isLinux && stdenv.isAarch64); + changelog = "https://github.com/RapidAI/RapidOCR/releases/tag/v${version}"; + description = "Cross platform OCR Library based on OnnxRuntime"; + homepage = "https://github.com/RapidAI/RapidOCR"; + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ pluiedev ]; + mainProgram = "rapidocr_onnxruntime"; + }; +} diff --git a/pkgs/development/python-modules/rapidocr-onnxruntime/setup-py-override-version-checking.patch b/pkgs/development/python-modules/rapidocr-onnxruntime/setup-py-override-version-checking.patch new file mode 100644 index 0000000000000..227618c2a60ca --- /dev/null +++ b/pkgs/development/python-modules/rapidocr-onnxruntime/setup-py-override-version-checking.patch @@ -0,0 +1,30 @@ +diff --git a/setup_onnxruntime.py b/setup_onnxruntime.py +index cd698d1..c6e8a33 100644 +--- a/setup_onnxruntime.py ++++ b/setup_onnxruntime.py +@@ -6,7 +6,6 @@ from pathlib import Path + from typing import List, Union + + import setuptools +-from get_pypi_latest_version import GetPyPiLatestVersion + + + def read_txt(txt_path: Union[Path, str]) -> List[str]: +@@ -26,16 +25,7 @@ def get_readme(): + + MODULE_NAME = "rapidocr_onnxruntime" + +-obtainer = GetPyPiLatestVersion() +-latest_version = obtainer(MODULE_NAME) +-VERSION_NUM = obtainer.version_add_one(latest_version) +- +-if len(sys.argv) > 2: +- match_str = " ".join(sys.argv[2:]) +- matched_versions = obtainer.extract_version(match_str) +- if matched_versions: +- VERSION_NUM = matched_versions +-sys.argv = sys.argv[:2] ++VERSION_NUM = "@version@" + + project_urls = { + "Documentation": "https://rapidai.github.io/RapidOCRDocs/docs/install_usage/rapidocr/usage/", diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 158394a3b3312..d7ab45fd4732d 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -99,6 +99,12 @@ buildPythonPackage rec { disabledTests = [ # flaky "test_outer_boundless_pixel_fidelity" + + # Failing with GDAL 3.9. + # Fixed in https://github.com/rasterio/rasterio/commit/24d0845e576158217f6541c3c81b163d873a994d + # Re-enable in next rasterio update. + "test_create_sidecar_mask" + "test_update_tags" ] ++ lib.optionals stdenv.isDarwin [ "test_reproject_error_propagation" ]; pythonImportsCheck = [ "rasterio" ]; diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 640d64b51b20a..e681e1f6d5550 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.9.1"; + version = "0.9.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-Y07QBUZs7olagoJ+ihIpgkAt9yit+4WK/2YDfvHPYOk="; + hash = "sha256-tCT43wbDScL/aoQFmLPkrw59a88f4qpNeNa0Q27H9wA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/returns/default.nix b/pkgs/development/python-modules/returns/default.nix index a468f377387fd..27fa225ba7d05 100644 --- a/pkgs/development/python-modules/returns/default.nix +++ b/pkgs/development/python-modules/returns/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "returns"; - version = "0.22.0"; + version = "0.23.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "dry-python"; repo = "returns"; rev = "refs/tags/${version}"; - hash = "sha256-0eFirhBsj8SWfoAPWEMuFa+EvBgHKpNeKVj3qJ4L6hE="; + hash = "sha256-4ZP/wvPgqQQec/BaXuL9r7BEc2G+LztMdFul0NeEJTc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/rich-argparse/default.nix b/pkgs/development/python-modules/rich-argparse/default.nix index 69d657d9b15c7..8edcfa9fbd951 100644 --- a/pkgs/development/python-modules/rich-argparse/default.nix +++ b/pkgs/development/python-modules/rich-argparse/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "rich-argparse"; - version = "1.5.1"; + version = "1.5.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "hamdanal"; repo = "rich-argparse"; rev = "refs/tags/v${version}"; - hash = "sha256-NcsEGImUAqwZI6Ga3UIqnoELvz6WRKyVqGkR4jPIKPI="; + hash = "sha256-kHGNjVx3d+JSsN/BpNua2rGD5S5sBfJvh1NyqQnziBI="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/rich-pixels/default.nix b/pkgs/development/python-modules/rich-pixels/default.nix index f54d5bb66eb9a..cda87a534fc40 100644 --- a/pkgs/development/python-modules/rich-pixels/default.nix +++ b/pkgs/development/python-modules/rich-pixels/default.nix @@ -3,49 +3,42 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, - poetry-core, - pytestCheckHook, - syrupy, + hatchling, pillow, - rich, + pytestCheckHook, + pythonOlder, pythonRelaxDepsHook, + rich, + syrupy, }: buildPythonPackage rec { pname = "rich-pixels"; - version = "2.2.0"; - format = "pyproject"; + version = "3.0.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "darrenburns"; repo = "rich-pixels"; - rev = version; - hash = "sha256-fbpnHEfBPWLSYhgETqKbdmmzt7Lu/4oKgetjgNvv04c="; + rev = "refs/tags/${version}"; + hash = "sha256-Sqs0DOyxJBfZmm/SVSTMSmaaeRlusiSp6VBnJjKYjgQ="; }; - patches = [ - (fetchpatch { - name = "fix-version.patch"; - url = "https://github.com/darrenburns/rich-pixels/commit/ff1cc3fef789321831f29e9bf282ae6b337eddb2.patch"; - hash = "sha256-58ZHBNg1RCuOfuE034qF1SbAgoiWMNlSG3c5pCSLUyI="; - }) - ]; - - nativeBuildInputs = [ - poetry-core - pythonRelaxDepsHook - ]; - - nativeCheckInputs = [ pytestCheckHook ]; + pythonRelaxDeps = [ "pillow" ]; - checkInputs = [ syrupy ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ pillow rich ]; - pythonRelaxDeps = [ "pillow" ]; + nativeCheckInputs = [ + pytestCheckHook + syrupy + ]; pythonImportsCheck = [ "rich_pixels" ]; diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index ea323ac634556..b961d6ca07263 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "robotframework"; - version = "7.0"; + version = "7.0.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "robotframework"; repo = "robotframework"; rev = "refs/tags/v${version}"; - hash = "sha256-IyOm2MTHj2rOew/IkyGIfI4XZSFU88+Tx8KHKIRT2G4="; + hash = "sha256-pr7x40ja1DwMPffmXQ2W53g1wuD0p63f+6ATfXhqGvE="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/rpi-gpio2/default.nix b/pkgs/development/python-modules/rpi-gpio2/default.nix deleted file mode 100644 index f24f6a5f6fe99..0000000000000 --- a/pkgs/development/python-modules/rpi-gpio2/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - libgpiod, - buildPythonPackage, - fetchFromGitHub, -}: - -buildPythonPackage rec { - pname = "rpi-gpio2"; - version = "0.4.0"; - format = "setuptools"; - - # PyPi source does not work for some reason - src = fetchFromGitHub { - owner = "underground-software"; - repo = "RPi.GPIO2"; - rev = "refs/tags/v${version}"; - hash = "sha256-CNnej67yTh3C8n4cCA7NW97rlfIDrrlepRNDkv+BUeY="; - }; - - propagatedBuildInputs = [ libgpiod ]; - - # Disable checks because they need to run on the specific platform - doCheck = false; - - meta = with lib; { - homepage = "https://github.com/underground-software/RPi.GPIO2"; - description = '' - Compatibility layer between RPi.GPIO syntax and libgpiod semantics - ''; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ onny ]; - }; -} diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix index 35c178941bdd4..2399e4e977feb 100644 --- a/pkgs/development/python-modules/safety/default.nix +++ b/pkgs/development/python-modules/safety/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "safety"; - version = "3.2.2"; + version = "3.2.3"; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-KlhnAEqh487ckAAKtyb9rSzgrheYY8GxaX1+je0bjNs="; + hash = "sha256-QUFUk08XJ9r4pkc0k5RP7LOAVAw/AIddwa43c4L32D8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sepaxml/default.nix b/pkgs/development/python-modules/sepaxml/default.nix index 6977f292e359e..d1e12b2ae1fad 100644 --- a/pkgs/development/python-modules/sepaxml/default.nix +++ b/pkgs/development/python-modules/sepaxml/default.nix @@ -39,6 +39,5 @@ buildPythonPackage rec { description = "SEPA Direct Debit XML generation in python"; homepage = "https://github.com/raphaelm/python-sepaxml/"; license = licenses.mit; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index a3a093100864b..cce3de84a0e87 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.28.0"; + version = "3.29.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-rsJLjqP1XT1JkFz3iQovF58XdkmVcL+jfjiiI9SqonE="; + hash = "sha256-49dSRg0nrTXuXfnrC2/3p/zYMxouXO9FLqSBSxg4TcU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix b/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix index 51d0388f72ca0..d6d1094447d24 100644 --- a/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix +++ b/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix @@ -1,4 +1,5 @@ { + lib, stdenv, pytest, spacy-models, @@ -7,7 +8,12 @@ stdenv.mkDerivation { name = "spacy-transformers-annotation-test"; - src = ./.; + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ + ./annotate.py + ]; + }; dontConfigure = true; dontBuild = true; diff --git a/pkgs/development/python-modules/spacy/annotation-test/default.nix b/pkgs/development/python-modules/spacy/annotation-test/default.nix index 02aad304a1e68..cb8a97aa568fc 100644 --- a/pkgs/development/python-modules/spacy/annotation-test/default.nix +++ b/pkgs/development/python-modules/spacy/annotation-test/default.nix @@ -1,4 +1,5 @@ { + lib, stdenv, pytest, spacy-models, @@ -7,7 +8,12 @@ stdenv.mkDerivation { name = "spacy-annotation-test"; - src = ./.; + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ + ./annotate.py + ]; + }; dontConfigure = true; dontBuild = true; diff --git a/pkgs/development/python-modules/spatial-image/default.nix b/pkgs/development/python-modules/spatial-image/default.nix index bacfe6933e1de..6209ebc4de5cc 100644 --- a/pkgs/development/python-modules/spatial-image/default.nix +++ b/pkgs/development/python-modules/spatial-image/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "spatial-image"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "spatial-image"; repo = "spatial-image"; rev = "refs/tags/v${version}"; - hash = "sha256-nCsxPhIgGmZZntYbhQ3KnzptcKdN288eNixbQDgECSQ="; + hash = "sha256-yIAqHhq2naTA8PdLOdrNSrhEOhRwlFD6x9dH4xDVt9Y="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index c55e100a8002c..444761c461590 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -1,24 +1,31 @@ { lib, stdenv, - aplpy, - astropy, buildPythonPackage, + pythonOlder, + fetchPypi, + + # build-system + setuptools-scm, + + # dependencies + astropy, casa-formats-io, dask, - fetchPypi, joblib, + looseversion, + radio-beam, + + # checks + aplpy, pytest-astropy, pytestCheckHook, - pythonOlder, - radio-beam, - setuptools-scm, }: buildPythonPackage rec { pname = "spectral-cube"; version = "0.6.5"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -27,14 +34,17 @@ buildPythonPackage rec { hash = "sha256-gJzrr3+/FsQN/HHDERxf/NECArwOaTqFwmI/Q2Z9HTM="; }; - nativeBuildInputs = [ setuptools-scm ]; + patches = [ ./distutils-looseversion.patch ]; - propagatedBuildInputs = [ + build-system = [ setuptools-scm ]; + + dependencies = [ astropy casa-formats-io - radio-beam - joblib dask + joblib + looseversion + radio-beam ]; nativeCheckInputs = [ @@ -54,11 +64,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "spectral_cube" ]; - meta = with lib; { + meta = { description = "Library for reading and analyzing astrophysical spectral data cubes"; homepage = "https://spectral-cube.readthedocs.io"; changelog = "https://github.com/radio-astro-tools/spectral-cube/releases/tag/v${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ smaret ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ smaret ]; }; } diff --git a/pkgs/development/python-modules/spectral-cube/distutils-looseversion.patch b/pkgs/development/python-modules/spectral-cube/distutils-looseversion.patch new file mode 100644 index 0000000000000..857d37a1a88ab --- /dev/null +++ b/pkgs/development/python-modules/spectral-cube/distutils-looseversion.patch @@ -0,0 +1,152 @@ +diff --git a/spectral_cube/conftest.py b/spectral_cube/conftest.py +index 0d7c158..6fac9b4 100644 +--- a/spectral_cube/conftest.py ++++ b/spectral_cube/conftest.py +@@ -4,7 +4,7 @@ + from __future__ import print_function, absolute_import, division + + import os +-from distutils.version import LooseVersion ++from looseversion import LooseVersion + from astropy.units.equivalencies import pixel_scale + + # Import casatools and casatasks here if available as they can otherwise +diff --git a/spectral_cube/lower_dimensional_structures.py b/spectral_cube/lower_dimensional_structures.py +index f0e3745..1b1e1f8 100644 +--- a/spectral_cube/lower_dimensional_structures.py ++++ b/spectral_cube/lower_dimensional_structures.py +@@ -526,7 +526,7 @@ class Projection(LowerDimensionalObject, SpatialCoordMixinClass, + " installed.") + + # Need version > 0.2 to work with cubes +- from distutils.version import LooseVersion ++ from looseversion import LooseVersion + if LooseVersion(version) < "0.3": + raise Warning("Requires version >=0.3 of reproject. The current " + "version is: {}".format(version)) +diff --git a/spectral_cube/np_compat.py b/spectral_cube/np_compat.py +index ed4a134..39aa320 100644 +--- a/spectral_cube/np_compat.py ++++ b/spectral_cube/np_compat.py +@@ -1,7 +1,7 @@ + from __future__ import print_function, absolute_import, division + + import numpy as np +-from distutils.version import LooseVersion ++from looseversion import LooseVersion + + def allbadtonan(function): + """ +diff --git a/spectral_cube/spectral_cube.py b/spectral_cube/spectral_cube.py +index 771a2d4..af752b4 100644 +--- a/spectral_cube/spectral_cube.py ++++ b/spectral_cube/spectral_cube.py +@@ -57,7 +57,7 @@ from .spectral_axis import (determine_vconv_from_ctype, get_rest_value_from_wcs, + doppler_beta, doppler_gamma, doppler_z) + from .io.core import SpectralCubeRead, SpectralCubeWrite + +-from distutils.version import LooseVersion ++from looseversion import LooseVersion + + + __all__ = ['BaseSpectralCube', 'SpectralCube', 'VaryingResolutionSpectralCube'] +@@ -2659,7 +2659,7 @@ class BaseSpectralCube(BaseNDClass, MaskableArrayMixinClass, + + reproj_kwargs = kwargs + # Need version > 0.2 to work with cubes, >= 0.5 for memmap +- from distutils.version import LooseVersion ++ from looseversion import LooseVersion + if LooseVersion(version) < "0.5": + raise Warning("Requires version >=0.5 of reproject. The current " + "version is: {}".format(version)) +diff --git a/spectral_cube/tests/test_masks.py b/spectral_cube/tests/test_masks.py +index c38ba27..1d6895d 100644 +--- a/spectral_cube/tests/test_masks.py ++++ b/spectral_cube/tests/test_masks.py +@@ -14,7 +14,7 @@ from .. import (BooleanArrayMask, LazyMask, LazyComparisonMask, + FunctionMask, CompositeMask) + from ..masks import is_broadcastable_and_smaller, dims_to_skip, view_of_subset + +-from distutils.version import LooseVersion ++from looseversion import LooseVersion + + + def test_spectral_cube_mask(): +diff --git a/spectral_cube/tests/test_moments.py b/spectral_cube/tests/test_moments.py +index 3043dd5..7e05c5b 100644 +--- a/spectral_cube/tests/test_moments.py ++++ b/spectral_cube/tests/test_moments.py +@@ -1,7 +1,7 @@ + from __future__ import print_function, absolute_import, division + + import warnings +-from distutils.version import LooseVersion ++from looseversion import LooseVersion + + import pytest + import numpy as np +diff --git a/spectral_cube/tests/test_performance.py b/spectral_cube/tests/test_performance.py +index bdee040..a778abc 100644 +--- a/spectral_cube/tests/test_performance.py ++++ b/spectral_cube/tests/test_performance.py +@@ -20,7 +20,7 @@ except ImportError: + + # The comparison of Quantities in test_memory_usage + # fail with older versions of numpy +-from distutils.version import LooseVersion ++from looseversion import LooseVersion + + NPY_VERSION_CHECK = LooseVersion(np.version.version) >= "1.13" + +diff --git a/spectral_cube/tests/test_regrid.py b/spectral_cube/tests/test_regrid.py +index 496ddd5..5b1fec7 100644 +--- a/spectral_cube/tests/test_regrid.py ++++ b/spectral_cube/tests/test_regrid.py +@@ -18,7 +18,7 @@ except ImportError: + + # The comparison of Quantities in test_memory_usage + # fail with older versions of numpy +-from distutils.version import LooseVersion ++from looseversion import LooseVersion + + NPY_VERSION_CHECK = LooseVersion(np.version.version) >= "1.13" + +diff --git a/spectral_cube/tests/test_spectral_cube.py b/spectral_cube/tests/test_spectral_cube.py +index 9ebeb7d..93e5647 100644 +--- a/spectral_cube/tests/test_spectral_cube.py ++++ b/spectral_cube/tests/test_spectral_cube.py +@@ -6,7 +6,7 @@ import operator + import itertools + import warnings + import mmap +-from distutils.version import LooseVersion ++from looseversion import LooseVersion + import sys + + import pytest +diff --git a/spectral_cube/tests/test_subcubes.py b/spectral_cube/tests/test_subcubes.py +index 6f74f68..217c324 100644 +--- a/spectral_cube/tests/test_subcubes.py ++++ b/spectral_cube/tests/test_subcubes.py +@@ -1,7 +1,7 @@ + from __future__ import print_function, absolute_import, division + + import pytest +-from distutils.version import LooseVersion ++from looseversion import LooseVersion + + from astropy import units as u + from astropy import wcs +diff --git a/spectral_cube/tests/test_visualization.py b/spectral_cube/tests/test_visualization.py +index 85ea038..0ac8d58 100644 +--- a/spectral_cube/tests/test_visualization.py ++++ b/spectral_cube/tests/test_visualization.py +@@ -1,7 +1,7 @@ + from __future__ import print_function, absolute_import, division + + import pytest +-from distutils.version import LooseVersion ++from looseversion import LooseVersion + + from .test_spectral_cube import cube_and_raw + diff --git a/pkgs/development/python-modules/sphinx-book-theme/default.nix b/pkgs/development/python-modules/sphinx-book-theme/default.nix index d892c356a25d6..5c65ccaeb4124 100644 --- a/pkgs/development/python-modules/sphinx-book-theme/default.nix +++ b/pkgs/development/python-modules/sphinx-book-theme/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sphinx-book-theme"; - version = "1.1.2"; + version = "1.1.3"; format = "wheel"; @@ -21,7 +21,7 @@ buildPythonPackage rec { dist = "py3"; python = "py3"; pname = "sphinx_book_theme"; - hash = "sha256-zudERm/eSPUDArhRKRsgiqZ+cmyjG3o7+5tuahRWY+A="; + hash = "sha256-pVSpp6w4gZeah6KxD2M6oqVwbnIhihD3G+OLPJ6DGuk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spsdk/default.nix b/pkgs/development/python-modules/spsdk/default.nix index fdc74f982c293..0e0d56aa027e9 100644 --- a/pkgs/development/python-modules/spsdk/default.nix +++ b/pkgs/development/python-modules/spsdk/default.nix @@ -59,6 +59,7 @@ buildPythonPackage rec { "click" "cryptography" "platformdirs" + "requests" "typing-extensions" ]; diff --git a/pkgs/development/python-modules/sqlite-anyio/default.nix b/pkgs/development/python-modules/sqlite-anyio/default.nix index 80926de7f47a9..bc9fd2ffcb230 100644 --- a/pkgs/development/python-modules/sqlite-anyio/default.nix +++ b/pkgs/development/python-modules/sqlite-anyio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sqlite-anyio"; - version = "0.2.0"; + version = "0.2.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "davidbrochart"; repo = "sqlite-anyio"; rev = "refs/tags/v${version}"; - hash = "sha256-6khHta7Rzp3g8G/xZnsNZuURFB35JyHz04NTzNJIiBw="; + hash = "sha256-lOUGT9SUxvzTvTDpiwx7Oa+0o3/lnrJ9xxMYFQAmFZk="; }; build-system = [ hatchling ]; @@ -37,6 +37,8 @@ buildPythonPackage rec { meta = with lib; { description = "Asynchronous client for SQLite using AnyIO"; homepage = "https://github.com/davidbrochart/sqlite-anyio"; + changelog = "https://github.com/davidbrochart/sqlite-anyio/releases/tag/v${version}"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/srt/default.nix b/pkgs/development/python-modules/srt/default.nix index 4becb1ec968c7..d4ae26479ca60 100644 --- a/pkgs/development/python-modules/srt/default.nix +++ b/pkgs/development/python-modules/srt/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { homepage = "https://github.com/cdown/srt"; description = "Tiny but featureful Python library for parsing, modifying, and composing SRT files"; license = licenses.bsd3; - maintainers = with maintainers; [ friedelino ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/sse-starlette/default.nix b/pkgs/development/python-modules/sse-starlette/default.nix index d2fc7de38bb17..baeaf9436c5ca 100644 --- a/pkgs/development/python-modules/sse-starlette/default.nix +++ b/pkgs/development/python-modules/sse-starlette/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "sse-starlette"; - version = "2.1.0"; + version = "2.1.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "sysid"; repo = "sse-starlette"; rev = "refs/tags/v${version}"; - hash = "sha256-gBkEs1jSKIOme2rbLf+pM3jFDgJkxyU92q+GsUsp8Eo="; + hash = "sha256-/aL0IkMdHNt7Ms1Et+xf00B9FGI31FuHAiJbxVMm3w0="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/std-uritemplate/default.nix b/pkgs/development/python-modules/std-uritemplate/default.nix index d0dbb244299d8..83c17826ff281 100644 --- a/pkgs/development/python-modules/std-uritemplate/default.nix +++ b/pkgs/development/python-modules/std-uritemplate/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "std-uritemplate"; - version = "0.0.59"; + version = "1.0.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "std_uritemplate"; inherit version; - hash = "sha256-LZHniQNIEP2p1iIigmLokse7P7PFyqbjF+xi4EOwnLc="; + hash = "sha256-Mf7o2nDbj663cdC6OfXIK/newY1NKnUpWTniowXlNvE="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/stm32loader/default.nix b/pkgs/development/python-modules/stm32loader/default.nix index 9434e25ecc31d..6578e3c119575 100644 --- a/pkgs/development/python-modules/stm32loader/default.nix +++ b/pkgs/development/python-modules/stm32loader/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { homepage = "https://github.com/florisla/stm32loader"; changelog = "https://github.com/florisla/stm32loader/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3; - maintainers = with maintainers; [ emily ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index 4db4998c1bca3..0ec6c7bfc616e 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -15,6 +15,7 @@ flask, freezegun, graphql-core, + inline-snapshot, libcst, opentelemetry-api, opentelemetry-sdk, @@ -43,7 +44,7 @@ buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.230.0"; + version = "0.235.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -52,7 +53,7 @@ buildPythonPackage rec { owner = "strawberry-graphql"; repo = "strawberry"; rev = "refs/tags/${version}"; - hash = "sha256-jhInHoOvPGIEoSddv8+30gY38L6XR5OEATUTdrHbNpA="; + hash = "sha256-M9GwddyLfwGhA1z+imEOiNrXYFM2gFT9IcFf/8cRHAE="; }; patches = [ @@ -66,7 +67,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "--emoji --mypy-ini-file=mypy.ini" "" \ + --replace-fail "--emoji" "" \ ''; build-system = [ poetry-core ]; @@ -138,6 +139,7 @@ buildPythonPackage rec { daphne email-validator freezegun + inline-snapshot pytest-asyncio pytest-emoji pytest-mock @@ -154,7 +156,6 @@ buildPythonPackage rec { "tests/django/test_dataloaders.py" "tests/exceptions/" "tests/http/" - "tests/mypy/test_plugin.py" # avoid dependency on mypy "tests/schema/extensions/" "tests/schema/test_dataloaders.py" "tests/schema/test_lazy/" diff --git a/pkgs/development/python-modules/superqt/default.nix b/pkgs/development/python-modules/superqt/default.nix index a54f3df4a7f59..c2fbba8406847 100644 --- a/pkgs/development/python-modules/superqt/default.nix +++ b/pkgs/development/python-modules/superqt/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "superqt"; - version = "0.6.6"; + version = "0.6.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "pyapp-kit"; repo = "superqt"; rev = "refs/tags/v${version}"; - hash = "sha256-AJXX460sm0rrimizkiBIjYFRtWbscEjlwo5ZLcgjzcA="; + hash = "sha256-/VR9Lc1x+7J/3zyo/eBFBvGkPXzpTfPpNAvNhSzWio8="; }; build-system = [ diff --git a/pkgs/development/python-modules/survey/default.nix b/pkgs/development/python-modules/survey/default.nix index da3c22c813626..6c787abb71d17 100644 --- a/pkgs/development/python-modules/survey/default.nix +++ b/pkgs/development/python-modules/survey/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "survey"; - version = "5.3.0"; + version = "5.3.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-jMTtsrEdt3NPy8NfeNPX4YNwjH2gaQfO89Iag/MBS+A="; + hash = "sha256-uNx8Ij28Li9QQjq/S6OP5kft2K8pDu2NyBK6BP/xcw8="; }; build-system = [ diff --git a/pkgs/development/python-modules/swagger-ui-bundle/default.nix b/pkgs/development/python-modules/swagger-ui-bundle/default.nix index d58bf4d9a4f05..b71ae59cca9ba 100644 --- a/pkgs/development/python-modules/swagger-ui-bundle/default.nix +++ b/pkgs/development/python-modules/swagger-ui-bundle/default.nix @@ -35,6 +35,5 @@ buildPythonPackage rec { description = "bundled swagger-ui pip package"; homepage = "https://github.com/dtkav/swagger_ui_bundle"; license = licenses.asl20; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/development/python-modules/tabcmd/default.nix b/pkgs/development/python-modules/tabcmd/default.nix index fca958dbf1cd5..e713fef830a78 100644 --- a/pkgs/development/python-modules/tabcmd/default.nix +++ b/pkgs/development/python-modules/tabcmd/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "tabcmd"; - version = "2.0.13"; + version = "2.0.14"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-f9zoYeb4RzcCtgcCYYvvuCuFrjqpP3Fhv38bUWH24+g="; + hash = "sha256-wyfKy0g2btdNMNviCd7brB+lwZvPcZ3/DnymdVjCGFg="; }; prePatch = '' diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 1dc3384e7cdd4..2ba8856349ac2 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1167"; + version = "3.0.1171"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-GO1iAkIJyuXAa+iAmIIbnARcm90MjTG689P0WEj8VIA="; + hash = "sha256-8ZjC4gfTVLuH8b90xzURHhowFS/vdXBjWP64ZoiM7/E="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tensorly/default.nix b/pkgs/development/python-modules/tensorly/default.nix index 9e3ff72609cf4..20bd49a8a9bad 100644 --- a/pkgs/development/python-modules/tensorly/default.nix +++ b/pkgs/development/python-modules/tensorly/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tensorly"; - version = "0.8.1"; + version = "0.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-hwpdExW/ESOavFkL3old1Efo5WC+PYmcgJp5/oLelaA="; + hash = "sha256-kYKyLY2V6M53co+26ZTZP4U6bHkFebKI5Uhh1x1/N58="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index 6d8252e3713a4..e95952f940103 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "8.2.0"; + version = "8.3.0"; pyproject = true; # DO NOT CONTACT upstream. # https://github.com/simplistix/ is only concerned with internal CI process. @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-70O2VxNMh+ijBE9LAqMq4uvd9Esrl7x5iaIBFkA5iO4="; + hash = "sha256-1MC4SvLyZ2EPkIAJtQ1vmDpOWK3iLGe6tnh7WkAtWcA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/textual-dev/default.nix b/pkgs/development/python-modules/textual-dev/default.nix index 41fcf67a54044..0e2b1c4884bee 100644 --- a/pkgs/development/python-modules/textual-dev/default.nix +++ b/pkgs/development/python-modules/textual-dev/default.nix @@ -6,11 +6,8 @@ fetchFromGitHub, msgpack, poetry-core, - pytest-aiohttp, - pytestCheckHook, pythonOlder, textual, - time-machine, typing-extensions, }: @@ -28,9 +25,9 @@ buildPythonPackage rec { hash = "sha256-QnMKVt1WxnwGnZFNb7Gbus7xewGvyG5xJ0hIKKK5hug="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp click msgpack @@ -38,19 +35,17 @@ buildPythonPackage rec { typing-extensions ]; - nativeCheckInputs = [ - pytest-aiohttp - pytestCheckHook - time-machine - ]; + # Tests require a running textual WS server + doCheck = false; pythonImportsCheck = [ "textual_dev" ]; meta = with lib; { description = "Development tools for Textual"; - mainProgram = "textual"; homepage = "https://github.com/Textualize/textual-dev"; + changelog = "https://github.com/Textualize/textual-dev/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ yannip ]; + mainProgram = "textual"; }; } diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index 859f3508e3a40..c6a677f4c65a7 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "textual"; - version = "0.53.1"; + version = "0.68.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = "textual"; rev = "refs/tags/v${version}"; - hash = "sha256-73qEogHe69B66r4EJOj2RAP95O5z7v/UYARTIEPxrcA="; + hash = "sha256-nxQVxe7lXMcxyqh4SWcQ/A6eQcEzkSshKmpweHpn7JE="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/timezonefinder/default.nix b/pkgs/development/python-modules/timezonefinder/default.nix index 07f8fce863e93..38662f50d8f7d 100644 --- a/pkgs/development/python-modules/timezonefinder/default.nix +++ b/pkgs/development/python-modules/timezonefinder/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "timezonefinder"; - version = "6.5.0"; + version = "6.5.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "jannikmi"; repo = "timezonefinder"; rev = "refs/tags/${version}"; - hash = "sha256-V5g1zTdXWeJba71/eUGQbF9XOhMQuzivtGkqGD4OHMY="; + hash = "sha256-KVjAK4r+cRrX7U6MT0P7hH/TX6kMDv2DaSa456YG4sA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/timm/default.nix b/pkgs/development/python-modules/timm/default.nix index be58f447dba4d..a02c90152435a 100644 --- a/pkgs/development/python-modules/timm/default.nix +++ b/pkgs/development/python-modules/timm/default.nix @@ -5,6 +5,7 @@ fetchFromGitHub, pdm-backend, huggingface-hub, + numpy, pyyaml, safetensors, torch, @@ -16,22 +17,23 @@ buildPythonPackage rec { pname = "timm"; - version = "1.0.3"; + version = "1.0.7"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "huggingface"; repo = "pytorch-image-models"; rev = "refs/tags/v${version}"; - hash = "sha256-h2J1v2zXUMGRKBBqq+RnxrXKOzlD5RRrVoODWSuj9Ms="; + hash = "sha256-0o88gOZvHXblGPwyRIz2D3sD7wdg0J0knrAFlognEOY="; }; build-system = [ pdm-backend ]; dependencies = [ huggingface-hub + numpy pyyaml safetensors torch diff --git a/pkgs/development/python-modules/tlds/default.nix b/pkgs/development/python-modules/tlds/default.nix index 5efe067d2ed3b..b1248d18b283b 100644 --- a/pkgs/development/python-modules/tlds/default.nix +++ b/pkgs/development/python-modules/tlds/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Automatically updated list of valid TLDs taken directly from IANA"; - homepage = "https://github.com/mweinelt/tlds"; + homepage = "https://github.com/kichik/tlds"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/tree-sitter-html/Cargo.lock b/pkgs/development/python-modules/tree-sitter-html/Cargo.lock new file mode 100644 index 0000000000000..e34eb1cd132d0 --- /dev/null +++ b/pkgs/development/python-modules/tree-sitter-html/Cargo.lock @@ -0,0 +1,71 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "cc" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" + +[[package]] +name = "memchr" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[package]] +name = "regex" +version = "1.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "tree-sitter" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df7cc499ceadd4dcdf7ec6d4cbc34ece92c3fa07821e287aedecd4416c516dca" +dependencies = [ + "cc", + "regex", +] + +[[package]] +name = "tree-sitter-html" +version = "0.20.3" +dependencies = [ + "cc", + "tree-sitter", +] diff --git a/pkgs/development/python-modules/tree-sitter-html/default.nix b/pkgs/development/python-modules/tree-sitter-html/default.nix new file mode 100644 index 0000000000000..2085ef7bad575 --- /dev/null +++ b/pkgs/development/python-modules/tree-sitter-html/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cargo +, rustPlatform +, rustc +, setuptools +, wheel +, tree-sitter +}: + +buildPythonPackage rec { + pname = "tree-sitter-html"; + version = "0.20.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tree-sitter"; + repo = "tree-sitter-html"; + rev = "v${version}"; + hash = "sha256-sHy3fVWemJod18HCQ8zBC/LpeCCPH0nzhI1wrkCg8nw="; + }; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + build-system = [ + cargo + rustPlatform.cargoSetupHook + rustc + setuptools + wheel + ]; + + passthru.optional-dependencies = { + core = [ + tree-sitter + ]; + }; + + # There are no tests + doCheck = false; + pythonImportsCheck = [ "tree_sitter_html" ]; + + meta = with lib; { + description = "HTML grammar for tree-sitter"; + homepage = "https://github.com/tree-sitter/tree-sitter-html"; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/tree-sitter-javascript/Cargo.lock b/pkgs/development/python-modules/tree-sitter-javascript/Cargo.lock new file mode 100644 index 0000000000000..2a6627a051151 --- /dev/null +++ b/pkgs/development/python-modules/tree-sitter-javascript/Cargo.lock @@ -0,0 +1,71 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "cc" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" + +[[package]] +name = "memchr" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[package]] +name = "regex" +version = "1.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "tree-sitter" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df7cc499ceadd4dcdf7ec6d4cbc34ece92c3fa07821e287aedecd4416c516dca" +dependencies = [ + "cc", + "regex", +] + +[[package]] +name = "tree-sitter-javascript" +version = "0.21.3" +dependencies = [ + "cc", + "tree-sitter", +] diff --git a/pkgs/development/python-modules/tree-sitter-javascript/default.nix b/pkgs/development/python-modules/tree-sitter-javascript/default.nix new file mode 100644 index 0000000000000..50b115c4e7ef8 --- /dev/null +++ b/pkgs/development/python-modules/tree-sitter-javascript/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cargo +, rustPlatform +, rustc +, setuptools +, wheel +, tree-sitter +}: + +buildPythonPackage rec { + pname = "tree-sitter-javascript"; + version = "0.21.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tree-sitter"; + repo = "tree-sitter-javascript"; + rev = "v${version}"; + hash = "sha256-jsdY9Pd9WqZuBYtk088mx1bRQadC6D2/tGGVY+ZZ0J4="; + }; + + cargoDeps = rustPlatform.importCargoLock { + # Upstream doesn't track a Cargo.lock file unfortunatly, but they barely + # have rust dependencies so it doesn't cost us too much. + lockFile = ./Cargo.lock; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + build-system = [ + cargo + rustPlatform.cargoSetupHook + rustc + setuptools + wheel + ]; + + passthru.optional-dependencies = { + core = [ + tree-sitter + ]; + }; + + # There are no tests + doCheck = false; + pythonImportsCheck = [ "tree_sitter_javascript" ]; + + meta = with lib; { + description = "JavaScript and JSX grammar for tree-sitter"; + homepage = "https://github.com/tree-sitter/tree-sitter-javascript"; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/tree-sitter-json/Cargo.lock b/pkgs/development/python-modules/tree-sitter-json/Cargo.lock new file mode 100644 index 0000000000000..1b9b095b26378 --- /dev/null +++ b/pkgs/development/python-modules/tree-sitter-json/Cargo.lock @@ -0,0 +1,71 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "cc" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" + +[[package]] +name = "memchr" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[package]] +name = "regex" +version = "1.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "tree-sitter" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df7cc499ceadd4dcdf7ec6d4cbc34ece92c3fa07821e287aedecd4416c516dca" +dependencies = [ + "cc", + "regex", +] + +[[package]] +name = "tree-sitter-json" +version = "0.21.0" +dependencies = [ + "cc", + "tree-sitter", +] diff --git a/pkgs/development/python-modules/tree-sitter-json/default.nix b/pkgs/development/python-modules/tree-sitter-json/default.nix new file mode 100644 index 0000000000000..acf574bef1d98 --- /dev/null +++ b/pkgs/development/python-modules/tree-sitter-json/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cargo +, rustPlatform +, rustc +, setuptools +, wheel +, tree-sitter +}: + +buildPythonPackage rec { + pname = "tree-sitter-json"; + version = "0.21.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tree-sitter"; + repo = "tree-sitter-json"; + rev = "v${version}"; + hash = "sha256-waejAbS7MjrE7w03MPqvBRpEpqTcKc6RgKCVSYaDV1Y="; + }; + + cargoDeps = rustPlatform.importCargoLock { + # Upstream doesn't track a Cargo.lock file unfortunatly, but they barely + # have rust dependencies so it doesn't cost us too much. + lockFile = ./Cargo.lock; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + build-system = [ + cargo + rustPlatform.cargoSetupHook + rustc + setuptools + wheel + ]; + + passthru.optional-dependencies = { + core = [ + tree-sitter + ]; + }; + + # There are no tests + doCheck = false; + pythonImportsCheck = [ "tree_sitter_json" ]; + + meta = with lib; { + description = "JSON grammar for tree-sitter"; + homepage = "https://github.com/tree-sitter/tree-sitter-json"; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/tree-sitter-languages/default.nix b/pkgs/development/python-modules/tree-sitter-languages/default.nix new file mode 100644 index 0000000000000..a118e4ffe0cca --- /dev/null +++ b/pkgs/development/python-modules/tree-sitter-languages/default.nix @@ -0,0 +1,68 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, cython +, tree-sitter0_21 +, pytestCheckHook +, python +}: + +buildPythonPackage rec { + pname = "tree-sitter-languages"; + version = "1.10.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "grantjenks"; + repo = "py-tree-sitter-languages"; + rev = "v${version}"; + hash = "sha256-wKU2c8QRBKFVFqg+DAeH5+cwm5jpDLmPZG3YBUsh/lM="; + # Use git, to also fetch tree-sitter repositories that upstream puts their + # hases in the repository as well, in repos.txt. + forceFetchGit = true; + postFetch = '' + cd $out + substitute build.py get-repos.py \ + --replace-fail "from tree_sitter import Language" "" \ + --replace-fail 'print(f"{sys.argv[0]}: Building", languages_filename)' "exit(0)" + ${python.pythonOnBuildForHost.interpreter} get-repos.py + rm -rf vendor/*/.git + ''; + }; + + build-system = [ + setuptools + wheel + cython + ]; + dependencies = [ + # https://github.com/grantjenks/py-tree-sitter-languages/issues/67 + tree-sitter0_21 + ]; + # Generate languages.so file (build won't fail without this, but tests will). + preBuild = '' + ${python.pythonOnBuildForHost.interpreter} build.py + ''; + nativeCheckInputs = [ + pytestCheckHook + ]; + # Without cd $out, tests fail to import the compiled cython extensions. + # Without copying the ./tests/ directory to $out, pytest won't detect the + # tests and run them. See also: + # https://github.com/NixOS/nixpkgs/issues/255262 + preCheck = '' + cp -r tests $out/${python.sitePackages}/tree_sitter_languages + cd $out + ''; + + pythonImportsCheck = [ "tree_sitter_languages" ]; + + meta = with lib; { + description = "Binary Python wheels for all tree sitter languages"; + homepage = "https://github.com/grantjenks/py-tree-sitter-languages"; + license = licenses.asl20; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/tree-sitter-python/Cargo.lock b/pkgs/development/python-modules/tree-sitter-python/Cargo.lock new file mode 100644 index 0000000000000..001baef04472e --- /dev/null +++ b/pkgs/development/python-modules/tree-sitter-python/Cargo.lock @@ -0,0 +1,71 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "cc" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" + +[[package]] +name = "memchr" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[package]] +name = "regex" +version = "1.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "tree-sitter" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df7cc499ceadd4dcdf7ec6d4cbc34ece92c3fa07821e287aedecd4416c516dca" +dependencies = [ + "cc", + "regex", +] + +[[package]] +name = "tree-sitter-python" +version = "0.21.0" +dependencies = [ + "cc", + "tree-sitter", +] diff --git a/pkgs/development/python-modules/tree-sitter-python/default.nix b/pkgs/development/python-modules/tree-sitter-python/default.nix new file mode 100644 index 0000000000000..e42136f5c2ada --- /dev/null +++ b/pkgs/development/python-modules/tree-sitter-python/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cargo +, rustPlatform +, rustc +, setuptools +, wheel +, tree-sitter +}: + +buildPythonPackage rec { + pname = "tree-sitter-python"; + version = "0.21.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tree-sitter"; + repo = "tree-sitter-python"; + rev = "v${version}"; + hash = "sha256-ZQ949GbgzZ/W667J+ekvQbs4bGnbDO+IWejivhxPZXM="; + }; + + cargoDeps = rustPlatform.importCargoLock { + # Upstream doesn't track a Cargo.lock file unfortunatly, but they barely + # have rust dependencies so it doesn't cost us too much. + lockFile = ./Cargo.lock; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + build-system = [ + cargo + rustPlatform.cargoSetupHook + rustc + setuptools + wheel + ]; + + passthru.optional-dependencies = { + core = [ + tree-sitter + ]; + }; + + # There are no tests + doCheck = false; + pythonImportsCheck = [ "tree_sitter_python" ]; + + meta = with lib; { + description = "Python grammar for tree-sitter"; + homepage = "https://github.com/tree-sitter/tree-sitter-python"; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/tree-sitter-rust/Cargo.lock b/pkgs/development/python-modules/tree-sitter-rust/Cargo.lock new file mode 100644 index 0000000000000..406fa5fc19bbe --- /dev/null +++ b/pkgs/development/python-modules/tree-sitter-rust/Cargo.lock @@ -0,0 +1,71 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "cc" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" + +[[package]] +name = "memchr" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[package]] +name = "regex" +version = "1.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "tree-sitter" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df7cc499ceadd4dcdf7ec6d4cbc34ece92c3fa07821e287aedecd4416c516dca" +dependencies = [ + "cc", + "regex", +] + +[[package]] +name = "tree-sitter-rust" +version = "0.21.2" +dependencies = [ + "cc", + "tree-sitter", +] diff --git a/pkgs/development/python-modules/tree-sitter-rust/default.nix b/pkgs/development/python-modules/tree-sitter-rust/default.nix new file mode 100644 index 0000000000000..b2c85aa9c5c1e --- /dev/null +++ b/pkgs/development/python-modules/tree-sitter-rust/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cargo +, rustPlatform +, rustc +, setuptools +, wheel +, tree-sitter +}: + +buildPythonPackage rec { + pname = "tree-sitter-rust"; + version = "0.21.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tree-sitter"; + repo = "tree-sitter-rust"; + rev = "v${version}"; + hash = "sha256-4CTh6fKSV8TuMHLAfEKWsAeCqeCM2uo6hVmF5KWhyPY="; + }; + + cargoDeps = rustPlatform.importCargoLock { + # Upstream doesn't track a Cargo.lock file unfortunatly, but they barely + # have rust dependencies so it doesn't cost us too much. + lockFile = ./Cargo.lock; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + build-system = [ + cargo + rustPlatform.cargoSetupHook + rustc + setuptools + wheel + ]; + + + passthru.optional-dependencies = { + core = [ + tree-sitter + ]; + }; + + # There are no tests + doCheck = false; + pythonImportsCheck = [ "tree_sitter_rust" ]; + + meta = with lib; { + description = "Rust grammar for tree-sitter"; + homepage = "https://github.com/tree-sitter/tree-sitter-rust"; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/tree-sitter/default.nix b/pkgs/development/python-modules/tree-sitter/default.nix index 91bbe16a52f41..fdaa03554433a 100644 --- a/pkgs/development/python-modules/tree-sitter/default.nix +++ b/pkgs/development/python-modules/tree-sitter/default.nix @@ -2,15 +2,19 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, pytestCheckHook, pythonOlder, setuptools, + tree-sitter-python, + tree-sitter-rust, + tree-sitter-html, + tree-sitter-javascript, + tree-sitter-json, }: buildPythonPackage rec { pname = "tree-sitter"; - version = "0.21.1"; + version = "0.22.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,26 +23,25 @@ buildPythonPackage rec { owner = "tree-sitter"; repo = "py-tree-sitter"; rev = "refs/tags/v${version}"; - hash = "sha256-U4ZdU0lxjZO/y0q20bG5CLKipnfpaxzV3AFR6fGS7m4="; + hash = "sha256-4lxE8oDFE0X7YAnB72PKIaHIqovWSM5QnFo0grPAtKU="; fetchSubmodules = true; }; - patches = [ - # Replace distutils with setuptools, https://github.com/tree-sitter/py-tree-sitter/pull/214 - (fetchpatch { - name = "replace-distutils.patch"; - url = "https://github.com/tree-sitter/py-tree-sitter/commit/80d3cae493c4a47e49cc1d2ebab0a8eaf7617825.patch"; - hash = "sha256-00coI8/COpYMiSflAECwh6yJCMJj/ucFEn18Npj2g+Q="; - }) - ]; - - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + tree-sitter-python + tree-sitter-rust + tree-sitter-html + tree-sitter-javascript + tree-sitter-json + ]; pythonImportsCheck = [ "tree_sitter" ]; preCheck = '' + # https://github.com/NixOS/nixpkgs/issues/255262#issuecomment-1721265871 rm -r tree_sitter ''; diff --git a/pkgs/development/python-modules/tree-sitter0_21/default.nix b/pkgs/development/python-modules/tree-sitter0_21/default.nix new file mode 100644 index 0000000000000..665f7d6b56ce9 --- /dev/null +++ b/pkgs/development/python-modules/tree-sitter0_21/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + pythonAtLeast, + setuptools, +}: + +buildPythonPackage rec { + pname = "tree-sitter0_21"; + version = "0.21.3"; + pyproject = true; + + # https://github.com/tree-sitter/py-tree-sitter/issues/209 + disabled = pythonAtLeast "3.12" || pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "tree-sitter"; + repo = "py-tree-sitter"; + rev = "refs/tags/v${version}"; + hash = "sha256-HT1sRzDFpeelWCq1ZMeRmoUg0a3SBR7bZKxBqn4fb2g="; + fetchSubmodules = true; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "tree_sitter" ]; + + preCheck = '' + rm -r tree_sitter + ''; + + meta = with lib; { + description = "Python bindings to the Tree-sitter parsing library"; + homepage = "https://github.com/tree-sitter/py-tree-sitter"; + changelog = "https://github.com/tree-sitter/py-tree-sitter/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/tskit/default.nix b/pkgs/development/python-modules/tskit/default.nix index 82f8e6b6a5f81..0299fea08e5aa 100644 --- a/pkgs/development/python-modules/tskit/default.nix +++ b/pkgs/development/python-modules/tskit/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchPypi, - setuptools-scm, + setuptools, pythonOlder, numpy, jsonschema, @@ -11,20 +11,21 @@ buildPythonPackage rec { pname = "tskit"; - version = "0.5.6"; - format = "pyproject"; + version = "0.5.7"; + pyproject = true; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-3f4hPxywY822mCF3IwooBezX38fM1zAm4Th4q//SzkY="; + hash = "sha256-yD+2W1tzzi+5wFoZrqNe+jJLpWyx6ZILBgKivDE+wiM="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ - numpy + dependencies = [ jsonschema + numpy svgwrite ]; @@ -34,11 +35,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "tskit" ]; - meta = with lib; { + meta = { description = "Tree sequence toolkit"; mainProgram = "tskit"; homepage = "https://github.com/tskit-dev/tskit"; - license = licenses.mit; - maintainers = with maintainers; [ alxsimon ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ alxsimon ]; }; } diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index b192152f66bce..204637733d55e 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "9.1.1"; + version = "9.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-LluMl5NdyI4aobxNoLtBv5BU4sAq/EhqvqNAxhOA5Og="; + hash = "sha256-vENcbkWXSdhHv3QYjhu8j2UmzmEFHaSD0xDb2pbxqMM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/txtai/default.nix b/pkgs/development/python-modules/txtai/default.nix index 143650d2ee509..a689f4381d6cf 100644 --- a/pkgs/development/python-modules/txtai/default.nix +++ b/pkgs/development/python-modules/txtai/default.nix @@ -50,6 +50,8 @@ xmltodict, # native check inputs unittestCheckHook, + + pythonAtLeast, }: let version = "7.2.0"; @@ -195,11 +197,13 @@ buildPythonPackage { "-v" ]; - meta = with lib; { + meta = { description = "Semantic search and workflows powered by language models"; changelog = "https://github.com/neuml/txtai/releases/tag/v${version}"; homepage = "https://github.com/neuml/txtai"; - license = licenses.asl20; - maintainers = with maintainers; [ happysalada ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ happysalada ]; + # This should be addressed in a newer version, but we first need to wait for python311Packages.faiss to be updated + broken = pythonAtLeast "3.12"; }; } diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index 68b187e2e7dcf..112c19286a92b 100644 --- a/pkgs/development/python-modules/types-awscrt/default.nix +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "types-awscrt"; - version = "0.20.11"; + version = "0.20.12"; pyproject = true; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-rVzp+1EUFEMDJvGaUT4j07xxQ8EM2+HNrrIiKtVnaY8="; + hash = "sha256-C+q93gIF3B2meepGT9P5i1cO9PD8glsVWpdPtRsh6Nk="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/ubelt/default.nix b/pkgs/development/python-modules/ubelt/default.nix index f47d4cb590e3b..85764d05986c2 100644 --- a/pkgs/development/python-modules/ubelt/default.nix +++ b/pkgs/development/python-modules/ubelt/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "ubelt"; - version = "1.3.5"; + version = "1.3.6"; pyproject = true; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Erotemic"; repo = "ubelt"; rev = "refs/tags/v${version}"; - hash = "sha256-pwqqt5Syag4cO6a93+7ZE3eI61yTZGc+NEu/Y0i1U0k="; + hash = "sha256-ygoJqyTscfuZVDGVbrZobZFvlcuF4HavTU65tmhyU+w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ucsmsdk/default.nix b/pkgs/development/python-modules/ucsmsdk/default.nix index 56dcad45e690e..667ebeca93410 100644 --- a/pkgs/development/python-modules/ucsmsdk/default.nix +++ b/pkgs/development/python-modules/ucsmsdk/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "ucsmsdk"; - version = "0.9.17"; + version = "0.9.18"; format = "setuptools"; src = fetchFromGitHub { owner = "CiscoUcs"; repo = "ucsmsdk"; rev = "refs/tags/v${version}"; - hash = "sha256-Ejn99MArKZjCHsl81WSHfpWV3Kz/mBrItIa0tPVProU="; + hash = "sha256-9LCrjelxx8HxIEiSdsvtvm31XiE11Gnp0suapmo2L5Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix index bae843bb4c975..77a4f48428d2a 100644 --- a/pkgs/development/python-modules/uiprotect/default.nix +++ b/pkgs/development/python-modules/uiprotect/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "uiprotect"; - version = "1.1.0"; + version = "1.7.2"; pyproject = true; src = fetchFromGitHub { owner = "uilibs"; repo = "uiprotect"; rev = "refs/tags/v${version}"; - hash = "sha256-TWErGEQot99x48Ti9rBxaq9qcrZiT/W0irdR+UxC1XI="; + hash = "sha256-gr+P7V0vsmWha/Di3BGORjssCLz0lsufawzMZKOMYt0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 8a362c8f84af0..7e8091dac4dab 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "urwid"; - version = "2.6.12"; + version = "2.6.14"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "urwid"; repo = "urwid"; rev = "refs/tags/${version}"; - hash = "sha256-JGX9v/x8c7ayHnxVjC7u4YLs3OvZmTzPNFUfqGCeIRQ="; + hash = "sha256-UDYIAAAKmdqtTzV8yn1zkEH0PvOUmVXodxF1ZyubgE0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix index adaf1ed7feb72..c0d6fa22c952f 100644 --- a/pkgs/development/python-modules/vt-py/default.nix +++ b/pkgs/development/python-modules/vt-py/default.nix @@ -3,6 +3,7 @@ aiohttp, buildPythonPackage, fetchFromGitHub, + flask, pytest-asyncio, pytest-httpserver, pytestCheckHook, @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "vt-py"; - version = "0.18.2"; + version = "0.18.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = "vt-py"; rev = "refs/tags/${version}"; - hash = "sha256-Uspd422JlBKlsD/K7NciYhYUb12wInN/Z7zTw7aYP28="; + hash = "sha256-Zu4lUniXfKaZ1SvX3YCzMLa76HgUWpmddV2N9buNS3o="; }; postPatch = '' @@ -39,6 +40,7 @@ buildPythonPackage rec { dependencies = [ aiohttp ]; nativeCheckInputs = [ + flask pytest-asyncio pytest-httpserver pytestCheckHook diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index 914da465b54c8..d07a93a3a8b43 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -98,6 +98,5 @@ buildPythonPackage rec { mainProgram = "weasyprint"; homepage = "https://weasyprint.org/"; license = licenses.bsd3; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/development/python-modules/websockify/default.nix b/pkgs/development/python-modules/websockify/default.nix index 470943793d7b5..fc1b3c7115188 100644 --- a/pkgs/development/python-modules/websockify/default.nix +++ b/pkgs/development/python-modules/websockify/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "websockify"; - version = "0.11.0"; + version = "0.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "novnc"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-82Fk9qbiiCD5Rts1d14sK/njeN7DcjKMKPqE7S/1WHs="; + hash = "sha256-+qjWmCkXJj8J5OImMSjTwXWyApmJ883NMr0157iqPS4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index e653d684d4475..cba91268a5eb1 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.60.2"; + version = "0.60.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "refs/tags/v${version}"; - hash = "sha256-VM4qCe+VMnfKXioUHTjOeBSniwpq44fvbN1k1jG6puk="; + hash = "sha256-eIGzcuSKzcpE6UPQKmv0kcFcIFizWOunfOJDHfcw7Yk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/xarray-dataclasses/default.nix b/pkgs/development/python-modules/xarray-dataclasses/default.nix index 2c350bb034726..78de25f5bfbfc 100644 --- a/pkgs/development/python-modules/xarray-dataclasses/default.nix +++ b/pkgs/development/python-modules/xarray-dataclasses/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "xarray-dataclasses"; - version = "1.7.0"; + version = "1.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "astropenguin"; repo = "xarray-dataclasses"; rev = "refs/tags/v${version}"; - hash = "sha256-fyRUH6t2+9tsxRQFfJR2EHinYtwCmWeCB77kpmBgdBA="; + hash = "sha256-NZBWq1G63yef6h9TjRBfCqPzhaks0Cm7bUCJfIIpmcE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/xdoctest/default.nix b/pkgs/development/python-modules/xdoctest/default.nix index 29cc5c71bd0e7..686c6e8b765e5 100644 --- a/pkgs/development/python-modules/xdoctest/default.nix +++ b/pkgs/development/python-modules/xdoctest/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "xdoctest"; - version = "1.1.4"; + version = "1.1.5"; pyproject = true; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Erotemic"; repo = "xdoctest"; rev = "refs/tags/v${version}"; - hash = "sha256-gKs8HsXm7hskSIw8bhEX1Vo8RbtO0YDjtjBJViz1rCE="; + hash = "sha256-lC4xX5V5iasQdR4tkLEvtMe/OjSp6+A7D2QGX6TFY4E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index 88b13859455dc..f3ee1d05772da 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -14,12 +14,13 @@ pythonOlder, requests, requests-mock, - setuptools, + poetry-core, + typing-extensions, }: buildPythonPackage rec { pname = "yalexs"; - version = "3.1.0"; + version = "6.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,16 +29,15 @@ buildPythonPackage rec { owner = "bdraco"; repo = "yalexs"; rev = "refs/tags/v${version}"; - hash = "sha256-+Sn+d6CuxIUEDLkDvcq7OT3AumElJFfWCwM02LPIeyg="; + hash = "sha256-xBBO0cXdOzt2ioMQzzdtSKB0WxOZBIb4PsiKoRrUUSc="; }; postPatch = '' - # Not used requirement - substituteInPlace setup.py \ - --replace-fail '"vol",' "" + substituteInPlace pyproject.toml \ + --replace-fail "-v -Wdefault --cov=yalexs --cov-report=term-missing:skip-covered" "" ''; - build-system = [ setuptools ]; + build-system = [ poetry-core ]; dependencies = [ aiofiles @@ -47,6 +47,7 @@ buildPythonPackage rec { pyjwt python-dateutil requests + typing-extensions ]; # aiounittest is not supported on 3.12 diff --git a/pkgs/development/python-modules/yaramod/default.nix b/pkgs/development/python-modules/yaramod/default.nix index 63c4e14ba8142..477f5d776c906 100644 --- a/pkgs/development/python-modules/yaramod/default.nix +++ b/pkgs/development/python-modules/yaramod/default.nix @@ -21,7 +21,7 @@ let in buildPythonPackage rec { pname = "yaramod"; - version = "3.21.0"; + version = "3.22.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "avast"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-YkMDoFwWPrDhAgDnPpNCU1NlnAPhwYQF/KFaRFn+juQ="; + hash = "sha256-WyMMcKKBNnEb0tyE2EjOspgJve6NJZg9HxymovBy/u4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index 7958be28794c2..f8ba88bdf0c64 100644 --- a/pkgs/development/python-modules/zha/default.nix +++ b/pkgs/development/python-modules/zha/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "zha"; - version = "0.0.8"; + version = "0.0.9"; pyproject = true; disabled = pythonOlder "3.12"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha"; rev = "refs/tags/${version}"; - hash = "sha256-xOaqwgL8NqB3pHNa6U/wextntI5aMivHLaIhSRqvgRU="; + hash = "sha256-wQY355KUsN91y3lgj9k3ceeHb6a0faxiguIFK4ZwPIE="; }; postPatch = '' @@ -47,8 +47,10 @@ buildPythonPackage rec { pythonRelaxDeps = [ "bellows" + "pyserial-asyncio-fast" "universal-silabs-flasher" "zha-quirks" + "zigpy" ]; nativeBuildInputs = [ pythonRelaxDepsHook ]; diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 5e70e78e4dc2c..48455b0a6e94b 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.64.0"; + version = "0.64.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-4p/CUAZQLiADWzjXMOeYUX0OJgZczHrI2/sVRuXiFSI="; + hash = "sha256-9hPJZQfLevV6zl7JvLtCJSspGl87ORlWLXoVJmRcEJU="; }; postPatch = '' diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index ce5f581be1bcf..95e062808bc31 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -483,7 +483,7 @@ let units = [ pkgs.udunits ]; unigd = [ pkgs.pkg-config ]; vdiffr = [ pkgs.libpng.dev ]; - V8 = [ pkgs.v8 ]; + V8 = [ pkgs.nodejs.libv8 ]; XBRL = with pkgs; [ zlib libxml2.dev ]; XLConnect = [ pkgs.jdk ]; xml2 = [ pkgs.libxml2.dev ] ++ lib.optionals stdenv.isDarwin [ pkgs.perl ]; @@ -1407,12 +1407,15 @@ let V8 = old.V8.overrideAttrs (attrs: { postPatch = '' substituteInPlace configure \ - --replace " -lv8_libplatform" "" + --replace-fail " -lv8_libplatform" "" + # Bypass the test checking if pointer compression is needed + substituteInPlace configure \ + --replace-fail "./pctest1" "true" ''; preConfigure = '' - export INCLUDE_DIR=${pkgs.v8}/include - export LIB_DIR=${pkgs.v8}/lib + export INCLUDE_DIR=${pkgs.nodejs.libv8}/include + export LIB_DIR=${pkgs.nodejs.libv8}/lib patchShebangs configure ''; diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index cd2f6f379efc5..3bb95521132b0 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -23,6 +23,7 @@ , nativeBuildInputs ? [] , buildInputs ? [] , extraConfigPaths ? [] +, passthru ? {} , ... }@args: @@ -182,7 +183,7 @@ let exit 1 ''; }; - }); + } // passthru); }; basicEnv = diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 3a64f7d2fd9d1..2e59b8a99cc11 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -18,7 +18,7 @@ # (to make gems behave if necessary). { lib, fetchurl, writeScript, ruby, libkrb5, libxml2, libxslt, python2, stdenv, which -, libiconv, postgresql, v8, clang, sqlite, zlib, imagemagick, lasem +, libiconv, postgresql, nodejs, clang, sqlite, zlib, imagemagick, lasem , pkg-config , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi , cmake, libssh2, openssl, openssl_1_1, libmysqlclient, git, perl, pcre, pcre2, gecode_3, curl , libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, gtk3, buildRubyGem @@ -476,7 +476,7 @@ in # otherwise the gem will fail to link to the libv8 binary. # see: https://github.com/cowboyd/libv8/pull/161 libv8 = attrs: { - buildInputs = [ which v8 python2 ]; + buildInputs = [ which nodejs.libv8 python2 ]; buildFlags = [ "--with-system-v8=true" ]; dontBuild = false; # The gem includes broken symlinks which are ignored during unpacking, but @@ -496,7 +496,7 @@ in }; execjs = attrs: { - propagatedBuildInputs = [ v8 ]; + propagatedBuildInputs = [ nodejs.libv8 ]; }; libxml-ruby = attrs: { diff --git a/pkgs/development/skaware-packages/execline/default.nix b/pkgs/development/skaware-packages/execline/default.nix index e64f3eef6f1a8..1b995df6d485f 100644 --- a/pkgs/development/skaware-packages/execline/default.nix +++ b/pkgs/development/skaware-packages/execline/default.nix @@ -1,14 +1,14 @@ { lib, skawarePackages, skalibs }: let - version = "2.9.5.1"; + version = "2.9.6.0"; in skawarePackages.buildPackage { inherit version; pname = "execline"; # ATTN: also check whether there is a new manpages version - sha256 = "33UANdD7IccmW/+37X4bZh3h6EKUSiJSvc3cMtDZchc="; + sha256 = "uion6Xxetr18pqCYeokl5ERlpb6ZbaoNGPj+yjfXVxo="; # Maintainer of manpages uses following versioning scheme: for every # upstream $version he tags manpages release as ${version}.1, and, @@ -16,8 +16,8 @@ in skawarePackages.buildPackage { # ${version}.3 and so on are created. manpages = skawarePackages.buildManPages { pname = "execline-man-pages"; - version = "2.9.5.1.1"; - sha256 = "hLo0TJJ4F2UQ+NkyO9DvVHO0ec86Eps1z99HthBzoIc="; + version = "2.9.6.0.1"; + sha256 = "0lyX3rIUZ2JqWioRSm22uDS+q9ONkwIZxfR5E2pSDC4="; description = "Port of the documentation for the execline suite to mdoc"; maintainers = [ lib.maintainers.sternenseemann ]; }; diff --git a/pkgs/development/skaware-packages/mdevd/default.nix b/pkgs/development/skaware-packages/mdevd/default.nix index 0e78d112c8bbe..dcc78ad4f60b9 100644 --- a/pkgs/development/skaware-packages/mdevd/default.nix +++ b/pkgs/development/skaware-packages/mdevd/default.nix @@ -2,8 +2,8 @@ skawarePackages.buildPackage { pname = "mdevd"; - version = "0.1.6.3"; - sha256 = "9uzw73zUjQTvx1rLLa2WfYULyIFb2wCY8cnvBDOU1DA="; + version = "0.1.6.4"; + sha256 = "c1jOUwtrm++3FeSBkJgem2mhLMqFhRnm0uS0bqt+JHA="; description = "mdev-compatible Linux hotplug manager daemon"; platforms = lib.platforms.linux; diff --git a/pkgs/development/skaware-packages/s6-dns/default.nix b/pkgs/development/skaware-packages/s6-dns/default.nix index 97cdc1d348a52..e51beccd74d2a 100644 --- a/pkgs/development/skaware-packages/s6-dns/default.nix +++ b/pkgs/development/skaware-packages/s6-dns/default.nix @@ -2,8 +2,8 @@ skawarePackages.buildPackage { pname = "s6-dns"; - version = "2.3.7.1"; - sha256 = "zwJYV07H1itlTgwq14r0x9Z6xMnLN/eBSA9ZflSzD20="; + version = "2.3.7.2"; + sha256 = "au4yu2jQH1EJ9x4xooMhPGaM08Dnn7nkaebKu1gHnys="; description = "Suite of DNS client programs and libraries for Unix systems"; diff --git a/pkgs/development/skaware-packages/s6-networking/default.nix b/pkgs/development/skaware-packages/s6-networking/default.nix index 5202b5c7cdd7a..b8c2c56a69e9e 100644 --- a/pkgs/development/skaware-packages/s6-networking/default.nix +++ b/pkgs/development/skaware-packages/s6-networking/default.nix @@ -18,13 +18,13 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport}; skawarePackages.buildPackage { pname = "s6-networking"; - version = "2.7.0.2"; - sha256 = "wzxvGyvhb4miGvlGz9BiQqEvmBhMiYt1XdskM4ZxzrE="; + version = "2.7.0.3"; + sha256 = "20EcVDcaF+19RUPdhs+VMM4l/PYkvvg64rV5Ug5ecL8="; manpages = skawarePackages.buildManPages { pname = "s6-networking-man-pages"; - version = "2.5.1.3.3"; - sha256 = "02ba5jyfpbib402mfl42pbbdxyjy2vhpiz1b2qdg4ax58yr4jzqk"; + version = "2.7.0.3.1"; + sha256 = "9u2C1TF9vma+7Qo+00uZ6eOCn/9eMgKALgHDVgMcrfg="; description = "Port of the documentation for the s6-networking suite to mdoc"; maintainers = [ lib.maintainers.sternenseemann ]; }; diff --git a/pkgs/development/skaware-packages/s6-rc/default.nix b/pkgs/development/skaware-packages/s6-rc/default.nix index f6865f43af5d1..dee9e4ed7209a 100644 --- a/pkgs/development/skaware-packages/s6-rc/default.nix +++ b/pkgs/development/skaware-packages/s6-rc/default.nix @@ -2,12 +2,12 @@ skawarePackages.buildPackage { pname = "s6-rc"; - version = "0.5.4.2"; - sha256 = "AL36WW+nFhUS6XLskoKiq9j9DjHwkXe616K8PY8oOYI="; + version = "0.5.4.3"; + sha256 = "4ycnlqlHkE3jerNOwQQw4mEHuO8FIQ2BBZyLNiA+ap8="; manpages = skawarePackages.buildManPages { pname = "s6-rc-man-pages"; - version = "0.5.4.2.1"; + version = "0.5.4.3.1"; sha256 = "Ywke3FG/xhhUd934auDB+iFRDCvy8IJs6IkirP6O/As="; description = "mdoc(7) versions of the documentation for the s6-rc service manager"; maintainers = [ lib.maintainers.qyliss ]; diff --git a/pkgs/development/skaware-packages/s6/default.nix b/pkgs/development/skaware-packages/s6/default.nix index 761ee34e9702c..188e33696c8fc 100644 --- a/pkgs/development/skaware-packages/s6/default.nix +++ b/pkgs/development/skaware-packages/s6/default.nix @@ -2,13 +2,13 @@ skawarePackages.buildPackage { pname = "s6"; - version = "2.12.0.4"; - sha256 = "yV1ReHYC4MjI5PkqcQy9qk7nl+6IbnE0Jyfil0+VwGs="; + version = "2.13.0.0"; + sha256 = "fkb49V2Auw4gJaZNXWSa9KSsIeNIAgyqrd4wul5bSDA="; manpages = skawarePackages.buildManPages { pname = "s6-man-pages"; - version = "2.12.0.4.1"; - sha256 = "9n4oIGfgcu+Q/UcY1Edr3n09Ecrbg77AI8TRBQoFzs0="; + version = "2.13.0.0.1"; + sha256 = "oZgyJ2mPxpgsV2Le29XM+NsjMhqvDQ70SUZ2gjYg5U8="; description = "Port of the documentation for the s6 supervision suite to mdoc"; maintainers = [ lib.maintainers.sternenseemann ]; }; diff --git a/pkgs/development/skaware-packages/skalibs/default.nix b/pkgs/development/skaware-packages/skalibs/default.nix index 44779eb3612b3..8af02e348312e 100644 --- a/pkgs/development/skaware-packages/skalibs/default.nix +++ b/pkgs/development/skaware-packages/skalibs/default.nix @@ -6,8 +6,8 @@ skawarePackages.buildPackage { pname = "skalibs"; - version = "2.14.1.1"; - sha256 = "trebgW9LoLaAFnaw7UF5tZyMeAnu/+JttnLkBGNr78M="; + version = "2.14.2.0"; + sha256 = "sha256-3f7Fcw5bLxnQOB7Pf3lrOabkcyNr2grY03dqP+ewfkM="; description = "Set of general-purpose C programming libraries"; diff --git a/pkgs/development/skaware-packages/tipidee/default.nix b/pkgs/development/skaware-packages/tipidee/default.nix index 31f772b84b7d5..4df0a2e2a3bb3 100644 --- a/pkgs/development/skaware-packages/tipidee/default.nix +++ b/pkgs/development/skaware-packages/tipidee/default.nix @@ -2,8 +2,8 @@ skawarePackages.buildPackage { pname = "tipidee"; - version = "0.0.4.0"; - sha256 = "sha256-FzZRGg8IBTkzXINb9WCdVukej9KyPFQIUuXfdcLz1RQ="; + version = "0.0.5.0"; + sha256 = "2ekfxxmHmkPVQym5mwLGZJxU5Cjne8lqBXNQa1K/FCI="; description = "HTTP 1.1 webserver, serving static files and CGI/NPH"; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 9bf6d49c509dc..3b925694c93ca 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.133"; + version = "3.2.140"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-mi8MPp99WViVHtMb5f6XxHiUwQkRh0DvPGRtaCUlykE="; + hash = "sha256-CqmXUz58eBMNrgfTDP/7M03R8vw9ys9/devRfFvWbBw="; }; patches = [ ./flake8-compat-5.x.patch ]; diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 2bbd0135d615a..fa5881a1cb0c2 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.17.4"; + version = "2.17.5"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - hash = "sha256-4BfIu81e/XR23Kp8+b6/KRbuji2Od53a1urcyjXX1q8="; + hash = "sha256-Ay+8NOYq1sBIDhCoju2/L8Ghegmxz5NmtpBLb0hqH/E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index c5040e07416c6..e94a98a6a96a8 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { pname = "aws-sam-cli"; - version = "1.117.0"; + version = "1.119.0"; pyproject = true; disabled = python3.pythonOlder "3.8"; @@ -19,14 +19,17 @@ python3.pkgs.buildPythonApplication rec { owner = "aws"; repo = "aws-sam-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-EXwR1bOaz2//pP3evOWF3XPUgIzbSEYqW4djyPkX8nQ="; + hash = "sha256-0H1C2z01nwJtlSNjTCi2bH6ExBnmn8xNXD/jzYFxvCs="; }; build-system = with python3.pkgs; [ - pythonRelaxDepsHook setuptools ]; + nativeBuildInputs = with python3.pkgs; [ + pythonRelaxDepsHook + ]; + pythonRelaxDeps = [ "aws-lambda-builders" "aws-sam-translator" @@ -36,10 +39,12 @@ python3.pkgs.buildPythonApplication rec { "docker" "jsonschema" "pyopenssl" + "requests" "rich" "ruamel-yaml" "tomlkit" "tzlocal" + "watchdog" ]; dependencies = with python3.pkgs; [ diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index 99ce90cc77455..b7e2265c49157 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "backblaze-b2"; - version = "3.19.1"; + version = "4.0.1"; pyproject = true; src = fetchFromGitHub { owner = "Backblaze"; repo = "B2_Command_Line_Tool"; rev = "refs/tags/v${version}"; - hash = "sha256-/P1cgAC+a2YCcvbsysYdD+fEwibo+GyE0XY4A0+gMh4="; + hash = "sha256-rZUWPSI7CrKOdEKdsSpekwBerbIMf2iiVrWkV8WrqSc="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/development/tools/bearer/default.nix b/pkgs/development/tools/bearer/default.nix index 388e529bf2902..30f7defdfe428 100644 --- a/pkgs/development/tools/bearer/default.nix +++ b/pkgs/development/tools/bearer/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "bearer"; - version = "1.43.7"; + version = "1.43.8"; src = fetchFromGitHub { owner = "bearer"; repo = "bearer"; rev = "refs/tags/v${version}"; - hash = "sha256-n48HpPAga3/CBKAzJOg5uc+y9gNvVtmlsme/nY5dSRo="; + hash = "sha256-rDmS13eDPYE/UmyCRsBi1wHOZerYf9QS/pOiPKVxwKA="; }; - vendorHash = "sha256-84YJ9CXnOu0JeCzF2Ip54PRz8uJ3j+nkIwEMD++Gabg="; + vendorHash = "sha256-7rTbLnFfdmRQgQfx2w/mO3Ac5ENEFm5XPzApKwlImkE="; subPackages = [ "cmd/bearer" ]; diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix index 4923ea23da1ce..5e6ad1c1e16fd 100644 --- a/pkgs/development/tools/build-managers/moon/default.nix +++ b/pkgs/development/tools/build-managers/moon/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "moon"; - version = "1.25.1"; + version = "1.25.6"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-LPQuP2OsR1TYnt7Qm8XRO0Ne7xliglJgQrMHNWnsYhM="; + hash = "sha256-DFBQryGbanytawHtD3ygSL9ypzM9hoxVoVB1H9ruPu4="; }; - cargoHash = "sha256-EWwUlKxsf0rZegxk1m11ZPIcfjwZKQ7C95l5UyGVFD0="; + cargoHash = "sha256-6Ipfz4649vf7qsavkif/zNbElMiZPEi/2ZXHbRcxRTw="; env = { RUSTFLAGS = "-C strip=symbols"; diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index e4b9f050d6f34..436a8c9501bf8 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.13.2"; + version = "0.14.0"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - hash = "sha256-Kb5p838jezDTJnc2jcKnima1gE7ENMm+4cmN6F6vh+Y="; + hash = "sha256-41e/S3TzDAJuvopd5JFMKvdDOmHwnwF+4wrdOvifyoU="; }; vendorHash = null; diff --git a/pkgs/development/tools/check-jsonschema/default.nix b/pkgs/development/tools/check-jsonschema/default.nix index 00dee40a391f0..fa2d4920a26be 100644 --- a/pkgs/development/tools/check-jsonschema/default.nix +++ b/pkgs/development/tools/check-jsonschema/default.nix @@ -4,7 +4,7 @@ with python3.pkgs; buildPythonApplication rec { pname = "check-jsonschema"; - version = "0.28.4"; + version = "0.28.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -13,7 +13,7 @@ buildPythonApplication rec { owner = "python-jsonschema"; repo = "check-jsonschema"; rev = "refs/tags/${version}"; - hash = "sha256-7EHx5XQ3sthxKcD+9ujo5ZXWQ7tZx/f7eN9OiK4k7mc="; + hash = "sha256-O2w9P/5og0cI7Ol+d5YVwLuvCjiskrRLL3V/jsYB4k4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/cloudsmith-cli/default.nix b/pkgs/development/tools/cloudsmith-cli/default.nix index 7de523c937f6e..0131a5029060f 100644 --- a/pkgs/development/tools/cloudsmith-cli/default.nix +++ b/pkgs/development/tools/cloudsmith-cli/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cloudsmith-cli"; - version = "1.2.3"; + version = "1.2.5"; format = "setuptools"; src = fetchFromGitHub { owner = "cloudsmith-io"; repo = "cloudsmith-cli"; - rev = "v${version}"; - hash = "sha256-a4hLx+INdFq6Ux3XkI5GWgAiGLHCoDA+MP2FNY3E6WA="; + rev = "refs/tags/v${version}"; + hash = "sha256-UzyfOmjJzYEJYA6c4kn5XCvRVIMuiIpiq0kH9UhBwmo="; }; patches = [ diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index d3cbb676757fd..e50259bed2366 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.119.0"; + version = "0.119.1"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BdCsm6ciQsfmrQOxOWPTfNbWXhnJzXBmHEUkPD/FobU="; + sha256 = "sha256-nEGeh0ZTYE4Ff0x+1G38KUFcUsr39kvM8QUfmHCFyK4="; }; vendorHash = "sha256-rL4bXt6VBG2b9nZ1M2FF6E8ODPT3UF4aRHSJqpVWyTw="; diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index 26d98065c8207..e481df1d538bb 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -25,7 +25,7 @@ buildGoModule rec { description = "Continuous Integration platform built on container technology"; mainProgram = "drone-server"; homepage = "https://github.com/harness/drone"; - maintainers = with maintainers; [ elohmeier vdemeester techknowlogick ]; + maintainers = with maintainers; [ vdemeester techknowlogick ]; license = with licenses; if enableUnfree then unfreeRedistributable else asl20; }; } diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 1c6cfdc5090e0..fbce84a679125 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, bash }: let - version = "16.11.1"; + version = "17.0.0"; in buildGoModule rec { inherit version; @@ -23,7 +23,7 @@ buildGoModule rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-ISL11AvKIy/tW/3MhVZ2/XT5RcaYj+x9rHKWAB/9TdU="; + sha256 = "sha256-u9yA9v2UojBTDElfZhi8k9D1of0vIj3c14ZFmwa+yj4="; }; patches = [ diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix index 416fb8eca02e0..53aac9d5d4df9 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "2.5.0"; - srcHash = "sha256-tR+suOR09folwZ6qmuaQhGml134L8dcK7ZX8/Pl4xfQ="; + version = "2.6.0"; + srcHash = "sha256-SuTizOHsj1t4WovbOX5MuMZixbPo7TyCnD6nnf62/H4="; # The tarball contains vendored dependencies vendorHash = null; in diff --git a/pkgs/development/tools/database/atlas/default.nix b/pkgs/development/tools/database/atlas/default.nix index 3f3b1f6a13f64..3901c068d0985 100644 --- a/pkgs/development/tools/database/atlas/default.nix +++ b/pkgs/development/tools/database/atlas/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "atlas"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "ariga"; repo = "atlas"; rev = "v${version}"; - hash = "sha256-eMYr+U95+xym7PZ02OmZbDG7g/kxE1Nojp3mZM6mf9Q="; + hash = "sha256-kmsDTHnYSkCRdLXPzE5g2qzzb8EuGunrM9SDfaul8Xo="; }; modRoot = "cmd/atlas"; proxyVendor = true; - vendorHash = "sha256-rM2l7U/ZkL0NIGPPbmBQ+P6mzGxdX4aQeS8Hz6EFmQc="; + vendorHash = "sha256-z2+u6jPTP6MOs7PTF6UzPwhnofQOhRll0zrmsLrN+PQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix index e3aba018735c9..2b7a31d05f2e8 100644 --- a/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.5.12"; + version = "2.5.14"; src = fetchFromGitHub { owner = "Altinity"; repo = "clickhouse-backup"; rev = "v${version}"; - hash = "sha256-qLBx1QhIefZbENEtJiVHoAMsxM9SqiCnPQpotIAJy5Y="; + hash = "sha256-y57P6AM0w1AaOxCOHPjdgyhvqP/yasOP46JdErnYEvg="; }; vendorHash = "sha256-vwcItklYe6ljFdGTxef19plaI5OMoOtQohY0xZLBUos="; diff --git a/pkgs/development/tools/database/dblab/default.nix b/pkgs/development/tools/database/dblab/default.nix index 89b5162c1fc3a..a797f18be70c6 100644 --- a/pkgs/development/tools/database/dblab/default.nix +++ b/pkgs/development/tools/database/dblab/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "dblab"; - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "danvergara"; repo = "dblab"; rev = "v${version}"; - hash = "sha256-xaggGX1BROyfexPV3I2TGYf3BPHg2uFebm8XZ0qwXUw="; + hash = "sha256-p579rxv8ntNLfunKl6JGYE7eFZc51p2OGWGhQmAuADY="; }; vendorHash = "sha256-RmZkSlA6KU1wXKFHPLYVhRjwxsDjO1XNoGBdNCmeGSw="; diff --git a/pkgs/development/tools/database/mermerd/default.nix b/pkgs/development/tools/database/mermerd/default.nix index 7331f5f61750d..f73cca5d01ec6 100644 --- a/pkgs/development/tools/database/mermerd/default.nix +++ b/pkgs/development/tools/database/mermerd/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "mermerd"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "KarnerTh"; repo = "mermerd"; rev = "refs/tags/v${version}"; - hash = "sha256-SzDwVkV7rV/pctFNWzgCfsDAHqcf/R5UMRJ48o+Iel0="; + hash = "sha256-7oBN9EeF3JBrOFuIM3lkNR2WMZA8PNDaKqdsVPawHBE="; }; - vendorHash = "sha256-rLOYJ/do4HSztnHrQZOUOG0Y3e3BupUGlijP5x8WtZc="; + vendorHash = "sha256-bd/1LT0Pw25NhbnwQH3nmuCm3m8jBKPOYGRIRpcOGQI="; ldflags = [ "-s" diff --git a/pkgs/development/tools/database/prqlc/default.nix b/pkgs/development/tools/database/prqlc/default.nix index 28664a88ae2fd..f929704d3dd45 100644 --- a/pkgs/development/tools/database/prqlc/default.nix +++ b/pkgs/development/tools/database/prqlc/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "prqlc"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "prql"; repo = "prql"; rev = version; - hash = "sha256-FUF0O1Z5v9FRLfb1Ms6r2FM/Omc1AO+S7MxvmZ9SHSk="; + hash = "sha256-nD3B4R2eBX52wekBrBT3jiIYdE/p6xgnHrvDFFofl/s="; }; - cargoHash = "sha256-A3tFoRNmRDMYJyHYdgXHrlszW0D30EMk7hSo/8Z5gvk="; + cargoHash = "sha256-Rhvl9rqtJyEpZZYUaN+ih6KXgEVKZCyovf34l883bZM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/database/sqlcmd/default.nix b/pkgs/development/tools/database/sqlcmd/default.nix index cd63751c5ba3b..f636092ec5c97 100644 --- a/pkgs/development/tools/database/sqlcmd/default.nix +++ b/pkgs/development/tools/database/sqlcmd/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "sqlcmd"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { repo = "go-sqlcmd"; owner = "microsoft"; rev = "v${version}"; - sha256 = "sha256-LLRNaY6ArUNoKSWSauCh2RKEGO5+G1OnoCAqMaAfOkY="; + sha256 = "sha256-69vSRwRl6Ep+lBpy31PkDdEV58yEhtqQBeisaih43CU="; }; - vendorHash = "sha256-NVmgAlNQvRj/7poIEWjMyKw2qWMd/HwbdSFHpumnRlo="; + vendorHash = "sha256-boMvZf8+o1JDaxiyttbW/7hcuTN9wAeTUWT89N0FsSU="; proxyVendor = true; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix index af428be72e8d7..e2d35dd403d55 100644 --- a/pkgs/development/tools/dprint/default.nix +++ b/pkgs/development/tools/dprint/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "dprint"; - version = "0.46.2"; + version = "0.46.3"; src = fetchCrate { inherit pname version; - sha256 = "sha256-P7q2WLTGydC652N4jvTiF7hm4HRmSWnRv9+AuxRoC5Y="; + sha256 = "sha256-IyhKxCqLyboEZINalI6bd///sUxWvmWlQVrzMA2sNdU="; }; - cargoHash = "sha256-xmMFqqADIwIII+arW9gZyf95yXOkBMDRDOaG0Nay7hQ="; + cargoHash = "sha256-46t6Y2UuRCAnvOhEPLgYN+fHHtJYxuflRT3DClLTDQk="; buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index fedd02fe733df..d5760841b2e24 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -23,35 +23,35 @@ }, "28": { "hashes": { - "aarch64-darwin": "53fc040cd09e955e013254f784cf51712029ded4a574559cf5fa19c9a911d75d", - "aarch64-linux": "3e46c3076041386213f7b9ebc12335889fbad5822ffc306cf7514abb88de8512", - "armv7l-linux": "2e22fbab2376a9bbeb8cbdd7d9bb3ca69fda6adeafa2b22ffb67157fcfcdb6ff", - "headers": "07iv5fh0yxv17c1akb2j4ab5xhv29d9zsgi6dm2r0n4pnf72wxwr", - "x86_64-darwin": "bd8a220fd906625ad4a8edf92e80e8eff89d51f40c22168e05090daa7c12bd66", - "x86_64-linux": "e3be93e1a15d61f72e074aee021e12f20465b81f51b8c1170bd9072d7d695c3a" + "aarch64-darwin": "c310ab098d8849c4aa05f05b1c8521031241a046e023a911f964fd1db31c64c9", + "aarch64-linux": "f77107266581a6b9880757876518df1c4bf6eeff5c193bb5de0a8f6c9902bd1f", + "armv7l-linux": "384d8b43f52b5350a438031ad12980418fc244b4b0aecfa5f7dcc3d6f103ebed", + "headers": "1d407g6yb81l9p0pbsidrsmnzkrwb4f2qb221kc9k2r7qdpf64px", + "x86_64-darwin": "6bc63916b7fe52de7559e7631fef5c93315a18ee90a0d3d08168c91414b09ecf", + "x86_64-linux": "20f6be493cbd6c9924206e744b1c490af1f97f4735451b9dc19f0d305366d546" }, - "version": "28.3.1" + "version": "28.3.3" }, "29": { "hashes": { - "aarch64-darwin": "c16d05f1231bb3c77da05ab236b454b3a2b6a642403be51e7c9b16cd2c421a19", - "aarch64-linux": "c3764d6c3799950e3418e8e5a5a5b2c41abe421dd8bcdebf054c7c85798d9860", - "armv7l-linux": "c5e92943ad78b4e41a32ae53c679e148ea2ae09f95f914b1834dbdbae578ba91", - "headers": "0macff2ir515szp2nd6jimnpg9ig87whhfi08h2hwaxp4xn9j5hn", - "x86_64-darwin": "8ed7924f77a5c43c137a57097c5c47c2e8e9a78197e18af11a767c98035c123e", - "x86_64-linux": "91e5eb374c2c85a07c2d4e99a89eb18515ff0169a49c3fa75289800e1225729e" + "aarch64-darwin": "e9934a8eaecaab05dcc572b47576cdba78491c144c19348c9c9e9524c8c5917b", + "aarch64-linux": "a5c2bc148d3f6c3ee2bd15289243a1b75093afde3753d0aa1125d2cb621f5b59", + "armv7l-linux": "a75e2487ea1a1b292fbc160618167c204f161c602780f2b997b75d6ef5bbe539", + "headers": "0z4n8c95z48n54d1fph2p2i6cb43gk202zg09vmv168ajpspi2rr", + "x86_64-darwin": "b875c884efe86eb2e1922781f55193d82520e923510f19af87a58dfe07d21562", + "x86_64-linux": "eb07a8137fde970450242c51e0c2f8ef6556f377a21c357584aa2632ee9e1d3f" }, - "version": "29.4.0" + "version": "29.4.2" }, "30": { "hashes": { - "aarch64-darwin": "9189d4a8d69175d94edafa4cb29a47389ebaff22c9baf0dd67a448e7a5240129", - "aarch64-linux": "37b520604e319f86f372cc1da8244b27d24708a4bdc1cc07a6f1d793f37e96c3", - "armv7l-linux": "6202a7ccde4ca344c01c124bd997bcfad06d475dd2e35bba70379cf2d93b5268", - "headers": "15nzay60m1v720243n3iizbcldn6ka9vcphh050pih8rnh74ds5p", - "x86_64-darwin": "7d9e81712a4b0ab209d03d0eef08ee9c4da1f5293fb169ff08766356a2e65fbb", - "x86_64-linux": "5a2bfd0f6a8703dd1b408675c9349732c4713b378d9ae0f64ea4661f6b5c7fd4" + "aarch64-darwin": "7497d7926a094d6e1bf34f70ef206c4f2d9df072b1f9fa8cd431f6ea4fab680c", + "aarch64-linux": "bdb3485cd87861bb1d99f6b417f979ac899974a4322191a648efc311af9f8c5c", + "armv7l-linux": "3941ab1f23576d8f55fdf525e40387f97c2c9809173a8a933402b62ec95a592f", + "headers": "1jz8grs7sjncg68s34hf7rhd830414avxs1xg5lng5n7wmwfiw8i", + "x86_64-darwin": "bdadef26dac934416b17fa2af6bcd55424eb8b1ceb5f6fae068dbd5fd8b0d357", + "x86_64-linux": "4d00e8cd5f37962dc8fbefe2941d89dcb1c180f1568bb32122c7eb40d21f39c4" }, - "version": "30.0.6" + "version": "30.1.1" } } diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 5f161f07c7e2e..26349f02fa60c 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -47,10 +47,10 @@ }, "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-YTuHUvqbVVq3gwfDFOzlRIlmfnm74u3soHem1jCVVaA=", + "hash": "sha256-hyk8RsG2hIsAZRiJuYRF6HC+K7TyA76qiYsc2sH0Apw=", "owner": "electron", "repo": "electron", - "rev": "v29.4.0" + "rev": "v29.4.2" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", @@ -902,10 +902,10 @@ "electron_yarn_hash": "0f868gk3d2cablpczav8a4vhk4nfirph45yzjz18mgzgday7w8hf", "modules": "121", "node": "20.9.0", - "version": "29.4.0" + "version": "29.4.2" }, "30": { - "chrome": "124.0.6367.207", + "chrome": "124.0.6367.243", "chromium": { "deps": { "gn": { @@ -915,15 +915,15 @@ "version": "2024-03-14" } }, - "version": "124.0.6367.207" + "version": "124.0.6367.243" }, "chromium_npm_hash": "sha256-oILlQlzTcc0YqAvK5htRvG/YXWJTDtJ60Z1EcBEj9dw=", "deps": { "src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-mMc1mWre9XeeR4jPn30RxAXadjyqcyVyHDjSVrI5lpI=", + "hash": "sha256-YrAJnuNig6v87+eNnZ2W+PCzxjGe5CuymF6ul/v9SCk=", "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", - "rev": "124.0.6367.207", + "rev": "124.0.6367.243", "url": "https://chromium.googlesource.com/chromium/src.git" }, "src/chrome/test/data/perf/canvas_bench": { @@ -952,10 +952,10 @@ }, "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-6f/6Deqysv8MubMjyxjiDM55DXG/9wTqBWW+zC+9OBE=", + "hash": "sha256-VWc9I5wpQYv13I1xgLQVqDg6IfXMinrzJmkMaIsEY90=", "owner": "electron", "repo": "electron", - "rev": "v30.0.6" + "rev": "v30.1.1" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", @@ -977,8 +977,8 @@ }, "src/third_party/angle": { "fetcher": "fetchFromGitiles", - "hash": "sha256-zEDHotJ6OSQlgq3nkVMhLll4j5iYl5sA1JFv854EIdM=", - "rev": "c67f290ef0f0433acb766c024d28c6f59f48b909", + "hash": "sha256-MFXZ7gEO8vHFHtjzzLSgGlB9AKx+hndPfmwsE5XHGXo=", + "rev": "bda89e1f7c7195a9d03d037039c2dd5057563a59", "url": "https://chromium.googlesource.com/angle/angle.git" }, "src/third_party/angle/third_party/VK-GL-CTS/src": { @@ -1115,14 +1115,14 @@ }, "src/third_party/dawn": { "fetcher": "fetchFromGitiles", - "hash": "sha256-GUB25IUviLFxGI3UQJS/kf51BZBeoYFqbiaSTSY11qA=", - "rev": "394edde38c9323f7c910e3bdec9b7efc4ee39379", + "hash": "sha256-W0E0fhjAc5gdTgIsy+iOAFA7GPEFeMPPJEU5nnRUtbM=", + "rev": "e04b03f714994b7a747b5472da4ffae9e6e38938", "url": "https://dawn.googlesource.com/dawn.git" }, "src/third_party/dawn/third_party/dxc": { "fetcher": "fetchFromGitiles", - "hash": "sha256-wsQtYqH8gFsDmLTUA7SKvTYiGQWX7Vbcz1QtsAg/epY=", - "rev": "bd7aa97798735e1288d36de41dcda75e867550e4", + "hash": "sha256-bqzkbBbf1btIz84odYfC3c69m6kgssHy2+a9aR+EUaQ=", + "rev": "511cfef8e0509d172fbfa156be8a97ed2b42590b", "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler" }, "src/third_party/dawn/third_party/dxheaders": { @@ -1181,10 +1181,10 @@ }, "src/third_party/electron_node": { "fetcher": "fetchFromGitHub", - "hash": "sha256-9/TPxYbnQPDpWf/Zti8bTh22e/uFRlzs7SCThfx/byQ=", + "hash": "sha256-15RUrS+zjp0nOveBnZB3bvEv36noZr2ergtNL7ky8iQ=", "owner": "nodejs", "repo": "node", - "rev": "v20.11.1" + "rev": "v20.14.0" }, "src/third_party/emoji-segmenter/src": { "fetcher": "fetchFromGitiles", @@ -1502,8 +1502,8 @@ }, "src/third_party/openscreen/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-wUKhF9sU1HAZvs4fQHxeFfxkpkhBp6nTljJrQ4lH7lA=", - "rev": "a3f9719bed95289c59771d4c4bcb85f5ecacac43", + "hash": "sha256-4Qd5nHJxIOY7ifPy6Xf0TgZK0TkZY48scOkJ25kMCjk=", + "rev": "90e48ecc4ed9feeba36f49065c738d620d6f0780", "url": "https://chromium.googlesource.com/openscreen" }, "src/third_party/openscreen/src/buildtools": { @@ -1526,8 +1526,8 @@ }, "src/third_party/pdfium": { "fetcher": "fetchFromGitiles", - "hash": "sha256-4CPHeZAJM756a2TIxs4ZX0D7j85deDIf/bTGow75m/U=", - "rev": "7b90b15a21cfdd3d74525616b5de04df94fa0583", + "hash": "sha256-/gSW4sd2AN4m3aIs9AojqsfrXeCNNrl7wFM54KeQVxw=", + "rev": "dcdd830ae4e1b14f85383d1baf84efee6bc853cc", "url": "https://pdfium.googlesource.com/pdfium.git" }, "src/third_party/perfetto": { @@ -1586,8 +1586,8 @@ }, "src/third_party/skia": { "fetcher": "fetchFromGitiles", - "hash": "sha256-8C8IMQjfJGeCXCXZyd/eSbDNsdcKI/Bul0m1wrqx1P8=", - "rev": "e2ea2eb3e0d37fff47968dfaaa337debb3b75b1e", + "hash": "sha256-zHfv4OZK/nVJc2rl+dBSCc4f6qndpAKcFZtThw06+LY=", + "rev": "a747f7ea37db6ea3871816dbaf2eb41b5776c826", "url": "https://skia.googlesource.com/skia.git" }, "src/third_party/smhasher/src": { @@ -1811,14 +1811,14 @@ }, "src/v8": { "fetcher": "fetchFromGitiles", - "hash": "sha256-8/XD/LwnCXDiVWeZvZsgvmSWpfVLILlaTtqw87V0Pgk=", - "rev": "ac8da461a20281ff8c30507cbdd7e6fed39fd183", + "hash": "sha256-ME/O8CJASZ8Ql931EaTRM3+6lLzGx1us/cK9Dv7Bd+s=", + "rev": "cc9dc1eb196bc3cbeca92eeec62949b4ac7cd757", "url": "https://chromium.googlesource.com/v8/v8.git" } }, - "electron_yarn_hash": "0f868gk3d2cablpczav8a4vhk4nfirph45yzjz18mgzgday7w8hf", + "electron_yarn_hash": "0w41mjfnrhmkf2qy4lk5zwhc7afkaiqypxs4379s4ay1r6zpvf6q", "modules": "123", - "node": "20.11.1", - "version": "30.0.6" + "node": "20.14.0", + "version": "30.1.1" } } diff --git a/pkgs/development/tools/espup/default.nix b/pkgs/development/tools/espup/default.nix index a64d982bdc2ca..f3624575f8f9a 100644 --- a/pkgs/development/tools/espup/default.nix +++ b/pkgs/development/tools/espup/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "espup"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "esp-rs"; repo = "espup"; rev = "v${version}"; - hash = "sha256-BW71yFX4jfx90KHdynkGSqWD4diyjEBQfdBNquVdDDI="; + hash = "sha256-ofC9pBKZEKGNNirshhfcCkzWN4CvD7IfArZaikkfnmI="; }; - cargoHash = "sha256-iUVOU1P996hLC1rR/wWtsDBkKSB0rD7PPh6ZsQkHq3I="; + cargoHash = "sha256-fM1If/RnPzLDYjUImNkMViWkjXBc5YRIJHthypcJfmc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/firebase-tools/default.nix b/pkgs/development/tools/firebase-tools/default.nix index e0ba4242aeda9..ed1a09e2916a9 100644 --- a/pkgs/development/tools/firebase-tools/default.nix +++ b/pkgs/development/tools/firebase-tools/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "firebase-tools"; - version = "13.11.0"; + version = "13.11.2"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; rev = "v${version}"; - hash = "sha256-q1ud4Aowbgpl8CHLWB055nvvMTAdY/USmeRKgOIa8WU="; + hash = "sha256-UkRkl9p8ABIr5kCtOW8nN6wpTOj56jdapQdenywd1to="; }; - npmDepsHash = "sha256-WTMC8yv2KeJKcttVXk4tAXghyzkfSO7/Y3ALEKlO/Bk="; + npmDepsHash = "sha256-NnO7g5TBnaFfv6s+95qjkVA0iSVFv1EQnVn1OgxeEeU="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json diff --git a/pkgs/development/tools/fsautocomplete/default.nix b/pkgs/development/tools/fsautocomplete/default.nix index 27bc02ad9bdf8..b4b381c369d86 100644 --- a/pkgs/development/tools/fsautocomplete/default.nix +++ b/pkgs/development/tools/fsautocomplete/default.nix @@ -2,13 +2,13 @@ buildDotnetModule rec { pname = "fsautocomplete"; - version = "0.73.1"; + version = "0.73.2"; src = fetchFromGitHub { owner = "fsharp"; repo = "FsAutoComplete"; rev = "v${version}"; - hash = "sha256-esvnbmifLFwzNUHTTwl6yEYPwFgWgKfaZGMQDJ+puus="; + hash = "sha256-iiV/Tw3gOteARrOEbLjPA/jGawoxJVBZg6GvF9p9HHA="; }; nugetDeps = ./deps.nix; diff --git a/pkgs/development/tools/fsautocomplete/deps.nix b/pkgs/development/tools/fsautocomplete/deps.nix index 68e3c8061084c..8dea1747aa97e 100644 --- a/pkgs/development/tools/fsautocomplete/deps.nix +++ b/pkgs/development/tools/fsautocomplete/deps.nix @@ -45,7 +45,7 @@ (fetchNuGet { pname = "ICSharpCode.Decompiler"; version = "7.2.1.6856"; sha256 = "19z68rgzl93lh1h8anbgzw119mhvcgr9nh5q2nxk6qihl2mx97ba"; }) (fetchNuGet { pname = "Ionide.Analyzers"; version = "0.11.0"; sha256 = "1wsx7gbr4macmim5z1iz9clgq9xfmg423snb589bvaiyg5k6ha00"; }) (fetchNuGet { pname = "Ionide.KeepAChangelog.Tasks"; version = "0.1.8"; sha256 = "066zla2rp1sal6by3h3sg6ibpkk52kbhn30bzk58l6ym7q1kqa6b"; }) - (fetchNuGet { pname = "Ionide.LanguageServerProtocol"; version = "0.4.23"; sha256 = "0jfsan2d7aj68xksn1xrdiww1fdz34n7k91r5y4a77jx6h4ngbxq"; }) + (fetchNuGet { pname = "Ionide.LanguageServerProtocol"; version = "0.6.0"; sha256 = "15wjmm91qdvhdpjjggqqsqgwlsi0wwsdzqarvdx9l1h2681hq9g0"; }) (fetchNuGet { pname = "Ionide.ProjInfo"; version = "0.65.0"; sha256 = "0aka78yaj7h3apbr9ia7rdikr2hhyizl1xakks90h47nax00kscz"; }) (fetchNuGet { pname = "Ionide.ProjInfo.FCS"; version = "0.65.0"; sha256 = "0kjrn6r6nwd5m5wlb8jpyzaicjcw64dg7w7vqndrwv7nw0wd4di0"; }) (fetchNuGet { pname = "Ionide.ProjInfo.ProjectSystem"; version = "0.65.0"; sha256 = "15080y3f0zqvdzi6ks9v6jhih5xsrgi08ji5zym88qvmp81g1m8q"; }) diff --git a/pkgs/development/tools/glock/default.nix b/pkgs/development/tools/glock/default.nix deleted file mode 100644 index bef0dbb6cab8e..0000000000000 --- a/pkgs/development/tools/glock/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "glock"; - version = "20160816-${lib.strings.substring 0 7 rev}"; - rev = "b8c84ff5ade15a6238ca61c20d3afc70d2e41276"; - - goPackagePath = "github.com/robfig/glock"; - - src = fetchFromGitHub { - inherit rev; - owner = "robfig"; - repo = "glock"; - sha256 = "10jwn3k71p340g8d43zjx7k1j534rcd7rss8pif09mpfrn9qndhh"; - }; - - goDeps = ./deps.nix; - - meta = with lib; { - homepage = "https://github.com/robfig/glock"; - description = "Command-line tool to lock Go dependencies to specific revisions"; - mainProgram = "glock"; - license = licenses.mit; - maintainers = [ maintainers.rushmorem ]; - }; -} diff --git a/pkgs/development/tools/glock/deps.nix b/pkgs/development/tools/glock/deps.nix deleted file mode 100644 index b7392d757cfc7..0000000000000 --- a/pkgs/development/tools/glock/deps.nix +++ /dev/null @@ -1,21 +0,0 @@ -# This file was generated by go2nix. -[ - { - goPackagePath = "github.com/agtorre/gocolorize"; - fetch = { - type = "git"; - url = "https://github.com/agtorre/gocolorize"; - rev = "f42b554bf7f006936130c9bb4f971afd2d87f671"; - sha256 = "1dj7s8bgw9qky344d0k9gz661c0m317a08a590184drw7m51hy9p"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "f1a397bba50dee815e8c73f3ec94ffc0e8df1a09"; - sha256 = "1wy8nn2vg70n98g80i1zrk49129phyfbzxbicj748bmf82rnaxzg"; - }; - } -] diff --git a/pkgs/development/tools/go-containerregistry/default.nix b/pkgs/development/tools/go-containerregistry/default.nix index ed1db7612411a..9b50f9c67e745 100644 --- a/pkgs/development/tools/go-containerregistry/default.nix +++ b/pkgs/development/tools/go-containerregistry/default.nix @@ -4,13 +4,13 @@ let bins = [ "crane" "gcrane" ]; in buildGoModule rec { pname = "go-containerregistry"; - version = "0.19.1"; + version = "0.19.2"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mHuxwIyPNUWuP4QmMyLMdRlpwSueyKkk9VezJ4Sv2Nw="; + sha256 = "sha256-YxUw30gjpBO/dXSTcNa4F91u3F9pg/IQuVWjKDV5mLs="; }; vendorHash = null; diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index d0affbabdbc72..ef4a608fcbc41 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -2,25 +2,23 @@ buildGoModule rec { pname = "gotools"; - version = "0.18.0"; + version = "0.22.0"; # using GitHub instead of https://go.googlesource.com/tools because Gitiles UI is to basic to browse src = fetchFromGitHub { owner = "golang"; repo = "tools"; rev = "v${version}"; - hash = "sha256-sOT98DdLYtPXovpcX020BbLSH99ByJSaVQeM10IcKG4="; + hash = "sha256-qqzvbHFbm6RlqztBnuj7HvMa9Wff1+YUA0fxiM0cx8o="; }; postPatch = '' # The gopls folder contains a Go submodule which causes a build failure # and lives in its own package named gopls. rm -r gopls - # getgo is an experimental go installer which adds generic named server and client binaries to $out/bin - rm -r cmd/getgo ''; - vendorHash = "sha256-gGAEl3yabXy1qbuBJyrpD+TRrKr56cZEOiSaBoBsYc8="; + vendorHash = "sha256-eQ/T/Zxmzn6KF0ewjvt9TDd48RSsSbQ3LgVcKgdeVbU="; doCheck = false; diff --git a/pkgs/development/tools/hclfmt/default.nix b/pkgs/development/tools/hclfmt/default.nix index 3fd10b5e082a6..730d44272b325 100644 --- a/pkgs/development/tools/hclfmt/default.nix +++ b/pkgs/development/tools/hclfmt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hclfmt"; - version = "2.20.1"; + version = "2.21.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "hcl"; rev = "v${version}"; - hash = "sha256-+4K6k32azx/66eag9c6lUN8TUJ1ICx4Q8zpnTJWqgQ0="; + hash = "sha256-izbctn5OqaDunQLovgCGTgqMzC9i227zXlXUNCEExvA="; }; - vendorHash = "sha256-L5OabeDUXbrwFOgWRhi9FPTWK+xbL54ZM7cYhS15Jis="; + vendorHash = "sha256-F2i7ph9GL9Xo43da6jHPn9P9FdWC6eSgqCyHPBxdFJY="; # The code repository includes other tools which are not useful. Only build # hclfmt. diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix index a21d26def2c30..e76caa4c58d8b 100644 --- a/pkgs/development/tools/jbang/default.nix +++ b/pkgs/development/tools/jbang/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cp -r . $out wrapProgram $out/bin/jbang \ --set JAVA_HOME ${jdk} \ - --set PATH ${lib.makeBinPath [ coreutils jdk curl ]} + --set PATH ${lib.makeBinPath [ (placeholder "out") coreutils jdk curl ]} runHook postInstall ''; diff --git a/pkgs/development/tools/language-servers/neocmakelsp/default.nix b/pkgs/development/tools/language-servers/neocmakelsp/default.nix index 53e17e4da8200..6797c2d432502 100644 --- a/pkgs/development/tools/language-servers/neocmakelsp/default.nix +++ b/pkgs/development/tools/language-servers/neocmakelsp/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "neocmakelsp"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "neocmakelsp"; rev = "v${version}"; - hash = "sha256-rMonXAggCsMWvyNmGu+crtw0a4zfhKJOR5GnIULWe1g="; + hash = "sha256-oYvjMpZcXIpOA/osVCOy2NxkFnEQePGf4le22M1bFPA="; }; - cargoHash = "sha256-09mpr7ncqK9c5AMhRSAe/K9pE3vXC3bxEXX3hIx3E7c="; + cargoHash = "sha256-kcqq4xnCxGIGCFlmm4EDc9ZfQHBi6k/xrhIyZ+eKs34="; meta = with lib; { description = "Cmake lsp based on tower-lsp and treesitter"; diff --git a/pkgs/development/tools/lv_img_conv/default.nix b/pkgs/development/tools/lv_img_conv/default.nix deleted file mode 100644 index e00b960c46b92..0000000000000 --- a/pkgs/development/tools/lv_img_conv/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib -, stdenv -, buildNpmPackage -, fetchFromGitHub -, pkg-config -, python3 -, pixman -, libpng -, libjpeg -, librsvg -, giflib -, cairo -, pango -, nodePackages -, makeWrapper -, CoreText -, nix-update-script -}: - -buildNpmPackage rec { - pname = "lv_img_conv"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "lvgl"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-LB7NZKwrpvps1cKzRoARHL4S48gBHadvxwA6JMmm/ME="; - }; - - npmDepsHash = "sha256-uDF22wlL3BlMQ/+Wmtgyjp4CVN6sDnjqjEPB4SeQuPk="; - - nativeBuildInputs = [ - pkg-config - python3 - makeWrapper - ]; - - buildInputs = [ - pixman - libpng - libjpeg - librsvg - giflib - cairo - pango - ] ++ lib.optionals stdenv.isDarwin [ - CoreText - ]; - - postInstall = '' - makeWrapper ${nodePackages.ts-node}/bin/ts-node $out/bin/lv_img_conv --add-flags $out/lib/node_modules/lv_img_conv/lib/cli.ts - ''; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - changelog = "https://github.com/lvgl/lv_img_conv/releases/tag/v${version}"; - description = "Image converter for LVGL"; - homepage = "https://github.com/lvgl/lv_img_conv"; - license = licenses.mit; - maintainers = with maintainers; [ stargate01 ]; - }; -} diff --git a/pkgs/development/tools/maizzle/default.nix b/pkgs/development/tools/maizzle/default.nix index f04536f763095..a33a845e7cd3a 100644 --- a/pkgs/development/tools/maizzle/default.nix +++ b/pkgs/development/tools/maizzle/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "maizzle"; - version = "1.5.8"; + version = "1.5.9"; src = fetchFromGitHub { owner = "maizzle"; repo = "cli"; rev = "v${version}"; - hash = "sha256-cSAYicgCgFpJO+2vBAqfl3od7B07DTXvkW38x6y5VgM="; + hash = "sha256-r3HWqfm/BdOfENi5cGdau7ockvNLxnWufWcQepI/RFM="; }; - npmDepsHash = "sha256-K9EQxqOjFzgTw/VXG2ZGF90yUzYTNl13Ssq9oiC+F7A="; + npmDepsHash = "sha256-WlqWOGwmSab+cJWPUFIBWuFwMK4lFQm80PoUfEIIIH8="; dontNpmBuild = true; diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix deleted file mode 100644 index 014d926eea3d7..0000000000000 --- a/pkgs/development/tools/misc/babeltrace/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, glib, libuuid, popt, elfutils }: - -stdenv.mkDerivation rec { - pname = "babeltrace"; - version = "1.5.8"; - - src = fetchurl { - url = "https://www.efficios.com/files/babeltrace/${pname}-${version}.tar.bz2"; - sha256 = "1hkg3phnamxfrhwzmiiirbhdgckzfkqwhajl0lmr1wfps7j47wcz"; - }; - - # The pre-generated ./configure script uses an old autoconf version which - # breaks cross-compilation (replaces references to malloc with rpl_malloc). - # Re-generate with nixpkgs's autoconf. This requires glib to be present in - # nativeBuildInputs for its m4 macros to be present. - nativeBuildInputs = [ autoreconfHook glib pkg-config ]; - buildInputs = [ glib libuuid popt elfutils ]; - - # --enable-debug-info (default) requires the configure script to run host - # executables to determine the elfutils library version, which cannot be done - # while cross compiling. - configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-debug-info"; - - meta = with lib; { - description = "Command-line tool and library to read and convert LTTng tracefiles"; - homepage = "https://www.efficios.com/babeltrace"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; - }; - -} diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index 568af01cf4abd..a66f6288d1781 100644 --- a/pkgs/development/tools/misc/blackfire/default.nix +++ b/pkgs/development/tools/misc/blackfire/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.28.3"; + version = "2.28.4"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}"); @@ -57,23 +57,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "nku9F29PjoPZL/PppK6HuC5Mk7TEWv4iAUVgoiYmaG8="; + sha256 = "k6CCNafcw6oRD5Dj0AYkidVdOdOOcwT8GBiEcwviByc="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "xZfjCn0HXqw0fBrZEKc4X2m8aTEiXOFjSEpSdFq9Wvc="; + sha256 = "zFnzbkPkTRUU6zn4zOlN9AyE3G2Y2Gp9l3MZRsmbdJc="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "05aI2Ao0++bTiwt6TygY/yvLkmByH604t8EX8T2bGZs="; + sha256 = "KxpSVTUyhbRHzlLH65XH2bXWS+OZExu0lpiLJ8comZA="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "ICG0SGBzpSQoug+5kl7kQ05Q0+0BAKdhRdUUwxgPEb4="; + sha256 = "sVM7LLVbvbLBArjuZq/qclXclEzqbY47CmgUCNXuZw0="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "qbhFK8Oe7565sOQMGE68TlyYN1B56kk2ibiBiDWw7VE="; + sha256 = "mOxYOmDQiEZdAPVKaM/rO37/YLlRXHil83/DKhRqim8="; }; }; diff --git a/pkgs/development/tools/misc/swig/2.x.nix b/pkgs/development/tools/misc/swig/2.x.nix index ac03372d97610..fd8e2a368417f 100644 --- a/pkgs/development/tools/misc/swig/2.x.nix +++ b/pkgs/development/tools/misc/swig/2.x.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0khm9gh5pczfcihr0pbicaicc4v9kjm5ip2alvkhmbb3ga6njkcm"; }; + # pcre-config isn't on PATH when cross-building + PCRE_CONFIG = "${pcre.dev}/bin/pcre-config"; nativeBuildInputs = [ autoconf automake libtool bison ]; buildInputs = [ pcre ]; diff --git a/pkgs/development/tools/misc/typical/default.nix b/pkgs/development/tools/misc/typical/default.nix index 8c094a2e1f18f..b2526370aadaa 100644 --- a/pkgs/development/tools/misc/typical/default.nix +++ b/pkgs/development/tools/misc/typical/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "typical"; - version = "0.9.7"; + version = "0.10.0"; src = fetchFromGitHub { owner = "stepchowfun"; repo = "typical"; rev = "v${version}"; - hash = "sha256-UoTzgYxLdlWefNLeege7+tlqWh4uzotO5EbcyqvU2Xo="; + hash = "sha256-Ngeam9sdSov25mHR8TNrxaoqf2tRc+zMUkt00u8DSiQ="; }; - cargoHash = "sha256-GIyvwByzNKFvEdVSLo2cxuQ7JvKRFezhyKQrWjbj7Kk="; + cargoHash = "sha256-v+1M+rgYgfA1yJIHcEGhdxyiZRNffZc27rSlGLDHjVA="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/mongosh/package-lock.json b/pkgs/development/tools/mongosh/package-lock.json index 37d494d0c53ee..b87274ea83301 100644 --- a/pkgs/development/tools/mongosh/package-lock.json +++ b/pkgs/development/tools/mongosh/package-lock.json @@ -1,15 +1,15 @@ { "name": "mongosh", - "version": "2.2.6", + "version": "2.2.9", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mongosh", - "version": "2.2.6", + "version": "2.2.9", "license": "Apache-2.0", "dependencies": { - "@mongosh/cli-repl": "2.2.6" + "@mongosh/cli-repl": "2.2.9" }, "bin": { "mongosh": "bin/mongosh.js" @@ -30,126 +30,165 @@ "node": ">=6.0.0" } }, - "node_modules/@aws-crypto/ie11-detection": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@aws-crypto/ie11-detection/-/ie11-detection-3.0.0.tgz", - "integrity": "sha512-341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q==", + "node_modules/@aws-crypto/sha256-browser": { + "version": "5.2.0", + "resolved": "https://registry.npmmirror.com/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz", + "integrity": "sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==", "dependencies": { - "tslib": "^1.11.1" + "@aws-crypto/sha256-js": "^5.2.0", + "@aws-crypto/supports-web-crypto": "^5.2.0", + "@aws-crypto/util": "^5.2.0", + "@aws-sdk/types": "^3.222.0", + "@aws-sdk/util-locate-window": "^3.0.0", + "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.6.2" } }, - "node_modules/@aws-crypto/ie11-detection/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmmirror.com/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/is-array-buffer": { + "version": "2.2.0", + "resolved": "https://registry.npmmirror.com/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz", + "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } }, - "node_modules/@aws-crypto/sha256-browser": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@aws-crypto/sha256-browser/-/sha256-browser-3.0.0.tgz", - "integrity": "sha512-8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ==", + "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-buffer-from": { + "version": "2.2.0", + "resolved": "https://registry.npmmirror.com/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz", + "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==", "dependencies": { - "@aws-crypto/ie11-detection": "^3.0.0", - "@aws-crypto/sha256-js": "^3.0.0", - "@aws-crypto/supports-web-crypto": "^3.0.0", - "@aws-crypto/util": "^3.0.0", - "@aws-sdk/types": "^3.222.0", - "@aws-sdk/util-locate-window": "^3.0.0", - "@aws-sdk/util-utf8-browser": "^3.0.0", - "tslib": "^1.11.1" + "@smithy/is-array-buffer": "^2.2.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" } }, - "node_modules/@aws-crypto/sha256-browser/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmmirror.com/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-utf8": { + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/@smithy/util-utf8/-/util-utf8-2.3.0.tgz", + "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==", + "dependencies": { + "@smithy/util-buffer-from": "^2.2.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } }, "node_modules/@aws-crypto/sha256-js": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@aws-crypto/sha256-js/-/sha256-js-3.0.0.tgz", - "integrity": "sha512-PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ==", + "version": "5.2.0", + "resolved": "https://registry.npmmirror.com/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz", + "integrity": "sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==", "dependencies": { - "@aws-crypto/util": "^3.0.0", + "@aws-crypto/util": "^5.2.0", "@aws-sdk/types": "^3.222.0", - "tslib": "^1.11.1" + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" } }, - "node_modules/@aws-crypto/sha256-js/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmmirror.com/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, "node_modules/@aws-crypto/supports-web-crypto": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@aws-crypto/supports-web-crypto/-/supports-web-crypto-3.0.0.tgz", - "integrity": "sha512-06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg==", + "version": "5.2.0", + "resolved": "https://registry.npmmirror.com/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz", + "integrity": "sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==", "dependencies": { - "tslib": "^1.11.1" + "tslib": "^2.6.2" } }, - "node_modules/@aws-crypto/supports-web-crypto/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmmirror.com/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, "node_modules/@aws-crypto/util": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@aws-crypto/util/-/util-3.0.0.tgz", - "integrity": "sha512-2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w==", + "version": "5.2.0", + "resolved": "https://registry.npmmirror.com/@aws-crypto/util/-/util-5.2.0.tgz", + "integrity": "sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==", "dependencies": { "@aws-sdk/types": "^3.222.0", - "@aws-sdk/util-utf8-browser": "^3.0.0", - "tslib": "^1.11.1" + "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.6.2" + } + }, + "node_modules/@aws-crypto/util/node_modules/@smithy/is-array-buffer": { + "version": "2.2.0", + "resolved": "https://registry.npmmirror.com/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz", + "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@aws-crypto/util/node_modules/@smithy/util-buffer-from": { + "version": "2.2.0", + "resolved": "https://registry.npmmirror.com/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz", + "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==", + "dependencies": { + "@smithy/is-array-buffer": "^2.2.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" } }, - "node_modules/@aws-crypto/util/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmmirror.com/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + "node_modules/@aws-crypto/util/node_modules/@smithy/util-utf8": { + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/@smithy/util-utf8/-/util-utf8-2.3.0.tgz", + "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==", + "dependencies": { + "@smithy/util-buffer-from": "^2.2.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=14.0.0" + } }, "node_modules/@aws-sdk/client-cognito-identity": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.577.0.tgz", - "integrity": "sha512-y1fHORHoufrzj2GcnY52g4ykemFpT0Hu9e9kYa6yR0weQ0WalcG7WcnMNasXMcjr9fDjNze7ZCTuWJSI+HwkTQ==", - "dependencies": { - "@aws-crypto/sha256-browser": "3.0.0", - "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sso-oidc": "3.577.0", - "@aws-sdk/client-sts": "3.577.0", - "@aws-sdk/core": "3.576.0", - "@aws-sdk/credential-provider-node": "3.577.0", - "@aws-sdk/middleware-host-header": "3.577.0", - "@aws-sdk/middleware-logger": "3.577.0", - "@aws-sdk/middleware-recursion-detection": "3.577.0", - "@aws-sdk/middleware-user-agent": "3.577.0", - "@aws-sdk/region-config-resolver": "3.577.0", - "@aws-sdk/types": "3.577.0", - "@aws-sdk/util-endpoints": "3.577.0", - "@aws-sdk/util-user-agent-browser": "3.577.0", - "@aws-sdk/util-user-agent-node": "3.577.0", - "@smithy/config-resolver": "^3.0.0", - "@smithy/core": "^2.0.0", - "@smithy/fetch-http-handler": "^3.0.0", - "@smithy/hash-node": "^3.0.0", - "@smithy/invalid-dependency": "^3.0.0", - "@smithy/middleware-content-length": "^3.0.0", - "@smithy/middleware-endpoint": "^3.0.0", - "@smithy/middleware-retry": "^3.0.0", - "@smithy/middleware-serde": "^3.0.0", - "@smithy/middleware-stack": "^3.0.0", - "@smithy/node-config-provider": "^3.0.0", - "@smithy/node-http-handler": "^3.0.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/smithy-client": "^3.0.0", - "@smithy/types": "^3.0.0", - "@smithy/url-parser": "^3.0.0", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.598.0.tgz", + "integrity": "sha512-N/1lnkhkzk1Il8WEZBWR713/7sDEqBtl/1AS6dfgw6Zh7NWUYSwBkZx6xdN8KogDu4CFExRHhilNOgI1JMug3w==", + "dependencies": { + "@aws-crypto/sha256-browser": "5.2.0", + "@aws-crypto/sha256-js": "5.2.0", + "@aws-sdk/client-sso-oidc": "3.598.0", + "@aws-sdk/client-sts": "3.598.0", + "@aws-sdk/core": "3.598.0", + "@aws-sdk/credential-provider-node": "3.598.0", + "@aws-sdk/middleware-host-header": "3.598.0", + "@aws-sdk/middleware-logger": "3.598.0", + "@aws-sdk/middleware-recursion-detection": "3.598.0", + "@aws-sdk/middleware-user-agent": "3.598.0", + "@aws-sdk/region-config-resolver": "3.598.0", + "@aws-sdk/types": "3.598.0", + "@aws-sdk/util-endpoints": "3.598.0", + "@aws-sdk/util-user-agent-browser": "3.598.0", + "@aws-sdk/util-user-agent-node": "3.598.0", + "@smithy/config-resolver": "^3.0.2", + "@smithy/core": "^2.2.1", + "@smithy/fetch-http-handler": "^3.0.2", + "@smithy/hash-node": "^3.0.1", + "@smithy/invalid-dependency": "^3.0.1", + "@smithy/middleware-content-length": "^3.0.1", + "@smithy/middleware-endpoint": "^3.0.2", + "@smithy/middleware-retry": "^3.0.4", + "@smithy/middleware-serde": "^3.0.1", + "@smithy/middleware-stack": "^3.0.1", + "@smithy/node-config-provider": "^3.1.1", + "@smithy/node-http-handler": "^3.0.1", + "@smithy/protocol-http": "^4.0.1", + "@smithy/smithy-client": "^3.1.2", + "@smithy/types": "^3.1.0", + "@smithy/url-parser": "^3.0.1", "@smithy/util-base64": "^3.0.0", "@smithy/util-body-length-browser": "^3.0.0", "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.0", - "@smithy/util-defaults-mode-node": "^3.0.0", - "@smithy/util-endpoints": "^2.0.0", - "@smithy/util-middleware": "^3.0.0", - "@smithy/util-retry": "^3.0.0", + "@smithy/util-defaults-mode-browser": "^3.0.4", + "@smithy/util-defaults-mode-node": "^3.0.4", + "@smithy/util-endpoints": "^2.0.2", + "@smithy/util-middleware": "^3.0.1", + "@smithy/util-retry": "^3.0.1", "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, @@ -158,46 +197,46 @@ } }, "node_modules/@aws-sdk/client-sso": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso/-/client-sso-3.577.0.tgz", - "integrity": "sha512-BwujdXrydlk6UEyPmewm5GqG4nkQ6OVyRhS/SyZP/6UKSFv2/sf391Cmz0hN0itUTH1rR4XeLln8XCOtarkrzg==", - "dependencies": { - "@aws-crypto/sha256-browser": "3.0.0", - "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/core": "3.576.0", - "@aws-sdk/middleware-host-header": "3.577.0", - "@aws-sdk/middleware-logger": "3.577.0", - "@aws-sdk/middleware-recursion-detection": "3.577.0", - "@aws-sdk/middleware-user-agent": "3.577.0", - "@aws-sdk/region-config-resolver": "3.577.0", - "@aws-sdk/types": "3.577.0", - "@aws-sdk/util-endpoints": "3.577.0", - "@aws-sdk/util-user-agent-browser": "3.577.0", - "@aws-sdk/util-user-agent-node": "3.577.0", - "@smithy/config-resolver": "^3.0.0", - "@smithy/core": "^2.0.0", - "@smithy/fetch-http-handler": "^3.0.0", - "@smithy/hash-node": "^3.0.0", - "@smithy/invalid-dependency": "^3.0.0", - "@smithy/middleware-content-length": "^3.0.0", - "@smithy/middleware-endpoint": "^3.0.0", - "@smithy/middleware-retry": "^3.0.0", - "@smithy/middleware-serde": "^3.0.0", - "@smithy/middleware-stack": "^3.0.0", - "@smithy/node-config-provider": "^3.0.0", - "@smithy/node-http-handler": "^3.0.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/smithy-client": "^3.0.0", - "@smithy/types": "^3.0.0", - "@smithy/url-parser": "^3.0.0", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso/-/client-sso-3.598.0.tgz", + "integrity": "sha512-nOI5lqPYa+YZlrrzwAJywJSw3MKVjvu6Ge2fCqQUNYMfxFB0NAaDFnl0EPjXi+sEbtCuz/uWE77poHbqiZ+7Iw==", + "dependencies": { + "@aws-crypto/sha256-browser": "5.2.0", + "@aws-crypto/sha256-js": "5.2.0", + "@aws-sdk/core": "3.598.0", + "@aws-sdk/middleware-host-header": "3.598.0", + "@aws-sdk/middleware-logger": "3.598.0", + "@aws-sdk/middleware-recursion-detection": "3.598.0", + "@aws-sdk/middleware-user-agent": "3.598.0", + "@aws-sdk/region-config-resolver": "3.598.0", + "@aws-sdk/types": "3.598.0", + "@aws-sdk/util-endpoints": "3.598.0", + "@aws-sdk/util-user-agent-browser": "3.598.0", + "@aws-sdk/util-user-agent-node": "3.598.0", + "@smithy/config-resolver": "^3.0.2", + "@smithy/core": "^2.2.1", + "@smithy/fetch-http-handler": "^3.0.2", + "@smithy/hash-node": "^3.0.1", + "@smithy/invalid-dependency": "^3.0.1", + "@smithy/middleware-content-length": "^3.0.1", + "@smithy/middleware-endpoint": "^3.0.2", + "@smithy/middleware-retry": "^3.0.4", + "@smithy/middleware-serde": "^3.0.1", + "@smithy/middleware-stack": "^3.0.1", + "@smithy/node-config-provider": "^3.1.1", + "@smithy/node-http-handler": "^3.0.1", + "@smithy/protocol-http": "^4.0.1", + "@smithy/smithy-client": "^3.1.2", + "@smithy/types": "^3.1.0", + "@smithy/url-parser": "^3.0.1", "@smithy/util-base64": "^3.0.0", "@smithy/util-body-length-browser": "^3.0.0", "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.0", - "@smithy/util-defaults-mode-node": "^3.0.0", - "@smithy/util-endpoints": "^2.0.0", - "@smithy/util-middleware": "^3.0.0", - "@smithy/util-retry": "^3.0.0", + "@smithy/util-defaults-mode-browser": "^3.0.4", + "@smithy/util-defaults-mode-node": "^3.0.4", + "@smithy/util-endpoints": "^2.0.2", + "@smithy/util-middleware": "^3.0.1", + "@smithy/util-retry": "^3.0.1", "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, @@ -206,48 +245,48 @@ } }, "node_modules/@aws-sdk/client-sso-oidc": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.577.0.tgz", - "integrity": "sha512-njmKSPDWueWWYVFpFcZ2P3fI6/pdQVDa0FgCyYZhOnJLgEHZIcBBg1AsnkVWacBuLopp9XVt2m+7hO6ugY1/1g==", - "dependencies": { - "@aws-crypto/sha256-browser": "3.0.0", - "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sts": "3.577.0", - "@aws-sdk/core": "3.576.0", - "@aws-sdk/credential-provider-node": "3.577.0", - "@aws-sdk/middleware-host-header": "3.577.0", - "@aws-sdk/middleware-logger": "3.577.0", - "@aws-sdk/middleware-recursion-detection": "3.577.0", - "@aws-sdk/middleware-user-agent": "3.577.0", - "@aws-sdk/region-config-resolver": "3.577.0", - "@aws-sdk/types": "3.577.0", - "@aws-sdk/util-endpoints": "3.577.0", - "@aws-sdk/util-user-agent-browser": "3.577.0", - "@aws-sdk/util-user-agent-node": "3.577.0", - "@smithy/config-resolver": "^3.0.0", - "@smithy/core": "^2.0.0", - "@smithy/fetch-http-handler": "^3.0.0", - "@smithy/hash-node": "^3.0.0", - "@smithy/invalid-dependency": "^3.0.0", - "@smithy/middleware-content-length": "^3.0.0", - "@smithy/middleware-endpoint": "^3.0.0", - "@smithy/middleware-retry": "^3.0.0", - "@smithy/middleware-serde": "^3.0.0", - "@smithy/middleware-stack": "^3.0.0", - "@smithy/node-config-provider": "^3.0.0", - "@smithy/node-http-handler": "^3.0.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/smithy-client": "^3.0.0", - "@smithy/types": "^3.0.0", - "@smithy/url-parser": "^3.0.0", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.598.0.tgz", + "integrity": "sha512-jfdH1pAO9Tt8Nkta/JJLoUnwl7jaRdxToQTJfUtE+o3+0JP5sA4LfC2rBkJSWcU5BdAA+kyOs5Lv776DlN04Vg==", + "dependencies": { + "@aws-crypto/sha256-browser": "5.2.0", + "@aws-crypto/sha256-js": "5.2.0", + "@aws-sdk/client-sts": "3.598.0", + "@aws-sdk/core": "3.598.0", + "@aws-sdk/credential-provider-node": "3.598.0", + "@aws-sdk/middleware-host-header": "3.598.0", + "@aws-sdk/middleware-logger": "3.598.0", + "@aws-sdk/middleware-recursion-detection": "3.598.0", + "@aws-sdk/middleware-user-agent": "3.598.0", + "@aws-sdk/region-config-resolver": "3.598.0", + "@aws-sdk/types": "3.598.0", + "@aws-sdk/util-endpoints": "3.598.0", + "@aws-sdk/util-user-agent-browser": "3.598.0", + "@aws-sdk/util-user-agent-node": "3.598.0", + "@smithy/config-resolver": "^3.0.2", + "@smithy/core": "^2.2.1", + "@smithy/fetch-http-handler": "^3.0.2", + "@smithy/hash-node": "^3.0.1", + "@smithy/invalid-dependency": "^3.0.1", + "@smithy/middleware-content-length": "^3.0.1", + "@smithy/middleware-endpoint": "^3.0.2", + "@smithy/middleware-retry": "^3.0.4", + "@smithy/middleware-serde": "^3.0.1", + "@smithy/middleware-stack": "^3.0.1", + "@smithy/node-config-provider": "^3.1.1", + "@smithy/node-http-handler": "^3.0.1", + "@smithy/protocol-http": "^4.0.1", + "@smithy/smithy-client": "^3.1.2", + "@smithy/types": "^3.1.0", + "@smithy/url-parser": "^3.0.1", "@smithy/util-base64": "^3.0.0", "@smithy/util-body-length-browser": "^3.0.0", "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.0", - "@smithy/util-defaults-mode-node": "^3.0.0", - "@smithy/util-endpoints": "^2.0.0", - "@smithy/util-middleware": "^3.0.0", - "@smithy/util-retry": "^3.0.0", + "@smithy/util-defaults-mode-browser": "^3.0.4", + "@smithy/util-defaults-mode-node": "^3.0.4", + "@smithy/util-endpoints": "^2.0.2", + "@smithy/util-middleware": "^3.0.1", + "@smithy/util-retry": "^3.0.1", "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, @@ -256,48 +295,48 @@ } }, "node_modules/@aws-sdk/client-sts": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sts/-/client-sts-3.577.0.tgz", - "integrity": "sha512-509Kklimva1XVlhGbpTpeX3kOP6ORpm44twJxDHpa9TURbmoaxj7veWlnLCbDorxDTrbsDghvYZshvcLsojVpg==", - "dependencies": { - "@aws-crypto/sha256-browser": "3.0.0", - "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sso-oidc": "3.577.0", - "@aws-sdk/core": "3.576.0", - "@aws-sdk/credential-provider-node": "3.577.0", - "@aws-sdk/middleware-host-header": "3.577.0", - "@aws-sdk/middleware-logger": "3.577.0", - "@aws-sdk/middleware-recursion-detection": "3.577.0", - "@aws-sdk/middleware-user-agent": "3.577.0", - "@aws-sdk/region-config-resolver": "3.577.0", - "@aws-sdk/types": "3.577.0", - "@aws-sdk/util-endpoints": "3.577.0", - "@aws-sdk/util-user-agent-browser": "3.577.0", - "@aws-sdk/util-user-agent-node": "3.577.0", - "@smithy/config-resolver": "^3.0.0", - "@smithy/core": "^2.0.0", - "@smithy/fetch-http-handler": "^3.0.0", - "@smithy/hash-node": "^3.0.0", - "@smithy/invalid-dependency": "^3.0.0", - "@smithy/middleware-content-length": "^3.0.0", - "@smithy/middleware-endpoint": "^3.0.0", - "@smithy/middleware-retry": "^3.0.0", - "@smithy/middleware-serde": "^3.0.0", - "@smithy/middleware-stack": "^3.0.0", - "@smithy/node-config-provider": "^3.0.0", - "@smithy/node-http-handler": "^3.0.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/smithy-client": "^3.0.0", - "@smithy/types": "^3.0.0", - "@smithy/url-parser": "^3.0.0", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sts/-/client-sts-3.598.0.tgz", + "integrity": "sha512-bXhz/cHL0iB9UH9IFtMaJJf4F8mV+HzncETCRFzZ9SyUMt5rP9j8A7VZknqGYSx/6mI8SsB1XJQkWSbhn6FiSQ==", + "dependencies": { + "@aws-crypto/sha256-browser": "5.2.0", + "@aws-crypto/sha256-js": "5.2.0", + "@aws-sdk/client-sso-oidc": "3.598.0", + "@aws-sdk/core": "3.598.0", + "@aws-sdk/credential-provider-node": "3.598.0", + "@aws-sdk/middleware-host-header": "3.598.0", + "@aws-sdk/middleware-logger": "3.598.0", + "@aws-sdk/middleware-recursion-detection": "3.598.0", + "@aws-sdk/middleware-user-agent": "3.598.0", + "@aws-sdk/region-config-resolver": "3.598.0", + "@aws-sdk/types": "3.598.0", + "@aws-sdk/util-endpoints": "3.598.0", + "@aws-sdk/util-user-agent-browser": "3.598.0", + "@aws-sdk/util-user-agent-node": "3.598.0", + "@smithy/config-resolver": "^3.0.2", + "@smithy/core": "^2.2.1", + "@smithy/fetch-http-handler": "^3.0.2", + "@smithy/hash-node": "^3.0.1", + "@smithy/invalid-dependency": "^3.0.1", + "@smithy/middleware-content-length": "^3.0.1", + "@smithy/middleware-endpoint": "^3.0.2", + "@smithy/middleware-retry": "^3.0.4", + "@smithy/middleware-serde": "^3.0.1", + "@smithy/middleware-stack": "^3.0.1", + "@smithy/node-config-provider": "^3.1.1", + "@smithy/node-http-handler": "^3.0.1", + "@smithy/protocol-http": "^4.0.1", + "@smithy/smithy-client": "^3.1.2", + "@smithy/types": "^3.1.0", + "@smithy/url-parser": "^3.0.1", "@smithy/util-base64": "^3.0.0", "@smithy/util-body-length-browser": "^3.0.0", "@smithy/util-body-length-node": "^3.0.0", - "@smithy/util-defaults-mode-browser": "^3.0.0", - "@smithy/util-defaults-mode-node": "^3.0.0", - "@smithy/util-endpoints": "^2.0.0", - "@smithy/util-middleware": "^3.0.0", - "@smithy/util-retry": "^3.0.0", + "@smithy/util-defaults-mode-browser": "^3.0.4", + "@smithy/util-defaults-mode-node": "^3.0.4", + "@smithy/util-endpoints": "^2.0.2", + "@smithy/util-middleware": "^3.0.1", + "@smithy/util-retry": "^3.0.1", "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" }, @@ -306,15 +345,15 @@ } }, "node_modules/@aws-sdk/core": { - "version": "3.576.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/core/-/core-3.576.0.tgz", - "integrity": "sha512-KDvDlbeipSTIf+ffKtTg1m419TK7s9mZSWC8bvuZ9qx6/sjQFOXIKOVqyuli6DnfxGbvRcwoRuY99OcCH1N/0w==", - "dependencies": { - "@smithy/core": "^2.0.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/signature-v4": "^3.0.0", - "@smithy/smithy-client": "^3.0.0", - "@smithy/types": "^3.0.0", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/core/-/core-3.598.0.tgz", + "integrity": "sha512-HaSjt7puO5Cc7cOlrXFCW0rtA0BM9lvzjl56x0A20Pt+0wxXGeTOZZOkXQIepbrFkV2e/HYukuT9e99vXDm59g==", + "dependencies": { + "@smithy/core": "^2.2.1", + "@smithy/protocol-http": "^4.0.1", + "@smithy/signature-v4": "^3.1.0", + "@smithy/smithy-client": "^3.1.2", + "@smithy/types": "^3.1.0", "fast-xml-parser": "4.2.5", "tslib": "^2.6.2" }, @@ -323,14 +362,14 @@ } }, "node_modules/@aws-sdk/credential-provider-cognito-identity": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.577.0.tgz", - "integrity": "sha512-y5yo4RKQSIQEOGLMLziLh0MZ+CxLs2QmTRjh8PkL8ovy12FPyou9Ptr7hIDD5SnCsiItJful5qbmj9e2QSmozw==", - "dependencies": { - "@aws-sdk/client-cognito-identity": "3.577.0", - "@aws-sdk/types": "3.577.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/types": "^3.0.0", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.598.0.tgz", + "integrity": "sha512-u6oocRReswkA2mFlOwtCetgmEr9B+Yhle3K13x37rb1lQgq1wUuWUvHU7U9v26hUZIhfUpigV/Mgr/RQZB6+Yw==", + "dependencies": { + "@aws-sdk/client-cognito-identity": "3.598.0", + "@aws-sdk/types": "3.598.0", + "@smithy/property-provider": "^3.1.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -338,13 +377,13 @@ } }, "node_modules/@aws-sdk/credential-provider-env": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.577.0.tgz", - "integrity": "sha512-Jxu255j0gToMGEiqufP8ZtKI8HW90lOLjwJ3LrdlD/NLsAY0tOQf1fWc53u28hWmmNGMxmCrL2p66IOgMDhDUw==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.598.0.tgz", + "integrity": "sha512-vi1khgn7yXzLCcgSIzQrrtd2ilUM0dWodxj3PQ6BLfP0O+q1imO3hG1nq7DVyJtq7rFHs6+9N8G4mYvTkxby2w==", "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/types": "^3.0.0", + "@aws-sdk/types": "3.598.0", + "@smithy/property-provider": "^3.1.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -352,18 +391,18 @@ } }, "node_modules/@aws-sdk/credential-provider-http": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.577.0.tgz", - "integrity": "sha512-n++yhCp67b9+ZRGEdY1jhamB5E/O+QsIDOPSuRmdaSGMCOd82oUEKPgIVEU1bkqxDsBxgiEWuvtfhK6sNiDS0A==", - "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/fetch-http-handler": "^3.0.0", - "@smithy/node-http-handler": "^3.0.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/smithy-client": "^3.0.0", - "@smithy/types": "^3.0.0", - "@smithy/util-stream": "^3.0.0", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.598.0.tgz", + "integrity": "sha512-N7cIafi4HVlQvEgvZSo1G4T9qb/JMLGMdBsDCT5XkeJrF0aptQWzTFH0jIdZcLrMYvzPcuEyO3yCBe6cy/ba0g==", + "dependencies": { + "@aws-sdk/types": "3.598.0", + "@smithy/fetch-http-handler": "^3.0.2", + "@smithy/node-http-handler": "^3.0.1", + "@smithy/property-provider": "^3.1.1", + "@smithy/protocol-http": "^4.0.1", + "@smithy/smithy-client": "^3.1.2", + "@smithy/types": "^3.1.0", + "@smithy/util-stream": "^3.0.2", "tslib": "^2.6.2" }, "engines": { @@ -371,44 +410,45 @@ } }, "node_modules/@aws-sdk/credential-provider-ini": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.577.0.tgz", - "integrity": "sha512-q7lHPtv6BjRvChUE3m0tIaEZKxPTaZ1B3lKxGYsFl3VLAu5N8yGCUKwuA1izf4ucT+LyKscVGqK6VDZx1ev3nw==", - "dependencies": { - "@aws-sdk/credential-provider-env": "3.577.0", - "@aws-sdk/credential-provider-process": "3.577.0", - "@aws-sdk/credential-provider-sso": "3.577.0", - "@aws-sdk/credential-provider-web-identity": "3.577.0", - "@aws-sdk/types": "3.577.0", - "@smithy/credential-provider-imds": "^3.0.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/shared-ini-file-loader": "^3.0.0", - "@smithy/types": "^3.0.0", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.598.0.tgz", + "integrity": "sha512-/ppcIVUbRwDIwJDoYfp90X3+AuJo2mvE52Y1t2VSrvUovYn6N4v95/vXj6LS8CNDhz2jvEJYmu+0cTMHdhI6eA==", + "dependencies": { + "@aws-sdk/credential-provider-env": "3.598.0", + "@aws-sdk/credential-provider-http": "3.598.0", + "@aws-sdk/credential-provider-process": "3.598.0", + "@aws-sdk/credential-provider-sso": "3.598.0", + "@aws-sdk/credential-provider-web-identity": "3.598.0", + "@aws-sdk/types": "3.598.0", + "@smithy/credential-provider-imds": "^3.1.1", + "@smithy/property-provider": "^3.1.1", + "@smithy/shared-ini-file-loader": "^3.1.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sts": "^3.577.0" + "@aws-sdk/client-sts": "^3.598.0" } }, "node_modules/@aws-sdk/credential-provider-node": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.577.0.tgz", - "integrity": "sha512-epZ1HOMsrXBNczc0HQpv0VMjqAEpc09DUA7Rg3gUJfn8umhML7A7bXnUyqPA+S54q397UYg1leQKdSn23OiwQQ==", - "dependencies": { - "@aws-sdk/credential-provider-env": "3.577.0", - "@aws-sdk/credential-provider-http": "3.577.0", - "@aws-sdk/credential-provider-ini": "3.577.0", - "@aws-sdk/credential-provider-process": "3.577.0", - "@aws-sdk/credential-provider-sso": "3.577.0", - "@aws-sdk/credential-provider-web-identity": "3.577.0", - "@aws-sdk/types": "3.577.0", - "@smithy/credential-provider-imds": "^3.0.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/shared-ini-file-loader": "^3.0.0", - "@smithy/types": "^3.0.0", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.598.0.tgz", + "integrity": "sha512-sXTlqL5I/awlF9Dg2MQ17SfrEaABVnsj2mf4jF5qQrIRhfbvQOIYdEqdy8Rn1AWlJMz/N450SGzc0XJ5owxxqw==", + "dependencies": { + "@aws-sdk/credential-provider-env": "3.598.0", + "@aws-sdk/credential-provider-http": "3.598.0", + "@aws-sdk/credential-provider-ini": "3.598.0", + "@aws-sdk/credential-provider-process": "3.598.0", + "@aws-sdk/credential-provider-sso": "3.598.0", + "@aws-sdk/credential-provider-web-identity": "3.598.0", + "@aws-sdk/types": "3.598.0", + "@smithy/credential-provider-imds": "^3.1.1", + "@smithy/property-provider": "^3.1.1", + "@smithy/shared-ini-file-loader": "^3.1.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -416,14 +456,14 @@ } }, "node_modules/@aws-sdk/credential-provider-process": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.577.0.tgz", - "integrity": "sha512-Gin6BWtOiXxIgITrJ3Nwc+Y2P1uVT6huYR4EcbA/DJUPWyO0n9y5UFLewPvVbLkRn15JeEqErBLUrHclkiOKtw==", - "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/shared-ini-file-loader": "^3.0.0", - "@smithy/types": "^3.0.0", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.598.0.tgz", + "integrity": "sha512-rM707XbLW8huMk722AgjVyxu2tMZee++fNA8TJVNgs1Ma02Wx6bBrfIvlyK0rCcIRb0WdQYP6fe3Xhiu4e8IBA==", + "dependencies": { + "@aws-sdk/types": "3.598.0", + "@smithy/property-provider": "^3.1.1", + "@smithy/shared-ini-file-loader": "^3.1.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -431,16 +471,16 @@ } }, "node_modules/@aws-sdk/credential-provider-sso": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.577.0.tgz", - "integrity": "sha512-iVm5SQvS7EgZTJsRaqUOmDQpBQPPPat42SCbWFvFQOLrl8qewq8OP94hFS5w2mP62zngeYzqhJnDel79HXbxew==", - "dependencies": { - "@aws-sdk/client-sso": "3.577.0", - "@aws-sdk/token-providers": "3.577.0", - "@aws-sdk/types": "3.577.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/shared-ini-file-loader": "^3.0.0", - "@smithy/types": "^3.0.0", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.598.0.tgz", + "integrity": "sha512-5InwUmrAuqQdOOgxTccRayMMkSmekdLk6s+az9tmikq0QFAHUCtofI+/fllMXSR9iL6JbGYi1940+EUmS4pHJA==", + "dependencies": { + "@aws-sdk/client-sso": "3.598.0", + "@aws-sdk/token-providers": "3.598.0", + "@aws-sdk/types": "3.598.0", + "@smithy/property-provider": "^3.1.1", + "@smithy/shared-ini-file-loader": "^3.1.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -448,42 +488,42 @@ } }, "node_modules/@aws-sdk/credential-provider-web-identity": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.577.0.tgz", - "integrity": "sha512-ZGHGNRaCtJJmszb9UTnC7izNCtRUttdPlLdMkh41KPS32vfdrBDHs1JrpbZijItRj1xKuOXsiYSXLAaHGcLh8Q==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.598.0.tgz", + "integrity": "sha512-GV5GdiMbz5Tz9JO4NJtRoFXjW0GPEujA0j+5J/B723rTN+REHthJu48HdBKouHGhdzkDWkkh1bu52V02Wprw8w==", "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/types": "^3.0.0", + "@aws-sdk/types": "3.598.0", + "@smithy/property-provider": "^3.1.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sts": "^3.577.0" + "@aws-sdk/client-sts": "^3.598.0" } }, "node_modules/@aws-sdk/credential-providers": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-providers/-/credential-providers-3.577.0.tgz", - "integrity": "sha512-/fzdyyAetJxTPH8f2bh1UkcN48dScLb6LjBj9+wX2BHyKSZUal7+TqPTyme4f3pj1I1EeKhDIYKldR8YyMPIAg==", - "dependencies": { - "@aws-sdk/client-cognito-identity": "3.577.0", - "@aws-sdk/client-sso": "3.577.0", - "@aws-sdk/client-sts": "3.577.0", - "@aws-sdk/credential-provider-cognito-identity": "3.577.0", - "@aws-sdk/credential-provider-env": "3.577.0", - "@aws-sdk/credential-provider-http": "3.577.0", - "@aws-sdk/credential-provider-ini": "3.577.0", - "@aws-sdk/credential-provider-node": "3.577.0", - "@aws-sdk/credential-provider-process": "3.577.0", - "@aws-sdk/credential-provider-sso": "3.577.0", - "@aws-sdk/credential-provider-web-identity": "3.577.0", - "@aws-sdk/types": "3.577.0", - "@smithy/credential-provider-imds": "^3.0.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/types": "^3.0.0", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-providers/-/credential-providers-3.598.0.tgz", + "integrity": "sha512-IFZwH3F2rA2WbpYFUxOeu/M3/9p4+oRbKVLDZlaaDtwwuZ9VHEbnkUm20zOgSXeVExa3qgYhJvg7H5JrqxP97A==", + "dependencies": { + "@aws-sdk/client-cognito-identity": "3.598.0", + "@aws-sdk/client-sso": "3.598.0", + "@aws-sdk/client-sts": "3.598.0", + "@aws-sdk/credential-provider-cognito-identity": "3.598.0", + "@aws-sdk/credential-provider-env": "3.598.0", + "@aws-sdk/credential-provider-http": "3.598.0", + "@aws-sdk/credential-provider-ini": "3.598.0", + "@aws-sdk/credential-provider-node": "3.598.0", + "@aws-sdk/credential-provider-process": "3.598.0", + "@aws-sdk/credential-provider-sso": "3.598.0", + "@aws-sdk/credential-provider-web-identity": "3.598.0", + "@aws-sdk/types": "3.598.0", + "@smithy/credential-provider-imds": "^3.1.1", + "@smithy/property-provider": "^3.1.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -491,13 +531,13 @@ } }, "node_modules/@aws-sdk/middleware-host-header": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.577.0.tgz", - "integrity": "sha512-9ca5MJz455CODIVXs0/sWmJm7t3QO4EUa1zf8pE8grLpzf0J94bz/skDWm37Pli13T3WaAQBHCTiH2gUVfCsWg==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.598.0.tgz", + "integrity": "sha512-WiaG059YBQwQraNejLIi0gMNkX7dfPZ8hDIhvMr5aVPRbaHH8AYF3iNSsXYCHvA2Cfa1O9haYXsuMF9flXnCmA==", "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/types": "^3.0.0", + "@aws-sdk/types": "3.598.0", + "@smithy/protocol-http": "^4.0.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -505,12 +545,12 @@ } }, "node_modules/@aws-sdk/middleware-logger": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-logger/-/middleware-logger-3.577.0.tgz", - "integrity": "sha512-aPFGpGjTZcJYk+24bg7jT4XdIp42mFXSuPt49lw5KygefLyJM/sB0bKKqPYYivW0rcuZ9brQ58eZUNthrzYAvg==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-logger/-/middleware-logger-3.598.0.tgz", + "integrity": "sha512-bxBjf/VYiu3zfu8SYM2S9dQQc3tz5uBAOcPz/Bt8DyyK3GgOpjhschH/2XuUErsoUO1gDJqZSdGOmuHGZQn00Q==", "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/types": "^3.0.0", + "@aws-sdk/types": "3.598.0", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -518,13 +558,13 @@ } }, "node_modules/@aws-sdk/middleware-recursion-detection": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.577.0.tgz", - "integrity": "sha512-pn3ZVEd2iobKJlR3H+bDilHjgRnNrQ6HMmK9ZzZw89Ckn3Dcbv48xOv4RJvu0aU8SDLl/SNCxppKjeLDTPGBNA==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.598.0.tgz", + "integrity": "sha512-vjT9BeFY9FeN0f8hm2l6F53tI0N5bUq6RcDkQXKNabXBnQxKptJRad6oP2X5y3FoVfBLOuDkQgiC2940GIPxtQ==", "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/types": "^3.0.0", + "@aws-sdk/types": "3.598.0", + "@smithy/protocol-http": "^4.0.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -532,14 +572,14 @@ } }, "node_modules/@aws-sdk/middleware-user-agent": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.577.0.tgz", - "integrity": "sha512-P55HAXgwmiHHpFx5JEPvOnAbfhN7v6sWv9PBQs+z2tC7QiBcPS0cdJR6PfV7J1n4VPK52/OnrK3l9VxdQ7Ms0g==", - "dependencies": { - "@aws-sdk/types": "3.577.0", - "@aws-sdk/util-endpoints": "3.577.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/types": "^3.0.0", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.598.0.tgz", + "integrity": "sha512-4tjESlHG5B5MdjUaLK7tQs/miUtHbb6deauQx8ryqSBYOhfHVgb1ZnzvQR0bTrhpqUg0WlybSkDaZAICf9xctg==", + "dependencies": { + "@aws-sdk/types": "3.598.0", + "@aws-sdk/util-endpoints": "3.598.0", + "@smithy/protocol-http": "^4.0.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -547,15 +587,15 @@ } }, "node_modules/@aws-sdk/region-config-resolver": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.577.0.tgz", - "integrity": "sha512-4ChCFACNwzqx/xjg3zgFcW8Ali6R9C95cFECKWT/7CUM1D0MGvkclSH2cLarmHCmJgU6onKkJroFtWp0kHhgyg==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.598.0.tgz", + "integrity": "sha512-oYXhmTokSav4ytmWleCr3rs/1nyvZW/S0tdi6X7u+dLNL5Jee+uMxWGzgOrWK6wrQOzucLVjS4E/wA11Kv2GTw==", "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/node-config-provider": "^3.0.0", - "@smithy/types": "^3.0.0", + "@aws-sdk/types": "3.598.0", + "@smithy/node-config-provider": "^3.1.1", + "@smithy/types": "^3.1.0", "@smithy/util-config-provider": "^3.0.0", - "@smithy/util-middleware": "^3.0.0", + "@smithy/util-middleware": "^3.0.1", "tslib": "^2.6.2" }, "engines": { @@ -563,29 +603,29 @@ } }, "node_modules/@aws-sdk/token-providers": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/token-providers/-/token-providers-3.577.0.tgz", - "integrity": "sha512-0CkIZpcC3DNQJQ1hDjm2bdSy/Xjs7Ny5YvSsacasGOkNfk+FdkiQy6N67bZX3Zbc9KIx+Nz4bu3iDeNSNplnnQ==", - "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/shared-ini-file-loader": "^3.0.0", - "@smithy/types": "^3.0.0", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/token-providers/-/token-providers-3.598.0.tgz", + "integrity": "sha512-TKY1EVdHVBnZqpyxyTHdpZpa1tUpb6nxVeRNn1zWG8QB5MvH4ALLd/jR+gtmWDNQbIG4cVuBOZFVL8hIYicKTA==", + "dependencies": { + "@aws-sdk/types": "3.598.0", + "@smithy/property-provider": "^3.1.1", + "@smithy/shared-ini-file-loader": "^3.1.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@aws-sdk/client-sso-oidc": "^3.577.0" + "@aws-sdk/client-sso-oidc": "^3.598.0" } }, "node_modules/@aws-sdk/types": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/types/-/types-3.577.0.tgz", - "integrity": "sha512-FT2JZES3wBKN/alfmhlo+3ZOq/XJ0C7QOZcDNrpKjB0kqYoKjhVKZ/Hx6ArR0czkKfHzBBEs6y40ebIHx2nSmA==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/types/-/types-3.598.0.tgz", + "integrity": "sha512-742uRl6z7u0LFmZwDrFP6r1wlZcgVPw+/TilluDJmCAR8BgRw3IR+743kUXKBGd8QZDRW2n6v/PYsi/AWCDDMQ==", "dependencies": { - "@smithy/types": "^3.0.0", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -593,13 +633,13 @@ } }, "node_modules/@aws-sdk/util-endpoints": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/util-endpoints/-/util-endpoints-3.577.0.tgz", - "integrity": "sha512-FjuUz1Kdy4Zly2q/c58tpdqHd6z7iOdU/caYzoc8jwgAHBDBbIJNQLCU9hXJnPV2M8pWxQDyIZsoVwtmvErPzw==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/util-endpoints/-/util-endpoints-3.598.0.tgz", + "integrity": "sha512-Qo9UoiVVZxcOEdiOMZg3xb1mzkTxrhd4qSlg5QQrfWPJVx/QOg+Iy0NtGxPtHtVZNHZxohYwDwV/tfsnDSE2gQ==", "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/types": "^3.0.0", - "@smithy/util-endpoints": "^2.0.0", + "@aws-sdk/types": "3.598.0", + "@smithy/types": "^3.1.0", + "@smithy/util-endpoints": "^2.0.2", "tslib": "^2.6.2" }, "engines": { @@ -618,24 +658,24 @@ } }, "node_modules/@aws-sdk/util-user-agent-browser": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.577.0.tgz", - "integrity": "sha512-zEAzHgR6HWpZOH7xFgeJLc6/CzMcx4nxeQolZxVZoB5pPaJd3CjyRhZN0xXeZB0XIRCWmb4yJBgyiugXLNMkLA==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.598.0.tgz", + "integrity": "sha512-36Sxo6F+ykElaL1mWzWjlg+1epMpSe8obwhCN1yGE7Js9ywy5U6k6l+A3q3YM9YRbm740sNxncbwLklMvuhTKw==", "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/types": "^3.0.0", + "@aws-sdk/types": "3.598.0", + "@smithy/types": "^3.1.0", "bowser": "^2.11.0", "tslib": "^2.6.2" } }, "node_modules/@aws-sdk/util-user-agent-node": { - "version": "3.577.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.577.0.tgz", - "integrity": "sha512-XqvtFjbSMtycZTWVwDe8DRWovuoMbA54nhUoZwVU6rW9OSD6NZWGR512BUGHFaWzW0Wg8++Dj10FrKTG2XtqfA==", + "version": "3.598.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.598.0.tgz", + "integrity": "sha512-oyWGcOlfTdzkC6SVplyr0AGh54IMrDxbhg5RxJ5P+V4BKfcDoDcZV9xenUk9NsOi9MuUjxMumb9UJGkDhM1m0A==", "dependencies": { - "@aws-sdk/types": "3.577.0", - "@smithy/node-config-provider": "^3.0.0", - "@smithy/types": "^3.0.0", + "@aws-sdk/types": "3.598.0", + "@smithy/node-config-provider": "^3.1.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -650,20 +690,12 @@ } } }, - "node_modules/@aws-sdk/util-utf8-browser": { - "version": "3.259.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.259.0.tgz", - "integrity": "sha512-UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw==", - "dependencies": { - "tslib": "^2.3.1" - } - }, "node_modules/@babel/code-frame": { - "version": "7.24.2", - "resolved": "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.24.2.tgz", - "integrity": "sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.24.7.tgz", + "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", "dependencies": { - "@babel/highlight": "^7.24.2", + "@babel/highlight": "^7.24.7", "picocolors": "^1.0.0" }, "engines": { @@ -671,28 +703,28 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.24.4", - "resolved": "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.24.4.tgz", - "integrity": "sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.24.7.tgz", + "integrity": "sha512-qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.24.5", - "resolved": "https://registry.npmmirror.com/@babel/core/-/core-7.24.5.tgz", - "integrity": "sha512-tVQRucExLQ02Boi4vdPp49svNGcfL2GhdTCT9aldhXgCJVAI21EtRfBettiuLUwce/7r6bFdgs6JFkcdTiFttA==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/core/-/core-7.24.7.tgz", + "integrity": "sha512-nykK+LEK86ahTkX/3TgauT0ikKoNCfKHEaZYTUVupJdTLzGNvrblu4u6fa7DhZONAltdf8e662t/abY8idrd/g==", "dependencies": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.24.2", - "@babel/generator": "^7.24.5", - "@babel/helper-compilation-targets": "^7.23.6", - "@babel/helper-module-transforms": "^7.24.5", - "@babel/helpers": "^7.24.5", - "@babel/parser": "^7.24.5", - "@babel/template": "^7.24.0", - "@babel/traverse": "^7.24.5", - "@babel/types": "^7.24.5", + "@babel/code-frame": "^7.24.7", + "@babel/generator": "^7.24.7", + "@babel/helper-compilation-targets": "^7.24.7", + "@babel/helper-module-transforms": "^7.24.7", + "@babel/helpers": "^7.24.7", + "@babel/parser": "^7.24.7", + "@babel/template": "^7.24.7", + "@babel/traverse": "^7.24.7", + "@babel/types": "^7.24.7", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -716,11 +748,11 @@ } }, "node_modules/@babel/generator": { - "version": "7.24.5", - "resolved": "https://registry.npmmirror.com/@babel/generator/-/generator-7.24.5.tgz", - "integrity": "sha512-x32i4hEXvr+iI0NEoEfDKzlemF8AmtOP8CcrRaEcpzysWuoEb1KknpcvMsHKPONoKZiDuItklgWhB18xEhr9PA==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/generator/-/generator-7.24.7.tgz", + "integrity": "sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA==", "dependencies": { - "@babel/types": "^7.24.5", + "@babel/types": "^7.24.7", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^2.5.1" @@ -730,12 +762,12 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.23.6", - "resolved": "https://registry.npmmirror.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz", - "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.7.tgz", + "integrity": "sha512-ctSdRHBi20qWOfy27RUb4Fhp07KSJ3sXcuSvTrXrc4aG8NSYDo1ici3Vhg9bg69y5bj0Mr1lh0aeEgTvc12rMg==", "dependencies": { - "@babel/compat-data": "^7.23.5", - "@babel/helper-validator-option": "^7.23.5", + "@babel/compat-data": "^7.24.7", + "@babel/helper-validator-option": "^7.24.7", "browserslist": "^4.22.2", "lru-cache": "^5.1.1", "semver": "^6.3.1" @@ -753,57 +785,61 @@ } }, "node_modules/@babel/helper-environment-visitor": { - "version": "7.22.20", - "resolved": "https://registry.npmmirror.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", - "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz", + "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==", + "dependencies": { + "@babel/types": "^7.24.7" + }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-function-name": { - "version": "7.23.0", - "resolved": "https://registry.npmmirror.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", - "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz", + "integrity": "sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==", "dependencies": { - "@babel/template": "^7.22.15", - "@babel/types": "^7.23.0" + "@babel/template": "^7.24.7", + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-hoist-variables": { - "version": "7.22.5", - "resolved": "https://registry.npmmirror.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", - "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz", + "integrity": "sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==", "dependencies": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-imports": { - "version": "7.24.3", - "resolved": "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz", - "integrity": "sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz", + "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==", "dependencies": { - "@babel/types": "^7.24.0" + "@babel/traverse": "^7.24.7", + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.24.5", - "resolved": "https://registry.npmmirror.com/@babel/helper-module-transforms/-/helper-module-transforms-7.24.5.tgz", - "integrity": "sha512-9GxeY8c2d2mdQUP1Dye0ks3VDyIMS98kt/llQ2nUId8IsWqTF0l1LkSX0/uP7l7MCDrzXS009Hyhe2gzTiGW8A==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/helper-module-transforms/-/helper-module-transforms-7.24.7.tgz", + "integrity": "sha512-1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ==", "dependencies": { - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-module-imports": "^7.24.3", - "@babel/helper-simple-access": "^7.24.5", - "@babel/helper-split-export-declaration": "^7.24.5", - "@babel/helper-validator-identifier": "^7.24.5" + "@babel/helper-environment-visitor": "^7.24.7", + "@babel/helper-module-imports": "^7.24.7", + "@babel/helper-simple-access": "^7.24.7", + "@babel/helper-split-export-declaration": "^7.24.7", + "@babel/helper-validator-identifier": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -813,78 +849,78 @@ } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.24.5", - "resolved": "https://registry.npmmirror.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.5.tgz", - "integrity": "sha512-xjNLDopRzW2o6ba0gKbkZq5YWEBaK3PCyTOY1K2P/O07LGMhMqlMXPxwN4S5/RhWuCobT8z0jrlKGlYmeR1OhQ==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.7.tgz", + "integrity": "sha512-Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-simple-access": { - "version": "7.24.5", - "resolved": "https://registry.npmmirror.com/@babel/helper-simple-access/-/helper-simple-access-7.24.5.tgz", - "integrity": "sha512-uH3Hmf5q5n7n8mz7arjUlDOCbttY/DW4DYhE6FUsjKJ/oYC1kQQUvwEQWxRwUpX9qQKRXeqLwWxrqilMrf32sQ==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz", + "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==", "dependencies": { - "@babel/types": "^7.24.5" + "@babel/traverse": "^7.24.7", + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-split-export-declaration": { - "version": "7.24.5", - "resolved": "https://registry.npmmirror.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.5.tgz", - "integrity": "sha512-5CHncttXohrHk8GWOFCcCl4oRD9fKosWlIRgWm4ql9VYioKm52Mk2xsmoohvm7f3JoiLSM5ZgJuRaf5QZZYd3Q==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz", + "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==", "dependencies": { - "@babel/types": "^7.24.5" + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-string-parser": { - "version": "7.24.1", - "resolved": "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz", - "integrity": "sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.24.7.tgz", + "integrity": "sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.24.5", - "resolved": "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.5.tgz", - "integrity": "sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", + "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { - "version": "7.23.5", - "resolved": "https://registry.npmmirror.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz", - "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/helper-validator-option/-/helper-validator-option-7.24.7.tgz", + "integrity": "sha512-yy1/KvjhV/ZCL+SM7hBrvnZJ3ZuT9OuZgIJAGpPEToANvc3iM6iDvBnRjtElWibHU6n8/LPR/EjX9EtIEYO3pw==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.24.5", - "resolved": "https://registry.npmmirror.com/@babel/helpers/-/helpers-7.24.5.tgz", - "integrity": "sha512-CiQmBMMpMQHwM5m01YnrM6imUG1ebgYJ+fAIW4FZe6m4qHTPaRHti+R8cggAwkdz4oXhtO4/K9JWlh+8hIfR2Q==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/helpers/-/helpers-7.24.7.tgz", + "integrity": "sha512-NlmJJtvcw72yRJRcnCmGvSi+3jDEg8qFu3z0AFoymmzLx5ERVWyzd9kVXr7Th9/8yIJi2Zc6av4Tqz3wFs8QWg==", "dependencies": { - "@babel/template": "^7.24.0", - "@babel/traverse": "^7.24.5", - "@babel/types": "^7.24.5" + "@babel/template": "^7.24.7", + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.24.5", - "resolved": "https://registry.npmmirror.com/@babel/highlight/-/highlight-7.24.5.tgz", - "integrity": "sha512-8lLmua6AVh/8SLJRRVD6V8p73Hir9w5mJrhE+IPpILG31KKlI9iz5zmBYKcWPS59qSfgP9RaSBQSHHE81WKuEw==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/highlight/-/highlight-7.24.7.tgz", + "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==", "dependencies": { - "@babel/helper-validator-identifier": "^7.24.5", + "@babel/helper-validator-identifier": "^7.24.7", "chalk": "^2.4.2", "js-tokens": "^4.0.0", "picocolors": "^1.0.0" @@ -894,9 +930,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.24.5", - "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.24.5.tgz", - "integrity": "sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.24.7.tgz", + "integrity": "sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==", "bin": { "parser": "bin/babel-parser.js" }, @@ -905,11 +941,11 @@ } }, "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.24.5", - "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.5.tgz", - "integrity": "sha512-SZuuLyfxvsm+Ah57I/i1HVjveBENYK9ue8MJ7qkc7ndoNjqquJiElzA7f5yaAXjyW2hKojosOTAQQRX50bPSVg==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.7.tgz", + "integrity": "sha512-19eJO/8kdCQ9zISOf+SEUJM/bAUIsvY3YDnXZTupUCQ8LgrWnsG/gFB9dvXqdXnRXMAM8fvt7b0CBKQHNGy1mw==", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.5" + "@babel/helper-plugin-utils": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -919,11 +955,11 @@ } }, "node_modules/@babel/plugin-transform-parameters": { - "version": "7.24.5", - "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.5.tgz", - "integrity": "sha512-9Co00MqZ2aoky+4j2jhofErthm6QVLKbpQrvz20c3CH9KQCLHyNB+t2ya4/UrRpQGR+Wrwjg9foopoeSdnHOkA==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz", + "integrity": "sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.5" + "@babel/helper-plugin-utils": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -933,11 +969,11 @@ } }, "node_modules/@babel/plugin-transform-shorthand-properties": { - "version": "7.24.1", - "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.1.tgz", - "integrity": "sha512-LyjVB1nsJ6gTTUKRjRWx9C1s9hE7dLfP/knKdrfeH9UPtAGjYGgxIbFfx7xyLIEWs7Xe1Gnf8EWiUqfjLhInZA==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz", + "integrity": "sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0" + "@babel/helper-plugin-utils": "^7.24.7" }, "engines": { "node": ">=6.9.0" @@ -947,31 +983,31 @@ } }, "node_modules/@babel/template": { - "version": "7.24.0", - "resolved": "https://registry.npmmirror.com/@babel/template/-/template-7.24.0.tgz", - "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/template/-/template-7.24.7.tgz", + "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==", "dependencies": { - "@babel/code-frame": "^7.23.5", - "@babel/parser": "^7.24.0", - "@babel/types": "^7.24.0" + "@babel/code-frame": "^7.24.7", + "@babel/parser": "^7.24.7", + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.24.5", - "resolved": "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.24.5.tgz", - "integrity": "sha512-7aaBLeDQ4zYcUFDUD41lJc1fG8+5IU9DaNSJAgal866FGvmD5EbWQgnEC6kO1gGLsX0esNkfnJSndbTXA3r7UA==", - "dependencies": { - "@babel/code-frame": "^7.24.2", - "@babel/generator": "^7.24.5", - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-function-name": "^7.23.0", - "@babel/helper-hoist-variables": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.24.5", - "@babel/parser": "^7.24.5", - "@babel/types": "^7.24.5", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.24.7.tgz", + "integrity": "sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==", + "dependencies": { + "@babel/code-frame": "^7.24.7", + "@babel/generator": "^7.24.7", + "@babel/helper-environment-visitor": "^7.24.7", + "@babel/helper-function-name": "^7.24.7", + "@babel/helper-hoist-variables": "^7.24.7", + "@babel/helper-split-export-declaration": "^7.24.7", + "@babel/parser": "^7.24.7", + "@babel/types": "^7.24.7", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -980,12 +1016,12 @@ } }, "node_modules/@babel/types": { - "version": "7.24.5", - "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.24.5.tgz", - "integrity": "sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ==", + "version": "7.24.7", + "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.24.7.tgz", + "integrity": "sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==", "dependencies": { - "@babel/helper-string-parser": "^7.24.1", - "@babel/helper-validator-identifier": "^7.24.5", + "@babel/helper-string-parser": "^7.24.7", + "@babel/helper-validator-identifier": "^7.24.7", "to-fast-properties": "^2.0.0" }, "engines": { @@ -1109,9 +1145,9 @@ } }, "node_modules/@mongodb-js/devtools-connect": { - "version": "2.6.3", - "resolved": "https://registry.npmmirror.com/@mongodb-js/devtools-connect/-/devtools-connect-2.6.3.tgz", - "integrity": "sha512-oGM/HQ8GJmcSVKcnVz+uNy3m1WFz2a7XqcEa/JJcl+imKDPHritkNVUsPIA9fYMRduuOT9f7ko8uWTVLgcw/qA==", + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/@mongodb-js/devtools-connect/-/devtools-connect-3.0.1.tgz", + "integrity": "sha512-xbk/eGHPQTQz4VSpGb5oRqSSbzipcFDODrAc4YtYFrb0980buOAopO71NozCbQoVnoiO1pYVIqcnrZMHkdaJzg==", "dependencies": { "@mongodb-js/oidc-http-server-pages": "1.1.1", "lodash.merge": "^4.6.2", @@ -1126,7 +1162,7 @@ "resolve-mongodb-srv": "^1.1.1" }, "peerDependencies": { - "@mongodb-js/oidc-plugin": "^0.4.0", + "@mongodb-js/oidc-plugin": "^1.0.0", "mongodb": "^5.8.1 || ^6.0.0", "mongodb-log-writer": "^1.4.2" } @@ -1145,17 +1181,16 @@ "integrity": "sha512-zYkANxb4HVDN4zGuU2ud4fL+XpqRxaydCwVZyU9Mh5EhqbrCL5mGH7t3BaGnfdQUw+HVtwP3dmasc+5Hjewk+g==" }, "node_modules/@mongodb-js/oidc-plugin": { - "version": "0.4.0", - "resolved": "https://registry.npmmirror.com/@mongodb-js/oidc-plugin/-/oidc-plugin-0.4.0.tgz", - "integrity": "sha512-tinXSz6O2AmgMAgorXUcCJtDhayghkmsXVVTd5UiXhzSA/NNVtlleZXSVkG6tr46WXGzLISgVX+lUzzcEIiwJQ==", + "version": "1.0.2", + "resolved": "https://registry.npmmirror.com/@mongodb-js/oidc-plugin/-/oidc-plugin-1.0.2.tgz", + "integrity": "sha512-hwTbkmJ31RPB5ksA6pLepnaQOBz6iurE+uH89B1IIJdxVuiO0Qz+OqpTN8vk8LZzcVDb/WbNoxqxogCWwMqFKw==", "dependencies": { - "abort-controller": "^3.0.0", "express": "^4.18.2", "open": "^9.1.0", "openid-client": "^5.6.4" }, "engines": { - "node": ">= 14.18.0" + "node": ">= 16.20.1" } }, "node_modules/@mongodb-js/saslprep": { @@ -1167,12 +1202,12 @@ } }, "node_modules/@mongosh/arg-parser": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/arg-parser/-/arg-parser-2.2.6.tgz", - "integrity": "sha512-eQa3NNxgyHsExN3DQi9zCNZKTp1g0z+8CdV+RYPHpRsNXtkjESu6A30qX90UYrtoyFzDt2O7NgocDA7pDh/whw==", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/arg-parser/-/arg-parser-2.2.9.tgz", + "integrity": "sha512-Bc9v3cmhpfOG3LKRnOyZ/kfDJcQB1mNm7JWD2wJsaFBsWb4S1VXh50l23vC8HIj6vU6QYHGIAc5ikSxZ+shfyQ==", "dependencies": { - "@mongosh/errors": "2.2.6", - "@mongosh/i18n": "2.2.6", + "@mongosh/errors": "2.2.9", + "@mongosh/i18n": "2.2.9", "mongodb-connection-string-url": "^3.0.1" }, "engines": { @@ -1180,9 +1215,9 @@ } }, "node_modules/@mongosh/async-rewriter2": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/async-rewriter2/-/async-rewriter2-2.2.6.tgz", - "integrity": "sha512-EYv9MFbWuq8yCBGkSxcnt/lTbiDqrHFhReq6HgoPw4hBctS+hYd2qkroLhAUvoqv78t6PRoZcvynYb7CPOmqTA==", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/async-rewriter2/-/async-rewriter2-2.2.9.tgz", + "integrity": "sha512-JiS0VxGLoHNfLF9zox1dY0jX/3+ygdziigbTfS1AkKWt/Nmf/DURBFFjgLqs3mn3V3qYE4mUCmbeB9G1f6yMYA==", "dependencies": { "@babel/core": "^7.22.8", "@babel/plugin-transform-destructuring": "^7.22.5", @@ -1198,12 +1233,12 @@ } }, "node_modules/@mongosh/autocomplete": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/autocomplete/-/autocomplete-2.2.6.tgz", - "integrity": "sha512-d1oZZWXLOsJ1gFW1+A8Pdi+PuLALXYI3OwZOMtHSZCwSjR8DED90D9rDjUaOIZHKzTFWubUMRPonD9GQHo/hzg==", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/autocomplete/-/autocomplete-2.2.9.tgz", + "integrity": "sha512-uwBtG2bQVk6N8/A7Jjl6w/FQZKIAUrrfeBA7q4kZ6XWzBY1CKcNOG1Kq5tTrN5xp82Au+FLF0rhFBy195fas0Q==", "dependencies": { "@mongodb-js/mongodb-constants": "^0.10.1", - "@mongosh/shell-api": "2.2.6", + "@mongosh/shell-api": "2.2.9", "semver": "^7.5.4" }, "engines": { @@ -1211,25 +1246,25 @@ } }, "node_modules/@mongosh/cli-repl": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/cli-repl/-/cli-repl-2.2.6.tgz", - "integrity": "sha512-PMQdli4DyYw5HGhxjkQS2gt/UdEiAO2X34AxTa2KkG2oOQHMZJlb8UptijDvVxvYLcqXtlTqCu1ZWe33SE8LvA==", - "dependencies": { - "@mongosh/arg-parser": "2.2.6", - "@mongosh/autocomplete": "2.2.6", - "@mongosh/editor": "2.2.6", - "@mongosh/errors": "2.2.6", - "@mongosh/history": "2.2.6", - "@mongosh/i18n": "2.2.6", - "@mongosh/import-node-fetch": "2.2.6", - "@mongosh/js-multiline-to-singleline": "2.2.6", - "@mongosh/logging": "2.2.6", - "@mongosh/service-provider-core": "2.2.6", - "@mongosh/service-provider-server": "2.2.6", - "@mongosh/shell-api": "2.2.6", - "@mongosh/shell-evaluator": "2.2.6", - "@mongosh/snippet-manager": "2.2.6", - "@mongosh/types": "2.2.6", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/cli-repl/-/cli-repl-2.2.9.tgz", + "integrity": "sha512-9gcu2lG9d9aFT+KPRVXpgX84Ounpp0/uuBFln5XuZfKXZwoWbpWD7zJ3mBdzAQKyuZ5SR2x6NokGGZbEbLGhrA==", + "dependencies": { + "@mongosh/arg-parser": "2.2.9", + "@mongosh/autocomplete": "2.2.9", + "@mongosh/editor": "2.2.9", + "@mongosh/errors": "2.2.9", + "@mongosh/history": "2.2.9", + "@mongosh/i18n": "2.2.9", + "@mongosh/import-node-fetch": "2.2.9", + "@mongosh/js-multiline-to-singleline": "2.2.9", + "@mongosh/logging": "2.2.9", + "@mongosh/service-provider-core": "2.2.9", + "@mongosh/service-provider-server": "2.2.9", + "@mongosh/shell-api": "2.2.9", + "@mongosh/shell-evaluator": "2.2.9", + "@mongosh/snippet-manager": "2.2.9", + "@mongosh/types": "2.2.9", "@segment/analytics-node": "^1.3.0", "ansi-escape-sequences": "^5.1.2", "askcharacter": "^2.0.4", @@ -1254,7 +1289,7 @@ "node": ">=16.15.0" }, "optionalDependencies": { - "get-console-process-list": "^1.0.4", + "get-console-process-list": "^1.0.5", "glibc-version": "^1.0.0", "macos-export-certificate-and-key": "^1.1.2", "mongodb-crypt-library-version": "^1.0.5", @@ -1262,15 +1297,15 @@ } }, "node_modules/@mongosh/editor": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/editor/-/editor-2.2.6.tgz", - "integrity": "sha512-yqKluTpcy2u3xnuiUeikvYCDdtMjTNTPSbHD6pA0v3kNNOUb5gHDs6SeLAxO7h+7Z8uR61BD2uaYmo0qUw0r0A==", - "dependencies": { - "@mongosh/js-multiline-to-singleline": "2.2.6", - "@mongosh/service-provider-core": "2.2.6", - "@mongosh/shell-api": "2.2.6", - "@mongosh/shell-evaluator": "2.2.6", - "@mongosh/types": "2.2.6", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/editor/-/editor-2.2.9.tgz", + "integrity": "sha512-kTCgkeZBg1AYLKq65elwusyDiKeTyh5l4W3yg2yGvuzhk1I73DPsSkA+E2TWpqVgzsTeRXUbmySSMrKxx/t+mA==", + "dependencies": { + "@mongosh/js-multiline-to-singleline": "2.2.9", + "@mongosh/service-provider-core": "2.2.9", + "@mongosh/shell-api": "2.2.9", + "@mongosh/shell-evaluator": "2.2.9", + "@mongosh/types": "2.2.9", "js-beautify": "^1.15.1" }, "engines": { @@ -1278,17 +1313,17 @@ } }, "node_modules/@mongosh/errors": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/errors/-/errors-2.2.6.tgz", - "integrity": "sha512-AFsb8QUMTg7axHkuIlq8wZ0qEKgAB+r1eIQg5BfqpMGhabCdB+2QhV7/VUq/CCOcG+rdqBwLCHodp6HBcLM4HA==", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/errors/-/errors-2.2.9.tgz", + "integrity": "sha512-gN7czs7VK1OoG6H2Cq4gVVUZZPUeBxsBBKeOOFQIGy6QH5IAr4pm/w17K5dhOEoGhdH37h3WOp3dS24z/6NF0A==", "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/history": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/history/-/history-2.2.6.tgz", - "integrity": "sha512-3TuXFo8M0l21EUTYa+sYHqxzRfy8jM/ghlFme3FeLeDPkjahDPieoOwjxZtEorxuojrvKXvFKwJ+FRGrO2hIIg==", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/history/-/history-2.2.9.tgz", + "integrity": "sha512-Irm8s2z48T+OMADrmJSe+xvCXMkPUCCTltGgVY3w+vm42ftfd6k3ZXGlVu+j/QNCp1D4HmRLDY6RmnQLFb2IUw==", "dependencies": { "mongodb-connection-string-url": "^3.0.1", "mongodb-redact": "^0.2.3" @@ -1298,20 +1333,20 @@ } }, "node_modules/@mongosh/i18n": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/i18n/-/i18n-2.2.6.tgz", - "integrity": "sha512-q0bfuI0tQmS+CHJNXBDF34Dlf5jeHYG8RUPawxkYtgvP6WvuFpDbxyog2iN//jZSruIvulqd9gBffhCbbn+IbQ==", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/i18n/-/i18n-2.2.9.tgz", + "integrity": "sha512-AhEEAHV/2ytZ1swDV7VmKYt4D0P+2pqf8khR3OwOg5RJ0Cx8vRS4RdWvszxKeA26s2zlPMRiherwPTdAEc5zww==", "dependencies": { - "@mongosh/errors": "2.2.6" + "@mongosh/errors": "2.2.9" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/import-node-fetch": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/import-node-fetch/-/import-node-fetch-2.2.6.tgz", - "integrity": "sha512-zQmSYu8NEzYyNQkZ82uMC2auVJIBorfuT/NWGxIkkZozc0eljkJEtgkNiAw6f17gEFzyk7fE46r091SHcXjXUw==", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/import-node-fetch/-/import-node-fetch-2.2.9.tgz", + "integrity": "sha512-YbC6nJjnR1kSOZHVD/8gx6hh8eZkkZ9r4M9NFyDTTynbKgZNCwMtFBtl10zYsNMLJOCKW6o8vJ2YFsBLdZNyww==", "dependencies": { "node-fetch": "^3.3.2" }, @@ -1320,9 +1355,9 @@ } }, "node_modules/@mongosh/js-multiline-to-singleline": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.2.6.tgz", - "integrity": "sha512-M5ak3Sxd2sLQtI3mV5ubQv0vo3YsJlvRaFCvmeQQgGTDT76gwrlYf/f6qDlR6jdIHVELO5cgx4gMDdoSWGQpCw==", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.2.9.tgz", + "integrity": "sha512-3EPqCQ64zwqR7PpdITBd3e8grpnwE7XIohuVbYXNo48Hlnz0Gdc8QAjSwQF2LO51ozCmPVcrQqCjVuLjdtPBUA==", "dependencies": { "@babel/core": "^7.16.12", "@babel/types": "^7.21.2" @@ -1332,14 +1367,14 @@ } }, "node_modules/@mongosh/logging": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/logging/-/logging-2.2.6.tgz", - "integrity": "sha512-D+H6T9OyQJsoUd58hSXxyRbcgM1hPcq5FqwUqUwlYnl9qKMj7W9004JaTBQPu2nYdYcdJvTGqIo9s+8IMGXB2g==", - "dependencies": { - "@mongodb-js/devtools-connect": "^2.6.3", - "@mongosh/errors": "2.2.6", - "@mongosh/history": "2.2.6", - "@mongosh/types": "2.2.6", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/logging/-/logging-2.2.9.tgz", + "integrity": "sha512-/LvJ3Rk2B5Po7JkG/suZIaJybAzCUSvNGRmobwR6HeDJ4RwKMKvPUJrUYu1GXXQqdLNDXH2o9eEWojMk/IA3LQ==", + "dependencies": { + "@mongodb-js/devtools-connect": "^3.0.1", + "@mongosh/errors": "2.2.9", + "@mongosh/history": "2.2.9", + "@mongosh/types": "2.2.9", "mongodb-log-writer": "^1.4.2", "mongodb-redact": "^0.2.3" }, @@ -1348,14 +1383,14 @@ } }, "node_modules/@mongosh/service-provider-core": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-core/-/service-provider-core-2.2.6.tgz", - "integrity": "sha512-Q1NasVJc8sq+32NLVPQymLiyTsjP4Z4AsALA4IYV8dDzSlpBt8zWFnAWRGAFxLwRRR89TpqN3n1Fj9oR7DFUXw==", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-core/-/service-provider-core-2.2.9.tgz", + "integrity": "sha512-QJ+4TBD30C3cGoKoBtGOH82RVTKNMcBG1vhs8rfRheajivMLEBka2Hk/49R6yv9lhSfwgueH57+6EFNdqVFgSQ==", "dependencies": { "@aws-sdk/credential-providers": "^3.525.0", - "@mongosh/errors": "2.2.6", + "@mongosh/errors": "2.2.9", "bson": "^6.7.0", - "mongodb": "^6.6.2", + "mongodb": "^6.7.0", "mongodb-build-info": "^1.7.2" }, "engines": { @@ -1366,17 +1401,17 @@ } }, "node_modules/@mongosh/service-provider-server": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-server/-/service-provider-server-2.2.6.tgz", - "integrity": "sha512-/4ynmXCKqhz3lSeZ1ybVvFWfYJ21HXAactY9BguPwzI2TGb/g2LcboU86DrVDmxe4+Odg8L0pH7ICIRhlaxjFg==", - "dependencies": { - "@mongodb-js/devtools-connect": "^2.6.3", - "@mongodb-js/oidc-plugin": "^0.4.0", - "@mongosh/errors": "2.2.6", - "@mongosh/service-provider-core": "2.2.6", - "@mongosh/types": "2.2.6", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-server/-/service-provider-server-2.2.9.tgz", + "integrity": "sha512-G4pXkwvvlnFW5sLQAbgDwqpt0tBJHlsQPJN+eMT9N6gRtEnhxAnOuOGA4zKTcaOZN2bTnzd6F7Yu5Z5AOOVXUA==", + "dependencies": { + "@mongodb-js/devtools-connect": "^3.0.1", + "@mongodb-js/oidc-plugin": "^1.0.2", + "@mongosh/errors": "2.2.9", + "@mongosh/service-provider-core": "2.2.9", + "@mongosh/types": "2.2.9", "aws4": "^1.12.0", - "mongodb": "^6.6.2", + "mongodb": "^6.7.0", "mongodb-connection-string-url": "^3.0.1", "socks": "^2.8.3" }, @@ -1389,15 +1424,15 @@ } }, "node_modules/@mongosh/shell-api": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/shell-api/-/shell-api-2.2.6.tgz", - "integrity": "sha512-hwIG3Urj+/IyhuIknQXTWUWQ6aNDda+2xMd3a5psk7WRVYo5BRNT+kBk3QkUXIVUOJ+yNIFomPcd2f4t1zFoOg==", - "dependencies": { - "@mongosh/arg-parser": "2.2.6", - "@mongosh/errors": "2.2.6", - "@mongosh/history": "2.2.6", - "@mongosh/i18n": "2.2.6", - "@mongosh/service-provider-core": "2.2.6", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/shell-api/-/shell-api-2.2.9.tgz", + "integrity": "sha512-1Wo2RJ1vpYY/LRKKyIgl9vn7nycBVpO+iAaOFRSI0VxcW7dujROIm+XLBzqvJql/0qeqfnQGXv+jCTb13emduw==", + "dependencies": { + "@mongosh/arg-parser": "2.2.9", + "@mongosh/errors": "2.2.9", + "@mongosh/history": "2.2.9", + "@mongosh/i18n": "2.2.9", + "@mongosh/service-provider-core": "2.2.9", "mongodb-redact": "^0.2.3" }, "engines": { @@ -1405,27 +1440,27 @@ } }, "node_modules/@mongosh/shell-evaluator": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/shell-evaluator/-/shell-evaluator-2.2.6.tgz", - "integrity": "sha512-1R9017ia8mVtFcUtuGiiYe4E1fkwIjtB9dSYeo30GLUGZTAo79GJqHsYDVtC/UNRk2Fb6wCq8/jPi1/r/B9ATg==", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/shell-evaluator/-/shell-evaluator-2.2.9.tgz", + "integrity": "sha512-p56jKPaRfFKT4yW3FrmLeawy/8qL7x2q9Gx88e0iJhBI3ybft0dQ1tWvX3mMg6YxZGNsDeHgPSAwNlFAy3lxiQ==", "dependencies": { - "@mongosh/async-rewriter2": "2.2.6", - "@mongosh/history": "2.2.6", - "@mongosh/shell-api": "2.2.6" + "@mongosh/async-rewriter2": "2.2.9", + "@mongosh/history": "2.2.9", + "@mongosh/shell-api": "2.2.9" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/snippet-manager": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/snippet-manager/-/snippet-manager-2.2.6.tgz", - "integrity": "sha512-kl2Y6AF3R7BMjUshzPywI5vkf8HOAR5jKlKt18pkkWdOleQ45+X0BVWpiLpBmZXZZGamaa3u20z9qtzuO/HPtQ==", - "dependencies": { - "@mongosh/errors": "2.2.6", - "@mongosh/import-node-fetch": "2.2.6", - "@mongosh/shell-api": "2.2.6", - "@mongosh/types": "2.2.6", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/snippet-manager/-/snippet-manager-2.2.9.tgz", + "integrity": "sha512-JG9Svfoh1z30U7mwbojx0Wm2BkVd6wqqkkpxucgJ9ba2DG7VvgN4iez6HQa+eA3KmMKVII7IzYnt/J0gOum80g==", + "dependencies": { + "@mongosh/errors": "2.2.9", + "@mongosh/import-node-fetch": "2.2.9", + "@mongosh/shell-api": "2.2.9", + "@mongosh/types": "2.2.9", "bson": "^6.7.0", "cross-spawn": "^7.0.3", "escape-string-regexp": "^4.0.0", @@ -1437,11 +1472,11 @@ } }, "node_modules/@mongosh/types": { - "version": "2.2.6", - "resolved": "https://registry.npmmirror.com/@mongosh/types/-/types-2.2.6.tgz", - "integrity": "sha512-+QcymQR4eqdrxhecgmeiZja794M4kuASJn7r8clDgWTBHTSdxyiq3S8bNuNekJU0h2rdcGJZepGnQbV6PBmSww==", + "version": "2.2.9", + "resolved": "https://registry.npmmirror.com/@mongosh/types/-/types-2.2.9.tgz", + "integrity": "sha512-Vo91tPc24nrybDsE/wQXbKynB3VC8BvF+yallZpMvLNtckr5q7nTuaTBWG5Er1myPA5MQhZm6DgpsIWR1YnGgg==", "dependencies": { - "@mongodb-js/devtools-connect": "^2.6.3" + "@mongodb-js/devtools-connect": "^3.0.1" }, "engines": { "node": ">=14.15.1" @@ -1553,11 +1588,11 @@ "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==" }, "node_modules/@smithy/abort-controller": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/abort-controller/-/abort-controller-3.0.0.tgz", - "integrity": "sha512-p6GlFGBt9K4MYLu72YuJ523NVR4A8oHlC5M2JO6OmQqN8kAc/uh1JqLE+FizTokrSJGg0CSvC+BrsmGzKtsZKA==", + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/@smithy/abort-controller/-/abort-controller-3.0.1.tgz", + "integrity": "sha512-Jb7jg4E+C+uvrUQi+h9kbILY6ts6fglKZzseMCHlH9ayq+1f5QdpYf8MV/xppuiN6DAMJAmwGz53GwP3213dmA==", "dependencies": { - "@smithy/types": "^3.0.0", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -1565,14 +1600,14 @@ } }, "node_modules/@smithy/config-resolver": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/config-resolver/-/config-resolver-3.0.0.tgz", - "integrity": "sha512-2GzOfADwYLQugYkKQhIyZyQlM05K+tMKvRnc6eFfZcpJGRfKoMUMYdPlBKmqHwQFXQKBrGV6cxL9oymWgDzvFw==", + "version": "3.0.2", + "resolved": "https://registry.npmmirror.com/@smithy/config-resolver/-/config-resolver-3.0.2.tgz", + "integrity": "sha512-wUyG6ezpp2sWAvfqmSYTROwFUmJqKV78GLf55WODrosBcT0BAMd9bOLO4HRhynWBgAobPml2cF9ZOdgCe00r+g==", "dependencies": { - "@smithy/node-config-provider": "^3.0.0", - "@smithy/types": "^3.0.0", + "@smithy/node-config-provider": "^3.1.1", + "@smithy/types": "^3.1.0", "@smithy/util-config-provider": "^3.0.0", - "@smithy/util-middleware": "^3.0.0", + "@smithy/util-middleware": "^3.0.1", "tslib": "^2.6.2" }, "engines": { @@ -1580,17 +1615,17 @@ } }, "node_modules/@smithy/core": { - "version": "2.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/core/-/core-2.0.1.tgz", - "integrity": "sha512-rcMkjvwxH/bER+oZUPR0yTA0ELD6m3A+d92+CFkdF6HJFCBB1bXo7P5pm21L66XwTN01B6bUhSCQ7cymWRD8zg==", - "dependencies": { - "@smithy/middleware-endpoint": "^3.0.0", - "@smithy/middleware-retry": "^3.0.1", - "@smithy/middleware-serde": "^3.0.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/smithy-client": "^3.0.1", - "@smithy/types": "^3.0.0", - "@smithy/util-middleware": "^3.0.0", + "version": "2.2.2", + "resolved": "https://registry.npmmirror.com/@smithy/core/-/core-2.2.2.tgz", + "integrity": "sha512-bxZr4ZTqS6hMSQGYdcsfFQTFU0MO2xKLbkqZMSRDM+ruQ0nY00lFJUeLhXe7fqohSEd1y5wKu1Ap0bVJPzpmHg==", + "dependencies": { + "@smithy/middleware-endpoint": "^3.0.2", + "@smithy/middleware-retry": "^3.0.5", + "@smithy/middleware-serde": "^3.0.1", + "@smithy/protocol-http": "^4.0.1", + "@smithy/smithy-client": "^3.1.3", + "@smithy/types": "^3.1.0", + "@smithy/util-middleware": "^3.0.1", "tslib": "^2.6.2" }, "engines": { @@ -1598,14 +1633,14 @@ } }, "node_modules/@smithy/credential-provider-imds": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/credential-provider-imds/-/credential-provider-imds-3.0.0.tgz", - "integrity": "sha512-lfmBiFQcA3FsDAPxNfY0L7CawcWtbyWsBOHo34nF095728JLkBX4Y9q/VPPE2r7fqMVK+drmDigqE2/SSQeVRA==", + "version": "3.1.1", + "resolved": "https://registry.npmmirror.com/@smithy/credential-provider-imds/-/credential-provider-imds-3.1.1.tgz", + "integrity": "sha512-htndP0LwHdE3R3Nam9ZyVWhwPYOmD4xCL79kqvNxy8u/bv0huuy574CSiRY4cvEICgimv8jlVfLeZ7zZqbnB2g==", "dependencies": { - "@smithy/node-config-provider": "^3.0.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/types": "^3.0.0", - "@smithy/url-parser": "^3.0.0", + "@smithy/node-config-provider": "^3.1.1", + "@smithy/property-provider": "^3.1.1", + "@smithy/types": "^3.1.0", + "@smithy/url-parser": "^3.0.1", "tslib": "^2.6.2" }, "engines": { @@ -1613,23 +1648,23 @@ } }, "node_modules/@smithy/fetch-http-handler": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/fetch-http-handler/-/fetch-http-handler-3.0.1.tgz", - "integrity": "sha512-uaH74i5BDj+rBwoQaXioKpI0SHBJFtOVwzrCpxZxphOW0ki5jhj7dXvDMYM2IJem8TpdFvS2iC08sjOblfFGFg==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/fetch-http-handler/-/fetch-http-handler-3.0.3.tgz", + "integrity": "sha512-31x2MokxJL/u5U/BdElvVRotOGjUcOOvI2pb5TZ02umBLw+vVHImiLn+khbN0SblaFXNRzPoGrKwXylNjV3skw==", "dependencies": { - "@smithy/protocol-http": "^4.0.0", - "@smithy/querystring-builder": "^3.0.0", - "@smithy/types": "^3.0.0", + "@smithy/protocol-http": "^4.0.1", + "@smithy/querystring-builder": "^3.0.1", + "@smithy/types": "^3.1.0", "@smithy/util-base64": "^3.0.0", "tslib": "^2.6.2" } }, "node_modules/@smithy/hash-node": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/hash-node/-/hash-node-3.0.0.tgz", - "integrity": "sha512-84qXstNemP3XS5jcof0el6+bDfjzuvhJPQTEfro3lgtbCtKgzPm3MgiS6ehXVPjeQ5+JS0HqmTz8f/RYfzHVxw==", + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/@smithy/hash-node/-/hash-node-3.0.1.tgz", + "integrity": "sha512-w2ncjgk2EYO2+WhAsSQA8owzoOSY7IL1qVytlwpnL1pFGWTjIoIh5nROkEKXY51unB63bMGZqDiVoXaFbyKDlg==", "dependencies": { - "@smithy/types": "^3.0.0", + "@smithy/types": "^3.1.0", "@smithy/util-buffer-from": "^3.0.0", "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" @@ -1639,11 +1674,11 @@ } }, "node_modules/@smithy/invalid-dependency": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/invalid-dependency/-/invalid-dependency-3.0.0.tgz", - "integrity": "sha512-F6wBBaEFgJzj0s4KUlliIGPmqXemwP6EavgvDqYwCH40O5Xr2iMHvS8todmGVZtuJCorBkXsYLyTu4PuizVq5g==", + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/@smithy/invalid-dependency/-/invalid-dependency-3.0.1.tgz", + "integrity": "sha512-RSNF/32BKygXKKMyS7koyuAq1rcdW5p5c4EFa77QenBFze9As+JiRnV9OWBh2cB/ejGZalEZjvIrMLHwJl7aGA==", "dependencies": { - "@smithy/types": "^3.0.0", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" } }, @@ -1659,12 +1694,12 @@ } }, "node_modules/@smithy/middleware-content-length": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-content-length/-/middleware-content-length-3.0.0.tgz", - "integrity": "sha512-3C4s4d/iGobgCtk2tnWW6+zSTOBg1PRAm2vtWZLdriwTroFbbWNSr3lcyzHdrQHnEXYCC5K52EbpfodaIUY8sg==", + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/@smithy/middleware-content-length/-/middleware-content-length-3.0.1.tgz", + "integrity": "sha512-6QdK/VbrCfXD5/QolE2W/ok6VqxD+SM28Ds8iSlEHXZwv4buLsvWyvoEEy0322K/g5uFgPzBmZjGqesTmPL+yQ==", "dependencies": { - "@smithy/protocol-http": "^4.0.0", - "@smithy/types": "^3.0.0", + "@smithy/protocol-http": "^4.0.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -1672,16 +1707,16 @@ } }, "node_modules/@smithy/middleware-endpoint": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-endpoint/-/middleware-endpoint-3.0.0.tgz", - "integrity": "sha512-aXOAWztw/5qAfp0NcA2OWpv6ZI/E+Dh9mByif7i91D/0iyYNUcKvskmXiowKESFkuZ7PIMd3VOR4fTibZDs2OQ==", - "dependencies": { - "@smithy/middleware-serde": "^3.0.0", - "@smithy/node-config-provider": "^3.0.0", - "@smithy/shared-ini-file-loader": "^3.0.0", - "@smithy/types": "^3.0.0", - "@smithy/url-parser": "^3.0.0", - "@smithy/util-middleware": "^3.0.0", + "version": "3.0.2", + "resolved": "https://registry.npmmirror.com/@smithy/middleware-endpoint/-/middleware-endpoint-3.0.2.tgz", + "integrity": "sha512-gWEaGYB3Bei17Oiy/F2IlUPpBazNXImytoOdJ1xbrUOaJKAOiUhx8/4FOnYLLJHdAwa9PlvJ2ULda2f/Dnwi9w==", + "dependencies": { + "@smithy/middleware-serde": "^3.0.1", + "@smithy/node-config-provider": "^3.1.1", + "@smithy/shared-ini-file-loader": "^3.1.1", + "@smithy/types": "^3.1.0", + "@smithy/url-parser": "^3.0.1", + "@smithy/util-middleware": "^3.0.1", "tslib": "^2.6.2" }, "engines": { @@ -1689,17 +1724,17 @@ } }, "node_modules/@smithy/middleware-retry": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-retry/-/middleware-retry-3.0.1.tgz", - "integrity": "sha512-hBhSEuL841FhJBK/19WpaGk5YWSzFk/P2UaVjANGKRv3eYNO8Y1lANWgqnuPWjOyCEWMPr58vELFDWpxvRKANw==", - "dependencies": { - "@smithy/node-config-provider": "^3.0.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/service-error-classification": "^3.0.0", - "@smithy/smithy-client": "^3.0.1", - "@smithy/types": "^3.0.0", - "@smithy/util-middleware": "^3.0.0", - "@smithy/util-retry": "^3.0.0", + "version": "3.0.5", + "resolved": "https://registry.npmmirror.com/@smithy/middleware-retry/-/middleware-retry-3.0.5.tgz", + "integrity": "sha512-nKAmmea9Wm0d94obPqVgjxW2zzaNemxcTzjgd17LhGKI23D66UQKI5gpoWDsnE+R4tfuZe9dCcw8gmTVEwFpRA==", + "dependencies": { + "@smithy/node-config-provider": "^3.1.1", + "@smithy/protocol-http": "^4.0.1", + "@smithy/service-error-classification": "^3.0.1", + "@smithy/smithy-client": "^3.1.3", + "@smithy/types": "^3.1.0", + "@smithy/util-middleware": "^3.0.1", + "@smithy/util-retry": "^3.0.1", "tslib": "^2.6.2", "uuid": "^9.0.1" }, @@ -1708,11 +1743,11 @@ } }, "node_modules/@smithy/middleware-serde": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-serde/-/middleware-serde-3.0.0.tgz", - "integrity": "sha512-I1vKG1foI+oPgG9r7IMY1S+xBnmAn1ISqployvqkwHoSb8VPsngHDTOgYGYBonuOKndaWRUGJZrKYYLB+Ane6w==", + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/@smithy/middleware-serde/-/middleware-serde-3.0.1.tgz", + "integrity": "sha512-ak6H/ZRN05r5+SR0/IUc5zOSyh2qp3HReg1KkrnaSLXmncy9lwOjNqybX4L4x55/e5mtVDn1uf/gQ6bw5neJPw==", "dependencies": { - "@smithy/types": "^3.0.0", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -1720,11 +1755,11 @@ } }, "node_modules/@smithy/middleware-stack": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-stack/-/middleware-stack-3.0.0.tgz", - "integrity": "sha512-+H0jmyfAyHRFXm6wunskuNAqtj7yfmwFB6Fp37enytp2q047/Od9xetEaUbluyImOlGnGpaVGaVfjwawSr+i6Q==", + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/@smithy/middleware-stack/-/middleware-stack-3.0.1.tgz", + "integrity": "sha512-fS5uT//y1SlBdkzIvgmWQ9FufwMXrHSSbuR25ygMy1CRDIZkcBMoF4oTMYNfR9kBlVBcVzlv7joFdNrFuQirPA==", "dependencies": { - "@smithy/types": "^3.0.0", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -1732,13 +1767,13 @@ } }, "node_modules/@smithy/node-config-provider": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/node-config-provider/-/node-config-provider-3.0.0.tgz", - "integrity": "sha512-buqfaSdDh0zo62EPLf8rGDvcpKwGpO5ho4bXS2cdFhlOta7tBkWJt+O5uiaAeICfIOfPclNOndshDNSanX2X9g==", + "version": "3.1.1", + "resolved": "https://registry.npmmirror.com/@smithy/node-config-provider/-/node-config-provider-3.1.1.tgz", + "integrity": "sha512-z5G7+ysL4yUtMghUd2zrLkecu0mTfnYlt5dR76g/HsFqf7evFazwiZP1ag2EJenGxNBDwDM5g8nm11NPogiUVA==", "dependencies": { - "@smithy/property-provider": "^3.0.0", - "@smithy/shared-ini-file-loader": "^3.0.0", - "@smithy/types": "^3.0.0", + "@smithy/property-provider": "^3.1.1", + "@smithy/shared-ini-file-loader": "^3.1.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -1746,14 +1781,14 @@ } }, "node_modules/@smithy/node-http-handler": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/node-http-handler/-/node-http-handler-3.0.0.tgz", - "integrity": "sha512-3trD4r7NOMygwLbUJo4eodyQuypAWr7uvPnebNJ9a70dQhVn+US8j/lCnvoJS6BXfZeF7PkkkI0DemVJw+n+eQ==", + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/@smithy/node-http-handler/-/node-http-handler-3.0.1.tgz", + "integrity": "sha512-hlBI6MuREA4o1wBMEt+QNhUzoDtFFvwR6ecufimlx9D79jPybE/r8kNorphXOi91PgSO9S2fxRjcKCLk7Jw8zA==", "dependencies": { - "@smithy/abort-controller": "^3.0.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/querystring-builder": "^3.0.0", - "@smithy/types": "^3.0.0", + "@smithy/abort-controller": "^3.0.1", + "@smithy/protocol-http": "^4.0.1", + "@smithy/querystring-builder": "^3.0.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -1761,11 +1796,11 @@ } }, "node_modules/@smithy/property-provider": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/property-provider/-/property-provider-3.0.0.tgz", - "integrity": "sha512-LmbPgHBswdXCrkWWuUwBm9w72S2iLWyC/5jet9/Y9cGHtzqxi+GVjfCfahkvNV4KXEwgnH8EMpcrD9RUYe0eLQ==", + "version": "3.1.1", + "resolved": "https://registry.npmmirror.com/@smithy/property-provider/-/property-provider-3.1.1.tgz", + "integrity": "sha512-YknOMZcQkB5on+MU0DvbToCmT2YPtTETMXW0D3+/Iln7ezT+Zm1GMHhCW1dOH/X/+LkkQD9aXEoCX/B10s4Xdw==", "dependencies": { - "@smithy/types": "^3.0.0", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -1773,11 +1808,11 @@ } }, "node_modules/@smithy/protocol-http": { - "version": "4.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/protocol-http/-/protocol-http-4.0.0.tgz", - "integrity": "sha512-qOQZOEI2XLWRWBO9AgIYuHuqjZ2csyr8/IlgFDHDNuIgLAMRx2Bl8ck5U5D6Vh9DPdoaVpuzwWMa0xcdL4O/AQ==", + "version": "4.0.1", + "resolved": "https://registry.npmmirror.com/@smithy/protocol-http/-/protocol-http-4.0.1.tgz", + "integrity": "sha512-eBhm9zwcFPEazc654c0BEWtxYAzrw+OhoSf5pkwKzfftWKXRoqEhwOE2Pvn30v0iAdo7Mfsfb6pi1NnZlGCMpg==", "dependencies": { - "@smithy/types": "^3.0.0", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -1785,11 +1820,11 @@ } }, "node_modules/@smithy/querystring-builder": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/querystring-builder/-/querystring-builder-3.0.0.tgz", - "integrity": "sha512-bW8Fi0NzyfkE0TmQphDXr1AmBDbK01cA4C1Z7ggwMAU5RDz5AAv/KmoRwzQAS0kxXNf/D2ALTEgwK0U2c4LtRg==", + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/@smithy/querystring-builder/-/querystring-builder-3.0.1.tgz", + "integrity": "sha512-vKitpnG/2KOMVlx3x1S3FkBH075EROG3wcrcDaNerQNh8yuqnSL23btCD2UyX4i4lpPzNW6VFdxbn2Z25b/g5Q==", "dependencies": { - "@smithy/types": "^3.0.0", + "@smithy/types": "^3.1.0", "@smithy/util-uri-escape": "^3.0.0", "tslib": "^2.6.2" }, @@ -1798,11 +1833,11 @@ } }, "node_modules/@smithy/querystring-parser": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/querystring-parser/-/querystring-parser-3.0.0.tgz", - "integrity": "sha512-UzHwthk0UEccV4dHzPySnBy34AWw3V9lIqUTxmozQ+wPDAO9csCWMfOLe7V9A2agNYy7xE+Pb0S6K/J23JSzfQ==", + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/@smithy/querystring-parser/-/querystring-parser-3.0.1.tgz", + "integrity": "sha512-Qt8DMC05lVS8NcQx94lfVbZSX+2Ym7032b/JR8AlboAa/D669kPzqb35dkjkvAG6+NWmUchef3ENtrD6F+5n8Q==", "dependencies": { - "@smithy/types": "^3.0.0", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -1810,22 +1845,22 @@ } }, "node_modules/@smithy/service-error-classification": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/service-error-classification/-/service-error-classification-3.0.0.tgz", - "integrity": "sha512-3BsBtOUt2Gsnc3X23ew+r2M71WwtpHfEDGhHYHSDg6q1t8FrWh15jT25DLajFV1H+PpxAJ6gqe9yYeRUsmSdFA==", + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/@smithy/service-error-classification/-/service-error-classification-3.0.1.tgz", + "integrity": "sha512-ubFUvIePjDCyIzZ+pLETqNC6KXJ/fc6g+/baqel7Zf6kJI/kZKgjwkCI7zbUhoUuOZ/4eA/87YasVu40b/B4bA==", "dependencies": { - "@smithy/types": "^3.0.0" + "@smithy/types": "^3.1.0" }, "engines": { "node": ">=16.0.0" } }, "node_modules/@smithy/shared-ini-file-loader": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.0.0.tgz", - "integrity": "sha512-REVw6XauXk8xE4zo5aGL7Rz4ywA8qNMUn8RtWeTRQsgAlmlvbJ7CEPBcaXU2NDC3AYBgYAXrGyWD8XrN8UGDog==", + "version": "3.1.1", + "resolved": "https://registry.npmmirror.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.1.tgz", + "integrity": "sha512-nD6tXIX2126/P9e3wqRY1bm9dTtPZwRDyjVOd18G28o+1UOG+kOVgUwujE795HslSuPlEgqzsH5sgNP1hDjj9g==", "dependencies": { - "@smithy/types": "^3.0.0", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -1833,14 +1868,14 @@ } }, "node_modules/@smithy/signature-v4": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/signature-v4/-/signature-v4-3.0.0.tgz", - "integrity": "sha512-kXFOkNX+BQHe2qnLxpMEaCRGap9J6tUGLzc3A9jdn+nD4JdMwCKTJ+zFwQ20GkY+mAXGatyTw3HcoUlR39HwmA==", + "version": "3.1.0", + "resolved": "https://registry.npmmirror.com/@smithy/signature-v4/-/signature-v4-3.1.0.tgz", + "integrity": "sha512-m0/6LW3IQ3/JBcdhqjpkpABPTPhcejqeAn0U877zxBdNLiWAnG2WmCe5MfkUyVuvpFTPQnQwCo/0ZBR4uF5kxg==", "dependencies": { "@smithy/is-array-buffer": "^3.0.0", - "@smithy/types": "^3.0.0", + "@smithy/types": "^3.1.0", "@smithy/util-hex-encoding": "^3.0.0", - "@smithy/util-middleware": "^3.0.0", + "@smithy/util-middleware": "^3.0.1", "@smithy/util-uri-escape": "^3.0.0", "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" @@ -1850,15 +1885,15 @@ } }, "node_modules/@smithy/smithy-client": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/smithy-client/-/smithy-client-3.0.1.tgz", - "integrity": "sha512-KAiFY4Y4jdHxR+4zerH/VBhaFKM8pbaVmJZ/CWJRwtM/CmwzTfXfvYwf6GoUwiHepdv+lwiOXCuOl6UBDUEINw==", - "dependencies": { - "@smithy/middleware-endpoint": "^3.0.0", - "@smithy/middleware-stack": "^3.0.0", - "@smithy/protocol-http": "^4.0.0", - "@smithy/types": "^3.0.0", - "@smithy/util-stream": "^3.0.1", + "version": "3.1.3", + "resolved": "https://registry.npmmirror.com/@smithy/smithy-client/-/smithy-client-3.1.3.tgz", + "integrity": "sha512-YVz+akpR5lIIRPJfhE4sqoHYwMys6/33vsFvDof+71FCwa4jkVfMpzKv9TKrG/EDb5TV+YtjdXkwywdqlUOQXA==", + "dependencies": { + "@smithy/middleware-endpoint": "^3.0.2", + "@smithy/middleware-stack": "^3.0.1", + "@smithy/protocol-http": "^4.0.1", + "@smithy/types": "^3.1.0", + "@smithy/util-stream": "^3.0.3", "tslib": "^2.6.2" }, "engines": { @@ -1866,9 +1901,9 @@ } }, "node_modules/@smithy/types": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/types/-/types-3.0.0.tgz", - "integrity": "sha512-VvWuQk2RKFuOr98gFhjca7fkBS+xLLURT8bUjk5XQoV0ZLm7WPwWPPY3/AwzTLuUBDeoKDCthfe1AsTUWaSEhw==", + "version": "3.1.0", + "resolved": "https://registry.npmmirror.com/@smithy/types/-/types-3.1.0.tgz", + "integrity": "sha512-qi4SeCVOUPjhSSZrxxB/mB8DrmuSFUcJnD9KXjuP+7C3LV/KFV4kpuUSH3OHDZgQB9TEH/1sO/Fq/5HyaK9MPw==", "dependencies": { "tslib": "^2.6.2" }, @@ -1877,12 +1912,12 @@ } }, "node_modules/@smithy/url-parser": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/url-parser/-/url-parser-3.0.0.tgz", - "integrity": "sha512-2XLazFgUu+YOGHtWihB3FSLAfCUajVfNBXGGYjOaVKjLAuAxx3pSBY3hBgLzIgB17haf59gOG3imKqTy8mcrjw==", + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/@smithy/url-parser/-/url-parser-3.0.1.tgz", + "integrity": "sha512-G140IlNFlzYWVCedC4E2d6NycM1dCUbe5CnsGW1hmGt4hYKiGOw0v7lVru9WAn5T2w09QEjl4fOESWjGmCvVmg==", "dependencies": { - "@smithy/querystring-parser": "^3.0.0", - "@smithy/types": "^3.0.0", + "@smithy/querystring-parser": "^3.0.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" } }, @@ -1942,13 +1977,13 @@ } }, "node_modules/@smithy/util-defaults-mode-browser": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.1.tgz", - "integrity": "sha512-nW5kEzdJn1Bn5TF+gOPHh2rcPli8JU9vSSXLbfg7uPnfR1TMRQqs9zlYRhIb87NeSxIbpdXOI94tvXSy+fvDYg==", + "version": "3.0.5", + "resolved": "https://registry.npmmirror.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.5.tgz", + "integrity": "sha512-VZkJ+bXCHcNSMhX8EReGyFcc/Err94YGqeEKbbxkVz2TgKlacsoplpi+kxOMVbQq/tq9sQx5ajBKG+nl2GNuxw==", "dependencies": { - "@smithy/property-provider": "^3.0.0", - "@smithy/smithy-client": "^3.0.1", - "@smithy/types": "^3.0.0", + "@smithy/property-provider": "^3.1.1", + "@smithy/smithy-client": "^3.1.3", + "@smithy/types": "^3.1.0", "bowser": "^2.11.0", "tslib": "^2.6.2" }, @@ -1957,16 +1992,16 @@ } }, "node_modules/@smithy/util-defaults-mode-node": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.1.tgz", - "integrity": "sha512-TFk+Qb+elLc/MOhtSp+50fstyfZ6avQbgH2d96xUBpeScu+Al9elxv+UFAjaTHe0HQe5n+wem8ZLpXvU8lwV6Q==", - "dependencies": { - "@smithy/config-resolver": "^3.0.0", - "@smithy/credential-provider-imds": "^3.0.0", - "@smithy/node-config-provider": "^3.0.0", - "@smithy/property-provider": "^3.0.0", - "@smithy/smithy-client": "^3.0.1", - "@smithy/types": "^3.0.0", + "version": "3.0.5", + "resolved": "https://registry.npmmirror.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.5.tgz", + "integrity": "sha512-jy19cFQA0k4f8VUDFsZVBey3rmI8EuXCw/xh/abdiq6S1qdwdfZ5coviuyYd//LPszf2yWIYkLpvmLF9qbhLGg==", + "dependencies": { + "@smithy/config-resolver": "^3.0.2", + "@smithy/credential-provider-imds": "^3.1.1", + "@smithy/node-config-provider": "^3.1.1", + "@smithy/property-provider": "^3.1.1", + "@smithy/smithy-client": "^3.1.3", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -1974,12 +2009,12 @@ } }, "node_modules/@smithy/util-endpoints": { - "version": "2.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/util-endpoints/-/util-endpoints-2.0.0.tgz", - "integrity": "sha512-+exaXzEY3DNt2qtA2OtRNSDlVrE4p32j1JSsQkzA5AdP0YtJNjkYbYhJxkFmPYcjI1abuwopOZCwUmv682QkiQ==", + "version": "2.0.2", + "resolved": "https://registry.npmmirror.com/@smithy/util-endpoints/-/util-endpoints-2.0.2.tgz", + "integrity": "sha512-4zFOcBFQvifd2LSD4a1dKvfIWWwh4sWNtS3oZ7mpob/qPPmJseqKB148iT+hWCDsG//TmI+8vjYPgZdvnkYlTg==", "dependencies": { - "@smithy/node-config-provider": "^3.0.0", - "@smithy/types": "^3.0.0", + "@smithy/node-config-provider": "^3.1.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -1998,11 +2033,11 @@ } }, "node_modules/@smithy/util-middleware": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/util-middleware/-/util-middleware-3.0.0.tgz", - "integrity": "sha512-q5ITdOnV2pXHSVDnKWrwgSNTDBAMHLptFE07ua/5Ty5WJ11bvr0vk2a7agu7qRhrCFRQlno5u3CneU5EELK+DQ==", + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/@smithy/util-middleware/-/util-middleware-3.0.1.tgz", + "integrity": "sha512-WRODCQtUsO7vIvfrdxS8RFPeLKcewYtaCglZsBsedIKSUGIIvMlZT5oh+pCe72I+1L+OjnZuqRNpN2LKhWA4KQ==", "dependencies": { - "@smithy/types": "^3.0.0", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -2010,12 +2045,12 @@ } }, "node_modules/@smithy/util-retry": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/@smithy/util-retry/-/util-retry-3.0.0.tgz", - "integrity": "sha512-nK99bvJiziGv/UOKJlDvFF45F00WgPLKVIGUfAK+mDhzVN2hb/S33uW2Tlhg5PVBoqY7tDVqL0zmu4OxAHgo9g==", + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/@smithy/util-retry/-/util-retry-3.0.1.tgz", + "integrity": "sha512-5lRtYm+8fNFEUTdqZXg5M4ppVp40rMIJfR1TpbHAhKQgPIDpWT+iYMaqgnwEbtpi9U1smyUOPv5Sg+M1neOBgw==", "dependencies": { - "@smithy/service-error-classification": "^3.0.0", - "@smithy/types": "^3.0.0", + "@smithy/service-error-classification": "^3.0.1", + "@smithy/types": "^3.1.0", "tslib": "^2.6.2" }, "engines": { @@ -2023,13 +2058,13 @@ } }, "node_modules/@smithy/util-stream": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/util-stream/-/util-stream-3.0.1.tgz", - "integrity": "sha512-7F7VNNhAsfMRA8I986YdOY5fE0/T1/ZjFF6OLsqkvQVNP3vZ/szYDfGCyphb7ioA09r32K/0qbSFfNFU68aSzA==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/util-stream/-/util-stream-3.0.3.tgz", + "integrity": "sha512-ztOvXkXKJromRHNzvrLEW/vvTQPnxPBRHA0gR0QX61LnHDgrm4TBT4EQNpWwwHCD1N0nnEL5bEkzo2dt2t34Kg==", "dependencies": { - "@smithy/fetch-http-handler": "^3.0.1", - "@smithy/node-http-handler": "^3.0.0", - "@smithy/types": "^3.0.0", + "@smithy/fetch-http-handler": "^3.0.3", + "@smithy/node-http-handler": "^3.0.1", + "@smithy/types": "^3.1.0", "@smithy/util-base64": "^3.0.0", "@smithy/util-buffer-from": "^3.0.0", "@smithy/util-hex-encoding": "^3.0.0", @@ -2089,17 +2124,6 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/abort-controller": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/abort-controller/-/abort-controller-3.0.0.tgz", - "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", - "dependencies": { - "event-target-shim": "^5.0.0" - }, - "engines": { - "node": ">=6.5" - } - }, "node_modules/accepts": { "version": "1.3.8", "resolved": "https://registry.npmmirror.com/accepts/-/accepts-1.3.8.tgz", @@ -2113,9 +2137,9 @@ } }, "node_modules/acorn": { - "version": "8.11.3", - "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.11.3.tgz", - "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", + "version": "8.12.0", + "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.12.0.tgz", + "integrity": "sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==", "bin": { "acorn": "bin/acorn" }, @@ -2276,9 +2300,9 @@ } }, "node_modules/aws4": { - "version": "1.12.0", - "resolved": "https://registry.npmmirror.com/aws4/-/aws4-1.12.0.tgz", - "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==" + "version": "1.13.0", + "resolved": "https://registry.npmmirror.com/aws4/-/aws4-1.13.0.tgz", + "integrity": "sha512-3AungXC4I8kKsS9PuS4JH2nc+0bVY/mjgrephHTIi8fpEeGsTHBUJeosp0Wc1myYMElmD0B3Oc4XL/HVJ4PV2g==" }, "node_modules/balanced-match": { "version": "1.0.2", @@ -2425,9 +2449,9 @@ } }, "node_modules/browserslist": { - "version": "4.23.0", - "resolved": "https://registry.npmmirror.com/browserslist/-/browserslist-4.23.0.tgz", - "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==", + "version": "4.23.1", + "resolved": "https://registry.npmmirror.com/browserslist/-/browserslist-4.23.1.tgz", + "integrity": "sha512-TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw==", "funding": [ { "type": "opencollective", @@ -2443,10 +2467,10 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001587", - "electron-to-chromium": "^1.4.668", + "caniuse-lite": "^1.0.30001629", + "electron-to-chromium": "^1.4.796", "node-releases": "^2.0.14", - "update-browserslist-db": "^1.0.13" + "update-browserslist-db": "^1.0.16" }, "bin": { "browserslist": "cli.js" @@ -2527,9 +2551,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001620", - "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001620.tgz", - "integrity": "sha512-WJvYsOjd1/BYUY6SNGUosK9DUidBPDTnOARHp3fSmFO1ekdxaY6nKRttEVrfMmYi80ctS0kz1wiWmm14fVc3ew==", + "version": "1.0.30001636", + "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001636.tgz", + "integrity": "sha512-bMg2vmr8XBsbL6Lr0UHXy/21m84FTxDLWn2FSqMd5PrlbMxwJlQnC2YWYxVgp66PZE+BBNF2jYQUBKCo1FDeZg==", "funding": [ { "type": "opencollective", @@ -2663,9 +2687,9 @@ } }, "node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "version": "4.3.5", + "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.5.tgz", + "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==", "dependencies": { "ms": "2.1.2" }, @@ -2836,9 +2860,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/electron-to-chromium": { - "version": "1.4.774", - "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.774.tgz", - "integrity": "sha512-132O1XCd7zcTkzS3FgkAzKmnBuNJjK8WjcTtNuoylj7MYbqw5eXehjQ5OK91g0zm7OTKIPeaAG4CPoRfD9M1Mg==" + "version": "1.4.805", + "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.805.tgz", + "integrity": "sha512-8W4UJwX/w9T0QSzINJckTKG6CYpAUTqsaWcWIsdud3I1FYJcMgW9QqT1/4CBff/pP/TihWh13OmiyY8neto6vw==" }, "node_modules/emoji-regex": { "version": "9.2.2", @@ -3039,14 +3063,6 @@ "node": ">= 0.6" } }, - "node_modules/event-target-shim": { - "version": "5.0.1", - "resolved": "https://registry.npmmirror.com/event-target-shim/-/event-target-shim-5.0.1.tgz", - "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", - "engines": { - "node": ">=6" - } - }, "node_modules/execa": { "version": "7.2.0", "resolved": "https://registry.npmmirror.com/execa/-/execa-7.2.0.tgz", @@ -3229,9 +3245,9 @@ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "node_modules/foreground-child": { - "version": "3.1.1", - "resolved": "https://registry.npmmirror.com/foreground-child/-/foreground-child-3.1.1.tgz", - "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", + "version": "3.2.1", + "resolved": "https://registry.npmmirror.com/foreground-child/-/foreground-child-3.2.1.tgz", + "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==", "dependencies": { "cross-spawn": "^7.0.0", "signal-exit": "^4.0.1" @@ -3341,9 +3357,9 @@ } }, "node_modules/get-console-process-list": { - "version": "1.0.4", - "resolved": "https://registry.npmmirror.com/get-console-process-list/-/get-console-process-list-1.0.4.tgz", - "integrity": "sha512-vn5MA+CCTMgRuF9fxvJYLC2fMCuBPKQ7RwhA9H2TvMvy33oDivjIqA4mh2NJlUDoZXPcu/1moN3VfyukxxKwpA==", + "version": "1.0.5", + "resolved": "https://registry.npmmirror.com/get-console-process-list/-/get-console-process-list-1.0.5.tgz", + "integrity": "sha512-K73UHh6ht+MXnnuqQAE/5IjlevHV1ePiTy8yBLsZZPxmoY1KHtouW9E2K1bVLeQzHELztb38vFNak6J+2CNCuw==", "hasInstallScript": true, "optional": true, "os": [ @@ -3435,15 +3451,15 @@ } }, "node_modules/glob": { - "version": "10.3.15", - "resolved": "https://registry.npmmirror.com/glob/-/glob-10.3.15.tgz", - "integrity": "sha512-0c6RlJt1TICLyvJYIApxb8GsXoai0KUP7AxKKAtsYXdgJR1mGEUa7DgwShbdk1nly0PYoZj01xd4hzbq3fsjpw==", + "version": "10.4.1", + "resolved": "https://registry.npmmirror.com/glob/-/glob-10.4.1.tgz", + "integrity": "sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==", "dependencies": { "foreground-child": "^3.1.0", - "jackspeak": "^2.3.6", - "minimatch": "^9.0.1", - "minipass": "^7.0.4", - "path-scurry": "^1.11.0" + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "path-scurry": "^1.11.1" }, "bin": { "glob": "dist/esm/bin.mjs" @@ -3455,6 +3471,20 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/glob/node_modules/minimatch": { + "version": "9.0.4", + "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-9.0.4.tgz", + "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/globals": { "version": "11.12.0", "resolved": "https://registry.npmmirror.com/globals/-/globals-11.12.0.tgz", @@ -3763,9 +3793,9 @@ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" }, "node_modules/jackspeak": { - "version": "2.3.6", - "resolved": "https://registry.npmmirror.com/jackspeak/-/jackspeak-2.3.6.tgz", - "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", + "version": "3.4.0", + "resolved": "https://registry.npmmirror.com/jackspeak/-/jackspeak-3.4.0.tgz", + "integrity": "sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw==", "dependencies": { "@isaacs/cliui": "^8.0.2" }, @@ -4055,9 +4085,9 @@ } }, "node_modules/minipass": { - "version": "7.1.1", - "resolved": "https://registry.npmmirror.com/minipass/-/minipass-7.1.1.tgz", - "integrity": "sha512-UZ7eQ+h8ywIRAW1hIEl2AqdwzJucU/Kp59+8kkZeSvafXhZjul247BvIJjEVFVeON6d7lM46XX1HXCduKAS8VA==", + "version": "7.1.2", + "resolved": "https://registry.npmmirror.com/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", "engines": { "node": ">=16 || 14 >=14.17" } @@ -4108,9 +4138,9 @@ "optional": true }, "node_modules/mongodb": { - "version": "6.6.2", - "resolved": "https://registry.npmmirror.com/mongodb/-/mongodb-6.6.2.tgz", - "integrity": "sha512-ZF9Ugo2JCG/GfR7DEb4ypfyJJyiKbg5qBYKRintebj8+DNS33CyGMkWbrS9lara+u+h+yEOGSRiLhFO/g1s1aw==", + "version": "6.7.0", + "resolved": "https://registry.npmmirror.com/mongodb/-/mongodb-6.7.0.tgz", + "integrity": "sha512-TMKyHdtMcO0fYBNORiYdmM25ijsHs+Njs963r4Tro4OQZzqYigAzYQouwWRg4OIaiLRUEGUh/1UAcH5lxdSLIA==", "dependencies": { "@mongodb-js/saslprep": "^1.1.5", "bson": "^6.7.0", @@ -4161,20 +4191,46 @@ } }, "node_modules/mongodb-client-encryption": { - "version": "6.0.0", - "resolved": "https://registry.npmmirror.com/mongodb-client-encryption/-/mongodb-client-encryption-6.0.0.tgz", - "integrity": "sha512-GtqkqlSq19acX006/U1odA3l+gwhvABeoTUlvvgtvSs6qcN3qSHPnur3Z5N4oKOv6fZ7EtT8rIsWP2riI0+Eyg==", + "version": "6.0.1", + "resolved": "https://registry.npmmirror.com/mongodb-client-encryption/-/mongodb-client-encryption-6.0.1.tgz", + "integrity": "sha512-u6pKu9plR7hQH6VtsfYonC9dwWAM3HFEpi+Xy3EJIdUyoH6dlFgaxX8TnKx/Ycfi2I1cxTXq2IbhSpg157vVgg==", "hasInstallScript": true, "optional": true, "dependencies": { "bindings": "^1.5.0", "node-addon-api": "^4.3.0", - "prebuild-install": "^7.1.1" + "prebuild-install": "^7.1.2" }, "engines": { "node": ">=16.20.1" } }, + "node_modules/mongodb-client-encryption/node_modules/prebuild-install": { + "version": "7.1.2", + "resolved": "https://registry.npmmirror.com/prebuild-install/-/prebuild-install-7.1.2.tgz", + "integrity": "sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ==", + "optional": true, + "dependencies": { + "detect-libc": "^2.0.0", + "expand-template": "^2.0.3", + "github-from-package": "0.0.0", + "minimist": "^1.2.3", + "mkdirp-classic": "^0.5.3", + "napi-build-utils": "^1.0.1", + "node-abi": "^3.3.0", + "pump": "^3.0.0", + "rc": "^1.2.7", + "simple-get": "^4.0.0", + "tar-fs": "^2.0.0", + "tunnel-agent": "^0.6.0" + }, + "bin": { + "prebuild-install": "bin.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/mongodb-connection-string-url": { "version": "3.0.1", "resolved": "https://registry.npmmirror.com/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.1.tgz", @@ -4243,9 +4299,9 @@ } }, "node_modules/node-abi": { - "version": "3.62.0", - "resolved": "https://registry.npmmirror.com/node-abi/-/node-abi-3.62.0.tgz", - "integrity": "sha512-CPMcGa+y33xuL1E0TcNIu4YyaZCxnnvkVaEXrsosR3FxN+fV8xvb7Mzpb7IgKler10qeMkE6+Dp8qJhpzdq35g==", + "version": "3.65.0", + "resolved": "https://registry.npmmirror.com/node-abi/-/node-abi-3.65.0.tgz", + "integrity": "sha512-ThjYBfoDNr08AWx6hGaRbfPwxKV9kVzAzOzlLKbk2CuqXE2xnCh+cbAGnwM3t8Lq4v9rUB7VfondlkBckcJrVA==", "optional": true, "dependencies": { "semver": "^7.3.5" @@ -5413,9 +5469,9 @@ } }, "node_modules/tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + "version": "2.6.3", + "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.6.3.tgz", + "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" }, "node_modules/tunnel-agent": { "version": "0.6.0", diff --git a/pkgs/development/tools/mongosh/source.json b/pkgs/development/tools/mongosh/source.json index a5d214f717008..cdebe929bf966 100644 --- a/pkgs/development/tools/mongosh/source.json +++ b/pkgs/development/tools/mongosh/source.json @@ -1,6 +1,6 @@ { - "version": "2.2.6", - "integrity": "sha512-ksL2zesQ82i6/km7ec4Ii3rtFDIPf4tmLDjkts/Kf+l6OGn54lox6sh/eDRMflggm8XYdFOYQFiLADzRtQwVOA==", - "filename": "mongosh-2.2.6.tgz", - "deps": "sha256-/zvqFRIGroP1YLSTlKv+ZKzB4c/Y78mn8BM8lnbqj/M=" + "version": "2.2.9", + "integrity": "sha512-7zROoz9tFqBW3t4aI6pO9S6GmGuDWb9m8hT0w91uL6CXTHUcYH7XM4INR2jr3+qXFYLkaXZ1WQoLgmuoJoSj7g==", + "filename": "mongosh-2.2.9.tgz", + "deps": "sha256-wefY8JDdtabrtlJfsT4iZsCwYIbIxv8T+U2S29Hl2O4=" } diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix index fa9379ab62ee7..b334654dd924e 100644 --- a/pkgs/development/tools/operator-sdk/default.nix +++ b/pkgs/development/tools/operator-sdk/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.34.2"; + version = "1.35.0"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-vVa1ljPRSHSo7bVqPkRt/jbuSlzLmnVaLnyreskwOrM="; + hash = "sha256-KalG1DLhvXEjNAOeP79BMYvI74j6nKnDkOYubIJ0Shs="; }; - vendorHash = "sha256-YspUrnSS6d8Ta8dmUjx9A5D/V5Bqm08DQJrRBaIGyQg="; + vendorHash = "sha256-TuDbQoC9at3yQikGTfsAKJ5kc/naqLqfHEwXLOv+12A="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/development/tools/parsing/nex/default.nix b/pkgs/development/tools/parsing/nex/default.nix index 2d3f18cacedd0..6a34156608784 100644 --- a/pkgs/development/tools/parsing/nex/default.nix +++ b/pkgs/development/tools/parsing/nex/default.nix @@ -1,12 +1,12 @@ -{ buildGoPackage +{ buildGoModule , fetchFromGitHub , lib }: # upstream is pretty stale, but it still works, so until they merge module # support we have to use gopath: see blynn/nex#57 -buildGoPackage rec { +buildGoModule rec { pname = "nex"; - version = "unstable-2021-03-30"; + version = "0-unstable-2021-03-30"; src = fetchFromGitHub { owner = "blynn"; @@ -15,9 +15,18 @@ buildGoPackage rec { hash = "sha256-DtJkV380T2B5j0+u7lYZfbC0ej0udF4GW2lbRmmbjAM="; }; - goPackagePath = "github.com/blynn/nex"; + vendorHash = null; + + postPatch = '' + go mod init github.com/blynn/nex + ''; + subPackages = [ "." ]; + # Fails with 'nex_test.go:23: got: 7a3661f13445ca7b51de2987bea127d9 wanted: 13f760d2f0dc1743dd7165781f2a318d' + # Checks failed on master before, but buildGoPackage had checks disabled. + doCheck = false; + meta = with lib; { description = "Lexer for Go"; mainProgram = "nex"; diff --git a/pkgs/development/tools/patcher9x/default.nix b/pkgs/development/tools/patcher9x/default.nix index 090f902c75b92..fdf116a40c860 100644 --- a/pkgs/development/tools/patcher9x/default.nix +++ b/pkgs/development/tools/patcher9x/default.nix @@ -1,7 +1,7 @@ { fasm, lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation (finalAttr: { - name = "patcher9x"; + pname = "patcher9x"; version = "0.8.50"; srcs = [ diff --git a/pkgs/development/tools/pnpm/generic.nix b/pkgs/development/tools/pnpm/generic.nix index 5560f4aee6ebc..7050df4489709 100644 --- a/pkgs/development/tools/pnpm/generic.nix +++ b/pkgs/development/tools/pnpm/generic.nix @@ -3,6 +3,7 @@ stdenvNoCC, callPackages, fetchurl, + installShellFiles, nodejs, testers, withNode ? true, @@ -25,6 +26,8 @@ buildInputs = lib.optionals withNode [ nodejs ]; + nativeBuildInputs = [ installShellFiles nodejs ]; + installPhase = '' runHook preInstall @@ -36,6 +39,25 @@ runHook postInstall ''; + postInstall = + if lib.toInt (lib.versions.major version) < 9 then '' + export HOME="$PWD" + node $out/bin/pnpm install-completion bash + node $out/bin/pnpm install-completion fish + node $out/bin/pnpm install-completion zsh + sed -i '1 i#compdef pnpm' .config/tabtab/zsh/pnpm.zsh + installShellCompletion \ + .config/tabtab/bash/pnpm.bash \ + .config/tabtab/fish/pnpm.fish \ + .config/tabtab/zsh/pnpm.zsh + '' else '' + node $out/bin/pnpm completion bash >pnpm.bash + node $out/bin/pnpm completion fish >pnpm.fish + node $out/bin/pnpm completion zsh >pnpm.zsh + sed -i '1 i#compdef pnpm' pnpm.zsh + installShellCompletion pnpm.{bash,fish,zsh} + ''; + passthru = let fetchDepsAttrs = callPackages ./fetch-deps { pnpm = finalAttrs.finalPackage; }; in { diff --git a/pkgs/development/tools/pqrs/default.nix b/pkgs/development/tools/pqrs/default.nix index 730bc67fbbe83..1d406394ac122 100644 --- a/pkgs/development/tools/pqrs/default.nix +++ b/pkgs/development/tools/pqrs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pqrs"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "manojkarthick"; repo = "pqrs"; rev = "v${version}"; - sha256 = "sha256-t6Y6gpMEpccCoyhG66FZEKHVNCbHblaqYZY1iJUZVUA="; + sha256 = "sha256-0oSSoGZga0OGAKUNsLmKkUl8N1l0pVi4KIqrKJbeVVU="; }; - cargoHash = "sha256-fnoYVWpBn5Dil2o+u2MKQqd8dEKFE2i29Qz7cJae+gE="; + cargoHash = "sha256-w0WD+EtVGFMGpS4a2DJrLdbunwF2yiONKQwdcQG2EB0="; meta = with lib; { description = "CLI tool to inspect Parquet files"; diff --git a/pkgs/development/tools/protoc-gen-twirp/default.nix b/pkgs/development/tools/protoc-gen-twirp/default.nix index 98045aa94c64e..4f59af22d6e9c 100644 --- a/pkgs/development/tools/protoc-gen-twirp/default.nix +++ b/pkgs/development/tools/protoc-gen-twirp/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "protoc-gen-twirp"; version = "8.1.3"; @@ -11,14 +11,16 @@ buildGoPackage rec { sha256 = "sha256-p3gHVHGBHakOOQnJAuMK7vZumNXN15mOABuEHUG0wNs="; }; - goPackagePath = "github.com/twitchtv/twirp"; + postPatch = '' + go mod init github.com/twitchtv/twirp + ''; + + vendorHash = null; subPackages = [ "protoc-gen-twirp" ]; - doCheck = true; - meta = with lib; { description = "Simple RPC framework with protobuf service definitions"; mainProgram = "protoc-gen-twirp"; diff --git a/pkgs/development/tools/pyenv/default.nix b/pkgs/development/tools/pyenv/default.nix index 007cf3b1dd6a4..9f761ef0be276 100644 --- a/pkgs/development/tools/pyenv/default.nix +++ b/pkgs/development/tools/pyenv/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pyenv"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "pyenv"; repo = "pyenv"; rev = "refs/tags/v${version}"; - hash = "sha256-hPbXKUg7jl4Dd4m29yaEJVX+jl8c/1oODEcRGTao58w="; + hash = "sha256-jYBKTrpc3KI1iW/VCw4Udk4TS8dXFGg5WgbEWZ+vWqE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index a76d4e824434f..ef3d61e60f77e 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "qtcreator"; - version = "13.0.1"; + version = "13.0.2"; src = fetchurl { url = "https://download.qt.io/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - hash = "sha256-gZAG0ZIfYcxnWYC8ydeVoiSM/XlhFdrUZqRFR1nasy4="; + hash = "sha256-wSXMVSJhnH+PwoBadQq5bLu1al/fw4i2yxWrda9+wM4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/reindeer/default.nix b/pkgs/development/tools/reindeer/default.nix index ca5646b19de07..d868c5b16b874 100644 --- a/pkgs/development/tools/reindeer/default.nix +++ b/pkgs/development/tools/reindeer/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "reindeer"; - version = "2024.06.03.00"; + version = "2024.06.10.00"; src = fetchFromGitHub { owner = "facebookincubator"; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-YAWGNF4WN8/RV3GYmxjyARNk4VzTXJEa42/gaK5B4CE="; }; - cargoHash = "sha256-VURortaBxd6hLdsPbjHvqrXsjwMjmq7Ke0wGfoLPq8w="; + cargoHash = "sha256-uNTDLQH6m4Dbk8tGyGnm0W5OK9OGaABZOq7weqtvaeU="; nativeBuildInputs = [ pkg-config ]; buildInputs = diff --git a/pkgs/development/tools/relic/default.nix b/pkgs/development/tools/relic/default.nix index bcb22db1829f6..3a66444f345cb 100644 --- a/pkgs/development/tools/relic/default.nix +++ b/pkgs/development/tools/relic/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "relic"; - version = "7.6.2"; + version = "8.0.1"; src = fetchFromGitHub { owner = "sassoftware"; repo = pname; rev = "v${version}"; - sha256 = "sha256-T76+Ftky1rSIqEoKE3RLsf6g2gguVJgYFflWmyEhdEk="; + sha256 = "sha256-w7KU3XntkKep0mcuOUBSG4fJW14yCamioeRH5YrULSo="; }; - vendorHash = "sha256-5mgqIw3BV88rEF3ALD3pLhm658yUUFf44hQFSw085cU="; + vendorHash = "sha256-/P4W+smY01feV1HP5Tsx0PsoOyp//ik7RVWuEaiSepY="; ldflags = [ "-s" diff --git a/pkgs/development/tools/rubyfmt/default.nix b/pkgs/development/tools/rubyfmt/default.nix index 729a58b533833..272fe25a5b14e 100644 --- a/pkgs/development/tools/rubyfmt/default.nix +++ b/pkgs/development/tools/rubyfmt/default.nix @@ -76,10 +76,12 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/fables-tales/rubyfmt"; license = licenses.mit; maintainers = with maintainers; [ bobvanderlinden ]; - # = note: Undefined symbols for architecture x86_64: - # "_utimensat", referenced from: - # _utime_internal in librubyfmt-3c969812b3b27083.rlib(file.o) - broken = stdenv.isDarwin && stdenv.isx86_64; + # https://github.com/NixOS/nixpkgs/issues/320722 + broken = true + # = note: Undefined symbols for architecture x86_64: + # "_utimensat", referenced from: + # _utime_internal in librubyfmt-3c969812b3b27083.rlib(file.o) + || stdenv.isDarwin && stdenv.isx86_64; mainProgram = "rubyfmt"; }; } diff --git a/pkgs/development/tools/ruff/Cargo.lock b/pkgs/development/tools/ruff/Cargo.lock index 162ca379af1a8..4f31226a36529 100644 --- a/pkgs/development/tools/ruff/Cargo.lock +++ b/pkgs/development/tools/ruff/Cargo.lock @@ -134,6 +134,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] +name = "arc-swap" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + +[[package]] name = "argfile" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -200,6 +206,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] name = "cachedir" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -209,6 +221,12 @@ dependencies = [ ] [[package]] +name = "camino" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" + +[[package]] name = "cast" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -219,6 +237,11 @@ name = "cc" version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" +dependencies = [ + "jobserver", + "libc", + "once_cell", +] [[package]] name = "cfg-if" @@ -282,9 +305,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.4" +version = "4.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "a9689a29b593160de5bc4aacab7b5d54fb52231de70122626c178e6a368994c7" dependencies = [ "clap_builder", "clap_derive", @@ -292,9 +315,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "2e5387378c84f6faa26890ebf9f0a92989f8873d4d380467bcd0d8d8620424df" dependencies = [ "anstream", "anstyle", @@ -346,14 +369,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.4" +version = "4.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn", + "syn 2.0.66", ] [[package]] @@ -594,7 +617,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn", + "syn 2.0.66", ] [[package]] @@ -605,7 +628,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn", + "syn 2.0.66", ] [[package]] @@ -732,6 +755,16 @@ dependencies = [ ] [[package]] +name = "eyre" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" +dependencies = [ + "indenter", + "once_cell", +] + +[[package]] name = "fastrand" version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -869,6 +902,21 @@ dependencies = [ ] [[package]] +name = "hashlink" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +dependencies = [ + "hashbrown 0.14.5", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] name = "heck" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -971,6 +1019,12 @@ dependencies = [ ] [[package]] +name = "indenter" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" + +[[package]] name = "indexmap" version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1075,7 +1129,7 @@ dependencies = [ "Inflector", "proc-macro2", "quote", - "syn", + "syn 2.0.66", ] [[package]] @@ -1124,6 +1178,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] +name = "jobserver" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +dependencies = [ + "libc", +] + +[[package]] name = "jod-thread" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1192,7 +1255,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2ae40017ac09cd2c6a53504cb3c871c7f2b41466eac5bc66ba63f39073b467b" dependencies = [ "quote", - "syn", + "syn 2.0.66", ] [[package]] @@ -1630,15 +1693,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] -name = "pmutil" -version = "0.6.1" +name = "pkg-config" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "portable-atomic" @@ -1778,6 +1836,8 @@ dependencies = [ "dashmap", "hashbrown 0.14.5", "indexmap", + "insta", + "is-macro", "notify", "parking_lot", "rayon", @@ -1785,6 +1845,7 @@ dependencies = [ "ruff_notebook", "ruff_python_ast", "ruff_python_parser", + "ruff_python_stdlib", "ruff_text_size", "rustc-hash", "smol_str", @@ -1792,6 +1853,8 @@ dependencies = [ "tracing", "tracing-subscriber", "tracing-tree", + "walkdir", + "zip", ] [[package]] @@ -1816,9 +1879,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -1859,27 +1922,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] -name = "result-like" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf7172fef6a7d056b5c26bf6c826570267562d51697f4982ff3ba4aec68a9df" -dependencies = [ - "result-like-derive", -] - -[[package]] -name = "result-like-derive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d6574c02e894d66370cfc681e5d68fedbc9a548fb55b30a96b3f0ae22d0fe5" -dependencies = [ - "pmutil", - "proc-macro2", - "quote", - "syn", -] - -[[package]] name = "ring" version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1896,7 +1938,7 @@ dependencies = [ [[package]] name = "ruff" -version = "0.4.8" +version = "0.4.9" dependencies = [ "anyhow", "argfile", @@ -1942,8 +1984,6 @@ dependencies = [ "tikv-jemallocator", "toml", "tracing", - "tracing-subscriber", - "tracing-tree", "walkdir", "wild", ] @@ -1960,6 +2000,7 @@ dependencies = [ "ruff_python_ast", "ruff_python_formatter", "ruff_python_parser", + "ruff_python_trivia", "serde", "serde_json", "tikv-jemallocator", @@ -1981,6 +2022,23 @@ dependencies = [ ] [[package]] +name = "ruff_db" +version = "0.0.0" +dependencies = [ + "camino", + "countme", + "dashmap", + "filetime", + "ruff_python_ast", + "ruff_python_parser", + "ruff_source_file", + "ruff_text_size", + "rustc-hash", + "salsa-2022", + "tracing", +] + +[[package]] name = "ruff_dev" version = "0.0.0" dependencies = [ @@ -2057,7 +2115,7 @@ dependencies = [ [[package]] name = "ruff_linter" -version = "0.4.8" +version = "0.4.9" dependencies = [ "aho-corasick", "annotate-snippets 0.9.2", @@ -2085,7 +2143,6 @@ dependencies = [ "pyproject-toml", "quick-junit", "regex", - "result-like", "ruff_cache", "ruff_diagnostics", "ruff_macros", @@ -2125,7 +2182,7 @@ dependencies = [ "proc-macro2", "quote", "ruff_python_trivia", - "syn", + "syn 2.0.66", ] [[package]] @@ -2215,7 +2272,6 @@ dependencies = [ "static_assertions", "thiserror", "tracing", - "unicode-width", ] [[package]] @@ -2277,6 +2333,7 @@ version = "0.0.0" dependencies = [ "bitflags 2.5.0", "is-macro", + "ruff_db", "ruff_index", "ruff_python_ast", "ruff_python_parser", @@ -2284,6 +2341,8 @@ dependencies = [ "ruff_source_file", "ruff_text_size", "rustc-hash", + "salsa-2022", + "tracing", ] [[package]] @@ -2344,6 +2403,7 @@ dependencies = [ "serde_json", "shellexpand", "tracing", + "tracing-subscriber", "walkdir", ] @@ -2382,6 +2442,7 @@ dependencies = [ "ruff_python_formatter", "ruff_python_index", "ruff_python_parser", + "ruff_python_trivia", "ruff_source_file", "ruff_text_size", "ruff_workspace", @@ -2498,6 +2559,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] +name = "salsa-2022" +version = "0.1.0" +source = "git+https://github.com/salsa-rs/salsa.git?rev=05b4e3ebdcdc47730cdd359e7e97fb2470527279#05b4e3ebdcdc47730cdd359e7e97fb2470527279" +dependencies = [ + "arc-swap", + "crossbeam", + "crossbeam-utils", + "dashmap", + "hashlink", + "indexmap", + "log", + "parking_lot", + "rustc-hash", + "salsa-2022-macros", + "smallvec", +] + +[[package]] +name = "salsa-2022-macros" +version = "0.1.0" +source = "git+https://github.com/salsa-rs/salsa.git?rev=05b4e3ebdcdc47730cdd359e7e97fb2470527279#05b4e3ebdcdc47730cdd359e7e97fb2470527279" +dependencies = [ + "eyre", + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] name = "same-file" version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2527,7 +2618,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn", + "syn 2.0.66", ] [[package]] @@ -2576,7 +2667,7 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.66", ] [[package]] @@ -2587,7 +2678,7 @@ checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.66", ] [[package]] @@ -2609,7 +2700,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.66", ] [[package]] @@ -2650,7 +2741,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn", + "syn 2.0.66", ] [[package]] @@ -2742,15 +2833,15 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.26.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7993a8e3a9e88a00351486baae9522c91b123a088f76469e5bd5cc17198ea87" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", "rustversion", - "syn", + "syn 2.0.66", ] [[package]] @@ -2761,6 +2852,17 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" @@ -2823,7 +2925,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn", + "syn 2.0.66", ] [[package]] @@ -2834,7 +2936,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.66", "test-case-core", ] @@ -2855,7 +2957,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.66", ] [[package]] @@ -2915,9 +3017,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.8.13" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", @@ -2936,9 +3038,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.13" +version = "0.22.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" dependencies = [ "indexmap", "serde", @@ -2967,7 +3069,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.66", ] [[package]] @@ -3197,7 +3299,7 @@ checksum = "9881bea7cbe687e36c9ab3b778c36cd0487402e270304e8b1296d5085303c1a2" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.66", ] [[package]] @@ -3282,7 +3384,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -3316,7 +3418,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3349,7 +3451,7 @@ checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.66", ] [[package]] @@ -3618,7 +3720,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.66", ] [[package]] @@ -3626,3 +3728,44 @@ name = "zeroize" version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" + +[[package]] +name = "zip" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +dependencies = [ + "byteorder", + "crc32fast", + "crossbeam-utils", + "zstd", +] + +[[package]] +name = "zstd" +version = "0.11.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "5.0.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +dependencies = [ + "libc", + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.10+zstd.1.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" +dependencies = [ + "cc", + "pkg-config", +] diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 5ba3a852f5b7c..75285de4612b7 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -6,23 +6,26 @@ , darwin , rust-jemalloc-sys , ruff-lsp +, testers +, ruff }: rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.4.8"; + version = "0.4.9"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; rev = "refs/tags/v${version}"; - hash = "sha256-XuAJ65R80+IntWBGikG1cxAH8Tr3mnwQvSxeKFQj2ac="; + hash = "sha256-40ZXD52d/kZNkSZ64H/s/OiiU99IiblGfYa4KmU8xD4="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "lsp-types-0.95.1" = "sha256-8Oh299exWXVi6A39pALOISNfp8XBya8z+KT/Z7suRxQ="; + "salsa-2022-0.1.0" = "sha256-mt+X1hO+5ZrCAgy6N4aArnixJ9GjY/KwM0uIMUSrDsg="; }; }; @@ -41,6 +44,26 @@ rustPlatform.buildRustPackage rec { export NO_COLOR=1 ''; + # Failing for an unclear reason. + # According to the maintainers, those tests are from an experimental crate that isn't actually + # used by ruff currently and can thus be safely skipped. + checkFlags = [ + "--skip=semantic::tests::expression_scope" + "--skip=semantic::tests::reachability_trivial" + "--skip=semantic::types::infer::tests::follow_import_to_class" + "--skip=semantic::types::infer::tests::if_elif" + "--skip=semantic::types::infer::tests::if_elif_else" + "--skip=semantic::types::infer::tests::ifexpr_walrus" + "--skip=semantic::types::infer::tests::ifexpr_walrus_2" + "--skip=semantic::types::infer::tests::join_paths" + "--skip=semantic::types::infer::tests::literal_int_arithmetic" + "--skip=semantic::types::infer::tests::maybe_unbound" + "--skip=semantic::types::infer::tests::narrow_none" + "--skip=semantic::types::infer::tests::resolve_base_class_by_name" + "--skip=semantic::types::infer::tests::resolve_module_member" + "--skip=semantic::types::infer::tests::resolve_visible_def" + ]; + postInstall = '' installShellCompletion --cmd ruff \ --bash <($out/bin/ruff generate-shell-completion bash) \ @@ -50,6 +73,7 @@ rustPlatform.buildRustPackage rec { passthru.tests = { inherit ruff-lsp; + version = testers.testVersion { package = ruff; }; }; meta = { diff --git a/pkgs/development/tools/rust/cargo-depgraph/default.nix b/pkgs/development/tools/rust/cargo-depgraph/default.nix index 1918501d1d92d..c4379974a6abb 100644 --- a/pkgs/development/tools/rust/cargo-depgraph/default.nix +++ b/pkgs/development/tools/rust/cargo-depgraph/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-depgraph"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromSourcehut { owner = "~jplatte"; repo = "cargo-depgraph"; rev = "v${version}"; - hash = "sha256-q9a7O6lSsQz9nJ82uG1oNyNyNebzXEanVWh3xkypqqM="; + hash = "sha256-yvcKRESX2W1oLmQvkl07iG8+I74qDKsaS3amM4pZU8s="; }; - cargoHash = "sha256-gmSNYxyizaVvz38R0nTdUp9nP/f4hxgHO9hVV3RFP6U="; + cargoHash = "sha256-OJOw0V4u/bK4vw3bU2wKVeOqP205ehfZMKJ6qIpYDLU="; meta = with lib; { description = "Create dependency graphs for cargo projects using `cargo metadata` and graphviz"; diff --git a/pkgs/development/tools/rust/cargo-modules/default.nix b/pkgs/development/tools/rust/cargo-modules/default.nix index a2f5f80aed1f5..2745b9c586b9b 100644 --- a/pkgs/development/tools/rust/cargo-modules/default.nix +++ b/pkgs/development/tools/rust/cargo-modules/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-modules"; - version = "0.15.5"; + version = "0.16.3"; src = fetchFromGitHub { owner = "regexident"; repo = pname; rev = "v${version}"; - hash = "sha256-+jHanZ2/BIgNLUpMlibfUAVfA6QTPlavRci2YD1w3zE="; + hash = "sha256-6JFQuFISIKmR+dm2YYb4iwBjR61WrcLpfwcC67a96t4="; }; - cargoHash = "sha256-umaKVs1fFiUKz2HIJuB+7skSwRQbG12dl9eD+et42go="; + cargoHash = "sha256-TiSiOMBkmH4Y5VORXZ59fl9+EwOjfWV2n/r3LTmSFxQ="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/development/tools/rust/cargo-semver-checks/default.nix index 006c5ea75b1dd..82fa17b3405a6 100644 --- a/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/pkgs/development/tools/rust/cargo-semver-checks/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-semver-checks"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "obi1kenobi"; repo = pname; rev = "v${version}"; - hash = "sha256-iumHMVDlgwjjQsn0aoSJUPoOKmLztD47b7he2nJhins="; + hash = "sha256-2B9i9S6OY+7DEorZoXfQQx9cEU2Y8FoyIyytJ8C7dXU="; }; - cargoHash = "sha256-/mrVrbPHi4lo2iu/IWwDYIjqWZYNkm/4lWpRMLKBNpA="; + cargoHash = "sha256-S03fgnefhU6c5e9YtFMBart+nfBQj7f4O+lSPe8fgqg="; nativeBuildInputs = [ cmake diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index d60684bc679c0..941460c35d451 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2024-06-03"; - cargoSha256 = "sha256-UTN2VLByC+aIoIfftTnXm/l+vEYOKuMIrVdUAnt3ZAc="; + version = "2024-06-11"; + cargoSha256 = "sha256-mo3TGaUI1gjJX64Di7+M40CzHkIuFAuXl27yJ9GPkPU="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-7ZKcQoNc4Od+oXdZQdTDbaPRpKW64WH0adSBlqzqWHU="; + sha256 = "sha256-/N0sZW3xiivMm5klk9zBtzMlO+uaxnUq35kI3bakLx8="; }; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix index 1844d25c706a1..b01d04ad8123a 100644 --- a/pkgs/development/tools/rust/svd2rust/default.nix +++ b/pkgs/development/tools/rust/svd2rust/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "svd2rust"; - version = "0.33.3"; + version = "0.33.4"; src = fetchCrate { inherit pname version; - hash = "sha256-Ed7dwVXjLOAtW9ZOh1g+yamnSzyoKo1lS4N2nyyqaJ8="; + hash = "sha256-V7d/lVNL7J/ErBlJUf8btrukGC+KSvk3r9AAethFNyk="; }; - cargoHash = "sha256-BppPMYsv0v7K6z9URYEWrz0SHPx+oe2jeP3EzydFcuI="; + cargoHash = "sha256-Wu/F4PU02hrmiL7OaKIP59CfDVWrU5cw60TYngqJYNg="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/development/tools/twilio-cli/default.nix b/pkgs/development/tools/twilio-cli/default.nix index 7a5a3e4bad083..fe0544b671378 100644 --- a/pkgs/development/tools/twilio-cli/default.nix +++ b/pkgs/development/tools/twilio-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.20.1"; + version = "5.21.0"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - hash = "sha256-tS30wEXUhzPUPh5gY+UZF274/EOfwMGU19glXUrDuw0="; + hash = "sha256-rtI89baKJS4itwTcHY9IjKeskQO6mz/c746wdVy4cG4="; }; buildInputs = [ nodejs-slim ]; diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index a908207182c0b..b70e8448717b6 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.22.3"; + version = "1.22.7"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-0al9U7UFqG/ljMtT2xJnyroRz4mGhvM7ZtIs/YkcNIs="; + hash = "sha256-417z9N8oC0kIqBs63fP/xdry5EFmlnyWDryKaJITtZQ="; }; - cargoHash = "sha256-Nn5ein7W4H58fIq8MZsGkwrF1zA5rTO95Uqe/VuL0W8="; + cargoHash = "sha256-Ol/pk3/9StHzEFHXcsSS9APUXf8hjnY7fwmF1mWtsVE="; meta = with lib; { description = "Source code spell checker"; diff --git a/pkgs/development/tools/unconvert/default.nix b/pkgs/development/tools/unconvert/default.nix index 21c0d08ab5ac8..478a111555a61 100644 --- a/pkgs/development/tools/unconvert/default.nix +++ b/pkgs/development/tools/unconvert/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "unconvert"; - version = "unstable-2022-09-18"; + version = "0-unstable-2023-09-07"; src = fetchFromGitHub { owner = "mdempsky"; repo = "unconvert"; - rev = "3f84926d692329767c21c2aef3dfb7889c956832"; - sha256 = "sha256-vcRHriFCT5b8SKjtRSg+kZDcCAKySC1cKVq+FMZb+9M="; + rev = "415706980c061b6f71ea923bd206aec88785638f"; + hash = "sha256-MchA8uvy+MyQ/VaglBDTC7j/lNIKAtGeeECLoFfH6pI="; }; - vendorHash = "sha256-p77mLvGtohmC8J+bqqkM5kqc1pMPcFx7GhXOZ4q4jeM="; + vendorHash = "sha256-vZDk+ZNCMP5RRNrgeIowdOKPot7rqM84JhlbfvcQbB4="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index b43bc40c85f6a..3cc5e31c3c152 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix @@ -398,25 +398,15 @@ in rec { }); yarn2nix = mkYarnPackage { - src = - let - src = ./.; - - mkFilter = { dirsToInclude, filesToInclude, root }: path: type: - let - inherit (lib) elem elemAt splitString; - - subpath = elemAt (splitString "${toString root}/" path) 1; - spdir = elemAt (splitString "/" subpath) 0; - in elem spdir dirsToInclude || - (type == "regular" && elem subpath filesToInclude); - in builtins.filterSource - (mkFilter { - dirsToInclude = ["bin" "lib"]; - filesToInclude = ["package.json" "yarn.lock"]; - root = src; - }) - src; + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ + ./bin + ./lib + ./package.json + ./yarn.lock + ]; + }; # yarn2nix is the only package that requires the yarnNix option. # All the other projects can auto-generate that file. diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index f54f77113e42e..571c0a489ea72 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.44.1"; + version = "4.44.2"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - hash = "sha256-5l948J0NTeWOeUMlcoEQZws8viqtARdkJsGch4c6Trw="; + hash = "sha256-l5/D2yCbf4CB4bUB/wIN/MW4u2D8pv7N6bL5q5DoDMs="; }; - vendorHash = "sha256-j5vcx5wW2v1kNc2QCPR11JEb1fTA9q4E4mbJ2VJC37A="; + vendorHash = "sha256-HiRdz6fDu0Q0mAi2E5Ec0Hst8mhJEfvNuoDXJ5Ak+js="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 9b0a1f3a9bd35..28820426e109b 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.1.10"; + version = "1.1.14"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-txTr+uYvGOsytyTO2mXZUQOOJMcNT4uyzNCdz4pn0AQ="; + hash = "sha256-JKUAmUW/Lh78RUZBOk1cXLpMrhxskXW6BO+WcYanWFs="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-8Wp3RDvP2/tonU8ngDTWuGD1m7q7gxwnuwbxpc6N/+Y="; + hash = "sha256-kBkzOLG8O4OvjwKHiDiYFEvAe3QtDJDdoGKvMzSY5wA="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-cV3NO0qGqZqSgVLj1U2bvQUqGzgGugLPwk4eq+XfjTU="; + hash = "sha256-zDngJ0zTRCQqufNmGRjwzi+77K4TpP6C/2lVqA4yEI0="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-iQM/BtoaDBRlH/jx9qH6WlV2Ox7MbtWMzHc8RxVCHH0="; + hash = "sha256-LCfBxZMR+DI9HDvk3ZCJGFPtev+4U9AcxY/qDYbpOuA="; }; }; updateScript = writeShellScript "update-bun" '' @@ -92,7 +92,7 @@ stdenvNoCC.mkDerivation rec { lgpl21Only # javascriptcore and webkit ]; mainProgram = "bun"; - maintainers = with maintainers; [ DAlperin jk thilobillerbeck cdmistman coffeeispower ]; + maintainers = with maintainers; [ DAlperin jk thilobillerbeck cdmistman coffeeispower diogomdp ]; platforms = builtins.attrNames passthru.sources; # Broken for Musl at 2024-01-13, tracking issue: # https://github.com/NixOS/nixpkgs/issues/280716 diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 3f59d8eff6d05..c8de1418333a0 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -13,16 +13,16 @@ }: rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.43.6"; + version = "1.44.3"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - hash = "sha256-8yBcSiaav28AevAH5wh0VwpMR5U5Vong8D+UFCx/wjo="; + hash = "sha256-KSCHVoKZiInxsnM+2sgyl87Wz9K9mjGjT4356m3+haY="; }; - cargoHash = "sha256-o8DsFtn3+gtIMO5LS3mHbQS1iWT46iC9ZHr8hEOXZrs="; + cargoHash = "sha256-/ZxCM8/xLccOzzU5gfX0eC/DJwgqFngXM3cg+F/ZFAM="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index fcf916af57e9b..e7de26609e67c 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -13,11 +13,11 @@ let }; in fetch_librusty_v8 { - version = "0.91.1"; + version = "0.93.1"; shas = { - x86_64-linux = "sha256-2J/YDTtSCXo2nsO0Lx6mJqKSFu2hUc8HmNAL2SD9ImI="; - aarch64-linux = "sha256-NwuDVaEbYWZfF2epVPPhIKM1aw35e8Bp5siBoREpym8="; - x86_64-darwin = "sha256-JNf4Me4VMdvjgYM4OyCUlQW6Q/OdQ2BuDNWFKI4sbtg="; - aarch64-darwin = "sha256-WVBDiGWVBvMiKNgPaPw8KQChARkFDfx8Nt9QEobGNG4="; + x86_64-linux = "sha256-ttbwIxzMgihfwwjh3usu7FxVTwLt7ceXU+MyaxXfkxk="; + aarch64-linux = "sha256-rlyY4C4FMHTyPUzqHKYzToIs9tJunTXEor9wc/7zH/0="; + x86_64-darwin = "sha256-IUDe0ogBSCaz1q+uXepOi883hamtJYqBPtNfrm/y6Qo="; + aarch64-darwin = "sha256-53PuHq7AUi21cjopoFakzLuJyqSJ9VeF7g53IWxFXAI="; }; } diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index ff8bfa4fa3d7a..e04421421180d 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.2.66"; + version = "0.2.72"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-vdiTlUzrldbxWo5LoYnWTGq/P/QA+Qybk78pqxDoUlQ="; + hash = "sha256-v2+xDeErVkgiGavPpBtKg7+BBhiKZdmbo2NIFL7iXvw="; }; - vendorHash = "sha256-VdOBAxIaQzld4uX42RPYg4+p5F6mnBnI5efV8X48Eh8="; + vendorHash = "sha256-iRZrjkWQxuUW/YM5TygFt+g8suM5iLGsWsCt4QQOX3M="; subPackages = [ "." ]; diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index 676ef1c7e5452..ec5cc40cc9c2d 100644 --- a/pkgs/development/web/nodejs/v22.nix +++ b/pkgs/development/web/nodejs/v22.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "22.2.0"; - sha256 = "sha256-iJkIqIKNFISRDX5lm2qlet6NUo/w45Dpp372WadihHQ="; + version = "22.3.0"; + sha256 = "0k0h4s9s2y0ms3g6xhynsqsrkl9hz001dmj6j0gpc5x5vk8mpf5z"; patches = [ ./disable-darwin-v8-system-instrumentation-node19.patch ./bypass-darwin-xcrun-node16.patch diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index 6af284843e71b..0d9465b770605 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -1,24 +1,36 @@ -{ fetchurl, stdenv, lib, buildFHSEnv, appimageTools, writeShellScript, anki, undmg, zstd, cacert, commandLineArgs ? [] }: +{ + fetchurl, + stdenv, + lib, + buildFHSEnv, + appimageTools, + writeShellScript, + anki, + undmg, + zstd, + cacert, + commandLineArgs ? [ ], +}: let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "24.04.1"; + version = "24.06.2"; sources = { linux = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst"; - sha256 = "sha256-elUTr0Lumw5bzWbeU74m8e/AxQPNpKXiIOC0Rcgh3AY="; + sha256 = "sha256-A7/R7nQUt0L4fKFadPvKyi1sCEUIXcOZSW+Yr1ty63c="; }; # For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version darwin-x86_64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg"; - sha256 = "sha256-LlHbZ8Yw17Ym11L1lqMibAaV8XWB8oiMFGQxE1PvApI="; + sha256 = "sha256-tZjR5ebzbm9w5m66Q2cy8Oe1VtqGEDpLfjpgbUh07Lo="; }; darwin-aarch64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg"; - sha256 = "sha256-lMUfIvV4biaOb0ABTZciBP59XY1Ln3tkwphi2oaRu4c="; + sha256 = "sha256-/SVtyvsPWv5EGiNTbfHbPtguLi/oNytO16JPnD7IaCM="; }; }; @@ -43,57 +55,80 @@ let }; meta = with lib; { - inherit (anki.meta) license homepage description longDescription; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + inherit (anki.meta) + license + homepage + description + longDescription + ; + platforms = [ + "x86_64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; maintainers = with maintainers; [ mahmoudk1000 ]; }; - passthru = { inherit sources; }; - - fhsEnvAnki = buildFHSEnv (appimageTools.defaultFhsEnvArgs // { - inherit pname version; - - profile = '' - # anki vendors QT and mixing QT versions usually causes crashes - unset QT_PLUGIN_PATH - # anki uses the system ssl cert, without it plugins do not download/update - export SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt" - ''; - - # Dependencies of anki - targetPkgs = pkgs: (with pkgs; [ xorg.libxkbfile xcb-util-cursor-HEAD krb5 zstd ]); - - runScript = writeShellScript "anki-wrapper.sh" '' - exec ${unpacked}/bin/anki ${ lib.strings.escapeShellArgs commandLineArgs } "$@" - ''; - - extraInstallCommands = '' - ln -s ${pname} $out/bin/anki - - mkdir -p $out/share - cp -R ${unpacked}/share/applications \ - ${unpacked}/share/man \ - ${unpacked}/share/pixmaps \ - $out/share/ - ''; + passthru = { + inherit sources; + }; - inherit meta passthru; - }); + fhsEnvAnki = buildFHSEnv ( + appimageTools.defaultFhsEnvArgs + // { + inherit pname version; + + profile = '' + # anki vendors QT and mixing QT versions usually causes crashes + unset QT_PLUGIN_PATH + # anki uses the system ssl cert, without it plugins do not download/update + export SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt" + ''; + + # Dependencies of anki + targetPkgs = + pkgs: + (with pkgs; [ + xorg.libxkbfile + xcb-util-cursor-HEAD + krb5 + zstd + ]); + + runScript = writeShellScript "anki-wrapper.sh" '' + exec ${unpacked}/bin/anki ${lib.strings.escapeShellArgs commandLineArgs} "$@" + ''; + + extraInstallCommands = '' + ln -s ${pname} $out/bin/anki + + mkdir -p $out/share + cp -R ${unpacked}/share/applications \ + ${unpacked}/share/man \ + ${unpacked}/share/pixmaps \ + $out/share/ + ''; + + inherit meta passthru; + } + ); in -if stdenv.isLinux then fhsEnvAnki -else stdenv.mkDerivation { - inherit pname version passthru; +if stdenv.isLinux then + fhsEnvAnki +else + stdenv.mkDerivation { + inherit pname version passthru; - src = if stdenv.isAarch64 then sources.darwin-aarch64 else sources.darwin-x86_64; + src = if stdenv.isAarch64 then sources.darwin-aarch64 else sources.darwin-x86_64; - nativeBuildInputs = [ undmg ]; - sourceRoot = "."; + nativeBuildInputs = [ undmg ]; + sourceRoot = "."; - installPhase = '' - mkdir -p $out/Applications/ - cp -a Anki.app $out/Applications/ - ''; + installPhase = '' + mkdir -p $out/Applications/ + cp -a Anki.app $out/Applications/ + ''; - inherit meta; -} + inherit meta; + } diff --git a/pkgs/games/corsix-th/darwin-cmake-no-fixup-bundle.patch b/pkgs/games/corsix-th/darwin-cmake-no-fixup-bundle.patch new file mode 100644 index 0000000000000..170554ce9f2f0 --- /dev/null +++ b/pkgs/games/corsix-th/darwin-cmake-no-fixup-bundle.patch @@ -0,0 +1,12 @@ +diff --git a/CorsixTH/CMakeLists.txt b/CorsixTH/CMakeLists.txt +index 85856df3..f0f08277 100644 +--- a/CorsixTH/CMakeLists.txt ++++ b/CorsixTH/CMakeLists.txt +@@ -293,7 +293,6 @@ if(NOT USE_SOURCE_DATADIRS) + install(CODE " + INCLUDE(BundleUtilities) + SET(BU_CHMOD_BUNDLE_ITEMS ON) +- FIXUP_BUNDLE(\"${CMAKE_INSTALL_PREFIX}/CorsixTH.app\" \"\" \"\") + ") + if(WITH_LUAROCKS) + install(CODE "execute_process( diff --git a/pkgs/games/corsix-th/default.nix b/pkgs/games/corsix-th/default.nix index 240992406b2fd..f55a9a20b3281 100644 --- a/pkgs/games/corsix-th/default.nix +++ b/pkgs/games/corsix-th/default.nix @@ -10,9 +10,15 @@ , SDL2 , SDL2_mixer , timidity +# Darwin dependencies +, libiconv +, Cocoa +, CoreVideo +# Update +, nix-update-script }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation(finalAttrs: { pname = "corsix-th"; version = "0.67"; @@ -23,23 +29,50 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-WA/VJqHXzBfVUBNtxCVsGBRzSRQ0pvDvAy03ntc0KZE="; }; - luaEnv = lua.withPackages(p: with p; [ luafilesystem lpeg luasec luasocket ]); + patches = [ + ./darwin-cmake-no-fixup-bundle.patch + ]; + nativeBuildInputs = [ cmake doxygen makeWrapper ]; - buildInputs = [ ffmpeg freetype lua finalAttrs.luaEnv SDL2 SDL2_mixer timidity ]; + + buildInputs = let + luaEnv = lua.withPackages(p: with p; [ luafilesystem lpeg luasec luasocket ]); + in [ + ffmpeg + freetype + lua + luaEnv + SDL2 + SDL2_mixer + timidity + ] ++ lib.optionals stdenv.isDarwin [ + libiconv + Cocoa + CoreVideo + ]; + cmakeFlags = [ "-Wno-dev" ]; - postInstall = '' + postInstall = lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/corsix-th \ --set LUA_PATH "$LUA_PATH" \ --set LUA_CPATH "$LUA_CPATH" + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv $out/CorsixTH.app $out/Applications + wrapProgram $out/Applications/CorsixTH.app/Contents/MacOS/CorsixTH \ + --set LUA_PATH "$LUA_PATH" \ + --set LUA_CPATH "$LUA_CPATH" ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Reimplementation of the 1997 Bullfrog business sim Theme Hospital"; mainProgram = "corsix-th"; homepage = "https://corsixth.com/"; license = licenses.mit; - maintainers = with maintainers; [ hughobrien ]; - platforms = platforms.linux; + maintainers = with maintainers; [ hughobrien matteopacini ]; + platforms = platforms.linux ++ platforms.darwin; }; }) diff --git a/pkgs/games/ferium/default.nix b/pkgs/games/ferium/default.nix index f564b715f81d3..ea9a092d2ccb4 100644 --- a/pkgs/games/ferium/default.nix +++ b/pkgs/games/ferium/default.nix @@ -9,18 +9,18 @@ rustPlatform.buildRustPackage rec { pname = "ferium"; - version = "4.6.0"; + version = "4.7.0"; src = fetchFromGitHub { owner = "gorilla-devs"; repo = pname; rev = "v${version}"; - hash = "sha256-a4bX5pC3FSCswvUG1wFeo3e6F+CmyfYowv7OhF2DZss="; + hash = "sha256-jj3BdaxH7ofhHNF2eu+burn6+/0bPQQZ8JfjXAFyN4A="; }; buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoHash = "sha256-CyDFBSTdUjapMtb6cNOEV53wTJDWotdSZZgHAQpsa9I="; + cargoHash = "sha256-dysKHi6CqPrF/q7LPn1+TwOP3p2KwauhTuqLCda3OSs="; # Disable the GUI file picker so that GTK/XDG dependencies aren't used buildNoDefaultFeatures = true; diff --git a/pkgs/games/minecraft-servers/derivation.nix b/pkgs/games/minecraft-servers/derivation.nix index 0773be6bcfc7e..a1b03a0a3b368 100644 --- a/pkgs/games/minecraft-servers/derivation.nix +++ b/pkgs/games/minecraft-servers/derivation.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, nixosTests, jre_headless, version, url, sha1 }: +{ lib, stdenv, fetchurl, nixosTests, jre_headless, makeWrapper, udev, version, url, sha1 }: stdenv.mkDerivation { pname = "minecraft-server"; inherit version; @@ -7,16 +7,18 @@ stdenv.mkDerivation { preferLocalBuild = true; + nativeBuildInputs = [ makeWrapper ]; + installPhase = '' - mkdir -p $out/bin $out/lib/minecraft - cp -v $src $out/lib/minecraft/server.jar + runHook preInstall + + install -Dm644 $src $out/lib/minecraft/server.jar - cat > $out/bin/minecraft-server << EOF - #!/bin/sh - exec ${jre_headless}/bin/java \$@ -jar $out/lib/minecraft/server.jar nogui - EOF + makeWrapper ${lib.getExe jre_headless} $out/bin/minecraft-server \ + --append-flags "-jar $out/lib/minecraft/server.jar nogui" \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]} - chmod +x $out/bin/minecraft-server + runHook postInstall ''; dontUnpack = true; diff --git a/pkgs/games/minecraft-servers/versions.json b/pkgs/games/minecraft-servers/versions.json index 5fece659ca419..fdda977994b81 100644 --- a/pkgs/games/minecraft-servers/versions.json +++ b/pkgs/games/minecraft-servers/versions.json @@ -1,4 +1,10 @@ { + "1.21": { + "sha1": "450698d1863ab5180c25d7c804ef0fe6369dd1ba", + "url": "https://piston-data.mojang.com/v1/objects/450698d1863ab5180c25d7c804ef0fe6369dd1ba/server.jar", + "version": "1.21", + "javaVersion": 21 + }, "1.20": { "sha1": "145ff0858209bcfc164859ba735d4199aafa1eea", "url": "https://piston-data.mojang.com/v1/objects/145ff0858209bcfc164859ba735d4199aafa1eea/server.jar", diff --git a/pkgs/games/shipwright/darwin-fixes.patch b/pkgs/games/shipwright/darwin-fixes.patch new file mode 100644 index 0000000000000..ae5e936603ddf --- /dev/null +++ b/pkgs/games/shipwright/darwin-fixes.patch @@ -0,0 +1,37 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2c8644af..157758c9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -166,17 +166,13 @@ endif() + if(CMAKE_SYSTEM_NAME MATCHES "Darwin") + add_custom_target(CreateOSXIcons + COMMAND mkdir -p ${CMAKE_BINARY_DIR}/macosx/soh.iconset +- COMMAND sips -z 16 16 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_16x16.png +- COMMAND sips -z 32 32 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_16x16@2x.png +- COMMAND sips -z 32 32 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_32x32.png +- COMMAND sips -z 64 64 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_32x32@2x.png +- COMMAND sips -z 128 128 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_128x128.png +- COMMAND sips -z 256 256 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_128x128@2x.png +- COMMAND sips -z 256 256 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_256x256.png +- COMMAND sips -z 512 512 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_256x256@2x.png +- COMMAND sips -z 512 512 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_512x512.png +- COMMAND cp soh/macosx/sohIcon.png ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_512x512@2x.png +- COMMAND iconutil -c icns -o ${CMAKE_BINARY_DIR}/macosx/soh.icns ${CMAKE_BINARY_DIR}/macosx/soh.iconset ++ COMMAND convert soh/macosx/sohIcon.png -resize 16x16 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_16.png ++ COMMAND convert soh/macosx/sohIcon.png -resize 32x32 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_32.png ++ COMMAND convert soh/macosx/sohIcon.png -resize 64x64 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_64.png ++ COMMAND convert soh/macosx/sohIcon.png -resize 128x128 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_128.png ++ COMMAND convert soh/macosx/sohIcon.png -resize 256x256 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_256.png ++ COMMAND convert soh/macosx/sohIcon.png -resize 512x512 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_512.png ++ COMMAND png2icns ${CMAKE_BINARY_DIR}/macosx/soh.icns ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_{16,32,64,128,256,512}.png + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + COMMENT "Creating OSX icons ..." + ) +@@ -201,7 +197,6 @@ install(DIRECTORY ${CMAKE_BINARY_DIR}/assets + + install(CODE " + include(BundleUtilities) +- fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/soh-macos\" \"\" \"${dirs}\") + ") + + endif() diff --git a/pkgs/games/shipwright/default.nix b/pkgs/games/shipwright/default.nix index 397226fc4ba5c..cdb48733eb012 100644 --- a/pkgs/games/shipwright/default.nix +++ b/pkgs/games/shipwright/default.nix @@ -24,8 +24,13 @@ , imagemagick , gnome , makeWrapper +, darwin +, libicns }: - +let + inherit (darwin.apple_sdk_11_0.frameworks) + IOSurface Metal QuartzCore Cocoa AVFoundation; +in stdenv.mkDerivation (finalAttrs: { pname = "shipwright"; version = "8.0.5"; @@ -38,6 +43,10 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + patches = [ + ./darwin-fixes.patch + ]; + # This would get fetched at build time otherwise, see: # https://github.com/HarbourMasters/Shipwright/blob/e46c60a7a1396374e23f7a1f7122ddf9efcadff7/soh/CMakeLists.txt#L736 gamecontrollerdb = fetchurl { @@ -50,27 +59,39 @@ stdenv.mkDerivation (finalAttrs: { cmake ninja pkg-config - lsb-release python3 imagemagick - copyDesktopItems makeWrapper + ] ++ lib.optionals stdenv.isLinux [ + lsb-release + copyDesktopItems + ] ++ lib.optionals stdenv.isDarwin [ + libicns + darwin.sigtool ]; buildInputs = [ boost + glew + SDL2 + SDL2_net + libpng + ] ++ lib.optionals stdenv.isLinux [ libX11 libXrandr libXinerama libXcursor libXi libXext - glew - SDL2 - SDL2_net libpulseaudio - libpng gnome.zenity + ] ++ lib.optionals stdenv.isDarwin [ + IOSurface + Metal + QuartzCore + Cocoa + AVFoundation + darwin.apple_sdk_11_0.libs.simd ]; cmakeFlags = [ @@ -78,6 +99,9 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "NON_PORTABLE" true) ]; + env.NIX_CFLAGS_COMPILE = + lib.optionalString stdenv.isDarwin "-Wno-int-conversion -Wno-implicit-int"; + dontAddPrefix = true; # Linking fails without this @@ -90,18 +114,60 @@ stdenv.mkDerivation (finalAttrs: { popd ''; - preInstall = '' + preInstall = lib.optionalString stdenv.isLinux '' # Cmake likes it here for its install paths cp ../OTRExporter/soh.otr .. + '' + lib.optionalString stdenv.isDarwin '' + cp ../OTRExporter/soh.otr soh/soh.otr ''; - postInstall = '' + postInstall = lib.optionalString stdenv.isLinux '' mkdir -p $out/bin ln -s $out/lib/soh.elf $out/bin/soh install -Dm644 ../soh/macosx/sohIcon.png $out/share/pixmaps/soh.png + '' + lib.optionalString stdenv.isDarwin '' + # Recreate the macOS bundle (without using cpack) + # We mirror the structure of the bundle distributed by the project + + mkdir -p $out/Applications/soh.app/Contents + cp $src/soh/macosx/Info.plist.in $out/Applications/soh.app/Contents/Info.plist + substituteInPlace $out/Applications/soh.app/Contents/Info.plist \ + --replace-fail "@CMAKE_PROJECT_VERSION@" "${finalAttrs.version}" + + mv $out/MacOS $out/Applications/soh.app/Contents/MacOS + + # Wrapper + cp $src/soh/macosx/soh-macos.sh.in $out/Applications/soh.app/Contents/MacOS/soh + chmod +x $out/Applications/soh.app/Contents/MacOS/soh + patchShebangs $out/Applications/soh.app/Contents/MacOS/soh + + # "lib" contains all resources that are in "Resources" in the official bundle. + # We move them to the right place and symlink them back to $out/lib, + # as that's where the game expects them. + mv $out/Resources $out/Applications/soh.app/Contents/Resources + mv $out/lib/** $out/Applications/soh.app/Contents/Resources + rm -rf $out/lib + ln -s $out/Applications/soh.app/Contents/Resources $out/lib + + # Copy icons + cp -r ../build/macosx/soh.icns $out/Applications/soh.app/Contents/Resources/soh.icns + + # Fix executable + install_name_tool -change @executable_path/../Frameworks/libSDL2-2.0.0.dylib \ + ${SDL2}/lib/libSDL2-2.0.0.dylib \ + $out/Applications/soh.app/Contents/Resources/soh-macos + install_name_tool -change @executable_path/../Frameworks/libGLEW.2.2.0.dylib \ + ${glew}/lib/libGLEW.2.2.0.dylib \ + $out/Applications/soh.app/Contents/Resources/soh-macos + install_name_tool -change @executable_path/../Frameworks/libpng16.16.dylib \ + ${libpng}/lib/libpng16.16.dylib \ + $out/Applications/soh.app/Contents/Resources/soh-macos + + # Codesign (ad-hoc) + codesign -f -s - $out/Applications/soh.app/Contents/Resources/soh-macos ''; - fixupPhase = '' + fixupPhase = lib.optionalString stdenv.isLinux '' wrapProgram $out/lib/soh.elf --prefix PATH ":" ${lib.makeBinPath [ gnome.zenity ]} ''; @@ -121,8 +187,8 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/HarbourMasters/Shipwright"; description = "A PC port of Ocarina of Time with modern controls, widescreen, high-resolution, and more"; mainProgram = "soh"; - platforms = [ "x86_64-linux" ]; - maintainers = with lib.maintainers; [ ivar j0lol ]; + platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin; + maintainers = with lib.maintainers; [ ivar j0lol matteopacini ]; license = with lib.licenses; [ # OTRExporter, OTRGui, ZAPDTR, libultraship mit diff --git a/pkgs/games/steam/runtime.nix b/pkgs/games/steam/runtime.nix index 6c2416dc18488..f736ac8daa47c 100644 --- a/pkgs/games/steam/runtime.nix +++ b/pkgs/games/steam/runtime.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "steam-runtime"; # from https://repo.steampowered.com/steamrt-images-scout/snapshots/latest-steam-client-general-availability/VERSION.txt - version = "0.20231127.68515"; + version = "0.20240415.84615"; src = fetchurl { url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${finalAttrs.version}/steam-runtime.tar.xz"; - hash = "sha256-invUOdJGNhrswsj9Vj/bSAkEigWtBQ554sBAyvPf0mk="; + hash = "sha256-C8foNnIVA+O4YwuCrIf9N6Lr/GlApPVgZsYgi+3OZUE="; name = "scout-runtime-${finalAttrs.version}.tar.gz"; }; diff --git a/pkgs/kde/generated/dependencies.json b/pkgs/kde/generated/dependencies.json index 70f5499bfdbc0..371a13bf633bd 100644 --- a/pkgs/kde/generated/dependencies.json +++ b/pkgs/kde/generated/dependencies.json @@ -492,7 +492,6 @@ "extra-cmake-modules", "karchive", "kcmutils", - "kcodecs", "kcompletion", "kconfig", "kconfigwidgets", @@ -514,7 +513,6 @@ "kwidgetsaddons", "kwindowsystem", "kxmlgui", - "plasma-activities", "sonnet", "threadweaver" ], @@ -700,6 +698,7 @@ "packagekit-qt", "phonon", "plasma-activities", + "selenium-webdriver-at-spi", "solid" ], "dolphin-plugins": [ @@ -879,6 +878,15 @@ "kxmlgui", "sonnet" ], + "glaxnimate": [ + "extra-cmake-modules", + "karchive", + "kcompletion", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kxmlgui" + ], "granatier": [ "extra-cmake-modules", "kconfig", @@ -1035,8 +1043,11 @@ "kwindowsystem", "libquotient", "networkmanager-qt", + "plasma-integration", "prison", - "qqc2-desktop-style" + "qqc2-breeze-style", + "qqc2-desktop-style", + "selenium-webdriver-at-spi" ], "juk": [ "kcompletion", @@ -1858,6 +1869,7 @@ "kwidgetsaddons", "kxmlgui", "libplasma", + "plasma-desktop", "plasma-nano", "plasma-workspace", "plasma5support", @@ -2056,7 +2068,6 @@ "kdoctools", "ki18n", "kio", - "kparts", "kwidgetsaddons", "kxmlgui" ], @@ -2975,6 +2986,21 @@ "ktextwidgets", "kwidgetsaddons" ], + "kmuddy": [ + "extra-cmake-modules", + "karchive", + "kcmutils", + "kconfig", + "kcoreaddons", + "ki18n", + "kiconthemes", + "kio", + "knotifications", + "kservice", + "ktextwidgets", + "kwidgetsaddons", + "kxmlgui" + ], "kmymoney": [ "akonadi", "alkimia", @@ -3182,6 +3208,19 @@ "kxmlgui", "syntax-highlighting" ], + "kompare": [ + "extra-cmake-modules", + "kcodecs", + "kconfig", + "kcoreaddons", + "kdoctools", + "kiconthemes", + "kjobwidgets", + "kparts", + "ktexteditor", + "kwidgetsaddons", + "libkomparediff2" + ], "kongress": [ "extra-cmake-modules", "kcalendarcore", @@ -3511,6 +3550,14 @@ "kxmlgui", "plasma-activities" ], + "krdp": [ + "extra-cmake-modules", + "kcmutils", + "kconfig", + "kdbusaddons", + "kpipewire", + "kstatusnotifieritem" + ], "krecorder": [ "extra-cmake-modules", "kconfig", @@ -3671,6 +3718,7 @@ "kconfigwidgets", "kcoreaddons", "kcrash", + "kdeclarative", "kglobalaccel", "ki18n", "kidletime", @@ -4349,6 +4397,14 @@ "ki18n", "kwidgetsaddons" ], + "libkomparediff2": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "ki18n", + "kio", + "kxmlgui" + ], "libksane": [ "extra-cmake-modules", "ki18n", @@ -4433,6 +4489,7 @@ "kdbusaddons", "ki18n", "kirigami", + "kirigami-addons", "kitemmodels" ], "lokalize": [ @@ -4500,6 +4557,7 @@ "kcolorscheme", "kconfig", "kcoreaddons", + "kcrash", "ki18n", "kirigami", "kirigami-addons", @@ -5186,6 +5244,7 @@ "ksvg", "libplasma", "plasma-workspace", + "pulseaudio-qt", "selenium-webdriver-at-spi" ], "plasma-pass": [ @@ -5274,6 +5333,7 @@ "kconfig", "kcoreaddons", "kdbusaddons", + "kdeclarative", "kglobalaccel", "ki18n", "kiconthemes", @@ -5405,6 +5465,7 @@ "plasma5support", "polkit-qt-1", "prison", + "qcoro", "qqc2-desktop-style", "selenium-webdriver-at-spi", "solid", @@ -5416,8 +5477,14 @@ "extra-cmake-modules", "kconfig", "kcoreaddons", + "kguiaddons", "ki18n", - "libplasma" + "kio", + "knotifications", + "kservice", + "libksysguard", + "libplasma", + "solid" ], "plasmatube": [ "extra-cmake-modules", @@ -5761,13 +5828,6 @@ "kxmlgui", "plasma-activities" ], - "smaragd": [ - "kconfig", - "kcoreaddons", - "kdecoration", - "ki18n", - "kwidgetsaddons" - ], "smb4k": [ "extra-cmake-modules", "kauth", @@ -5979,6 +6039,7 @@ "kconfig", "kcoreaddons", "kdbusaddons", + "kdeclarative", "ki18n", "kio", "kirigami", @@ -6146,5 +6207,5 @@ "kwindowsystem" ] }, - "version": "525ad8d3" + "version": "558e00a4" } \ No newline at end of file diff --git a/pkgs/kde/generated/licenses.json b/pkgs/kde/generated/licenses.json index 1b6a47dc218c0..c0890c5a7ed03 100644 --- a/pkgs/kde/generated/licenses.json +++ b/pkgs/kde/generated/licenses.json @@ -1755,6 +1755,15 @@ "CC0-1.0", "GPL-2.0-or-later" ], + "krdp": [ + "BSD-2-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], "krecorder": [ "BSD-3-Clause", "CC-BY-4.0", @@ -2076,7 +2085,10 @@ "layer-shell-qt": [ "BSD-3-Clause", "CC0-1.0", + "LGPL-2.1-only", + "LGPL-3.0-only", "LGPL-3.0-or-later", + "LicenseRef-KDE-Accepted-LGPL", "MIT" ], "libgravatar": [ @@ -2526,6 +2538,7 @@ "LicenseRef-Qt-Commercial" ], "plasma-mobile": [ + "Apache-2.0", "BSD-3-Clause", "CC0-1.0", "GPL-2.0-only", @@ -2635,9 +2648,11 @@ ], "plasma-workspace-wallpapers": [], "plasma5support": [ + "BSD-3-Clause", "CC0-1.0", "GPL-2.0-or-later", - "LGPL-2.0-or-later" + "LGPL-2.0-or-later", + "LGPL-2.1-or-later" ], "plasmatube": [ "CC-BY-SA-4.0", @@ -2667,6 +2682,7 @@ "GPL-2.0-or-later", "GPL-3.0-only", "LGPL-2.0-only", + "LGPL-2.0-or-later", "LGPL-2.1-only", "LGPL-2.1-or-later", "LGPL-3.0-only", @@ -2831,7 +2847,6 @@ "GPL-2.0-only", "GPL-2.0-or-later", "GPL-3.0-only", - "GPL-3.0-or-later", "LGPL-2.0-only", "LGPL-2.1-or-later", "LicenseRef-KDE-Accepted-GPL" diff --git a/pkgs/kde/generated/projects.json b/pkgs/kde/generated/projects.json index d798654c27d8e..5af72a4c52d17 100644 --- a/pkgs/kde/generated/projects.json +++ b/pkgs/kde/generated/projects.json @@ -1001,6 +1001,12 @@ "project_path": "unmaintained/flickr-runner", "repo_path": "unmaintained/flickr-runner" }, + "foss-public-alert-server": { + "description": "Open source server that allows desktop applications to receive near real-time push notifications about emergency alerts worldwide.", + "name": "foss-public-alert-server", + "project_path": "playground/www/foss-public-alert-server", + "repo_path": "webapps/foss-public-alert-server" + }, "frameworkintegration": { "description": "Framework providing components to allow applications to integrate with a KDE Workspace", "name": "frameworkintegration", diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json index e44e3b0e2cc9f..dd11c14e89271 100644 --- a/pkgs/kde/generated/sources/plasma.json +++ b/pkgs/kde/generated/sources/plasma.json @@ -1,317 +1,322 @@ { "bluedevil": { - "version": "6.0.5.1", - "url": "mirror://kde/stable/plasma/6.0.5/bluedevil-6.0.5.1.tar.xz", - "hash": "sha256-Zvzi1J9qxxa1UeMDD47T9xvuwEKNofma9+lZvJD1POI=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/bluedevil-6.1.0.tar.xz", + "hash": "sha256-9ZWwZUgK+o/B57VXPaJGqOJ2h08KGeqwz8tUBKymBoQ=" }, "breeze": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/breeze-6.0.5.tar.xz", - "hash": "sha256-8kndRGT02mtoGvXE/Q6BF4EnKUstRBE087EOJwP1c3Q=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/breeze-6.1.0.tar.xz", + "hash": "sha256-9xuPTnZ35WhWdqxy+WEBWFPelZseCLpzU5FHzse9HQ4=" }, "breeze-grub": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/breeze-grub-6.0.5.tar.xz", - "hash": "sha256-w9+KYNSYv0WYvGwW1hmnVxdQRnPB9Q9YHN+aZ428f+I=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/breeze-grub-6.1.0.tar.xz", + "hash": "sha256-VglghrnChFxWsUMK+8Rsb6cLiLnxMpvm/XWEm8BmiQ8=" }, "breeze-gtk": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/breeze-gtk-6.0.5.tar.xz", - "hash": "sha256-Uez1bnWimp5P26cG9MKE2W+YsPGLCqnYZkIYw22UuRI=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/breeze-gtk-6.1.0.tar.xz", + "hash": "sha256-F3tosQ/23CLiryzXAq2T6aLksWbGofPfyx1jgl4mWns=" }, "breeze-plymouth": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/breeze-plymouth-6.0.5.tar.xz", - "hash": "sha256-/hcQ+oYSTOCvENFgXMN1cW0/LP6aT87X9PSg6lhYBr4=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/breeze-plymouth-6.1.0.tar.xz", + "hash": "sha256-Gd8toIZclKuMhfWM0tiVZfQ3nci8iFFmsgGto6mTRc8=" }, "discover": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/discover-6.0.5.tar.xz", - "hash": "sha256-lEygP+Ex4OkveVsy5Of8cUyaWfwYpLvan1BAjQxq85U=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/discover-6.1.0.tar.xz", + "hash": "sha256-vrkjioN4fcaAMKrB7rpSE4rwOcB8SrL/jez+noYgOwg=" }, "drkonqi": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/drkonqi-6.0.5.tar.xz", - "hash": "sha256-EBX5rXNMxOULEK0kNqYGYddLDex0hyW+kIIQMzMCmF0=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/drkonqi-6.1.0.tar.xz", + "hash": "sha256-5/KbSC0C6HFK0mh/OObtIR8qXpLIVGa5NDIRIBlLp9Q=" }, "flatpak-kcm": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/flatpak-kcm-6.0.5.tar.xz", - "hash": "sha256-dBuUbAfQ1OUJ+M8pabIx5fNxAg1y+idqb35hY80nDOM=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/flatpak-kcm-6.1.0.tar.xz", + "hash": "sha256-DykHMvPm7nxOTmnAal3eROvc1eq1GNeC1Av+EAALlic=" }, "kactivitymanagerd": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kactivitymanagerd-6.0.5.tar.xz", - "hash": "sha256-We+Wj6CZDteuxmgr28jFHfEiSil5NAhMRjBgvJFv4J4=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kactivitymanagerd-6.1.0.tar.xz", + "hash": "sha256-yy5tpju5hPZdRbvTB4QEzWVGNT7TwtyTx7QJeNqCdzY=" }, "kde-cli-tools": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kde-cli-tools-6.0.5.tar.xz", - "hash": "sha256-wAJ64E5pHGkuGowFZdZ3n7Nuyw16949mY7kjD0WBso8=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kde-cli-tools-6.1.0.tar.xz", + "hash": "sha256-vE4iYriz4Y3sAQ7BvqT23c1fNqEnX4TRK29uhjs2Xb4=" }, "kde-gtk-config": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kde-gtk-config-6.0.5.tar.xz", - "hash": "sha256-tCKWn3sid9g9eppm25m5mcA8sKtKUDHgCwzN77pX74M=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kde-gtk-config-6.1.0.tar.xz", + "hash": "sha256-kreRiz7qxjkJiX29odEsTDMlAoF8MIGVYcxTidoRuO8=" }, "kdecoration": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kdecoration-6.0.5.tar.xz", - "hash": "sha256-CjxRYcA+i6ED/BCWarveKY3pjiXJRaJK4IpTmnhnAiQ=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kdecoration-6.1.0.tar.xz", + "hash": "sha256-hi6xlzLtGEZDDE3g71YwKsD5rvWtJgcZ0kMbY9yKr6U=" }, "kdeplasma-addons": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kdeplasma-addons-6.0.5.tar.xz", - "hash": "sha256-kRr0dUhzwXwcp9SfBmnePjhoWLCa3ygng7nFUQV2upU=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kdeplasma-addons-6.1.0.tar.xz", + "hash": "sha256-y1f6QnsxiKG8emsS4Zb8ESUnQuCPY5fjrwD/rzRnYSc=" }, "kgamma": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kgamma-6.0.5.tar.xz", - "hash": "sha256-ZZ3rZG/aFwONRUhpjHrEsIwSZgYjt411Q3pgbWp7rTY=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kgamma-6.1.0.tar.xz", + "hash": "sha256-/HuqscZYq7KfqTgpS3aXpyq8cvDDTo6itM4i281dTfk=" }, "kglobalacceld": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kglobalacceld-6.0.5.tar.xz", - "hash": "sha256-LJs5HA4/kbuLMgApx7l/yBZmWIghBtHfmtRBYAiU/K4=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kglobalacceld-6.1.0.tar.xz", + "hash": "sha256-89sf4gN5iaz/HvDAPqB3eaysr7YD/q7v7vj4SZtoAxA=" }, "kinfocenter": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kinfocenter-6.0.5.tar.xz", - "hash": "sha256-v08sYnJC2CeGcwbE6IR5bH1finoqKURKSUwqytXIiXM=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kinfocenter-6.1.0.tar.xz", + "hash": "sha256-KDyleEkIe8YSldSQX+a/aP98iwGDC4dHn6uavHLbVN4=" }, "kmenuedit": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kmenuedit-6.0.5.tar.xz", - "hash": "sha256-mqHTlyTLoee49t7YxJCs3+EVmO02jCjpqoZXJpjjWfg=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kmenuedit-6.1.0.tar.xz", + "hash": "sha256-KB9/dC0chX+dpjSrCB+9UYSxDWpr3dUpEr9k9DFkQb8=" }, "kpipewire": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kpipewire-6.0.5.tar.xz", - "hash": "sha256-QyfaJDUYbpBlPIcN5zCCp+X7YdE+BqUXywIfHVa30tY=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kpipewire-6.1.0.tar.xz", + "hash": "sha256-/MwoeEHuM8EoPL3Kg1DHji5zneulHyV0FpCaoCbNea0=" + }, + "krdp": { + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/krdp-6.1.0.tar.xz", + "hash": "sha256-MSfrtI0TD/GuuD4KZZj7Iv0LEmS76BqdbD3Sw4qAGJA=" }, "kscreen": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kscreen-6.0.5.tar.xz", - "hash": "sha256-7e2LVYFn2JopqDCnvTx9aSs2XaUpx7blnr2t65Fqk/A=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kscreen-6.1.0.tar.xz", + "hash": "sha256-FivRlneM93bKZGmq0FmAcx/di4JXD8BF+JYSqXq7RAE=" }, "kscreenlocker": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kscreenlocker-6.0.5.tar.xz", - "hash": "sha256-W7lKKg1pzOt+1O/L94a1M4hWfVEKQQ/Z0BvpE9KxY9A=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kscreenlocker-6.1.0.tar.xz", + "hash": "sha256-CjLFLnTRzE6QRKG+KXgHNqoM+uYZ3/Awl9VnfsnxBnE=" }, "ksshaskpass": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/ksshaskpass-6.0.5.tar.xz", - "hash": "sha256-bfDu70OgQesabXG6Uk/qxX/B9IrrRFQDZvEkBMxJhrw=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/ksshaskpass-6.1.0.tar.xz", + "hash": "sha256-CmWqVI3U7PSYl4WDg10QNxBICYpiPHTKlQx4/BbqJKk=" }, "ksystemstats": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/ksystemstats-6.0.5.tar.xz", - "hash": "sha256-vcb6lcC02tkhDHp3NOHCM7xAjwn8r0lhunCa/6H9QoQ=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/ksystemstats-6.1.0.tar.xz", + "hash": "sha256-zlm//t8V/P2g+R7kWZVff+j/0r2hNDV1fnCaRAbv6Tw=" }, "kwallet-pam": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kwallet-pam-6.0.5.tar.xz", - "hash": "sha256-JcYRKOrvtWPlAFR/ZQvik+dRJu1fwvrFdO9AzMv9ANs=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kwallet-pam-6.1.0.tar.xz", + "hash": "sha256-sh7YYul1Hf6pOOVXGFrI6qJK4mDveV+5mtdNPEy5aho=" }, "kwayland": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kwayland-6.0.5.tar.xz", - "hash": "sha256-qLiEEdKtlJfifW29ldZH3l6+YxRWHnqNk1/Xmy/nroQ=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kwayland-6.1.0.tar.xz", + "hash": "sha256-xzbPiMgdkHrxPkCo7qR1VHbcIkw19jvPeRUDl130UH0=" }, "kwayland-integration": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kwayland-integration-6.0.5.tar.xz", - "hash": "sha256-sW30rZhRJCo5OHTC1TUgKXMkfduovhP9lZi+hhapoEU=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kwayland-integration-6.1.0.tar.xz", + "hash": "sha256-kblfkvmSZ5UquVTZ1t1+8HZTAHPy0g1A7qICdJfYNsg=" }, "kwin": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kwin-6.0.5.tar.xz", - "hash": "sha256-JC59IQUp7GMbxf4/4KEXo9HU7bHdOmRKr9UIkxL4sNc=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kwin-6.1.0.tar.xz", + "hash": "sha256-UK/9bFwjzCxqjCPXQaZrBvZnnILH/Tyv6mamsGQ7Ty8=" }, "kwrited": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/kwrited-6.0.5.tar.xz", - "hash": "sha256-EKtotq1K/3451YlgdNusEGgNDfk/BKzy8tFaPYV/Q1k=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/kwrited-6.1.0.tar.xz", + "hash": "sha256-F9z4QZtdDXdevWhQmVPKe3M46/rU51dandc2TpEOIOE=" }, "layer-shell-qt": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/layer-shell-qt-6.0.5.tar.xz", - "hash": "sha256-vWv3PcebVh3TjB/HjDc7LvS532nWqCfjBdAREJ2RosI=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/layer-shell-qt-6.1.0.tar.xz", + "hash": "sha256-Vb2OgZonmwWf4p2/Rj+PFfgzcHN5xxkVPsdQt7UIIdg=" }, "libkscreen": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/libkscreen-6.0.5.tar.xz", - "hash": "sha256-Aad1afNy01TBcqI/LU4GYXAcAk5E2XKXGxRnNeFq4dk=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/libkscreen-6.1.0.tar.xz", + "hash": "sha256-wZPUO8wltih3CfGC5OYV9QtKleErutyitxQyBiSvq3Q=" }, "libksysguard": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/libksysguard-6.0.5.tar.xz", - "hash": "sha256-ypVPW7V3AL0UuuMjOoIJTqadMiccw+3W0yvPONsj4Xc=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/libksysguard-6.1.0.tar.xz", + "hash": "sha256-bR6a964QsSSrYqynDi89oVt0KnL3wGRvjCGff0tl42o=" }, "libplasma": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/libplasma-6.0.5.tar.xz", - "hash": "sha256-01dlwDmQHnObAU/5JkDGzUpNhSTCb+TQC9E00WqwzNI=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/libplasma-6.1.0.tar.xz", + "hash": "sha256-7SXwTKaKBAlkt7zbBDy3C+69+HgMYwJqWyyxPGu+dTs=" }, "milou": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/milou-6.0.5.tar.xz", - "hash": "sha256-cI4YtbQkmFoWdQfptZNN6TxlrK8vUkRmMS0JUV64Qs8=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/milou-6.1.0.tar.xz", + "hash": "sha256-e2gqTq2FrW28MoI7jU3JQbSVHlBwn9TTPNml3DSJvkY=" }, "ocean-sound-theme": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/ocean-sound-theme-6.0.5.tar.xz", - "hash": "sha256-YBXzkxp0E0/dfu9cfHWS74t0D8wITXcm+N+ZPcUon2s=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/ocean-sound-theme-6.1.0.tar.xz", + "hash": "sha256-nsZVxPPxT55qBEUP2yyomn97Ve228X7TbZr1ZuvgBfA=" }, "oxygen": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/oxygen-6.0.5.tar.xz", - "hash": "sha256-flQ3LW/ca3Nz2UjZSJ8+lLRXpvIqjwD26t4zzYPOgCI=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/oxygen-6.1.0.tar.xz", + "hash": "sha256-paAuWqy8qCjJhd+Nqbyq0LabVfymjBLwyvhS5woPW20=" }, "oxygen-sounds": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/oxygen-sounds-6.0.5.tar.xz", - "hash": "sha256-azR0er1oOQF9DqzB1SyFtSbbtnggH8TMNxknhnElOVI=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/oxygen-sounds-6.1.0.tar.xz", + "hash": "sha256-7sCIyky+3zmafrYlAT0b8bOTPgGAb8eeFZeS2X9jQ9E=" }, "plasma-activities": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-activities-6.0.5.tar.xz", - "hash": "sha256-iBGHa8aQJ47NczsjOsRepPuwa8GmLZ4XuSaKpNBeplg=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-activities-6.1.0.tar.xz", + "hash": "sha256-z3rQIIRAVqYvW9jXkrW8/cJV6gU97FHA+RBAJj9P+fg=" }, "plasma-activities-stats": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-activities-stats-6.0.5.tar.xz", - "hash": "sha256-16qv+XsfDDyUGxNKM/d9la8JXLsaZO/nQdev0VyYe18=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-activities-stats-6.1.0.tar.xz", + "hash": "sha256-0R3Rla1kK7BXW/13fBMjvq6opk2VkW0iH8b8ZytV7RU=" }, "plasma-browser-integration": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-browser-integration-6.0.5.tar.xz", - "hash": "sha256-MNzpVeJ6p2VsgnWCQK3umPJ3NglrwPgyodEDTM8+5Bg=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-browser-integration-6.1.0.tar.xz", + "hash": "sha256-8dpzTyPiLMUBPtpriuL/4nQ/lNN/EzQKxXXCFne5A5Y=" }, "plasma-desktop": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-desktop-6.0.5.tar.xz", - "hash": "sha256-XZABuuoy41BVM3Zn8gTijyBuvMqgoXLg8QlCa6gELs8=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-desktop-6.1.0.tar.xz", + "hash": "sha256-ATHGaI2bAhBn5G0cFLiiWJXwbQ9Pdx/15J3kFgRJJM4=" }, "plasma-disks": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-disks-6.0.5.tar.xz", - "hash": "sha256-Mh7C8xdwQiOZcnjvS/O5zwEuL/rsWo1X5X/qxoFOOtg=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-disks-6.1.0.tar.xz", + "hash": "sha256-VKxFan5XP+6c6LkXUL+9q+CfG0+fQt1+qRU9dyfgthE=" }, "plasma-firewall": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-firewall-6.0.5.tar.xz", - "hash": "sha256-C1LnQTzHRdl7sWo4rEBhL/t9x+QyPhVvoX2SNCXEsw4=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-firewall-6.1.0.tar.xz", + "hash": "sha256-sct/qtoHGU6D/PH93wXF/pK2zvSi7LQUgbPMkCQXBwo=" }, "plasma-integration": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-integration-6.0.5.tar.xz", - "hash": "sha256-f4FoP/j4puI9XJjps/O8PWOKvU3K1OQNJ0RsACkAT/A=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-integration-6.1.0.tar.xz", + "hash": "sha256-8P/6n80DVp9sgI6NwecQfAjzC61o/m6PzD3ancB/v6c=" }, "plasma-mobile": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-mobile-6.0.5.tar.xz", - "hash": "sha256-hx0BuUCuMPHjzxt0jWaoluRa473G1rHodfKMlWTwVpQ=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-mobile-6.1.0.tar.xz", + "hash": "sha256-hvATS/pn8QwgdExI3JGIfb7pba4k8BeaU0m3XmoJwvg=" }, "plasma-nano": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-nano-6.0.5.tar.xz", - "hash": "sha256-F4dSBUjZukxoajwhuvM7pxdmGeYOcOjOvuymQcPFlgE=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-nano-6.1.0.tar.xz", + "hash": "sha256-01m8dwqVD7ear4OpyWQg+K2M/zJO1Q54T4SpPatxATU=" }, "plasma-nm": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-nm-6.0.5.tar.xz", - "hash": "sha256-LFK3WpYe/Quf2e86bOtPS8U53p763DoMAIeZ12+U+Oc=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-nm-6.1.0.tar.xz", + "hash": "sha256-U1Kv+bZzUYYJRQANCXID1TvhJMDxB8h7MkKBiYD1RpA=" }, "plasma-pa": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-pa-6.0.5.tar.xz", - "hash": "sha256-7L87tAcggJSByraFfnwbNDaKE50RYrAM1GssxjzZqsQ=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-pa-6.1.0.tar.xz", + "hash": "sha256-4squGRC7896AJHvUZUWNPXmI5s5gNOtj2pdj7xqtJjk=" }, "plasma-sdk": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-sdk-6.0.5.tar.xz", - "hash": "sha256-EeVgkilQMQvf9UmfibMWE9Tr4HBW7FeDuCYCsPm+jvs=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-sdk-6.1.0.tar.xz", + "hash": "sha256-oDKFPYakiYW9MTlCD67m6q7nV5YsG4zveNQ0BGCtS08=" }, "plasma-systemmonitor": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-systemmonitor-6.0.5.tar.xz", - "hash": "sha256-ZiUY5tx2PRnL2HjBRaN2GmouJ2X9I3J4/90KKlJTCAs=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-systemmonitor-6.1.0.tar.xz", + "hash": "sha256-tJqhz3tvhOp99xFyml0/b9AAREviorkP9l4Nu63JEiQ=" }, "plasma-thunderbolt": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-thunderbolt-6.0.5.tar.xz", - "hash": "sha256-WZfeM874a3tsRK3Oai4dO7U2x9eqQ+HjUN0Ov3fLZlg=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-thunderbolt-6.1.0.tar.xz", + "hash": "sha256-OG/68iQGUBzoWE6MjIY0TS6RGa+BFYgoJT5TDDVFwI0=" }, "plasma-vault": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-vault-6.0.5.tar.xz", - "hash": "sha256-L+PMc/e+9NTGR26gz9MuMl1bhx/fz/XBFB8gPd4L6U0=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-vault-6.1.0.tar.xz", + "hash": "sha256-tItJkyeQS4fto8v4+BSQRFDZO37vr5U8Y9HzfdnW0j0=" }, "plasma-welcome": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-welcome-6.0.5.tar.xz", - "hash": "sha256-XChjJlDcoDD9mpNl28Vv4ImObUhjwkYlrW5QPBzCPsY=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-welcome-6.1.0.tar.xz", + "hash": "sha256-GDF8qwiZixUExd2JFAN6QMqV7bRA9FxhN6Zq/fii9wA=" }, "plasma-workspace": { - "version": "6.0.5.1", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-workspace-6.0.5.1.tar.xz", - "hash": "sha256-iQf5/e1fxuXZU1X4NGMo3hjXyIUNq9kQnXVFjVru2BM=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-workspace-6.1.0.tar.xz", + "hash": "sha256-9PVC5vIB9GCA7m+5Ztn4lYEajc19TxikxsSM4MNaEnw=" }, "plasma-workspace-wallpapers": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-workspace-wallpapers-6.0.5.tar.xz", - "hash": "sha256-fqtNNHNe3/oSIrK1X9JEjX9iNeReAKG/mpRQ1za1O/A=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma-workspace-wallpapers-6.1.0.tar.xz", + "hash": "sha256-DLke5HhfzK04Pivi3RWwRFD4vAWUw5hvdYYP3tykZ1E=" }, "plasma5support": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma5support-6.0.5.tar.xz", - "hash": "sha256-ioEefbocMK4mKJNMTakdLfpC3JMihul9rIlwZGKHuHo=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plasma5support-6.1.0.tar.xz", + "hash": "sha256-4YMrMhq+krNzamEDdB7C1BZFMR2CKVXznsyJOOStVyo=" }, "plymouth-kcm": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plymouth-kcm-6.0.5.tar.xz", - "hash": "sha256-veWy0OMBjv2oB44yrqN0dTtOJRdxTJkUnl+Y0EbxJu8=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/plymouth-kcm-6.1.0.tar.xz", + "hash": "sha256-fS3hRSIl3UUmx0YZMAWTxY2s8PY7OApE2RyO6vLBvKs=" }, "polkit-kde-agent-1": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/polkit-kde-agent-1-6.0.5.tar.xz", - "hash": "sha256-cs+jZ/3UayyRduR80TB/LqccAgfy49zPBtKS3OTUSKk=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/polkit-kde-agent-1-6.1.0.tar.xz", + "hash": "sha256-QQaWh6qBGJvYMwyp0IHiFXnkbYFek4SdWHQeq+Fn7sI=" }, "powerdevil": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/powerdevil-6.0.5.tar.xz", - "hash": "sha256-J/mVvObyfjW3jgwjL43uj7pQ+5HXs6/RF1g723mhL9Q=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/powerdevil-6.1.0.tar.xz", + "hash": "sha256-RFsqU2a8HWSwRUfv5ucTt1otMwn+Ryfp7fYVe+bdRYA=" }, "print-manager": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/print-manager-6.0.5.tar.xz", - "hash": "sha256-V6wh/zTaLIxm9Hh43iwE0uoFOV8pd/yWxR3usEczozc=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/print-manager-6.1.0.tar.xz", + "hash": "sha256-xjx0BUhkCHdQQJAp7kiBvBFlq5POYBZp7cvzjMLyAhU=" }, "qqc2-breeze-style": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/qqc2-breeze-style-6.0.5.tar.xz", - "hash": "sha256-1PzFlkagZv05Kp7YZXGJ7sZ35yJJyKTnJH7YmrxHRJY=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/qqc2-breeze-style-6.1.0.tar.xz", + "hash": "sha256-raTAxWIsGluCXpsQQuC+cTUq3aRGQJS7beIclxAu4m8=" }, "sddm-kcm": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/sddm-kcm-6.0.5.tar.xz", - "hash": "sha256-huWdNrSD+i70jYUDHG8Y8oaHvQ7otCOEsK4mwBSywCg=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/sddm-kcm-6.1.0.tar.xz", + "hash": "sha256-GzCrvNGEp/RgoZY2qlDvfaNOa25BLubL+XrpW0146tw=" }, "systemsettings": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/systemsettings-6.0.5.tar.xz", - "hash": "sha256-tyK6Ifq9jNJ+I3GoPjOppOFAMlfUVLPwHG+kbCh0z5M=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/systemsettings-6.1.0.tar.xz", + "hash": "sha256-vZSxNCBkeUoULLKF7RAqbbaVm/JoLU5mHVYNc0poylw=" }, "wacomtablet": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/wacomtablet-6.0.5.tar.xz", - "hash": "sha256-N8+dNHdReMoiPm2bM+iqwRmRO6ETFvS8Imkk4lOXDK8=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/wacomtablet-6.1.0.tar.xz", + "hash": "sha256-0evmQyKNRwrVzClMWs0BD0ArpzqnfCpFKljTrIPIPIU=" }, "xdg-desktop-portal-kde": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/xdg-desktop-portal-kde-6.0.5.tar.xz", - "hash": "sha256-AL30QtN7MICr/SlYQl3XJKOlAZ1Q39fLMZ5RYLJ6awU=" + "version": "6.1.0", + "url": "mirror://kde/stable/plasma/6.1.0/xdg-desktop-portal-kde-6.1.0.tar.xz", + "hash": "sha256-BUzmYjI07AvobqAA1/sTz5V+T8QqJIVBKS+jgx2ATbM=" } } \ No newline at end of file diff --git a/pkgs/kde/misc/marknote/default.nix b/pkgs/kde/misc/marknote/default.nix index b006ab1276c3a..0f676c6fb07ef 100644 --- a/pkgs/kde/misc/marknote/default.nix +++ b/pkgs/kde/misc/marknote/default.nix @@ -2,7 +2,6 @@ lib, mkKdeDerivation, fetchurl, - kcrash, qtdeclarative, qtsvg, qtwayland, @@ -18,7 +17,6 @@ mkKdeDerivation rec { }; extraBuildInputs = [ - kcrash qtdeclarative qtsvg qtwayland diff --git a/pkgs/kde/plasma/default.nix b/pkgs/kde/plasma/default.nix index a29c1fc36d2e8..6fa4d2383f994 100644 --- a/pkgs/kde/plasma/default.nix +++ b/pkgs/kde/plasma/default.nix @@ -17,6 +17,7 @@ kinfocenter = callPackage ./kinfocenter {}; kmenuedit = callPackage ./kmenuedit {}; kpipewire = callPackage ./kpipewire {}; + krdp = callPackage ./krdp {}; kscreen = callPackage ./kscreen {}; kscreenlocker = callPackage ./kscreenlocker {}; ksshaskpass = callPackage ./ksshaskpass {}; diff --git a/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch b/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch index 543aecdec43fc..84609b2ff2230 100644 --- a/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch +++ b/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch @@ -1,7 +1,7 @@ -diff --git a/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in b/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in +diff --git a/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in b/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in index 0de6973e..30035768 100644 ---- a/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in -+++ b/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in +--- a/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in ++++ b/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in @@ -85,6 +85,6 @@ "Name[zh_CN]": "窗口管理器", "Name[zh_TW]": "視窗管理員" @@ -10,23 +10,23 @@ index 0de6973e..30035768 100644 + "TryExec": "@qdbus@", "X-KDE-KInfoCenter-Category": "graphical_information" } -diff --git a/Modules/kwinsupportinfo/main.cpp b/Modules/kwinsupportinfo/main.cpp +diff --git a/kcms/kwinsupportinfo/main.cpp b/kcms/kwinsupportinfo/main.cpp index 6ae168b5..89d0a2ff 100644 ---- a/Modules/kwinsupportinfo/main.cpp -+++ b/Modules/kwinsupportinfo/main.cpp +--- a/kcms/kwinsupportinfo/main.cpp ++++ b/kcms/kwinsupportinfo/main.cpp @@ -18,7 +18,7 @@ public: explicit KCMKWinSupportInfo(QObject *parent, const KPluginMetaData &data) : KQuickConfigModule(parent, data) { -- m_outputContext = new CommandOutputContext(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QStringLiteral("/qdbus"), +- m_outputContext = new CommandOutputContext(QLibraryInfo::path(QLibraryInfo::BinariesPath) + QStringLiteral("/qdbus"), + m_outputContext = new CommandOutputContext(QStringLiteral("@qdbus@"), {QStringLiteral("org.kde.KWin"), QStringLiteral("/KWin"), QStringLiteral("supportInformation")}, parent); } -diff --git a/Modules/xserver/kcm_xserver.json b/Modules/xserver/kcm_xserver.json +diff --git a/kcms/xserver/kcm_xserver.json b/kcms/xserver/kcm_xserver.json index b3f1ce24..dc610932 100644 ---- a/Modules/xserver/kcm_xserver.json -+++ b/Modules/xserver/kcm_xserver.json +--- a/kcms/xserver/kcm_xserver.json ++++ b/kcms/xserver/kcm_xserver.json @@ -141,7 +141,7 @@ "Name[zh_CN]": "X 服务器", "Name[zh_TW]": "X 伺服器" @@ -36,10 +36,10 @@ index b3f1ce24..dc610932 100644 "X-DocPath": "kinfocenter/graphical.html#xserver", "X-KDE-KInfoCenter-Category": "graphical_information", "X-KDE-Keywords": "X,X-Server,XServer,XFree86,Display,VideoCard,System Information", -diff --git a/Modules/xserver/main.cpp b/Modules/xserver/main.cpp +diff --git a/kcms/xserver/main.cpp b/kcms/xserver/main.cpp index 6d4d1e25..d39fe19e 100644 ---- a/Modules/xserver/main.cpp -+++ b/Modules/xserver/main.cpp +--- a/kcms/xserver/main.cpp ++++ b/kcms/xserver/main.cpp @@ -16,7 +16,7 @@ public: explicit KCMXServer(QObject *parent, const KPluginMetaData &data) : KQuickConfigModule(parent, data) diff --git a/pkgs/kde/plasma/krdp/default.nix b/pkgs/kde/plasma/krdp/default.nix new file mode 100644 index 0000000000000..38208475ca279 --- /dev/null +++ b/pkgs/kde/plasma/krdp/default.nix @@ -0,0 +1,31 @@ +{ + lib, + mkKdeDerivation, + substituteAll, + openssl, + pkg-config, + qtkeychain, + qtwayland, + freerdp, + wayland, + wayland-protocols, +}: +mkKdeDerivation { + pname = "krdp"; + + patches = [ + (substituteAll { + src = ./hardcode-openssl-path.patch; + openssl = lib.getExe openssl; + }) + ]; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [ + qtkeychain + qtwayland + freerdp + wayland + wayland-protocols + ]; +} diff --git a/pkgs/kde/plasma/krdp/hardcode-openssl-path.patch b/pkgs/kde/plasma/krdp/hardcode-openssl-path.patch new file mode 100644 index 0000000000000..8ef18364b72ca --- /dev/null +++ b/pkgs/kde/plasma/krdp/hardcode-openssl-path.patch @@ -0,0 +1,13 @@ +diff --git a/src/kcm/kcmkrdpserver.cpp b/src/kcm/kcmkrdpserver.cpp +index 3af527c..3433a84 100644 +--- a/src/kcm/kcmkrdpserver.cpp ++++ b/src/kcm/kcmkrdpserver.cpp +@@ -218,7 +218,7 @@ void KRDPServerConfig::generateCertificate() + QString certificateKeyPath(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/krdpserver/krdp.key")); + qDebug(KRDPKCM) << "Generating certificate files to: " << certificatePath << " and " << certificateKeyPath; + QProcess sslProcess; +- sslProcess.start(u"openssl"_qs, ++ sslProcess.start(u"@openssl@"_qs, + { + u"req"_qs, + u"-nodes"_qs, diff --git a/pkgs/kde/plasma/kwin/default.nix b/pkgs/kde/plasma/kwin/default.nix index abef3f7113c08..ffa7e146ece68 100644 --- a/pkgs/kde/plasma/kwin/default.nix +++ b/pkgs/kde/plasma/kwin/default.nix @@ -8,7 +8,9 @@ qtwayland, libinput, xorg, + xwayland, libdisplay-info, + libei, mesa, lcms2, libcap, @@ -53,9 +55,12 @@ mkKdeDerivation { lcms2 libcap libdisplay-info + libei libinput pipewire xorg.libxcvt + # we need to provide this so it knows our xwayland supports new features + xwayland ]; } diff --git a/pkgs/kde/plasma/plasma-desktop/default.nix b/pkgs/kde/plasma/plasma-desktop/default.nix index 8ee90dee3a67a..a84a55779d365 100644 --- a/pkgs/kde/plasma/plasma-desktop/default.nix +++ b/pkgs/kde/plasma/plasma-desktop/default.nix @@ -10,6 +10,7 @@ pkg-config, qtsvg, qtwayland, + breeze, kaccounts-integration, SDL2, xkeyboard_config, @@ -39,6 +40,10 @@ in }) ./tzdir.patch ./no-discover-shortcut.patch + (substituteAll { + src = ./wallpaper-paths.patch; + wallpapers = "${lib.getBin breeze}/share/wallpapers"; + }) ]; extraNativeBuildInputs = [pkg-config]; diff --git a/pkgs/kde/plasma/plasma-workspace/wallpaper-paths.patch b/pkgs/kde/plasma/plasma-desktop/wallpaper-paths.patch index 050200a8411f1..67d46bc6879ef 100644 --- a/pkgs/kde/plasma/plasma-workspace/wallpaper-paths.patch +++ b/pkgs/kde/plasma/plasma-desktop/wallpaper-paths.patch @@ -1,5 +1,5 @@ ---- a/lookandfeel/sddm-theme/theme.conf.cmake -+++ b/lookandfeel/sddm-theme/theme.conf.cmake +--- a/sddm-theme/theme.conf.cmake ++++ b/sddm-theme/theme.conf.cmake @@ -4,5 +4,5 @@ logo=${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze/default-logo.svg type=image color=#1d99f3 diff --git a/pkgs/kde/plasma/plasma-workspace/default.nix b/pkgs/kde/plasma/plasma-workspace/default.nix index 42f46eef5eb04..e89063876a867 100644 --- a/pkgs/kde/plasma/plasma-workspace/default.nix +++ b/pkgs/kde/plasma/plasma-workspace/default.nix @@ -10,7 +10,6 @@ libcanberra, libqalculate, pipewire, - breeze, qttools, qqc2-breeze-style, gpsd, @@ -25,10 +24,6 @@ mkKdeDerivation { xsetroot = "${lib.getBin xorg.xsetroot}/bin/xsetroot"; qdbus = "${lib.getBin qttools}/bin/qdbus"; }) - (substituteAll { - src = ./wallpaper-paths.patch; - wallpapers = "${lib.getBin breeze}/share/wallpapers"; - }) ]; postInstall = '' diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index a2e3bd28f490c..b29572b436bd5 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -251,6 +251,38 @@ let plugins = { meta = common_meta // { description = "iscan esci s80 plugin for " + passthru.hw; }; }; + s600 = stdenv.mkDerivation rec { + name = "iscan-gt-s600-bundle"; + version = "2.30.4"; + + src = fetchurl { + urls = [ + "https://download2.ebz.epson.net/iscan/plugin/gt-s600/rpm/x64/iscan-gt-s600-bundle-${version}.x64.rpm.tar.gz" + "https://web.archive.org/web/20240614120113/https://download2.ebz.epson.net/iscan/plugin/gt-s600/rpm/x64/iscan-gt-s600-bundle-${version}.x64.rpm.tar.gz" + ]; + sha256 = "fe1356b1d5c40bc5ac985a5693166efb9e5049a78b412f49c385eb503eadf2c6"; + }; + + nativeBuildInputs = [ autoPatchelfHook rpm ]; + + installPhase = '' + cd plugins + ${rpm}/bin/rpm2cpio iscan-plugin-gt-s600-*.x86_64.rpm | ${cpio}/bin/cpio -idmv + mkdir $out + cp -r usr/share $out + cp -r usr/lib64 $out/lib + mv $out/share/iscan $out/share/esci + mv $out/lib/iscan $out/lib/esci + ''; + + passthru = { + registrationCommand = '' + $registry --add interpreter usb 0x04b8 0x012d "$plugin/lib/esci/libesint66 $plugin/share/esci/esfw66.bin" + ''; + hw = "GT-F650, GT-S600, Perfection V10, Perfection V100 Photo"; + }; + meta = common_meta // { description = "iscan gt-s600 plugin for " + passthru.hw; }; + }; s650 = stdenv.mkDerivation rec { name = "iscan-gt-s650-bundle"; version = "2.30.4"; diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index 4c3b969b425fa..b14807e257eaf 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.2.9"; + version = "1.2.10"; src = fetchurl { # To find new versions, visit # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for # some printer like for instance "WF-7210" to get to the most recent # version. - url = "https://download3.ebz.epson.net/dsc/f/03/00/15/33/94/3bf10a30a1f8b5b91ddbafa4571c073878ec476b/epson-inkjet-printer-escpr2-1.2.9-1.src.rpm"; - sha256 = "sha256-2smNBTMSqoKYsGUoBtIHS3Fwk9ODbiXaP7Dtq69FG9U="; + url = "https://download3.ebz.epson.net/dsc/f/03/00/15/87/52/84d8972472981a5337b96610c39c8c7586256b55/epson-inkjet-printer-escpr2-1.2.10-1.src.rpm"; + sha256 = "sha256-vrAVarGBp8eI07WMtQSmuNpX5iS26+B2iP/b7U8mJmo="; }; unpackPhase = '' diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index 79b378e9591fd..81b76ab3f151c 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "fastly"; - version = "10.12.1"; + version = "10.12.2"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-qQlKgK24xLRpueTdu6nVM91HEby6X1/fPhMXshCqi0s="; + hash = "sha256-2B/7XmhHo/1Y2szdXNygiK6IsmVvcdAPtOvZI/B26pw="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, diff --git a/pkgs/misc/lssecret/default.nix b/pkgs/misc/lssecret/default.nix index 000498acf23af..b1bf44096d888 100644 --- a/pkgs/misc/lssecret/default.nix +++ b/pkgs/misc/lssecret/default.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation rec { - name = "lssecret"; + pname = "lssecret"; version = "unstable-2022-12-02"; src = fetchFromGitLab { owner = "GrantMoyer"; - repo = name; + repo = "lssecret"; rev = "20fd771a"; hash = "sha256-yU70WZj4EC/sFJxyq2SQ0YQ6RCQHYiW/aQiYWo7+ujk="; }; diff --git a/pkgs/os-specific/bsd/freebsd/patches/13.1/compat-install-dirs.patch b/pkgs/os-specific/bsd/freebsd/patches/13.1/compat-install-dirs.patch index 9bb2bea32ee98..4bc21cf8eb147 100644 --- a/pkgs/os-specific/bsd/freebsd/patches/13.1/compat-install-dirs.patch +++ b/pkgs/os-specific/bsd/freebsd/patches/13.1/compat-install-dirs.patch @@ -2,12 +2,11 @@ diff --git a/tools/build/Makefile b/tools/build/Makefile index 948a5f9dfdb..592af84eeae 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile -@@ -327,15 +327,15 @@ host-symlinks: +@@ -327,14 +327,14 @@ host-symlinks: # and cross-tools stages. We do this here using mkdir since mtree may not exist # yet (this happens if we are crossbuilding from Linux/Mac). INSTALLDIR_LIST= \ - bin \ -- lib/casper \ - lib/geom \ - usr/include/casper \ - usr/include/private/ucl \ @@ -16,7 +15,6 @@ index 948a5f9dfdb..592af84eeae 100644 - usr/libdata/pkgconfig \ - usr/libexec + ${BINDIR} \ -+ ${LIBDIR}/casper \ + ${LIBDIR}/geom \ + ${INCLUDEDIR}/casper \ + ${INCLUDEDIR}/private/ucl \ diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/libcxxrt-headers.patch b/pkgs/os-specific/bsd/freebsd/patches/14.0/libcxxrt-headers.patch new file mode 100644 index 0000000000000..256db9e2d9cf4 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/14.0/libcxxrt-headers.patch @@ -0,0 +1,11 @@ +--- freebsd/lib/libcxxrt/Makefile 2024-05-30 14:27:42.328086005 -0700 ++++ freebsd/lib/libcxxrt/Makefile.mod 2024-05-30 14:27:48.048014581 -0700 +@@ -19,6 +19,8 @@ + SRCS+= terminate.cc + SRCS+= typeinfo.cc + ++INCS+=cxxabi.h unwind.h unwind-arm.h unwind-itanium.h ++ + WARNS?= 0 + CFLAGS+= -isystem ${SRCDIR} -nostdinc++ + CXXSTD?= c++14 diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/localedef.patch b/pkgs/os-specific/bsd/freebsd/patches/14.0/localedef.patch new file mode 100644 index 0000000000000..73a0341bd3240 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/14.0/localedef.patch @@ -0,0 +1,158 @@ +diff --git a/include/_ctype.h b/include/_ctype.h +index 91e6b1d14f6b..a6896b598da3 100644 +--- a/include/_ctype.h ++++ b/include/_ctype.h +@@ -44,7 +44,7 @@ + #define __CTYPE_H_ + + #include <sys/cdefs.h> +-#include <sys/_types.h> ++#include <sys/types.h> + + #define _CTYPE_A 0x00000100L /* Alpha */ + #define _CTYPE_C 0x00000200L /* Control */ +diff --git a/lib/libc/locale/collate.h b/lib/libc/locale/collate.h +index 2d3723b49f5b..6bbff732b9d7 100644 +--- a/lib/libc/locale/collate.h ++++ b/lib/libc/locale/collate.h +@@ -36,6 +36,7 @@ + #ifndef _COLLATE_H_ + #define _COLLATE_H_ + ++#include <stdint.h> + #include <sys/cdefs.h> + #include <sys/types.h> + #include <limits.h> +diff --git a/usr.bin/localedef/charmap.c b/usr.bin/localedef/charmap.c +index 44b7e3292eae..79c30b7cf372 100644 +--- a/usr.bin/localedef/charmap.c ++++ b/usr.bin/localedef/charmap.c +@@ -31,6 +31,7 @@ + /* + * CHARMAP file handling for localedef. + */ ++#include <stdint.h> + #include <sys/cdefs.h> + #include <sys/types.h> + #include <sys/tree.h> +diff --git a/usr.bin/localedef/collate.c b/usr.bin/localedef/collate.c +index 2a080773a95e..3f0030c638f5 100644 +--- a/usr.bin/localedef/collate.c ++++ b/usr.bin/localedef/collate.c +@@ -31,6 +31,7 @@ + /* + * LC_COLLATE database generation routines for localedef. + */ ++#include <stdint.h> + #include <sys/cdefs.h> + #include <sys/types.h> + #include <sys/tree.h> +diff --git a/usr.bin/localedef/ctype.c b/usr.bin/localedef/ctype.c +index ab7b76e57b2d..846c6d6480a8 100644 +--- a/usr.bin/localedef/ctype.c ++++ b/usr.bin/localedef/ctype.c +@@ -32,6 +32,7 @@ + /* + * LC_CTYPE database generation routines for localedef. + */ ++#include <stdint.h> + #include <sys/cdefs.h> + #include <sys/tree.h> + +diff --git a/usr.bin/localedef/localedef.c b/usr.bin/localedef/localedef.c +index 5ff146d6f655..ed69aa1f0c0e 100644 +--- a/usr.bin/localedef/localedef.c ++++ b/usr.bin/localedef/localedef.c +@@ -32,7 +32,7 @@ + * POSIX localedef. + */ + #include <sys/cdefs.h> +-#include <sys/endian.h> ++#include <endian.h> + #include <sys/stat.h> + #include <sys/types.h> + +diff --git a/usr.bin/localedef/messages.c b/usr.bin/localedef/messages.c +index 6b8eb9d684dd..0155821d0e56 100644 +--- a/usr.bin/localedef/messages.c ++++ b/usr.bin/localedef/messages.c +@@ -31,6 +31,7 @@ + /* + * LC_MESSAGES database generation routines for localedef. + */ ++#include <stdint.h> + #include <sys/cdefs.h> + #include <stdio.h> + #include <stdlib.h> +diff --git a/usr.bin/localedef/monetary.c b/usr.bin/localedef/monetary.c +index 7a77ac7e256c..7636c4deca1f 100644 +--- a/usr.bin/localedef/monetary.c ++++ b/usr.bin/localedef/monetary.c +@@ -31,6 +31,7 @@ + /* + * LC_MONETARY database generation routines for localedef. + */ ++#include <stdint.h> + #include <sys/cdefs.h> + #include <stdio.h> + #include <stdlib.h> +diff --git a/usr.bin/localedef/numeric.c b/usr.bin/localedef/numeric.c +index 5533b7c10e1a..9c47494f815c 100644 +--- a/usr.bin/localedef/numeric.c ++++ b/usr.bin/localedef/numeric.c +@@ -31,6 +31,7 @@ + /* + * LC_NUMERIC database generation routines for localedef. + */ ++#include <stdint.h> + #include <sys/cdefs.h> + #include <stdio.h> + #include <stdlib.h> +diff --git a/usr.bin/localedef/parser.y b/usr.bin/localedef/parser.y +index 23b3b54f8a6e..e01330f0152d 100644 +--- a/usr.bin/localedef/parser.y ++++ b/usr.bin/localedef/parser.y +@@ -33,6 +33,7 @@ + * POSIX localedef grammar. + */ + ++#include <stdint.h> + #include <wchar.h> + #include <stdio.h> + #include <limits.h> +diff --git a/usr.bin/localedef/scanner.c b/usr.bin/localedef/scanner.c +index c6d45a993f28..b17670ef4b4a 100644 +--- a/usr.bin/localedef/scanner.c ++++ b/usr.bin/localedef/scanner.c +@@ -32,6 +32,7 @@ + * This file contains the "scanner", which tokenizes the input files + * for localedef for processing by the higher level grammar processor. + */ ++#include <stdint.h> + #include <sys/cdefs.h> + #include <stdio.h> + #include <stdlib.h> +diff --git a/usr.bin/localedef/time.c b/usr.bin/localedef/time.c +index 7a56e244c921..0e409a742d0a 100644 +--- a/usr.bin/localedef/time.c ++++ b/usr.bin/localedef/time.c +@@ -31,6 +31,7 @@ + /* + * LC_TIME database generation routines for localedef. + */ ++#include <stdint.h> + #include <sys/cdefs.h> + #include <stdio.h> + #include <stdlib.h> +diff --git a/usr.bin/localedef/wide.c b/usr.bin/localedef/wide.c +index 062e120e6912..a199cddb198d 100644 +--- a/usr.bin/localedef/wide.c ++++ b/usr.bin/localedef/wide.c +@@ -34,6 +34,7 @@ + * to the wide character forms used internally by libc. Unfortunately, + * this approach means that we need a method for each and every encoding. + */ ++#include <stdint.h> + #include <sys/cdefs.h> + #include <ctype.h> + #include <stdlib.h> diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.0/tinfo-host-cc.patch b/pkgs/os-specific/bsd/freebsd/patches/14.0/tinfo-host-cc.patch new file mode 100644 index 0000000000000..6446322a8a0a3 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/14.0/tinfo-host-cc.patch @@ -0,0 +1,15 @@ +--- a/lib/ncurses/tinfo/Makefile 2023-12-26 23:02:07.827892619 -0800 ++++ b/lib/ncurses/tinfo/Makefile 2023-12-26 23:01:24.175546100 -0800 +@@ -282,10 +282,10 @@ + build-tools: make_hash make_keys + + make_keys: make_keys.c names.c ncurses_def.h ${HEADERS} ${BUILD_TOOLS_META} +- ${CC:N${CCACHE_BIN}} -o $@ ${CFLAGS} ${NCURSES_DIR}/ncurses/tinfo/make_keys.c ++ ${CC_HOST:N${CCACHE_BIN}} -o $@ ${CFLAGS} ${NCURSES_DIR}/ncurses/tinfo/make_keys.c + + make_hash: make_hash.c hashsize.h ncurses_def.h ${HEADERS} ${BUILD_TOOLS_META} +- ${CC:N${CCACHE_BIN}} -o $@ ${CFLAGS} -DMAIN_PROGRAM \ ++ ${CC_HOST:N${CCACHE_BIN}} -o $@ ${CFLAGS} -DMAIN_PROGRAM \ + ${NCURSES_DIR}/ncurses/tinfo/make_hash.c + .endif + .if ${MK_DIRDEPS_BUILD} == "yes" && ${MACHINE} != "host" diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/bin.nix b/pkgs/os-specific/bsd/freebsd/pkgs/bin.nix new file mode 100644 index 0000000000000..2b2738ec5794a --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/bin.nix @@ -0,0 +1,92 @@ +{ + mkDerivation, + pkgsBuildBuild, + libjail, + libmd, + libnetbsd, + libcapsicum, + libcasper, + libelf, + libxo, + libncurses-tinfo, + libedit, + lib, + stdenv, + bsdSetupHook, + freebsdSetupHook, + makeMinimal, + install, + tsort, + lorder, + mandoc, + groff, + byacc, + gencat, +}: +mkDerivation { + pname = "bins"; + path = "bin"; + extraPaths = [ + "sys/conf" + "sys/sys/param.h" + "contrib/sendmail" + "contrib/tcsh" + "usr.bin/printf" + "lib/libsm" + ]; + buildInputs = [ + libjail + libmd + libnetbsd + libcapsicum + libcasper + libelf + libxo + libncurses-tinfo + libedit + ]; + nativeBuildInputs = [ + bsdSetupHook + freebsdSetupHook + makeMinimal + install + tsort + lorder + mandoc + groff + + byacc + gencat + ]; + + MK_TESTS = "no"; + + postPatch = '' + sed -E -i -e '/#define\tBSD.*/d' $BSDSRCDIR/sys/sys/param.h + sed -E -i -e '/^SYMLINKS.*/d' $BSDSRCDIR/bin/*/Makefile + sed -E -i -e 's/mktemp -t ka/mktemp -t kaXXXXXX/' $BSDSRCDIR/bin/sh/mkbuiltins $BSDSRCDIR/bin/sh/mktokens + ''; + + preBuild = '' + export NIX_CFLAGS_COMPILE="-I$BSDSRCDIR/sys $NIX_CFLAGS_COMPILE" + + make -C $BSDSRCDIR/lib/libsm $makeFlags + + make -C $BSDSRCDIR/bin/sh $makeFlags "CC=${pkgsBuildBuild.stdenv.cc}/bin/cc" CFLAGS="-D__unused= -D__printf0like\(a,b\)= -D__dead2=" ${ + lib.optionalString (!stdenv.buildPlatform.isFreeBSD) "MK_PIE=no " + }mkbuiltins mksyntax mktokens mknodes + make -C $BSDSRCDIR/bin/csh $makeFlags "CC=${pkgsBuildBuild.stdenv.cc}/bin/cc" CFLAGS="-D__unused= -D__printf0like\(a,b\)= -D__dead2= -I$BSDSRCDIR/contrib/tcsh -I." ${ + lib.optionalString (!stdenv.buildPlatform.isFreeBSD) "MK_PIE=no " + }gethost + ''; + + preInstall = '' + makeFlags="$makeFlags ROOTDIR=$out/root" + ''; + + outputs = [ + "out" + "man" + "debug" + ]; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/boot-install.nix b/pkgs/os-specific/bsd/freebsd/pkgs/boot-install.nix index 966489d9aef36..79dab282e3f3f 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/boot-install.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/boot-install.nix @@ -1,10 +1,23 @@ { buildPackages, freebsd-lib }: -# Wrap NetBSD's install +# Wrap GNU coreutils' install +# The -l flag causes a symlink instead of a copy to be installed, so +# it is safe to discard during bootstrap since coreutils does not support it. + buildPackages.writeShellScriptBin "boot-install" ( freebsd-lib.install-wrapper + '' + fixed_args=() + while [[ ''${#args[0]} > 0 ]]; do + case "''${args[0]}" in + -l) + args=("''${args[@]:2}") + continue + esac + fixed_args+=("''${args[0]}") + args=("''${args[@]:1}") + done - ${buildPackages.netbsd.install}/bin/xinstall "''${args[@]}" + ${buildPackages.coreutils}/bin/install "''${fixed_args[@]}" '' ) diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/cp.nix b/pkgs/os-specific/bsd/freebsd/pkgs/cp.nix new file mode 100644 index 0000000000000..3ebfd91a4e153 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/cp.nix @@ -0,0 +1,10 @@ +{ mkDerivation }: +mkDerivation { + path = "bin/cp"; + + extraPaths = [ "sys" ]; + + postPatch = '' + substituteInPlace $BSDSRCDIR/bin/cp/Makefile --replace 'tests' "" + ''; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix b/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix index 0f74d78b1d13d..020a08c1d01ef 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix @@ -12,7 +12,7 @@ }: mkDerivation { - isStatic = true; + noLibc = true; path = "lib/csu"; extraPaths = [ "lib/Makefile.inc" diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/filterSource.nix b/pkgs/os-specific/bsd/freebsd/pkgs/filterSource.nix index dc215c18aecb7..09674056d9cd8 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/filterSource.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/filterSource.nix @@ -18,6 +18,17 @@ let lib.concatMapStringsSep "\n" (path: "/${path}") sortedPaths ); in -runCommand "${pname}-filtered-src" { nativeBuildInputs = [ pkgsBuildBuild.rsync ]; } '' - rsync -a -r --files-from=${filterText} ${source}/ $out -'' +runCommand "${pname}-filtered-src" + { + nativeBuildInputs = [ + (pkgsBuildBuild.rsync.override { + enableZstd = false; + enableXXHash = false; + enableOpenSSL = false; + enableLZ4 = false; + }) + ]; + } + '' + rsync -a -r --files-from=${filterText} ${source}/ $out + '' diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/iconv.nix b/pkgs/os-specific/bsd/freebsd/pkgs/iconv.nix new file mode 100644 index 0000000000000..9c1ba1835c145 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/iconv.nix @@ -0,0 +1,12 @@ +{ + mkDerivation, + libcapsicum, + libcasper, +}: +mkDerivation { + path = "usr.bin/iconv"; + buildInputs = [ + libcapsicum + libcasper + ]; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/include/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/include/package.nix index 70734226a54f5..a7ceb0cdf384f 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/include/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/include/package.nix @@ -7,7 +7,7 @@ }: mkDerivation { - isStatic = true; + noLibc = true; path = "include"; extraPaths = [ diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/ldd.nix b/pkgs/os-specific/bsd/freebsd/pkgs/ldd.nix new file mode 100644 index 0000000000000..406e37402b2bb --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/ldd.nix @@ -0,0 +1,21 @@ +{ + lib, + stdenv, + mkDerivation, + libelf, +}: +mkDerivation { + path = "usr.bin/ldd"; + extraPaths = [ + "libexec/rtld-elf" + "contrib/elftoolchain/libelf" + ]; + + buildInputs = [ libelf ]; + + env = { + NIX_CFLAGS_COMPILE = "-D_RTLD_PATH=${lib.getLib stdenv.cc.libc}/libexec/ld-elf.so.1"; + }; + + meta.platforms = lib.platforms.freebsd; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix index 8f2cc976463e4..a991e69265823 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix @@ -21,7 +21,7 @@ }: mkDerivation { - isStatic = true; + noLibc = true; pname = "libc"; path = "lib/libc"; extraPaths = diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libcapsicum.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libcapsicum.nix new file mode 100644 index 0000000000000..3cb1560df77aa --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libcapsicum.nix @@ -0,0 +1 @@ +{ mkDerivation }: mkDerivation { path = "lib/libcapsicum"; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libcasper.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libcasper.nix new file mode 100644 index 0000000000000..df27f72bc8cb0 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libcasper.nix @@ -0,0 +1,26 @@ +{ + lib, + stdenv, + mkDerivation, + libnv, +}: +mkDerivation { + path = "lib/libcasper/libcasper"; + extraPaths = [ + "lib/Makefile.inc" + "lib/libcasper" + ]; + buildInputs = [ libnv ]; + + MK_TESTS = "no"; + + makeFlags = [ + "STRIP=-s" # flag to install, not command + "CFLAGS=-DWITH_CASPER" + ] ++ lib.optional (!stdenv.hostPlatform.isFreeBSD) "MK_WERROR=no"; + + postInstall = '' + make -C $BSDSRCDIR/lib/libcasper/services $makeFlags CFLAGS="-DWITH_CASPER -I$out/include" + make -C $BSDSRCDIR/lib/libcasper/services $makeFlags install + ''; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libcxxrt.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libcxxrt.nix index 0640d2292d491..fd5591c0ffb8a 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libcxxrt.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libcxxrt.nix @@ -1,4 +1,4 @@ -{ mkDerivation, ... }: +{ mkDerivation }: # this package is quite different from stock libcxxrt. # as of FreeBSD 14.0, it is vendored from APPROXIMATELY libcxxrt # 5d8a15823a103bbc27f1bfdcf2b5aa008fab57dd, though the vendoring mechanism is @@ -8,4 +8,11 @@ mkDerivation { pname = "libcxxrt"; path = "lib/libcxxrt"; extraPaths = [ "contrib/libcxxrt" ]; + outputs = [ + "out" + "dev" + "debug" + ]; + noLibcxx = true; + libName = "cxxrt"; } diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libdl.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libdl.nix new file mode 100644 index 0000000000000..2b77a0f716624 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libdl.nix @@ -0,0 +1,9 @@ +{ mkDerivation, ... }: +mkDerivation { + path = "lib/libdl"; + extraPaths = [ + "lib/libc" + "libexec/rtld-elf" + ]; + buildInputs = [ ]; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libedit.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libedit.nix new file mode 100644 index 0000000000000..50b1c9f58333f --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libedit.nix @@ -0,0 +1,7 @@ +{ mkDerivation, libncurses-tinfo }: +mkDerivation { + path = "lib/libedit"; + extraPaths = [ "contrib/libedit" ]; + buildInputs = [ libncurses-tinfo ]; + MK_TESTS = "no"; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix new file mode 100644 index 0000000000000..a116aff81f397 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix @@ -0,0 +1,29 @@ +{ + mkDerivation, + lib, + bsdSetupHook, + freebsdSetupHook, + makeMinimal, + install, + m4, +}: +mkDerivation { + path = "lib/libelf"; + extraPaths = [ + "lib/libc" + "contrib/elftoolchain" + "sys/sys/elf32.h" + "sys/sys/elf64.h" + "sys/sys/elf_common.h" + ]; + buildInputs = [ ]; + nativeBuildInputs = [ + bsdSetupHook + freebsdSetupHook + makeMinimal + install + m4 + ]; + + meta.platforms = lib.platforms.freebsd; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libjail.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libjail.nix new file mode 100644 index 0000000000000..9150be559c650 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libjail.nix @@ -0,0 +1,5 @@ +{ mkDerivation }: +mkDerivation { + path = "lib/libjail"; + MK_TESTS = "no"; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libncurses-tinfo.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libncurses-tinfo.nix new file mode 100644 index 0000000000000..f86f78dbc2914 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libncurses-tinfo.nix @@ -0,0 +1,15 @@ +{ mkDerivation, pkgsBuildBuild }: +mkDerivation { + path = "lib/ncurses/tinfo"; + extraPaths = [ + "lib/ncurses" + "contrib/ncurses" + "lib/Makefile.inc" + ]; + CC_HOST = "${pkgsBuildBuild.stdenv.cc}/bin/cc"; + MK_TESTS = "no"; + preBuild = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D_VA_LIST -D_VA_LIST_DECLARED -Dva_list=__builtin_va_list -D_SIZE_T -D_WCHAR_T" + make $makeFlags "CFLAGS=-D_VA_LIST -D_VA_LIST_DECLARED -Dva_list=__builtin_va_list -I$BSDSRCDIR/contrib/ncurses/ncurses -I$BSDSRCDIR/contrib/ncurses/include -I." ncurses_dll.h make_hash make_keys + ''; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libncurses.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libncurses.nix new file mode 100644 index 0000000000000..2dd1ee2fe57de --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libncurses.nix @@ -0,0 +1,25 @@ +{ + lib, + versionData, + mkDerivation, + libncurses-tinfo, + ... +}: +mkDerivation { + path = "lib/ncurses/ncurses"; + extraPaths = [ + "lib/ncurses" + "contrib/ncurses" + "lib/Makefile.inc" + ]; + MK_TESTS = "no"; + preBuild = lib.optionalString (versionData.major == 14) '' + make -C ../tinfo $makeFlags curses.h ncurses_dll.h ncurses_def.h + ''; + buildInputs = lib.optionals (versionData.major == 14) [ libncurses-tinfo ]; + + # some packages depend on libncursesw.so.8 + postInstall = '' + ln -s $out/lib/libncursesw.so.9 $out/lib/libncursesw.so.8 + ''; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libxo.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libxo.nix new file mode 100644 index 0000000000000..a4882ea1970c3 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libxo.nix @@ -0,0 +1,6 @@ +{ mkDerivation }: +mkDerivation { + path = "lib/libxo"; + extraPaths = [ "contrib/libxo" ]; + MK_TESTS = "no"; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/locale.nix b/pkgs/os-specific/bsd/freebsd/pkgs/locale.nix new file mode 100644 index 0000000000000..b661a7cee853f --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/locale.nix @@ -0,0 +1,7 @@ +{ mkDerivation, libsbuf }: +mkDerivation { + path = "usr.bin/locale"; + buildInputs = [ libsbuf ]; + extraPaths = [ "lib/libc/locale" ]; + MK_TESTS = "no"; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/localedef.nix b/pkgs/os-specific/bsd/freebsd/pkgs/localedef.nix new file mode 100644 index 0000000000000..2e4902860c8d9 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/localedef.nix @@ -0,0 +1,39 @@ +{ + mkDerivation, + lib, + stdenv, + compat, + bsdSetupHook, + byacc, + freebsdSetupHook, + makeMinimal, + install, +}: +mkDerivation ( + { + path = "usr.bin/localedef"; + + extraPaths = [ + "lib/libc/locale" + "lib/libc/stdtime" + ] ++ lib.optionals (!stdenv.hostPlatform.isFreeBSD) [ "." ]; + + nativeBuildInputs = [ + bsdSetupHook + byacc + freebsdSetupHook + makeMinimal + install + ]; + + buildInputs = [ ]; + + preBuild = lib.optionalString (!stdenv.hostPlatform.isFreeBSD) '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${compat}/include -D__unused= -D__pure= -Wno-strict-aliasing" + export NIX_LDFLAGS="$NIX_LDFLAGS -L${compat}/lib" + ''; + + MK_TESTS = "no"; + } + // lib.optionalAttrs (!stdenv.hostPlatform.isFreeBSD) { BOOTSTRAPPING = 1; } +) diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/locales.nix b/pkgs/os-specific/bsd/freebsd/pkgs/locales.nix new file mode 100644 index 0000000000000..d8d3de93d5ec7 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/pkgs/locales.nix @@ -0,0 +1,51 @@ +{ + mkDerivation, + lib, + symlinkJoin, + bsdSetupHook, + freebsdSetupHook, + makeMinimal, + install, + tsort, + lorder, + mandoc, + groff, + localedef, + allLocales ? true, + locales ? [ "en_US.UTF-8" ], +}: +let + build = + name: needsLocaledef: + mkDerivation { + path = "share/${name}"; + + extraPaths = lib.optional needsLocaledef "tools/tools/locale/etc/final-maps"; + nativeBuildInputs = [ + bsdSetupHook + freebsdSetupHook + makeMinimal + install + tsort + lorder + mandoc + groff + ] ++ lib.optional needsLocaledef localedef; + }; + directories = { + colldef = true; + colldef_unicode = true; + ctypedef = true; + monetdef = false; + monetdef_unicode = false; + msgdef = false; + msgdef_unicode = false; + numericdef = false; + numericdef_unicode = false; + timedef = false; + }; +in +symlinkJoin { + name = "freebsd-locales"; + paths = lib.mapAttrsToList build directories; +} diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix index be195b3bc6fa5..12f2c9407e3c2 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix @@ -2,6 +2,9 @@ lib, stdenv, stdenvNoCC, + stdenvNoLibs, + overrideCC, + buildPackages, versionData, writeText, patches, @@ -21,7 +24,15 @@ lib.makeOverridable ( attrs: let - stdenv' = if attrs.noCC or false then stdenvNoCC else stdenv; + stdenv' = + if attrs.noCC or false then + stdenvNoCC + else if attrs.noLibc or false then + stdenvNoLibs + else if attrs.noLibcxx or false then + overrideCC stdenv buildPackages.llvmPackages.clangNoLibcxx + else + stdenv; in stdenv'.mkDerivation ( rec { @@ -128,15 +139,17 @@ lib.makeOverridable ( splitPatch = patchFile: let + allLines' = lib.strings.splitString "\n" (builtins.readFile patchFile); + allLines = builtins.filter ( + line: !((lib.strings.hasPrefix "diff --git" line) || (lib.strings.hasPrefix "index " line)) + ) allLines'; foldFunc = a: b: - if (lib.strings.hasPrefix "--- " b) then + if ((lib.strings.hasPrefix "--- " b) || (lib.strings.hasPrefix "diff --git " b)) then (a ++ [ [ b ] ]) else ((lib.lists.init a) ++ (lib.lists.singleton ((lib.lists.last a) ++ [ b ]))); - partitionedPatches' = lib.lists.foldl foldFunc [ [ ] ] ( - lib.strings.splitString "\n" (builtins.readFile patchFile) - ); + partitionedPatches' = lib.lists.foldl foldFunc [ [ ] ] allLines; partitionedPatches = if (builtins.length partitionedPatches' > 1) then (lib.lists.drop 1 partitionedPatches') diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index e0d03108960c0..5f5ec212f2698 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -17,15 +17,7 @@ makeScopeWithSplicing' { directory = ./pkgs; } // { - - fetchNetBSD = - path: version: sha256: - fetchcvs { - cvsRoot = ":pserver:anoncvs@anoncvs.NetBSD.org:/cvsroot"; - module = "src/${path}"; - inherit sha256; - tag = "netbsd-${lib.replaceStrings [ "." ] [ "-" ] version}-RELEASE"; - }; + version = "9.2"; defaultMakeFlags = [ "MKSOFTFLOAT=${ @@ -151,18 +143,18 @@ makeScopeWithSplicing' { inherit (buildPackages.buildPackages) rsync; }; - _mainLibcExtraPaths = with self; [ - common - i18n_module.src - sys.src - ld_elf_so.src - libpthread.src - libm.src - libresolv.src - librpcsvc.src - libutil.src - librt.src - libcrypt.src + _mainLibcExtraPaths = [ + "common" + "lib/i18n_module" + "lib/libcrypt" + "lib/libm" + "lib/libpthread" + "lib/libresolv" + "lib/librpcsvc" + "lib/librt" + "lib/libutil" + "libexec/ld.elf_so" + "sys" ]; libc = self.callPackage ./pkgs/libc.nix { diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/cksum.nix b/pkgs/os-specific/bsd/netbsd/pkgs/cksum.nix index a2ec387501ae1..a95df55874e42 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/cksum.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/cksum.nix @@ -2,7 +2,5 @@ mkDerivation { path = "usr.bin/cksum"; - version = "9.2"; - sha256 = "0msfhgyvh5c2jmc6qjnf12c378dhw32ffsl864qz4rdb2b98rfcq"; meta.platforms = lib.platforms.netbsd; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/column.nix b/pkgs/os-specific/bsd/netbsd/pkgs/column.nix index f3cebfa9ab261..a51369433f6c2 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/column.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/column.nix @@ -1,7 +1,3 @@ { mkDerivation }: -mkDerivation { - path = "usr.bin/column"; - version = "9.2"; - sha256 = "0r6b0hjn5ls3j3sv6chibs44fs32yyk2cg8kh70kb4cwajs4ifyl"; -} +mkDerivation { path = "usr.bin/column"; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/common.nix b/pkgs/os-specific/bsd/netbsd/pkgs/common.nix deleted file mode 100644 index 464fc1c9e0c26..0000000000000 --- a/pkgs/os-specific/bsd/netbsd/pkgs/common.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ fetchNetBSD }: - -fetchNetBSD "common" "9.2" "1pfylz9r3ap5wnwwbwczbfjb1m5qdyspzbnmxmcdkpzz2zgj64b9" diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix index 4c149e95c1ae6..91a2bb8755c89 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix @@ -14,19 +14,16 @@ netbsdSetupHook, makeMinimal, rsync, - fetchNetBSD, _mainLibcExtraPaths, + version, }: mkDerivation ( let - version = "9.2"; commonDeps = [ zlib ]; in { path = "tools/compat"; - sha256 = "1vsxg7136nlhc72vpa664vs22874xh7ila95nkmsd8crn3z3cyn0"; - inherit version; setupHooks = [ ../../../../../build-support/setup-hooks/role.bash @@ -133,14 +130,12 @@ mkDerivation ( --subst-var-by version ${version} ''; extraPaths = [ - include.src - libc.src - libutil.src - (fetchNetBSD "external/bsd/flex" "9.2" "0h98jpfj7vx5zh7vd7bk6b1hmzgkcb757a8j6d9zgygxxv13v43m") - (fetchNetBSD "sys/sys" "9.2" "0zawhw51klaigqqwkx0lzrx3mim2jywrc24cm7c66qsf1im9awgd") - (fetchNetBSD "common/include/rpc/types.h" "9.2" - "0n2df12mlc3cbc48jxq35yzl1y7ghgpykvy7jnfh898rdhac7m9a" - ) + include.path + libc.path + libutil.path + "external/bsd/flex" + "sys/sys" + "common/include/rpc/types.h" ] ++ libutil.extraPaths ++ _mainLibcExtraPaths; } ) diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/config.nix b/pkgs/os-specific/bsd/netbsd/pkgs/config.nix index c423f3ca86760..272e9065b29b7 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/config.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/config.nix @@ -13,8 +13,6 @@ }: mkDerivation { path = "usr.bin/config"; - version = "9.2"; - sha256 = "1yz3n4hncdkk6kp595fh2q5lg150vpqg8iw2dccydkyw4y3hgsjj"; env.NIX_CFLAGS_COMPILE = toString [ "-DMAKE_BOOTSTRAP" ]; nativeBuildInputs = [ bsdSetupHook @@ -27,5 +25,5 @@ mkDerivation { rsync ]; buildInputs = compatIfNeeded; - extraPaths = [ cksum.src ]; + extraPaths = [ cksum.path ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/csu.nix b/pkgs/os-specific/bsd/netbsd/pkgs/csu.nix index 66443331490f5..a0d7ca419c1c4 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/csu.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/csu.nix @@ -22,8 +22,6 @@ mkDerivation { path = "lib/csu"; - version = "9.2"; - sha256 = "0al5jfazvhlzn9hvmnrbchx4d0gm282hq5gp4xs2zmj9ycmf6d03"; meta.platforms = lib.platforms.netbsd; nativeBuildInputs = [ bsdSetupHook @@ -43,7 +41,7 @@ mkDerivation { ]; buildInputs = [ headers ]; extraPaths = [ - sys.src - ld_elf_so.src + sys.path + ld_elf_so.path ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/dict.nix b/pkgs/os-specific/bsd/netbsd/pkgs/dict.nix index 0d7d026dd21d2..8d27f29a75e57 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/dict.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/dict.nix @@ -3,7 +3,5 @@ mkDerivation { path = "share/dict"; noCC = true; - version = "9.2"; - sha256 = "0svfc0byk59ri37pyjslv4c4rc7zw396r73mr593i78d39q5g3ad"; makeFlags = defaultMakeFlags ++ [ "BINDIR=$(out)/share" ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/fts/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/fts/package.nix index 7c64658bf2e51..57fc0633b0886 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/fts/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/fts/package.nix @@ -4,14 +4,11 @@ netbsdSetupHook, rsync, compatIfNeeded, - fetchNetBSD, }: mkDerivation { pname = "fts"; path = "include/fts.h"; - sha256 = "01d4fpxvz1pgzfk5xznz5dcm0x0gdzwcsfm1h3d0xc9kc6hj2q77"; - version = "9.2"; nativeBuildInputs = [ bsdSetupHook netbsdSetupHook @@ -19,11 +16,9 @@ mkDerivation { ]; propagatedBuildInputs = compatIfNeeded; extraPaths = [ - (fetchNetBSD "lib/libc/gen/fts.c" "9.2" "1a8hmf26242nmv05ipn3ircxb0jqmmi66rh78kkyi9vjwkfl3qn7") - (fetchNetBSD "lib/libc/include/namespace.h" "9.2" - "0kksr3pdwdc1cplqf5z12ih4cml6l11lqrz91f7hjjm64y7785kc" - ) - (fetchNetBSD "lib/libc/gen/fts.3" "9.2" "1asxw0n3fhjdadwkkq3xplfgqgl3q32w1lyrvbakfa3gs0wz5zc1") + "lib/libc/gen/fts.c" + "lib/libc/include/namespace.h" + "lib/libc/gen/fts.3" ]; skipIncludesPhase = true; buildPhase = '' diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/genassym.nix b/pkgs/os-specific/bsd/netbsd/pkgs/genassym.nix index 7f81a77a02dd2..9eed584b29ae4 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/genassym.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/genassym.nix @@ -1,7 +1,3 @@ { mkDerivation }: -mkDerivation { - path = "usr.bin/genassym"; - version = "9.2"; - sha256 = "1acl1dz5kvh9h5806vkz2ap95rdsz7phmynh5i3x5y7agbki030c"; -} +mkDerivation { path = "usr.bin/genassym"; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/gencat.nix b/pkgs/os-specific/bsd/netbsd/pkgs/gencat.nix index 411be85e91e2f..ea701b6404ecc 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/gencat.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/gencat.nix @@ -1,7 +1,3 @@ { mkDerivation }: -mkDerivation { - path = "usr.bin/gencat"; - version = "9.2"; - sha256 = "0gd463x1hg36bhr7y0xryb5jyxk0z0g7xvy8rgk82nlbnlnsbbwb"; -} +mkDerivation { path = "usr.bin/gencat"; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/getconf.nix b/pkgs/os-specific/bsd/netbsd/pkgs/getconf.nix index c8483d454b877..2feb6495ccf86 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/getconf.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/getconf.nix @@ -1,7 +1,3 @@ { mkDerivation }: -mkDerivation { - path = "usr.bin/getconf"; - sha256 = "122vslz4j3h2mfs921nr2s6m078zcj697yrb75rwp2hnw3qz4s8q"; - version = "9.2"; -} +mkDerivation { path = "usr.bin/getconf"; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/getent/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/getent/package.nix index 7a9acb1e0a9e8..b6a4efad4ac9c 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/getent/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/getent/package.nix @@ -2,7 +2,5 @@ mkDerivation { path = "usr.bin/getent"; - sha256 = "1qngywcmm0y7nl8h3n8brvkxq4jw63szbci3kc1q6a6ndhycbbvr"; - version = "9.2"; patches = [ ./getent.patch ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/i18n_module.nix b/pkgs/os-specific/bsd/netbsd/pkgs/i18n_module.nix index c76ada865775e..066d9f236f9bf 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/i18n_module.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/i18n_module.nix @@ -6,8 +6,6 @@ mkDerivation { path = "lib/i18n_module"; - version = "9.2"; - sha256 = "0w6y5v3binm7gf2kn7y9jja8k18rhnyl55cvvfnfipjqdxvxd9jd"; meta.platforms = lib.platforms.netbsd; - extraPaths = [ libc.src ]; + extraPaths = [ libc.path ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/include.nix b/pkgs/os-specific/bsd/netbsd/pkgs/include.nix index ec316a63174fd..6df34b96095e7 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/include.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/include.nix @@ -10,15 +10,12 @@ rsync, nbperf, rpcgen, - common, defaultMakeFlags, stdenv, }: mkDerivation { path = "include"; - version = "9.2"; - sha256 = "0nxnmj4c8s3hb9n3fpcmd0zl3l1nmhivqgi9a35sis943qvpgl9h"; nativeBuildInputs = [ bsdSetupHook netbsdSetupHook @@ -46,7 +43,7 @@ mkDerivation { makeFlags=''${makeFlags/INCSDIR/INCSDIR0} ''; - extraPaths = [ common ]; + extraPaths = [ "common" ]; headersOnly = true; noCC = true; meta.platforms = lib.platforms.netbsd; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix index 0fc6ca452be0d..2dbec08f15e85 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix @@ -26,11 +26,9 @@ let in mkDerivation { path = "usr.bin/xinstall"; - version = "9.2"; - sha256 = "1f6pbz3qv1qcrchdxif8p5lbmnwl8b9nq615hsd3cyl4avd5bfqj"; extraPaths = [ - mtree.src - make.src + mtree.path + make.path ]; nativeBuildInputs = [ bsdSetupHook diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/ld_elf_so.nix b/pkgs/os-specific/bsd/netbsd/pkgs/ld_elf_so.nix index a350e81d32064..7f25ce097ff0d 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/ld_elf_so.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/ld_elf_so.nix @@ -7,8 +7,6 @@ mkDerivation { path = "libexec/ld.elf_so"; - version = "9.2"; - sha256 = "0ia9mqzdljly0vqfwflm5mzz55k7qsr4rw2bzhivky6k30vgirqa"; meta.platforms = lib.platforms.netbsd; LIBC_PIC = "${libc}/lib/libc_pic.a"; # Hack to prevent a symlink being installed here for compatibility. @@ -18,5 +16,5 @@ mkDerivation { "BINDIR=$(out)/libexec" "CLIBOBJ=${libc}/lib" ]; - extraPaths = [ libc.src ] ++ libc.extraPaths; + extraPaths = [ libc.path ] ++ libc.extraPaths; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libarch.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libarch.nix index 93ea02f8a17c1..457ea6fa48d91 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libarch.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libarch.nix @@ -2,7 +2,5 @@ mkDerivation { path = "lib/libarch"; - version = "9.2"; - sha256 = "6ssenRhuSwp0Jn71ErT0PrEoCJ+cIYRztwdL4QTDZsQ="; meta.platforms = lib.platforms.netbsd; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libc.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libc.nix index d755e4b6870a1..cf71857776d83 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libc.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libc.nix @@ -3,7 +3,6 @@ mkDerivation, defaultMakeFlags, _mainLibcExtraPaths, - fetchNetBSD, bsdSetupHook, netbsdSetupHook, makeMinimal, @@ -26,13 +25,9 @@ mkDerivation { path = "lib/libc"; - version = "9.2"; - sha256 = "1y9c13igg0kai07sqvf9cm6yqmd8lhfd8hq3q7biilbgs1l99as3"; USE_FORT = "yes"; MKPROFILE = "no"; - extraPaths = _mainLibcExtraPaths ++ [ - (fetchNetBSD "external/bsd/jemalloc" "9.2" "0cq704swa0h2yxv4gc79z2lwxibk9k7pxh3q5qfs7axx3jx3n8kb") - ]; + extraPaths = _mainLibcExtraPaths ++ [ "external/bsd/jemalloc" ]; nativeBuildInputs = [ bsdSetupHook netbsdSetupHook diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libcrypt.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libcrypt.nix index c5f9deff589c4..abcb2cfb14fb8 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libcrypt.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libcrypt.nix @@ -2,8 +2,6 @@ mkDerivation { path = "lib/libcrypt"; - version = "9.2"; - sha256 = "0siqan1wdqmmhchh2n8w6a8x1abbff8n4yb6jrqxap3hqn8ay54g"; SHLIBINSTALLDIR = "$(out)/lib"; meta.platforms = lib.platforms.netbsd; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libcurses.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libcurses.nix index 5072821db9117..8d61bcfdf7d97 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libcurses.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libcurses.nix @@ -9,8 +9,6 @@ mkDerivation { path = "lib/libcurses"; - version = "9.2"; - sha256 = "0pd0dggl3w4bv5i5h0s1wrc8hr66n4hkv3zlklarwfdhc692fqal"; buildInputs = [ libterminfo ]; env.NIX_CFLAGS_COMPILE = toString ( [ diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix index ee1e7bf79f964..cb9951cb8cf10 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libedit.nix @@ -9,8 +9,6 @@ mkDerivation { path = "lib/libedit"; - version = "9.2"; - sha256 = "1wqhngraxwqk4jgrf5f18jy195yrp7c06n1gf31pbplq79mg1bcj"; buildInputs = [ libterminfo libcurses diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libm.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libm.nix index f36e97f8e6ae0..8a2304cacbca1 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libm.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libm.nix @@ -6,9 +6,7 @@ mkDerivation { path = "lib/libm"; - version = "9.2"; - sha256 = "1apwfr26shdmbqqnmg7hxf7bkfxw44ynqnnnghrww9bnhqdnsy92"; SHLIBINSTALLDIR = "$(out)/lib"; meta.platforms = lib.platforms.netbsd; - extraPaths = [ sys.src ]; + extraPaths = [ sys.path ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libossaudio.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libossaudio.nix index 51bbc216e2046..a74176db68cdf 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libossaudio.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libossaudio.nix @@ -2,7 +2,5 @@ mkDerivation { path = "lib/libossaudio"; - version = "9.2"; - sha256 = "16l3bfy6dcwqnklvh3x0ps8ld1y504vf57v9rx8f9adzhb797jh0"; meta.platforms = lib.platforms.netbsd; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libpci.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libpci.nix index b0be4a2da723a..69d1ff5accca4 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libpci.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libpci.nix @@ -7,9 +7,7 @@ mkDerivation { pname = "libpci"; path = "lib/libpci"; - version = "9.2"; - sha256 = "+IOEO1Bw3/H3iCp3uk3bwsFZbvCqN5Ciz70irnPl8E8="; env.NIX_CFLAGS_COMPILE = toString [ "-I." ]; meta.platforms = lib.platforms.netbsd; - extraPaths = [ sys.src ]; + extraPaths = [ sys.path ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/base.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/base.nix index d8ea7c553eba3..08c298c0fe5d5 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/base.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/base.nix @@ -1,5 +1 @@ -{ - path = "lib/libpthread"; - version = "9.2"; - sha256 = "0mlmc31k509dwfmx5s2x010wxjc44mr6y0cbmk30cfipqh8c962h"; -} +{ path = "lib/libpthread"; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/package.nix index 88d392e20b4a8..28665b351f88a 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libpthread/package.nix @@ -2,7 +2,6 @@ lib, mkDerivation, headers, - common, libc, librt, sys, @@ -18,10 +17,10 @@ mkDerivation ( buildInputs = [ headers ]; SHLIBINSTALLDIR = "$(out)/lib"; extraPaths = [ - common - libc.src - librt.src - sys.src + "common" + libc.path + librt.path + sys.path ]; meta.platforms = lib.platforms.netbsd; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libresolv.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libresolv.nix index 24bc4f2f9e002..7db4948e6939b 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libresolv.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libresolv.nix @@ -6,8 +6,6 @@ mkDerivation { path = "lib/libresolv"; - version = "9.2"; - sha256 = "1am74s74mf1ynwz3p4ncjkg63f78a1zjm983q166x4sgzps15626"; meta.platforms = lib.platforms.netbsd; - extraPaths = [ libc.src ]; + extraPaths = [ libc.path ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/librpcsvc.nix b/pkgs/os-specific/bsd/netbsd/pkgs/librpcsvc.nix index 8d757a8a84304..3f2d392ba8c5d 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/librpcsvc.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/librpcsvc.nix @@ -14,8 +14,6 @@ mkDerivation { path = "lib/librpcsvc"; - version = "9.2"; - sha256 = "1q34pfiyjbrgrdqm46jwrsqms49ly6z3b0xh1wg331zga900vq5n"; makeFlags = defaultMakeFlags ++ [ "INCSDIR=$(out)/include/rpcsvc" ]; meta.platforms = lib.platforms.netbsd; nativeBuildInputs = [ diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/librt.nix b/pkgs/os-specific/bsd/netbsd/pkgs/librt.nix index fa0229953b66b..4e4bf0bc5ac4b 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/librt.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/librt.nix @@ -7,10 +7,8 @@ mkDerivation { path = "lib/librt"; - version = "9.2"; - sha256 = "07f8mpjcqh5kig5z5sp97fg55mc4dz6aa1x5g01nv2pvbmqczxc6"; meta.platforms = lib.platforms.netbsd; - extraPaths = [ libc.src ] ++ libc.extraPaths; + extraPaths = [ libc.path ] ++ libc.extraPaths; postPatch = '' sed -i 's,/usr\(/include/sys/syscall.h\),${headers}\1,g' \ $BSDSRCDIR/lib/{libc,librt}/sys/Makefile.inc diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libterminfo.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libterminfo.nix index 6ac573d865b1a..6e7b59df2ed5e 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libterminfo.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libterminfo.nix @@ -12,13 +12,10 @@ tic, rsync, compatIfNeeded, - fetchNetBSD, }: mkDerivation { path = "lib/libterminfo"; - version = "9.2"; - sha256 = "0pq05k3dj0dfsczv07frnnji92mazmy2qqngqbx2zgqc1x251414"; nativeBuildInputs = [ bsdSetupHook netbsdSetupHook @@ -45,7 +42,5 @@ mkDerivation { postInstall = '' make -C $BSDSRCDIR/share/terminfo $makeFlags BINDIR=$out/share install ''; - extraPaths = [ - (fetchNetBSD "share/terminfo" "9.2" "1vh9rl4w8118a9qdpblfxmv1wkpm83rm9gb4rzz5bpm56i6d7kk7") - ]; + extraPaths = [ "share/terminfo" ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libutil.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libutil.nix index fdc57df9c231e..d5bf075fc5e7d 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libutil.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libutil.nix @@ -1,6 +1,5 @@ { mkDerivation, - common, libc, sys, bsdSetupHook, @@ -18,12 +17,10 @@ mkDerivation { path = "lib/libutil"; - version = "9.2"; - sha256 = "02gm5a5zhh8qp5r5q5r7x8x6x50ir1i0ncgsnfwh1vnrz6mxbq7z"; extraPaths = [ - common - libc.src - sys.src + "common" + libc.path + sys.path ]; nativeBuildInputs = [ bsdSetupHook diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/locale/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/locale/package.nix index 3c61e8517b35b..e3e06ba1a152c 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/locale/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/locale/package.nix @@ -2,8 +2,6 @@ mkDerivation { path = "usr.bin/locale"; - version = "9.2"; - sha256 = "0kk6v9k2bygq0wf9gbinliqzqpzs9bgxn0ndyl2wcv3hh2bmsr9p"; patches = [ ./locale.patch ]; env.NIX_CFLAGS_COMPILE = "-DYESSTR=__YESSTR -DNOSTR=__NOSTR"; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/lorder.nix b/pkgs/os-specific/bsd/netbsd/pkgs/lorder.nix index 0b99a794b07a0..836fa7500e579 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/lorder.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/lorder.nix @@ -11,8 +11,6 @@ mkDerivation { path = "usr.bin/lorder"; - version = "9.2"; - sha256 = "0rjf9blihhm0n699vr2bg88m4yjhkbxh6fxliaay3wxkgnydjwn2"; nativeBuildInputs = [ bsdSetupHook netbsdSetupHook diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/make-rules.nix b/pkgs/os-specific/bsd/netbsd/pkgs/make-rules.nix index 66086c01c233f..a1e8d1482c215 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/make-rules.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/make-rules.nix @@ -9,8 +9,6 @@ mkDerivation { path = "share/mk"; - sha256 = "0w9x77cfnm6zwy40slradzi0ip9gz80x6lk7pvnlxzsr2m5ra5sy"; - version = "9.2"; noCC = true; buildInputs = [ ]; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/make.nix b/pkgs/os-specific/bsd/netbsd/pkgs/make.nix index 4d0b9f4b4cf22..9612ca7ff4893 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/make.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/make.nix @@ -1,15 +1,12 @@ { lib, mkDerivation, - fetchNetBSD, stdenv, make-rules, }: mkDerivation { path = "usr.bin/make"; - sha256 = "0vi73yicbmbp522qzqvd979cx6zm5jakhy77xh73c1kygf8klccs"; - version = "9.2"; postPatch = make-rules.postPatch @@ -21,7 +18,5 @@ mkDerivation { postInstall = '' make -C $BSDSRCDIR/share/mk FILESDIR=$out/share/mk install ''; - extraPaths = [ - (fetchNetBSD "share/mk" "9.2" "0w9x77cfnm6zwy40slradzi0ip9gz80x6lk7pvnlxzsr2m5ra5sy") - ]; + extraPaths = [ "share/mk" ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/makeMinimal.nix b/pkgs/os-specific/bsd/netbsd/pkgs/makeMinimal.nix index 62a4d4a6a1246..ad70b6b8cd072 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/makeMinimal.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/makeMinimal.nix @@ -9,8 +9,6 @@ mkDerivation { path = "tools/make"; - sha256 = "0fh0nrnk18m613m5blrliq2aydciv51qhc0ihsj4k63incwbk90n"; - version = "9.2"; buildInputs = [ ]; nativeBuildInputs = [ @@ -47,5 +45,5 @@ mkDerivation { runHook postInstall ''; - extraPaths = [ make.src ]; + extraPaths = [ make.path ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/man.nix b/pkgs/os-specific/bsd/netbsd/pkgs/man.nix index bce5bcee66946..527c547fdaad0 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/man.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/man.nix @@ -3,8 +3,6 @@ mkDerivation { path = "share/man"; noCC = true; - version = "9.2"; - sha256 = "1l4lmj4kmg8dl86x94sr45w0xdnkz8dn4zjx0ipgr9bnq98663zl"; # man0 generates a man.pdf using ps2pdf, but doesn't install it later, # so we can avoid the dependency on ghostscript postPatch = '' diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/misc.nix b/pkgs/os-specific/bsd/netbsd/pkgs/misc.nix index 7f96f4d1495ad..726acf27d50b0 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/misc.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/misc.nix @@ -3,7 +3,5 @@ mkDerivation { path = "share/misc"; noCC = true; - version = "9.2"; - sha256 = "1j2cdssdx6nncv8ffj7f7ybl7m9hadjj8vm8611skqdvxnjg6nbc"; makeFlags = defaultMakeFlags ++ [ "BINDIR=$(out)/share" ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/mkDerivation.nix b/pkgs/os-specific/bsd/netbsd/pkgs/mkDerivation.nix index 849d2b1da3fbf..f4f103087587d 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/mkDerivation.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/mkDerivation.nix @@ -1,8 +1,11 @@ { lib, - stdenvNoCC, stdenv, - fetchNetBSD, + stdenvNoCC, + crossLibcStdenv, + runCommand, + rsync, + source, bsdSetupHook, netbsdSetupHook, makeMinimal, @@ -12,9 +15,9 @@ mandoc, groff, statHook, - rsync, compatIfNeeded, defaultMakeFlags, + version, }: lib.makeOverridable ( @@ -23,10 +26,20 @@ lib.makeOverridable ( stdenv' = if attrs.noCC or false then stdenvNoCC else stdenv; in stdenv'.mkDerivation ( - { + rec { pname = "${attrs.pname or (baseNameOf attrs.path)}-netbsd"; - inherit (attrs) version; - src = fetchNetBSD attrs.path attrs.version attrs.sha256; + inherit version; + src = runCommand "${pname}-filtered-src" { nativeBuildInputs = [ rsync ]; } '' + for p in ${lib.concatStringsSep " " ([ attrs.path ] ++ attrs.extraPaths or [ ])}; do + set -x + path="$out/$p" + mkdir -p "$(dirname "$path")" + src_path="${source}/$p" + if [[ -d "$src_path" ]]; then src_path+=/; fi + rsync --chmod="+w" -r "$src_path" "$path" + set +x + done + ''; extraPaths = [ ]; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/mknod.nix b/pkgs/os-specific/bsd/netbsd/pkgs/mknod.nix index 5c4c172e40a7d..bf7d8b7db689b 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/mknod.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/mknod.nix @@ -1,7 +1,3 @@ { mkDerivation }: -mkDerivation { - path = "sbin/mknod"; - version = "9.2"; - sha256 = "1d9369shzwgixz3nph991i8q5vk7hr04py3n9avbfbhzy4gndqs2"; -} +mkDerivation { path = "sbin/mknod"; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/mtree.nix b/pkgs/os-specific/bsd/netbsd/pkgs/mtree.nix index 723da3ad891bc..8310941c7cb22 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/mtree.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/mtree.nix @@ -2,7 +2,5 @@ mkDerivation { path = "usr.sbin/mtree"; - version = "9.2"; - sha256 = "04p7w540vz9npvyb8g8hcf2xa05phn1y88hsyrcz3vwanvpc0yv9"; - extraPaths = [ mknod.src ]; + extraPaths = [ mknod.path ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/nbperf.nix b/pkgs/os-specific/bsd/netbsd/pkgs/nbperf.nix index a23c5dddfc9f8..3b52eae96c3b2 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/nbperf.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/nbperf.nix @@ -1,7 +1,3 @@ { mkDerivation }: -mkDerivation { - path = "usr.bin/nbperf"; - version = "9.2"; - sha256 = "1nxc302vgmjhm3yqdivqyfzslrg0vjpbss44s74rcryrl19mma9r"; -} +mkDerivation { path = "usr.bin/nbperf"; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/setup-hook.sh b/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/setup-hook.sh index ef00ea418e535..8c3742a76534b 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/setup-hook.sh +++ b/pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/setup-hook.sh @@ -1,16 +1,6 @@ -mergeNetBSDSourceDir() { - # merge together all extra paths - # there should be a better way to do this - chmod -R u+w $BSDSRCDIR - for path in $extraPaths; do - rsync -Er --chmod u+w $path/ $BSDSRCDIR/ - done -} - addNetBSDMakeFlags() { makeFlags="INCSDIR=${!outputDev}/include $makeFlags" makeFlags="MANDIR=${!outputMan}/share/man $makeFlags" } -postUnpackHooks+=(mergeNetBSDSourceDir) preConfigureHooks+=(addNetBSDMakeFlags) diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/rpcgen.nix b/pkgs/os-specific/bsd/netbsd/pkgs/rpcgen.nix index b1482d4dff112..dc6ceb7bd634d 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/rpcgen.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/rpcgen.nix @@ -1,7 +1,3 @@ { mkDerivation }: -mkDerivation { - path = "usr.bin/rpcgen"; - version = "9.2"; - sha256 = "1kfgfx54jg98wbg0d95p0rvf4w0302v8fz724b0bdackdsrd4988"; -} +mkDerivation { path = "usr.bin/rpcgen"; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/source.nix b/pkgs/os-specific/bsd/netbsd/pkgs/source.nix new file mode 100644 index 0000000000000..432de84ffb3e1 --- /dev/null +++ b/pkgs/os-specific/bsd/netbsd/pkgs/source.nix @@ -0,0 +1,12 @@ +{ + lib, + fetchcvs, + version, +}: + +fetchcvs { + cvsRoot = ":pserver:anoncvs@anoncvs.NetBSD.org:/cvsroot"; + module = "src"; + tag = "netbsd-${lib.replaceStrings [ "." ] [ "-" ] version}-RELEASE"; + sha256 = "sha256-+onT/ajWayaKALucaZBqoiEkvBBI400Fs2OCtMf/bYU="; +} diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/stat/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/stat/package.nix index 397b1f5303c15..522a7a1837b18 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/stat/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/stat/package.nix @@ -14,8 +14,6 @@ mkDerivation { path = "usr.bin/stat"; - version = "9.2"; - sha256 = "18nqwlndfc34qbbgqx5nffil37jfq9aw663ippasfxd2hlyc106x"; nativeBuildInputs = [ bsdSetupHook netbsdSetupHook diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix b/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix index 4c140fa3bdef7..6a6f8a5032768 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix @@ -14,12 +14,9 @@ config, genassym, defaultMakeFlags, - common, }: { path = "sys"; - version = "9.2"; - sha256 = "03s18q8d9giipf05bx199fajc2qwikji0djz7hw63d2lya6bfnpj"; # Make the build ignore linker warnings prePatch = '' @@ -89,5 +86,5 @@ ''; meta.platforms = lib.platforms.netbsd; - extraPaths = [ common ]; + extraPaths = [ "common" ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/sys/headers.nix b/pkgs/os-specific/bsd/netbsd/pkgs/sys/headers.nix index 2df35efc199ad..65fabedfcb457 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/sys/headers.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/sys/headers.nix @@ -14,7 +14,6 @@ config, genassym, defaultMakeFlags, - common, }: let base = import ./base.nix { @@ -34,7 +33,6 @@ let config genassym defaultMakeFlags - common ; }; in diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/sys/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/sys/package.nix index c8e6edab5f48f..cb691dc87855d 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/sys/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/sys/package.nix @@ -14,7 +14,6 @@ config, genassym, defaultMakeFlags, - common, }: let base = import ./base.nix { @@ -34,7 +33,6 @@ let config genassym defaultMakeFlags - common ; }; in diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/tic.nix b/pkgs/os-specific/bsd/netbsd/pkgs/tic.nix index e0900652108fd..f71df930ce1c3 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/tic.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/tic.nix @@ -11,13 +11,10 @@ compatIfNeeded, defaultMakeFlags, libterminfo, - fetchNetBSD, }: mkDerivation { path = "tools/tic"; - version = "9.2"; - sha256 = "092y7db7k4kh2jq8qc55126r5qqvlb8lq8mhmy5ipbi36hwb4zrz"; HOSTPROG = "tic"; buildInputs = compatIfNeeded; nativeBuildInputs = [ @@ -32,8 +29,8 @@ mkDerivation { ]; makeFlags = defaultMakeFlags ++ [ "TOOLDIR=$(out)" ]; extraPaths = [ - libterminfo.src - (fetchNetBSD "usr.bin/tic" "9.2" "1mwdfg7yx1g43ss378qsgl5rqhsxskqvsd2mqvrn38qw54i8v5i1") - (fetchNetBSD "tools/Makefile.host" "9.2" "15b4ab0n36lqj00j5lz2xs83g7l8isk3wx1wcapbrn66qmzz2sxy") + libterminfo.path + "usr.bin/tic" + "tools/Makefile.host" ]; } diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/tsort.nix b/pkgs/os-specific/bsd/netbsd/pkgs/tsort.nix index 9200bc57a73e0..b1ab320da0c8f 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/tsort.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/tsort.nix @@ -11,8 +11,6 @@ mkDerivation { path = "usr.bin/tsort"; - version = "9.2"; - sha256 = "1dqvf9gin29nnq3c4byxc7lfd062pg7m84843zdy6n0z63hnnwiq"; nativeBuildInputs = [ bsdSetupHook netbsdSetupHook diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/uudecode.nix b/pkgs/os-specific/bsd/netbsd/pkgs/uudecode.nix index 7592db3eaf180..1e58df16ceeec 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/uudecode.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/uudecode.nix @@ -6,8 +6,6 @@ mkDerivation { path = "usr.bin/uudecode"; - version = "9.2"; - sha256 = "00a3zmh15pg4vx6hz0kaa5mi8d2b1sj4h512d7p6wbvxq6mznwcn"; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isLinux "-DNO_BASE64"; NIX_LDFLAGS = lib.optional stdenv.isDarwin "-lresolv"; } diff --git a/pkgs/os-specific/darwin/macfuse/default.nix b/pkgs/os-specific/darwin/macfuse/default.nix index c63b536f248b5..4de9600e79108 100644 --- a/pkgs/os-specific/darwin/macfuse/default.nix +++ b/pkgs/os-specific/darwin/macfuse/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "macfuse-stubs"; - version = "4.4.1"; + version = "4.8.0"; src = fetchurl { url = "https://github.com/osxfuse/osxfuse/releases/download/macfuse-${version}/macfuse-${version}.dmg"; - sha256 = "2a2d0f37ec5fcff547c5efa7d08539103a0b46bc16080c2b41a7e749f6e65c61"; + hash = "sha256-ucTzO2qdN4QkowMVvC3+4pjEVjbwMsB0xFk+bvQxwtQ="; }; nativeBuildInputs = [ cpio xar undmg libtapi ]; diff --git a/pkgs/os-specific/darwin/raycast/default.nix b/pkgs/os-specific/darwin/raycast/default.nix index 5df4990b59f2c..4b8ef7031d07d 100644 --- a/pkgs/os-specific/darwin/raycast/default.nix +++ b/pkgs/os-specific/darwin/raycast/default.nix @@ -11,12 +11,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.76.0"; + version = "1.76.1"; src = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal"; - hash = "sha256-9qvXUmCATwugK8lB1LeSnjfr5MNCjF9QTKR29LmbKes="; + hash = "sha256-dZshCh1MSHf7ywwmNOvYNCXfSqC6C8vTCNsh/+klomk="; }; dontPatch = true; diff --git a/pkgs/os-specific/linux/bpftune/default.nix b/pkgs/os-specific/linux/bpftune/default.nix index 8747ef3d928f2..cc97ed16faea1 100644 --- a/pkgs/os-specific/linux/bpftune/default.nix +++ b/pkgs/os-specific/linux/bpftune/default.nix @@ -12,31 +12,28 @@ stdenv.mkDerivation rec { pname = "bpftune"; - version = "0-unstable-2024-05-17"; + version = "0-unstable-2024-06-07"; src = fetchFromGitHub { owner = "oracle"; repo = "bpftune"; - rev = "83115c56cf9620fe5669f4a3be67ab779d8f4536"; - hash = "sha256-er2i7CEUXF3BpWTG//s8C0xfIk5gSVOHB8nE1r7PX78="; + rev = "04bab5dd306b55b3e4e13e261af2480b7ccff9fc"; + hash = "sha256-kVjvupZ6HxJocwXWOrxUNqEGl0welJRlZwvOmMKqeBA="; }; postPatch = '' # otherwise shrink rpath would drop $out/lib from rpath substituteInPlace src/Makefile \ - --replace /lib64 /lib \ - --replace /sbin /bin \ - --replace ldconfig true + --replace-fail /lib64 /lib \ + --replace-fail /sbin /bin \ + --replace-fail ldconfig true substituteInPlace src/bpftune.service \ - --replace /usr/sbin/bpftune "$out/bin/bpftune" + --replace-fail /usr/sbin/bpftune "$out/bin/bpftune" substituteInPlace include/bpftune/libbpftune.h \ - --replace /usr/lib64/bpftune/ "$out/lib/bpftune/" \ - --replace /usr/local/lib64/bpftune/ "$out/lib/bpftune/" + --replace-fail /usr/lib64/bpftune/ "$out/lib/bpftune/" \ + --replace-fail /usr/local/lib64/bpftune/ "$out/lib/bpftune/" substituteInPlace src/libbpftune.c \ - --replace /lib/modules /run/booted-system/kernel-modules/lib/modules - - substituteInPlace src/Makefile sample_tuner/Makefile \ - --replace 'BPF_INCLUDE := /usr/include' 'BPF_INCLUDE := ${lib.getDev libbpf}/include' \ + --replace-fail /lib/modules /run/booted-system/kernel-modules/lib/modules ''; nativeBuildInputs = [ @@ -56,6 +53,7 @@ stdenv.mkDerivation rec { "confprefix=${placeholder "out"}/etc" "BPFTUNE_VERSION=${version}" "NL_INCLUDE=${lib.getDev libnl}/include/libnl3" + "BPF_INCLUDE=${lib.getDev libbpf}/include" ]; hardeningDisable = [ diff --git a/pkgs/os-specific/linux/ethq/default.nix b/pkgs/os-specific/linux/ethq/default.nix index 581382e4faf2d..94f18cccd9439 100644 --- a/pkgs/os-specific/linux/ethq/default.nix +++ b/pkgs/os-specific/linux/ethq/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ethq"; - version = "0.6.3"; + version = "0.7.0"; src = fetchFromGitHub { owner = "isc-projects"; repo = "ethq"; rev = "refs/tags/v${builtins.replaceStrings ["."] ["_"] version}"; - hash = "sha256-dr37KiSnP0S0OjQof242EcbH+y4pCCzu6R9D6fXR9qc="; + hash = "sha256-ye5ep9EM9Sq/NqNZHENPmFZefVBx1BGrPm3YEG1NcSc="; }; buildInputs = [ ncurses ]; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix index 386df843971cf..b2125170db14d 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix @@ -2,22 +2,22 @@ stdenvNoCC.mkDerivation { pname = "raspberrypi-wireless-firmware"; - version = "unstable-2023-11-15"; + version = "unstable-2024-02-26"; srcs = [ (fetchFromGitHub { name = "bluez-firmware"; owner = "RPi-Distro"; repo = "bluez-firmware"; - rev = "d9d4741caba7314d6500f588b1eaa5ab387a4ff5"; - hash = "sha256-CjbZ3t3TW/iJ3+t9QKEtM9NdQU7SwcUCDYuTmFEwvhU="; + rev = "78d6a07730e2d20c035899521ab67726dc028e1c"; + hash = "sha256-KakKnOBeWxh0exu44beZ7cbr5ni4RA9vkWYb9sGMb8Q="; }) (fetchFromGitHub { name = "firmware-nonfree"; owner = "RPi-Distro"; repo = "firmware-nonfree"; - rev = "88aa085bfa1a4650e1ccd88896f8343c22a24055"; - hash = "sha256-Yynww79LPPkau4YDSLI6IMOjH64nMpHUdGjnCfIR2+M="; + rev = "223ccf3a3ddb11b3ea829749fbbba4d65b380897"; + hash = "sha256-BGq0+cr+xBRwQM/LqiQuRWuZpQsKM5jfcrNCqWMuVzM="; }) ]; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index 0aea94bca067f..ece39dade72b0 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -3,16 +3,13 @@ stdenvNoCC.mkDerivation rec { # NOTE: this should be updated with linux_rpi pname = "raspberrypi-firmware"; - # raspberrypi/firmware no longers tag the releases. However, since each commit - # on the stable branch corresponds to a tag in raspberrypi/linux repo, we - # assume they are cut together. - version = "stable_20231123"; + version = "1.20240529"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; - rev = "524247ac6d8b1f4ddd53730e978a70c76a320bd6"; - hash = "sha256-rESwkR7pc5MTwIZ8PaMUPXuzxfv+jVpdRp8ijvxHGcg="; + rev = version; + hash = "sha256-KsCo7ZG6vKstxRyFljZtbQvnDSqiAPdUza32xTY/tlA="; }; installPhase = '' diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 9d0972661f9bb..1619002be01c3 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,38 +1,38 @@ { "testing": { - "version": "6.10-rc3", - "hash": "sha256:11kjvjww4n0l4knq1v4rsbnac4s01r69yk1lrb9hgikszxyjklwk" + "version": "6.10-rc4", + "hash": "sha256:1cx7c25fa8pvabhwph0rdqdryalxgl7rs1ry0v4k048bxpisvahf" }, "6.1": { - "version": "6.1.93", - "hash": "sha256:1kqbfbw7ivhl6aqb8pl92fll4bhgyn8xkgv8vpx62gcjylpaycfz" + "version": "6.1.94", + "hash": "sha256:0sakp5k4q2xfd3la7j8s2rcbvndh6fdqgzz5ivyqf0df4anp3siq" }, "5.15": { - "version": "5.15.160", - "hash": "sha256:018v19a7rhzc4szybzzn86jlnk42x7jm6xkadfd2d3xq6f7727pl" + "version": "5.15.161", + "hash": "sha256:0k277hz6nq62v0xfc1n2hc69cyvmnxpl0qcbszinajywh23gfafn" }, "5.10": { - "version": "5.10.218", - "hash": "sha256:1mmj5hwm5i16gc1y4nzr1cs882vi6vrihrincdcivv63x11v4dlw" + "version": "5.10.219", + "hash": "sha256:0c6dhi6w8likvyyzw7wj2fqhz8nhv760kkic8bk66r1prhakzdwk" }, "5.4": { - "version": "5.4.277", - "hash": "sha256:0l8zq3k07hdprfpvw69ykkf2pdg8wiv28xz733yxsjcfb0l5n7vy" + "version": "5.4.278", + "hash": "sha256:1245zf7vk2fyprw9fspljqy9wlzma9bayri7xx2g8iam2430d875" }, "4.19": { - "version": "4.19.315", - "hash": "sha256:1j1j8awy0237jp2r211qpa305c10y7rlcbkxkzdvzbgyhwy4spkc" + "version": "4.19.316", + "hash": "sha256:0lmyhwr4la7kvim7jqdi29scjkvqp9crpvdbhpb4j8d7mj5kgzz4" }, "6.6": { - "version": "6.6.33", - "hash": "sha256:15yy80dwis74gmmamnnn8kayak3am15gg6llk4k74x9avhhbqgm1" + "version": "6.6.34", + "hash": "sha256:180v8q5376gl6zmjd54qcb1wpmz7cq299bdbhmz738rsb67yrq64" }, "6.8": { "version": "6.8.12", "hash": "sha256:0fb0m0fv4521g63gq04d7lm6hy8169s1rykiav5bkd99s9b1kcqr" }, "6.9": { - "version": "6.9.4", - "hash": "sha256:1hpcc1bkan1y03bigi8mxd86z0c0bjpklnp9piw1ml57s7h00a17" + "version": "6.9.5", + "hash": "sha256:1ccm5w2x3faln5d0jj954xf99x7hn74ihk5zv6di99h3a2mv87x5" } } diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 9a03c39ec5691..b5be3ba7230a9 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/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 = "19575"; - sha256 = "1f826x8a6nmqcjcplg5x4rcqkr3p886abxhyqir8a102ymnh7wkw"; + rev = "19584"; + sha256 = "1vhk4jnx8f98lkj2isrms2jm9c5qrpgayxbhawslqrprq1pmzlif"; } , ... }: diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index e0ce6549235d6..775a50980f6d4 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -2,8 +2,8 @@ let # NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this - modDirVersion = "6.1.63"; - tag = "stable_20231123"; + modDirVersion = "6.6.31"; + tag = "stable_20240529"; in lib.overrideDerivation (buildLinux (args // { version = "${modDirVersion}-${tag}"; @@ -14,7 +14,7 @@ lib.overrideDerivation (buildLinux (args // { owner = "raspberrypi"; repo = "linux"; rev = tag; - hash = "sha256-4Rc57y70LmRFwDnOD4rHoHGmfxD9zYEAwYm9Wvyb3no="; + hash = "sha256-UWUTeCpEN7dlFSQjog6S3HyEWCCnaqiUqV5KxCjYink="; }; defconfig = { @@ -24,32 +24,33 @@ lib.overrideDerivation (buildLinux (args // { "4" = "bcm2711_defconfig"; }.${toString rpiVersion}; + structuredExtraConfig = (args.structuredExtraConfig or {}) // (with lib.kernel; { + # Workaround https://github.com/raspberrypi/linux/issues/6198 + # Needed because NixOS 24.05+ sets DRM_SIMPLEDRM=y which pulls in + # DRM_KMS_HELPER=y. + BACKLIGHT_CLASS_DEVICE = yes; + }); + features = { efiBootStub = false; } // (args.features or {}); kernelPatches = (args.kernelPatches or []) ++ [ - # Fix "WARNING: unmet direct dependencies detected for MFD_RP1", and - # subsequent build failure. - # https://github.com/NixOS/nixpkgs/pull/268280#issuecomment-1911839809 - # https://github.com/raspberrypi/linux/pull/5900 + # Fix compilation errors due to incomplete patch backport. + # https://github.com/raspberrypi/linux/pull/6223 { - name = "drm-rp1-depends-on-instead-of-select-MFD_RP1.patch"; + name = "gpio-pwm_-_pwm_apply_might_sleep.patch"; patch = fetchpatch { - url = "https://github.com/peat-psuwit/rpi-linux/commit/6de0bb51929cd3ad4fa27b2a421a2af12e6468f5.patch"; - hash = "sha256-9pHcbgWTiztu48SBaLPVroUnxnXMKeCGt5vEo9V8WGw="; + url = "https://github.com/peat-psuwit/rpi-linux/commit/879f34b88c60dd59765caa30576cb5bfb8e73c56.patch"; + hash = "sha256-HlOkM9EFmlzOebCGoj7lNV5hc0wMjhaBFFZvaRCI0lI="; }; } - # Fix `ERROR: modpost: missing MODULE_LICENSE() in <...>/bcm2712-iommu.o` - # by preventing such code from being built as module. - # https://github.com/NixOS/nixpkgs/pull/284035#issuecomment-1913015802 - # https://github.com/raspberrypi/linux/pull/5910 { - name = "iommu-bcm2712-don-t-allow-building-as-module.patch"; + name = "ir-rx51_-_pwm_apply_might_sleep.patch"; patch = fetchpatch { - url = "https://github.com/peat-psuwit/rpi-linux/commit/693a5e69bddbcbe1d1b796ebc7581c3597685b1b.patch"; - hash = "sha256-8BYYQDM5By8cTk48ASYKJhGVQnZBIK4PXtV70UtfS+A="; + url = "https://github.com/peat-psuwit/rpi-linux/commit/23431052d2dce8084b72e399fce82b05d86b847f.patch"; + hash = "sha256-UDX/BJCJG0WVndP/6PbPK+AZsfU3vVxDCrpn1kb1kqE="; }; } ]; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix index 47634d116e9ac..127d7e6635138 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.15.158-rt76"; # updated by ./update-rt.sh + version = "5.15.160-rt77"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -19,14 +19,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1inmdpif3qf1blmvjj4i7y42bylvhv0wyj3b0apq12zxlj1iq1zr"; + sha256 = "018v19a7rhzc4szybzzn86jlnk42x7jm6xkadfd2d3xq6f7727pl"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "17kw7cs1p0qgqf911prn3472c1j7r01g0mzqxsxpkdvhawxps7wy"; + sha256 = "0id4m1k1xq84bxgnchm8r2iwfqw6nacv5n1ksgyzj6q6v66ik3wk"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index cb75f013b6241..3060ff9ef775a 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -172,12 +172,6 @@ let # Ensure that depmod gets resolved through PATH sed -i Makefile -e 's|= /sbin/depmod|= depmod|' - # Don't include a (random) NT_GNU_BUILD_ID, to make the build more deterministic. - # This way kernels can be bit-by-bit reproducible depending on settings - # (e.g. MODULE_SIG and SECURITY_LOCKDOWN_LSM need to be disabled). - # See also https://kernelnewbies.org/BuildId - sed -i Makefile -e 's|--build-id=[^ ]*|--build-id=none|' - # Some linux-hardened patches now remove certain files in the scripts directory, so the file may not exist. [[ -f scripts/ld-version.sh ]] && patchShebangs scripts/ld-version.sh diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 15c344efbed3d..b2c4d0a6a6695 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -6,14 +6,14 @@ let # NOTE: When updating these, please also take a look at the changes done to # kernel config in the xanmod version commit ltsVariant = { - version = "6.6.32"; - hash = "sha256-DdBkfDq+bed1WdaAtxX16xjZO10jjqJ74ccY9Wq6ryM="; + version = "6.6.33"; + hash = "sha256-3qGxIYNVm2f69rym0Ya1X497G7yRNj3lLCtVgyEZ9yw="; variant = "lts"; }; mainVariant = { - version = "6.8.11"; - hash = "sha256-nEAUw7qFXab7J6x8coSsoB2meeOX4TQver2WztkFJJI="; + version = "6.9.4"; + hash = "sha256-gY0t77aPWOuRZFESNp0OLIsjLAv+rf0NHbab9WF2VtA="; variant = "main"; }; @@ -46,6 +46,14 @@ let HZ = freeform "250"; HZ_250 = yes; HZ_1000 = no; + + # RCU_BOOST and RCU_EXP_KTHREAD + RCU_EXPERT = yes; + RCU_FANOUT = freeform "64"; + RCU_FANOUT_LEAF = freeform "16"; + RCU_BOOST = yes; + RCU_BOOST_DELAY = freeform "0"; + RCU_EXP_KTHREAD = yes; }; extraMeta = { diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index d0467dad0d6ec..270a608c84cd5 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,16 +4,16 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.9.3"; #zen + version = "6.9.5"; #zen suffix = "zen1"; #zen - sha256 = "0vgy249zrzm6kn8wqisnbgbq8h6sffmk1zs6cx57annab9w0sb57"; #zen + sha256 = "16dm07xd5x5kbn3yk8q2kqwby67953p40ja0akrg31hycz8sgbqq"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "6.9.3"; #lqx + version = "6.9.5"; #lqx suffix = "lqx1"; #lqx - sha256 = "1wfjw5fq7myvhfb6srina0b7b76a08ib9x8hd8bdfr4zr6al8zq8"; #lqx + sha256 = "0r3pgjfyza3vkvp7kw1s7sn1gf4hxq6r6qs5wvv76gmff7s399yz"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/pkgs/os-specific/linux/kexec-tools/default.nix b/pkgs/os-specific/linux/kexec-tools/default.nix index 3861d5d0cd6f8..caecc7f9c10ef 100644 --- a/pkgs/os-specific/linux/kexec-tools/default.nix +++ b/pkgs/os-specific/linux/kexec-tools/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { url = "https://github.com/horms/kexec-tools/commit/328de8e00e298f00d7ba6b25dc3950147e9642e6.patch"; hash = "sha256-wVQI4oV+hBLq3kGIp2+F5J3f6s/TypDu3Xq583KYc3U="; }) - ]; + ] ++ lib.optional (stdenv.hostPlatform.useLLVM or false) ./fix-purgatory-llvm-libunwind.patch; hardeningDisable = [ "format" "pic" "relro" "pie" ]; diff --git a/pkgs/os-specific/linux/kexec-tools/fix-purgatory-llvm-libunwind.patch b/pkgs/os-specific/linux/kexec-tools/fix-purgatory-llvm-libunwind.patch new file mode 100644 index 0000000000000..235410da94f2c --- /dev/null +++ b/pkgs/os-specific/linux/kexec-tools/fix-purgatory-llvm-libunwind.patch @@ -0,0 +1,11 @@ +--- a/purgatory/Makefile 2024-06-06 23:59:33.089005832 -0700 ++++ b/purgatory/Makefile 2024-06-06 23:59:56.761169892 -0700 +@@ -62,7 +62,7 @@ + $(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\ + -Wl,--no-undefined -nostartfiles -nostdlib \ + -nodefaultlibs -e purgatory_start -r \ +- -Wl,-Map=$(PURGATORY_MAP) ++ -Wl,-Map=$(PURGATORY_MAP) -static + + $(PURGATORY): $(PURGATORY_OBJS) + $(MKDIR) -p $(@D) diff --git a/pkgs/os-specific/linux/ksmbd-tools/default.nix b/pkgs/os-specific/linux/ksmbd-tools/default.nix index b81f581c07aaa..de5d15a0c75aa 100644 --- a/pkgs/os-specific/linux/ksmbd-tools/default.nix +++ b/pkgs/os-specific/linux/ksmbd-tools/default.nix @@ -37,6 +37,5 @@ stdenv.mkDerivation rec { homepage = "https://www.kernel.org/doc/html/latest/filesystems/cifs/ksmbd.html"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/os-specific/linux/nsncd/default.nix b/pkgs/os-specific/linux/nsncd/default.nix index 9491c4887fce6..80dfdb5457fa7 100644 --- a/pkgs/os-specific/linux/nsncd/default.nix +++ b/pkgs/os-specific/linux/nsncd/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "nsncd"; - version = "unstable-2024-01-16"; + version = "unstable-2024-03-18"; src = fetchFromGitHub { owner = "twosigma"; repo = "nsncd"; - rev = "f4706786f26d12c533035fb2916be9be5751150b"; - hash = "sha256-GbKDWW00eZZwmslkaGIO8hjCyD5xi7h+S2WP6q5ekOQ="; + rev = "7605e330d5a313a8656e6fcaf1c10cd6b5cdd427"; + hash = "sha256-Bd7qE9MP5coBCkr70TdoJfwYhQpdrn/zmN4KoARcaMI="; }; - cargoSha256 = "sha256-jAxcyMPDTBFBrG0cuKm0Tm5p/UEnUgTPQKDgqY2yK7w="; + cargoHash = "sha256-i1rmc5wxtc631hZy2oM4d6r7od0w8GrG7+/pdM6Gqco="; checkFlags = [ # Relies on the test environment to be able to resolve "localhost" # on IPv4. That's not the case in the Nix sandbox somehow. Works diff --git a/pkgs/os-specific/linux/r8168/default.nix b/pkgs/os-specific/linux/r8168/default.nix index 6eb53ca17f7a3..274fcd06ffefa 100644 --- a/pkgs/os-specific/linux/r8168/default.nix +++ b/pkgs/os-specific/linux/r8168/default.nix @@ -6,18 +6,18 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi in stdenv.mkDerivation rec { name = "r8168-${kernel.version}-${version}"; # on update please verify that the source matches the realtek version - version = "8.052.01"; + version = "8.053.00"; # This is a mirror. The original website[1] doesn't allow non-interactive # downloads, instead emailing you a download link. - # [1] https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software - # I've verified manually (`diff -r`) that the source code for version 8.052.01 + # [1] https://www.realtek.com/Download/List?cate_id=584 + # I've verified manually (`diff -r`) that the source code for version 8.053.00 # is the same as the one available on the realtek website. src = fetchFromGitHub { owner = "mtorromeo"; repo = "r8168"; rev = version; - sha256 = "01mi7hh92nc7jaxkfrpz7j0ci78djrhgmq0im4k1270mwmvr0yzj"; + sha256 = "0bHGs8jyWd+ZiixOoNkBqhS9RjDpRp3vveAgk1YuOWU="; }; hardeningDisable = [ "pic" ]; @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ timokau ]; - broken = (lib.versions.majorMinor kernel.modDirVersion) != "5.15"; + maintainers = with maintainers; []; + broken = lib.versionAtLeast kernel.modDirVersion "6.9"; }; } diff --git a/pkgs/os-specific/linux/sd-switch/default.nix b/pkgs/os-specific/linux/sd-switch/default.nix index dc25cb434e9d9..b8dfd36d5919c 100644 --- a/pkgs/os-specific/linux/sd-switch/default.nix +++ b/pkgs/os-specific/linux/sd-switch/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromSourcehut, rustPlatform, nix-update-script }: -let version = "0.4.0"; +let version = "0.5.0"; in rustPlatform.buildRustPackage { pname = "sd-switch"; inherit version; @@ -9,10 +9,10 @@ in rustPlatform.buildRustPackage { owner = "~rycee"; repo = "sd-switch"; rev = version; - hash = "sha256-PPFYH34HAD/vC+9jpA1iPQRVNR6MX8ncSPC+7bl2oHY="; + hash = "sha256-TESS+CwwEugAz+grzndunAoKF9Or/Jl7tftL392fUaM="; }; - cargoHash = "sha256-zUoa7nPNFvnYekbEZwtnJKZ6qd47Sb4LZGEkaKVQ9ZQ="; + cargoHash = "sha256-QEnleFwEIoKATupj0sSV/GUztQoozEsb3SEgnfFzAfw="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index 4f27c7e83fb5d..b3395c7a4ceae 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -3,33 +3,25 @@ python3, pam, popt, talloc, tdb, tevent, pkg-config, ldb, openldap, pcre2, libkrb5, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2, libuuid, systemd, nspr, check, cmocka, uid_wrapper, p11-kit, - nss_wrapper, ncurses, Po4a, http-parser, jansson, jose, - docbook_xsl, docbook_xml_dtd_44, - testers, nix-update-script, nixosTests, fetchpatch, + nss_wrapper, ncurses, Po4a, jansson, jose, + docbook_xsl, docbook_xml_dtd_45, + testers, nix-update-script, nixosTests, withSudo ? false }: let - docbookFiles = "${docbook_xsl}/share/xml/docbook-xsl/catalog.xml:${docbook_xml_dtd_44}/xml/dtd/docbook/catalog.xml"; + docbookFiles = "${docbook_xsl}/share/xml/docbook-xsl/catalog.xml:${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml"; in stdenv.mkDerivation (finalAttrs: { pname = "sssd"; - version = "2.9.4"; + version = "2.9.5"; src = fetchFromGitHub { owner = "SSSD"; repo = "sssd"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-VJXZndbmC6mAVxzvv5Wjb4adrQkP16Rt4cgjl4qGDIc="; + hash = "sha256-wr6qFgM5XN3aizYVquj0xF+mVRgrkLWWhA3/gQOK8hQ="; }; - patches = [ - # Fix the build with Samba 4.20 - (fetchpatch { - url = "https://github.com/SSSD/sssd/commit/1bf51929a48b84d62ac54f2a42f17e7fbffe1612.patch"; - hash = "sha256-VLx04APEipp860iOJNIwTGywxZ7rIDdyh3te6m7Ymlo="; - }) - ]; - postPatch = '' patchShebangs ./sbus_generate.sh.in ''; @@ -74,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { talloc tdb tevent ldb pam openldap pcre2 libkrb5 cifs-utils glib keyutils dbus fakeroot libxslt libxml2 libuuid python3.pkgs.python-ldap systemd nspr check cmocka uid_wrapper - nss_wrapper ncurses Po4a http-parser jansson jose ]; + nss_wrapper ncurses Po4a jansson jose ]; makeFlags = [ "SGML_CATALOG_FILES=${docbookFiles}" diff --git a/pkgs/os-specific/linux/tuna/default.nix b/pkgs/os-specific/linux/tuna/default.nix index 3b527c8b534fe..634680dc318c2 100644 --- a/pkgs/os-specific/linux/tuna/default.nix +++ b/pkgs/os-specific/linux/tuna/default.nix @@ -57,6 +57,5 @@ buildPythonApplication rec { homepage = "https://git.kernel.org/pub/scm/utils/tuna/tuna.git"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/os-specific/linux/wiringpi/default.nix b/pkgs/os-specific/linux/wiringpi/default.nix index bc80e2a33543b..a8eb74217a4f9 100644 --- a/pkgs/os-specific/linux/wiringpi/default.nix +++ b/pkgs/os-specific/linux/wiringpi/default.nix @@ -1,50 +1,54 @@ -{ lib -, stdenv -, symlinkJoin -, fetchFromGitHub -, libxcrypt +{ + lib, + stdenv, + symlinkJoin, + fetchFromGitHub, + libxcrypt, }: let - version = "2.61-1"; - mkSubProject = { subprj # The only mandatory argument - , buildInputs ? [] - , src ? fetchFromGitHub { + version = "3.6"; + srcAll = fetchFromGitHub { owner = "WiringPi"; repo = "WiringPi"; rev = version; - sha256 = "sha256-VxAaPhaPXd9xYt663Ju6SLblqiSLizauhhuFqCqbO5M="; - } - }: stdenv.mkDerivation (finalAttrs: { - pname = "wiringpi-${subprj}"; - inherit version src; - sourceRoot = "${src.name}/${subprj}"; - inherit buildInputs; - # Remove (meant for other OSs) lines from Makefiles - preInstall = '' - sed -i "/chown root/d" Makefile - sed -i "/chmod/d" Makefile - ''; - makeFlags = [ - "DESTDIR=${placeholder "out"}" - "PREFIX=/." - # On NixOS we don't need to run ldconfig during build: - "LDCONFIG=echo" - ]; - }); + sha256 = "sha256-Hw81Ua9LTb/9l3Js1rx8TfCOF59MrrvH6AGsAsG1SoE="; + }; + mkSubProject = + { + subprj, # The only mandatory argument + buildInputs ? [ ], + src ? srcAll, + }: + stdenv.mkDerivation (finalAttrs: { + pname = "wiringpi-${subprj}"; + inherit version src; + sourceRoot = "${src.name}/${subprj}"; + inherit buildInputs; + # Remove (meant for other OSs) lines from Makefiles + preInstall = '' + sed -i "/chown root/d" Makefile + sed -i "/chmod/d" Makefile + ''; + makeFlags = [ + "DESTDIR=${placeholder "out"}" + "PREFIX=/." + # On NixOS we don't need to run ldconfig during build: + "LDCONFIG=echo" + ]; + }); passthru = { + # Helps nix-update and probably nixpkgs-update find the src of this package + # automatically. + src = srcAll; inherit mkSubProject; wiringPi = mkSubProject { subprj = "wiringPi"; - buildInputs = [ - libxcrypt - ]; + buildInputs = [ libxcrypt ]; }; devLib = mkSubProject { subprj = "devLib"; - buildInputs = [ - passthru.wiringPi - ]; + buildInputs = [ passthru.wiringPi ]; }; wiringPiD = mkSubProject { subprj = "wiringPiD"; diff --git a/pkgs/servers/akkoma/default.nix b/pkgs/servers/akkoma/default.nix index 472089bbafae4..ec69767338aab 100644 --- a/pkgs/servers/akkoma/default.nix +++ b/pkgs/servers/akkoma/default.nix @@ -222,7 +222,7 @@ beamPackages.mixRelease rec { description = "ActivityPub microblogging server"; homepage = "https://akkoma.social"; license = licenses.agpl3Only; - maintainers = with maintainers; [ mvs tcmal ]; + maintainers = with maintainers; [ mvs ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/elasticmq-server-bin/default.nix b/pkgs/servers/elasticmq-server-bin/default.nix index 1e8a97fa2b64e..f878ef6e64e92 100644 --- a/pkgs/servers/elasticmq-server-bin/default.nix +++ b/pkgs/servers/elasticmq-server-bin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "elasticmq-server"; - version = "1.6.3"; + version = "1.6.4"; src = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${finalAttrs.pname}-${finalAttrs.version}.jar"; - sha256 = "sha256-AVvzIx39IdtLzlD7jUJk3NlNRJym0N3VZmKsncYkzFU="; + sha256 = "sha256-HAxZaZofO24baPTNFqSltNgZekjOLRuCprcAksTSYiY="; }; # don't do anything? diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix index b7ad77e5e75ad..0aba1e90a1647 100644 --- a/pkgs/servers/ftp/bftpd/default.nix +++ b/pkgs/servers/ftp/bftpd/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { buildInputs = [ libxcrypt ]; + CFLAGS = "-std=gnu89"; + preConfigure = '' sed -re 's/-[og] 0//g' -i Makefile* ''; diff --git a/pkgs/servers/gotosocial/default.nix b/pkgs/servers/gotosocial/default.nix index 2e452e0e57d70..cf2e82a46db0c 100644 --- a/pkgs/servers/gotosocial/default.nix +++ b/pkgs/servers/gotosocial/default.nix @@ -9,11 +9,11 @@ let owner = "superseriousbusiness"; repo = "gotosocial"; - version = "0.15.0"; + version = "0.16.0"; web-assets = fetchurl { url = "https://github.com/${owner}/${repo}/releases/download/v${version}/${repo}_${version}_web-assets.tar.gz"; - hash = "sha256-vrSdFIdBcfj6+sxtvv1s/Mu85I1mKxjyUYS902oLKk4="; + hash = "sha256-aZQpd5KvoZvXEMVzGbWrtGsc+P1JStjZ6U5mX6q7Vb0="; }; in buildGoModule rec { @@ -23,7 +23,7 @@ buildGoModule rec { src = fetchFromGitHub { inherit owner repo; rev = "refs/tags/v${version}"; - hash = "sha256-z0iETddkw4C2R6ig9ZO8MTvhuWnmQ37/6q3oZ4WAzd4="; + hash = "sha256-QoG09+jmq5e5vxDVtkhY35098W/9B1HsYTuUnz43LV4="; }; vendorHash = null; diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix index e1f508aa766ad..8bb5a1eef31b5 100644 --- a/pkgs/servers/headscale/default.nix +++ b/pkgs/servers/headscale/default.nix @@ -18,6 +18,11 @@ buildGoModule rec { vendorHash = "sha256-IOkbbFtE6+tNKnglE/8ZuNxhPSnloqM2sLgTvagMmnc="; + patches = [ + # backport of https://github.com/juanfont/headscale/pull/1697 + ./trim-oidc-secret-path.patch + ]; + ldflags = ["-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}"]; nativeBuildInputs = [installShellFiles]; diff --git a/pkgs/servers/headscale/trim-oidc-secret-path.patch b/pkgs/servers/headscale/trim-oidc-secret-path.patch new file mode 100644 index 0000000000000..4275988aa7db6 --- /dev/null +++ b/pkgs/servers/headscale/trim-oidc-secret-path.patch @@ -0,0 +1,13 @@ +diff --git a/hscontrol/config.go b/hscontrol/config.go +index 0e83a1c..71fbfb0 100644 +--- a/hscontrol/config.go ++++ b/hscontrol/config.go +@@ -573,7 +573,7 @@ func GetHeadscaleConfig() (*Config, error) { + if err != nil { + return nil, err + } +- oidcClientSecret = string(secretBytes) ++ oidcClientSecret = strings.TrimSpace(string(secretBytes)) + } + + return &Config{ diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index dc3d6359cc856..1fe093dfb2d07 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2024.6.2"; + version = "2024.6.3"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -112,9 +112,10 @@ ]; "aladdin_connect" = ps: with ps; [ fnv-hash-fast + genie-partner-sdk psutil-home-assistant sqlalchemy - ]; # missing inputs: genie-partner-sdk + ]; "alarm_control_panel" = ps: with ps; [ ]; "alarmdecoder" = ps: with ps; [ @@ -3138,8 +3139,9 @@ hassil home-assistant-intents mutagen + ollama webrtc-noise-gain - ]; # missing inputs: ollama-hass + ]; "ombi" = ps: with ps; [ pyombi ]; @@ -5250,6 +5252,7 @@ "airvisual_pro" "airzone" "airzone_cloud" + "aladdin_connect" "alarm_control_panel" "alarmdecoder" "alert" @@ -5708,6 +5711,7 @@ "nx584" "obihai" "octoprint" + "ollama" "omnilogic" "onboarding" "oncue" diff --git a/pkgs/servers/home-assistant/custom-components/adaptive_lighting/default.nix b/pkgs/servers/home-assistant/custom-components/adaptive_lighting/default.nix index 1d2ae2228a5b2..9c35395d3e98e 100644 --- a/pkgs/servers/home-assistant/custom-components/adaptive_lighting/default.nix +++ b/pkgs/servers/home-assistant/custom-components/adaptive_lighting/default.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "basnijholt"; domain = "adaptive_lighting"; - version = "1.19.1"; + version = "1.22.0"; src = fetchFromGitHub { owner = "basnijholt"; repo = "adaptive-lighting"; rev = "refs/tags/${version}"; - hash = "sha256-AZsloE1vNQ9o2pg878J6I5qYXyI4fqYEvr18SrTocWo="; + hash = "sha256-k5pCgPM5xjVfWjOcr0UDFzYl/8z7yUwgYdBmC3+2F5k="; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/custom-components/epex_spot/default.nix b/pkgs/servers/home-assistant/custom-components/epex_spot/default.nix index e655a0d788d9d..85bef161595e0 100644 --- a/pkgs/servers/home-assistant/custom-components/epex_spot/default.nix +++ b/pkgs/servers/home-assistant/custom-components/epex_spot/default.nix @@ -7,23 +7,19 @@ buildHomeAssistantComponent rec { owner = "mampfes"; domain = "epex_spot"; - version = "2.3.5"; + version = "2.3.7"; src = fetchFromGitHub { owner = "mampfes"; repo = "ha_epex_spot"; rev = "refs/tags/${version}"; - hash = "sha256-WmPsFfQm8ChEr41XVgKi2BGwta5aKH9GDz4iIfTAPK4="; + hash = "sha256-8cxEOCzlQbS3HbQMBo7/rZb/GfpJvOWayLttEaEENYs="; }; propagatedBuildInputs = [ beautifulsoup4 ]; - postPatch = '' - substituteInPlace custom_components/epex_spot/manifest.json --replace-fail 'bs4' 'beautifulsoup4' - ''; - #skip phases without activity dontConfigure = true; doCheck = false; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 1bcb076b3061e..2e60e21ae8f2a 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -533,7 +533,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2024.6.2"; + hassVersion = "2024.6.3"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -551,13 +551,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-o37/Vfs9+0pxihfaInB6f8DI1uExbBcQse2841v6+Ec="; + hash = "sha256-hpKfdcTc9vddA/1EsfugDIKUPe0g3fPQnmwHLSEIF9w="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-eGlPcB5U6yJZd/771xzqKKY7REnCsniDypGndlsGo/E="; + hash = "sha256-lhTVAYwtYf7UzplAIHTWqgd0P7V93gjNbBUlMd3i3oQ="; }; build-system = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 928479e6e0d2a..f3e6062d5b266 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/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 = "20240610.0"; + version = "20240610.1"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-k4zUo439nfB71LVhv3Mfhj5mRD4Oduas+NHEyAqYBa4="; + hash = "sha256-6XSDKPL+rbtP/jGYbvzc5cakEZC94sDetmPuM7TQQ64="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 5a421a1f897b4..4d14ee508bcba 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.6.2"; + version = "2024.6.3"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-y1TiexWK5aJRa6Kfcdc8rPr+uueKJ2+4n2q6dCPCWjk="; + hash = "sha256-YMoNoR9LT38nkqoo0seaP88XUOcVmSQN1dBKiW+13SM="; }; build-system = [ diff --git a/pkgs/servers/home-assistant/update-component-packages.py b/pkgs/servers/home-assistant/update-component-packages.py index 10288f5e6d64f..e25b60336140d 100755 --- a/pkgs/servers/home-assistant/update-component-packages.py +++ b/pkgs/servers/home-assistant/update-component-packages.py @@ -41,6 +41,7 @@ PKG_SET = "home-assistant.python.pkgs" PKG_PREFERENCES = { "fiblary3": "fiblary3-fork", # https://github.com/home-assistant/core/issues/66466 "HAP-python": "hap-python", + "ollama-hass": "ollama", "SQLAlchemy": "sqlalchemy", "tensorflow": "tensorflow", "yt-dlp": "yt-dlp", diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index a54b8b59f94e2..b20fbee945913 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -21,13 +21,13 @@ in buildGoModule rec { pname = "evcc"; - version = "0.127.0"; + version = "0.127.2"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; rev = version; - hash = "sha256-Kvpi9HE7dr3StLEihJDF5z1fQELsOv0/5jLLmEEtOJ8="; + hash = "sha256-85AhiqAvjr63tfXovH2bt1b583ak1N09EtbLLtW7qeA="; }; vendorHash = "sha256-MdfLJpPEi6Cr34W6eJSraKJwBPtR66HM2tJIbPE9mZs="; diff --git a/pkgs/servers/http/apache-modules/mod_tile/default.nix b/pkgs/servers/http/apache-modules/mod_tile/default.nix index cd3937fe1fa62..6c64478cc1259 100644 --- a/pkgs/servers/http/apache-modules/mod_tile/default.nix +++ b/pkgs/servers/http/apache-modules/mod_tile/default.nix @@ -29,6 +29,11 @@ stdenv.mkDerivation rec { hash = "sha256-zXUwTG8cqAkY5MC1jAc2TtMgNMQPLc5nc22okVYP4ME="; }; + patches = [ + # Support Mapnik >= v4.0.0-rc2 (boost:optional no longer used) + ./mod_tile-std_optional.patch + ]; + nativeBuildInputs = [ cmake pkg-config @@ -64,6 +69,8 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=$(out)" ]; doCheck = true; + # Do not run tests in parallel + enableParallelChecking = false; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/servers/http/apache-modules/mod_tile/mod_tile-std_optional.patch b/pkgs/servers/http/apache-modules/mod_tile/mod_tile-std_optional.patch new file mode 100644 index 0000000000000..1f63ce0bc1f1d --- /dev/null +++ b/pkgs/servers/http/apache-modules/mod_tile/mod_tile-std_optional.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e68d2e9..ddba150 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -48,7 +48,7 @@ find_package(LIBMEMCACHED) + find_package(LIBRADOS) + + if(LIBMAPNIK_VERSION STRGREATER_EQUAL "4") +- set(CMAKE_CXX_STANDARD 14) ++ set(CMAKE_CXX_STANDARD 17) + endif() + + # Programs +diff --git a/src/parameterize_style.cpp b/src/parameterize_style.cpp +index 8db7122..7100735 100644 +--- a/src/parameterize_style.cpp ++++ b/src/parameterize_style.cpp +@@ -72,7 +74,7 @@ static void parameterize_map_language(mapnik::Map &m, char * parameter) + mapnik::parameters params = l.datasource()->params(); + + if (params.find("table") != params.end()) { +- boost::optional<std::string> table = params.get<std::string>("table"); ++ auto table = params.get<std::string>("table"); + + if (table && table->find(",name") != std::string::npos) { + std::string str = *table; diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index a33bdbcebc92b..48d43dfe647fa 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -55,6 +55,6 @@ callPackage ../nginx/generic.nix args rec { homepage = "https://openresty.org"; license = lib.licenses.bsd2; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ thoughtpolice lblasc emily ]; + maintainers = with lib.maintainers; [ thoughtpolice lblasc ]; }; } diff --git a/pkgs/servers/libreddit/default.nix b/pkgs/servers/libreddit/default.nix index 246697c937f4b..c27ea94a7b0c7 100644 --- a/pkgs/servers/libreddit/default.nix +++ b/pkgs/servers/libreddit/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "libreddit"; - version = "0.30.0"; + version = "0.30.1"; src = fetchFromGitHub { owner = "libreddit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jV8U7znBFCYBmtI6fm+/5oKsLJ3/tQG16GUvNnBlp7A="; + hash = "sha256-Z+COSDiJoWHHZQM4BJca0JA5RrJKYjhfkFj8yx/0gZA="; }; - cargoHash = "sha256-V7bT1uwSk9IW5rhKHW+6yHv+o+H3w7O/yuRpPDrcFic="; + cargoHash = "sha256-42xtt5dCcV6+TcssFjufkVtDSRiDGaatAaiP6K8DT8I="; buildInputs = lib.optionals stdenv.isDarwin [ Security diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 000c56b41d831..136cb0828f326 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -32,20 +32,20 @@ let in python.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.108.0"; + version = "1.109.0"; format = "pyproject"; src = fetchFromGitHub { owner = "element-hq"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-Pvn6mf1EM7Dj3N7frBzPGU9YmTDhJuAVuvXbYgjnRqk="; + hash = "sha256-AUaHgMKte1EIfI0EQm8YeQVtlXGTm+MZwq22WzYHGsE="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-R4V/Z8f2nbSifjlYP2NCP0B6KiAAa+YSmpVLdzeuXWY="; + hash = "sha256-KwRNn2Ypt87QRUTCsj00zsu6uQtP5MSuM6B2DemoFGs="; }; postPatch = '' diff --git a/pkgs/servers/mediamtx/default.nix b/pkgs/servers/mediamtx/default.nix index aca51d8dc0d7d..35db7a9c65688 100644 --- a/pkgs/servers/mediamtx/default.nix +++ b/pkgs/servers/mediamtx/default.nix @@ -1,29 +1,30 @@ -{ lib -, fetchFromGitHub -, fetchurl -, buildGoModule -, nixosTests +{ + lib, + fetchFromGitHub, + fetchurl, + buildGoModule, + nixosTests, }: let hlsJs = fetchurl { - url = "https://cdn.jsdelivr.net/npm/hls.js@v1.5.8/dist/hls.min.js"; - hash = "sha256-KG8Cm0dAsFbrBHuMi9c+bMocpSvWWK4c9aWH9LGfDY4="; + url = "https://cdn.jsdelivr.net/npm/hls.js@v1.5.11/dist/hls.min.js"; + hash = "sha256-N10eCJk75KlKpHVXtwgC7vBDrU5b7ZQng9o/QK93m2w="; }; in buildGoModule rec { pname = "mediamtx"; # check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "bluenviron"; repo = pname; rev = "v${version}"; - hash = "sha256-hm6rfO9RF7bsSwxP8tKwiVqEpyQpVK4itWWklbOsKzw="; + hash = "sha256-/r5N9RSlYH6xM+JyETuTQWu0YTvaShI6APi8ibpP7Zg="; }; - vendorHash = "sha256-QsRJ4hCtb29cT4QzPqW19bZxH+wMegufSxwdljXbuqs="; + vendorHash = "sha256-/TgSTXA6SOCfm/wtjJBtyIg4Fo0moJyC640zoIOQ4Fo="; postPatch = '' cp ${hlsJs} internal/servers/hls/hls.min.js @@ -32,16 +33,14 @@ buildGoModule rec { # Tests need docker doCheck = false; - ldflags = [ - "-X github.com/bluenviron/mediamtx/internal/core.version=v${version}" - ]; + ldflags = [ "-X github.com/bluenviron/mediamtx/internal/core.version=v${version}" ]; - passthru.tests = { inherit (nixosTests) mediamtx; }; + passthru.tests = { + inherit (nixosTests) mediamtx; + }; meta = with lib; { - description = - "Ready-to-use RTSP server and RTSP proxy that allows to read and publish video and audio streams" - ; + description = "Ready-to-use RTSP server and RTSP proxy that allows to read and publish video and audio streams"; inherit (src.meta) homepage; license = licenses.mit; mainProgram = "mediamtx"; diff --git a/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/pkgs/servers/monitoring/grafana-image-renderer/default.nix index dec05b859bb02..4d598a1395cf9 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/default.nix +++ b/pkgs/servers/monitoring/grafana-image-renderer/default.nix @@ -7,18 +7,18 @@ mkYarnPackage rec { pname = "grafana-image-renderer"; - version = "3.10.5"; + version = "3.11.0"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; rev = "v${version}"; - hash = "sha256-Ah78mapwGTD5mTPN7oKk8iwXpp2RMQ8nm0QX3/jTjKU="; + hash = "sha256-FoRXXeKiruXM8/Yh63zn2NuAj/JBXRNgNLLAuJ+sVIw="; }; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-o8Bxc5KyoYMYJ6FwQ6PSi7A0LhU4VNuXh5xXbEXLb4Y="; + hash = "sha256-utJS1UsJ2SJ72w2zFpbP33Jz+eTG5aoKfvRP9muB9gg="; }; packageJSON = ./package.json; diff --git a/pkgs/servers/monitoring/grafana-image-renderer/package.json b/pkgs/servers/monitoring/grafana-image-renderer/package.json index e7435c2ebdaba..6ef90d97713c2 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/package.json +++ b/pkgs/servers/monitoring/grafana-image-renderer/package.json @@ -25,7 +25,7 @@ "test-diff": "cross-env SAVE_DIFF=true jest" }, "dependencies": { - "@grpc/grpc-js": "^1.7.0", + "@grpc/grpc-js": "^1.8.22", "@grpc/proto-loader": "^0.7.2", "@hapi/boom": "^10.0.0", "@puppeteer/browsers": "^1.6.0", diff --git a/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix b/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix index 37631a00c6798..c9b7440507aa7 100644 --- a/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "junos-czerwonk-exporter"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "czerwonk"; repo = "junos_exporter"; rev = version; - sha256 = "sha256-KdVyRddAr2gqiFyIGBfWbi4DHAaiey4p4OBFND/2u7U="; + sha256 = "sha256-5haMQlwGJO0WdT75AEfs41k1oWUqrFk9nj+DOcKAom0="; }; - vendorHash = "sha256-fytDr56ZhhO5u6u9CRIEKXGqgnzntSVqEVItibpLyPM="; + vendorHash = "sha256-qHs6KuBmJmmkmR23Ae7COadb2F7N8CMUmScx8JFt98Q="; meta = with lib; { description = "Exporter for metrics from devices running JunOS"; diff --git a/pkgs/servers/monitoring/prometheus/knot-exporter.nix b/pkgs/servers/monitoring/prometheus/knot-exporter.nix index f15dc626e59f7..2255e660380fb 100644 --- a/pkgs/servers/monitoring/prometheus/knot-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/knot-exporter.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "knot-exporter"; - version = "3.3.5"; + version = "3.3.6"; pyproject = true; src = fetchPypi { pname = "knot_exporter"; inherit version; - hash = "sha256-7r4zXqomiszDrplMedEyw2ZQ2NwDTf54EOwnsLc5RJ0="; + hash = "sha256-4Fdbu08RbivZF+Hnk+tI1DW9PyzQTI0TngAbZ60CcO8="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix index d3365fc92bf4f..1f215b4ffdc6d 100644 --- a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix @@ -1,11 +1,9 @@ -{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "surfboard_exporter"; version = "2.0.0"; - goPackagePath = "github.com/ipstatic/surfboard_exporter"; - src = fetchFromGitHub { rev = version; owner = "ipstatic"; @@ -13,6 +11,12 @@ buildGoPackage rec { sha256 = "11qms26648nwlwslnaflinxcr5rnp55s908rm1qpnbz0jnxf5ipw"; }; + postPatch = '' + go mod init github.com/ipstatic/surfboard_exporter + ''; + + vendorHash = null; + passthru.tests = { inherit (nixosTests.prometheus-exporters) surfboard; }; meta = with lib; { diff --git a/pkgs/servers/networking/exabgp/default.nix b/pkgs/servers/networking/exabgp/default.nix index ea3e43183c11c..f00b427b15a2a 100644 --- a/pkgs/servers/networking/exabgp/default.nix +++ b/pkgs/servers/networking/exabgp/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "exabgp"; - version = "4.2.21"; + version = "4.2.22"; format = "pyproject"; src = fetchFromGitHub { owner = "Exa-Networks"; repo = "exabgp"; rev = "refs/tags/${version}"; - hash = "sha256-NlGE3yHUXPdxAMGhSaXMT2P1e7P+4AWg4lReP3f6Zx8="; + hash = "sha256-PrdCAmefKCBmbBFp04KiQGSsZZ4KNFk/ZtMedh9oow4="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index 83a0dc0da83d3..739fab6f81197 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, stdenv, pkg-config, rustPlatform, libiconv, fetchpatch, nixosTests }: let - libflux_version = "0.188.0"; + libflux_version = "0.194.5"; - # This is copied from influxdb2 with flux version matching the needed by thi + # This is copied from influxdb2 with the required flux version flux = rustPlatform.buildRustPackage rec { pname = "libflux"; version = "v${libflux_version}"; @@ -11,21 +11,22 @@ let owner = "influxdata"; repo = "flux"; rev = "v${libflux_version}"; - hash = "sha256-4Z6Vfdyh0zimQlE47plSIjTWBYiju0Qu09M+MgMQOL4="; + hash = "sha256-XHT/+JMu5q1cPjZT2x/OKEPgxFJcnjrQKqn8w9/Mb3s="; }; patches = [ - # https://github.com/influxdata/flux/pull/5440 - # fix compile error with Rust 1.72.0 + # Fix build on Rust 1.78 (included after v0.195.0) (fetchpatch { - url = "https://github.com/influxdata/flux/commit/8d1d6c8b485eb7e15b6a5f57762d1f766b17defd.patch"; + name = "fix-build-on-rust-1.78.patch"; + url = "https://github.com/influxdata/flux/commit/68c831c40b396f0274f6a9f97d77707c39970b02.patch"; stripLen = 2; extraPrefix = ""; - hash = "sha256-BDBmGKsC2RWMyObDm7dPwFq/3cVIdBKF8ZVaCL+uftw="; - includes = [ "flux/src/lib.rs" ]; + excludes = [ ]; + hash = "sha256-6LOTgbOCfETNTmshyXgtDZf9y4t/2iqRuVPkz9dYPHc="; }) + ../influxdb2/fix-unsigned-char.patch ]; sourceRoot = "${src.name}/libflux"; - cargoHash = "sha256-925U9weBOvMuyApsTOjtQxik3nqT2UpK+DPM64opc7c="; + cargoHash = "sha256-O+t4f4P5291BuyARH6Xf3LejMFEQEBv+qKtyjHRhclA="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = lib.optional stdenv.isDarwin libiconv; pkgcfg = '' @@ -48,16 +49,16 @@ let in buildGoModule rec { pname = "influxdb"; - version = "1.10.5"; + version = "1.10.7"; src = fetchFromGitHub { owner = "influxdata"; repo = pname; rev = "v${version}"; - hash = "sha256-FvKGNqy27q6/X2DI/joJXfGVrax6hQcNcx5nJDeSLm0="; + hash = "sha256-Aibu3yG/D1501Hr2F2qsGvjig14tbEAI+MBfqbxlpg8="; }; - vendorHash = "sha256-1jeZBVmNOxF5NPlTKg+YRw6VqIIZDcT3snnoMLX3y4g="; + vendorHash = "sha256-AA6uj7PgXjC+IK2ZSwRnYpHS4MFScOROO1BpP+s33IU="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix index 46dddd6eca3a0..81333a9f1ec30 100644 --- a/pkgs/servers/nosql/influxdb2/default.nix +++ b/pkgs/servers/nosql/influxdb2/default.nix @@ -13,15 +13,15 @@ }: let - version = "2.7.1"; - ui_version = "OSS-v${version}"; - libflux_version = "0.193.0"; + version = "2.7.6"; + ui_version = "OSS-v2.7.1"; + libflux_version = "0.194.5"; src = fetchFromGitHub { owner = "influxdata"; repo = "influxdb"; rev = "v${version}"; - hash = "sha256-JWu4V2k8ItbzBa421EtzgMVlDznoDdGjIhfDSaZ0j6c="; + hash = "sha256-0gqFUIV0ETdVuVmC+SwoKsO6OkoT/s+qKO1f8fkaZj4="; }; ui = fetchurl { @@ -36,21 +36,22 @@ let owner = "influxdata"; repo = "flux"; rev = "v${libflux_version}"; - hash = "sha256-gx6vnGOFu35wasLl7X/73eDsE0/50cAzjmBjZ+H2Ne4="; + hash = "sha256-XHT/+JMu5q1cPjZT2x/OKEPgxFJcnjrQKqn8w9/Mb3s="; }; patches = [ - # Fix build with recent rust versions + # Fix build on Rust 1.78 (included after v0.195.0) (fetchpatch { - url = "https://github.com/influxdata/flux/commit/6dc8054cfeec4b65b5c7ae786d633240868b8589.patch"; + name = "fix-build-on-rust-1.78.patch"; + url = "https://github.com/influxdata/flux/commit/68c831c40b396f0274f6a9f97d77707c39970b02.patch"; stripLen = 2; extraPrefix = ""; - excludes = [ "rust-toolchain.toml" ]; - hash = "sha256-w3z+Z26Xhy9TNICyNhc8XiWNSpdLA23ADI4K/AOMYhg="; + excludes = [ ]; + hash = "sha256-6LOTgbOCfETNTmshyXgtDZf9y4t/2iqRuVPkz9dYPHc="; }) - ./no-deny-warnings.patch + ./fix-unsigned-char.patch ]; sourceRoot = "${src.name}/libflux"; - cargoSha256 = "sha256-MoI5nxLGA/3pduZ+vgmSG3lm3Nx58SP+6WXQl2pX9Lc="; + cargoHash = "sha256-O+t4f4P5291BuyARH6Xf3LejMFEQEBv+qKtyjHRhclA="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = lib.optional stdenv.isDarwin libiconv; pkgcfg = '' @@ -78,7 +79,7 @@ in buildGoModule { nativeBuildInputs = [ go-bindata pkg-config perl ]; - vendorHash = "sha256-5b1WRq3JndkOkKBhMzGZnSyBDY5Lk0UGe/WGHQJp0CQ="; + vendorHash = "sha256-3Vf8BCrOwliXrH+gmZ4RJ1YBEbqL0Szx2prW3ie9CNg="; subPackages = [ "cmd/influxd" "cmd/telemetryd" ]; PKG_CONFIG_PATH = "${flux}/pkgconfig"; diff --git a/pkgs/servers/nosql/influxdb2/fix-unsigned-char.patch b/pkgs/servers/nosql/influxdb2/fix-unsigned-char.patch new file mode 100644 index 0000000000000..173e5b30e5ee1 --- /dev/null +++ b/pkgs/servers/nosql/influxdb2/fix-unsigned-char.patch @@ -0,0 +1,13 @@ +diff --git a/flux/src/cffi.rs b/flux/src/cffi.rs +index ba18e3d5..0c1badf8 100644 +--- a/flux/src/cffi.rs ++++ b/flux/src/cffi.rs +@@ -1149,7 +1149,7 @@ from(bucket: v.bucket) + fn parse_with_invalid_utf8() { + let cfname = CString::new("foo.flux").unwrap(); + let cfname_ptr: *const c_char = cfname.as_ptr(); +- let v: Vec<c_char> = vec![-61, 0]; ++ let v: Vec<c_char> = vec![-61i8 as c_char, 0]; + let csrc: *const c_char = &v[0]; + // Safety: both pointers are valid + let pkg = unsafe { flux_parse(cfname_ptr, csrc) }; diff --git a/pkgs/servers/nosql/influxdb2/no-deny-warnings.patch b/pkgs/servers/nosql/influxdb2/no-deny-warnings.patch deleted file mode 100644 index 3000ccad8256c..0000000000000 --- a/pkgs/servers/nosql/influxdb2/no-deny-warnings.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/flux/src/lib.rs b/flux/src/lib.rs -index 3fdf4071..a4c02277 100644 ---- a/flux/src/lib.rs -+++ b/flux/src/lib.rs -@@ -1,5 +1,3 @@ --#![cfg_attr(feature = "strict", deny(warnings, missing_docs))] -- - //! This module provides the public facing API for Flux's Go runtime, including formatting, - //! parsing, and standard library analysis. - use std::sync::Arc; diff --git a/pkgs/servers/osmocom/libosmocore/default.nix b/pkgs/servers/osmocom/libosmocore/default.nix index acc72975617ff..770dcd97f0a4c 100644 --- a/pkgs/servers/osmocom/libosmocore/default.nix +++ b/pkgs/servers/osmocom/libosmocore/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libosmocore"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "osmocom"; repo = "libosmocore"; rev = version; - hash = "sha256-rbdn7MiB0tluHgdQz1XpcQsN5FU8eGhmetzXzFAiCLg="; + hash = "sha256-9b+wQoC3lOz7mlaxzSRIrXinRVoNj4UYW0ae+JBBKsE="; }; postPatch = '' diff --git a/pkgs/servers/osmocom/osmo-bsc/default.nix b/pkgs/servers/osmocom/osmo-bsc/default.nix index 1f9a6cabbf18d..1df6e7dd4c3be 100644 --- a/pkgs/servers/osmocom/osmo-bsc/default.nix +++ b/pkgs/servers/osmocom/osmo-bsc/default.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation rec { license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ janik ]; platforms = lib.platforms.linux; + mainProgram = "osmo-bsc"; }; } diff --git a/pkgs/servers/osmocom/osmo-ggsn/default.nix b/pkgs/servers/osmocom/osmo-ggsn/default.nix index ce902e29c256f..51615fdb1b3ce 100644 --- a/pkgs/servers/osmocom/osmo-ggsn/default.nix +++ b/pkgs/servers/osmocom/osmo-ggsn/default.nix @@ -43,5 +43,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ janik ]; platforms = lib.platforms.linux; + mainProgram = "osmo-ggsn"; }; } diff --git a/pkgs/servers/osmocom/osmo-hlr/default.nix b/pkgs/servers/osmocom/osmo-hlr/default.nix index 6dce9cd84d401..112e3c8739029 100644 --- a/pkgs/servers/osmocom/osmo-hlr/default.nix +++ b/pkgs/servers/osmocom/osmo-hlr/default.nix @@ -47,5 +47,6 @@ stdenv.mkDerivation rec { license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ janik ]; platforms = lib.platforms.linux; + mainProgram = "osmo-hlr"; }; } diff --git a/pkgs/servers/osmocom/osmo-sgsn/default.nix b/pkgs/servers/osmocom/osmo-sgsn/default.nix index d74ca535e1401..9529c4f50cad7 100644 --- a/pkgs/servers/osmocom/osmo-sgsn/default.nix +++ b/pkgs/servers/osmocom/osmo-sgsn/default.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation rec { license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ janik ]; platforms = lib.platforms.linux; + mainProgram = "osmo-sgsn"; }; } diff --git a/pkgs/servers/pinnwand/default.nix b/pkgs/servers/pinnwand/default.nix index a0bfe6559a3e5..c7549e1913a14 100644 --- a/pkgs/servers/pinnwand/default.nix +++ b/pkgs/servers/pinnwand/default.nix @@ -58,7 +58,7 @@ with python3.pkgs; buildPythonApplication rec { meta = with lib; { changelog = "https://github.com/supakeen/pinnwand/releases/tag/v${version}"; description = "Python pastebin that tries to keep it simple"; - homepage = "https://supakeen.com/project/pinnwand/"; + homepage = "https://github.com/supakeen/pinnwand"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; mainProgram = "pinnwand"; diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 0a3d243d0a200..dbcd3aa9682fb 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.40.2.8395-c67dce28e"; + version = "1.40.3.8555-fef15d30c"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "sha256-ZJqbE9pgflqFVjiDqCED6K5KBk6KHSbkIQllF06jJVQ="; + sha256 = "0v415di48dg5mvkvb374lbx089iavrbqiaada1wdhaz87gb54lww"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "sha256-gYRhQIf6RaXgFTaigFW1yJ7ndxRmOP6oJSNnr8o0EBM="; + sha256 = "0m2b9xalrvnwiblwygkjrypr8kpbcxh8mw30ka1sf4cxmny4g5lq"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/readarr/default.nix b/pkgs/servers/readarr/default.nix index 21e55f6e14679..7040e29470560 100644 --- a/pkgs/servers/readarr/default.nix +++ b/pkgs/servers/readarr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libmediainfo, sqlite, curl, makeWrapper, icu, dotnet-runtime, openssl, nixosTests }: +{ lib, stdenv, fetchurl, libmediainfo, sqlite, curl, makeWrapper, icu, dotnet-runtime, openssl, nixosTests, zlib }: let os = if stdenv.isDarwin then "osx" else "linux"; @@ -8,13 +8,13 @@ let x86_64-darwin = "x64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-JKGLMu7rIhMAJM2bThTQiHDgc449gWQwmku/yQEAXL4="; - arm64-linux_hash = "sha256-1gzjriw4osMp8w2Auwu+PPCz0qi7hwTY+1tlcb2GxeI="; - x64-osx_hash = "sha256-eYUCmtG2yz/IoGUQJPa5z3UGJyXafsNG/CFIBBoz0hQ="; + x64-linux_hash = "sha256-GncaJNZEbApPl6Tt9k0NblRPdYnOGiR1V6VTJB8+LIU="; + arm64-linux_hash = "sha256-PvZHTjBmcpfu7fg5TLgcGoLofnAr6QM/2uNbGOpsx+U="; + x64-osx_hash = "sha256-h6JPb9esNlR+zqa8P0U2+zeLyW2JWw+AE/5PBHBGIQA="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "readarr"; - version = "0.3.27.2538"; + version = "0.3.28.2554"; src = fetchurl { url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz"; @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { cp -r * $out/share/${pname}-${version}/. makeWrapper "${dotnet-runtime}/bin/dotnet" $out/bin/Readarr \ --add-flags "$out/share/${pname}-${version}/Readarr.dll" \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ curl sqlite libmediainfo icu openssl ]} + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ curl sqlite libmediainfo icu openssl zlib ]} runHook postInstall ''; diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index 0d23d6e4a701e..a6b2d512f641e 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -7,12 +7,12 @@ , stdenv }: let - version = "24.1.6"; + version = "24.1.7"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-zLqeokN84LrthNOg2wRmCy324sk4cMDPaTcdDbdhIoY="; + sha256 = "sha256-+JCFbLWDhqHYYpeNPpcGXL8tNsi4jpGbAd8DGSIsc7A="; }; server = callPackage ./server.nix { inherit src version; }; in diff --git a/pkgs/servers/search/meilisearch/Cargo.lock b/pkgs/servers/search/meilisearch/Cargo.lock index 2ec78384a3b4a..b7419052a84bf 100644 --- a/pkgs/servers/search/meilisearch/Cargo.lock +++ b/pkgs/servers/search/meilisearch/Cargo.lock @@ -47,7 +47,7 @@ dependencies = [ "actix-utils", "ahash", "base64 0.21.7", - "bitflags 2.4.1", + "bitflags 2.5.0", "brotli", "bytes", "bytestring", @@ -80,7 +80,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -149,10 +149,10 @@ dependencies = [ "impl-more", "pin-project-lite", "tokio", - "tokio-rustls 0.23.4", + "tokio-rustls", "tokio-util", "tracing", - "webpki-roots 0.22.6", + "webpki-roots 0.25.3", ] [[package]] @@ -246,9 +246,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", @@ -306,9 +306,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.6.7" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd2405b3ac1faab2990b74d728624cd9fd115651fcecc7c2d8daf01376275ba" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", @@ -320,9 +320,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.1" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" @@ -354,9 +354,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" dependencies = [ "backtrace", ] @@ -386,7 +386,7 @@ dependencies = [ "byteorder", "heed", "log", - "memmap2 0.9.3", + "memmap2 0.9.4", "ordered-float", "rand", "rayon", @@ -424,7 +424,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -435,7 +435,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -455,9 +455,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "backtrace" @@ -494,7 +494,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "benchmarks" -version = "1.7.6" +version = "1.8.2" dependencies = [ "anyhow", "bytes", @@ -541,7 +541,7 @@ version = "0.68.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "cexpr", "clang-sys", "lazy_static", @@ -552,7 +552,18 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.48", + "syn 2.0.58", +] + +[[package]] +name = "bindgen_cuda" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f8489af5b7d17a81bffe37e0f4d6e1e4de87c87329d05447f22c35d95a1227d" +dependencies = [ + "glob", + "num_cpus", + "rayon", ] [[package]] @@ -578,9 +589,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" dependencies = [ "serde", ] @@ -628,7 +639,7 @@ dependencies = [ [[package]] name = "build-info" -version = "1.7.6" +version = "1.8.2" dependencies = [ "anyhow", "time", @@ -637,9 +648,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "byte-unit" @@ -659,22 +670,22 @@ checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.4.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" +checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -730,15 +741,16 @@ dependencies = [ [[package]] name = "candle-core" -version = "0.3.3" -source = "git+https://github.com/huggingface/candle.git#5270224f407502b82fe90bc2622894ce3871b002" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f1b20174c1707e20f4cb364a355b449803c03e9b0c9193324623cf9787a4e00" dependencies = [ "byteorder", "candle-kernels", "cudarc", "gemm", - "half 2.3.1", - "memmap2 0.9.3", + "half 2.4.0", + "memmap2 0.9.4", "num-traits", "num_cpus", "rand", @@ -752,21 +764,21 @@ dependencies = [ [[package]] name = "candle-kernels" -version = "0.3.1" -source = "git+https://github.com/huggingface/candle.git#f4fcf6090045ac44122fd5f0a7e46db6e3e16528" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5845911a44164ebb73b56a0e23793ba1b583bad102af7400fe4768babc5815b2" dependencies = [ - "anyhow", - "glob", - "rayon", + "bindgen_cuda", ] [[package]] name = "candle-nn" -version = "0.3.3" -source = "git+https://github.com/huggingface/candle.git#5270224f407502b82fe90bc2622894ce3871b002" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66a27533c8edfc915a6459f9850641ef523a829fa1a181c670766c1f752d873a" dependencies = [ "candle-core", - "half 2.3.1", + "half 2.4.0", "num-traits", "rayon", "safetensors", @@ -776,8 +788,9 @@ dependencies = [ [[package]] name = "candle-transformers" -version = "0.3.3" -source = "git+https://github.com/huggingface/candle.git#5270224f407502b82fe90bc2622894ce3871b002" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5847699f0643da05e57fc473672566e93dc36d82c1b7eeb970c6154d3434fe1" dependencies = [ "byteorder", "candle-core", @@ -789,7 +802,6 @@ dependencies = [ "serde_json", "serde_plain", "tracing", - "wav", ] [[package]] @@ -833,9 +845,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" dependencies = [ "jobserver", "libc", @@ -877,9 +889,9 @@ dependencies = [ [[package]] name = "charabia" -version = "0.8.7" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a9071b1586dd067b5fdfd2069fab932c047ca5bbce4bd2bdee8af0f4b155053" +checksum = "933f20f2269b24d32fd5503e7b3c268af902190daf8d9d2b73ed2e75d77c00b4" dependencies = [ "aho-corasick", "cow-utils", @@ -889,9 +901,7 @@ dependencies = [ "fst", "irg-kvariants", "jieba-rs", - "lindera-core", - "lindera-dictionary", - "lindera-tokenizer", + "lindera", "litemap", "once_cell", "pinyin", @@ -982,7 +992,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -1089,18 +1099,18 @@ checksum = "79bb3adfaf5f75d24b01aee375f7555907840fa2800e5ec8fa3b9e2031830173" [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] @@ -1246,7 +1256,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9395df0cab995685664e79cc35ad6302bf08fb9c5d82301875a183affe1278b1" dependencies = [ - "half 2.3.1", + "half 2.4.0", ] [[package]] @@ -1294,7 +1304,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -1316,7 +1326,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -1330,9 +1340,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.9" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", "serde", @@ -1346,7 +1356,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -1450,7 +1460,7 @@ dependencies = [ "convert_case 0.6.0", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -1529,7 +1539,7 @@ dependencies = [ [[package]] name = "dump" -version = "1.7.6" +version = "1.8.2" dependencies = [ "anyhow", "big_s", @@ -1564,9 +1574,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" dependencies = [ "serde", ] @@ -1643,9 +1653,9 @@ checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", ] @@ -1668,7 +1678,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -1688,20 +1698,30 @@ checksum = "03cdc46ec28bd728e67540c528013c6a10eb69a02eb31078a1bda695438cbfb8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", +] + +[[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", + "regex", ] [[package]] name = "env_logger" -version = "0.10.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" dependencies = [ + "anstream", + "anstyle", + "env_filter", "humantime", - "is-terminal", "log", - "regex", - "termcolor", ] [[package]] @@ -1761,13 +1781,13 @@ dependencies = [ "darling 0.20.3", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", "uuid", ] [[package]] name = "file-store" -version = "1.7.6" +version = "1.8.2" dependencies = [ "faux", "tempfile", @@ -1790,7 +1810,7 @@ dependencies = [ [[package]] name = "filter-parser" -version = "1.7.6" +version = "1.8.2" dependencies = [ "insta", "nom", @@ -1810,7 +1830,7 @@ dependencies = [ [[package]] name = "flatten-serde-json" -version = "1.7.6" +version = "1.8.2" dependencies = [ "criterion", "serde_json", @@ -1893,7 +1913,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -1928,7 +1948,7 @@ dependencies = [ [[package]] name = "fuzzers" -version = "1.7.6" +version = "1.8.2" dependencies = [ "arbitrary", "clap", @@ -1954,7 +1974,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27d12c0aed7f1e24276a241aadc4cb8ea9f83000f34bc062b7cc2d51e3b0fabd" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "debugid", "fxhash", "serde", @@ -1963,9 +1983,9 @@ dependencies = [ [[package]] name = "gemm" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97d506c68f4fb12325b52a638e7d54cc87e3593a4ded0de60218b6dfd65f645" +checksum = "6ab24cc62135b40090e31a76a9b2766a501979f3070fa27f689c27ec04377d32" dependencies = [ "dyn-stack", "gemm-c32", @@ -1983,9 +2003,9 @@ dependencies = [ [[package]] name = "gemm-c32" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd16f26e8f34661edc906d8c9522b59ec1655c865a98a58950d0246eeaca9da" +checksum = "b9c030d0b983d1e34a546b86e08f600c11696fde16199f971cd46c12e67512c0" dependencies = [ "dyn-stack", "gemm-common", @@ -1998,9 +2018,9 @@ dependencies = [ [[package]] name = "gemm-c64" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8e34381bc060b47fbd25522a281799ef763cd27f43bbd1783d935774659242a" +checksum = "fbb5f2e79fefb9693d18e1066a557b4546cd334b226beadc68b11a8f9431852a" dependencies = [ "dyn-stack", "gemm-common", @@ -2013,13 +2033,13 @@ dependencies = [ [[package]] name = "gemm-common" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22518a76339b09276f77c3166c44262e55f633712fe8a44fd0573505887feeab" +checksum = "a2e7ea062c987abcd8db95db917b4ffb4ecdfd0668471d8dc54734fdff2354e8" dependencies = [ "bytemuck", "dyn-stack", - "half 2.3.1", + "half 2.4.0", "num-complex", "num-traits", "once_cell", @@ -2033,14 +2053,14 @@ dependencies = [ [[package]] name = "gemm-f16" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70409bbf3ef83b38cbe4a58cd4b797c1c27902505bdd926a588ea61b6c550a84" +checksum = "7ca4c06b9b11952071d317604acb332e924e817bd891bec8dfb494168c7cedd4" dependencies = [ "dyn-stack", "gemm-common", "gemm-f32", - "half 2.3.1", + "half 2.4.0", "num-complex", "num-traits", "paste", @@ -2051,9 +2071,9 @@ dependencies = [ [[package]] name = "gemm-f32" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3068edca27f100964157211782eba19e961aa4d0d2bdac3e1775a51aa7680" +checksum = "e9a69f51aaefbd9cf12d18faf273d3e982d9d711f60775645ed5c8047b4ae113" dependencies = [ "dyn-stack", "gemm-common", @@ -2066,9 +2086,9 @@ dependencies = [ [[package]] name = "gemm-f64" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd41e8f5a60dce8d8acd852a3f4b22f8e18be957e1937731be692c037652510" +checksum = "aa397a48544fadf0b81ec8741e5c0fba0043008113f71f2034def1935645d2b0" dependencies = [ "dyn-stack", "gemm-common", @@ -2097,13 +2117,15 @@ checksum = "36d244a08113319b5ebcabad2b8b7925732d15eec46d7e7ac3c11734f3b7a6ad" [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi", + "wasm-bindgen", ] [[package]] @@ -2130,7 +2152,7 @@ version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b3ba52851e73b46a4c3df1d89343741112003f0f6f13beb0dfac9e457c3fdcd" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "libc", "libgit2-sys", "log", @@ -2182,9 +2204,9 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "half" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" dependencies = [ "bytemuck", "cfg-if", @@ -2222,7 +2244,7 @@ dependencies = [ "atomic-polyfill", "hash32", "rustc_version", - "spin 0.9.8", + "spin", "stable_deref_trait", ] @@ -2238,7 +2260,7 @@ version = "0.20.0-alpha.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9648a50991c86df7d00c56c268c27754fcf4c80be2ba57fc4a00dc928c6fe934" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "bytemuck", "byteorder", "heed-traits", @@ -2272,9 +2294,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -2393,7 +2415,7 @@ dependencies = [ "hyper", "rustls 0.21.10", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", ] [[package]] @@ -2420,7 +2442,7 @@ checksum = "206ca75c9c03ba3d4ace2460e57b189f39f43de612c2f85836e65c929701bb2d" [[package]] name = "index-scheduler" -version = "1.7.6" +version = "1.8.2" dependencies = [ "anyhow", "big_s", @@ -2453,9 +2475,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown", @@ -2567,10 +2589,19 @@ dependencies = [ ] [[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] name = "itoa" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jieba-rs" @@ -2589,25 +2620,25 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[package]] name = "json-depth-checker" -version = "1.7.6" +version = "1.8.2" dependencies = [ "criterion", "serde_json", @@ -2615,19 +2646,29 @@ dependencies = [ [[package]] name = "jsonwebtoken" -version = "8.3.0" +version = "9.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" +checksum = "5c7ea04a7c5c055c175f189b6dc6ba036fd62306b58c66c9f6389036c503a3f4" dependencies = [ "base64 0.21.7", + "js-sys", "pem", - "ring 0.16.20", + "ring", "serde", "serde_json", "simple_asn1", ] [[package]] +name = "kanaria" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0f9d9652540055ac4fded998a73aca97d965899077ab1212587437da44196ff" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] name = "kstring" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2694,9 +2735,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libmimalloc-sys" @@ -2732,10 +2773,67 @@ dependencies = [ ] [[package]] +name = "lindera" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1bbf252ea3490053dc397539ece0b510924f2f72605fa28d3e858d86f43ec88" +dependencies = [ + "lindera-analyzer", + "lindera-core", + "lindera-dictionary", + "lindera-filter", + "lindera-tokenizer", +] + +[[package]] +name = "lindera-analyzer" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87febfec0e2859ce2154fb90dd6f66b774ddb0b6e264b44f8e3d1303c9dcedd7" +dependencies = [ + "anyhow", + "bincode", + "byteorder", + "encoding", + "kanaria", + "lindera-cc-cedict-builder", + "lindera-core", + "lindera-dictionary", + "lindera-filter", + "lindera-ipadic-builder", + "lindera-ko-dic-builder", + "lindera-tokenizer", + "lindera-unidic-builder", + "once_cell", + "regex", + "serde", + "serde_json", + "thiserror", + "unicode-blocks", + "unicode-normalization", + "unicode-segmentation", + "yada", +] + +[[package]] +name = "lindera-cc-cedict" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcb91bb8a93ab0f95dbc3c43b5105354bb059134ef731154f75a64b5d919e71d" +dependencies = [ + "bincode", + "byteorder", + "lindera-cc-cedict-builder", + "lindera-core", + "lindera-decompress", + "once_cell", +] + +[[package]] name = "lindera-cc-cedict-builder" -version = "0.27.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a90d23f7cef31c6ab7ac0d4f3b23940754207f7b5a80b080c39193caffe99ac2" +checksum = "f6022a8309a287dbef425fd09a61585351670c83001d74f6c089979e2330b683" dependencies = [ "anyhow", "bincode", @@ -2744,6 +2842,7 @@ dependencies = [ "encoding", "env_logger", "glob", + "lindera-compress", "lindera-core", "lindera-decompress", "log", @@ -2752,9 +2851,9 @@ dependencies = [ [[package]] name = "lindera-compress" -version = "0.27.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1927b7d2bd4ffc19e07691bf8609722663c341f80260a1c636cee8f1ec420dce" +checksum = "32363cbcf433f915e7d77c2a0c410db2d6b23442e80715cf2cf6b9864078a500" dependencies = [ "anyhow", "flate2", @@ -2763,9 +2862,9 @@ dependencies = [ [[package]] name = "lindera-core" -version = "0.27.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3299caa2b81c9a076535a4651a83bf7d624c15f2349f243187fffc64b5a78251" +checksum = "d9a0e858753a02b1a3524fae4fbb11ca4b3a947128fd7854b797386562678be8" dependencies = [ "anyhow", "bincode", @@ -2780,9 +2879,9 @@ dependencies = [ [[package]] name = "lindera-decompress" -version = "0.27.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b82b8d2323a67dc8ff0c40751d199b7ba94cd5e3c13a5b31622d318acc79e5b" +checksum = "0e406345f6f8b665b9a129c67079c18ca9d97e9d171d102b4106a64a592c285e" dependencies = [ "anyhow", "flate2", @@ -2791,29 +2890,73 @@ dependencies = [ [[package]] name = "lindera-dictionary" -version = "0.27.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cddf783b459d54b130d956889bec052c25fcb478a304e03fa9b2289387572bc5" +checksum = "3e2a3ec0e5fd6768a27c6ec1040e8470d3a5926418f7afe065859e98aabb3bfe" dependencies = [ "anyhow", "bincode", "byteorder", + "lindera-cc-cedict", "lindera-cc-cedict-builder", "lindera-core", + "lindera-ipadic", "lindera-ipadic-builder", + "lindera-ipadic-neologd", "lindera-ipadic-neologd-builder", "lindera-ko-dic", "lindera-ko-dic-builder", "lindera-unidic", "lindera-unidic-builder", "serde", + "strum", + "strum_macros", +] + +[[package]] +name = "lindera-filter" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1badaf51bad051185ea4917ba91bbbf2d6f8167e155647e21e0eaaef0982a95d" +dependencies = [ + "anyhow", + "csv", + "kanaria", + "lindera-cc-cedict-builder", + "lindera-core", + "lindera-dictionary", + "lindera-ipadic-builder", + "lindera-ko-dic-builder", + "lindera-unidic-builder", + "once_cell", + "regex", + "serde", + "serde_json", + "unicode-blocks", + "unicode-normalization", + "unicode-segmentation", + "yada", +] + +[[package]] +name = "lindera-ipadic" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "129ec16366354998f9791467ad38731539197747f649e573ead845358271ce25" +dependencies = [ + "bincode", + "byteorder", + "lindera-core", + "lindera-decompress", + "lindera-ipadic-builder", + "once_cell", ] [[package]] name = "lindera-ipadic-builder" -version = "0.27.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27c708f08f14b0806f6c4cce5324b4bcba27209463026b78c31f399f8be9d30d" +checksum = "7f0979a56bc57e9c9be2996dff232c47aa146a2e7baebf5dd567e388eba3dd90" dependencies = [ "anyhow", "bincode", @@ -2823,6 +2966,7 @@ dependencies = [ "encoding_rs_io", "env_logger", "glob", + "lindera-compress", "lindera-core", "lindera-decompress", "log", @@ -2831,10 +2975,24 @@ dependencies = [ ] [[package]] +name = "lindera-ipadic-neologd" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20076660c4e79ef0316735b44e18ec7644e54786acdee8946c972d5f97086d0f" +dependencies = [ + "bincode", + "byteorder", + "lindera-core", + "lindera-decompress", + "lindera-ipadic-neologd-builder", + "once_cell", +] + +[[package]] name = "lindera-ipadic-neologd-builder" -version = "0.27.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5e67eb91652203d202f7d27ead220d1d8c9099552709b8429eae9c70f2312fb" +checksum = "eccd18ed5f65d1d64ac0cbfa1d6827bfbbaf6530520ae6847e6a91ee38f47e20" dependencies = [ "anyhow", "bincode", @@ -2844,6 +3002,7 @@ dependencies = [ "encoding_rs_io", "env_logger", "glob", + "lindera-compress", "lindera-core", "lindera-decompress", "log", @@ -2853,9 +3012,9 @@ dependencies = [ [[package]] name = "lindera-ko-dic" -version = "0.27.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d45da8d9a5888f4d4e78bb29fc82ff9ae519962efb0d2d92343b6cf8e373952f" +checksum = "59073171566c3e498ca048e84c2d0a7e117a42f36c8eb7d7163e65ac38bd6d48" dependencies = [ "bincode", "byteorder", @@ -2866,13 +3025,14 @@ dependencies = [ "lindera-ko-dic-builder", "once_cell", "tar", + "ureq", ] [[package]] name = "lindera-ko-dic-builder" -version = "0.27.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c0933295dc945178bbc08f34111dc3ef22bfee38820f78453c8f8d4f3463d1" +checksum = "ae176afa8535ca2a5ee9471873f85d531db0a6c32a3c42b41084506aac22b577" dependencies = [ "anyhow", "bincode", @@ -2890,12 +3050,11 @@ dependencies = [ [[package]] name = "lindera-tokenizer" -version = "0.27.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348ce9bb3f2e5edc577420b98cca05b2177f3af50ef5ae278a1d8a1351d56197" +checksum = "457285bdde84571aa510c9e05371904305a55e8a541fa1473d4393062f06932d" dependencies = [ "bincode", - "byteorder", "lindera-core", "lindera-dictionary", "once_cell", @@ -2905,26 +3064,27 @@ dependencies = [ [[package]] name = "lindera-unidic" -version = "0.27.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74022a57c395ed7e213a9cd5833207e3c583145078ee9a164aeaec68b30c9d8e" +checksum = "5839980be552dfa639b70964c61914a9ad014148663679b0e148aa72e5e30f23" dependencies = [ "bincode", "byteorder", "encoding", + "flate2", "lindera-core", "lindera-decompress", "lindera-unidic-builder", "once_cell", + "tar", "ureq", - "zip", ] [[package]] name = "lindera-unidic-builder" -version = "0.27.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34e5564ee81af82603cd6a03c3abe6e17cc0ae598bfa5078809f06e59e96e08" +checksum = "dcaab8f061d5b944b1e424f49c7efbf8f276e8a72e4f4ff956d01e46d481f008" dependencies = [ "anyhow", "bincode", @@ -2997,7 +3157,7 @@ checksum = "fc2fb41a9bb4257a3803154bdf7e2df7d45197d1941c9b1a90ad815231630721" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -3063,9 +3223,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "lz4_flex" @@ -3098,7 +3258,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -3115,7 +3275,7 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "meili-snap" -version = "1.7.6" +version = "1.8.2" dependencies = [ "insta", "md5", @@ -3124,7 +3284,7 @@ dependencies = [ [[package]] name = "meilisearch" -version = "1.7.6" +version = "1.8.2" dependencies = [ "actix-cors", "actix-http", @@ -3182,7 +3342,7 @@ dependencies = [ "rayon", "regex", "reqwest", - "rustls 0.20.9", + "rustls 0.21.10", "rustls-pemfile", "segment", "serde", @@ -3217,7 +3377,7 @@ dependencies = [ [[package]] name = "meilisearch-auth" -version = "1.7.6" +version = "1.8.2" dependencies = [ "base64 0.21.7", "enum-iterator", @@ -3236,7 +3396,7 @@ dependencies = [ [[package]] name = "meilisearch-types" -version = "1.7.6" +version = "1.8.2" dependencies = [ "actix-web", "anyhow", @@ -3266,7 +3426,7 @@ dependencies = [ [[package]] name = "meilitool" -version = "1.7.6" +version = "1.8.2" dependencies = [ "anyhow", "clap", @@ -3295,9 +3455,9 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45fd3a57831bf88bc63f8cebc0cf956116276e97fef3966103e96416209f7c92" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" dependencies = [ "libc", "stable_deref_trait", @@ -3305,7 +3465,7 @@ dependencies = [ [[package]] name = "milli" -version = "1.7.6" +version = "1.8.2" dependencies = [ "arroy", "big_s", @@ -3326,7 +3486,6 @@ dependencies = [ "filter-parser", "flatten-serde-json", "fst", - "futures", "fxhash", "geoutils", "grenad", @@ -3350,7 +3509,6 @@ dependencies = [ "rand", "rand_pcg", "rayon", - "reqwest", "roaring", "rstar", "serde", @@ -3364,8 +3522,9 @@ dependencies = [ "tiktoken-rs", "time", "tokenizers", - "tokio", "tracing", + "ureq", + "url", "uuid", ] @@ -3402,9 +3561,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] @@ -3439,7 +3598,7 @@ checksum = "371717c0a5543d6a800cac822eac735aa7d2d2fbb41002e9856a4089532dbdce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -3501,9 +3660,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" dependencies = [ "bytemuck", "num-traits", @@ -3527,9 +3686,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", "libm", @@ -3731,11 +3890,12 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "pem" -version = "1.1.1" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" +checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" dependencies = [ - "base64 0.13.1", + "base64 0.21.7", + "serde", ] [[package]] @@ -3746,7 +3906,7 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "permissive-json-pointer" -version = "1.7.6" +version = "1.8.2" dependencies = [ "big_s", "serde_json", @@ -3782,7 +3942,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -3836,7 +3996,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -3865,7 +4025,7 @@ checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -3888,9 +4048,9 @@ checksum = "16f2611cd06a1ac239a0cea4521de9eb068a6ca110324ee00631aa68daa74fc0" [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "platform-dirs" @@ -3973,9 +4133,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -4035,9 +4195,9 @@ dependencies = [ [[package]] name = "pulp" -version = "0.18.4" +version = "0.18.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7057c1435edb390ebfc51743abad043377f1f698ce8e649a9b52a4b378be5e4d" +checksum = "03457ac216146f43f921500bac4e892d5cd32b0479b929cbfc90f95cd6c599c2" dependencies = [ "bytemuck", "libm", @@ -4115,9 +4275,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.8.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -4181,35 +4341,29 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.8.2", + "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" - -[[package]] -name = "regex-syntax" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" @@ -4244,7 +4398,7 @@ dependencies = [ "serde_urlencoded", "system-configuration", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tokio-util", "tower-service", "url", @@ -4263,38 +4417,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c31b5c4033f8fdde8700e4657be2c497e7288f01515be52168c631e2e4d4086" [[package]] -name = "riff" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9b1a3d5f46d53f4a3478e2be4a5a5ce5108ea58b100dcd139830eae7f79a3a1" - -[[package]] name = "ring" -version = "0.16.20" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - -[[package]] -name = "ring" -version = "0.17.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", "getrandom", "libc", - "spin 0.9.8", - "untrusted 0.9.0", - "windows-sys 0.48.0", + "spin", + "untrusted", + "windows-sys 0.52.0", ] [[package]] @@ -4362,7 +4496,7 @@ version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys 0.4.12", @@ -4371,26 +4505,28 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.9" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", - "ring 0.16.20", + "ring", + "rustls-webpki 0.101.7", "sct", - "webpki", ] [[package]] name = "rustls" -version = "0.21.10" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" dependencies = [ "log", - "ring 0.17.7", - "rustls-webpki", - "sct", + "ring", + "rustls-pki-types", + "rustls-webpki 0.102.2", + "subtle", + "zeroize", ] [[package]] @@ -4403,13 +4539,30 @@ dependencies = [ ] [[package]] +name = "rustls-pki-types" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8" + +[[package]] name = "rustls-webpki" version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.7", - "untrusted 0.9.0", + "ring", + "untrusted", +] + +[[package]] +name = "rustls-webpki" +version = "0.102.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", ] [[package]] @@ -4420,15 +4573,15 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "safetensors" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1659ef1c27917eb58c2d53664b5506d0b68c9cb9b460d3e0901011cf71269a8e" +checksum = "8d980e6bfb34436fb0a81e42bc41af43f11805bbbca443e7f68e9faaabe669ed" dependencies = [ "serde", "serde_json", @@ -4455,8 +4608,8 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.7", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] @@ -4490,9 +4643,9 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.195" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] @@ -4508,20 +4661,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.195" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] name = "serde_json" -version = "1.0.111" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ "indexmap", "itoa", @@ -4572,9 +4725,9 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", @@ -4721,12 +4874,6 @@ dependencies = [ [[package]] name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" @@ -4776,6 +4923,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] +name = "strum" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.58", +] + +[[package]] name = "subtle" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4794,9 +4963,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" dependencies = [ "proc-macro2", "quote", @@ -4814,14 +4983,13 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", - "unicode-xid", + "syn 2.0.58", ] [[package]] @@ -4830,7 +4998,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec7dddc5f0fee506baf8b9fdb989e242f17e4b11c61dfbb0635b705217199eea" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "byteorder", "enum-as-inner", "libc", @@ -4917,22 +5085,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -5020,14 +5188,14 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokenizers" -version = "0.14.1" -source = "git+https://github.com/huggingface/tokenizers.git?tag=v0.14.1#6357206cdcce4d78ffb1e0372feb456caea09375" +version = "0.15.2" +source = "git+https://github.com/huggingface/tokenizers.git?tag=v0.15.2#701a73b869602b5639589d197e805349cdba3223" dependencies = [ "aho-corasick", "derive_builder 0.12.0", "esaxx-rs", "getrandom", - "itertools 0.11.0", + "itertools 0.12.1", "lazy_static", "log", "macro_rules_attribute", @@ -5038,7 +5206,7 @@ dependencies = [ "rayon", "rayon-cond", "regex", - "regex-syntax 0.7.4", + "regex-syntax", "serde", "serde_json", "spm_precompiled", @@ -5075,18 +5243,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", -] - -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls 0.20.9", - "tokio", - "webpki", + "syn 2.0.58", ] [[package]] @@ -5197,7 +5354,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -5282,9 +5439,9 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ucd-trie" @@ -5317,16 +5474,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] +name = "unicode-blocks" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b12e05d9e06373163a9bb6bb8c263c261b396643a99445fe6b9811fd376581b" + +[[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] @@ -5342,9 +5505,9 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" @@ -5353,12 +5516,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] name = "unicode_categories" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5366,33 +5523,28 @@ checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" [[package]] name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "untrusted" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.9.1" +version = "2.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cdd25c339e200129fe4de81451814e5228c9b771d57378817d6117cc2b3f97" +checksum = "11f214ce18d8b2cbe84ed3aa6486ed3f5b285cf8d8fbdbce9f3f767a724adc35" dependencies = [ "base64 0.21.7", "flate2", "log", "once_cell", - "rustls 0.21.10", - "rustls-webpki", + "rustls 0.22.2", + "rustls-pki-types", + "rustls-webpki 0.102.2", "serde", "serde_json", "socks", "url", - "webpki-roots 0.25.3", + "webpki-roots 0.26.1", ] [[package]] @@ -5496,9 +5648,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -5532,9 +5684,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5542,16 +5694,16 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", "wasm-bindgen-shared", ] @@ -5569,9 +5721,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5579,22 +5731,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-streams" @@ -5610,15 +5762,6 @@ dependencies = [ ] [[package]] -name = "wav" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a65e199c799848b4f997072aa4d673c034f80f40191f97fe2f0a23f410be1609" -dependencies = [ - "riff", -] - -[[package]] name = "web-sys" version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5629,31 +5772,21 @@ dependencies = [ ] [[package]] -name = "webpki" -version = "0.22.4" +name = "webpki-roots" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" -dependencies = [ - "ring 0.17.7", - "untrusted 0.9.0", -] +checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" [[package]] name = "webpki-roots" -version = "0.22.6" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" dependencies = [ - "webpki", + "rustls-pki-types", ] [[package]] -name = "webpki-roots" -version = "0.25.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" - -[[package]] name = "whatlang" version = "0.16.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5681,9 +5814,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -5941,7 +6074,7 @@ dependencies = [ [[package]] name = "xtask" -version = "1.7.6" +version = "1.8.2" dependencies = [ "anyhow", "build-info", @@ -5964,9 +6097,9 @@ dependencies = [ [[package]] name = "yada" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d12cb7a57bbf2ab670ed9545bae3648048547f9039279a89ce000208e585c1" +checksum = "aed111bd9e48a802518765906cbdadf0b45afb72b9c81ab049a3b86252adffdd" [[package]] name = "yaml-rust" @@ -5989,9 +6122,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e38c508604d6bbbd292dadb3c02559aa7fff6b654a078a36217cad871636e4" +checksum = "65e71b2e4f287f467794c671e2b8f8a5f3716b3c829079a1c44740148eff07e4" dependencies = [ "serde", "stable_deref_trait", @@ -6001,13 +6134,13 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5e19fb6ed40002bab5403ffa37e53e0e56f914a4450c8765f533018db1db35f" +checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", "synstructure", ] @@ -6028,7 +6161,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", ] [[package]] @@ -6048,11 +6181,17 @@ checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.58", "synstructure", ] [[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" + +[[package]] name = "zerovec" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6102,11 +6241,10 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" +version = "2.0.10+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" dependencies = [ "cc", - "libc", "pkg-config", ] diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index 1846775194f06..55810cf589975 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -1,14 +1,16 @@ -{ stdenv -, lib -, rustPlatform -, fetchFromGitHub -, Security -, SystemConfiguration -, nixosTests -, nix-update-script +{ + stdenv, + lib, + rustPlatform, + fetchFromGitHub, + Security, + SystemConfiguration, + nixosTests, + nix-update-script, }: -let version = "1.7.6"; +let + version = "1.8.2"; in rustPlatform.buildRustPackage { pname = "meilisearch"; @@ -18,33 +20,28 @@ rustPlatform.buildRustPackage { owner = "meilisearch"; repo = "MeiliSearch"; rev = "refs/tags/v${version}"; - hash = "sha256-LsJM7zkoiu5LZb/rhnZaAS/wVNH8b6YZ+vNEE1wVIIk="; + hash = "sha256-x5hHgEhM3iljB7KoJcRoEEZm5bc/lZevT9x/bf2mEMI="; }; - cargoBuildFlags = [ - "--package=meilisearch" - ]; + cargoBuildFlags = [ "--package=meilisearch" ]; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "actix-web-static-files-3.0.5" = "sha256-2BN0RzLhdykvN3ceRLkaKwSZtel2DBqZ+uz4Qut+nII="; - "candle-core-0.3.3" = "sha256-umWvG+82B793PQtY9VeHjPTtTVmSPdts25buw4v4TQc="; - "candle-kernels-0.3.1" = "sha256-KlkjTUcbnP+uZoA0fDZlEPT5qKC2ogMAuR8X14xRFgA="; "hf-hub-0.3.2" = "sha256-tsn76b+/HRvPnZ7cWd8SBcEdnMPtjUEIRJipOJUbz54="; - "tokenizers-0.14.1" = "sha256-cq7dQLttNkV5UUhXujxKKMuzhD7hz+zTTKxUKlvz1s0="; + "tokenizers-0.15.2" = "sha256-lWvCu2hDJFzK6IUBJ4yeL4eZkOA08LHEMfiKXVvkog8="; }; }; # Default features include mini dashboard which downloads something from the internet. buildNoDefaultFeatures = true; - nativeBuildInputs = [ - rustPlatform.bindgenHook - ]; + nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = lib.optionals stdenv.isDarwin [ - Security SystemConfiguration + Security + SystemConfiguration ]; passthru = { @@ -57,13 +54,18 @@ rustPlatform.buildRustPackage { # Tests will try to compile with mini-dashboard features which downloads something from the internet. doCheck = false; - meta = with lib; { + meta = { description = "Powerful, fast, and an easy to use search engine"; mainProgram = "meilisearch"; homepage = "https://docs.meilisearch.com/"; changelog = "https://github.com/meilisearch/meilisearch/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ happysalada ]; - platforms = [ "aarch64-linux" "aarch64-darwin" "x86_64-linux" "x86_64-darwin" ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ happysalada ]; + platforms = [ + "aarch64-linux" + "aarch64-darwin" + "x86_64-linux" + "x86_64-darwin" + ]; }; } diff --git a/pkgs/servers/search/quickwit/Cargo.lock b/pkgs/servers/search/quickwit/Cargo.lock index 5888255d9182f..db5e22e698f2f 100644 --- a/pkgs/servers/search/quickwit/Cargo.lock +++ b/pkgs/servers/search/quickwit/Cargo.lock @@ -5441,7 +5441,7 @@ dependencies = [ [[package]] name = "quickwit-actors" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -5461,7 +5461,7 @@ dependencies = [ [[package]] name = "quickwit-aws" -version = "0.8.1" +version = "0.8.2" dependencies = [ "async-trait", "aws-config", @@ -5483,7 +5483,7 @@ dependencies = [ [[package]] name = "quickwit-cli" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -5541,7 +5541,7 @@ dependencies = [ [[package]] name = "quickwit-cluster" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -5570,7 +5570,7 @@ dependencies = [ [[package]] name = "quickwit-codegen" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "futures", @@ -5587,7 +5587,7 @@ dependencies = [ [[package]] name = "quickwit-codegen-example" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -5614,7 +5614,7 @@ dependencies = [ [[package]] name = "quickwit-common" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-speed-limit", @@ -5652,7 +5652,7 @@ dependencies = [ [[package]] name = "quickwit-config" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "bytes", @@ -5686,7 +5686,7 @@ dependencies = [ [[package]] name = "quickwit-control-plane" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -5724,7 +5724,7 @@ dependencies = [ [[package]] name = "quickwit-datetime" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "itertools 0.12.1", @@ -5738,7 +5738,7 @@ dependencies = [ [[package]] name = "quickwit-directories" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -5759,7 +5759,7 @@ dependencies = [ [[package]] name = "quickwit-doc-mapper" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "base64 0.21.7", @@ -5794,7 +5794,7 @@ dependencies = [ [[package]] name = "quickwit-index-management" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -5826,7 +5826,7 @@ dependencies = [ [[package]] name = "quickwit-indexing" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "arc-swap", @@ -5891,7 +5891,7 @@ dependencies = [ [[package]] name = "quickwit-ingest" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -5931,7 +5931,7 @@ dependencies = [ [[package]] name = "quickwit-integration-tests" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "bytes", @@ -5964,7 +5964,7 @@ dependencies = [ [[package]] name = "quickwit-jaeger" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -5998,7 +5998,7 @@ dependencies = [ [[package]] name = "quickwit-janitor" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -6035,7 +6035,7 @@ dependencies = [ [[package]] name = "quickwit-lambda" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "aws_lambda_events", @@ -6075,7 +6075,7 @@ dependencies = [ [[package]] name = "quickwit-macros" -version = "0.8.1" +version = "0.8.2" dependencies = [ "proc-macro2", "quote", @@ -6084,7 +6084,7 @@ dependencies = [ [[package]] name = "quickwit-metastore" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -6127,7 +6127,7 @@ dependencies = [ [[package]] name = "quickwit-opentelemetry" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -6151,7 +6151,7 @@ dependencies = [ [[package]] name = "quickwit-proto" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -6188,7 +6188,7 @@ dependencies = [ [[package]] name = "quickwit-query" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "base64 0.21.7", @@ -6214,7 +6214,7 @@ dependencies = [ [[package]] name = "quickwit-rest-client" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "bytes", @@ -6238,7 +6238,7 @@ dependencies = [ [[package]] name = "quickwit-search" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "assert-json-diff 2.0.2", @@ -6290,7 +6290,7 @@ dependencies = [ [[package]] name = "quickwit-serve" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "assert-json-diff 2.0.2", @@ -6359,7 +6359,7 @@ dependencies = [ [[package]] name = "quickwit-storage" -version = "0.8.1" +version = "0.8.2" dependencies = [ "anyhow", "async-trait", @@ -6407,7 +6407,7 @@ dependencies = [ [[package]] name = "quickwit-telemetry" -version = "0.8.1" +version = "0.8.2" dependencies = [ "async-trait", "encoding_rs", diff --git a/pkgs/servers/search/quickwit/default.nix b/pkgs/servers/search/quickwit/default.nix index 095bfc679aa47..ccc32cb90056e 100644 --- a/pkgs/servers/search/quickwit/default.nix +++ b/pkgs/servers/search/quickwit/default.nix @@ -7,22 +7,63 @@ , protobuf , rust-jemalloc-sys , Security +, nodejs +, yarn +, fetchYarnDeps +, fixup-yarn-lock }: let pname = "quickwit"; - version = "0.8.1"; -in -rustPlatform.buildRustPackage rec { - inherit pname version; + version = "0.8.2"; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${src}/quickwit/quickwit-ui/yarn.lock"; + hash = "sha256-HppK9ycUxCOIagvzCmE+VfcmfMQfPIC8WeWM6WbA6fQ="; + }; src = fetchFromGitHub { owner = "quickwit-oss"; repo = pname; rev = "v${version}"; - hash = "sha256-B5U9nzXh6kj3/UnQzM3//h4hn9ippWHbeDMcMTP9XfM="; + hash = "sha256-OrCO0mCFmhYBdpr4Gps56KJJ37uuJpV6ZJHWspOScyw="; }; + quickwit-ui = stdenv.mkDerivation { + name = "quickwit-ui"; + src = "${src}/quickwit/quickwit-ui"; + + nativeBuildInputs = [ + nodejs + yarn + fixup-yarn-lock + ]; + + configurePhase = '' + export HOME=$(mktemp -d) + ''; + + buildPhase = '' + yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} + fixup-yarn-lock yarn.lock + + yarn install --offline \ + --frozen-lockfile --no-progress \ + --ignore-engines --ignore-scripts + patchShebangs . + + yarn build + ''; + + installPhase = '' + mkdir $out + mv build/* $out + ''; + }; +in +rustPlatform.buildRustPackage rec { + inherit pname version src; + postPatch = '' substituteInPlace ./quickwit-ingest/build.rs \ --replace-fail '.with_protos' '.with_includes(&["."]).with_protos' @@ -34,6 +75,11 @@ rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/quickwit"; + preBuild = '' + mkdir -p quickwit-ui/build + cp -r ${quickwit-ui}/* quickwit-ui/build + ''; + buildInputs = [ rust-jemalloc-sys ] ++ lib.optionals stdenv.isDarwin [ Security ]; @@ -50,6 +96,9 @@ rustPlatform.buildRustPackage rec { }; }; + CARGO_PROFILE_RELEASE_LTO = "fat"; + CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1"; + # needed for internal protobuf c wrapper library PROTOC = "${protobuf}/bin/protoc"; PROTOC_INCLUDE = "${protobuf}/include"; diff --git a/pkgs/servers/search/sonic-server/default.nix b/pkgs/servers/search/sonic-server/default.nix index cbe8b431fa930..cb5521e9dfe8a 100644 --- a/pkgs/servers/search/sonic-server/default.nix +++ b/pkgs/servers/search/sonic-server/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "sonic-server"; - version = "1.4.8"; + version = "1.4.9"; src = fetchFromGitHub { owner = "valeriansaliou"; repo = "sonic"; rev = "refs/tags/v${version}"; - hash = "sha256-kNuLcImowjoptNQI12xHD6Tv+LLYdwlpauqYviKw6Xk="; + hash = "sha256-PTujR3ciLRvbpiqStNMx3W5fkUdW2dsGmCj/iFRTKJM="; }; - cargoHash = "sha256-9XSRb5RB82L72RzRWPJ45AJahkRnLwAL7lI2QFqbeko="; + cargoHash = "sha256-bH9u38gvH6QEySQ3XFXEHBiSqKKtB+kjcZRLjx4Z6XM="; # Found argument '--test-threads' which wasn't expected, or isn't valid in this context doCheck = false; diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix index 5b1f982216a34..412f8d4de2e91 100644 --- a/pkgs/servers/spicedb/default.nix +++ b/pkgs/servers/spicedb/default.nix @@ -17,6 +17,10 @@ buildGoModule rec { vendorHash = "sha256-pqHDSQQMvfas9yeyhs5cWokBPISQygz2aHf6W5Zc+co="; + ldflags = [ + "-X 'github.com/jzelinskie/cobrautil/v2.Version=${src.rev}'" + ]; + subPackages = [ "cmd/spicedb" ]; meta = with lib; { diff --git a/pkgs/servers/spicedb/zed.nix b/pkgs/servers/spicedb/zed.nix index 5b6e9d24e114d..efe77289040c7 100644 --- a/pkgs/servers/spicedb/zed.nix +++ b/pkgs/servers/spicedb/zed.nix @@ -16,6 +16,10 @@ buildGoModule rec { vendorHash = "sha256-Z6j4w4/anfK0ln2MvgnwZFoe8BA5jVHG3g9m2TynmmE="; + ldflags = [ + "-X 'github.com/jzelinskie/cobrautil/v2.Version=${src.rev}'" + ]; + meta = with lib; { description = "Command line for managing SpiceDB"; mainProgram = "zed"; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 70ac95a3ae179..cab00249d3b6b 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -58,10 +58,6 @@ let patches = [ ./patch/cmake-includedir.patch - - # Fix build with libxml 2.12 and Clang 16. - # https://github.com/MariaDB/server/pull/2983 - ./patch/0001-Fix-build-with-libxml2-2.12.patch ] # Fixes a build issue as documented on # https://jira.mariadb.org/browse/MDEV-26769?focusedCommentId=206073&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-206073 @@ -248,29 +244,31 @@ in # see https://mariadb.org/about/#maintenance-policy for EOLs mariadb_105 = self.callPackage generic { # Supported until 2025-06-24 - version = "10.5.23"; - hash = "sha256-P3wzsgjLeZ2wFKh09WcY6t/yLulXgfo2Cqa8aWEJrP4="; + # TODO should be removed + version = "10.5.25"; + hash = "sha256-lhnQ9R6GQ1dGayxjMBo0pT99/ZnxjE/UUvqyK/Obpk4="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_106 = self.callPackage generic { # Supported until 2026-07-06 - version = "10.6.16"; - hash = "sha256-Xvg4Q+eW3Nqa6keyRpDd9thI9D9D4R+dmgzCHHj7uc8="; + version = "10.6.18"; + hash = "sha256-aJihER9HEwcJ4ouix70aV+S7VxAfbhCeWX1R5tOFzxg="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_1011 = self.callPackage generic { # Supported until 2028-02-16 - version = "10.11.6"; - hash = "sha256-HAFjRj6Y1x9HgHQWEaQJge7ivETTkmAcpJu/lI0E3Wc="; + version = "10.11.8"; + hash = "sha256-XwTz4z2fHL7/BeecVNQdMCYwUAyZWu5ysGOOL5383w8="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_110 = self.callPackage generic { # Supported until 2024-06-07 - version = "11.0.4"; - hash = "sha256-J2ls3zEVnyJUEOtchmW4VkWhxZmBzlr2vP9sll/u3ms="; + # TODO should be removed + version = "11.0.6"; + hash = "sha256-AYnWKUbDfG20a/GkaLqVgLy6joDwWVjsSDwzh+zPmgA="; inherit (self.darwin) cctools; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; diff --git a/pkgs/servers/sql/patroni/default.nix b/pkgs/servers/sql/patroni/default.nix index 14f52c9d63ae2..119218bada526 100644 --- a/pkgs/servers/sql/patroni/default.nix +++ b/pkgs/servers/sql/patroni/default.nix @@ -6,13 +6,13 @@ pythonPackages.buildPythonApplication rec { pname = "patroni"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "zalando"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-gOjjE++hf3GOimvCxBR0jqqi3JNpbejLcWbLHpz2H4Q="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-GyPPBoYcJnuMer9FYGhWqursX/qJLaAlc9zFULoJqo4="; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index ff9f4f4150a22..3040e8074b32c 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -1,5 +1,13 @@ self: let + # Before removing an EOL major version, make sure to check the versioning policy in: + # <nixpkgs>/nixos/modules/services/databases/postgresql.md + # + # Before removing, make sure to update it to the last minor version - and if only in + # an immediately preceding commit. This allows people relying on that old major version + # for a bit longer to still update up to this commit to at least get the latest minor + # version. In other words: Do not remove the second-to-last minor version from nixpkgs, + # yet. Update first. versions = { postgresql_12 = ./12.nix; postgresql_13 = ./13.nix; diff --git a/pkgs/servers/sql/postgresql/ext/plv8/0001-build-Allow-using-V8-from-system.patch b/pkgs/servers/sql/postgresql/ext/plv8/0001-build-Allow-using-V8-from-system.patch index 05f607911f20a..e6099771ea1a8 100644 --- a/pkgs/servers/sql/postgresql/ext/plv8/0001-build-Allow-using-V8-from-system.patch +++ b/pkgs/servers/sql/postgresql/ext/plv8/0001-build-Allow-using-V8-from-system.patch @@ -1,47 +1,44 @@ diff --git a/Makefile b/Makefile -index 38879cc..6e78eeb 100644 +index a705c11..08b952b 100644 --- a/Makefile +++ b/Makefile -@@ -20,6 +20,7 @@ OBJS = $(SRCS:.cc=.o) +@@ -13,11 +13,14 @@ OBJS = $(SRCS:.cc=.o) MODULE_big = plv8-$(PLV8_VERSION) EXTENSION = plv8 PLV8_DATA = plv8.control plv8--$(PLV8_VERSION).sql +USE_SYSTEM_V8 = 0 - - # Platform detection -@@ -41,6 +42,7 @@ PGXS := $(shell $(PG_CONFIG) --pgxs) - PG_VERSION_NUM := $(shell cat `$(PG_CONFIG) --includedir-server`/pg_config*.h \ - | perl -ne 'print $$1 and exit if /PG_VERSION_NUM\s+(\d+)/') + ifeq ($(OS),Windows_NT) + # noop for now + else ++ ifeq ($(USE_SYSTEM_V8),0) + SHLIB_LINK += -Ldeps/v8-cmake/build ++ endif + UNAME_S := $(shell uname -s) + ifeq ($(UNAME_S),Darwin) + CCFLAGS += -stdlib=libc++ +@@ -34,6 +37,7 @@ ifeq ($(NUMPROC),0) + NUMPROC = 1 + endif +ifeq ($(USE_SYSTEM_V8),0) - AUTOV8_DIR = build/v8 - AUTOV8_OUT = build/v8/out.gn/obj - AUTOV8_STATIC_LIBS = -lv8_libplatform -lv8_libbase -@@ -66,6 +68,7 @@ v8: - make -f Makefiles/Makefile.macos v8 - endif - endif + SHLIB_LINK += -Ldeps/v8-cmake/build + + all: v8 $(OBJS) +@@ -46,11 +50,16 @@ deps/v8-cmake/build/libv8_libbase.a: + @cd deps/v8-cmake && mkdir -p build && cd build && cmake -Denable-fPIC=ON -DCMAKE_BUILD_TYPE=Release ../ && make -j $(NUMPROC) + + v8: deps/v8-cmake/build/libv8_libbase.a ++else ++all: $(OBJS) +endif # enable direct jsonb conversion by default CCFLAGS += -DJSONB_DIRECT_CONVERSION -@@ -83,6 +86,7 @@ ifdef BIGINT_GRACEFUL - endif - +ifeq ($(USE_SYSTEM_V8),0) - # We're gonna build static link. Rip it out after include Makefile - SHLIB_LINK := $(filter-out -lv8, $(SHLIB_LINK)) - -@@ -101,6 +105,7 @@ else - SHLIB_LINK += -lrt -std=c++14 - endif - endif + CCFLAGS += -Ideps/v8-cmake/v8/include -std=c++17 +endif - DATA = $(PLV8_DATA) - ifndef DISABLE_DIALECT --- -2.37.3 - + ifdef EXECUTION_TIMEOUT + CCFLAGS += -DEXECUTION_TIMEOUT diff --git a/pkgs/servers/sql/postgresql/ext/plv8/default.nix b/pkgs/servers/sql/postgresql/ext/plv8/default.nix index 2e8ac591a2ddd..615dcb3a80ae1 100644 --- a/pkgs/servers/sql/postgresql/ext/plv8/default.nix +++ b/pkgs/servers/sql/postgresql/ext/plv8/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchFromGitHub -, v8 +, nodejs_20 , perl , postgresql , jitSupport @@ -11,15 +11,17 @@ , gnugrep }: -stdenv.mkDerivation (finalAttrs: { +let + libv8 = nodejs_20.libv8; +in stdenv.mkDerivation (finalAttrs: { pname = "plv8"; - version = "3.1.10"; + version = "3.2.2"; src = fetchFromGitHub { owner = "plv8"; repo = "plv8"; rev = "v${finalAttrs.version}"; - hash = "sha256-g1A/XPC0dX2360Gzvmo9/FSQnM6Wt2K4eR0pH0p9fz4="; + hash = "sha256-azO33v22EF+/sTNmwswxyDR0PhrvWfTENuLu6JgSGJ0="; }; patches = [ @@ -33,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - v8 + libv8 postgresql ]; @@ -43,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { # Nixpkgs build a v8 monolith instead of separate v8_libplatform. "USE_SYSTEM_V8=1" "SHLIB_LINK=-lv8" - "V8_OUTDIR=${v8}/lib" + "V8_OUTDIR=${libv8}/lib" ]; installFlags = [ @@ -56,9 +58,6 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs ./generate_upgrade.sh - # https://github.com/plv8/plv8/pull/506 - substituteInPlace generate_upgrade.sh \ - --replace " 2.3.10 " " 2.3.10 2.3.11 2.3.12 2.3.13 2.3.14 2.3.15 " ''; postInstall = '' diff --git a/pkgs/servers/sqlpage/default.nix b/pkgs/servers/sqlpage/default.nix index 294b90e31bbb4..0c633bb408e67 100644 --- a/pkgs/servers/sqlpage/default.nix +++ b/pkgs/servers/sqlpage/default.nix @@ -42,13 +42,13 @@ in rustPlatform.buildRustPackage rec { pname = "sqlpage"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "lovasoa"; repo = "SQLpage"; rev = "v${version}"; - hash = "sha256-FSMf1B/2ZyOikkwmt3YLtKYs7NCf3N91SKQK73kWieQ="; + hash = "sha256-tb3MwH6d/xe05QiBu11iZYICp8eTkKLuQiISoY0zKTE="; }; postPatch = '' @@ -75,7 +75,7 @@ rustPlatform.buildRustPackage rec { "$(cat ${tomselect})" ''; - cargoHash = "sha256-uDeQ6/hKJFD747sUeQbpQIIzbpcvQfsTbbx68m1GAKY="; + cargoHash = "sha256-/k9nNxZxyV12pyRep6cTsUoEQobb9sWKnXxQmXmVAl0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index e5c9d4310cb82..a69e7eb3aecdd 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -10,10 +10,11 @@ , shadow , procps , nixosTests +, installShellFiles }: let - version = "1.68.0"; + version = "1.68.1"; in buildGoModule { pname = "tailscale"; @@ -23,7 +24,7 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-GTl5RCwIoDuzbaigy0/++xaPPEMLRDbBi/z82xCDOZY="; + hash = "sha256-ZAzro69F7ovfdqzRss/U7puh1T37bkEtUXabCYc5LwU="; }; patches = [ @@ -37,7 +38,7 @@ buildGoModule { vendorHash = "sha256-SUjoeOFYz6zbEgv/vND7kEXbuWlZDrUKF2Dmqsf/KVw="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ] ++ [ installShellFiles ]; CGO_ENABLED = 0; @@ -63,6 +64,12 @@ buildGoModule { --prefix PATH : ${lib.makeBinPath [ iproute2 iptables getent shadow ]} \ --suffix PATH : ${lib.makeBinPath [ procps ]} + local INSTALL="$out/bin/tailscale" + installShellCompletion --cmd tailscale \ + --bash <($out/bin/tailscale completion bash) \ + --fish <($out/bin/tailscale completion fish) \ + --zsh <($out/bin/tailscale completion zsh) + sed -i -e "s#/usr/sbin#$out/bin#" -e "/^EnvironmentFile/d" ./cmd/tailscaled/tailscaled.service install -D -m0444 -t $out/lib/systemd/system ./cmd/tailscaled/tailscaled.service ''; diff --git a/pkgs/servers/teleport/generic.nix b/pkgs/servers/teleport/generic.nix index 94ca520964cd7..51bea403f7dbf 100644 --- a/pkgs/servers/teleport/generic.nix +++ b/pkgs/servers/teleport/generic.nix @@ -182,7 +182,10 @@ buildGoModule rec { # which occupies more than 31 bits of address space. broken = stdenv.hostPlatform.parsed.cpu.bits < 64 || # See comment about wasm32-unknown-unknown in rustc.nix. - lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] || - !stdenv.hostPlatform.gcc.thumb or true; + # version 15 is the first that starts to use wasm + (lib.versionAtLeast version "15") && ( + lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] || + !stdenv.hostPlatform.gcc.thumb or true + ); }; } diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 98f443a286592..375347b22fc12 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "traefik"; - version = "3.0.2"; + version = "3.0.3"; # Archive with static assets for webui src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - hash = "sha256-h/LN++Jw8Yr08uH5T2Br1YVJtiAToI/1k4YDxqmFCZQ="; + hash = "sha256-vjY8sbNkY/kdQiJ020iUWxIVzxkmpkeLhxBThc6tUuE="; stripRoot = false; }; - vendorHash = "sha256-XVRVrfraI7lQOrQKv0L557903hwZXlzI+9/tpXnAlW0="; + vendorHash = "sha256-rvo3nw9yUfikO82cy6BbukwqwBSrUCCEta3nKBprCbk="; subPackages = [ "cmd/traefik" ]; diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix index a245f003e7891..35437f4fd778a 100644 --- a/pkgs/servers/web-apps/outline/default.nix +++ b/pkgs/servers/web-apps/outline/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "outline"; - version = "0.76.1"; + version = "0.77.2"; src = fetchFromGitHub { owner = "outline"; repo = "outline"; rev = "v${version}"; - hash = "sha256-i+1Bd9equlYxxdmvoUim31SM5ymJjnauvqGOmnPmTWA="; + hash = "sha256-Ri2qN7nR79Y1tsUsga/92nS7EuP/nqaUG2FiYJQNAr4="; }; nativeBuildInputs = [ makeWrapper prefetch-yarn-deps fixup-yarn-lock ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-xR6W9Kclgt7YZvkqNg7hOtY39mMNZvtDR/a1aOgD2Ko="; + hash = "sha256-wxXnvi58mBfAQiMSxhXWK7sYLvr8nfQ+u6kMYnRWI3s="; }; configurePhase = '' diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index e9680f8484033..717619ffba13b 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -9,7 +9,7 @@ hash = "sha256-aLOO/XgjI3d/+1BpHDT2pGR697oceghjzOId1MjC+wQ="; }; wordpress6_5 = { - version = "6.5.2"; - hash = "sha256-APBO7hO9iuDGOP/IvB0dLAwby0PU7LPFth4IUXNQe9I="; + version = "6.5.4"; + hash = "sha256-HsgnmdN8MxN0F5v3BDFQzxvX2AgC/Ke0+Nz01Fkty7Q="; }; } diff --git a/pkgs/servers/web-apps/wordpress/generic.nix b/pkgs/servers/web-apps/wordpress/generic.nix index 637aed1d19e39..cfe0975abb2f2 100644 --- a/pkgs/servers/web-apps/wordpress/generic.nix +++ b/pkgs/servers/web-apps/wordpress/generic.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { #!nix-shell -i bash -p common-updater-scripts jq set -eu -o pipefail version=$(curl --globoff "https://api.wordpress.org/core/version-check/1.7/" | jq -r '.offers[0].version') - update-source-version wordpress $version + update-source-version wordpress $version --file=./pkgs/servers/web-apps/wordpress/default.nix ''; meta = with lib; { diff --git a/pkgs/servers/web-apps/wordpress/packages/plugins.json b/pkgs/servers/web-apps/wordpress/packages/plugins.json index e3702cb34d23e..fb72b53043098 100644 --- a/pkgs/servers/web-apps/wordpress/packages/plugins.json +++ b/pkgs/servers/web-apps/wordpress/packages/plugins.json @@ -7,8 +7,8 @@ }, "akismet": { "path": "akismet/tags/5.3.2", - "rev": "3055719", - "sha256": "1298r4mqv4ndyizgmsln06d4cgr04kw3wpdsl6y7ym7lriy207qw", + "rev": "3095776", + "sha256": "0qjn2v4hq9259pbncambxzlqywvwgcc9nbz8nqi6rj1m3za4vpyv", "version": "5.3.2" }, "antispam-bee": { @@ -24,10 +24,10 @@ "version": "2.21.08.31" }, "breeze": { - "path": "breeze/tags/2.1.7", - "rev": "3074984", - "sha256": "13alrv92p70ccg8xjybfzzikv35ff24zkc3dxlbrlr62ikczyyy0", - "version": "2.1.7" + "path": "breeze/tags/2.1.9", + "rev": "3097827", + "sha256": "1az7p8zbcxl50swir8jqbcfp07ibkn225x0rc69sc38shsl7aaqv", + "version": "2.1.9" }, "co-authors-plus": { "path": "co-authors-plus/tags/3.6.1", @@ -60,16 +60,16 @@ "version": "1.4.0" }, "gutenberg": { - "path": "gutenberg/tags/18.3.0", - "rev": "3083588", - "sha256": "0dl6hdi38988zpcl69avy1p8s93djlzk6f56ra490lvzlmf4g73z", - "version": "18.3.0" + "path": "gutenberg/tags/18.5.0", + "rev": "3098391", + "sha256": "16hxrm1pp44jnbnzg6rsx2wm6rbfcfyrxvaam41qvf5s9kdnds0j", + "version": "18.5.0" }, "hcaptcha-for-forms-and-more": { - "path": "hcaptcha-for-forms-and-more/tags/4.1.1", - "rev": "3081325", - "sha256": "1sw42qpy3qqz48a86fd5dc71iq6s1q44v5mgq7fa49makkn5fd4r", - "version": "4.1.1" + "path": "hcaptcha-for-forms-and-more/tags/4.2.1", + "rev": "3098902", + "sha256": "0asfkd63zy6cpg3f8lg3l3cdfnlxsg6lnw2sqbcn267jdijqal51", + "version": "4.2.1" }, "hello-dolly": { "path": "hello-dolly/tags/1.7.2", @@ -79,15 +79,15 @@ }, "hkdev-maintenance-mode": { "path": "hkdev-maintenance-mode/trunk", - "rev": "3054874", - "sha256": "0p2qj6w0gy0pl0mq4x9f53r3y0rkr47039mb7l9rg6rgs41baa9m", + "rev": "3098579", + "sha256": "1l8h3f4fmgjjnvk81vf35jmhdsnfc8j2gi3gqrb8mr2q3dbf9fkn", "version": "3.0.2" }, "jetpack": { - "path": "jetpack/tags/13.4.1", - "rev": "3084434", - "sha256": "17fg162f5nqf87xi0bii9xsgc19vfd9hrf86b82c4m6sgb80rf2p", - "version": "13.4.1" + "path": "jetpack/tags/13.5", + "rev": "3098116", + "sha256": "12m9jyrxfpq7v7ydgp2kvn7s28s6gx0mzc9fihd1fddinvyjihqs", + "version": "13.5" }, "jetpack-lite": { "path": "jetpack-lite/tags/3.0.3", @@ -102,28 +102,28 @@ "version": "5.2.6" }, "login-lockdown": { - "path": "login-lockdown/tags/2.09", - "rev": "3059559", - "sha256": "0rvxzb1bfssfsngkf3mkqb0h3vivyjnsw822s7fwkavhklm6cfjx", - "version": "2.09" + "path": "login-lockdown/tags/2.10", + "rev": "3088782", + "sha256": "1zm6xfq2xmb4bqb3j272j4majywfa5zqs4ms7lwygmb3s74980bm", + "version": "2.10" }, "mailpoet": { - "path": "mailpoet/tags/4.50.0", - "rev": "3083197", - "sha256": "01z2r87jw94ap9ha8kz1l999pczpa6985j4z0nq44b20672p62gv", - "version": "4.50.0" + "path": "mailpoet/tags/4.51.1", + "rev": "3097471", + "sha256": "0107v98nkaqlar5igxcllrvm10ac2zrn0j5j03xwk48b933y9d7h", + "version": "4.51.1" }, "merge-minify-refresh": { "path": "merge-minify-refresh/trunk", - "rev": "3007859", - "sha256": "1f9ppjkpza5h6z23ma7x9lrpqsq5qxc0n8zfffs44njf086n7k4f", - "version": "2.7" + "rev": "3089082", + "sha256": "04li9jl0b6mf16n7619jnls20wd9ix0ggpsqkpm5s11jpwbnc9n6", + "version": "2.8" }, "opengraph": { - "path": "opengraph/tags/1.11.2", - "rev": "3065435", - "sha256": "1s78pf57s37rljd5qjddjyhbff2kw7h9y11k0nk9a6rj3l1zx9hl", - "version": "1.11.2" + "path": "opengraph/tags/1.11.3", + "rev": "3097574", + "sha256": "1g9lv3ffbcf2bcbwjfczry4wjzrmvpbilymhs15vx2ysjhh7jqgv", + "version": "1.11.3" }, "simple-login-captcha": { "path": "simple-login-captcha/tags/1.3.6", @@ -157,8 +157,8 @@ }, "webp-converter-for-media": { "path": "webp-converter-for-media/tags/5.12.5", - "rev": "3071153", - "sha256": "03a53ssvbxhdi3j14vpzf3w4fzljk5hzy29d3g2mxrgbcbjcjrs1", + "rev": "3096305", + "sha256": "0v8a06na42la16gq6m1mfjglnggdxpy9qnfc20xr0wi2qv5xnwf8", "version": "5.12.5" }, "webp-express": { @@ -168,16 +168,16 @@ "version": "0.25.9" }, "wordpress-seo": { - "path": "wordpress-seo/tags/22.6", - "rev": "3079171", - "sha256": "105646vkdvnrwa6kbk8vhvp40l5rg5dnd0rs21qg7byw7xv61nzs", - "version": "22.6" + "path": "wordpress-seo/tags/22.8", + "rev": "3093688", + "sha256": "14by3h0wk4xjh78pgsvwb9j791viky5w8h78frw905d3azhv8jnj", + "version": "22.8" }, "worker": { - "path": "worker/tags/4.9.19", - "rev": "3019262", - "sha256": "1pfn7bvdqv0cy10nbkdqw9m0b0nys6grw3jry41nr9ffbajbx4kx", - "version": "4.9.19" + "path": "worker/tags/4.9.20", + "rev": "3087053", + "sha256": "0krm85iyk25s2fy7z16z0k9cjvhw31y5w6wfjbsl7cfz0q3ld6j5", + "version": "4.9.20" }, "wp-change-email-sender": { "path": "wp-change-email-sender/tags/2.0", @@ -186,10 +186,10 @@ "version": "2.0" }, "wp-fastest-cache": { - "path": "wp-fastest-cache/tags/1.2.6", - "rev": "3081800", - "sha256": "0pp8di9jaj13k0qdpcnwx825nzx8cd9h336li8swg3jbr3sppvl7", - "version": "1.2.6" + "path": "wp-fastest-cache/tags/1.2.7", + "rev": "3091143", + "sha256": "1drmm1badk8wgqs0r3pl47fl5hsc883llcaxgsppyv4x1mzvnwi2", + "version": "1.2.7" }, "wp-gdpr-compliance": { "path": "wp-gdpr-compliance/tags/2.0.22", @@ -204,16 +204,16 @@ "version": "4.0.1" }, "wp-statistics": { - "path": "wp-statistics/tags/14.6.4", - "rev": "3081064", - "sha256": "03834h6vcczcbmw7h3db6bk39qr9yipgsn8q9mwa43rq7h7b7pvh", - "version": "14.6.4" + "path": "wp-statistics/tags/14.7.2", + "rev": "3096387", + "sha256": "15gccsdw8g1d3np6xl7bzq89ydx0qkv1qxzj62r0cglzlnphli8b", + "version": "14.7.2" }, "wp-swiper": { "path": "wp-swiper/trunk", - "rev": "3045384", - "sha256": "1m8gmab211pnhibpwviqsxm9pgzb2si2y41myksmxnbsvnnfmj7j", - "version": "1.1.6" + "rev": "3093150", + "sha256": "1apbl3vgb996n2la15iyv0z9xfn0axcjkn721fxvi2l0bar9kmcy", + "version": "1.1.10" }, "wp-user-avatars": { "path": "wp-user-avatars/trunk", diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 7e2cc2fdcb4f1..11913a39e017b 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -64,6 +64,13 @@ stdenv.mkDerivation rec { url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/8cb1c21a4240a5b6bf4aeeef51819639b4e0ad24.patch"; hash = "sha256-MZPP9QgYO4RFJ/vcjkpu7SVSo5Dh09ZdZjOwTopjdYQ="; }) + # Backport fix for segfault when linux-dmabuf device is not accessible + # FIXME: remove when merged + # Upstream PR: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1565 + (fetchpatch { + url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/7605833315c05488eca30ed0a70a2a1430e89bbc.patch"; + hash = "sha256-4/A6aOiOGouPe2v4wIYDQY9rWkuNZJwk0h4gpfrl6hI="; + }) ]; depsBuildBuild = [ diff --git a/pkgs/shells/nushell/nu_scripts/default.nix b/pkgs/shells/nushell/nu_scripts/default.nix index 9815d79343873..47d29b44ac23d 100644 --- a/pkgs/shells/nushell/nu_scripts/default.nix +++ b/pkgs/shells/nushell/nu_scripts/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nu_scripts"; - version = "0-unstable-2024-06-08"; + version = "0-unstable-2024-06-16"; src = fetchFromGitHub { owner = "nushell"; repo = pname; - rev = "398cc82308d8ddd0fb09bc9e8fc20cced26a0d30"; - hash = "sha256-zJWZakNxLQI3vxClzS4B0NqY84Oj5R1BjX2aMjCm/+Q="; + rev = "92f20ff2827b1afb3d06011bc0609a0212c53993"; + hash = "sha256-ZYrlX8Kg9VD5/eUctesAXQlBcVPiOZ3W9WCpBkByrpA="; }; installPhase = '' diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index f1641a4d32126..946d724f86aac 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,14 +5,14 @@ , git, nix, nixfmt-classic, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { - version = "2024-06-04"; + version = "2024-06-13"; pname = "oh-my-zsh"; src = fetchFromGitHub { owner = "ohmyzsh"; repo = "ohmyzsh"; - rev = "efdfe2f29ac57a9de76391b4e5548edab6a43241"; - sha256 = "sha256-IyBZMAcSFhZ2zdDZ9FcKpSEK3N2qjkTbkh3ToigFtTw="; + rev = "0c9b42a863778d67aee22bbd43f296110fe1f047"; + sha256 = "sha256-8ZVYN97K4KJOG+JnVpCVbMx2HGypvk7KZmwNzUfcovo="; }; strictDeps = true; diff --git a/pkgs/test/dotnet/default.nix b/pkgs/test/dotnet/default.nix index 7592b09d76e3c..d70850c05fdb0 100644 --- a/pkgs/test/dotnet/default.nix +++ b/pkgs/test/dotnet/default.nix @@ -1,5 +1,7 @@ -{ callPackage }: +{ lib, callPackage }: { project-references = callPackage ./project-references { }; + use-dotnet-from-env = lib.recurseIntoAttrs (callPackage ./use-dotnet-from-env { }); + structured-attrs = lib.recurseIntoAttrs (callPackage ./structured-attrs { }); } diff --git a/pkgs/test/dotnet/project-references/default.nix b/pkgs/test/dotnet/project-references/default.nix index 0736cedc9096b..762686a7d01ff 100644 --- a/pkgs/test/dotnet/project-references/default.nix +++ b/pkgs/test/dotnet/project-references/default.nix @@ -4,11 +4,13 @@ { lib , dotnet-sdk -, buildDotnetModule +, buildPackages # buildDotnetModule , runCommand }: let + inherit (buildPackages) buildDotnetModule; + nugetDeps = ./nuget-deps.nix; # Specify the TargetFramework via an environment variable so that we don't @@ -18,7 +20,8 @@ let library = buildDotnetModule { name = "project-references-test-library"; src = ./library; - inherit nugetDeps TargetFramework; + inherit nugetDeps; + env.TargetFramework = TargetFramework; packNupkg = true; }; @@ -26,7 +29,8 @@ let application = buildDotnetModule { name = "project-references-test-application"; src = ./application; - inherit nugetDeps TargetFramework; + inherit nugetDeps; + env.TargetFramework = TargetFramework; projectReferences = [ library ]; }; diff --git a/pkgs/test/dotnet/structured-attrs/default.nix b/pkgs/test/dotnet/structured-attrs/default.nix new file mode 100644 index 0000000000000..cf96fef8dbdcc --- /dev/null +++ b/pkgs/test/dotnet/structured-attrs/default.nix @@ -0,0 +1,36 @@ +{ lib +, dotnet-sdk +, buildPackages # buildDotnetModule +, testers +, runCommand +}: +let + # Note: without structured attributes, we can’t use derivation arguments that + # contain spaces unambiguously because arguments are passed as space-separated + # environment variables. + copyrightString = "Public domain 🅮"; + + inherit (buildPackages) buildDotnetModule; + + app = buildDotnetModule { + name = "structured-attrs-test-application"; + src = ./src; + nugetDeps = ./nuget-deps.nix; + dotnetFlags = [ "--property:Copyright=${copyrightString}" ]; + env.TargetFramework = "net${lib.versions.majorMinor (lib.getVersion dotnet-sdk)}"; + __structuredAttrs = true; + }; +in +{ + no-structured-attrs = testers.testBuildFailure (app.overrideAttrs { + __structuredAttrs = false; + }); + + check-output = testers.testEqualContents { + assertion = "buildDotnetModule sets AssemblyCopyrightAttribute with structured attributes"; + expected = builtins.toFile "expected-copyright.txt" copyrightString; + actual = runCommand "dotnet-structured-attrs-test" { } '' + ${app}/bin/Application >"$out" + ''; + }; +} diff --git a/pkgs/test/dotnet/structured-attrs/nuget-deps.nix b/pkgs/test/dotnet/structured-attrs/nuget-deps.nix new file mode 100644 index 0000000000000..f3a17967e25c8 --- /dev/null +++ b/pkgs/test/dotnet/structured-attrs/nuget-deps.nix @@ -0,0 +1,5 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ +] diff --git a/pkgs/test/dotnet/structured-attrs/src/Application.cs b/pkgs/test/dotnet/structured-attrs/src/Application.cs new file mode 100644 index 0000000000000..3bc548105c2b4 --- /dev/null +++ b/pkgs/test/dotnet/structured-attrs/src/Application.cs @@ -0,0 +1,10 @@ +using System; +using System.Reflection; + +Console.Write( + ( + (AssemblyCopyrightAttribute)Assembly + .GetExecutingAssembly() + .GetCustomAttributes(typeof(AssemblyCopyrightAttribute), true)[0] + ).Copyright +); diff --git a/pkgs/test/dotnet/structured-attrs/src/Application.csproj b/pkgs/test/dotnet/structured-attrs/src/Application.csproj new file mode 100644 index 0000000000000..decaa6d961aab --- /dev/null +++ b/pkgs/test/dotnet/structured-attrs/src/Application.csproj @@ -0,0 +1,5 @@ +<Project Sdk="Microsoft.NET.Sdk"> + <PropertyGroup> + <OutputType>exe</OutputType> + </PropertyGroup> +</Project> diff --git a/pkgs/test/dotnet/use-dotnet-from-env/default.nix b/pkgs/test/dotnet/use-dotnet-from-env/default.nix new file mode 100644 index 0000000000000..711a98eb0c29d --- /dev/null +++ b/pkgs/test/dotnet/use-dotnet-from-env/default.nix @@ -0,0 +1,60 @@ +{ lib +, dotnet-sdk +, buildPackages # buildDotnetModule, dotnet-runtime +, testers +, runCommand +, removeReferencesTo +}: +let + inherit (buildPackages) buildDotnetModule dotnet-runtime; + + app = buildDotnetModule { + name = "use-dotnet-from-env-test-application"; + src = ./src; + nugetDeps = ./nuget-deps.nix; + useDotnetFromEnv = true; + env.TargetFramework = "net${lib.versions.majorMinor (lib.getVersion dotnet-sdk)}"; + }; + + appWithoutFallback = app.overrideAttrs (oldAttrs: { + nativeBuildInputs = (oldAttrs.nativeBuildInputs or [ ]) ++ [ + removeReferencesTo + ]; + postFixup = (oldAttrs.postFixup or "") + '' + remove-references-to -t ${dotnet-runtime} "$out/bin/Application" + ''; + }); + + runtimeVersion = lib.getVersion dotnet-runtime; + runtimeVersionFile = builtins.toFile "dotnet-version.txt" runtimeVersion; +in +{ + fallback = testers.testEqualContents { + assertion = "buildDotnetModule sets fallback DOTNET_ROOT in wrapper"; + expected = runtimeVersionFile; + actual = runCommand "use-dotnet-from-env-fallback-test" { } '' + ${app}/bin/Application >"$out" + ''; + }; + + # Check that appWithoutFallback does not use fallback .NET runtime. + without-fallback = testers.testBuildFailure (runCommand "use-dotnet-from-env-without-fallback-test" { } '' + ${appWithoutFallback}/bin/Application >"$out" + ''); + + # NB assumes that without-fallback above to passes. + use-dotnet-root-env = testers.testEqualContents { + assertion = "buildDotnetModule uses DOTNET_ROOT from environment in wrapper"; + expected = runtimeVersionFile; + actual = runCommand "use-dotnet-from-env-root-test" { env.DOTNET_ROOT = dotnet-runtime; } '' + ${appWithoutFallback}/bin/Application >"$out" + ''; + }; + use-dotnet-path-env = testers.testEqualContents { + assertion = "buildDotnetModule uses DOTNET_ROOT from dotnet in PATH in wrapper"; + expected = runtimeVersionFile; + actual = runCommand "use-dotnet-from-env-path-test" { dotnetRuntime = dotnet-runtime; } '' + PATH=$dotnetRuntime''${PATH+:}$PATH ${appWithoutFallback}/bin/Application >"$out" + ''; + }; +} diff --git a/pkgs/test/dotnet/use-dotnet-from-env/nuget-deps.nix b/pkgs/test/dotnet/use-dotnet-from-env/nuget-deps.nix new file mode 100644 index 0000000000000..f3a17967e25c8 --- /dev/null +++ b/pkgs/test/dotnet/use-dotnet-from-env/nuget-deps.nix @@ -0,0 +1,5 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ +] diff --git a/pkgs/test/dotnet/use-dotnet-from-env/src/Application.cs b/pkgs/test/dotnet/use-dotnet-from-env/src/Application.cs new file mode 100644 index 0000000000000..5efc571ca9a3e --- /dev/null +++ b/pkgs/test/dotnet/use-dotnet-from-env/src/Application.cs @@ -0,0 +1,3 @@ +using System; + +Console.Write(Environment.Version.ToString()); diff --git a/pkgs/test/dotnet/use-dotnet-from-env/src/Application.csproj b/pkgs/test/dotnet/use-dotnet-from-env/src/Application.csproj new file mode 100644 index 0000000000000..decaa6d961aab --- /dev/null +++ b/pkgs/test/dotnet/use-dotnet-from-env/src/Application.csproj @@ -0,0 +1,5 @@ +<Project Sdk="Microsoft.NET.Sdk"> + <PropertyGroup> + <OutputType>exe</OutputType> + </PropertyGroup> +</Project> diff --git a/pkgs/test/haskell/cabalSdist/local/generated.nix b/pkgs/test/haskell/cabalSdist/local/generated.nix index bfa299962bcb4..f6463e762dddc 100644 --- a/pkgs/test/haskell/cabalSdist/local/generated.nix +++ b/pkgs/test/haskell/cabalSdist/local/generated.nix @@ -3,7 +3,14 @@ mkDerivation { pname = "local"; version = "0.1.0.0"; - src = ./.; + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ + ./app + ./CHANGELOG.md + ./local.cabal + ]; + }; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; diff --git a/pkgs/test/haskell/setBuildTarget/default.nix b/pkgs/test/haskell/setBuildTarget/default.nix index f0c78c5104499..39d5db698bcd0 100644 --- a/pkgs/test/haskell/setBuildTarget/default.nix +++ b/pkgs/test/haskell/setBuildTarget/default.nix @@ -7,7 +7,15 @@ let mkDerivation { pname = "haskell-setBuildTarget"; version = "0.1.0.0"; - src = ./.; + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ + ./haskell-setBuildTarget.cabal + ./Bar.hs + ./Foo.hs + ./Setup.hs + ]; + }; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 44818869dc827..8708325cc4659 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -59,14 +59,14 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.15.62"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.16.4"; # N.B: if you change this, check if overrides are still up-to-date pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = "refs/tags/${version}"; - hash = "sha256-hhjxhdrU4FFJWNcq4JiKpSSDr6YxKbUDGIuBoixryWU="; + hash = "sha256-l+AbacIs/1cJ78BACb3f5KuN9jM55WBT1SHD/lcAbcA="; }; postPatch = '' diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 3336e382bb453..d401801a15edf 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -50,8 +50,8 @@ let changelog = "https://github.com/Azure/azure-cli-extensions/blob/main/src/${pname}/HISTORY.rst"; license = lib.licenses.mit; sourceProvenance = [ lib.sourceTypes.fromSource ]; - }; - } // (removeAttrs args [ "url" "sha256" "description" ])); + } // args.meta or { }; + } // (removeAttrs args [ "url" "sha256" "description" "meta" ])); extensions = callPackages ./extensions-generated.nix { inherit mkAzExtension; } @@ -233,7 +233,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage rec { # pip is required to install extensions locally, but it's not needed if # we're using the default immutable configuration. pip - ]; + ] ++ lib.concatMap (extension: extension.propagatedBuildInputs) withExtensions; postInstall = '' substituteInPlace az.completion.sh \ diff --git a/pkgs/tools/admin/azure-cli/extensions-manual.nix b/pkgs/tools/admin/azure-cli/extensions-manual.nix index 1ae9845f2d452..6e098fb1f3cf8 100644 --- a/pkgs/tools/admin/azure-cli/extensions-manual.nix +++ b/pkgs/tools/admin/azure-cli/extensions-manual.nix @@ -1,4 +1,6 @@ -{ mkAzExtension +{ lib +, mkAzExtension +, mycli , python3Packages }: @@ -9,9 +11,24 @@ url = "https://github.com/Azure/azure-devops-cli-extension/releases/download/20240206.1/azure_devops-${version}-py2.py3-none-any.whl"; sha256 = "658a2854d8c80f874f9382d421fa45abf6a38d00334737dda006f8dec64cf70a"; description = "Tools for managing Azure DevOps"; - propagatedBuildInputs = with python3Packages; [ - distro + propagatedBuildInputs = with python3Packages; [ distro ]; + }; + + rdbms-connect = mkAzExtension rec { + pname = "rdbms-connect"; + version = "1.0.6"; + url = "https://azcliprod.blob.core.windows.net/cli-extensions/rdbms_connect-${version}-py2.py3-none-any.whl"; + sha256 = "49cbe8d9b7ea07a8974a29ad90247e864ed798bed5f28d0e3a57a4b37f5939e7"; + description = "Support for testing connection to Azure Database for MySQL & PostgreSQL servers"; + propagatedBuildInputs = (with python3Packages; [ + pgcli + psycopg2 + pymysql + setproctitle + ]) ++ [ + mycli ]; + meta.maintainers = with lib.maintainers; [ obreitwi ]; }; # Removed extensions diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index fc4ed942e9799..5ff28355bc7c4 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lego"; - version = "4.17.3"; + version = "4.17.4"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IfgZd8dXSJU4WlW6i2EUP5DJcfaCNFT6STlCdLD+7nI="; + sha256 = "sha256-DF9Bx6CzZLdnyqe8PNWU2I9ym2SBDAjdwG9/zxvSjgs="; }; - vendorHash = "sha256-0QL/+Oaulk2PUAKTUZaYzZ7wLjrTgh2m2WoJM3QxvXw="; + vendorHash = "sha256-tX/QpAZLuQEYhm1I1twlg3TefaLqfiEz9cXID+r6EHA="; doCheck = false; diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index b8b0f5c11a8d4..128ab8e226f7b 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,12 +1,12 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.119.0"; + version = "3.120.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.119.0-linux-x64.tar.gz"; - sha256 = "03v3138m6dxqbq192rxs5vhk9ypmvlp64k4l8acmcxys23gz7lvq"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.120.0-linux-x64.tar.gz"; + sha256 = "1ck6i0hqzisl474vv84iwdg8yh57sc6q3pjq81xh6plp8s95rka2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.17.2-linux-amd64.tar.gz"; @@ -17,36 +17,36 @@ sha256 = "0vwlil9awkfs774992bb9lj6bggjw4vnys0z0pzsd4lmidxc8mv8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.56.0-linux-amd64.tar.gz"; - sha256 = "036rkgs55j2z9gkivc9iw8apc2h82c4wdf6b0wiwd16jbaj5bvwb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.57.0-linux-amd64.tar.gz"; + sha256 = "14dh5jf6ld5prgcbz74yk9fwcf1k6fsfm70gw1xy97m4crn2l4q9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v6.8.3-linux-amd64.tar.gz"; - sha256 = "1q6hmfq5j1qjvppb1a9mhsd0ihc7yw1sr1rdspyd76jqk7610nfz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.0.0-linux-amd64.tar.gz"; + sha256 = "1nqxc28ncrq1zpclm2acvvqa8yl21nmk6lb5sqsvy5kbizpzslar"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.3.3-linux-amd64.tar.gz"; sha256 = "0vcmyzb6qbg8sfrbq06sdi1cc309132qsf92lswxydvnrqxvy0x4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.39.0-linux-amd64.tar.gz"; - sha256 = "1ca29a9y03bi0q6zk5k1585bfx0pgxgsj4m0hhxvfz8lfh1i6lw3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.40.0-linux-amd64.tar.gz"; + sha256 = "162zhf7iy9yr47h4fik3rps2wy7fsl74mg4kcnjxv65wjwmqlab4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.79.0-linux-amd64.tar.gz"; - sha256 = "09cn9g7pxnqsgr6cz62k8vnynvkxgqi9pf172inwm0f01h945zp9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.80.0-linux-amd64.tar.gz"; + sha256 = "1sgfw4b9s6k5854fa35y0p77v1n5h199yaghing4qn05i0miapgp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.51.0-linux-amd64.tar.gz"; - sha256 = "0y6y8ra858a4hn7wasf2356s33an68w8dwy7y4kdpb3kpky1mx3m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.52.0-linux-amd64.tar.gz"; + sha256 = "00cbix4cdhmgj50ilqjyn2ia3mxyp094n1979pm15j88plvambf3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.1.1-linux-amd64.tar.gz"; sha256 = "05vyz81a5z96k35hh8ky9bl6c505jfb6rxsc82qlfh8kx110p66l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.30.0-linux-amd64.tar.gz"; - sha256 = "159anajw61s89f08kkrkp81r4yg7vf269pzk4ldq8fljikr49y55"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.31.0-linux-amd64.tar.gz"; + sha256 = "0n1kp9ip9f70rhn619r5a4pzyalcfx46252cfk3ha50drjv27l58"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.3-linux-amd64.tar.gz"; @@ -73,8 +73,8 @@ sha256 = "17zngh68ssilazg5caiz2amzcgd1kp906k5viwp2ig70wp6gwkyy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.26.0-linux-amd64.tar.gz"; - sha256 = "0vmq4vwfgc1smp6ls2gk4li80zksqb7rx61ci4grm1vgrhxjv2gr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.27.0-linux-amd64.tar.gz"; + sha256 = "0qxp61glmnqh5a4w07b7hwbj0nkg7c15pqil8855jv15zakgp495"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.1-linux-amd64.tar.gz"; @@ -125,8 +125,8 @@ sha256 = "0ibyifkbbvkid3pfgiy8c25mrykkjgkaq2r8cn7jd6yaf15x0p3a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.79.0-linux-amd64.tar.gz"; - sha256 = "0n7cj6bj4hrjrijn0pniy9fzq39cb019m1k5rqqbfpkpv1211zf1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.80.1-linux-amd64.tar.gz"; + sha256 = "1bzmgs0xy1l2rwh843y7rdamsixm8lddybr2y088ilf69g8a63gl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.22.1-linux-amd64.tar.gz"; @@ -145,8 +145,8 @@ sha256 = "05g9fhg25ixxxrv0pm066cjdimjzs9wp8jlxv9179hny9hcy8fyh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.9.0-linux-amd64.tar.gz"; - sha256 = "19ag7ca5c1cnhpc3rxdy5rm5gavazjnrjh7hzpbysdmckzbc28ff"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.0-linux-amd64.tar.gz"; + sha256 = "0f3pa8y29n3isxa4kwqfsr6i1x3xhcj7jnqmnzkc60y7lg4r1z12"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.10.1-linux-amd64.tar.gz"; @@ -163,8 +163,8 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.119.0-darwin-x64.tar.gz"; - sha256 = "17g915yfckfk7jywf1sxh3hkc9n4rw9myr6zn3h3w8wwhzs74z2y"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.120.0-darwin-x64.tar.gz"; + sha256 = "090hvs9dghc4jzrsxj71gxl6gmsilfr3sydw7is9hwpjiykk1k3n"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.17.2-darwin-amd64.tar.gz"; @@ -175,36 +175,36 @@ sha256 = "0kwj3m50giwk8p0d0amy5nrvf4m4ms5salbh51nd4fm0l5hz2n0q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.56.0-darwin-amd64.tar.gz"; - sha256 = "0czn7l0vnl8w9lkcg7rbr723q1gwv0ci4bxf6jik3vmcchl38z2h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.57.0-darwin-amd64.tar.gz"; + sha256 = "0pyc2d7jg5bi3lz151d94i0i8sfrxhqnv388sdz6yrdkhz434z82"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v6.8.3-darwin-amd64.tar.gz"; - sha256 = "0avzcn0z4i5rhw8sdr0bxpj2lnpvmdxgw70gi7hzn551mr45fsfq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.0.0-darwin-amd64.tar.gz"; + sha256 = "1qi3vmzsp3bcq7y8y7q0h7hiqk6r5mzjq7h6i0g77fjcyjabqdch"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.3.3-darwin-amd64.tar.gz"; sha256 = "1jhnh3f2zni8wmddf2bz25r37iwbh1dyf8j9wnjyync1fqjy877y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.39.0-darwin-amd64.tar.gz"; - sha256 = "1p0qmmh4v8hm82vykpzwdmffrrfr9nrnwqyzxxvmn76p5q2hrqx4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.40.0-darwin-amd64.tar.gz"; + sha256 = "1km113wism9yf4rlx44g171jkxz3srpyvyi5hwablpw9pk93qnsv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.79.0-darwin-amd64.tar.gz"; - sha256 = "1vfs8nxck3fwryqbwwbqrai9bcf2b1bw4nv5521z9y6qbskqqyn0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.80.0-darwin-amd64.tar.gz"; + sha256 = "01xjm5q6kixyz4yvgjdhfskm3l7caygd33h19w7kzaih3dfffd25"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.51.0-darwin-amd64.tar.gz"; - sha256 = "00ividjihn5258vyp0jj3jvvcclihqjpgx9rkxm2xqs6rn7yfy2h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.52.0-darwin-amd64.tar.gz"; + sha256 = "052hkf5ljyg3fhqn7z1dk4mhp4pbzvb2klvc9d2p4qqzv8vc47gr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.1.1-darwin-amd64.tar.gz"; sha256 = "0blhx82diydpwbfr7grj2zxk29pvg0b2w2rawlv60mhc3dw6ixar"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.30.0-darwin-amd64.tar.gz"; - sha256 = "136407vq3m2ilpgmyh01n76izm9zigdm9l8rqd7mlg0c6laivc19"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.31.0-darwin-amd64.tar.gz"; + sha256 = "120z9hs349qzjk84fwzizhpp90fp21fgapxbgy56k22pshl35wzs"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.3-darwin-amd64.tar.gz"; @@ -231,8 +231,8 @@ sha256 = "009w2zsmy4nkc5w8k0ldm5fl2yjl8h52574w1as27kz0800nibav"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.26.0-darwin-amd64.tar.gz"; - sha256 = "1ihhs7q570mssswqfgmm1741b879ky1gyakiilypi3nzlnnpa9w5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.27.0-darwin-amd64.tar.gz"; + sha256 = "0d3pcwj7lncq4zalbkd3nyk4dbas5328maxa3dv55z6wi4x2ds9n"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.1-darwin-amd64.tar.gz"; @@ -283,8 +283,8 @@ sha256 = "1yg346nz6nrp8s9f998jynn250nywpg1nzxx6820pdinvaw81sgy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.79.0-darwin-amd64.tar.gz"; - sha256 = "0fhmza4ynmb5bcwd0m80p4acv2l5f2imca9zg02mmv6drd4wznpm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.80.1-darwin-amd64.tar.gz"; + sha256 = "1h06j9jpba6wxv8nz33ysz5bx928qbm64nk4gv5qa5zzdpm4c1mh"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.22.1-darwin-amd64.tar.gz"; @@ -303,8 +303,8 @@ sha256 = "1mbrrw4mvf1dnh6zp66lb9lsirg24gikvd7ls51bdld4pfs1rn3z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.9.0-darwin-amd64.tar.gz"; - sha256 = "07g2iys3w2r0giwakymb1n1bpwp812z93nskxbkwiw4zl8p6vr9v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.0-darwin-amd64.tar.gz"; + sha256 = "06vdv0mms6ksn1ah61afkfi2jx6q0sicbkvw2ngd98ch8djjqysk"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.10.1-darwin-amd64.tar.gz"; @@ -321,8 +321,8 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.119.0-linux-arm64.tar.gz"; - sha256 = "0m0ziqpa8q17fn330mrjrvqz27k6fd35x2ihaa6bdx37mq6vmac5"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.120.0-linux-arm64.tar.gz"; + sha256 = "0aki919lihvzva9qswc1lqigssiqqy8zqdd6v982xfc5b29xa0cb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.17.2-linux-arm64.tar.gz"; @@ -333,36 +333,36 @@ sha256 = "0a1kqpjwsksimv29y5q8d4b36s28801vhim1f5agq0c0lrn1fcds"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.56.0-linux-arm64.tar.gz"; - sha256 = "026f789v04asxfq0a2bll5qsr28rb7mcm4jmsc4y1bwiv3brcpx8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.57.0-linux-arm64.tar.gz"; + sha256 = "0yn3rbya6fr12m3ah2f5qywp85vf198zsdkpzx5wny6s6prnsiw8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v6.8.3-linux-arm64.tar.gz"; - sha256 = "0hcf3q5k2rc9xmi66ybvinw9sgc9ky1rgfzsidc7by413maq027z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.0.0-linux-arm64.tar.gz"; + sha256 = "0fxsa527dnvc77flfgqbmj5823mfwwfp67r9sswkhik3i6i0lm3c"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.3.3-linux-arm64.tar.gz"; sha256 = "1dv2y358fwcp6pr8mb1yhw5lygs9aqf8ma50vz3p74z1101lz3id"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.39.0-linux-arm64.tar.gz"; - sha256 = "14mz37gd25cjivwjkzrszywvz2kmc5xj2rk35dvhdy4qqw10jz4a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.40.0-linux-arm64.tar.gz"; + sha256 = "1881iqrnsfja341nq27k6pv3c85pw27cyq5ykk5bs2vzjvv008g0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.79.0-linux-arm64.tar.gz"; - sha256 = "1x03nwk51pkcyl6ncsnxiqmk40hd62vswncz0vkd082vhirqfq14"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.80.0-linux-arm64.tar.gz"; + sha256 = "0hmd6y0mh9bwx38k5hqbgclwfsa8ls64511zkhlmln6pix3bn4k0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.51.0-linux-arm64.tar.gz"; - sha256 = "1b9wsnpnrky80mjrj21p7xn90s95dabync5a426nk7s089kscs6v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.52.0-linux-arm64.tar.gz"; + sha256 = "08a20lp4ym5cncv6q3s7dbwrhhn76630x8a2arsm4j7gcqja389m"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.1.1-linux-arm64.tar.gz"; sha256 = "1chrfqdiwx6lvylrih6zx7m1zkrmcb7lz0x1cb9hc0l5fy93rc63"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.30.0-linux-arm64.tar.gz"; - sha256 = "0jiqkskhhbb6hvwg0vhh6ms2rqdr8lsl0400yhiin1q1whz9bk4y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.31.0-linux-arm64.tar.gz"; + sha256 = "0vrlk561p3aax3cgzpvjgwsxwwc5vblqb28cvc1xrj4bphd7xjda"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.3-linux-arm64.tar.gz"; @@ -389,8 +389,8 @@ sha256 = "09cdx6hh2lvipnj4fsff66vq8i3fvggs253ik2a8lpajg4xdhswi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.26.0-linux-arm64.tar.gz"; - sha256 = "06556faphr92rby8iyjzmzl9gxj27yij1d1rhw2cnk7q1w5m45i6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.27.0-linux-arm64.tar.gz"; + sha256 = "1qs9bcsw91s450sdxb2lrqzxl2q4wmpfjfspp7g5yxnv8ns8knl6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.1-linux-arm64.tar.gz"; @@ -441,8 +441,8 @@ sha256 = "15n7wi330pfqg4z196cjx5gksdz3nhaqbjvxslzx9lx501ly3npd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.79.0-linux-arm64.tar.gz"; - sha256 = "1bd3w8lbfcxvr2bl9cqm4kysq1fklsni69w3w42ss7lvayw8rzna"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.80.1-linux-arm64.tar.gz"; + sha256 = "1jhjz9kcs09x5i128mx4k7mh5fjafmg21hnifxh2avcari52r1q6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.22.1-linux-arm64.tar.gz"; @@ -461,8 +461,8 @@ sha256 = "08w72fz5lzsaa4q5zfnkkggpyy5brqx1zpbybkvc9r91s44kbjjf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.9.0-linux-arm64.tar.gz"; - sha256 = "0la5pifbr558smr69nmqax7b8vkvhr243avrn04gz11sc1fwqb2a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.0-linux-arm64.tar.gz"; + sha256 = "0j9w042blbs0wq3qlnjk20a9bs48v3jmg4s3z2mn39c7ff1604by"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.10.1-linux-arm64.tar.gz"; @@ -479,8 +479,8 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.119.0-darwin-arm64.tar.gz"; - sha256 = "13b12g1lbpg2nsff7xggp7fdz77vsmvmb5l0dk77qrxl8nr6hq25"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.120.0-darwin-arm64.tar.gz"; + sha256 = "17niys4r8i1b40g3sv783ndnbks0lqpdasi2p3sx7zc64sq6v7nm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.17.2-darwin-arm64.tar.gz"; @@ -491,36 +491,36 @@ sha256 = "0dydbqff9rd7f8ys2imjz3rf3c4y1248zmrbhsr78jywdw1h7fa3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.56.0-darwin-arm64.tar.gz"; - sha256 = "1qhsc01rbgvq25w7m2rjvbfg5fr3x8s3gi1z0vaz5m75znd0kbh8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.57.0-darwin-arm64.tar.gz"; + sha256 = "0blhb4ymfwrc7lm7v4sg0kmpibwbrrxcwd30imqp0gk6awmnjggn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v6.8.3-darwin-arm64.tar.gz"; - sha256 = "1a6hkwj3c7rwykiqls6x72gsfiqbqwqmdkyzhbbr0sq1zs1r4n05"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.0.0-darwin-arm64.tar.gz"; + sha256 = "1g461qcw8479fgchyg0wl086lay2irz7f1415bdvjhcjhjsyqas9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.3.3-darwin-arm64.tar.gz"; sha256 = "0a1aibs654xbcdm8kdcjjrg55fb0yh819d52zz3h6hpg40bahqcx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.39.0-darwin-arm64.tar.gz"; - sha256 = "1lfancfjr5qrzz9n3nb47cc1gyap4ls3dsc1wpnknafnmxqgv5h0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.40.0-darwin-arm64.tar.gz"; + sha256 = "0kgyg5jqxrlv8jr5iyqdj6xg1x4n2zjnlaymwyvakygryfnq4b1m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.79.0-darwin-arm64.tar.gz"; - sha256 = "1j7kxxcgysxfzyfy9a5jb3f0dcw8kq39i145cnjh5887bqxqmnvb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.80.0-darwin-arm64.tar.gz"; + sha256 = "1abz7hc4shvijf8291528blba3n4ixwwpk5jqv7i38bsn1jh1q3f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.51.0-darwin-arm64.tar.gz"; - sha256 = "0w5wxc9bcipx3zq9090dsqiz79a2p6md7k8wkbyyzhz9yhpx461s"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.52.0-darwin-arm64.tar.gz"; + sha256 = "0171rb3d1582vi0p67s4cmcjx19a3r278w4a1vlmqadk5jg9xx2k"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.1.1-darwin-arm64.tar.gz"; sha256 = "1m53gzviimjcr3dl0pydafa6dl1r0q6ih1gwhm7lvgpll300wl1q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.30.0-darwin-arm64.tar.gz"; - sha256 = "07ybs8rg5hdkz0f7d72znpflc5im1sp7nk3qqdmw11wszn63wsrz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.31.0-darwin-arm64.tar.gz"; + sha256 = "0k2aab9vn0l9sq0pgzwl3cz1gzg5yc4gqw1yln2nq637wknp7p6f"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.3-darwin-arm64.tar.gz"; @@ -547,8 +547,8 @@ sha256 = "1054c8cici744kyf817q8fk89ljcijxi7g5vi9080w4j6hxmabvn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.26.0-darwin-arm64.tar.gz"; - sha256 = "0v3hw5m78p8qv9camvcbl0dycb1fdgxwbikgpbxa45d921ihkvsc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.27.0-darwin-arm64.tar.gz"; + sha256 = "1d87xac6mwzigqrql4vq40gmz9xn9f4pi1rri54393jkfqnzi64i"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.1-darwin-arm64.tar.gz"; @@ -599,8 +599,8 @@ sha256 = "1gfifqyj3aab1cwwsd99pdidvqwwyab558ca98l318jzl02855b9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.79.0-darwin-arm64.tar.gz"; - sha256 = "08x8yzjfl8j3rwlwzxfqmjlxxn177kdhmrz9g8a7igp8yggyq5hs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.80.1-darwin-arm64.tar.gz"; + sha256 = "0z3bvfcfdx1fps2zgx7g1jmrlhrp0m6sbd91c7ddx7ig4g2l4xfz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.22.1-darwin-arm64.tar.gz"; @@ -619,8 +619,8 @@ sha256 = "1vfl1qk2iiv1d51l9jzcy3p96n8fwk7fbdsvvyfd3cn2xp07npnv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.9.0-darwin-arm64.tar.gz"; - sha256 = "0xc8d7ix9nxnpy376q4n36mi58p9vz9ifzvldk8s8cpld8pgrm20"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.0-darwin-arm64.tar.gz"; + sha256 = "0djz66nn08bm47cqwai7mlgwffm6xzn4p3niwsh280xnj0q9hkbq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.10.1-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index 58645fa7902c0..5464fea5281ee 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.94.11"; + version = "0.94.13"; src = fetchFromGitHub { owner = "Qovery"; repo = "qovery-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-2p3KUIu3L78X2/i5B6+RoMmoyG5vqg8RWDXeUYlpqwU="; + hash = "sha256-LFVl4IlLoJyOdHv0rqL2GfUvLpp/8qT951fQkW8MHy4="; }; - vendorHash = "sha256-OKerPm5odNWCD5AqfNHqcQSeWu53ZVqCbIowzf6tO9A="; + vendorHash = "sha256-qrDadHGhjwsAIfIQIkUeT7Tehv1sTtsfzgPyKxc5zJE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix index ec5f92c740189..ba65217d59c70 100644 --- a/pkgs/tools/admin/scaleway-cli/default.nix +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "scaleway-cli"; - version = "2.27.0"; + version = "2.31.0"; src = fetchFromGitHub { owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "sha256-brcsscNRftlpx73Q6lnbwvFiKoY6csERUUnAsiXwhF0="; + sha256 = "sha256-v8KkF5GShMDVjeAoe/bvoqHIBKDJ1hd6RIpu9Zugc6w="; }; - vendorHash = "sha256-GDV7BDZb0oHQUbA/Ojx6kzh9kBh0C5RbjYDDzX16LmQ="; + vendorHash = "sha256-Oprca0JX8SmrEGrnalzKt89qrXa5UEbErl8BOFJlHGI="; ldflags = [ "-w" diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index c8cbf6bf8ce2d..26ac2c3938a11 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -11,19 +11,19 @@ buildGoModule rec { pname = "trivy"; - version = "0.52.1"; + version = "0.52.2"; src = fetchFromGitHub { owner = "aquasecurity"; repo = "trivy"; rev = "refs/tags/v${version}"; - hash = "sha256-7jM0eTUydehzlY8esSxIvQ11Y8VEF6Uyk7mSC0whmq0="; + hash = "sha256-3RUL0sgO2/hcfuihNKr51t0qbXvxs9X7yD/OBGATDdw="; }; # Hash mismatch on across Linux and Darwin proxyVendor = true; - vendorHash = "sha256-MsHlJ56MT+UqF+Psj+hKKpwPnRTcQ3RvWoHbmI93A5E="; + vendorHash = "sha256-VkUyjmiiJsDx7NdU6T20LB3tltOYYtf/RaTTPuliMQU="; subPackages = [ "cmd/trivy" ]; diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix index f4eb5e9327fe5..c24176263dfec 100644 --- a/pkgs/tools/archivers/7zz/default.nix +++ b/pkgs/tools/archivers/7zz/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "7zz"; - version = "24.05"; + version = "24.06"; src = fetchurl { url = "https://7-zip.org/a/7z${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}-src.tar.xz"; hash = { - free = "sha256-yYq3IEV2GeDWwW6KrdpgK2/QOsmDcBpIZvbk6VKZETY="; - unfree = "sha256-Y/NBz4C40ofG6UVRmz2g+nVVPIVXKkcbf6bmj5qQt5A="; + free = "sha256-X3uqGnJGQpW5MOaTtgWYwwrhS84e+piX7Gc+e8Pll00="; + unfree = "sha256-KqFmDHc1JbLthNbNf/BoDHhuwIk7h+TbRGVNy39ayLU="; }.${if enableUnfree then "unfree" else "free"}; downloadToTemp = (!enableUnfree); # remove the unRAR related code from the src drv diff --git a/pkgs/tools/archivers/7zz/update.sh b/pkgs/tools/archivers/7zz/update.sh index bc3179615d357..1128cedd54913 100755 --- a/pkgs/tools/archivers/7zz/update.sh +++ b/pkgs/tools/archivers/7zz/update.sh @@ -1,11 +1,8 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p curl xq-xml nix-prefetch +#! nix-shell -I nixpkgs=./. -i bash -p curl xq-xml common-updater-scripts set -euo pipefail -cd "$(dirname "${BASH_SOURCE[0]}")" -DRV_DIR="$PWD" - -OLD_VERSION="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" +OLD_VERSION="$(nix-instantiate --eval --json --expr 'let pkgs = import ./. {}; in pkgs._7zz.version' | sed 's/"//g')" NEW_VERSION="$(curl -H 'Accept: application/rss+xml' 'https://sourceforge.net/projects/sevenzip/rss?path=/7-Zip' | xq -x "substring((/rss/channel/item[link[contains(., 'src.tar.xz')]])[1]/title, 8, 5)")" echo "comparing versions $OLD_VERSION => $NEW_VERSION" @@ -14,37 +11,5 @@ if [[ "$OLD_VERSION" == "$NEW_VERSION" ]]; then exit 0 fi -NIXPKGS_ROOT="$(realpath "$DRV_DIR/../../../..")" - -echo "getting free source hash" -OLD_FREE_HASH="$(nix-instantiate --eval --strict -E "with import $NIXPKGS_ROOT {}; _7zz.src.drvAttrs.outputHash" | tr -d '"')" -echo "getting unfree source hash" -OLD_UNFREE_HASH="$(nix-instantiate --eval --strict -E "with import $NIXPKGS_ROOT {}; (_7zz.override { enableUnfree = true; }).src.drvAttrs.outputHash" | tr -d '"')" - -NEW_VERSION_FORMATTED="$(echo "$NEW_VERSION" | tr -d '.')" -URL="https://7-zip.org/a/7z${NEW_VERSION_FORMATTED}-src.tar.xz" - -# `nix-prefetch` is broken without flakes -# see https://github.com/msteen/nix-prefetch/issues/51 -NEW_FREE_HASH=$(nix-prefetch -f "$NIXPKGS_ROOT" -E "_7zz.src" --url "$URL" --option extra-experimental-features flakes) - -NEW_UNFREE_OUT=$(nix-prefetch -f "$NIXPKGS_ROOT" -E "(_7zz.override { enableUnfree = true; }).src" --url "$URL" --output raw --print-path --option extra-experimental-features flakes) -# first line of raw output is the hash -NEW_UNFREE_HASH="$(echo "$NEW_UNFREE_OUT" | sed -n 1p)" -# second line of raw output is the src path -NEW_UNFREE_SRC="$(echo "$NEW_UNFREE_OUT" | sed -n 2p)" -# make sure to nuke the unfree src from the updater's machine -# > the license requires that you agree to these use restrictions, or you must remove the software (source and binary) from your hard disks -# https://fedoraproject.org/wiki/Licensing:Unrar -nix-store --delete "$NEW_UNFREE_SRC" - - -echo "updating version" -sed -i "s/version = \"$OLD_VERSION\";/version = \"$NEW_VERSION\";/" "$DRV_DIR/default.nix" - -echo "updating free hash" -sed -i "s@free = \"$OLD_FREE_HASH\";@free = \"$NEW_FREE_HASH\";@" "$DRV_DIR/default.nix" -echo "updating unfree hash" -sed -i "s@unfree = \"$OLD_UNFREE_HASH\";@unfree = \"$NEW_UNFREE_HASH\";@" "$DRV_DIR/default.nix" - -echo "done" +update-source-version _7zz "$NEW_VERSION" +update-source-version _7zz-rar "$NEW_VERSION" --ignore-same-version diff --git a/pkgs/tools/audio/mpd-discord-rpc/default.nix b/pkgs/tools/audio/mpd-discord-rpc/default.nix index 64535fd3e5a15..1da562085158a 100644 --- a/pkgs/tools/audio/mpd-discord-rpc/default.nix +++ b/pkgs/tools/audio/mpd-discord-rpc/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "mpd-discord-rpc"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "JakeStanger"; repo = "mpd-discord-rpc"; rev = "v${version}"; - hash = "sha256-Sdvrq9ChaSwjQDVjHVzcVLYbzyCHXsta1/Jo9hVkcDw="; + hash = "sha256-WiHMXazNKyt5N7WmkftZYEHeQi+l9qoU2yr6jRHfjdE="; }; - cargoHash = "sha256-w3ulSCbQBkDATe4yfgGSl7WMrUk3sYlS08UbgvGY/5s="; + cargoHash = "sha256-DnOv9YJpr777p1GVhe8LS5uAUs6Dr/gRLoJarFx5avw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/cd-dvd/ccd2iso/default.nix b/pkgs/tools/cd-dvd/ccd2iso/default.nix index b364566f4b7df..a050175b69f27 100644 --- a/pkgs/tools/cd-dvd/ccd2iso/default.nix +++ b/pkgs/tools/cd-dvd/ccd2iso/default.nix @@ -9,6 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1z000zi7hpr2h9cabj6hzf3n6a6gd6glmm8nn36v4b8i4vzbhx7q"; }; + patches = [ + ./include.patch + ]; + meta = with lib; { description = "CloneCD to ISO converter"; homepage = "https://sourceforge.net/projects/ccd2iso/"; diff --git a/pkgs/tools/cd-dvd/ccd2iso/include.patch b/pkgs/tools/cd-dvd/ccd2iso/include.patch new file mode 100644 index 0000000000000..d7c05f701ccd0 --- /dev/null +++ b/pkgs/tools/cd-dvd/ccd2iso/include.patch @@ -0,0 +1,9 @@ +--- a/src/ccd2iso.c 2024-06-16 09:01:37 ++++ b/src/ccd2iso.c 2024-06-16 09:01:49 +@@ -27,6 +27,7 @@ + + #include <stdio.h> + #include <stdlib.h> ++#include <string.h> + + #include "clonecd.h" diff --git a/pkgs/tools/filesystems/exfatprogs/default.nix b/pkgs/tools/filesystems/exfatprogs/default.nix index 9b5ca5eca7b5a..997aeec80fa7c 100644 --- a/pkgs/tools/filesystems/exfatprogs/default.nix +++ b/pkgs/tools/filesystems/exfatprogs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exfatprogs"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-v/SN2RAX+RjNReYkbXYy5Lm/NgIeDeLnAVx5cWo01tM="; + sha256 = "sha256-SrkRPDyASXpUAKapwcfaJSlUJBcVNtYZltdPzuhpvYM="; }; nativeBuildInputs = [ pkg-config autoreconfHook file ]; diff --git a/pkgs/tools/filesystems/kdiskmark/default.nix b/pkgs/tools/filesystems/kdiskmark/default.nix index fd6281a43ab6e..287ef7debc584 100644 --- a/pkgs/tools/filesystems/kdiskmark/default.nix +++ b/pkgs/tools/filesystems/kdiskmark/default.nix @@ -10,7 +10,7 @@ , fetchFromGitHub }: stdenv.mkDerivation rec { - name = "kdiskmark"; + pname = "kdiskmark"; version = "3.1.4"; src = fetchFromGitHub { diff --git a/pkgs/tools/games/minecraft/mcaselector/default.nix b/pkgs/tools/games/minecraft/mcaselector/default.nix index a533264ebad9a..610a46526ad6e 100644 --- a/pkgs/tools/games/minecraft/mcaselector/default.nix +++ b/pkgs/tools/games/minecraft/mcaselector/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "mcaselector"; - version = "2.4"; + version = "2.4.1"; src = fetchurl { url = "https://github.com/Querz/mcaselector/releases/download/${finalAttrs.version}/mcaselector-${finalAttrs.version}.jar"; - hash = "sha256-6WQIvDmyVVmxHFOMk2emT1a4PMGVjvtC0aSkryvwARs="; + hash = "sha256-4czkp7+akZEPvnYLMFGrqrhBYafDVxDo1iQZYwvaARE="; }; dontUnpack = true; @@ -27,11 +27,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { mkdir -p $out/{bin,lib/mcaselector} cp $src $out/lib/mcaselector/mcaselector.jar + + runHook postInstall + ''; + + preFixup = '' makeWrapper ${jre}/bin/java $out/bin/mcaselector \ --add-flags "-jar $out/lib/mcaselector/mcaselector.jar" \ ''${gappsWrapperArgs[@]} - - runHook postInstall ''; meta = with lib; { diff --git a/pkgs/tools/games/opentracker/default.nix b/pkgs/tools/games/opentracker/default.nix index 814a6375b622d..4561a5c86436e 100644 --- a/pkgs/tools/games/opentracker/default.nix +++ b/pkgs/tools/games/opentracker/default.nix @@ -3,10 +3,13 @@ stdenv, buildDotnetModule, fetchFromGitHub, + autoPatchelfHook, wrapGAppsHook3, dotnetCorePackages, fontconfig, gtk3, + icu, + libkrb5, libunwind, openssl, xinput, @@ -39,6 +42,7 @@ buildDotnetModule rec { ]; nativeBuildInputs = [ + autoPatchelfHook wrapGAppsHook3 ]; @@ -46,7 +50,10 @@ buildDotnetModule rec { stdenv.cc.cc.lib fontconfig gtk3 + icu + libkrb5 libunwind + openssl ]; runtimeDeps = @@ -62,6 +69,11 @@ buildDotnetModule rec { libXi ]); + autoPatchelfIgnoreMissingDeps = [ + "libc.musl-x86_64.so.1" + "libintl.so.8" + ]; + meta = with lib; { description = "Tracking application for A Link to the Past Randomizer"; homepage = "https://github.com/trippsc2/OpenTracker"; diff --git a/pkgs/tools/games/pokefinder/default.nix b/pkgs/tools/games/pokefinder/default.nix index 3ca5520fda15a..e4d773684343e 100644 --- a/pkgs/tools/games/pokefinder/default.nix +++ b/pkgs/tools/games/pokefinder/default.nix @@ -3,6 +3,7 @@ , copyDesktopItems , makeDesktopItem , fetchFromGitHub +, fetchpatch , cmake , python3 , qtbase @@ -15,17 +16,25 @@ stdenv.mkDerivation rec { pname = "pokefinder"; - version = "4.1.2"; + version = "4.2.0"; src = fetchFromGitHub { owner = "Admiral-Fish"; repo = "PokeFinder"; rev = "v${version}"; - sha256 = "ps8F6IcbCNybrZ02tbLNyB3YEvKlcYgCpv5Em7Riv+Q="; + sha256 = "R0FrRRQRe0tWrHUoU4PPwOgIsltUEImEMTXL79ISfRE="; fetchSubmodules = true; }; - patches = [ ./set-desktop-file-name.patch ]; + patches = [ + ./set-desktop-file-name.patch + # fix compatibility with our libstdc++ + # https://github.com/Admiral-Fish/PokeFinder/pull/392 + (fetchpatch { + url = "https://github.com/Admiral-Fish/PokeFinder/commit/2cb1b049cabdf0d1b32c8cf29bf6c9d9c5c55cb0.patch"; + hash = "sha256-F/w7ydsZ5tZParMWi33W3Tv8A6LLiJt4dAoCrs40DIo="; + }) + ]; postPatch = '' patchShebangs Source/Core/Resources/ diff --git a/pkgs/tools/games/steam-rom-manager/default.nix b/pkgs/tools/games/steam-rom-manager/default.nix index 6f4e7e0de333a..a58bcf55f34bd 100644 --- a/pkgs/tools/games/steam-rom-manager/default.nix +++ b/pkgs/tools/games/steam-rom-manager/default.nix @@ -2,11 +2,11 @@ appimageTools.wrapType2 rec { name = "steam-rom-manager"; - version = "2.5.9"; + version = "2.5.11"; src = fetchurl { url = "https://github.com/SteamGridDB/steam-rom-manager/releases/download/v${version}/Steam-ROM-Manager-${version}.AppImage"; - sha256 = "sha256-jBRDlCOPamTwjE4x6J6MoN1EQBmILJ+yPMez/0f6F9c="; + sha256 = "sha256-KeJ1O7YZOP8l09XFIa043tEAAU6bwpvCsJQ5r5aeuQY="; }; extraInstallCommands = let diff --git a/pkgs/tools/graphics/lsix/default.nix b/pkgs/tools/graphics/lsix/default.nix index 7569ccd6f7ac5..bcb3867e3a787 100644 --- a/pkgs/tools/graphics/lsix/default.nix +++ b/pkgs/tools/graphics/lsix/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "lsix"; - version = "1.9"; + version = "1.9.1"; src = fetchFromGitHub { owner = "hackerb9"; repo = "lsix"; rev = finalAttrs.version; - sha256 = "sha256-oa2+ADAJL3b57p4UF/0NT/WaM43TlsGXPVTtriczQbk="; + sha256 = "sha256-msTG7otjzksg/2XyPDy31LEb7uGXSgB8fzfHvad9nPA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/graphics/snapdragon-profiler/default.nix b/pkgs/tools/graphics/snapdragon-profiler/default.nix index aa8477d5717df..a4ece4ae1ab21 100644 --- a/pkgs/tools/graphics/snapdragon-profiler/default.nix +++ b/pkgs/tools/graphics/snapdragon-profiler/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { cp -r * $out/lib/snapdragon-profiler makeWrapper "${mono}/bin/mono" $out/bin/snapdragon-profiler \ --add-flags "$out/lib/snapdragon-profiler/SnapdragonProfiler.exe" \ - --suffix PATH : ${lib.makeBinPath [ jre androidenv.androidPkgs_9_0.platform-tools coreutils ]} \ + --suffix PATH : ${lib.makeBinPath [ jre androidenv.androidPkgs.platform-tools coreutils ]} \ --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \ --suffix LD_LIBRARY_PATH : $(echo $NIX_LDFLAGS | sed 's/ -L/:/g;s/ -rpath /:/g;s/-rpath //') \ --chdir "$out/lib/snapdragon-profiler" # Fixes themes not loading correctly diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix index e9317cbc2eea2..d7e03bafdb89a 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-chewing"; - version = "5.1.4"; + version = "5.1.5"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-n/5ZFXX/vg4rZSYeq1J/hpqib7P/grNH+NdPpx0fZMo="; + hash = "sha256-qXIcIByfgfWRe0rhetTHRyA7RqUHIP6FATwvtrfXNwQ="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index 0a1694267a35f..d0581164d663c 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -13,13 +13,13 @@ in stdenv.mkDerivation rec { pname = "ibus-typing-booster"; - version = "2.25.8"; + version = "2.25.9"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - hash = "sha256-0fjtLsIoMiI7zhaxU8RcoG4k48e02sJZvpjEBDfB/I0="; + hash = "sha256-dQifLJjgTKkFYBOJKxGXA1w97UBa0Bh56I6nRk0GVj0="; }; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook3 gobject-introspection ]; diff --git a/pkgs/tools/misc/cyberchef/default.nix b/pkgs/tools/misc/cyberchef/default.nix index 3fa530b50fb94..db888fccbf9bc 100644 --- a/pkgs/tools/misc/cyberchef/default.nix +++ b/pkgs/tools/misc/cyberchef/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "cyberchef"; - version = "10.18.6"; + version = "10.18.8"; src = fetchzip { url = "https://github.com/gchq/CyberChef/releases/download/v${version}/CyberChef_v${version}.zip"; - sha256 = "sha256-LbauIeDUqfL1ChZTThq7CJ++yNiuKaa773jSdmxorf8="; + sha256 = "sha256-1Ta0fgrwBHfUlj7aJkiAHV7MmHRlXJloYt2P889ya+U="; stripRoot = false; }; diff --git a/pkgs/tools/misc/fdupes/default.nix b/pkgs/tools/misc/fdupes/default.nix index fefb3992749b9..c82d2c861f0ef 100644 --- a/pkgs/tools/misc/fdupes/default.nix +++ b/pkgs/tools/misc/fdupes/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fdupes"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "adrianlopezroche"; repo = "fdupes"; rev = "v${version}"; - hash = "sha256-BW6a5vKRAuXs/zWPHhtZs6Y4scyCEfqHEAkGUSUiwkI="; + hash = "sha256-yOUgPa13DHDcuEqJMpBQVMOKFH/rlH44rWiIPRwnztM="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 0fcb6692243b7..20349aa8ff4d4 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -8,30 +8,36 @@ , postgresql , openssl , libyaml +, darwin }: stdenv.mkDerivation (finalAttrs: { pname = "fluent-bit"; - version = "3.0.6"; + version = "3.0.7"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${finalAttrs.version}"; - hash = "sha256-o48qnyYAiV2gt81hC8/ja+/JWNFlMb47QsBt6BD7VjA="; + hash = "sha256-AR+YmxIP6VZlpztpez6OViX1cGqoP/jeOiuzBcav1Eg="; }; + # optional only to avoid linux rebuild + patches = lib.optionals stdenv.isDarwin [ ./macos-11-sdk-compat.patch ]; + nativeBuildInputs = [ cmake flex bison ]; buildInputs = [ openssl libyaml postgresql ] - ++ lib.optionals stdenv.isLinux [ systemd ]; + ++ lib.optionals stdenv.isLinux [ systemd ] + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.IOKit darwin.apple_sdk_11_0.frameworks.Foundation ]; cmakeFlags = [ "-DFLB_RELEASE=ON" "-DFLB_METRICS=ON" "-DFLB_HTTP_SERVER=ON" "-DFLB_OUT_PGSQL=ON" - ]; + ] + ++ lib.optionals stdenv.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13" ]; env.NIX_CFLAGS_COMPILE = toString ( # Used by the embedded luajit, but is not predefined on older mac SDKs. diff --git a/pkgs/tools/misc/fluent-bit/macos-11-sdk-compat.patch b/pkgs/tools/misc/fluent-bit/macos-11-sdk-compat.patch new file mode 100644 index 0000000000000..5063e028e6564 --- /dev/null +++ b/pkgs/tools/misc/fluent-bit/macos-11-sdk-compat.patch @@ -0,0 +1,17 @@ +diff --git i/src/flb_utils.c w/src/flb_utils.c +index 87637f1331d7..7a0036566438 100644 +--- i/src/flb_utils.c ++++ w/src/flb_utils.c +@@ -1424,11 +1424,11 @@ int flb_utils_get_machine_id(char **out_id, size_t *out_size) + return 0; + } + #elif defined (FLB_SYSTEM_MACOS) + bool bret; + CFStringRef serialNumber; +- io_service_t platformExpert = IOServiceGetMatchingService(kIOMainPortDefault, ++ io_service_t platformExpert = IOServiceGetMatchingService(kIOMasterPortDefault, + IOServiceMatching("IOPlatformExpertDevice")); + + if (platformExpert) { + CFTypeRef serialNumberAsCFString = + IORegistryEntryCreateCFProperty(platformExpert, diff --git a/pkgs/tools/misc/glasgow/default.nix b/pkgs/tools/misc/glasgow/default.nix index 77f3eb01d96ad..4821ad923ef85 100644 --- a/pkgs/tools/misc/glasgow/default.nix +++ b/pkgs/tools/misc/glasgow/default.nix @@ -76,7 +76,7 @@ python3.pkgs.buildPythonApplication rec { description = "Software for Glasgow, a digital interface multitool"; homepage = "https://github.com/GlasgowEmbedded/Glasgow"; license = licenses.bsd0; - maintainers = with maintainers; [ emily thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice ]; mainProgram = "glasgow"; }; } diff --git a/pkgs/tools/misc/h/default.nix b/pkgs/tools/misc/h/default.nix index 6e4ae6381e756..6d65accc51d54 100644 --- a/pkgs/tools/misc/h/default.nix +++ b/pkgs/tools/misc/h/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "h"; - version = "1.0.4"; + version = "1.1.0"; src = fetchFromGitHub { owner = "zimbatm"; repo = "h"; rev = "v${version}"; - hash = "sha256-eitUKOo2c1c+SyctkUW/SUb2RCKUoU6nJplfJVdwBSs="; + hash = "sha256-4rhol8a+OMX2+MxFPEM1WzM/70C7sye8jw4pg7CujRo="; }; buildInputs = [ ruby ]; diff --git a/pkgs/tools/misc/lesspipe/default.nix b/pkgs/tools/misc/lesspipe/default.nix index b29026eb9724f..b2c310bc5f40e 100644 --- a/pkgs/tools/misc/lesspipe/default.nix +++ b/pkgs/tools/misc/lesspipe/default.nix @@ -74,9 +74,9 @@ stdenv.mkDerivation rec { "mdcat" "pandoc" "docx2txt" "libreoffice" "pptx2md" "mdcat" "xlscat" "odt2txt" "wvText" "antiword" "catdoc" "broken_catppt" "sxw2txt" "groff" "mandoc" "unrtf" "dvi2tty" "pod2text" "perldoc" "h5dump" "ncdump" "matdump" "djvutxt" "openssl" "gpg" "plistutil" "plutil" "id3v2" "csvlook" "jq" "zlib-flate" "lessfilter" - ] ++ lib.optional stdenv.isDarwin [ - # resholve only identifies this on darwin - # call site is gaurded by || so it's safe to leave dynamic + ] ++ lib.optional (stdenv.isDarwin || stdenv.isFreeBSD) [ + # resholve only identifies this on darwin/bsd + # call site is guarded by || so it's safe to leave dynamic "locale" ]; builtin = [ "setopt" ]; diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix index e24a9ff66b18c..7d2c99226690c 100644 --- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "opentelemetry-collector-contrib"; - version = "0.101.0"; + version = "0.102.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector-contrib"; rev = "v${version}"; - sha256 = "sha256-WdMQnAYAdyvS0uyRzvLnhi1HeoWqmUQSIq6MdcP7NfY="; + sha256 = "sha256-syl4mvh78otLWnDpu/7DHlAq0UqQ+4Alg8tZ16OYBQ4="; }; # proxy vendor to avoid hash missmatches between linux and macOS proxyVendor = true; - vendorHash = "sha256-LM9Co4XpmyIOTVllhiiON4R8OYTO5OjY9Wn+LrU6PIM="; + vendorHash = "sha256-SEj2waLnThV+anIdtZisJDusTrjObSXNPWIrWoL0gNA="; # there is a nested go.mod sourceRoot = "${src.name}/cmd/otelcontribcol"; diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index 740bea469a393..309a78c5400c0 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "pv"; - version = "1.8.9"; + version = "1.8.10"; src = fetchurl { url = "https://www.ivarch.com/programs/sources/pv-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-oHidj4xaCPrzcLWgfR2Tau/5UEpPSdp21BZHl6xGBuY="; + sha256 = "sha256-1MkMF8/NRKqWuYI3cx5PgR4HHUwgUqaJ0tgeZnH1cbE="; }; meta = { diff --git a/pkgs/tools/misc/qt6gtk2/default.nix b/pkgs/tools/misc/qt6gtk2/default.nix index 69044a2bb3126..28a3e6e535893 100644 --- a/pkgs/tools/misc/qt6gtk2/default.nix +++ b/pkgs/tools/misc/qt6gtk2/default.nix @@ -1,14 +1,14 @@ -{ fetchFromGitHub, lib, stdenv, gtk2, pkg-config, qmake, qtbase }: +{ fetchFromGitHub, lib, stdenv, gtk2, pkg-config, qmake, qtbase, unstableGitUpdater }: stdenv.mkDerivation (finalAttrs: { pname = "qt6gtk2"; - version = "0.2"; + version = "0.2-unstable-2024-05-06"; src = fetchFromGitHub { owner = "trialuser02"; repo = finalAttrs.pname; - rev = finalAttrs.version; - hash = "sha256-g5ZCwTnNEJJ57zEwNqMxrl0EWYJMt3PquZ2IsmxQYqk="; + rev = "d29ba6c1fb4ac933ed7b91f0480cbd0c5a975ab8"; + hash = "sha256-lIUCdfsmvuzDQaOi2U/CHch1re6Jn6yDfcX26Gu0eUo="; }; buildInputs = [ gtk2 qtbase ]; @@ -16,15 +16,11 @@ stdenv.mkDerivation (finalAttrs: { dontWrapQtApps = true; - installPhase = '' - runHook preInstall + qmakeFlags = [ + "PLUGINDIR=${placeholder "out"}/${qtbase.qtPluginPrefix}" + ]; - mkdir -p $out/lib/qt-6/plugins/{platformthemes,styles} - cp -pr src/qt6gtk2-qtplugin/libqt6gtk2.so $out/lib/qt-6/plugins/platformthemes - cp -pr src/qt6gtk2-style/libqt6gtk2-style.so $out/lib/qt-6/plugins/styles - - runHook postInstall - ''; + passthru.updateScript = unstableGitUpdater { }; meta = { description = "GTK+2.0 integration plugins for Qt6"; diff --git a/pkgs/tools/misc/shadowenv/Cargo.lock.patch b/pkgs/tools/misc/shadowenv/Cargo.lock.patch deleted file mode 100644 index d1866991cea79..0000000000000 --- a/pkgs/tools/misc/shadowenv/Cargo.lock.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git c/Cargo.lock i/Cargo.lock -index fb6ef6e..347b404 100644 ---- c/Cargo.lock -+++ i/Cargo.lock -@@ -1168,7 +1168,7 @@ dependencies = [ - - [[package]] - name = "shadowenv" --version = "2.1.0" -+version = "2.1.1" - dependencies = [ - "atty", - "blake2", diff --git a/pkgs/tools/misc/shadowenv/default.nix b/pkgs/tools/misc/shadowenv/default.nix index b9387024419b1..34597142522c0 100644 --- a/pkgs/tools/misc/shadowenv/default.nix +++ b/pkgs/tools/misc/shadowenv/default.nix @@ -2,18 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shadowenv"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "Shopify"; repo = pname; rev = version; - hash = "sha256-NKqoeJ2sejbe7Gghk3H7oJtP16SX1PcIIjsh/bZdTfQ="; + hash = "sha256-SYVVP1WOadsgucHo3z5QxbGtzczfiej4C3/EmbrHOhg="; }; - cargoPatches = [ ./Cargo.lock.patch ]; - - cargoHash = "sha256-CGAwb+UduM2QKne2bPntOcFnaUQN/3uUANc6z7f/Oig="; + cargoHash = "sha256-x4OQa84cIKzx29lMx56GfqSFE216jD897g4VhkiV4Kc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 6b540fac7ffd8..e03b792456816 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -15,7 +15,7 @@ let python pytest nose3 cryptography pyyaml requests mock requests-mock python-dateutil setuptools; - version = "4.79"; + version = "4.83"; in @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "spaam"; repo = "svtplay-dl"; rev = version; - hash = "sha256-m5lIiWOROzNUONAVRoD6vdE7+1TeI6L0tNw+afYtNZA="; + hash = "sha256-CaidnRd21qtPKlFMHfQMmYVz/CfN88uBC1XK3JikHf0="; }; pythonPaths = [ cryptography pyyaml requests ]; diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/tools/misc/tbls/default.nix index 427e21e2ad258..d5ceaa6f52de3 100644 --- a/pkgs/tools/misc/tbls/default.nix +++ b/pkgs/tools/misc/tbls/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "tbls"; - version = "1.76.0"; + version = "1.76.1"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-tVilEpSmCHx+m8HwcsyNDVIUICccndnn4vI4oOa5t/w="; + hash = "sha256-xSmw3udoTTEpEpfoyU48RAlN8gR/cfqco1DQ8qs5W94="; }; vendorHash = "sha256-ALjpU5el6Tmzsw2f5/AizFBuk+zJj9RKe9KHdE0AOrM="; diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 913310ec7a471..dec0e1b453359 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -38,10 +38,17 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-RX3RZ0Mcyda7C7im1r4QgUxTnp95nfpGgQ2HRxr0s64="; }; - patches = [(fetchpatch { - url = "https://github.com/tmux/tmux/commit/2d1afa0e62a24aa7c53ce4fb6f1e35e29d01a904.diff"; - hash = "sha256-mDt5wy570qrUc0clGa3GhZFTKgL0sfnQcWJEJBKAbKs="; - })]; + patches = [ + (fetchpatch { + url = "https://github.com/tmux/tmux/commit/2d1afa0e62a24aa7c53ce4fb6f1e35e29d01a904.diff"; + hash = "sha256-mDt5wy570qrUc0clGa3GhZFTKgL0sfnQcWJEJBKAbKs="; + }) + # this patch is designed for android but FreeBSD exhibits the same error for the same reason + (fetchpatch { + url = "https://github.com/tmux/tmux/commit/4f5a944ae3e8f7a230054b6c0b26f423fa738e71.patch"; + hash = "sha256-HlUeU5ZicPe7Ya8A1HpunxfVOE2BF6jOHq3ZqTuU5RE="; + }) + ]; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/misc/topicctl/default.nix b/pkgs/tools/misc/topicctl/default.nix index 744e4ddaccb16..1b19b83edc8aa 100644 --- a/pkgs/tools/misc/topicctl/default.nix +++ b/pkgs/tools/misc/topicctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "topicctl"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "segmentio"; repo = "topicctl"; rev = "v${version}"; - sha256 = "sha256-S1i2Nv7FQzqCTTjkS5slEI0vdt3kXhVWdtaYyng1GsQ="; + sha256 = "sha256-ZvyMGtsmXnJUGUoC9UciqCpQJsbxykzeRDo+i4ni82o="; }; vendorHash = "sha256-+mnnvdna1g6JE29weOJZmdO3jFp2a75dV9wK2XcWJ9s="; diff --git a/pkgs/tools/misc/unparam/default.nix b/pkgs/tools/misc/unparam/default.nix index 6578f08c59aec..535617b1f12ea 100644 --- a/pkgs/tools/misc/unparam/default.nix +++ b/pkgs/tools/misc/unparam/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "unparam"; - version = "unstable-2023-03-12"; + version = "0-unstable-2024-05-28"; src = fetchFromGitHub { owner = "mvdan"; repo = "unparam"; - rev = "e84e2d14e3b88193890ff95d72ecb81312f36589"; - sha256 = "sha256-kbEdOqX/p/FrNfWQ2WjXX+lERprSV2EI9l+kapHuFi4="; + rev = "8a5130ca722ffad18c95cc467b561f1668b9b0d2"; + hash = "sha256-CYCXTriGUd4bNY6ZPfkX4puE1imcqYHnX1SXVdnXPGM="; }; - vendorHash = "sha256-gEZFAMcr1okqG2IXcS3hDzZKMINohd2JzxezGbzyeBE="; + vendorHash = "sha256-2lNC4V1WQkJdkagIlBu6tj4SA4KJKstHXc+B4emKu6s="; subPackages = [ "." ]; diff --git a/pkgs/tools/misc/vector/Cargo.lock b/pkgs/tools/misc/vector/Cargo.lock index 4362aedcf6158..dfccefda9e01b 100644 --- a/pkgs/tools/misc/vector/Cargo.lock +++ b/pkgs/tools/misc/vector/Cargo.lock @@ -66,7 +66,7 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" dependencies = [ - "getrandom 0.2.14", + "getrandom 0.2.15", "once_cell", "version_check", ] @@ -78,7 +78,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", - "getrandom 0.2.14", + "getrandom 0.2.15", "once_cell", "version_check", "zerocopy", @@ -94,6 +94,21 @@ dependencies = [ ] [[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] name = "allocator-api2" version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -227,9 +242,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "apache-avro" @@ -359,10 +374,11 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.9" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e9eabd7a98fe442131a17c316bd9349c43695e49e730c3c8e12cfb5f4da2693" +checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5" dependencies = [ + "brotli", "flate2", "futures-core", "memchr", @@ -426,21 +442,21 @@ dependencies = [ [[package]] name = "async-graphql" -version = "7.0.3" +version = "7.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261fa27d5bff5afdf7beff291b3bc73f99d1529804c70e51b0fbc51e70b1c6a9" +checksum = "bf338d20ba5bab309f55ce8df95d65ee19446f7737f06f4a64593ab2c6b546ad" dependencies = [ "async-graphql-derive", "async-graphql-parser", "async-graphql-value", "async-stream", "async-trait", - "base64 0.21.7", + "base64 0.22.1", "bytes 1.6.0", "chrono", "fnv", "futures-util", - "http 1.0.0", + "http 1.1.0", "indexmap 2.2.6", "mime", "multer", @@ -457,26 +473,26 @@ dependencies = [ [[package]] name = "async-graphql-derive" -version = "7.0.3" +version = "7.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3188809947798ea6db736715a60cf645ba3b87ea031c710130e1476b48e45967" +checksum = "fc51fd6b7102acda72bc94e8ae1543844d5688ff394a6cf7c21f2a07fe2d64e4" dependencies = [ "Inflector", "async-graphql-parser", "darling 0.20.8", - "proc-macro-crate 1.3.1", - "proc-macro2 1.0.81", + "proc-macro-crate 3.1.0", + "proc-macro2 1.0.85", "quote 1.0.36", - "strum 0.26.1", - "syn 2.0.60", + "strum 0.26.2", + "syn 2.0.66", "thiserror", ] [[package]] name = "async-graphql-parser" -version = "7.0.3" +version = "7.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4e65a0b83027f35b2a5d9728a098bc66ac394caa8191d2c65ed9eb2985cf3d8" +checksum = "75361eefd64e39f89bead4cb45fddbaf60ddb0e7b15fb7c852b6088bcd63071f" dependencies = [ "async-graphql-value", "pest", @@ -486,9 +502,9 @@ dependencies = [ [[package]] name = "async-graphql-value" -version = "7.0.3" +version = "7.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68e40849c29a39012d38bff87bfed431f1ed6c53fbec493294c1045d61a7ae75" +checksum = "c1f665d2d52b41c4ed1f01c43f3ef27a2fe0af2452ed5c8bc7ac9b1a8719afaa" dependencies = [ "bytes 1.6.0", "indexmap 2.2.6", @@ -498,9 +514,9 @@ dependencies = [ [[package]] name = "async-graphql-warp" -version = "7.0.3" +version = "7.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e901ea60bac5613a1c824da04c8e72906cf79efde5c56f657e3a4ac89624b0a5" +checksum = "e400c0f2609939f8cec46d8137f0959a49a4a514458f2a43a4ee0b0f6eb20a36" dependencies = [ "async-graphql", "futures-util", @@ -560,11 +576,11 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.0.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45e900cdcd39bb94a14487d3f7ef92ca222162e6c7c3fe7cb3550ea75fb486ed" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 3.0.1", + "event-listener 5.3.1", "event-listener-strategy", "pin-project-lite", ] @@ -649,9 +665,9 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -689,9 +705,9 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -706,9 +722,9 @@ version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -724,17 +740,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] name = "autocfg" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1051,9 +1056,9 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58b56f1cbe6fd4d0c2573df72868f20ab1c125ca9c9dbce17927a463433a2e57" +checksum = "31eed8d45759b2c5fe7fd304dd70739060e9e0de509209036eabea14d0720cce" dependencies = [ "aws-credential-types", "aws-smithy-eventstream", @@ -1065,7 +1070,7 @@ dependencies = [ "hex", "hmac", "http 0.2.9", - "http 1.0.0", + "http 1.1.0", "once_cell", "percent-encoding", "sha2", @@ -1158,9 +1163,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.4.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cf64e73ef8d4dac6c933230d56d136b75b252edcf82ed36e37d603090cd7348" +checksum = "db83b08939838d18e33b5dbaf1a0f048f28c10bd28071ab7ce6f245451855414" dependencies = [ "aws-smithy-async", "aws-smithy-http", @@ -1172,6 +1177,7 @@ dependencies = [ "http 0.2.9", "http-body 0.4.5", "http-body 1.0.0", + "httparse", "hyper 0.14.28", "hyper-rustls 0.24.2", "once_cell", @@ -1184,15 +1190,15 @@ dependencies = [ [[package]] name = "aws-smithy-runtime-api" -version = "1.5.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c19fdae6e3d5ac9cd01f2d6e6c359c5f5a3e028c2d148a8f5b90bf3399a18a7" +checksum = "1b570ea39eb95bd32543f6e4032bce172cb6209b9bc8c83c770d08169e875afc" dependencies = [ "aws-smithy-async", "aws-smithy-types", "bytes 1.6.0", "http 0.2.9", - "http 1.0.0", + "http 1.1.0", "pin-project-lite", "tokio", "tracing 0.1.40", @@ -1201,15 +1207,15 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.1.8" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abe14dceea1e70101d38fbf2a99e6a34159477c0fb95e68e05c66bd7ae4c3729" +checksum = "cfe321a6b21f5d8eabd0ade9c55d3d0335f3c3157fc2b3e87f05f34b539e4df5" dependencies = [ "base64-simd", "bytes 1.6.0", "bytes-utils", "http 0.2.9", - "http 1.0.0", + "http 1.1.0", "http-body 0.4.5", "http-body 1.0.0", "http-body-util", @@ -1233,9 +1239,9 @@ dependencies = [ [[package]] name = "aws-types" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a43b56df2c529fe44cb4d92bd64d0479883fb9608ff62daede4df5405381814" +checksum = "6f734808d43702a67e57d478a12e227d4d038d0b90c9005a78c87890d3805922" dependencies = [ "aws-credential-types", "aws-smithy-async", @@ -1303,14 +1309,14 @@ dependencies = [ "bytes 1.6.0", "dyn-clone", "futures 0.3.30", - "getrandom 0.2.14", + "getrandom 0.2.15", "http-types", "log", "paste", "pin-project", "quick-xml", "rand 0.8.5", - "reqwest", + "reqwest 0.11.26", "rustc_version 0.4.0", "serde", "serde_json", @@ -1325,7 +1331,7 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bd7ea32ca7eb66ff4757f83baac702ff11d469e5de365b6bc6f79f9c25d3436" dependencies = [ - "async-lock 3.0.0", + "async-lock 3.4.0", "async-trait", "azure_core", "futures 0.3.30", @@ -1388,7 +1394,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" dependencies = [ - "getrandom 0.2.14", + "getrandom 0.2.15", "instant", "rand 0.8.5", ] @@ -1507,12 +1513,12 @@ checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "bitmask-enum" -version = "2.2.3" +version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9990737a6d5740ff51cdbbc0f0503015cb30c390f6623968281eb214a520cfc0" +checksum = "afb15541e888071f64592c0b4364fdff21b7cb0a247f984296699351963a8721" dependencies = [ "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -1584,7 +1590,7 @@ dependencies = [ "futures-util", "hex", "home", - "http 1.0.0", + "http 1.1.0", "http-body-util", "hyper 1.2.0", "hyper-named-pipe", @@ -1640,13 +1646,34 @@ checksum = "f404657a7ea7b5249e36808dff544bc88a28f26e0ac40009f674b7a009d14be3" dependencies = [ "once_cell", "proc-macro-crate 2.0.0", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", "syn_derive", ] [[package]] +name = "brotli" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6221fe77a248b9117d431ad93761222e1cf8ff282d9d1d5d9f53d6299a1cf76" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] name = "bson" version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1712,7 +1739,7 @@ version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "syn 1.0.109", ] @@ -1765,39 +1792,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" [[package]] -name = "cached" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a7d38ed2761b8a13ce42bc44b09d5a052b88da2f9fead624c779f31ac0729a" -dependencies = [ - "ahash 0.8.11", - "cached_proc_macro", - "cached_proc_macro_types", - "hashbrown 0.14.5", - "instant", - "once_cell", - "thiserror", -] - -[[package]] -name = "cached_proc_macro" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771aa57f3b17da6c8bcacb187bb9ec9bc81c8160e72342e67c329e0e1651a669" -dependencies = [ - "darling 0.20.8", - "proc-macro2 1.0.81", - "quote 1.0.36", - "syn 2.0.60", -] - -[[package]] -name = "cached_proc_macro_types" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0" - -[[package]] name = "cargo_toml" version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2016,24 +2010,9 @@ dependencies = [ [[package]] name = "clap" -version = "2.34.0" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags 1.3.2", - "strsim 0.8.0", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "clap" -version = "4.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" dependencies = [ "clap_builder", "clap_derive", @@ -2045,15 +2024,15 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb9b20c0dd58e4c2e991c8d203bbeb76c11304d1011659686b5b644bc29aa478" dependencies = [ - "clap 4.5.4", + "clap", "log", ] [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" dependencies = [ "anstream", "anstyle", @@ -2064,23 +2043,23 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.2" +version = "4.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79504325bf38b10165b02e89b4347300f855f273c4cb30c4a3209e6583275e" +checksum = "d2020fa13af48afc65a9a87335bda648309ab3d154cd03c7ff95b378c7ed39c4" dependencies = [ - "clap 4.5.4", + "clap", ] [[package]] name = "clap_derive" -version = "4.5.4" +version = "4.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" dependencies = [ "heck 0.5.0", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -2122,7 +2101,7 @@ dependencies = [ "memchr", "once_cell", "ordered-float 4.2.0", - "prost 0.12.4", + "prost 0.12.6", "prost-reflect", "regex", "rstest", @@ -2227,9 +2206,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.3.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -2261,22 +2240,22 @@ dependencies = [ [[package]] name = "console-api" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd326812b3fd01da5bb1af7d340d0d555fd3d4b641e7f1dfcf5962a902952787" +checksum = "a257c22cd7e487dd4a13d413beabc512c5052f0bc048db0da6a84c3d8a6142fd" dependencies = [ "futures-core", - "prost 0.12.4", - "prost-types 0.12.4", - "tonic", + "prost 0.12.6", + "prost-types 0.12.6", + "tonic 0.11.0", "tracing-core 0.1.32", ] [[package]] name = "console-subscriber" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7481d4c57092cd1c19dd541b92bdce883de840df30aa5d03fd48a3935c01842e" +checksum = "31c4cc54bae66f7d9188996404abdf7fdfa23034ef8e43478c8810828abad758" dependencies = [ "console-api", "crossbeam-channel", @@ -2284,13 +2263,14 @@ dependencies = [ "futures-task", "hdrhistogram", "humantime", - "prost-types 0.12.4", + "prost 0.12.6", + "prost-types 0.12.6", "serde", "serde_json", "thread_local", "tokio", "tokio-stream", - "tonic", + "tonic 0.11.0", "tracing 0.1.40", "tracing-core 0.1.32", "tracing-subscriber", @@ -2389,9 +2369,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] @@ -2405,7 +2385,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.5.4", + "clap", "criterion-plot", "futures 0.3.30", "is-terminal", @@ -2479,9 +2459,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crossterm" @@ -2606,9 +2586,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -2639,7 +2619,7 @@ checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "strsim 0.10.0", "syn 1.0.109", @@ -2653,10 +2633,10 @@ checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "strsim 0.10.0", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -2678,7 +2658,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core 0.20.8", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -2714,15 +2694,15 @@ checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" [[package]] name = "databend-client" -version = "0.17.1" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "123d9b08aefcdce56e2379487198c1fb8c439cedf6c31d16c3974f0f9d3e282f" +checksum = "8afe21f4ac2e61c9360d5c1b7cce3ed4392c2a42c6c1dbb1115cc27f25f23b78" dependencies = [ "async-trait", "log", "once_cell", "percent-encoding", - "reqwest", + "reqwest 0.12.4", "serde", "serde_json", "tokio", @@ -2791,7 +2771,7 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "syn 1.0.109", ] @@ -2802,9 +2782,9 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -2814,7 +2794,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case 0.4.0", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "rustc_version 0.4.0", "syn 1.0.109", @@ -2887,6 +2867,17 @@ dependencies = [ ] [[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2 1.0.85", + "quote 1.0.36", + "syn 2.0.66", +] + +[[package]] name = "dns-lookup" version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2929,6 +2920,24 @@ dependencies = [ ] [[package]] +name = "domain" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eefe29e8dd614abbee51a1616654cab123c4c56850ab83f5b7f1e1f9977bf7c" +dependencies = [ + "bytes 1.6.0", + "futures-util", + "moka", + "octseq", + "rand 0.8.5", + "serde", + "smallvec", + "time", + "tokio", + "tracing 0.1.40", +] + +[[package]] name = "duct" version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3040,9 +3049,9 @@ checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", "serde", @@ -3071,7 +3080,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "syn 1.0.109", ] @@ -3083,9 +3092,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -3095,29 +3104,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd" dependencies = [ "once_cell", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "enumflags2" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" dependencies = [ "enumflags2_derive", ] [[package]] name = "enumflags2_derive" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -3217,12 +3226,23 @@ dependencies = [ ] [[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] name = "event-listener-strategy" -version = "0.3.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 3.0.1", + "event-listener 5.3.1", "pin-project-lite", ] @@ -3524,9 +3544,9 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -3591,9 +3611,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -3636,7 +3656,7 @@ dependencies = [ "arc-swap", "futures 0.3.30", "log", - "reqwest", + "reqwest 0.11.26", "serde", "serde_derive", "serde_json", @@ -3705,7 +3725,7 @@ dependencies = [ "graphql-parser", "heck 0.4.1", "lazy_static", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "serde", "serde_json", @@ -3719,7 +3739,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83febfa838f898cfa73dfaa7a8eb69ff3409021ac06ee94cfb3d622f6eeb1a97" dependencies = [ "graphql_client_codegen", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "syn 1.0.109", ] @@ -3728,12 +3748,12 @@ name = "greptime-proto" version = "0.1.0" source = "git+https://github.com/GreptimeTeam/greptime-proto.git?tag=v0.4.1#4306ab645ee55b3f7f2ad3fb7acc5820f967c1aa" dependencies = [ - "prost 0.12.4", + "prost 0.12.6", "serde", "serde_json", "strum 0.25.0", "strum_macros 0.25.3", - "tonic", + "tonic 0.10.2", "tonic-build 0.10.2", ] @@ -3748,12 +3768,12 @@ dependencies = [ "futures-util", "greptime-proto", "parking_lot", - "prost 0.12.4", + "prost 0.12.6", "rand 0.8.5", "snafu 0.7.5", "tokio", "tokio-stream", - "tonic", + "tonic 0.10.2", "tonic-build 0.9.2", "tower", ] @@ -3800,16 +3820,16 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" dependencies = [ + "atomic-waker", "bytes 1.6.0", "fnv", "futures-core", "futures-sink", - "futures-util", - "http 1.0.0", + "http 1.1.0", "indexmap 2.2.6", "slab", "tokio", @@ -3897,15 +3917,6 @@ dependencies = [ [[package]] name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "heck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" @@ -4042,15 +4053,6 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" @@ -4147,9 +4149,9 @@ dependencies = [ [[package]] name = "http" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes 1.6.0", "fnv", @@ -4174,7 +4176,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ "bytes 1.6.0", - "http 1.0.0", + "http 1.1.0", ] [[package]] @@ -4185,7 +4187,7 @@ checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" dependencies = [ "bytes 1.6.0", "futures-util", - "http 1.0.0", + "http 1.1.0", "http-body 1.0.0", "pin-project-lite", ] @@ -4278,7 +4280,7 @@ dependencies = [ "bytes 1.6.0", "futures-channel", "futures-util", - "http 1.0.0", + "http 1.1.0", "http-body 1.0.0", "httparse", "itoa", @@ -4361,7 +4363,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" dependencies = [ "futures-util", - "http 1.0.0", + "http 1.1.0", "hyper 1.2.0", "hyper-util", "log", @@ -4407,7 +4409,7 @@ dependencies = [ "bytes 1.6.0", "futures-channel", "futures-util", - "http 1.0.0", + "http 1.1.0", "http-body 1.0.0", "hyper 1.2.0", "pin-project-lite", @@ -4457,6 +4459,124 @@ dependencies = [ ] [[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2 1.0.85", + "quote 1.0.36", + "syn 2.0.66", +] + +[[package]] name = "ident_case" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4475,6 +4595,16 @@ dependencies = [ [[package]] name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" @@ -4494,6 +4624,18 @@ dependencies = [ ] [[package]] +name = "idna" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed" +dependencies = [ + "icu_normalizer", + "icu_properties", + "smallvec", + "utf8_iter", +] + +[[package]] name = "indexmap" version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4543,9 +4685,9 @@ checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" [[package]] name = "infer" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb33622da908807a06f9513c19b3c1ad50fab3e4137d82a78107d502075aa199" +checksum = "bc150e5ce2330295b8616ce0e3f53250e53af31759a9dbedad1621ba29151847" [[package]] name = "inotify" @@ -4598,7 +4740,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi", "libc", "windows-sys 0.48.0", ] @@ -4621,7 +4763,7 @@ dependencies = [ "socket2 0.5.7", "widestring 1.0.2", "windows-sys 0.48.0", - "winreg", + "winreg 0.50.0", ] [[package]] @@ -4648,7 +4790,7 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi", "rustix 0.38.31", "windows-sys 0.48.0", ] @@ -4687,6 +4829,15 @@ dependencies = [ ] [[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] name = "itoa" version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4766,7 +4917,7 @@ dependencies = [ "k8s-test-framework", "rand 0.8.5", "regex", - "reqwest", + "reqwest 0.11.26", "serde_json", "tokio", "tracing 0.1.40", @@ -5002,9 +5153,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.154" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libflate" @@ -5087,6 +5238,12 @@ dependencies = [ ] [[package]] +name = "litemap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" + +[[package]] name = "lock_api" version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5120,9 +5277,9 @@ version = "0.1.0" dependencies = [ "bytes 1.6.0", "chrono", - "prost 0.12.4", - "prost-build 0.12.4", - "prost-types 0.12.4", + "prost 0.12.6", + "prost-build 0.12.6", + "prost-types 0.12.6", "snap", ] @@ -5334,9 +5491,9 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -5419,9 +5576,9 @@ dependencies = [ [[package]] name = "mlua" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9bed6bce296397a9d6a86f995dd10a547a4e6949825d45225906bdcbfe7367" +checksum = "e340c022072f3208a4105458286f4985ba5355bfe243c3073afe45cbe9ecf491" dependencies = [ "bstr 1.9.1", "mlua-sys", @@ -5433,9 +5590,9 @@ dependencies = [ [[package]] name = "mlua-sys" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2847b42764435201d8cbee1f517edb79c4cca4181877b90047587c89e1b7bce4" +checksum = "5552e7e4e22ada0463dfdeee6caf6dc057a189fdc83136408a8f950a5e5c5540" dependencies = [ "cc", "cfg-if", @@ -5446,24 +5603,48 @@ dependencies = [ [[package]] name = "mlua_derive" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaade5f94e5829db58791664ba98f35fea6a3ffebc783becb51dc97c7a21abee" +checksum = "09697a6cec88e7f58a02c7ab5c18c611c6907c8654613df9cc0192658a4fb859" dependencies = [ "itertools 0.12.1", "once_cell", "proc-macro-error", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "regex", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "mock_instant" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c356644192565524790740e4075307c2cfc26d04d2543fb8e3ab9ef43a115ec" +checksum = "cdcebb6db83796481097dedc7747809243cc81d9ed83e6a938b76d4ea0b249cf" + +[[package]] +name = "moka" +version = "0.12.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e0d88686dc561d743b40de8269b26eaf0dc58781bde087b0984646602021d08" +dependencies = [ + "async-lock 3.4.0", + "async-trait", + "crossbeam-channel", + "crossbeam-epoch", + "crossbeam-utils", + "event-listener 5.3.1", + "futures-util", + "once_cell", + "parking_lot", + "quanta 0.12.3", + "rustc_version 0.4.0", + "smallvec", + "tagptr", + "thiserror", + "triomphe", + "uuid", +] [[package]] name = "mongodb" @@ -5509,7 +5690,7 @@ dependencies = [ "trust-dns-resolver", "typed-builder 0.10.0", "uuid", - "webpki-roots", + "webpki-roots 0.25.2", ] [[package]] @@ -5521,7 +5702,7 @@ dependencies = [ "bytes 1.6.0", "encoding_rs", "futures-util", - "http 1.0.0", + "http 1.1.0", "httparse", "log", "memchr", @@ -5650,7 +5831,7 @@ dependencies = [ "data-encoding", "ed25519", "ed25519-dalek", - "getrandom 0.2.14", + "getrandom 0.2.15", "log", "rand 0.8.5", "signatory", @@ -5665,7 +5846,7 @@ dependencies = [ "data-encoding", "ed25519", "ed25519-dalek", - "getrandom 0.2.14", + "getrandom 0.2.15", "log", "rand 0.8.5", "signatory", @@ -5839,9 +6020,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", "libm", @@ -5853,7 +6034,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi", "libc", ] @@ -5891,7 +6072,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "syn 1.0.109", ] @@ -5903,9 +6084,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -5914,10 +6095,10 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 2.0.0", - "proc-macro2 1.0.81", + "proc-macro-crate 3.1.0", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -5943,10 +6124,10 @@ checksum = "c38841cdd844847e3e7c8d29cef9dcfed8877f8f56f9071f77843ecf3baf937f" dependencies = [ "base64 0.13.1", "chrono", - "getrandom 0.2.14", + "getrandom 0.2.15", "http 0.2.9", "rand 0.8.5", - "reqwest", + "reqwest 0.11.26", "serde", "serde_json", "serde_path_to_error", @@ -5974,6 +6155,17 @@ dependencies = [ ] [[package]] +name = "octseq" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ed2eaec452d98ccc1c615dd843fd039d9445f2fb4da114ee7e6af5fcb68be98" +dependencies = [ + "bytes 1.6.0", + "serde", + "smallvec", +] + +[[package]] name = "ofb" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6036,14 +6228,14 @@ dependencies = [ "chrono", "flagset", "futures 0.3.30", - "getrandom 0.2.14", + "getrandom 0.2.15", "http 0.2.9", "log", "md-5", "once_cell", "percent-encoding", "quick-xml", - "reqwest", + "reqwest 0.11.26", "serde", "serde_json", "tokio", @@ -6103,9 +6295,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -6116,9 +6308,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.2.3+3.2.1" +version = "300.3.1+3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" +checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91" dependencies = [ "cc", ] @@ -6144,9 +6336,9 @@ dependencies = [ "chrono", "hex", "ordered-float 4.2.0", - "prost 0.12.4", - "prost-build 0.12.4", - "tonic", + "prost 0.12.6", + "prost-build 0.12.6", + "tonic 0.10.2", "tonic-build 0.10.2", "vector-core", "vector-lookup", @@ -6220,6 +6412,12 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owo-colors" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" + +[[package]] +name = "owo-colors" version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f" @@ -6268,9 +6466,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -6306,9 +6504,9 @@ checksum = "13242a5ce97f39a8095d03c8b273e91d09f2690c0b7d69a2af844941115bab24" [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pbkdf2" @@ -6361,9 +6559,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.7" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "219c0dcc30b6a27553f9cc242972b67f75b60eb0db71f0b5462f38b058c41546" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" dependencies = [ "memchr", "thiserror", @@ -6388,9 +6586,9 @@ checksum = "1381c29a877c6d34b8c176e734f35d7f7f5b3adaefe940cb4d1bb7af94678e2e" dependencies = [ "pest", "pest_meta", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -6476,16 +6674,16 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -6728,14 +6926,13 @@ dependencies = [ [[package]] name = "prettydiff" -version = "0.6.4" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff1fec61082821f8236cf6c0c14e8172b62ce8a72a0eedc30d3b247bb68dc11" +checksum = "abec3fb083c10660b3854367697da94c674e9e82aa7511014dc958beeb7215e9" dependencies = [ - "ansi_term", + "owo-colors 3.5.0", "pad", "prettytable-rs", - "structopt", ] [[package]] @@ -6744,7 +6941,7 @@ version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "syn 1.0.109", ] @@ -6754,8 +6951,8 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ - "proc-macro2 1.0.81", - "syn 2.0.60", + "proc-macro2 1.0.85", + "syn 2.0.66", ] [[package]] @@ -6801,13 +6998,22 @@ dependencies = [ ] [[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + +[[package]] name = "proc-macro-error" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "syn 1.0.109", "version_check", @@ -6819,7 +7025,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "version_check", ] @@ -6847,9 +7053,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] @@ -6861,9 +7067,9 @@ dependencies = [ "indexmap 2.2.6", "nom", "num_enum 0.7.2", - "prost 0.12.4", - "prost-build 0.12.4", - "prost-types 0.12.4", + "prost 0.12.6", + "prost-build 0.12.6", + "prost-types 0.12.6", "snafu 0.7.5", "vector-common", ] @@ -6894,7 +7100,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cf16337405ca084e9c78985114633b6827711d22b9e6ef6c6c0d665eb3f0b6e" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "syn 1.0.109", ] @@ -6911,12 +7117,12 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes 1.6.0", - "prost-derive 0.12.4", + "prost-derive 0.12.6", ] [[package]] @@ -6943,9 +7149,9 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80b776a1b2dc779f5ee0641f8ade0125bc1298dd41a9a0c16d8bd57b42d222b1" +checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" dependencies = [ "bytes 1.6.0", "heck 0.5.0", @@ -6955,10 +7161,10 @@ dependencies = [ "once_cell", "petgraph", "prettyplease 0.2.15", - "prost 0.12.4", - "prost-types 0.12.4", + "prost 0.12.6", + "prost-types 0.12.6", "regex", - "syn 2.0.60", + "syn 2.0.66", "tempfile", ] @@ -6970,22 +7176,22 @@ checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", "itertools 0.10.5", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "syn 1.0.109", ] [[package]] name = "prost-derive" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", "itertools 0.12.1", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -6996,8 +7202,8 @@ checksum = "6f5eec97d5d34bdd17ad2db2219aabf46b054c6c41bd5529767c9ce55be5898f" dependencies = [ "base64 0.22.1", "once_cell", - "prost 0.12.4", - "prost-types 0.12.4", + "prost 0.12.6", + "prost-types 0.12.6", "serde", "serde-value", ] @@ -7013,11 +7219,11 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3235c33eb02c1f1e212abdbe34c78b264b038fb58ca612664343271e36e55ffe" +checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" dependencies = [ - "prost 0.12.4", + "prost 0.12.6", ] [[package]] @@ -7050,16 +7256,26 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "syn 1.0.109", ] [[package]] +name = "publicsuffix" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457" +dependencies = [ + "idna 0.3.0", + "psl-types", +] + +[[package]] name = "pulsar" -version = "6.1.0" +version = "6.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d21c6a837986cf25d22ac5b951c267d95808f3c830ff009c2879fff259a0268" +checksum = "d7f3541ff84e39da334979ac4bf171e0f277f4f782603aeae65bf5795dc7275a" dependencies = [ "async-trait", "bit-vec", @@ -7164,7 +7380,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "syn 1.0.109", ] @@ -7184,7 +7400,7 @@ version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", ] [[package]] @@ -7268,7 +7484,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.14", + "getrandom 0.2.15", ] [[package]] @@ -7301,21 +7517,21 @@ dependencies = [ [[package]] name = "ratatui" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a564a852040e82671dc50a37d88f3aa83bbc690dfc6844cfe7a2591620206a80" +checksum = "f44c9e68fd46eda15c646fbb85e1040b657a58cdc8c98db1d97a55930d991eef" dependencies = [ "bitflags 2.4.1", "cassowary", "compact_str", "crossterm", - "indoc", "itertools 0.12.1", "lru", "paste", "stability", - "strum 0.26.1", + "strum 0.26.2", "unicode-segmentation", + "unicode-truncate", "unicode-width", ] @@ -7471,16 +7687,16 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.14", + "getrandom 0.2.15", "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.10.4" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -7568,7 +7784,6 @@ dependencies = [ "js-sys", "log", "mime", - "mime_guess", "native-tls", "once_cell", "percent-encoding", @@ -7590,8 +7805,52 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots", - "winreg", + "webpki-roots 0.25.2", + "winreg 0.50.0", +] + +[[package]] +name = "reqwest" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +dependencies = [ + "base64 0.22.1", + "bytes 1.6.0", + "futures-core", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.2.0", + "hyper-rustls 0.26.0", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "mime_guess", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls 0.22.4", + "rustls-pemfile 2.1.0", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tokio-rustls 0.25.0", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "webpki-roots 0.26.1", + "winreg 0.52.0", ] [[package]] @@ -7627,7 +7886,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" dependencies = [ "cc", - "getrandom 0.2.14", + "getrandom 0.2.15", "libc", "spin 0.9.8", "untrusted", @@ -7658,7 +7917,7 @@ version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "syn 1.0.109", ] @@ -7705,9 +7964,9 @@ dependencies = [ [[package]] name = "roaring" -version = "0.10.4" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b26f4c25a604fcb3a1bcd96dd6ba37c93840de95de8198d94c0d571a74a804d1" +checksum = "7699249cc2c7d71939f30868f47e9d7add0bdc030d90ee10bfd16887ff8bb1c8" dependencies = [ "bytemuck", "byteorder", @@ -7715,9 +7974,9 @@ dependencies = [ [[package]] name = "roxmltree" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" +checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" [[package]] name = "rsa" @@ -7741,9 +8000,9 @@ dependencies = [ [[package]] name = "rstest" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5316d2a1479eeef1ea21e7f9ddc67c191d497abc8fc3ba2467857abbb68330" +checksum = "9afd55a67069d6e434a95161415f5beeada95a01c7b815508a82dcb0e1593682" dependencies = [ "futures 0.3.30", "futures-timer", @@ -7753,18 +8012,19 @@ dependencies = [ [[package]] name = "rstest_macros" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04a9df72cc1f67020b0d63ad9bfe4a323e459ea7eb68e03bd9824db49f9a4c25" +checksum = "4165dfae59a39dd41d8dec720d3cbfbc71f69744efb480a3920f5d4e0cc6798d" dependencies = [ "cfg-if", "glob", - "proc-macro2 1.0.81", + "proc-macro-crate 3.1.0", + "proc-macro2 1.0.85", "quote 1.0.36", "regex", "relative-path", "rustc_version 0.4.0", - "syn 2.0.60", + "syn 2.0.66", "unicode-ident", ] @@ -7829,7 +8089,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.22", + "semver 1.0.23", ] [[package]] @@ -8005,9 +8265,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "salsa20" @@ -8029,9 +8289,9 @@ dependencies = [ [[package]] name = "sasl2-sys" -version = "0.1.20+2.1.28" +version = "0.1.22+2.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e645bd98535fc8fd251c43ba7c7c1f9be1e0369c99b6a5ea719052a773e655c" +checksum = "05f2a7f7efd9fc98b3a9033272df10709f5ee3fa0eabbd61a527a3a1ed6bd3c6" dependencies = [ "cc", "duct", @@ -8144,9 +8404,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" dependencies = [ "serde", ] @@ -8159,18 +8419,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.200" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde-toml-merge" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88075e75b01384301454b1c188243552c674263c0c0c3c7ed5dd82291b20798f" +checksum = "93b4e415d6bff989e5e48649ca9b8b4d4997cb069a0c90a84bfd38c7df5e3968" dependencies = [ "toml", ] @@ -8207,31 +8467,31 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.200" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "serde_derive_internals" -version = "0.29.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "indexmap 2.2.6", "itoa", @@ -8284,16 +8544,16 @@ version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -8345,7 +8605,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" dependencies = [ "darling 0.13.4", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "syn 1.0.109", ] @@ -8357,9 +8617,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" dependencies = [ "darling 0.20.8", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -8624,7 +8884,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "syn 1.0.109", ] @@ -8636,9 +8896,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "080c44971436b1af15d6f61ddd8b543995cf63ab8e677d46b00cc06f4ef267a0" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -8708,10 +8968,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ff9eaf853dec4c8802325d8b6d3dffa86cc707fd7a1a4cdbf416e13b061787a" dependencies = [ "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] name = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8769,12 +9035,6 @@ dependencies = [ [[package]] name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "strsim" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" @@ -8786,30 +9046,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" [[package]] -name = "structopt" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" -dependencies = [ - "clap 2.34.0", - "lazy_static", - "structopt-derive", -] - -[[package]] -name = "structopt-derive" -version = "0.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" -dependencies = [ - "heck 0.3.3", - "proc-macro-error", - "proc-macro2 1.0.81", - "quote 1.0.36", - "syn 1.0.109", -] - -[[package]] name = "strum" version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8817,9 +9053,9 @@ checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" [[package]] name = "strum" -version = "0.26.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" dependencies = [ "strum_macros 0.26.1", ] @@ -8831,10 +9067,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "rustversion", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -8844,10 +9080,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "rustversion", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -8883,18 +9119,18 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.60" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "unicode-ident", ] @@ -8906,9 +9142,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -8918,6 +9154,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2 1.0.85", + "quote 1.0.36", + "syn 2.0.66", +] + +[[package]] name = "syslog" version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8962,6 +9209,12 @@ dependencies = [ ] [[package]] +name = "tagptr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" + +[[package]] name = "take_mut" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -9051,32 +9304,23 @@ dependencies = [ ] [[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] name = "thiserror" -version = "1.0.59" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.59" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -9151,6 +9395,16 @@ dependencies = [ ] [[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + +[[package]] name = "tinytemplate" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -9177,9 +9431,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes 1.6.0", @@ -9218,13 +9472,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -9374,21 +9628,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.8", + "toml_edit 0.22.14", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] @@ -9417,9 +9671,20 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.8" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c12219811e0c1ba077867254e5ad62ee2c9c190b0d957110750ac0cda1ae96cd" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.2.6", + "toml_datetime", + "winnow 0.5.18", +] + +[[package]] +name = "toml_edit" +version = "0.22.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" dependencies = [ "indexmap 2.2.6", "serde", @@ -9447,7 +9712,7 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project", - "prost 0.12.4", + "prost 0.12.6", "rustls 0.21.11", "rustls-native-certs 0.6.3", "rustls-pemfile 1.0.3", @@ -9461,13 +9726,40 @@ dependencies = [ ] [[package]] +name = "tonic" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" +dependencies = [ + "async-stream", + "async-trait", + "axum", + "base64 0.21.7", + "bytes 1.6.0", + "h2 0.3.26", + "http 0.2.9", + "http-body 0.4.5", + "hyper 0.14.28", + "hyper-timeout", + "percent-encoding", + "pin-project", + "prost 0.12.6", + "tokio", + "tokio-stream", + "tower", + "tower-layer", + "tower-service", + "tracing 0.1.40", +] + +[[package]] name = "tonic-build" version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07" dependencies = [ "prettyplease 0.1.25", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "prost-build 0.11.9", "quote 1.0.36", "syn 1.0.109", @@ -9480,10 +9772,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889" dependencies = [ "prettyplease 0.2.15", - "proc-macro2 1.0.81", - "prost-build 0.12.4", + "proc-macro2 1.0.85", + "prost-build 0.12.6", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -9584,9 +9876,9 @@ version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -9713,6 +10005,12 @@ dependencies = [ ] [[package]] +name = "triomphe" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b2cb4fbb9995eeb36ac86fadf24031ccd58f99d6b4b2d7b911db70bddb80d90" + +[[package]] name = "trust-dns-proto" version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -9791,7 +10089,7 @@ dependencies = [ "byteorder", "bytes 1.6.0", "data-encoding", - "http 1.0.0", + "http 1.1.0", "httparse", "log", "rand 0.8.5", @@ -9817,7 +10115,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "syn 1.0.109", ] @@ -9837,9 +10135,9 @@ version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f03ca4cb38206e2bef0700092660bb74d696f808514dae47fa1467cbfe26e96e" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -9867,9 +10165,9 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac73887f47b9312552aa90ef477927ff014d63d1920ca8037c6c1951eab64bb1" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -9944,6 +10242,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] +name = "unicode-truncate" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5fbabedabe362c618c714dbefda9927b5afc8e2a8102f47f081089a9019226" +dependencies = [ + "itertools 0.12.1", + "unicode-width", +] + +[[package]] name = "unicode-width" version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -10005,12 +10313,12 @@ dependencies = [ [[package]] name = "url" -version = "2.5.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56" dependencies = [ "form_urlencoded", - "idna 0.5.0", + "idna 1.0.0", "percent-encoding", "serde", ] @@ -10028,12 +10336,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] name = "utf8-width" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" [[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + +[[package]] name = "utf8parse" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -10046,7 +10366,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "atomic", - "getrandom 0.2.14", + "getrandom 0.2.15", "rand 0.8.5", "serde", "wasm-bindgen", @@ -10069,9 +10389,8 @@ name = "vdev" version = "0.1.0" dependencies = [ "anyhow", - "cached", "chrono", - "clap 4.5.4", + "clap", "clap-verbosity-flag", "clap_complete", "confy", @@ -10081,14 +10400,14 @@ dependencies = [ "hex", "indexmap 2.2.6", "indicatif", - "itertools 0.12.1", + "itertools 0.13.0", "log", "once_cell", "os_info", - "owo-colors", + "owo-colors 4.0.0", "paste", "regex", - "reqwest", + "reqwest 0.11.26", "serde", "serde_json", "serde_yaml 0.9.34+deprecated", @@ -10098,14 +10417,8 @@ dependencies = [ ] [[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] name = "vector" -version = "0.38.0" +version = "0.39.0" dependencies = [ "apache-avro", "approx", @@ -10150,7 +10463,7 @@ dependencies = [ "chrono", "chrono-tz", "cidr-utils 0.6.1", - "clap 4.5.4", + "clap", "colored", "console-subscriber", "criterion", @@ -10173,7 +10486,7 @@ dependencies = [ "governor", "greptimedb-client", "grok", - "h2 0.4.4", + "h2 0.4.5", "hash_hasher", "hashbrown 0.14.5", "headers", @@ -10189,10 +10502,10 @@ dependencies = [ "hyper-proxy", "indexmap 2.2.6", "indoc", - "infer 0.15.0", + "infer 0.16.0", "inventory", "ipnet", - "itertools 0.12.1", + "itertools 0.13.0", "k8s-openapi 0.18.0", "kube", "lapin", @@ -10225,10 +10538,11 @@ dependencies = [ "portpicker", "postgres-openssl", "proptest", - "prost 0.12.4", - "prost-build 0.12.4", + "proptest-derive", + "prost 0.12.6", + "prost-build 0.12.6", "prost-reflect", - "prost-types 0.12.4", + "prost-types 0.12.6", "pulsar", "quickcheck", "rand 0.8.5", @@ -10237,21 +10551,20 @@ dependencies = [ "rdkafka", "redis", "regex", - "reqwest", + "reqwest 0.11.26", "rmp-serde", "rmpv", "roaring", "rstest", "rumqttc", "seahash", - "semver 1.0.22", + "semver 1.0.23", "serde", "serde-toml-merge", "serde_bytes", "serde_json", "serde_with 3.8.1", "serde_yaml 0.9.34+deprecated", - "sha2", "similar-asserts", "smallvec", "smpl_jwt", @@ -10272,7 +10585,7 @@ dependencies = [ "tokio-tungstenite 0.20.1", "tokio-util", "toml", - "tonic", + "tonic 0.10.2", "tonic-build 0.10.2", "tower", "tower-http", @@ -10301,11 +10614,11 @@ version = "0.1.2" dependencies = [ "anyhow", "chrono", - "clap 4.5.4", + "clap", "futures 0.3.30", "graphql_client", "indoc", - "reqwest", + "reqwest 0.11.26", "serde", "serde_json", "tokio", @@ -10324,7 +10637,7 @@ dependencies = [ "async-trait", "bytecheck", "bytes 1.6.0", - "clap 4.5.4", + "clap", "crc32fast", "criterion", "crossbeam-queue", @@ -10427,11 +10740,11 @@ dependencies = [ "convert_case 0.6.0", "darling 0.20.8", "once_cell", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "serde", "serde_json", - "syn 2.0.60", + "syn 2.0.66", "tracing 0.1.40", ] @@ -10440,11 +10753,11 @@ name = "vector-config-macros" version = "0.1.0" dependencies = [ "darling 0.20.8", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", "serde", "serde_derive_internals", - "syn 2.0.60", + "syn 2.0.66", "vector-config", "vector-config-common", ] @@ -10489,9 +10802,9 @@ dependencies = [ "parking_lot", "pin-project", "proptest", - "prost 0.12.4", - "prost-build 0.12.4", - "prost-types 0.12.4", + "prost 0.12.6", + "prost-build 0.12.6", + "prost-types 0.12.6", "quanta 0.12.3", "quickcheck", "quickcheck_macros", @@ -10515,7 +10828,7 @@ dependencies = [ "tokio-test", "tokio-util", "toml", - "tonic", + "tonic 0.10.2", "tracing 0.1.40", "tracing-core 0.1.32", "tracing-subscriber", @@ -10584,7 +10897,7 @@ dependencies = [ name = "vector-vrl-cli" version = "0.1.0" dependencies = [ - "clap 4.5.4", + "clap", "vector-vrl-functions", "vrl", ] @@ -10603,7 +10916,7 @@ dependencies = [ "ansi_term", "chrono", "chrono-tz", - "clap 4.5.4", + "clap", "enrichment", "glob", "prettydiff", @@ -10622,7 +10935,7 @@ version = "0.1.0" dependencies = [ "cargo_toml", "enrichment", - "getrandom 0.2.14", + "getrandom 0.2.15", "gloo-utils", "serde", "serde-wasm-bindgen", @@ -10645,9 +10958,9 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] name = "vrl" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82cfcc99d9936dc2a8645f049122a5c5d137b066d0ffc48f01203ab2f102ed62" +checksum = "6a714e10e3f6bac2ef76935b9281cc7434cc6f85f6ddab644383454555b63346" dependencies = [ "aes", "ansi_term", @@ -10664,7 +10977,7 @@ dependencies = [ "chrono", "chrono-tz", "cidr-utils 0.6.1", - "clap 4.5.4", + "clap", "codespan-reporting", "community-id", "crypto_secretbox", @@ -10673,6 +10986,7 @@ dependencies = [ "data-encoding", "digest", "dns-lookup", + "domain", "dyn-clone", "exitcode", "flate2", @@ -10684,7 +10998,7 @@ dependencies = [ "idna 0.5.0", "indexmap 2.2.6", "indoc", - "itertools 0.12.1", + "itertools 0.13.0", "lalrpop", "lalrpop-util", "md-5", @@ -10701,9 +11015,11 @@ dependencies = [ "pest_derive", "prettydiff", "prettytable-rs", - "prost 0.12.4", + "prost 0.12.6", "prost-reflect", "psl", + "psl-types", + "publicsuffix", "quickcheck", "quoted_printable", "rand 0.8.5", @@ -10755,7 +11071,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", ] @@ -10858,9 +11174,9 @@ dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -10892,9 +11208,9 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -10952,6 +11268,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] +name = "webpki-roots" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] + +[[package]] name = "which" version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -11287,6 +11612,16 @@ dependencies = [ ] [[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] name = "wiremock" version = "0.5.22" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -11319,6 +11654,18 @@ dependencies = [ ] [[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + +[[package]] name = "wyz" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -11343,6 +11690,30 @@ dependencies = [ ] [[package]] +name = "yoke" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +dependencies = [ + "proc-macro2 1.0.85", + "quote 1.0.36", + "syn 2.0.66", + "synstructure", +] + +[[package]] name = "zerocopy" version = "0.7.31" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -11357,9 +11728,30 @@ version = "0.7.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.85", "quote 1.0.36", - "syn 2.0.60", + "syn 2.0.66", +] + +[[package]] +name = "zerofrom" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +dependencies = [ + "proc-macro2 1.0.85", + "quote 1.0.36", + "syn 2.0.66", + "synstructure", ] [[package]] @@ -11369,6 +11761,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" [[package]] +name = "zerovec" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7" +dependencies = [ + "proc-macro2 1.0.85", + "quote 1.0.36", + "syn 2.0.66", +] + +[[package]] name = "zstd" version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 550fb341474bd..9ed2bc9c6e2ed 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -36,7 +36,7 @@ let pname = "vector"; - version = "0.38.0"; + version = "0.39.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -45,15 +45,9 @@ rustPlatform.buildRustPackage { owner = "vectordotdev"; repo = pname; rev = "v${version}"; - hash = "sha256-sJgryN6/XaM1qXxv76/5RGanUpBYxIsGYGToOCXDvwA="; + hash = "sha256-S6yzh8ISIh6xzw5DwQaoZdpfmDHE9gfjlEtxIZerSak="; }; - patches = [ - # Enable LTO to bring down binary size - # Adapted from https://github.com/vectordotdev/vector/pull/20034 - ./vector-lto.patch - ]; - cargoLock = { lockFile = ./Cargo.lock; outputHashes = { @@ -83,6 +77,9 @@ rustPlatform.buildRustPackage { # needed to dynamically link rdkafka CARGO_FEATURE_DYNAMIC_LINKING=1; + CARGO_PROFILE_RELEASE_LTO = "fat"; + CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1"; + buildNoDefaultFeatures = true; buildFeatures = features; diff --git a/pkgs/tools/misc/vector/vector-lto.patch b/pkgs/tools/misc/vector/vector-lto.patch deleted file mode 100644 index a795c1f16d25e..0000000000000 --- a/pkgs/tools/misc/vector/vector-lto.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- ./Cargo.toml 2024-04-10 00:01:12.033806583 +0100 -+++ ./Cargo.toml 2024-04-10 00:01:48.324228125 +0100 -@@ -45,7 +45,8 @@ path = "tests/e2e/mod.rs" - # This results in roughly a 5% reduction in performance when compiling locally vs when - # compiled via the CI pipeline. - [profile.release] --debug = false # Do not include debug symbols in the executable. -+lto = true -+codegen-units = 1 - - [profile.bench] - debug = true diff --git a/pkgs/tools/misc/wasm-tools/default.nix b/pkgs/tools/misc/wasm-tools/default.nix index dc83c150d11e4..e89628a117ff6 100644 --- a/pkgs/tools/misc/wasm-tools/default.nix +++ b/pkgs/tools/misc/wasm-tools/default.nix @@ -5,19 +5,19 @@ rustPlatform.buildRustPackage rec { pname = "wasm-tools"; - version = "1.210.0"; + version = "1.211.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-qp00/cgx2FpdBbt5CXYFD/V6SOtz7VQfRq0zJsELVuc="; + hash = "sha256-xd5/QB6/V8cyoygShmcIzUgXZNs+kBuPtKy56BSoxKo="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-jNr0oyd+8E5ppPcV5LMAbOro4ZodgskCHAhe5TgC/6I="; + cargoHash = "sha256-H3eEwVZB6xzZwW5Bvgs7yPV58QUNvLSWSDigLzs2uG0="; cargoBuildFlags = [ "--package" "wasm-tools" ]; cargoTestFlags = [ "--all" ]; diff --git a/pkgs/tools/misc/xmonad-log/deps.nix b/pkgs/tools/misc/xmonad-log/deps.nix deleted file mode 100644 index f5a7c7e5dd1dd..0000000000000 --- a/pkgs/tools/misc/xmonad-log/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/godbus/dbus"; - fetch = { - type = "git"; - url = "https://github.com/godbus/dbus"; - rev = "a389bdde4dd695d414e47b755e95e72b7826432c"; - sha256 = "1ckvg15zdsgmbn4mi36cazkb407ixc9mmyf7vwj8b8wi3d00rgn9"; - }; - } -] diff --git a/pkgs/tools/networking/bore/default.nix b/pkgs/tools/networking/bore/default.nix index abbbcc414751f..f32e9ff7542ca 100644 --- a/pkgs/tools/networking/bore/default.nix +++ b/pkgs/tools/networking/bore/default.nix @@ -46,5 +46,6 @@ rustPlatform.buildRustPackage rec { license = licenses.isc; maintainers = [ maintainers.delan ]; mainProgram = "bore"; + broken = stdenv.isDarwin; # bindgen fails on: "in6_addr_union_(...)" is not a valid Ident }; } diff --git a/pkgs/tools/networking/checkip/default.nix b/pkgs/tools/networking/checkip/default.nix index 48a2b13542960..1ac21fcb84e28 100644 --- a/pkgs/tools/networking/checkip/default.nix +++ b/pkgs/tools/networking/checkip/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "checkip"; - version = "0.46.4"; + version = "0.47.4"; src = fetchFromGitHub { owner = "jreisinger"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7AeoshQBEEZnikAINF+Bv0CBHq347x2K+tdO/tjVco4="; + hash = "sha256-b30Biyncg48Lv78LlojnWVwLDt30QwPhyxi97n6XjY4="; }; vendorHash = "sha256-awqaDEdWILm8RcQ8hrtJFMTJQA5TzGZhiBTMfexmtA0="; diff --git a/pkgs/tools/networking/ddns-go/default.nix b/pkgs/tools/networking/ddns-go/default.nix index e6d03c09099ec..9c5b96c90ac41 100644 --- a/pkgs/tools/networking/ddns-go/default.nix +++ b/pkgs/tools/networking/ddns-go/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ddns-go"; - version = "6.6.1"; + version = "6.6.2"; src = fetchFromGitHub { owner = "jeessy2"; repo = pname; rev = "v${version}"; - hash = "sha256-dlKglwjQj8o48ao5aFmV9oZEIm3Jdt4+7uFkGclSgOs="; + hash = "sha256-rl0J10HuZ7WBnOTylCW0MrNFEoKoBwUicJWy9vcQIew="; }; - vendorHash = "sha256-J18JTLUvUaZDp1/65iJJp4oVSNOsENrMghJVP40ITOo="; + vendorHash = "sha256-dJXXGoTzgbmpDoAYKfkUgsmQILQQ+zbE14+BiaNEHSs="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix index 2281822d2e778..95ef1c7402d91 100644 --- a/pkgs/tools/networking/gnirehtet/default.nix +++ b/pkgs/tools/networking/gnirehtet/default.nix @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' wrapProgram $out/bin/gnirehtet \ --set GNIREHTET_APK ${apk}/gnirehtet.apk \ - --set ADB ${androidenv.androidPkgs_9_0.platform-tools}/bin/adb + --set ADB ${androidenv.androidPkgs.platform-tools}/bin/adb ''; meta = with lib; { diff --git a/pkgs/tools/networking/ligolo-ng/default.nix b/pkgs/tools/networking/ligolo-ng/default.nix index 8a56bfb84845c..80f26666f0ffc 100644 --- a/pkgs/tools/networking/ligolo-ng/default.nix +++ b/pkgs/tools/networking/ligolo-ng/default.nix @@ -34,6 +34,5 @@ buildGoModule rec { homepage = "https://github.com/tnpitsecurity/ligolo-ng"; changelog = "https://github.com/nicocha30/ligolo-ng/releases/tag/v${version}"; license = licenses.gpl3Only; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix index 12e93981ef2de..0f6c0cc8b7542 100644 --- a/pkgs/tools/networking/nebula/default.nix +++ b/pkgs/tools/networking/nebula/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "nebula"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "slackhq"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-G4v1lCGTEPOfYeHWl8xy2TowloRefKFAc/P17zWB9kk="; + hash = "sha256-+RferzOPlx7UuqpckQBY/RDO9gptknhuan+Es0Vf/yM="; }; vendorHash = "sha256-4BnFvA0dxsEK7ictDUZ6nol6PtM54kk9dwKPTQbRUR0="; diff --git a/pkgs/tools/networking/ockam/default.nix b/pkgs/tools/networking/ockam/default.nix index 8cff2e5bc49d1..cca1fb40bf7db 100644 --- a/pkgs/tools/networking/ockam/default.nix +++ b/pkgs/tools/networking/ockam/default.nix @@ -13,7 +13,7 @@ let pname = "ockam"; - version = "0.125.0"; + version = "0.126.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -22,10 +22,10 @@ rustPlatform.buildRustPackage { owner = "build-trust"; repo = pname; rev = "ockam_v${version}"; - hash = "sha256-CFJ2Z/PI7du9wlvh3/Ew8AejcU//xPuUXJweQ4phYc8="; + hash = "sha256-LkjMxUKTlj3fkSlm1NNOQKVUEz6baqaxMXcI6myaT24="; }; - cargoHash = "sha256-j9c1m6beT70E0+czXMVOqY36wAHR1uqL5zKHkrlIAQk="; + cargoHash = "sha256-wOBr1U9lekDwG8MntrvR7QtMItJ41kLcyt70N2Uz1M8="; nativeBuildInputs = [ git pkg-config ]; buildInputs = [ openssl dbus ] ++ lib.optionals stdenv.isDarwin [ AppKit Security ]; diff --git a/pkgs/tools/networking/snmpcheck/default.nix b/pkgs/tools/networking/snmpcheck/default.nix index b365ccc5f1911..dbf6c95de8ac1 100644 --- a/pkgs/tools/networking/snmpcheck/default.nix +++ b/pkgs/tools/networking/snmpcheck/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { description = "SNMP enumerator"; homepage = "http://www.nothink.org/codes/snmpcheck/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ elohmeier ]; mainProgram = "snmp-check"; }; } diff --git a/pkgs/tools/nix/nixci/default.nix b/pkgs/tools/nix/nixci/default.nix index dbbc7ae1cc4f4..e84e21f4c83fb 100644 --- a/pkgs/tools/nix/nixci/default.nix +++ b/pkgs/tools/nix/nixci/default.nix @@ -12,15 +12,15 @@ rustPlatform.buildRustPackage rec { pname = "nixci"; - version = "0.4.0"; + version = "0.5.0"; src = fetchCrate { inherit version; pname = "nixci"; - hash = "sha256-JC1LUny8UKflANlcx6Hcgx39CRry+ossnp/RQK36oaI="; + hash = "sha256-XbPXS29zqg+pOs/JRRB2bRPdMTDy/oKLM41UomSZTN0="; }; - cargoHash = "sha256-pYPzM7QlQ2EXwrvuXMa1qs0m7cmumh1iPesgJZ0H2kg="; + cargoHash = "sha256-+ed/XsEAwp7bsZOb+bOailpgSFnKvwoHR0QptnGeulk="; nativeBuildInputs = [ pkg-config ]; @@ -37,8 +37,8 @@ rustPlatform.buildRustPackage rec { env.DEVOUR_FLAKE = fetchFromGitHub { owner = "srid"; repo = "devour-flake"; - rev = "v3"; - hash = "sha256-O51F4YFOzlaQAc9b6xjkAqpvrvCtw/Os2M7TU0y4SKQ="; + rev = "v4"; + hash = "sha256-Vey9n9hIlWiSAZ6CCTpkrL6jt4r2JvT2ik9wa2bjeC0="; }; meta = with lib; { diff --git a/pkgs/tools/package-management/libdnf/default.nix b/pkgs/tools/package-management/libdnf/default.nix index 79fc38eaef33d..dc5e95f7f3d98 100644 --- a/pkgs/tools/package-management/libdnf/default.nix +++ b/pkgs/tools/package-management/libdnf/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "libdnf"; - version = "0.73.1"; + version = "0.73.2"; outputs = [ "out" "dev" "py" ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "rpm-software-management"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-mZCrJ1fXqKE1sMYKWHLLQEPkdLwPwqJz+8n+DlNmxvM="; + hash = "sha256-tdAbkIb3BAhNKFbjIGHEdVNwh3E1sKFLP+L4MhifsQM="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/lix/common.nix b/pkgs/tools/package-management/lix/common.nix index e0d504774235c..d36742a007523 100644 --- a/pkgs/tools/package-management/lix/common.nix +++ b/pkgs/tools/package-management/lix/common.nix @@ -11,6 +11,7 @@ inherit hash; }, docCargoHash ? null, + docCargoLock ? null, patches ? [ ], maintainers ? lib.teams.lix.members, }@args: @@ -65,6 +66,12 @@ assert (hash == null) -> (src != null); util-linuxMinimal, xz, nixosTests, + lix-doc ? callPackage ./doc { + inherit src; + version = "${version}${suffix}"; + cargoHash = docCargoHash; + cargoLock = docCargoLock; + }, enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, enableStatic ? stdenv.hostPlatform.isStatic, @@ -78,212 +85,205 @@ assert (hash == null) -> (src != null); stateDir, storeDir, }: -let - lix-doc = callPackage ./doc { - inherit src; - version = "${version}${suffix}"; - cargoHash = docCargoHash; - }; - self = stdenv.mkDerivation { - pname = "lix"; +assert lib.assertMsg (docCargoHash != null || docCargoLock != null) "Either `lix-doc`'s cargoHash using `docCargoHash` or `lix-doc`'s `cargoLock.lockFile` using `docCargoLock` must be set!"; +stdenv.mkDerivation { + pname = "lix"; - version = "${version}${suffix}"; - VERSION_SUFFIX = suffix; + version = "${version}${suffix}"; + VERSION_SUFFIX = suffix; - inherit src patches; + inherit src patches; - outputs = - [ - "out" - "dev" - ] - ++ lib.optionals enableDocumentation [ - "man" - "doc" - ]; + outputs = + [ + "out" + "dev" + ] + ++ lib.optionals enableDocumentation [ + "man" + "doc" + ]; - strictDeps = true; + strictDeps = true; - nativeBuildInputs = - [ - pkg-config - bison - flex - jq - meson - ninja - cmake - python3 - doxygen + nativeBuildInputs = + [ + pkg-config + bison + flex + jq + meson + ninja + cmake + python3 + doxygen - # Tests - git - mercurial - jq - lsof - ] - ++ lib.optionals (enableDocumentation) [ - (lib.getBin lowdown) - mdbook - mdbook-linkcheck - ] - ++ lib.optionals stdenv.isLinux [ util-linuxMinimal ]; + # Tests + git + mercurial + jq + lsof + ] + ++ lib.optionals (enableDocumentation) [ + (lib.getBin lowdown) + mdbook + mdbook-linkcheck + ] + ++ lib.optionals stdenv.isLinux [ util-linuxMinimal ]; - buildInputs = - [ - boost - brotli - bzip2 - curl - editline - libsodium - openssl - sqlite - xz - gtest - libarchive - lowdown - rapidcheck - toml11 - lix-doc - ] - ++ lib.optionals stdenv.isDarwin [ Security ] - ++ lib.optionals (stdenv.isx86_64) [ libcpuid ] - ++ lib.optionals withLibseccomp [ libseccomp ] - ++ lib.optionals withAWS [ aws-sdk-cpp ]; + buildInputs = + [ + boost + brotli + bzip2 + curl + editline + libsodium + openssl + sqlite + xz + gtest + libarchive + lowdown + rapidcheck + toml11 + lix-doc + ] + ++ lib.optionals stdenv.isDarwin [ Security ] + ++ lib.optionals (stdenv.isx86_64) [ libcpuid ] + ++ lib.optionals withLibseccomp [ libseccomp ] + ++ lib.optionals withAWS [ aws-sdk-cpp ]; - propagatedBuildInputs = [ - boehmgc - nlohmann_json - ]; + propagatedBuildInputs = [ + boehmgc + nlohmann_json + ]; - postPatch = '' - patchShebangs --build tests - ''; + postPatch = '' + patchShebangs --build tests + ''; - preConfigure = - # Copy libboost_context so we don't get all of Boost in our closure. - # https://github.com/NixOS/nixpkgs/issues/45462 - lib.optionalString (!enableStatic) '' - mkdir -p $out/lib - cp -pd ${boost}/lib/{libboost_context*,libboost_thread*,libboost_system*} $out/lib - rm -f $out/lib/*.a - ${lib.optionalString stdenv.isLinux '' - chmod u+w $out/lib/*.so.* - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.* - ''} - ${lib.optionalString stdenv.hostPlatform.isDarwin '' - for LIB in $out/lib/*.dylib; do - chmod u+w $LIB - install_name_tool -id $LIB $LIB - install_name_tool -delete_rpath ${boost}/lib/ $LIB || true - done - install_name_tool -change ${boost}/lib/libboost_system.dylib $out/lib/libboost_system.dylib $out/lib/libboost_thread.dylib - ''} - ''; + preConfigure = + # Copy libboost_context so we don't get all of Boost in our closure. + # https://github.com/NixOS/nixpkgs/issues/45462 + lib.optionalString (!enableStatic) '' + mkdir -p $out/lib + cp -pd ${boost}/lib/{libboost_context*,libboost_thread*,libboost_system*} $out/lib + rm -f $out/lib/*.a + ${lib.optionalString stdenv.isLinux '' + chmod u+w $out/lib/*.so.* + patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.* + ''} + ${lib.optionalString stdenv.hostPlatform.isDarwin '' + for LIB in $out/lib/*.dylib; do + chmod u+w $LIB + install_name_tool -id $LIB $LIB + install_name_tool -delete_rpath ${boost}/lib/ $LIB || true + done + install_name_tool -change ${boost}/lib/libboost_system.dylib $out/lib/libboost_system.dylib $out/lib/libboost_thread.dylib + ''} + ''; - mesonBuildType = "release"; - mesonFlags = - [ - # LTO optimization - (lib.mesonBool "b_lto" (!stdenv.isDarwin)) - (lib.mesonEnable "gc" true) - (lib.mesonBool "enable-tests" true) - (lib.mesonBool "enable-docs" enableDocumentation) - (lib.mesonBool "enable-embedded-sandbox-shell" (stdenv.isLinux && stdenv.hostPlatform.isStatic)) - (lib.mesonEnable "seccomp-sandboxing" withLibseccomp) + mesonBuildType = "release"; + mesonFlags = + [ + # LTO optimization + (lib.mesonBool "b_lto" (!stdenv.isDarwin)) + (lib.mesonEnable "gc" true) + (lib.mesonBool "enable-tests" true) + (lib.mesonBool "enable-docs" enableDocumentation) + (lib.mesonBool "enable-embedded-sandbox-shell" (stdenv.isLinux && stdenv.hostPlatform.isStatic)) + (lib.mesonEnable "seccomp-sandboxing" withLibseccomp) - (lib.mesonOption "store-dir" storeDir) - (lib.mesonOption "state-dir" stateDir) - (lib.mesonOption "sysconfdir" confDir) - ] - ++ lib.optionals stdenv.isLinux [ - (lib.mesonOption "sandbox-shell" "${busybox-sandbox-shell}/bin/busybox") - ]; + (lib.mesonOption "store-dir" storeDir) + (lib.mesonOption "state-dir" stateDir) + (lib.mesonOption "sysconfdir" confDir) + ] + ++ lib.optionals stdenv.isLinux [ + (lib.mesonOption "sandbox-shell" "${busybox-sandbox-shell}/bin/busybox") + ]; - # Needed for Meson to find Boost. - # https://github.com/NixOS/nixpkgs/issues/86131. - env = { - BOOST_INCLUDEDIR = "${lib.getDev boost}/include"; - BOOST_LIBRARYDIR = "${lib.getLib boost}/lib"; - }; + # Needed for Meson to find Boost. + # https://github.com/NixOS/nixpkgs/issues/86131. + env = { + BOOST_INCLUDEDIR = "${lib.getDev boost}/include"; + BOOST_LIBRARYDIR = "${lib.getLib boost}/lib"; + }; - postInstall = - '' - mkdir -p $doc/nix-support - echo "doc manual $doc/share/doc/nix/manual" >> $doc/nix-support/hydra-build-products - '' - + lib.optionalString stdenv.hostPlatform.isStatic '' - mkdir -p $out/nix-support - echo "file binary-dist $out/bin/nix" >> $out/nix-support/hydra-build-products - '' - + lib.optionalString stdenv.isDarwin '' - for lib in libnixutil.dylib libnixexpr.dylib; do - install_name_tool \ - -change "${lib.getLib boost}/lib/libboost_context.dylib" \ - "$out/lib/libboost_context.dylib" \ - "$out/lib/$lib" - done - ''; + postInstall = + '' + mkdir -p $doc/nix-support + echo "doc manual $doc/share/doc/nix/manual" >> $doc/nix-support/hydra-build-products + '' + + lib.optionalString stdenv.hostPlatform.isStatic '' + mkdir -p $out/nix-support + echo "file binary-dist $out/bin/nix" >> $out/nix-support/hydra-build-products + '' + + lib.optionalString stdenv.isDarwin '' + for lib in libnixutil.dylib libnixexpr.dylib; do + install_name_tool \ + -change "${lib.getLib boost}/lib/libboost_context.dylib" \ + "$out/lib/libboost_context.dylib" \ + "$out/lib/$lib" + done + ''; - doCheck = true; - mesonCheckFlags = [ "--suite=check" ]; - checkInputs = [ - gtest - rapidcheck - ]; + doCheck = true; + mesonCheckFlags = [ "--suite=check" ]; + checkInputs = [ + gtest + rapidcheck + ]; - doInstallCheck = true; - mesonInstallCheckFlags = [ "--suite=installcheck" ]; + doInstallCheck = true; + mesonInstallCheckFlags = [ "--suite=installcheck" ]; - preInstallCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' - # socket path becomes too long otherwise - export TMPDIR=$NIX_BUILD_TOP - # Prevent crashes in libcurl due to invoking Objective-C `+initialize` methods after `fork`. - # See http://sealiesoftware.com/blog/archive/2017/6/5/Objective-C_and_fork_in_macOS_1013.html. - export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES - ''; + preInstallCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' + # socket path becomes too long otherwise + export TMPDIR=$NIX_BUILD_TOP + # Prevent crashes in libcurl due to invoking Objective-C `+initialize` methods after `fork`. + # See http://sealiesoftware.com/blog/archive/2017/6/5/Objective-C_and_fork_in_macOS_1013.html. + export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES + ''; - installCheckPhase = '' - runHook preInstallCheck - flagsArray=($mesonInstallCheckFlags "''${mesonInstallCheckFlagsArray[@]}") - meson test --no-rebuild "''${flagsArray[@]}" - runHook postInstallCheck - ''; - # strictoverflow is disabled because we trap on signed overflow instead - hardeningDisable = [ "strictoverflow" ] ++ lib.optional stdenv.hostPlatform.isStatic "pie"; - # hardeningEnable = lib.optionals (!stdenv.isDarwin) [ "pie" ]; - # hardeningDisable = lib.optional stdenv.hostPlatform.isMusl "fortify"; - separateDebugInfo = stdenv.isLinux && !enableStatic; - enableParallelBuilding = true; + installCheckPhase = '' + runHook preInstallCheck + flagsArray=($mesonInstallCheckFlags "''${mesonInstallCheckFlagsArray[@]}") + meson test --no-rebuild "''${flagsArray[@]}" + runHook postInstallCheck + ''; + # strictoverflow is disabled because we trap on signed overflow instead + hardeningDisable = [ "strictoverflow" ] ++ lib.optional stdenv.hostPlatform.isStatic "pie"; + # hardeningEnable = lib.optionals (!stdenv.isDarwin) [ "pie" ]; + # hardeningDisable = lib.optional stdenv.hostPlatform.isMusl "fortify"; + separateDebugInfo = stdenv.isLinux && !enableStatic; + enableParallelBuilding = true; - passthru = { - inherit aws-sdk-cpp boehmgc; - tests = { - misc = nixosTests.nix-misc.lix; - }; + passthru = { + inherit aws-sdk-cpp boehmgc; + tests = { + misc = nixosTests.nix-misc.lix; }; + }; - # point 'nix edit' and ofborg at the file that defines the attribute, - # not this common file. - pos = builtins.unsafeGetAttrPos "version" args; - meta = with lib; { - description = "Powerful package manager that makes package management reliable and reproducible"; - longDescription = '' - Lix (a fork of Nix) is a powerful package manager for Linux and other Unix systems that - makes package management reliable and reproducible. It provides atomic - upgrades and rollbacks, side-by-side installation of multiple versions of - a package, multi-user package management and easy setup of build - environments. - ''; - homepage = "https://lix.systems"; - license = licenses.lgpl21Plus; - inherit maintainers; - platforms = platforms.unix; - outputsToInstall = [ "out" ] ++ optional enableDocumentation "man"; - mainProgram = "nix"; - broken = enableStatic; - }; + # point 'nix edit' and ofborg at the file that defines the attribute, + # not this common file. + pos = builtins.unsafeGetAttrPos "version" args; + meta = with lib; { + description = "Powerful package manager that makes package management reliable and reproducible"; + longDescription = '' + Lix (a fork of Nix) is a powerful package manager for Linux and other Unix systems that + makes package management reliable and reproducible. It provides atomic + upgrades and rollbacks, side-by-side installation of multiple versions of + a package, multi-user package management and easy setup of build + environments. + ''; + homepage = "https://lix.systems"; + license = licenses.lgpl21Plus; + inherit maintainers; + platforms = platforms.unix; + outputsToInstall = [ "out" ] ++ optional enableDocumentation "man"; + mainProgram = "nix"; + broken = enableStatic; }; -in -self +} diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix index 9a03e64f8b8fc..c160e187241e6 100644 --- a/pkgs/tools/package-management/lix/default.nix +++ b/pkgs/tools/package-management/lix/default.nix @@ -47,6 +47,8 @@ let }; in lib.makeExtensible (self: ({ + buildLix = common; + lix_2_90 = ( common { version = "2.90-beta.1"; diff --git a/pkgs/tools/package-management/lix/doc/default.nix b/pkgs/tools/package-management/lix/doc/default.nix index a3c1d7d9ccc5a..b19f3bd2a170d 100644 --- a/pkgs/tools/package-management/lix/doc/default.nix +++ b/pkgs/tools/package-management/lix/doc/default.nix @@ -2,11 +2,12 @@ src, rustPlatform, version, - cargoHash, + cargoHash ? null, + cargoLock ? null }: rustPlatform.buildRustPackage { pname = "lix-doc"; - sourceRoot = "${src.name}/lix-doc"; - inherit version src cargoHash; + sourceRoot = "${src.name or src}/lix-doc"; + inherit version src cargoHash cargoLock; } diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 1eeecab4e7ec7..5f2a9dadfd6b2 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -176,6 +176,12 @@ in lib.makeExtensible (self: ({ self_attribute_name = "nix_2_22"; }; + nix_2_23 = common { + version = "2.23.0"; + hash = "sha256-cRCwRDxR8rEQQEvGjIH8g0krJd4ZFJrdgmPXkv65S/Y="; + self_attribute_name = "nix_2_23"; + }; + git = common rec { version = "2.23.0"; suffix = "pre20240526_${lib.substring 0 8 src.rev}"; @@ -188,7 +194,7 @@ in lib.makeExtensible (self: ({ self_attribute_name = "git"; }; - latest = self.nix_2_22; + latest = self.nix_2_23; # The minimum Nix version supported by Nixpkgs # Note that some functionality *might* have been backported into this Nix version, diff --git a/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch b/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch index 578bd325d56bd..a53b7f1f52f49 100644 --- a/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch +++ b/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch @@ -11,14 +11,23 @@ index 2b45489..0e6d8ef 100644 GC_bool found_me = FALSE; size_t nthreads = 0; int i; -@@ -868,6 +870,31 @@ GC_INNER void GC_push_all_stacks(void) +@@ -868,6 +870,40 @@ GC_INNER void GC_push_all_stacks(void) hi = p->altstack + p->altstack_size; # endif /* FIXME: Need to scan the normal stack too, but how ? */ + } else { ++ #ifdef HAVE_PTHREAD_ATTR_GET_NP ++ if (pthread_attr_init(&pattr) != 0) { ++ ABORT("GC_push_all_stacks: pthread_attr_init failed!"); ++ } ++ if (pthread_attr_get_np(p->id, &pattr) != 0) { ++ ABORT("GC_push_all_stacks: pthread_attr_get_np failed!"); ++ } ++ #else + if (pthread_getattr_np(p->id, &pattr)) { + ABORT("GC_push_all_stacks: pthread_getattr_np failed!"); + } ++ #endif + if (pthread_attr_getstacksize(&pattr, &stack_limit)) { + ABORT("GC_push_all_stacks: pthread_attr_getstacksize failed!"); + } diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix index 3c3956bb94cc1..3d119f6b846ad 100644 --- a/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -16,14 +16,14 @@ python3.pkgs.buildPythonApplication rec { pname = "nixpkgs-review"; - version = "2.10.4"; + version = "2.10.5"; format = "pyproject"; src = fetchFromGitHub { owner = "Mic92"; repo = "nixpkgs-review"; - rev = version; - hash = "sha256-+4T6Mm4YfH0wWlkNYS03H9Z9oNlYQnVUncvWGA0CKIQ="; + rev = "refs/tags/${version}"; + hash = "sha256-dRTKE8gkV298ZmMokyy3Ufer/Lp1GQYdEhIBoLhloEQ="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/pacup/default.nix b/pkgs/tools/package-management/pacup/default.nix index 7afd4eb815d73..992615982ea73 100644 --- a/pkgs/tools/package-management/pacup/default.nix +++ b/pkgs/tools/package-management/pacup/default.nix @@ -4,13 +4,13 @@ }: python3.pkgs.buildPythonApplication rec { - name = "pacup"; + pname = "pacup"; version = "2.0.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pacstall"; - repo = name; + repo = "pacup"; rev = "refs/tags/${version}"; hash = "sha256-ItO38QyxNHftKPQZAPO7596ddBfX0a1nfVVqgx7BfwI="; }; diff --git a/pkgs/tools/security/age/default.nix b/pkgs/tools/security/age/default.nix index ea8108fde301c..89acb4d14c334 100644 --- a/pkgs/tools/security/age/default.nix +++ b/pkgs/tools/security/age/default.nix @@ -2,36 +2,16 @@ buildGoModule rec { pname = "age"; - version = "1.1.1"; - vendorHash = "sha256-MumPdRTz840+hoisJ7ADgBhyK3n8P6URobbRJYDFkDY="; + version = "1.2.0"; src = fetchFromGitHub { owner = "FiloSottile"; repo = "age"; rev = "v${version}"; - sha256 = "sha256-LRxxJQLQkzoCNYGS/XBixVmYXoZ1mPHKvFicPGXYLcw="; + hash = "sha256-O0NKDPvr+6ZupakPIpnGgDcdfG3nWR1pvVE+3KkYurY="; }; - # Worked with the upstream to change the way test vectors were sourced from - # another repo at test run time, so we can run test without network access. - # https://github.com/FiloSottile/age/pull/476 - # - # Changes landed after v1.1.1, so we'll patch this one until next release. - patches = [ - # Revert "all: temporarily disable testscript tests" - (fetchpatch { - name = "0001-revert-temporarily-disabled-testscript-tests.patch"; - url = "https://github.com/FiloSottile/age/commit/5471e05672de168766f5f11453fd324c53c264e5.patch"; - sha256 = "sha256-F3oDhRWJqqcF9MDDWPeO9V/wUGXkmUXY87wgokUIoOk="; - }) - - # age: depend on c2sp.org/CCTV/age for TestVectors - (fetchpatch { - name = "0002-depend-on-c2sp_cctv_age__TestVectors.patch"; - url = "https://github.com/FiloSottile/age/commit/edf7388f7731b274b055dcab3ec4006cc4961b68.patch"; - sha256 = "sha256-CloCj/uF3cqTeCfRkV6TeYiovuDQXm1ZIklREWAot1E="; - }) - ]; + vendorHash = "sha256-5We4OYoexzzSF1AkxuGCUwuYJ3Wra+T6mCcT4XYgzhU="; ldflags = [ "-s" "-w" "-X main.Version=${version}" @@ -59,6 +39,7 @@ buildGoModule rec { ]; meta = with lib; { + changelog = "https://github.com/FiloSottile/age/releases/tag/v${version}"; homepage = "https://age-encryption.org/"; description = "Modern encryption tool with small explicit keys"; license = licenses.bsd3; diff --git a/pkgs/tools/security/cewl/default.nix b/pkgs/tools/security/cewl/default.nix index dc1ad37513daa..833c521250792 100644 --- a/pkgs/tools/security/cewl/default.nix +++ b/pkgs/tools/security/cewl/default.nix @@ -29,6 +29,5 @@ stdenv.mkDerivation rec { mainProgram = "cewl"; homepage = "https://digi.ninja/projects/cewl.php/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/tools/security/evil-winrm/default.nix b/pkgs/tools/security/evil-winrm/default.nix index ab406caafb65c..b8e88e1db9ebd 100644 --- a/pkgs/tools/security/evil-winrm/default.nix +++ b/pkgs/tools/security/evil-winrm/default.nix @@ -42,6 +42,5 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Hackplayers/evil-winrm"; changelog = "https://github.com/Hackplayers/evil-winrm/blob/v${version}/CHANGELOG.md"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 8babd87b36f38..086927a43fcea 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2024-06-08"; + version = "2024-06-15"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; rev = "refs/tags/${version}"; - hash = "sha256-2PZTafasrJet9E/qoMaUIS/eZ8zWLujIAh5vqCrIHkQ="; + hash = "sha256-bETNSUv36GobOke1bwE+uTSRqln3kANqfl8UIx7bdjM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index 69c54c41533d0..207ee746a107c 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.18.3"; + version = "8.18.4"; src = fetchFromGitHub { owner = "zricethezav"; repo = "gitleaks"; rev = "refs/tags/v${version}"; - hash = "sha256-OLs3rpP6s6ZyCUKkD5Sl/tAMl3gSBWrUUFYeNffiXEs="; + hash = "sha256-tAomF5Ym+D/VMYXrsPlUnh3M94Xdx6I8WoU1jMouZag="; }; vendorHash = "sha256-DgCtWRo5KNuFCdhGJvzoH2v8n7mIxNk8eHyZFPUPo24="; diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index c94c9458723d3..95bd1b8435df6 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.12" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.13" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 4715a6f935bf3..864358152c6d8 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,10 +1,11 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 4248753964d0fe0e89bf84cf2b8c8c4871009a96 - ref: refs/tags/6.4.12 + revision: 0dae49af4bc85231052e15fc97f8bfbf9ec56cf3 + ref: refs/tags/6.4.13 specs: - metasploit-framework (6.4.12) + metasploit-framework (6.4.13) aarch64 + abbrev actionpack (~> 7.0.0) activerecord (~> 7.0.0) activesupport (~> 7.0.0) @@ -13,12 +14,16 @@ GIT aws-sdk-iam aws-sdk-s3 aws-sdk-ssm + base64 bcrypt bcrypt_pbkdf + bigdecimal bootsnap bson chunky_png + csv dnsruby + drb ed25519 em-http-request eventmachine @@ -27,6 +32,7 @@ GIT faraday-retry faye-websocket filesize + getoptlong hrr_rb_ssh-ed25519 http-cookie irb (~> 1.7.4) @@ -41,6 +47,7 @@ GIT metasploit_payloads-mettle (= 1.0.26) mqtt msgpack (~> 1.6.0) + mutex_m nessus_rest net-imap net-ldap @@ -109,6 +116,7 @@ GEM Ascii85 (1.1.1) aarch64 (2.1.0) racc (~> 1.6) + abbrev (0.1.2) actionpack (7.0.8.3) actionview (= 7.0.8.3) activesupport (= 7.0.8.3) @@ -178,11 +186,13 @@ GEM concurrent-ruby (1.2.3) cookiejar (0.3.4) crass (1.0.6) + csv (3.3.0) daemons (1.4.1) date (3.3.4) dnsruby (1.72.1) simpleidn (~> 0.2.1) domain_name (0.6.20240107) + drb (2.2.1) ed25519 (1.3.0) em-http-request (1.1.7) addressable (>= 2.3.4) @@ -208,6 +218,7 @@ GEM websocket-driver (>= 0.5.1) ffi (1.16.3) filesize (0.2.0) + getoptlong (0.2.1) gssapi (1.3.1) ffi (>= 1.0.1) gyoku (1.4.0) @@ -278,6 +289,7 @@ GEM multi_json (1.15.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) + mutex_m (0.2.0) nessus_rest (0.1.6) net-imap (0.4.11) date diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index ee4f0a200ad5e..b7144716ecf4f 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.4.12"; + version = "6.4.13"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = "refs/tags/${version}"; - hash = "sha256-wMtEbrH3fH0bnKfMPB/V+Z3JcVX8LMAeIWtAHmlWN5c="; + hash = "sha256-9Qo+6FAkrzkXpaHPa6u3BgGH8yKDCKo1TtS4xO12Kew="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 268cb36e1a043..5edc7bb331356 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -9,6 +9,16 @@ }; version = "2.1.0"; }; + abbrev = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hj2qyx7rzpc7awhvqlm597x7qdxwi4kkml4aqnp5jylmsm4w6xd"; + type = "gem"; + }; + version = "0.1.2"; + }; actionpack = { groups = ["default"]; platforms = []; @@ -319,6 +329,16 @@ }; version = "1.0.6"; }; + csv = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zfn40dvgjk1xv1z8l11hr9jfg3jncwsc9yhzsz4l4rivkpivg8b"; + type = "gem"; + }; + version = "3.3.0"; + }; daemons = { groups = ["default"]; platforms = []; @@ -359,6 +379,16 @@ }; version = "0.6.20240107"; }; + drb = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79"; + type = "gem"; + }; + version = "2.2.1"; + }; ed25519 = { groups = ["default"]; platforms = []; @@ -479,6 +509,16 @@ }; version = "0.2.0"; }; + getoptlong = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "198vy9dxyzibqdbw9jg8p2ljj9iknkyiqlyl229vz55rjxrz08zx"; + type = "gem"; + }; + version = "0.2.1"; + }; gssapi = { groups = ["default"]; platforms = []; @@ -684,12 +724,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "4248753964d0fe0e89bf84cf2b8c8c4871009a96"; - sha256 = "15rparliwh3b44gc0b7wamqwk7grslgkrk57khdpsz7pn5p49jy0"; + rev = "0dae49af4bc85231052e15fc97f8bfbf9ec56cf3"; + sha256 = "1v19fvnw9f6l9qssl2434brqf086nymnpkx1llbkkbr4a3l3w2pm"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.4.12"; + version = "6.4.13"; }; metasploit-model = { groups = ["default"]; @@ -801,6 +841,16 @@ }; version = "3.0.0"; }; + mutex_m = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn"; + type = "gem"; + }; + version = "0.2.0"; + }; nessus_rest = { groups = ["default"]; platforms = []; diff --git a/pkgs/tools/security/notation/default.nix b/pkgs/tools/security/notation/default.nix index f9318296060f5..3afd7bd27f2ff 100644 --- a/pkgs/tools/security/notation/default.nix +++ b/pkgs/tools/security/notation/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "notation"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "notaryproject"; repo = pname; rev = "v${version}"; - hash = "sha256-MJBFdtx+HkPCN1SIohKOy33BW746GNN2fWkr7TIuBmk="; + hash = "sha256-Pi4Ddlx8G4dRDz79yTiPBf6gf0wsvoE9CuyeVGrHst0="; }; - vendorHash = "sha256-USkufc1dG4eyRfRJHSX4mVZHnvOc5onHenF98Aedac4="; + vendorHash = "sha256-REJPSBLXzIPAmxwzckufTqJvZCWUUkJLBmHTx2nv9QM="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 20dd582b4fac2..29b8a5547cfbd 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nuclei"; - version = "3.2.8"; + version = "3.2.9"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei"; rev = "refs/tags/v${version}"; - hash = "sha256-U/L9V/1aGMjh30s/XDgV522RdLhS1yyUkHwkFDWjA4U="; + hash = "sha256-4YfdpM+F2hP88GbB5ct2dla/balbt8uQcJSUyJut99U="; }; - vendorHash = "sha256-DGNjDKjFZ0EJPOJxC7nTCCts8pisomfe4eru2WAHHow="; + vendorHash = "sha256-zonoIvDbSHpURKPJoTfL2SrpiIAQkh0oAGEDEQiH35M="; subPackages = [ "cmd/nuclei/" ]; diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index 414f124f9b274..bd2cdbfbbbab7 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -29,13 +29,13 @@ assert lib.assertOneOf "backend" backend [ "x11" "wayland" ]; stdenv.mkDerivation { pname = "rofi-pass"; - version = "2.0.2-unstable-2024-02-13"; + version = "2.0.2-unstable-2024-06-16"; src = fetchFromGitHub { owner = "carnager"; repo = "rofi-pass"; - rev = "8aa6b9293a8f0af267425326fa966966ca42085e"; - hash = "sha256-g/AuLYj0yvLCXFR3y9GbMiE6hDCPBeuFM145c2Ukvys="; + rev = "37c4c862deb133a85b7d72989acfdbd2ef16b8ad"; + hash = "sha256-1lPNj47vTPLBK7mVm+PngV8C/ZsjJ2EN4ffXGU2TlQo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 756b2a67565a4..bdbbd55e9607c 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -1,23 +1,27 @@ -{ stdenv -, lib -, fetchurl -, fetchpatch -, pkg-config -, autoreconfHook -, wrapGAppsHook3 -, libgpg-error -, libassuan -, libsForQt5 -, ncurses -, gtk2 -, gcr -, withLibsecret ? true -, libsecret +{ + stdenv, + lib, + fetchurl, + fetchpatch, + pkg-config, + autoreconfHook, + wrapGAppsHook3, + libgpg-error, + libassuan, + libsForQt5, + qt6, + ncurses, + gtk2, + gcr, + withLibsecret ? true, + libsecret, }: let flavorInfo = { - tty = { flag = "tty"; }; + tty = { + flag = "tty"; + }; curses = { flag = "curses"; buildInputs = [ ncurses ]; @@ -31,52 +35,70 @@ let buildInputs = [ gcr ]; nativeBuildInputs = [ wrapGAppsHook3 ]; }; + qt5 = { + flag = "qt5"; + buildInputs = [ + libsForQt5.qtbase + libsForQt5.kwayland + libsForQt5.qtx11extras + ]; + nativeBuildInputs = [ libsForQt5.wrapQtAppsHook ]; + }; qt = { flag = "qt"; - buildInputs = [ libsForQt5.qtbase ]; - nativeBuildInputs = [ libsForQt5.wrapQtAppsHook ]; + buildInputs = [ + qt6.qtbase + qt6.qtwayland + ]; + nativeBuildInputs = [ qt6.wrapQtAppsHook ]; + }; + emacs = { + flag = "emacs"; }; - emacs = { flag = "emacs"; }; }; - buildPinentry = pinentryExtraPname: buildFlavors: + buildPinentry = + pinentryExtraPname: buildFlavors: let - enableFeaturePinentry = f: - lib.enableFeature (lib.elem f buildFlavors) ("pinentry-" + flavorInfo.${f}.flag); + enableFeaturePinentry = + f: lib.enableFeature (lib.elem f buildFlavors) ("pinentry-" + flavorInfo.${f}.flag); pinentryMkDerivation = - if (lib.elem "qt" buildFlavors) - then libsForQt5.mkDerivation - else stdenv.mkDerivation; - + if (lib.elem "qt5" buildFlavors) then libsForQt5.mkDerivation else stdenv.mkDerivation; in pinentryMkDerivation rec { pname = "pinentry-${pinentryExtraPname}"; - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { url = "mirror://gnupg/pinentry/pinentry-${version}.tar.bz2"; - hash = "sha256-RXoYXlqFI4+5RalV3GNSq5YtyLSHILYvyfpIx1QKQGc="; + hash = "sha256-mzzVIm51l/L97TmaO8ZZkjNRU2VZ6dsIJpgbyjFklN4="; }; - nativeBuildInputs = [ pkg-config autoreconfHook ] - ++ lib.concatMap (f: flavorInfo.${f}.nativeBuildInputs or [ ]) buildFlavors; + nativeBuildInputs = [ + pkg-config + autoreconfHook + ] ++ lib.concatMap (f: flavorInfo.${f}.nativeBuildInputs or [ ]) buildFlavors; - buildInputs = [ libgpg-error libassuan ] + buildInputs = + [ + libgpg-error + libassuan + ] ++ lib.optional withLibsecret libsecret ++ lib.concatMap (f: flavorInfo.${f}.buildInputs or [ ]) buildFlavors; dontWrapGApps = true; dontWrapQtApps = true; - patches = [ - ./autoconf-ar.patch - ] ++ lib.optionals (lib.elem "gtk2" buildFlavors) [ - (fetchpatch { - url = "https://salsa.debian.org/debian/pinentry/raw/debian/1.1.0-1/debian/patches/0007-gtk2-When-X11-input-grabbing-fails-try-again-over-0..patch"; - sha256 = "15r1axby3fdlzz9wg5zx7miv7gqx2jy4immaw4xmmw5skiifnhfd"; - }) - ]; + patches = + [ ./autoconf-ar.patch ] + ++ lib.optionals (lib.elem "gtk2" buildFlavors) [ + (fetchpatch { + url = "https://salsa.debian.org/debian/pinentry/raw/debian/1.1.0-1/debian/patches/0007-gtk2-When-X11-input-grabbing-fails-try-again-over-0..patch"; + sha256 = "15r1axby3fdlzz9wg5zx7miv7gqx2jy4immaw4xmmw5skiifnhfd"; + }) + ]; configureFlags = [ "--with-libgpg-error-prefix=${libgpg-error.dev}" @@ -87,35 +109,76 @@ let postInstall = lib.optionalString (lib.elem "gnome3" buildFlavors) '' wrapGApp $out/bin/pinentry-gnome3 - '' + lib.optionalString (lib.elem "qt" buildFlavors) '' + '' + + lib.optionalString (lib.elem "qt5" buildFlavors) '' + wrapQtApp $out/bin/pinentry-qt5 + ln -sf $out/bin/pinentry-qt5 $out/bin/pinentry-qt + '' + + lib.optionalString (lib.elem "qt" buildFlavors) '' wrapQtApp $out/bin/pinentry-qt ''; - passthru = { flavors = buildFlavors; }; + passthru = { + flavors = buildFlavors; + }; - meta = with lib; { + meta = { homepage = "https://gnupg.org/software/pinentry/index.html"; description = "GnuPG’s interface to passphrase input"; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; platforms = - if elem "gnome3" buildFlavors then platforms.linux else - if elem "qt" buildFlavors then (remove "aarch64-darwin" platforms.all) else - platforms.all; + if lib.elem "gnome3" buildFlavors then + lib.platforms.linux + else if (lib.elem "qt5" buildFlavors || lib.elem "qt" buildFlavors) then + (lib.remove "aarch64-darwin" lib.platforms.all) + else + lib.platforms.all; longDescription = '' Pinentry provides a console and (optional) GTK and Qt GUIs allowing users to enter a passphrase when `gpg` or `gpg2` is run and needs it. ''; - maintainers = with maintainers; [ fpletz ]; + maintainers = with lib.maintainers; [ fpletz ]; mainProgram = "pinentry"; }; }; in { - pinentry-curses = buildPinentry "curses" [ "curses" "tty" ]; - pinentry-emacs = buildPinentry "emacs" [ "emacs" "curses" "tty" ]; - pinentry-gnome3 = buildPinentry "gnome3" [ "gnome3" "curses" "tty" ]; - pinentry-gtk2 = buildPinentry "gtk2" [ "gtk2" "curses" "tty" ]; - pinentry-qt = buildPinentry "qt" [ "qt" "curses" "tty" ]; + pinentry-curses = buildPinentry "curses" [ + "curses" + "tty" + ]; + pinentry-emacs = buildPinentry "emacs" [ + "emacs" + "curses" + "tty" + ]; + pinentry-gnome3 = buildPinentry "gnome3" [ + "gnome3" + "curses" + "tty" + ]; + pinentry-gtk2 = buildPinentry "gtk2" [ + "gtk2" + "curses" + "tty" + ]; + pinentry-qt5 = buildPinentry "qt5" [ + "qt5" + "curses" + "tty" + ]; + pinentry-qt = buildPinentry "qt" [ + "qt" + "curses" + "tty" + ]; pinentry-tty = buildPinentry "tty" [ "tty" ]; - pinentry-all = buildPinentry "all" [ "curses" "tty" "gtk2" "gnome3" "qt" "emacs" ]; + pinentry-all = buildPinentry "all" [ + "curses" + "tty" + "gtk2" + "gnome3" + "qt" + "emacs" + ]; } diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix index 43e2b8ace7176..ab699f8f02b77 100644 --- a/pkgs/tools/security/sslscan/default.nix +++ b/pkgs/tools/security/sslscan/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "sslscan"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "rbsec"; repo = "sslscan"; rev = "refs/tags/${version}"; - hash = "sha256-oLlMeFVicDwr2XjCX/0cBMTXLKB8js50646uAf3tP9k="; + hash = "sha256-we55Oo9sIZ1FQn94xejlCKwlZBDMrQs/1f++blXTTUM="; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix index 24bee48ef08e2..7c8f44918506b 100644 --- a/pkgs/tools/security/step-ca/default.nix +++ b/pkgs/tools/security/step-ca/default.nix @@ -13,16 +13,16 @@ buildGoModule rec { pname = "step-ca"; - version = "0.26.1"; + version = "0.26.2"; src = fetchFromGitHub { owner = "smallstep"; repo = "certificates"; rev = "refs/tags/v${version}"; - hash = "sha256-yej7gzhaUPbcvqbse7Hh7Im38+DUfC9UZkpjpuG8ctk="; + hash = "sha256-sLHmeF/yh74/qsoF/DrYSAbULG9Nsvd6bvUT4tSVHdQ="; }; - vendorHash = "sha256-XlfdIg8YHCeCvc7kZczUxlxUonyZSQATgsxLTMvNDk4="; + vendorHash = "sha256-TISPM6bYzS0TpmopQLBns/rQqPKLDHK1job003vpFiQ="; ldflags = [ "-w" diff --git a/pkgs/tools/security/step-kms-plugin/default.nix b/pkgs/tools/security/step-kms-plugin/default.nix index 95a3b85fca637..a64f86a31d1ee 100644 --- a/pkgs/tools/security/step-kms-plugin/default.nix +++ b/pkgs/tools/security/step-kms-plugin/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "step-kms-plugin"; - version = "0.11.1"; + version = "0.11.3"; src = fetchFromGitHub { owner = "smallstep"; repo = pname; rev = "v${version}"; - hash = "sha256-EkLLhHXvh10tfEY6AY6o3n3JcmCXwauHsQ8VJRBpnnY="; + hash = "sha256-Gl/5AExN2/MEoR2HKpw7mDfuc/1Wj0UGSdXPzHl2JdU="; }; - vendorHash = "sha256-kwM5eNeAVtA6DaoFtBhxc7Jnfb7vVkdIGpUxVGjWwC8="; + vendorHash = "sha256-O6orQYrupJdJbx23TXCP0qWyvn6Hv2iDeRYvIgLp1NM="; proxyVendor = true; diff --git a/pkgs/tools/security/vault-ssh-plus/default.nix b/pkgs/tools/security/vault-ssh-plus/default.nix index 80cfa8674cb2b..a3a92f7c6a4c4 100644 --- a/pkgs/tools/security/vault-ssh-plus/default.nix +++ b/pkgs/tools/security/vault-ssh-plus/default.nix @@ -8,16 +8,16 @@ }: buildGoModule rec { pname = "vault-ssh-plus"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "isometry"; repo = pname; rev = "v${version}"; - hash = "sha256-IRmFC5WsLmHfPjS/jW5V7dNF5rNvmsh3YKwW7rGII24="; + hash = "sha256-djS50SBR8HTyEd5Ya2I9w5irBrLTqzekEi5ASmkl6yk="; }; - vendorHash = "sha256-cuU7rEpJrwrbiXLajdv4h6GePbpZclweyB9qZ3SIjP0="; + vendorHash = "sha256-NndIBvW1/EZJ2KwP6HZ6wvhrgtmhTe97l3VxprtWq30="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/witness/default.nix b/pkgs/tools/security/witness/default.nix index 85ef5aebd7e56..75cdc9e1ce61b 100644 --- a/pkgs/tools/security/witness/default.nix +++ b/pkgs/tools/security/witness/default.nix @@ -10,15 +10,15 @@ buildGoModule rec { pname = "witness"; - version = "0.4.0"; + version = "0.5.2"; src = fetchFromGitHub { owner = "in-toto"; repo = "witness"; rev = "v${version}"; - sha256 = "sha256-QnZZVQZMkh9GH6io19mlE3gHaiX73TgH7ibFT1H5DB4="; + sha256 = "sha256-3up10DdW0nMPAghEVlnOrFUbjQd1AuNmraBDjBPdjm8="; }; - vendorHash = "sha256-5q405OP8VPChhxiH2tjh2H+ailQRjGmLZvul7CubjJo="; + vendorHash = "sha256-sYWcmQloeZlwuUz0SkucpVGOqkoOpgnsHDsuWyWTBPQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index 5c09ebf70253a..c0a5e76d06775 100644 --- a/pkgs/tools/system/automatic-timezoned/default.nix +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "2.0.15"; + version = "2.0.16"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iYsZSWWgapKj5EwGdAsv4YR2sEqGEol3VsZsOPFHAtA="; + sha256 = "sha256-Ew2UiWq/K93HfKqaQoDHPrkKgHkgzzzdQwJTXmSYTeE="; }; - cargoHash = "sha256-ZlKG+KU1CjxSMA+hZ+kWrJ68kuJjDLJF8dAU/BHCBRw="; + cargoHash = "sha256-HsLDpfdL5/rQU8usKiWRnbZ5s6XxchbHpp+9SFhoDi4="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/pkgs/tools/system/opencl-info/default.nix b/pkgs/tools/system/opencl-info/default.nix deleted file mode 100644 index 7396e67087b18..0000000000000 --- a/pkgs/tools/system/opencl-info/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, opencl-clhpp, ocl-icd }: - -stdenv.mkDerivation { - pname = "opencl-info"; - version = "unstable-2014-02-21"; - - src = fetchFromGitHub { - owner = "marchv"; - repo = "opencl-info"; - rev = "3e53d001a98978feb865650cf0e93b045400c0d7"; - sha256 = "114lxgnjg40ivjjszkv4n3f3yq2lbrvywryvbazf20kqmdz7315l"; - }; - - patches = [ - # The cl.hpp header was removed from opencl-clhpp. This patch - # updates opencl-info to use the new cp2.hpp header. - # - # Submitted upstream: https://github.com/marchv/opencl-info/pull/2 - ./opencl-info-clhpp2.diff - ]; - - buildInputs = [ opencl-clhpp ocl-icd ]; - - NIX_LDFLAGS = "-lOpenCL"; - - installPhase = '' - install -Dm755 opencl-info $out/bin/opencl-info - ''; - - meta = with lib; { - description = "Tool to dump OpenCL platform/device information"; - homepage = "https://github.com/marchv/opencl-info"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; - mainProgram = "opencl-info"; - }; -} diff --git a/pkgs/tools/system/opencl-info/opencl-info-clhpp2.diff b/pkgs/tools/system/opencl-info/opencl-info-clhpp2.diff deleted file mode 100644 index 013222beebf74..0000000000000 --- a/pkgs/tools/system/opencl-info/opencl-info-clhpp2.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/opencl-info.cpp b/opencl-info.cpp -index a23015d..a6de0c1 100644 ---- a/opencl-info.cpp -+++ b/opencl-info.cpp -@@ -7,7 +7,7 @@ - #if defined(__APPLE__) || defined(__MACOSX) - # include <OpenCL/cl.hpp> - #else --# include <CL/cl.hpp> -+# include <CL/cl2.hpp> - #endif - - #include <iostream> -@@ -130,7 +130,7 @@ int main() { - PconstEnd; - P(device, CL_DEVICE_LOCAL_MEM_SIZE); - Pbool(device, CL_DEVICE_ERROR_CORRECTION_SUPPORT); -- Pbool(device, CL_DEVICE_HOST_UNIFIED_MEMORY); -+ // Pbool(device, CL_DEVICE_HOST_UNIFIED_MEMORY); /* Deprecated in 2.0 */ - P(device, CL_DEVICE_PROFILING_TIMER_RESOLUTION); - Pbool(device, CL_DEVICE_ENDIAN_LITTLE); - Pbool(device, CL_DEVICE_AVAILABLE); diff --git a/pkgs/tools/text/epub2txt2/default.nix b/pkgs/tools/text/epub2txt2/default.nix index af335773ea0c1..8ccc01d57b5bc 100644 --- a/pkgs/tools/text/epub2txt2/default.nix +++ b/pkgs/tools/text/epub2txt2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "epub2txt2"; - version = "2.06"; + version = "2.07"; src = fetchFromGitHub { owner = "kevinboone"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-zzcig5XNh9TqUHginsfoC47WrKavqi6k6ezir+OOMJk="; + sha256 = "sha256-/P81ZXhB0wyRx2bb/CO7+kTTNspYKoGUpBGLb8Yfb5I="; }; makeFlags = [ "CC:=$(CC)" "PREFIX:=$(out)" ]; diff --git a/pkgs/tools/text/mdbook-graphviz/default.nix b/pkgs/tools/text/mdbook-graphviz/default.nix index 721beb6ac1796..9dc9f1df0e021 100644 --- a/pkgs/tools/text/mdbook-graphviz/default.nix +++ b/pkgs/tools/text/mdbook-graphviz/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-graphviz"; - version = "0.1.7"; + version = "0.2.0"; src = fetchFromGitHub { owner = "dylanowen"; repo = pname; rev = "v${version}"; - hash = "sha256-FuAjuU4IXXuas+ubSuTMrZiYTGcZCuLTCSTJXtY2nlw="; + hash = "sha256-myASia/nkZmAf00lZ357Sh3YV73pCBrZAIRhSzFkZa0="; }; - cargoHash = "sha256-d4s9wmjqMHjev1Y4nAobFnCc5NTdklXcs7XTRXFMEjU="; + cargoHash = "sha256-UB/l+rcVHkrHv/fybDy/UjrJbVksWgt9JRQC118/kGM="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/mdbook-i18n-helpers/default.nix b/pkgs/tools/text/mdbook-i18n-helpers/default.nix index 96026213f4a86..f9343e1637981 100644 --- a/pkgs/tools/text/mdbook-i18n-helpers/default.nix +++ b/pkgs/tools/text/mdbook-i18n-helpers/default.nix @@ -5,17 +5,17 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-i18n-helpers"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "google"; repo = "mdbook-i18n-helpers"; # TODO fix once upstream uses semver for tags again rev = "refs/tags/mdbook-i18n-helpers-${version}"; - hash = "sha256-5DfQCkNilRB309BXQ/DWrSMX+A64uiZ2CZxPZ0krtys="; + hash = "sha256-nIavOBWPyCmCLwPcDbjjG1sa71HObGnhms9sSCAR2iA="; }; - cargoHash = "sha256-BrbEW5PD7n9KDaBUjdF60nto6mcfdQ0OUDKcnRH23DA="; + cargoHash = "sha256-bBUgsZHvJPwsdM3DjhaoAvIkPXQ6gzPOdfcE5rAnMQk="; meta = with lib; { description = "Helpers for a mdbook i18n workflow based on Gettext"; diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 22914dc547aad..2dfb2f00f662e 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "vale"; - version = "3.5.0"; + version = "3.6.0"; subPackages = [ "cmd/vale" ]; @@ -18,7 +18,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-yp3jy0iEO4DHhAskp2Y56KSjTddNTcQRf+HgxKa0o9c="; + hash = "sha256-Xkea1o0ywRKIg0cMJuxQehHbgVF0SSC9VRa53FQEong="; }; vendorHash = "sha256-OLlViQKLTark9yknnjJFiEThFtxNNjue5LUp1P/anKU="; diff --git a/pkgs/tools/typesetting/marp/default.nix b/pkgs/tools/typesetting/marp/default.nix index b61cc4dcdf661..2412935a0f9d3 100644 --- a/pkgs/tools/typesetting/marp/default.nix +++ b/pkgs/tools/typesetting/marp/default.nix @@ -10,18 +10,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "marp-cli"; - version = "3.2.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "marp-team"; repo = "marp-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-bx5mq5KI85qUct/9Hr6mby6dWmRkmpVbiIw+M8PZas8="; + hash = "sha256-azscuPkQ9/xcQtBg+5pJigXSQQVtBGvbd7ZwiLwU7Qo="; }; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-BogCt7ezmWxv2YfhljHYoBf47/FHR0qLZosjnoQhqgs="; + hash = "sha256-b/JyhsfXEbmM6+ajrjL65WhX9u9MEH+m1NHE6cTyf2g="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/video/go2rtc/default.nix b/pkgs/tools/video/go2rtc/default.nix index fb5d2003af3b9..39be2d40369be 100644 --- a/pkgs/tools/video/go2rtc/default.nix +++ b/pkgs/tools/video/go2rtc/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "go2rtc"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "AlexxIT"; repo = "go2rtc"; rev = "refs/tags/v${version}"; - hash = "sha256-p79LX7tHkQTVBWmXsKHMcXpC5idMgBmDtZxq+kQ0GEo="; + hash = "sha256-LK2+hNgP9EhnAL9QKzvfn0+pYjuJJDB7l1fd57jeCWw="; }; vendorHash = "sha256-mUdUMZf3KhJyE0iv2yvWtkHa+pyXcv2RTZY+JtBLrSQ="; diff --git a/pkgs/tools/wayland/cliphist/default.nix b/pkgs/tools/wayland/cliphist/default.nix index 7485d79bf7bc4..0cbb856162b2a 100644 --- a/pkgs/tools/wayland/cliphist/default.nix +++ b/pkgs/tools/wayland/cliphist/default.nix @@ -1,4 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ + lib, + buildGoModule, + fetchFromGitHub, +}: buildGoModule rec { pname = "cliphist"; @@ -13,6 +17,10 @@ buildGoModule rec { vendorHash = "sha256-O4jOFWygmFxm8ydOq1xtB1DESyWpFGXeSp8a6tT+too="; + postInstall = '' + cp ${src}/contrib/* $out/bin/ + ''; + meta = with lib; { description = "Wayland clipboard manager"; homepage = "https://github.com/sentriz/cliphist"; diff --git a/pkgs/tools/wayland/wlr-which-key/default.nix b/pkgs/tools/wayland/wlr-which-key/default.nix index bef65f8bc9dbc..3eaa2822c1901 100644 --- a/pkgs/tools/wayland/wlr-which-key/default.nix +++ b/pkgs/tools/wayland/wlr-which-key/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "wlr-which-key"; - version = "0.1.1"; + version = "0.1.3"; src = fetchFromGitHub { owner = "MaxVerevkin"; repo = "wlr-which-key"; rev = "v${version}"; - hash = "sha256-FVpPS5EQ6+xZIBtdS18SdVx0TK9/ikryU9mtm5JvDgk="; + hash = "sha256-DedmLWjK0a6AoGaKGRKfsmK/NIAFV2EYY8MgfiEj4+o="; }; - cargoHash = "sha256-JELvmG2CiknBP3QbaXSl1uj6wEgLaDFVFBuS1l5SUk4="; + cargoHash = "sha256-ZGaQX5raMSCwt88xhctwCxGWa9HZtcNqTKM35Z8QvAc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d7cf6ef306928..6609a49b31914 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -109,6 +109,7 @@ mapAliases ({ bash_5 = bash; # Added 2021-08-20 bazel_3 = throw "bazel 3 is past end of life as it is not an lts version"; # Added 2023-02-02 bazel_4 = throw "'bazel_4' has been removed from nixpkgs as it has reached end of life"; # Added 2024-01-23 + BeatSaberModManager = beatsabermodmanager; # Added 2024-06-12 bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04 bee-unstable = throw "bee-unstable has been removed, use 'bee' instead"; # Added 2024-02-12 bee-clef = throw "bee-clef has been removed as the upstream project was archived"; # Added 2024-02-12 @@ -176,6 +177,10 @@ mapAliases ({ chia-plotter = throw "chia-plotter has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30 chkservice = throw "chkservice has been removed from nixpkgs, as it has been deleted upstream"; # Added 2024-01-08 chocolateDoom = chocolate-doom; # Added 2023-05-01 + ChowCentaur = chow-centaur; # Added 2024-06-12 + ChowPhaser = chow-phaser; # Added 2024-06-12 + ChowKick = chow-kick; # Added 2024-06-12 + CHOWTapeModel = chow-tape-model; # Added 2024-06-12 chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27 chromiumBeta = throw "'chromiumBeta' has been removed due to the lack of maintenance in nixpkgs. Consider using 'chromium' instead."; # Added 2023-10-18 chromiumDev = throw "'chromiumDev' has been removed due to the lack of maintenance in nixpkgs. Consider using 'chromium' instead."; # Added 2023-10-18 @@ -186,6 +191,7 @@ mapAliases ({ inherit (libsForQt5.mauiPackages) clip; # added 2022-05-17 clpm = throw "'clpm' has been removed from nixpkgs"; # Added 2024-04-01 clwrapperFunction = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 + CoinMP = coinmp; # Added 2024-06-12 collada-dom = opencollada; # added 2024-02-21 composable_kernel = throw "'composable_kernel' has been replaced with 'rocmPackages.composable_kernel'"; # Added 2023-10-08 cope = throw "'cope' has been removed, as it is broken in nixpkgs since it was added, and fixing it is not trivial"; # Added 2024-04-12 @@ -222,6 +228,7 @@ mapAliases ({ clang15Stdenv = lowPrio llvmPackages_15.stdenv; clang16Stdenv = lowPrio llvmPackages_16.stdenv; clang17Stdenv = lowPrio llvmPackages_17.stdenv; + clang18Stdenv = lowPrio llvmPackages_18.stdenv; clang-tools_6 = throw "clang-tools_6 has been removed from nixpkgs"; # Added 2024-01-08 clang-tools_7 = throw "clang-tools_7 has been removed from nixpkgs"; # Added 2023-11-19 @@ -258,6 +265,7 @@ mapAliases ({ dhcp = throw "dhcp (ISC DHCP) has been removed from nixpkgs, because it reached its end of life"; # Added 2023-04-04 dibbler = throw "dibbler was removed because it is not maintained anymore"; # Added 2024-05-14 dnnl = oneDNN; # Added 2020-04-22 + docker-distribution = distribution; # Added 2023-12-26 docker-machine = throw "'docker-machine' has been removed, because the upstream project was archived"; # Added 2023-12-27 docker-machine-kvm = throw "'docker-machine-kvm' has been removed, because 'docker-machine' was archived upstream and removed"; # Added 2023-12-27 docker-machine-xhyve = throw "'docker-machine-xhyve' has been removed, because 'docker-machine' was archived upstream and removed"; # Added 2023-12-27 @@ -370,6 +378,7 @@ mapAliases ({ fastnlo_toolkit = fastnlo-toolkit; # Added 2024-01-03 inherit (luaPackages) fennel; # Added 2022-09-24 fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; # preserve + FIL-plugins = fil-plugins; # Added 2024-06-12 findimagedupes = throw "findimagedupes has been removed because the perl bindings are no longer compatible"; # Added 2023-07-10 finger_bsd = bsd-finger; fingerd_bsd = bsd-fingerd; @@ -538,6 +547,7 @@ mapAliases ({ haxe_3_2 = throw "'haxe_3_2' has been removed because it is old and no longer used by any packages in nixpkgs"; # Added 2023-03-15 haxe_3_4 = throw "'haxe_3_4' has been removed because it is old and no longer used by any packages in nixpkgs"; # Added 2023-03-15 + HentaiAtHome = hentai-at-home; # Added 2024-06-12 hepmc = throw "'hepmc' has been renamed to/replaced by 'hepmc2'"; # Converted to throw 2023-09-10 hikari = throw "hikari has been removed from nixpkgs, it was unmaintained and required wlroots_0_15 at the time of removal"; # Added 2024-03-28 hip = throw "'hip' has been removed in favor of 'rocmPackages.clr'"; # Added 2023-10-08 @@ -640,6 +650,8 @@ mapAliases ({ ### L ### larynx = piper-tts; # Added 2023-05-09 + LASzip = laszip; # Added 2024-06-12 + LASzip2 = laszip_2; # Added 2024-06-12 latinmodern-math = lmmath; ldgallery = throw "'ldgallery' has been removed from nixpkgs. Use the Flake provided by ldgallery instead"; # Added 2023-07-26 ledger_agent = ledger-agent; # Added 2024-01-07 @@ -668,6 +680,8 @@ mapAliases ({ librarian-puppet-go = throw "'librarian-puppet-go' has been removed, as it's upstream is unmaintained"; # Added 2024-06-10 libraw_unstable = throw "'libraw_unstable' has been removed, please use libraw"; # Added 2023-01-30 librdf = lrdf; # Added 2020-03-22 + LibreArp = librearp; # Added 2024-06-12 + LibreArp-lv2 = librearp-lv2; # Added 2024-06-12 libressl_3_5 = throw "'libressl_3_5' has reached end-of-life "; # Added 2023-05-07 librtlsdr = rtl-sdr; # Added 2023-02-18 librewolf-wayland = librewolf; # Added 2022-11-15 @@ -689,6 +703,7 @@ mapAliases ({ lispPackages_new = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 lispPackages = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 lispPackagesFor = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 + Literate = literate; # Added 2024-06-12 llama = walk; # Added 2023-01-23 # Linux kernels @@ -800,6 +815,7 @@ mapAliases ({ lobster-two = google-fonts; # Added 2021-07-22 luxcorerender = throw "'luxcorerender' has been removed as it's unmaintained and broken in nixpkgs since a while ago"; # Added 2023-06-07 + lv_img_conv = throw "'lv_img_conv' has been removed from nixpkgs as it is broken"; # Added 2024-06-18 lxd = lib.warn "lxd has been renamed to lxd-lts" lxd-lts; # Added 2024-04-01 lxd-unwrapped = lib.warn "lxd-unwrapped has been renamed to lxd-unwrapped-lts" lxd-unwrapped-lts; # Added 2024-04-01 lzma = xz; # moved from top-level 2021-03-14 @@ -821,6 +837,7 @@ mapAliases ({ meme = meme-image-generator; # Added 2021-04-21 mess = throw "'mess' has been renamed to/replaced by 'mame'"; # Converted to throw 2023-09-10 microsoft_gsl = microsoft-gsl; # Added 2023-05-26 + MIDIVisualizer = midivisualizer; # Added 2024-06-12 migraphx = throw "'migraphx' has been replaced with 'rocmPackages.migraphx'"; # Added 2023-10-08 minishift = throw "'minishift' has been removed as it was discontinued upstream. Use 'crc' to setup a microshift cluster instead"; # Added 2023-12-30 miopen = throw "'miopen' has been replaced with 'rocmPackages.miopen'"; # Added 2023-10-08 @@ -902,11 +919,8 @@ mapAliases ({ nix-template-rpm = throw "'nix-template-rpm' has been removed as it is broken and unmaintained"; # Added 2023-11-20 nixFlakes = nixVersions.stable; # Added 2021-05-21 nixStable = nixVersions.stable; # Added 2022-01-24 - nixUnstable = nixVersions.unstable; # Added 2022-01-26 + nixUnstable = throw "nixUnstable has been removed. For bleeding edge (Nix master, roughly weekly updated) use nixVersions.git, otherwise use nixVersions.latest."; # Converted to throw 2024-04-22 nix_2_3 = nixVersions.nix_2_3; - nix_2_4 = nixVersions.nix_2_4; - nix_2_5 = nixVersions.nix_2_5; - nix_2_6 = nixVersions.nix_2_6; nixfmt = lib.warn "nixfmt was renamed to nixfmt-classic. The nixfmt attribute may be used for the new RFC 166-style formatter in the future, which is currently available as nixfmt-rfc-style" nixfmt-classic; # Added 2024-03-31 nixops = throw "'nixops' has been removed. Please use 'nixops_unstable_minimal' for the time being. E.g. nixops_unstable_minimal.withPlugins (ps: [ ps.nixops-gce ])"; # Added 2023-10-26 nixopsUnstable = nixops_unstable; # Added 2022-03-03 @@ -959,6 +973,7 @@ mapAliases ({ openapi-generator-cli-unstable = throw "openapi-generator-cli-unstable was removed as it was not being updated; consider openapi-generator-cli instead"; # Added 2024-01-02 openbangla-keyboard = throw "openbangla-keyboard has been replaced by ibus-engines.openbangla-keyboard and fcitx5-openbangla-keyboard"; # added 2023-10-10 opencascade = throw "'opencascade' has been removed as it is unmaintained; consider opencascade-occt instead'"; # Added 2023-09-18 + opencl-info = throw "opencl-info has been removed, as the upstream is unmaintained; consider using 'clinfo' instead"; # Added 2024-06-12 openconnect_head = openconnect_unstable; # Added 2022-03-29 openconnect_gnutls = openconnect; # Added 2022-03-29 openconnect_unstable = throw "openconnect_unstable was removed from nixpkgs as it was not being updated"; # Added 2023-06-01 @@ -1023,6 +1038,7 @@ mapAliases ({ pltScheme = racket; # just to be sure pmdk = throw "'pmdk' is discontinued, no further support or maintenance is planned by upstream"; # Added 2023-02-06 pomotroid = throw "pomotroid has been removed from nixpkgs, because it depended on an insecure version of electron"; # Added 2023-09-12 + poretools = throw "poretools has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-03 powerdns = pdns; # Added 2022-03-28 # postgresql plugins @@ -1213,6 +1229,7 @@ mapAliases ({ shipyard = jumppad; # Added 2023-06-06 signumone-ks = throw "signumone-ks has been removed from nixpkgs because the developers stopped offering the binaries"; # Added 2023-08-17 simplenote = throw "'simplenote' has been removed because it is no longer maintained and insecure"; # Added 2023-10-09 + SkypeExport = skypeexport; # Added 2024-06-12 slack-dark = slack; # Added 2020-03-27 slmenu = throw "slmenu has been removed (upstream is gone)"; # Added 2023-04-06 slurm-llnl = slurm; # renamed July 2017 @@ -1222,6 +1239,7 @@ mapAliases ({ solr = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16 soundOfSorting = sound-of-sorting; # Added 2023-07-07 soundux = throw "'soundux' has been removed, as it is unmaintained."; # Added on 2024-02-14 + SPAdes = spades; # Added 2024-06-12 spark2 = throw "'spark2' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 spark_2_4 = throw "'spark_2_4' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 spark_3_1 = throw "'spark_3_1' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 @@ -1270,6 +1288,7 @@ mapAliases ({ supertux-editor = throw "'supertux-editor' has been removed, as it was broken and unmaintained"; # Added 2023-12-22 swift-im = throw "swift-im has been removed as it is unmaintained and depends on deprecated Python 2 / Qt WebKit"; # Added 2023-01-06 swtpm-tpm2 = swtpm; # Added 2021-02-26 + Sylk = sylk; # Added 2024-06-12 syncthing-cli = syncthing; # Added 2021-04-06 syncthingtray-qt6 = syncthingtray; # Added 2024-03-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f06962f5fad69..adba1c835f36e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -417,8 +417,6 @@ with pkgs; catatonit = callPackage ../applications/virtualization/catatonit { }; - catppuccin-gtk = callPackage ../data/themes/catppuccin-gtk { }; - catppuccin-kde = callPackage ../data/themes/catppuccin-kde { }; catppuccin-kvantum = callPackage ../data/themes/catppuccin-kvantum { }; @@ -1473,6 +1471,7 @@ with pkgs; _6tunnel = callPackage ../tools/networking/6tunnel { }; _7zz = darwin.apple_sdk_11_0.callPackage ../tools/archivers/7zz { }; + _7zz-rar = _7zz.override { enableUnfree = true; }; _9pfs = callPackage ../tools/filesystems/9pfs { }; @@ -2596,8 +2595,6 @@ with pkgs; cdemu-daemon = callPackage ../applications/emulators/cdemu/daemon.nix { }; - cemu = callPackage ../applications/emulators/cemu { }; - cen64 = callPackage ../applications/emulators/cen64 { }; citations = callPackage ../applications/misc/citations { }; @@ -3118,7 +3115,7 @@ with pkgs; inherit (callPackages ../development/tools/ammonite {}) ammonite_2_12 ammonite_2_13; - ammonite = if scala == scala_2_12 then ammonite_2_12 else ammonite_2_13; + ammonite = ammonite_2_13; amp = callPackage ../applications/editors/amp { }; @@ -4067,7 +4064,7 @@ with pkgs; adbfs-rootless = callPackage ../development/mobile/adbfs-rootless { }; adb-sync = callPackage ../development/mobile/adb-sync { - inherit (androidenv.androidPkgs_9_0) platform-tools; + inherit (androidenv.androidPkgs) platform-tools; }; amoco = callPackage ../tools/security/amoco { }; @@ -4083,7 +4080,7 @@ with pkgs; androidndkPkgs_23b = (callPackage ../development/androidndk-pkgs {})."23b"; androidndkPkgs_24 = (callPackage ../development/androidndk-pkgs {})."24"; - androidsdk_9_0 = androidenv.androidPkgs_9_0.androidsdk; + androidsdk = androidenv.androidPkgs.androidsdk; webos = recurseIntoAttrs { cmake-modules = callPackage ../development/mobile/webos/cmake-modules.nix { }; @@ -4196,8 +4193,6 @@ with pkgs; beats = callPackage ../tools/misc/beats { }; - BeatSaberModManager = callPackage ../games/BeatSaberModManager/default.nix { }; - beauty-line-icon-theme = callPackage ../data/icons/beauty-line-icon-theme { inherit (plasma5Packages) breeze-icons; }; @@ -5386,8 +5381,6 @@ with pkgs; globalarrays = callPackage ../development/libraries/globalarrays { }; - glock = callPackage ../development/tools/glock { }; - glslviewer = callPackage ../development/tools/glslviewer { inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -5501,8 +5494,6 @@ with pkgs; hypr = callPackage ../applications/window-managers/hyprwm/hypr { cairo = cairo.override { xcbSupport = true; }; }; - hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { }; - hyprland-autoname-workspaces = callPackage ../applications/misc/hyprland-autoname-workspaces { }; hyprland-per-window-layout = callPackage ../tools/wayland/hyprland-per-window-layout { }; @@ -5515,7 +5506,7 @@ with pkgs; hyprshade = python311Packages.callPackage ../applications/window-managers/hyprwm/hyprshade { }; - hyprlandPlugins = recurseIntoAttrs (callPackage ../applications/window-managers/hyprwm/hyprland/plugins.nix { }); + hyprlandPlugins = recurseIntoAttrs (callPackage ../applications/window-managers/hyprwm/hyprland-plugins { }); hysteria = callPackage ../tools/networking/hysteria { }; @@ -5977,9 +5968,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit Security; }; - odoo = callPackage ../applications/finance/odoo { }; - odoo15 = callPackage ../applications/finance/odoo/odoo15.nix { }; - odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter { }; oil-buku = callPackage ../applications/misc/oil-buku { }; @@ -6218,10 +6206,6 @@ with pkgs; rainloop-community rainloop-standard; - rav1e = callPackage ../tools/video/rav1e { - inherit (darwin.apple_sdk.frameworks) Security; - }; - raven-reader = callPackage ../applications/networking/newsreaders/raven-reader { }; razergenie = libsForQt5.callPackage ../applications/misc/razergenie { }; @@ -6638,8 +6622,9 @@ with pkgs; citrix_workspace_23_09_0 citrix_workspace_23_11_0 citrix_workspace_24_02_0 + citrix_workspace_24_05_0 ; - citrix_workspace = citrix_workspace_24_02_0; + citrix_workspace = citrix_workspace_24_05_0; clima = callPackage ../tools/text/clima { }; @@ -6728,9 +6713,7 @@ with pkgs; unionfs-fuse = callPackage ../tools/filesystems/unionfs-fuse { }; - unparam = callPackage ../tools/misc/unparam { - buildGoModule = buildGo121Module; - }; + unparam = callPackage ../tools/misc/unparam { }; inherit (nodePackages) uppy-companion; @@ -7578,7 +7561,7 @@ with pkgs; tracker = callPackage ../development/libraries/tracker { }; - tracy = callPackage ../development/tools/tracy { }; + tracy-x11 = callPackage ../by-name/tr/tracy/package.nix { withWayland = false; }; trivy = callPackage ../tools/admin/trivy { }; @@ -9477,17 +9460,7 @@ with pkgs; kestrel = callPackage ../tools/security/kestrel { }; - kexec-tools = callPackage ../os-specific/linux/kexec-tools { - # clangStdenv fails with - # purgatory/arch/i386/entry32-16.S:23:2: error: unknown directive - # .arch i386 - # ^ - # purgatory/arch/i386/entry32-16.S:115:11: error: unknown token in expression - # ljmp %cs:*(realdest - entry16) - # ^ - # make: *** [Makefile:128: purgatory/arch/i386/entry32-16.o] Error 1 - stdenv = gccStdenv; - }; + kexec-tools = callPackage ../os-specific/linux/kexec-tools { }; keepkey-agent = with python3Packages; toPythonApplication keepkey-agent; @@ -10379,10 +10352,6 @@ with pkgs; lv = callPackage ../tools/text/lv { }; - lv_img_conv = callPackage ../development/tools/lv_img_conv { - inherit (darwin.apple_sdk.frameworks) CoreText; - }; - lwc = callPackage ../tools/misc/lwc { }; lxd-image-server = callPackage ../tools/virtualization/lxd-image-server { }; @@ -11239,8 +11208,6 @@ with pkgs; opencc = callPackage ../tools/text/opencc { }; - opencl-info = callPackage ../tools/system/opencl-info { }; - opencryptoki = callPackage ../tools/security/opencryptoki { }; opendbx = callPackage ../development/libraries/opendbx { }; @@ -11496,6 +11463,7 @@ with pkgs; }; p7zip = callPackage ../tools/archivers/p7zip { }; + p7zip-rar = p7zip.override { enableUnfree = true; }; packagekit = callPackage ../tools/package-management/packagekit { }; @@ -11923,8 +11891,6 @@ with pkgs; popfile = callPackage ../tools/text/popfile { }; - poretools = callPackage ../applications/science/biology/poretools { }; - porsmo = callPackage ../applications/misc/porsmo { }; pantum-driver = callPackage ../misc/drivers/pantum-driver { }; @@ -13341,8 +13307,6 @@ with pkgs; systrayhelper = callPackage ../tools/misc/systrayhelper { }; - Sylk = callPackage ../applications/networking/Sylk { }; - privoxy = callPackage ../tools/networking/privoxy { w3m = w3m-batch; }; @@ -15379,8 +15343,11 @@ with pkgs; fluidd = callPackage ../applications/misc/fluidd { }; - flutterPackages = recurseIntoAttrs (callPackage ../development/compilers/flutter { }); + flutterPackages-bin = recurseIntoAttrs (callPackage ../development/compilers/flutter { }); + flutterPackages-source = recurseIntoAttrs (callPackage ../development/compilers/flutter { useNixpkgsEngine = true; }); + flutterPackages = flutterPackages-bin; flutter = flutterPackages.stable; + flutter323 = flutterPackages.v3_23; flutter322 = flutterPackages.v3_22; flutter319 = flutterPackages.v3_19; flutter316 = flutterPackages.v3_16; @@ -16167,8 +16134,6 @@ with pkgs; julia-stable-bin = julia_110-bin; julia-bin = julia-stable-bin; - jwasm = callPackage ../development/compilers/jwasm { }; - kind2 = darwin.apple_sdk_11_0.callPackage ../development/compilers/kind2 { }; kingstvis = callPackage ../applications/science/electronics/kingstvis { }; @@ -16802,7 +16767,7 @@ with pkgs; scala_2_13 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.13"; }; scala_3 = callPackage ../development/compilers/scala { }; - scala = scala_2_13; + scala = scala_3; scala-runners = callPackage ../development/compilers/scala-runners { coursier = coursier.override { jre = jdk8; }; }; @@ -16883,6 +16848,7 @@ with pkgs; swiPrologWithGui = swiProlog.override { withGui = true; }; tbb_2020_3 = callPackage ../development/libraries/tbb/2020_3.nix { }; + tbb_2021_5 = callPackage ../development/libraries/tbb/2021_5.nix { } ; tbb_2021_11 = callPackage ../development/libraries/tbb { }; # many packages still fail with latest version tbb = tbb_2020_3; @@ -18033,8 +17999,6 @@ with pkgs; b4 = callPackage ../development/tools/b4 { }; - babeltrace = callPackage ../development/tools/misc/babeltrace { }; - bam = callPackage ../development/tools/build-managers/bam { }; bandit = with python3Packages; toPythonApplication bandit; @@ -18564,8 +18528,6 @@ with pkgs; dwz = callPackage ../development/tools/misc/dwz { }; - eask = callPackage ../development/tools/eask { }; - easypdkprog = callPackage ../development/embedded/easypdkprog { }; editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { }; @@ -18620,8 +18582,6 @@ with pkgs; license-scanner = callPackage ../development/tools/license-scanner { }; - Literate = callPackage ../development/tools/literate-programming/Literate { }; - md-tangle = callPackage ../development/tools/literate-programming/md-tangle { }; # NOTE: Override and set useIcon = false to use Awk instead of Icon. @@ -20342,8 +20302,6 @@ with pkgs; soxt = callPackage ../development/libraries/soxt { }; - CoinMP = callPackage ../development/libraries/CoinMP { }; - coinlive = callPackage ../tools/misc/coinlive { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -20577,8 +20535,6 @@ with pkgs; entt = callPackage ../development/libraries/entt { }; - epoll-shim = callPackage ../development/libraries/epoll-shim { }; - libepoxy = callPackage ../development/libraries/libepoxy { inherit (darwin.apple_sdk.frameworks) Carbon OpenGL; }; @@ -21541,7 +21497,7 @@ with pkgs; ispc = callPackage ../development/compilers/ispc { xcode = darwin.xcode_14; - llvmPackages = llvmPackages_15; + llvmPackages = llvmPackages_17; }; isso = callPackage ../servers/isso { @@ -21659,9 +21615,6 @@ with pkgs; LAStools = callPackage ../development/libraries/LAStools { }; - LASzip = callPackage ../development/libraries/LASzip { }; - LASzip2 = callPackage ../development/libraries/LASzip/LASzip2.nix { }; - laurel = callPackage ../servers/monitoring/laurel/default.nix { }; lcm = callPackage ../development/libraries/lcm { }; @@ -23307,7 +23260,7 @@ with pkgs; micropython = callPackage ../development/interpreters/micropython { }; - MIDIVisualizer = darwin.apple_sdk_11_0.callPackage ../applications/audio/midi-visualizer { + midivisualizer = darwin.apple_sdk_11_0.callPackage ../applications/audio/midivisualizer { inherit (darwin.apple_sdk_11_0.frameworks) AppKit Cocoa Carbon CoreAudio CoreMIDI CoreServices Kernel; }; @@ -24671,9 +24624,7 @@ with pkgs; umockdev = callPackage ../development/libraries/umockdev { }; - unconvert = callPackage ../development/tools/unconvert { - buildGoModule = buildGo121Module; - }; + unconvert = callPackage ../development/tools/unconvert { }; uncover = callPackage ../tools/security/uncover { }; @@ -24748,8 +24699,6 @@ with pkgs; hdf5 = hdf5.override { usev110Api = true; }; }; - vkd3d = callPackage ../development/libraries/vkd3d {}; - vkd3d-proton = callPackage ../development/libraries/vkd3d-proton {}; vkdisplayinfo = callPackage ../tools/graphics/vkdisplayinfo { }; @@ -25026,7 +24975,11 @@ with pkgs; zig_0_12 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.12 { llvmPackages = llvmPackages_17; }; - zig = zig_0_12; + # requires a newer Apple SDK + zig_0_13 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.13 { + llvmPackages = llvmPackages_18; + }; + zig = zig_0_13; zimlib = callPackage ../development/libraries/zimlib { }; @@ -25841,7 +25794,7 @@ with pkgs; matrix-alertmanager = callPackage ../servers/monitoring/matrix-alertmanager { }; - mattermost = callPackage ../servers/mattermost { buildGoModule = buildGo122Module; }; + mattermost = callPackage ../servers/mattermost { }; matterircd = callPackage ../servers/mattermost/matterircd.nix { }; matterbridge = callPackage ../servers/matterbridge { }; @@ -27607,6 +27560,7 @@ with pkgs; odin = callPackage ../development/compilers/odin { inherit (pkgs.darwin.apple_sdk_11_0) MacOSX-SDK; inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security; + llvmPackages = llvmPackages_18; }; odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { }; @@ -29006,6 +28960,10 @@ with pkgs; redhat-official-fonts = callPackage ../data/fonts/redhat-official { }; + ricochet-refresh = callPackage ../by-name/ri/ricochet-refresh/package.nix { + protobuf = protobuf_21; # https://github.com/blueprint-freespeech/ricochet-refresh/issues/178 + }; + rime-data = callPackage ../data/misc/rime-data { }; roapi-http = callPackage ../servers/roapi/http.nix { }; @@ -29518,6 +29476,7 @@ with pkgs; androidStudioPackages = recurseIntoAttrs (callPackage ../applications/editors/android-studio { }); android-studio = androidStudioPackages.stable; + android-studio-full = android-studio.full; antfs-cli = callPackage ../applications/misc/antfs-cli { }; @@ -29581,8 +29540,6 @@ with pkgs; asap = callPackage ../tools/audio/asap { }; - aseprite = callPackage ../applications/editors/aseprite { }; - assign-lb-ip = callPackage ../applications/networking/cluster/assign-lb-ip { }; astroid = callPackage ../applications/networking/mailreaders/astroid { @@ -29976,14 +29933,6 @@ with pkgs; cgif = callPackage ../tools/graphics/cgif { }; - ChowCentaur = callPackage ../applications/audio/ChowCentaur { }; - - ChowKick = callPackage ../applications/audio/ChowKick { }; - - ChowPhaser = callPackage ../applications/audio/ChowPhaser { }; - - CHOWTapeModel = callPackage ../applications/audio/CHOWTapeModel { }; - chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or {}); chuck = callPackage ../applications/audio/chuck { @@ -30094,8 +30043,6 @@ with pkgs; coursera-dl = callPackage ../applications/misc/coursera-dl { }; - coyim = callPackage ../applications/networking/instant-messengers/coyim { }; - cozy-drive = callPackage ../applications/networking/cozy-drive { }; cplay-ng = callPackage ../applications/audio/cplay-ng { }; @@ -30249,8 +30196,6 @@ with pkgs; docker-machine-hyperkit = callPackage ../applications/networking/cluster/docker-machine/hyperkit.nix { }; docker-machine-kvm2 = callPackage ../applications/networking/cluster/docker-machine/kvm2.nix { }; - docker-distribution = callPackage ../applications/virtualization/docker/distribution.nix { }; - dockfmt = callPackage ../development/tools/dockfmt { }; afterburn = callPackage ../tools/admin/afterburn { }; @@ -30375,10 +30320,6 @@ with pkgs; edlin = callPackage ../applications/editors/edlin { }; - orbiton = callPackage ../applications/editors/orbiton { - buildGoModule = buildGo122Module; - }; - oed = callPackage ../applications/editors/oed { }; ekho = callPackage ../applications/audio/ekho { @@ -30600,8 +30541,6 @@ with pkgs; fig2dev = callPackage ../applications/graphics/fig2dev { }; - FIL-plugins = callPackage ../applications/audio/FIL-plugins { }; - finalfrontier = callPackage ../applications/science/machine-learning/finalfrontier { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -31186,9 +31125,19 @@ with pkgs; vmopts = config.jetbrains.vmopts or null; jdk = jetbrains.jdk; }) // { - jdk-no-jcef = callPackage ../development/compilers/jetbrains-jdk { withJcef = false; }; - jdk = callPackage ../development/compilers/jetbrains-jdk { }; - jcef = callPackage ../development/compilers/jetbrains-jdk/jcef.nix { }; + jdk-no-jcef = callPackage ../development/compilers/jetbrains-jdk { + jdk = jdk21; + withJcef = false; + }; + jdk-no-jcef-17 = callPackage ../development/compilers/jetbrains-jdk/17.nix { + withJcef = false; + }; + jdk = callPackage ../development/compilers/jetbrains-jdk { + jdk = jdk21; + }; + jcef = callPackage ../development/compilers/jetbrains-jdk/jcef.nix { + jdk = jdk21; + }; }); jmusicbot = callPackage ../applications/audio/jmusicbot { }; @@ -31197,10 +31146,6 @@ with pkgs; lemonade = callPackage ../applications/misc/lemonade { }; - LibreArp = callPackage ../applications/audio/LibreArp { }; - - LibreArp-lv2 = callPackage ../applications/audio/LibreArp/lv2.nix { }; - librespot = callPackage ../applications/audio/librespot { withALSA = stdenv.isLinux; withPulseAudio = config.pulseaudio or stdenv.isLinux; @@ -32236,8 +32181,6 @@ with pkgs; fluxctl = callPackage ../applications/networking/cluster/fluxctl { }; - fluxcd = callPackage ../applications/networking/cluster/fluxcd { }; - linkerd = callPackage ../applications/networking/cluster/linkerd { }; linkerd_edge = callPackage ../applications/networking/cluster/linkerd/edge.nix { }; linkerd_stable = linkerd; @@ -32597,8 +32540,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; - media-downloader = libsForQt5.callPackage ../applications/video/media-downloader { }; - mediaelch = mediaelch-qt5; mediaelch-qt5 = libsForQt5.callPackage ../applications/misc/mediaelch { }; mediaelch-qt6 = qt6Packages.callPackage ../applications/misc/mediaelch { }; @@ -33046,8 +32987,6 @@ with pkgs; nwg-menu = callPackage ../applications/misc/nwg-menu { }; - nwg-panel = callPackage ../applications/misc/nwg-panel { }; - nwg-wrapper = callPackage ../applications/misc/nwg-wrapper { }; ocm = callPackage ../applications/networking/cluster/ocm { }; @@ -33324,7 +33263,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation; }; - nheko = libsForQt5.callPackage ../applications/networking/instant-messengers/nheko { }; + nheko = qt6Packages.callPackage ../applications/networking/instant-messengers/nheko { }; notepad-next = libsForQt5.callPackage ../applications/editors/notepad-next { }; @@ -34219,8 +34158,6 @@ with pkgs; skypeforlinux = callPackage ../applications/networking/instant-messengers/skypeforlinux { }; - SkypeExport = callPackage ../applications/networking/instant-messengers/SkypeExport { }; - slingshot = callPackage ../tools/misc/slingshot { }; slop = callPackage ../tools/misc/slop { }; @@ -34497,8 +34434,6 @@ with pkgs; pythonBindings = true; }; - sublime-music = callPackage ../applications/audio/sublime-music { }; - subtitlr = callPackage ../applications/audio/subtitlr { }; subunit = callPackage ../development/libraries/subunit { }; @@ -35074,8 +35009,6 @@ with pkgs; qpdfview = libsForQt5.callPackage ../applications/office/qpdfview { }; - qtile = callPackage ../development/python-modules/qtile/wrapper.nix { }; - vimgolf = callPackage ../games/vimgolf { }; vimpc = callPackage ../applications/audio/vimpc { }; @@ -35097,9 +35030,6 @@ with pkgs; neovim-gtk = callPackage ../applications/editors/neovim/neovim-gtk.nix { }; - neovim-qt-unwrapped = libsForQt5.callPackage ../applications/editors/neovim/neovim-qt.nix { }; - neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { }; - gnvim-unwrapped = callPackage ../applications/editors/neovim/gnvim { }; gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { }; @@ -35643,8 +35573,6 @@ with pkgs; xmobar = haskellPackages.xmobar.bin; - xmonad-log = callPackage ../tools/misc/xmonad-log { }; - xmonad-with-packages = callPackage ../applications/window-managers/xmonad/wrapper.nix { inherit (haskellPackages) ghcWithPackages; packages = _: [ haskellPackages.xmonad-contrib ]; @@ -36196,7 +36124,9 @@ with pkgs; colobot = callPackage ../games/colobot { }; - corsix-th = callPackage ../games/corsix-th { }; + corsix-th = callPackage ../games/corsix-th { + inherit (darwin.apple_sdk.frameworks) Cocoa CoreVideo; + }; enigma = callPackage ../games/enigma { }; @@ -36236,7 +36166,9 @@ with pkgs; keeperrl = callPackage ../games/keeperrl { }; - shipwright = callPackage ../games/shipwright { }; + shipwright = callPackage ../games/shipwright { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + }; wipeout-rewrite = callPackage ../games/wipeout-rewrite { inherit (darwin.apple_sdk.frameworks) Foundation; @@ -37548,7 +37480,11 @@ with pkgs; enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { }); - expidus = recurseIntoAttrs (callPackage ../desktops/expidus {}); + expidus = recurseIntoAttrs (callPackages ../desktops/expidus { + # Use the Nix built Flutter Engine for testing. + # Also needed when we eventually package Genesis Shell. + flutterPackages = flutterPackages-source; + }); gnome2 = recurseIntoAttrs (callPackage ../desktops/gnome-2 { }); @@ -37958,8 +37894,6 @@ with pkgs; seaview = callPackage ../applications/science/biology/seaview { }; - SPAdes = callPackage ../applications/science/biology/spades { }; - svaba = callPackage ../applications/science/biology/svaba { }; tandem-aligner = callPackage ../applications/science/biology/tandem-aligner { }; @@ -39277,8 +39211,6 @@ with pkgs; velero = callPackage ../applications/networking/cluster/velero { }; - HentaiAtHome = callPackage ../applications/misc/HentaiAtHome { }; - hplip = callPackage ../misc/drivers/hplip { }; hplipWithPlugin = hplip.override { withPlugin = true; }; @@ -39376,8 +39308,6 @@ with pkgs; fmt = fmt_8; }; - kontemplate = callPackage ../applications/networking/cluster/kontemplate { }; - # In general we only want keep the last three minor versions around that # correspond to the last three supported kubernetes versions: # https://kubernetes.io/docs/setup/release/version-skew-policy/#supported-versions @@ -39387,8 +39317,9 @@ with pkgs; kops_1_26 kops_1_27 kops_1_28 + kops_1_29 ; - kops = kops_1_28; + kops = kops_1_29; lguf-brightness = callPackage ../misc/lguf-brightness { }; @@ -40767,8 +40698,6 @@ with pkgs; webwormhole = callPackage ../tools/networking/webwormhole { }; - werf = callPackage ../applications/networking/cluster/werf { }; - yor = callPackage ../applications/networking/cluster/yor { }; wifi-password = callPackage ../os-specific/darwin/wifi-password { }; diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index c9c8fe3b6a671..a294fa2e0d301 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -61,6 +61,8 @@ let controller-topology-project = callPackage ../applications/video/kodi/addons/controller-topology-project { }; + formula1 = callPackage ../applications/video/kodi/addons/formula1 { }; + iagl = callPackage ../applications/video/kodi/addons/iagl { }; invidious = callPackage ../applications/video/kodi/addons/invidious { }; @@ -97,6 +99,8 @@ let radioparadise = callPackage ../applications/video/kodi/addons/radioparadise { }; + raiplay = callPackage ../applications/video/kodi/addons/raiplay { }; + svtplay = callPackage ../applications/video/kodi/addons/svtplay { }; steam-controller = callPackage ../applications/video/kodi/addons/steam-controller { }; @@ -119,6 +123,8 @@ let osmc-skin = callPackage ../applications/video/kodi/addons/osmc-skin { }; + upnext = callPackage ../applications/video/kodi/addons/upnext { }; + vfs-libarchive = callPackage ../applications/video/kodi/addons/vfs-libarchive { }; vfs-rar = callPackage ../applications/video/kodi/addons/vfs-rar { }; @@ -175,6 +181,8 @@ let myconnpy = callPackage ../applications/video/kodi/addons/myconnpy { }; + plugin-cache = callPackage ../applications/video/kodi/addons/plugin-cache { }; + requests = callPackage ../applications/video/kodi/addons/requests { }; requests-cache = callPackage ../applications/video/kodi/addons/requests-cache { }; @@ -185,6 +193,8 @@ let signals = callPackage ../applications/video/kodi/addons/signals { }; + simplecache = callPackage ../applications/video/kodi/addons/simplecache { }; + simplejson = callPackage ../applications/video/kodi/addons/simplejson { }; six = callPackage ../applications/video/kodi/addons/six { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 8f491dd848b58..f26537876d6a0 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -204,6 +204,7 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.rust_1_77-6_9 + kernelPatches.rust_1_78 ]; }; @@ -215,7 +216,6 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.rust_1_78 ]; }; latest = packageAliases.linux_latest.kernel; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 4b3729bd2164e..46866fd883610 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -480,6 +480,8 @@ let ezjsonm = callPackage ../development/ocaml-modules/ezjsonm { }; + ezjsonm-encoding = callPackage ../development/ocaml-modules/ezjsonm-encoding { }; + ezxmlm = callPackage ../development/ocaml-modules/ezxmlm { }; ### F ### diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 04c2c05dadbb7..5071fff62745d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -586,10 +586,10 @@ with self; { AnyEventI3 = buildPerlPackage { pname = "AnyEvent-I3"; - version = "0.17"; + version = "0.19"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSTPLBG/AnyEvent-I3-0.17.tar.gz"; - hash = "sha256-U4LJhMnxODlfKfDACvgaoMj0t2VYIFXHPt5LE/BKbWM="; + url = "mirror://cpan/authors/id/M/MS/MSTPLBG/AnyEvent-I3-0.19.tar.gz"; + hash = "sha256-G807YNs9VWAUjeeRNT6K8RciZPWoXncZe5/8BB2sSDo="; }; propagatedBuildInputs = [ AnyEvent JSONXS ]; meta = { diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 176b7f7b82e13..268595503756b 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -365,6 +365,7 @@ mapAliases ({ pychef = throw "pychef has been removed because it's been archived upstream and abandoned since 2017."; # added 2022-11-14 PyChromecast = pychromecast; # added 2023-02-19 pycryptodome-test-vectors = throw "pycryptodome-test-vectors has been removed because it is an internal package to pycryptodome"; # added 2022-05-28 + pyfftw = throw "pyfftw has been removed because it is unmaintained and broken."; # Added 2024-06-17 pyflunearyou = pyoutbreaksnearme; # added 2023-02-11 pyialarmxr = pyialarmxr-homeassistant; # added 2022-06-07 pyialarmxr-homeassistant = throw "The package was removed together with the component support in home-assistant 2022.7.0"; # added 2022-07-07 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 928edd66a5f2f..42562f4c3244c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1330,6 +1330,17 @@ self: super: with self; { babelgladeextractor = callPackage ../development/python-modules/babelgladeextractor { }; + babeltrace = toPythonModule (pkgs.babeltrace.override { + pythonPackages = self; + enablePython = true; + }); + + babeltrace2 = toPythonModule (pkgs.babeltrace2.override { + inherit (self) python; + pythonPackages = self; + enablePython = true; + }); + bambi = callPackage ../development/python-modules/bambi { }; pad4pi = callPackage ../development/python-modules/pad4pi { }; @@ -2728,6 +2739,8 @@ self: super: with self; { dash = callPackage ../development/python-modules/dash { }; + dash-bootstrap-components = callPackage ../development/python-modules/dash-bootstrap-components { }; + dash-core-components = callPackage ../development/python-modules/dash-core-components { }; dash-html-components = callPackage ../development/python-modules/dash-html-components { }; @@ -4709,6 +4722,8 @@ self: super: with self; { generic = callPackage ../development/python-modules/generic { }; + genie-partner-sdk = callPackage ../development/python-modules/genie-partner-sdk { }; + geniushub-client = callPackage ../development/python-modules/geniushub-client { }; genome-collector = callPackage ../development/python-modules/genome-collector { }; @@ -5819,6 +5834,8 @@ self: super: with self; { inkex = callPackage ../development/python-modules/inkex { }; + inline-snapshot = callPackage ../development/python-modules/inline-snapshot { }; + inlinestyler = callPackage ../development/python-modules/inlinestyler { }; inotify = callPackage ../development/python-modules/inotify { }; @@ -6531,6 +6548,7 @@ self: super: with self; { laszip = callPackage ../development/python-modules/laszip { inherit (pkgs) cmake ninja; + inherit (pkgs.__splicedPackages) laszip; }; latex2mathml = callPackage ../development/python-modules/latex2mathml { }; @@ -7079,6 +7097,8 @@ self: super: with self; { lsprotocol = callPackage ../development/python-modules/lsprotocol { }; + lsp-tree-sitter = callPackage ../development/python-modules/lsp-tree-sitter { }; + ltpycld2 = callPackage ../development/python-modules/ltpycld2 { }; lttng = callPackage ../development/python-modules/lttng { }; @@ -10085,6 +10105,8 @@ self: super: with self; { pyrender = callPackage ../development/python-modules/pyrender { }; + pyreqwest-impersonate = callPackage ../development/python-modules/pyreqwest-impersonate { }; + pyrevolve = callPackage ../development/python-modules/pyrevolve { }; pyrfxtrx = callPackage ../development/python-modules/pyrfxtrx { }; @@ -11056,8 +11078,6 @@ self: super: with self; { pyfcm = callPackage ../development/python-modules/pyfcm { }; - pyfftw = callPackage ../development/python-modules/pyfftw { }; - pyfido = callPackage ../development/python-modules/pyfido { }; pyfiglet = callPackage ../development/python-modules/pyfiglet { }; @@ -13083,6 +13103,8 @@ self: super: with self; { rapidgzip = callPackage ../development/python-modules/rapidgzip { inherit (pkgs) nasm; }; + rapidocr-onnxruntime = callPackage ../development/python-modules/rapidocr-onnxruntime { }; + rapt-ble = callPackage ../development/python-modules/rapt-ble { }; rarfile = callPackage ../development/python-modules/rarfile { @@ -13496,8 +13518,6 @@ self: super: with self; { rpi-gpio = callPackage ../development/python-modules/rpi-gpio { }; - rpi-gpio2 = callPackage ../development/python-modules/rpi-gpio2 { }; - rplcd = callPackage ../development/python-modules/rplcd { }; rply = callPackage ../development/python-modules/rply { }; @@ -15462,6 +15482,20 @@ self: super: with self; { tree-sitter = callPackage ../development/python-modules/tree-sitter { }; + tree-sitter0_21 = callPackage ../development/python-modules/tree-sitter0_21 { }; + + tree-sitter-html = callPackage ../development/python-modules/tree-sitter-html { }; + + tree-sitter-python = callPackage ../development/python-modules/tree-sitter-python { }; + + tree-sitter-rust = callPackage ../development/python-modules/tree-sitter-rust { }; + + tree-sitter-javascript = callPackage ../development/python-modules/tree-sitter-javascript { }; + + tree-sitter-json = callPackage ../development/python-modules/tree-sitter-json { }; + + tree-sitter-languages = callPackage ../development/python-modules/tree-sitter-languages { }; + treelib = callPackage ../development/python-modules/treelib { }; treelog = callPackage ../development/python-modules/treelog { }; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index d6896155c920e..4b41dc5bdcd27 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -258,6 +258,7 @@ in x86_64-freebsd = mapTestOnCross systems.examples.x86_64-freebsd common; x86_64-netbsd = mapTestOnCross systems.examples.x86_64-netbsd common; + x86_64-openbsd = mapTestOnCross systems.examples.x86_64-openbsd common; # we test `embedded` instead of `linuxCommon` because very few packages # successfully cross-compile to Redox so far diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 18819de3029c5..386b8506c73ca 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -2872,10 +2872,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "185zq5r9g56sfks852992bm0xf2vm9569jyiz5jyww3vx1jply1d"; + sha256 = "sha256-On/KnfdO5kHcHom4MCrG0D8iiD3nceeGoOnzCU5apq0="; type = "gem"; }; - version = "7.1.3.2"; + version = "7.1.3.4"; }; rails-dom-testing = { dependencies = ["activesupport" "minitest" "nokogiri"]; @@ -3127,10 +3127,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-CQioY4HZ+XOCRoDfTgp1QidmJy8DscDknbfnnCPbETU="; + sha256 = "0428ady49qssmnmwnafzrjvyba8mzbridsgblv7c7kmd0vqgfn99"; type = "gem"; }; - version = "3.2.8"; + version = "3.3.0"; }; rmagick = { dependencies = ["observer" "pkg-config"]; |