diff --git a/doc/build-helpers/fetchers.chapter.md b/doc/build-helpers/fetchers.chapter.md index e8289112963b..e2ac6640ef6c 100644 --- a/doc/build-helpers/fetchers.chapter.md +++ b/doc/build-helpers/fetchers.chapter.md @@ -899,10 +899,6 @@ However, `fetchFromBitbucket` will automatically switch to using `fetchgit` and When `fetchgit` is used, refer to the `fetchgit` section for documentation of its available options. -## `fetchFromSavannah` {#fetchfromsavannah} - -This is used with Savannah repositories. The arguments expected are very similar to `fetchFromGitHub` above. - ## `fetchFromRepoOrCz` {#fetchfromrepoorcz} This is used with repo.or.cz repositories. The arguments expected are very similar to `fetchFromGitHub` above. diff --git a/doc/redirects.json b/doc/redirects.json index d52ae8a8f047..8e072af31e4e 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -314,7 +314,8 @@ "release-notes.html#sec-nixpkgs-release-26.05-lib-breaking" ], "sec-nixpkgs-release-26.05-lib-deprecations": [ - "release-notes.html#sec-nixpkgs-release-26.05-lib-deprecations" + "release-notes.html#sec-nixpkgs-release-26.05-lib-deprecations", + "index.html#fetchfromsavannah" ], "sec-nixpkgs-release-26.05-lib-additions-improvements": [ "release-notes.html#sec-nixpkgs-release-26.05-lib-additions-improvements" @@ -1779,9 +1780,6 @@ "fetchfrombitbucket": [ "index.html#fetchfrombitbucket" ], - "fetchfromsavannah": [ - "index.html#fetchfromsavannah" - ], "fetchfromrepoorcz": [ "index.html#fetchfromrepoorcz" ], diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index 0d999f37a294..2eb5902778ed 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -162,6 +162,7 @@ - `mpv-unwrapped.scripts` and `mpv-unwrapped.wrapper` have been removed. Please use `mpvScripts` and `mpv.override` accordingly. +- `fetchFromSavannah` is now deprecated and is expected to be fully removed in a future release. From now on, use `fetchgit` or a Savannah releases mirror when applicable. ### Additions and Improvements {#sec-nixpkgs-release-26.05-lib-additions-improvements} diff --git a/lib/attrsets.nix b/lib/attrsets.nix index b05f8a2f867e..0e79a3b5a39b 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -1628,26 +1628,43 @@ rec { binaryMerge 0 (length list); /** - Does the same as the update operator `//` except that attributes are - merged until the given predicate is verified. The predicate should - accept 3 arguments which are the path to reach the attribute, a part of - the first attribute set and a part of the second attribute set. When - the predicate is satisfied, the value of the first attribute set is - replaced by the value of the second attribute set. + Update `lhs` so that `rhs` wins for any given attribute path that occurs in both. + + Unlike the `//` (update) operator, which operates on a single attribute set, + This function views its operands `lhs` and `rhs` as a mapping from attribute *paths* + to values. + + The caller-provided function `pred` decides whether any given path is one of the following: + + - `true`: a value in the mapping + - `false`: an attribute set whose purpose is to create the nesting structure. # Inputs `pred` - : Predicate, taking the path to the current attribute as a list of strings for attribute names, and the two values at that path from the original arguments. + : Predicate function (of type `List String -> Any -> Any -> Bool`) + + Inputs: + + - `path : List String`: the path to the current attribute as a list of strings for attribute names + - `lhsAtPath : Any`: the value at that path in `lhs`; same as `getAttrFromPath path lhs` + - `rhsAtPath : Any`: the value at that path in `rhs`; same as `getAttrFromPath path rhs` + + Output: + + - `true`: `path` points to a value in the mapping, and `rhsAtPath` will appear in the return value of `recursiveUpdateUntil` + - `false`: `path` is part of the nesting structure and will be an attrset in the return value of `recursiveUpdateUntil` + + `pred` is only called for `path`s that extend prefixes for which `pred` returned `false`. `lhs` - : Left attribute set of the merge. + : Left attribute set of the update. `rhs` - : Right attribute set of the merge. + : Right attribute set of the update. # Type @@ -1660,23 +1677,23 @@ rec { ## `lib.attrsets.recursiveUpdateUntil` usage example ```nix - recursiveUpdateUntil (path: l: r: path == ["foo"]) { - # first attribute set + recursiveUpdateUntil (path: lhs: rhs: path == ["foo"]) { + # left attribute set foo.bar = 1; foo.baz = 2; bar = 3; } { - #second attribute set + # right attribute set foo.bar = 1; foo.quz = 2; baz = 4; } => { - foo.bar = 1; # 'foo.*' from the second set + foo.bar = 1; # 'foo.*' from the 'right' set foo.quz = 2; # - bar = 3; # 'bar' from the first set - baz = 4; # 'baz' from the second set + bar = 3; # 'bar' from the 'left' set + baz = 4; # 'baz' from the 'right' set } ``` @@ -1688,9 +1705,9 @@ rec { f = attrPath: zipAttrsWith ( - n: values: + name: values: let - here = attrPath ++ [ n ]; + here = attrPath ++ [ name ]; in if length values == 1 || pred here (elemAt values 1) (head values) then head values diff --git a/lib/options.nix b/lib/options.nix index 1cf93d5bdf92..164bd6248534 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -77,12 +77,12 @@ rec { isOption = lib.isType "option"; /** - Creates an Option attribute set. `mkOption` accepts an attribute set with the following keys: + Creates an Option declaration for use with the module system. # Inputs - Structured attribute set - : Attribute set containing none or some of the following attributes. + Attribute set + : containing none or some of the following attributes. `default` : Optional default value used when no definition is given in the configuration. @@ -122,16 +122,16 @@ rec { `readOnly` : Optional boolean indicating whether the option can be set only once. - `...` (any other attribute) - : Any other attribute is passed through to the resulting option attribute set. - # Examples :::{.example} ## `lib.options.mkOption` usage example ```nix - mkOption { } // => { _type = "option"; } - mkOption { default = "foo"; } // => { _type = "option"; default = "foo"; } + mkOption { } + # => Empty option; type = types.anything + + mkOption { default = "foo"; } + # => Same as above, with a default value ``` ::: diff --git a/lib/strings.nix b/lib/strings.nix index b2808b6693f4..cd0027e1a165 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -2115,6 +2115,9 @@ rec { `feature` : The feature to be set + `feature` + : The feature to be set + `value` : The desired value diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c45267afc888..cf8cb77ebca7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1350,6 +1350,12 @@ githubId = 8614547; name = "Ali Caglayan"; }; + aljazerzen = { + email = "aljaz@erzen.si"; + github = "aljazerzen"; + githubId = 11072061; + name = "Aljaž Mur Eržen"; + }; alkasm = { email = "alexreynolds00@gmail.com"; github = "alkasm"; @@ -14464,7 +14470,6 @@ }; l3af = { email = "L3afMeAlon3@gmail.com"; - matrix = "@L3afMe:matrix.org"; github = "L3afMe"; githubId = 72546287; name = "L3af"; @@ -24709,7 +24714,7 @@ }; snaki = { email = "ek@kyouma.net"; - matrix = "@snaki:kescher.at"; + matrix = "@emily:woof.rip"; name = "emily"; github = "snaakey"; githubId = 38018554; diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix index bd4b9cd0475e..496ccb21e7c6 100644 --- a/nixos/modules/config/swap.nix +++ b/nixos/modules/config/swap.nix @@ -297,7 +297,7 @@ in ${lib.optionalString (sw.size != null) '' currentSize=$(( $(stat -c "%s" "$DEVICE" 2>/dev/null || echo 0) / 1024 / 1024 )) if [[ ! -b "$DEVICE" && "${toString sw.size}" != "$currentSize" ]]; then - if [[ $(stat -f -c %T $(dirname "$DEVICE")) == "btrfs" ]]; then + if [[ $(stat -f -c %T "$(dirname "$DEVICE")") == "btrfs" ]]; then # Use btrfs mkswapfile to speed up the creation of swapfile. rm -f "$DEVICE" btrfs filesystem mkswapfile --size "${toString sw.size}M" --uuid clear "$DEVICE" @@ -307,8 +307,9 @@ in chattr +C "$DEVICE" 2>/dev/null || true echo "Creating swap file using dd and mkswap." + mkdir -p "$(dirname "$DEVICE")" dd if=/dev/zero of="$DEVICE" bs=1M count=${toString sw.size} status=progress - ${lib.optionalString (!sw.randomEncryption.enable) "mkswap ${sw.realDevice}"} + ${lib.optionalString (!sw.randomEncryption.enable) "mkswap \"${sw.realDevice}\""} fi fi ''} diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index cba49b7afe50..5031a40afc7a 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -7,7 +7,7 @@ alsa-lib ? null, carla ? null, fftwFloat, - fltk13, + fltk_1_3, fluidsynth ? null, lame ? null, libgig ? null, @@ -47,7 +47,7 @@ mkDerivation rec { carla alsa-lib fftwFloat - fltk13 + fltk_1_3 fluidsynth lame libgig diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix index 3074bd44c18e..1fc3f359f07e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix @@ -154,7 +154,7 @@ in nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ pkgs.pkg-config ]; - buildInputs = old.buildInputs or [ ] ++ [ pkgs.enchant2 ]; + buildInputs = old.buildInputs or [ ] ++ [ pkgs.enchant_2 ]; postBuild = old.postBuild or "" diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index cd304700ee5f..cd06872a5d1b 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -353,7 +353,7 @@ let pkgs.pkg-config ]; - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.enchant2 ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.enchant_2 ]; postBuild = '' NIX_CFLAGS_COMPILE="$($PKG_CONFIG --cflags enchant-2) $NIX_CFLAGS_COMPILE" diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 3c94142ec21a..4121c73a52c8 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -813,28 +813,28 @@ } }, "ungoogled-chromium": { - "version": "143.0.7499.192", + "version": "144.0.7559.59", "deps": { "depot_tools": { - "rev": "e2bb3cd55899346cc68bbfd5139e59c9d85a6984", - "hash": "sha256-Qlc0UAdGRm1C0DNAqBsssND8PQZUVkj6aDaeExjwi2E=" + "rev": "2e88a3f08bd8c4a0014eae82729beca935f7f188", + "hash": "sha256-UhEzt9TBZiyuEjPVyHyTEg/idVj9EaAfrHHw2iRuIro=" }, "gn": { - "version": "0-unstable-2025-10-08", - "rev": "07d3c6f4dc290fae5ca6152ebcb37d6815c411ab", - "hash": "sha256-kIPhfuJBQSISdRjloe0N2JrqvuVrEkNijb92/9zSE9I=" + "version": "0-unstable-2025-12-01", + "rev": "6e0b557db44b3c164094e57687d20ba036a80667", + "hash": "sha256-04h38X/hqWwMiAOVsVu4OUrt8N+S7yS/JXc5yvRGo1I=" }, "ungoogled-patches": { - "rev": "143.0.7499.192-1", - "hash": "sha256-OUdpe1flyqi2FPDzgFXBYu72CI1ZQkZ0wf3baSN+ayw=" + "rev": "144.0.7559.59-1", + "hash": "sha256-u4jg04k/HilI5i8eWS2b+MDvi9RYD1UP8KNNKNWZcfQ=" }, - "npmHash": "sha256-HF6B4abJJJ9JDVbovtAdaHIvqE1zHJZ2a+g2Cudx8Pw=" + "npmHash": "sha256-13sgV/5BD7QvDLBAEmoLN5vongw+S5v5znvZcctxhWc=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "be2c1f4fd451578a9ada68a0ac12d659362b44bf", - "hash": "sha256-YbYtW4UmlFoqXUSvPc7H+Fe0hUM+t9JwpBHKC98pY98=", + "rev": "cd1d73dd77daadf4581dc29ca73482fc241e079d", + "hash": "sha256-K/dmiy5u+XJIpS6AOTaXDLVYp5qAtfUbfSbGCpt9Cv8=", "recompress": true }, "src/third_party/clang-format/script": { @@ -844,28 +844,28 @@ }, "src/third_party/compiler-rt/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git", - "rev": "08611c39bbfc52cc034904eb88817c6209b828f9", - "hash": "sha256-AfVP7cm7eNGl0JPnMkixMFgloDTHh0KSOAwXDEcl5MU=" + "rev": "cb2de163a470f2e9d56ec8a4f912f644378b7191", + "hash": "sha256-Wl18dFoXfwe266yCKDYviOI46OimFLfstke/+baPzgM=" }, "src/third_party/libc++/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git", - "rev": "8cd54f6b0741cdef08299711668e6b25fef26406", - "hash": "sha256-AJx0Oz1sNubo2JNPjeXO5f9SnoXewOsPlgFrRXiCEKg=" + "rev": "07572e7b169225ef3a999584cba9d9004631ae66", + "hash": "sha256-fhaWlbzkvsbz02yqJ9nf6/lVrKDYBaIYNlx++A0JFTU=" }, "src/third_party/libc++abi/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git", - "rev": "a02fa0058d8d52aca049868d229808a3e5dadbad", - "hash": "sha256-iNV7NtVviRBDjt6mK/DK3WfYd/QNGejRaSvpgEXmLqY=" + "rev": "83a852080747b9a362e8f9e361366b7a601f302c", + "hash": "sha256-iRVRMcK8mKyHe+8Oh5qfl3Y8HYwVwK2NlgNE7WxbKJM=" }, "src/third_party/libunwind/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git", - "rev": "b7c3dda13e46ced88a6f7230e271ebd633b4cef2", - "hash": "sha256-eWxGIMxMBRvQVJ6uc3ZWaKO7oXLLCXTi8sVR8v3H4MM=" + "rev": "c65639bf792928e0d38aed822dc34d3e72066a6c", + "hash": "sha256-C5gUvzQIO00UbB8yotxbbjbrkqe7pXVzMeLlcSH0/Bg=" }, "src/third_party/llvm-libc/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git", - "rev": "796bfb264a22264b11acda9feaffdffb168c7e12", - "hash": "sha256-J/FiUpmwkFVZcLmeXABl4FE9rzGFsbo/Lc1Rjy5wdOU=" + "rev": "fe97633934c21742a74962d52c17b3bcba7ad824", + "hash": "sha256-mqj2ee9F2UDMZQSD9ZAP/g5r2P56Awq+grCdcypUqFE=" }, "src/chrome/test/data/perf/canvas_bench": { "url": "https://chromium.googlesource.com/chromium/canvas_bench.git", @@ -884,8 +884,8 @@ }, "src/docs/website": { "url": "https://chromium.googlesource.com/website.git", - "rev": "2acb551cf58ff3b6e6a093fe36deb8c625046900", - "hash": "sha256-HaNA1Es8t3A/WR9aXdEoFOdeNO6c6ydPDF1CCBb0Bu4=" + "rev": "d9a0c174b535ee5165fb8ef278324be9efa49352", + "hash": "sha256-LnLvIl4L3IFim5LA5ZFYSE6kpBMF8cL1dC/os7QmhHI=" }, "src/media/cdm/api": { "url": "https://chromium.googlesource.com/chromium/cdm.git", @@ -894,8 +894,8 @@ }, "src/net/third_party/quiche/src": { "url": "https://quiche.googlesource.com/quiche.git", - "rev": "42cbfedd76691c19af012a3d717fca07d7b09cc9", - "hash": "sha256-ik5NjHWC8LHJiOde7Jdqq2C/NOofQwtPT4ubAqc8D4A=" + "rev": "901d0a7b4dbb141f2ad4eb8e1f00eb87f945044e", + "hash": "sha256-yjHB2BYtSJiK34zIda1t2kcY+netDUIiaQ0vVtglYfw=" }, "src/testing/libfuzzer/fuzzers/wasm_corpus": { "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git", @@ -904,8 +904,8 @@ }, "src/third_party/angle": { "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "2dfb5b7603d09c1d06f9d7a894752431d98b9a3e", - "hash": "sha256-3F2K3UO3BHC0mJGUgc/q5AuxwL32O98PloF1cwyZLqU=" + "rev": "a96fca8d5ee2ca61e8de419e38cd577579281c9e", + "hash": "sha256-JOIeH+nMIS6BqS+8LKzRKHFiyZd8Stbybx6a08dixEE=" }, "src/third_party/angle/third_party/glmark2/src": { "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", @@ -919,8 +919,8 @@ }, "src/third_party/angle/third_party/VK-GL-CTS/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS", - "rev": "53f6cec6c0a81fc4e712cd3ec87a1a39b802f5d5", - "hash": "sha256-KC9sHWRrPI5R10z5Epq3e7BW7+Ez0AoYe+bKPYL58jg=" + "rev": "4a7c2fcd1b1a3701295f7d3fe42719e867c1b793", + "hash": "sha256-nOsbMbfBKzyRN+QzOb09LKYIRIoTjTDdsSaR78g3Puk=" }, "src/third_party/anonymous_tokens/src": { "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git", @@ -944,8 +944,8 @@ }, "src/third_party/dawn": { "url": "https://dawn.googlesource.com/dawn.git", - "rev": "479f62d2194fd6e44c37d07654ca6e41c42bd332", - "hash": "sha256-rzZn9l0EFcir6k8Xv2svIrhRPwe/rq48H7CX/3yfgFE=" + "rev": "a8d1e554a9bd35b0418ba7fd6b0bc005250a7703", + "hash": "sha256-GJuT3rqNxvKkRTMvoMi8/QYda0y0RTkZLhb5v9QkwGA=" }, "src/third_party/dawn/third_party/glfw": { "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", @@ -954,8 +954,8 @@ }, "src/third_party/dawn/third_party/dxc": { "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler", - "rev": "c522461221759f1785b3434ce52ae89d6b66855a", - "hash": "sha256-UqgsxtEdvGs3fOueXJU6DJcESmgkEGAjdnMig78qKzE=" + "rev": "3f85295cfc982e5447f9faaa36f345366faca11d", + "hash": "sha256-LS4+U+GdWXDSkEXMIibeSvjA1079kvQyrASq+5N8gYw=" }, "src/third_party/dawn/third_party/dxheaders": { "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers", @@ -974,13 +974,13 @@ }, "src/third_party/dawn/third_party/webgpu-cts": { "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts", - "rev": "95042527d1555325b90dbb745a29d32eb9fad14a", - "hash": "sha256-Ofi/XfzyQrt2gUHaJpOyUUD7DXTWWmvXXJQP7C6AN8w=" + "rev": "3314e4108692d0c201f0d381bf10ddc8dbbc7b69", + "hash": "sha256-bMo94M5Io0S76REatQvA/nC9QRvxy5rpKjeItFvZr4k=" }, "src/third_party/dawn/third_party/webgpu-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers", - "rev": "ca7071cd5dd8a67cb8ca4f8614fd006ff3d93bde", - "hash": "sha256-ucRkEY1bZ3WyK55FW0pujl9LWFENmEzZvxO2QKYXmhc=" + "rev": "079d4e5153eaabc4033584cc399c27f1acbb2548", + "hash": "sha256-4ARtN5+4yxMoFGKvPvQgJGYqAqQLjHlrrxlTmka/UhE=" }, "src/third_party/highway/src": { "url": "https://chromium.googlesource.com/external/github.com/google/highway.git", @@ -989,8 +989,8 @@ }, "src/third_party/google_benchmark/src": { "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git", - "rev": "761305ec3b33abf30e08d50eb829e19a802581cc", - "hash": "sha256-cH8s1gP6kCcojAAfTt5iQCVqiAaSooNk4BdaILujM3w=" + "rev": "188e8278990a9069ffc84441cb5a024fd0bede37", + "hash": "sha256-GfqY2d+Nd7ovNrXxzTRm/AYWj7GuxIO6FawzUEzwOVA=" }, "src/third_party/libpfm4/src": { "url": "https://chromium.googlesource.com/external/git.code.sf.net/p/perfmon2/libpfm4.git", @@ -999,8 +999,8 @@ }, "src/third_party/boringssl/src": { "url": "https://boringssl.googlesource.com/boringssl.git", - "rev": "58da9b0d721fd807279f4e3898741c92cf43bdbd", - "hash": "sha256-uvsW0p3wo7L1tQqelRk5QJ65Jt5cpv6ORZRorZjHqrw=" + "rev": "b94d71f87ff943a617d77f3ff029f9a01a1ec6bc", + "hash": "sha256-i+HP5Q1UmBCLmDdGvSKPts6nwo/9vGUh5wMdmmQ7qLU=" }, "src/third_party/breakpad/breakpad": { "url": "https://chromium.googlesource.com/breakpad/breakpad.git", @@ -1014,8 +1014,8 @@ }, "src/third_party/catapult": { "url": "https://chromium.googlesource.com/catapult.git", - "rev": "ddb5845c3f7d88d8698e602547bd854b36f0604f", - "hash": "sha256-N+h99EL03NL6sAGJJM/aZEdVibn7SziLJp5G09y0EOc=" + "rev": "a202c86635d505fa893d73bad1e220a66bb644e6", + "hash": "sha256-FumPjVoqe6OLULHlduuMZgJTn2cau7QMAQz6gv1gAnU=" }, "src/third_party/ced/src": { "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git", @@ -1039,8 +1039,8 @@ }, "src/third_party/cpuinfo/src": { "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git", - "rev": "877328f188a3c7d1fa855871a278eb48d530c4c0", - "hash": "sha256-JW83AgI1cWv4TSpXNe9sv/hNYAA7MOdUeTHY8+0lHgc=" + "rev": "161a9ec374884f4b3e85725cb22e05f9458fdc93", + "hash": "sha256-uzo6QpNfzTcqOpDse14e2OoxNyKDU8jSx+/wPLxmpJg=" }, "src/third_party/crc32c/src": { "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git", @@ -1049,13 +1049,13 @@ }, "src/third_party/cros_system_api": { "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git", - "rev": "2c31c25519405d3d2b107844fd5e8c8bc397dbf7", - "hash": "sha256-Ew7gk1XxZccztYLZc4sOrzyKjNTkFPG8g+oOLy4/g1Q=" + "rev": "5f1ffac5e855229e27c6e4356ffb189f3010283f", + "hash": "sha256-dWWNvPtZ90quSvu/ZfOHd40UosOG9EwPCF3QklHUvA0=" }, "src/third_party/crossbench": { "url": "https://chromium.googlesource.com/crossbench.git", - "rev": "e4937b062fe8b9130ea0fc02c406c045b5cb7b31", - "hash": "sha256-C//wuupFwZL4m8mMutY/SxCmg7mcfw2Sj5eS4c95+XE=" + "rev": "77240be1ccd1dc99b73be332223a8856641a2073", + "hash": "sha256-PHP2En509QS+LAvb7zt4l+34VGy7kik0X87n1fKH5tw=" }, "src/third_party/crossbench-web-tests": { "url": "https://chromium.googlesource.com/chromium/web-tests.git", @@ -1064,13 +1064,13 @@ }, "src/third_party/depot_tools": { "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git", - "rev": "e2bb3cd55899346cc68bbfd5139e59c9d85a6984", - "hash": "sha256-Qlc0UAdGRm1C0DNAqBsssND8PQZUVkj6aDaeExjwi2E=" + "rev": "2e88a3f08bd8c4a0014eae82729beca935f7f188", + "hash": "sha256-UhEzt9TBZiyuEjPVyHyTEg/idVj9EaAfrHHw2iRuIro=" }, "src/third_party/devtools-frontend/src": { "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "e4dd1d1d96b706a33ae7d60237d3cdcd58294e4c", - "hash": "sha256-6to/NYTcx7H5OXF1u6YT55uCHwf8RU1uJaSXvuFsQ/c=" + "rev": "d5efa4236f8676254c9f39ccfef18bd633de5fd3", + "hash": "sha256-BmwsvTjgYQayFnyT9EfFzpCfbgdTt9xZlsUba0uJelg=" }, "src/third_party/dom_distiller_js/dist": { "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", @@ -1084,8 +1084,8 @@ }, "src/third_party/eigen3/src": { "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git", - "rev": "cd4f989f8f9288ab5aed1643ecb04c7be021021e", - "hash": "sha256-qkdtS4kz8m5ZW30SQpDCbgM3WvfCGc+WGsv59J4FYpQ=" + "rev": "49623d0c4e1af3c680845191948d10f6d3e92f8a", + "hash": "sha256-6K6CqifDPVYSs6g6AbG38sP3w7W7/q6bhLgm873Z9bk=" }, "src/third_party/farmhash/src": { "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git", @@ -1104,8 +1104,8 @@ }, "src/third_party/ffmpeg": { "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git", - "rev": "9e751092c9498b84bbb77e2e0689ef9f50fe608f", - "hash": "sha256-ZeFzrCE9LkDcp3VTMJkm5ypX29RGZCyZkp3tEr7yFKU=" + "rev": "e18f48eba6b367ac68b9c477ae6cbe224e36b031", + "hash": "sha256-ecfRGFHkLcly874w6m5/oIO99MRgXftOJAb8KCc51ZU=" }, "src/third_party/flac": { "url": "https://chromium.googlesource.com/chromium/deps/flac.git", @@ -1119,8 +1119,8 @@ }, "src/third_party/fontconfig/src": { "url": "https://chromium.googlesource.com/external/fontconfig.git", - "rev": "f0ed9c3f43161d3555f6f7a5234b22fe7ca60727", - "hash": "sha256-2h0dWn7MxAX+4o2tMZLyjRFAES+FTMaGaf8M7ySkSV8=" + "rev": "23b3fc6e58a13d126b9c30fafc9a16f8bd7143e9", + "hash": "sha256-+vd+Q6NzoWA7Ou+hkgIRhUZ0A1G+rZAh7JrP84f0wnQ=" }, "src/third_party/fp16/src": { "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git", @@ -1134,8 +1134,8 @@ }, "src/third_party/freetype/src": { "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git", - "rev": "ae63cc0d13318f2f93fd440cce277388d1b30a49", - "hash": "sha256-Tx5MbwMk+d2OZGd4CxJhJtP1pQyRJ0pe358OdKuWiRU=" + "rev": "32fc0af22206327ffd06e1d025f13b11fd8d1a46", + "hash": "sha256-gUW2+dn13kexIGfU5DAY3EEzVtPzZzqjPnvDhUZXzQA=" }, "src/third_party/fxdiv/src": { "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git", @@ -1149,8 +1149,8 @@ }, "src/third_party/ink/src": { "url": "https://chromium.googlesource.com/external/github.com/google/ink.git", - "rev": "f70052a0bbae22fe52b630844e9651b27db92ed2", - "hash": "sha256-Mvxbdn4m/H3HBss31Z9nz0LphqpFeBHcX/kbFxJQPqM=" + "rev": "11ca89062782d7e5a57741a303a925f510b91015", + "hash": "sha256-Z4cxFSJHyARUbeAnW51Ar7zuTMyMzi52Z9R1anN4d74=" }, "src/third_party/ink_stroke_modeler/src": { "url": "https://chromium.googlesource.com/external/github.com/google/ink-stroke-modeler.git", @@ -1184,13 +1184,13 @@ }, "src/third_party/googletest/src": { "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git", - "rev": "b2b9072ecbe874f5937054653ef8f2731eb0f010", - "hash": "sha256-cTPx19WAXlyXDK4nY0pxbMI4oRojaARgIeASA+MB3NY=" + "rev": "4fe3307fb2d9f86d19777c7eb0e4809e9694dde7", + "hash": "sha256-gJhv3DQQSP5BQ6GmDobq42/Gkx4AbOg/ZS80bM0WpEw=" }, "src/third_party/hunspell_dictionaries": { "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git", - "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e", - "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=" + "rev": "cccf64a8acc951afe3f47fee023908e55699bc58", + "hash": "sha256-mYDPXa64IOKLMNiBiMqDrQMR7gDPI+vdyVc+M7E+ddc=" }, "src/third_party/icu": { "url": "https://chromium.googlesource.com/chromium/deps/icu.git", @@ -1214,8 +1214,8 @@ }, "src/third_party/fuzztest/src": { "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git", - "rev": "7940ee9a7ebce6419c6391eef8b289524b16f198", - "hash": "sha256-uIb2nzPzMU/FZGYs3cFQwc4QNTNRmz01uF6XDCLrgDk=" + "rev": "7406afb783ff5e7f3a1a66aebb81090622716412", + "hash": "sha256-PjeVtPCRoyRtXX0Q5x+EbT6tE9/FiYGdJjRqIVL29i0=" }, "src/third_party/domato/src": { "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git", @@ -1229,13 +1229,13 @@ }, "src/third_party/libaom/source/libaom": { "url": "https://aomedia.googlesource.com/aom.git", - "rev": "93233d27eb23ac3f1f13da1b19c5380bacc75baa", - "hash": "sha256-wDW+YXxIaenDtqf3zdpMT2hbwEMEswC88+Q2ylfzHw0=" + "rev": "5d80673d723a5e2e268b124d81d425053823d875", + "hash": "sha256-jVbneofb6JsFKBVwafMTPZBlNkqalkFdQvexZjCmxlA=" }, "src/third_party/crabbyavif/src": { "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git", - "rev": "3ba05863e84fd3acb4f4af2b4545221b317a2e55", - "hash": "sha256-HUGkuQWfUGsE6crsluI7l5H2DYalruoDKqBjbVfE7BM=" + "rev": "640d2758f8d2e59d1a55ae0933673f0f65de68c4", + "hash": "sha256-5nU1QDY6irjmufd7nO70dTS74EchC7NXX2MBNz3LNPw=" }, "src/third_party/nearby/src": { "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git", @@ -1249,8 +1249,8 @@ }, "src/third_party/jetstream/main": { "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git", - "rev": "0debbb0b94486d4c78162ad5a102279b96dc79d3", - "hash": "sha256-w1oBQrjYK8ze02MRNPO8PsV5rNHiLzToCQjoSm+NagI=" + "rev": "f88580ef6265b59295f37eb0c6666466b11a0e74", + "hash": "sha256-ai1OYU+O3xsrKWIH6iw09KZrMJOFPfe3GQpdDDtfxXQ=" }, "src/third_party/jetstream/v2.2": { "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git", @@ -1259,8 +1259,8 @@ }, "src/third_party/speedometer/main": { "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", - "rev": "d90b6fde07041d9d19ab71de32b461b613c899a1", - "hash": "sha256-/S8YBNfxbQe6Wt0h2Otuw7+bkObBtvmtb6ZO6nsce6E=" + "rev": "e2e2538900938c5d6819e9456bf33d48f806c96c", + "hash": "sha256-oF8ELo2qmkgaTpNzBLaC3A6gyf2iFv+FQNPGwdGqzVU=" }, "src/third_party/speedometer/v3.1": { "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git", @@ -1309,8 +1309,8 @@ }, "src/third_party/libjpeg_turbo": { "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git", - "rev": "e14cbfaa85529d47f9f55b0f104a579c1061f9ad", - "hash": "sha256-Ig+tmprZDvlf/M72/DTar2pbxat9ZElgSqdXdoM0lPs=" + "rev": "6383cf609c1f63c18af0f59b2738caa0c6c7e379", + "hash": "sha256-chUqHiT1HMmFRaCOgjGLVU+LxeN/iUq7y6ckrcqFYFI=" }, "src/third_party/liblouis/src": { "url": "https://chromium.googlesource.com/external/liblouis-github.git", @@ -1344,8 +1344,8 @@ }, "src/third_party/libvpx/source/libvpx": { "url": "https://chromium.googlesource.com/webm/libvpx.git", - "rev": "4c1801be20dd53900d2a7cd74f6fc91a9ae353be", - "hash": "sha256-8k8KWkDS3kvJjHWVlOlTW/By7rQLiT7TrOtxwEOCXgk=" + "rev": "9a7674e1a83d1261a49776c8794b87c9bccc85d7", + "hash": "sha256-PdRZyXurQkw3UWOH1MkkuzggJkt9Uxq472L4LkxaYtw=" }, "src/third_party/libwebm/source": { "url": "https://chromium.googlesource.com/webm/libwebm.git", @@ -1359,8 +1359,8 @@ }, "src/third_party/libyuv": { "url": "https://chromium.googlesource.com/libyuv/libyuv.git", - "rev": "900da61d3cadba86ec593c8226de736b5e6b2c43", - "hash": "sha256-vqPiv1HJe883aDOjzLBNXGA/b/F/frcW3Iml3ZUyHlY=" + "rev": "4825d9b29eea4dac24607245db7ec7d4c41c1964", + "hash": "sha256-FZufzbDupdGhlSNGjSC6XlYiTCl677vfr9VHYot4t8g=" }, "src/third_party/lss": { "url": "https://chromium.googlesource.com/linux-syscall-support.git", @@ -1379,8 +1379,8 @@ }, "src/third_party/nasm": { "url": "https://chromium.googlesource.com/chromium/deps/nasm.git", - "rev": "e2c93c34982b286b27ce8b56dd7159e0b90869a2", - "hash": "sha256-TxzAcp+CoKnnM0lCGjm+L3h6M30vYHjM07vW6zUe/vY=" + "rev": "af5eeeb054bebadfbb79c7bcd100a95e2ad4525f", + "hash": "sha256-vH3OUzfLZbaPY4DMAvSW0jKYRJmOa7aE8EfIJtZ1/Xs=" }, "src/third_party/neon_2_sse/src": { "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git", @@ -1394,13 +1394,13 @@ }, "src/third_party/openscreen/src": { "url": "https://chromium.googlesource.com/openscreen", - "rev": "279b21edd27132609d2f46b702c42455ea05c4a8", - "hash": "sha256-BxS1VaDK6ZwS7tXjimeBPNqdPKsIOosH29cL6EmWEM4=" + "rev": "734877394201dcfcc786b3c8ea057b7607a56993", + "hash": "sha256-DIn/qjmbuFeqzXOwyDf0/GStKv6VuCYGN/AATpD+9zM=" }, "src/third_party/openscreen/src/buildtools": { "url": "https://chromium.googlesource.com/chromium/src/buildtools", - "rev": "077a66f30fcf281b066fafb6dfc60818c238efb6", - "hash": "sha256-WnbgaCzZ/BJli6M60kP9e4mVPFDx0yu3eCac5wmQ7iM=" + "rev": "5df641722f2e50623646d702e0046fb68c0f5ce1", + "hash": "sha256-AHPwOX5Z0R3rl49OvFsW92jlvCKvScsMYkfOJeBnWZ8=" }, "src/third_party/openscreen/src/third_party/tinycbor/src": { "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git", @@ -1409,13 +1409,13 @@ }, "src/third_party/pdfium": { "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "f5c376f93d33709ecd6b0dc8147b14a651ddbfeb", - "hash": "sha256-Rfpdow3S3HTHVEEAmCyiKU7XfuUoxvtHeWV+wfarvF8=" + "rev": "66c6bc40966122935d37eef739deb988581214d4", + "hash": "sha256-PX3jg11+zGfEIiOewgO4s9Knfw5a1shhFl8BZfioXng=" }, "src/third_party/perfetto": { "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git", - "rev": "ac7792a0f3f1cbfffb071e8b97cd9a5168900e03", - "hash": "sha256-9vpds/Xgw65uW5TG0kenqFVEh/NM1V3OpRdkGd0pMk4=" + "rev": "fdb95badca57068440acc569169f602acee51d7a", + "hash": "sha256-qhZ8ghbw3AuJh8uUbH+cCreqJs55v9PxxsykhSpXfks=" }, "src/third_party/protobuf-javascript/src": { "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript", @@ -1424,8 +1424,8 @@ }, "src/third_party/pthreadpool/src": { "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git", - "rev": "0e6ca13779b57d397a5ba6bfdcaa8a275bc8ea2e", - "hash": "sha256-FPUKjWARY4TdUq7ni48tnszEdmVYxPXIgtddPBHn/U0=" + "rev": "d90cd6f1493e09d12c407243f7f331a8cda55efb", + "hash": "sha256-VdgC6LMzcfhH2Y65Gu+Osi6BXxIq01Fmw5AehsBlX70=" }, "src/third_party/pyelftools": { "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git", @@ -1434,8 +1434,8 @@ }, "src/third_party/quic_trace/src": { "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git", - "rev": "e5c4ef17d934e078644e65d667ca6d86fe020d49", - "hash": "sha256-LFZ5qFQoyBKta05wJUtJh3oIvaBYlzOozFpDulrQ/no=" + "rev": "352288a06d2c83ae68b5a402b2219f4678be9f39", + "hash": "sha256-JmK7nmHg/BfXvFNG2oMpOV83EF+LwVLdwL6qX5FGREs=" }, "src/third_party/pywebsocket3/src": { "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git", @@ -1444,23 +1444,23 @@ }, "src/third_party/re2/src": { "url": "https://chromium.googlesource.com/external/github.com/google/re2.git", - "rev": "61c4644171ee6b480540bf9e569cba06d9090b4b", - "hash": "sha256-fRnjrP6Bz33eW+bOta5v3k9gqgN+gBvRH+t1i7b+eXA=" + "rev": "e7aec5985072c1dbe735add802653ef4b36c231a", + "hash": "sha256-WOwDr0VEjvJyEmvrpw0YmlAnHJP0+0q28fUVpl4E7Eg=" }, "src/third_party/ruy/src": { "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git", - "rev": "9940fbf1e0c0863907e77e0600b99bb3e2bc2b9f", - "hash": "sha256-fV0El2ZgjxLqstKVN35SL72+diHNK0FkBmG5UwVZFrk=" + "rev": "1e6e50872655a73b5250f954d7b9da9a87292fd3", + "hash": "sha256-+GNd+hU/fYAsgeaPnWWg90uw8rKKxTTvPS5aOpYa8zM=" }, "src/third_party/search_engines_data/resources": { "url": "https://chromium.googlesource.com/external/search_engines_data.git", - "rev": "94eb2a9a225078cb5f40e82fd890bce387c8121a", - "hash": "sha256-WWkOOnOI3ohPuO+M9/x53hyDO11P6E6Z6ZZvKmQEyjI=" + "rev": "97355b69daee73d74ac38f2227788458bd95d372", + "hash": "sha256-ZT9Vbvh2hI7DJziwwvU2C2CVx37CycyzdQke4E3eipg=" }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "da51f0d60ea2b14e845a823dc11b405dbeef42d8", - "hash": "sha256-thUbelru/6nPF7haXJtW6ncT6sIQzYqi0BCAJ+BWNY0=" + "rev": "ee20d565acb08dece4a32e3f209cdd41119015ca", + "hash": "sha256-0LiFK/8873gei70iVhNGRlcFeGIp7tjDEfxTBz1LYv8=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", @@ -1479,8 +1479,8 @@ }, "src/third_party/swiftshader": { "url": "https://swiftshader.googlesource.com/SwiftShader.git", - "rev": "3d536c0fc62b1cdea0f78c3c38d79be559855b88", - "hash": "sha256-mlKoTdZgqfMzKGB7dUaETCd6NIQm5dne59w09/0bnGE=" + "rev": "04fbb7daf5a53689e067190e7ef1047c5d49e292", + "hash": "sha256-kg0beZH6AKT9TqPWF9aZRRTGHbTSVYm1pffuERv0eG4=" }, "src/third_party/text-fragments-polyfill/src": { "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git", @@ -1489,18 +1489,18 @@ }, "src/third_party/tflite/src": { "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git", - "rev": "5fcf510a862fb6d3c0d34906044389095a180ff6", - "hash": "sha256-iXt3IutfZxiH9j7/mnx+YeZwak44+nhNo2rbDxtgKTg=" + "rev": "247b0cf254fbbf3d326feed3820ec24503a353a5", + "hash": "sha256-iWUx5GFHhdo3It/djUO2rc+zb5VpIVwyiMYKjB2RIE0=" }, "src/third_party/vulkan-deps": { "url": "https://chromium.googlesource.com/vulkan-deps", - "rev": "224a52b06d0e019c7f7c006c2306de095207f77f", - "hash": "sha256-/RkiBLiXo7Z+FUIjHIrvvcU8Mg6vX9vJUn8Cz1fI2OE=" + "rev": "327bc9dec2a42806ad78c284829363657bb728dc", + "hash": "sha256-Ky1pMR6W0bgBq2ifVB/1b72dk2aZbIjF44Vc2Ho3iEg=" }, "src/third_party/glslang/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang", - "rev": "36b4d078576ad465e85b4b0502695ac5f3edb2e6", - "hash": "sha256-A2D6fSfHpeXsYnXZs9l7DRE4ELUHbNQxr7HaokFByDQ=" + "rev": "7a47e2531cb334982b2a2dd8513dca0a3de4373d", + "hash": "sha256-BXfe5SgjPy5a+FJh4KIe5kwvKVBvo773OfIZpOsDBLo=" }, "src/third_party/spirv-cross/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross", @@ -1509,38 +1509,38 @@ }, "src/third_party/spirv-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers", - "rev": "6bb105b6c4b3a246e1e6bb96366fe14c6dbfde83", - "hash": "sha256-rgLhWf3U7gMjB+mpwq4EgQdRS6yP2/Q71Ns42ZDu7cc=" + "rev": "b824a462d4256d720bebb40e78b9eb8f78bbb305", + "hash": "sha256-HjJjMuqTrYv5LUOWcexzPHb8nhOT4duooDAhDsd44Zo=" }, "src/third_party/spirv-tools/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools", - "rev": "05b0ab1253db43c3ea29efd593f3f13dfa621ab1", - "hash": "sha256-OmvvBOBacp8ZgY+tcV1a7OmdGL607rrH89bu9uLj1L4=" + "rev": "f410b3c178740f9f5bd28d5b22a71d4bc10acd49", + "hash": "sha256-HSqI9VkDBgivSqEAAkSXf+u2CT1OZcPU2YcH2BF1Y9o=" }, "src/third_party/vulkan-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers", - "rev": "df274657d83f3bd8c77aef816c1cbf27352a948b", - "hash": "sha256-/YXVD60zaSRgqkAFGZs0D0T2LoXRgMnYcO/RkQznW+I=" + "rev": "2fa203425eb4af9dfc6b03f97ef72b0b5bcb8350", + "hash": "sha256-DIePLzDoImnaso0WYUv819wSDeA7Zy1I/tYAbsALXKg=" }, "src/third_party/vulkan-loader/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader", - "rev": "e1cad037970cfeeb86051c49d00ead75311acbec", - "hash": "sha256-/xnxL+S6Z04FLHLv1V/YBcDu4fzhXvAqfHgS5cgeVhg=" + "rev": "052ac24611eced7b0ca62cc5cca2eeeb2051fa28", + "hash": "sha256-43eoTxe2O7MxwsC16nv1R1Xf4WkNNsTf0G5Mo46oipk=" }, "src/third_party/vulkan-tools/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools", - "rev": "7f6326618226225269a274869ac638b870c8fe2b", - "hash": "sha256-hInSJsfPuI7U74rEqFQf6De1QoBkFjAnGLFE91uyJ5s=" + "rev": "48b5d246b2d0b1a41ee7ea1b69525ae7bb38a2ae", + "hash": "sha256-uT3KUUiYZzgaAjfUhhqPsjTXE4B6XuSt/zSWE8R9lS0=" }, "src/third_party/vulkan-utility-libraries/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries", - "rev": "ea43e2f5e51e9ad958a40fdce981f2f0abf09cb5", - "hash": "sha256-7SYRTJLLkC1OXDZ/llNRpVKhQeNak2IFxrHNJKRfrLk=" + "rev": "c010c19e796035e92fb3b0462cb887518a41a7c1", + "hash": "sha256-lDO0B7wEYT6cc/t/ZW5OAxxgRfDORoGd+pF5r5R7yoQ=" }, "src/third_party/vulkan-validation-layers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers", - "rev": "0cb2d651931455e44aa898585d7d78a9d90d31c5", - "hash": "sha256-IxxvrY90d/NJWRNcvMIaUjg2o7LZEHi2gmOe+eyJmHI=" + "rev": "5e175a92548d1a507bd81fdc5db6fa1d2572a6ea", + "hash": "sha256-ZxLoVN0e58eA5ySn0MknTRMSD/bjCebFnwo2WgtrPYc=" }, "src/third_party/vulkan_memory_allocator": { "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git", @@ -1579,18 +1579,18 @@ }, "src/third_party/webgpu-cts/src": { "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git", - "rev": "eefe6f33964beec1bd1534b1d9065ad027b71740", - "hash": "sha256-g+zg7SpK/BztfgT+y45Ygb9+7izQpkgAM3vRX5iKkbU=" + "rev": "e7cad0143f136c69b345024d0a60e0d859dd7503", + "hash": "sha256-0Bn319fWpTERI31a9WahXiWi63v62rxI9aA/VUMzuAw=" }, "src/third_party/webpagereplay": { "url": "https://chromium.googlesource.com/webpagereplay.git", - "rev": "ab0ca8075f0cc5d40fed25e08ddabb144c29fc08", - "hash": "sha256-hZ2TH5AsPPqxxShDTG1hhgpZWqXccD7TsoPfXcdhIUg=" + "rev": "052833a44dd2f538b85936092bad545b6062e193", + "hash": "sha256-wrA3iN0HEXqIg53tprARRR7ekSYFXVbqaDIt1zZeTP4=" }, "src/third_party/webrtc": { "url": "https://webrtc.googlesource.com/src.git", - "rev": "4e31d1a1ff41bb1b79609c83f998458a111a149c", - "hash": "sha256-3tfB6jNsTLYozYqBfAmYNmq94wQ3OFxBSlOfRaj6wxc=" + "rev": "8f3537ef5b85b4c7dabed2676d4b72214c69c494", + "hash": "sha256-rs/miFkNVNCGOTSEvSRdWWf8zg1+WU+L/Pt+TblSGy4=" }, "src/third_party/wuffs/src": { "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", @@ -1609,18 +1609,18 @@ }, "src/third_party/xnnpack/src": { "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git", - "rev": "98a027498845d3e2acd0e983fff6950714edbfc2", - "hash": "sha256-MwzgJN/QE3pLI+5UZNz2oepBibQq5j4CKLDQ1jFyi2w=" + "rev": "d3efd0a2fcd944931416811da6d24222c91ddd9d", + "hash": "sha256-f3Bcapnbzg3wjrKJY8Yq9aGm7PHttJQt3ri6blRhEBk=" }, "src/third_party/zstd/src": { "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git", - "rev": "89d685e42dbcf815a16ed0fcd7d050ef74ccad96", - "hash": "sha256-xFObjxA4LKOnCugxaYek3cU4ld3JwLj5jFoRJ20hje4=" + "rev": "a25c1fc96f431e69abea38f52cb31e6bc074e9f1", + "hash": "sha256-W1pQwaVAPqr9QsNmQXoefPJASXB5OsFxx7TUUXRJkjU=" }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "326f5f8cad3f0e436c8ea8f82a6894936a32e860", - "hash": "sha256-crTEZnN5iWTXOxpAkvIDPQ6hyfF54F1/ImoKrdmO2K4=" + "rev": "ad25f9ae50a53bee50f459bfee25fb1e6f64adc3", + "hash": "sha256-vyOtnPA3tAeorNOGTDuAnwJ/UtpjeO8z+RSjx9RIFFc=" } } } diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 4b3e93869e76..c66d17a4740b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1418,13 +1418,13 @@ "vendorHash": null }, "vancluever_acme": { - "hash": "sha256-wtA9AUnxync67kCGII4rUlL74ycYpT1v3l6ghkN759Q=", + "hash": "sha256-0XO19ahaRrIxg785dHb/RPBXuGWyP5y0prAN7D9w6IE=", "homepage": "https://registry.terraform.io/providers/vancluever/acme", "owner": "vancluever", "repo": "terraform-provider-acme", - "rev": "v2.40.0", + "rev": "v2.42.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-qUa78KrmLUG+6vxLde4Of+rHvC2kjaaWKiafa2K/+Us=" + "vendorHash": "sha256-LAM2pzTIRdspYnXboDA+iGwt7uaI+/ItXPAgOJUELps=" }, "venafi_venafi": { "hash": "sha256-wpAckNRqZjSDt7KpCRpLSYkn6Gm+QPzn5sIJ90wRXjI=", diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 2dc0171aa9c5..6a7afab23b3d 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -10,7 +10,7 @@ cacert, cairo, dconf, - enchant2, + enchant, file, fontconfig, freetype, @@ -153,7 +153,7 @@ stdenv.mkDerivation rec { atk cairo dconf - enchant2 + enchant fontconfig freetype fuse3' diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index b6207c808046..a517dec53f94 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -66,7 +66,7 @@ nspr, libwpg, dbus-glib, - clucene_core_2, + clucene-core_2, libcdr, lcms2, unixODBC, @@ -408,7 +408,7 @@ stdenv.mkDerivation (finalAttrs: { bluez5 box2d_2 cairo - clucene_core_2 + clucene-core_2 cppunit cups curl diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index 695cfb9ef1a8..f15e934ded3c 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, hamlib, - fltk13, + fltk_1_3, libjpeg, libpng, portaudio, @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { libXinerama gettext hamlib - fltk13 + fltk_1_3 libjpeg libpng portaudio diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 11de395dc1a0..fd95aea165d7 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -200,7 +200,7 @@ rec { libogg libvorbis SDL2_image - glew110 + glew_1_10 openssl libidn onetbb diff --git a/pkgs/build-support/fetchsavannah/default.nix b/pkgs/build-support/fetchsavannah/default.nix index 475f2bdb4fd1..38075bdc1a98 100644 --- a/pkgs/build-support/fetchsavannah/default.nix +++ b/pkgs/build-support/fetchsavannah/default.nix @@ -12,23 +12,27 @@ lib.makeOverridable ( name ? repoRevToNameMaybe repo rev "savannah", ... # For hash agility }@args: - fetchzip ( - { - inherit name; - url = - let - repo' = lib.last (lib.strings.splitString "/" repo); # support repo like emacs/elpa - in - "https://cgit.git.savannah.gnu.org/cgit/${repo}.git/snapshot/${repo'}-${rev}.tar.gz"; - meta.homepage = "https://cgit.git.savannah.gnu.org/cgit/${repo}.git/"; - passthru.gitRepoUrl = "https://cgit.git.savannah.gnu.org/git/${repo}.git"; - } - // removeAttrs args [ - "repo" - "rev" - ] - ) - // { - inherit rev; - } + let + result = + fetchzip ( + { + inherit name; + url = + let + repo' = lib.last (lib.strings.splitString "/" repo); # support repo like emacs/elpa + in + "https://cgit.git.savannah.gnu.org/cgit/${repo}.git/snapshot/${repo'}-${rev}.tar.gz"; + meta.homepage = "https://cgit.git.savannah.gnu.org/cgit/${repo}.git/"; + passthru.gitRepoUrl = "https://cgit.git.savannah.gnu.org/git/${repo}.git"; + } + // removeAttrs args [ + "repo" + "rev" + ] + ) + // { + inherit rev; + }; + in + lib.warnOnInstantiate "`fetchFromSavannah` is deprecated and will be removed in a future release." result ) diff --git a/pkgs/by-name/af/afterstep/package.nix b/pkgs/by-name/af/afterstep/package.nix index f7b4e1634e4e..a71585cad7df 100644 --- a/pkgs/by-name/af/afterstep/package.nix +++ b/pkgs/by-name/af/afterstep/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fetchpatch, dbus, - fltk13, + fltk_1_3, gtk2, libICE, libSM, @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ dbus - fltk13 + fltk_1_3 gtk2 libICE libSM diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/by-name/ag/agg/package.nix similarity index 98% rename from pkgs/development/libraries/agg/default.nix rename to pkgs/by-name/ag/agg/package.nix index 6ba398223771..b55eb554d94e 100644 --- a/pkgs/development/libraries/agg/default.nix +++ b/pkgs/by-name/ag/agg/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + gccStdenv, fetchurl, autoconf, automake, @@ -10,7 +10,9 @@ SDL, libX11, }: - +let + stdenv = gccStdenv; +in stdenv.mkDerivation rec { pname = "agg"; version = "2.5"; diff --git a/pkgs/by-name/al/alsa-tools/package.nix b/pkgs/by-name/al/alsa-tools/package.nix index 82f238d16190..140f8bd4f2ad 100644 --- a/pkgs/by-name/al/alsa-tools/package.nix +++ b/pkgs/by-name/al/alsa-tools/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, alsa-lib, - fltk13, + fltk_1_3, gtk2, gtk3, makeWrapper, @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ alsa-lib - fltk13 + fltk_1_3 gtk2 gtk3 psmisc diff --git a/pkgs/by-name/an/ants/package.nix b/pkgs/by-name/an/ants/package.nix index 65ef2a04aa5b..5f131c67ec2b 100644 --- a/pkgs/by-name/an/ants/package.nix +++ b/pkgs/by-name/an/ants/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ANTs"; - version = "2.6.4"; + version = "2.6.5"; src = fetchFromGitHub { owner = "ANTsX"; repo = "ANTs"; tag = "v${finalAttrs.version}"; - hash = "sha256-c2a73OpRE/kCq8gq2DlwTQVZdTfKBuUQN/VeOZEkGIc="; + hash = "sha256-6ncoXhIlEjZL7ABdqpupM7ebWKYeUits37SbT0Jr1Lk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/by-name/at/atkmm/package.nix similarity index 100% rename from pkgs/development/libraries/atkmm/default.nix rename to pkgs/by-name/at/atkmm/package.nix diff --git a/pkgs/development/libraries/atkmm/2.36.nix b/pkgs/by-name/at/atkmm_2_36/package.nix similarity index 100% rename from pkgs/development/libraries/atkmm/2.36.nix rename to pkgs/by-name/at/atkmm_2_36/package.nix diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/by-name/av/avahi/package.nix similarity index 100% rename from pkgs/development/libraries/avahi/default.nix rename to pkgs/by-name/av/avahi/package.nix diff --git a/pkgs/by-name/ba/bats/package.nix b/pkgs/by-name/ba/bats/package.nix index 44881b4b4cc3..5396fb6ffa22 100644 --- a/pkgs/by-name/ba/bats/package.nix +++ b/pkgs/by-name/ba/bats/package.nix @@ -255,6 +255,22 @@ resholve.mkDerivation rec { meta = { homepage = "https://github.com/bats-core/bats-core"; description = "Bash Automated Testing System"; + longDescription = '' + Bats can be extended with libraries. The available libraries are: + + - `bats-assert` + - `bats-file` + - `bats-detik` + - `bats-support` + + An example of building this package with a few libraries: + ```nix + bats.withLibraries (p: [ + p.bats-assert + p.bats-support + ]) + ``` + ''; mainProgram = "bats"; maintainers = with lib.maintainers; [ abathur ]; license = lib.licenses.mit; diff --git a/pkgs/by-name/bi/bibletime/package.nix b/pkgs/by-name/bi/bibletime/package.nix index bc9fb7836e05..61e7063f4324 100644 --- a/pkgs/by-name/bi/bibletime/package.nix +++ b/pkgs/by-name/bi/bibletime/package.nix @@ -1,7 +1,7 @@ { lib, boost, - clucene_core_2, + clucene-core_2, cmake, docbook_xml_dtd_45, docbook_xsl_ns, @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost - clucene_core_2 + clucene-core_2 qtbase qtsvg qttools @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { ]; preConfigure = '' - export CLUCENE_HOME=${clucene_core_2}; + export CLUCENE_HOME=${clucene-core_2}; export SWORD_HOME=${sword}; ''; diff --git a/pkgs/by-name/bl/blackvoxel/package.nix b/pkgs/by-name/bl/blackvoxel/package.nix index 7b2b938a5c61..38faa31818c6 100644 --- a/pkgs/by-name/bl/blackvoxel/package.nix +++ b/pkgs/by-name/bl/blackvoxel/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, makeDesktopItem, imagemagick, - glew110, + glew_1_10, SDL_compat, nix-update-script, }: @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ imagemagick ]; buildInputs = [ - glew110 + glew_1_10 SDL_compat ]; diff --git a/pkgs/by-name/bu/buffer/package.nix b/pkgs/by-name/bu/buffer/package.nix index 2e91c32e236c..149891b0a97e 100644 --- a/pkgs/by-name/bu/buffer/package.nix +++ b/pkgs/by-name/bu/buffer/package.nix @@ -18,19 +18,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "buffer"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "cheywood"; repo = "buffer"; tag = finalAttrs.version; - hash = "sha256-AkgmKMMy3tBgJudJ2Mm8LFV+aE0QbviKxgAJEZ9A3cg="; + hash = "sha256-JO/ZvsTWNneyniXm5+0ZTE41zpvMtayxWGdOxYXxxxQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src pname version; - hash = "sha256-fwXeXaoC/Uh9eMEkRjhpAouxOrlRWX2n2r4pgIe83S0="; + hash = "sha256-odCUktrdV66Gyq7gKhrOhlcNNXkgpl4tLCsNgmlG27I="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bu/butt/package.nix b/pkgs/by-name/bu/butt/package.nix index 53dc3e89440e..3050588c06b8 100644 --- a/pkgs/by-name/bu/butt/package.nix +++ b/pkgs/by-name/bu/butt/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, pkg-config, - fltk13, + fltk_1_3, portaudio, lame, libvorbis, @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - fltk13 + fltk_1_3 portaudio lame libvorbis diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/by-name/c-/c-ares/package.nix similarity index 100% rename from pkgs/development/libraries/c-ares/default.nix rename to pkgs/by-name/c-/c-ares/package.nix diff --git a/pkgs/development/libraries/c-blosc/1.nix b/pkgs/by-name/c-/c-blosc/package.nix similarity index 100% rename from pkgs/development/libraries/c-blosc/1.nix rename to pkgs/by-name/c-/c-blosc/package.nix diff --git a/pkgs/development/libraries/c-blosc/2.nix b/pkgs/by-name/c-/c-blosc2/package.nix similarity index 100% rename from pkgs/development/libraries/c-blosc/2.nix rename to pkgs/by-name/c-/c-blosc2/package.nix diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/by-name/ca/cairomm/package.nix similarity index 100% rename from pkgs/development/libraries/cairomm/default.nix rename to pkgs/by-name/ca/cairomm/package.nix diff --git a/pkgs/development/libraries/cairomm/1.16.nix b/pkgs/by-name/ca/cairomm_1_16/package.nix similarity index 100% rename from pkgs/development/libraries/cairomm/1.16.nix rename to pkgs/by-name/ca/cairomm_1_16/package.nix diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/by-name/ca/capstone/package.nix similarity index 100% rename from pkgs/development/libraries/capstone/default.nix rename to pkgs/by-name/ca/capstone/package.nix diff --git a/pkgs/development/libraries/capstone/4.nix b/pkgs/by-name/ca/capstone_4/package.nix similarity index 100% rename from pkgs/development/libraries/capstone/4.nix rename to pkgs/by-name/ca/capstone_4/package.nix diff --git a/pkgs/development/libraries/cassandra-cpp-driver/default.nix b/pkgs/by-name/ca/cassandra-cpp-driver/package.nix similarity index 100% rename from pkgs/development/libraries/cassandra-cpp-driver/default.nix rename to pkgs/by-name/ca/cassandra-cpp-driver/package.nix diff --git a/pkgs/development/libraries/cctag/cmake-install-include-dir.patch b/pkgs/by-name/cc/cctag/cmake-install-include-dir.patch similarity index 100% rename from pkgs/development/libraries/cctag/cmake-install-include-dir.patch rename to pkgs/by-name/cc/cctag/cmake-install-include-dir.patch diff --git a/pkgs/development/libraries/cctag/cmake-no-apple-rpath.patch b/pkgs/by-name/cc/cctag/cmake-no-apple-rpath.patch similarity index 100% rename from pkgs/development/libraries/cctag/cmake-no-apple-rpath.patch rename to pkgs/by-name/cc/cctag/cmake-no-apple-rpath.patch diff --git a/pkgs/development/libraries/cctag/default.nix b/pkgs/by-name/cc/cctag/package.nix similarity index 93% rename from pkgs/development/libraries/cctag/default.nix rename to pkgs/by-name/cc/cctag/package.nix index 60de365c149e..37cb19617b65 100644 --- a/pkgs/development/libraries/cctag/default.nix +++ b/pkgs/by-name/cc/cctag/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + clangStdenv, fetchFromGitHub, cmake, @@ -9,9 +9,11 @@ opencv, onetbb, - avx2Support ? stdenv.hostPlatform.avx2Support, + avx2Support ? clangStdenv.hostPlatform.avx2Support, }: - +let + stdenv = clangStdenv; +in stdenv.mkDerivation rec { pname = "cctag"; version = "1.0.4"; diff --git a/pkgs/by-name/cd/cdk8s-cli/package.nix b/pkgs/by-name/cd/cdk8s-cli/package.nix index 87b3ddf9b65d..4532115e199b 100644 --- a/pkgs/by-name/cd/cdk8s-cli/package.nix +++ b/pkgs/by-name/cd/cdk8s-cli/package.nix @@ -12,18 +12,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "cdk8s-cli"; - version = "2.203.15"; + version = "2.203.16"; src = fetchFromGitHub { owner = "cdk8s-team"; repo = "cdk8s-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-vhTvRsKEzh/m5zoGBXi2sR43pkYTf8WyZ8bN1Eo0o38="; + hash = "sha256-PLdB0f7CMuvArlLfY+7G9UUUTURtiy/nHcgiSZoW01c="; }; yarnOfflineCache = fetchYarnDeps { inherit (finalAttrs) src; - hash = "sha256-32Ssu4NTY7JWnTiJASYW0j3fKF2jgKSQRqZluH220+4="; + hash = "sha256-GBkgzzkw5h2eajuIYO3gazDLoYYqc8Bx5NjWs8jVbaM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/by-name/ce/ceres-solver/package.nix similarity index 100% rename from pkgs/development/libraries/ceres-solver/default.nix rename to pkgs/by-name/ce/ceres-solver/package.nix diff --git a/pkgs/by-name/cl/cldr-annotations/package.nix b/pkgs/by-name/cl/cldr-annotations/package.nix index cf4187786989..95de6b5416e4 100644 --- a/pkgs/by-name/cl/cldr-annotations/package.nix +++ b/pkgs/by-name/cl/cldr-annotations/package.nix @@ -6,12 +6,12 @@ stdenvNoCC.mkDerivation rec { pname = "cldr-annotations"; - version = "48"; + version = "48.1"; src = fetchzip { url = "https://unicode.org/Public/cldr/${version}/cldr-common-${version}.zip"; stripRoot = false; - hash = "sha256-Q+dA8Y4VfO8abyHRVgoRQMfY5NG6vZn/ZorxF/SEOmo="; + hash = "sha256-QGbP3VHn77hKmTr8JY+plEs69Wo57DkBtfuZ0lzh2jo="; }; installPhase = '' diff --git a/pkgs/development/libraries/clucene-core/Fix-pkgconfig-file-by-adding-clucene-shared-library.patch b/pkgs/by-name/cl/clucene-core_2/Fix-pkgconfig-file-by-adding-clucene-shared-library.patch similarity index 100% rename from pkgs/development/libraries/clucene-core/Fix-pkgconfig-file-by-adding-clucene-shared-library.patch rename to pkgs/by-name/cl/clucene-core_2/Fix-pkgconfig-file-by-adding-clucene-shared-library.patch diff --git a/pkgs/development/libraries/clucene-core/Fixing_ZLIB_configuration_in_shared_CMakeLists.patch b/pkgs/by-name/cl/clucene-core_2/Fixing_ZLIB_configuration_in_shared_CMakeLists.patch similarity index 100% rename from pkgs/development/libraries/clucene-core/Fixing_ZLIB_configuration_in_shared_CMakeLists.patch rename to pkgs/by-name/cl/clucene-core_2/Fixing_ZLIB_configuration_in_shared_CMakeLists.patch diff --git a/pkgs/development/libraries/clucene-core/Install-contribs-lib.patch b/pkgs/by-name/cl/clucene-core_2/Install-contribs-lib.patch similarity index 100% rename from pkgs/development/libraries/clucene-core/Install-contribs-lib.patch rename to pkgs/by-name/cl/clucene-core_2/Install-contribs-lib.patch diff --git a/pkgs/development/libraries/clucene-core/fix-darwin.patch b/pkgs/by-name/cl/clucene-core_2/fix-darwin.patch similarity index 100% rename from pkgs/development/libraries/clucene-core/fix-darwin.patch rename to pkgs/by-name/cl/clucene-core_2/fix-darwin.patch diff --git a/pkgs/development/libraries/clucene-core/fix-missing-include-time.patch b/pkgs/by-name/cl/clucene-core_2/fix-missing-include-time.patch similarity index 100% rename from pkgs/development/libraries/clucene-core/fix-missing-include-time.patch rename to pkgs/by-name/cl/clucene-core_2/fix-missing-include-time.patch diff --git a/pkgs/development/libraries/clucene-core/2.x.nix b/pkgs/by-name/cl/clucene-core_2/package.nix similarity index 100% rename from pkgs/development/libraries/clucene-core/2.x.nix rename to pkgs/by-name/cl/clucene-core_2/package.nix diff --git a/pkgs/development/libraries/clucene-core/pthread-include.patch b/pkgs/by-name/cl/clucene-core_2/pthread-include.patch similarity index 100% rename from pkgs/development/libraries/clucene-core/pthread-include.patch rename to pkgs/by-name/cl/clucene-core_2/pthread-include.patch diff --git a/pkgs/by-name/ct/ctags-lsp/package.nix b/pkgs/by-name/ct/ctags-lsp/package.nix index 81f884b39626..942508509568 100644 --- a/pkgs/by-name/ct/ctags-lsp/package.nix +++ b/pkgs/by-name/ct/ctags-lsp/package.nix @@ -11,14 +11,14 @@ }: buildGoModule rec { pname = "ctags-lsp"; - version = "0.9.1"; + version = "0.10.2"; vendorHash = null; src = fetchFromGitHub { owner = "netmute"; repo = "ctags-lsp"; tag = "v${version}"; - hash = "sha256-QF1TBHo2/2Hsnbv4kDw/RYUw9pN8fAVX11lE3J1/k8I="; + hash = "sha256-8cknVcXIuV7mmRMm87jn2l3qrfaY3CGzCZ0VW5Vb9xk="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/libraries/dbus/implement-getgrouplist.patch b/pkgs/by-name/db/dbus/implement-getgrouplist.patch similarity index 100% rename from pkgs/development/libraries/dbus/implement-getgrouplist.patch rename to pkgs/by-name/db/dbus/implement-getgrouplist.patch diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/by-name/db/dbus/package.nix similarity index 100% rename from pkgs/development/libraries/dbus/default.nix rename to pkgs/by-name/db/dbus/package.nix diff --git a/pkgs/by-name/do/dovecot/package.nix b/pkgs/by-name/do/dovecot/package.nix index 92757140467b..52cd9b4b1e05 100644 --- a/pkgs/by-name/do/dovecot/package.nix +++ b/pkgs/by-name/do/dovecot/package.nix @@ -17,7 +17,7 @@ pam, libcap, coreutils, - clucene_core_2, + clucene-core_2, icu75, libexttextcat, libsodium, @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { zlib zstd xz - clucene_core_2 + clucene-core_2 icu75 libexttextcat libsodium diff --git a/pkgs/development/libraries/draco/default.nix b/pkgs/by-name/dr/draco/package.nix similarity index 96% rename from pkgs/development/libraries/draco/default.nix rename to pkgs/by-name/dr/draco/package.nix index d165b96ea1e3..24352556e86a 100644 --- a/pkgs/development/libraries/draco/default.nix +++ b/pkgs/by-name/dr/draco/package.nix @@ -1,5 +1,6 @@ { lib, + callPackage, stdenv, fetchFromGitHub, nix-update-script, @@ -10,11 +11,11 @@ withTranscoder ? true, eigen, ghc_filesystem, - tinygltf, }: let cmakeBool = b: if b then "ON" else "OFF"; + tinygltf = callPackage ./tinygltf.nix { }; in stdenv.mkDerivation (finalAttrs: { version = "1.5.7"; diff --git a/pkgs/development/libraries/draco/tinygltf.nix b/pkgs/by-name/dr/draco/tinygltf.nix similarity index 100% rename from pkgs/development/libraries/draco/tinygltf.nix rename to pkgs/by-name/dr/draco/tinygltf.nix diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/by-name/ec/eccodes/package.nix similarity index 94% rename from pkgs/development/libraries/eccodes/default.nix rename to pkgs/by-name/ec/eccodes/package.nix index 84ee929e0d1c..5ea1a9d7df36 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/by-name/ec/eccodes/package.nix @@ -1,7 +1,7 @@ { - fetchurl, lib, - stdenv, + gccStdenv, + fetchurl, cmake, netcdf, openjpeg, @@ -11,12 +11,11 @@ perl, ctestCheckHook, enablePython ? false, - pythonPackages, + python3Packages ? null, enablePosixThreads ? false, enableOpenMPThreads ? false, }: - -stdenv.mkDerivation rec { +gccStdenv.mkDerivation rec { pname = "eccodes"; version = "2.44.0"; @@ -54,8 +53,8 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = lib.optionals enablePython [ - pythonPackages.python - pythonPackages.numpy + python3Packages.python + python3Packages.numpy ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/by-name/en/enchant_2/package.nix similarity index 100% rename from pkgs/development/libraries/enchant/2.x.nix rename to pkgs/by-name/en/enchant_2/package.nix diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/by-name/fa/farstream/package.nix similarity index 88% rename from pkgs/development/libraries/farstream/default.nix rename to pkgs/by-name/fa/farstream/package.nix index d1432913b256..43549ba0b0c9 100644 --- a/pkgs/development/libraries/farstream/default.nix +++ b/pkgs/by-name/fa/farstream/package.nix @@ -3,16 +3,12 @@ stdenv, fetchurl, fetchpatch, + buildPackages, libnice, pkg-config, - autoreconfHook, - gstreamer, - gst-plugins-base, + gst_all_1, gupnp-igd, gobject-introspection, - gst-plugins-good, - gst-plugins-bad, - gst-libav, python3, }: @@ -46,12 +42,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - autoreconfHook + buildPackages.autoreconfHook269 gobject-introspection python3 ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good diff --git a/pkgs/by-name/fi/fish-lsp/package.nix b/pkgs/by-name/fi/fish-lsp/package.nix index adc8b7de4824..eeafb87393e4 100644 --- a/pkgs/by-name/fi/fish-lsp/package.nix +++ b/pkgs/by-name/fi/fish-lsp/package.nix @@ -53,6 +53,10 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall + rm -rf node_modules + yarn install --frozen-lockfile --force --production=true --ignore-engines \ + --ignore-platform --ignore-scripts --no-progress --non-interactive --offline + mkdir -p $out/share/fish-lsp cp -r . $out/share/fish-lsp diff --git a/pkgs/by-name/fl/flamp/package.nix b/pkgs/by-name/fl/flamp/package.nix index 79f5e2999ea5..841a43c6a9f5 100644 --- a/pkgs/by-name/fl/flamp/package.nix +++ b/pkgs/by-name/fl/flamp/package.nix @@ -4,7 +4,7 @@ fetchgit, autoreconfHook, pkg-config, - fltk13, + fltk_1_3, gettext, }: @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - fltk13 + fltk_1_3 ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/by-name/fl/flatbuffers/package.nix similarity index 100% rename from pkgs/development/libraries/flatbuffers/default.nix rename to pkgs/by-name/fl/flatbuffers/package.nix diff --git a/pkgs/development/libraries/flatbuffers/23.nix b/pkgs/by-name/fl/flatbuffers_23/package.nix similarity index 100% rename from pkgs/development/libraries/flatbuffers/23.nix rename to pkgs/by-name/fl/flatbuffers_23/package.nix diff --git a/pkgs/by-name/fl/flightgear/package.nix b/pkgs/by-name/fl/flightgear/package.nix index d2d05b651f0d..929d8019f937 100644 --- a/pkgs/by-name/fl/flightgear/package.nix +++ b/pkgs/by-name/fl/flightgear/package.nix @@ -25,7 +25,7 @@ cmake, libpng, udev, - fltk13, + fltk_1_3, apr, qt5, glew, @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { boost libpng udev - fltk13 + fltk_1_3 apr qt5.qtbase qt5.qtquickcontrols2 diff --git a/pkgs/by-name/fl/fllog/package.nix b/pkgs/by-name/fl/fllog/package.nix index 80e8f96ed4e6..3a49e0f43048 100644 --- a/pkgs/by-name/fl/fllog/package.nix +++ b/pkgs/by-name/fl/fllog/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - fltk13, + fltk_1_3, libjpeg, pkg-config, }: @@ -17,12 +17,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ - fltk13 + fltk_1_3 libjpeg ]; nativeBuildInputs = [ - fltk13 # fltk-config + fltk_1_3 # fltk-config pkg-config ]; diff --git a/pkgs/by-name/fl/flmsg/package.nix b/pkgs/by-name/fl/flmsg/package.nix index 4dd5825472ce..4ad285524d3a 100644 --- a/pkgs/by-name/fl/flmsg/package.nix +++ b/pkgs/by-name/fl/flmsg/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - fltk13, + fltk_1_3, libjpeg, pkg-config, }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - fltk13 + fltk_1_3 libjpeg ]; diff --git a/pkgs/by-name/fl/flpsed/package.nix b/pkgs/by-name/fl/flpsed/package.nix index 4171a77d0901..a8662e465487 100644 --- a/pkgs/by-name/fl/flpsed/package.nix +++ b/pkgs/by-name/fl/flpsed/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - fltk13, + fltk_1_3, ghostscript, }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0vngqxanykicabhfdznisv82k5ypkxwg0s93ms9ribvhpm8vf2xp"; }; - buildInputs = [ fltk13 ]; + buildInputs = [ fltk_1_3 ]; postPatch = '' # replace the execvp call to ghostscript @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { configureFlags = [ "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" - "FLTKCONFIG=${lib.getExe' (lib.getDev fltk13) "fltk-config"}" + "FLTKCONFIG=${lib.getExe' (lib.getDev fltk_1_3) "fltk-config"}" ]; meta = { diff --git a/pkgs/by-name/fl/flrig/package.nix b/pkgs/by-name/fl/flrig/package.nix index de57d3647394..b0390c36501f 100644 --- a/pkgs/by-name/fl/flrig/package.nix +++ b/pkgs/by-name/fl/flrig/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - fltk13, + fltk_1_3, libjpeg, eudev, pkg-config, @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - fltk13 + fltk_1_3 libjpeg eudev ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pkg-config ]; - env.FLTK_CONFIG = lib.getExe' (lib.getDev fltk13) "fltk-config"; + env.FLTK_CONFIG = lib.getExe' (lib.getDev fltk_1_3) "fltk-config"; meta = { description = "Digital modem rig control program"; diff --git a/pkgs/development/libraries/fltk/nsosv.patch b/pkgs/by-name/fl/fltk_1_3/nsosv.patch similarity index 100% rename from pkgs/development/libraries/fltk/nsosv.patch rename to pkgs/by-name/fl/fltk_1_3/nsosv.patch diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/by-name/fl/fltk_1_3/package.nix similarity index 100% rename from pkgs/development/libraries/fltk/default.nix rename to pkgs/by-name/fl/fltk_1_3/package.nix diff --git a/pkgs/development/libraries/fltk/1.4.nix b/pkgs/by-name/fl/fltk_1_4/package.nix similarity index 100% rename from pkgs/development/libraries/fltk/1.4.nix rename to pkgs/by-name/fl/fltk_1_4/package.nix diff --git a/pkgs/by-name/fl/flwrap/package.nix b/pkgs/by-name/fl/flwrap/package.nix index 1666191e48a5..5ec29e1d11c8 100644 --- a/pkgs/by-name/fl/flwrap/package.nix +++ b/pkgs/by-name/fl/flwrap/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - fltk13, + fltk_1_3, libjpeg, pkg-config, }: @@ -21,12 +21,12 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - fltk13 + fltk_1_3 libjpeg ]; configureFlags = [ - "FLTK_CONFIG=${lib.getExe' (lib.getDev fltk13) "fltk-config"}" + "FLTK_CONFIG=${lib.getExe' (lib.getDev fltk_1_3) "fltk-config"}" ]; meta = { diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/by-name/fo/fox/package.nix similarity index 100% rename from pkgs/development/libraries/fox/default.nix rename to pkgs/by-name/fo/fox/package.nix diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/by-name/fo/fox_1_6/package.nix similarity index 100% rename from pkgs/development/libraries/fox/fox-1.6.nix rename to pkgs/by-name/fo/fox_1_6/package.nix diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/by-name/fp/fplll/package.nix similarity index 100% rename from pkgs/development/libraries/fplll/default.nix rename to pkgs/by-name/fp/fplll/package.nix diff --git a/pkgs/development/libraries/fplll/20160331.nix b/pkgs/by-name/fp/fplll_20160331/package.nix similarity index 100% rename from pkgs/development/libraries/fplll/20160331.nix rename to pkgs/by-name/fp/fplll_20160331/package.nix diff --git a/pkgs/development/libraries/gamenetworkingsockets/default.nix b/pkgs/by-name/ga/gamenetworkingsockets/package.nix similarity index 94% rename from pkgs/development/libraries/gamenetworkingsockets/default.nix rename to pkgs/by-name/ga/gamenetworkingsockets/package.nix index 2cfeeacb61a2..21a4924ff3d8 100644 --- a/pkgs/development/libraries/gamenetworkingsockets/default.nix +++ b/pkgs/by-name/ga/gamenetworkingsockets/package.nix @@ -5,10 +5,12 @@ cmake, ninja, go, - protobuf, + protobuf_21, openssl, }: - +let + protobuf = protobuf_21; +in stdenv.mkDerivation rec { pname = "GameNetworkingSockets"; version = "1.4.1"; diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/by-name/gc/gcr/package.nix similarity index 100% rename from pkgs/development/libraries/gcr/default.nix rename to pkgs/by-name/gc/gcr/package.nix diff --git a/pkgs/development/libraries/gcr/4.nix b/pkgs/by-name/gc/gcr_4/package.nix similarity index 100% rename from pkgs/development/libraries/gcr/4.nix rename to pkgs/by-name/gc/gcr_4/package.nix diff --git a/pkgs/development/libraries/gdcm/add-missing-losslylosslessarray-in-TestTransferSyntax.patch b/pkgs/by-name/gd/gdcm/add-missing-losslylosslessarray-in-TestTransferSyntax.patch similarity index 100% rename from pkgs/development/libraries/gdcm/add-missing-losslylosslessarray-in-TestTransferSyntax.patch rename to pkgs/by-name/gd/gdcm/add-missing-losslylosslessarray-in-TestTransferSyntax.patch diff --git a/pkgs/development/libraries/gdcm/fix-vtk-deprecated-api.patch b/pkgs/by-name/gd/gdcm/fix-vtk-deprecated-api.patch similarity index 100% rename from pkgs/development/libraries/gdcm/fix-vtk-deprecated-api.patch rename to pkgs/by-name/gd/gdcm/fix-vtk-deprecated-api.patch diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/by-name/gd/gdcm/package.nix similarity index 97% rename from pkgs/development/libraries/gdcm/default.nix rename to pkgs/by-name/gd/gdcm/package.nix index ecd613650b38..e2241dfa9340 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/by-name/gd/gdcm/package.nix @@ -6,7 +6,7 @@ cmake, enableVTK ? true, vtk, - DarwinTools, # sw_vers + darwin, # sw_vers enablePython ? false, python ? null, swig, @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { cmake pkg-config ] - ++ lib.optional stdenv.hostPlatform.isDarwin DarwinTools; + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.DarwinTools; buildInputs = [ expat diff --git a/pkgs/development/libraries/gdcm/python_gdcm.egg-info b/pkgs/by-name/gd/gdcm/python_gdcm.egg-info similarity index 100% rename from pkgs/development/libraries/gdcm/python_gdcm.egg-info rename to pkgs/by-name/gd/gdcm/python_gdcm.egg-info diff --git a/pkgs/development/libraries/gdk-pixbuf/xlib.nix b/pkgs/by-name/gd/gdk-pixbuf-xlib/package.nix similarity index 100% rename from pkgs/development/libraries/gdk-pixbuf/xlib.nix rename to pkgs/by-name/gd/gdk-pixbuf-xlib/package.nix diff --git a/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch b/pkgs/by-name/gd/gdk-pixbuf/installed-tests-path.patch similarity index 100% rename from pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch rename to pkgs/by-name/gd/gdk-pixbuf/installed-tests-path.patch diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/by-name/gd/gdk-pixbuf/package.nix similarity index 100% rename from pkgs/development/libraries/gdk-pixbuf/default.nix rename to pkgs/by-name/gd/gdk-pixbuf/package.nix diff --git a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh b/pkgs/by-name/gd/gdk-pixbuf/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/gdk-pixbuf/setup-hook.sh rename to pkgs/by-name/gd/gdk-pixbuf/setup-hook.sh diff --git a/pkgs/by-name/ge/geary/package.nix b/pkgs/by-name/ge/geary/package.nix index 9602715f550f..b741ac74f993 100644 --- a/pkgs/by-name/ge/geary/package.nix +++ b/pkgs/by-name/ge/geary/package.nix @@ -5,7 +5,7 @@ pkg-config, gtk3, vala, - enchant2, + enchant, wrapGAppsHook3, meson, ninja, @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { buildInputs = [ adwaita-icon-theme - enchant2 + enchant folks gcr glib-networking diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/by-name/ge/gegl/package.nix similarity index 98% rename from pkgs/development/libraries/gegl/default.nix rename to pkgs/by-name/ge/gegl/package.nix index 00ccd6ae9170..9ae0814d0610 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/by-name/ge/gegl/package.nix @@ -29,7 +29,7 @@ gexiv2, libwebp, luajit, - openexr, + openexr_2, suitesparse, withLuaJIT ? lib.meta.availableOn stdenv.hostPlatform luajit, gimp, @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { libraw libwebp gexiv2 - openexr + openexr_2 suitesparse ] ++ lib.optionals stdenv.cc.isClang [ diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/by-name/ge/geoip/package.nix similarity index 100% rename from pkgs/development/libraries/geoip/default.nix rename to pkgs/by-name/ge/geoip/package.nix diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/by-name/gl/glew/package.nix similarity index 100% rename from pkgs/development/libraries/glew/default.nix rename to pkgs/by-name/gl/glew/package.nix diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/by-name/gl/glew_1_10/package.nix similarity index 100% rename from pkgs/development/libraries/glew/1.10.nix rename to pkgs/by-name/gl/glew_1_10/package.nix diff --git a/pkgs/development/libraries/glfw/2.x.nix b/pkgs/by-name/gl/glfw2/package.nix similarity index 100% rename from pkgs/development/libraries/glfw/2.x.nix rename to pkgs/by-name/gl/glfw2/package.nix diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/by-name/gl/glibmm/package.nix similarity index 100% rename from pkgs/development/libraries/glibmm/default.nix rename to pkgs/by-name/gl/glibmm/package.nix diff --git a/pkgs/development/libraries/glibmm/2.68.nix b/pkgs/by-name/gl/glibmm_2_68/package.nix similarity index 100% rename from pkgs/development/libraries/glibmm/2.68.nix rename to pkgs/by-name/gl/glibmm_2_68/package.nix diff --git a/pkgs/development/libraries/gnutls/dummy.crt b/pkgs/by-name/gn/gnutls/dummy.crt similarity index 100% rename from pkgs/development/libraries/gnutls/dummy.crt rename to pkgs/by-name/gn/gnutls/dummy.crt diff --git a/pkgs/development/libraries/gnutls/gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch b/pkgs/by-name/gn/gnutls/gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch similarity index 100% rename from pkgs/development/libraries/gnutls/gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch rename to pkgs/by-name/gn/gnutls/gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch diff --git a/pkgs/development/libraries/gnutls/nix-ssl-cert-file.patch b/pkgs/by-name/gn/gnutls/nix-ssl-cert-file.patch similarity index 100% rename from pkgs/development/libraries/gnutls/nix-ssl-cert-file.patch rename to pkgs/by-name/gn/gnutls/nix-ssl-cert-file.patch diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/by-name/gn/gnutls/package.nix similarity index 97% rename from pkgs/development/libraries/gnutls/default.nix rename to pkgs/by-name/gn/gnutls/package.nix index 49e5bdcea649..98f58a62e3f1 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/by-name/gn/gnutls/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + buildPackages, fetchurl, zlib, libtasn1, @@ -8,7 +9,6 @@ pkg-config, perl, gmp, - autoconf, automake, libidn2, libiconv, @@ -16,7 +16,7 @@ unbound, dns-root-data, gettext, - util-linux, + util-linuxMinimal, cxxBindings ? !stdenv.hostPlatform.isStatic, # tries to link libstdc++.so tpmSupport ? false, trousers, @@ -55,6 +55,9 @@ let && stdenv.buildPlatform == stdenv.hostPlatform; inherit (stdenv.hostPlatform) isDarwin; + + # break the cyclic dependency + util-linux = util-linuxMinimal; in stdenv.mkDerivation rec { @@ -166,7 +169,7 @@ stdenv.mkDerivation rec { texinfo ] ++ [ - autoconf + buildPackages.autoconf269 automake ] ++ lib.optionals doCheck [ diff --git a/pkgs/by-name/gs/gspell/package.nix b/pkgs/by-name/gs/gspell/package.nix index e71f3692fc6c..e7fe95307a58 100644 --- a/pkgs/by-name/gs/gspell/package.nix +++ b/pkgs/by-name/gs/gspell/package.nix @@ -13,7 +13,7 @@ mesonEmulatorHook, gtk3, icu, - enchant2, + enchant, gnome, }: @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ # required for pkg-config - enchant2 + enchant ]; passthru = { diff --git a/pkgs/by-name/he/hexchat/package.nix b/pkgs/by-name/he/hexchat/package.nix index 1834fceda867..2991989c85a4 100644 --- a/pkgs/by-name/he/hexchat/package.nix +++ b/pkgs/by-name/he/hexchat/package.nix @@ -1,7 +1,7 @@ { dbus-glib, desktop-file-utils, - enchant2, + enchant_2, fetchFromGitHub, gtk2, isocodes, @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { #hexchat and hexchat-text loads enchant spell checking library at run time and so it needs to have route to the path postPatch = '' - sed -i "s,libenchant-2.so.2,${enchant2}/lib/libenchant-2.so.2,g" src/fe-gtk/sexy-spell-entry.c + sed -i "s,libenchant-2.so.2,${enchant_2}/lib/libenchant-2.so.2,g" src/fe-gtk/sexy-spell-entry.c sed -i "/flag.startswith('-I')/i if flag.contains('no-such-path')\ncontinue\nendif" plugins/perl/meson.build chmod +x meson_post_install.py for f in meson_post_install.py \ diff --git a/pkgs/by-name/hm/hmcl/package.nix b/pkgs/by-name/hm/hmcl/package.nix index e295cd7fa789..12b4f490c425 100644 --- a/pkgs/by-name/hm/hmcl/package.nix +++ b/pkgs/by-name/hm/hmcl/package.nix @@ -39,13 +39,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hmcl"; - version = "3.9.1"; + version = "3.9.2"; src = fetchurl { # HMCL has built-in keys, such as the Microsoft OAuth secret and the CurseForge API key. # See https://github.com/HMCL-dev/HMCL/blob/refs/tags/release-3.6.12/.github/workflows/gradle.yml#L26-L28 url = "https://github.com/HMCL-dev/HMCL/releases/download/v${finalAttrs.version}/HMCL-${finalAttrs.version}.jar"; - hash = "sha256-UcycobEFbiSys19a3C01CqLKTM1SdAwHDNExRNVv6ug="; + hash = "sha256-/thuAsPadixV2vkez3w9yhkDdpJra54WkhFYaeKH0GU="; }; # - HMCL prompts users to download prebuilt Terracotta binary for diff --git a/pkgs/by-name/ht/htmlhint/package.nix b/pkgs/by-name/ht/htmlhint/package.nix index b1a46eca36fa..ed973a24d631 100644 --- a/pkgs/by-name/ht/htmlhint/package.nix +++ b/pkgs/by-name/ht/htmlhint/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "htmlhint"; - version = "1.7.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "htmlhint"; repo = "HTMLHint"; rev = "v${version}"; - hash = "sha256-jhn3FWzqwqczB7siHRxpYNLPoC9YhZtkcVyvWdIq93k="; + hash = "sha256-zRn6fqziqgp3cOPZfkmN+KP84bgjdPmaHD7n6rtiHVA="; }; - npmDepsHash = "sha256-acf6pyv3TsOA3Ulm/OMYZ2R7sMGEcsOXA9hbPXLbX3I="; + npmDepsHash = "sha256-L/yVM/HoBewzoADn9M+c2Er5LFEiZXajYIK8fvsDdio="; meta = { changelog = "https://github.com/htmlhint/HTMLHint/blob/${src.rev}/CHANGELOG.md"; diff --git a/pkgs/development/libraries/dbus/make-session-conf.xsl b/pkgs/by-name/ma/makeDBusConf/make-session-conf.xsl similarity index 100% rename from pkgs/development/libraries/dbus/make-session-conf.xsl rename to pkgs/by-name/ma/makeDBusConf/make-session-conf.xsl diff --git a/pkgs/development/libraries/dbus/make-system-conf.xsl b/pkgs/by-name/ma/makeDBusConf/make-system-conf.xsl similarity index 100% rename from pkgs/development/libraries/dbus/make-system-conf.xsl rename to pkgs/by-name/ma/makeDBusConf/make-system-conf.xsl diff --git a/pkgs/development/libraries/dbus/make-dbus-conf.nix b/pkgs/by-name/ma/makeDBusConf/package.nix similarity index 100% rename from pkgs/development/libraries/dbus/make-dbus-conf.nix rename to pkgs/by-name/ma/makeDBusConf/package.nix diff --git a/pkgs/by-name/ma/marwaita-icons/package.nix b/pkgs/by-name/ma/marwaita-icons/package.nix index 531468767b44..641afa0db689 100644 --- a/pkgs/by-name/ma/marwaita-icons/package.nix +++ b/pkgs/by-name/ma/marwaita-icons/package.nix @@ -3,19 +3,19 @@ stdenvNoCC, fetchFromGitHub, gtk3, - breeze-icons, hicolor-icon-theme, pantheon, + kdePackages, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "marwaita-icons"; version = "5.1"; src = fetchFromGitHub { owner = "darkomarko42"; repo = "marwaita-icons"; - rev = version; + tag = finalAttrs.version; hash = "sha256-UehujziT13kA9ltjyCvbSDTEpR8ISxoBpoLj22Zih8k="; }; @@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation rec { ]; propagatedBuildInputs = [ - breeze-icons + kdePackages.breeze-icons hicolor-icon-theme pantheon.elementary-icon-theme ]; @@ -55,4 +55,4 @@ stdenvNoCC.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.romildo ]; }; -} +}) diff --git a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix index a4bfa13e31ba..c30f9668c93d 100644 --- a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix +++ b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "matrix-alertmanager-receiver"; - version = "2025.11.26"; + version = "2025.12.24"; src = fetchFromGitHub { owner = "metio"; repo = "matrix-alertmanager-receiver"; tag = finalAttrs.version; - hash = "sha256-VIyz+9flJeeXkLW2y5hoUMb73LdwM/VUu7mgyALYioU="; + hash = "sha256-RK9Z/QeA0AjOfFROtOYKd3uCPn3NN+eyeuLQVWxlH6U="; }; - vendorHash = "sha256-x0KpYURQQxNPFO9Pd9F+OQ/Xw6xIYRA4UyQkV0kxGGU="; + vendorHash = "sha256-HJEpWf3WeMw9vLj7L6thx1ur5YuC5xjIuMCHaFZ2tS8="; env.CGO_ENABLED = "0"; diff --git a/pkgs/by-name/md/mdbook-toc/package.nix b/pkgs/by-name/md/mdbook-toc/package.nix index 59ff38111c37..4940a8559472 100644 --- a/pkgs/by-name/md/mdbook-toc/package.nix +++ b/pkgs/by-name/md/mdbook-toc/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-toc"; - version = "0.15.2"; + version = "0.15.3"; src = fetchFromGitHub { owner = "badboy"; repo = "mdbook-toc"; tag = version; - sha256 = "sha256-gzwsPRhsAQTraiK/N5dKEj8NTpV/mYmECpS4KVl4Ql8="; + sha256 = "sha256-nQMVba6jwfatGpV1jhwzdNlMY7XUGpHU3TqZ1yMy6Q0="; }; - cargoHash = "sha256-+YvEptJlNjomIsyS7cNImwYa1SxawY05e5vq9VmrktA="; + cargoHash = "sha256-ksLapG9MDGDgKNZIg7Kx9CpzCTchkQdmMlWAEczdbRg="; meta = { description = "Preprocessor for mdbook to add inline Table of Contents support"; diff --git a/pkgs/by-name/me/meilisearch/package.nix b/pkgs/by-name/me/meilisearch/package.nix index c0f06a6c4560..21f9dae474db 100644 --- a/pkgs/by-name/me/meilisearch/package.nix +++ b/pkgs/by-name/me/meilisearch/package.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "meilisearch"; - version = "1.32.0"; + version = "1.32.1"; src = fetchFromGitHub { owner = "meilisearch"; repo = "meilisearch"; tag = "v${finalAttrs.version}"; - hash = "sha256-kif2f63eKZsZQrGvgTXNB6r3G5q+zyXx0+i8bXvmKAg="; + hash = "sha256-ljp+Cpk8aW1fC9wM7/9dAg9d68scwhYBJmbnJmgoMG8="; }; cargoBuildFlags = [ "--package=meilisearch" ]; - cargoHash = "sha256-Wa6UYpRI/DsEq9p+nwcMiVru+1+94XhYyT6MLxBBQPc="; + cargoHash = "sha256-0OK34rZqUL2w0z3NIoEfa+DMpbIZWZ6X3ZeeDf4GCcA="; # Default features include mini dashboard which downloads something from the internet. buildNoDefaultFeatures = true; diff --git a/pkgs/by-name/ne/nezha/package.nix b/pkgs/by-name/ne/nezha/package.nix index 9c91ca4a577d..df7379423929 100644 --- a/pkgs/by-name/ne/nezha/package.nix +++ b/pkgs/by-name/ne/nezha/package.nix @@ -48,13 +48,13 @@ let in buildGoModule (finalAttrs: { pname = "nezha"; - version = "1.14.12"; + version = "1.14.14"; src = fetchFromGitHub { owner = "nezhahq"; repo = "nezha"; tag = "v${finalAttrs.version}"; - hash = "sha256-gNXbg5JaHHogJaRGmAjOXskrbkSRu1fnIqQMu8U3lzk="; + hash = "sha256-F6M/bpuupQDDxKrafWlB3vk6iKf1QfJU1x0p3MAzzhM="; }; proxyVendor = true; diff --git a/pkgs/by-name/op/open-pdf-sign/package.nix b/pkgs/by-name/op/open-pdf-sign/package.nix index a18188ecbd93..fd6bca29f5b8 100644 --- a/pkgs/by-name/op/open-pdf-sign/package.nix +++ b/pkgs/by-name/op/open-pdf-sign/package.nix @@ -26,7 +26,7 @@ maven.buildMavenPackage rec { sed -i '/dirtyQualifier/d' ./pom.xml ''; - mvnHash = "sha256-5DgCjqKPc/y4vDX8pl4Qnm1KsCOpCdUVNiihpvcCzBU="; + mvnHash = "sha256-oEAvqgH4/vfywPHUfbrIpOIdbeqt+K4H+Pebx5EQqMA="; # Disable test requires the network, we also set the version mvnParameters = lib.escapeShellArgs [ diff --git a/pkgs/by-name/py/pyrefly/package.nix b/pkgs/by-name/py/pyrefly/package.nix index 1c09e7ea4d41..c201b54d4cae 100644 --- a/pkgs/by-name/py/pyrefly/package.nix +++ b/pkgs/by-name/py/pyrefly/package.nix @@ -10,17 +10,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "pyrefly"; - version = "0.47.0"; + version = "0.48.0"; src = fetchFromGitHub { owner = "facebook"; repo = "pyrefly"; tag = finalAttrs.version; - hash = "sha256-ur1QTNnQnGiAq2pdbe1IfnKUCD0hfzrujLgLA89nR9E="; + hash = "sha256-n/Nlz1eTC29JyTGJvGUpO4BF22tZBh3ZsMdPUPy874M="; }; buildAndTestSubdir = "pyrefly"; - cargoHash = "sha256-4FsNFx70/hIkfKmuzP26YLhwEEY7J3xacluDgDcFh6s="; + cargoHash = "sha256-mLK32ar+7N4r2MQWfa6G5yql8xseck9VYR4gF/1dSnM="; buildInputs = [ rust-jemalloc-sys ]; diff --git a/pkgs/by-name/qt/qtappinstancemanager/package.nix b/pkgs/by-name/qt/qtappinstancemanager/package.nix index aba0d222c3a4..050d1345602f 100644 --- a/pkgs/by-name/qt/qtappinstancemanager/package.nix +++ b/pkgs/by-name/qt/qtappinstancemanager/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qtappinstancemanager"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "oclero"; repo = "qtappinstancemanager"; tag = "v${finalAttrs.version}"; - hash = "sha256-+YkvWv5ss4O1WLDmwpueuRY72tTdXTLZeg8pVL4R3Ag="; + hash = "sha256-jWOuI5pjKdDtvQMVAOrj/hWRAjsal/01H9Va2reEbos="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/audio/rtaudio/default.nix b/pkgs/by-name/rt/rtaudio_5/package.nix similarity index 96% rename from pkgs/development/libraries/audio/rtaudio/default.nix rename to pkgs/by-name/rt/rtaudio_5/package.nix index 843788a86357..dd142e55f2d1 100644 --- a/pkgs/development/libraries/audio/rtaudio/default.nix +++ b/pkgs/by-name/rt/rtaudio_5/package.nix @@ -10,7 +10,7 @@ pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, libpulseaudio, jackSupport ? true, - jack, + libjack2, coreaudioSupport ? stdenv.hostPlatform.isDarwin, }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optional alsaSupport alsa-lib ++ lib.optional pulseaudioSupport libpulseaudio - ++ lib.optional jackSupport jack; + ++ lib.optional jackSupport libjack2; cmakeFlags = [ "-DRTAUDIO_API_ALSA=${if alsaSupport then "ON" else "OFF"}" diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/by-name/rt/rtmidi/package.nix similarity index 96% rename from pkgs/development/libraries/audio/rtmidi/default.nix rename to pkgs/by-name/rt/rtmidi/package.nix index fb8d867d96f8..774c754447d3 100644 --- a/pkgs/development/libraries/audio/rtmidi/default.nix +++ b/pkgs/by-name/rt/rtmidi/package.nix @@ -8,7 +8,7 @@ alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib, jackSupport ? true, - jack, + libjack2, coremidiSupport ? stdenv.hostPlatform.isDarwin, }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = lib.optional alsaSupport alsa-lib ++ lib.optional jackSupport jack; + buildInputs = lib.optional alsaSupport alsa-lib ++ lib.optional jackSupport libjack2; cmakeFlags = [ "-DRTMIDI_API_ALSA=${if alsaSupport then "ON" else "OFF"}" diff --git a/pkgs/by-name/ru/rustical/package.nix b/pkgs/by-name/ru/rustical/package.nix index 9f1eb069ce33..23e90d5d84e8 100644 --- a/pkgs/by-name/ru/rustical/package.nix +++ b/pkgs/by-name/ru/rustical/package.nix @@ -8,16 +8,21 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rustical"; - version = "0.11.5"; + version = "0.11.10"; src = fetchFromGitHub { owner = "lennart-k"; repo = "rustical"; tag = "v${finalAttrs.version}"; - hash = "sha256-hvdYwh9nmSXS9QhyxW5mLRS4kgf164I+UxGHRlK1oH4="; + hash = "sha256-+XGYM12RO0+bUpt7mIP7qm1CoYDnJYRNtkxVRyoH32g="; }; - cargoHash = "sha256-rpTQpb0a8QhFT7Qo6hYZ+nPmWFnR/vSVCoHvZFQR3Cs="; + postPatch = '' + substituteInPlace Cargo.toml \ + --replace-fail 'rust-version = "1.92"' 'rust-version = "1.91"' + ''; + + cargoHash = "sha256-9GF7ViELoUxOxccyhFJehfRm7KuQIbv2wp9xIKkCpPQ="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/sa/salt/package.nix b/pkgs/by-name/sa/salt/package.nix index e7bb0c280330..c6b0c8dd97b9 100644 --- a/pkgs/by-name/sa/salt/package.nix +++ b/pkgs/by-name/sa/salt/package.nix @@ -12,12 +12,12 @@ python3.pkgs.buildPythonApplication rec { pname = "salt"; - version = "3007.10"; + version = "3007.11"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-c3FRr9L2vgdIg8lpl0MeYJ7Df/Max7BkXQmFL9QknYQ="; + hash = "sha256-EAkO0/1kKSXRkEXNH6mJHznUkQR0AsQ2ijtzCrwUCAU="; }; patches = [ diff --git a/pkgs/by-name/sw/sword/package.nix b/pkgs/by-name/sw/sword/package.nix index 3e9f942466d0..1c0afb3d13fb 100644 --- a/pkgs/by-name/sw/sword/package.nix +++ b/pkgs/by-name/sw/sword/package.nix @@ -4,7 +4,7 @@ fetchurl, pkg-config, icu, - clucene_core, + clucene-core, autoreconfHook, bzip2, @@ -38,7 +38,7 @@ stdenv.mkDerivation ( icu ] ++ (lib.optionals stdenv.hostPlatform.isUnix [ - clucene_core + clucene-core curl ]) ++ (lib.optionals stdenv.hostPlatform.isWindows [ diff --git a/pkgs/by-name/to/toolhive/package.nix b/pkgs/by-name/to/toolhive/package.nix index a905ad847ee8..c5ebff99b7de 100644 --- a/pkgs/by-name/to/toolhive/package.nix +++ b/pkgs/by-name/to/toolhive/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "toolhive"; - version = "0.6.6"; + version = "0.6.9"; src = fetchFromGitHub { owner = "stacklok"; repo = "toolhive"; tag = "v${finalAttrs.version}"; - hash = "sha256-zCkKS573MzqiZ4Zr3ztlM7Jd0XHWAOEXUT+dF/nIiZ8="; + hash = "sha256-qeUeRcxMo2hgsYcydQjTA9N125gpfC0ts7h7axLES24="; }; - vendorHash = "sha256-gEPIbMpbCg+6Li3F3H7J5++Cnun8/kMJ4s8bTtGecqI="; + vendorHash = "sha256-k7dPbHqsQVUL0pJoduq4clFG/q1i6gsTaQtES28xTKU="; # Build only the main CLI and operator binaries subPackages = [ diff --git a/pkgs/by-name/ty/typescript-go/package.nix b/pkgs/by-name/ty/typescript-go/package.nix index 0e14c5041266..96c62a6e7090 100644 --- a/pkgs/by-name/ty/typescript-go/package.nix +++ b/pkgs/by-name/ty/typescript-go/package.nix @@ -10,13 +10,13 @@ let in buildGoModule { pname = "typescript-go"; - version = "0-unstable-2026-01-08"; + version = "0-unstable-2026-01-14"; src = fetchFromGitHub { owner = "microsoft"; repo = "typescript-go"; - rev = "ceefddd3b46e03cb98c0bf088676d7b6be6021a1"; - hash = "sha256-IWaqL55dK3HEv6DTSjuQObKNgSEfvBdiD9RmfDSaQ0M="; + rev = "f5bcdfc02e6527b774418a26ee817c4397da8546"; + hash = "sha256-tNpRCXj/QoYP2uw7nWaQZAnQtktYgVfZZ1/L+N+/xys="; fetchSubmodules = false; }; diff --git a/pkgs/by-name/ut/utm/package.nix b/pkgs/by-name/ut/utm/package.nix index 4f5d4046c481..9ff5f1ad57a0 100644 --- a/pkgs/by-name/ut/utm/package.nix +++ b/pkgs/by-name/ut/utm/package.nix @@ -6,12 +6,12 @@ stdenvNoCC, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "utm"; version = "4.7.5"; src = fetchurl { - url = "https://github.com/utmapp/UTM/releases/download/v${version}/UTM.dmg"; + url = "https://github.com/utmapp/UTM/releases/download/v${finalAttrs.version}/UTM.dmg"; hash = "sha256-qENck8+1+Lv+6ksTTPrRrGa2djK3XkOMY7GorgQ77w4="; }; @@ -61,7 +61,7 @@ stdenvNoCC.mkDerivation rec { See https://docs.getutm.app/ for more information. ''; homepage = "https://mac.getutm.app/"; - changelog = "https://github.com/utmapp/utm/releases/tag/v${version}"; + changelog = "https://github.com/utmapp/utm/releases/tag/v${finalAttrs.version}"; mainProgram = "UTM"; license = lib.licenses.asl20; platforms = lib.platforms.darwin; # 11.3 is the minimum supported version as of UTM 4. @@ -71,4 +71,4 @@ stdenvNoCC.mkDerivation rec { wegank ]; }; -} +}) diff --git a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix index 6a25d6447566..dbc64c8cdc8c 100644 --- a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix +++ b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix @@ -9,14 +9,14 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20251213093556"; + version = "20260112053243"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-ITZsD7bpYXsXmLlSL/zY3eh2yAy7Afwddw64SADmnSo="; + hash = "sha256-21Xk+0o4xUOHcLtXrioLy8cwZziKoXp7LCHS+Q60ZTI="; }; - vendorHash = "sha256-HmIXpF7P3J+lPXpmWWoFpSYAu5zbBQSDrj6S88LgWSU="; + vendorHash = "sha256-9tXv+rDBowxDN9gH4zHCr4TRbic4kijco3Y6bojJKRk="; meta = { description = "Community managed domain list"; homepage = "https://github.com/v2fly/domain-list-community"; diff --git a/pkgs/by-name/va/vapoursynth/package.nix b/pkgs/by-name/va/vapoursynth/package.nix index 5607743660a3..5d6e5626bd73 100644 --- a/pkgs/by-name/va/vapoursynth/package.nix +++ b/pkgs/by-name/va/vapoursynth/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "vapoursynth"; - version = "72"; + version = "73"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = "R${version}"; - hash = "sha256-LRRz4471Rl/HwJ14zAkU/f2Acuofja8c0pGkuWihhsM="; + hash = "sha256-cs+MEnOi1bwA52fiTIlGGzYjy5/m/FdoK55WSADR/gQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ya/yazi/plugins/nav-parent-panel/default.nix b/pkgs/by-name/ya/yazi/plugins/nav-parent-panel/default.nix new file mode 100644 index 000000000000..c625e60a5b89 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/nav-parent-panel/default.nix @@ -0,0 +1,30 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "nav-parent-panel"; + version = "0-unstable-2025-09-15"; + + src = fetchFromGitHub { + owner = "yaqihou"; + repo = "nav-parent-panel.yazi"; + rev = "e72b944cf58d227a80bbd816031068870b20178f"; + hash = "sha256-jKCCggyldQrdw88DaNXNuLbEq88HgoWc0oCCWTtQF2g="; + }; + + meta = { + description = "Yazi plugin to navigate between sibling directories"; + longDescription = '' + This plugin allows you to cycle through sibling directories (same level + as the current directory) without having to go up to the parent directory. + + For a visual demonstration, check + [this example](https://github.com/yaqihou/nav-parent-panel.yazi#example). + ''; + homepage = "https://github.com/yaqihou/nav-parent-panel.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ eljamm ]; + }; +} diff --git a/pkgs/by-name/ye/yek/package.nix b/pkgs/by-name/ye/yek/package.nix index 23fe911c5e3f..d4df6f721c16 100644 --- a/pkgs/by-name/ye/yek/package.nix +++ b/pkgs/by-name/ye/yek/package.nix @@ -8,7 +8,7 @@ versionCheckHook, }: let - version = "0.21.0"; + version = "0.25.0"; in rustPlatform.buildRustPackage { pname = "yek"; @@ -18,25 +18,21 @@ rustPlatform.buildRustPackage { owner = "bodo-run"; repo = "yek"; tag = "v${version}"; - hash = "sha256-GAG5SCcxWL0JbngE2oOadVhOt2ppep6rIbYjIF2y3jI="; + hash = "sha256-6yHQyl4UnRQlmWkBbAvUEBZnrHW3GsrrFZyOU+p3mjE="; }; - cargoHash = "sha256-uShKrH4fdLDJX4ZX0TWXCyFctEH0C98B/STY9j6aH8A="; + cargoHash = "sha256-WheN8rk/LwKTVg0mDorbXGBvojISSu1KtknFkWmpLMk="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; env.OPENSSL_NO_VENDOR = 1; - checkFlags = [ - # Tests with git fail - "--skip=e2e_tests::test_git_boost_config" - "--skip=e2e_tests::test_git_integration" - "--skip=lib_tests::test_serialize_repo_with_git" - "--skip=priority_tests::test_get_recent_commit_times_empty_repo" - "--skip=priority_tests::test_get_recent_commit_times_with_git" - "--skip=priority_tests::test_get_recent_commit_times_git_failure" - ]; + # Tests using git fail + # Skipping individual checks causes failure as `--skip` flags + # end up passed to executable + # > error: unexpected argument '--skip' found + doCheck = false; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/ze/zensical/package.nix b/pkgs/by-name/ze/zensical/package.nix new file mode 100644 index 000000000000..b8e890f3115b --- /dev/null +++ b/pkgs/by-name/ze/zensical/package.nix @@ -0,0 +1,59 @@ +{ + lib, + fetchPypi, + rustPlatform, + python3Packages, + versionCheckHook, +}: + +python3Packages.buildPythonApplication rec { + pname = "zensical"; + version = "0.0.15"; + pyproject = true; + + # We fetch from PyPi, because GitHub repo does not contain all sources. + # The publish process also copies in assets from zensical/ui. + # We could combine sources, but then nix-update won't work. + src = fetchPypi { + inherit pname version; + hash = "sha256-syAMkbMDcGccULi0qkHCDlX/KBS5AD7iPJtvkjoMGb4="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit pname version src; + hash = "sha256-Sg4gl23aK6yPZ3Hdi+IzTGnx8wEAkSL0SrKGVdMRJ2s="; + }; + + nativeBuildInputs = with rustPlatform; [ + maturinBuildHook + cargoSetupHook + ]; + + dependencies = with python3Packages; [ + click + deepmerge + markdown + pygments + pymdown-extensions + pyyaml + ]; + + nativeCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + meta = { + description = "Static site generator for documentation"; + longDescription = '' + Zensical is a modern static site generator designed to simplify + building and maintaining project documentation. It's built by + the creators of Material for MkDocs and shares the same core + design principles and philosophy – batteries included, easy to + use, with powerful customization options. + ''; + homepage = "https://zensical.org"; + changelog = "https://github.com/zensical/zensical/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aljazerzen ]; + mainProgram = "zensical"; + }; +} diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index ab4dd9a16f82..bc19c93d21ef 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -760,7 +760,7 @@ builtins.intersectAttrs super { fltkhs = overrideCabal (drv: { libraryToolDepends = (drv.libraryToolDepends or [ ]) ++ [ pkgs.buildPackages.autoconf ]; librarySystemDepends = (drv.librarySystemDepends or [ ]) ++ [ - pkgs.fltk13 + pkgs.fltk_1_3 pkgs.libGL pkgs.libjpeg ]; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 26fd07c6dd9b..1e2df1082117 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -240646,7 +240646,7 @@ self: { Cabal, directory, filepath, - fltk14, + fltk_1_4, libGL, libGLU, mtl, @@ -240675,7 +240675,7 @@ self: { text vector ]; - librarySystemDepends = [ fltk14 ]; + librarySystemDepends = [ fltk_1_4 ]; libraryPkgconfigDepends = [ libGL libGLU @@ -240700,7 +240700,7 @@ self: { } ) { - inherit (pkgs) fltk14; + inherit (pkgs) fltk_1_4; inherit (pkgs) libGL; inherit (pkgs) libGLU; inherit (pkgs) pkg-config; diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix deleted file mode 100644 index f5281cf832ab..000000000000 --- a/pkgs/development/libraries/c-blosc/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ callPackage }: -{ - c-blosc = callPackage ./1.nix { }; - c-blosc2 = callPackage ./2.nix { }; -} diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index e54a8077d761..2b5b24356104 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -21,7 +21,7 @@ wayland-protocols, wayland-scanner, libwebp, - enchant2, + enchant, xorg, libxkbcommon, libavif, @@ -141,7 +141,7 @@ clangStdenv.mkDerivation (finalAttrs: { buildInputs = [ at-spi2-core cairo # required even when using skia - enchant2 + enchant flite libavif libepoxy diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix index 551feba4eb2c..a725329d917c 100644 --- a/pkgs/development/lisp-modules/packages.nix +++ b/pkgs/development/lisp-modules/packages.nix @@ -122,6 +122,13 @@ let cl-liballegro-nuklear = build-with-compile-into-pwd super.cl-liballegro-nuklear; + cl-project = super.cl-project.overrideLispAttrs { + # install skeleton.asd + postInstall = '' + cp -v skeleton/skeleton.asd $out/skeleton + ''; + }; + lessp = build-asdf-system { pname = "lessp"; version = "0.2-f8a9e4664"; diff --git a/pkgs/development/python-modules/bitsandbytes/default.nix b/pkgs/development/python-modules/bitsandbytes/default.nix index 66769216709a..4d33e8f943c0 100644 --- a/pkgs/development/python-modules/bitsandbytes/default.nix +++ b/pkgs/development/python-modules/bitsandbytes/default.nix @@ -27,7 +27,7 @@ let pname = "bitsandbytes"; - version = "0.48.2"; + version = "0.49.1"; brokenConditions = lib.attrsets.filterAttrs (_: cond: cond) { "CUDA and ROCm are mutually exclusive" = cudaSupport && rocmSupport; @@ -81,7 +81,7 @@ buildPythonPackage { owner = "bitsandbytes-foundation"; repo = "bitsandbytes"; tag = version; - hash = "sha256-gtNOMxLeYTCZK5MVdpjOFOw6rxvqS+XJmY1Meiuz0Rw="; + hash = "sha256-nNhxDJITXNIZMXuZdzpF5dl1K1kFEVQ0gbTqZnOf/sI="; }; patches = [ diff --git a/pkgs/development/python-modules/gekko/default.nix b/pkgs/development/python-modules/gekko/default.nix index d0edd4b35488..86117f7ded48 100644 --- a/pkgs/development/python-modules/gekko/default.nix +++ b/pkgs/development/python-modules/gekko/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "gekko"; - version = "1.3.0"; + version = "1.3.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-S/uHA1UPPX159ZOk/vItSVWZ4VVu1Bylhc98LslAutI="; + hash = "sha256-o5nNn4lshkrb37ud0FL5V9EG9FTgpxG9U9tpbIiazn4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/githubkit/default.nix b/pkgs/development/python-modules/githubkit/default.nix index 0e1d6e1e150f..f8f85d4ba07d 100644 --- a/pkgs/development/python-modules/githubkit/default.nix +++ b/pkgs/development/python-modules/githubkit/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "githubkit"; - version = "0.13.4"; + version = "0.13.5"; pyproject = true; src = fetchFromGitHub { owner = "yanyongyu"; repo = "githubkit"; tag = "v${version}"; - hash = "sha256-67Y0r4Po3z4YmnbWC0HBLmsKD68HMIGvHKo5SLe+KRc="; + hash = "sha256-YKL31M1H4LBE29xmi6GfX3tTBGxS9yUvHQEiWke3ANA="; }; patches = [ diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 70d6a6e5bd7a..ccf56f460f61 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -35,16 +35,16 @@ writableTmpDirAsHomeHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "keras"; - version = "3.13.0"; + version = "3.13.1"; pyproject = true; src = fetchFromGitHub { owner = "keras-team"; repo = "keras"; - tag = "v${version}"; - hash = "sha256-JsWmwJbIJIF3eEj7wYzNOSAiNHQkQ5LHKrE0lVQtU/U="; + tag = "v${finalAttrs.version}"; + hash = "sha256-oFlEgic6M6ZRqDl6RvAbQccW8RIHC4fEGWJyNPidDHM="; }; build-system = [ @@ -157,8 +157,8 @@ buildPythonPackage rec { meta = { description = "Multi-backend implementation of the Keras API, with support for TensorFlow, JAX, and PyTorch"; homepage = "https://keras.io"; - changelog = "https://github.com/keras-team/keras/releases/tag/v${version}"; + changelog = "https://github.com/keras-team/keras/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; }; -} +}) diff --git a/pkgs/development/python-modules/meshcore/default.nix b/pkgs/development/python-modules/meshcore/default.nix index 03b67619309f..1545c54d96dd 100644 --- a/pkgs/development/python-modules/meshcore/default.nix +++ b/pkgs/development/python-modules/meshcore/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "meshcore"; - version = "2.2.3"; + version = "2.2.4"; pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "sha256-lmMflAlrNnfsc10J3CBxor9ftHK10bWyGTbjASJv82s="; + sha256 = "sha256-uI61YDj1zYNsdcUZ2VoHQz0Xr5ja/tNH6UyBUjL8B6w="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pyenchant/default.nix b/pkgs/development/python-modules/pyenchant/default.nix index 6024528bb534..3ca3b126b8f3 100644 --- a/pkgs/development/python-modules/pyenchant/default.nix +++ b/pkgs/development/python-modules/pyenchant/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, isPy27, fetchPypi, - enchant2, + enchant_2, }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "sha256-glKIJGtd68lDb5GWdlCXTvDVY2RYUCYZ4yLEdvEoOJE="; }; - propagatedBuildInputs = [ enchant2 ]; + propagatedBuildInputs = [ enchant_2 ]; postPatch = let @@ -33,7 +33,7 @@ buildPythonPackage rec { # it "accidentally" work by pulling something from /opt. substituteInPlace enchant/_enchant.py \ --replace 'os.environ.get("PYENCHANT_LIBRARY_PATH")' \ - "'${enchant2}/lib/libenchant-2${libext}'" \ + "'${enchant_2}/lib/libenchant-2${libext}'" \ --replace '/opt/local/lib/' "" ''; diff --git a/pkgs/development/python-modules/sabctools/default.nix b/pkgs/development/python-modules/sabctools/default.nix index f6d5f07d8814..072e4f14ea03 100644 --- a/pkgs/development/python-modules/sabctools/default.nix +++ b/pkgs/development/python-modules/sabctools/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "sabctools"; - version = "9.2.1"; + version = "9.3.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-lYs0ve17IfDs3OccKweun/J+Sl5ct/HFVHwwEZP2LNk="; + hash = "sha256-CE11hjSkZFSmeUh3V3U4y/z77wS/hBUHRo40Y19YnX4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/serpent/default.nix b/pkgs/development/python-modules/serpent/default.nix index bb6312686e5e..c66747fc2cc1 100644 --- a/pkgs/development/python-modules/serpent/default.nix +++ b/pkgs/development/python-modules/serpent/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "serpent"; - version = "1.41"; + version = "1.42"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-BAcDX+PGZEOH1Iz/FGfVqp/v+BTQc3K3hnftDuPtcJU="; + hash = "sha256-jqCCsB+LoH7NdONKkRisRSG8RZSTjZErgIyJ8dpCVQY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python2-modules/attrs/default.nix b/pkgs/development/python2-modules/attrs/default.nix deleted file mode 100644 index d2613cfcfb42..000000000000 --- a/pkgs/development/python2-modules/attrs/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, -}: - -buildPythonPackage rec { - pname = "attrs"; - version = "21.4.0"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-YmuoI0IR25joad92IwoTfExAoS1yRFxF1fW3FvB24v0="; - }; - - outputs = [ - "out" - "testout" - ]; - - postInstall = '' - # Install tests as the tests output. - mkdir $testout - cp -R tests $testout/tests - ''; - - pythonImportsCheck = [ - "attr" - ]; - - # pytest depends on attrs, so we can't do this out-of-the-box. - # Instead, we do this as a passthru.tests test. - doCheck = false; - - meta = { - description = "Python attributes without boilerplate"; - homepage = "https://github.com/hynek/attrs"; - license = lib.licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python2-modules/backports-functools-lru-cache/default.nix b/pkgs/development/python2-modules/backports-functools-lru-cache/default.nix deleted file mode 100644 index 78a52491f1fc..000000000000 --- a/pkgs/development/python2-modules/backports-functools-lru-cache/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - setuptools, - setuptools-scm, -}: - -buildPythonPackage rec { - pname = "backports-functools-lru-cache"; - version = "1.6.6"; - pyproject = true; - - src = fetchPypi { - pname = "backports.functools_lru_cache"; - inherit version; - hash = "sha256-e3DnAbpNtYwO2GcanTORsKu5vRvCTU6Qw0gPS6r8wtw="; - }; - - nativeBuildInputs = [ - setuptools - setuptools-scm - ]; - - # circular dependency: - # backports-functools-lru-cache -> pytest -> wc-width -> backports-functools-lru-cache - doCheck = false; - - pythonImportsCheck = [ - "backports.functools_lru_cache" - ]; - - meta = { - description = "Backport of functools.lru_cache"; - homepage = "https://github.com/jaraco/backports.functools_lru_cache"; - license = lib.licenses.mit; - }; -} diff --git a/pkgs/development/python2-modules/cffi/default.nix b/pkgs/development/python2-modules/cffi/default.nix deleted file mode 100644 index 52ed21c84918..000000000000 --- a/pkgs/development/python2-modules/cffi/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - stdenv, - cffi, -}: - -if cffi == null then - null -else - cffi.overridePythonAttrs { - disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ - # cannot load library 'c' - "test_FILE" - "test_FILE_object" - "test_FILE_only_for_FILE_arg" - "test_load_and_call_function" - "test_load_library" - - # cannot load library 'dl' - "test_dlopen_handle" - - # cannot load library 'm' - "test_dir_on_dlopen_lib" - "test_dlclose" - "test_dlopen" - "test_dlopen_constant" - "test_dlopen_flags" - "test_function_typedef" - "test_line_continuation_in_defines" - "test_missing_function" - "test_remove_comments" - "test_remove_line_continuation_comments" - "test_simple" - "test_sin" - "test_sinf" - "test_stdcall_only_on_windows" - "test_wraps_from_stdlib" - - # MemoryError - "test_callback_as_function_argument" - "test_callback_crash" - "test_callback_decorator" - "test_callback_large_struct" - "test_callback_returning_void" - "test_cast_functionptr_and_int" - "test_function_pointer" - "test_functionptr_intptr_return" - "test_functionptr_simple" - "test_functionptr_void_return" - "test_functionptr_voidptr_return" - ]; - } diff --git a/pkgs/development/python2-modules/configparser/default.nix b/pkgs/development/python2-modules/configparser/default.nix deleted file mode 100644 index 679d19c59f47..000000000000 --- a/pkgs/development/python2-modules/configparser/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - lib, - stdenv, - buildPythonPackage, - fetchPypi, - setuptools-scm, -}: - -buildPythonPackage rec { - pname = "configparser"; - version = "4.0.2"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "c7d282687a5308319bf3d2e7706e575c635b0a470342641c93bea0ea3b5331df"; - }; - - # No tests available - doCheck = false; - - nativeBuildInputs = [ setuptools-scm ]; - - preConfigure = '' - export LC_ALL=${if stdenv.hostPlatform.isDarwin then "en_US" else "C"}.UTF-8 - ''; - - meta = { - description = "Updated configparser from Python 3.7 for Python 2.6+"; - license = lib.licenses.mit; - homepage = "https://github.com/jaraco/configparser"; - }; -} diff --git a/pkgs/development/python2-modules/contextlib2/default.nix b/pkgs/development/python2-modules/contextlib2/default.nix deleted file mode 100644 index 273fd278c528..000000000000 --- a/pkgs/development/python2-modules/contextlib2/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, -}: - -buildPythonPackage rec { - pname = "contextlib2"; - version = "0.6.0.post1"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e"; - }; - - # requires unittest2, which has been removed - doCheck = false; - - meta = { - description = "Backports and enhancements for the contextlib module"; - homepage = "https://contextlib2.readthedocs.org/"; - license = lib.licenses.psfl; - }; -} diff --git a/pkgs/development/python2-modules/coverage/default.nix b/pkgs/development/python2-modules/coverage/default.nix deleted file mode 100644 index 7bf3247d8768..000000000000 --- a/pkgs/development/python2-modules/coverage/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - mock, -}: - -buildPythonPackage rec { - pname = "coverage"; - version = "5.5"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "ebe78fe9a0e874362175b02371bdfbee64d8edc42a044253ddf4ee7d3c15212c"; - }; - - # No tests in archive - doCheck = false; - nativeCheckInputs = [ mock ]; - - meta = { - description = "Code coverage measurement for python"; - homepage = "https://coverage.readthedocs.io/"; - license = lib.licenses.bsd3; - }; -} diff --git a/pkgs/development/python2-modules/filelock/default.nix b/pkgs/development/python2-modules/filelock/default.nix deleted file mode 100644 index 8f6358ffd654..000000000000 --- a/pkgs/development/python2-modules/filelock/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - setuptools-scm, -}: - -buildPythonPackage rec { - pname = "filelock"; - version = "3.2.1"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "1qry67zv2pmz8px6wdfbjqv75nmryy2ac7asqgs6q6db2722kpcw"; - }; - - nativeBuildInputs = [ - setuptools-scm - ]; - - meta = { - homepage = "https://github.com/benediktschmitt/py-filelock"; - description = "Platform independent file lock for Python"; - license = lib.licenses.unlicense; - maintainers = with lib.maintainers; [ henkkalkwater ]; - }; -} diff --git a/pkgs/development/python2-modules/hypothesis/default.nix b/pkgs/development/python2-modules/hypothesis/default.nix deleted file mode 100644 index d2b8c9066f89..000000000000 --- a/pkgs/development/python2-modules/hypothesis/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - attrs, - coverage, - pexpect, - doCheck ? true, - pytest, - pytest-xdist, - flaky, - mock, - sortedcontainers, -}: -buildPythonPackage rec { - # https://hypothesis.readthedocs.org/en/latest/packaging.html - - # Hypothesis has optional dependencies on the following libraries - # pytz fake_factory django numpy pytest - # If you need these, you can just add them to your environment. - - version = "4.57.1"; - format = "setuptools"; - pname = "hypothesis"; - - # Use github tarballs that includes tests - src = fetchFromGitHub { - owner = "HypothesisWorks"; - repo = "hypothesis-python"; - rev = "hypothesis-python-${version}"; - sha256 = "1qcpcrk6892hzyjsdr581pw6i4fj9035nv89mcjrcrzcmycdlfds"; - }; - - postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; - - propagatedBuildInputs = [ - attrs - coverage - sortedcontainers - ]; - - nativeCheckInputs = [ - pytest - pytest-xdist - flaky - mock - pexpect - ]; - inherit doCheck; - - checkPhase = '' - rm tox.ini # This file changes how py.test runs and breaks it - py.test tests/cover - ''; - - meta = { - description = "Python library for property based testing"; - homepage = "https://github.com/HypothesisWorks/hypothesis"; - license = lib.licenses.mpl20; - }; -} diff --git a/pkgs/development/python2-modules/importlib-metadata/default.nix b/pkgs/development/python2-modules/importlib-metadata/default.nix deleted file mode 100644 index 7aaa45854161..000000000000 --- a/pkgs/development/python2-modules/importlib-metadata/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - setuptools-scm, - zipp, - pathlib2, - contextlib2, - configparser, - isPy3k, -}: - -buildPythonPackage rec { - pname = "importlib-metadata"; - version = "2.1.1"; - format = "setuptools"; - - src = fetchPypi { - pname = "importlib_metadata"; - inherit version; - sha256 = "1pdmsmwagimn0lsl4x7sg3skcr2fvzqpv2pjd1rh7yrm5gzrxpmq"; - }; - - nativeBuildInputs = [ setuptools-scm ]; - - propagatedBuildInputs = [ - zipp - ] - ++ lib.optionals (!isPy3k) [ - pathlib2 - contextlib2 - configparser - ]; - - # Cyclic dependencies - doCheck = false; - - pythonImportsCheck = [ "importlib_metadata" ]; - - meta = { - description = "Read metadata from Python packages"; - homepage = "https://importlib-metadata.readthedocs.io/"; - license = lib.licenses.asl20; - }; -} diff --git a/pkgs/development/python2-modules/jinja2/default.nix b/pkgs/development/python2-modules/jinja2/default.nix deleted file mode 100644 index d66b6544e14e..000000000000 --- a/pkgs/development/python2-modules/jinja2/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - stdenv, - buildPythonPackage, - isPy3k, - fetchPypi, - pytest, - markupsafe, - setuptools, -}: - -buildPythonPackage rec { - pname = "Jinja2"; - version = "2.11.3"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6"; - }; - - nativeCheckInputs = [ pytest ]; - propagatedBuildInputs = [ - markupsafe - setuptools - ]; - - # Multiple tests run out of stack space on 32bit systems with python2. - # See https://github.com/pallets/jinja/issues/1158 - # warnings are no longer being filtered correctly for python2 - doCheck = !stdenv.hostPlatform.is32bit && isPy3k; - - checkPhase = '' - pytest -v tests -W ignore::DeprecationWarning - ''; - - meta = { - homepage = "http://jinja.pocoo.org/"; - description = "Stand-alone template engine"; - license = lib.licenses.bsd3; - longDescription = '' - Jinja2 is a template engine written in pure Python. It provides a - Django inspired non-XML syntax but supports inline expressions and - an optional sandboxed environment. - ''; - maintainers = with lib.maintainers; [ pierron ]; - }; -} diff --git a/pkgs/development/python2-modules/markupsafe/default.nix b/pkgs/development/python2-modules/markupsafe/default.nix deleted file mode 100644 index ec6aa8cb600c..000000000000 --- a/pkgs/development/python2-modules/markupsafe/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, -}: - -buildPythonPackage rec { - pname = "MarkupSafe"; - version = "1.1.1"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"; - }; - - meta = { - description = "Implements a XML/HTML/XHTML Markup safe string"; - homepage = "http://dev.pocoo.org"; - license = lib.licenses.bsd3; - maintainers = [ ]; - }; - -} diff --git a/pkgs/development/python2-modules/mock/default.nix b/pkgs/development/python2-modules/mock/default.nix deleted file mode 100644 index 3e100689eb54..000000000000 --- a/pkgs/development/python2-modules/mock/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - isPy27, - funcsigs, - six, - pbr, - unittestCheckHook, - pytest, -}: - -buildPythonPackage rec { - pname = "mock"; - version = "3.0.5"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "83657d894c90d5681d62155c82bda9c1187827525880eda8ff5df4ec813437c3"; - }; - - propagatedBuildInputs = [ - six - pbr - ] - ++ lib.optionals isPy27 [ funcsigs ]; - - # On PyPy for Python 2.7 in particular, Mock's tests have a known failure. - # Mock upstream has a decoration to disable the failing test and make - # everything pass, but it is not yet released. The commit: - # https://github.com/testing-cabal/mock/commit/73bfd51b7185#diff-354f30a63fb0907d4ad57269548329e3L12 - #doCheck = !(python.isPyPy && python.isPy27); - doCheck = false; # Infinite recursion pytest - - nativeCheckInputs = [ - unittestCheckHook - pytest - ]; - - meta = { - description = "Mock objects for Python"; - homepage = "http://python-mock.sourceforge.net/"; - license = lib.licenses.bsd2; - }; - -} diff --git a/pkgs/development/python2-modules/more-itertools/default.nix b/pkgs/development/python2-modules/more-itertools/default.nix deleted file mode 100644 index 783f57e1cfa9..000000000000 --- a/pkgs/development/python2-modules/more-itertools/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - unittestCheckHook, - six, - stdenv, -}: - -buildPythonPackage rec { - pname = "more-itertools"; - version = "5.0.0"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "38a936c0a6d98a38bcc2d03fdaaedaba9f412879461dd2ceff8d37564d6522e4"; - }; - - nativeCheckInputs = [ unittestCheckHook ]; - propagatedBuildInputs = [ six ]; - - # iterable = range(10 ** 10) # Is efficiently reversible - # OverflowError: Python int too large to convert to C long - doCheck = !stdenv.hostPlatform.is32bit; - - meta = { - homepage = "https://more-itertools.readthedocs.org"; - description = "Expansion of the itertools module"; - license = lib.licenses.mit; - }; -} diff --git a/pkgs/development/python2-modules/packaging/default.nix b/pkgs/development/python2-modules/packaging/default.nix deleted file mode 100644 index f5a0f459bd4e..000000000000 --- a/pkgs/development/python2-modules/packaging/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - pyparsing, - six, - pytestCheckHook, - pretend, -}: - -# We keep 20.4 because it uses setuptools instead of flit-core -# which requires Python 3 to build a universal wheel. - -buildPythonPackage rec { - pname = "packaging"; - version = "20.4"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8"; - }; - - propagatedBuildInputs = [ - pyparsing - six - ]; - - nativeCheckInputs = [ - pytestCheckHook - pretend - ]; - - # Prevent circular dependency - doCheck = false; - - meta = { - description = "Core utilities for Python packages"; - homepage = "https://github.com/pypa/packaging"; - license = [ - lib.licenses.bsd2 - lib.licenses.asl20 - ]; - maintainers = with lib.maintainers; [ bennofs ]; - }; -} diff --git a/pkgs/development/python2-modules/pip/default.nix b/pkgs/development/python2-modules/pip/default.nix index 229f34fa1a7a..e0b6b001cb3e 100644 --- a/pkgs/development/python2-modules/pip/default.nix +++ b/pkgs/development/python2-modules/pip/default.nix @@ -3,11 +3,9 @@ buildPythonPackage, bootstrapped-pip, fetchFromGitHub, - mock, scripttest, virtualenv, pretend, - pytest, }: buildPythonPackage rec { @@ -30,12 +28,11 @@ buildPythonPackage rec { pipInstallFlags = [ "--ignore-installed" ]; nativeCheckInputs = [ - mock scripttest virtualenv pretend - pytest ]; + # Pip wants pytest, but tests are not distributed doCheck = false; diff --git a/pkgs/development/python2-modules/pluggy/default.nix b/pkgs/development/python2-modules/pluggy/default.nix deleted file mode 100644 index 968068182188..000000000000 --- a/pkgs/development/python2-modules/pluggy/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - buildPythonPackage, - lib, - fetchPypi, - setuptools-scm, - importlib-metadata, -}: - -buildPythonPackage rec { - pname = "pluggy"; - version = "0.13.1"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"; - }; - - checkPhase = '' - py.test - ''; - - # To prevent infinite recursion with pytest - doCheck = false; - - nativeBuildInputs = [ setuptools-scm ]; - - propagatedBuildInputs = [ importlib-metadata ]; - - meta = { - description = "Plugin and hook calling mechanisms for Python"; - homepage = "https://github.com/pytest-dev/pluggy"; - license = lib.licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python2-modules/pycairo/default.nix b/pkgs/development/python2-modules/pycairo/default.nix deleted file mode 100644 index ed4f1f2e6e21..000000000000 --- a/pkgs/development/python2-modules/pycairo/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ - lib, - fetchFromGitHub, - fetchpatch, - meson, - ninja, - buildPythonPackage, - pytest, - pkg-config, - cairo, - python, -}: - -buildPythonPackage rec { - pname = "pycairo"; - version = "1.18.2"; - - format = "other"; - - src = fetchFromGitHub { - owner = "pygobject"; - repo = "pycairo"; - rev = "v${version}"; - sha256 = "142145a2whvlk92jijrbf3i2bqrzmspwpysj0bfypw0krzi0aa6j"; - }; - - patches = [ - (fetchpatch { - url = "https://github.com/pygobject/pycairo/commit/678edd94d8a6dfb5d51f9c3549e6ee8c90a73744.patch"; - sha256 = "sha256-HmP69tUGYxZvJ/M9FJHwHTCjb9Kf4aWRyMT4wSymrT0="; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - buildInputs = [ - cairo - ]; - - # HACK: Don't use the pytestCheckHook because PYTHONPATH - # will be added by the Python setuptook breaking meson. - checkPhase = '' - ${pytest}/bin/pytest - ''; - - mesonFlags = [ - # This is only used for figuring out what version of Python is in - # use, and related stuff like figuring out what the install prefix - # should be, but it does need to be able to execute Python code. - "-Dpython=${python.pythonOnBuildForHost.interpreter}" - ]; - - meta = { - description = "Python 2 bindings for cairo"; - homepage = "https://pycairo.readthedocs.io/"; - license = with lib.licenses; [ - lgpl21Only - mpl11 - ]; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - }; -} diff --git a/pkgs/development/python2-modules/pygobject/default.nix b/pkgs/development/python2-modules/pygobject/default.nix deleted file mode 100644 index 88a4375b0029..000000000000 --- a/pkgs/development/python2-modules/pygobject/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - fetchpatch, - python, - buildPythonPackage, - pkg-config, - glib, - isPy3k, - pythonAtLeast, -}: - -buildPythonPackage rec { - pname = "pygobject"; - version = "2.28.7"; - format = "other"; - disabled = pythonAtLeast "3.9"; - - src = fetchurl { - url = "mirror://gnome/sources/pygobject/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0nkam61rsn7y3wik3vw46wk5q2cjfh2iph57hl9m39rc8jijb7dv"; - }; - - outputs = [ - "out" - "devdoc" - ]; - - patches = lib.optionals stdenv.hostPlatform.isDarwin [ - ./pygobject-2.0-fix-darwin.patch - (fetchpatch { - url = "https://github.com/macports/macports-ports/raw/f2975d5bbbc2459c661905c5a850cc661fa32f55/python/py-gobject/files/py-gobject-dynamic_lookup-11.patch"; - sha256 = "sha256-mtlyu+La3+iC5iQAmVJzDA5E35XGaRQy/EKXzvrWRCg="; - extraPrefix = ""; - }) - ]; - - configureFlags = [ "--disable-introspection" ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib ]; - - # in a "normal" setup, pygobject and pygtk are installed into the - # same site-packages: we need a pth file for both. pygtk.py would be - # used to select a specific version, in our setup it should have no - # effect, but we leave it in case somebody expects and calls it. - postInstall = lib.optionalString (!isPy3k) '' - mv $out/${python.sitePackages}/{pygtk.pth,${pname}-${version}.pth} - - # Prevent wrapping of codegen files as these are meant to be - # executed by the python program - chmod a-x $out/share/pygobject/*/codegen/*.py - ''; - - meta = { - homepage = "https://pygobject.readthedocs.io/"; - description = "Python bindings for GLib"; - license = lib.licenses.gpl2; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python2-modules/pygobject/pygobject-2.0-fix-darwin.patch b/pkgs/development/python2-modules/pygobject/pygobject-2.0-fix-darwin.patch deleted file mode 100644 index 7fef05262f4d..000000000000 --- a/pkgs/development/python2-modules/pygobject/pygobject-2.0-fix-darwin.patch +++ /dev/null @@ -1,88 +0,0 @@ ---- a/gio/unix-types.defs -+++ b/gio/unix-types.defs -@@ -7,18 +7,6 @@ - (gtype-id "G_TYPE_UNIX_CONNECTION") - ) - --(define-object DesktopAppInfo -- (docstring -- "DesktopAppInfo(desktop_id) -> gio.unix.DesktopAppInfo\n\n" -- "gio.Unix.DesktopAppInfo is an implementation of gio.AppInfo\n" -- "based on desktop files." -- ) -- (in-module "giounix") -- (parent "GObject") -- (c-name "GDesktopAppInfo") -- (gtype-id "G_TYPE_DESKTOP_APP_INFO") --) -- - (define-object FDMessage - (in-module "giounix") - (parent "GSocketControlMessage") ---- a/gio/unix.defs -+++ b/gio/unix.defs -@@ -32,54 +32,6 @@ - - - --;; From gdesktopappinfo.h -- --(define-function desktop_app_info_get_type -- (c-name "g_desktop_app_info_get_type") -- (return-type "GType") --) -- --(define-function desktop_app_info_new_from_filename -- (c-name "g_desktop_app_info_new_from_filename") -- (return-type "GDesktopAppInfo*") -- (parameters -- '("const-char*" "filename") -- ) --) -- --(define-function g_desktop_app_info_new_from_keyfile -- (c-name "g_desktop_app_info_new_from_keyfile") -- (return-type "GDesktopAppInfo*") -- (parameters -- '("GKeyFile*" "key_file") -- ) --) -- --(define-function desktop_app_info_new -- (c-name "g_desktop_app_info_new") -- (is-constructor-of "GDesktopAppInfo") -- (return-type "GDesktopAppInfo*") -- (parameters -- '("const-char*" "desktop_id") -- ) --) -- --(define-method get_is_hidden -- (of-object "GDesktopAppInfo") -- (c-name "g_desktop_app_info_get_is_hidden") -- (return-type "gboolean") --) -- --(define-function desktop_app_info_set_desktop_env -- (c-name "g_desktop_app_info_set_desktop_env") -- (return-type "none") -- (parameters -- '("const-char*" "desktop_env") -- ) --) -- -- -- - ;; From gunixfdmessage.h - - (define-function g_unix_fd_message_get_type ---- a/gio/unix.override -+++ b/gio/unix.override -@@ -24,7 +24,6 @@ - #define NO_IMPORT_PYGOBJECT - #include - #include --#include - #include - #include - #include diff --git a/pkgs/development/python2-modules/pygtk/default.nix b/pkgs/development/python2-modules/pygtk/default.nix deleted file mode 100644 index e5702f908169..000000000000 --- a/pkgs/development/python2-modules/pygtk/default.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - fetchpatch, - python, - pkg-config, - gtk2, - pygobject2, - pycairo, - pango, - buildPythonPackage, - isPy3k, -}: - -buildPythonPackage rec { - pname = "pygtk"; - outputs = [ - "out" - "dev" - ]; - version = "2.24.0"; - format = "other"; - - disabled = isPy3k; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "04k942gn8vl95kwf0qskkv6npclfm31d78ljkrkgyqxxcni1w76d"; - }; - - patches = [ - # https://bugzilla.gnome.org/show_bug.cgi?id=660216 - fixes some memory leaks - (fetchpatch { - url = "https://gitlab.gnome.org/Archive/pygtk/commit/eca72baa5616fbe4dbebea43c7e5940847dc5ab8.diff"; - sha256 = "031px4w5cshcx1sns430sdbr2i007b9zyb2carb3z65nzr77dpdd"; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/Archive/pygtk/commit/4aaa48eb80c6802aec6d03e5695d2a0ff20e0fc2.patch"; - sha256 = "0z8cg7nr3qki8gg8alasdzzyxcihfjlxn518glq5ajglk3q5pzsn"; - }) - ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - pango - ]; - - propagatedBuildInputs = [ - gtk2 - pygobject2 - pycairo - ]; - - configurePhase = "configurePhase"; - - buildPhase = "buildPhase"; - - env.NIX_CFLAGS_COMPILE = - lib.optionalString stdenv.hostPlatform.isDarwin "-ObjC" - + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) " -lpython2.7" - + " -fpermissive"; # downgrade code errors to warnings - - installPhase = "installPhase"; - - checkPhase = '' - sed -i -e "s/glade = importModule('gtk.glade', buildDir)//" \ - tests/common.py - sed -i -e "s/, glade$//" \ - -e "s/.*testGlade.*//" \ - -e "s/.*(glade.*//" \ - tests/test_api.py - '' - + '' - sed -i -e "s/sys.path.insert(0, os.path.join(buildDir, 'gtk'))//" \ - -e "s/sys.path.insert(0, buildDir)//" \ - tests/common.py - make check - ''; - # XXX: TypeError: Unsupported type: - # The check phase was not executed in the previous - # non-buildPythonPackage setup - not sure why not. - doCheck = false; - - postInstall = '' - rm $out/bin/pygtk-codegen-2.0 - ln -s ${pygobject2}/bin/pygobject-codegen-2.0 $out/bin/pygtk-codegen-2.0 - ln -s ${pygobject2}/${python.sitePackages}/pygobject-${pygobject2.version}.pth \ - $out/${python.sitePackages}/${pname}-${version}.pth - ''; - - meta = { - description = "GTK 2 Python bindings"; - homepage = "https://gitlab.gnome.org/Archive/pygtk"; - platforms = lib.platforms.all; - license = with lib.licenses; [ lgpl21Plus ]; - maintainers = with lib.maintainers; [ bryango ]; - }; -} diff --git a/pkgs/development/python2-modules/pyparsing/default.nix b/pkgs/development/python2-modules/pyparsing/default.nix deleted file mode 100644 index 36de6922e72d..000000000000 --- a/pkgs/development/python2-modules/pyparsing/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - buildPythonPackage, - fetchFromGitHub, - lib, - - # since this is a dependency of pytest, we need to avoid - # circular dependencies - jinja2, - railroad-diagrams, -}: - -let - pyparsing = buildPythonPackage rec { - pname = "pyparsing"; - version = "2.4.7"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "pyparsing"; - repo = pname; - rev = "pyparsing_${version}"; - sha256 = "14pfy80q2flgzjcx8jkracvnxxnr59kjzp3kdm5nh232gk1v6g6h"; - }; - - # circular dependencies if enabled by default - doCheck = false; - nativeCheckInputs = [ - jinja2 - railroad-diagrams - ]; - - checkPhase = '' - python -m unittest - ''; - - passthru.tests = { - check = pyparsing.overridePythonAttrs (_: { - doCheck = true; - }); - }; - - meta = { - homepage = "https://github.com/pyparsing/pyparsing"; - description = "Alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions"; - license = lib.licenses.mit; - }; - }; -in -pyparsing diff --git a/pkgs/development/python2-modules/pytest-xdist/default.nix b/pkgs/development/python2-modules/pytest-xdist/default.nix deleted file mode 100644 index 96db76de1488..000000000000 --- a/pkgs/development/python2-modules/pytest-xdist/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - lib, - fetchPypi, - buildPythonPackage, - execnet, - pytest, - setuptools-scm, - pytest-forked, - filelock, - psutil, - six, - isPy3k, -}: - -buildPythonPackage rec { - pname = "pytest-xdist"; - version = "1.34.0"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "1vh4ps32lp5ignch5adbl3pgchvigdfmrl6qpmhxih54wa1qw3il"; - }; - - nativeBuildInputs = [ - setuptools-scm - pytest - ]; - nativeCheckInputs = [ - pytest - filelock - ]; - propagatedBuildInputs = [ - execnet - pytest-forked - psutil - six - ]; - - # Encountered a memory leak - # https://github.com/pytest-dev/pytest-xdist/issues/462 - doCheck = !isPy3k; - - checkPhase = '' - # Excluded tests access file system - py.test testing -k "not test_distribution_rsyncdirs_example \ - and not test_rsync_popen_with_path \ - and not test_popen_rsync_subdir \ - and not test_init_rsync_roots \ - and not test_rsyncignore" - ''; - - meta = { - description = "py.test xdist plugin for distributed testing and loop-on-failing modes"; - homepage = "https://github.com/pytest-dev/pytest-xdist"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/development/python2-modules/pytest/default.nix b/pkgs/development/python2-modules/pytest/default.nix deleted file mode 100644 index 3adb0a7d4aad..000000000000 --- a/pkgs/development/python2-modules/pytest/default.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - attrs, - hypothesis, - py, - setuptools-scm, - setuptools, - six, - pluggy, - funcsigs, - isPy3k, - more-itertools, - atomicwrites, - mock, - writeText, - wcwidth, - packaging, - isPyPy, -}: -buildPythonPackage rec { - version = "4.6.11"; - format = "setuptools"; - pname = "pytest"; - - src = fetchPypi { - inherit pname version; - sha256 = "50fa82392f2120cc3ec2ca0a75ee615be4c479e66669789771f1758332be4353"; - }; - - postPatch = '' - substituteInPlace setup.py \ - --replace "pluggy>=0.12,<1.0" "pluggy>=0.12,<2.0" - ''; - - nativeCheckInputs = [ - hypothesis - mock - ]; - buildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ - attrs - py - setuptools - six - pluggy - more-itertools - atomicwrites - wcwidth - packaging - ] - ++ lib.optionals (!isPy3k) [ funcsigs ]; - - doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460 - checkPhase = '' - runHook preCheck - - # don't test bash builtins - rm testing/test_argcomplete.py - - # determinism - this test writes non deterministic bytecode - rm -rf testing/test_assertrewrite.py - - PYTHONDONTWRITEBYTECODE=1 $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths" - runHook postCheck - ''; - - # Remove .pytest_cache when using py.test in a Nix build - setupHook = writeText "pytest-hook" '' - pytestcachePhase() { - find $out -name .pytest_cache -type d -exec rm -rf {} + - } - - appendToVar preDistPhases pytestcachePhase - - # pytest generates it's own bytecode files to improve assertion messages. - # These files similar to cpython's bytecode files but are never laoded - # by python interpreter directly. We remove them for a few reasons: - # - files are non-deterministic: https://github.com/NixOS/nixpkgs/issues/139292 - # (file headers are generatedt by pytest directly and contain timestamps) - # - files are not needed after tests are finished - pytestRemoveBytecodePhase () { - # suffix is defined at: - # https://github.com/pytest-dev/pytest/blob/4.6.11/src/_pytest/assertion/rewrite.py#L32-L47 - find $out -name "*-PYTEST.py[co]" -delete - } - appendToVar preDistPhases pytestRemoveBytecodePhase - ''; - - meta = { - homepage = "https://docs.pytest.org"; - description = "Framework for writing tests"; - maintainers = with lib.maintainers; [ - lovek323 - madjar - ]; - license = lib.licenses.mit; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/development/python2-modules/wcwidth/default.nix b/pkgs/development/python2-modules/wcwidth/default.nix deleted file mode 100644 index f16622f7a7b0..000000000000 --- a/pkgs/development/python2-modules/wcwidth/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - backports-functools-lru-cache, - wcwidth, - lib, -}: - -wcwidth.overridePythonAttrs (oldAttrs: { - propagatedBuildInputs = oldAttrs.propagatedBuildInputs or [ ] ++ [ - backports-functools-lru-cache - ]; - - /** - As of version 0.2.13 upstream still supports python2. In the future, this - package should be dropped or pinned to the last working version after the - final release for python2. See: - https://github.com/jquast/wcwidth/pull/117#issuecomment-1946609638 - */ - disabled = false; - - meta = oldAttrs.meta // { - /** - maintainers overridden here for python2; this makes sure that python3 - maintainers are not blamed for the breakage here. - */ - maintainers = with lib.maintainers; [ bryango ]; - }; -}) diff --git a/pkgs/development/python2-modules/zipp/default.nix b/pkgs/development/python2-modules/zipp/default.nix deleted file mode 100644 index a08e88cc6d7d..000000000000 --- a/pkgs/development/python2-modules/zipp/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - setuptools-scm, - pytest, - pytest-flake8, - more-itertools, -}: - -buildPythonPackage rec { - pname = "zipp"; - version = "1.0.0"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "0v3qayhqv7vyzydpydwcp51bqciw8p2ajddw68x5k8zppc0vx3yk"; - }; - - nativeBuildInputs = [ setuptools-scm ]; - - propagatedBuildInputs = [ more-itertools ]; - - nativeCheckInputs = [ - pytest - pytest-flake8 - ]; - - checkPhase = '' - pytest - ''; - - # Prevent infinite recursion with pytest - doCheck = false; - - meta = { - description = "Pathlib-compatible object wrapper for zip files"; - homepage = "https://github.com/jaraco/zipp"; - license = lib.licenses.mit; - }; -} diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index 69444502147d..e9b6b2870376 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -12,12 +12,11 @@ git, gnused, nix, - nixfmt, rebar3-nix, }: let - version = "3.25.1"; + version = "3.26.0"; owner = "erlang"; deps = import ./rebar-deps.nix { inherit fetchFromGitHub fetchgit fetchHex; }; rebar3 = stdenv.mkDerivation rec { @@ -30,7 +29,7 @@ let inherit owner; repo = pname; rev = version; - sha256 = "Wpg8MDVwum/cBpwbcY3Cjt2JkuQHEp7wxbZKgyP6crc="; + sha256 = "PDWJFSe8xEUwHcN10PUz6c5EWZLIrKTVqM0xExk9nJs="; }; buildInputs = [ erlang ]; @@ -95,7 +94,6 @@ let git gnused nix - nixfmt (rebar3WithPlugins { globalPlugins = [ rebar3-nix ]; }) ] } @@ -107,7 +105,7 @@ let tmpdir=$(mktemp -d) cp -R $(nix-build $nixpkgs --no-out-link -A rebar3.src)/* "$tmpdir" (cd "$tmpdir" && rebar3 as test nix lock -o "$nix_path/rebar-deps.nix") - nixfmt "$nix_path/rebar-deps.nix" + nix run -f $nixpkgs/ci fmt.pkg "$nix_path/rebar-deps.nix" else echo "rebar3 is already up-to-date" fi diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0c7fe5fe9393..9c7af91e8f69 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -467,6 +467,8 @@ mapAliases { clima = throw "'clima' has been removed, as it has been unmaintained upstream since December 2024, use glow instead"; # Added 2026-01-01 clipbuzz = throw "clipbuzz has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09 cloudlogoffline = throw "cloudlogoffline has been removed"; # Added 2025-05-18 + clucene_core = warnAlias "'clucene_core' has been renamed to 'clucene-core'" clucene-core; # Added 2026-01-12 + clucene_core_2 = warnAlias "'clucene_core_2' has been renamed to 'clucene-core_2'" clucene-core_2; # Added 2026-01-12 cockroachdb-bin = throw "'cockroachdb-bin' has been renamed to/replaced by 'cockroachdb'"; # Converted to throw 2025-10-27 code-browser-gtk2 = throw "'code-browser-gtk2' has been removed, as it was broken since 22.11"; # Added 2025-08-22 code-browser-gtk = throw "'code-browser-gtk' has been removed, as it was broken since 22.11"; # Added 2025-08-22 @@ -586,6 +588,7 @@ mapAliases { EmptyEpsilon = throw "'EmptyEpsilon' has been renamed to/replaced by 'empty-epsilon'"; # Converted to throw 2025-10-27 emulationstation = throw "emulationstation was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 emulationstation-de = throw "emulationstation-de was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 + enchant2 = warnAlias "'enchant2' has been renamed to 'enchant_2'" enchant_2; # Added 2026-01-14 enyo-doom = throw "'enyo-doom' has been renamed to/replaced by 'enyo-launcher'"; # Converted to throw 2025-10-27 epapirus-icon-theme = throw "'epapirus-icon-theme' has been removed because 'papirus-icon-theme' no longer supports building with elementaryOS icon support"; # Added 2025-06-15 eris-go = throw "'eris-go' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01 @@ -628,6 +631,10 @@ mapAliases { floorp = throw "floorp has been replaced with floorp-bin, as building from upstream sources has become unfeasible starting with version 12.x"; # Added 2025-09-06 floorp-unwrapped = throw "floorp-unwrapped has been replaced with floorp-bin-unwrapped, as building from upstream sources has become unfeasible starting with version 12.x"; # Added 2025-09-06 flow-editor = throw "'flow-editor' has been renamed to/replaced by 'flow-control'"; # Converted to throw 2025-10-27 + fltk13 = warnAlias "'fltk13' has been renamed to 'fltk_1_3'" fltk_1_3; # Added 2026-01-14 + fltk13-minimal = warnAlias "'fltk13-minimal' has been renamed to 'fltk_1_3-minimal'" fltk_1_3-minimal; # Added 2026-01-14 + fltk14 = warnAlias "'fltk14' has been renamed to 'fltk_1_4'" fltk_1_4; # Added 2026-01-14 + fltk14-minimal = warnAlias "'fltk14-minimal' has been renamed to 'fltk_1_4-minimal'" fltk_1_4-minimal; # Added 2026-01-14 flut-renamer = throw "flut-renamer is unmaintained and has been removed"; # Added 2025-08-26 flutter324 = throw "flutter324 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2025-10-28 flutter326 = throw "flutter326 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2025-06-08 @@ -693,6 +700,7 @@ mapAliases { gjay = throw "'gjay' has been removed as it is unmaintained upstream"; # Added 2025-05-25 glabels = throw "'glabels' has been removed because it is no longer maintained. Consider using 'glabels-qt', which is an active fork."; # Added 2025-09-16 glaxnimate = kdePackages.glaxnimate; # Added 2025-09-17 + glew110 = warnAlias "'glew110' has been renamed to 'glew_1_10'" glew_1_10; # Added 2026-01-14 glew-egl = throw "'glew-egl' has been renamed to/replaced by 'glew'"; # Converted to throw 2025-10-27 glfw-wayland = throw "'glfw-wayland' has been renamed to/replaced by 'glfw'"; # Converted to throw 2025-10-27 glfw-wayland-minecraft = throw "'glfw-wayland-minecraft' has been renamed to/replaced by 'glfw3-minecraft'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41a9795c3876..eb7c50937ce3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1632,9 +1632,7 @@ with pkgs; asmrepl = callPackage ../development/interpreters/asmrepl { }; - avahi = callPackage ../development/libraries/avahi { }; - - avahi-compat = callPackage ../development/libraries/avahi { + avahi-compat = callPackage ../by-name/av/avahi/package.nix { withLibdnssdCompat = true; }; @@ -1719,13 +1717,6 @@ with pkgs; ''; }); - capstone = callPackage ../development/libraries/capstone { }; - capstone_4 = callPackage ../development/libraries/capstone/4.nix { }; - - ceres-solver = callPackage ../development/libraries/ceres-solver { - gflags = null; # only required for examples/tests - }; - cedille = callPackage ../applications/science/logic/cedille { inherit (haskellPackages) alex @@ -2562,10 +2553,6 @@ with pkgs; inherit (darwin) autoSignDarwinBinariesHook; }; - fox = callPackage ../development/libraries/fox { }; - - fox_1_6 = callPackage ../development/libraries/fox/fox-1.6.nix { }; - fpm = callPackage ../tools/package-management/fpm { }; ferdium = callPackage ../applications/networking/instant-messengers/ferdium { @@ -3593,13 +3580,7 @@ with pkgs; rocket = libsForQt5.callPackage ../tools/graphics/rocket { }; - rtaudio = callPackage ../development/libraries/audio/rtaudio { - jack = libjack2; - }; - - rtmidi = callPackage ../development/libraries/audio/rtmidi { - jack = libjack2; - }; + rtaudio = rtaudio_5; mpi = openmpi; # this attribute should used to build MPI applications openmodelica = recurseIntoAttrs (callPackage ../applications/science/misc/openmodelica { }); @@ -6577,10 +6558,6 @@ with pkgs; acl = callPackage ../development/libraries/acl { }; - agg = callPackage ../development/libraries/agg { - stdenv = gccStdenv; - }; - allegro = allegro4; allegro4 = callPackage ../development/libraries/allegro { }; allegro5 = callPackage ../development/libraries/allegro/5.nix { }; @@ -6640,25 +6617,12 @@ with pkgs; botanEsdm = botan3.override { withEsdm = true; }; - c-ares = callPackage ../development/libraries/c-ares { }; - - c-aresMinimal = callPackage ../development/libraries/c-ares { - withCMake = false; - }; - - inherit (callPackages ../development/libraries/c-blosc { }) - c-blosc - c-blosc2 - ; + c-aresMinimal = callPackage ../by-name/c-/c-ares/package.nix { withCMake = false; }; niv = lib.getBin (haskell.lib.compose.justStaticExecutables haskellPackages.niv); ormolu = lib.getBin (haskell.lib.compose.justStaticExecutables haskellPackages.ormolu); - cctag = callPackage ../development/libraries/cctag { - stdenv = clangStdenv; - }; - ceedling = callPackage ../development/tools/ceedling { }; celt = callPackage ../development/libraries/celt { }; @@ -6677,9 +6641,7 @@ with pkgs; ] ); - clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { }; - - clucene_core = clucene_core_2; + clucene-core = clucene-core_2; codecserver = callPackage ../applications/audio/codecserver { protobuf = protobuf_21; @@ -6711,14 +6673,6 @@ with pkgs; db60 = callPackage ../development/libraries/db/db-6.0.nix { }; db62 = callPackage ../development/libraries/db/db-6.2.nix { }; - dbus = callPackage ../development/libraries/dbus { }; - - makeDBusConf = callPackage ../development/libraries/dbus/make-dbus-conf.nix { }; - - draco = callPackage ../development/libraries/draco { - tinygltf = callPackage ../development/libraries/draco/tinygltf.nix { }; - }; - # Multi-arch "drivers" which we want to build for i686. driversi686Linux = recurseIntoAttrs { inherit (pkgsi686Linux) @@ -6732,15 +6686,9 @@ with pkgs; ; }; - eccodes = callPackage ../development/libraries/eccodes { - pythonPackages = python3Packages; - stdenv = if stdenv.hostPlatform.isDarwin then gccStdenv else stdenv; - }; - vapoursynth-editor = libsForQt5.callPackage ../by-name/va/vapoursynth/editor.nix { }; - enchant2 = callPackage ../development/libraries/enchant/2.x.nix { }; - enchant = enchant2; + enchant = enchant_2; factorPackages-0_99 = callPackage ./factor-packages.nix { factor-unwrapped = callPackage ../development/compilers/factor-lang/0.99.nix { }; @@ -6762,17 +6710,6 @@ with pkgs; factor-lang-0_101 = factorPackages-0_101.factor-lang; factor-lang = factor-lang-0_101; - farstream = callPackage ../development/libraries/farstream { - inherit (gst_all_1) - gstreamer - gst-plugins-base - gst-plugins-good - gst-plugins-bad - gst-libav - ; - autoreconfHook = buildPackages.autoreconfHook269; - }; - inherit (callPackage ../development/libraries/ffmpeg { }) ffmpeg_4 ffmpeg_4-headless @@ -6801,23 +6738,21 @@ with pkgs; }; fftwMpi = fftw.override { enableMpi = true; }; - fltk13 = callPackage ../development/libraries/fltk { }; - fltk14 = callPackage ../development/libraries/fltk/1.4.nix { }; - fltk13-minimal = fltk13.override { + fltk_1_3-minimal = fltk_1_3.override { withGL = false; withCairo = false; withExamples = false; withDocs = false; }; - fltk14-minimal = fltk14.override { + fltk_1_4-minimal = fltk_1_4.override { withGL = false; withCairo = false; withPango = false; withExamples = false; withDocs = false; }; - fltk = fltk13; - fltk-minimal = fltk13-minimal; + fltk = fltk_1_3; + fltk-minimal = fltk_1_3-minimal; inherit (callPackages ../development/libraries/fmt { }) fmt_9 @@ -6828,9 +6763,6 @@ with pkgs; fmt = fmt_12; - fplll = callPackage ../development/libraries/fplll { }; - fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix { }; - freeipa = callPackage ../os-specific/linux/freeipa { # NOTE: freeipa and sssd need to be built with the same version of python kerberos = krb5.override { @@ -6848,53 +6780,32 @@ with pkgs; makeFontsCache = callPackage ../development/libraries/fontconfig/make-fonts-cache.nix { }; - gamenetworkingsockets = callPackage ../development/libraries/gamenetworkingsockets { - protobuf = protobuf_21; - }; - gamt = callPackage ../by-name/am/amtterm/package.nix { withGamt = true; }; - gcr = callPackage ../development/libraries/gcr { }; - - gcr_4 = callPackage ../development/libraries/gcr/4.nix { }; - gecode_3 = callPackage ../development/libraries/gecode/3.nix { }; gecode_6 = qt5.callPackage ../development/libraries/gecode { }; gecode = gecode_6; - gegl = callPackage ../development/libraries/gegl { - openexr = openexr_2; - }; - geoclue2-with-demo-agent = geoclue2.override { withDemoAgent = true; }; - geoipWithDatabase = makeOverridable (callPackage ../development/libraries/geoip) { + geoipWithDatabase = makeOverridable (callPackage ../by-name/ge/geoip/package.nix) { drvName = "geoip-tools"; geoipDatabase = geolite-legacy; }; - geoip = callPackage ../development/libraries/geoip { }; - gettext = callPackage ../development/libraries/gettext { }; gdalMinimal = gdal.override { useMinimalFeatures = true; }; - gdcm = callPackage ../development/libraries/gdcm { - inherit (darwin) DarwinTools; - }; - ghp-import = with python3Packages; toPythonApplication ghp-import; ghcid = haskellPackages.ghcid.bin; graphia = qt6Packages.callPackage ../applications/science/misc/graphia { }; - glew = callPackage ../development/libraries/glew { }; - glew110 = callPackage ../development/libraries/glew/1.10.nix { }; glfw = glfw3; - glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; glfw3-minecraft = callPackage ../by-name/gl/glfw3/package.nix { withMinecraftPatch = true; @@ -7059,11 +6970,6 @@ with pkgs; gst_all_1 = recurseIntoAttrs (callPackage ../development/libraries/gstreamer { }); - gnutls = callPackage ../development/libraries/gnutls { - util-linux = util-linuxMinimal; # break the cyclic dependency - autoconf = buildPackages.autoconf269; - }; - grantlee = libsForQt5.callPackage ../development/libraries/grantlee { }; glib = callPackage ../by-name/gl/glib/package.nix ( @@ -7079,33 +6985,17 @@ with pkgs; } ); - glibmm = callPackage ../development/libraries/glibmm { }; - - glibmm_2_68 = callPackage ../development/libraries/glibmm/2.68.nix { }; - glirc = haskell.lib.compose.justStaticExecutables haskellPackages.glirc; # Not moved to aliases while we decide if we should split the package again. atk = at-spi2-core; - atkmm = callPackage ../development/libraries/atkmm { }; - - atkmm_2_36 = callPackage ../development/libraries/atkmm/2.36.nix { }; - - cairomm = callPackage ../development/libraries/cairomm { }; - - cairomm_1_16 = callPackage ../development/libraries/cairomm/1.16.nix { }; - pangomm = callPackage ../development/libraries/pangomm { }; pangomm_2_48 = callPackage ../development/libraries/pangomm/2.48.nix { }; pangomm_2_42 = callPackage ../development/libraries/pangomm/2.42.nix { }; - gdk-pixbuf = callPackage ../development/libraries/gdk-pixbuf { }; - - gdk-pixbuf-xlib = callPackage ../development/libraries/gdk-pixbuf/xlib.nix { }; - gtk2 = callPackage ../development/libraries/gtk/2.x.nix { }; gtk2-x11 = gtk2.override { @@ -7992,9 +7882,6 @@ with pkgs; protobuf_21 ; - flatbuffers = callPackage ../development/libraries/flatbuffers { }; - flatbuffers_23 = callPackage ../development/libraries/flatbuffers/23.nix { }; - nanopbMalloc = callPackage ../by-name/na/nanopb/package.nix { enableMalloc = true; }; pth = if stdenv.hostPlatform.isMusl then npth else gnupth; @@ -8809,8 +8696,6 @@ with pkgs; }; cassandra = cassandra_4; - cassandra-cpp-driver = callPackage ../development/libraries/cassandra-cpp-driver/default.nix { }; - apache-jena = callPackage ../servers/nosql/apache-jena/binary.nix { java = jre; }; @@ -10088,10 +9973,6 @@ with pkgs; # lohit-fonts.kashmiri lohit-fonts.konkani lohit-fonts.maithili lohit-fonts.sindhi lohit-fonts = recurseIntoAttrs (callPackages ../data/fonts/lohit-fonts { }); - marwaita-icons = callPackage ../by-name/ma/marwaita-icons/package.nix { - inherit (kdePackages) breeze-icons; - }; - mplus-outline-fonts = recurseIntoAttrs (callPackage ../data/fonts/mplus-outline-fonts { }); noto-fonts-cjk-serif-static = callPackage ../by-name/no/noto-fonts-cjk-serif/package.nix { @@ -11626,7 +11507,7 @@ with pkgs; }; rakarrack = callPackage ../applications/audio/rakarrack { - fltk = fltk13; + fltk = fltk_1_3; }; rawtherapee = callPackage ../applications/graphics/rawtherapee { @@ -12071,7 +11952,7 @@ with pkgs; ); virtualglLib = callPackage ../tools/X11/virtualgl/lib.nix { - fltk = fltk13; + fltk = fltk_1_3; }; virtualgl = callPackage ../tools/X11/virtualgl { @@ -13906,7 +13787,7 @@ with pkgs; yaziPlugins = recurseIntoAttrs (callPackage ../by-name/ya/yazi/plugins { }); dillo = callPackage ../by-name/di/dillo/package.nix { - fltk = fltk13; + fltk = fltk_1_3; }; libkazv = callPackage ../by-name/li/libkazv/package.nix { diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index bd805eef0f1b..b11347318543 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -11,7 +11,7 @@ bzip2, curl, cyrus_sasl, - enchant2, + enchant, freetds, gd, gettext, @@ -450,7 +450,7 @@ lib.makeScope pkgs.newScope ( } { name = "enchant"; - buildInputs = [ enchant2 ]; + buildInputs = [ enchant ]; configureFlags = [ "--with-enchant" ]; doCheck = false; } diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index f633a7ecc96b..bbecf82f65b8 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -74,6 +74,7 @@ mapAliases { atsim_potentials = throw "'atsim_potentials' has been renamed to/replaced by 'atsim-potentials'"; # Converted to throw 2025-10-29 autotrash = throw "'autotrash' has been renamed to/replaced by 'super.pkgs.autotrash'"; # Converted to throw 2025-10-29 Babel = throw "'Babel' has been renamed to/replaced by 'babel'"; # Converted to throw 2025-10-29 + backports-functools-lru-cache = throw "'backports-functools-lru-cache' has been removed from nixpkgs as it was not longer used in python2"; # Added 2026-01-14 backports_shutil_get_terminal_size = throw "'backports_shutil_get_terminal_size' has been renamed to/replaced by 'backports-shutil-get-terminal-size'"; # Converted to throw 2025-10-29 basewood-av = throw "'basewood-av' has been removed due to being archived upstream and unused"; # added 2025-11-26 bash_kernel = throw "'bash_kernel' has been renamed to/replaced by 'bash-kernel'"; # Converted to throw 2025-10-29 @@ -340,6 +341,7 @@ mapAliases { pygame_sdl2 = throw "'pygame_sdl2' has been renamed to/replaced by 'pygame-sdl2'"; # Converted to throw 2025-10-29 PyGithub = throw "'PyGithub' has been renamed to/replaced by 'pygithub'"; # Converted to throw 2025-10-29 pygls_2 = pygls; # added 2026-01-05 + pygtk = throw "pygtk has been removed because it was not supported by python3"; # Added 2026-01-14 pyheif = throw "pyheif has been removed due to lack of upstream maintenance and breakage. Use `pillow-heif` instead."; # added 2025-09-17 pyhiveapi = throw "'pyhiveapi' has been renamed to/replaced by 'pyhive-integration'"; # Converted to throw 2025-10-29 pyialarmxr = throw "'pyialarmxr' has been renamed to/replaced by 'pyialarmxr-homeassistant'"; # Converted to throw 2025-10-29 @@ -352,6 +354,7 @@ mapAliases { pymicro-vad = throw "'pymicro-vad' was removed because Home Assistant switched to 'pysilero-vad'"; # added 2026-01-08 PyMVGLive = throw "'PyMVGLive' has been renamed to/replaced by 'pymvglive'"; # Converted to throw 2025-10-29 pymyq = throw "'pymyq' has been renamed to/replaced by 'python-myq'"; # Converted to throw 2025-10-29 + pyobject = throw "'pyobject' has been removed because it was only supporting python 2"; # Added 2026-01-24 pyownet = throw "pyownet was removed because Home Assistant switched to aio-ownet"; # added 2025-10-31 pypcap = throw "pypcap has been removed because it is broken and unmaintained upstream."; # added 2025-06-18 pyqldb = throw "pyqldb has been removed, because the underlying service is reaching end of support"; # added 2025-07-30 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7636e0c9a163..afeba3265b94 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4775,7 +4775,7 @@ self: super: with self; { eccodes = toPythonModule ( pkgs.eccodes.override { enablePython = true; - pythonPackages = self; + python3Packages = self; } ); @@ -13377,7 +13377,7 @@ self: super: with self; { pyemvue = callPackage ../development/python-modules/pyemvue { }; - pyenchant = callPackage ../development/python-modules/pyenchant { inherit (pkgs) enchant2; }; + pyenchant = callPackage ../development/python-modules/pyenchant { inherit (pkgs) enchant_2; }; pyenphase = callPackage ../development/python-modules/pyenphase { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index ebfdbb802acb..ab674985fe11 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -7,66 +7,49 @@ self: super: with self; with super; { - attrs = callPackage ../development/python2-modules/attrs { }; - - backports-functools-lru-cache = - callPackage ../development/python2-modules/backports-functools-lru-cache - { }; + attrs = disabled super.attrs; bootstrapped-pip = toPythonModule (callPackage ../development/python2-modules/bootstrapped-pip { }); - cffi = callPackage ../development/python2-modules/cffi { inherit cffi; }; + cffi = disabed super.cffi; - configparser = callPackage ../development/python2-modules/configparser { }; + configparser = disabled super.configparser; - contextlib2 = callPackage ../development/python2-modules/contextlib2 { }; + contextlib2 = disabled super.contextlib2; - coverage = callPackage ../development/python2-modules/coverage { }; + coverage = disabled super.coverage; - filelock = callPackage ../development/python2-modules/filelock { }; + filelock = disabled super.filelock; - hypothesis = callPackage ../development/python2-modules/hypothesis { }; + hypothesis = disabled super.hypothesis; - importlib-metadata = callPackage ../development/python2-modules/importlib-metadata { }; + importlib-metadata = disabled super.importlib-metadata; - jinja2 = callPackage ../development/python2-modules/jinja2 { }; + jinja2 = disabled super.jinja2; - markupsafe = callPackage ../development/python2-modules/markupsafe { }; + markupsafe = disabled super.markupsafe; - mock = callPackage ../development/python2-modules/mock { }; + mock = disabled super.mock; - more-itertools = callPackage ../development/python2-modules/more-itertools { }; + more-itertools = disabled super.more-itertools; - # ninja python stub was created to help simplify python builds using PyPA's - # build tool in Python 3, but it does not yet support Python 2 - ninja = pkgs.buildPackages.ninja; + ninja = disabled super.ninja; - packaging = callPackage ../development/python2-modules/packaging { }; + packaging = disabled super.packaging; pip = callPackage ../development/python2-modules/pip { }; - pluggy = callPackage ../development/python2-modules/pluggy { }; + pluggy = disabled super.pluggy; - pycairo = callPackage ../development/python2-modules/pycairo { - inherit (pkgs.buildPackages) meson; - }; + pycairo = disabled super.pycairo; - pygobject2 = callPackage ../development/python2-modules/pygobject { }; + pyparsing = disabled super.pyparsing; - pygtk = callPackage ../development/python2-modules/pygtk { }; + pytest = disabled super.pytest; - pyparsing = callPackage ../development/python2-modules/pyparsing { }; + pytest_4 = disabled super.pytest; - pytest = pytest_4; - - pytest_4 = callPackage ../development/python2-modules/pytest { - # hypothesis tests require pytest that causes dependency cycle - hypothesis = self.hypothesis.override { - doCheck = false; - }; - }; - - pytest-xdist = callPackage ../development/python2-modules/pytest-xdist { }; + pytest-xdist = disabled super.pytest-xdist; recoll = disabled super.recoll; @@ -76,18 +59,13 @@ with super; setuptools = callPackage ../development/python2-modules/setuptools { }; - six = super.six.overridePythonAttrs (_: { - doCheck = false; # circular dependency with pytest - }); + six = disabled super.six; - wcwidth = callPackage ../development/python2-modules/wcwidth { - inherit wcwidth; - }; + wcwidth = disabled super.wcwitch; wheel = callPackage ../development/python2-modules/wheel { }; zeek = disabled super.zeek; - zipp = callPackage ../development/python2-modules/zipp { }; - + zipp = disabled super.zipp; }