diff --git a/ci/OWNERS b/ci/OWNERS index e2153236ced0..2d1a46e2ccff 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -41,7 +41,7 @@ /lib/meta.nix @alyssais @NixOS/stdenv @llakala /lib/meta-types.nix @infinisil @adisbladis @NixOS/stdenv @llakala /lib/source-types.nix @alyssais @NixOS/stdenv @llakala -/lib/systems @alyssais @NixOS/stdenv @llakala +/lib/systems @alyssais @NixOS/stdenv ## Libraries / Module system /lib/modules.nix @infinisil @roberth @hsjobeki @llakala /lib/types.nix @infinisil @roberth @hsjobeki @llakala @@ -260,7 +260,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /pkgs/applications/editors/jetbrains @leona-ya @theCapypara # Licenses -/lib/licenses @alyssais @emilazy @jopejoe1 @llakala +/lib/licenses @alyssais @emilazy @jopejoe1 # Qt /pkgs/development/libraries/qt-5 @K900 @NickCao @SuperSandro2000 diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index 67686422c0ee..481987f089a1 100644 --- a/doc/release-notes/rl-2611.section.md +++ b/doc/release-notes/rl-2611.section.md @@ -49,6 +49,8 @@ - `mcphost` has been removed, as it was archived upstream and declared unmaintained. +- `fflogs` has been removed because it was no longer functional. Users should switch to `archon-lite`. + - `services.mysql` now sets `root@localhost` authentication to `auth_socket` when used with `mysql` or `percona-server`. Existing deployments will also be adjusted if possible. See the [security advisory GHSA-6qxx-6rg8-c4p8](https://github.com/NixOS/nixpkgs/security/advisories/GHSA-6qxx-6rg8-c4p8) for more information. diff --git a/lib/licenses/licenses.nix b/lib/licenses/licenses.nix index faaf92e6a68e..dfd69622939a 100644 --- a/lib/licenses/licenses.nix +++ b/lib/licenses/licenses.nix @@ -310,6 +310,11 @@ lib.mapAttrs mkLicense ( redistributable = true; }; + buddy = { + spdxId = "Buddy"; + fullName = "Buddy License"; + }; + bzip2 = { spdxId = "bzip2-1.0.6"; fullName = "bzip2 and libbzip2 License v1.0.6"; @@ -1611,6 +1616,11 @@ lib.mapAttrs mkLicense ( url = "https://fedoraproject.org/wiki/Licensing:Wadalab?rd=Licensing/Wadalab"; }; + wordnet = { + spdxId = "WordNet"; + fullName = "WordNet License"; + }; + wtfpl = { spdxId = "WTFPL"; fullName = "Do What The F*ck You Want To Public License"; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 16fe945d61c9..419d89fb76be 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9107,6 +9107,12 @@ githubId = 41450706; name = "fin-w"; }; + fiona = { + email = "mail@fiona.hamburg"; + github = "Fiona42069"; + githubId = 260108682; + name = "fiona"; + }; fionera = { email = "nix@fionera.de"; github = "fionera"; @@ -25962,6 +25968,12 @@ name = "Nikolay Korotkiy"; keys = [ { fingerprint = "ADF4 C13D 0E36 1240 BD01 9B51 D1DE 6D7F 6936 63A5"; } ]; }; + silicalet = { + name = "Mr. why"; + email = "silicalet@outlook.com"; + github = "silicalet"; + githubId = 188071249; + }; silky = { name = "Noon van der Silk"; email = "noonsilk+nixpkgs@gmail.com"; diff --git a/nixos/modules/services/networking/networkd-dispatcher.nix b/nixos/modules/services/networking/networkd-dispatcher.nix index adc948104da3..e2f766463e38 100644 --- a/nixos/modules/services/networking/networkd-dispatcher.nix +++ b/nixos/modules/services/networking/networkd-dispatcher.nix @@ -93,8 +93,8 @@ in config = mkIf cfg.enable { - warnings = mkIf (!config.networking.useNetworkd) [ - "services.networkd-dispatcher will not execute any scripts unless networking.useNetworkd is enabled." + warnings = mkIf (!config.systemd.network.enable) [ + "services.networkd-dispatcher will not execute any scripts unless networkd is enabled, either via `systemd.network.enable` or via `networking.useNetworkd`." ]; systemd = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix index b1a6b0e4fd70..1115f32c61d0 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix @@ -47,7 +47,6 @@ melpaBuild (finalAttrs: { platforms = [ "aarch64-darwin" "aarch64-linux" - "x86_64-darwin" "x86_64-linux" "x86_64-windows" ]; diff --git a/pkgs/applications/editors/jetbrains/ides/clion.nix b/pkgs/applications/editors/jetbrains/ides/clion.nix index 063d2c752ad2..547e4878df21 100644 --- a/pkgs/applications/editors/jetbrains/ides/clion.nix +++ b/pkgs/applications/editors/jetbrains/ides/clion.nix @@ -28,10 +28,6 @@ let url = "https://download.jetbrains.com/cpp/CLion-2026.1.4-aarch64.tar.gz"; hash = "sha256-I6IKQng4lNtRlQIq08K5bueqgKI/q1awX4EuRnyAnOk="; }; - x86_64-darwin = { - url = "https://download.jetbrains.com/cpp/CLion-2026.1.4.dmg"; - hash = "sha256-AJt+K1zv4eyjdzubUeFGwB9mqzvOeb3ffA2k0MajPBs="; - }; aarch64-darwin = { url = "https://download.jetbrains.com/cpp/CLion-2026.1.4-aarch64.dmg"; hash = "sha256-i3stX7dyRgSOJkFTMD9/hkw6e2mGNqn13S7X/vJ66RQ="; diff --git a/pkgs/applications/editors/jetbrains/ides/datagrip.nix b/pkgs/applications/editors/jetbrains/ides/datagrip.nix index dfe4ed7f7d3f..81c7b8d92a09 100644 --- a/pkgs/applications/editors/jetbrains/ides/datagrip.nix +++ b/pkgs/applications/editors/jetbrains/ides/datagrip.nix @@ -19,10 +19,6 @@ let url = "https://download.jetbrains.com/datagrip/datagrip-2026.1.3-aarch64.tar.gz"; hash = "sha256-G+tinD/+qM5HVR4u2E0cNXtdVsbwgK8/PdZ3ic6hf4M="; }; - x86_64-darwin = { - url = "https://download.jetbrains.com/datagrip/datagrip-2026.1.3.dmg"; - hash = "sha256-vW2LEonl0D9S0VxbeJX4jRrwhELGBwlOXwiHslvh06E="; - }; aarch64-darwin = { url = "https://download.jetbrains.com/datagrip/datagrip-2026.1.3-aarch64.dmg"; hash = "sha256-Kyt3fYPXzwTVxPFVKd+atiHWb/i7gjGahz1MJ4iXxy8="; diff --git a/pkgs/applications/editors/jetbrains/ides/dataspell.nix b/pkgs/applications/editors/jetbrains/ides/dataspell.nix index 18dd09b48cf9..a9435844c443 100644 --- a/pkgs/applications/editors/jetbrains/ides/dataspell.nix +++ b/pkgs/applications/editors/jetbrains/ides/dataspell.nix @@ -21,10 +21,6 @@ let url = "https://download.jetbrains.com/python/dataspell-2026.1.2-aarch64.tar.gz"; hash = "sha256-SSmIPF0pDMolxeXL21UaHMbZdtYbChWVxTKZOsPhH+I="; }; - x86_64-darwin = { - url = "https://download.jetbrains.com/python/dataspell-2026.1.2.dmg"; - hash = "sha256-2qzwzGMYuy1qEuTprxwNa5gOPgCZq2MadSKN8FT8w8c="; - }; aarch64-darwin = { url = "https://download.jetbrains.com/python/dataspell-2026.1.2-aarch64.dmg"; hash = "sha256-MGWufS0nlswdqhACNQWtlXJwfPiYw8wUx7olIxPS15k="; diff --git a/pkgs/applications/editors/jetbrains/ides/gateway.nix b/pkgs/applications/editors/jetbrains/ides/gateway.nix index 56370da57946..28f722fed168 100644 --- a/pkgs/applications/editors/jetbrains/ides/gateway.nix +++ b/pkgs/applications/editors/jetbrains/ides/gateway.nix @@ -19,10 +19,6 @@ let url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.3-aarch64.tar.gz"; hash = "sha256-CSe04BBo4jS1cIhu4NfZqaSHMaNue2eFUPa+1gOxuoo="; }; - x86_64-darwin = { - url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.3.dmg"; - hash = "sha256-WKwIP19y5EKO98JgEm468ofaRp/JO5z8lqNhtpsH4tY="; - }; aarch64-darwin = { url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.3-aarch64.dmg"; hash = "sha256-AHY/lY0ARkW0VoSgy0t7LLNXA965PLooWBSWxBKBV5M="; diff --git a/pkgs/applications/editors/jetbrains/ides/goland.nix b/pkgs/applications/editors/jetbrains/ides/goland.nix index 692e2ba49fc8..b19fd343d896 100644 --- a/pkgs/applications/editors/jetbrains/ides/goland.nix +++ b/pkgs/applications/editors/jetbrains/ides/goland.nix @@ -19,10 +19,6 @@ let url = "https://download.jetbrains.com/go/goland-2026.1.4-aarch64.tar.gz"; hash = "sha256-7s98kY08aKjdRGQLDkffeVhgj1FWurLmTTYmtb5Qx6c="; }; - x86_64-darwin = { - url = "https://download.jetbrains.com/go/goland-2026.1.4.dmg"; - hash = "sha256-RbvcLpLVyeL4B1DJ2/9Ub/6Cz6fJGXMPCHsJ705GsAo="; - }; aarch64-darwin = { url = "https://download.jetbrains.com/go/goland-2026.1.4-aarch64.dmg"; hash = "sha256-y7mEke0z0MvQs+kMtrmrq7EeAtJUbgo6sGZrOB0MraM="; diff --git a/pkgs/applications/editors/jetbrains/ides/idea.nix b/pkgs/applications/editors/jetbrains/ides/idea.nix index e77c6a800f61..3367506afa51 100644 --- a/pkgs/applications/editors/jetbrains/ides/idea.nix +++ b/pkgs/applications/editors/jetbrains/ides/idea.nix @@ -22,10 +22,6 @@ let url = "https://download.jetbrains.com/idea/ideaIU-2026.1.4-aarch64.tar.gz"; hash = "sha256-MDZFuLrUxcCIc0Zhi4QhgKPeU7Pgs9oJ/FxQH1n3gBM="; }; - x86_64-darwin = { - url = "https://download.jetbrains.com/idea/ideaIU-2026.1.4.dmg"; - hash = "sha256-8K+LiewiINP4S9eqV0kGWtfy2Ff/zvBwX89iX7mYZ78="; - }; aarch64-darwin = { url = "https://download.jetbrains.com/idea/ideaIU-2026.1.4-aarch64.dmg"; hash = "sha256-XIBK/+Lxaz9dX+Lxl7HXsl+Z3Z7GBzSuDxNssb/4A2s="; diff --git a/pkgs/applications/editors/jetbrains/ides/mps.nix b/pkgs/applications/editors/jetbrains/ides/mps.nix index 52e18be29bcd..691bd0f94179 100644 --- a/pkgs/applications/editors/jetbrains/ides/mps.nix +++ b/pkgs/applications/editors/jetbrains/ides/mps.nix @@ -19,10 +19,6 @@ let url = "https://download.jetbrains.com/mps/2025.3/MPS-2025.3.tar.gz"; hash = "sha256-xAI+UrTheCTWHSdoI4YZvhTlrlc121M+OVFkfzd7a3k="; }; - x86_64-darwin = { - url = "https://download.jetbrains.com/mps/2025.3/MPS-2025.3-macos.dmg"; - hash = "sha256-whYAjKkF79mrknHflZnvOOy2bLosYUguelZDSuPt3uY="; - }; aarch64-darwin = { url = "https://download.jetbrains.com/mps/2025.3/MPS-2025.3-macos-aarch64.dmg"; hash = "sha256-3HnEHOhRRI9IYjBhc5FO7h5j4jBBDtZTVkmO/S1fBEQ="; diff --git a/pkgs/applications/editors/jetbrains/ides/phpstorm.nix b/pkgs/applications/editors/jetbrains/ides/phpstorm.nix index be56d33d23bc..b76837caa81b 100644 --- a/pkgs/applications/editors/jetbrains/ides/phpstorm.nix +++ b/pkgs/applications/editors/jetbrains/ides/phpstorm.nix @@ -19,10 +19,6 @@ let url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.4-aarch64.tar.gz"; hash = "sha256-T9q3/nxv/AA6y7CHWtOhUibR7bnKN8OZmfN3NWYTsIQ="; }; - x86_64-darwin = { - url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.4.dmg"; - hash = "sha256-W7EwYu7S3hs1564tXq8H1Uok/Gwx/8QJO4brUGOfFY4="; - }; aarch64-darwin = { url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.4-aarch64.dmg"; hash = "sha256-XGcfEWHHeLugvkT/WlQDsVRN33F46b1PCNhINQitqSY="; diff --git a/pkgs/applications/editors/jetbrains/ides/pycharm.nix b/pkgs/applications/editors/jetbrains/ides/pycharm.nix index 4f418ef23a3b..452f73600373 100644 --- a/pkgs/applications/editors/jetbrains/ides/pycharm.nix +++ b/pkgs/applications/editors/jetbrains/ides/pycharm.nix @@ -20,10 +20,6 @@ let url = "https://download.jetbrains.com/python/pycharm-2026.1.4-aarch64.tar.gz"; hash = "sha256-71FbYpN0seJ5k/yZA7aoXgU4W/N1BhjtKl7W7Hic9UE="; }; - x86_64-darwin = { - url = "https://download.jetbrains.com/python/pycharm-2026.1.4.dmg"; - hash = "sha256-Q5hTcYoNUzmAxwcsXJNS4medQjFKWc/Sgkybt4PQPfg="; - }; aarch64-darwin = { url = "https://download.jetbrains.com/python/pycharm-2026.1.4-aarch64.dmg"; hash = "sha256-qxSgp8r4S0KXjCCTIoAiEZFCn3uBE/0pWLLA6td0Fq0="; diff --git a/pkgs/applications/editors/jetbrains/ides/rider.nix b/pkgs/applications/editors/jetbrains/ides/rider.nix index c962306f3389..d787cbecf590 100644 --- a/pkgs/applications/editors/jetbrains/ides/rider.nix +++ b/pkgs/applications/editors/jetbrains/ides/rider.nix @@ -31,10 +31,6 @@ let url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.4-aarch64.tar.gz"; hash = "sha256-GXmyBrqxUpwK4djjwllvK+pnfktDrDHpLJKoe4D2xFo="; }; - x86_64-darwin = { - url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.4.dmg"; - hash = "sha256-GfQ5WpKunJ+JhE1VcArm3UxZ5udCbfnS1Kw3D4gZorA="; - }; aarch64-darwin = { url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.4-aarch64.dmg"; hash = "sha256-cfwT22BN1jzKZzrZHMQqYFJPGuRwta/sqoOJOp+PfBE="; diff --git a/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix b/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix index b4ab8c0b34c4..b99a31ccb041 100644 --- a/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix +++ b/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix @@ -19,10 +19,6 @@ let url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.4-aarch64.tar.gz"; hash = "sha256-oSu19pkGVWt31vWBdAffSZsu4QzsUznVbUSwDy98nug="; }; - x86_64-darwin = { - url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.4.dmg"; - hash = "sha256-BLo2weIJK8gQAcMtAiETM7FMdhw9aoFIGh5Yqjv3k7s="; - }; aarch64-darwin = { url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.4-aarch64.dmg"; hash = "sha256-4wEnwcPRtwp0wxePUMiLow6sMxirwndRMdmJL8LBh9k="; diff --git a/pkgs/applications/editors/jetbrains/ides/rust-rover.nix b/pkgs/applications/editors/jetbrains/ides/rust-rover.nix index 3f82ae6aea2e..6e4312187c31 100644 --- a/pkgs/applications/editors/jetbrains/ides/rust-rover.nix +++ b/pkgs/applications/editors/jetbrains/ides/rust-rover.nix @@ -25,10 +25,6 @@ let url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.4-aarch64.tar.gz"; hash = "sha256-KpF3jCnLKCEeEXkBdB8ZsPPqP9FOVRTwRV/FQLKyh1Q="; }; - x86_64-darwin = { - url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.4.dmg"; - hash = "sha256-2BwgAD0xF9IxRJh+gW4vLzBW13rFQSzQPbEwdmQGvLU="; - }; aarch64-darwin = { url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.4-aarch64.dmg"; hash = "sha256-Hly4NBv9mg/RMmxCM6m9w5eS/CQ7ycxp7V2VQZwyGQE="; diff --git a/pkgs/applications/editors/jetbrains/ides/webstorm.nix b/pkgs/applications/editors/jetbrains/ides/webstorm.nix index 0e35c48c293b..6e28014f825b 100644 --- a/pkgs/applications/editors/jetbrains/ides/webstorm.nix +++ b/pkgs/applications/editors/jetbrains/ides/webstorm.nix @@ -19,10 +19,6 @@ let url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.4-aarch64.tar.gz"; hash = "sha256-f9KenMq1gtldzpBraSBwOb/186WQwh1ps5Ypj5JoOU0="; }; - x86_64-darwin = { - url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.4.dmg"; - hash = "sha256-SGdo6WYMCcCBuZUjvURcMTbJUqhZ4MzFlSLg6Zjr84I="; - }; aarch64-darwin = { url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.4-aarch64.dmg"; hash = "sha256-ZYen6Ew0GYbBAmuGCDACPBsygxZ6sT787o6gqF9DJzw="; diff --git a/pkgs/applications/editors/jetbrains/updater/updateInfo.json b/pkgs/applications/editors/jetbrains/updater/updateInfo.json index a64e1af94fcd..41f9f5b8ddd1 100644 --- a/pkgs/applications/editors/jetbrains/updater/updateInfo.json +++ b/pkgs/applications/editors/jetbrains/updater/updateInfo.json @@ -4,7 +4,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg" } }, @@ -13,7 +12,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg" } }, @@ -22,7 +20,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/python/dataspell-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg" } }, @@ -31,7 +28,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg" } }, @@ -40,7 +36,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/go/goland-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/go/goland-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg" } }, @@ -49,7 +44,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg" } }, @@ -62,7 +56,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg", "aarch64-darwin": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg" } }, @@ -71,7 +64,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg" } }, @@ -80,7 +72,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/python/pycharm-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/python/pycharm-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/python/pycharm-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/python/pycharm-{version}-aarch64.dmg" } }, @@ -93,7 +84,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg" } }, @@ -102,7 +92,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg" } }, @@ -111,7 +100,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg" } }, @@ -120,7 +108,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg" } } diff --git a/pkgs/applications/editors/vim/plugins/non-generated/windsurf-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/windsurf-nvim/default.nix index ca8b0fec8b1c..077bff37e046 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/windsurf-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/windsurf-nvim/default.nix @@ -14,7 +14,6 @@ let codeiumHashes = { x86_64-linux = "sha256-IeNK7UQtOhqC/eQv7MAya4jB1WIGykSR7IgutZatmHM="; aarch64-linux = "sha256-ujTFki/3V79El2WCkG0PJhbaMT0knC9mrS9E7Uv9HD4="; - x86_64-darwin = "sha256-r2KloEQsUku9sk8h76kwyQuMTHcq/vwfTSK2dkiXDzE="; aarch64-darwin = "sha256-1jNH0Up8mAahDgvPF6g42LV+RVDVsPqDM54lE2KYY48="; }; @@ -30,7 +29,6 @@ let { x86_64-linux = "linux_x64"; aarch64-linux = "linux_arm"; - x86_64-darwin = "macos_x64"; aarch64-darwin = "macos_arm"; } .${system} or throwSystem; diff --git a/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix b/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix index d083d33635b7..2128bad3a243 100644 --- a/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix +++ b/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix @@ -14,10 +14,6 @@ vscode-utils.buildVscodeMarketplaceExtension { arch = "linux-x64"; hash = "sha256-lhDt8XEF90y4pj8RLUZgfZNmHkV1XlmHsYuT6sGJMRc="; }; - "x86_64-darwin" = { - arch = "darwin-x64"; - hash = "sha256-SqFRn5FVQ+LcpmYT7/AIdIKTOxbapaKvPi+I360dVW8="; - }; "aarch64-linux" = { arch = "linux-arm64"; hash = "sha256-iuYVCG4YWPFI8o4GmuNjkbXvzJsAre0gSSEWq6CUk2E="; @@ -57,7 +53,6 @@ vscode-utils.buildVscodeMarketplaceExtension { "aarch64-linux" "aarch64-darwin" "x86_64-linux" - "x86_64-darwin" ]; maintainers = [ lib.maintainers.azd325 ]; }; diff --git a/pkgs/applications/editors/vscode/extensions/continue.continue/default.nix b/pkgs/applications/editors/vscode/extensions/continue.continue/default.nix index 96c4d7441c5f..330c30ad87dd 100644 --- a/pkgs/applications/editors/vscode/extensions/continue.continue/default.nix +++ b/pkgs/applications/editors/vscode/extensions/continue.continue/default.nix @@ -13,10 +13,6 @@ vscode-utils.buildVscodeMarketplaceExtension { arch = "linux-x64"; hash = "sha256-4GiTNT+UPdTth9VDhHTXfqhQ5gM6vfLAaU5Cy3VMTCI="; }; - "x86_64-darwin" = { - arch = "darwin-x64"; - hash = "sha256-XJfDXWYpxYV5YHIBINqNJdyVho7Xd9OGMu11WE0LENM="; - }; "aarch64-linux" = { arch = "linux-arm64"; hash = "sha256-QngCharrjiDKrY7RgWtKzIJxjXazuRvpuHVUAxknWfA="; @@ -44,7 +40,6 @@ vscode-utils.buildVscodeMarketplaceExtension { maintainers = with lib.maintainers; [ flacks ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index de3ec7a5475f..5af2c5353f82 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3190,10 +3190,6 @@ let arch = "linux-x64"; hash = "sha256-pmA7BNwyHiaU93j61/MyrBV5kH0DlW+7BA6HNlKGnso="; }; - "x86_64-darwin" = { - arch = "darwin-x64"; - hash = "sha256-E2KRzjIxLFmwArzEKittjejacrCOFFNNzphWw8v5CpE="; - }; "aarch64-linux" = { arch = "linux-arm64"; hash = "sha256-pnQP1OKr3NJgUuXzO1InYqGA49OuMFn2iEf8wpl4PqM="; @@ -3224,7 +3220,6 @@ let maintainers = [ lib.maintainers.magnouvean ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; diff --git a/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix b/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix index 70523c30c6d4..2abc84aba7d9 100644 --- a/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix +++ b/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix @@ -10,10 +10,6 @@ let hash = "sha256-jfjd2V7IJ4GQlz/pXmrY/LlBjQ2qtlsQV4ZRD8RiWTg="; arch = "linux-x64"; }; - x86_64-darwin = { - hash = "sha256-aOFoTLVaaMFsdGoWV0OC31/nmOHXUhr2Y8K4SWcNil8="; - arch = "darwin-x64"; - }; aarch64-linux = { hash = "sha256-ugluaghNNZ/VrQORVIhc0Fuv3rHo++LO3Uwg2ujmsQc="; arch = "linux-arm64"; diff --git a/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix b/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix index b470cd4ca50f..64bb5e1086ce 100644 --- a/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix +++ b/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix @@ -45,7 +45,6 @@ vscode-utils.buildVscodeMarketplaceExtension { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix b/pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix index e8d4b1b9ce98..2fa4097929c3 100644 --- a/pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix @@ -14,10 +14,6 @@ vscode-utils.buildVscodeMarketplaceExtension { arch = "linux-x64"; hash = "sha256-uPmJyEq7X6uJzE1M5Xywax1mrnTcg6jOb9MlpKZ0WRk="; }; - "x86_64-darwin" = { - arch = "darwin-x64"; - hash = "sha256-oEVt3VbRUPD4tfQs0EU7RX6671fCJiMi38wF+76RzZI="; - }; "aarch64-linux" = { arch = "linux-arm64"; hash = "sha256-b46f0f99rjBivewC9jUbAFiKK+DS1XKv+AynUlKHliw="; @@ -52,7 +48,6 @@ vscode-utils.buildVscodeMarketplaceExtension { "aarch64-linux" "aarch64-darwin" "x86_64-linux" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ xiaoxiangmoe ]; }; diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix index af7fd5daef40..96eeea294b2d 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix @@ -22,10 +22,6 @@ let arch = "linux-arm64"; hash = "sha256-1zz9xrMALIOXzMpArWSwO12WmRE+0ldbIwUFH1G2GQI="; }; - x86_64-darwin = { - arch = "darwin-x64"; - hash = "sha256-3PoSbp8M2X4bhSQyxvNC7jtNDVNEuEKeYRZQMFOmbtQ="; - }; aarch64-darwin = { arch = "darwin-arm64"; hash = "sha256-F4CsyiX46SpjilJNV+qYps1JAw09pVruLmW+muN9/B4="; @@ -138,7 +134,6 @@ vscode-utils.buildVscodeMarketplaceExtension { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix index b0bb0e750ec8..abd222def11d 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix @@ -24,10 +24,6 @@ let arch = "linux-arm64"; hash = "sha256-EV3745OXbwrRmc8P5e13DZbomyJGcYQUF07WflRWU1Q="; }; - x86_64-darwin = { - arch = "darwin-x64"; - hash = "sha256-i2cALeaSXfwIdfXNeWfND99nFYIiOFwsxbqU7/Effx8="; - }; aarch64-darwin = { arch = "darwin-arm64"; hash = "sha256-KCIkjBmYZPiuFmQ3/aDycARYIHPyDTmMkoGcuG5DQX8="; @@ -159,7 +155,6 @@ vscode-utils.buildVscodeMarketplaceExtension { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix index a934f7a21db6..4c95c0174df3 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix @@ -18,10 +18,6 @@ let hash = "sha256-HQfmDV6rJX6l1pGybe8//2QrTSwE+rlEJOi4/iW69lY="; arch = "linux-x64"; }; - x86_64-darwin = { - hash = "sha256-tAZyt2fwB/GOhffY5lhHJTmbXG8UloynPtjoMtWRHok="; - arch = "darwin-x64"; - }; aarch64-linux = { hash = "sha256-v7fatW/LMJ8CeSRrE/5b7dLqOrhNhwzUySUxtAMuBUE="; arch = "linux-arm64"; diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.vscode-speech/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.vscode-speech/default.nix index a92f471d2f06..4399094441b1 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode.vscode-speech/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.vscode-speech/default.nix @@ -16,10 +16,6 @@ vscode-utils.buildVscodeMarketplaceExtension { arch = "linux-x64"; hash = "sha256-dZwOBehoYEqaYskvcPB55IKnG1CMToioyUJXlndqorA="; }; - "x86_64-darwin" = { - arch = "darwin-x64"; - hash = "sha256-b6LobvVngC0TFuWTC9JBQrECkoX7ewLNCpCROkXHk20="; - }; "aarch64-linux" = { arch = "linux-arm64"; hash = "sha256-/EaOfoubfq1ufwB7TTQ2hqmh1ZJiZ1+B6QeYu3MoFPI="; @@ -68,7 +64,6 @@ vscode-utils.buildVscodeMarketplaceExtension { license = lib.licenses.unfree; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; diff --git a/pkgs/applications/editors/vscode/extensions/redhat.vscode-xml/default.nix b/pkgs/applications/editors/vscode/extensions/redhat.vscode-xml/default.nix index 4e311914bc7a..1df127e0fd59 100644 --- a/pkgs/applications/editors/vscode/extensions/redhat.vscode-xml/default.nix +++ b/pkgs/applications/editors/vscode/extensions/redhat.vscode-xml/default.nix @@ -13,10 +13,6 @@ vscode-utils.buildVscodeMarketplaceExtension { arch = "linux-x64"; hash = "sha256-cP/oFn19CZ/G3kjdHNZGqXvoDE1qUtg6xrg/2MO14Lo="; }; - "x86_64-darwin" = { - arch = "darwin-x64"; - hash = "sha256-wtk8SasxXEQ3pCJpVTWR8wcY/bNaIZmImbAtrFWYWOo="; - }; "aarch64-darwin" = { arch = "darwin-arm64"; hash = "sha256-XYdwVoDqK+88ZYUm6APyamFNx6XlYjy0R4CIhSMuRmU="; @@ -42,7 +38,6 @@ vscode-utils.buildVscodeMarketplaceExtension { platforms = [ "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" ]; }; } diff --git a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix index dba6740771e6..305f1123a1b8 100644 --- a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix +++ b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix @@ -15,10 +15,6 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { arch = "linux-x64"; hash = "sha256-Oz4Buraof4yXIxGeKXIsDkvEQQ0Gzf/b5mdses1nHlo="; }; - "x86_64-darwin" = { - arch = "darwin-x64"; - hash = "sha256-Iqe4KZXQHenKAypXK/qzG2BCXbk2cZ0i/0xhWhlfQxo="; - }; "aarch64-darwin" = { arch = "darwin-arm64"; hash = "sha256-vMDB5zmdBNt3R5AkeuCYhxzW/rSGwM+wtU5K4v3ZU/U="; diff --git a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix index 6d5b83c7e2d6..f7aafb38d63a 100644 --- a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix @@ -20,10 +20,6 @@ let arch = "linux-arm64"; hash = "sha256-Z3cRojI4mCCS2t3aLojgImULQOobq5liDwoeHuzKEhY="; }; - x86_64-darwin = { - arch = "darwin-x64"; - hash = "sha256-Th0cseTJk+CD3BO/99t0VMD7zcF6nxAfmHFhfN8j5sw="; - }; aarch64-darwin = { arch = "darwin-arm64"; hash = "sha256-rHgMl71YCs9ea0nFnx+E2U8isL4zQzIvvE9tgxM7IiA="; @@ -66,7 +62,6 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { "aarch64-linux" "aarch64-darwin" "x86_64-linux" - "x86_64-darwin" ]; maintainers = [ ]; }; diff --git a/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix b/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix index 66e9fbc2eb18..c29133655ef5 100644 --- a/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix +++ b/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix @@ -10,10 +10,6 @@ let hash = "sha256-DWrKvjWpUYvyqgZCShqwBKw33MHW31cxb4ERV65O+uc="; arch = "linux-x64"; }; - x86_64-darwin = { - hash = "sha256-CYDutYtU0+AAn6PYO/EQ/Suv8BNuMtvePpFdKRtiqAs="; - arch = "darwin-x64"; - }; aarch64-linux = { hash = "sha256-iFHeZiTubXA/t2Gib9hP42d7yjq/WRyywp+l8VhGfmo="; arch = "linux-arm64"; diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix index eb1b67a6132b..f07054e2fd07 100644 --- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix +++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix @@ -15,10 +15,6 @@ vscode-utils.buildVscodeMarketplaceExtension { arch = "linux-x64"; hash = "sha256-htZGjy7ZnQLGZUncokGaGHyLpvPM5jzWUvCdnfN1vbM="; }; - "x86_64-darwin" = { - arch = "darwin-x64"; - hash = "sha256-OFdrXunh63xBZW/HwDDjj17TTiOLGY1Enb6ARxNc4bI="; - }; "aarch64-linux" = { arch = "linux-arm64"; hash = "sha256-rgeNJbl6G2yKAWYW7NarQwVLmd3oZ4YTOVeCUat6ZqQ="; @@ -56,7 +52,6 @@ vscode-utils.buildVscodeMarketplaceExtension { "aarch64-linux" "aarch64-darwin" "x86_64-linux" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ sandarukasa ]; }; diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 652b2fab1896..4bfc6969b048 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -429,7 +429,6 @@ stdenv.mkDerivation ( # see https://www.npmjs.com/package/@vscode/ripgrep-universal?activeTab=code ripgrepSystem = { - x86_64-darwin = "darwin-x64"; aarch64-darwin = "darwin-arm64"; armv7l-linux = "linux-arm"; aarch64-linux = "linux-arm64"; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 89ed737e0c43..480d02b1b232 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -24,7 +24,6 @@ let plat = { x86_64-linux = "linux-x64"; - x86_64-darwin = "darwin"; aarch64-linux = "linux-arm64"; aarch64-darwin = "darwin-arm64"; armv7l-linux = "linux-armhf"; @@ -36,7 +35,6 @@ let hash = { x86_64-linux = "sha256-4G+zZ5HJuvdJXUt9wPWqqCVOfRpgpe5D5sfevAXJYrU="; - x86_64-darwin = "sha256-+o+UZwmJMeGyf2n1VZcm0zl4dzuC/0UBV5jyUANKsEQ="; aarch64-linux = "sha256-UEkpGlTV/KZ8Qcw/OBOCNDQHblD7gHHloSzM62FvDnw="; aarch64-darwin = "sha256-IHu9EwW9/oS2FTr/mB7ugMss5Pku3IyslqFYr4riZyk="; armv7l-linux = "sha256-Rfp2H6L7bXXhdxf2yphW9YXDGW1+Ea0nKdyTFS8Y/tU="; @@ -128,7 +126,6 @@ buildVscode { ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "armv7l-linux" diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index af9fa5cc4eba..f78790955fcd 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,7 +15,6 @@ let plat = { x86_64-linux = "linux-x64"; - x86_64-darwin = "darwin-x64"; aarch64-linux = "linux-arm64"; aarch64-darwin = "darwin-arm64"; armv7l-linux = "linux-armhf"; @@ -28,7 +27,6 @@ let hash = { x86_64-linux = "sha256-LJsGc11MH6zlcJNfSWjTWPn2Jp9dkjeBPQuCXH1woUM="; - x86_64-darwin = "sha256-bC7AfH2eKmmsWIOHifNGKD/kVQCYyuMfU3SUil0DXkM="; aarch64-linux = "sha256-mT5dvw8GOZ0GnZaKRS/TAzQDEEYDOgcj6w6lNLy5kQ0="; aarch64-darwin = "sha256-c8K17XKpRG1ji2mUfoyg2+cRF+qc1KVMYVkaQoUIz7Y="; armv7l-linux = "sha256-91ZHhEUDVoDiRBLwMHVLhzKmb9gWcPBUsVRZVLhCA4M="; @@ -88,7 +86,6 @@ buildVscode rec { mainProgram = "codium"; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" "aarch64-darwin" "armv7l-linux" diff --git a/pkgs/applications/emulators/libretro/cores/opera.nix b/pkgs/applications/emulators/libretro/cores/opera.nix index b1c2a0b39b02..3f84f95bdedf 100644 --- a/pkgs/applications/emulators/libretro/cores/opera.nix +++ b/pkgs/applications/emulators/libretro/cores/opera.nix @@ -6,13 +6,13 @@ }: mkLibretroCore { core = "opera"; - version = "0-unstable-2026-06-28"; + version = "0-unstable-2026-07-13"; src = fetchFromGitHub { owner = "libretro"; repo = "opera-libretro"; - rev = "340f9e9014c292fc47a8844a871a71dafe072b6d"; - hash = "sha256-geBK8RIlaRcWn4CDzVl3pjK0WOFQcMZl7zFMXE2oZNo="; + rev = "1edda8a2a6c6b9ae259d5c7cd7d54dcba9ee7e32"; + hash = "sha256-dc7xRjFxfSL2q9u1N0QH2j+oPbRGng2Z3U3J484lXiU="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/prboom.nix b/pkgs/applications/emulators/libretro/cores/prboom.nix index 907e3f47386f..38a3b5c3ecca 100644 --- a/pkgs/applications/emulators/libretro/cores/prboom.nix +++ b/pkgs/applications/emulators/libretro/cores/prboom.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "prboom"; - version = "0-unstable-2026-07-01"; + version = "0-unstable-2026-07-07"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-prboom"; - rev = "141978db577b52cb943641629401776e49ccbbe6"; - hash = "sha256-USRBq+h2HAoDIdYVd47wGLEnUzJAEOvikuvSNTHpboI="; + rev = "31563d6e65faa6b9b7e975754d2062370bba4342"; + hash = "sha256-eFRzbVTL5ARf650D0ZAEFGNTxjAy1CjBiAhwSQR8vJ4="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/wine/packages.nix b/pkgs/applications/emulators/wine/packages.nix index c548d3c1a72e..918046b464da 100644 --- a/pkgs/applications/emulators/wine/packages.nix +++ b/pkgs/applications/emulators/wine/packages.nix @@ -84,7 +84,6 @@ in if pkgs.stdenv.hostPlatform.isAarch64 then [ "--enable-archs=aarch64" ] else [ "--enable-win64" ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" ]; mainProgram = "wine"; @@ -145,7 +144,6 @@ in [ "--enable-archs=x86_64,i386" ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" ]; mainProgram = "wine"; diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 17291bdc2cce..f0a220d8733d 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -29,7 +29,6 @@ let ]; platforms = [ "i686-linux" - "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ]; diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 947166188ad2..80174bc67d6e 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -41,7 +41,6 @@ let aarch64-linux = "linux-aarch64"; # bundles are universal and can be re-used for both darwin architectures aarch64-darwin = "mac"; - x86_64-darwin = "mac"; }; arch = mozillaPlatforms.${stdenv.hostPlatform.system}; diff --git a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix deleted file mode 100644 index 2e430baa0706..000000000000 --- a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - lib, - buildGoModule, - minikube, -}: - -buildGoModule rec { - inherit (minikube) - version - src - nativeBuildInputs - buildInputs - vendorHash - doCheck - postPatch - ; - - pname = "docker-machine-hyperkit"; - - buildPhase = '' - make docker-machine-driver-hyperkit COMMIT=${src.rev} - ''; - - installPhase = '' - install out/docker-machine-driver-hyperkit -Dt $out/bin - ''; - - meta = { - homepage = "https://minikube.sigs.k8s.io/docs/drivers/hyperkit"; - description = "HyperKit driver for docker-machine"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ atkinschang ]; - platforms = [ "x86_64-darwin" ]; - }; -} diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index e592740d8129..11e899ebe285 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -26,7 +26,6 @@ assert lib.elem stdenv.system [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; @@ -178,7 +177,6 @@ in srcHash = "sha256-AkZjpHk57S3pYiZambxgRHR7PD51HSI4H1HHW9ICah4="; variant = "lean"; }; - x86_64-darwin = x86_64-linux; aarch64-linux = { version = "3.4.0"; hash = "sha256-QWxzKtNyw/AzcHMv0v7kj91pw1HO7VAN9MHO84caFk8="; @@ -199,7 +197,6 @@ in hash = "sha256-9RlQWcDUECrap//xf3sqhd+Qa8tuGZSHFjGfmXhkGgQ="; srcHash = "sha256-4OEsVhBNV9CJ+PN4FgCduUCVA9/el5yezSCZ6ko3+bU="; }; - x86_64-darwin = x86_64-linux; aarch64-linux = x86_64-linux // { hash = "sha256-5Lv2uA72BJEva5v2yncyPe5gKNCNOPNsoHffVt6KXQ0="; }; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 369471be3c1f..bbd0d279a248 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1139,13 +1139,13 @@ "vendorHash": "sha256-WpI4OZ7BUVgHwQY+7ct+K6CnwXFFuiRbI+iTFSJ8a5A=" }, "rootlyhq_rootly": { - "hash": "sha256-eJKJedLDp6CdFNimI8artmKYMsgURFXxS/RpMEJnVWk=", + "hash": "sha256-uxEqnGPJPUHhD2qtT9BR34/x6xSN5cZcW0JvH8fKfT0=", "homepage": "https://registry.terraform.io/providers/rootlyhq/rootly", "owner": "rootlyhq", "repo": "terraform-provider-rootly", - "rev": "v5.16.1", + "rev": "v5.17.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-QVZBQ7Ir8iEUaJo0yXFNp8rInIcbp9qw70UDJ3NAgRM=" + "vendorHash": "sha256-CndTtUfv1NWZd1sgfGq+e4lPm68aQuqwo55KzmdgXeI=" }, "rundeck_rundeck": { "hash": "sha256-g8unbz8+UGLiAOJju6E2bLkygvZgHkv173PdMDefmrc=", diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index ebbbddb8dbed..4bedf5ef87fe 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -35,7 +35,7 @@ let self = discord-development; }; }; - x86_64-darwin = { + aarch64-darwin = { discord = rec { branch = "stable"; binaryName = desktopName; @@ -62,7 +62,6 @@ let }; }; - aarch64-darwin = x86_64-darwin; default = x86_64-linux; # Used for unsupported platforms, so we can return *something* there. }; @@ -81,7 +80,6 @@ let ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix b/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix index a346ebd7b0de..030234b95fb5 100644 --- a/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix +++ b/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix @@ -33,6 +33,6 @@ stdenvNoCC.mkDerivation rec { # See: https://cancel.fm/ripcord/shareware-redistribution/ license = lib.licenses.unfreeRedistributable; maintainers = with lib.maintainers; [ mikroskeem ]; - platforms = [ "x86_64-darwin" ]; + platforms = [ ]; }; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index c6ce7747558d..601ead626005 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -41,7 +41,6 @@ let x86_64-linux = "linux-x86_64"; # bundles are universal and can be re-used for both darwin architectures aarch64-darwin = "mac"; - x86_64-darwin = "mac"; }; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; diff --git a/pkgs/applications/office/libreoffice/darwin/default.nix b/pkgs/applications/office/libreoffice/darwin/default.nix index 5a36fda68a8b..a2fdd448cdec 100644 --- a/pkgs/applications/office/libreoffice/darwin/default.nix +++ b/pkgs/applications/office/libreoffice/darwin/default.nix @@ -18,13 +18,6 @@ let url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg"; sha256 = "64e0ad05564554eeee639d49b08b20908a38d4722ec95f1620d05c99bcbe9fb1"; }; - - x86_64-darwin = rec { - arch = "x86_64"; - archSuffix = "x86-64"; - url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg"; - sha256 = "f92ba40fdada173232fe929bf77973a1ffcccec55ae7971957a6de84d33f0f1e"; - }; }; in stdenvNoCC.mkDerivation { @@ -78,7 +71,6 @@ stdenvNoCC.mkDerivation { maintainers = with lib.maintainers; [ tricktron ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix index 37c0a8133d1d..2e5bd1ebe4db 100644 --- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix +++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix @@ -134,7 +134,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = [ "x86_64-linux" - "x86_64-darwin" ]; maintainers = [ lib.maintainers.costrouc ]; }; diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index ad384520cefe..94a25f22f33c 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -300,7 +300,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "i686-linux" "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; diff --git a/pkgs/by-name/_0/_010editor/package.nix b/pkgs/by-name/_0/_010editor/package.nix index a74d0473c291..198f52aaea37 100644 --- a/pkgs/by-name/_0/_010editor/package.nix +++ b/pkgs/by-name/_0/_010editor/package.nix @@ -91,11 +91,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-M1D2Bmi45sYiB0Ci+0X0AxyIeR+On60xt4jP1Jsy5tA="; }; - x86_64-darwin = fetchurl { - url = "https://download.sweetscape.com/010EditorMac64Installer${finalAttrs.version}.dmg"; - hash = "sha256-vsI0VgcJGleJTQ5C1JaiCkELfWfwgFhyCx+6j5mldIk="; - }; - aarch64-darwin = fetchurl { url = "https://download.sweetscape.com/010EditorMacARM64Installer${finalAttrs.version}.dmg"; hash = "sha256-+yU5JdPNS2BfiZLsBLyyC+ieVNqbIWba3teBlTIDWtk="; @@ -124,7 +119,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ eljamm ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/_1/_1password-cli/package.nix b/pkgs/by-name/_1/_1password-cli/package.nix index f9c70c26f423..6595b170e8e3 100644 --- a/pkgs/by-name/_1/_1password-cli/package.nix +++ b/pkgs/by-name/_1/_1password-cli/package.nix @@ -25,14 +25,13 @@ let pname = "1password-cli"; version = "2.34.1"; - sources = rec { + sources = { aarch64-linux = fetch "linux_arm64" "sha256-uEukRq71eeayvNguD9XepvP1Br5AkE2Ag/Chv2idf4A=" "zip"; i686-linux = fetch "linux_386" "sha256-p/F3YZLJnlimrVE2qxTHvIB4m47kuwhoCWTC40VIvMs=" "zip"; x86_64-linux = fetch "linux_amd64" "sha256-oAABMlwwv5X91TT6FK2aPpg+e2CvmHT1rqIVRTjQNCQ=" "zip"; aarch64-darwin = fetch "apple_universal" "sha256-vp1Y1M6DUanx1CAVhLrqgBovwws6Y/5jOgnwTZE8Hhc=" "pkg"; - x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; mainProgram = "op"; diff --git a/pkgs/by-name/_1/_1password-gui/package.nix b/pkgs/by-name/_1/_1password-gui/package.nix index 2b569843f718..260e1ad7ecf2 100644 --- a/pkgs/by-name/_1/_1password-gui/package.nix +++ b/pkgs/by-name/_1/_1password-gui/package.nix @@ -37,7 +37,6 @@ let ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; diff --git a/pkgs/by-name/ac/acli/sources.json b/pkgs/by-name/ac/acli/sources.json index e35f6351094d..861fa1f4dfe4 100644 --- a/pkgs/by-name/ac/acli/sources.json +++ b/pkgs/by-name/ac/acli/sources.json @@ -9,10 +9,6 @@ "url": "https://acli.atlassian.com/linux/1.3.22-stable/acli_1.3.22-stable_linux_arm64.tar.gz", "sha256": "1a9e86d0b46a62a8f1992c1ef98b3af7e9a9ee3f76d0efa215fe1f2d1b2fd139" }, - "x86_64-darwin": { - "url": "https://acli.atlassian.com/darwin/1.3.22-stable/acli_1.3.22-stable_darwin_amd64.tar.gz", - "sha256": "993fd692700d602fd1e3cff7f1d29f70e44a2ebb8056fbb93bdc8aed1e5cbbd4" - }, "x86_64-linux": { "url": "https://acli.atlassian.com/linux/1.3.22-stable/acli_1.3.22-stable_linux_amd64.tar.gz", "sha256": "de9e0a60a556e4119428b9072f6ca787e75b9f9a538aa71ebcc8084deb8ca1a6" diff --git a/pkgs/by-name/ae/aemu/package.nix b/pkgs/by-name/ae/aemu/package.nix index 1db8ebbad7b3..f7e3d10209c7 100644 --- a/pkgs/by-name/ae/aemu/package.nix +++ b/pkgs/by-name/ae/aemu/package.nix @@ -44,7 +44,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/af/affine-bin/package.nix b/pkgs/by-name/af/affine-bin/package.nix index 804f31d6339e..f2e33e1c83e4 100644 --- a/pkgs/by-name/af/affine-bin/package.nix +++ b/pkgs/by-name/af/affine-bin/package.nix @@ -48,7 +48,6 @@ stdenvNoCC.mkDerivation ( ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" "x86_64-linux" ]; sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index 9c5fb55b894e..43b532795f8c 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -257,7 +257,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "aarch64-darwin" "aarch64-linux" - "x86_64-darwin" "x86_64-linux" ]; sourceProvenance = [ lib.sourceTypes.fromSource ]; diff --git a/pkgs/by-name/ag/age-plugin-openpgp-card/package.nix b/pkgs/by-name/ag/age-plugin-openpgp-card/package.nix index f1b49b82d9fe..5c8cfad15f1f 100644 --- a/pkgs/by-name/ag/age-plugin-openpgp-card/package.nix +++ b/pkgs/by-name/ag/age-plugin-openpgp-card/package.nix @@ -33,7 +33,6 @@ rustPlatform.buildRustPackage (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "age-plugin-openpgp-card"; diff --git a/pkgs/by-name/ai/airbuddy/package.nix b/pkgs/by-name/ai/airbuddy/package.nix index 50c5a10791af..a20169b03656 100644 --- a/pkgs/by-name/ai/airbuddy/package.nix +++ b/pkgs/by-name/ai/airbuddy/package.nix @@ -47,7 +47,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ stepbrobd ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/al/aldente/package.nix b/pkgs/by-name/al/aldente/package.nix index 6d41225a7fde..aae7dc51b192 100644 --- a/pkgs/by-name/al/aldente/package.nix +++ b/pkgs/by-name/al/aldente/package.nix @@ -43,7 +43,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ stepbrobd ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix index 93411a575544..ef38328ce8b4 100644 --- a/pkgs/by-name/am/amp-cli/package.nix +++ b/pkgs/by-name/am/amp-cli/package.nix @@ -20,7 +20,6 @@ let # supported x86_64 CPUs instead of depending on the build user's CPU flags. x86_64-linux = "linux-x64-baseline"; aarch64-linux = "linux-arm64"; - x86_64-darwin = "darwin-x64"; aarch64-darwin = "darwin-arm64"; }; @@ -80,7 +79,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { { x86_64-linux = "sha256-KNXCbNhY7njmGQlv3NxBmkIDciVVZlXl9JedBerdrZM="; aarch64-linux = "sha256-HJf1Ikmai/h/Y2HybYcKxRhx5VhiyoPaubocCkoxF3s="; - x86_64-darwin = "sha256-X8yl1GF6PseC1mSrMsQDmpXInKr4GD7cgHqhD/p6l4o="; aarch64-darwin = "sha256-agoKx8pXQf1HGUwsfqpgeZBubwhnPG+xqIfu3Y+AK2Y="; } .${system'}; diff --git a/pkgs/by-name/an/android-cli/package.nix b/pkgs/by-name/an/android-cli/package.nix index 2e289159937b..95dd81c5cea8 100644 --- a/pkgs/by-name/an/android-cli/package.nix +++ b/pkgs/by-name/an/android-cli/package.nix @@ -14,10 +14,6 @@ let url = "https://dl.google.com/android/cli/${version}/linux_x86_64/android-cli"; hash = "sha256-TmwLwLKqnMCxWwtX8m50KflmisfeG3PjZsBs7z9vccU="; }; - x86_64-darwin = { - url = "https://dl.google.com/android/cli/${version}/darwin_x86_64/android-cli"; - hash = "sha256-ThBobULyevoKlp/22tdUqnBBccX6FbPDNrSwwuK4wnw="; - }; aarch64-darwin = { url = "https://dl.google.com/android/cli/${version}/darwin_arm64/android-cli"; hash = "sha256-E3PC0Ivf6MoYRQu56dSD/49LI8DJZhXL27/o6daH0Sg="; @@ -75,7 +71,6 @@ stdenv.mkDerivation { teams = with teams; [ android ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "android"; diff --git a/pkgs/by-name/an/anki-bin/package.nix b/pkgs/by-name/an/anki-bin/package.nix index d3f7622c0820..22846bba8568 100644 --- a/pkgs/by-name/an/anki-bin/package.nix +++ b/pkgs/by-name/an/anki-bin/package.nix @@ -69,7 +69,6 @@ let platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/an/antigravity-cli/package.nix b/pkgs/by-name/an/antigravity-cli/package.nix index 496b0c4e2731..455485d6a4bb 100644 --- a/pkgs/by-name/an/antigravity-cli/package.nix +++ b/pkgs/by-name/an/antigravity-cli/package.nix @@ -25,10 +25,6 @@ let url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/${wholeVersion}/darwin-arm/cli_mac_arm64.tar.gz"; hash = "sha256-U/cwihF/cP5+7KSmkAToI5yOoYydguR5ZrKQMytpuCk="; }; - x86_64-darwin = fetchurl { - url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/${wholeVersion}/darwin-x64/cli_mac_x64.tar.gz"; - hash = "sha256-A8YjMmFUiHKxdlR+OpOPQGKC+68z/83vtjw1yiJGt6g="; - }; }; in stdenvNoCC.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/an/antigravity/information.json b/pkgs/by-name/an/antigravity/information.json index 79cbe4f69f9a..2073ecc8798e 100644 --- a/pkgs/by-name/an/antigravity/information.json +++ b/pkgs/by-name/an/antigravity/information.json @@ -10,10 +10,6 @@ "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/linux-arm/Antigravity.tar.gz", "sha256": "64d11085f17edc691adbe8952d59887f257d58448705dc2a19dfa23890d36df1" }, - "x86_64-darwin": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/darwin-x64/Antigravity.zip", - "sha256": "86437909f7e1c85d987b02130d3464b3d004d07904d5c893989ac3c924d11357" - }, "aarch64-darwin": { "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/darwin-arm/Antigravity.zip", "sha256": "4a8a90feed7078dae30d1dbcb268a0497c103ba76df7012a4467587aa7cffdf8" diff --git a/pkgs/by-name/an/antigravity/package.nix b/pkgs/by-name/an/antigravity/package.nix index a0d5cd05a137..165e5a2c4889 100644 --- a/pkgs/by-name/an/antigravity/package.nix +++ b/pkgs/by-name/an/antigravity/package.nix @@ -66,7 +66,6 @@ buildVscode { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/an/anytype-heart/package.nix b/pkgs/by-name/an/anytype-heart/package.nix index 5b11214a178c..c03e7d4ff88e 100644 --- a/pkgs/by-name/an/anytype-heart/package.nix +++ b/pkgs/by-name/an/anytype-heart/package.nix @@ -15,7 +15,6 @@ let # https://github.com/anyproto/anytype-heart/blob/f33a6b09e9e4e597f8ddf845fc4d6fe2ef335622/pkg/lib/localstore/ftsearch/ftsearchtantivy.go#L3 x86_64-linux = "linux-amd64-musl"; aarch64-linux = "linux-arm64-musl"; - x86_64-darwin = "darwin-amd64"; aarch64-darwin = "darwin-arm64"; } .${stdenv.hostPlatform.system} @@ -89,7 +88,6 @@ buildGoModule (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; broken = stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix index e6f428405645..69b330717963 100644 --- a/pkgs/by-name/an/anytype/package.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -231,7 +231,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; broken = stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/ap/appfire-cli/package.nix b/pkgs/by-name/ap/appfire-cli/package.nix index a4519d548f3d..3514e508ffa3 100644 --- a/pkgs/by-name/ap/appfire-cli/package.nix +++ b/pkgs/by-name/ap/appfire-cli/package.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { shellNames = { "x86_64-linux" = "bin/shell-linux-amd64"; "aarch64-linux" = "bin/shell-linux-arm64"; - "x86_64-darwin" = "bin/shell-macos-amd64"; "aarch64-darwin" = "bin/shell-macos-arm64"; }; # versionCheckHook cannot be used because appfire-cli requires $HOME to be set diff --git a/pkgs/by-name/ap/appflowy/package.nix b/pkgs/by-name/ap/appflowy/package.nix index fb368880b132..fd19b3534667 100644 --- a/pkgs/by-name/ap/appflowy/package.nix +++ b/pkgs/by-name/ap/appflowy/package.nix @@ -24,16 +24,15 @@ let dist = - rec { + { x86_64-linux = { urlSuffix = "linux-x86_64.tar.gz"; hash = "sha256-A8JUYzEMQH1sEKYrKZ84QZAgYbz0OvpHa3t9RIUVE9c="; }; - x86_64-darwin = { + aarch64-darwin = { urlSuffix = "macos-universal.zip"; hash = "sha256-LSNvFL1ud/FkzNSGk17ZqN2debnqsjlVDHd4NBjTds0="; }; - aarch64-darwin = x86_64-darwin; } ."${stdenvNoCC.hostPlatform.system}" or (throw "appflowy: No source for system: ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/by-name/at/atomgit-cli/package.nix b/pkgs/by-name/at/atomgit-cli/package.nix new file mode 100644 index 000000000000..39bcf62fbe39 --- /dev/null +++ b/pkgs/by-name/at/atomgit-cli/package.nix @@ -0,0 +1,67 @@ +{ + lib, + stdenv, + buildGoModule, + fetchgit, + gitMinimal, + makeWrapper, + versionCheckHook, + writableTmpDirAsHomeHook, + xdg-utils, +}: + +buildGoModule (finalAttrs: { + __structuredAttrs = true; + + pname = "atomgit-cli"; + version = "0.5.0"; + + src = fetchgit { + url = "https://atomgit.com/hust-open-atom-club/atomgit-cli.git"; + rev = "11f1ff216053bf47c0a3baaed6698c9222f1ce77"; + hash = "sha256-ZvQ8S0f1jUfN48UE/U+JnTTrtoWYZfwhDPDBbKKLlC0="; + }; + + vendorHash = "sha256-7K17JaXFsjf163g5PXCb5ng2gYdotnZ2IDKk8KFjNj0="; + + subPackages = [ "cmd/ag" ]; + + preCheck = '' + # Test all packages, not only cmd/ag. + unset subPackages + ''; + + ldflags = [ + "-s" + "-w" + "-X atomgit.com/hust-open-atom-club/atomgit-cli/internal/version.Version=v${finalAttrs.version}" + "-X atomgit.com/hust-open-atom-club/atomgit-cli/internal/version.Commit=${finalAttrs.src.rev}" + "-X atomgit.com/hust-open-atom-club/atomgit-cli/internal/version.BuildDate=2026-07-13T07:53:45Z" + ]; + + nativeBuildInputs = [ makeWrapper ]; + + postFixup = '' + wrapProgram $out/bin/ag \ + --prefix PATH : ${ + lib.makeBinPath ([ gitMinimal ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xdg-utils ]) + } + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + writableTmpDirAsHomeHook + ]; + versionCheckProgramArg = "version"; + versionCheckKeepEnvironment = [ "HOME" ]; + doInstallCheck = true; + + meta = { + description = "Command-line interface for AtomGit"; + homepage = "https://atomgit.com/hust-open-atom-club/atomgit-cli"; + changelog = "https://atomgit.com/hust-open-atom-club/atomgit-cli/tags/v${finalAttrs.version}"; + license = lib.licenses.mulan-psl2; + mainProgram = "ag"; + maintainers = [ lib.maintainers.silicalet ]; + }; +}) diff --git a/pkgs/by-name/at/atuin-desktop/package.nix b/pkgs/by-name/at/atuin-desktop/package.nix index 8c314c465018..a375364af645 100644 --- a/pkgs/by-name/at/atuin-desktop/package.nix +++ b/pkgs/by-name/at/atuin-desktop/package.nix @@ -80,7 +80,6 @@ rustPlatform.buildRustPackage (finalAttrs: { { aarch64-darwin = "sha256-YbjDAa2KG8U0ODqIYc5h7iNr5px+6+iforDrPomOVDo="; aarch64-linux = "sha256-JoUPAfBF4xdQxtx+J/VNpYomBACNsL7Wes0XXuGByGk="; - x86_64-darwin = "sha256-YzxQyZPfcQci8QsGEDRTcc2A9tmvem3cHkv/OBFlWDQ="; x86_64-linux = "sha256-w8fMS6f+F+23EtMjjl0RsHMm6b5jOXSwUDAc21vqLAg="; } .${stdenv.hostPlatform.system} diff --git a/pkgs/by-name/au/aube/package.nix b/pkgs/by-name/au/aube/package.nix index acac055e65eb..2d507db55606 100644 --- a/pkgs/by-name/au/aube/package.nix +++ b/pkgs/by-name/au/aube/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "aube"; - version = "1.26.0"; + version = "1.27.0"; src = fetchFromGitHub { owner = "jdx"; repo = "aube"; tag = "v${finalAttrs.version}"; - hash = "sha256-bQDDLgO5dG9kMF9VDnHGwuMZjWrbNT5Ia90rJrERDaE="; + hash = "sha256-lnW5ZLcdkpt662wDSj5YsnL7wILkJw3xoBs+3n7XWGY="; }; - cargoHash = "sha256-L9UiSO9UL8kBOebFXrZqbIJ/V4tobl1NYAdlktmX2lY="; + cargoHash = "sha256-Ox3l2VqtHfrAICTj7CL99EL5dXF43snPu7/X1ZFYceM="; nativeBuildInputs = [ cmake ]; # libz-ng-sys @@ -33,6 +33,9 @@ rustPlatform.buildRustPackage (finalAttrs: { checkFlags = [ # failed on x86_64-linux "--skip=http::ticket_cache::tests::max_per_host_evicts_oldest" + "--skip=http::ticket_cache::tests::invalidate_removes_all_for_host" + # require network access + "--skip=http::ticket_cache::tests::roundtrip_persists_across_open" ]; __darwinAllowLocalNetworking = true; @@ -44,6 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: { passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; }; + strictDeps = true; __structuredAttrs = true; meta = { diff --git a/pkgs/by-name/au/audacity/package.nix b/pkgs/by-name/au/audacity/package.nix index 74bd8b0a589c..ff0bd1ae1e67 100644 --- a/pkgs/by-name/au/audacity/package.nix +++ b/pkgs/by-name/au/audacity/package.nix @@ -31,7 +31,7 @@ libid3tag, libopus, libuuid, - ffmpeg_7, + ffmpeg_8, soundtouch, portaudio, # given up fighting their portaudio.patch? portmidi, @@ -59,7 +59,7 @@ # 1. detach sbsms let - ffmpeg = ffmpeg_7; + ffmpeg = ffmpeg_8; in stdenv.mkDerivation (finalAttrs: { pname = "audacity"; diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix index f1a75fdd3fea..13b363cbded6 100644 --- a/pkgs/by-name/au/authentik/package.nix +++ b/pkgs/by-name/au/authentik/package.nix @@ -307,7 +307,11 @@ let build-system = with final; [ hatchling ]; - propagatedBuildInputs = + pythonRelaxDeps = [ + "structlog" + ]; + + dependencies = with final; [ channels @@ -329,7 +333,11 @@ let build-system = with final; [ hatchling ]; - propagatedBuildInputs = + pythonRelaxDeps = [ + "structlog" + ]; + + dependencies = with final; [ cron-converter diff --git a/pkgs/by-name/az/azure-functions-core-tools/package.nix b/pkgs/by-name/az/azure-functions-core-tools/package.nix index 27eaa122b9c4..f37cc27ae3d8 100644 --- a/pkgs/by-name/az/azure-functions-core-tools/package.nix +++ b/pkgs/by-name/az/azure-functions-core-tools/package.nix @@ -66,7 +66,6 @@ buildDotnetModule { platforms = [ "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" ]; }; } diff --git a/pkgs/by-name/az/azure-static-sites-client/package.nix b/pkgs/by-name/az/azure-static-sites-client/package.nix index eec2fbc63e62..c007204348f1 100644 --- a/pkgs/by-name/az/azure-static-sites-client/package.nix +++ b/pkgs/by-name/az/azure-static-sites-client/package.nix @@ -24,7 +24,6 @@ let }; sources = { "x86_64-linux" = fetchBinary "linux-x64"; - "x86_64-darwin" = fetchBinary "osx-x64"; }; in stdenv.mkDerivation { diff --git a/pkgs/by-name/ba/bazarr/package.nix b/pkgs/by-name/ba/bazarr/package.nix index fcb85a166a8b..3b531409b618 100644 --- a/pkgs/by-name/ba/bazarr/package.nix +++ b/pkgs/by-name/ba/bazarr/package.nix @@ -1,75 +1,112 @@ { - stdenv, lib, - fetchzip, - makeWrapper, - python3, - unar, + stdenv, + fetchFromGitHub, + fetchNpmDeps, + nodejs, + npmHooks, + dart-sass, + makeBinaryWrapper, + python313, ffmpeg, + unar, nixosTests, + nix-update-script, }: - let - runtimeProgDeps = [ - ffmpeg - unar - ]; + python = python313.withPackages (ps: [ + ps.lxml + ps.numpy + ps.pillow + ps.psycopg2 + ps.setuptools + ps.webrtcvad + ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bazarr"; version = "1.6.0"; - src = fetchzip { - url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip"; - hash = "sha256-LRcc2wg5u260yl3A7rRwBfldl6WOyvF2T9NKGTKabfw="; - stripRoot = false; + src = fetchFromGitHub { + owner = "morpheus65535"; + repo = "bazarr"; + tag = "v${finalAttrs.version}"; + hash = "sha256-r3H0JEcGYzQOTHVR/zONmtOIF+LnJd+qn2pcAj8vdOA="; }; - nativeBuildInputs = [ makeWrapper ]; + npmRoot = "frontend"; + npmDeps = fetchNpmDeps { + name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; + inherit (finalAttrs) src; + sourceRoot = "${finalAttrs.src.name}/frontend"; + hash = "sha256-cb++eqVtKZer9B1rwJ9WR4mZImnASeFU2MojgXAPWf4="; + }; - buildInputs = [ - (python3.withPackages (ps: [ - ps.lxml - ps.numpy - ps.gevent - ps.gevent-websocket - ps.pillow - ps.setuptools - ps.psycopg2 - ps.webrtcvad - ])) - ] - ++ runtimeProgDeps; + nativeBuildInputs = [ + nodejs + npmHooks.npmConfigHook + dart-sass + makeBinaryWrapper + ]; + + buildPhase = '' + runHook preBuild + pushd frontend + # sass-embedded's bundled Dart compiler won't run in the sandbox; use nixpkgs' dart-sass. + # https://github.com/sass/embedded-host-node/issues/334 + substituteInPlace node_modules/sass-embedded/dist/lib/src/compiler-path.js \ + --replace-fail 'compilerCommand = (() => {' 'compilerCommand = (() => { return ["dart-sass"];' + npm run build + popd + runHook postBuild + ''; installPhase = '' runHook preInstall - mkdir -p "$out"/{bin,share/${pname}} - cp -r * "$out/share/${pname}" + mkdir -p $out/share/bazarr/frontend + cp -r bazarr bazarr.py custom_libs libs migrations $out/share/bazarr/ + cp -r frontend/build $out/share/bazarr/frontend/build - # Add missing shebang and execute perms so that patchShebangs can do its - # thing. - sed -i "1i #!/usr/bin/env python3" "$out/share/${pname}/bazarr.py" - chmod +x "$out/share/${pname}/bazarr.py" + printf '%s' "${finalAttrs.version}" > $out/share/bazarr/VERSION - makeWrapper "$out/share/${pname}/bazarr.py" \ - "$out/bin/bazarr" \ - --suffix PATH : ${lib.makeBinPath runtimeProgDeps} + printf '%s' "${ + lib.generators.toKeyValue { } { + updatemethod = "External"; + updatemethodmessage = "Bazarr is managed by Nix. Update it through your system configuration."; + packageversion = finalAttrs.version; + packageauthor = "nixpkgs"; + } + }" > $out/share/bazarr/package_info + + makeWrapper ${lib.getExe python} $out/bin/bazarr \ + --add-flags $out/share/bazarr/bazarr.py \ + --prefix PATH : ${ + lib.makeBinPath [ + ffmpeg + unar + ] + } runHook postInstall ''; - passthru.tests = { - smoke-test = nixosTests.bazarr; + passthru = { + tests.smoke-test = nixosTests.bazarr; + updateScript = nix-update-script { }; }; meta = { description = "Subtitle manager for Sonarr and Radarr"; homepage = "https://www.bazarr.media/"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + changelog = "https://github.com/morpheus65535/bazarr/releases/tag/v${finalAttrs.version}"; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ diogotcorreia ]; + maintainers = with lib.maintainers; [ + connor-grady + diogotcorreia + ]; mainProgram = "bazarr"; - platforms = lib.platforms.all; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ba/bazel_8/examples.nix b/pkgs/by-name/ba/bazel_8/examples.nix index 596600749b4b..38cc4da6ff97 100644 --- a/pkgs/by-name/ba/bazel_8/examples.nix +++ b/pkgs/by-name/ba/bazel_8/examples.nix @@ -49,7 +49,6 @@ in { aarch64-darwin = "sha256-FwHsg9P65Eu/n8PV7UW90bvBNG+U67zizRy6Krk32Yg="; aarch64-linux = "sha256-W8h2tCIauGnEvPpXje19bZUE/izHaCQ0Wj4nMaP3nkc="; - x86_64-darwin = "sha256-XIrGRmYDDRN3Kkt1dFWex1bPRMeIHAR+XWLqB/PpOAM="; x86_64-linux = "sha256-VBckTQAK5qeyi2ublk+Dcga5O5XZg3bfHR6Yaw6vSp0="; } .${stdenv.hostPlatform.system}; @@ -79,7 +78,6 @@ in { aarch64-darwin = "sha256-l6qJU0zGIKl12TYYsG5b+upswUA0hGE+VtQ9QnKpBh8="; aarch64-linux = "sha256-l6qJU0zGIKl12TYYsG5b+upswUA0hGE+VtQ9QnKpBh8="; - x86_64-darwin = "sha256-l6qJU0zGIKl12TYYsG5b+upswUA0hGE+VtQ9QnKpBh8="; x86_64-linux = "sha256-l6qJU0zGIKl12TYYsG5b+upswUA0hGE+VtQ9QnKpBh8="; } .${stdenv.hostPlatform.system}; @@ -110,7 +108,6 @@ in { aarch64-darwin = "sha256-50cAS1okGT1Mq3+TNLk2dk6OdBOAF2LdcskcYuVNOSY="; aarch64-linux = "sha256-2Oia7+2nzLrWeo/bK/5L7du5Y30DY+S0jit6e1ixJXw="; - x86_64-darwin = "sha256-+vgvj3ABm+vvXT7U7JxjuzIMwVAiUh1gcWZnFNzcmY0="; x86_64-linux = "sha256-kBnSlFRfYsotZTRMrTNhk8/106+BLzwuU6MIRXlD1jE="; } .${stdenv.hostPlatform.system}; diff --git a/pkgs/by-name/ba/bazel_9/examples.nix b/pkgs/by-name/ba/bazel_9/examples.nix index 27f848282eb4..97b262d983b5 100644 --- a/pkgs/by-name/ba/bazel_9/examples.nix +++ b/pkgs/by-name/ba/bazel_9/examples.nix @@ -64,7 +64,6 @@ in { aarch64-darwin = "sha256-Jth981+r20azC/CqoWN3LK5USm8zUIpL9Xt88+TcL1o="; aarch64-linux = "sha256-4E/QCSOXTN/dW65xz/n47tXW0PlHUOP1UP+TwJfMueI="; - x86_64-darwin = "sha256-t4JP4o3O9C9BehidQPVu4EATnUZodhFh1/ctITxD6JA="; x86_64-linux = "sha256-HzgFpbEBZ8efA5pwUsGZjt9bKiAXslB17OZQcm3cspc="; } .${stdenv.hostPlatform.system}; @@ -102,7 +101,6 @@ in { aarch64-darwin = "sha256-CbA4Kcn6656xnK6DkN4TZ7u1/mizA49Im9hRCU86TGs="; aarch64-linux = "sha256-CbA4Kcn6656xnK6DkN4TZ7u1/mizA49Im9hRCU86TGs="; - x86_64-darwin = "sha256-CbA4Kcn6656xnK6DkN4TZ7u1/mizA49Im9hRCU86TGs="; x86_64-linux = "sha256-CbA4Kcn6656xnK6DkN4TZ7u1/mizA49Im9hRCU86TGs="; } .${stdenv.hostPlatform.system}; @@ -141,7 +139,6 @@ in { aarch64-darwin = "sha256-uUl7PpR3jAKvj6VWspPE3IR4Gr/V2VrBv1MlTzOIZJs="; aarch64-linux = "sha256-uhcIwDk8NAZDBynzxWk+0fLP/2XadKQRl5BlFPjf4/8="; - x86_64-darwin = "sha256-vi3+/ps+dhDjqYHxWSnWOXhh1jWJWwb5ifUUhN4vxrg="; x86_64-linux = "sha256-YURF8Zjueq3BN5GfEx5L+C4hGmr5qfJc7OngqZ17384="; } .${stdenv.hostPlatform.system}; diff --git a/pkgs/by-name/bc/bcompare/package.nix b/pkgs/by-name/bc/bcompare/package.nix index a55448023ecc..906a9d87def9 100644 --- a/pkgs/by-name/bc/bcompare/package.nix +++ b/pkgs/by-name/bc/bcompare/package.nix @@ -25,12 +25,10 @@ let sha256 = "sha256-CCSRNGWIYVKAoQVVJ8McDUtc45nK0S4CdamcT5uVlQM="; }; - x86_64-darwin = fetchurl { + aarch64-darwin = fetchurl { url = "https://www.scootersoftware.com/files/BCompareOSX-${version}.zip"; sha256 = "sha256-R+G2Zlr074i2W4GaEDweK0c0q8tnzjs6M0N106WVAlg="; }; - - aarch64-darwin = srcs.x86_64-darwin; }; src = srcs.${stdenv.hostPlatform.system} or throwSystem; diff --git a/pkgs/by-name/be/beekeeper-studio/package.nix b/pkgs/by-name/be/beekeeper-studio/package.nix index c5da0de573aa..d905565eec37 100644 --- a/pkgs/by-name/be/beekeeper-studio/package.nix +++ b/pkgs/by-name/be/beekeeper-studio/package.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { asset = selectSystem { x86_64-linux = "beekeeper-studio_${finalAttrs.version}_amd64.deb"; aarch64-linux = "beekeeper-studio_${finalAttrs.version}_arm64.deb"; - x86_64-darwin = "Beekeeper-Studio-${finalAttrs.version}-mac.zip"; aarch64-darwin = "Beekeeper-Studio-${finalAttrs.version}-arm64-mac.zip"; }; in @@ -56,7 +55,6 @@ stdenv.mkDerivation (finalAttrs: { hash = selectSystem { x86_64-linux = "sha256-e5y7uBzdbDSUQKpxRjho+2kU3wx23spdSv1PwmJ30gA="; aarch64-linux = "sha256-iuZDeSYljiSRUqtLIA1BcrRaYoqg9dnlbRDLsetVkMQ="; - x86_64-darwin = "sha256-7iW40NPAU4C+gDZb7YmGFmTOnmg5V/yb9+6EW6MlyXU="; aarch64-darwin = "sha256-Jnm4Vfm9+6dXmjnI5gYpYW1g7Anl9xhIKXbQA2SGUDE="; }; }; @@ -158,7 +156,6 @@ stdenv.mkDerivation (finalAttrs: { "aarch64-linux" "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index 305fcc575591..00fe90cf9a4d 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -246,7 +246,6 @@ buildNpmPackage (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "bitwarden"; diff --git a/pkgs/by-name/bl/blackfire/package.nix b/pkgs/by-name/bl/blackfire/package.nix index 0205b58df2db..22d6d990aef6 100644 --- a/pkgs/by-name/bl/blackfire/package.nix +++ b/pkgs/by-name/bl/blackfire/package.nix @@ -74,10 +74,6 @@ stdenv.mkDerivation rec { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; hash = "sha256-Ofs9raAtx/duS8dXWfvjKGzhJr3j9+gkH8lP/VLfnkE="; }; - "x86_64-darwin" = fetchurl { - url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - hash = "sha256-+rMiD/vFFIA8dR3quUnpr8uDNTdvnXyYjT8brgiOxBI="; - }; }; updateScript = writeShellScript "update-blackfire" '' @@ -112,7 +108,6 @@ stdenv.mkDerivation rec { "x86_64-linux" "aarch64-linux" "i686-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/bl/blackfire/php-probe.nix b/pkgs/by-name/bl/blackfire/php-probe.nix index 51181437257b..a85e267b8278 100644 --- a/pkgs/by-name/bl/blackfire/php-probe.nix +++ b/pkgs/by-name/bl/blackfire/php-probe.nix @@ -59,16 +59,6 @@ let "8.5" = "sha256-GpvF7cgcTXLguwQCj0vOwtn7EbUQYqolzt7JPr8RtCM="; }; }; - "x86_64-darwin" = { - system = "amd64"; - hash = { - "8.1" = "sha256-bRoTC959irVHSTbMmBEQPw2O5ecoMj4zJK+a5AT1i7M="; - "8.2" = "sha256-6DGh0Ajlxt6L7acen3171gfyUajmb9k6fAY+h56BZCI="; - "8.3" = "sha256-KhZ5KD+9lCC+4bSVZPfkvWpWgRmOZ9iL87NfQ/YMWzw="; - "8.4" = "sha256-DRU0I60T9ZvIHYU82qbHFmEQwn3Vrp/MGmhiKzOm3og="; - "8.5" = "sha256-LrGek8mg9tBhccLGBKeokKsiYSxitxE+MP9sya3H4aY="; - }; - }; }; makeSource = @@ -166,7 +156,6 @@ stdenv.mkDerivation (finalAttrs: { "x86_64-linux" "aarch64-linux" "i686-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/bl/blackhole/package.nix b/pkgs/by-name/bl/blackhole/package.nix index b84a1a42b8b1..fa3f1a861c34 100644 --- a/pkgs/by-name/bl/blackhole/package.nix +++ b/pkgs/by-name/bl/blackhole/package.nix @@ -7,15 +7,18 @@ nix-update-script, channel ? "256ch", }: +let + numChannels = lib.toIntBase10 (lib.removeSuffix "ch" channel); +in stdenv.mkDerivation (finalAttrs: { pname = "blackhole"; - version = "0.6.1"; + version = "0.7.1"; src = fetchFromGitHub { owner = "existentialaudio"; repo = "BlackHole"; tag = "v${finalAttrs.version}"; - hash = "sha256-jFKi5LJdTOMFa1mErH6WsjgCtLCKzwpgn2+T3Fp9MtQ="; + hash = "sha256-kuIaoXA0K7SFPXKFHqcilTbf1zn9Ol3JYVpnkFuQEZg="; }; nativeBuildInputs = [ @@ -31,14 +34,14 @@ stdenv.mkDerivation (finalAttrs: { "-configuration" "Release" "PRODUCT_BUNDLE_IDENTIFIER=${finalAttrs.bundleId}" - "GCC_PREPROCESSOR_DEFINITIONS=$GCC_PREPROCESSOR_DEFINITIONS kDriver_Name=\\\"blackhole${channel}\\\" kPlugIn_BundleID=\\\"${finalAttrs.bundleId}\\\" kPlugIn_Icon=\\\"BlackHole.icns\\\"" + "GCC_PREPROCESSOR_DEFINITIONS=$GCC_PREPROCESSOR_DEFINITIONS kNumber_Of_Channels=${toString numChannels} kDriver_Name=\\\"BlackHole\\\" kPlugIn_BundleID=\\\"${finalAttrs.bundleId}\\\" kPlugIn_Icon=\\\"BlackHole.icns\\\"" ]; installPhase = '' runHook preInstall mkdir -p $out/Library/Audio/Plug-Ins/HAL - mv Products/Release/BlackHole.driver $out/Library/Audio/Plug-Ins/HAL/Blackhole${channel}.driver + mv Products/Release/BlackHole.driver $out/Library/Audio/Plug-Ins/HAL/BlackHole${channel}.driver runHook postInstall ''; diff --git a/pkgs/by-name/bl/blast-bin/package.nix b/pkgs/by-name/bl/blast-bin/package.nix index 7436773c178f..a6a5151ac050 100644 --- a/pkgs/by-name/bl/blast-bin/package.nix +++ b/pkgs/by-name/bl/blast-bin/package.nix @@ -26,10 +26,6 @@ let url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-aarch64-linux.tar.gz"; hash = "sha256-1EeiMu08R9Glq8qRky4OTT5lQPLJcM7iaqUrmUOS4MI="; }; - x86_64-darwin = fetchurl { - url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-x64-macosx.tar.gz"; - hash = "sha256-fu4edyD12q8G452ckrEl2Qct5+uB9JnABd7bCLkyMkw="; - }; aarch64-darwin = fetchurl { url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-aarch64-macosx.tar.gz"; hash = "sha256-6NpPNLBCHaBRscLZ5fjh5Dv3bjjPk2Gh2+L7xEtiJNs="; @@ -72,7 +68,6 @@ stdenv.mkDerivation { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/bl/blastem/package.nix b/pkgs/by-name/bl/blastem/package.nix index 2881fe114b73..b58c6bb6101a 100644 --- a/pkgs/by-name/bl/blastem/package.nix +++ b/pkgs/by-name/bl/blastem/package.nix @@ -74,7 +74,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "i686-linux" "x86_64-linux" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/bl/bleep/package.nix b/pkgs/by-name/bl/bleep/package.nix index 2ed661c7138e..3aa0a27072e9 100644 --- a/pkgs/by-name/bl/bleep/package.nix +++ b/pkgs/by-name/bl/bleep/package.nix @@ -12,14 +12,12 @@ let platform = { x86_64-linux = "x86_64-pc-linux"; - x86_64-darwin = "x86_64-apple-darwin"; aarch64-darwin = "arm64-apple-darwin"; } ."${stdenvNoCC.system}" or (throw "unsupported system ${stdenvNoCC.hostPlatform.system}"); hash = { x86_64-linux = "sha256-SGV0fEuwmGwpqmD42a+x0fIK50RWSHEYDesH4obgRhg="; - x86_64-darwin = "sha256-fOeYUchUE1Jj4xSrYjljEUpGrW8cvev7d/qywc81vFo="; aarch64-darwin = "sha256-qL0hjEdfkN62NDvhlzVgW4TYWv0IReo2Fo5eVhUaOrI="; } ."${stdenvNoCC.system}" or (throw "unsupported system ${stdenvNoCC.hostPlatform.system}"); @@ -73,7 +71,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { mainProgram = "bleep"; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; maintainers = with lib.maintainers; [ kristianan ]; diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index c4d80135ebf5..ff7db4ee1495 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -453,7 +453,6 @@ stdenv'.mkDerivation (finalAttrs: { platforms = [ "aarch64-darwin" "aarch64-linux" - "x86_64-darwin" "x86_64-linux" ]; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/bl/bloop/package.nix b/pkgs/by-name/bl/bloop/package.nix index 65dbf840fb6e..0fb6d58c68c8 100644 --- a/pkgs/by-name/bl/bloop/package.nix +++ b/pkgs/by-name/bl/bloop/package.nix @@ -86,7 +86,6 @@ stdenv.mkDerivation rec { mainProgram = "bloop"; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/bo/boundary/package.nix b/pkgs/by-name/bo/boundary/package.nix index 6645a16a3ccd..c0c2ead360fc 100644 --- a/pkgs/by-name/bo/boundary/package.nix +++ b/pkgs/by-name/bo/boundary/package.nix @@ -15,13 +15,11 @@ stdenv.mkDerivation rec { suffix = selectSystem { x86_64-linux = "linux_amd64"; aarch64-linux = "linux_arm64"; - x86_64-darwin = "darwin_amd64"; aarch64-darwin = "darwin_arm64"; }; hash = selectSystem { x86_64-linux = "sha256-S5wt4Wy2SfO+36YwxQo86vnSIv4I0tMdfXro3i2qS6k="; aarch64-linux = "sha256-bu+tYL5uHs67JG1MxCUDIQ9xwYxArbz/FElN0QCXNU4="; - x86_64-darwin = "sha256-sRPq9+JnKYD5+0JVqhfGpCflHZgFdsrPprJqfxuAlpI="; aarch64-darwin = "sha256-PEaxwEKCidLvDbMSfXZ2ehWOwblLjzU+yy9Qq9tavtw="; }; in diff --git a/pkgs/by-name/bo/box-cli/sources.json b/pkgs/by-name/bo/box-cli/sources.json index 10c07df913c5..5b805dbf81e9 100644 --- a/pkgs/by-name/bo/box-cli/sources.json +++ b/pkgs/by-name/bo/box-cli/sources.json @@ -10,10 +10,6 @@ "filename": "box-linux-arm64", "hash": "sha256-V2Sk6C1ZTRWlYQ2bVQTvK6PU8BkBPkmJMjUAo2Ul6+Q=" }, - "x86_64-darwin": { - "filename": "box-darwin-x64", - "hash": "sha256-QI+ecq0O4dkKqdIvkONcYdXsS+EQLFIU35ulKGNSCRE=" - }, "aarch64-darwin": { "filename": "box-darwin-arm64", "hash": "sha256-cyjMUGkWfNOggvtBfVqCijmcAj0P2SuFQORwg9EWbn0=" diff --git a/pkgs/by-name/br/brave/make-brave.nix b/pkgs/by-name/br/brave/make-brave.nix index 497820c9f4cf..fd018d50a3d5 100644 --- a/pkgs/by-name/br/brave/make-brave.nix +++ b/pkgs/by-name/br/brave/make-brave.nix @@ -307,7 +307,6 @@ stdenv.mkDerivation { "aarch64-linux" "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" ]; mainProgram = "brave"; }; diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix index f42a60bd89b2..a63f06c2ddf4 100644 --- a/pkgs/by-name/br/brave/package.nix +++ b/pkgs/by-name/br/brave/package.nix @@ -18,10 +18,6 @@ let url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip"; hash = "sha256-65qGzjXZfY5eTWbxTA9R3jN2F0CdkXnHXGVfw3spujo="; }; - x86_64-darwin = { - url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip"; - hash = "sha256-XPKKB/X8w5Neuxeluc5OFZVN1thqZ0Cf/pFTP4GY2/o="; - }; }; archive = diff --git a/pkgs/by-name/br/breitbandmessung/package.nix b/pkgs/by-name/br/breitbandmessung/package.nix index 9b8e37db0735..a696d13904a1 100644 --- a/pkgs/by-name/br/breitbandmessung/package.nix +++ b/pkgs/by-name/br/breitbandmessung/package.nix @@ -18,7 +18,7 @@ let sources = import ./sources.nix; systemArgs = - rec { + { x86_64-linux = { src = fetchurl sources.x86_64-linux; @@ -57,8 +57,8 @@ let ''; }; - x86_64-darwin = { - src = fetchurl sources.x86_64-darwin; + aarch64-darwin = { + src = fetchurl sources.aarch64-darwin; nativeBuildInputs = [ undmg ]; @@ -74,8 +74,6 @@ let runHook postInstall ''; }; - - aarch64-darwin = x86_64-darwin; } .${system} or { src = throw "Unsupported system: ${system}"; @@ -97,7 +95,6 @@ stdenv.mkDerivation ( maintainers = with lib.maintainers; [ b4dm4n ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/br/breitbandmessung/sources.nix b/pkgs/by-name/br/breitbandmessung/sources.nix index cb27fc7b61c6..48d21c728e1a 100644 --- a/pkgs/by-name/br/breitbandmessung/sources.nix +++ b/pkgs/by-name/br/breitbandmessung/sources.nix @@ -4,7 +4,7 @@ url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-3.11.0-linux.deb"; sha256 = "sha256-kNuR+zcKEdZ9p0HEajmFQ3TIUz1z2Ao098QNCK6x5lg="; }; - x86_64-darwin = { + aarch64-darwin = { url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-3.11.0-mac.dmg"; sha256 = "sha256-pKI4Kg4ngXYzyZnzmlijIxmzoCKshdQao1v9JWaAV50="; }; diff --git a/pkgs/by-name/br/breitbandmessung/update.sh b/pkgs/by-name/br/breitbandmessung/update.sh index da982adf933b..88dc7b6e2b36 100755 --- a/pkgs/by-name/br/breitbandmessung/update.sh +++ b/pkgs/by-name/br/breitbandmessung/update.sh @@ -20,7 +20,7 @@ if [[ $current != $latest ]]; then url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-${latest}-linux.deb"; sha256 = "${linux_hash}"; }; - x86_64-darwin = { + aarch64-darwin = { url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-${latest}-mac.dmg"; sha256 = "${darwin_hash}"; }; diff --git a/pkgs/by-name/br/brioche/librusty_v8.nix b/pkgs/by-name/br/brioche/librusty_v8.nix index 00cbd562c0ae..a15d2d5b2e14 100644 --- a/pkgs/by-name/br/brioche/librusty_v8.nix +++ b/pkgs/by-name/br/brioche/librusty_v8.nix @@ -7,7 +7,6 @@ fetchLibrustyV8 { # NOTE; Follows supported platforms of package (see meta.platforms attribute)! x86_64-linux = "167yh6wabn154axrylam4p76n5a411rqjdgaza4dwsfc5cg2zvv2"; aarch64-linux = "1lmpqndmv9lyzsca1sx4prw76fsnk63cr1i15jdmk764j3zyyki6"; - x86_64-darwin = "1zdlwgq3kgd931ppd9afvqkn45vg8gjsz6k8jb2vnbwzf03grsv0"; aarch64-darwin = "0hm2wdkd5palsxdw0r9y5365gdww7f37g5z9260sa639211lipp4"; }; } diff --git a/pkgs/by-name/br/brioche/package.nix b/pkgs/by-name/br/brioche/package.nix index 8b589de649a8..526d752ba59f 100644 --- a/pkgs/by-name/br/brioche/package.nix +++ b/pkgs/by-name/br/brioche/package.nix @@ -67,7 +67,6 @@ rustPlatform.buildRustPackage (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/bs/bs-manager/depotdownloader/default.nix b/pkgs/by-name/bs/bs-manager/depotdownloader/default.nix index 8e8112ce33d7..a093c2041d3a 100644 --- a/pkgs/by-name/bs/bs-manager/depotdownloader/default.nix +++ b/pkgs/by-name/bs/bs-manager/depotdownloader/default.nix @@ -27,7 +27,6 @@ buildDotnetModule { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "DepotDownloader"; diff --git a/pkgs/by-name/bu/buck2/hashes.json b/pkgs/by-name/bu/buck2/hashes.json index 1f897e49538a..5738dd882710 100644 --- a/pkgs/by-name/bu/buck2/hashes.json +++ b/pkgs/by-name/bu/buck2/hashes.json @@ -7,10 +7,6 @@ "buck2": "sha256-IqDsyQ7Omy7QujT85oKrWwyirG7gwfupdxzvRoMRmQs=", "rust-project": "sha256-iFSko4FTvAVlKUxJE/6FzR6H7V2SryRfEi7nRhfyhxQ=" }, - "x86_64-darwin": { - "buck2": "sha256-G/xarAld9dXanZl7Ivcuoer3YsytmFXWED44u2U4q8g=", - "rust-project": "sha256-jbvvqPI7+qpONhk8UZfSiFpMGCGWRr85BocA58d+C7Y=" - }, "aarch64-linux": { "buck2": "sha256-VKV1vltATu3tAPmMiifba7MV9kNFH754FDda6i8cQrU=", "rust-project": "sha256-oqxHdbNzQn1KHObboAd4/LTbilIJgLqMiWCgHLaPFrc=" diff --git a/pkgs/by-name/bu/buck2/package.nix b/pkgs/by-name/bu/buck2/package.nix index 9cb994ba84f0..175d05aadc14 100644 --- a/pkgs/by-name/bu/buck2/package.nix +++ b/pkgs/by-name/bu/buck2/package.nix @@ -47,7 +47,6 @@ let # NOTE (aseipp): must be synchronized with update.nu! platform-suffix = { - x86_64-darwin = "x86_64-apple-darwin"; aarch64-darwin = "aarch64-apple-darwin"; x86_64-linux = "x86_64-unknown-linux-gnu"; aarch64-linux = "aarch64-unknown-linux-gnu"; @@ -150,7 +149,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/bu/buddy/package.nix b/pkgs/by-name/bu/buddy/package.nix index 6abc5dda3439..ac5845e6303b 100644 --- a/pkgs/by-name/bu/buddy/package.nix +++ b/pkgs/by-name/bu/buddy/package.nix @@ -32,10 +32,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://sourceforge.net/projects/buddy/"; description = "Binary decision diagram package"; - license = { - url = "https://sourceforge.net/p/buddy/gitcode/ci/master/tree/README"; - fullName = "Buddy License"; - }; + license = lib.licenses.buddy; platforms = lib.platforms.unix; # Once had cygwin problems }; diff --git a/pkgs/by-name/bu/bulloak/package.nix b/pkgs/by-name/bu/bulloak/package.nix index 39bd57007466..863802b9fa05 100644 --- a/pkgs/by-name/bu/bulloak/package.nix +++ b/pkgs/by-name/bu/bulloak/package.nix @@ -15,10 +15,6 @@ let url = "https://raw.githubusercontent.com/ethereum/solc-bin/bdd7dd3fda6e4a00c0697d891a1a7ae9f2b3a5fd/linux-amd64/list.json"; hash = "sha256-H6D6XbIw5sDZlbc2c51vIMRmOqs2nDIcaNzCaOvnLsw="; }; - x86_64-darwin = fetchurl { - url = "https://raw.githubusercontent.com/ethereum/solc-bin/bdd7dd3fda6e4a00c0697d891a1a7ae9f2b3a5fd/macosx-amd64/list.json"; - hash = "sha256-A3A6gtNb129tD5KC0tCXvlzQ11t5SrNrX8tQeq73+mY="; - }; aarch64-linux = fetchurl { url = "https://raw.githubusercontent.com/nikitastupin/solc/99b5867237b37952d372e0dab400d6788feda315/linux/aarch64/list.json"; hash = "sha256-u6WRAcnR9mN9ERfFdLOxxSc9ASQIQvmS8uG+Z4H6OAU="; diff --git a/pkgs/by-name/bu/bun/package.nix b/pkgs/by-name/bu/bun/package.nix index 928ec621b10e..b901985b3808 100644 --- a/pkgs/by-name/bu/bun/package.nix +++ b/pkgs/by-name/bu/bun/package.nix @@ -27,7 +27,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { sourceRoot = { aarch64-darwin = "bun-darwin-aarch64"; - x86_64-darwin = "bun-darwin-x64-baseline"; } .${stdenvNoCC.hostPlatform.system} or null; @@ -87,10 +86,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { url = "https://github.com/oven-sh/bun/releases/download/bun-v${finalAttrs.version}/bun-linux-aarch64.zip"; hash = "sha256-cLrkGzkIsKEg4eWMXIrzDnSvrjuNEbDT/djnh937SyI="; }; - "x86_64-darwin" = fetchurl { - url = "https://github.com/oven-sh/bun/releases/download/bun-v${finalAttrs.version}/bun-darwin-x64-baseline.zip"; - hash = "sha256-qYumpIDyL9qbNDYmuQak4mqlNhi/hdK8WSjs8rpF8O0="; - }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${finalAttrs.version}/bun-linux-x64.zip"; hash = "sha256-ecB3H6i5LDOq5B4VoODTB+qZ0OLwAxfHHGxTI3p44lo="; diff --git a/pkgs/by-name/c3/c3c/package.nix b/pkgs/by-name/c3/c3c/package.nix index 806cd0c3f6ab..761b7d9bd695 100644 --- a/pkgs/by-name/c3/c3c/package.nix +++ b/pkgs/by-name/c3/c3c/package.nix @@ -59,7 +59,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { doCheck = lib.elem llvmPackages.stdenv.system [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ] && checks; diff --git a/pkgs/by-name/ca/caffeine/package.nix b/pkgs/by-name/ca/caffeine/package.nix index 881d85276502..195baaae0a5c 100644 --- a/pkgs/by-name/ca/caffeine/package.nix +++ b/pkgs/by-name/ca/caffeine/package.nix @@ -57,7 +57,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ emilytrau ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/ca/caido-cli/package.nix b/pkgs/by-name/ca/caido-cli/package.nix index 4dd939bb2417..bf9c1a9fb4ae 100644 --- a/pkgs/by-name/ca/caido-cli/package.nix +++ b/pkgs/by-name/ca/caido-cli/package.nix @@ -21,10 +21,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://caido.download/releases/v${finalAttrs.version}/caido-cli-v${finalAttrs.version}-linux-aarch64.tar.gz"; hash = "sha256-d1xzF0N6emShCQpotFiQEj1wV3hdt1DK7R+6Smlxrmg="; }; - x86_64-darwin = { - url = "https://caido.download/releases/v${finalAttrs.version}/caido-cli-v${finalAttrs.version}-mac-x86_64.zip"; - hash = "sha256-xh6kaYPJ7dwDHM1CkDzxYBHM4cKUex+XPXceqvQgWX4="; - }; aarch64-darwin = { url = "https://caido.download/releases/v${finalAttrs.version}/caido-cli-v${finalAttrs.version}-mac-aarch64.zip"; hash = "sha256-FwbKLEwjiFzZWdBS6RgsDtc/EkI9AT2CBGwdmgEdDnw="; @@ -62,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/ca/caido-desktop/package.nix b/pkgs/by-name/ca/caido-desktop/package.nix index 3f9c146862d0..cedb8a7c3e42 100644 --- a/pkgs/by-name/ca/caido-desktop/package.nix +++ b/pkgs/by-name/ca/caido-desktop/package.nix @@ -20,10 +20,6 @@ let url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-aarch64.AppImage"; hash = "sha256-B7dw9uoG++AqT264ZlyHxGpv68fH5SlYzDKUaIM8c14="; }; - x86_64-darwin = { - url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-mac-x86_64.dmg"; - hash = "sha256-0VCLjl0Lpe+4Mgnrp6X8ApJWjAjuhkaZOxQ4P3C8MSM="; - }; aarch64-darwin = { url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-mac-aarch64.dmg"; hash = "sha256-GmpMnaGR7gYz1RvSO5xj9AA3xU1mn2IBInakmVkuG7A="; @@ -49,7 +45,6 @@ let platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/ca/cargo-feature-combinations/package.nix b/pkgs/by-name/ca/cargo-feature-combinations/package.nix index d7d52def6bcc..29d9742b1000 100644 --- a/pkgs/by-name/ca/cargo-feature-combinations/package.nix +++ b/pkgs/by-name/ca/cargo-feature-combinations/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { __structuredAttrs = true; pname = "cargo-feature-combinations"; - version = "0.2.3"; + version = "0.3.0"; src = fetchFromGitHub { owner = "romnn"; repo = "cargo-feature-combinations"; tag = "v${finalAttrs.version}"; - hash = "sha256-5QQrWdq1jTGUCnzZkzJ2WzJRpxhRtaZMLpgCIktaiPc="; + hash = "sha256-PneHMWX7IRoX4oSm8iePeI+pEPs8n3F2PW06ZWKDFcc="; }; - cargoHash = "sha256-PMZGYxdB9cbWLVtvfRtWsRqVwJWayPbrdhpKvxmq3dM="; + cargoHash = "sha256-DCfO2N6ml1a1P2hFs3gxRE9k+WYv8eqMzwL+cionwYE="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ce/cernlib/package.nix b/pkgs/by-name/ce/cernlib/package.nix index 0dc50aa77f9b..e029773d7c89 100644 --- a/pkgs/by-name/ce/cernlib/package.nix +++ b/pkgs/by-name/ce/cernlib/package.nix @@ -67,7 +67,6 @@ stdenv.mkDerivation rec { "aarch64-linux" "i686-linux" "x86_64-linux" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ veprbl ]; license = lib.licenses.gpl2; diff --git a/pkgs/by-name/ch/chalk/package.nix b/pkgs/by-name/ch/chalk/package.nix index fb794b4b81e9..3411c52109ca 100644 --- a/pkgs/by-name/ch/chalk/package.nix +++ b/pkgs/by-name/ch/chalk/package.nix @@ -9,13 +9,11 @@ let chalkVersion = "1.34.9"; chalkPathPiecesByNixSystem = { "aarch64-darwin" = "Darwin/aarch64"; - "x86_64-darwin" = "Darwin/x86_64"; "aarch64-linux" = "Linux/aarch64"; "x86_64-linux" = "Linux/x86_64"; }; chalkHashByNixSystem = { "aarch64-darwin" = "sha256-owDGsT/2tU1Y3JKWAQkYNG18dOxXIST/3bfjXJf1gXU="; - "x86_64-darwin" = "sha256-lCRYekUmXFW6V/zvbvWCqzxr0bbpvQwk1wgWtAYuPuQ="; "aarch64-linux" = "sha256-uvhjhLbVBGB5SNFbfgtpaeLULFnEm3x8fN9ffyJzSSM="; "x86_64-linux" = "sha256-lC5SwvZzYJqomRrK42roSQr4/GZScM2VdgiQ9DOSkHQ="; }; @@ -47,7 +45,6 @@ stdenv.mkDerivation { mainProgram = "chalk"; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; diff --git a/pkgs/by-name/ch/cheesecutter/package.nix b/pkgs/by-name/ch/cheesecutter/package.nix index 88b64568da1d..fc363f829648 100644 --- a/pkgs/by-name/ch/cheesecutter/package.nix +++ b/pkgs/by-name/ch/cheesecutter/package.nix @@ -83,7 +83,6 @@ stdenv.mkDerivation { platforms = [ "x86_64-linux" "i686-linux" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ OPNA2608 ]; mainProgram = "ccutter"; diff --git a/pkgs/by-name/ch/chez/package.nix b/pkgs/by-name/ch/chez/package.nix index 7551fc866a9e..645746d78052 100644 --- a/pkgs/by-name/ch/chez/package.nix +++ b/pkgs/by-name/ch/chez/package.nix @@ -23,7 +23,6 @@ let "x86_64-linux" = "ta6le"; "x86-linux" = "ti3le"; "aarch64-linux" = "tarm64le"; - "x86_64-darwin" = "ta6osx"; "aarch64-darwin" = "tarm64osx"; "x86_64-windows" = "ta6nt"; "aarch64-windows" = "tarm64nt"; diff --git a/pkgs/by-name/cl/clouddrive2/package.nix b/pkgs/by-name/cl/clouddrive2/package.nix index 3d92141714e2..8eb9b9a0c30e 100644 --- a/pkgs/by-name/cl/clouddrive2/package.nix +++ b/pkgs/by-name/cl/clouddrive2/package.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation (finalAttrs: { { x86_64-linux = "sha256-X5WAnHyXdAkWrN/AbkDE0eNH4mwdPcZ0Cs5Q21KB6/w="; aarch64-linux = "sha256-somHyDBG94pGQB+IZd404H1tX0X2qC8LeIcXeihU6yA="; - x86_64-darwin = "sha256-O28IQTelQSZj9P4ETYaeQfxvN5Etxed4ZwvfJB4vBM8="; aarch64-darwin = "sha256-GaL2bCwQdtI3bq2wkwza1OEHFvhppdZpUIq3QRQ0vN8="; } .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); @@ -58,7 +57,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/cl/cloudflare-warp/package.nix b/pkgs/by-name/cl/cloudflare-warp/package.nix index fca8a5bc535e..809f6f028740 100644 --- a/pkgs/by-name/cl/cloudflare-warp/package.nix +++ b/pkgs/by-name/cl/cloudflare-warp/package.nix @@ -27,7 +27,7 @@ let version = "2026.3.846.0"; - sources = rec { + sources = { x86_64-linux = fetchurl { url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}_amd64.deb"; hash = "sha256-1SKTK0QW+3CcqBLqHbIsPny/6ekyjZe9qRcjYOMnR58="; @@ -40,7 +40,6 @@ let url = "https://downloads.cloudflareclient.com/v1/download/macos/version/${version}"; hash = "sha256-cDmoM0nIYYQyurJeeiVSX0IWJdIY0pVLmjIae5mEXI4="; }; - x86_64-darwin = aarch64-darwin; }; in stdenv.mkDerivation (finalAttrs: { @@ -222,7 +221,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/co/coconutbattery/package.nix b/pkgs/by-name/co/coconutbattery/package.nix index 687f839e3d81..a0240542cb9d 100644 --- a/pkgs/by-name/co/coconutbattery/package.nix +++ b/pkgs/by-name/co/coconutbattery/package.nix @@ -36,7 +36,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ stepbrobd ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/co/code-cursor/sources.json b/pkgs/by-name/co/code-cursor/sources.json index 11bed61cd65f..d9bb6464be94 100644 --- a/pkgs/by-name/co/code-cursor/sources.json +++ b/pkgs/by-name/co/code-cursor/sources.json @@ -10,10 +10,6 @@ "url": "https://downloads.cursor.com/production/bf249e6efb5b097f23d7e21d7283429f0760b74a/linux/arm64/Cursor-3.11.19-aarch64.AppImage", "hash": "sha256-lFAK6xTIA3d0kmjybDYsMTYZhDbr/xasDG/NuZmE83Y=" }, - "x86_64-darwin": { - "url": "https://downloads.cursor.com/production/bf249e6efb5b097f23d7e21d7283429f0760b74a/darwin/x64/Cursor-darwin-x64.dmg", - "hash": "sha256-gM0FOE9dTet5Fp7PG0DHsHSXb5fLohuNiiEt1J2wbSE=" - }, "aarch64-darwin": { "url": "https://downloads.cursor.com/production/bf249e6efb5b097f23d7e21d7283429f0760b74a/darwin/arm64/Cursor-darwin-arm64.dmg", "hash": "sha256-WQ2OfTaGqELWTfjgU4n5tgfgTHQSA06RxERa6pkdukU=" diff --git a/pkgs/by-name/co/code-server/package.nix b/pkgs/by-name/co/code-server/package.nix index 87c5dd768006..469afda541e2 100644 --- a/pkgs/by-name/co/code-server/package.nix +++ b/pkgs/by-name/co/code-server/package.nix @@ -62,7 +62,6 @@ let { x86_64-linux = "linux-x64"; aarch64-linux = "linux-arm64"; - x86_64-darwin = "darwin-x64"; aarch64-darwin = "darwin-arm64"; } .${system}; @@ -356,7 +355,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" ]; mainProgram = "code-server"; }; diff --git a/pkgs/by-name/co/codegraph/package.nix b/pkgs/by-name/co/codegraph/package.nix index 21642fdc283d..7f068105e424 100644 --- a/pkgs/by-name/co/codegraph/package.nix +++ b/pkgs/by-name/co/codegraph/package.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation (finalAttrs: { { "aarch64-darwin" = "codegraph-darwin-arm64"; "aarch64-linux" = "codegraph-linux-arm64"; - "x86_64-darwin" = "codegraph-darwin-x64"; "x86_64-linux" = "codegraph-linux-x64"; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -82,10 +81,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/colbymchenry/codegraph/releases/download/v${finalAttrs.version}/codegraph-linux-arm64.tar.gz"; hash = "sha256-DWLF6yci+NGdIPehvZdEReGNUpTLWb4Ragw9Vc6HWR8="; }; - "x86_64-darwin" = fetchurl { - url = "https://github.com/colbymchenry/codegraph/releases/download/v${finalAttrs.version}/codegraph-darwin-x64.tar.gz"; - hash = "sha256-Q2+WlDz9km6m0KhFTxiDPSElTV/Zs9IkMXsUJhMt75U="; - }; "x86_64-linux" = fetchurl { url = "https://github.com/colbymchenry/codegraph/releases/download/v${finalAttrs.version}/codegraph-linux-x64.tar.gz"; hash = "sha256-+1hf9QGNb6qkbSgrYfT2ibx5Z+2KG0Z6XFVt187ZtUI="; diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix index 1de6073e6d26..31b4c65bbf5f 100644 --- a/pkgs/by-name/co/codeium/package.nix +++ b/pkgs/by-name/co/codeium/package.nix @@ -15,7 +15,6 @@ let { x86_64-linux = "linux_x64"; aarch64-linux = "linux_arm"; - x86_64-darwin = "macos_x64"; aarch64-darwin = "macos_arm"; } @@ -25,7 +24,6 @@ let { x86_64-linux = "sha256-hx5q0JRwvmE63uOpht7+6d7/jCLeknrj2RwiiMkBllc="; aarch64-linux = "sha256-r0gGxwhVkQ5MLTmcrBCJpKfsizAJLJYPw1VdfiHJ3i8="; - x86_64-darwin = "sha256-LI+qp82dorbZCyibCVwx04tiCoRz3SkT1kUyAFlKWys="; aarch64-darwin = "sha256-c0BDLK1ilDOdNYbOqzFNoJFeBUlWI7/+z7HaosM/D4o="; } .${system} or throwSystem; @@ -84,7 +82,6 @@ stdenv.mkDerivation (finalAttrs: { "aarch64-darwin" "aarch64-linux" "x86_64-linux" - "x86_64-darwin" ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; diff --git a/pkgs/by-name/co/coder/package.nix b/pkgs/by-name/co/coder/package.nix index d953252e0a3b..db0fc4b16120 100644 --- a/pkgs/by-name/co/coder/package.nix +++ b/pkgs/by-name/co/coder/package.nix @@ -18,7 +18,6 @@ let version = "2.33.11"; hash = { x86_64-linux = "sha256-NY9xyLc6Pr1wWPnr4fLo6t+7B7Gin/BlTH3tdxQk30k="; - x86_64-darwin = "sha256-yEHu+ekyZSUd66L9sR8ihVLFnDe9N/kFKLGHOFfx9es="; aarch64-linux = "sha256-Wc9hhotJKcb1fdjfh9pWxVs/e4YpBua1PyAhMRJbUAY="; aarch64-darwin = "sha256-7A6BxOg4A3Ua5SXjnh5gtG/LE94iGuRQPe/S9UjX/oc="; }; @@ -27,7 +26,6 @@ let version = "2.34.5"; hash = { x86_64-linux = "sha256-B0roCJqTu6o89nHbVA3b9eHKj/VmJ9i1j4blF1I76yU="; - x86_64-darwin = "sha256-+7QhdfwFqh9SZBJOgOqS0Y49dUsWM6PC0/oBhfuAkfM="; aarch64-linux = "sha256-UDyEhBAlvgSHWLPtbNXHj6X2gle1Y3fjQLSKHzwc/XI="; aarch64-darwin = "sha256-VhliikNdqi7AauYlKQvMroEjR3jZZnhNw0HTtJFw5zg="; }; @@ -46,7 +44,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { { x86_64-linux = "linux_amd64"; aarch64-linux = "linux_arm64"; - x86_64-darwin = "darwin_amd64"; aarch64-darwin = "darwin_arm64"; } .${system}; @@ -55,7 +52,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { { x86_64-linux = "tar.gz"; aarch64-linux = "tar.gz"; - x86_64-darwin = "zip"; aarch64-darwin = "zip"; } .${system}; diff --git a/pkgs/by-name/co/codex-acp/librusty_v8.nix b/pkgs/by-name/co/codex-acp/librusty_v8.nix index c2f00c5fe62e..58ee83b3833e 100644 --- a/pkgs/by-name/co/codex-acp/librusty_v8.nix +++ b/pkgs/by-name/co/codex-acp/librusty_v8.nix @@ -12,7 +12,6 @@ fetchurl { { x86_64-linux = "sha256-5ktNmeSuKTouhGJEqJuAF4uhA4LBP7WRwfppaPUpEVM="; aarch64-linux = "sha256-2/FlsHyBvbBUvARrQ9I+afz3vMGkwbW0d2mDpxBi7Ng="; - x86_64-darwin = "sha256-YwzSQPG77NsHFBfcGDh6uBz2fFScHFFaC0/Pnrpke7c="; aarch64-darwin = "sha256-v+LJvjKlbChUbw+WWCXuaPv2BkBfMQzE4XtEilaM+Yo="; } .${stdenv.hostPlatform.system} diff --git a/pkgs/by-name/co/codex/librusty_v8.nix b/pkgs/by-name/co/codex/librusty_v8.nix index 213a3174cee3..9b38127fc5f6 100644 --- a/pkgs/by-name/co/codex/librusty_v8.nix +++ b/pkgs/by-name/co/codex/librusty_v8.nix @@ -6,7 +6,6 @@ fetchLibrustyV8 { shas = { x86_64-linux = "sha256-5ktNmeSuKTouhGJEqJuAF4uhA4LBP7WRwfppaPUpEVM="; aarch64-linux = "sha256-2/FlsHyBvbBUvARrQ9I+afz3vMGkwbW0d2mDpxBi7Ng="; - x86_64-darwin = "sha256-YwzSQPG77NsHFBfcGDh6uBz2fFScHFFaC0/Pnrpke7c="; aarch64-darwin = "sha256-v+LJvjKlbChUbw+WWCXuaPv2BkBfMQzE4XtEilaM+Yo="; }; } diff --git a/pkgs/by-name/co/codexbar/package.nix b/pkgs/by-name/co/codexbar/package.nix index e91c7026221c..62684d7c3540 100644 --- a/pkgs/by-name/co/codexbar/package.nix +++ b/pkgs/by-name/co/codexbar/package.nix @@ -3,29 +3,34 @@ stdenvNoCC, fetchurl, nix-update-script, + makeWrapper, unzip, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "codexbar"; - version = "0.41.0"; + version = "0.43.0"; __structuredAttrs = true; strictDeps = true; src = fetchurl { url = "https://github.com/steipete/CodexBar/releases/download/v${finalAttrs.version}/CodexBar-macos-universal-${finalAttrs.version}.zip"; - hash = "sha256-M3i05Yu15uTLd/bO5E5bYen3dYo1iTEI/z7+VxeFhY0="; + hash = "sha256-dKr5/7HzgqDXUwkHGj1z534ekTajyUFNSrpg+vK/4Yw="; }; sourceRoot = "."; - nativeBuildInputs = [ unzip ]; + nativeBuildInputs = [ + makeWrapper + unzip + ]; installPhase = '' runHook preInstall mkdir -p $out/Applications - cp -r *.app $out/Applications + cp -r CodexBar.app $out/Applications + makeWrapper $out/Applications/CodexBar.app/Contents/MacOS/CodexBar $out/bin/codexbar runHook postInstall ''; @@ -44,5 +49,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; platforms = lib.platforms.darwin; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + mainProgram = "codexbar"; }; }) diff --git a/pkgs/by-name/co/confluent-cli/package.nix b/pkgs/by-name/co/confluent-cli/package.nix index 4e3d2fabc11d..8ae7ef9ed628 100644 --- a/pkgs/by-name/co/confluent-cli/package.nix +++ b/pkgs/by-name/co/confluent-cli/package.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation (finalAttrs: { system = selectSystem { x86_64-linux = "linux_amd64"; aarch64-linux = "linux_arm64"; - x86_64-darwin = "darwin_amd64"; aarch64-darwin = "darwin_arm64"; }; in @@ -28,7 +27,6 @@ stdenv.mkDerivation (finalAttrs: { hash = selectSystem { x86_64-linux = "sha256-52zPTIuJOS+MMG1+pA+f0HI7VvBHLsRnSq5zWorHsiQ="; aarch64-linux = "sha256-hdhMSZR593rcjch4EVdRshC72aTp1c3dTQBlLCDMsVg="; - x86_64-darwin = "sha256-ybzj3fv+7Wdix9ez7cARazhpkxMGi/EO8NbpneWGN4I="; aarch64-darwin = "sha256-YOVGl47XOvvHDtm2/VzzLOeFCA6sw8BuDHQWZgzNNtE="; }; }; diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix index 851e409fad4b..a942e14695cf 100644 --- a/pkgs/by-name/co/copilot-language-server/package.nix +++ b/pkgs/by-name/co/copilot-language-server/package.nix @@ -10,11 +10,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "copilot-language-server"; - version = "1.517.0"; + version = "1.521.0"; src = fetchzip { url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip"; - hash = "sha256-BzvUARAI8DOEYHPMavJdtSkr+ZCj/E+mM9wQtmEGyjY="; + hash = "sha256-uHt22/756jxh34HhIbMEu3nGebbTF1325ylWuKzZzEI="; stripRoot = false; }; @@ -58,7 +58,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix b/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix index 0dae81d299c6..5b46ca14a230 100644 --- a/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix +++ b/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation { license = lib.licenses.mit; platforms = [ "x86_64-linux" - "x86_64-darwin" ]; # The last successful Darwin Hydra build was in 2023 broken = stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/cr/crates-lsp/package.nix b/pkgs/by-name/cr/crates-lsp/package.nix index c297cebaf644..bf41babb8ea4 100644 --- a/pkgs/by-name/cr/crates-lsp/package.nix +++ b/pkgs/by-name/cr/crates-lsp/package.nix @@ -28,7 +28,6 @@ rustPlatform.buildRustPackage (finalAttrs: { "x86_64-linux" "aarch64-linux" "aarch64-darwin" - "x86_64-darwin" "x86_64-windows" ]; maintainers = with lib.maintainers; [ steveej ]; diff --git a/pkgs/by-name/cr/crates-tui/package.nix b/pkgs/by-name/cr/crates-tui/package.nix index f601887ddc7f..b5c7145a24a0 100644 --- a/pkgs/by-name/cr/crates-tui/package.nix +++ b/pkgs/by-name/cr/crates-tui/package.nix @@ -40,7 +40,6 @@ rustPlatform.buildRustPackage { platforms = [ "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" "x86_64-windows" ]; maintainers = with lib.maintainers; [ pluiedev ]; diff --git a/pkgs/by-name/cu/cursor-cli/package.nix b/pkgs/by-name/cu/cursor-cli/package.nix index 8d3f8946c574..195956b2ed5e 100644 --- a/pkgs/by-name/cu/cursor-cli/package.nix +++ b/pkgs/by-name/cu/cursor-cli/package.nix @@ -17,10 +17,6 @@ let url = "https://downloads.cursor.com/lab/2026.06.26-7079533/linux/arm64/agent-cli-package.tar.gz"; hash = "sha256-WcMurHV8Pm/2Y1HvNJGZYqjgt3OzHwn5oW5W27egueE="; }; - x86_64-darwin = fetchurl { - url = "https://downloads.cursor.com/lab/2026.06.26-7079533/darwin/x64/agent-cli-package.tar.gz"; - hash = "sha256-5J2SA5AoyOxT9Ng58MnyCFtNllQCYhbO5MQZaONwgsk="; - }; aarch64-darwin = fetchurl { url = "https://downloads.cursor.com/lab/2026.06.26-7079533/darwin/arm64/agent-cli-package.tar.gz"; hash = "sha256-UO8SRA6depwO9SNhvYl9uOy9Dp625vHVNiyfxtmq3c4="; diff --git a/pkgs/by-name/cy/cypress/package.nix b/pkgs/by-name/cy/cypress/package.nix index 11170463fc34..8673e221f023 100644 --- a/pkgs/by-name/cy/cypress/package.nix +++ b/pkgs/by-name/cy/cypress/package.nix @@ -29,10 +29,6 @@ let platform = "darwin-arm64"; hash = "sha256-8qvMsC+tRKK12jC2r1A54kS/PZ6q+sErvLvTkse6Kn4="; }; - x86_64-darwin = { - platform = "darwin-x64"; - hash = "sha256-cCLJloLcuCDgTEiMMJKY6rYiPPhZfFfqXFP5NAMhw4Q="; - }; }; inherit (stdenv.hostPlatform) system; binary = diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index cb4cf4679e46..6627d34277af 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -28,13 +28,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { suffix = selectSystem { x86_64-linux = "linux-x86_64.tar.gz"; aarch64-linux = "linux-aarch64.tar.gz"; - x86_64-darwin = "macos-x86_64.dmg"; aarch64-darwin = "macos-aarch64.dmg"; }; hash = selectSystem { x86_64-linux = "sha256-atbQ00lq589FlNem85NgzTKGyhTRpFII8OSfVfYQuD0="; aarch64-linux = "sha256-Sde0q31hXMqX2oxfhgj5EcpeUYYFZJy61usaJVpZkLM="; - x86_64-darwin = "sha256-EmTHuzEc4beM52hC2T7poZ1SOKa9kO2Rp3NnctlsBYo="; aarch64-darwin = "sha256-PwuFwEE+aBEG/ykwNrEBl20yfrade8BdUUHdLJGBkwc="; }; in diff --git a/pkgs/by-name/db/dbgate/package.nix b/pkgs/by-name/db/dbgate/package.nix index aba4e08601d0..8a8c8d042914 100644 --- a/pkgs/by-name/db/dbgate/package.nix +++ b/pkgs/by-name/db/dbgate/package.nix @@ -20,10 +20,6 @@ let url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_x86_64.AppImage"; hash = "sha256-QR44QZ5QNz/q9Cfp/d5EYjlG84ZmCtBFe8a4aMFEhjQ="; }; - x86_64-darwin = { - url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_x64.dmg"; - hash = "sha256-pTE8Na078B2njCrpuN0xt75PkjwepXnuhphB8Qqcsls="; - }; aarch64-darwin = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_universal.dmg"; hash = "sha256-luk0vWRc4x3QMYAPquTWiSW9FqTe1IsBm9qOoOeHOps="; @@ -42,7 +38,6 @@ let mainProgram = "dbgate"; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; diff --git a/pkgs/by-name/dc/dcp/package.nix b/pkgs/by-name/dc/dcp/package.nix index 6dffa4736f19..89a9bd5850ea 100644 --- a/pkgs/by-name/dc/dcp/package.nix +++ b/pkgs/by-name/dc/dcp/package.nix @@ -15,13 +15,13 @@ buildGoModule (finalAttrs: { pname = "dcp"; - version = "0.25.2"; + version = "0.25.5"; src = fetchFromGitHub { owner = "microsoft"; repo = "dcp"; tag = "v${finalAttrs.version}"; - hash = "sha256-afQa5arDC9GD0jzzKBSc+zHrNmHpn91HdcWDeFzpbzQ="; + hash = "sha256-umcrTAPWAInbjdZYhY0xEbI7heGwr+8FGMI7BIWSdD0="; }; vendorHash = "sha256-hcuVUUr3kr3iBmSEhHy365LIWGGLFTYnBRa5jnt7kPw="; diff --git a/pkgs/by-name/de/debase/package.nix b/pkgs/by-name/de/debase/package.nix index 5afb703d27a7..424d38460dc5 100644 --- a/pkgs/by-name/de/debase/package.nix +++ b/pkgs/by-name/de/debase/package.nix @@ -77,7 +77,6 @@ stdenv.mkDerivation rec { platforms = [ # Only these systems are supported by Makefile "x86_64-linux" - "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix index 01096528ff05..284eb950d8d2 100644 --- a/pkgs/by-name/de/deno/package.nix +++ b/pkgs/by-name/de/deno/package.nix @@ -295,7 +295,6 @@ rustPlatform.buildRustPackage (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/de/depotdownloader/package.nix b/pkgs/by-name/de/depotdownloader/package.nix index 43768226ed97..108ef26ed1f5 100644 --- a/pkgs/by-name/de/depotdownloader/package.nix +++ b/pkgs/by-name/de/depotdownloader/package.nix @@ -32,7 +32,6 @@ buildDotnetModule rec { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "DepotDownloader"; diff --git a/pkgs/by-name/di/discord-gamesdk/package.nix b/pkgs/by-name/di/discord-gamesdk/package.nix index 8f9fff09dd6e..4163284b8099 100644 --- a/pkgs/by-name/di/discord-gamesdk/package.nix +++ b/pkgs/by-name/di/discord-gamesdk/package.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" "x86_64-windows" ]; diff --git a/pkgs/by-name/di/disk-inventory-x/package.nix b/pkgs/by-name/di/disk-inventory-x/package.nix deleted file mode 100644 index 86d35df055f6..000000000000 --- a/pkgs/by-name/di/disk-inventory-x/package.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchurl, - undmg, -}: -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "disk-inventory-x"; - version = "1.3"; - - src = fetchurl { - url = "https://www.derlien.com/diskinventoryx/downloads/Disk%20Inventory%20X%20${finalAttrs.version}.dmg"; - sha256 = "1rfqp8ia6ficvqxynn43f1pba4rfmhf61kn2ihysbnjs8c33bbvq"; - }; - sourceRoot = "."; - - nativeBuildInputs = [ undmg ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/Applications - cp -r *.app $out/Applications - - runHook postInstall - ''; - - meta = { - description = "Disk usage utility for Mac OS X"; - homepage = "https://www.derlien.com"; - license = lib.licenses.gpl3Plus; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ emilytrau ]; - platforms = [ "x86_64-darwin" ]; - }; -}) diff --git a/pkgs/by-name/dm/dmd/binary.nix b/pkgs/by-name/dm/dmd/binary.nix index 395468f59ac5..fec299c9976d 100644 --- a/pkgs/by-name/dm/dmd/binary.nix +++ b/pkgs/by-name/dm/dmd/binary.nix @@ -86,7 +86,6 @@ stdenv.mkDerivation { maintainers = [ lib.maintainers.lionello ]; homepage = "https://dlang.org/"; platforms = [ - "x86_64-darwin" "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/by-name/dm/dmd/generic.nix b/pkgs/by-name/dm/dmd/generic.nix index 971addbeaf51..4408faabee09 100644 --- a/pkgs/by-name/dm/dmd/generic.nix +++ b/pkgs/by-name/dm/dmd/generic.nix @@ -242,7 +242,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "i686-linux" - "x86_64-darwin" ]; # ld: section __DATA/__thread_bss has type zero-fill but non-zero file offset file '/private/tmp/nix-build-dmd-2.109.1.drv-0/.rdmd-301/rdmd-build.d-A1CF043A7D87C5E88A58F3C0EF5A0DF7/objs/build.o' for architecture x86_64 # clang-16: error: linker command failed with exit code 1 (use -v to see invocation) diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix index 00d6545bc097..4af408029750 100644 --- a/pkgs/by-name/dp/dprint/package.nix +++ b/pkgs/by-name/dp/dprint/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "dprint"; - version = "0.55.1"; + version = "0.55.2"; # Prefer repository rather than crate here # - They have Cargo.lock in the repository @@ -21,10 +21,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "dprint"; repo = "dprint"; tag = finalAttrs.version; - hash = "sha256-OXXLpKgP2cUuPl7ikgZVPFgJiLY0Zy8MmBkz8Kp2+XM="; + hash = "sha256-80YdmDyyofBoHhLcldI9l1chpI6NKScyLQneJ068q/U="; }; - cargoHash = "sha256-IDxJPicTq0/7LI/07QfJrteaKAHDoeKdzpbEv871xxE="; + cargoHash = "sha256-b6N4cKzsYRJEhvxVAtc+kfQJeDJMD7IpkGm14e9Icuo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/du/dub/package.nix b/pkgs/by-name/du/dub/package.nix index 457af1c63539..27e2de5e22f9 100644 --- a/pkgs/by-name/du/dub/package.nix +++ b/pkgs/by-name/du/dub/package.nix @@ -163,7 +163,6 @@ stdenv.mkDerivation (finalAttrs: { "x86_64-linux" "i686-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/dw/dwproton-bin/package.nix b/pkgs/by-name/dw/dwproton-bin/package.nix index 0d10c39ca128..350041457939 100644 --- a/pkgs/by-name/dw/dwproton-bin/package.nix +++ b/pkgs/by-name/dw/dwproton-bin/package.nix @@ -11,11 +11,11 @@ proton-ge-bin.overrideAttrs ( inherit steamDisplayName; pname = "dwproton-bin"; - version = "dwproton-11.0-5"; + version = "dwproton-11.0-7"; src = fetchzip { url = "https://dawn.wine/dawn-winery/dwproton/releases/download/${finalAttrs.version}/${finalAttrs.version}-x86_64.tar.xz"; - hash = "sha256-2x4xotJ2aJYbg+G2TDPqyU7uuoc/hZQon9CA6SFGin0="; + hash = "sha256-M8wcC7pKFs0Qena5NN9ylq2TykRfPK7JiHnzP6DkZv0="; }; preFixup = '' diff --git a/pkgs/by-name/dx/dxmt/package.nix b/pkgs/by-name/dx/dxmt/package.nix deleted file mode 100644 index 2545292cb01b..000000000000 --- a/pkgs/by-name/dx/dxmt/package.nix +++ /dev/null @@ -1,132 +0,0 @@ -{ - lib, - stdenv, - pkgsCross, - fetchFromGitHub, - buildPackages, - cmake, - git, - python3, - meson, - ninja, - tinyxxd, - sqlite, - libz, - ncurses, - libxml2, - wine64, - darwin, - symlinkJoin, -}: -let - dxmt-llvm = stdenv.mkDerivation rec { - pname = "dxmt-llvm"; - version = "15.0.7"; - - src = fetchFromGitHub { - owner = "llvm"; - repo = "llvm-project"; - tag = version; - hash = "sha256-wjuZQyXQ/jsmvy6y1aksCcEDXGBjuhpgngF3XQJ/T4s="; - }; - - nativeBuildInputs = [ - cmake - git - ninja - python3 - ]; - - cmakeFlags = [ - "-DLLVM_ENABLE_ZSTD=OFF" - "-DLLVM_BUILD_TOOLS=Off" - "-S ../llvm" - ]; - }; - inherit (darwin) xcode; - - dxmt = pkgsCross.mingwW64.stdenv.mkDerivation (finalAttrs: { - pname = "dxmt"; - version = "0.80"; - - src = fetchFromGitHub { - owner = "3shain"; - repo = "dxmt"; - rev = "v${finalAttrs.version}"; - hash = "sha256-HNSKqEYu8se8DyzwRbqfmHRRyBXyW6D5ddPaEdnkuL4="; - fetchSubmodules = true; - }; - - patches = [ - ./winecrt0.patch - ]; - - postPatch = '' - substituteInPlace src/airconv/darwin/meson.build --replace-fail -lcurses -lncurses - - sed -e "/find_program('xcrun')/d" \ - -e "s,metalir_generator = generator(xcrun,metalir_generator = generator(find_program('${xcode}/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/metal')," \ - -e "s,metallib_generator = generator(xcrun,metallib_generator = generator(find_program('${xcode}/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/metallib')," \ - -e "s/'-sdk', 'macosx', 'metal\(lib\)\{0,1\}', //" \ - -i meson.build - ''; - - nativeBuildInputs = [ - meson - ninja - tinyxxd - buildPackages.stdenv.cc - ]; - - buildInputs = [ - sqlite - libz - ncurses - libxml2 - ]; - - mesonFlags = [ - (lib.mesonOption "native_llvm_path" "${dxmt-llvm}") - (lib.mesonOption "wine_install_path" "${wine64}") - ]; - - preBuild = '' - export HOME=$TMPDIR - ''; - - __structuredAttrs = true; - strictDeps = true; - - meta = { - description = "Metal-based translation layer for Direct3D 10/11"; - homepage = "https://github.com/3shain/dxmt"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.feyorsh ]; - platforms = lib.platforms.windows; - hydraPlatforms = [ ]; - }; - }); -in -symlinkJoin { - name = "dxmt-${dxmt.version}"; - - paths = [ dxmt ]; - - passthru = { - inherit dxmt; - }; - - __structuredAttrs = true; - strictDeps = true; - - meta = { - inherit (dxmt.meta) - description - homepage - maintainers - license - ; - platforms = [ "x86_64-darwin" ]; - hydraPlatforms = [ ]; - }; -} diff --git a/pkgs/by-name/dx/dxmt/winecrt0.patch b/pkgs/by-name/dx/dxmt/winecrt0.patch deleted file mode 100644 index f4d0830659bb..000000000000 --- a/pkgs/by-name/dx/dxmt/winecrt0.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git c/src/winemetal/meson.build i/src/winemetal/meson.build -index 858d4b3..d937e29 100644 ---- c/src/winemetal/meson.build -+++ i/src/winemetal/meson.build -@@ -26,8 +26,19 @@ elif wine_install_path != '' - if not wine_install_path.startswith('/') - wine_install_path = join_paths(meson.project_source_root(), wine_install_path) - endif -- lib_winecrt0 = cc.find_library('winecrt0', dirs : [ join_paths(wine_install_path,'lib/wine', windows_builtin_install_dir) ]) -- lib_ntdll = cc.find_library('ntdll', dirs : [ join_paths(wine_install_path, 'lib/wine', windows_builtin_install_dir)], static: true) -+ winecrt0_unix_archive = custom_target( -+ 'winecrt0_fixup', -+ output : 'libwinecrt0_fixed.a', -+ command : [ -+ 'sh', '-c', -+ 'ar p "$1" unix_lib.o > unix_lib.o && ar crs "$2" unix_lib.o', -+ 'sh', -+ join_paths(wine_install_path, 'lib/wine', windows_builtin_install_dir, 'libwinecrt0.a'), -+ '@OUTPUT@', -+ ], -+ ) -+ lib_winecrt0 = declare_dependency(sources : winecrt0_unix_archive) -+ lib_ntdll = cc.find_library('ntdll', dirs : [ join_paths(wine_install_path, 'lib/wine', windows_builtin_install_dir)]) - lib_dbghelp = cc.find_library('dbghelp', dirs : [ join_paths(wine_install_path, 'lib/wine', windows_builtin_install_dir) ]) - winebuild = join_paths(wine_install_path, 'bin/winebuild') - else -@@ -59,4 +70,4 @@ custom_target('postprocess_lib', - - if cpu_family == 'x86_64' or cpu_family == 'aarch64' - subdir('unix') --endif -\ No newline at end of file -+endif diff --git a/pkgs/by-name/dx/dxvk/package.nix b/pkgs/by-name/dx/dxvk/package.nix index 144bfe33609b..f4af351b33c1 100644 --- a/pkgs/by-name/dx/dxvk/package.nix +++ b/pkgs/by-name/dx/dxvk/package.nix @@ -84,7 +84,6 @@ stdenvNoCC.mkDerivation ( maintainers = [ lib.maintainers.reckenrode ]; license = lib.licenses.zlib; platforms = [ - "x86_64-darwin" "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/by-name/el/electron-mail/package.nix b/pkgs/by-name/el/electron-mail/package.nix index 335241bfcf75..965e6ad8746d 100644 --- a/pkgs/by-name/el/electron-mail/package.nix +++ b/pkgs/by-name/el/electron-mail/package.nix @@ -21,10 +21,6 @@ let url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-mac-arm64.dmg"; hash = "sha256-V32Wi0oCU9dLfzqxg3OdseiILX7wPiBGNz7KuG0vlZY="; }; - x86_64-darwin = fetchurl { - url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-mac-x64.dmg"; - hash = "sha256-I1UvFMSdAwkqgkhn+mkBGslA8v+VTajO/Za0lJ5uYZ8="; - }; }; src = sources.${stdenvNoCC.hostPlatform.system}; @@ -45,7 +41,6 @@ let platforms = [ "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" ]; changelog = "https://github.com/vladimiry/ElectronMail/releases/tag/v${version}"; }; diff --git a/pkgs/by-name/en/envoy-bin/package.nix b/pkgs/by-name/en/envoy-bin/package.nix index 47ad70b28786..fcbf5d0a0033 100644 --- a/pkgs/by-name/en/envoy-bin/package.nix +++ b/pkgs/by-name/en/envoy-bin/package.nix @@ -7,7 +7,7 @@ versionCheckHook, }: let - version = "1.38.2"; + version = "1.39.0"; inherit (stdenvNoCC.hostPlatform) system; throwSystem = throw "envoy-bin is not available for ${system}."; @@ -20,8 +20,8 @@ let hash = { - aarch64-linux = "sha256-nHFdDu2KrzqZgw7glwvDtevH1CIbvB4vP/chBWHanX0="; - x86_64-linux = "sha256-h3RKH8mY1ncHjJcDEToZLQgwutxoiGYkQWMoR/yziJk="; + aarch64-linux = "sha256-7lOk9TdVZvFZRNycsDr7H8Io3zj2FzfGd/E5ITIVr88="; + x86_64-linux = "sha256-RAna3IeTHY+GdjFMvYMHHLZRJftP6sP2M1gAWA36khg="; } .${system} or throwSystem; in diff --git a/pkgs/by-name/er/erlang-language-platform/package.nix b/pkgs/by-name/er/erlang-language-platform/package.nix index 6288fddca42a..89109ff74a3d 100644 --- a/pkgs/by-name/er/erlang-language-platform/package.nix +++ b/pkgs/by-name/er/erlang-language-platform/package.nix @@ -65,7 +65,6 @@ stdenv.mkDerivation rec { "aarch64-linux" "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ offsetcyan ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; diff --git a/pkgs/by-name/ev/eventstore/package.nix b/pkgs/by-name/ev/eventstore/package.nix index 156cc0d5983d..9b7b80e40dbf 100644 --- a/pkgs/by-name/ev/eventstore/package.nix +++ b/pkgs/by-name/ev/eventstore/package.nix @@ -82,7 +82,6 @@ buildDotnetModule rec { ]; platforms = [ "x86_64-linux" - "x86_64-darwin" ]; inherit mainProgram; }; diff --git a/pkgs/by-name/fa/fasmg/package.nix b/pkgs/by-name/fa/fasmg/package.nix index dec77f1f04d4..1ea5b4b1977b 100644 --- a/pkgs/by-name/fa/fasmg/package.nix +++ b/pkgs/by-name/fa/fasmg/package.nix @@ -32,10 +32,6 @@ stdenv.mkDerivation (finalAttrs: { bin = "fasmg.x64"; asm = "source/linux/x64/fasmg.asm"; }; - x86_64-darwin = { - bin = "source/macos/x64/fasmg"; - asm = "source/macos/x64/fasmg.asm"; - }; x86-linux = { bin = "fasmg"; asm = "source/linux/fasmg.asm"; diff --git a/pkgs/by-name/fa/fastfetch-unwrapped/package.nix b/pkgs/by-name/fa/fastfetch-unwrapped/package.nix index 3fe6b67b2fa9..cae780fd2c07 100644 --- a/pkgs/by-name/fa/fastfetch-unwrapped/package.nix +++ b/pkgs/by-name/fa/fastfetch-unwrapped/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastfetch-unwrapped"; - version = "2.65.2"; + version = "2.66.0"; strictDeps = true; __structuredAttrs = true; @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "fastfetch-cli"; repo = "fastfetch"; tag = finalAttrs.version; - hash = "sha256-yRKxETZEIlpl42y+adp9wpQhD6ZDebdfGj4SL1zxr3w="; + hash = "sha256-ttszEPEywszDGHoYKZYXM2WAUcuOSIj589LeEWxtRaU="; }; outputs = [ diff --git a/pkgs/by-name/fe/fermyon-spin/package.nix b/pkgs/by-name/fe/fermyon-spin/package.nix index 44a7f6761d0c..3354659377e0 100644 --- a/pkgs/by-name/fe/fermyon-spin/package.nix +++ b/pkgs/by-name/fe/fermyon-spin/package.nix @@ -14,7 +14,6 @@ let { x86_64-linux = "linux-amd64"; aarch64-linux = "linux-aarch64"; - x86_64-darwin = "macos-amd64"; aarch64-darwin = "macos-aarch64"; } .${system} or (throw "Unsupported system: ${system}"); @@ -22,7 +21,6 @@ let packageHashes = { x86_64-linux = "sha256-eVI8/JNCTVVbNJPH6gfg+0guH9mXLymoO+oLp9dkvwA="; aarch64-linux = "sha256-84ESEqr07JxqcxxRWrUFKmS+Uvws3RsVtC9EgXqCqdw="; - x86_64-darwin = "sha256-X/Hl/vIsepm/jf6srSYim6Ucy3TN0XQgdOluep6Ohrw="; aarch64-darwin = "sha256-0WpDjZJhw/jB55G5IUdgvwOaYlqRCY5itk5sVjogYn4="; }; diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix deleted file mode 100644 index 2de7dfe9bf3c..000000000000 --- a/pkgs/by-name/ff/fflogs/package.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - appimageTools, - fetchurl, -}: - -let - pname = "fflogs"; - version = "9.3.65"; - src = fetchurl { - url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage"; - hash = "sha256-HsanoX1iJpLC8p64H4enlo20X6LOBNAxkubwPBp5juA="; - }; - extracted = appimageTools.extractType2 { inherit pname version src; }; -in -appimageTools.wrapType2 { - inherit pname version src; - - extraInstallCommands = '' - mkdir -p $out/share/applications - mkdir -p $out/share/icons/hicolor/512x512/apps - cp -r ${extracted}/usr/share/icons/hicolor/512x512/apps/'FF Logs Uploader.png' $out/share/icons/hicolor/512x512/apps/fflogs.png - chmod -R +w $out/share/ - test ! -e $out/share/icons/hicolor/0x0 # check for regression of https://github.com/electron-userland/electron-builder/issues/5294 - cp ${extracted}/'FF Logs Uploader.desktop' $out/share/applications/fflogs.desktop - sed -i 's@^Exec=AppRun --no-sandbox@Exec=fflogs@g' $out/share/applications/fflogs.desktop - sed -i 's@^Icon=FF Logs Uploader@Icon=fflogs@g' $out/share/applications/fflogs.desktop - ''; - - meta = { - description = "Application for uploading Final Fantasy XIV combat logs to fflogs.com"; - homepage = "https://www.fflogs.com/client/download"; - downloadPage = "https://github.com/RPGLogs/Uploaders-fflogs/releases/latest"; - license = lib.licenses.unfree; # no license listed - mainProgram = "fflogs"; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ keysmashes ]; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/by-name/fi/filen-cli/package.nix b/pkgs/by-name/fi/filen-cli/package.nix index d4202deff945..f49e06e0318c 100644 --- a/pkgs/by-name/fi/filen-cli/package.nix +++ b/pkgs/by-name/fi/filen-cli/package.nix @@ -59,7 +59,6 @@ let { aarch64-darwin = "sha256-+nTCiCEXsEz7YqRZkHlP3CWL7e7OPdds33BTwfqTL5c="; aarch64-linux = "sha256-uvL498mHFXwoZpeCwsup4Iyh4l5buVnqLRBMyGVRIlA="; - x86_64-darwin = "sha256-5nEB6JQLmHasxcIReoiLLLRdSiaT1CRAmGFVyqdd+VY="; x86_64-linux = "sha256-Ky+ewpdd5nKvRzXwEAUgT7P/OW3v6fdb2r6SGxZ/JEc="; } .${stdenv.hostPlatform.system} @@ -143,7 +142,6 @@ stdenv.mkDerivation { platforms = [ "aarch64-darwin" "aarch64-linux" - "x86_64-darwin" "x86_64-linux" ]; }; diff --git a/pkgs/by-name/fi/filtr/package.nix b/pkgs/by-name/fi/filtr/package.nix index 64ee9511d35d..4ba17c3a3d3e 100644 --- a/pkgs/by-name/fi/filtr/package.nix +++ b/pkgs/by-name/fi/filtr/package.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "filtr"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "tiagolr"; repo = "filtr"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-LW21Hv0Gs7csgHg9tMPa4fmZGAby64uDAOdkwhOSwx4="; + hash = "sha256-diOM6Y2HrOP5wXg4tVXms7TYOSM16t06ZDg1/Q1L/zc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix index d9afbec8e06e..6b6bd3e8eaf4 100644 --- a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix +++ b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix @@ -16,13 +16,13 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "firefly-iii-data-importer"; - version = "2.3.2"; + version = "2.3.4"; src = fetchFromGitHub { owner = "firefly-iii"; repo = "data-importer"; tag = "v${finalAttrs.version}"; - hash = "sha256-JLN13SCpMXByu3rWSclcsLBGCLFMzHGHOM+bWLJ2MPw="; + hash = "sha256-869oPalwVdc7Ge8zcG6OniTZ6zhLOknlvFQkEHzLg0M="; }; buildInputs = [ php ]; @@ -42,12 +42,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { composerStrictValidation = true; strictDeps = true; - vendorHash = "sha256-QobjMMPEhLvsTwlJJvf4nUi1PcZEDOaU8EzexluOI90="; + vendorHash = "sha256-GEioAwqo9BHzoP4/uetqiQgv+O9Qzqyo/AcW9VP23n0="; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; name = "${finalAttrs.pname}-npm-deps"; - hash = "sha256-NkxCvC0EPMLi7GV5GG1+5niL3KIaqBsleo11/gzaX/s="; + hash = "sha256-FEEC89/7cEuKU4mY27Pm5nr5EkOoL7BWZRAOpCZK61I="; }; composerRepository = php.mkComposerRepository { diff --git a/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json b/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json index 47abcca624ef..c10dfd437b94 100644 --- a/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json +++ b/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json @@ -12,10 +12,6 @@ "aarch64-darwin": { "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.15.2/floorp-macOS-universal.dmg", "sha256": "c4e64d732cd687e6711230d84cac687e8e4d28cc056f66a665fbf03ac2861b7b" - }, - "x86_64-darwin": { - "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.15.2/floorp-macOS-universal.dmg", - "sha256": "c4e64d732cd687e6711230d84cac687e8e4d28cc056f66a665fbf03ac2861b7b" } } } diff --git a/pkgs/by-name/fl/flywheel-cli/package.nix b/pkgs/by-name/fl/flywheel-cli/package.nix index dfc2a3b68421..b134fa032be8 100644 --- a/pkgs/by-name/fl/flywheel-cli/package.nix +++ b/pkgs/by-name/fl/flywheel-cli/package.nix @@ -11,14 +11,12 @@ let os = { - x86_64-darwin = "darwin"; x86_64-linux = "linux"; } .${system} or throwSystem; sha256 = { - x86_64-darwin = "sha256-OIyEu3Hsobui9s5+T9nC10SxMw0MhgmTA4SN9Ridyzo="; x86_64-linux = "sha256-SxBjRd95hoh2zwX6IDnkZnTWVduQafPHvnWw8qTuM78="; } .${system} or throwSystem; @@ -52,7 +50,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ rbreslow ]; platforms = [ - "x86_64-darwin" "x86_64-linux" ]; }; diff --git a/pkgs/by-name/fm/fmodex/package.nix b/pkgs/by-name/fm/fmodex/package.nix index 36d0e24d9250..702efa275e19 100644 --- a/pkgs/by-name/fm/fmodex/package.nix +++ b/pkgs/by-name/fm/fmodex/package.nix @@ -61,7 +61,6 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "i686-linux" - "x86_64-darwin" ]; maintainers = [ lib.maintainers.lassulus ]; }; diff --git a/pkgs/by-name/fr/freelens-bin/package.nix b/pkgs/by-name/fr/freelens-bin/package.nix index adc3239312c1..25aea7c42f28 100644 --- a/pkgs/by-name/fr/freelens-bin/package.nix +++ b/pkgs/by-name/fr/freelens-bin/package.nix @@ -27,10 +27,6 @@ let url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-linux-arm64.AppImage"; hash = "sha256-Pw6RPa6T9jN7XAfOqj6lDFzTqhwOT1DgK35cANyBAOE="; }; - x86_64-darwin = { - url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-macos-amd64.dmg"; - hash = "sha256-6qn/3Zly7nvj9XxihUdmkguLWw0a7Y321Xv7EnJzjkc="; - }; aarch64-darwin = { url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-macos-arm64.dmg"; hash = "sha256-ARIvUMkkdUK5O6xdplXJ/JkPdezO/16HvO2P21W6y8I="; diff --git a/pkgs/by-name/fx/fx-cast-bridge/package.nix b/pkgs/by-name/fx/fx-cast-bridge/package.nix index b5276379abc0..1acb35b25238 100644 --- a/pkgs/by-name/fx/fx-cast-bridge/package.nix +++ b/pkgs/by-name/fx/fx-cast-bridge/package.nix @@ -72,7 +72,6 @@ buildNpmPackage rec { platforms = [ "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" ]; # aarch64-linux wasn't support in upstream according to README broken = stdenv.hostPlatform.isDarwin; mainProgram = "fx_cast_bridge"; diff --git a/pkgs/by-name/fz/fzf-zsh-plugin/package.nix b/pkgs/by-name/fz/fzf-zsh-plugin/package.nix index 705e4a99b5f1..f955a1c27f89 100644 --- a/pkgs/by-name/fz/fzf-zsh-plugin/package.nix +++ b/pkgs/by-name/fz/fzf-zsh-plugin/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "fzf-zsh-plugin"; - version = "1.0.0-unstable-2026-06-30"; + version = "1.0.0-unstable-2026-07-09"; src = fetchFromGitHub { owner = "unixorn"; repo = "fzf-zsh-plugin"; - rev = "6f953534d4c69a7340d27b7dcf14f406a22bed61"; - hash = "sha256-RQrxCU7f3LSepUYm0+2ljvJfzVh8yp4NMJHxssA60Vk="; + rev = "92187cbc8fe91b7c5ab3a186e566682f64286879"; + hash = "sha256-JedEqrcaJmVL8PF850xP7csgvFzDpcCqW8lJ/5WHklY="; }; strictDeps = true; diff --git a/pkgs/by-name/ga/gauge/plugins/go/data.json b/pkgs/by-name/ga/gauge/plugins/go/data.json index b4c9904bbea4..6a423125a65c 100644 --- a/pkgs/by-name/ga/gauge/plugins/go/data.json +++ b/pkgs/by-name/ga/gauge/plugins/go/data.json @@ -4,10 +4,6 @@ "url": "https://github.com/getgauge-contrib/gauge-go/releases/download/v0.4.0/gauge-go-0.4.0-darwin.arm64.zip", "hash": "sha256-tMo3+gQPnldCARm0WB7UYSMwaVpz90N2BiTzmvIFTg0=" }, - "x86_64-darwin": { - "url": "https://github.com/getgauge-contrib/gauge-go/releases/download/v0.4.0/gauge-go-0.4.0-darwin.x86_64.zip", - "hash": "sha256-zfrEDRyflvvp4Hf2+42RL+5ooY0iBU0bkO2caOAGp74=" - }, "x86_64-linux": { "url": "https://github.com/getgauge-contrib/gauge-go/releases/download/v0.4.0/gauge-go-0.4.0-linux.x86_64.zip", "hash": "sha256-JEHjk51vYCFAcj9xant2vBU3BZI0krYbfZk9ALjdIs0=" diff --git a/pkgs/by-name/ga/gauge/plugins/go/default.nix b/pkgs/by-name/ga/gauge/plugins/go/default.nix index 09b89bb82f7d..a766b71a0117 100644 --- a/pkgs/by-name/ga/gauge/plugins/go/default.nix +++ b/pkgs/by-name/ga/gauge/plugins/go/default.nix @@ -17,7 +17,6 @@ makeGaugePlugin { sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" "x86_64-linux" ]; }; diff --git a/pkgs/by-name/ga/gauge/plugins/html-report/data.json b/pkgs/by-name/ga/gauge/plugins/html-report/data.json index c307371ca4fd..8e797b972857 100644 --- a/pkgs/by-name/ga/gauge/plugins/html-report/data.json +++ b/pkgs/by-name/ga/gauge/plugins/html-report/data.json @@ -4,10 +4,6 @@ "url": "https://github.com/getgauge/html-report/releases/download/v4.3.2/html-report-4.3.2-darwin.arm64.zip", "hash": "sha256-30RW9I9QTGncnwNTj0/rLlVCQ1wo8oJ2Q0gchHk+ioM=" }, - "x86_64-darwin": { - "url": "https://github.com/getgauge/html-report/releases/download/v4.3.2/html-report-4.3.2-darwin.x86_64.zip", - "hash": "sha256-6dC1gObS4msHr+KyKZufDpDQ9MgAIfqUPSIW7jWewtU=" - }, "aarch64-linux": { "url": "https://github.com/getgauge/html-report/releases/download/v4.3.2/html-report-4.3.2-linux.arm64.zip", "hash": "sha256-sayeQCuoJbeDWK7s/86ApMhzxHhxsyBB4D9QCMxJ/p8=" diff --git a/pkgs/by-name/ga/gauge/plugins/html-report/default.nix b/pkgs/by-name/ga/gauge/plugins/html-report/default.nix index 4d07f023de9b..c41c1add4ba2 100644 --- a/pkgs/by-name/ga/gauge/plugins/html-report/default.nix +++ b/pkgs/by-name/ga/gauge/plugins/html-report/default.nix @@ -17,7 +17,6 @@ makeGaugePlugin { sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" "aarch64-linux" "x86_64-linux" ]; diff --git a/pkgs/by-name/ga/gauge/plugins/java/data.json b/pkgs/by-name/ga/gauge/plugins/java/data.json index 1c0861f5cdb6..ef7944717914 100644 --- a/pkgs/by-name/ga/gauge/plugins/java/data.json +++ b/pkgs/by-name/ga/gauge/plugins/java/data.json @@ -4,10 +4,6 @@ "url": "https://github.com/getgauge/gauge-java/releases/download/v0.12.0/gauge-java-0.12.0-darwin.arm64.zip", "hash": "sha256-vN0FqYT/73+OPGIYEsPwB+eSQ6n5SrFwlHfFybBDpEo=" }, - "x86_64-darwin": { - "url": "https://github.com/getgauge/gauge-java/releases/download/v0.12.0/gauge-java-0.12.0-darwin.x86_64.zip", - "hash": "sha256-loKFJzvFshMY206t1z01d4q5jTxKtB0o7nmN4qFWDDQ=" - }, "aarch64-linux": { "url": "https://github.com/getgauge/gauge-java/releases/download/v0.12.0/gauge-java-0.12.0-linux.arm64.zip", "hash": "sha256-z6nclV/gUDR/jTA4DKaP1HVwuM3U3IVljbYzrlGF15A=" diff --git a/pkgs/by-name/ga/gauge/plugins/java/default.nix b/pkgs/by-name/ga/gauge/plugins/java/default.nix index 95843d20f914..662d80a47c24 100644 --- a/pkgs/by-name/ga/gauge/plugins/java/default.nix +++ b/pkgs/by-name/ga/gauge/plugins/java/default.nix @@ -22,7 +22,6 @@ makeGaugePlugin { ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" "aarch64-linux" "x86_64-linux" ]; diff --git a/pkgs/by-name/ga/gauge/plugins/make-gauge-plugin.nix b/pkgs/by-name/ga/gauge/plugins/make-gauge-plugin.nix index 36025ca24492..e720d8694304 100644 --- a/pkgs/by-name/ga/gauge/plugins/make-gauge-plugin.nix +++ b/pkgs/by-name/ga/gauge/plugins/make-gauge-plugin.nix @@ -37,7 +37,6 @@ let ; # Upstream uses a different naming scheme for platforms systemMap = { - "x86_64-darwin" = "darwin.x86_64"; "aarch64-darwin" = "darwin.arm64"; "aarch64-linux" = "linux.arm64"; "x86_64-linux" = "linux.x86_64"; diff --git a/pkgs/by-name/ga/gauge/plugins/ruby/data.json b/pkgs/by-name/ga/gauge/plugins/ruby/data.json index 3fb1653b0465..219525a8b9ff 100644 --- a/pkgs/by-name/ga/gauge/plugins/ruby/data.json +++ b/pkgs/by-name/ga/gauge/plugins/ruby/data.json @@ -4,10 +4,6 @@ "url": "https://github.com/getgauge/gauge-ruby/releases/download/v0.9.3/gauge-ruby-0.9.3-darwin.arm64.zip", "hash": "sha256-s0/hTqVP4Pa1yk474TYUF1dbXy+NbrtJjwBxRXShXqQ=" }, - "x86_64-darwin": { - "url": "https://github.com/getgauge/gauge-ruby/releases/download/v0.9.3/gauge-ruby-0.9.3-darwin.x86_64.zip", - "hash": "sha256-NNPIR6ZueZ3coavMM9AeqC+O/I/xcfnEo8KTiQivvQs=" - }, "aarch64-linux": { "url": "https://github.com/getgauge/gauge-ruby/releases/download/v0.9.3/gauge-ruby-0.9.3-linux.arm64.zip", "hash": "sha256-vd3KZ1Lc2F81xknc6+tPNxLjZWD8oCMBsCAuw2iJURw=" diff --git a/pkgs/by-name/ga/gauge/plugins/ruby/default.nix b/pkgs/by-name/ga/gauge/plugins/ruby/default.nix index 3754cd9f617a..17d1976f0de1 100644 --- a/pkgs/by-name/ga/gauge/plugins/ruby/default.nix +++ b/pkgs/by-name/ga/gauge/plugins/ruby/default.nix @@ -17,7 +17,6 @@ makeGaugePlugin { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" "aarch64-linux" "x86_64-linux" ]; diff --git a/pkgs/by-name/ga/gauge/plugins/screenshot/data.json b/pkgs/by-name/ga/gauge/plugins/screenshot/data.json index dd06efc09a7a..f0a50c659b92 100644 --- a/pkgs/by-name/ga/gauge/plugins/screenshot/data.json +++ b/pkgs/by-name/ga/gauge/plugins/screenshot/data.json @@ -1,9 +1,5 @@ { "version": "0.3.2", - "x86_64-darwin": { - "url": "https://github.com/getgauge/gauge_screenshot/releases/download/v0.3.2/screenshot-0.3.2-darwin.x86_64.zip", - "hash": "sha256-0qOdBQv6TCiwHizvbb47Sj0aUcMtID4qQ3v5D3XGkXg=" - }, "aarch64-darwin": { "url": "https://github.com/getgauge/gauge_screenshot/releases/download/v0.3.2/screenshot-0.3.2-darwin.arm64.zip", "hash": "sha256-hsFevOBgKbUIMpNcEyv/2A/agIuInIjLTdhmg0C54pQ=" diff --git a/pkgs/by-name/ga/gauge/plugins/screenshot/default.nix b/pkgs/by-name/ga/gauge/plugins/screenshot/default.nix index b769266051a3..c6572efbc623 100644 --- a/pkgs/by-name/ga/gauge/plugins/screenshot/default.nix +++ b/pkgs/by-name/ga/gauge/plugins/screenshot/default.nix @@ -16,7 +16,6 @@ makeGaugePlugin { maintainers = [ ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "x86_64-linux" diff --git a/pkgs/by-name/ga/gauge/plugins/xml-report/data.json b/pkgs/by-name/ga/gauge/plugins/xml-report/data.json index d3b3daf86634..10db9f0700d3 100644 --- a/pkgs/by-name/ga/gauge/plugins/xml-report/data.json +++ b/pkgs/by-name/ga/gauge/plugins/xml-report/data.json @@ -1,9 +1,5 @@ { "version": "0.5.2", - "x86_64-darwin": { - "url": "https://github.com/getgauge/xml-report/releases/download/v0.5.2/xml-report-0.5.2-darwin.x86_64.zip", - "hash": "sha256-YVH9Eh9EVDdJp8F/PXMz4egVpo8ULJmvWjWHH4iH2iI=" - }, "aarch64-darwin": { "url": "https://github.com/getgauge/xml-report/releases/download/v0.5.2/xml-report-0.5.2-darwin.arm64.zip", "hash": "sha256-UW3Axcti8r9dEfiupj2r+mcLGpFBwYQf/7mDNyynReE=" diff --git a/pkgs/by-name/ga/gauge/plugins/xml-report/default.nix b/pkgs/by-name/ga/gauge/plugins/xml-report/default.nix index 4335ff94fc35..6ebfc058ee1f 100644 --- a/pkgs/by-name/ga/gauge/plugins/xml-report/default.nix +++ b/pkgs/by-name/ga/gauge/plugins/xml-report/default.nix @@ -16,7 +16,6 @@ makeGaugePlugin { maintainers = [ ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "x86_64-linux" diff --git a/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix index 7ca004b43a97..d598c14c8ce1 100644 --- a/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix +++ b/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { { aarch64-darwin = "darwin-arm64"; aarch64-linux = "aarch64"; - x86_64-darwin = "darwin-x86_64"; x86_64-linux = "x86_64"; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -30,7 +29,6 @@ stdenv.mkDerivation rec { { aarch64-darwin = "fb6921db95d345dc7e5e487dd43b745e3a5b4d5c0c7ca4f707347148760317b4"; aarch64-linux = "c8824bffd057afce2259f7618254e840715f33523a3d4e4294f471208f976764"; - x86_64-darwin = "1ab00742d1ed0926e6f227df39d767f8efab46f5250505c29cb81f548222d794"; x86_64-linux = "95c011cee430e64dd6087c75c800f04b9c49832cc1000127a92a97f9c8d83af4"; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -104,7 +102,6 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/ge/geogram/package.nix b/pkgs/by-name/ge/geogram/package.nix index 87f89e888151..6aae896f16fc 100644 --- a/pkgs/by-name/ge/geogram/package.nix +++ b/pkgs/by-name/ge/geogram/package.nix @@ -101,7 +101,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; maintainers = with lib.maintainers; [ tmarkus ]; diff --git a/pkgs/by-name/gh/ghdl/package.nix b/pkgs/by-name/gh/ghdl/package.nix index 3f843bafb4da..b56327e67e8b 100644 --- a/pkgs/by-name/gh/ghdl/package.nix +++ b/pkgs/by-name/gh/ghdl/package.nix @@ -150,7 +150,6 @@ stdenv.mkDerivation (finalAttrs: { ]; platforms = [ "x86_64-linux" - "x86_64-darwin" ] ++ lib.optionals (backendIsLLVM || backendIsLLVMJit || backendIsGCC) [ "aarch64-linux" ] ++ lib.optionals (backendIsLLVM || backendIsLLVMJit) [ "aarch64-darwin" ]; diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix index ceb96f569302..2158bd9241a5 100644 --- a/pkgs/by-name/gi/gitaly/package.nix +++ b/pkgs/by-name/gi/gitaly/package.nix @@ -98,7 +98,7 @@ buildGoModule ( meta = { homepage = "https://gitlab.com/gitlab-org/gitaly"; description = "Git RPC service for handling all the git calls made by GitLab"; - platforms = lib.platforms.linux ++ [ "x86_64-darwin" ]; + platforms = lib.platforms.linux ++ [ ]; teams = [ lib.teams.gitlab ]; license = lib.licenses.mit; }; diff --git a/pkgs/by-name/gi/github-copilot-cli/package.nix b/pkgs/by-name/gi/github-copilot-cli/package.nix index 7bf30b233a2a..300fb5ba4bdf 100644 --- a/pkgs/by-name/gi/github-copilot-cli/package.nix +++ b/pkgs/by-name/gi/github-copilot-cli/package.nix @@ -89,7 +89,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/gi/github-copilot-intellij-agent/package.nix b/pkgs/by-name/gi/github-copilot-intellij-agent/package.nix index 626d1836645d..0748ab05d59d 100644 --- a/pkgs/by-name/gi/github-copilot-intellij-agent/package.nix +++ b/pkgs/by-name/gi/github-copilot-intellij-agent/package.nix @@ -88,7 +88,6 @@ stdenv.mkDerivation rec { mainProgram = "copilot-agent"; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix index 5c7427c84f1b..3bc156df62ba 100644 --- a/pkgs/by-name/gi/github-runner/package.nix +++ b/pkgs/by-name/gi/github-runner/package.nix @@ -370,7 +370,6 @@ buildDotnetModule (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/gi/gitkraken/package.nix b/pkgs/by-name/gi/gitkraken/package.nix index 2d42936b67ca..ddc70a42368d 100644 --- a/pkgs/by-name/gi/gitkraken/package.nix +++ b/pkgs/by-name/gi/gitkraken/package.nix @@ -66,11 +66,6 @@ let hash = "sha256-CX/NxvLrxia92vSIjWXzIiBdTfhZ8TW7a5g1hEt+Y/k="; }; - x86_64-darwin = fetchzip { - url = "https://api.gitkraken.dev/releases/production/darwin/x64/${version}/GitKraken-v${version}.zip"; - hash = "sha256-B4vFDrDy3s/d5MyGOP3pv/pGpUfpJFhvI8EWSqJhiyg="; - }; - aarch64-darwin = fetchzip { url = "https://api.gitkraken.dev/releases/production/darwin/arm64/${version}/GitKraken-v${version}.zip"; hash = "sha256-JEgqJ6smqDG/2KFApRSYTuL1Ch1sIkhGDMjqVsgQUmc="; diff --git a/pkgs/by-name/gk/gk-cli/package.nix b/pkgs/by-name/gk/gk-cli/package.nix index cce70ae497fe..58cd2315a577 100644 --- a/pkgs/by-name/gk/gk-cli/package.nix +++ b/pkgs/by-name/gk/gk-cli/package.nix @@ -85,11 +85,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-nDVehD0TTNTvhuDU8RB4lZiVcEJpB+l6EGkzckC7JuU="; stripRoot = false; }; - x86_64-darwin = fetchzip { - url = "${base_url}darwin_amd64.zip"; - hash = "sha256-Lhuqb5592T6VcTMVmAdIDfGMXaS4dSu0wbQeHheXXk4="; - stripRoot = false; - }; aarch64-windows = fetchzip { url = "${base_url}windows_arm64.zip"; hash = "sha256-sXHeqR4AW/sRPp74PieXI1n4VGV94CnrcMF1ovAek8E="; diff --git a/pkgs/by-name/go/golden-cheetah-bin/package.nix b/pkgs/by-name/go/golden-cheetah-bin/package.nix index 43468179bff4..c3b8399f43da 100644 --- a/pkgs/by-name/go/golden-cheetah-bin/package.nix +++ b/pkgs/by-name/go/golden-cheetah-bin/package.nix @@ -12,7 +12,6 @@ let description = "Performance software for cyclists, runners and triathletes. This version includes the API Tokens for e.g. Strava"; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/go/google-app-engine-go-sdk/package.nix b/pkgs/by-name/go/google-app-engine-go-sdk/package.nix index 6cea608e8941..16ef0b8e1665 100644 --- a/pkgs/by-name/go/google-app-engine-go-sdk/package.nix +++ b/pkgs/by-name/go/google-app-engine-go-sdk/package.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.asl20; platforms = [ "x86_64-linux" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ lufia ]; }; diff --git a/pkgs/by-name/go/google-cloud-sdk/data.nix b/pkgs/by-name/go/google-cloud-sdk/data.nix index 5f38c0ca139b..48f65e093eed 100644 --- a/pkgs/by-name/go/google-cloud-sdk/data.nix +++ b/pkgs/by-name/go/google-cloud-sdk/data.nix @@ -7,10 +7,6 @@ url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-570.0.0-linux-x86_64.tar.gz"; sha256 = "1qx246cy1mcngky4gcg65lzzw64anab9hqpmp6v7dqfqfld64p5k"; }; - x86_64-darwin = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-570.0.0-darwin-x86_64.tar.gz"; - sha256 = "1gk6rrj8p30zraw3n2ajy50vnd5v724s5bnhnilnml03is7ssamd"; - }; aarch64-linux = { url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-570.0.0-linux-arm.tar.gz"; sha256 = "085ykvz0y6madak8aak4bh0qyafqyiflmck0nkcb4xv6kmw6s3fa"; diff --git a/pkgs/by-name/go/goose-cli/librusty_v8.nix b/pkgs/by-name/go/goose-cli/librusty_v8.nix index 3ace8f706ca8..0baf70969fb7 100644 --- a/pkgs/by-name/go/goose-cli/librusty_v8.nix +++ b/pkgs/by-name/go/goose-cli/librusty_v8.nix @@ -6,7 +6,6 @@ fetchLibrustyV8 { shas = { x86_64-linux = "sha256-chV1PAx40UH3Ute5k3lLrgfhih39Rm3KqE+mTna6ysE="; aarch64-linux = "sha256-4IivYskhUSsMLZY97+g23UtUYh4p5jk7CzhMbMyqXyY="; - x86_64-darwin = "sha256-1jUuC+z7saQfPYILNyRJanD4+zOOhXU2ac/LFoytwho="; aarch64-darwin = "sha256-yHa1eydVCrfYGgrZANbzgmmf25p7ui1VMas2A7BhG6k="; }; } diff --git a/pkgs/by-name/gr/grafana/package.nix b/pkgs/by-name/gr/grafana/package.nix index 478bec0247dc..2fdf5e419e2d 100644 --- a/pkgs/by-name/gr/grafana/package.nix +++ b/pkgs/by-name/gr/grafana/package.nix @@ -167,7 +167,6 @@ buildGoModule (finalAttrs: { ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" "aarch64-darwin" "riscv64-linux" diff --git a/pkgs/by-name/gr/graphite-cli/package.nix b/pkgs/by-name/gr/graphite-cli/package.nix index af2cc83f569d..242a2b4c91c8 100644 --- a/pkgs/by-name/gr/graphite-cli/package.nix +++ b/pkgs/by-name/gr/graphite-cli/package.nix @@ -16,7 +16,6 @@ let suffix = selectSystem { x86_64-linux = "linux-x64"; aarch64-linux = "linux-arm64"; - x86_64-darwin = "darwin-x64"; aarch64-darwin = "darwin-arm64"; }; @@ -33,7 +32,6 @@ let platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; @@ -64,7 +62,6 @@ let hash = selectSystem { x86_64-linux = "sha256-YnG3iw35ZEyGbB9vGdcnj0qkvUfyLuaIEB5l09hkRck="; aarch64-linux = "sha256-Z4yY26hXf8++TX5tJcqufsAULTn9oUL90d9tDZj5d/k="; - x86_64-darwin = "sha256-oV0tanuk2dzB62uChni9CJtSw3eFECQi3aMBc+ZV7Do="; aarch64-darwin = "sha256-6eogi8fMOD5IgRyEdPRxdDa17WytB1JwTpKRzyyhQ2Q="; }; }; diff --git a/pkgs/by-name/gr/grok-build/package.nix b/pkgs/by-name/gr/grok-build/package.nix index 41384599d35e..8237c9a09f71 100644 --- a/pkgs/by-name/gr/grok-build/package.nix +++ b/pkgs/by-name/gr/grok-build/package.nix @@ -17,7 +17,6 @@ let platform = { x86_64-linux = "linux-x86_64"; aarch64-linux = "linux-aarch64"; - x86_64-darwin = "macos-x86_64"; aarch64-darwin = "macos-aarch64"; }; @@ -29,7 +28,6 @@ let { x86_64-linux = "sha256-Tgc407VVDzyEK8CuafRogVxjKcAIoRDQwnppTcNAETU="; aarch64-linux = "sha256-7a4g6SoKM/7ewao0iPPjgI2MTKISj8jzE/vYGOPpX18="; - x86_64-darwin = "sha256-8xDJT3lft4OY97M4cxF00Uq6IpqJWJXlyHlpr78/ypU="; aarch64-darwin = "sha256-Kpe6Z1vZkqqbmB4ug3dkYNlPRptRDAuO/ii1DSNtdnw="; } .${system}; diff --git a/pkgs/by-name/ha/hamrs/package.nix b/pkgs/by-name/ha/hamrs/package.nix index f5efef779242..197c41291142 100644 --- a/pkgs/by-name/ha/hamrs/package.nix +++ b/pkgs/by-name/ha/hamrs/package.nix @@ -21,7 +21,6 @@ let "x86_64-linux" "i686-linux" "aarch64-darwin" - "x86_64-darwin" ]; mainProgram = "hamrs"; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; diff --git a/pkgs/by-name/ha/handy/package.nix b/pkgs/by-name/ha/handy/package.nix index edb67c0a0dbe..1870494bec50 100644 --- a/pkgs/by-name/ha/handy/package.nix +++ b/pkgs/by-name/ha/handy/package.nix @@ -281,6 +281,5 @@ rustPlatform.buildRustPackage (finalAttrs: { philocalyst ]; platforms = with lib.platforms; linux ++ darwin; - badPlatforms = [ "x86_64-darwin" ]; # We weren't able to get hashes here }; }) diff --git a/pkgs/by-name/ha/harmonoid/package.nix b/pkgs/by-name/ha/harmonoid/package.nix index be44011022dd..9a78f84bcded 100644 --- a/pkgs/by-name/ha/harmonoid/package.nix +++ b/pkgs/by-name/ha/harmonoid/package.nix @@ -19,20 +19,18 @@ let version = "0.3.22"; url_base = "https://github.com/alexmercerind2/harmonoid-releases/releases/download/v${version}"; url = - rec { + { x86_64-linux = "${url_base}/harmonoid-linux-x86_64.tar.gz"; aarch64-linux = "${url_base}/harmonoid-linux-aarch64.tar.gz"; - x86_64-darwin = "${url_base}/harmonoid-macos-universal.dmg"; - aarch64-darwin = x86_64-darwin; + aarch64-darwin = "${url_base}/harmonoid-macos-universal.dmg"; } .${stdenv.hostPlatform.system} or (throw "${stdenv.hostPlatform.system} is an unsupported platform"); hash = - rec { + { x86_64-linux = "sha256-+fEx30uu0rZiORrtE00xG2piJzpFbfxSZw3OjrhLJyg="; aarch64-linux = "sha256-jXN5i+LudsODNZUzb5SXClqgQxYzanrbZCqB8X0pJRQ="; - x86_64-darwin = "sha256-YYMKrb7ZilfEztL2JTxSdeoDd8xQMrHFtN9N9fmsm3w="; - aarch64-darwin = x86_64-darwin; + aarch64-darwin = "sha256-YYMKrb7ZilfEztL2JTxSdeoDd8xQMrHFtN9N9fmsm3w="; } .${stdenv.hostPlatform.system}; in @@ -95,7 +93,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; license = { diff --git a/pkgs/by-name/ha/harmonoid/update.sh b/pkgs/by-name/ha/harmonoid/update.sh index 3b60cd92159c..b1879fc4425d 100755 --- a/pkgs/by-name/ha/harmonoid/update.sh +++ b/pkgs/by-name/ha/harmonoid/update.sh @@ -17,4 +17,4 @@ macos_hash=$(nix-hash --to-sri --type sha256 "$macos_hash") update-source-version harmonoid "$version" "$linux64_hash" --system=x86_64-linux --ignore-same-version update-source-version harmonoid "$version" "$linux_aarch_hash" --system=aarch64-linux --ignore-same-version -update-source-version harmonoid "$version" "$macos_hash" --system=x86_64-darwin --ignore-same-version +update-source-version harmonoid "$version" "$macos_hash" --system=aarch64-darwin --ignore-same-version diff --git a/pkgs/by-name/ha/hashlink/package.nix b/pkgs/by-name/ha/hashlink/package.nix index 27f7118cd6c2..a116f0677d4d 100644 --- a/pkgs/by-name/ha/hashlink/package.nix +++ b/pkgs/by-name/ha/hashlink/package.nix @@ -71,7 +71,6 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; platforms = [ "x86_64-linux" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ iblech diff --git a/pkgs/by-name/ho/hoppscotch/package.nix b/pkgs/by-name/ho/hoppscotch/package.nix index e45ed21adc28..ddbfdba315b7 100644 --- a/pkgs/by-name/ho/hoppscotch/package.nix +++ b/pkgs/by-name/ho/hoppscotch/package.nix @@ -17,10 +17,6 @@ let url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg"; hash = "sha256-RnLMpXkDAk89T5ogNiVz8zMMdLtXTlAg5nu+sjyczEk="; }; - x86_64-darwin = { - url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg"; - hash = "sha256-dBjwElYc3+TpAbho/8p946VtEDlCVDsfCSidQUKVC/U="; - }; x86_64-linux = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage"; hash = "sha256-irPI613Y1l0j5F+Nzm9v/JXsiJY35D8dQpmMcPMYvmU="; @@ -46,7 +42,6 @@ let mainProgram = "hoppscotch"; platforms = [ "aarch64-darwin" - "x86_64-darwin" "x86_64-linux" ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; diff --git a/pkgs/by-name/hy/hyperscan/package.nix b/pkgs/by-name/hy/hyperscan/package.nix index 41fe9c8ac965..d32212804412 100644 --- a/pkgs/by-name/hy/hyperscan/package.nix +++ b/pkgs/by-name/hy/hyperscan/package.nix @@ -129,7 +129,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ avnik ]; platforms = [ "x86_64-linux" - "x86_64-darwin" ]; license = lib.licenses.bsd3; }; diff --git a/pkgs/by-name/ib/ibmcloud-cli/package.nix b/pkgs/by-name/ib/ibmcloud-cli/package.nix index 8042e9afd4a0..d4048cfd7ef4 100644 --- a/pkgs/by-name/ib/ibmcloud-cli/package.nix +++ b/pkgs/by-name/ib/ibmcloud-cli/package.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://download.clis.cloud.ibm.com/ibm-cloud-cli/${finalAttrs.version}/binaries/IBM_Cloud_CLI_${finalAttrs.version}_${platform}.tgz"; hash = { - "x86_64-darwin" = "sha256-/sekaJxa8+inOBsHucyPE3yWM+Z+64jArGwCht8Corc="; "aarch64-darwin" = "sha256-JrTFbufKjX9uUwUcfxCDjqbZx6drgSmqn0F/xtce/mE="; "x86_64-linux" = "sha256-Zu6XFQeD9Dlny6cex7X6P428MiQftwn9RR4QL3H/0AU="; "aarch64-linux" = "sha256-pfHhAszhbbLKkJnwP94dCaDZNFTLr+2tnO3aHxOch+U="; diff --git a/pkgs/by-name/il/iloader/package.nix b/pkgs/by-name/il/iloader/package.nix index 6d6b87d5ad00..2caf94bfb38e 100644 --- a/pkgs/by-name/il/iloader/package.nix +++ b/pkgs/by-name/il/iloader/package.nix @@ -123,7 +123,6 @@ rustPlatform.buildRustPackage (finalAttrs: { "aarch64-linux" "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/im/immersed/package.nix b/pkgs/by-name/im/immersed/package.nix index 38ed8ab5fd60..dd97389eea7d 100644 --- a/pkgs/by-name/im/immersed/package.nix +++ b/pkgs/by-name/im/immersed/package.nix @@ -9,7 +9,7 @@ let pname = "immersed"; version = "11.0.0"; - sources = lib.mapAttrs (_: fetchurl) rec { + sources = lib.mapAttrs (_: fetchurl) { x86_64-linux = { url = "https://web.archive.org/web/20260306043741/https://static.immersed.com/dl/Immersed-x86_64.AppImage"; hash = "sha256-GbckZ/WK+7/PFQvTfUwwePtufPKVwIwSPh+Bo/cG7ko="; @@ -18,11 +18,10 @@ let url = "https://web.archive.org/web/20260306043741/https://static.immersed.com/dl/Immersed-aarch64.AppImage"; hash = "sha256-3BokV30y6QRjE94K7JQ6iIuQw1t+h3BKZY+nEFGTVHI="; }; - x86_64-darwin = { + aarch64-darwin = { url = "https://web.archive.org/web/20260306043741/https://static.immersed.com/dl/Immersed.dmg"; hash = "sha256-L5nrkchXD1NIQCknYHVhBWbVJVkkHvKaDjuk9qiY340="; }; - aarch64-darwin = x86_64-darwin; }; src = sources.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); diff --git a/pkgs/by-name/in/insomnia/package.nix b/pkgs/by-name/in/insomnia/package.nix index 002582e024f1..1292d46639cc 100644 --- a/pkgs/by-name/in/insomnia/package.nix +++ b/pkgs/by-name/in/insomnia/package.nix @@ -16,10 +16,6 @@ let url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.dmg"; hash = "sha256-sPl7KXC8Z13LFZvxuKg02iDbtrCxn//Yrr8AOOf3VD4="; }; - x86_64-darwin = { - url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.dmg"; - hash = "sha256-sPl7KXC8Z13LFZvxuKg02iDbtrCxn//Yrr8AOOf3VD4="; - }; x86_64-linux = { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.AppImage"; hash = "sha256-PlcKBQnkmgU/SsLRKX7ohrGHm7B4hK9FMkplwlbFolI="; @@ -36,7 +32,6 @@ let platforms = [ "aarch64-darwin" "x86_64-linux" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ markus1189 diff --git a/pkgs/by-name/io/iozone/package.nix b/pkgs/by-name/io/iozone/package.nix index d0a31d286279..3285519e5a18 100644 --- a/pkgs/by-name/io/iozone/package.nix +++ b/pkgs/by-name/io/iozone/package.nix @@ -69,7 +69,6 @@ stdenv.mkDerivation rec { platforms = [ "i686-linux" "x86_64-linux" - "x86_64-darwin" "aarch64-linux" ]; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix index a971e357825d..1a5f04256fab 100644 --- a/pkgs/by-name/is/isabelle/package.nix +++ b/pkgs/by-name/is/isabelle/package.nix @@ -356,7 +356,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/it/iterm2/package.nix b/pkgs/by-name/it/iterm2/package.nix index 330cb67f2afb..346b13595625 100644 --- a/pkgs/by-name/it/iterm2/package.nix +++ b/pkgs/by-name/it/iterm2/package.nix @@ -52,7 +52,6 @@ stdenvNoCC.mkDerivation rec { emaiax ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; diff --git a/pkgs/by-name/iv/iverilog/package.nix b/pkgs/by-name/iv/iverilog/package.nix index c32744a4d55d..d5cf8f12a57e 100644 --- a/pkgs/by-name/iv/iverilog/package.nix +++ b/pkgs/by-name/iv/iverilog/package.nix @@ -93,10 +93,5 @@ stdenv.mkDerivation (finalAttrs: { ]; maintainers = with lib.maintainers; [ thoughtpolice ]; platforms = lib.platforms.all; - badPlatforms = [ - # Several tests fail with: - # ==> Failed - running iverilog. - "x86_64-darwin" - ]; }; }) diff --git a/pkgs/by-name/ja/jai/package.nix b/pkgs/by-name/ja/jai/package.nix index 2849b1e6c65d..80eb1815a571 100644 --- a/pkgs/by-name/ja/jai/package.nix +++ b/pkgs/by-name/ja/jai/package.nix @@ -32,7 +32,6 @@ let maintainers = with lib.maintainers; [ samestep ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/jd/jdiskreport/package.nix b/pkgs/by-name/jd/jdiskreport/package.nix index 5c89565d2a7e..c1766867a0ab 100644 --- a/pkgs/by-name/jd/jdiskreport/package.nix +++ b/pkgs/by-name/jd/jdiskreport/package.nix @@ -63,7 +63,6 @@ stdenv.mkDerivation rec { license = lib.licenses.unfreeRedistributable; # TODO freedist, libs under BSD-3 platforms = [ "x86_64-linux" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ kylesferrazza ]; mainProgram = "jdiskreport"; diff --git a/pkgs/by-name/je/jellyfin-desktop/package.nix b/pkgs/by-name/je/jellyfin-desktop/package.nix index 4a2c0f1251aa..3d571881d290 100644 --- a/pkgs/by-name/je/jellyfin-desktop/package.nix +++ b/pkgs/by-name/je/jellyfin-desktop/package.nix @@ -86,7 +86,6 @@ stdenv.mkDerivation (finalAttrs: { "aarch64-linux" "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ jojosch diff --git a/pkgs/by-name/je/jetbrains-toolbox/package.nix b/pkgs/by-name/je/jetbrains-toolbox/package.nix index 13f6daa12ee5..39b4e819df0d 100644 --- a/pkgs/by-name/je/jetbrains-toolbox/package.nix +++ b/pkgs/by-name/je/jetbrains-toolbox/package.nix @@ -27,7 +27,6 @@ let "aarch64-linux" "aarch64-darwin" "x86_64-linux" - "x86_64-darwin" ]; mainProgram = "jetbrains-toolbox"; }; @@ -60,7 +59,6 @@ let hash = selectSystem { x86_64-linux = "sha256-GhrN3oGdNqE4cYJmSAeRATk2yS6AVF6z+/VIb7ttoJc="; aarch64-linux = "sha256-vI0niFirdAnYKF7+1+ACD31i86PgpPXUfKPkHttusRo="; - x86_64-darwin = "sha256-E58+mSFTptDE0Vb2xpfFgDOQrAB9LHi1pR+Hd7TlSYQ="; aarch64-darwin = "sha256-islydrfr1j2OlC3wyzGss+NlzjcyrMydYSv6fjFf4D0="; }; in diff --git a/pkgs/by-name/ju/jugglinglab/package.nix b/pkgs/by-name/ju/jugglinglab/package.nix index b27ef7717856..1841aefd1dcb 100644 --- a/pkgs/by-name/ju/jugglinglab/package.nix +++ b/pkgs/by-name/ju/jugglinglab/package.nix @@ -13,7 +13,6 @@ let { "x86_64-linux" = "linux-x86-64"; "aarch64-linux" = "linux-aarch64"; - "x86_64-darwin" = "darwin-x86-64"; "aarch64-darwin" = "darwin-aarch64"; } .${stdenv.system} or null; diff --git a/pkgs/by-name/ju/julec/package.nix b/pkgs/by-name/ju/julec/package.nix index bad43ba7d257..1204eb46cc68 100644 --- a/pkgs/by-name/ju/julec/package.nix +++ b/pkgs/by-name/ju/julec/package.nix @@ -116,7 +116,6 @@ clangStdenv.mkDerivation (finalAttrs: { "x86_64-linux" "aarch64-linux" "i686-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "julec"; diff --git a/pkgs/by-name/kd/kdigger/package.nix b/pkgs/by-name/kd/kdigger/package.nix index 32f3d9e98857..3d4473fde6db 100644 --- a/pkgs/by-name/kd/kdigger/package.nix +++ b/pkgs/by-name/kd/kdigger/package.nix @@ -74,7 +74,6 @@ buildGoModule (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/ke/keeweb/package.nix b/pkgs/by-name/ke/keeweb/package.nix index 50229cc3c924..e83b9b6863fa 100644 --- a/pkgs/by-name/ke/keeweb/package.nix +++ b/pkgs/by-name/ke/keeweb/package.nix @@ -36,10 +36,6 @@ let url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.linux.x64.deb"; hash = "sha256-/U+vn5TLIU9/J6cRFjuAdyGzlwC04mp4L2X2ETp+ZSE="; }; - x86_64-darwin = fetchurl { - url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.mac.x64.dmg"; - hash = "sha256-+ZFGrrw0tZ7F6lb/3iBIyGD+tp1puVhkPv10hfp6ATU="; - }; aarch64-darwin = fetchurl { url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.mac.arm64.dmg"; hash = "sha256-bkhwsWYLkec16vMOfXUce7jfrmI9W2xHiZvU1asebK4="; diff --git a/pkgs/by-name/ke/keyboard-layout-editor/package.nix b/pkgs/by-name/ke/keyboard-layout-editor/package.nix index 3c59c1790a13..a504ee36ba37 100644 --- a/pkgs/by-name/ke/keyboard-layout-editor/package.nix +++ b/pkgs/by-name/ke/keyboard-layout-editor/package.nix @@ -78,7 +78,6 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/ke/keycloak/keycloak-2fa-sms-authenticator/default.nix b/pkgs/by-name/ke/keycloak/keycloak-2fa-sms-authenticator/default.nix index e456b5f6a83a..20253474f3e0 100644 --- a/pkgs/by-name/ke/keycloak/keycloak-2fa-sms-authenticator/default.nix +++ b/pkgs/by-name/ke/keycloak/keycloak-2fa-sms-authenticator/default.nix @@ -19,7 +19,6 @@ maven.buildMavenPackage rec { let mvnHashes = { "aarch64-darwin" = "sha256-eRlu24SYe+PBOTKoAQPd5MoM7VUxHZx4/uiW6mV2PZI="; - "x86_64-darwin" = "sha256-p+XpCjXiEPMJnXIrbD2Qse/csZfv8YZ6h+sNZitCyro="; "aarch64-linux" = "sha256-4P9qM3X99dEy3ssr1+vp65QUJikRfE4EoK6LOta9IFs="; "x86_64-linux" = "sha256-wxgEHC1xJahyoizozvRfRZAWTjrYmYNM42yk+ZRke5A="; }; diff --git a/pkgs/by-name/ke/keycloak/keycloak-enforce-mfa-authenticator/default.nix b/pkgs/by-name/ke/keycloak/keycloak-enforce-mfa-authenticator/default.nix index 5a2f0bb9afa7..cbbc5e58a903 100644 --- a/pkgs/by-name/ke/keycloak/keycloak-enforce-mfa-authenticator/default.nix +++ b/pkgs/by-name/ke/keycloak/keycloak-enforce-mfa-authenticator/default.nix @@ -19,7 +19,6 @@ maven.buildMavenPackage rec { let mvnHashes = { "aarch64-darwin" = "sha256-eRlu24SYe+PBOTKoAQPd5MoM7VUxHZx4/uiW6mV2PZI="; - "x86_64-darwin" = "sha256-p+XpCjXiEPMJnXIrbD2Qse/csZfv8YZ6h+sNZitCyro="; "aarch64-linux" = "sha256-4P9qM3X99dEy3ssr1+vp65QUJikRfE4EoK6LOta9IFs="; "x86_64-linux" = "sha256-wxgEHC1xJahyoizozvRfRZAWTjrYmYNM42yk+ZRke5A="; }; diff --git a/pkgs/by-name/ke/keymapp/package.nix b/pkgs/by-name/ke/keymapp/package.nix index 0b9c11e485df..ca95ba677ca6 100644 --- a/pkgs/by-name/ke/keymapp/package.nix +++ b/pkgs/by-name/ke/keymapp/package.nix @@ -21,7 +21,6 @@ let url = "https://oryx.nyc3.cdn.digitaloceanspaces.com/keymapp/keymapp-${version}.dmg"; hash = "sha256-H6xRau7pWuSF5Aa6lblwi/Lg5KxC+HM3rtUMjX+hEE8="; }; - x86_64-darwin = aarch64-darwin; aarch64-linux = { url = "https://oryx.nyc3.cdn.digitaloceanspaces.com/keymapp/keymapp-${version}.tar.gz"; hash = "sha256-qHvHCDzWRhuhDg2kuU8kmikQDXElQtVEmPAelHz4aPo="; diff --git a/pkgs/by-name/ki/kilo/package.nix b/pkgs/by-name/ki/kilo/package.nix index 15dd55fab2e2..b49d470751de 100644 --- a/pkgs/by-name/ki/kilo/package.nix +++ b/pkgs/by-name/ki/kilo/package.nix @@ -190,11 +190,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { "aarch64-linux" "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" - ]; - badPlatforms = [ - # Broken due to Bun requiring AVX when run via Rosetta 2 on Apple Silicon. - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/ki/kiro-cli/package.nix b/pkgs/by-name/ki/kiro-cli/package.nix index 46b9a508e063..bdb2b27bd3c6 100644 --- a/pkgs/by-name/ki/kiro-cli/package.nix +++ b/pkgs/by-name/ki/kiro-cli/package.nix @@ -32,7 +32,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-aarch64-linux.tar.gz"; hash = "sha256-39hKSRi1l5ruSqObViksJkufiCOvLTaIkQzT3sNQFQQ="; }; - x86_64-darwin = darwinDmg; aarch64-darwin = darwinDmg; } .${system} or (throw "Unsupported system: ${system}"); @@ -98,7 +97,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/ki/kiro/package.nix b/pkgs/by-name/ki/kiro/package.nix index 60d81bd99c69..1a866bbd3d06 100644 --- a/pkgs/by-name/ki/kiro/package.nix +++ b/pkgs/by-name/ki/kiro/package.nix @@ -58,7 +58,6 @@ in ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "kiro"; diff --git a/pkgs/by-name/ki/kiro/sources.json b/pkgs/by-name/ki/kiro/sources.json index 08221c497282..3bbebcea1ec8 100644 --- a/pkgs/by-name/ki/kiro/sources.json +++ b/pkgs/by-name/ki/kiro/sources.json @@ -3,10 +3,6 @@ "url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.12.333/tar/kiro-ide-0.12.333-stable-linux-x64.tar.gz", "hash": "sha256-EEj0hz3fxPtesifXuFb0DQfFHaYgOQ1wgkaqcNMeX84=" }, - "x86_64-darwin": { - "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-x64/signed/0.12.333/kiro-ide-0.12.333-stable-darwin-x64.dmg", - "hash": "sha256-5oPK6JGrY+0+i/VnvRlSM/5XQJkq3pPsUB1IaoruJzw=" - }, "aarch64-darwin": { "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.12.333/kiro-ide-0.12.333-stable-darwin-arm64.dmg", "hash": "sha256-Wu5dpXzth/TTly3k019ln/cHl3ZgtS8PenGTzwR5b6Y=" diff --git a/pkgs/by-name/kn/knot-resolver_5/package.nix b/pkgs/by-name/kn/knot-resolver_5/package.nix index 1bc541bb9498..26dbd427f5a4 100644 --- a/pkgs/by-name/kn/knot-resolver_5/package.nix +++ b/pkgs/by-name/kn/knot-resolver_5/package.nix @@ -140,6 +140,7 @@ let rm -r "$out"/lib/sysusers.d/ # ATM more likely to harm than help ''; + __darwinAllowLocalNetworking = true; doInstallCheck = with stdenv; hostPlatform == buildPlatform; nativeInstallCheckInputs = [ cmocka diff --git a/pkgs/by-name/kn/knot-resolver_6/package.nix b/pkgs/by-name/kn/knot-resolver_6/package.nix index f8058a3ad70e..5223af3b2463 100644 --- a/pkgs/by-name/kn/knot-resolver_6/package.nix +++ b/pkgs/by-name/kn/knot-resolver_6/package.nix @@ -121,6 +121,7 @@ let rm -r "$out"/lib/sysusers.d/ # ATM more likely to harm than help ''; + __darwinAllowLocalNetworking = true; doInstallCheck = with stdenv; hostPlatform == buildPlatform; nativeInstallCheckInputs = [ which diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix index 5e8f45e08a92..f64b20b0cc17 100644 --- a/pkgs/by-name/la/ladybird/package.nix +++ b/pkgs/by-name/la/ladybird/package.nix @@ -216,7 +216,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "Ladybird"; diff --git a/pkgs/by-name/ld/ldc/bootstrap.nix b/pkgs/by-name/ld/ldc/bootstrap.nix index 734797cd5c2a..4c73b83d707b 100644 --- a/pkgs/by-name/ld/ldc/bootstrap.nix +++ b/pkgs/by-name/ld/ldc/bootstrap.nix @@ -72,7 +72,6 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [ lionello ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; diff --git a/pkgs/by-name/ld/ldc/package.nix b/pkgs/by-name/ld/ldc/package.nix index e57382a52b6a..e0bd2ad39ae2 100644 --- a/pkgs/by-name/ld/ldc/package.nix +++ b/pkgs/by-name/ld/ldc/package.nix @@ -177,7 +177,6 @@ stdenv.mkDerivation (finalAttrs: { "x86_64-linux" "i686-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/le/legends-of-equestria/package.nix b/pkgs/by-name/le/legends-of-equestria/package.nix index 4c1b58e89594..65539a30db33 100644 --- a/pkgs/by-name/le/legends-of-equestria/package.nix +++ b/pkgs/by-name/le/legends-of-equestria/package.nix @@ -52,10 +52,6 @@ let url = "https://mega.nz/file/QmBXXDiC#XoG19N2_uBIHVKDNId5mE4cod9q29iPkYOfGDgAX_Oo"; outputHash = "IdcowkU2k2grg133jTf3EOENATCCige64BMYXtFupRE="; }; - x86_64-darwin = { - url = "https://mega.nz/file/Uy4WzbCL#5tCRmmrizaIdilo2iYLSVkoSSNDleyQ8ZNYYT5hJsR4"; - outputHash = "D/2G7w89Z4JTP0TEjnlBKI7XCBx2LBurXZcEp0gW+JA="; - }; aarch64-darwin = { url = "https://mega.nz/file/xr4AHIrb#pD5wDIiYys2my4_59UWiYoqBpdyUQHf_CalPZe7hpME"; outputHash = "PpDUFnobznB5FHYSF+m9S3RcNIdi7eWyxxDHRdS+zlY="; diff --git a/pkgs/by-name/le/lens/package.nix b/pkgs/by-name/le/lens/package.nix index dd955dbe67de..8c06617539c8 100644 --- a/pkgs/by-name/le/lens/package.nix +++ b/pkgs/by-name/le/lens/package.nix @@ -15,10 +15,6 @@ let url = "https://api.k8slens.dev/binaries/Lens-${version}-latest.x86_64.AppImage"; hash = "sha512-P9PrtbGKaHNlzZsm10ovkYCBBfQpVWBgcVsYLETMwINP2bzrIIK5HVbkbcTEUsxK90L7MQmFwpAssojW0b9G5Q=="; }; - x86_64-darwin = { - url = "https://api.k8slens.dev/binaries/Lens-${version}-latest.dmg"; - hash = "sha512-I/i9s7O3jT+eNqqUu6B+rB+YbegKhAsZwHlc3mp2wNWW9YDilQbzKrhF9Fq2dSz2WKVZUscBtSGtXCuiPcFXzw=="; - }; aarch64-darwin = { url = "https://api.k8slens.dev/binaries/Lens-${version}-latest-arm64.dmg"; hash = "sha512-eCE3w7NlYrHiexCirH2wFN0nOO3qAt5acbldXbDMVIrG94tbgM8Y5ZO8/YIUN45XbotYtKW8/Nw+WsrTp6DPBg=="; diff --git a/pkgs/by-name/le/leo3-bin/package.nix b/pkgs/by-name/le/leo3-bin/package.nix index dfdd5f0eb22d..718e2c281425 100644 --- a/pkgs/by-name/le/leo3-bin/package.nix +++ b/pkgs/by-name/le/leo3-bin/package.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "leo3"; - version = "1.2"; + version = "1.7.18"; src = fetchurl { - url = "https://github.com/leoprover/Leo-III/releases/download/v${finalAttrs.version}/leo3.jar"; - sha256 = "1lgwxbr1rnk72rnvc8raq5i1q71ckhn998pwd9xk6zf27wlzijk7"; + url = "https://github.com/leoprover/Leo-III/releases/download/v${finalAttrs.version}/leo3-v${finalAttrs.version}.jar"; + sha256 = "sha256-HEUi8Krxv9u9Rq/2Gu0Tts86sseaAZq+pccJ4Q5MRr0="; }; dontUnpack = true; diff --git a/pkgs/by-name/le/lexy/package.nix b/pkgs/by-name/le/lexy/package.nix index 192651fb22f8..b3fb30eeafc9 100644 --- a/pkgs/by-name/le/lexy/package.nix +++ b/pkgs/by-name/le/lexy/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "lexy"; - version = "0.6.0"; + version = "0.6.3"; pyproject = true; src = fetchFromGitHub { owner = "antoniorodr"; repo = "lexy"; tag = "v${finalAttrs.version}"; - hash = "sha256-1Q7ntShhzE9OUrifIV9GjCp6BvUv1OmtH7SRLGYUhYU="; + hash = "sha256-OT+RaoIC+CxHHFdi3Hp405B/tWCTsPPrK8aDowKOUFc="; }; build-system = [ diff --git a/pkgs/by-name/li/libfrida-core/package.nix b/pkgs/by-name/li/libfrida-core/package.nix index df551379428b..7a0515460c24 100644 --- a/pkgs/by-name/li/libfrida-core/package.nix +++ b/pkgs/by-name/li/libfrida-core/package.nix @@ -35,10 +35,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { url = "https://github.com/frida/frida/releases/download/${finalAttrs.version}/frida-core-devkit-${finalAttrs.version}-linux-arm64.tar.xz"; hash = "sha256-ryGe+T9GP3CitQMZHwco0d5tNoyXQ9TUwRG2D5E+Hp0="; }; - x86_64-darwin = fetchurl { - url = "https://github.com/frida/frida/releases/download/${finalAttrs.version}/frida-core-devkit-${finalAttrs.version}-macos-x86_64.tar.xz"; - hash = "sha256-x76PBEkQ7j1nIHucxV/BCmmOfRhiJUiCXGQk/Iw7KTE="; - }; aarch64-darwin = fetchurl { url = "https://github.com/frida/frida/releases/download/${finalAttrs.version}/frida-core-devkit-${finalAttrs.version}-macos-arm64.tar.xz"; hash = "sha256-CmOkZ+/w/Vh6V5lJ8jzXU5ZLi0FWXXXIFgPLdb+nu88="; diff --git a/pkgs/by-name/li/libwhereami/package.nix b/pkgs/by-name/li/libwhereami/package.nix index e77179f3066d..6c03202f9e7e 100644 --- a/pkgs/by-name/li/libwhereami/package.nix +++ b/pkgs/by-name/li/libwhereami/package.nix @@ -50,7 +50,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "i686-linux" "x86_64-linux" - "x86_64-darwin" ]; # fails on aarch64 }; diff --git a/pkgs/by-name/lo/localsend/package.nix b/pkgs/by-name/lo/localsend/package.nix index 0db8997810e4..e7337d1034a6 100644 --- a/pkgs/by-name/lo/localsend/package.nix +++ b/pkgs/by-name/lo/localsend/package.nix @@ -132,7 +132,6 @@ let mainProgram = "localsend"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/lu/luau-lsp/package.nix b/pkgs/by-name/lu/luau-lsp/package.nix index 0caaceacf2d0..a2c108728a95 100644 --- a/pkgs/by-name/lu/luau-lsp/package.nix +++ b/pkgs/by-name/lu/luau-lsp/package.nix @@ -57,10 +57,5 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ HeitorAugustoLN ]; mainProgram = "luau-lsp"; platforms = lib.platforms.all; - badPlatforms = [ - # Could not find a package configuration file provided by "Protobuf" - # It is unclear why this is only happening on x86_64-darwin - "x86_64-darwin" - ]; }; }) diff --git a/pkgs/by-name/lu/lunar/package.nix b/pkgs/by-name/lu/lunar/package.nix index d14faf6a0b11..8e1647755a0c 100644 --- a/pkgs/by-name/lu/lunar/package.nix +++ b/pkgs/by-name/lu/lunar/package.nix @@ -40,7 +40,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; maintainers = with lib.maintainers; [ delafthi ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/lv/lvtk/package.nix b/pkgs/by-name/lv/lvtk/package.nix index 7e0b9f8ff379..f84dd1bac181 100644 --- a/pkgs/by-name/lv/lvtk/package.nix +++ b/pkgs/by-name/lv/lvtk/package.nix @@ -51,7 +51,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ bot-wxt1221 ]; platforms = lib.platforms.unix; badPlatforms = [ - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/ma/mactracker/package.nix b/pkgs/by-name/ma/mactracker/package.nix index 6ed1c53b5007..f6b9a4a30bad 100644 --- a/pkgs/by-name/ma/mactracker/package.nix +++ b/pkgs/by-name/ma/mactracker/package.nix @@ -72,7 +72,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ DimitarNestorov ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/ma/mailspring/mailcore2.nix b/pkgs/by-name/ma/mailspring/mailcore2.nix index aa5c4e4f5ba9..c3dccc1d0bc4 100644 --- a/pkgs/by-name/ma/mailspring/mailcore2.nix +++ b/pkgs/by-name/ma/mailspring/mailcore2.nix @@ -99,7 +99,6 @@ stdenv.mkDerivation { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/ma/mailspring/mailsync.nix b/pkgs/by-name/ma/mailspring/mailsync.nix index cd112e3b4740..6f77d031ec29 100644 --- a/pkgs/by-name/ma/mailspring/mailsync.nix +++ b/pkgs/by-name/ma/mailspring/mailsync.nix @@ -131,7 +131,6 @@ stdenv.mkDerivation { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/ma/mailspring/package.nix b/pkgs/by-name/ma/mailspring/package.nix index fecb9bd4c470..d084abef9230 100644 --- a/pkgs/by-name/ma/mailspring/package.nix +++ b/pkgs/by-name/ma/mailspring/package.nix @@ -56,7 +56,6 @@ let platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; @@ -154,7 +153,6 @@ buildNpmPackage (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/ma/markdownlint-cli/package.nix b/pkgs/by-name/ma/markdownlint-cli/package.nix index 12d9eb3175d7..edaa8a8c37e8 100644 --- a/pkgs/by-name/ma/markdownlint-cli/package.nix +++ b/pkgs/by-name/ma/markdownlint-cli/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "markdownlint-cli"; - version = "0.49.0"; + version = "0.49.1"; src = fetchFromGitHub { owner = "igorshubovych"; repo = "markdownlint-cli"; rev = "v${version}"; - hash = "sha256-Se8Dw3pFGUiAMchbX4gH56aIMtvSg6wxGYecqRK1UAA="; + hash = "sha256-+zR/A7cp85ggX8MwidRzIPQ54Su4SyGOQtWy9c6fdk8="; }; - npmDepsHash = "sha256-CrffManYnidN0XgRmTBaBpu4skCMXubbfz91Q4sGh80="; + npmDepsHash = "sha256-UMaE1ZAha8D8v387YlVn47AEu6YwNop1yh80gd1Gwh4="; dontNpmBuild = true; diff --git a/pkgs/by-name/ma/marktext/package.nix b/pkgs/by-name/ma/marktext/package.nix index 6f3503763737..db7d839c5b44 100644 --- a/pkgs/by-name/ma/marktext/package.nix +++ b/pkgs/by-name/ma/marktext/package.nix @@ -173,7 +173,6 @@ stdenv.mkDerivation (finalAttrs: { bot-wxt1221 ]; badPlatforms = [ - "x86_64-darwin" "aarch64-darwin" ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/ma/mas/package.nix b/pkgs/by-name/ma/mas/package.nix index 1822215e189d..fc07f3ad0c03 100644 --- a/pkgs/by-name/ma/mas/package.nix +++ b/pkgs/by-name/ma/mas/package.nix @@ -20,10 +20,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { # nix store prefetch-file https://github.com/mas-cli/mas/releases/download/v$VERSION/mas-$VERSION-$ARCH.pkg sources = { - x86_64-darwin = { - arch = "x86_64"; - hash = "sha256-m8od4ftuoZyeC517fIUkkCDJ7WWp1DTC70CJai8zlfk="; - }; aarch64-darwin = { arch = "arm64"; hash = "sha256-vCGKhUyF2eHJVJapayYoe7ZgVrlWiLkPkdBPpi7SG3U="; @@ -85,7 +81,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { zachcoyle ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/me/meetingbar/package.nix b/pkgs/by-name/me/meetingbar/package.nix index 1038adb66296..c8b656d24b24 100644 --- a/pkgs/by-name/me/meetingbar/package.nix +++ b/pkgs/by-name/me/meetingbar/package.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ delafthi ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/me/meilisearch/package.nix b/pkgs/by-name/me/meilisearch/package.nix index 6f4876cfbf5b..e257bfba31b3 100644 --- a/pkgs/by-name/me/meilisearch/package.nix +++ b/pkgs/by-name/me/meilisearch/package.nix @@ -50,7 +50,6 @@ rustPlatform.buildRustPackage (finalAttrs: { "aarch64-linux" "aarch64-darwin" "x86_64-linux" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/me/meteor/package.nix b/pkgs/by-name/me/meteor/package.nix index 59f7148ad3f8..499113461bd7 100644 --- a/pkgs/by-name/me/meteor/package.nix +++ b/pkgs/by-name/me/meteor/package.nix @@ -20,10 +20,6 @@ let url = "https://static.meteor.com/packages-bootstrap/${version}/meteor-bootstrap-os.linux.x86_64.tar.gz"; hash = "sha256-tzzRN9UAH7+BM3fs76U5H20vD0LGMpdrMDDiJtchgEg="; }; - x86_64-darwin = fetchurl { - url = "https://static.meteor.com/packages-bootstrap/${version}/meteor-bootstrap-os.osx.x86_64.tar.gz"; - hash = "sha256-Z9Had9hscEjxHch19KCYUTqN4OikYLfz1tqEpyxw2Y8="; - }; aarch64-darwin = fetchurl { url = "https://static.meteor.com/packages-bootstrap/${version}/meteor-bootstrap-os.osx.arm64.tar.gz"; hash = "sha256-AT7njZTgf/WTHlvLEbF3dXKNoqyqHy8KloBQ4gsbPuM="; diff --git a/pkgs/by-name/mi/micropython/package.nix b/pkgs/by-name/mi/micropython/package.nix index bb7745fd2849..38df77b5a981 100644 --- a/pkgs/by-name/mi/micropython/package.nix +++ b/pkgs/by-name/mi/micropython/package.nix @@ -67,7 +67,6 @@ stdenv.mkDerivation rec { "armv6l-linux" = "Linux"; "riscv64-linux" = "Linux"; "powerpc64le-linux" = "Linux"; - "x86_64-darwin" = "Darwin"; "aarch64-darwin" = "Darwin"; } .${stdenv.hostPlatform.system} or stdenv.hostPlatform.parsed.kernel.name diff --git a/pkgs/by-name/mi/mill/package.nix b/pkgs/by-name/mi/mill/package.nix index 3f95a76c87fd..47155656b736 100644 --- a/pkgs/by-name/mi/mill/package.nix +++ b/pkgs/by-name/mi/mill/package.nix @@ -16,7 +16,6 @@ let suffixMap = { aarch64-darwin = "native-mac-aarch64"; - x86_64-darwin = "native-mac-amd64"; aarch64-linux = "native-linux-aarch64"; x86_64-linux = "native-linux-amd64"; }; @@ -33,7 +32,6 @@ stdenvNoCC.mkDerivation rec { sha256 = { aarch64-darwin = "sha256-UiooqMbxceUepk4uJV8ZSL1o4VLeTZgWs3URQFXFmQs="; - x86_64-darwin = "sha256-EvIH0GHrdFtE5m6WqHAu7XDJn/8rElpmSxLrdCx5CKY="; aarch64-linux = "sha256-Az/NCaFVrKANJvgIHx9QlW/fPyFVc4XiJ6BZr4ahfxk="; x86_64-linux = "sha256-YhygFs8+ffOgoOSpggrYQ+xS19q8koYbN9UnozlLTPY="; } @@ -118,7 +116,6 @@ stdenvNoCC.mkDerivation rec { "x86_64-linux" "aarch64-linux" "aarch64-darwin" - "x86_64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json index c761bc6d5cf4..6e1c8d36235e 100644 --- a/pkgs/by-name/mi/mirrord/manifest.json +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -12,10 +12,6 @@ "aarch64-darwin": { "url": "https://github.com/metalbear-co/mirrord/releases/download/3.229.0/mirrord_mac_universal", "hash": "sha256-o71hF5s3dwNPgubbJrO1/Vjfau3kTVZAjDYahuDpevc=" - }, - "x86_64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.229.0/mirrord_mac_universal", - "hash": "sha256-o71hF5s3dwNPgubbJrO1/Vjfau3kTVZAjDYahuDpevc=" } } } diff --git a/pkgs/by-name/mi/mirth/package.nix b/pkgs/by-name/mi/mirth/package.nix index 4aa8dfd1eab4..031fb321fd92 100644 --- a/pkgs/by-name/mi/mirth/package.nix +++ b/pkgs/by-name/mi/mirth/package.nix @@ -107,7 +107,6 @@ stdenv.mkDerivation { "aarch64-windows" "i686-linux" "i686-windows" - "x86_64-darwin" "x86_64-linux" "x86_64-windows" ]; diff --git a/pkgs/by-name/mk/mkl/package.nix b/pkgs/by-name/mk/mkl/package.nix index 31b724759e8a..0b8dd5091d61 100644 --- a/pkgs/by-name/mk/mkl/package.nix +++ b/pkgs/by-name/mk/mkl/package.nix @@ -219,7 +219,6 @@ stdenvNoCC.mkDerivation ( license = lib.licenses.issl; platforms = [ "x86_64-linux" - "x86_64-darwin" ]; }; } diff --git a/pkgs/by-name/ml/mlkit/package.nix b/pkgs/by-name/ml/mlkit/package.nix index 62b090e74a19..d845f8d4696a 100644 --- a/pkgs/by-name/ml/mlkit/package.nix +++ b/pkgs/by-name/ml/mlkit/package.nix @@ -59,7 +59,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/melsman/mlkit/blob/v${finalAttrs.version}/NEWS.md"; license = lib.licenses.gpl2Plus; platforms = [ - "x86_64-darwin" "x86_64-linux" ]; maintainers = with lib.maintainers; [ athas ]; diff --git a/pkgs/by-name/mo/mole-cleaner/package.nix b/pkgs/by-name/mo/mole-cleaner/package.nix index ad79f8ac2612..bd5380f824d0 100644 --- a/pkgs/by-name/mo/mole-cleaner/package.nix +++ b/pkgs/by-name/mo/mole-cleaner/package.nix @@ -4,32 +4,47 @@ fetchFromGitHub, makeWrapper, coreutils, - gnused, gawk, fd, - gitUpdater, + nix-update-script, versionCheckHook, writableTmpDirAsHomeHook, + writeShellScript, }: +let + duForTests = writeShellScript "mole-cleaner-du-for-tests" '' + args=() + while (( $# > 0 )); do + case "$1" in + -I) + shift + args+=("--exclude=$1") + ;; + *) + args+=("$1") + ;; + esac + shift + done + + exec ${lib.getExe' coreutils "du"} "''${args[@]}" + ''; +in buildGoModule (finalAttrs: { pname = "mole-cleaner"; - version = "1.31.0"; - __structuredAttrs = true; + version = "1.46.0"; src = fetchFromGitHub { owner = "tw93"; repo = "Mole"; tag = "V${finalAttrs.version}"; - hash = "sha256-dalmW3W/seGZreSWuYP7JN/nMUbs3WyDHzKU83EveeY="; + hash = "sha256-rIoVXEz4K0RFb1ir1gRCyDw5euNwQvLS0GwBsJhuApE="; }; - vendorHash = "sha256-LznLZ0NO8VBWP95ReAVORUMIDhh7/pgTY5mGNN2tND8="; + vendorHash = "sha256-hLFlAy4AE1eNOxd4d75Mbo3ZKlwvNK7QV2DNVPd7NHc="; - subPackages = [ - "cmd/analyze" - "cmd/status" - ]; + __structuredAttrs = true; nativeBuildInputs = [ makeWrapper @@ -39,59 +54,84 @@ buildGoModule (finalAttrs: { versionCheckHook writableTmpDirAsHomeHook coreutils - gnused gawk ]; - postInstall = '' + buildPhase = '' + runHook preBuild + go build -p "$NIX_BUILD_CORES" -o analyze ./cmd/analyze + go build -p "$NIX_BUILD_CORES" -o status ./cmd/status + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dm755 mole $out/libexec/mole/mole - install -Dm755 mo $out/libexec/mole/mo cp -r bin lib $out/libexec/mole/ - mv $out/bin/analyze $out/libexec/mole/bin/analyze-go - mv $out/bin/status $out/libexec/mole/bin/status-go + install -Dm755 analyze $out/libexec/mole/bin/analyze-go + install -Dm755 status $out/libexec/mole/bin/status-go patchShebangs $out/libexec/mole - makeWrapper $out/libexec/mole/mole $out/bin/mole \ - --prefix PATH : ${ - lib.makeBinPath [ - fd - coreutils - gnused - gawk - ] - } - makeWrapper $out/libexec/mole/mo $out/bin/mo \ - --prefix PATH : ${ - lib.makeBinPath [ - fd - coreutils - gnused - gawk - ] - } + substituteInPlace $out/libexec/mole/mole \ + --replace-fail 'update_message="$(read_update_message_cache "$msg_cache")"' 'update_message=""' + + mkdir -p $out/libexec/mole/nix-bin + ln -s ${lib.getExe' coreutils "timeout"} $out/libexec/mole/nix-bin/timeout + + makeWrapper $out/libexec/mole/mole $out/bin/mo \ + --run ' + case "$1" in + update|remove) + echo "mo $1 is unsupported for Nix-installed Mole; update or remove it through your Nix profile or configuration." >&2 + exit 1 + ;; + esac + export PATH=${ + lib.makeBinPath [ + fd + ] + }:'"$out"'/libexec/mole/nix-bin:/usr/bin:/bin:''${PATH} + ' + + runHook postInstall + ''; + + checkPhase = '' + runHook preCheck + # Keep buildGoModule's test behavior: tests can rely on their source paths. + export GOFLAGS="''${GOFLAGS//-trimpath/}" + mkdir -p "$TMPDIR/mole-test-bin" + ln -s ${duForTests} "$TMPDIR/mole-test-bin/du" + PATH="$TMPDIR/mole-test-bin:$PATH" go test ./... + runHook postCheck ''; doInstallCheck = true; - versionCheckKeepEnvironment = [ "HOME" ]; + versionCheckKeepEnvironment = "HOME PATH"; + versionCheckProgram = "${placeholder "out"}/bin/mo"; versionCheckProgramArg = "--version"; installCheckPhase = '' runHook preInstallCheck - $out/bin/mole --help > /dev/null $out/bin/mo --help > /dev/null + test -w "$HOME" + test ! -e $out/bin/mole runHook postInstallCheck ''; - passthru.updateScript = gitUpdater { rev-prefix = "V"; }; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version-regex=^V(.*)$" ]; + }; meta = { description = "CLI tool for cleaning and optimizing macOS systems"; homepage = "https://github.com/tw93/Mole"; changelog = "https://github.com/tw93/Mole/releases/tag/V${finalAttrs.version}"; - license = lib.licenses.mit; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ IanHollow ]; - mainProgram = "mole"; + mainProgram = "mo"; platforms = lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/mo/mongocxx/package.nix b/pkgs/by-name/mo/mongocxx/package.nix index 911ec75b40ad..1e7a68ee21ba 100644 --- a/pkgs/by-name/mo/mongocxx/package.nix +++ b/pkgs/by-name/mo/mongocxx/package.nix @@ -59,6 +59,5 @@ stdenv.mkDerivation (finalAttrs: { "libbsoncxx" ]; platforms = lib.platforms.all; - badPlatforms = [ "x86_64-darwin" ]; # needs sdk >= 10.14 }; }) diff --git a/pkgs/by-name/mo/mongodb-ce/package.nix b/pkgs/by-name/mo/mongodb-ce/package.nix index 5a7fe772b5e5..97a400cdfa3f 100644 --- a/pkgs/by-name/mo/mongodb-ce/package.nix +++ b/pkgs/by-name/mo/mongodb-ce/package.nix @@ -66,10 +66,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://fastdl.mongodb.org/linux/mongodb-linux-aarch64-ubuntu2404-${finalAttrs.version}.tgz"; hash = "sha256-5AX8pb1jInbQTuE0RqpqqcRXon6wKwdvoDCNDF70krE="; }; - "x86_64-darwin" = fetchurl { - url = "https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-${finalAttrs.version}.tgz"; - hash = "sha256-BLIFrmToU8tFHdjAD+0q827cyeDHoYiXwtsds6e7NMA="; - }; "aarch64-darwin" = fetchurl { url = "https://fastdl.mongodb.org/osx/mongodb-macos-arm64-${finalAttrs.version}.tgz"; hash = "sha256-M3/x/d2rVKUmIZBQ9hVuT6W9ajZy/Ut5+8aDeXF+HwY="; diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix index dc7104f0b485..a1789c333cfc 100644 --- a/pkgs/by-name/mo/mongodb-compass/package.nix +++ b/pkgs/by-name/mo/mongodb-compass/package.nix @@ -62,13 +62,11 @@ let url = "https://downloads.mongodb.com/compass/${ selectSystem { x86_64-linux = "mongodb-compass_${version}_amd64.deb"; - x86_64-darwin = "mongodb-compass-${version}-darwin-x64.zip"; aarch64-darwin = "mongodb-compass-${version}-darwin-arm64.zip"; } }"; hash = selectSystem { x86_64-linux = "sha256-faD8sIbnho5urBWE0btcmD7tXT8eQCNyJYzpIyI+bA4="; - x86_64-darwin = "sha256-Ddue3jSvQecBjxQlyh/+ujrF9NheZ9PS0Dq7J08SJr8="; aarch64-darwin = "sha256-HGOJPYC4+CgLQQ3BNUTNZUln5oqPkC8ewHft99LCZQ8="; }; }; @@ -197,7 +195,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/mo/monodraw/package.nix b/pkgs/by-name/mo/monodraw/package.nix index 3a80b9f382bf..386fe0127ef7 100644 --- a/pkgs/by-name/mo/monodraw/package.nix +++ b/pkgs/by-name/mo/monodraw/package.nix @@ -69,7 +69,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { license = lib.licenses.unfree; maintainers = with lib.maintainers; [ delafthi ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/mp/mprime/package.nix b/pkgs/by-name/mp/mprime/package.nix index e3ac811c35e9..e059e845eff1 100644 --- a/pkgs/by-name/mp/mprime/package.nix +++ b/pkgs/by-name/mp/mprime/package.nix @@ -15,7 +15,6 @@ let { x86_64-linux = "linux64"; i686-linux = "linux"; - x86_64-darwin = "macosx64"; } ."${stdenv.hostPlatform.system}" or throwSystem; @@ -23,7 +22,6 @@ let { x86_64-linux = "make64"; i686-linux = "makefile"; - x86_64-darwin = "makemac"; } ."${stdenv.hostPlatform.system}" or throwSystem; @@ -111,7 +109,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "i686-linux" "x86_64-linux" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ dstremur ]; mainProgram = "mprime"; diff --git a/pkgs/by-name/ms/msgraph-cli/package.nix b/pkgs/by-name/ms/msgraph-cli/package.nix index 6c166bf6f684..2878fc43cb20 100644 --- a/pkgs/by-name/ms/msgraph-cli/package.nix +++ b/pkgs/by-name/ms/msgraph-cli/package.nix @@ -34,7 +34,6 @@ buildDotnetModule rec { maintainers = with lib.maintainers; [ nazarewk ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" "x86_64-linux" ]; }; diff --git a/pkgs/by-name/mv/mvnd/package.nix b/pkgs/by-name/mv/mvnd/package.nix index 86da716dcc62..5249dbb8c8fd 100644 --- a/pkgs/by-name/mv/mvnd/package.nix +++ b/pkgs/by-name/mv/mvnd/package.nix @@ -15,7 +15,6 @@ let platformMap = { aarch64-darwin = "darwin-aarch64"; aarch64-linux = "linux-aarch64"; - x86_64-darwin = "darwin-amd64"; x86_64-linux = "linux-amd64"; }; in diff --git a/pkgs/by-name/my/mystmd/package.nix b/pkgs/by-name/my/mystmd/package.nix index 99e17b03767c..403f118c7c89 100644 --- a/pkgs/by-name/my/mystmd/package.nix +++ b/pkgs/by-name/my/mystmd/package.nix @@ -59,7 +59,6 @@ stdenv.mkDerivation (finalAttrs: { { x86_64-linux = "sha256-4EQkvsoji9M4VCrdwyHm+ncd4XFjgAf34Kt+YeM3qjs="; aarch64-linux = "sha256-xm4T1BL3AyRsYOERz4LhG4ZJQkSMzspoA+l60OND3E0="; - x86_64-darwin = "sha256-L+zY9O5ridMvZEhGH0R56P3XiDlYF3UrFZwmOYlqxYY="; aarch64-darwin = "sha256-ZUx+jF7IcEbUCnUUeW0uOFgEpO9UIJpP3/VpUJ5ulAM="; } .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/ne/neowall/package.nix b/pkgs/by-name/ne/neowall/package.nix index a962a297ce4f..01d6fc39bea6 100644 --- a/pkgs/by-name/ne/neowall/package.nix +++ b/pkgs/by-name/ne/neowall/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "neowall"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "1ay1"; repo = "neowall"; tag = "v${finalAttrs.version}"; - hash = "sha256-NntwAm4LmGEcAJEp9W+y0mosn+jZXwatTp4ftMqcpSo="; + hash = "sha256-XK3A/B37R5mQWzdiMwwDkSHMC87sHXDvtOXvnaGCuJ0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ne/nesting/package.nix b/pkgs/by-name/ne/nesting/package.nix index 207268ba9f20..bfe7a8326ad4 100644 --- a/pkgs/by-name/ne/nesting/package.nix +++ b/pkgs/by-name/ne/nesting/package.nix @@ -53,9 +53,5 @@ buildGoModule (finalAttrs: { license = lib.licenses.mit; mainProgram = "nesting"; maintainers = with lib.maintainers; [ commiterate ]; - badPlatforms = [ - # Only supports AArch64 for Darwin. - "x86_64-darwin" - ]; }; }) diff --git a/pkgs/by-name/ne/nethogs/package.nix b/pkgs/by-name/ne/nethogs/package.nix index 006122654ec5..2fe67b8d5fee 100644 --- a/pkgs/by-name/ne/nethogs/package.nix +++ b/pkgs/by-name/ne/nethogs/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nethogs"; - version = "0.8.8"; + version = "0.9.0"; src = fetchFromGitHub { owner = "raboof"; repo = "nethogs"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-+yVMyGSBIBWYjA9jaGWvrcsNPbJ6S4ax9H1BhWHYUUU="; + sha256 = "sha256-ojbsCoJ8fOaHgm1tWyM59siTDYmCllXOUNqNQJwRhws="; }; buildInputs = [ diff --git a/pkgs/by-name/no/nosql-workbench/package.nix b/pkgs/by-name/no/nosql-workbench/package.nix index f79d7c92c358..6964f8bf667a 100644 --- a/pkgs/by-name/no/nosql-workbench/package.nix +++ b/pkgs/by-name/no/nosql-workbench/package.nix @@ -13,10 +13,6 @@ let src = fetchurl { - x86_64-darwin = { - url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-mac-x64-${version}.dmg"; - hash = "sha256-ewlaaaWxPHxaOdAMbkHChzbxAB5MNdZS/p8ROD/SvcQ="; - }; aarch64-darwin = { url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-mac-arm64-${version}.dmg"; hash = "sha256-U6Gea89/cXY9Fd6JAWrUtf7Q4VfEXDPzbjCQcHMRjiE="; @@ -36,7 +32,6 @@ let maintainers = with lib.maintainers; [ DataHearth ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" "x86_64-linux" ]; }; diff --git a/pkgs/by-name/no/notesnook/package.nix b/pkgs/by-name/no/notesnook/package.nix index e388c4407c13..a963443c55a6 100644 --- a/pkgs/by-name/no/notesnook/package.nix +++ b/pkgs/by-name/no/notesnook/package.nix @@ -18,7 +18,6 @@ let { x86_64-linux = "linux_x86_64.AppImage"; aarch64-linux = "linux_arm64.AppImage"; - x86_64-darwin = "mac_x64.dmg"; aarch64-darwin = "mac_arm64.dmg"; } .${system} or throwSystem; @@ -29,7 +28,6 @@ let { x86_64-linux = "sha256-NmhV+x5HrKBO7BX1bJyjChKQF/j38kQqJ3x0amSXzGU="; aarch64-linux = "sha256-IU4hF/ol4pyh+ABTri2aqwqaB+cfrHLtsF7wrqE+wEY="; - x86_64-darwin = "sha256-YhJvkKreWUReEgs4R9lWV0/cx3d0hrjKTHZn0hDsp3k="; aarch64-darwin = "sha256-9CTGpCPJY6sq6JWDpoCTyOTt/vtCazDaoDzFFUzR9zg="; } .${system} or throwSystem; @@ -57,7 +55,6 @@ let platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "notesnook"; diff --git a/pkgs/by-name/no/notion-app/package.nix b/pkgs/by-name/no/notion-app/package.nix index e99f9bb0fa1e..767bda0e3b33 100644 --- a/pkgs/by-name/no/notion-app/package.nix +++ b/pkgs/by-name/no/notion-app/package.nix @@ -5,9 +5,7 @@ unzip, }: let - info = - (lib.importJSON ./sources.json)."${stdenvNoCC.hostPlatform.parsed.cpu.name}-darwin" - or (throw "Unsupported CPU architecture: ${stdenvNoCC.hostPlatform.parsed.cpu.name}"); + info = lib.importJSON ./source.json; in stdenvNoCC.mkDerivation (finalAttrs: { pname = "notion-app"; @@ -37,7 +35,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { pradyuman ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/no/notion-app/source.json b/pkgs/by-name/no/notion-app/source.json new file mode 100644 index 000000000000..8d095dc524f7 --- /dev/null +++ b/pkgs/by-name/no/notion-app/source.json @@ -0,0 +1,5 @@ +{ + "version": "7.25.1", + "url": "https://desktop-release.notion-static.com/Notion-arm64-7.25.1.zip", + "hash": "sha512-1t+hNS33R3CX+inR8ArKvm4LDn0Wu7JiCU91ucnaAgQm85XUcWFdxk/f421M9XqG1Wte+webFX45LXDlixKa2A==" +} diff --git a/pkgs/by-name/no/notion-app/sources.json b/pkgs/by-name/no/notion-app/sources.json deleted file mode 100644 index 61b33e14609e..000000000000 --- a/pkgs/by-name/no/notion-app/sources.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "x86_64-darwin": { - "version": "7.25.1", - "url": "https://desktop-release.notion-static.com/Notion-7.25.1.zip", - "hash": "sha512-HBhe2onWY44JbMVIfiLglyNDk1tqepwCerqbgUuI56mstBlg+B0KuepTl+plJODoTVtRasmrg/WRBw+ESWpEeg==" - }, - "aarch64-darwin": { - "version": "7.25.1", - "url": "https://desktop-release.notion-static.com/Notion-arm64-7.25.1.zip", - "hash": "sha512-1t+hNS33R3CX+inR8ArKvm4LDn0Wu7JiCU91ucnaAgQm85XUcWFdxk/f421M9XqG1Wte+webFX45LXDlixKa2A==" - } -} diff --git a/pkgs/by-name/no/notion-app/update/update.mjs b/pkgs/by-name/no/notion-app/update/update.mjs index a4d56e8ff3d8..c6a7e3e4baf9 100755 --- a/pkgs/by-name/no/notion-app/update/update.mjs +++ b/pkgs/by-name/no/notion-app/update/update.mjs @@ -23,15 +23,10 @@ const __dirname = import.meta.dirname; hash: `sha512-${string}`; }} Info */ -/** @typedef {{ - "x86_64-darwin": Info; - "aarch64-darwin": Info; -}} InfoMap */ - const BASE_URL = "https://desktop-release.notion-static.com/"; /** * - * @param {"latest-mac.yml" | "arm64-mac.yml"} liveCheckFile + * @param {"arm64-mac.yml"} liveCheckFile * @returns {Promise} */ async function getInfo(liveCheckFile) { @@ -57,26 +52,20 @@ async function getInfo(liveCheckFile) { } async function main() { - const filePath = path.join(__dirname, "../sources.json"); - /** @type {InfoMap} */ + const filePath = path.join(__dirname, "../source.json"); + /** @type {Info} */ const oldInfo = JSON.parse( await fsPromises.readFile(filePath, { encoding: "utf-8" }) ); - /** @type {InfoMap} */ - const info = { - "x86_64-darwin": await getInfo("latest-mac.yml"), - "aarch64-darwin": await getInfo("arm64-mac.yml"), - }; + /** @type {Info} */ + const info = await getInfo("arm64-mac.yml"); if (JSON.stringify(oldInfo) === JSON.stringify(info)) { console.log("[update] No updates found"); return; } - const platforms = /** @type {const} */ (["x86_64-darwin", "aarch64-darwin"]); - for (const platform of platforms) { - console.log( - `[update] Updating Notion ${platform} ${oldInfo[platform].version} -> ${info[platform].version}` - ); - } + console.log( + `[update] Updating Notion ${oldInfo.version} -> ${info.version}` + ); await fsPromises.writeFile( filePath, JSON.stringify(info, null, 2) + "\n", diff --git a/pkgs/by-name/nu/nushell-plugin-desktop_notifications/package.nix b/pkgs/by-name/nu/nushell-plugin-desktop_notifications/package.nix index cd4d1026ea33..76cc59030954 100644 --- a/pkgs/by-name/nu/nushell-plugin-desktop_notifications/package.nix +++ b/pkgs/by-name/nu/nushell-plugin-desktop_notifications/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nu_plugin_desktop_notifications"; - version = "0.113.1"; + version = "0.114.1"; src = fetchFromGitHub { owner = "FMotalleb"; repo = "nu_plugin_desktop_notifications"; tag = "v${finalAttrs.version}"; - hash = "sha256-aA47T3Fxo2eH0JclZRC7zY4RK8eRnAqj712LhgXEMpU="; + hash = "sha256-/41DHPv9UKHUY551UppiauEiwoB0qQnkSrl6pHytwLs="; }; - cargoHash = "sha256-e/q/X0Temmkoj6DcPLUC+QfN9lVDrE4esVEx9LF4bHc="; + cargoHash = "sha256-csBlo1Gly1LbvMxfmydmLlzhQh7ul2haLr7IAq/GlbI="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/nu/nuxmv/package.nix b/pkgs/by-name/nu/nuxmv/package.nix index 5896cbb0edf8..561fa8c2b09d 100644 --- a/pkgs/by-name/nu/nuxmv/package.nix +++ b/pkgs/by-name/nu/nuxmv/package.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ siraben ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/oa/oakctl/package.nix b/pkgs/by-name/oa/oakctl/package.nix index ae194502129f..3d1f56e53502 100644 --- a/pkgs/by-name/oa/oakctl/package.nix +++ b/pkgs/by-name/oa/oakctl/package.nix @@ -26,10 +26,6 @@ let url = "https://oakctl-releases.luxonis.com/data/${version}/darwin_arm64/oakctl"; hash = "sha256-tJl9OKhaY9dIxkN+tsbQ3isyAfFPSDOqkgLgDDaRaSg="; }; - x86_64-darwin = fetchurl { - url = "https://oakctl-releases.luxonis.com/data/${version}/darwin_x86_64/oakctl"; - hash = "sha256-xjmMqECqZ+ukXAPRKoJ1m1y7ABMIltw9u236q9k56/o="; - }; }; src = @@ -73,7 +69,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "oakctl"; diff --git a/pkgs/by-name/ob/objection/package.nix b/pkgs/by-name/ob/objection/package.nix index 08b5f65a2bc6..3090b7d979ad 100644 --- a/pkgs/by-name/ob/objection/package.nix +++ b/pkgs/by-name/ob/objection/package.nix @@ -42,10 +42,6 @@ let fridaArch = "linux-ia32"; fridaHash = "sha256-vLwf+EwWNDLznda8J+xVqp8XmuivdZ0VKgISR9YoQR0="; }; - x86_64-darwin = { - fridaArch = "darwin-x64"; - fridaHash = "sha256-raODa/EHRpMYNwFK9gxTXWrxnx1G1IbKTKV1343MTm8="; - }; aarch64-darwin = { fridaArch = "darwin-arm64"; fridaHash = "sha256-mR6HM9rmRmXhWqXA0GC4Xkdj9KVSthhtvMAzijE+j5c="; diff --git a/pkgs/by-name/ob/obsidian/package.nix b/pkgs/by-name/ob/obsidian/package.nix index ba5471ecedf0..97ac4d8ed740 100644 --- a/pkgs/by-name/ob/obsidian/package.nix +++ b/pkgs/by-name/ob/obsidian/package.nix @@ -33,12 +33,11 @@ let platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; - srcs = rec { + srcs = { x86_64-linux = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz"; hash = "sha256-/L4IsRHZwf2wm5wIlSsG4cgpxiFj66JYTEtOyFm+B50="; @@ -49,12 +48,10 @@ let hash = "sha256-a8hye/27bXMdWvmgb1HW3nBhxoyQjIrotDqe03miAmA="; }; - x86_64-darwin = fetchurl { + aarch64-darwin = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/Obsidian-${version}.dmg"; hash = "sha256-O4XBO0zlVRLobhcKfNKklOLbaVrIiMBgHhU8uFt3iBs="; }; - - aarch64-darwin = x86_64-darwin; }; src = diff --git a/pkgs/by-name/oc/ocis_5-bin/package.nix b/pkgs/by-name/oc/ocis_5-bin/package.nix index 47ff4aace7e7..2453d3df8c00 100644 --- a/pkgs/by-name/oc/ocis_5-bin/package.nix +++ b/pkgs/by-name/oc/ocis_5-bin/package.nix @@ -12,7 +12,6 @@ let x86_64-linux = "amd64"; aarch64-linux = "arm64"; armv7l-linux = "arm"; - x86_64-darwin = "amd64"; aarch64-darwin = "arm64"; } ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/od/odpic/package.nix b/pkgs/by-name/od/odpic/package.nix index b65b3058466e..807171475992 100644 --- a/pkgs/by-name/od/odpic/package.nix +++ b/pkgs/by-name/od/odpic/package.nix @@ -51,7 +51,6 @@ stdenv.mkDerivation { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" ]; hydraPlatforms = [ ]; }; diff --git a/pkgs/by-name/om/ombi/package.nix b/pkgs/by-name/om/ombi/package.nix index 6e8d8d8cd40f..b21ac3e7e702 100644 --- a/pkgs/by-name/om/ombi/package.nix +++ b/pkgs/by-name/om/ombi/package.nix @@ -18,7 +18,6 @@ let { x86_64-linux = "x64"; aarch64-linux = "arm64"; - x86_64-darwin = "x64"; } ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -89,7 +88,6 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" ]; mainProgram = "Ombi"; }; diff --git a/pkgs/by-name/oo/ookla-speedtest/package.nix b/pkgs/by-name/oo/ookla-speedtest/package.nix index ca3019ec8232..630338789e91 100644 --- a/pkgs/by-name/oo/ookla-speedtest/package.nix +++ b/pkgs/by-name/oo/ookla-speedtest/package.nix @@ -10,7 +10,7 @@ let pname = "ookla-speedtest"; version = "1.2.0"; - srcs = rec { + srcs = { x86_64-linux = fetchurl { url = "https://install.speedtest.net/app/cli/${pname}-${version}-linux-x86_64.tgz"; sha256 = "sha256-VpBZbFT/m+1j+jcy+BigXbwtsZrTbtaPIcpfZNXP7rc="; @@ -27,11 +27,10 @@ let url = "https://install.speedtest.net/app/cli/${pname}-${version}-linux-armhf.tgz"; sha256 = "sha256-5F/N672KGFVTU1Uz3QMtaxC8jGTu5BObEUe5wJg10I0="; }; - x86_64-darwin = fetchurl { + aarch64-darwin = fetchurl { url = "https://install.speedtest.net/app/cli/${pname}-${version}-macosx-universal.tgz"; sha256 = "sha256-yfgZIUnryI+GmZmM7Ksc4UQUQEWQfs5vU89Qh39N5m8="; }; - aarch64-darwin = x86_64-darwin; }; in diff --git a/pkgs/by-name/oo/ooklaserver/package.nix b/pkgs/by-name/oo/ooklaserver/package.nix index dcf20a3fedb2..34c3fc8e0949 100644 --- a/pkgs/by-name/oo/ooklaserver/package.nix +++ b/pkgs/by-name/oo/ooklaserver/package.nix @@ -9,7 +9,6 @@ let "x86_64-linux" = "OoklaServer-linux-x86_64-static-musl.zip"; "aarch64-linux" = "OoklaServer-linux-aarch64-static-musl.zip"; # Mach-O universal binary with 2 architectures: [x86_64:Mach-O 64-bit executable x86_64] [arm64] - "x86_64-darwin" = "OoklaServer-macosx.zip"; "aarch64-darwin" = "OoklaServer-macosx.zip"; "x86_64-windows" = "OoklaServer-windows64.zip"; "i686-windows" = "OoklaServer-windows32.zip"; diff --git a/pkgs/by-name/op/openbao/package.nix b/pkgs/by-name/op/openbao/package.nix index 2ca7c101dd8b..68348dc22ae7 100644 --- a/pkgs/by-name/op/openbao/package.nix +++ b/pkgs/by-name/op/openbao/package.nix @@ -14,16 +14,16 @@ buildGoModule (finalAttrs: { pname = "openbao"; - version = "2.5.5"; + version = "2.6.0"; src = fetchFromGitHub { owner = "openbao"; repo = "openbao"; tag = "v${finalAttrs.version}"; - hash = "sha256-75Rm9EGkvUKJ05d55bboPAE+Nm/GLLgH1TqDrExkJO0="; + hash = "sha256-FJ+34HeRT025EFwFXY8ewfnJbQirqFb3j+kPNxpGOA4="; }; - vendorHash = "sha256-3d3g6f0O7X+aedYCfLbqLNuITKNQuxZkApWTTKSk7lA="; + vendorHash = "sha256-O0xx61S0KEk5QB/NsV+kBlErvVuKBfI/81o29rDye1w="; proxyVendor = true; diff --git a/pkgs/by-name/op/openbao/ui.nix b/pkgs/by-name/op/openbao/ui.nix index 0a6e634e2b5e..44b2c4e1a377 100644 --- a/pkgs/by-name/op/openbao/ui.nix +++ b/pkgs/by-name/op/openbao/ui.nix @@ -1,50 +1,46 @@ { stdenvNoCC, openbao, - yarn-berry_3, - nodejs_22, + fetchPnpmDeps, + pnpmConfigHook, + pnpmBuildHook, + pnpm_10, + # https://github.com/openbao/openbao/issues/731 + nodejs-slim_22, }: let - - yarn = yarn-berry_3.override { nodejs = nodejs_22; }; - + nodejs-slim = nodejs-slim_22; + pnpm = pnpm_10.override { inherit nodejs-slim; }; in stdenvNoCC.mkDerivation (finalAttrs: { pname = openbao.pname + "-ui"; inherit (openbao) version src; sourceRoot = "${finalAttrs.src.name}/ui"; - offlineCache = yarn.fetchYarnBerryDeps { - inherit (finalAttrs) src sourceRoot; - hash = "sha256-XK3ZVnzOTbFzrpPgaz1cx7okTycLhrvBHk9P2Nwv1cg="; - }; - nativeBuildInputs = [ - yarn.yarnBerryConfigHook - nodejs_22 - yarn + pnpmConfigHook + pnpmBuildHook + pnpm + nodejs-slim ]; - env.YARN_ENABLE_SCRIPTS = 0; - - preConfigure = '' - printYarnErrors() { - cat /build/*.log - } - failureHooks+=(printYarnErrors) - ''; + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) + pname + version + src + sourceRoot + ; + inherit pnpm; + fetcherVersion = 4; + hash = "sha256-9Q5celZSwMgSS8qcj8sDH/JLv48lgDMOylANvXSnhsU="; + }; postConfigure = '' substituteInPlace .ember-cli \ --replace-fail "../http/web_ui" "$out" ''; - buildPhase = '' - runHook preBuild - yarn run ember build --environment=production - runHook postBuild - ''; - dontInstall = true; meta = (builtins.removeAttrs openbao.meta [ "mainProgram" ]) // { diff --git a/pkgs/by-name/op/openmvg/package.nix b/pkgs/by-name/op/openmvg/package.nix index 82d6951ad55f..0a37cfad64df 100644 --- a/pkgs/by-name/op/openmvg/package.nix +++ b/pkgs/by-name/op/openmvg/package.nix @@ -94,9 +94,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/openMVG/openMVG/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mpl20; platforms = lib.platforms.unix; - badPlatforms = [ - "x86_64-darwin" - ]; maintainers = with lib.maintainers; [ mdaiter bouk diff --git a/pkgs/by-name/op/openutau/package.nix b/pkgs/by-name/op/openutau/package.nix index c6cd7004a650..43b6809d64ed 100644 --- a/pkgs/by-name/op/openutau/package.nix +++ b/pkgs/by-name/op/openutau/package.nix @@ -110,7 +110,6 @@ buildDotnetModule rec { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "OpenUtau"; diff --git a/pkgs/by-name/op/openvscode-server/package.nix b/pkgs/by-name/op/openvscode-server/package.nix index 9ab14172e520..856519dfbe52 100644 --- a/pkgs/by-name/op/openvscode-server/package.nix +++ b/pkgs/by-name/op/openvscode-server/package.nix @@ -32,7 +32,6 @@ let { x86_64-linux = "linux-x64"; aarch64-linux = "linux-arm64"; - x86_64-darwin = "darwin-x64"; aarch64-darwin = "darwin-arm64"; } .${system} or (throw "Unsupported system ${system}"); @@ -247,7 +246,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "openvscode-server"; diff --git a/pkgs/by-name/op/openxray/package.nix b/pkgs/by-name/op/openxray/package.nix index 2881f39126ca..e8aac8d9b55a 100644 --- a/pkgs/by-name/op/openxray/package.nix +++ b/pkgs/by-name/op/openxray/package.nix @@ -96,7 +96,6 @@ stdenv.mkDerivation (finalAttrs: { "x86_64-linux" "i686-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/or/oracle-instantclient/package.nix b/pkgs/by-name/or/oracle-instantclient/package.nix index 6cd1c5d2829a..ebf46278030e 100644 --- a/pkgs/by-name/or/oracle-instantclient/package.nix +++ b/pkgs/by-name/or/oracle-instantclient/package.nix @@ -33,7 +33,6 @@ let { x86_64-linux = "21.10.0.0.0"; aarch64-linux = "19.10.0.0.0"; - x86_64-darwin = "19.8.0.0.0"; aarch64-darwin = "23.3.0.23.09"; } .${stdenv.hostPlatform.system} or throwSystem; @@ -42,7 +41,6 @@ let { x86_64-linux = "2110000"; aarch64-linux = "191000"; - x86_64-darwin = "198000"; aarch64-darwin = "233023"; } .${stdenv.hostPlatform.system} or throwSystem; @@ -64,13 +62,6 @@ let tools = "sha256-4QY0EwcnctwPm6ZGDZLudOFM4UycLFmRIluKGXVwR0M="; odbc = "sha256-T+RIIKzZ9xEg/E72pfs5xqHz2WuIWKx/oRfDrQbw3ms="; }; - x86_64-darwin = { - basic = "sha256-V+1BmPOhDYPNXdwkcsBY1MOwt4Yka66/a7/HORzBIIc="; - sdk = "sha256-D6iuTEQYqmbOh1z5LnKN16ga6vLmjnkm4QK15S/Iukw="; - sqlplus = "sha256-08uoiwoKPZmTxLZLYRVp0UbN827FXdhOukeDUXvTCVk="; - tools = "sha256-1xFFGZapFq9ogGQ6ePSv4PrXl5qOAgRZWAp4mJ5uxdU="; - odbc = "sha256-S6+5P4daK/+nXwoHmOkj4DIkHtwdzO5GOkCCI612bRY="; - }; aarch64-darwin = { basic = "sha256-G83bWDhw9wwjLVee24oy/VhJcCik7/GtKOzgOXuo1/4="; sdk = "sha256-PerfzgietrnAkbH9IT7XpmaFuyJkPHx0vl4FCtjPzLs="; @@ -96,7 +87,6 @@ let { x86_64-linux = "linux.x64"; aarch64-linux = "linux.arm64"; - x86_64-darwin = "macos.x64"; aarch64-darwin = "macos.arm64"; } .${stdenv.hostPlatform.system} or throwSystem; @@ -105,7 +95,6 @@ let { x86_64-linux = "linux"; aarch64-linux = "linux"; - x86_64-darwin = "mac"; aarch64-darwin = "mac"; } .${stdenv.hostPlatform.system} or throwSystem; @@ -199,7 +188,6 @@ stdenv.mkDerivation { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; maintainers = with lib.maintainers; [ dylanmtaylor ]; diff --git a/pkgs/by-name/or/orbstack/package.nix b/pkgs/by-name/or/orbstack/package.nix index a307199fa416..0f8fa3730fb9 100644 --- a/pkgs/by-name/or/orbstack/package.nix +++ b/pkgs/by-name/or/orbstack/package.nix @@ -13,10 +13,6 @@ let arch = "arm64"; hash = "sha256-W8FxnDyYfExgxlvp/dZbRzCZDhaX7Byxwz5rujG/krU="; }; - x86_64-darwin = { - arch = "amd64"; - hash = "sha256-8woVgREEpJT+IGaVsash/PruEuye+8uhKaADTrtoMZs="; - }; }; sources = lib.mapAttrs ( system: diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix index f2751bd4e951..f45fcc84c347 100644 --- a/pkgs/by-name/os/osu-lazer-bin/package.nix +++ b/pkgs/by-name/os/osu-lazer-bin/package.nix @@ -19,11 +19,6 @@ let hash = "sha256-XwfNO38dDaUmu/3AEgRwV0VW6JrAUCxWD6Wt0Ew23Eo="; stripRoot = false; }; - x86_64-darwin = fetchzip { - url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Intel.zip"; - hash = "sha256-Crj40NkKasqc2JF1LeJwOlnCzHxsPiKG77SKTo8DS/8="; - stripRoot = false; - }; x86_64-linux = fetchurl { url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.AppImage"; hash = "sha256-KyA5UCvb9epk7jRtdG5wl0LzKc6/D2rkw5EJQxIaihw="; @@ -48,7 +43,6 @@ let mainProgram = "osu!"; platforms = [ "aarch64-darwin" - "x86_64-darwin" "x86_64-linux" ]; }; diff --git a/pkgs/by-name/ov/ovftool/package.nix b/pkgs/by-name/ov/ovftool/package.nix index 7dee55070560..a910a409b709 100644 --- a/pkgs/by-name/ov/ovftool/package.nix +++ b/pkgs/by-name/ov/ovftool/package.nix @@ -99,11 +99,6 @@ let fileName = "VMware-ovftool-${version}-lin.x86_64.zip"; hash = "sha256-LIOXCiEswBJirbds47nFKvOW+tg0D/cay3SeM+hsjjM="; }; - "x86_64-darwin" = rec { - version = "5.1.0-25410048"; - fileName = "VMware-ovftool-${version}-mac.x64.zip"; - hash = "sha256-gDSraL+B3As+QxT2GlAmL8KjsIelxAd2e4iSRaXOTtI="; - }; }; ovftoolSystem = ovftoolSystems.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); diff --git a/pkgs/by-name/ow/owmods-cli/package.nix b/pkgs/by-name/ow/owmods-cli/package.nix index 1e3b266f44cb..b204820e1efd 100644 --- a/pkgs/by-name/ow/owmods-cli/package.nix +++ b/pkgs/by-name/ow/owmods-cli/package.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "owmods-cli"; - version = "0.15.5"; + version = "0.15.7"; src = fetchFromGitHub { owner = "ow-mods"; repo = "ow-mod-man"; rev = "cli_v${finalAttrs.version}"; - hash = "sha256-8ZHLb57/gC03+rWe8mHcBS0nJVNjjRMtLADwGcSZ0CI="; + hash = "sha256-ohCP0VKf2jEtjZsDN5ISZ5c/EGYANvjuCPyKQcNCwyc="; }; - cargoHash = "sha256-WxfbkfOXU1NgUYagsDu3ri26k+XytG7Vy8+ofuQEwjE="; + cargoHash = "sha256-oYTz7Dzdv9prHzDSSjX9PozzKToMXRW6qs8Y2dfYQ8A="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/p4/p4d/package.nix b/pkgs/by-name/p4/p4d/package.nix index 27d1fa46381c..c87592b00b38 100644 --- a/pkgs/by-name/p4/p4d/package.nix +++ b/pkgs/by-name/p4/p4d/package.nix @@ -12,10 +12,6 @@ let url = "https://web.archive.org/web/20231109221336id_/https://ftp.perforce.com/perforce/r23.1/bin.linux26x86_64/helix-core-server.tgz"; sha256 = "b68c4907cf9258ab47102e8f0e489c11d528a8f614bfa45e3a2fa198639e2362"; }; - "x86_64-darwin" = fetchurl { - url = "https://web.archive.org/web/20231109221937id_/https://ftp.perforce.com/perforce/r23.1/bin.macosx1015x86_64/helix-core-server.tgz"; - sha256 = "fcbf09787ffc29f7237839711447bf19a37ae18a8a7e19b2d30deb3715ae2c11"; - }; }; in stdenv.mkDerivation { diff --git a/pkgs/by-name/p4/p4v/package.nix b/pkgs/by-name/p4/p4v/package.nix index 5192bb10b033..9e6d58e391fd 100644 --- a/pkgs/by-name/p4/p4v/package.nix +++ b/pkgs/by-name/p4/p4v/package.nix @@ -8,7 +8,7 @@ let # Upstream replaces minor versions, so use archived URLs. - srcs = rec { + srcs = { x86_64-linux = fetchurl { url = "https://web.archive.org/web/20260414052921/https://filehost.perforce.com/perforce/r26.1/bin.linux26x86_64/p4v.tgz"; sha256 = "sha256-89Xz9dxAeLGOOr90K0CdlxjrfIf9vUmyZV3tzWspWdQ="; @@ -18,7 +18,6 @@ let sha256 = "sha256-8MBLS6EQOVenxZ1Uv75kPzU8aO2AldmxkwOz+JcBRpY="; }; # this is universal - x86_64-darwin = aarch64-darwin; }; mkDerivation = diff --git a/pkgs/by-name/pa/packer/extra/mk-packer-plugin.nix b/pkgs/by-name/pa/packer/extra/mk-packer-plugin.nix index b5a8cf71711e..3fa737b75554 100644 --- a/pkgs/by-name/pa/packer/extra/mk-packer-plugin.nix +++ b/pkgs/by-name/pa/packer/extra/mk-packer-plugin.nix @@ -1,7 +1,6 @@ let platformSuffix = { x86_64-linux = "linux_amd64"; - x86_64-darwin = "darwin_amd64"; aarch64-linux = "linux_arm64"; aarch64-darwin = "darwin_arm64"; }; diff --git a/pkgs/by-name/pa/pam_ssh_agent_auth/package.nix b/pkgs/by-name/pa/pam_ssh_agent_auth/package.nix index 6ba71b483e24..45f7a5b5cfcc 100644 --- a/pkgs/by-name/pa/pam_ssh_agent_auth/package.nix +++ b/pkgs/by-name/pa/pam_ssh_agent_auth/package.nix @@ -88,6 +88,8 @@ stdenv.mkDerivation rec { "--with-cflags=-I$PWD" ]; + makeFlags = [ "LD=$(CC)" ]; + prePatch = "cp -r ${ed25519-donna}/. ed25519-donna/."; enableParallelBuilding = true; diff --git a/pkgs/by-name/pa/paperlib/package.nix b/pkgs/by-name/pa/paperlib/package.nix index 3bc6c94decdb..e8fdb2226fc2 100644 --- a/pkgs/by-name/pa/paperlib/package.nix +++ b/pkgs/by-name/pa/paperlib/package.nix @@ -16,10 +16,6 @@ let url = "https://github.com/Future-Scholars/paperlib/releases/download/release-electron-${version}/Paperlib_${version}_arm.dmg"; hash = "sha256-KNMPUeCNtODHzMJhCwI4SJPRfa87RmAe6CRRazgRZCQ="; }; - x86_64-darwin = { - url = "https://github.com/Future-Scholars/paperlib/releases/download/release-electron-${version}/Paperlib_${version}.dmg"; - hash = "sha256-5QwF0+7Y4LzReHCj8yZrAJDAZVyY0ANC5gjAxdaVRkU="; - }; x86_64-linux = { url = "https://github.com/Future-Scholars/paperlib/releases/download/release-electron-${version}/Paperlib_${version}.AppImage"; hash = "sha256-uBYhiUL4YWwnLLPvXMoXjlQqlqFep/OpwwnmPx7s5dY="; @@ -38,7 +34,6 @@ let maintainers = with lib.maintainers; [ ByteSudoer ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" "x86_64-linux" ]; mainProgram = "paperlib"; diff --git a/pkgs/by-name/pa/patchcil/package.nix b/pkgs/by-name/pa/patchcil/package.nix index 4f019dfe4516..e883ed4b80dc 100644 --- a/pkgs/by-name/pa/patchcil/package.nix +++ b/pkgs/by-name/pa/patchcil/package.nix @@ -67,7 +67,6 @@ buildDotnetModule rec { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" "x86_64-windows" "i686-windows" diff --git a/pkgs/by-name/pc/pcsx2-bin/package.nix b/pkgs/by-name/pc/pcsx2-bin/package.nix deleted file mode 100644 index 7310b25301d5..000000000000 --- a/pkgs/by-name/pc/pcsx2-bin/package.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchurl, - makeWrapper, -}: - -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "pcsx2-bin"; - version = "2.4.0"; - - src = fetchurl { - url = "https://github.com/PCSX2/pcsx2/releases/download/v${finalAttrs.version}/pcsx2-v${finalAttrs.version}-macos-Qt.tar.xz"; - hash = "sha256-nExKu5WwBVxUA8P3DZ7SVln5zORXcR3lM/gWjFxgAV8="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - dontPatch = true; - dontConfigure = true; - dontBuild = true; - - sourceRoot = "."; - - installPhase = '' - runHook preInstall - mkdir -p $out/Applications - cp -r "PCSX2-v${finalAttrs.version}.app" $out/Applications/PCSX2.app - runHook postInstall - ''; - - passthru = { - updateScript = ./update.sh; - }; - - meta = { - homepage = "https://pcsx2.net"; - description = "Playstation 2 emulator (precompiled binary, repacked from official website)"; - longDescription = '' - PCSX2 is an open-source PlayStation 2 (AKA PS2) emulator. Its purpose is - to emulate the PS2 hardware, using a combination of MIPS CPU Interpreters, - Recompilers and a Virtual Machine which manages hardware states and PS2 - system memory. This allows you to play PS2 games on your PC, with many - additional features and benefits. - ''; - changelog = "https://github.com/PCSX2/pcsx2/releases/tag/v${finalAttrs.version}"; - downloadPage = "https://github.com/PCSX2/pcsx2"; - license = with lib.licenses; [ - gpl3Plus - lgpl3Plus - ]; - maintainers = with lib.maintainers; [ matteopacini ]; - platforms = [ "x86_64-darwin" ]; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - }; -}) diff --git a/pkgs/by-name/pc/pcsx2-bin/update.sh b/pkgs/by-name/pc/pcsx2-bin/update.sh deleted file mode 100755 index 943d2693d201..000000000000 --- a/pkgs/by-name/pc/pcsx2-bin/update.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq gnused - -set -euo pipefail - -cd "$(dirname "$0")" || exit 1 - -# Grab latest version, ignoring "latest" and "preview" tags -LATEST_VER="$(curl --fail -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/PCSX2/pcsx2/releases/latest" | jq -r '.tag_name' | sed 's/^v//')" -CURRENT_VER="$(grep -oP 'version = "\K[^"]+' package.nix)" - -if [[ "$LATEST_VER" == "$CURRENT_VER" ]]; then - echo "pcsx2-bin is up-to-date" - exit 0 -fi - -HASH="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/PCSX2/pcsx2/releases/download/v${LATEST_VER}/pcsx2-v${LATEST_VER}-macos-Qt.tar.xz")")" - -sed -i "s#hash = \".*\"#hash = \"$HASH\"#g" package.nix -sed -i "s#version = \".*\";#version = \"$LATEST_VER\";#g" package.nix diff --git a/pkgs/by-name/pd/pdfium-binaries/package.nix b/pkgs/by-name/pd/pdfium-binaries/package.nix index 316f8410f10d..a605af9f7c2e 100644 --- a/pkgs/by-name/pd/pdfium-binaries/package.nix +++ b/pkgs/by-name/pd/pdfium-binaries/package.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation (finalAttrs: { system = selectSystem { x86_64-linux = "linux-x64"; aarch64-linux = "linux-arm64"; - x86_64-darwin = "mac-x64"; aarch64-darwin = "mac-arm64"; }; in @@ -29,14 +28,12 @@ stdenv.mkDerivation (finalAttrs: { selectSystem { x86_64-linux = "sha256-I3JTNnqXpDHwl+sOS/AlPj4znG2OFIqRxtJNhXD+w6I="; aarch64-linux = "sha256-PBkwxcjsqeEElNC+V74h4P1e508IB/zXjGoQuwK6Krk="; - x86_64-darwin = "sha256-aumdSND6Lefr6GgmWBSX4pQhZj8jJIABi6VJSqKNin8="; aarch64-darwin = "sha256-DpoPHGaFkjfOa3tXItYLeJpTLfRXOrjlN/+eyPEcgOQ="; } else selectSystem { x86_64-linux = "sha256-0VaBPO4angdRqerquTjqizZWvGxrRP8k7DZXLw8Yqaw="; aarch64-linux = "sha256-h7JJxmCg9GIaVMajNZb+AeClIeX8w9XWM2RYqGhPoUY="; - x86_64-darwin = "sha256-1Or4cuxvx13Z70kIj7Q1DM1hg/bW5SPAGEDEtnBU6YI="; aarch64-darwin = "sha256-rJqrpCo+5bzqyUsRubGOsBZ8orV1dSuXfjADFJmxBOw="; }; stripRoot = false; @@ -70,7 +67,6 @@ stdenv.mkDerivation (finalAttrs: { "aarch64-linux" "aarch64-darwin" "x86_64-linux" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/pe/pear-desktop/package.nix b/pkgs/by-name/pe/pear-desktop/package.nix index 06fa70cc0950..e011c3e4a230 100644 --- a/pkgs/by-name/pe/pear-desktop/package.nix +++ b/pkgs/by-name/pe/pear-desktop/package.nix @@ -122,7 +122,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/pg/pgsql-tools/package.nix b/pkgs/by-name/pg/pgsql-tools/package.nix index e8ac7a04be46..8a1675a76b8a 100644 --- a/pkgs/by-name/pg/pgsql-tools/package.nix +++ b/pkgs/by-name/pg/pgsql-tools/package.nix @@ -23,10 +23,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/microsoft/pgsql-tools/releases/download/v${finalAttrs.version}/pgsqltoolsservice-linux-arm64.tar.gz"; hash = "sha256-rD8jymGdM1RDGDbrKu6E7xoWtSMRNuc2ngCmR+sHgQI="; }; - x86_64-darwin = { - url = "https://github.com/microsoft/pgsql-tools/releases/download/v${finalAttrs.version}/pgsqltoolsservice-osx-x86.tar.gz"; - hash = "sha256-KLl7HPChurzB6QYV6AqAP3g1J3VKl61+we3opzJQwG0="; - }; aarch64-darwin = { url = "https://github.com/microsoft/pgsql-tools/releases/download/v${finalAttrs.version}/pgsqltoolsservice-osx-arm64.tar.gz"; hash = "sha256-tpabEKB1kqse7D58FsP/9jywk+vgAAvptL9MadwxWg8="; diff --git a/pkgs/by-name/ph/phoenixd/package.nix b/pkgs/by-name/ph/phoenixd/package.nix index ae8392392e5c..9e6357913b2a 100644 --- a/pkgs/by-name/ph/phoenixd/package.nix +++ b/pkgs/by-name/ph/phoenixd/package.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation (finalAttrs: { attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); suffix = selectSystem { aarch64-darwin = "macos-arm64"; - x86_64-darwin = "macos-x64"; x86_64-linux = "linux-x64"; aarch64-linux = "linux-arm64"; }; @@ -29,7 +28,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/ACINQ/phoenixd/releases/download/v${finalAttrs.version}/phoenixd-${finalAttrs.version}-${suffix}.zip"; hash = selectSystem { aarch64-darwin = "sha256-eVrwJGjXZNl9e2QGtVVEHjptCMPQgGaxljDEqr7LE7s="; - x86_64-darwin = "sha256-vHu+9GwN0jWvjH/bKceZHDPRidVLFLzzMen2Zc+L1ck="; x86_64-linux = "sha256-n/yvAisqpnbHs3XV0sHq0sUpq0+mqXmG+3LXRNmrLpI="; aarch64-linux = "sha256-mfhLpPXFvkO0mz4okdOXALIk8MR2CQQ8mZ6aI+QgNZs="; }; @@ -63,7 +61,6 @@ stdenv.mkDerivation (finalAttrs: { "aarch64-linux" "aarch64-darwin" "x86_64-linux" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/pi/pi-coding-agent/package.nix b/pkgs/by-name/pi/pi-coding-agent/package.nix index dbc834c1b0a6..74052c202f84 100644 --- a/pkgs/by-name/pi/pi-coding-agent/package.nix +++ b/pkgs/by-name/pi/pi-coding-agent/package.nix @@ -12,16 +12,16 @@ }: buildNpmPackage (finalAttrs: { pname = "pi-coding-agent"; - version = "0.80.6"; + version = "0.80.7"; src = fetchFromGitHub { owner = "earendil-works"; repo = "pi"; tag = "v${finalAttrs.version}"; - hash = "sha256-e/wcHruEcBAHDF5tKvwew7LXjVp0eraHh2k+QaL2sCA="; + hash = "sha256-s7dD82fugvWRvqL1VTcEwCIR5JI6t7VeFHR9NdMtG00="; }; - npmDepsHash = "sha256-xXEOR0epZcfbXayYGyJdBiFVliamBexqA+1Sd7wlGhU="; + npmDepsHash = "sha256-Bd/NIt3lyQR5Y7P+HksPxMQvJc0AjVfDi1M1bH3/eOg="; npmWorkspace = "packages/coding-agent"; diff --git a/pkgs/by-name/pi/picat/package.nix b/pkgs/by-name/pi/picat/package.nix index 9686bb196c47..511899f77f0d 100644 --- a/pkgs/by-name/pi/picat/package.nix +++ b/pkgs/by-name/pi/picat/package.nix @@ -31,7 +31,6 @@ stdenv.mkDerivation { x86_64-linux = "linux64"; aarch64-linux = "linux64"; x86_64-cygwin = "cygwin64"; - x86_64-darwin = "mac64"; aarch64-darwin = "mac64"; } ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -69,7 +68,6 @@ stdenv.mkDerivation { "x86_64-linux" "aarch64-linux" "x86_64-cygwin" - "x86_64-darwin" "aarch64-darwin" ]; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/pi/pinnacle/package.nix b/pkgs/by-name/pi/pinnacle/package.nix index 7c62582fa34e..3e42a9c08ed8 100644 --- a/pkgs/by-name/pi/pinnacle/package.nix +++ b/pkgs/by-name/pi/pinnacle/package.nix @@ -53,6 +53,12 @@ let src = pinnacle-src; sourceRoot = "${src.name}/api/lua"; knownRockspec = "${pinnacle-src}/api/lua/rockspecs/pinnacle-api-0.2.4-1.rockspec"; + + postConfigure = '' + substituteInPlace "$rockspecFilename" \ + --replace-fail '"compat53 ~> 0.14"' '"compat53 >= 0.14"' + ''; + propagatedBuildInputs = with lua54Packages; [ cqueues http diff --git a/pkgs/by-name/pi/pinokio/package.nix b/pkgs/by-name/pi/pinokio/package.nix index 94491c396b06..37925159de60 100644 --- a/pkgs/by-name/pi/pinokio/package.nix +++ b/pkgs/by-name/pi/pinokio/package.nix @@ -11,10 +11,6 @@ let src = fetchurl { - x86_64-darwin = { - url = "https://github.com/pinokiocomputer/pinokio/releases/download/${version}/Pinokio-${version}.dmg"; - hash = "sha256-Il5zaVWu4icSsKmMjU9u1/Mih34fd+xNpF1nkFAFFGo="; - }; x86_64-linux = { url = "https://github.com/pinokiocomputer/pinokio/releases/download/${version}/Pinokio-${version}.AppImage"; hash = "sha256-/E/IAOUgxH9RWpE2/vLlQy92LOgwpHF79K/1XEtSpXI="; @@ -30,7 +26,6 @@ let license = lib.licenses.mit; maintainers = with lib.maintainers; [ ByteSudoer ]; platforms = [ - "x86_64-darwin" "x86_64-linux" ]; mainProgram = "pinokio"; diff --git a/pkgs/by-name/pi/pixieditor/package.nix b/pkgs/by-name/pi/pixieditor/package.nix index 7153f6efc502..bbfd9eac45ef 100644 --- a/pkgs/by-name/pi/pixieditor/package.nix +++ b/pkgs/by-name/pi/pixieditor/package.nix @@ -182,7 +182,6 @@ buildDotnetModule (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/pl/platformsh/package.nix b/pkgs/by-name/pl/platformsh/package.nix index 2f6d7c0a4b9a..5558fe7ed7e4 100644 --- a/pkgs/by-name/pl/platformsh/package.nix +++ b/pkgs/by-name/pl/platformsh/package.nix @@ -70,7 +70,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/pl/plezy/package.nix b/pkgs/by-name/pl/plezy/package.nix index 17ef30c364d1..2b289563e176 100644 --- a/pkgs/by-name/pl/plezy/package.nix +++ b/pkgs/by-name/pl/plezy/package.nix @@ -58,7 +58,6 @@ let BatteredBunny ]; platforms = lib.platforms.linux ++ [ - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = lib.optionals stdenv.hostPlatform.isDarwin ( diff --git a/pkgs/by-name/pn/pngout/package.nix b/pkgs/by-name/pn/pngout/package.nix index c257ea350a83..29fa25fd74ce 100644 --- a/pkgs/by-name/pn/pngout/package.nix +++ b/pkgs/by-name/pn/pngout/package.nix @@ -22,9 +22,6 @@ let folder = "i686"; ld-linux = "ld-linux.so.2"; }; - x86_64-darwin = { - folder = "."; - }; x86_64-linux = { folder = "amd64"; ld-linux = "ld-linux-x86-64.so.2"; diff --git a/pkgs/by-name/po/policycoreutils/package.nix b/pkgs/by-name/po/policycoreutils/package.nix index 41b9919dcafd..89a2e30e324c 100644 --- a/pkgs/by-name/po/policycoreutils/package.nix +++ b/pkgs/by-name/po/policycoreutils/package.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "policycoreutils"; - version = "3.10"; + version = "3.11"; inherit (libsepol) se_url; src = fetchurl { url = "${finalAttrs.se_url}/${finalAttrs.version}/policycoreutils-${finalAttrs.version}.tar.gz"; - hash = "sha256-jb1Q2Gisv66dGpcva7slh/BsnsczCNEa9qyzpAHemDI="; + hash = "sha256-BU5B7AOXMaXua3l6jguNbjRu4dCpusLyUttIwj+aixs="; }; postPatch = '' diff --git a/pkgs/by-name/po/ponyc/package.nix b/pkgs/by-name/po/ponyc/package.nix index 3d01332e124f..56d979f892f7 100644 --- a/pkgs/by-name/po/ponyc/package.nix +++ b/pkgs/by-name/po/ponyc/package.nix @@ -199,7 +199,6 @@ stdenv.mkDerivation (finalAttrs: { ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; diff --git a/pkgs/by-name/po/postman/package.nix b/pkgs/by-name/po/postman/package.nix index 7a4d0162dd2f..5f62e19b473f 100644 --- a/pkgs/by-name/po/postman/package.nix +++ b/pkgs/by-name/po/postman/package.nix @@ -19,7 +19,6 @@ let system = selectSystem { aarch64-darwin = "osx_arm64"; aarch64-linux = "linuxarm64"; - x86_64-darwin = "osx_64"; x86_64-linux = "linux64"; }; in @@ -29,7 +28,6 @@ let hash = selectSystem { aarch64-darwin = "sha256-rZLqbcX5ZRNeDUyEWcsLWMr3KXsnXRKBRmLZKMH9gIs="; aarch64-linux = "sha256-sMJohqgY8DrC7DLgU9AQofLWMhebznAJSLFe5D65c4M="; - x86_64-darwin = "sha256-Bit/M3Z+3bJsGSWdCDp9xK9RnxH6bptI0eMqt28dwHQ="; x86_64-linux = "sha256-PsTFM5UwX104G8YIwAy1OY4EgNhspupkPJ53y3qwGUc="; }; }; @@ -66,7 +64,6 @@ let platforms = [ "aarch64-darwin" "aarch64-linux" - "x86_64-darwin" "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/po/powershell/package.nix b/pkgs/by-name/po/powershell/package.nix index b7c267790d9e..b8611e6701a3 100644 --- a/pkgs/by-name/po/powershell/package.nix +++ b/pkgs/by-name/po/powershell/package.nix @@ -102,10 +102,6 @@ stdenv.mkDerivation rec { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-arm64.tar.gz"; hash = "sha256-ehSjheyn3FvtwciqPYt2X0Sa2jCqvleFqf0zEmbrBi0="; }; - x86_64-darwin = fetchurl { - url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-x64.tar.gz"; - hash = "sha256-8CBzpEJRWHeqWo82H1WGaAAQDEG2Zc+2SIO3fbuglBI="; - }; x86_64-linux = fetchurl { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-x64.tar.gz"; hash = "sha256-hW0HZdIzI3f516Sup279/eTeUURudzjd4t/aQdup4qc="; diff --git a/pkgs/by-name/pr/protoc-gen-grpc-java/package.nix b/pkgs/by-name/pr/protoc-gen-grpc-java/package.nix index a988d9bcc4e0..43589f649163 100644 --- a/pkgs/by-name/pr/protoc-gen-grpc-java/package.nix +++ b/pkgs/by-name/pr/protoc-gen-grpc-java/package.nix @@ -80,7 +80,6 @@ stdenv.mkDerivation (finalAttrs: { "powerpc64le-linux" "s390x-linux" # Darwin - "x86_64-darwin" "aarch64-darwin" # Windows "x86_64-windows" diff --git a/pkgs/by-name/pr/proton-pass-cli/package.nix b/pkgs/by-name/pr/proton-pass-cli/package.nix index 857d02899a24..7d48c6754153 100644 --- a/pkgs/by-name/pr/proton-pass-cli/package.nix +++ b/pkgs/by-name/pr/proton-pass-cli/package.nix @@ -63,10 +63,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-aarch64"; hash = "sha256-NdBabzetuIJEbu81Rfg3hUVEw8BJ2A3Who/i08/qwMs="; }; - "x86_64-darwin" = fetchurl { - url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-x86_64"; - hash = "sha256-K6vfr0ut8cQo1mrNeEN35akxLIo1sftt6hnn6wUa6Dk="; - }; "x86_64-linux" = fetchurl { url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-x86_64"; hash = "sha256-cYjwKnweeahg9xZq0sNPei5slhJltwZ34nBPIW3Rdtk="; diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix index b0d22a8e6cbc..e0a50c92611f 100644 --- a/pkgs/by-name/pr/proton-pass/package.nix +++ b/pkgs/by-name/pr/proton-pass/package.nix @@ -22,7 +22,6 @@ let url = "https://proton.me/download/pass/macos/ProtonPass_${version}.dmg"; hash = "sha256-CwdiHEqKnk+ELoavs1p6ND48e2rvEFBqbXQs79ihQ4M="; }; - "x86_64-darwin" = passthru.sources."aarch64-darwin"; }; updateScript = writeShellScript "update-proton-pass" '' set -o errexit diff --git a/pkgs/by-name/pr/proton-vpn/darwin.nix b/pkgs/by-name/pr/proton-vpn/darwin.nix index f688f1d78e1f..ed7e2cb3dded 100644 --- a/pkgs/by-name/pr/proton-vpn/darwin.nix +++ b/pkgs/by-name/pr/proton-vpn/darwin.nix @@ -55,7 +55,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = meta // { platforms = [ - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/pr/protonmail-desktop/package.nix b/pkgs/by-name/pr/protonmail-desktop/package.nix index 3b9df20572d8..c8374c4714ce 100644 --- a/pkgs/by-name/pr/protonmail-desktop/package.nix +++ b/pkgs/by-name/pr/protonmail-desktop/package.nix @@ -28,10 +28,6 @@ stdenv.mkDerivation { url = "https://proton.me/download/mail/macos/${version}/ProtonMail-desktop.dmg"; hash = darwinHash; }; - "x86_64-darwin" = fetchurl { - url = "https://proton.me/download/mail/macos/${version}/ProtonMail-desktop.dmg"; - hash = darwinHash; - }; } ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/ps/psc-package/package.nix b/pkgs/by-name/ps/psc-package/package.nix index 63fcd8c03328..e369775298c0 100644 --- a/pkgs/by-name/ps/psc-package/package.nix +++ b/pkgs/by-name/ps/psc-package/package.nix @@ -71,7 +71,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd3; maintainers = [ ]; platforms = [ - "x86_64-darwin" "x86_64-linux" ]; }; diff --git a/pkgs/by-name/pu/pulumi-bin/data.nix b/pkgs/by-name/pu/pulumi-bin/data.nix index 2a4b004ea6d4..f944e90eabde 100644 --- a/pkgs/by-name/pu/pulumi-bin/data.nix +++ b/pkgs/by-name/pu/pulumi-bin/data.nix @@ -161,164 +161,6 @@ sha256 = "14qsnjafhd8ppachxr7j9541p5rbf1cakqlr7mra86fli1r49z9p"; } ]; - x86_64-darwin = [ - { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.250.0-darwin-x64.tar.gz"; - sha256 = "0j730hkbhvb3qrxqg26brvwy3g1pmf1z22q5si4jj0ipsxg638ca"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.58.0-darwin-amd64.tar.gz"; - sha256 = "0fdpnggk551z63580d6vky3sm51ihhvg05ikg8p2vq0d8axji164"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v11.4.0-darwin-amd64.tar.gz"; - sha256 = "13jmk6hf5d4v98hdrb1p5h6606mpkrm4v1ypcmvpjzcsal0psqjc"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.104.0-darwin-amd64.tar.gz"; - sha256 = "070c1yqx79r8fd1dw4b14h5rgzbb2wkh15wgy2dqdknp2558h47m"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.11.3-darwin-amd64.tar.gz"; - sha256 = "02ynw60l8rz7ri5fnwlpm6qmsj2f266y7gmm01yia3l84xmj0rx6"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.47.0-darwin-amd64.tar.gz"; - sha256 = "16qx8g6zp7vdic86pzwrd4i8rvyrjjwdhylww7b5a4sfy3vwacg9"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.35.0-darwin-amd64.tar.gz"; - sha256 = "1q96gdbpaax397v7pd300c4zi27xxhhxw1vhsdpxir1gl1yabzas"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.9.1-darwin-amd64.tar.gz"; - sha256 = "1yql4aacwb6am3q9zldazmss262z19hvfp3jcysw7jskbsqa3gr5"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.15.0-darwin-amd64.tar.gz"; - sha256 = "16h5brr42f9fhhpwplxl0h2iqa0h5h11dj6vg024p3sgqb2p5qxx"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.38.0-darwin-amd64.tar.gz"; - sha256 = "044zrb629jsqvigdmqz9dx53cnhjvksxdf6rg2pw6v3ajxzbz80y"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.17.0-darwin-amd64.tar.gz"; - sha256 = "0s81lkz7bzi5z9jzgllvnf5gsvyvnc6fhdgm5xiggca5pg7a48xv"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.15.0-darwin-amd64.tar.gz"; - sha256 = "028nbjydy61zks5brpk5bhn2b1ah3w0w4f279gg04h0adc0lyvfp"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v5.7.0-darwin-amd64.tar.gz"; - sha256 = "0hyxdmmhaihvsmqlfmrid388l0z130w5yl24rkjvzgxg28v11zbh"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.73.0-darwin-amd64.tar.gz"; - sha256 = "0k24h0d6hlr4fvbm100w2fkbf25wpj05q12j7wqid1vk77m4icza"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v5.1.0-darwin-amd64.tar.gz"; - sha256 = "1g5ygb3mv58mbfb2a53042s87iw3m1gf1i1qyqb3qclmqqaymi7x"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-amd64.tar.gz"; - sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.3.0-darwin-amd64.tar.gz"; - sha256 = "0cpj6dcjrvqz5x9b4m084cqbz9mlhl7x74j0z4s7pjg1k4s0cyw6"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.29.0-darwin-amd64.tar.gz"; - sha256 = "13hcvn3njrr2iraq12gf9rr6ym7m1whq82vvbbs4z973knmrmn56"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.14.0-darwin-amd64.tar.gz"; - sha256 = "1avxgva74gcvsnc82k9vp9xskr8ddxjnbqryfbxw0mvsgp6iby0g"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v10.0.0-darwin-amd64.tar.gz"; - sha256 = "1wcf9sd4hqabn4ycwjbmhylic2cd3nsgs7xqz49l691alv97m1yi"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-amd64.tar.gz"; - sha256 = "0ddd0pgpyywq291r9q8w6bn41r2px595017iihx4n2cnb1c4v6d5"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.39.0-darwin-amd64.tar.gz"; - sha256 = "1dabrwwl9qn316r2c5ldmv9a8ddlm7gfkkgbaj2jspk4qswgbxfr"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.32.0-darwin-amd64.tar.gz"; - sha256 = "09jhjsgg5sa1a78zak21wxhi3pjml9sl3y1vh59qb0dlq2hp9whd"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v6.0.0-darwin-amd64.tar.gz"; - sha256 = "1dgx29v753hprw1cql4hkz2m7gc1a14p2wx5qrbxcf971z2lir17"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.8.0-darwin-amd64.tar.gz"; - sha256 = "1phwjh9y6grc1mcppxim6q7v3wj02pdy2lj464y3v4ydy6xdw7ha"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.3.0-darwin-amd64.tar.gz"; - sha256 = "0bf9m8gczh1a5b8b2xc7w98z5swd3a9r2dbd6b40g18kyc29mwjf"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.5.0-darwin-amd64.tar.gz"; - sha256 = "0a0zs556yx2cskym7w9xfv88wfscvxip0nwzib6i8cf901732xq7"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.17.0-darwin-amd64.tar.gz"; - sha256 = "09kly1i1p9jw939k1pr51w3ja9ixh53hyv40dm6xb6fkxcpbj1q6"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.21.0-darwin-amd64.tar.gz"; - sha256 = "1qrl998hs6iyvc35kas97dalr2bdrzb63k08i3bgaplj8f0p6pqy"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.17.0-darwin-amd64.tar.gz"; - sha256 = "1c49701g8r3565hvf55xjgbsc5hgh8rxmbsz86dp4lffsj2748sx"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.134.1-darwin-amd64.tar.gz"; - sha256 = "1zbgpbp7kxll9jmrhf009l4kc7amz7mvgxwj18rcrbf2q118v9pc"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-darwin-amd64.tar.gz"; - sha256 = "1jpcyp3lqiz4aab331x7shhqxzp4m6nz68vhkyqksvdplzr9rj44"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.28.0-darwin-amd64.tar.gz"; - sha256 = "0piwpxykabjczmd4jzzvl3fnn6g8gis02glmch2fshplgdanj7yy"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.5.0-darwin-amd64.tar.gz"; - sha256 = "1hm2lbph6i0g2hl8z0cykv55yyqmzyk52wbzzr1snj5lpygrnwc8"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.10.0-darwin-amd64.tar.gz"; - sha256 = "01vysx2nl7lm5s2398sx80b3mxmjl6kcxpnspiwyvcw8h9vp2g9s"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.13.0-darwin-amd64.tar.gz"; - sha256 = "03gblpxr9y4c1k5zd0j50q045rvq9r8k3s619rp8clnxz23khk59"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.17.0-darwin-amd64.tar.gz"; - sha256 = "1w0xj0bsmpjm56yafajpqin6aljyj2x6wk5n9z8a76gvwh6c5awn"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.12-darwin-amd64.tar.gz"; - sha256 = "00xk2mz37n2szb7yswcifgrcanqdlbxqcah04a4b7d4b09d3rwz3"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-amd64.tar.gz"; - sha256 = "11wm9c125154brisncm9cgb41nbjl9q9h4bq6z0ym8v681qq0fc4"; - } - ]; aarch64-linux = [ { url = "https://get.pulumi.com/releases/sdk/pulumi-v3.250.0-linux-arm64.tar.gz"; diff --git a/pkgs/by-name/pv/pvs-studio/package.nix b/pkgs/by-name/pv/pvs-studio/package.nix index 9a2fa2f2fb81..03e9c5c2b494 100644 --- a/pkgs/by-name/pv/pvs-studio/package.nix +++ b/pkgs/by-name/pv/pvs-studio/package.nix @@ -25,12 +25,10 @@ stdenv.mkDerivation rec { fetchzip { url = selectSystem { aarch64-darwin = "https://web.archive.org/web/20260131193428/https://files.pvs-studio.com/pvs-studio-${version}-macos-arm64.zip"; - x86_64-darwin = "https://web.archive.org/web/20260131193142/https://files.pvs-studio.com/pvs-studio-${version}-macos-x86_64.zip"; x86_64-linux = "https://web.archive.org/web/20260131192910/https://files.pvs-studio.com/pvs-studio-${version}-x86_64.tgz"; }; hash = selectSystem { aarch64-darwin = "sha256-ExJldpqwD9dqGtY/QQ2i3qiNXSyR6exhYKIrwgdQrtQ="; - x86_64-darwin = "sha256-zKwUVDoi9yWCD0gooeDslTwzQ/9N17OkMqwkAL0EQe8="; x86_64-linux = "sha256-c7+Zvo+cHtGtdaHi+3w7Vjluo7uQ2CfptCO8RkVm7wU="; }; }; @@ -73,7 +71,6 @@ stdenv.mkDerivation rec { license = lib.licenses.unfreeRedistributable; platforms = [ "aarch64-darwin" - "x86_64-darwin" "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/qf/qFlipper/package.nix b/pkgs/by-name/qf/qFlipper/package.nix index a9d2156d07f9..9a82d06de575 100644 --- a/pkgs/by-name/qf/qFlipper/package.nix +++ b/pkgs/by-name/qf/qFlipper/package.nix @@ -94,7 +94,6 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [ cab404 ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" ]; # qtbase doesn't build yet on aarch64-darwin }; diff --git a/pkgs/by-name/qq/qq/package.nix b/pkgs/by-name/qq/qq/package.nix index 71e592b1d694..fe372117e064 100644 --- a/pkgs/by-name/qq/qq/package.nix +++ b/pkgs/by-name/qq/qq/package.nix @@ -47,7 +47,6 @@ let platforms = [ "aarch64-darwin" "aarch64-linux" - "x86_64-darwin" "x86_64-linux" ]; license = lib.licenses.unfree; diff --git a/pkgs/by-name/qq/qq/sources.nix b/pkgs/by-name/qq/qq/sources.nix index 069b9861e72e..563fb6bc5ad9 100644 --- a/pkgs/by-name/qq/qq/sources.nix +++ b/pkgs/by-name/qq/qq/sources.nix @@ -12,7 +12,6 @@ let in { aarch64-darwin = any-darwin; - x86_64-darwin = any-darwin; aarch64-linux = { version = "3.2.29-2026-05-28"; src = fetchurl { diff --git a/pkgs/by-name/ra/radarr/deps.json b/pkgs/by-name/ra/radarr/deps.json index 85245045429c..993445ebd52e 100644 --- a/pkgs/by-name/ra/radarr/deps.json +++ b/pkgs/by-name/ra/radarr/deps.json @@ -808,9 +808,9 @@ }, { "pname": "Servarr.FFprobe", - "version": "5.1.4.112", - "hash": "sha256-OdPIvZcrGj0XaqFJQCnrPt0zgPPvB5nd7WpYFF9Bnh0=", - "url": "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/783c2dce-dbc3-4218-8816-4a5e12af4d84/nuget/v3/flat2/servarr.ffprobe/5.1.4.112/servarr.ffprobe.5.1.4.112.nupkg" + "version": "5.1.10.124", + "hash": "sha256-7/xXsQNQGIAF+KtVln2x5QnLs0L1zyDmusyJESOsNP8=", + "url": "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/783c2dce-dbc3-4218-8816-4a5e12af4d84/nuget/v3/flat2/servarr.ffprobe/5.1.10.124/servarr.ffprobe.5.1.10.124.nupkg" }, { "pname": "SharpZipLib", diff --git a/pkgs/by-name/ra/radarr/package.nix b/pkgs/by-name/ra/radarr/package.nix index 15c4af170792..571bd6e1abe2 100644 --- a/pkgs/by-name/ra/radarr/package.nix +++ b/pkgs/by-name/ra/radarr/package.nix @@ -21,7 +21,7 @@ applyPatches, }: let - version = "6.2.1.10461"; + version = "6.3.0.10514"; # The dotnet8 compatibility patches also change `yarn.lock`, so we must pass # the already patched lockfile to `fetchYarnDeps`. src = applyPatches { @@ -29,7 +29,7 @@ let owner = "Radarr"; repo = "Radarr"; tag = "v${version}"; - hash = "sha256-gDEMahF0uhwlOisD0gWzY3M17mXftKBm9gN5Uaatqsk="; + hash = "sha256-1CAcsqhdAH2dOcOMVyIlaqEmCKDwXNUJf3SuVuJEZ7E="; }; postPatch = '' mv src/NuGet.config NuGet.Config diff --git a/pkgs/by-name/ra/ralphex/package.nix b/pkgs/by-name/ra/ralphex/package.nix index de0b83afdcc8..55e294916088 100644 --- a/pkgs/by-name/ra/ralphex/package.nix +++ b/pkgs/by-name/ra/ralphex/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { pname = "ralphex"; - version = "1.5.1"; + version = "1.6.0"; __structuredAttrs = true; @@ -17,7 +17,7 @@ buildGoModule (finalAttrs: { owner = "umputun"; repo = "ralphex"; tag = "v${finalAttrs.version}"; - hash = "sha256-oW2BQIq98YwTc9h4u3KOhx6x7qgGMLetXNnOTOjM49Q="; + hash = "sha256-RUl5BVGc5EjeXZNjfC2WVZrrSXxR1mQyABkIxIT2NyQ="; }; vendorHash = null; diff --git a/pkgs/by-name/ra/rapidapi/package.nix b/pkgs/by-name/ra/rapidapi/package.nix index 9b5bdc7c5348..119b5a422927 100644 --- a/pkgs/by-name/ra/rapidapi/package.nix +++ b/pkgs/by-name/ra/rapidapi/package.nix @@ -74,7 +74,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ DimitarNestorov ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/ra/rar/package.nix b/pkgs/by-name/ra/rar/package.nix index cf563ccd3586..e415d4c17ac3 100644 --- a/pkgs/by-name/ra/rar/package.nix +++ b/pkgs/by-name/ra/rar/package.nix @@ -20,10 +20,6 @@ let url = "https://www.rarlab.com/rar/rarmacos-arm-${downloadVersion}.tar.gz"; hash = "sha256-aLOTwAB1jUd/3kPJVf91QvEvdvP16HzdqSMVL8eRvU0="; }; - x86_64-darwin = { - url = "https://www.rarlab.com/rar/rarmacos-x64-${downloadVersion}.tar.gz"; - hash = "sha256-2h+zw9d0gTbJs2m2g9V0s3LLHtBJpjSoH4XZORg0bY8="; - }; }; in stdenv.mkDerivation { diff --git a/pkgs/by-name/ra/raycast/package.nix b/pkgs/by-name/ra/raycast/package.nix index 8ab35d586a2f..aa90edbbf9bd 100644 --- a/pkgs/by-name/ra/raycast/package.nix +++ b/pkgs/by-name/ra/raycast/package.nix @@ -21,11 +21,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=arm"; hash = "sha256-muX6PPanjU+ElCQhIfo7Y7cChbTO8Q/gH12ULvBK43s="; }; - x86_64-darwin = fetchurl { - name = "Raycast.dmg"; - url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=x86_64"; - hash = "sha256-E8VGFydX5GXE3graZUSzN0S2JGbBXM/LD+DLm9waAus="; - }; } .${stdenvNoCC.system} or (throw "raycast: ${stdenvNoCC.system} is unsupported."); @@ -85,7 +80,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; diff --git a/pkgs/by-name/re/readarr/package.nix b/pkgs/by-name/re/readarr/package.nix index 5f2874bd8c3c..78a0bd08d1e2 100644 --- a/pkgs/by-name/re/readarr/package.nix +++ b/pkgs/by-name/re/readarr/package.nix @@ -19,7 +19,6 @@ let { x86_64-linux = "x64"; aarch64-linux = "arm64"; - x86_64-darwin = "x64"; } ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = @@ -80,7 +79,6 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" ]; }; } diff --git a/pkgs/by-name/re/reaper-reapack-extension/darwin.nix b/pkgs/by-name/re/reaper-reapack-extension/darwin.nix index d44bf2c324bb..3f643cbed2a4 100644 --- a/pkgs/by-name/re/reaper-reapack-extension/darwin.nix +++ b/pkgs/by-name/re/reaper-reapack-extension/darwin.nix @@ -20,7 +20,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { "https://github.com/cfillion/reapack/releases/download/v${finalAttrs.version}/reaper_reapack-${arch}.dylib"; hash = { - x86_64-darwin = "sha256-slLzjIWpEzOn4GAcRwb6WdJSVExuQK0cVgHgd7qM4oE="; aarch64-darwin = "sha256-eFKEUuTUWE4Wp/vWVrvTbK78U6TicvRXSWggVAH2Og4="; } .${stdenvNoCC.hostPlatform.system}; diff --git a/pkgs/by-name/re/reaper-reapack-extension/package.nix b/pkgs/by-name/re/reaper-reapack-extension/package.nix index 1f5bafa0574c..1c40ddc28e9c 100644 --- a/pkgs/by-name/re/reaper-reapack-extension/package.nix +++ b/pkgs/by-name/re/reaper-reapack-extension/package.nix @@ -20,7 +20,6 @@ callPackage p { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/re/reaper-sws-extension/darwin.nix b/pkgs/by-name/re/reaper-sws-extension/darwin.nix index 3011ad5e7ee6..9ad9d3679f6c 100644 --- a/pkgs/by-name/re/reaper-sws-extension/darwin.nix +++ b/pkgs/by-name/re/reaper-sws-extension/darwin.nix @@ -23,7 +23,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { "https://github.com/reaper-oss/sws/releases/download/v${finalAttrs.version}/reaper_sws-${arch}.dylib"; hash = { - x86_64-darwin = "sha256-c0enRIXFN+dMDdxTQ3hFv0almTF0dfrSHILNigJp2Js="; aarch64-darwin = "sha256-jmuob0qslYhxiE2ShfTwY4RJAKBLJSUb+VBEM0sQPbo="; } .${stdenvNoCC.hostPlatform.system}; diff --git a/pkgs/by-name/re/reaper-sws-extension/package.nix b/pkgs/by-name/re/reaper-sws-extension/package.nix index f4f2a33aadee..1c4d22bf271f 100644 --- a/pkgs/by-name/re/reaper-sws-extension/package.nix +++ b/pkgs/by-name/re/reaper-sws-extension/package.nix @@ -22,7 +22,6 @@ callPackage p { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/re/reaper/package.nix b/pkgs/by-name/re/reaper/package.nix index 3363d1e1d760..dd34c1d76d44 100644 --- a/pkgs/by-name/re/reaper/package.nix +++ b/pkgs/by-name/re/reaper/package.nix @@ -148,7 +148,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/rg/rgrc/package.nix b/pkgs/by-name/rg/rgrc/package.nix index e95e47c58883..a2e6b0765a30 100644 --- a/pkgs/by-name/rg/rgrc/package.nix +++ b/pkgs/by-name/rg/rgrc/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rgrc"; - version = "0.6.13"; + version = "0.6.14"; src = fetchFromGitHub { owner = "lazywalker"; repo = "rgrc"; tag = "v${finalAttrs.version}"; - hash = "sha256-MZ3+dgq78QcroHJ0eL7kUuI+wZm6QaTCgA4CrcO5iCQ="; + hash = "sha256-DEsxdqX9kAK/TqmP8PMOLQE4ij0+8mkoK/QapbXikss="; }; - cargoHash = "sha256-DB3J3fTesC8Eg/GqWLYKIiE8FoNjGs9i1LgNx4klvsw="; + cargoHash = "sha256-OLDMaHwrDO4Q4V0hVIbXmkTiBowpGoZc/xOISwS25Nc="; buildFeatures = [ "embed-configs" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ro/roam-research/common.nix b/pkgs/by-name/ro/roam-research/common.nix index 97095a8eadea..d284c83ee5aa 100644 --- a/pkgs/by-name/ro/roam-research/common.nix +++ b/pkgs/by-name/ro/roam-research/common.nix @@ -6,10 +6,6 @@ in { inherit pname version; sources = { - x86_64-darwin = fetchurl { - url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/Roam+Research-${version}.dmg"; - hash = "sha256-c7h+ZvR1LtHhOr63xQcRxXC00on2Ob0XfRyS2HU3Qkg="; - }; aarch64-darwin = fetchurl { url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/Roam+Research-${version}-arm64.dmg"; hash = "sha256-fPtJAKfh65/dEryi0kdg+1hLfdvzBU87uS0y6eaaVy4="; diff --git a/pkgs/by-name/ro/roam-research/darwin.nix b/pkgs/by-name/ro/roam-research/darwin.nix index b11afb88e8f4..00603c518486 100644 --- a/pkgs/by-name/ro/roam-research/darwin.nix +++ b/pkgs/by-name/ro/roam-research/darwin.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = [ - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "roam-research"; diff --git a/pkgs/by-name/ro/rosenpass/package.nix b/pkgs/by-name/ro/rosenpass/package.nix index e0fe37b334f0..dbbb4cea5f77 100644 --- a/pkgs/by-name/ro/rosenpass/package.nix +++ b/pkgs/by-name/ro/rosenpass/package.nix @@ -59,7 +59,6 @@ rustPlatform.buildRustPackage (finalAttrs: { platforms = [ "aarch64-darwin" "aarch64-linux" - "x86_64-darwin" "x86_64-linux" ]; mainProgram = "rosenpass"; diff --git a/pkgs/by-name/ro/router/librusty_v8.nix b/pkgs/by-name/ro/router/librusty_v8.nix index 46c17dfd01c6..063fbb7f95a8 100644 --- a/pkgs/by-name/ro/router/librusty_v8.nix +++ b/pkgs/by-name/ro/router/librusty_v8.nix @@ -22,7 +22,6 @@ fetch_librusty_v8 { shas = { x86_64-linux = "sha256-8pa8nqA6rbOSBVnp2Q8/IQqh/rfYQU57hMgwU9+iz4A="; aarch64-linux = "sha256-3kXOV8rlCNbNBdXgOtd3S94qO+JIKyOByA4WGX+XVP0="; - x86_64-darwin = "sha256-iBBVKZiSoo08YEQ8J/Rt1/5b7a+2xjtuS6QL/Wod5nQ="; aarch64-darwin = "sha256-Djnuc3l/jQKvBf1aej8LG5Ot2wPT0m5Zo1B24l1UHsM="; }; } diff --git a/pkgs/by-name/rp/rpiboot/package.nix b/pkgs/by-name/rp/rpiboot/package.nix index 767cc479f12d..ab25daf1743a 100644 --- a/pkgs/by-name/rp/rpiboot/package.nix +++ b/pkgs/by-name/rp/rpiboot/package.nix @@ -46,7 +46,6 @@ stdenv.mkDerivation (finalAttrs: { "armv7l-linux" "armv6l-linux" "x86_64-linux" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/ru/rutabaga_gfx/package.nix b/pkgs/by-name/ru/rutabaga_gfx/package.nix index 5caaa90d1ed4..3f02cfa6c39a 100644 --- a/pkgs/by-name/ru/rutabaga_gfx/package.nix +++ b/pkgs/by-name/ru/rutabaga_gfx/package.nix @@ -84,7 +84,6 @@ stdenv.mkDerivation (finalAttrs: { "armv6l-linux" "armv7a-linux" "armv7l-linux" - "x86_64-darwin" "x86_64-linux" ]; }; diff --git a/pkgs/by-name/sa/sauce-connect/package.nix b/pkgs/by-name/sa/sauce-connect/package.nix index d2b6114a21f3..c40048785f35 100644 --- a/pkgs/by-name/sa/sauce-connect/package.nix +++ b/pkgs/by-name/sa/sauce-connect/package.nix @@ -21,11 +21,10 @@ stdenv.mkDerivation rec { url = "https://saucelabs.com/downloads/sauce-connect/${version}/sauce-connect-${version}_linux.aarch64.tar.gz"; hash = "sha256-3fUB0KLFEmSzRlYSZhJ3VP4QJC/S1R2Iyk3+o82sNRg="; }; - x86_64-darwin = fetchurl { + aarch64-darwin = fetchurl { url = "https://saucelabs.com/downloads/sauce-connect/${version}/sauce-connect-${version}_darwin.all.zip"; hash = "sha256-nSmDenuel+L4HKhDEHMirGwKj0A7plIXAqf+T7Agc3A="; }; - aarch64-darwin = passthru.sources.x86_64-darwin; }; updateScript = ./update.sh; }; diff --git a/pkgs/by-name/sa/sauce-connect/update.sh b/pkgs/by-name/sa/sauce-connect/update.sh index 38ab992a3eb3..79a8afb7059d 100755 --- a/pkgs/by-name/sa/sauce-connect/update.sh +++ b/pkgs/by-name/sa/sauce-connect/update.sh @@ -19,7 +19,7 @@ all_versions=$(jq --exit-status --raw-output \ '.all_downloads | to_entries[] | select(.value | has("linux") and has("osx")) | .key' \ <<< "$response") latest_version=$(sort --version-sort <<< "$all_versions" | tail -n 1) -for platform in x86_64-linux aarch64-linux x86_64-darwin; do +for platform in x86_64-linux aarch64-linux aarch64-darwin; do update-source-version sauce-connect "$latest_version" \ --ignore-same-version \ --source-key="passthru.sources.$platform" diff --git a/pkgs/by-name/sa/saw-tools/sources.nix b/pkgs/by-name/sa/saw-tools/sources.nix index 5f17154d628c..41b753252c81 100644 --- a/pkgs/by-name/sa/saw-tools/sources.nix +++ b/pkgs/by-name/sa/saw-tools/sources.nix @@ -5,10 +5,6 @@ url = "https://github.com/GaloisInc/saw-script/releases/download/v1.5/saw-1.5-macos-15-ARM64-with-solvers.tar.gz"; hash = "sha256-1mURJfcnIRhuLrG1Gf4SRXmTzLbztBBRQGcXFFiAWWU="; }; - x86_64-darwin = { - url = "https://github.com/GaloisInc/saw-script/releases/download/v1.5/saw-1.5-macos-15-intel-X64-with-solvers.tar.gz"; - hash = "sha256-f3NofLPR6tarcZg/EjtCv1mSxz5O4nTKeOEoTPeGgf8="; - }; x86_64-linux = { url = "https://github.com/GaloisInc/saw-script/releases/download/v1.5/saw-1.5-ubuntu-22.04-X64-with-solvers.tar.gz"; hash = "sha256-k9Qo93d0IXBRe7P+wU20LjFjM+LdHf6Z2S0Nybmh/4E="; diff --git a/pkgs/by-name/sc/scala-cli/sources.json b/pkgs/by-name/sc/scala-cli/sources.json index fdaf6f63e512..98f82f24b34d 100644 --- a/pkgs/by-name/sc/scala-cli/sources.json +++ b/pkgs/by-name/sc/scala-cli/sources.json @@ -9,10 +9,6 @@ "asset": "scala-cli-aarch64-pc-linux.gz", "sha256": "1ja02j2nqp4c0hhj102zrl8sdxxcivsijkacbs0qff4kzjdjyzp7" }, - "x86_64-darwin": { - "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "0a478k2qknzsfw5fccz3fwq4sha789i2rdprpj5dj9717aj1ygpi" - }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", "sha256": "1xih99h7dklf7i08m71r9dxrid1xwa0jvixncc177a42zwwkkcrp" diff --git a/pkgs/by-name/sc/scilab-bin/package.nix b/pkgs/by-name/sc/scilab-bin/package.nix index 9371ace75235..f8372ca0abbb 100644 --- a/pkgs/by-name/sc/scilab-bin/package.nix +++ b/pkgs/by-name/sc/scilab-bin/package.nix @@ -27,10 +27,6 @@ let url = "https://www.utc.fr/~mottelet/scilab/download/${version}/scilab-${version}-accelerate-arm64.dmg"; sha256 = "sha256-L4dxD8R8bY5nd+4oDs5Yk0LlNsFykLnAM+oN/O87SRI="; }; - x86_64-darwin = fetchurl { - url = "https://www.utc.fr/~mottelet/scilab/download/${version}/scilab-${version}-x86_64.dmg"; - sha256 = "sha256-tBeqzllMuogrGcJxGqEl2DdNXaiwok3yhzWSdlWY5Fc="; - }; x86_64-linux = fetchurl { url = "https://www.scilab.org/download/${version}/scilab-${version}.bin.linux-x86_64.tar.gz"; sha256 = "sha256-PuGnz2YdAhriavwnuf5Qyy0cnCeRHlWC6dQzfr7bLHk="; @@ -44,7 +40,6 @@ let description = "Scientific software package for numerical computations (Matlab lookalike)"; platforms = [ "aarch64-darwin" - "x86_64-darwin" "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/sd/sdrplay/package.nix b/pkgs/by-name/sd/sdrplay/package.nix index 93a762cb0058..5644e1bf5ede 100644 --- a/pkgs/by-name/sd/sdrplay/package.nix +++ b/pkgs/by-name/sd/sdrplay/package.nix @@ -14,13 +14,12 @@ let hash = "sha256-CTcyv10Xz9G2LqHh4qOW9tKBEcB+rztE2R7xJIU4QBQ="; }; - x86_64-darwin = { + aarch64-darwin = { url = "https://www.sdrplay.com/software/SDRplayAPI-macos-installer-universal-3.15.1.pkg"; hash = "sha256-XRSM7aH653XS0t9bP89G3uJ7YiLiU1xMBjwvLqL3rMM="; }; aarch64-linux = x86_64-linux; - aarch64-darwin = x86_64-darwin; }; platforms = lib.attrNames sources; diff --git a/pkgs/by-name/se/segger-jlink/source.nix b/pkgs/by-name/se/segger-jlink/source.nix index 07887df66dab..2b3703a6fa6a 100644 --- a/pkgs/by-name/se/segger-jlink/source.nix +++ b/pkgs/by-name/se/segger-jlink/source.nix @@ -30,10 +30,4 @@ ext = "pkg"; hash = "sha256-wfK9cV2Ul3LGmqTwerS1+BR0BuhmCFZdXtWykwJqWCM="; }; - x86_64-darwin = { - os = "MacOSX"; - name = "x86_64"; - ext = "pkg"; - hash = "sha256-4xgulHc4AtGr2CV1NIX02N0y75k5s9AXgX6jK6hXW9s="; - }; } diff --git a/pkgs/by-name/sh/sharpsat-td/package.nix b/pkgs/by-name/sh/sharpsat-td/package.nix index 6004c73a541a..f883f5b8acbb 100644 --- a/pkgs/by-name/sh/sharpsat-td/package.nix +++ b/pkgs/by-name/sh/sharpsat-td/package.nix @@ -91,7 +91,6 @@ stdenv.mkDerivation { # uses clhash, which is non-portable platforms = [ "x86_64-linux" - "x86_64-darwin" ]; }; } diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix index 003cf64b05bf..7fa96cde9803 100644 --- a/pkgs/by-name/si/signal-desktop/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -339,7 +339,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/si/simplotask/package.nix b/pkgs/by-name/si/simplotask/package.nix index 5e67109b2471..816baca71ed9 100644 --- a/pkgs/by-name/si/simplotask/package.nix +++ b/pkgs/by-name/si/simplotask/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "simplotask"; - version = "1.20.0"; + version = "1.20.1"; src = fetchFromGitHub { owner = "umputun"; repo = "spot"; tag = "v${finalAttrs.version}"; - hash = "sha256-iSUT5b0nL+6wiiMXFoXwe9r4WV68BXopCYRrswwFxyk="; + hash = "sha256-VZXtteRXzjxXtAOYXZHBXknOyegbaCAPPXyRtig3PIs="; }; vendorHash = null; diff --git a/pkgs/by-name/si/simulide/package.nix b/pkgs/by-name/si/simulide/package.nix index 6064a90e2e41..c111213f2356 100644 --- a/pkgs/by-name/si/simulide/package.nix +++ b/pkgs/by-name/si/simulide/package.nix @@ -177,7 +177,6 @@ stdenv.mkDerivation { ]; platforms = [ "x86_64-linux" - "x86_64-darwin" ]; }; } diff --git a/pkgs/by-name/si/six-sines/package.nix b/pkgs/by-name/si/six-sines/package.nix index 14100abc6c98..1f03f2f282ce 100644 --- a/pkgs/by-name/si/six-sines/package.nix +++ b/pkgs/by-name/si/six-sines/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + nix-update-script, cmake, pkg-config, autoPatchelfHook, @@ -22,9 +23,6 @@ libxrandr, libxrender, libxscrnsaver, - # clap-wrapper's Linux standalone GUI host (auto-detected via pkg-config; - # if absent, the standalone still builds but can't show plugin windows) - gtkmm3, }: let @@ -34,18 +32,19 @@ let # `base_sdks.cmake` short-circuits the CPM path when *_SDK_ROOT is set. # # Revisions are pinned to whatever the clap-wrapper submodule at the - # six-sines v1.1.0 tag requests in cmake/base_sdks.cmake. When bumping + # six-sines v1.2.0 tag requests in cmake/base_sdks.cmake. When bumping # six-sines, re-check those tags here. vst3sdk = fetchFromGitHub { owner = "steinbergmedia"; repo = "vst3sdk"; - rev = "v3.7.6_build_18"; + rev = "v3.8.0_build_66"; fetchSubmodules = true; - hash = "sha256-MeMb09bM8D4FPHWvvRbmWbiyO9u8JVxyfgv4jmeogLI="; + hash = "sha256-9HnDOOiKT0ploNJukk4vcZjBLS5gL4SdvmfFqZJPIxA="; # The `doc` submodule is ~130 MB of PDFs we never reference. The # `vstgui4` submodule isn't touched by clap-wrapper's VST3 glue either, - # but it's small (~12 MB) and removing it would diverge further from - # upstream Steinberg, so leave it in. + # but it — like the `tutorials` submodule that appeared in 3.8.0 — is + # small, and removing more would diverge further from upstream + # Steinberg, so leave both in. postFetch = '' rm -rf $out/doc ''; @@ -68,7 +67,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "six-sines"; - version = "1.1.0"; + version = "1.2.0"; __structuredAttrs = true; strictDeps = true; @@ -77,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "six-sines"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-IQLGC86FqS3dptPzNpHEYKB59MWFDKsOPGM+FuzGcPo="; + hash = "sha256-6m3+IthBnBvRX8gB8JH3NVN7ot3jTn5zSl/HYUB5Zy4="; }; nativeBuildInputs = [ @@ -110,7 +109,6 @@ stdenv.mkDerivation (finalAttrs: { libxrandr libxrender libxscrnsaver - gtkmm3 ]; # JUCE loads several X11 libraries via dlopen() in juce_XSymbols_linux.h @@ -154,20 +152,16 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "VST3_SDK_ROOT" "${vst3sdk}") (lib.cmakeFeature "RTAUDIO_SDK_ROOT" "${rtaudio-src}") (lib.cmakeFeature "RTMIDI_SDK_ROOT" "${rtmidi-src}") - - # CMake 4 hard-removed support for cmake_minimum_required(VERSION < 3.5). - # The bundled libsamplerate submodule still declares `VERSION 3.1..3.18` - # at the top of its CMakeLists.txt and refuses to configure otherwise. - # 3.5 is the value CMake itself suggests in the error. - (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5") ]; - # The CMakeLists exposes a `six-sines_all` custom target that aggregates - # the `_clap`, `_vst3`, and `_standalone` sub-targets (`_auv2` is - # APPLE-gated and absent on Linux). The default ALL target would build - # the same outputs in practice — the test subdir is already EXCLUDE_FROM_ALL - # — but going through `six-sines_all` matches what upstream documents and - # keeps the surface narrow if extra default targets ever land later. + # clap-wrapper's make_clapfirst_plugins() defines a `six-sines_all` custom + # target that aggregates the `_clap`, `_vst3`, and `_standalone` + # sub-targets (`_auv2` is APPLE-gated and absent on Linux). The default + # ALL target would build the same outputs in practice — the test subdir + # is EXCLUDE_FROM_ALL and the installer helper target added in 1.2.0 is + # likewise outside it — but going through `six-sines_all` matches what + # upstream documents and keeps the surface narrow if extra default + # targets ever land later. buildPhase = '' runHook preBuild cmake --build . --config Release --parallel "$NIX_BUILD_CORES" --target six-sines_all @@ -193,6 +187,11 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + # nix-update bumps version + src hash, but knows nothing about the + # vst3sdk pin in the let-binding above — on every bump, re-check the + # tag requested by the clap-wrapper submodule's cmake/base_sdks.cmake. + passthru.updateScript = nix-update-script { }; + meta = { description = "Small synthesizer exploring audio-rate inter-modulation of sine waves (FM/PM/AM)"; longDescription = '' @@ -208,9 +207,11 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ magnetophon ]; mainProgram = "six-sines"; - # cmake/compile-options.cmake hard-codes `-march=nehalem` for non-Apple - # builds, and clap-wrapper hard-codes the VST3 bundle architecture path - # to `x86_64-linux`. aarch64-linux would require patching both. + # Since 1.2.0 upstream selects `-march=armv8-a` on aarch64 (`nehalem` + # only on x86), and clap-wrapper derives the VST3 bundle arch dir from + # CMAKE_SYSTEM_PROCESSOR instead of hard-coding x86_64-linux, so + # aarch64-linux should now be viable — add it once a build has been + # verified. platforms = [ "x86_64-linux" ]; }; }) diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index 50f578ed3205..88adb201f72a 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -27,7 +27,6 @@ let platformIds = { "x86_64-linux" = "linux"; "aarch64-linux" = "linux-arm64"; - "x86_64-darwin" = "darwin"; "aarch64-darwin" = "darwin-arm64"; }; diff --git a/pkgs/by-name/sk/sketchybar/package.nix b/pkgs/by-name/sk/sketchybar/package.nix index 4d615ad3b9a8..8c622c8ea8ab 100644 --- a/pkgs/by-name/sk/sketchybar/package.nix +++ b/pkgs/by-name/sk/sketchybar/package.nix @@ -14,7 +14,6 @@ let target = { "aarch64-darwin" = "arm64"; - "x86_64-darwin" = "x86"; } .${system} or (throw "Unsupported system: ${system}"); in diff --git a/pkgs/by-name/sl/slack/package.nix b/pkgs/by-name/sl/slack/package.nix index cd229d837413..d347bd66ef14 100644 --- a/pkgs/by-name/sl/slack/package.nix +++ b/pkgs/by-name/sl/slack/package.nix @@ -26,7 +26,6 @@ let prince213 ]; platforms = [ - "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ]; diff --git a/pkgs/by-name/sl/slack/sources.nix b/pkgs/by-name/sl/slack/sources.nix index f8a69186d6e8..52cc93c4d730 100644 --- a/pkgs/by-name/sl/slack/sources.nix +++ b/pkgs/by-name/sl/slack/sources.nix @@ -9,13 +9,6 @@ hash = "sha256-u5NppmmRyC+6HaPIcSSGOOdVRiZdT9GE1eHvad6rYdY="; }; }; - x86_64-darwin = { - version = "4.49.89"; - src = fetchurl { - url = "https://downloads.slack-edge.com/desktop-releases/mac/x64/4.49.89/Slack-4.49.89-macOS.dmg"; - hash = "sha256-eysKaQ1SXScsL0vji+32r/NgWN0eni62+LkB4svTHUE="; - }; - }; x86_64-linux = { version = "4.49.89"; src = fetchurl { diff --git a/pkgs/by-name/sl/sleek-todo/package.nix b/pkgs/by-name/sl/sleek-todo/package.nix index 9962bb5fa571..70919ae938a5 100644 --- a/pkgs/by-name/sl/sleek-todo/package.nix +++ b/pkgs/by-name/sl/sleek-todo/package.nix @@ -15,10 +15,6 @@ let src = fetchurl { - x86_64-darwin = { - url = "https://github.com/ransome1/sleek/releases/download/v${version}/sleek-2.0.14-mac-x64.dmg"; - hash = "sha256-f5mMSRa+gAoakOy9TSZeALqCylGLd0nUJIh8o+LWAro="; - }; x86_64-linux = { url = "https://github.com/ransome1/sleek/releases/download/v${version}/sleek-2.0.14.AppImage"; hash = "sha256-d2fLsCI7peuNBtjgHs1qumgPAF9eJeBYiIIffoSv9Jk="; @@ -34,7 +30,6 @@ let mainProgram = "sleek-todo"; platforms = [ "x86_64-linux" - "x86_64-darwin" ]; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/by-name/sn/snipaste/package.nix b/pkgs/by-name/sn/snipaste/package.nix index cd2a8efd0ecf..e6486aca4d3d 100644 --- a/pkgs/by-name/sn/snipaste/package.nix +++ b/pkgs/by-name/sn/snipaste/package.nix @@ -31,7 +31,6 @@ let mainProgram = "snipaste"; platforms = [ "aarch64-darwin" - "x86_64-darwin" "x86_64-linux" ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; diff --git a/pkgs/by-name/sn/snipaste/sources.nix b/pkgs/by-name/sn/snipaste/sources.nix index fd43d746efdc..b3ed093ee007 100644 --- a/pkgs/by-name/sn/snipaste/sources.nix +++ b/pkgs/by-name/sn/snipaste/sources.nix @@ -12,7 +12,6 @@ let in { aarch64-darwin = any-darwin; - x86_64-darwin = any-darwin; x86_64-linux = { version = "2.11.3"; src = fetchurl { diff --git a/pkgs/by-name/so/soapysdrplay/package.nix b/pkgs/by-name/so/soapysdrplay/package.nix index e30f18451336..9af47dddf8d7 100644 --- a/pkgs/by-name/so/soapysdrplay/package.nix +++ b/pkgs/by-name/so/soapysdrplay/package.nix @@ -43,7 +43,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/so/souffle/package.nix b/pkgs/by-name/so/souffle/package.nix index c222f3864ee8..df5acb20c7b7 100644 --- a/pkgs/by-name/so/souffle/package.nix +++ b/pkgs/by-name/so/souffle/package.nix @@ -89,8 +89,8 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' substituteInPlace "$out/bin/souffle-compile.py" \ - --replace "-IPLACEHOLDER_FOR_INCLUDES_THAT_ARE_SET_BY_NIXPKGS" \ - "-I${ncurses.dev}/include -I${zlib.dev}/include -I${sqlite.dev}/include -I${libffi.dev}/include -I$out/include" + --replace-fail "-IPLACEHOLDER_FOR_INCLUDES_THAT_ARE_SET_BY_NIXPKGS" \ + "-I${lib.getDev ncurses}/include -I${lib.getDev zlib}/include -I${lib.getDev sqlite}/include -I${lib.getDev libffi}/include -I$out/include" ''; outputs = [ "out" ]; diff --git a/pkgs/by-name/so/sourcery/package.nix b/pkgs/by-name/so/sourcery/package.nix index f3de616a6d4e..9f24c45258a1 100644 --- a/pkgs/by-name/so/sourcery/package.nix +++ b/pkgs/by-name/so/sourcery/package.nix @@ -30,10 +30,6 @@ python3Packages.buildPythonApplication (finalAttrs: { platform = "manylinux1_x86_64"; hash = "sha256-oUL7EVbfwgV1K1Rv0kzW5r1AXr167BCXwzntDgVyTc0="; }; - "x86_64-darwin" = fetchWheel { - platform = "macosx_10_9_x86_64"; - hash = "sha256-Ynn1BUBrmzRV2sL5ZGwOEQ/ccoV0edwFt4iiz9KN+k8="; - }; "aarch64-darwin" = fetchWheel { platform = "macosx_11_0_arm64"; hash = "sha256-iQNOSoAClAk2FMjAExfgsFHDXS56vwieePGDCYRRbgQ="; diff --git a/pkgs/by-name/sp/spacedrive/package.nix b/pkgs/by-name/sp/spacedrive/package.nix index a1e86f16de7a..9abc044e017f 100644 --- a/pkgs/by-name/sp/spacedrive/package.nix +++ b/pkgs/by-name/sp/spacedrive/package.nix @@ -26,10 +26,6 @@ let url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-darwin-aarch64.dmg"; hash = "sha256-0Bj6GjsxLUgLlycA33pXIvItoqFtatjJl2Z/ZwjnC0c="; }; - x86_64-darwin = { - url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-darwin-x86_64.dmg"; - hash = "sha256-E1XCGeWBe/oHHE3izMykT8wFrIGhNMvmxEieMrnSfZ8="; - }; x86_64-linux = { url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-linux-x86_64.deb"; hash = "sha256-MLCAHNLJ/9bdCBLBBssrpk98uvKTfHs9YGxmxJ11/oY="; @@ -44,7 +40,6 @@ let changelog = "https://github.com/spacedriveapp/spacedrive/releases/tag/${version}"; platforms = [ "aarch64-darwin" - "x86_64-darwin" "x86_64-linux" ]; license = lib.licenses.agpl3Plus; diff --git a/pkgs/by-name/sp/spacetimedb/librusty_v8.nix b/pkgs/by-name/sp/spacetimedb/librusty_v8.nix index c990394b5441..65e72c49d23e 100644 --- a/pkgs/by-name/sp/spacetimedb/librusty_v8.nix +++ b/pkgs/by-name/sp/spacetimedb/librusty_v8.nix @@ -6,7 +6,6 @@ fetchLibrustyV8 { shas = { x86_64-linux = "sha256-chV1PAx40UH3Ute5k3lLrgfhih39Rm3KqE+mTna6ysE="; aarch64-linux = "sha256-4IivYskhUSsMLZY97+g23UtUYh4p5jk7CzhMbMyqXyY="; - x86_64-darwin = "sha256-1jUuC+z7saQfPYILNyRJanD4+zOOhXU2ac/LFoytwho="; aarch64-darwin = "sha256-yHa1eydVCrfYGgrZANbzgmmf25p7ui1VMas2A7BhG6k="; }; } diff --git a/pkgs/by-name/sp/speakeasy-cli/package.nix b/pkgs/by-name/sp/speakeasy-cli/package.nix index 543f8df482a5..a1f2f2c0d13d 100644 --- a/pkgs/by-name/sp/speakeasy-cli/package.nix +++ b/pkgs/by-name/sp/speakeasy-cli/package.nix @@ -31,10 +31,6 @@ stdenv.mkDerivation (finalAttrs: { passthru = { sources = { - "x86_64-darwin" = fetchurl { - url = "https://github.com/speakeasy-api/speakeasy/releases/download/v${finalAttrs.version}/speakeasy_darwin_amd64.zip"; - hash = "sha256-ZXTD4rZUTg7JBnoloHs0gysUHTmgxJotrP/70PYfAB8="; - }; "x86_64-linux" = fetchurl { url = "https://github.com/speakeasy-api/speakeasy/releases/download/v${finalAttrs.version}/speakeasy_linux_amd64.zip"; hash = "sha256-8QEtlte0PtbCVZjvcBd16zJf3weVju5nsS+PrDCMMl8="; diff --git a/pkgs/by-name/sp/spotify/package.nix b/pkgs/by-name/sp/spotify/package.nix index 1a788cf71047..7f999fe4b3fa 100644 --- a/pkgs/by-name/sp/spotify/package.nix +++ b/pkgs/by-name/sp/spotify/package.nix @@ -19,7 +19,6 @@ let license = lib.licenses.unfree; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "spotify"; diff --git a/pkgs/by-name/sp/spotube/package.nix b/pkgs/by-name/sp/spotube/package.nix index 2cf5e96731a7..17f3c858c292 100644 --- a/pkgs/by-name/sp/spotube/package.nix +++ b/pkgs/by-name/sp/spotube/package.nix @@ -93,10 +93,6 @@ stdenv.mkDerivation (finalAttrs: { suffix = "linux-x86_64.deb"; hash = "sha256-FEb5mPmGOAMw4nnFJ0kC+ymg4zBdUXWjvIO0sGOS6M0="; }; - "x86_64-darwin" = fetchArtifact { - suffix = "macos-universal.dmg"; - hash = "sha256-J2J9/UQZAECvGmumqGzcRFA5kpakOmFpQKlK5oesCRM="; - }; "aarch64-darwin" = fetchArtifact { suffix = "macos-universal.dmg"; hash = "sha256-J2J9/UQZAECvGmumqGzcRFA5kpakOmFpQKlK5oesCRM="; diff --git a/pkgs/by-name/sp/sprite/package.nix b/pkgs/by-name/sp/sprite/package.nix index 6379d4ef9b81..9c8734cfcbf8 100644 --- a/pkgs/by-name/sp/sprite/package.nix +++ b/pkgs/by-name/sp/sprite/package.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation (finalAttrs: { hash = { aarch64-darwin = "sha256-0EbsXuNdSC9lfTR9lQFgGk9nYg200f+tZY8xcXmqTzc="; - x86_64-darwin = "sha256-IA3C42wheIATCBlAFVJbq0omjPZv+rQstthCwXDUm5w="; aarch64-linux = "sha256-4a7LrFWgxe5wUcPLMDvo2/HmpCnELkJSyr2nAA9RBwk="; x86_64-linux = "sha256-FfWZ9PFhorfbf8/YsdcFAnpA2QtA1LqAfQiGrc8sesQ="; } diff --git a/pkgs/by-name/sq/sqlpkg-cli/package.nix b/pkgs/by-name/sq/sqlpkg-cli/package.nix index 7a598186c372..6453c513a6db 100644 --- a/pkgs/by-name/sq/sqlpkg-cli/package.nix +++ b/pkgs/by-name/sq/sqlpkg-cli/package.nix @@ -40,7 +40,6 @@ buildGoModule (finalAttrs: { platforms = lib.platforms.unix; badPlatforms = [ "aarch64-linux" # assets_test.go:44: BuildAssetPath: unexpected error unsupported platform: linux-arm64 - "x86_64-darwin" # assets_test.go:44: BuildAssetPath: unexpected error unsupported platform: darwin-amd64 "aarch64-darwin" # install_test.go:22: installation error: failed to dequarantine files: exec: "xattr": executable file not found in $PATH ]; }; diff --git a/pkgs/by-name/st/stash/package.nix b/pkgs/by-name/st/stash/package.nix index 566ebd51fa2f..1157c9ecbfa6 100644 --- a/pkgs/by-name/st/stash/package.nix +++ b/pkgs/by-name/st/stash/package.nix @@ -136,7 +136,6 @@ buildGoModule ( platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/st/steamcmd/package.nix b/pkgs/by-name/st/steamcmd/package.nix index e3448c0b65ea..3da5ea4e86d3 100644 --- a/pkgs/by-name/st/steamcmd/package.nix +++ b/pkgs/by-name/st/steamcmd/package.nix @@ -14,10 +14,6 @@ let "https://web.archive.org/web/20240521141411/https://steamcdn-a.akamaihd.net/client/installer/steamcmd_${platform}.tar.gz"; in { - x86_64-darwin = fetchurl { - url = url "osx"; - hash = "sha256-jswXyJiOWsrcx45jHEhJD3YVDy36ps+Ne0tnsJe9dTs="; - }; x86_64-linux = fetchurl { url = url "linux"; hash = "sha256-zr8ARr/QjPRdprwJSuR6o56/QVXl7eQTc7V5uPEHHnw="; @@ -62,7 +58,6 @@ stdenvNoCC.mkDerivation { mainProgram = "steamcmd"; platforms = [ "x86_64-linux" - "x86_64-darwin" ]; license = lib.licenses.unfreeRedistributable; maintainers = with lib.maintainers; [ tadfisher ]; diff --git a/pkgs/by-name/st/stockfish/package.nix b/pkgs/by-name/st/stockfish/package.nix index 91045ea9dce5..06bba69c1a84 100644 --- a/pkgs/by-name/st/stockfish/package.nix +++ b/pkgs/by-name/st/stockfish/package.nix @@ -121,7 +121,6 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "i686-linux" - "x86_64-darwin" "aarch64-linux" "aarch64-darwin" "armv7l-linux" diff --git a/pkgs/by-name/st/stripe-cli/package.nix b/pkgs/by-name/st/stripe-cli/package.nix index 6b0915107681..8a2e679aa441 100644 --- a/pkgs/by-name/st/stripe-cli/package.nix +++ b/pkgs/by-name/st/stripe-cli/package.nix @@ -50,7 +50,6 @@ buildGoModule (finalAttrs: { # https://github.com/stripe/stripe-cli/blob/e3020d2e2df9c731b2f51df3aa53bf16383e863f/pkg/plugins/test_artifacts/plugins.toml !lib.lists.any (platform: lib.meta.platformMatch stdenv.hostPlatform platform) [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ] ) diff --git a/pkgs/by-name/su/subler/package.nix b/pkgs/by-name/su/subler/package.nix index b4e3928c6190..1d5719a2aa11 100644 --- a/pkgs/by-name/su/subler/package.nix +++ b/pkgs/by-name/su/subler/package.nix @@ -37,7 +37,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ delafthi ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/su/subread/package.nix b/pkgs/by-name/su/subread/package.nix index 2c1f057fb4a4..6199186e80ba 100644 --- a/pkgs/by-name/su/subread/package.nix +++ b/pkgs/by-name/su/subread/package.nix @@ -40,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ jbedo ]; platforms = [ - "x86_64-darwin" "x86_64-linux" ]; homepage = "https://subread.sourceforge.net/"; diff --git a/pkgs/by-name/su/sunshine/package.nix b/pkgs/by-name/su/sunshine/package.nix index 871dbfd3fa1b..2216a713211c 100644 --- a/pkgs/by-name/su/sunshine/package.nix +++ b/pkgs/by-name/su/sunshine/package.nix @@ -74,7 +74,6 @@ let { x86_64-linux = "Linux-x86_64"; aarch64-linux = "Linux-aarch64"; - x86_64-darwin = "Darwin-x86_64"; aarch64-darwin = "Darwin-arm64"; } .${stdenv.hostPlatform.system} @@ -89,7 +88,6 @@ let { x86_64-linux = "sha256-VT+4qP2FaizCoIBBbBkzbYw4YOvGhuBUoZxWL0IYVZo="; aarch64-linux = "sha256-X5v/GsJy8G3/LHW/8s0VAS0Vegr7JhZSqYotXL/s81o="; - x86_64-darwin = "sha256-rrOGahWwJikRfUn27Q4jVra2Q/MMSNitu0wS2UGKGWk="; aarch64-darwin = "sha256-xkfwLJgb7uz1H7mJrQFW79w2T/T/Zv7biXlvXz5UvXc="; } .${stdenv.hostPlatform.system}; diff --git a/pkgs/by-name/su/sunvox/package.nix b/pkgs/by-name/su/sunvox/package.nix index bbb1e3dfa9ab..166c9f892878 100644 --- a/pkgs/by-name/su/sunvox/package.nix +++ b/pkgs/by-name/su/sunvox/package.nix @@ -21,7 +21,6 @@ let "i686-linux" = "linux_x86"; "aarch64-linux" = "linux_arm64"; "armv7l-linux" = "arm_armhf_raspberry_pi"; - "x86_64-darwin" = "macos"; "aarch64-darwin" = "macos"; }; bindir = diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix index fd128ad3a71b..851827cff5e7 100644 --- a/pkgs/by-name/su/supabase-cli/package.nix +++ b/pkgs/by-name/su/supabase-cli/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { pname = "supabase-cli"; - version = "2.109.0"; + version = "2.109.1"; __structuredAttrs = true; @@ -17,13 +17,13 @@ buildGoModule (finalAttrs: { owner = "supabase"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-5AfSH69poNnUlK7oT9W5k37DjcitCOSJEPBtnRMUqVc="; + hash = "sha256-wTqvbcYC2QeeUXUzkmvUin0oXulmhMXIiyNCXaWqPSQ="; }; # Supabase is in the process of porting the CLI to TS, for now we continue with the Go cli. sourceRoot = "${finalAttrs.src.name}/apps/cli-go"; - vendorHash = "sha256-yHNtzzdYhCgBSb/VwGe2cqmZwNNwrKLVg2RVE0Nwq1M="; + vendorHash = "sha256-qfQgcdRv4GHmZWQWth3Hqknlr9yCjRkZFO0p2jeZG0A="; ldflags = [ "-s" diff --git a/pkgs/by-name/sw/swiftlint/sources.json b/pkgs/by-name/sw/swiftlint/sources.json index 17f49c673677..0f813f8659d5 100644 --- a/pkgs/by-name/sw/swiftlint/sources.json +++ b/pkgs/by-name/sw/swiftlint/sources.json @@ -9,10 +9,6 @@ "filename": "swiftlint_linux_amd64.zip", "hash": "sha256-eTBqNOXHzFWiIM0QjLuGHcrV8QE43N8mHiYkrosKSGs=" }, - "x86_64-darwin": { - "filename": "portable_swiftlint.zip", - "hash": "sha256-1ssKp6L18e8wb8nje8tU3Jom+syPd4SsDD3T7M9ca6Y=" - }, "aarch64-darwin": { "filename": "portable_swiftlint.zip", "hash": "sha256-1ssKp6L18e8wb8nje8tU3Jom+syPd4SsDD3T7M9ca6Y=" diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs b/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs index 84a46d64565f..d74fce7b6d19 100644 --- a/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs +++ b/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs @@ -2376,7 +2376,7 @@ won't take effect until you reboot the system. match logind.list_users() { Err(err) => { eprintln!("Unable to list users with logind: {err}"); - die(); + exit_code = 4; } Ok(users) => { for (uid, name, user_dbus_path) in users { diff --git a/pkgs/by-name/sw/swt/package.nix b/pkgs/by-name/sw/swt/package.nix index db2f8ad1b41d..d4e6761718a8 100644 --- a/pkgs/by-name/sw/swt/package.nix +++ b/pkgs/by-name/sw/swt/package.nix @@ -30,8 +30,6 @@ stdenv.mkDerivation (finalAttrs: { ppc64le-linux.hash = "sha256-lKAB2aCI3dZdt3pE7uSvSfxc8vc3oMSTCx5R+71Aqdk="; riscv64-linux.platform = "gtk-linux-riscv64"; riscv64-linux.hash = "sha256-lKAB2aCI3dZdt3pE7uSvSfxc8vc3oMSTCx5R+71Aqdk="; - x86_64-darwin.platform = "cocoa-macosx-x86_64"; - x86_64-darwin.hash = "sha256-Uns3fMoetbZAIrL/N0eVd42/3uygXakDdxpaxf5SWDI="; aarch64-darwin.platform = "cocoa-macosx-aarch64"; aarch64-darwin.hash = "sha256-jvxmoRFGquYClPgMqWi2ylw26YiGSG5bONnM1PcjlTM="; }; diff --git a/pkgs/by-name/sy/synapse-admin/package.nix b/pkgs/by-name/sy/synapse-admin/package.nix index 0115d0533378..b65f92a92fae 100644 --- a/pkgs/by-name/sy/synapse-admin/package.nix +++ b/pkgs/by-name/sy/synapse-admin/package.nix @@ -140,7 +140,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/sy/synology-drive-client/package.nix b/pkgs/by-name/sy/synology-drive-client/package.nix index dae8f02f5720..dcf60705dc6a 100644 --- a/pkgs/by-name/sy/synology-drive-client/package.nix +++ b/pkgs/by-name/sy/synology-drive-client/package.nix @@ -34,7 +34,6 @@ let ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "synology-drive"; diff --git a/pkgs/by-name/sy/sysdig-cli-scanner/package.nix b/pkgs/by-name/sy/sysdig-cli-scanner/package.nix index c3881324572d..28c92d50722a 100644 --- a/pkgs/by-name/sy/sysdig-cli-scanner/package.nix +++ b/pkgs/by-name/sy/sysdig-cli-scanner/package.nix @@ -59,7 +59,6 @@ stdenv.mkDerivation { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix index 70a131178040..119281813d92 100644 --- a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix +++ b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix @@ -11,11 +11,6 @@ hash = "sha256-j8mbSn6fbzAc8cOsq8FGKtDEJvmc0gqjNXJrpQwyuCc="; }; - x86_64-darwin = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.2/darwin/amd64/sysdig-cli-scanner"; - hash = "sha256-J19TcXnR4cnr5Lk8yJ7KuX25xk4YqryXonWXoKFHe60="; - }; - aarch64-darwin = { url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.27.2/darwin/arm64/sysdig-cli-scanner"; hash = "sha256-WaWfY1QGIz6WxTF+QMk6iJHzM05h03soYadv4Kf/dNg="; diff --git a/pkgs/by-name/ta/tabnine/sources.json b/pkgs/by-name/ta/tabnine/sources.json index 8ebec98bfc54..47c98df25987 100644 --- a/pkgs/by-name/ta/tabnine/sources.json +++ b/pkgs/by-name/ta/tabnine/sources.json @@ -8,10 +8,6 @@ "aarch64-darwin": { "name": "aarch64-apple-darwin", "hash": "sha256-8bwrbMQJkBMLgWt0n6R6uc+s6SxZr8JiGM+2ni5lgqY=" - }, - "x86_64-darwin": { - "name": "x86_64-apple-darwin", - "hash": "sha256-C0zePvocvgm8gP0C++7xJ5yb8MLb7kY/5HNsbEeZu6Q=" } } } diff --git a/pkgs/by-name/ta/tailwindcss_3/package.nix b/pkgs/by-name/ta/tailwindcss_3/package.nix index 21d4a03103a3..4a427a63e1e9 100644 --- a/pkgs/by-name/ta/tailwindcss_3/package.nix +++ b/pkgs/by-name/ta/tailwindcss_3/package.nix @@ -13,7 +13,6 @@ let aarch64-darwin = "macos-arm64"; aarch64-linux = "linux-arm64"; armv7l-linux = "linux-armv7"; - x86_64-darwin = "macos-x64"; x86_64-linux = "linux-x64"; } .${system} or throwSystem; @@ -23,7 +22,6 @@ let aarch64-darwin = "sha256-odDHmFdZrMygvxLlGsHcvw9s8v/7Yubg9i0JHEd6EKM="; aarch64-linux = "sha256-abE3i4EzGS19L+sSoRb6EtA1WU9Y2z7/IVh55K2M85s="; armv7l-linux = "sha256-cE59ka+6bh9jCImv0NfbNrRjTmKFEswUHVBKW+riiGA="; - x86_64-darwin = "sha256-bL2tdL53bAh/+l6aBXUSxUiY+f6IKNM2IhLf4y/JM6M="; x86_64-linux = "sha256-fST3+hkdIZO3jNX1pCpgk+FECVIZCFKfQtgLEf3h8dQ="; } .${system} or throwSystem; diff --git a/pkgs/by-name/ta/tailwindcss_4/package.nix b/pkgs/by-name/ta/tailwindcss_4/package.nix index 9fb6ab49e233..4851aada1613 100644 --- a/pkgs/by-name/ta/tailwindcss_4/package.nix +++ b/pkgs/by-name/ta/tailwindcss_4/package.nix @@ -15,7 +15,6 @@ let { aarch64-darwin = "macos-arm64"; aarch64-linux = "linux-arm64"; - x86_64-darwin = "macos-x64"; x86_64-linux = "linux-x64"; } .${system} or throwSystem; @@ -24,7 +23,6 @@ let { aarch64-darwin = "sha256-uACwZZ3GS58D7eVmAkTZQV13fVc5riiJKAh3yje+dCo="; aarch64-linux = "sha256-OU3czCQCz6Or2X37pW81h3gaPW5s5m5lzq2hS+t2ZLg="; - x86_64-darwin = "sha256-zvjxEEceiJw8RAkFXPiv8zB29YoIGGew38ZTSykL+7A="; x86_64-linux = "sha256-UDbE+0Mo4LzbtgZccNislFLg1MlHETp4io+U/TkEJcE="; } .${system} or throwSystem; diff --git a/pkgs/by-name/td/tdarr/package.nix b/pkgs/by-name/td/tdarr/package.nix index 0ab94d1f4051..828baa3ebec9 100644 --- a/pkgs/by-name/td/tdarr/package.nix +++ b/pkgs/by-name/td/tdarr/package.nix @@ -28,7 +28,6 @@ symlinkJoin { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; maintainers = with lib.maintainers; [ mistyttm ]; diff --git a/pkgs/by-name/te/teams/package.nix b/pkgs/by-name/te/teams/package.nix index 686d91d6f473..22bb6711d7e8 100644 --- a/pkgs/by-name/te/teams/package.nix +++ b/pkgs/by-name/te/teams/package.nix @@ -23,7 +23,6 @@ let license = lib.licenses.unfree; maintainers = with lib.maintainers; [ tricktron ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "teams"; diff --git a/pkgs/by-name/te/tetrio-desktop/package.nix b/pkgs/by-name/te/tetrio-desktop/package.nix index 2e29cae9eeb1..df6ddd4381e4 100644 --- a/pkgs/by-name/te/tetrio-desktop/package.nix +++ b/pkgs/by-name/te/tetrio-desktop/package.nix @@ -27,10 +27,6 @@ let url = "https://tetr.io/about/desktop/builds/${version}/TETR.IO%20Setup%20arm64.dmg"; hash = "sha256-PbK9XEynpii35p6DQYiPbaRM4guPazWd5N4Dr2O4H24="; }; - x86_64-darwin = fetchurl { - url = "https://tetr.io/about/desktop/builds/${version}/TETR.IO%20Setup%20x86.dmg"; - hash = "sha256-I4Mj6YY7KwpLk2tZ02EdqUxnxSW/3vCM4J7YFzCLEuM="; - }; }; in stdenv.mkDerivation { diff --git a/pkgs/by-name/th/the-unarchiver/package.nix b/pkgs/by-name/th/the-unarchiver/package.nix index 0cafcea1eddd..d09564aa7f43 100644 --- a/pkgs/by-name/th/the-unarchiver/package.nix +++ b/pkgs/by-name/th/the-unarchiver/package.nix @@ -34,7 +34,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ xiaoxiangmoe ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; diff --git a/pkgs/by-name/th/thunderbird-mcp/package-lock.json b/pkgs/by-name/th/thunderbird-mcp/package-lock.json index 6eab8be02f1b..3ad83f5984f8 100644 --- a/pkgs/by-name/th/thunderbird-mcp/package-lock.json +++ b/pkgs/by-name/th/thunderbird-mcp/package-lock.json @@ -1,12 +1,12 @@ { "name": "thunderbird-mcp", - "version": "0.7.3", + "version": "0.7.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "thunderbird-mcp", - "version": "0.7.3", + "version": "0.7.4", "license": "MIT", "bin": { "thunderbird-mcp": "mcp-bridge.cjs" diff --git a/pkgs/by-name/th/thunderbird-mcp/package.nix b/pkgs/by-name/th/thunderbird-mcp/package.nix index d2ff5690148e..a15fa5372f94 100644 --- a/pkgs/by-name/th/thunderbird-mcp/package.nix +++ b/pkgs/by-name/th/thunderbird-mcp/package.nix @@ -7,13 +7,13 @@ buildNpmPackage (finalAttrs: { pname = "thunderbird-mcp"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "TKasperczyk"; repo = "thunderbird-mcp"; tag = "v${finalAttrs.version}"; - hash = "sha256-VIJUMMiJ2NCdMfxK4E/FAQ4P2ryS6KlxhPj749JH6sE="; + hash = "sha256-jrmHqToe+lJTpoG1QYaYHVk84PaO5zKAXLwr3Opl0A4="; }; postPatch = '' @@ -23,7 +23,7 @@ buildNpmPackage (finalAttrs: { forceEmptyCache = true; dontNpmBuild = true; - npmDepsHash = "sha256-6irpujYRk/OvoTA43CvtoaOmHvK4coMFXRfXhGrjFNk="; + npmDepsHash = "sha256-D0DAjK/u59rOKNf5kCu/OYkch+4lZYgdHkuib0sqtIw="; doCheck = true; diff --git a/pkgs/by-name/ti/tidal/package.nix b/pkgs/by-name/ti/tidal/package.nix index 8c511ca6f456..b1a394e6e37e 100644 --- a/pkgs/by-name/ti/tidal/package.nix +++ b/pkgs/by-name/ti/tidal/package.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = [ - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "tidal"; diff --git a/pkgs/by-name/ti/tideways-cli/package.nix b/pkgs/by-name/ti/tideways-cli/package.nix index f044e413e67a..64db702bdd24 100644 --- a/pkgs/by-name/ti/tideways-cli/package.nix +++ b/pkgs/by-name/ti/tideways-cli/package.nix @@ -44,10 +44,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_linux_arm64-${finalAttrs.version}.tar.gz"; hash = "sha256-s74CnmEQ9RPki1af477tQFkrp6C9MwfehXTq2HPNAkk="; }; - "x86_64-darwin" = fetchurl { - url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_macos_amd64-${finalAttrs.version}.tar.gz"; - hash = "sha256-hlF75uRbSqafZL6sK2Zctxxvy7VBxZQBgTI7tSugePc="; - }; "aarch64-darwin" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_macos_arm64-${finalAttrs.version}.tar.gz"; hash = "sha256-RTt5XKMJbYPea6pEPD72mITfUW41v584zrwT3rkEcQg="; diff --git a/pkgs/by-name/ti/tidgi/package.nix b/pkgs/by-name/ti/tidgi/package.nix index 25799d61b531..291abd95e9b4 100644 --- a/pkgs/by-name/ti/tidgi/package.nix +++ b/pkgs/by-name/ti/tidgi/package.nix @@ -15,10 +15,6 @@ stdenv.mkDerivation (finalAttrs: { src = { - x86_64-darwin = fetchurl { - url = "https://github.com/tiddly-gittly/TidGi-Desktop/releases/download/v${finalAttrs.version}/TidGi-darwin-x64-${finalAttrs.version}.zip"; - hash = "sha256-nxfnPz2oxsYUsT2Q9ADDxVq5xcJvkNDQTBX8EkGUF4g="; - }; aarch64-darwin = fetchurl { url = "https://github.com/tiddly-gittly/TidGi-Desktop/releases/download/v${finalAttrs.version}/TidGi-darwin-arm64-${finalAttrs.version}.zip"; hash = "sha256-bSJFM67+KVECUqjwu1HYipn+zOps1ahNzM721yZL52c="; @@ -70,7 +66,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ klchen0112 ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; diff --git a/pkgs/by-name/ti/tika/package.nix b/pkgs/by-name/ti/tika/package.nix index 6e152c46bc06..4ad36a1c560f 100644 --- a/pkgs/by-name/ti/tika/package.nix +++ b/pkgs/by-name/ti/tika/package.nix @@ -19,7 +19,6 @@ let mvnDepsHashes = { "x86_64-linux" = "sha256-ZlGOxVXU63AKzfWeOLGPa2l8v+Rv8Bzr4H/Er62cxk8="; "aarch64-linux" = "sha256-CrOYBEnp8cVpdF2PrpGQjmdYH8ZKupm9Jf1LVyNoObk="; - "x86_64-darwin" = "sha256-D1QkCTYep9RbNUaZPrnbgkR94cvQkX3xxxUxwyLIqx8="; "aarch64-darwin" = "sha256-zvvko6wSJoc2cgMLl7XVmypq0vVTirrIpJiEdypPlrU="; }; diff --git a/pkgs/by-name/to/tokenspeed-triton-llvm/package.nix b/pkgs/by-name/to/tokenspeed-triton-llvm/package.nix index 9c039a344ef0..568542fccfe3 100644 --- a/pkgs/by-name/to/tokenspeed-triton-llvm/package.nix +++ b/pkgs/by-name/to/tokenspeed-triton-llvm/package.nix @@ -78,9 +78,5 @@ stdenv.mkDerivation (finalAttrs: { ]; maintainers = with lib.maintainers; [ prince213 ]; platforms = with lib.platforms; aarch64 ++ x86; - badPlatforms = [ - # clang++: error: clang frontend command failed with exit code 139 - "x86_64-darwin" - ]; }; }) diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix index 5de922579090..8fc231900d75 100644 --- a/pkgs/by-name/tp/tpnote/package.nix +++ b/pkgs/by-name/tp/tpnote/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tpnote"; - version = "1.26.4"; + version = "1.26.6"; src = fetchFromGitHub { owner = "getreu"; repo = "tp-note"; tag = "v${finalAttrs.version}"; - hash = "sha256-RoFamyNkUkB+94ZcVcyIJ6OvX0T9NAzkYido5sU6IAc="; + hash = "sha256-ELRR2nIbkbD/WWS93lyHHYoPY/KLUBO9+/13UUFhA6Y="; }; - cargoHash = "sha256-kJCp285pQCUtHCUEDehNFlz87K72XmYp5z6vJD790sQ="; + cargoHash = "sha256-gFfESz0yn9AJ4QCujaUyXrFnxyHzqi3IX5Gg0Gma0DQ="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/tr/transgui/package.nix b/pkgs/by-name/tr/transgui/package.nix index 2b5a6958a8ee..5427785190a3 100644 --- a/pkgs/by-name/tr/transgui/package.nix +++ b/pkgs/by-name/tr/transgui/package.nix @@ -115,7 +115,6 @@ stdenv.mkDerivation rec { mainProgram = "transgui"; platforms = [ "x86_64-linux" - "x86_64-darwin" ]; }; } diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix index 1e9d3cb465ae..818a738254e5 100644 --- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix +++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix @@ -808,10 +808,10 @@ }; ghostty = { - version = "1.3.1-unstable-2026-06-03"; + version = "1.3.1-unstable-2026-07-07"; url = "github:bezhermoso/tree-sitter-ghostty"; - rev = "7f41507014534e5f72d16e4639c0346d0adb8054"; - hash = "sha256-81aTIWcdmHj+sNxB8geIoJwTZocMPTZXWvEKkARzhuU="; + rev = "1f47dfd4da0faab5321b47518ce2faa4be163580"; + hash = "sha256-tpTm4e3f+hjy9Mi91fSm1qojJLB6A8KsN/iEsiOdxsw="; meta = { license = lib.licenses.mit; maintainers = with lib.maintainers; [ @@ -851,7 +851,7 @@ }; gitattributes = { - version = "0-unstable-2025-08-17"; + version = "0.1.6-unstable-2025-08-17"; url = "github:tree-sitter-grammars/tree-sitter-gitattributes"; rev = "1b7af09d45b579f9f288453b95ad555f1f431645"; hash = "sha256-eHDcJgHpWemOYtKACVhl5Muri1W1Igrjm/p0rAbvrNY="; @@ -1493,6 +1493,18 @@ }; }; + linkerscript = { + version = "1.0.0"; + url = "github:tree-sitter-grammars/tree-sitter-linkerscript"; + hash = "sha256-Do8MIcl5DJo00V4wqIbdVC0to+2YYwfy08QWqSLMkQA="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + fiona + ]; + }; + }; + llvm = { version = "1.1.0-unstable-2025-08-22"; url = "github:benwilliamgraham/tree-sitter-llvm"; @@ -1649,10 +1661,10 @@ }; meson = { - version = "0-unstable-2026-01-22"; + version = "1.3.0-unstable-2026-06-29"; url = "github:tree-sitter-grammars/tree-sitter-meson"; - rev = "c84f3540624b81fc44067030afce2ff78d6ede05"; - hash = "sha256-+GMR051L89asgavX2T3zKwWl8xUFHenlCWJYELhMuyA="; + rev = "aa8d472034956f94f51f2ef2cbfec4cc07efbfde"; + hash = "sha256-UJREw7mQqJTKcD2owKJ4GZkkch/KGTIy9/+Fdl3W3ik="; meta = { license = lib.licenses.mit; maintainers = with lib.maintainers; [ @@ -1734,10 +1746,10 @@ }; nim = { - version = "0.6.2-unstable-2026-03-21"; + version = "0.6.2-unstable-2026-07-03"; url = "github:alaviss/tree-sitter-nim"; - rev = "3878440d9398515ae053c6f6024986e69868bb74"; - hash = "sha256-mdAT1jTFeVP8TYi4H36sjd826KmxHQ1EZ+8gd37NGfY="; + rev = "ac72ba30d16edf0be021588a9301ede4accd6cf4"; + hash = "sha256-1jr8tKdKvKTKCUSEvC+vRGw+W1Rl3WMbv0ZS3u7H1GA="; meta = { license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ @@ -2294,10 +2306,10 @@ }; rescript = { - version = "0-unstable-2026-05-02"; + version = "6.0.0-unstable-2026-07-13"; url = "github:rescript-lang/tree-sitter-rescript"; - rev = "5c71bebe716dc89ca84b816f9646456dd85666cc"; - hash = "sha256-45wPsR0ipBrd6R6SbL65EpIadAG0alQHzIXZhKJ9BkA="; + rev = "19ed8a8e6bcc844b71c37e9edaffc60c77f74d7c"; + hash = "sha256-mQJSmb9Qy5pFS+nNz4+C7RPs1mpAoxxqbx7seYo8+JI="; meta = { license = lib.licenses.mit; maintainers = with lib.maintainers; [ @@ -2544,9 +2556,9 @@ }; sshclientconfig = rec { - version = "2026.6.4"; + version = "2026.7.9"; url = "github:metio/tree-sitter-ssh-client-config?ref=${version}"; - hash = "sha256-jluMtWRFuyG8WGiVn1ge2NfSdRIq8zqS1R12AG/Imtc="; + hash = "sha256-La1h6uJC5gUA84OAr3zBbQiR+AnrhcUhNf6r4HUpwhg="; meta = { license = lib.licenses.cc0; maintainers = with lib.maintainers; [ @@ -3136,7 +3148,7 @@ }; xml = { - version = "0-unstable-2026-01-21"; + version = "0.7.0-unstable-2026-01-21"; url = "github:tree-sitter-grammars/tree-sitter-xml"; rev = "5000ae8f22d11fbe93939b05c1e37cf21117162d"; hash = "sha256-QN+jQx1CrTbYpmM9mLUfjWcymGsa0Th7LVgk4thnQXU="; diff --git a/pkgs/by-name/tr/trilium-desktop/package.nix b/pkgs/by-name/tr/trilium-desktop/package.nix index aae19eff9656..822f813f1a50 100644 --- a/pkgs/by-name/tr/trilium-desktop/package.nix +++ b/pkgs/by-name/tr/trilium-desktop/package.nix @@ -28,13 +28,11 @@ let # exposed like this for update.sh x86_64-linux.hash = "sha256-1d6nYhj83LWzglkWoOtAj6lNPkik1qXY5lVpr1iG7No="; aarch64-linux.hash = "sha256-LQMNgj1Ml8gShlPS0qgD/a+Fw4SjvvHrw6XAcSLN7q4="; - x86_64-darwin.hash = "sha256-H6eJPJdj1rZt1pXRKBUVOJuIhmDHY5SexKkZ8ITARGQ="; aarch64-darwin.hash = "sha256-dMlgJgDuxZH1jnvLalmgDUMVCdWQ8AviGt86aeMbGVY="; sources = { x86_64-linux = linuxSource "x64" x86_64-linux.hash; aarch64-linux = linuxSource "arm64" aarch64-linux.hash; - x86_64-darwin = darwinSource "x64" x86_64-darwin.hash; aarch64-darwin = darwinSource "arm64" aarch64-darwin.hash; }; diff --git a/pkgs/by-name/tt/ttl2c/package.nix b/pkgs/by-name/tt/ttl2c/package.nix index 1fe484a48645..6c908eb4c331 100644 --- a/pkgs/by-name/tt/ttl2c/package.nix +++ b/pkgs/by-name/tt/ttl2c/package.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { ]; platforms = lib.platforms.unix; badPlatforms = [ - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/tu/turingplus/bootstrap.nix b/pkgs/by-name/tu/turingplus/bootstrap.nix index 5f4cf44bdb58..4fd794c841a1 100644 --- a/pkgs/by-name/tu/turingplus/bootstrap.nix +++ b/pkgs/by-name/tu/turingplus/bootstrap.nix @@ -13,10 +13,6 @@ let url = "https://github.com/CordyJ/Open-TuringPlus/releases/download/v6.2.1/opentplus-62-linux64.tar.gz"; sha256 = "sha256-FoOlOcRWpStg4aerjr+FmcXXnwYftrqG1j4iZJ+4AzE="; }; - "x86_64-darwin" = { - url = "https://github.com/CordyJ/Open-TuringPlus/releases/download/v6.2.1/opentplus-62-macos64.tar.gz"; - sha256 = "sha256-8o1hIA74JPqZyjWfg4leC99z1+YMVhwFGME5qBf/BP0="; - }; }; redirects = [ @@ -81,7 +77,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "tpc"; platforms = [ "x86_64-linux" - "x86_64-darwin" ]; homepage = "https://github.com/CordyJ/Open-TuringPlus"; downloadPage = "https://github.com/CordyJ/Open-TuringPlus/releases"; diff --git a/pkgs/by-name/tu/turingplus/package.nix b/pkgs/by-name/tu/turingplus/package.nix index 1f5fa93451bf..5c3aa1e5f79e 100644 --- a/pkgs/by-name/tu/turingplus/package.nix +++ b/pkgs/by-name/tu/turingplus/package.nix @@ -64,7 +64,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "tpc"; platforms = [ "x86_64-linux" - "x86_64-darwin" ]; homepage = "https://github.com/CordyJ/Open-TuringPlus"; downloadPage = "https://github.com/CordyJ/Open-TuringPlus/releases"; diff --git a/pkgs/by-name/ty/typesense/sources.json b/pkgs/by-name/ty/typesense/sources.json index 31bbf29f9a95..cb443f452229 100644 --- a/pkgs/by-name/ty/typesense/sources.json +++ b/pkgs/by-name/ty/typesense/sources.json @@ -9,10 +9,6 @@ "arch": "linux-amd64", "hash": "sha256-BD0qE1dEVKVUPwO2fMO0SMXiwG9dD0RMnAzkVZitFKA=" }, - "x86_64-darwin": { - "arch": "darwin-amd64", - "hash": "sha256-9imHOPW8OkFczuNxXGn3bXFI49BIdUJ5GGh1mrvcMgE=" - }, "aarch64-darwin": { "arch": "darwin-arm64", "hash": "sha256-yAOR/bGYBQGp8Mllhh0yKyqmItd2+IfLib3W+lIHwr0=" diff --git a/pkgs/by-name/ud/udig/package.nix b/pkgs/by-name/ud/udig/package.nix index 08ed305dd5fe..275c84436937 100644 --- a/pkgs/by-name/ud/udig/package.nix +++ b/pkgs/by-name/ud/udig/package.nix @@ -17,10 +17,6 @@ let url = "http://udig.refractions.net/files/downloads/udig-${version}.linux.gtk.x86_64.zip"; hash = "sha256-ijuSWq1jSsB8K653bjcUdNwVGZscDaTuegBr01oNEg4="; }; - x86_64-darwin = fetchurl { - url = "http://udig.refractions.net/files/downloads/udig-${version}.macosx.cocoa.x86_64.zip"; - hash = "sha256-Ihk3InHB3/tEYRqH2ozhokz2GN8Gfig5DJkO/8P1LJs="; - }; }; src = srcs.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/un/unison-ucm/package.nix b/pkgs/by-name/un/unison-ucm/package.nix index 78d98f8ac058..8b671da11c74 100644 --- a/pkgs/by-name/un/unison-ucm/package.nix +++ b/pkgs/by-name/un/unison-ucm/package.nix @@ -22,10 +22,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-arm64.tar.gz"; hash = "sha256-DBNZx90rLqeRrjAnscamI8sduIH966az+AfMpWzberk="; }; - x86_64-darwin = fetchurl { - url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-x64.tar.gz"; - hash = "sha256-ei/w82erwVf3oLbXcisBkPv2/k4gvwSxshTg7PWijhw="; - }; aarch64-linux = fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux-arm64.tar.gz"; hash = "sha256-6XRr8IOwRhZlGFD9xb29cvqqYVjZFzSvh3S52Cq4HMo="; @@ -85,7 +81,6 @@ stdenv.mkDerivation (finalAttrs: { lib.maintainers.virusdave ]; platforms = [ - "x86_64-darwin" "x86_64-linux" "aarch64-darwin" "aarch64-linux" diff --git a/pkgs/by-name/up/upbound/sources-main.json b/pkgs/by-name/up/upbound/sources-main.json index e7ced7bbe649..eb233e0cf6c4 100644 --- a/pkgs/by-name/up/upbound/sources-main.json +++ b/pkgs/by-name/up/upbound/sources-main.json @@ -2,7 +2,6 @@ "archMap": { "aarch64-darwin": "darwin_arm64", "aarch64-linux": "linux_arm64", - "x86_64-darwin": "darwin_amd64", "x86_64-linux": "linux_amd64" }, "fetchurlAttrSet": { @@ -15,10 +14,6 @@ "hash": "sha256-deoM4C92EVDdLiTFdFBHYgUQ3UDzn1Lls5z/qL8Gwjs=", "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.152.g4da0ccab/bundle/docker-credential-up/linux_arm64.tar.gz" }, - "x86_64-darwin": { - "hash": "sha256-j00COhV/TXMd285Me7je47qwRMLXTrH8wxaPrkRHy/s=", - "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.152.g4da0ccab/bundle/docker-credential-up/darwin_amd64.tar.gz" - }, "x86_64-linux": { "hash": "sha256-3Cc34/LpcahZ8ADKVQOtAKvGNv5gC6mW9zFhHB9LqgA=", "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.152.g4da0ccab/bundle/docker-credential-up/linux_amd64.tar.gz" @@ -33,10 +28,6 @@ "hash": "sha256-wbWLMrDG5oBk4vmkEY9S7ruAib7d1kY0J2s/YT8hSZA=", "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.152.g4da0ccab/bundle/up/linux_arm64.tar.gz" }, - "x86_64-darwin": { - "hash": "sha256-2tl2itYBEA1hzAzrr0R6ArKLEkrL6MAvOdtAFNAhwbw=", - "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.152.g4da0ccab/bundle/up/darwin_amd64.tar.gz" - }, "x86_64-linux": { "hash": "sha256-4vLU6etUqoH/bNZrAVfJyedMpmxdXz0XLQRlj4Ct/eE=", "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.152.g4da0ccab/bundle/up/linux_amd64.tar.gz" diff --git a/pkgs/by-name/up/upbound/sources-stable.json b/pkgs/by-name/up/upbound/sources-stable.json index b43015f58698..d9ae0996dd70 100644 --- a/pkgs/by-name/up/upbound/sources-stable.json +++ b/pkgs/by-name/up/upbound/sources-stable.json @@ -2,7 +2,6 @@ "archMap": { "aarch64-darwin": "darwin_arm64", "aarch64-linux": "linux_arm64", - "x86_64-darwin": "darwin_amd64", "x86_64-linux": "linux_amd64" }, "fetchurlAttrSet": { @@ -15,10 +14,6 @@ "hash": "sha256-qvZFOXKnj27h69/JPhqH5wu86nqAa/7pHZzzTxwSTcg=", "url": "https://cli.upbound.io/stable/v0.40.3/bundle/docker-credential-up/linux_arm64.tar.gz" }, - "x86_64-darwin": { - "hash": "sha256-o7JMbBeCHAN0pqUzAGDHTuIzS+9QRLeQuQnDQU2aCLw=", - "url": "https://cli.upbound.io/stable/v0.40.3/bundle/docker-credential-up/darwin_amd64.tar.gz" - }, "x86_64-linux": { "hash": "sha256-eU9GsVmJtQZ5T6YrnrvV3cNZPCBD29JCqDIhyLt37Hk=", "url": "https://cli.upbound.io/stable/v0.40.3/bundle/docker-credential-up/linux_amd64.tar.gz" @@ -33,10 +28,6 @@ "hash": "sha256-XiGtOrWEfF8CQvsrutyiP2XXGaAft0WC02sqiXTOBqs=", "url": "https://cli.upbound.io/stable/v0.40.3/bundle/up/linux_arm64.tar.gz" }, - "x86_64-darwin": { - "hash": "sha256-kt2pvAJSDK91BrHD21HPX1+XnkeQaPfXPpr0Gwk6+8M=", - "url": "https://cli.upbound.io/stable/v0.40.3/bundle/up/darwin_amd64.tar.gz" - }, "x86_64-linux": { "hash": "sha256-17C2Igba/apKI4iTu8hIzlcI7PkXAAwM/eqoBeuWcpw=", "url": "https://cli.upbound.io/stable/v0.40.3/bundle/up/linux_amd64.tar.gz" diff --git a/pkgs/by-name/up/upscayl/package.nix b/pkgs/by-name/up/upscayl/package.nix index 9b12bf4a5245..6874e50bb4d2 100644 --- a/pkgs/by-name/up/upscayl/package.nix +++ b/pkgs/by-name/up/upscayl/package.nix @@ -8,7 +8,7 @@ let pname = "upscayl"; version = "2.15.0"; - srcs = rec { + srcs = { x86_64-linux = fetchurl { url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage"; hash = "sha256-ZFlFfliby5nneepELc5gi6zaM5FrcBmohit8YlKqgik="; @@ -17,7 +17,6 @@ let url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-mac.zip"; hash = "sha256-gXqeRaNW0g7ZVkCSbxps9SqPMuVSzLTCGL5F3Om/iwo="; }; - x86_64-darwin = aarch64-darwin; }; meta = { description = "Free and Open Source AI Image Upscaler"; diff --git a/pkgs/by-name/up/upsun/package.nix b/pkgs/by-name/up/upsun/package.nix index c86d1b24e37f..a6f9c48ed228 100644 --- a/pkgs/by-name/up/upsun/package.nix +++ b/pkgs/by-name/up/upsun/package.nix @@ -68,7 +68,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/ur/urbit/package.nix b/pkgs/by-name/ur/urbit/package.nix index 897bec0e3243..f61ed2e4f259 100644 --- a/pkgs/by-name/ur/urbit/package.nix +++ b/pkgs/by-name/ur/urbit/package.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation (finalAttrs: { { x86_64-linux = "1bm32airwqi6pkxlkd0hwrwd0gwm9x5y05dzgy27yxnbcrnyjcpk"; aarch64-linux = "126hw995xipbx9kb4ml8kn6xwkwd96q90cbr3q143ya2wl1sabya"; - x86_64-darwin = "07k8msx5wxyggi8x8hc97vimb6zbav7ficyq7m6jjaq1zf0vinqb"; aarch64-darwin = "0dsapvlyfr2cb9c16b46bcnvq75by87ybys96zhf16k92z4rzrfv"; } .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); @@ -42,7 +41,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; maintainers = [ lib.maintainers.matthew-levan ]; diff --git a/pkgs/by-name/ut/ut1999/package.nix b/pkgs/by-name/ut/ut1999/package.nix index b70cbb0c3689..2dcf26039efc 100644 --- a/pkgs/by-name/ut/ut1999/package.nix +++ b/pkgs/by-name/ut/ut1999/package.nix @@ -23,7 +23,7 @@ let version = "469e"; - srcs = rec { + srcs = { x86_64-linux = fetchurl { url = "https://github.com/OldUnreal/UnrealTournamentPatches/releases/download/v${version}/OldUnreal-UTPatch${builtins.elemAt (lib.strings.splitString "-" version) 0}-Linux-amd64.tar.bz2"; hash = "sha256-CMgGqjchsZcARaoVitkAUTKdmC6KmjZhFTkA6cy/aww="; @@ -36,12 +36,10 @@ let url = "https://github.com/OldUnreal/UnrealTournamentPatches/releases/download/v${version}/OldUnreal-UTPatch${builtins.elemAt (lib.strings.splitString "-" version) 0}-Linux-x86.tar.bz2"; hash = "sha256-y9bYAW77MOOYJ1elgsaIUygDch7B7HOPwor5s+FdPBQ="; }; - x86_64-darwin = fetchurl { + aarch64-darwin = fetchurl { url = "https://github.com/OldUnreal/UnrealTournamentPatches/releases/download/v${version}/OldUnreal-UTPatch${builtins.elemAt (lib.strings.splitString "-" version) 0}-macOS.dmg"; hash = "sha256-trOh9GLktwLfDuz5DWY+8fhHzDaq3KHsbdNSeNCR+g0="; }; - # fat binary - aarch64-darwin = x86_64-darwin; }; # This upload of the game is officially sanctioned by OldUnreal (who has received permission from Epic Games to link to archive.org) and the UT99.org community # This is a copy of the original Unreal Tournament: Game of the Year Edition (also known as UT or UT99). The first ISO contains the base game. @@ -77,12 +75,11 @@ let cp -r System Sounds Textures maps $out ''; systemDir = - rec { + { x86_64-linux = "System64"; aarch64-linux = "SystemARM64"; i686-linux = "System"; - x86_64-darwin = "System"; - aarch64-darwin = x86_64-darwin; + aarch64-darwin = "System"; } .${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); in diff --git a/pkgs/by-name/va/vault-bin/package.nix b/pkgs/by-name/va/vault-bin/package.nix index 5401509c09f7..bde41b46ec79 100644 --- a/pkgs/by-name/va/vault-bin/package.nix +++ b/pkgs/by-name/va/vault-bin/package.nix @@ -16,14 +16,12 @@ stdenv.mkDerivation rec { x86_64-linux = "linux_amd64"; aarch64-linux = "linux_arm64"; i686-linux = "linux_386"; - x86_64-darwin = "darwin_amd64"; aarch64-darwin = "darwin_arm64"; }; hash = selectSystem { x86_64-linux = "sha256-THVYezhV7TmChy8IKsE8Agx6ks4wFctuk+GevXhwRv8="; aarch64-linux = "sha256-Wmlpw9gzbdCvgCwf3Nh9JPjjmDKS2P0TNYaRvKqO4fg="; i686-linux = "sha256-Fdxq1r1G17kiCl7b9OBrWwkyo+VoKOvrUPf0p4wZlcs="; - x86_64-darwin = "sha256-tyQzmycXo4kSvo1X4afFU2aWuXyvyvw0mb81eiH3WjE="; aarch64-darwin = "sha256-+zor3j+7saG6AnuIlkJSAsCkMHYuhm0Abmt6TTu8bZI="; }; in @@ -70,7 +68,6 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "i686-linux" - "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; diff --git a/pkgs/by-name/ve/verifast/package.nix b/pkgs/by-name/ve/verifast/package.nix index bf1db3540bd2..3f574610ed58 100644 --- a/pkgs/by-name/ve/verifast/package.nix +++ b/pkgs/by-name/ve/verifast/package.nix @@ -60,10 +60,6 @@ stdenv.mkDerivation ( url = "https://github.com/verifast/verifast/releases/download/${finalAttrs.version}/${pname}-${finalAttrs.version}-macos-aarch.tar.gz"; hash = "sha256-/UicTlA4lFRk3OBgcsiS8YtDGmb7R7d6zeVLZo49HV8="; }; - x86_64-darwin = fetchurl { - url = "https://github.com/verifast/verifast/releases/download/${finalAttrs.version}/${pname}-${finalAttrs.version}-macos.tar.gz"; - hash = "sha256-EVYPcnPsERfs2bqVQMbdR6TAv/ChQDrmCZNRl2Qs1Qw="; - }; }; in { diff --git a/pkgs/by-name/ve/verilator/package.nix b/pkgs/by-name/ve/verilator/package.nix index b011167f1ee9..765730487591 100644 --- a/pkgs/by-name/ve/verilator/package.nix +++ b/pkgs/by-name/ve/verilator/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + bash, perl, flex, bison, @@ -19,15 +20,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "verilator"; - version = "5.048"; + version = "5.050"; src = fetchFromGitHub { owner = "verilator"; repo = "verilator"; tag = "v${finalAttrs.version}"; - hash = "sha256-xvqqgbW7L07+NBYzGN2KLhwir58ByShxo4VVPI3pgZk="; + hash = "sha256-ZOwBBbVNP0PaYUvrjdvbWu88fZOZ6IJ8BHAiajcOjP8="; }; - enableParallelBuilding = true; buildInputs = [ perl @@ -72,8 +72,8 @@ stdenv.mkDerivation (finalAttrs: { test_regress/t/t_a1_first_cc.py \ test_regress/t/t_a2_first_sc.py \ ci/* ci/docker/run/* ci/docker/run/hooks/* ci/docker/buildenv/build.sh - # verilator --gdbbt uses /bin/echo to test if gdb works. - substituteInPlace bin/verilator --replace-fail "/bin/echo" "${coreutils}/bin/echo" + # verilator --gdbbt uses /bin/sh to test if gdb works. + substituteInPlace bin/verilator --replace-fail "/bin/sh" "${bash}/bin/sh" ''; # grep '^#!/' -R . | grep -v /nix/store | less # (in nix-shell after patchPhase) diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index daddf229bc5a..eb1d9e2317e6 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -198,7 +198,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/ve/vesta-viewer/package.nix b/pkgs/by-name/ve/vesta-viewer/package.nix index ebf984923f23..71a53c730200 100644 --- a/pkgs/by-name/ve/vesta-viewer/package.nix +++ b/pkgs/by-name/ve/vesta-viewer/package.nix @@ -30,7 +30,6 @@ let sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ ulysseszhan ]; mainProgram = "VESTA"; @@ -115,7 +114,6 @@ stdenvNoCC.mkDerivation ( } // { "x86_64-linux" = linuxArgs; - "x86_64-darwin" = darwinArgs; } .${stdenvNoCC.hostPlatform.system} or { } ) diff --git a/pkgs/by-name/vg/vgmtrans/package.nix b/pkgs/by-name/vg/vgmtrans/package.nix index 1c372c637384..eef464cad792 100644 --- a/pkgs/by-name/vg/vgmtrans/package.nix +++ b/pkgs/by-name/vg/vgmtrans/package.nix @@ -62,7 +62,6 @@ stdenv.mkDerivation (finalAttrs: { # See CMakePresets.json platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" "x86_64-windows" "aarch64-windows" diff --git a/pkgs/by-name/vi/virtiofsd/package.nix b/pkgs/by-name/vi/virtiofsd/package.nix index 1b3ef67272c8..f9eea1b8c735 100644 --- a/pkgs/by-name/vi/virtiofsd/package.nix +++ b/pkgs/by-name/vi/virtiofsd/package.nix @@ -10,18 +10,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "virtiofsd"; - version = "1.13.3"; + version = "1.14.0"; src = fetchFromGitLab { owner = "virtio-fs"; repo = "virtiofsd"; rev = "v${finalAttrs.version}"; - hash = "sha256-H8FjnrwB6IfZ7pVFesEWZkWpWjVYGrewlPRZc97Nlh8="; + hash = "sha256-NeqeSqPeD3hjAcbck+g8bmarbUL1Nks8AMAi/WxwzwY="; }; separateDebugInfo = true; - cargoHash = "sha256-AOWHlvFvKj05f4/KE1F37qkRstW5gUlRH0HZVZrg7Dg="; + cargoHash = "sha256-7byiMT2/jf0R7zHr/HBeXKk2T+OQhlVhZ9QJHlEY/Ao="; env = { LIBCAPNG_LIB_PATH = "${lib.getLib libcap_ng}/lib"; diff --git a/pkgs/by-name/vk/vk-messenger/package.nix b/pkgs/by-name/vk/vk-messenger/package.nix index 7dfd160d7656..3cccc25a4a8d 100644 --- a/pkgs/by-name/vk/vk-messenger/package.nix +++ b/pkgs/by-name/vk/vk-messenger/package.nix @@ -31,10 +31,6 @@ let url = "https://desktop.userapi.com/rpm/master/vk-${version}.x86_64.rpm"; sha256 = "spDw9cfDSlIuCwOqREsqXC19tx62TiAz9fjIS9lYjSQ="; }; - x86_64-darwin = fetchurl { - url = "https://web.archive.org/web/20220302083827/https://desktop.userapi.com/mac/master/vk.dmg"; - sha256 = "hxK8I9sF6njfCxSs1KBCHfnG81JGKUgHKAeFLtuCNe0="; - }; } .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); @@ -47,7 +43,6 @@ let platforms = [ "i686-linux" "x86_64-linux" - "x86_64-darwin" ]; }; diff --git a/pkgs/by-name/vl/vlang/package.nix b/pkgs/by-name/vl/vlang/package.nix index 5e9fd1cc8ecc..deded5495626 100644 --- a/pkgs/by-name/vl/vlang/package.nix +++ b/pkgs/by-name/vl/vlang/package.nix @@ -6,6 +6,8 @@ freetype, openssl, makeWrapper, + pkg-config, + sqlite, upx, boehmgc, libxdmcp, @@ -16,7 +18,7 @@ }: let - version = "0.5.1"; + version = "0.5.2"; ptraceSubstitution = '' #include #include @@ -25,12 +27,12 @@ let # So we fix its rev to correspond to the V version. vc = stdenv.mkDerivation { pname = "v.c"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "vlang"; repo = "vc"; - rev = "f461dfebcdfac3c75fdf28fec80c07f0a7a9a53d"; - hash = "sha256-GsciyAqCVbLpC6L+HFX90+1yX1Iq/GIBZIIzLVXbFN0="; + rev = "7eb8c54a3843e5107d5af06d7a8c3e928f322475"; + hash = "sha256-Ca8RqMN2BwnwCfjvtGtFAl/qaoSLQTHGmhIk5FN3CO8="; }; # patch the ptrace reference for darwin @@ -48,8 +50,8 @@ let markdown = fetchFromGitHub { owner = "vlang"; repo = "markdown"; - rev = "6ecbf4c519de2ca4cb26432bb2653c9cb9f17309"; - hash = "sha256-tFOI9Dh1yvFtsWHr4JvFUonbI6la3aj47YmfuFt3unI="; + rev = "ef2f1018c37c1db6e379331b3cd841331b6a6fd2"; + hash = "sha256-drhDQYm7yiL+EDyslkTb0MGA9NQRrDLVg3IElwXAIIY="; }; boehmgcStatic = boehmgc.override { enableStatic = true; @@ -63,17 +65,21 @@ stdenv.mkDerivation { owner = "vlang"; repo = "v"; rev = version; - hash = "sha256-f9YtL2+gWvFI/fX09CtQlPRLDZT7D6K8bRQvXApXByU="; + hash = "sha256-0PInqMmb4sNzJwVD9SMhTXzvxMdaC1uIJl7fpdXKESE="; }; propagatedBuildInputs = [ glfw freetype openssl + sqlite ] ++ lib.optional stdenv.hostPlatform.isUnix upx; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + pkg-config + ]; buildInputs = [ binaryen @@ -103,13 +109,20 @@ stdenv.mkDerivation { mkdir -p $out/{bin,lib,share} cp -r examples $out/share cp -r {cmd,vlib,thirdparty} $out/lib - cp v $out/lib + cp v v.mod $out/lib ln -s $out/lib/v $out/bin/v - wrapProgram $out/bin/v --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} + wrapProgram $out/bin/v \ + --prefix PATH : ${ + lib.makeBinPath [ + stdenv.cc + pkg-config + ] + } \ + --prefix PKG_CONFIG_PATH : ${lib.getDev sqlite}/lib/pkgconfig # gen_vc is a V-maintainer tool for pushing bootstrap C files to the vc - # repo; it requires network/SSH access and a v.mod root that doesn't exist - # in the installed layout, so it cannot be built in the Nix sandbox. + # repo; it requires network/SSH access, so it cannot be built in the Nix + # sandbox. rm $out/lib/cmd/tools/gen_vc.v mkdir -p $HOME/.vmodules; diff --git a/pkgs/by-name/vo/voicevox-core/onnxruntime.nix b/pkgs/by-name/vo/voicevox-core/onnxruntime.nix index 86e3afabdf0a..8e1820f467c6 100644 --- a/pkgs/by-name/vo/voicevox-core/onnxruntime.nix +++ b/pkgs/by-name/vo/voicevox-core/onnxruntime.nix @@ -43,10 +43,6 @@ stdenv.mkDerivation (finalAttrs: { id = "linux-arm64"; hash = "sha256-J27twAe2lDJPWbw1ws+QQXJOt4ZghDemSfCW7eo5Q6k="; }; - "x86_64-darwin" = fetchArtifact { - id = "osx-x86_64"; - hash = "sha256-We3IYCUtu39kzC63K9SykEpt98NfM9yAgkNbnxWlBd8="; - }; "aarch64-darwin" = fetchArtifact { id = "osx-arm64"; hash = "sha256-ltfqGSigoVSFSS03YhOH31D0CnkuKmgX1N9z7NGFcfI="; diff --git a/pkgs/by-name/vo/volatility2-bin/package.nix b/pkgs/by-name/vo/volatility2-bin/package.nix index facd93842e85..2e3ce9b38c5d 100644 --- a/pkgs/by-name/vo/volatility2-bin/package.nix +++ b/pkgs/by-name/vo/volatility2-bin/package.nix @@ -10,13 +10,11 @@ let suffix = { x86_64-linux = "lin64_standalone"; - x86_64-darwin = "mac64_standalone"; } .${stdenv.hostPlatform.system} or throwSystem; hash = { x86_64-linux = "sha256-ucG6oR4gBRUjMmHRr9QNenc04ENvwLvyCzSAqIoAiwM="; - x86_64-darwin = "sha256-BObRSSGUra1y/oo3ZFfIGi2PdHDX2gZy315x7R9DQPk="; } .${stdenv.hostPlatform.system} or throwSystem; in @@ -60,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Advanced memory forensics framework"; platforms = [ "x86_64-linux" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ ivyfanchiang ]; license = lib.licenses.gpl2Plus; diff --git a/pkgs/by-name/wa/waveterm/package.nix b/pkgs/by-name/wa/waveterm/package.nix index 5fa0b5fc964e..ede934b2012c 100644 --- a/pkgs/by-name/wa/waveterm/package.nix +++ b/pkgs/by-name/wa/waveterm/package.nix @@ -44,7 +44,6 @@ let "aarch64-linux" "aarch64-darwin" "x86_64-linux" - "x86_64-darwin" ]; maintainers = [ ]; }; @@ -129,14 +128,12 @@ let src = let arch = selectSystem { - x86_64-darwin = "x64"; aarch64-darwin = "arm64"; }; in fetchurl { url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/Wave-darwin-${arch}-${version}.zip"; hash = selectSystem { - x86_64-darwin = "sha256-U22AVln0IhGrL41YUbJMi2agjfAs1N8Zd6msElpAXD8="; aarch64-darwin = "sha256-NY/KFFGgtrQr9YL32nudWeTIGNDjswelcOD1wo+Jh3s="; }; }; diff --git a/pkgs/by-name/we/weasis/package.nix b/pkgs/by-name/we/weasis/package.nix index 22ac32255b97..a9811e0b040f 100644 --- a/pkgs/by-name/we/weasis/package.nix +++ b/pkgs/by-name/we/weasis/package.nix @@ -20,7 +20,6 @@ let platform = selectSystem { "x86_64-linux" = "linux-x86-64"; "aarch64-linux" = "linux-aarch64"; - "x86_64-darwin" = "macosx-x86-64"; "aarch64-darwin" = "macosx-aarch64"; }; diff --git a/pkgs/by-name/we/wechat/package.nix b/pkgs/by-name/we/wechat/package.nix index 2e57b779d37b..95c75acd1da4 100644 --- a/pkgs/by-name/we/wechat/package.nix +++ b/pkgs/by-name/we/wechat/package.nix @@ -19,7 +19,6 @@ let mainProgram = "wechat"; platforms = [ "aarch64-darwin" - "x86_64-darwin" "aarch64-linux" "x86_64-linux" ]; @@ -43,7 +42,6 @@ let in { aarch64-darwin = any-darwin; - x86_64-darwin = any-darwin; # use https://web.archive.org/save to archive the Linux versions # add `if_` at the end of timestamps to avoid toolbar insertion # for a more complicated guide, see https://en.wikipedia.org/wiki/Help:Using_the_Wayback_Machine diff --git a/pkgs/by-name/wh/whatcable/package.nix b/pkgs/by-name/wh/whatcable/package.nix new file mode 100644 index 000000000000..32f8ee2cf091 --- /dev/null +++ b/pkgs/by-name/wh/whatcable/package.nix @@ -0,0 +1,57 @@ +{ + fetchzip, + lib, + nix-update-script, + re-plistbuddy, + stdenvNoCC, + versionCheckHook, + writeShellScript, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "whatcable"; + version = "1.1.9"; + + strictDeps = true; + __structuredAttrs = true; + + src = fetchzip { + url = "https://github.com/darrylmorley/whatcable/releases/download/v${finalAttrs.version}/WhatCable.zip"; + hash = "sha256-0taHQE4aUJrbRdWXZZyHfJ+2EzpEiXpsj8HWg04lgXg="; + }; + + dontPatch = true; + dontConfigure = true; + dontBuild = true; + dontFixup = true; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/Applications/WhatCable.app" "$out/bin" + cp -R . "$out/Applications/WhatCable.app" + ln -s "$out/Applications/WhatCable.app/Contents/Helpers/whatcable" "$out/bin/whatcable" + + runHook postInstall + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = writeShellScript "whatcable-version-check" '' + ${lib.getExe' re-plistbuddy "PlistBuddy"} -c "Print :CFBundleShortVersionString" "$1" + ''; + versionCheckProgramArg = [ "${placeholder "out"}/Applications/WhatCable.app/Contents/Info.plist" ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "macOS menu bar app that explains USB-C cable capabilities"; + homepage = "https://whatcable.uk"; + changelog = "https://github.com/darrylmorley/whatcable/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tyceherrman ]; + mainProgram = "whatcable"; + platforms = [ "aarch64-darwin" ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/wh/whisparr/package.nix b/pkgs/by-name/wh/whisparr/package.nix index 5fcd3f16b94d..4093bbf15f6c 100644 --- a/pkgs/by-name/wh/whisparr/package.nix +++ b/pkgs/by-name/wh/whisparr/package.nix @@ -23,7 +23,6 @@ let { aarch64-darwin = "arm64"; aarch64-linux = "arm64"; - x86_64-darwin = "x64"; x86_64-linux = "x64"; } ."${system}" or (throw "Unsupported system: ${system}"); @@ -86,7 +85,6 @@ stdenv.mkDerivation rec { platforms = [ "aarch64-darwin" "aarch64-linux" - "x86_64-darwin" "x86_64-linux" ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; diff --git a/pkgs/by-name/wi/wire-desktop/package.nix b/pkgs/by-name/wi/wire-desktop/package.nix index b6663db4acbf..498720bbc790 100644 --- a/pkgs/by-name/wi/wire-desktop/package.nix +++ b/pkgs/by-name/wi/wire-desktop/package.nix @@ -27,7 +27,7 @@ let hash = "sha256-pNu+/JKvaKSqHxNeDL8RcDy+FiY3aynQH06t05qgXrA="; }; }; - x86_64-darwin = rec { + aarch64-darwin = rec { version = "3.42.5489"; src = fetchFromGitHub { owner = "wireapp"; @@ -37,7 +37,6 @@ let }; }; aarch64-linux = x86_64-linux; - aarch64-darwin = x86_64-darwin; }; web-config = fetchFromGitHub { owner = "wireapp"; @@ -193,7 +192,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/wk/wkhtmltopdf/package.nix b/pkgs/by-name/wk/wkhtmltopdf/package.nix index be0d0620fb47..9dd7399ef9eb 100644 --- a/pkgs/by-name/wk/wkhtmltopdf/package.nix +++ b/pkgs/by-name/wk/wkhtmltopdf/package.nix @@ -122,7 +122,6 @@ stdenv.mkDerivation ( kalbasit ]; platforms = [ - "x86_64-darwin" "x86_64-linux" "aarch64-linux" ]; diff --git a/pkgs/by-name/wl/wl-find-cursor/package.nix b/pkgs/by-name/wl/wl-find-cursor/package.nix new file mode 100644 index 000000000000..a4ceb1e5f4e7 --- /dev/null +++ b/pkgs/by-name/wl/wl-find-cursor/package.nix @@ -0,0 +1,52 @@ +{ + lib, + fetchFromGitHub, + nix-update-script, + stdenv, + wayland, + wayland-protocols, + wayland-scanner, +}: + +stdenv.mkDerivation { + pname = "wl-find-cursor"; + version = "0-unstable-2026-02-03"; + + src = fetchFromGitHub { + owner = "cjacker"; + repo = "wl-find-cursor"; + rev = "ce1a125702b466dc537c5490f7888b4a68dee883"; + hash = "sha256-IUreWEOWF1loS5SiAh8XPFrKE35Pxv6e8hhvdtNvjiU="; + }; + + __structuredAttrs = true; + strictDeps = true; + + nativeBuildInputs = [ + wayland-scanner + ]; + + buildInputs = [ + wayland + ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace-fail "/usr/share/wayland-protocols" "${wayland-protocols}/share/wayland-protocols" \ + --replace-fail "gcc" "${stdenv.cc.targetPrefix}cc" \ + --replace-fail "install: default" "install: all" + ''; + + makeFlags = [ "PREFIX=$(out)" ]; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + + meta = { + description = "Highlight and print the mouse cursor position on Wayland"; + homepage = "https://github.com/cjacker/wl-find-cursor"; + license = lib.licenses.mit; + mainProgram = "wl-find-cursor"; + maintainers = with lib.maintainers; [ ilkecan ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/wo/wordnet/package.nix b/pkgs/by-name/wo/wordnet/package.nix index a82b10cec122..bd7f906b8f2a 100644 --- a/pkgs/by-name/wo/wordnet/package.nix +++ b/pkgs/by-name/wo/wordnet/package.nix @@ -55,10 +55,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://wordnet.princeton.edu/"; - license = { - fullName = "WordNet 3.0 license"; - url = "https://wordnet.princeton.edu/license-and-commercial-use"; - }; + license = lib.licenses.wordnet; maintainers = [ ]; platforms = with lib.platforms; linux ++ darwin; mainProgram = "wn"; diff --git a/pkgs/by-name/wp/wpsoffice-cn/package.nix b/pkgs/by-name/wp/wpsoffice-cn/package.nix index e88bedf6c021..9b36df74966d 100644 --- a/pkgs/by-name/wp/wpsoffice-cn/package.nix +++ b/pkgs/by-name/wp/wpsoffice-cn/package.nix @@ -79,7 +79,6 @@ let homepage = "https://www.wps.cn"; platforms = [ "aarch64-darwin" - "x86_64-darwin" "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/wp/wpsoffice-cn/sources.nix b/pkgs/by-name/wp/wpsoffice-cn/sources.nix index 5f86b3053a11..b3ee081764fd 100644 --- a/pkgs/by-name/wp/wpsoffice-cn/sources.nix +++ b/pkgs/by-name/wp/wpsoffice-cn/sources.nix @@ -7,10 +7,6 @@ url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2023/26885/wps-office_12.1.2.26885.AK.preread.sw.Personal_715971_amd64.deb"; hash = "sha256-VdpRSUZ6FYS0ttEoDLWrBMBhRTl0gQ+slnmzO9hmTlE="; }; - x86_64-darwin = { - url = "https://package.mac.wpscdn.cn/mac_wps_pkg/12.1.26016/WPS_Office_12.1.26016(26016)_x64.dmg"; - hash = "sha256-pyjW1cUKX7RRFDQo2ik2L57fIwixLj0XqHMYTe4aE3g="; - }; aarch64-darwin = { url = "https://package.mac.wpscdn.cn/mac_wps_pkg/12.1.26016/WPS_Office_12.1.26016(26016)_arm64.dmg"; hash = "sha256-vlT96ROqB/6Jt/x60Zeh6B4MtN2NGyn5PWv9pNafF/8="; diff --git a/pkgs/by-name/ya/yaak/package.nix b/pkgs/by-name/ya/yaak/package.nix index 61e5b734b3ab..f5bab9ed69dc 100644 --- a/pkgs/by-name/ya/yaak/package.nix +++ b/pkgs/by-name/ya/yaak/package.nix @@ -104,7 +104,6 @@ rustPlatform.buildRustPackage (finalAttrs: { archPlatforms = { "aarch64-darwin" = "aarch64-apple-darwin"; - "x86_64-darwin" = "x86_64-apple-darwin"; "aarch64-linux" = "aarch64-unknown-linux-gnu"; "x86_64-linux" = "x86_64-unknown-linux-gnu"; } @@ -150,7 +149,6 @@ rustPlatform.buildRustPackage (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/ya/yandex-cloud/package.nix b/pkgs/by-name/ya/yandex-cloud/package.nix index 9a6f8919996c..41a1002af868 100644 --- a/pkgs/by-name/ya/yandex-cloud/package.nix +++ b/pkgs/by-name/ya/yandex-cloud/package.nix @@ -78,7 +78,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = [ lib.maintainers.tie ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" "aarch64-linux" "x86_64-linux" # Built with GO386=sse2. diff --git a/pkgs/by-name/ya/yandex-cloud/sources.json b/pkgs/by-name/ya/yandex-cloud/sources.json index d6ff1cbd5b5c..952f4d110fe8 100644 --- a/pkgs/by-name/ya/yandex-cloud/sources.json +++ b/pkgs/by-name/ya/yandex-cloud/sources.json @@ -13,10 +13,6 @@ "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.193.0/linux/386/yc", "hash": "sha256-RQpyHlwy3bu9xdeLiqEuAt8WCAh6qafSaMXDGESkBEw=" }, - "x86_64-darwin": { - "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.193.0/darwin/amd64/yc", - "hash": "sha256-k1mhTX9VtaCWDCbwwYooAOcWRB/xbSq2V0hrApVXlKE=" - }, "x86_64-linux": { "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.193.0/linux/amd64/yc", "hash": "sha256-gv+mlrW1uSoSzDFDAoZeQK9dr0HIhgUuvVpppuKUe24=" diff --git a/pkgs/by-name/zb/zbctl/package.nix b/pkgs/by-name/zb/zbctl/package.nix index 4b6a5c6d3a6f..e2c1feee05b3 100644 --- a/pkgs/by-name/zb/zbctl/package.nix +++ b/pkgs/by-name/zb/zbctl/package.nix @@ -42,7 +42,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.asl20; platforms = [ - "x86_64-darwin" "x86_64-linux" ]; maintainers = with lib.maintainers; [ thetallestjj ]; diff --git a/pkgs/by-name/ze/zennotes-desktop/package.nix b/pkgs/by-name/ze/zennotes-desktop/package.nix index d0845373c487..2ec8888bca27 100644 --- a/pkgs/by-name/ze/zennotes-desktop/package.nix +++ b/pkgs/by-name/ze/zennotes-desktop/package.nix @@ -13,14 +13,14 @@ buildNpmPackage (finalAttrs: { pname = "zennotes-desktop"; - version = "2.13.1"; + version = "2.13.2"; npmDepsHash = "sha256-7dchbcGAZm+PlVsES76sYD9NOqeCulEKC7S0zLERvvY="; src = fetchFromGitHub { owner = "ZenNotes"; repo = "zennotes"; tag = "v${finalAttrs.version}"; - hash = "sha256-jhdX+GFzBBxbT+B04RDqm66qfDi/LcpJR5eCRlQhx68="; + hash = "sha256-Wazp3v6fV0gBh4ASlinhmA6SnGDmBvRcWFEXbENQUII="; }; npmWorkspace = "apps/desktop"; diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix index 654346309b00..bd573c080e3b 100644 --- a/pkgs/by-name/zo/zoom-us/package.nix +++ b/pkgs/by-name/zo/zoom-us/package.nix @@ -66,10 +66,6 @@ let name = "zoomusInstallerFull.pkg"; hash = "sha256-HReyDktQ+EiHM857kgvzQD8tSHtSFYrAfv1YSTVFCLw="; }; - x86_64-darwin = fetchurl { - url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-F7v+j4M6pQ3sIBW5rWoIQ0gdtgtTPlUiUe2ffcc5sd8="; - }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; hash = "sha256-OxzJtNqV50C2kPonXylvyOL3/3ItChkpDw7KIOzDiPw="; diff --git a/pkgs/by-name/zr/zrok/package.nix b/pkgs/by-name/zr/zrok/package.nix index f39d3fc9f3dc..409324563b29 100644 --- a/pkgs/by-name/zr/zrok/package.nix +++ b/pkgs/by-name/zr/zrok/package.nix @@ -17,7 +17,6 @@ let x86_64-linux = "linux_amd64"; aarch64-linux = "linux_arm64"; armv7l-linux = "linux_armv7"; - x86_64-darwin = "darwin_amd64"; aarch64-darwin = "darwin_arm64"; } .${system} or throwSystem; @@ -27,7 +26,6 @@ let x86_64-linux = "sha256-H/KISDC58ILi6oZlLY2HdgJR9ksEt+VeJem4VIFhqcY="; aarch64-linux = "sha256-kfmMi2HeZG81CocOEK+n+UwfKz245Ya4C6iXT2L85pI="; armv7l-linux = "sha256-AZDoQOJMBB1k9r07URj5g8249Od5P039nf3BadzCbPY="; - x86_64-darwin = "sha256-B2LeP1hKxifxpGD7BS0Wgd0h+Cf4teFh8ldyqrFhteU="; aarch64-darwin = "sha256-c5vWvb8ZhGAnmlZB/kqErC6SEXClg6vNbJheAAmqV/E="; } .${system} or throwSystem; @@ -76,7 +74,6 @@ stdenv.mkDerivation (finalAttrs: { "x86_64-linux" "aarch64-linux" "armv7l-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index 33bbba1bb930..8754458b76f8 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -30,12 +30,6 @@ let runtime = "armcl"; kernel = "linuxarm"; }; - x86_64-darwin = { - arch = "darwinx86"; - hash = "sha256-r+OhkU0b+QDgoZpZb0Xpc3V0yRq8GBKcNLt2IzeOSdE="; - runtime = "dx86cl64"; - kernel = "darwinx8664"; - }; armv6l-linux = armv7l-linux; }; cfg = diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix index 96e0a0f79222..270b3f279703 100644 --- a/pkgs/development/compilers/clasp/default.nix +++ b/pkgs/development/compilers/clasp/default.nix @@ -80,7 +80,6 @@ stdenv.mkDerivation rec { teams = [ lib.teams.lisp ]; platforms = [ "x86_64-linux" - "x86_64-darwin" ]; homepage = "https://github.com/clasp-developers/clasp"; mainProgram = "clasp"; diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index a009f657643c..3c6d6f85fe69 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -37,7 +37,6 @@ let archs = { x86_64-linux = "linux-x86_64"; i686-linux = "linux-i686"; - x86_64-darwin = "darwin-universal"; aarch64-darwin = "darwin-universal"; aarch64-linux = "linux-aarch64"; }; @@ -289,7 +288,6 @@ rec { sha256s = { x86_64-linux = "sha256-F0LjdV02U9G6B8ApHxClF/o5KvhxMNukSX7Z2CwSNIs="; aarch64-darwin = "sha256-5kkObQl0VIO6zqQ8TYl0JzYyUmwfmPE9targpfwseSQ="; - x86_64-darwin = "sha256-5kkObQl0VIO6zqQ8TYl0JzYyUmwfmPE9targpfwseSQ="; aarch64-linux = "sha256-AzFz+nrU/HJmCL1hbCKXf5ej/uypqV1GJPVLQ4J3778="; }; }; diff --git a/pkgs/development/compilers/dart/default.nix b/pkgs/development/compilers/dart/default.nix index 5f8c5a1be82d..54b79b692c2e 100644 --- a/pkgs/development/compilers/dart/default.nix +++ b/pkgs/development/compilers/dart/default.nix @@ -21,13 +21,11 @@ stdenv.mkDerivation (finalAttrs: { system = selectSystem { x86_64-linux = "linux-x64"; aarch64-linux = "linux-arm64"; - x86_64-darwin = "macos-x64"; aarch64-darwin = "macos-arm64"; }; hash = selectSystem { x86_64-linux = "sha256-KOR7RM8HXzZ3EEbAaLsNF0IBz5x2CHRK7RzCMgQpnC0="; aarch64-linux = "sha256-+CyD7OfRaAR1UN/UpmTkBxrHxIi923LcQxAsItfgtRg="; - x86_64-darwin = "sha256-OBmfVv4i8iNednmRkdW5UW42A2nGG2ukQROY1dWSC6s="; aarch64-darwin = "sha256-zYdTko53trZlvXDc4OZLTsbS4v3hQdZAm7cWyKwfHAo="; }; in @@ -113,7 +111,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 3eadb90bfa24..3b38f31d8e4e 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -39,7 +39,6 @@ makeScopeWithSplicing' { runtimeIdentifierMap = { "x86_64-linux" = "linux-x64"; "aarch64-linux" = "linux-arm64"; - "x86_64-darwin" = "osx-x64"; "aarch64-darwin" = "osx-arm64"; "x86_64-windows" = "win-x64"; "i686-windows" = "win-x86"; diff --git a/pkgs/development/compilers/dotnet/source/vmr.nix b/pkgs/development/compilers/dotnet/source/vmr.nix index 84c6f24ae33a..c832c28abcb0 100644 --- a/pkgs/development/compilers/dotnet/source/vmr.nix +++ b/pkgs/development/compilers/dotnet/source/vmr.nix @@ -539,7 +539,6 @@ stdenv.mkDerivation { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; # build deadlocks intermittently on rosetta diff --git a/pkgs/development/compilers/elm/packages/lamdera/default.nix b/pkgs/development/compilers/elm/packages/lamdera/default.nix index cd074c316f07..ffde6b93c836 100644 --- a/pkgs/development/compilers/elm/packages/lamdera/default.nix +++ b/pkgs/development/compilers/elm/packages/lamdera/default.nix @@ -10,7 +10,6 @@ let hashes = { "x86_64-linux" = "1i3mhm1swphkimm4dfdiyabxd6w3xni14cnlffz0da1p6a2x11v2"; "aarch64-linux" = "0p7dxnnxh0nskbdaq5ldf33rqmbgj0ymhqdi89y3pk1yxjlk7bcf"; - "x86_64-darwin" = "0mw5a28nlq0ra69q5fcl2spmvc88qrffzw7ngh5fdmdmvkd9f3wb"; "aarch64-darwin" = "0j20i5g92h8zx6p3hzxdrh298dkipxxhyvp28asddrxbiscfca1b"; }; in @@ -38,7 +37,6 @@ stdenv.mkDerivation rec { "aarch64-linux" "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ Zimmi48 ]; }; diff --git a/pkgs/development/compilers/fbc/mac-bin.nix b/pkgs/development/compilers/fbc/mac-bin.nix index 39e8cf5fd72b..13c95fe18aae 100644 --- a/pkgs/development/compilers/fbc/mac-bin.nix +++ b/pkgs/development/compilers/fbc/mac-bin.nix @@ -31,6 +31,6 @@ stdenvNoCC.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.gpl2Plus; # runtime & graphics libraries are LGPLv2+ w/ static linking exception maintainers = with lib.maintainers; [ OPNA2608 ]; - platforms = [ "x86_64-darwin" ]; + platforms = [ ]; }; } diff --git a/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix b/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix index a425f8fce636..d2a3dd648160 100644 --- a/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix +++ b/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix @@ -54,7 +54,6 @@ runCommand "flutter-artifacts-${flutterPlatform}-${systemPlatform}" { "x86_64-linux" = "linux"; "aarch64-linux" = "linux"; - "x86_64-darwin" = "macos"; "aarch64-darwin" = "macos"; } .${systemPlatform}; diff --git a/pkgs/development/compilers/flutter/engine/package.nix b/pkgs/development/compilers/flutter/engine/package.nix index 7d79b09e8662..9c3fc0d2bb43 100644 --- a/pkgs/development/compilers/flutter/engine/package.nix +++ b/pkgs/development/compilers/flutter/engine/package.nix @@ -383,7 +383,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index 23ea9ab073cc..4f546902fd30 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -219,7 +219,6 @@ let platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "flutter"; diff --git a/pkgs/development/compilers/flutter/versions/3_29/data.json b/pkgs/development/compilers/flutter/versions/3_29/data.json index a3c5323a3aef..4c6757f3bace 100644 --- a/pkgs/development/compilers/flutter/versions/3_29/data.json +++ b/pkgs/development/compilers/flutter/versions/3_29/data.json @@ -18,7 +18,6 @@ "dartHash": { "x86_64-linux": "sha256-ClgSWEu0+lLcPIlabVvBY197/c/kyio6Zoq3KppbW3Y=", "aarch64-linux": "sha256-NACnkq/pVMiWxfAt4+bkUjM0ZLwBWk5GQrbc9HGFE4k=", - "x86_64-darwin": "sha256-liZz9Bj1RFH7vmEpdMiJ9/h3Yut/o0qEBvydq8dGdKs=", "aarch64-darwin": "sha256-544u8sIlQudxjBCSZlnQESLsOOdWp5h4lVTaY9P+pRQ=" }, "flutterHash": "sha256-VWmKhxjerGKmw9fXhrRRVcKpUhefmJ2agRkIyWeAOO4=", @@ -26,47 +25,39 @@ "android": { "aarch64-darwin": "sha256-xWeagoJGFkHKW0oT5FSJCy254qemp5jZq/zXpadOrVY=", "aarch64-linux": "sha256-2z7PgRGqUlFQZHJ53EdDT4p5Vk6OT2BJKx2QwSF7/QI=", - "x86_64-darwin": "sha256-xWeagoJGFkHKW0oT5FSJCy254qemp5jZq/zXpadOrVY=", "x86_64-linux": "sha256-2z7PgRGqUlFQZHJ53EdDT4p5Vk6OT2BJKx2QwSF7/QI=" }, "fuchsia": { "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", "aarch64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", - "x86_64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=" }, "ios": { "aarch64-darwin": "sha256-mKrkm+Sio/SUPoivJNh+Kg4iZ6o/7P2Wsqi1ys5i6/k=", "aarch64-linux": "sha256-mKrkm+Sio/SUPoivJNh+Kg4iZ6o/7P2Wsqi1ys5i6/k=", - "x86_64-darwin": "sha256-mKrkm+Sio/SUPoivJNh+Kg4iZ6o/7P2Wsqi1ys5i6/k=", "x86_64-linux": "sha256-mKrkm+Sio/SUPoivJNh+Kg4iZ6o/7P2Wsqi1ys5i6/k=" }, "linux": { "aarch64-darwin": "sha256-W8usesonlRBxd5CFQyQAyVfx4yMkd2UcZWbhVlB8Jwc=", "aarch64-linux": "sha256-W8usesonlRBxd5CFQyQAyVfx4yMkd2UcZWbhVlB8Jwc=", - "x86_64-darwin": "sha256-RxNVQpRR4EWbK0WD+d6tZbweW3QE7Z3fipKFpf4YyG8=", "x86_64-linux": "sha256-RxNVQpRR4EWbK0WD+d6tZbweW3QE7Z3fipKFpf4YyG8=" }, "macos": { "aarch64-darwin": "sha256-WGm1+0IY5FMyXt5TSXcwrEw/u72lmc+2H7NR66uvxrE=", "aarch64-linux": "sha256-WGm1+0IY5FMyXt5TSXcwrEw/u72lmc+2H7NR66uvxrE=", - "x86_64-darwin": "sha256-WGm1+0IY5FMyXt5TSXcwrEw/u72lmc+2H7NR66uvxrE=", "x86_64-linux": "sha256-WGm1+0IY5FMyXt5TSXcwrEw/u72lmc+2H7NR66uvxrE=" }, "universal": { "aarch64-darwin": "sha256-MxtHKccpQfurtKumtp00CRqB/riU5+wiHsuUh4sCXVY=", "aarch64-linux": "sha256-w2onIP0zkg8N/vsnC9DKCrG4iIUvRiBhbHvSJYzW/fQ=", - "x86_64-darwin": "sha256-vq4/tCBQQtmJarcnrrL+saCUKS/xCoFHmKAxBSn1edI=", "x86_64-linux": "sha256-TglGaiwmbxCYJ6bk1zJwhIYlPf3+VVTO5zCMpzyu/JY=" }, "web": { "aarch64-darwin": "sha256-yN5ElLmpNG71yY9Egye8uXgHwiL8xRwNCkczElLf27Q=", "aarch64-linux": "sha256-yN5ElLmpNG71yY9Egye8uXgHwiL8xRwNCkczElLf27Q=", - "x86_64-darwin": "sha256-yN5ElLmpNG71yY9Egye8uXgHwiL8xRwNCkczElLf27Q=", "x86_64-linux": "sha256-yN5ElLmpNG71yY9Egye8uXgHwiL8xRwNCkczElLf27Q=" }, "windows": { - "x86_64-darwin": "sha256-l9rG2aRTrN26QFnLvbeGiUvMz8+faCo3byIbz33DWpY=", "x86_64-linux": "sha256-l9rG2aRTrN26QFnLvbeGiUvMz8+faCo3byIbz33DWpY=" } }, diff --git a/pkgs/development/compilers/flutter/versions/3_32/data.json b/pkgs/development/compilers/flutter/versions/3_32/data.json index 078a4c8a8d51..53b3a3840ba2 100644 --- a/pkgs/development/compilers/flutter/versions/3_32/data.json +++ b/pkgs/development/compilers/flutter/versions/3_32/data.json @@ -18,7 +18,6 @@ "dartHash": { "x86_64-linux": "sha256-3eE40VMwrPFD502lIaz+CkD7mBnSI/WqJ3C4DVQ01Z4=", "aarch64-linux": "sha256-0GXCO00ar5532h+cXBEIe8BhGVKOuGuoPzr1M00muh4=", - "x86_64-darwin": "sha256-S3iGDVLollApke2SnXAcV919qsDTVmz5Gf9fTletr00=", "aarch64-darwin": "sha256-haHQks9N1mBIqRsYg9sOLw7ra7gC708gsTWfKxvIK1c=" }, "flutterHash": "sha256-s5T16+cMmL2ustJQjwFbfS8G+/TJW/WCEF1IO4WgbXQ=", @@ -26,47 +25,39 @@ "android": { "aarch64-darwin": "sha256-hswA4YkMM3uur0F2KuA32g+EXtCPH7SYVZkjr2EFV7o=", "aarch64-linux": "sha256-1V8hfmK2q2QgbIT+YC/WtFZmkG7xcvrJYPeiN0o4fhY=", - "x86_64-darwin": "sha256-hswA4YkMM3uur0F2KuA32g+EXtCPH7SYVZkjr2EFV7o=", "x86_64-linux": "sha256-1V8hfmK2q2QgbIT+YC/WtFZmkG7xcvrJYPeiN0o4fhY=" }, "fuchsia": { "aarch64-darwin": "sha256-WkWLbIpEyrwyB9mcA3ElNecRmCVt8+6y3qKi9zFRR9I=", "aarch64-linux": "sha256-WkWLbIpEyrwyB9mcA3ElNecRmCVt8+6y3qKi9zFRR9I=", - "x86_64-darwin": "sha256-WkWLbIpEyrwyB9mcA3ElNecRmCVt8+6y3qKi9zFRR9I=", "x86_64-linux": "sha256-WkWLbIpEyrwyB9mcA3ElNecRmCVt8+6y3qKi9zFRR9I=" }, "ios": { "aarch64-darwin": "sha256-obbmFnObjvQH6sLL0MsRrFtA0x8yCOo7clMqQzteWGY=", "aarch64-linux": "sha256-obbmFnObjvQH6sLL0MsRrFtA0x8yCOo7clMqQzteWGY=", - "x86_64-darwin": "sha256-obbmFnObjvQH6sLL0MsRrFtA0x8yCOo7clMqQzteWGY=", "x86_64-linux": "sha256-obbmFnObjvQH6sLL0MsRrFtA0x8yCOo7clMqQzteWGY=" }, "linux": { "aarch64-darwin": "sha256-LID4h0JABLwjmrv3XS1MEWTYn/7GmBtybqiLbErfgWA=", "aarch64-linux": "sha256-LID4h0JABLwjmrv3XS1MEWTYn/7GmBtybqiLbErfgWA=", - "x86_64-darwin": "sha256-k8fVg13YXFFBAI0OKph1DqzfmNk1PYAyy/PVuma2hlM=", "x86_64-linux": "sha256-k8fVg13YXFFBAI0OKph1DqzfmNk1PYAyy/PVuma2hlM=" }, "macos": { "aarch64-darwin": "sha256-Y+T2SuM4D8Du/MAQR9DScU8ObPPE7WGxxvC5Km2YmHg=", "aarch64-linux": "sha256-Y+T2SuM4D8Du/MAQR9DScU8ObPPE7WGxxvC5Km2YmHg=", - "x86_64-darwin": "sha256-Y+T2SuM4D8Du/MAQR9DScU8ObPPE7WGxxvC5Km2YmHg=", "x86_64-linux": "sha256-Y+T2SuM4D8Du/MAQR9DScU8ObPPE7WGxxvC5Km2YmHg=" }, "universal": { "aarch64-darwin": "sha256-h4v8Pyw7VqFDWh+VCcz12bgd1o5FIb+cpomR0k570f4=", "aarch64-linux": "sha256-ZBDA3tS2GwnubeIuXhZ7Zxc75KNim5OCYkkn03KMYGs=", - "x86_64-darwin": "sha256-USoiNw8AUinCwMvrpOTmhSDq/TP1f0N9ZT8l8ZILzOo=", "x86_64-linux": "sha256-OfSxYyyaRxaUCDR8ZjTdIBQ3PFpRXoA1YHIIooXAKKY=" }, "web": { "aarch64-darwin": "sha256-jaDnIyn0uwLOblQ1IqU0TlsgBrXyk8wXhlRzAwXLo50=", "aarch64-linux": "sha256-jaDnIyn0uwLOblQ1IqU0TlsgBrXyk8wXhlRzAwXLo50=", - "x86_64-darwin": "sha256-jaDnIyn0uwLOblQ1IqU0TlsgBrXyk8wXhlRzAwXLo50=", "x86_64-linux": "sha256-jaDnIyn0uwLOblQ1IqU0TlsgBrXyk8wXhlRzAwXLo50=" }, "windows": { - "x86_64-darwin": "sha256-zJrruuMcgtOXRrkRPoGHovyjABDck0Dzjrz7bCtx4C4=", "x86_64-linux": "sha256-zJrruuMcgtOXRrkRPoGHovyjABDck0Dzjrz7bCtx4C4=" } }, diff --git a/pkgs/development/compilers/flutter/versions/3_35/data.json b/pkgs/development/compilers/flutter/versions/3_35/data.json index 6d04fcf6b864..8fb3d6bbd85e 100644 --- a/pkgs/development/compilers/flutter/versions/3_35/data.json +++ b/pkgs/development/compilers/flutter/versions/3_35/data.json @@ -18,7 +18,6 @@ "dartHash": { "x86_64-linux": "sha256-ZJcii2WBCE4PNt5+S2nH4hj+WoZuhRLFkzMlSZEa01Y=", "aarch64-linux": "sha256-EzNApYsHor1suB9dFgJuewMqa0v7cADKLUzLym5GLOY=", - "x86_64-darwin": "sha256-mjWHCF5voWLKlqBKYhl2OKg2aDx0pyIQ1TlF6k4MQz0=", "aarch64-darwin": "sha256-1rAfqatlOdphdi6dZSfUfKywAbdwRn6ijo60isjV3Lw=" }, "flutterHash": "sha256-0GI3P11vys6JU+H5MXKznHTItOXZwap7bxHzgj6umc4=", @@ -26,47 +25,39 @@ "android": { "aarch64-darwin": "sha256-BbwfmKPmxZUPVoZEE687vudBCBPzVM/C9ehPEAPr6Jw=", "aarch64-linux": "sha256-Pgc/ybLcRFJkbGUI2eY689yxOv2VyKdO/F5vGkTg/tM=", - "x86_64-darwin": "sha256-BbwfmKPmxZUPVoZEE687vudBCBPzVM/C9ehPEAPr6Jw=", "x86_64-linux": "sha256-Pgc/ybLcRFJkbGUI2eY689yxOv2VyKdO/F5vGkTg/tM=" }, "fuchsia": { "aarch64-darwin": "sha256-qpHjEpuIK1hI6ga1qr0Q/t5S2Jjk8oUpnkeXsIeu7UM=", "aarch64-linux": "sha256-qpHjEpuIK1hI6ga1qr0Q/t5S2Jjk8oUpnkeXsIeu7UM=", - "x86_64-darwin": "sha256-qpHjEpuIK1hI6ga1qr0Q/t5S2Jjk8oUpnkeXsIeu7UM=", "x86_64-linux": "sha256-qpHjEpuIK1hI6ga1qr0Q/t5S2Jjk8oUpnkeXsIeu7UM=" }, "ios": { "aarch64-darwin": "sha256-ZjNJhDXqv9dg9Gn62TRYX1Vb4Qn0adS5nxxpYZOGsgY=", "aarch64-linux": "sha256-ZjNJhDXqv9dg9Gn62TRYX1Vb4Qn0adS5nxxpYZOGsgY=", - "x86_64-darwin": "sha256-ZjNJhDXqv9dg9Gn62TRYX1Vb4Qn0adS5nxxpYZOGsgY=", "x86_64-linux": "sha256-ZjNJhDXqv9dg9Gn62TRYX1Vb4Qn0adS5nxxpYZOGsgY=" }, "linux": { "aarch64-darwin": "sha256-TB9BOiV1Z1cKJKusNW4O0oJEJCt9XmWN+g4yCXtyepc=", "aarch64-linux": "sha256-TB9BOiV1Z1cKJKusNW4O0oJEJCt9XmWN+g4yCXtyepc=", - "x86_64-darwin": "sha256-7BocNpo89xSXNy6yob+EESVfalm2olwR/knVfq9I1VA=", "x86_64-linux": "sha256-7BocNpo89xSXNy6yob+EESVfalm2olwR/knVfq9I1VA=" }, "macos": { "aarch64-darwin": "sha256-vnV12shNi630OuyWTey/31vsmAcF7UMEgfdBZBXWc4c=", "aarch64-linux": "sha256-vnV12shNi630OuyWTey/31vsmAcF7UMEgfdBZBXWc4c=", - "x86_64-darwin": "sha256-vnV12shNi630OuyWTey/31vsmAcF7UMEgfdBZBXWc4c=", "x86_64-linux": "sha256-vnV12shNi630OuyWTey/31vsmAcF7UMEgfdBZBXWc4c=" }, "universal": { "aarch64-darwin": "sha256-oPUDsJxKbbWEH1XgxOFoBnVYJAjgeCBKIrYtBafWtWU=", "aarch64-linux": "sha256-ae6UH4K09lcl7UZzD/WKFxWUKEZQsLmizODs/RMKcis=", - "x86_64-darwin": "sha256-wxDWrT35CUIEQaKeIK0adr0oPfv6to60Z6R+8zrwhmU=", "x86_64-linux": "sha256-CxvOlq8nxeY5esRanl2N7oO4RFgBTwQcRdS7Pp/5tt8=" }, "web": { "aarch64-darwin": "sha256-T+LR7Yo2hEy24u3aS+ehp9nyRBB+3dNDyF6jw1oOd1o=", "aarch64-linux": "sha256-T+LR7Yo2hEy24u3aS+ehp9nyRBB+3dNDyF6jw1oOd1o=", - "x86_64-darwin": "sha256-T+LR7Yo2hEy24u3aS+ehp9nyRBB+3dNDyF6jw1oOd1o=", "x86_64-linux": "sha256-T+LR7Yo2hEy24u3aS+ehp9nyRBB+3dNDyF6jw1oOd1o=" }, "windows": { - "x86_64-darwin": "sha256-xTWgw8JE/4R9UcdZmLEbMk+yL2V3zfAIXDRli9XYe5k=", "x86_64-linux": "sha256-xTWgw8JE/4R9UcdZmLEbMk+yL2V3zfAIXDRli9XYe5k=" } }, diff --git a/pkgs/development/compilers/flutter/versions/3_38/data.json b/pkgs/development/compilers/flutter/versions/3_38/data.json index 88baf3ba0ece..0561fac74b8b 100644 --- a/pkgs/development/compilers/flutter/versions/3_38/data.json +++ b/pkgs/development/compilers/flutter/versions/3_38/data.json @@ -18,7 +18,6 @@ "dartHash": { "x86_64-linux": "sha256-Js8cesRAseVfa5CCQSmnJJVBYl+S7Zy7ax/vNbWMjQ0=", "aarch64-linux": "sha256-Ba7CCHPzor8H6ksrQUqDnx82i92OSE4qiihMaDKNexI=", - "x86_64-darwin": "sha256-btQavXZ3CVM0ByGlZJ5z2TUfXsPljY4iFeU1rgf4KQE=", "aarch64-darwin": "sha256-zmEK01ooqIKtVlw+7JlDAVvviFOcaqOrbGPkdirst6A=" }, "flutterHash": "sha256-dFVejSD3l2C6FM3/vimOId5Nklctv7ISO9uDhLTNf80=", @@ -26,47 +25,39 @@ "android": { "aarch64-darwin": "sha256-NFvkU3aDAmCAuO+ZrNaY5CJpPyioc6eB6cFZfziXEQU=", "aarch64-linux": "sha256-eHu5nWrxht1O6dP6LQ2UHNpPMNaRt/vL+cY2Okhtn0g=", - "x86_64-darwin": "sha256-NFvkU3aDAmCAuO+ZrNaY5CJpPyioc6eB6cFZfziXEQU=", "x86_64-linux": "sha256-eHu5nWrxht1O6dP6LQ2UHNpPMNaRt/vL+cY2Okhtn0g=" }, "fuchsia": { "aarch64-darwin": "sha256-DUlLvOGzLasLtZgndXew3l6w7VLDnrE5NqN3em1MVXE=", "aarch64-linux": "sha256-DUlLvOGzLasLtZgndXew3l6w7VLDnrE5NqN3em1MVXE=", - "x86_64-darwin": "sha256-DUlLvOGzLasLtZgndXew3l6w7VLDnrE5NqN3em1MVXE=", "x86_64-linux": "sha256-DUlLvOGzLasLtZgndXew3l6w7VLDnrE5NqN3em1MVXE=" }, "ios": { "aarch64-darwin": "sha256-+aKuaOXWEzDXWG2tMz7u3MLuiHSa3XyYHrfBGwRxUHI=", "aarch64-linux": "sha256-+aKuaOXWEzDXWG2tMz7u3MLuiHSa3XyYHrfBGwRxUHI=", - "x86_64-darwin": "sha256-+aKuaOXWEzDXWG2tMz7u3MLuiHSa3XyYHrfBGwRxUHI=", "x86_64-linux": "sha256-+aKuaOXWEzDXWG2tMz7u3MLuiHSa3XyYHrfBGwRxUHI=" }, "linux": { "aarch64-darwin": "sha256-IMa7QTMRYoWlJcI/SCO6aBtmKtIozQAcAgeQFWCFgb4=", "aarch64-linux": "sha256-IMa7QTMRYoWlJcI/SCO6aBtmKtIozQAcAgeQFWCFgb4=", - "x86_64-darwin": "sha256-nmLLXotJuHrFrpRMjdb/38l/rPRDiFvFf0BwfVvs9V8=", "x86_64-linux": "sha256-nmLLXotJuHrFrpRMjdb/38l/rPRDiFvFf0BwfVvs9V8=" }, "macos": { "aarch64-darwin": "sha256-p/ysd+1EOSaKmHRWYr/lYCo8H1oty4GC0Moaw+PC72A=", "aarch64-linux": "sha256-p/ysd+1EOSaKmHRWYr/lYCo8H1oty4GC0Moaw+PC72A=", - "x86_64-darwin": "sha256-p/ysd+1EOSaKmHRWYr/lYCo8H1oty4GC0Moaw+PC72A=", "x86_64-linux": "sha256-p/ysd+1EOSaKmHRWYr/lYCo8H1oty4GC0Moaw+PC72A=" }, "universal": { "aarch64-darwin": "sha256-viiNdnQKAaTO91yNwGrSwr5jT2Zm+38rLNCyb7N3faw=", "aarch64-linux": "sha256-u9qKNkrdxkIVP4+rn0vzDSY37twJ/TLV7nfX6IqRj+4=", - "x86_64-darwin": "sha256-ztUb0vhegvskVdXcIi6xQtfJdIZTCWQB8zfR0CTLD54=", "x86_64-linux": "sha256-Xlm/ds/m0nm2cAXszCxCCjMNDyyK4AcldrvnwYImxSE=" }, "web": { "aarch64-darwin": "sha256-CkFJ96IWOk3q+VjPzpieyp8IMiTaTKgnAQpyltHeMnw=", "aarch64-linux": "sha256-CkFJ96IWOk3q+VjPzpieyp8IMiTaTKgnAQpyltHeMnw=", - "x86_64-darwin": "sha256-CkFJ96IWOk3q+VjPzpieyp8IMiTaTKgnAQpyltHeMnw=", "x86_64-linux": "sha256-CkFJ96IWOk3q+VjPzpieyp8IMiTaTKgnAQpyltHeMnw=" }, "windows": { - "x86_64-darwin": "sha256-HId39NR+rbe1fqEssNb7gD6bvmeLj1N9UJYV8hxJFt0=", "x86_64-linux": "sha256-HId39NR+rbe1fqEssNb7gD6bvmeLj1N9UJYV8hxJFt0=" } }, diff --git a/pkgs/development/compilers/flutter/versions/3_41/data.json b/pkgs/development/compilers/flutter/versions/3_41/data.json index aa923e2bdb7d..8bc39d31b938 100644 --- a/pkgs/development/compilers/flutter/versions/3_41/data.json +++ b/pkgs/development/compilers/flutter/versions/3_41/data.json @@ -18,7 +18,6 @@ "dartHash": { "x86_64-linux": "sha256-V/OrWsJIgwYLH/ErzaxHLtdlY+xzZOiPim1B5PDbB18=", "aarch64-linux": "sha256-UOmrpY+HF5Q4VHeKcwdOY6gMQgVDVdNeJzKgzAgkovs=", - "x86_64-darwin": "sha256-lN5qGAScNUAm9UIkRrMRz8lrUdttMW7rfKRv8UwLiqo=", "aarch64-darwin": "sha256-P9A96zsMeJepiWw/Xz3aSp/mPEOxQ2Tuko7G2zSL4Kw=" }, "flutterHash": "sha256-9kvhawYRdHRYtFHrFYQkO4t8i1f9UKshn2TsUJwu+Sk=", @@ -26,47 +25,39 @@ "android": { "aarch64-darwin": "sha256-HHjCSLo/fFqOv0T+dg0wqrjZV9c+5DDkCQthgsa18rU=", "aarch64-linux": "sha256-9UqlUjsT0FksR9pxOPFnzLG3FQyRhCOhEzKm8fHuqN4=", - "x86_64-darwin": "sha256-HHjCSLo/fFqOv0T+dg0wqrjZV9c+5DDkCQthgsa18rU=", "x86_64-linux": "sha256-9UqlUjsT0FksR9pxOPFnzLG3FQyRhCOhEzKm8fHuqN4=" }, "fuchsia": { "aarch64-darwin": "sha256-A6zbYPXZ5hY+hsPAtB6xcw9ujfmwFz1+iT3Alq0hskw=", "aarch64-linux": "sha256-A6zbYPXZ5hY+hsPAtB6xcw9ujfmwFz1+iT3Alq0hskw=", - "x86_64-darwin": "sha256-A6zbYPXZ5hY+hsPAtB6xcw9ujfmwFz1+iT3Alq0hskw=", "x86_64-linux": "sha256-A6zbYPXZ5hY+hsPAtB6xcw9ujfmwFz1+iT3Alq0hskw=" }, "ios": { "aarch64-darwin": "sha256-jEmSOUft1qTmzyFynDeYDmJ/0TxKAJmqCW+/g3F8jdw=", "aarch64-linux": "sha256-jEmSOUft1qTmzyFynDeYDmJ/0TxKAJmqCW+/g3F8jdw=", - "x86_64-darwin": "sha256-jEmSOUft1qTmzyFynDeYDmJ/0TxKAJmqCW+/g3F8jdw=", "x86_64-linux": "sha256-jEmSOUft1qTmzyFynDeYDmJ/0TxKAJmqCW+/g3F8jdw=" }, "linux": { "aarch64-darwin": "sha256-/UwQlRd5vQvbP51kzNw/XrwyoPOmi+USRw9Sdx4aMUE=", "aarch64-linux": "sha256-/UwQlRd5vQvbP51kzNw/XrwyoPOmi+USRw9Sdx4aMUE=", - "x86_64-darwin": "sha256-6Vu3JczoFAY+mG4FXxDCE1caX3ngXwhDKpX4s5M5nOQ=", "x86_64-linux": "sha256-6Vu3JczoFAY+mG4FXxDCE1caX3ngXwhDKpX4s5M5nOQ=" }, "macos": { "aarch64-darwin": "sha256-NcMhaTMO4cR5aNYpvBM962WQMCQCpMU+v4V/bJ16xis=", "aarch64-linux": "sha256-NcMhaTMO4cR5aNYpvBM962WQMCQCpMU+v4V/bJ16xis=", - "x86_64-darwin": "sha256-NcMhaTMO4cR5aNYpvBM962WQMCQCpMU+v4V/bJ16xis=", "x86_64-linux": "sha256-NcMhaTMO4cR5aNYpvBM962WQMCQCpMU+v4V/bJ16xis=" }, "universal": { "aarch64-darwin": "sha256-H552p//yX1kKgZCSGcyUtNVXb7sGCyYA44957MxAdjc=", "aarch64-linux": "sha256-5um826or7cL13JdeE40P2FE8LKBz9M/2obDaLfNdBhM=", - "x86_64-darwin": "sha256-xph1PMLnB1b/VRSqAUtDZSR+j8CfXOZKGXnFQXfMDK8=", "x86_64-linux": "sha256-vcmcSU9EvMwV8joEB2LdwiUDe9pjSHb1c6bKpJ1P8KU=" }, "web": { "aarch64-darwin": "sha256-ePaEAMISdrnSCxXBJOaqYYJFzinfR66WxyV1kNiV3qE=", "aarch64-linux": "sha256-ePaEAMISdrnSCxXBJOaqYYJFzinfR66WxyV1kNiV3qE=", - "x86_64-darwin": "sha256-ePaEAMISdrnSCxXBJOaqYYJFzinfR66WxyV1kNiV3qE=", "x86_64-linux": "sha256-ePaEAMISdrnSCxXBJOaqYYJFzinfR66WxyV1kNiV3qE=" }, "windows": { - "x86_64-darwin": "sha256-PEV89ov1KC8CXIMupIm4Nk+pYn/WcMEq3xAPo0EQSUM=", "x86_64-linux": "sha256-PEV89ov1KC8CXIMupIm4Nk+pYn/WcMEq3xAPo0EQSUM=" } }, diff --git a/pkgs/development/compilers/flutter/versions/3_44/data.json b/pkgs/development/compilers/flutter/versions/3_44/data.json index 4ff30f347210..a8de805e4bb6 100644 --- a/pkgs/development/compilers/flutter/versions/3_44/data.json +++ b/pkgs/development/compilers/flutter/versions/3_44/data.json @@ -18,7 +18,6 @@ "dartHash": { "x86_64-linux": "sha256-KOR7RM8HXzZ3EEbAaLsNF0IBz5x2CHRK7RzCMgQpnC0=", "aarch64-linux": "sha256-+CyD7OfRaAR1UN/UpmTkBxrHxIi923LcQxAsItfgtRg=", - "x86_64-darwin": "sha256-OBmfVv4i8iNednmRkdW5UW42A2nGG2ukQROY1dWSC6s=", "aarch64-darwin": "sha256-zYdTko53trZlvXDc4OZLTsbS4v3hQdZAm7cWyKwfHAo=" }, "flutterHash": "sha256-ohtjU+COfEqruLp2/RhJ/8Ssbp5OgPR9ont1HvkXGCY=", @@ -26,49 +25,41 @@ "android": { "aarch64-darwin": "sha256-+CxZcjk4JpqDQPaj9ifo8tmlSz1x4vra/QO32k7h2Lc=", "aarch64-linux": "sha256-y15KG7BW6OTAqTMXzmKHGvZlKYiVyJ92SCuASzdTpPo=", - "x86_64-darwin": "sha256-+CxZcjk4JpqDQPaj9ifo8tmlSz1x4vra/QO32k7h2Lc=", "x86_64-linux": "sha256-y15KG7BW6OTAqTMXzmKHGvZlKYiVyJ92SCuASzdTpPo=" }, "fuchsia": { "aarch64-darwin": "sha256-uv1eRF5BbuBx7fq5CNCWfWV23SILtDL0DkFCRR1l2Q4=", "aarch64-linux": "sha256-uv1eRF5BbuBx7fq5CNCWfWV23SILtDL0DkFCRR1l2Q4=", - "x86_64-darwin": "sha256-uv1eRF5BbuBx7fq5CNCWfWV23SILtDL0DkFCRR1l2Q4=", "x86_64-linux": "sha256-uv1eRF5BbuBx7fq5CNCWfWV23SILtDL0DkFCRR1l2Q4=" }, "ios": { "aarch64-darwin": "sha256-o5u/JFgQalrOJtNcL3a1E2cZtgMuF/WReRC8p0iCWO0=", "aarch64-linux": "sha256-o5u/JFgQalrOJtNcL3a1E2cZtgMuF/WReRC8p0iCWO0=", - "x86_64-darwin": "sha256-o5u/JFgQalrOJtNcL3a1E2cZtgMuF/WReRC8p0iCWO0=", "x86_64-linux": "sha256-o5u/JFgQalrOJtNcL3a1E2cZtgMuF/WReRC8p0iCWO0=" }, "linux": { "aarch64-darwin": "sha256-lK50YsR5OtPSaQzo8nTbwAIY+45N4c+NQtZ6wvl0mR4=", "aarch64-linux": "sha256-lK50YsR5OtPSaQzo8nTbwAIY+45N4c+NQtZ6wvl0mR4=", - "x86_64-darwin": "sha256-fp9nlWsCoiFUNFoBm91fyIIcyfHWBNeZvip6IJOJlM8=", "x86_64-linux": "sha256-fp9nlWsCoiFUNFoBm91fyIIcyfHWBNeZvip6IJOJlM8=" }, "macos": { "aarch64-darwin": "sha256-hjQfPc0URfsOHY4Eo8WtSVa8B4TVG6a3O3Lvy+RriyM=", "aarch64-linux": "sha256-hjQfPc0URfsOHY4Eo8WtSVa8B4TVG6a3O3Lvy+RriyM=", - "x86_64-darwin": "sha256-hjQfPc0URfsOHY4Eo8WtSVa8B4TVG6a3O3Lvy+RriyM=", "x86_64-linux": "sha256-hjQfPc0URfsOHY4Eo8WtSVa8B4TVG6a3O3Lvy+RriyM=" }, "universal": { "aarch64-darwin": "sha256-EsVOhzp9lk5mKbGfatRR90mI+vBUy48xsOp0pCjniW0=", "aarch64-linux": "sha256-Gsr4wH4zFf3DJWACtUBWt5YwftXgFMf7wtaazLMm3tc=", - "x86_64-darwin": "sha256-UR3SU3IpKWrOEBOUNeUDvCl04ap0PpAG4XsGhG0mQfQ=", "x86_64-linux": "sha256-IyfIP4DGU7SnPKwcnkWr4ePY2YAXcDOxNsergKrwbx0=" }, "web": { "aarch64-darwin": "sha256-j8+RBHZakuXTks1najDti80ZQPtX+I2eiHylSRnT8gQ=", "aarch64-linux": "sha256-j8+RBHZakuXTks1najDti80ZQPtX+I2eiHylSRnT8gQ=", - "x86_64-darwin": "sha256-j8+RBHZakuXTks1najDti80ZQPtX+I2eiHylSRnT8gQ=", "x86_64-linux": "sha256-j8+RBHZakuXTks1najDti80ZQPtX+I2eiHylSRnT8gQ=" }, "windows": { "aarch64-darwin": "sha256-UGwi0jZNSkeRSxv5x//py236b6aUkvVDrATojt3eTR8=", "aarch64-linux": "sha256-UGwi0jZNSkeRSxv5x//py236b6aUkvVDrATojt3eTR8=", - "x86_64-darwin": "sha256-FdGT7vVxL2lSnaZ68chgJ379pdisIuM5FQOmysOCirY=", "x86_64-linux": "sha256-FdGT7vVxL2lSnaZ68chgJ379pdisIuM5FQOmysOCirY=" } }, diff --git a/pkgs/development/compilers/ghc/9.0.2-binary.nix b/pkgs/development/compilers/ghc/9.0.2-binary.nix index cc3eb43b8ac0..62ad743db4ca 100644 --- a/pkgs/development/compilers/ghc/9.0.2-binary.nix +++ b/pkgs/development/compilers/ghc/9.0.2-binary.nix @@ -116,29 +116,6 @@ let } ]; }; - x86_64-darwin = { - variantSuffix = ""; - src = { - url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; - sha256 = "e1fe990eb987f5c4b03e0396f9c228a10da71769c8a2bc8fadbc1d3b10a0f53a"; - }; - exePathForLibraryCheck = null; # we don't have a library check for darwin yet - archSpecificLibraries = [ - { - nixPackage = gmp; - fileToCheckFor = null; - } - { - nixPackage = ncurses6; - fileToCheckFor = null; - } - { - nixPackage = libiconv; - fileToCheckFor = null; - } - ]; - isHadrian = true; - }; aarch64-darwin = { variantSuffix = ""; src = { diff --git a/pkgs/development/compilers/ghc/9.8.4-binary.nix b/pkgs/development/compilers/ghc/9.8.4-binary.nix index 7c2c75a3795f..90f7d1f56170 100644 --- a/pkgs/development/compilers/ghc/9.8.4-binary.nix +++ b/pkgs/development/compilers/ghc/9.8.4-binary.nix @@ -102,28 +102,6 @@ let } ]; }; - x86_64-darwin = { - variantSuffix = ""; - src = { - url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; - sha256 = "de7baacfb1513ab0e4ccf8911045cceee84bc8a4e39b89bd975ed3135e5f7d96"; - }; - exePathForLibraryCheck = null; # we don't have a library check for darwin yet - archSpecificLibraries = [ - { - nixPackage = gmp; - fileToCheckFor = null; - } - { - nixPackage = ncurses6; - fileToCheckFor = null; - } - { - nixPackage = libiconv; - fileToCheckFor = null; - } - ]; - }; aarch64-darwin = { variantSuffix = ""; src = { diff --git a/pkgs/development/compilers/gnat-bootstrap/default.nix b/pkgs/development/compilers/gnat-bootstrap/default.nix index 6a07f0502832..1a710e765b2e 100644 --- a/pkgs/development/compilers/gnat-bootstrap/default.nix +++ b/pkgs/development/compilers/gnat-bootstrap/default.nix @@ -38,11 +38,6 @@ stdenv.mkDerivation ( alireRevision = "2"; } // { - x86_64-darwin = { - inherit url; - hash = "sha256-DNHcHTIi7pw0rsVtpyGTyLVElq3IoO2YX/OkDbdeQyo="; - upstreamTriplet = "x86_64-apple-darwin21.6.0"; - }; x86_64-linux = { inherit url; hash = "sha256-DC95udGSzRDE22ON4UpekxTYWOSBeUdJvILbSFj6MFQ="; @@ -60,11 +55,6 @@ stdenv.mkDerivation ( alireRevision = "1"; } // { - x86_64-darwin = { - inherit url; - hash = "sha256-3YOnvuI6Qq7huQcqgFSz/o+ZgY2wNkKDqHIuzNz1MVY="; - upstreamTriplet = "x86_64-apple-darwin21.6.0"; - }; x86_64-linux = { inherit url; hash = "sha256-pH3IuOpCM9sY/ppTYcxBmgpsUiMrisIjmAa/rmmZXb4="; @@ -87,11 +77,6 @@ stdenv.mkDerivation ( alireRevision = "1"; } // { - x86_64-darwin = { - inherit url; - hash = "sha256-VUEX89/ZXXxE0ks61unWoM0Oza6v4v3EwJs0vSDBwTQ="; - upstreamTriplet = "x86_64-apple-darwin24.6.0"; - }; x86_64-linux = { inherit url; hash = "sha256-8CDxqAQW7zskadfdzMjJqzPN8GZ2qu/7NWvcQLDis1s="; @@ -114,11 +99,6 @@ stdenv.mkDerivation ( alireRevision = "1"; } // { - x86_64-darwin = { - inherit url; - hash = "sha256-u/cYFKqWLTaFADTscDxnrkYSoemKrfKpNIZ8XPlTbLI="; - upstreamTriplet = "x86_64-apple-darwin24.6.0"; - }; x86_64-linux = { inherit url; hash = "sha256-5bKYPJnXDGa80BtAogLE82X0zTuYKdN2cKh503oMeic="; @@ -286,7 +266,6 @@ stdenv.mkDerivation ( ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ] ++ lib.optionals (lib.versionAtLeast majorVersion "14") [ diff --git a/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix b/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix index 68d54df3f6be..553206a50ba8 100644 --- a/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix +++ b/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix @@ -27,10 +27,6 @@ hash = "sha256-tvPaziTPGWDseQIW9MhvANT0PfZOTotUj2OC8EiUcT8="; url = "https://download.oracle.com/graalvm/17/archive/graalvm-jdk-17.0.12_linux-x64_bin.tar.gz"; }; - "x86_64-darwin" = { - hash = "sha256-PsrBRx8/qVpWxbdcZdueYKxFUfVu2gnrnaleYEnqd9c="; - url = "https://download.oracle.com/graalvm/17/archive/graalvm-jdk-17.0.12_macos-x64_bin.tar.gz"; - }; "aarch64-darwin" = { hash = "sha256-TN/cbJOV9nc+/NGRtmBfG3yOG3irkAq1z/NHIKP+/8U="; url = "https://download.oracle.com/graalvm/17/archive/graalvm-jdk-17.0.12_macos-aarch64_bin.tar.gz"; diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index f07dec30a6b9..0d3654f74bd9 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -27,7 +27,6 @@ in sha256 = { x86_64-linux = "1grpvdzkh4b6mfdn1khbs1nz1b7q61rkzfip3q2x4330fjqwcjgv"; aarch64-linux = "1cn62bmrgz344zsml80rqpmryp8hk6bdni3zhh43lpqf8a0aj11h"; - x86_64-darwin = "0jzk0kl1jvnav8ccarpwzfvyyzibfhrhfj72s3q17kzxwhpgbimx"; aarch64-darwin = "0nzh0zwjlagn4aglimyajmqv5m6qwdqz7lyjaszfxzyf1p0hcmxx"; }; }) { } @@ -38,7 +37,6 @@ in sha256 = { x86_64-linux = "0dfy4wlrz6jbs7kd9r0bjk9d6sqgf4fakrxrnzwfl1bsdlsn6qxk"; aarch64-linux = "0gk2zxkwz2yyg3im23jpgaxzixchyywm19nbh51szmniah31y1x2"; - x86_64-darwin = "14nz5qf9raida260srcmh7p41xdylipx5n61nbx9sf12vcyrrd7p"; aarch64-darwin = "1mrvycjlxs225sspdvvq4qbay1riyyjzqjs1d0xgqdkh6c6kv47d"; }; }) { } @@ -49,7 +47,6 @@ in sha256 = { x86_64-linux = "16h77px97qpzfcf5lfrj8kj8baq6fs07sxjasbdsj8cly6zg7axv"; aarch64-linux = "16a8gkaqzsxw5z8axdyp13qdlqxapg9q11csgxigs3xxayw976q2"; - x86_64-darwin = "0b34hb93pyqj4yfljy4krzf182dkwmlj6wkf4j5c7fnn0v3bfw0s"; aarch64-darwin = "0cbarn632dxn1x1zi68k31plimvrr4yizr5kcc4rvagdsbxq4z97"; }; }) { } diff --git a/pkgs/development/compilers/julia/generic-bin.nix b/pkgs/development/compilers/julia/generic-bin.nix index 8e9673ed6cec..26f1728ccce2 100644 --- a/pkgs/development/compilers/julia/generic-bin.nix +++ b/pkgs/development/compilers/julia/generic-bin.nix @@ -73,10 +73,6 @@ stdenv.mkDerivation { url = "https://julialang-s3.julialang.org/bin/linux/aarch64/${lib.versions.majorMinor version}/julia-${version}-linux-aarch64.tar.gz"; sha256 = sha256.aarch64-linux; }; - x86_64-darwin = fetchurl { - url = "https://julialang-s3.julialang.org/bin/mac/x64/${lib.versions.majorMinor version}/julia-${version}-mac64.tar.gz"; - sha256 = sha256.x86_64-darwin; - }; aarch64-darwin = fetchurl { url = "https://julialang-s3.julialang.org/bin/mac/aarch64/${lib.versions.majorMinor version}/julia-${version}-macaarch64.tar.gz"; sha256 = sha256.aarch64-darwin; @@ -151,7 +147,6 @@ stdenv.mkDerivation { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "julia"; diff --git a/pkgs/development/compilers/kotlin/native.nix b/pkgs/development/compilers/kotlin/native.nix index aeb98f646f58..ea5ea5368aec 100644 --- a/pkgs/development/compilers/kotlin/native.nix +++ b/pkgs/development/compilers/kotlin/native.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { getArch = { "aarch64-darwin" = "macos-aarch64"; - "x86_64-darwin" = "macos-x86_64"; "x86_64-linux" = "linux-x86_64"; } .${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); diff --git a/pkgs/development/compilers/llvm/21/llvm/sdag-freeze-condition-in-select-of-load-fold.patch b/pkgs/development/compilers/llvm/21/llvm/sdag-freeze-condition-in-select-of-load-fold.patch new file mode 100644 index 000000000000..e1c7c2789fa3 --- /dev/null +++ b/pkgs/development/compilers/llvm/21/llvm/sdag-freeze-condition-in-select-of-load-fold.patch @@ -0,0 +1,3975 @@ +diff --git a/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/lib/CodeGen/SelectionDAG/DAGCombiner.cpp +index 91fd2d843f..d5b3ad2797 100644 +--- a/lib/CodeGen/SelectionDAG/DAGCombiner.cpp ++++ b/lib/CodeGen/SelectionDAG/DAGCombiner.cpp +@@ -28487,10 +28487,12 @@ + SDNode::hasPredecessorHelper(RLD, Visited, Worklist))) + return false; + +- Addr = DAG.getSelect(SDLoc(TheSelect), +- LLD->getBasePtr().getValueType(), +- TheSelect->getOperand(0), LLD->getBasePtr(), +- RLD->getBasePtr()); ++ // If the condition is poison, originally this would result in a poison ++ // result. After the transform, this would result in a load of poison, ++ // which is UB. Freeze the condition to prevent this. ++ Addr = DAG.getSelect(SDLoc(TheSelect), LLD->getBasePtr().getValueType(), ++ DAG.getFreeze(TheSelect->getOperand(0)), ++ LLD->getBasePtr(), RLD->getBasePtr()); + } else { // Otherwise SELECT_CC + // We cannot do this optimization if any pair of {RLD, LLD} is a + // predecessor to {RLD, LLD, CondLHS, CondRHS}. As we've already compared +@@ -28509,10 +28511,10 @@ + SDNode::hasPredecessorHelper(RLD, Visited, Worklist))) + return false; + ++ SDValue FrozenOp0 = DAG.getFreeze(TheSelect->getOperand(0)); ++ SDValue FrozenOp1 = DAG.getFreeze(TheSelect->getOperand(1)); + Addr = DAG.getNode(ISD::SELECT_CC, SDLoc(TheSelect), +- LLD->getBasePtr().getValueType(), +- TheSelect->getOperand(0), +- TheSelect->getOperand(1), ++ LLD->getBasePtr().getValueType(), FrozenOp0, FrozenOp1, + LLD->getBasePtr(), RLD->getBasePtr(), + TheSelect->getOperand(4)); + } +diff --git a/test/CodeGen/AArch64/icmp.ll b/test/CodeGen/AArch64/icmp.ll +index 18665bcbea..ea6fff4a6d 100644 +--- a/test/CodeGen/AArch64/icmp.ll ++++ b/test/CodeGen/AArch64/icmp.ll +@@ -1379,26 +1379,22 @@ + define <2 x i128> @v2i128_i128(<2 x i128> %a, <2 x i128> %b, <2 x i128> %d, <2 x i128> %e) { + ; CHECK-SD-LABEL: v2i128_i128: + ; CHECK-SD: // %bb.0: // %entry ++; CHECK-SD-NEXT: cmp x2, x6 + ; CHECK-SD-NEXT: add x10, sp, #32 + ; CHECK-SD-NEXT: mov x11, sp ++; CHECK-SD-NEXT: sbcs xzr, x3, x7 ++; CHECK-SD-NEXT: cset w8, lt + ; CHECK-SD-NEXT: cmp x0, x4 +-; CHECK-SD-NEXT: orr x12, x10, #0x8 +-; CHECK-SD-NEXT: orr x13, x11, #0x8 + ; CHECK-SD-NEXT: sbcs xzr, x1, x5 ++; CHECK-SD-NEXT: cset w9, lt ++; CHECK-SD-NEXT: cmp w9, #0 ++; CHECK-SD-NEXT: csel x9, x11, x10, ne ++; CHECK-SD-NEXT: cmp w8, #0 + ; CHECK-SD-NEXT: add x8, sp, #48 +-; CHECK-SD-NEXT: add x9, sp, #16 +-; CHECK-SD-NEXT: csel x12, x13, x12, lt +-; CHECK-SD-NEXT: csel x10, x11, x10, lt +-; CHECK-SD-NEXT: cmp x2, x6 +-; CHECK-SD-NEXT: orr x11, x8, #0x8 +-; CHECK-SD-NEXT: orr x13, x9, #0x8 +-; CHECK-SD-NEXT: sbcs xzr, x3, x7 +-; CHECK-SD-NEXT: ldr x0, [x10] +-; CHECK-SD-NEXT: csel x8, x9, x8, lt +-; CHECK-SD-NEXT: csel x9, x13, x11, lt +-; CHECK-SD-NEXT: ldr x1, [x12] +-; CHECK-SD-NEXT: ldr x2, [x8] +-; CHECK-SD-NEXT: ldr x3, [x9] ++; CHECK-SD-NEXT: add x10, sp, #16 ++; CHECK-SD-NEXT: ldp x0, x1, [x9] ++; CHECK-SD-NEXT: csel x8, x10, x8, ne ++; CHECK-SD-NEXT: ldp x2, x3, [x8] + ; CHECK-SD-NEXT: ret + ; + ; CHECK-GI-LABEL: v2i128_i128: +diff --git a/test/CodeGen/ARM/fp16-promote.ll b/test/CodeGen/ARM/fp16-promote.ll +index 1bd0150880..7c2e738e49 100644 +--- a/test/CodeGen/ARM/fp16-promote.ll ++++ b/test/CodeGen/ARM/fp16-promote.ll +@@ -150,7 +150,7 @@ + ; No conversion is needed + define void @test_select(ptr %p, ptr %q, i1 zeroext %c) #0 { + ; CHECK-ALL-LABEL: test_select: +-; CHECK-ALL: cmp {{r[0-9]+}}, #0 ++; CHECK-ALL: tst {{r[0-9]+}}, #1 + ; CHECK-ALL: movne {{r[0-9]+}}, {{r[0-9]+}} + ; CHECK-ALL: ldrh {{r[0-9]+}}, [{{r[0-9]+}}] + ; CHECK-ALL: strh {{r[0-9]+}}, [{{r[0-9]+}}] +diff --git a/test/CodeGen/Mips/cconv/vector.ll b/test/CodeGen/Mips/cconv/vector.ll +index c64c60ddef..5cd2b77615 100644 +--- a/test/CodeGen/Mips/cconv/vector.ll ++++ b/test/CodeGen/Mips/cconv/vector.ll +@@ -6038,15 +6038,15 @@ + define <4 x float> @select(<4 x i32> %cond, <4 x float> %arg1, <4 x float> %arg2) { + ; MIPS32-LABEL: select: + ; MIPS32: # %bb.0: # %entry +-; MIPS32-NEXT: andi $1, $7, 1 +-; MIPS32-NEXT: lw $2, 16($sp) +-; MIPS32-NEXT: andi $2, $2, 1 ++; MIPS32-NEXT: lw $1, 16($sp) ++; MIPS32-NEXT: andi $2, $7, 1 ++; MIPS32-NEXT: andi $1, $1, 1 + ; MIPS32-NEXT: addiu $3, $sp, 44 + ; MIPS32-NEXT: addiu $5, $sp, 28 + ; MIPS32-NEXT: addiu $7, $sp, 48 + ; MIPS32-NEXT: addiu $8, $sp, 32 +-; MIPS32-NEXT: movn $7, $8, $2 +-; MIPS32-NEXT: movn $3, $5, $1 ++; MIPS32-NEXT: movn $7, $8, $1 ++; MIPS32-NEXT: movn $3, $5, $2 + ; MIPS32-NEXT: andi $1, $6, 1 + ; MIPS32-NEXT: addiu $2, $sp, 40 + ; MIPS32-NEXT: addiu $5, $sp, 24 +diff --git a/test/CodeGen/Mips/cmov.ll b/test/CodeGen/Mips/cmov.ll +index bb3c7c27a1..ee60b353b8 100644 +--- a/test/CodeGen/Mips/cmov.ll ++++ b/test/CodeGen/Mips/cmov.ll +@@ -65,7 +65,7 @@ + + ; 64-CMOV: daddiu $[[R1:[0-9]+]], ${{[0-9]+}}, %got_disp(d) + ; 64-CMOV: daddiu $[[R0:[0-9]+]], ${{[0-9]+}}, %got_disp(c) +-; 64-CMOV: movn $[[R1]], $[[R0]], $4 ++; 64-CMOV: movn $[[R1]], $[[R0]], $2 + + ; 64-CMP-DAG: daddiu $[[R1:[0-9]+]], ${{[0-9]+}}, %got_disp(d) + ; 64-CMP-DAG: daddiu $[[R0:[0-9]+]], ${{[0-9]+}}, %got_disp(c) +diff --git a/test/CodeGen/X86/cmovcmov.ll b/test/CodeGen/X86/cmovcmov.ll +index d2d1c4db46..2a69289291 100644 +--- a/test/CodeGen/X86/cmovcmov.ll ++++ b/test/CodeGen/X86/cmovcmov.ll +@@ -165,37 +165,40 @@ + ; NOCMOV-NEXT: fnstsw %ax + ; NOCMOV-NEXT: # kill: def $ah killed $ah killed $ax + ; NOCMOV-NEXT: sahf +-; NOCMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; NOCMOV-NEXT: jne .LBB4_3 +-; NOCMOV-NEXT: # %bb.1: # %entry +-; NOCMOV-NEXT: jp .LBB4_3 ++; NOCMOV-NEXT: setnp %al ++; NOCMOV-NEXT: sete %cl ++; NOCMOV-NEXT: andb %al, %cl ++; NOCMOV-NEXT: testb %cl, %cl ++; NOCMOV-NEXT: jne .LBB4_1 + ; NOCMOV-NEXT: # %bb.2: # %entry + ; NOCMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; NOCMOV-NEXT: .LBB4_3: # %entry ++; NOCMOV-NEXT: je .LBB4_5 ++; NOCMOV-NEXT: .LBB4_4: + ; NOCMOV-NEXT: leal {{[0-9]+}}(%esp), %edx +-; NOCMOV-NEXT: jne .LBB4_6 +-; NOCMOV-NEXT: # %bb.4: # %entry +-; NOCMOV-NEXT: jp .LBB4_6 +-; NOCMOV-NEXT: # %bb.5: # %entry ++; NOCMOV-NEXT: movl {{[0-9]+}}(%esp), %eax ++; NOCMOV-NEXT: je .LBB4_8 ++; NOCMOV-NEXT: .LBB4_7: ++; NOCMOV-NEXT: leal {{[0-9]+}}(%esp), %esi ++; NOCMOV-NEXT: jmp .LBB4_9 ++; NOCMOV-NEXT: .LBB4_1: ++; NOCMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx ++; NOCMOV-NEXT: jne .LBB4_4 ++; NOCMOV-NEXT: .LBB4_5: # %entry + ; NOCMOV-NEXT: leal {{[0-9]+}}(%esp), %edx +-; NOCMOV-NEXT: .LBB4_6: # %entry + ; NOCMOV-NEXT: movl {{[0-9]+}}(%esp), %eax +-; NOCMOV-NEXT: leal {{[0-9]+}}(%esp), %esi +-; NOCMOV-NEXT: jne .LBB4_9 +-; NOCMOV-NEXT: # %bb.7: # %entry +-; NOCMOV-NEXT: jp .LBB4_9 +-; NOCMOV-NEXT: # %bb.8: # %entry ++; NOCMOV-NEXT: jne .LBB4_7 ++; NOCMOV-NEXT: .LBB4_8: # %entry + ; NOCMOV-NEXT: leal {{[0-9]+}}(%esp), %esi + ; NOCMOV-NEXT: .LBB4_9: # %entry + ; NOCMOV-NEXT: movl (%ecx), %ecx + ; NOCMOV-NEXT: movl (%edx), %edx + ; NOCMOV-NEXT: movl (%esi), %esi +-; NOCMOV-NEXT: leal {{[0-9]+}}(%esp), %edi +-; NOCMOV-NEXT: jne .LBB4_12 +-; NOCMOV-NEXT: # %bb.10: # %entry +-; NOCMOV-NEXT: jp .LBB4_12 ++; NOCMOV-NEXT: jne .LBB4_10 + ; NOCMOV-NEXT: # %bb.11: # %entry + ; NOCMOV-NEXT: leal {{[0-9]+}}(%esp), %edi ++; NOCMOV-NEXT: jmp .LBB4_12 ++; NOCMOV-NEXT: .LBB4_10: ++; NOCMOV-NEXT: leal {{[0-9]+}}(%esp), %edi + ; NOCMOV-NEXT: .LBB4_12: # %entry + ; NOCMOV-NEXT: movl (%edi), %edi + ; NOCMOV-NEXT: movl %edi, 12(%eax) +diff --git a/test/CodeGen/X86/fp-strict-scalar-cmp-fp16.ll b/test/CodeGen/X86/fp-strict-scalar-cmp-fp16.ll +index 6a6b86e8ef..1c06160584 100644 +--- a/test/CodeGen/X86/fp-strict-scalar-cmp-fp16.ll ++++ b/test/CodeGen/X86/fp-strict-scalar-cmp-fp16.ll +@@ -49,10 +49,13 @@ + ; X86-FP16: # %bb.0: + ; X86-FP16-NEXT: vmovsh {{.*#+}} xmm0 = mem[0],zero,zero,zero,zero,zero,zero,zero + ; X86-FP16-NEXT: vucomish {{[0-9]+}}(%esp), %xmm0 ++; X86-FP16-NEXT: setnp %al ++; X86-FP16-NEXT: sete %cl ++; X86-FP16-NEXT: andb %al, %cl ++; X86-FP16-NEXT: testb $1, %cl + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; X86-FP16-NEXT: cmovnel %eax, %ecx +-; X86-FP16-NEXT: cmovpl %eax, %ecx + ; X86-FP16-NEXT: movl (%ecx), %eax + ; X86-FP16-NEXT: retl + ; +@@ -112,9 +115,11 @@ + ; X86-FP16: # %bb.0: + ; X86-FP16-NEXT: vmovsh {{.*#+}} xmm0 = mem[0],zero,zero,zero,zero,zero,zero,zero + ; X86-FP16-NEXT: vucomish {{[0-9]+}}(%esp), %xmm0 ++; X86-FP16-NEXT: seta %al ++; X86-FP16-NEXT: testb $1, %al + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X86-FP16-NEXT: cmoval %eax, %ecx ++; X86-FP16-NEXT: cmovnel %eax, %ecx + ; X86-FP16-NEXT: movl (%ecx), %eax + ; X86-FP16-NEXT: retl + ; +@@ -173,9 +178,11 @@ + ; X86-FP16: # %bb.0: + ; X86-FP16-NEXT: vmovsh {{.*#+}} xmm0 = mem[0],zero,zero,zero,zero,zero,zero,zero + ; X86-FP16-NEXT: vucomish {{[0-9]+}}(%esp), %xmm0 ++; X86-FP16-NEXT: setae %al ++; X86-FP16-NEXT: testb $1, %al + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X86-FP16-NEXT: cmovael %eax, %ecx ++; X86-FP16-NEXT: cmovnel %eax, %ecx + ; X86-FP16-NEXT: movl (%ecx), %eax + ; X86-FP16-NEXT: retl + ; +@@ -236,9 +243,11 @@ + ; X86-FP16: # %bb.0: + ; X86-FP16-NEXT: vmovsh {{.*#+}} xmm0 = mem[0],zero,zero,zero,zero,zero,zero,zero + ; X86-FP16-NEXT: vucomish {{[0-9]+}}(%esp), %xmm0 ++; X86-FP16-NEXT: seta %al ++; X86-FP16-NEXT: testb $1, %al + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X86-FP16-NEXT: cmoval %eax, %ecx ++; X86-FP16-NEXT: cmovnel %eax, %ecx + ; X86-FP16-NEXT: movl (%ecx), %eax + ; X86-FP16-NEXT: retl + ; +@@ -299,9 +308,11 @@ + ; X86-FP16: # %bb.0: + ; X86-FP16-NEXT: vmovsh {{.*#+}} xmm0 = mem[0],zero,zero,zero,zero,zero,zero,zero + ; X86-FP16-NEXT: vucomish {{[0-9]+}}(%esp), %xmm0 ++; X86-FP16-NEXT: setae %al ++; X86-FP16-NEXT: testb $1, %al + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X86-FP16-NEXT: cmovael %eax, %ecx ++; X86-FP16-NEXT: cmovnel %eax, %ecx + ; X86-FP16-NEXT: movl (%ecx), %eax + ; X86-FP16-NEXT: retl + ; +@@ -360,6 +371,8 @@ + ; X86-FP16: # %bb.0: + ; X86-FP16-NEXT: vmovsh {{.*#+}} xmm0 = mem[0],zero,zero,zero,zero,zero,zero,zero + ; X86-FP16-NEXT: vucomish {{[0-9]+}}(%esp), %xmm0 ++; X86-FP16-NEXT: setne %al ++; X86-FP16-NEXT: testb $1, %al + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; X86-FP16-NEXT: cmovnel %eax, %ecx +@@ -421,9 +434,11 @@ + ; X86-FP16: # %bb.0: + ; X86-FP16-NEXT: vmovsh {{.*#+}} xmm0 = mem[0],zero,zero,zero,zero,zero,zero,zero + ; X86-FP16-NEXT: vucomish {{[0-9]+}}(%esp), %xmm0 ++; X86-FP16-NEXT: setnp %al ++; X86-FP16-NEXT: testb $1, %al + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X86-FP16-NEXT: cmovnpl %eax, %ecx ++; X86-FP16-NEXT: cmovnel %eax, %ecx + ; X86-FP16-NEXT: movl (%ecx), %eax + ; X86-FP16-NEXT: retl + ; +@@ -482,9 +497,11 @@ + ; X86-FP16: # %bb.0: + ; X86-FP16-NEXT: vmovsh {{.*#+}} xmm0 = mem[0],zero,zero,zero,zero,zero,zero,zero + ; X86-FP16-NEXT: vucomish {{[0-9]+}}(%esp), %xmm0 ++; X86-FP16-NEXT: sete %al ++; X86-FP16-NEXT: testb $1, %al + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X86-FP16-NEXT: cmovel %eax, %ecx ++; X86-FP16-NEXT: cmovnel %eax, %ecx + ; X86-FP16-NEXT: movl (%ecx), %eax + ; X86-FP16-NEXT: retl + ; +@@ -545,9 +562,11 @@ + ; X86-FP16: # %bb.0: + ; X86-FP16-NEXT: vmovsh {{.*#+}} xmm0 = mem[0],zero,zero,zero,zero,zero,zero,zero + ; X86-FP16-NEXT: vucomish {{[0-9]+}}(%esp), %xmm0 ++; X86-FP16-NEXT: setb %al ++; X86-FP16-NEXT: testb $1, %al + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X86-FP16-NEXT: cmovbl %eax, %ecx ++; X86-FP16-NEXT: cmovnel %eax, %ecx + ; X86-FP16-NEXT: movl (%ecx), %eax + ; X86-FP16-NEXT: retl + ; +@@ -608,9 +627,11 @@ + ; X86-FP16: # %bb.0: + ; X86-FP16-NEXT: vmovsh {{.*#+}} xmm0 = mem[0],zero,zero,zero,zero,zero,zero,zero + ; X86-FP16-NEXT: vucomish {{[0-9]+}}(%esp), %xmm0 ++; X86-FP16-NEXT: setbe %al ++; X86-FP16-NEXT: testb $1, %al + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X86-FP16-NEXT: cmovbel %eax, %ecx ++; X86-FP16-NEXT: cmovnel %eax, %ecx + ; X86-FP16-NEXT: movl (%ecx), %eax + ; X86-FP16-NEXT: retl + ; +@@ -669,9 +690,11 @@ + ; X86-FP16: # %bb.0: + ; X86-FP16-NEXT: vmovsh {{.*#+}} xmm0 = mem[0],zero,zero,zero,zero,zero,zero,zero + ; X86-FP16-NEXT: vucomish {{[0-9]+}}(%esp), %xmm0 ++; X86-FP16-NEXT: setb %al ++; X86-FP16-NEXT: testb $1, %al + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X86-FP16-NEXT: cmovbl %eax, %ecx ++; X86-FP16-NEXT: cmovnel %eax, %ecx + ; X86-FP16-NEXT: movl (%ecx), %eax + ; X86-FP16-NEXT: retl + ; +@@ -730,9 +753,11 @@ + ; X86-FP16: # %bb.0: + ; X86-FP16-NEXT: vmovsh {{.*#+}} xmm0 = mem[0],zero,zero,zero,zero,zero,zero,zero + ; X86-FP16-NEXT: vucomish {{[0-9]+}}(%esp), %xmm0 ++; X86-FP16-NEXT: setbe %al ++; X86-FP16-NEXT: testb $1, %al + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X86-FP16-NEXT: cmovbel %eax, %ecx ++; X86-FP16-NEXT: cmovnel %eax, %ecx + ; X86-FP16-NEXT: movl (%ecx), %eax + ; X86-FP16-NEXT: retl + ; +@@ -793,10 +818,13 @@ + ; X86-FP16: # %bb.0: + ; X86-FP16-NEXT: vmovsh {{.*#+}} xmm0 = mem[0],zero,zero,zero,zero,zero,zero,zero + ; X86-FP16-NEXT: vucomish {{[0-9]+}}(%esp), %xmm0 ++; X86-FP16-NEXT: setp %al ++; X86-FP16-NEXT: setne %cl ++; X86-FP16-NEXT: orb %al, %cl ++; X86-FP16-NEXT: testb $1, %cl + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; X86-FP16-NEXT: cmovnel %eax, %ecx +-; X86-FP16-NEXT: cmovpl %eax, %ecx + ; X86-FP16-NEXT: movl (%ecx), %eax + ; X86-FP16-NEXT: retl + ; +@@ -856,9 +884,11 @@ + ; X86-FP16: # %bb.0: + ; X86-FP16-NEXT: vmovsh {{.*#+}} xmm0 = mem[0],zero,zero,zero,zero,zero,zero,zero + ; X86-FP16-NEXT: vucomish {{[0-9]+}}(%esp), %xmm0 ++; X86-FP16-NEXT: setp %al ++; X86-FP16-NEXT: testb $1, %al + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X86-FP16-NEXT: cmovpl %eax, %ecx ++; X86-FP16-NEXT: cmovnel %eax, %ecx + ; X86-FP16-NEXT: movl (%ecx), %eax + ; X86-FP16-NEXT: retl + ; +@@ -919,10 +949,13 @@ + ; X86-FP16: # %bb.0: + ; X86-FP16-NEXT: vmovsh {{.*#+}} xmm0 = mem[0],zero,zero,zero,zero,zero,zero,zero + ; X86-FP16-NEXT: vcomish {{[0-9]+}}(%esp), %xmm0 ++; X86-FP16-NEXT: setnp %al ++; X86-FP16-NEXT: sete %cl ++; X86-FP16-NEXT: andb %al, %cl ++; X86-FP16-NEXT: testb $1, %cl + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; X86-FP16-NEXT: cmovnel %eax, %ecx +-; X86-FP16-NEXT: cmovpl %eax, %ecx + ; X86-FP16-NEXT: movl (%ecx), %eax + ; X86-FP16-NEXT: retl + ; +@@ -982,9 +1015,11 @@ + ; X86-FP16: # %bb.0: + ; X86-FP16-NEXT: vmovsh {{.*#+}} xmm0 = mem[0],zero,zero,zero,zero,zero,zero,zero + ; X86-FP16-NEXT: vcomish {{[0-9]+}}(%esp), %xmm0 ++; X86-FP16-NEXT: seta %al ++; X86-FP16-NEXT: testb $1, %al + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X86-FP16-NEXT: cmoval %eax, %ecx ++; X86-FP16-NEXT: cmovnel %eax, %ecx + ; X86-FP16-NEXT: movl (%ecx), %eax + ; X86-FP16-NEXT: retl + ; +@@ -1043,9 +1078,11 @@ + ; X86-FP16: # %bb.0: + ; X86-FP16-NEXT: vmovsh {{.*#+}} xmm0 = mem[0],zero,zero,zero,zero,zero,zero,zero + ; X86-FP16-NEXT: vcomish {{[0-9]+}}(%esp), %xmm0 ++; X86-FP16-NEXT: setae %al ++; X86-FP16-NEXT: testb $1, %al + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X86-FP16-NEXT: cmovael %eax, %ecx ++; X86-FP16-NEXT: cmovnel %eax, %ecx + ; X86-FP16-NEXT: movl (%ecx), %eax + ; X86-FP16-NEXT: retl + ; +@@ -1106,9 +1143,11 @@ + ; X86-FP16: # %bb.0: + ; X86-FP16-NEXT: vmovsh {{.*#+}} xmm0 = mem[0],zero,zero,zero,zero,zero,zero,zero + ; X86-FP16-NEXT: vcomish {{[0-9]+}}(%esp), %xmm0 ++; X86-FP16-NEXT: seta %al ++; X86-FP16-NEXT: testb $1, %al + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X86-FP16-NEXT: cmoval %eax, %ecx ++; X86-FP16-NEXT: cmovnel %eax, %ecx + ; X86-FP16-NEXT: movl (%ecx), %eax + ; X86-FP16-NEXT: retl + ; +@@ -1169,9 +1208,11 @@ + ; X86-FP16: # %bb.0: + ; X86-FP16-NEXT: vmovsh {{.*#+}} xmm0 = mem[0],zero,zero,zero,zero,zero,zero,zero + ; X86-FP16-NEXT: vcomish {{[0-9]+}}(%esp), %xmm0 ++; X86-FP16-NEXT: setae %al ++; X86-FP16-NEXT: testb $1, %al + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X86-FP16-NEXT: cmovael %eax, %ecx ++; X86-FP16-NEXT: cmovnel %eax, %ecx + ; X86-FP16-NEXT: movl (%ecx), %eax + ; X86-FP16-NEXT: retl + ; +@@ -1230,6 +1271,8 @@ + ; X86-FP16: # %bb.0: + ; X86-FP16-NEXT: vmovsh {{.*#+}} xmm0 = mem[0],zero,zero,zero,zero,zero,zero,zero + ; X86-FP16-NEXT: vcomish {{[0-9]+}}(%esp), %xmm0 ++; X86-FP16-NEXT: setne %al ++; X86-FP16-NEXT: testb $1, %al + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; X86-FP16-NEXT: cmovnel %eax, %ecx +@@ -1291,9 +1334,11 @@ + ; X86-FP16: # %bb.0: + ; X86-FP16-NEXT: vmovsh {{.*#+}} xmm0 = mem[0],zero,zero,zero,zero,zero,zero,zero + ; X86-FP16-NEXT: vcomish {{[0-9]+}}(%esp), %xmm0 ++; X86-FP16-NEXT: setnp %al ++; X86-FP16-NEXT: testb $1, %al + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X86-FP16-NEXT: cmovnpl %eax, %ecx ++; X86-FP16-NEXT: cmovnel %eax, %ecx + ; X86-FP16-NEXT: movl (%ecx), %eax + ; X86-FP16-NEXT: retl + ; +@@ -1352,9 +1397,11 @@ + ; X86-FP16: # %bb.0: + ; X86-FP16-NEXT: vmovsh {{.*#+}} xmm0 = mem[0],zero,zero,zero,zero,zero,zero,zero + ; X86-FP16-NEXT: vcomish {{[0-9]+}}(%esp), %xmm0 ++; X86-FP16-NEXT: sete %al ++; X86-FP16-NEXT: testb $1, %al + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X86-FP16-NEXT: cmovel %eax, %ecx ++; X86-FP16-NEXT: cmovnel %eax, %ecx + ; X86-FP16-NEXT: movl (%ecx), %eax + ; X86-FP16-NEXT: retl + ; +@@ -1415,9 +1462,11 @@ + ; X86-FP16: # %bb.0: + ; X86-FP16-NEXT: vmovsh {{.*#+}} xmm0 = mem[0],zero,zero,zero,zero,zero,zero,zero + ; X86-FP16-NEXT: vcomish {{[0-9]+}}(%esp), %xmm0 ++; X86-FP16-NEXT: setb %al ++; X86-FP16-NEXT: testb $1, %al + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X86-FP16-NEXT: cmovbl %eax, %ecx ++; X86-FP16-NEXT: cmovnel %eax, %ecx + ; X86-FP16-NEXT: movl (%ecx), %eax + ; X86-FP16-NEXT: retl + ; +@@ -1478,9 +1527,11 @@ + ; X86-FP16: # %bb.0: + ; X86-FP16-NEXT: vmovsh {{.*#+}} xmm0 = mem[0],zero,zero,zero,zero,zero,zero,zero + ; X86-FP16-NEXT: vcomish {{[0-9]+}}(%esp), %xmm0 ++; X86-FP16-NEXT: setbe %al ++; X86-FP16-NEXT: testb $1, %al + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X86-FP16-NEXT: cmovbel %eax, %ecx ++; X86-FP16-NEXT: cmovnel %eax, %ecx + ; X86-FP16-NEXT: movl (%ecx), %eax + ; X86-FP16-NEXT: retl + ; +@@ -1539,9 +1590,11 @@ + ; X86-FP16: # %bb.0: + ; X86-FP16-NEXT: vmovsh {{.*#+}} xmm0 = mem[0],zero,zero,zero,zero,zero,zero,zero + ; X86-FP16-NEXT: vcomish {{[0-9]+}}(%esp), %xmm0 ++; X86-FP16-NEXT: setb %al ++; X86-FP16-NEXT: testb $1, %al + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X86-FP16-NEXT: cmovbl %eax, %ecx ++; X86-FP16-NEXT: cmovnel %eax, %ecx + ; X86-FP16-NEXT: movl (%ecx), %eax + ; X86-FP16-NEXT: retl + ; +@@ -1600,9 +1653,11 @@ + ; X86-FP16: # %bb.0: + ; X86-FP16-NEXT: vmovsh {{.*#+}} xmm0 = mem[0],zero,zero,zero,zero,zero,zero,zero + ; X86-FP16-NEXT: vcomish {{[0-9]+}}(%esp), %xmm0 ++; X86-FP16-NEXT: setbe %al ++; X86-FP16-NEXT: testb $1, %al + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X86-FP16-NEXT: cmovbel %eax, %ecx ++; X86-FP16-NEXT: cmovnel %eax, %ecx + ; X86-FP16-NEXT: movl (%ecx), %eax + ; X86-FP16-NEXT: retl + ; +@@ -1663,10 +1718,13 @@ + ; X86-FP16: # %bb.0: + ; X86-FP16-NEXT: vmovsh {{.*#+}} xmm0 = mem[0],zero,zero,zero,zero,zero,zero,zero + ; X86-FP16-NEXT: vcomish {{[0-9]+}}(%esp), %xmm0 ++; X86-FP16-NEXT: setp %al ++; X86-FP16-NEXT: setne %cl ++; X86-FP16-NEXT: orb %al, %cl ++; X86-FP16-NEXT: testb $1, %cl + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; X86-FP16-NEXT: cmovnel %eax, %ecx +-; X86-FP16-NEXT: cmovpl %eax, %ecx + ; X86-FP16-NEXT: movl (%ecx), %eax + ; X86-FP16-NEXT: retl + ; +@@ -1726,9 +1784,11 @@ + ; X86-FP16: # %bb.0: + ; X86-FP16-NEXT: vmovsh {{.*#+}} xmm0 = mem[0],zero,zero,zero,zero,zero,zero,zero + ; X86-FP16-NEXT: vcomish {{[0-9]+}}(%esp), %xmm0 ++; X86-FP16-NEXT: setp %al ++; X86-FP16-NEXT: testb $1, %al + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-FP16-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X86-FP16-NEXT: cmovpl %eax, %ecx ++; X86-FP16-NEXT: cmovnel %eax, %ecx + ; X86-FP16-NEXT: movl (%ecx), %eax + ; X86-FP16-NEXT: retl + ; +diff --git a/test/CodeGen/X86/fp-strict-scalar-cmp.ll b/test/CodeGen/X86/fp-strict-scalar-cmp.ll +index e3e2b6225a..b9823fd564 100644 +--- a/test/CodeGen/X86/fp-strict-scalar-cmp.ll ++++ b/test/CodeGen/X86/fp-strict-scalar-cmp.ll +@@ -13,10 +13,13 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; SSE-32-NEXT: ucomiss {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setnp %al ++; SSE-32-NEXT: sete %cl ++; SSE-32-NEXT: andb %al, %cl ++; SSE-32-NEXT: testb $1, %cl + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; SSE-32-NEXT: cmovnel %eax, %ecx +-; SSE-32-NEXT: cmovpl %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -32,10 +35,13 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; AVX-32-NEXT: vucomiss {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setnp %al ++; AVX-32-NEXT: sete %cl ++; AVX-32-NEXT: andb %al, %cl ++; AVX-32-NEXT: testb $1, %cl + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; AVX-32-NEXT: cmovnel %eax, %ecx +-; AVX-32-NEXT: cmovpl %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -56,13 +62,17 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: leal {{[0-9]+}}(%esp), %eax +-; X87-NEXT: jne .LBB0_3 +-; X87-NEXT: # %bb.1: +-; X87-NEXT: jp .LBB0_3 ++; X87-NEXT: setnp %al ++; X87-NEXT: sete %cl ++; X87-NEXT: andb %al, %cl ++; X87-NEXT: testb $1, %cl ++; X87-NEXT: jne .LBB0_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax +-; X87-NEXT: .LBB0_3: ++; X87-NEXT: movl (%eax), %eax ++; X87-NEXT: retl ++; X87-NEXT: .LBB0_1: ++; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax + ; X87-NEXT: retl + ; +@@ -73,10 +83,13 @@ + ; X87-CMOV-NEXT: fucompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setnp %al ++; X87-CMOV-NEXT: sete %cl ++; X87-CMOV-NEXT: andb %al, %cl ++; X87-CMOV-NEXT: testb $1, %cl + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; X87-CMOV-NEXT: cmovnel %eax, %ecx +-; X87-CMOV-NEXT: cmovpl %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmp.f32( +@@ -91,9 +104,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; SSE-32-NEXT: ucomiss {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: seta %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmoval %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -108,9 +123,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; AVX-32-NEXT: vucomiss {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: seta %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmoval %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -130,7 +147,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: ja .LBB1_1 ++; X87-NEXT: seta %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB1_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -147,9 +166,11 @@ + ; X87-CMOV-NEXT: fucompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: seta %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmoval %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmp.f32( +@@ -164,9 +185,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; SSE-32-NEXT: ucomiss {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setae %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovael %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -181,9 +204,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; AVX-32-NEXT: vucomiss {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setae %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovael %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -203,7 +228,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: jae .LBB2_1 ++; X87-NEXT: setae %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB2_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -220,9 +247,11 @@ + ; X87-CMOV-NEXT: fucompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setae %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovael %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmp.f32( +@@ -237,9 +266,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; SSE-32-NEXT: ucomiss {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: seta %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmoval %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -254,9 +285,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; AVX-32-NEXT: vucomiss {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: seta %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmoval %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -276,7 +309,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: ja .LBB3_1 ++; X87-NEXT: seta %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB3_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -293,9 +328,11 @@ + ; X87-CMOV-NEXT: fucompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: seta %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmoval %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmp.f32( +@@ -310,9 +347,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; SSE-32-NEXT: ucomiss {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setae %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovael %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -327,9 +366,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; AVX-32-NEXT: vucomiss {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setae %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovael %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -349,7 +390,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: jae .LBB4_1 ++; X87-NEXT: setae %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB4_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -366,9 +409,11 @@ + ; X87-CMOV-NEXT: fucompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setae %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovael %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmp.f32( +@@ -383,6 +428,8 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; SSE-32-NEXT: ucomiss {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setne %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; SSE-32-NEXT: cmovnel %eax, %ecx +@@ -400,6 +447,8 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; AVX-32-NEXT: vucomiss {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setne %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; AVX-32-NEXT: cmovnel %eax, %ecx +@@ -422,6 +471,8 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf ++; X87-NEXT: setne %al ++; X87-NEXT: testb $1, %al + ; X87-NEXT: jne .LBB5_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax +@@ -439,6 +490,8 @@ + ; X87-CMOV-NEXT: fucompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setne %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; X87-CMOV-NEXT: cmovnel %eax, %ecx +@@ -456,9 +509,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; SSE-32-NEXT: ucomiss {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setnp %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovnpl %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -473,9 +528,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; AVX-32-NEXT: vucomiss {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setnp %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovnpl %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -495,7 +552,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: jnp .LBB6_1 ++; X87-NEXT: setnp %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB6_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -512,9 +571,11 @@ + ; X87-CMOV-NEXT: fucompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setnp %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovnpl %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmp.f32( +@@ -529,9 +590,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; SSE-32-NEXT: ucomiss {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: sete %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovel %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -546,9 +609,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; AVX-32-NEXT: vucomiss {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: sete %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovel %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -568,7 +633,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: je .LBB7_1 ++; X87-NEXT: sete %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB7_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -585,9 +652,11 @@ + ; X87-CMOV-NEXT: fucompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: sete %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovel %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmp.f32( +@@ -602,9 +671,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; SSE-32-NEXT: ucomiss {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setb %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovbl %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -619,9 +690,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; AVX-32-NEXT: vucomiss {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setb %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovbl %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -641,7 +714,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: jb .LBB8_1 ++; X87-NEXT: setb %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB8_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -658,9 +733,11 @@ + ; X87-CMOV-NEXT: fucompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setb %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovbl %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmp.f32( +@@ -675,9 +752,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; SSE-32-NEXT: ucomiss {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setbe %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovbel %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -692,9 +771,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; AVX-32-NEXT: vucomiss {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setbe %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovbel %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -714,7 +795,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: jbe .LBB9_1 ++; X87-NEXT: setbe %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB9_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -731,9 +814,11 @@ + ; X87-CMOV-NEXT: fucompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setbe %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovbel %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmp.f32( +@@ -748,9 +833,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; SSE-32-NEXT: ucomiss {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setb %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovbl %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -765,9 +852,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; AVX-32-NEXT: vucomiss {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setb %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovbl %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -787,7 +876,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: jb .LBB10_1 ++; X87-NEXT: setb %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB10_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -804,9 +895,11 @@ + ; X87-CMOV-NEXT: fucompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setb %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovbl %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmp.f32( +@@ -821,9 +914,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; SSE-32-NEXT: ucomiss {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setbe %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovbel %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -838,9 +933,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; AVX-32-NEXT: vucomiss {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setbe %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovbel %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -860,7 +957,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: jbe .LBB11_1 ++; X87-NEXT: setbe %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB11_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -877,9 +976,11 @@ + ; X87-CMOV-NEXT: fucompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setbe %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovbel %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmp.f32( +@@ -894,10 +995,13 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; SSE-32-NEXT: ucomiss {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setp %al ++; SSE-32-NEXT: setne %cl ++; SSE-32-NEXT: orb %al, %cl ++; SSE-32-NEXT: testb $1, %cl + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; SSE-32-NEXT: cmovnel %eax, %ecx +-; SSE-32-NEXT: cmovpl %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -913,10 +1017,13 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; AVX-32-NEXT: vucomiss {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setp %al ++; AVX-32-NEXT: setne %cl ++; AVX-32-NEXT: orb %al, %cl ++; AVX-32-NEXT: testb $1, %cl + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; AVX-32-NEXT: cmovnel %eax, %ecx +-; AVX-32-NEXT: cmovpl %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -937,13 +1044,17 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: leal {{[0-9]+}}(%esp), %eax +-; X87-NEXT: jne .LBB12_3 +-; X87-NEXT: # %bb.1: +-; X87-NEXT: jp .LBB12_3 ++; X87-NEXT: setp %al ++; X87-NEXT: setne %cl ++; X87-NEXT: orb %al, %cl ++; X87-NEXT: testb $1, %cl ++; X87-NEXT: jne .LBB12_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax +-; X87-NEXT: .LBB12_3: ++; X87-NEXT: movl (%eax), %eax ++; X87-NEXT: retl ++; X87-NEXT: .LBB12_1: ++; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax + ; X87-NEXT: retl + ; +@@ -954,10 +1065,13 @@ + ; X87-CMOV-NEXT: fucompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setp %al ++; X87-CMOV-NEXT: setne %cl ++; X87-CMOV-NEXT: orb %al, %cl ++; X87-CMOV-NEXT: testb $1, %cl + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; X87-CMOV-NEXT: cmovnel %eax, %ecx +-; X87-CMOV-NEXT: cmovpl %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmp.f32( +@@ -972,9 +1086,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; SSE-32-NEXT: ucomiss {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setp %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovpl %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -989,9 +1105,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; AVX-32-NEXT: vucomiss {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setp %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovpl %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -1011,7 +1129,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: jp .LBB13_1 ++; X87-NEXT: setp %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB13_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -1028,9 +1148,11 @@ + ; X87-CMOV-NEXT: fucompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setp %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovpl %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmp.f32( +@@ -1045,10 +1167,13 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movsd {{.*#+}} xmm0 = mem[0],zero + ; SSE-32-NEXT: ucomisd {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setnp %al ++; SSE-32-NEXT: sete %cl ++; SSE-32-NEXT: andb %al, %cl ++; SSE-32-NEXT: testb $1, %cl + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; SSE-32-NEXT: cmovnel %eax, %ecx +-; SSE-32-NEXT: cmovpl %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -1064,10 +1189,13 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovsd {{.*#+}} xmm0 = mem[0],zero + ; AVX-32-NEXT: vucomisd {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setnp %al ++; AVX-32-NEXT: sete %cl ++; AVX-32-NEXT: andb %al, %cl ++; AVX-32-NEXT: testb $1, %cl + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; AVX-32-NEXT: cmovnel %eax, %ecx +-; AVX-32-NEXT: cmovpl %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -1088,13 +1216,17 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: leal {{[0-9]+}}(%esp), %eax +-; X87-NEXT: jne .LBB14_3 +-; X87-NEXT: # %bb.1: +-; X87-NEXT: jp .LBB14_3 ++; X87-NEXT: setnp %al ++; X87-NEXT: sete %cl ++; X87-NEXT: andb %al, %cl ++; X87-NEXT: testb $1, %cl ++; X87-NEXT: jne .LBB14_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax +-; X87-NEXT: .LBB14_3: ++; X87-NEXT: movl (%eax), %eax ++; X87-NEXT: retl ++; X87-NEXT: .LBB14_1: ++; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax + ; X87-NEXT: retl + ; +@@ -1105,10 +1237,13 @@ + ; X87-CMOV-NEXT: fucompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setnp %al ++; X87-CMOV-NEXT: sete %cl ++; X87-CMOV-NEXT: andb %al, %cl ++; X87-CMOV-NEXT: testb $1, %cl + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; X87-CMOV-NEXT: cmovnel %eax, %ecx +-; X87-CMOV-NEXT: cmovpl %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmp.f64( +@@ -1123,9 +1258,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movsd {{.*#+}} xmm0 = mem[0],zero + ; SSE-32-NEXT: ucomisd {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: seta %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmoval %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -1140,9 +1277,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovsd {{.*#+}} xmm0 = mem[0],zero + ; AVX-32-NEXT: vucomisd {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: seta %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmoval %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -1162,7 +1301,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: ja .LBB15_1 ++; X87-NEXT: seta %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB15_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -1179,9 +1320,11 @@ + ; X87-CMOV-NEXT: fucompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: seta %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmoval %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmp.f64( +@@ -1196,9 +1339,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movsd {{.*#+}} xmm0 = mem[0],zero + ; SSE-32-NEXT: ucomisd {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setae %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovael %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -1213,9 +1358,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovsd {{.*#+}} xmm0 = mem[0],zero + ; AVX-32-NEXT: vucomisd {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setae %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovael %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -1235,7 +1382,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: jae .LBB16_1 ++; X87-NEXT: setae %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB16_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -1252,9 +1401,11 @@ + ; X87-CMOV-NEXT: fucompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setae %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovael %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmp.f64( +@@ -1269,9 +1420,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movsd {{.*#+}} xmm0 = mem[0],zero + ; SSE-32-NEXT: ucomisd {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: seta %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmoval %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -1286,9 +1439,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovsd {{.*#+}} xmm0 = mem[0],zero + ; AVX-32-NEXT: vucomisd {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: seta %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmoval %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -1308,7 +1463,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: ja .LBB17_1 ++; X87-NEXT: seta %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB17_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -1325,9 +1482,11 @@ + ; X87-CMOV-NEXT: fucompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: seta %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmoval %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmp.f64( +@@ -1342,9 +1501,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movsd {{.*#+}} xmm0 = mem[0],zero + ; SSE-32-NEXT: ucomisd {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setae %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovael %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -1359,9 +1520,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovsd {{.*#+}} xmm0 = mem[0],zero + ; AVX-32-NEXT: vucomisd {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setae %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovael %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -1381,7 +1544,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: jae .LBB18_1 ++; X87-NEXT: setae %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB18_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -1398,9 +1563,11 @@ + ; X87-CMOV-NEXT: fucompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setae %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovael %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmp.f64( +@@ -1415,6 +1582,8 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movsd {{.*#+}} xmm0 = mem[0],zero + ; SSE-32-NEXT: ucomisd {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setne %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; SSE-32-NEXT: cmovnel %eax, %ecx +@@ -1432,6 +1601,8 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovsd {{.*#+}} xmm0 = mem[0],zero + ; AVX-32-NEXT: vucomisd {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setne %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; AVX-32-NEXT: cmovnel %eax, %ecx +@@ -1454,6 +1625,8 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf ++; X87-NEXT: setne %al ++; X87-NEXT: testb $1, %al + ; X87-NEXT: jne .LBB19_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax +@@ -1471,6 +1644,8 @@ + ; X87-CMOV-NEXT: fucompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setne %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; X87-CMOV-NEXT: cmovnel %eax, %ecx +@@ -1488,9 +1663,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movsd {{.*#+}} xmm0 = mem[0],zero + ; SSE-32-NEXT: ucomisd {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setnp %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovnpl %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -1505,9 +1682,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovsd {{.*#+}} xmm0 = mem[0],zero + ; AVX-32-NEXT: vucomisd {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setnp %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovnpl %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -1527,7 +1706,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: jnp .LBB20_1 ++; X87-NEXT: setnp %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB20_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -1544,9 +1725,11 @@ + ; X87-CMOV-NEXT: fucompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setnp %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovnpl %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmp.f64( +@@ -1561,9 +1744,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movsd {{.*#+}} xmm0 = mem[0],zero + ; SSE-32-NEXT: ucomisd {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: sete %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovel %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -1578,9 +1763,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovsd {{.*#+}} xmm0 = mem[0],zero + ; AVX-32-NEXT: vucomisd {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: sete %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovel %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -1600,7 +1787,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: je .LBB21_1 ++; X87-NEXT: sete %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB21_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -1617,9 +1806,11 @@ + ; X87-CMOV-NEXT: fucompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: sete %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovel %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmp.f64( +@@ -1634,9 +1825,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movsd {{.*#+}} xmm0 = mem[0],zero + ; SSE-32-NEXT: ucomisd {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setb %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovbl %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -1651,9 +1844,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovsd {{.*#+}} xmm0 = mem[0],zero + ; AVX-32-NEXT: vucomisd {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setb %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovbl %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -1673,7 +1868,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: jb .LBB22_1 ++; X87-NEXT: setb %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB22_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -1690,9 +1887,11 @@ + ; X87-CMOV-NEXT: fucompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setb %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovbl %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmp.f64( +@@ -1707,9 +1906,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movsd {{.*#+}} xmm0 = mem[0],zero + ; SSE-32-NEXT: ucomisd {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setbe %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovbel %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -1724,9 +1925,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovsd {{.*#+}} xmm0 = mem[0],zero + ; AVX-32-NEXT: vucomisd {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setbe %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovbel %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -1746,7 +1949,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: jbe .LBB23_1 ++; X87-NEXT: setbe %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB23_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -1763,9 +1968,11 @@ + ; X87-CMOV-NEXT: fucompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setbe %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovbel %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmp.f64( +@@ -1780,9 +1987,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movsd {{.*#+}} xmm0 = mem[0],zero + ; SSE-32-NEXT: ucomisd {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setb %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovbl %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -1797,9 +2006,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovsd {{.*#+}} xmm0 = mem[0],zero + ; AVX-32-NEXT: vucomisd {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setb %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovbl %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -1819,7 +2030,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: jb .LBB24_1 ++; X87-NEXT: setb %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB24_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -1836,9 +2049,11 @@ + ; X87-CMOV-NEXT: fucompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setb %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovbl %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmp.f64( +@@ -1853,9 +2068,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movsd {{.*#+}} xmm0 = mem[0],zero + ; SSE-32-NEXT: ucomisd {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setbe %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovbel %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -1870,9 +2087,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovsd {{.*#+}} xmm0 = mem[0],zero + ; AVX-32-NEXT: vucomisd {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setbe %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovbel %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -1892,7 +2111,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: jbe .LBB25_1 ++; X87-NEXT: setbe %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB25_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -1909,9 +2130,11 @@ + ; X87-CMOV-NEXT: fucompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setbe %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovbel %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmp.f64( +@@ -1926,10 +2149,13 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movsd {{.*#+}} xmm0 = mem[0],zero + ; SSE-32-NEXT: ucomisd {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setp %al ++; SSE-32-NEXT: setne %cl ++; SSE-32-NEXT: orb %al, %cl ++; SSE-32-NEXT: testb $1, %cl + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; SSE-32-NEXT: cmovnel %eax, %ecx +-; SSE-32-NEXT: cmovpl %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -1945,10 +2171,13 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovsd {{.*#+}} xmm0 = mem[0],zero + ; AVX-32-NEXT: vucomisd {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setp %al ++; AVX-32-NEXT: setne %cl ++; AVX-32-NEXT: orb %al, %cl ++; AVX-32-NEXT: testb $1, %cl + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; AVX-32-NEXT: cmovnel %eax, %ecx +-; AVX-32-NEXT: cmovpl %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -1969,13 +2198,17 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: leal {{[0-9]+}}(%esp), %eax +-; X87-NEXT: jne .LBB26_3 +-; X87-NEXT: # %bb.1: +-; X87-NEXT: jp .LBB26_3 ++; X87-NEXT: setp %al ++; X87-NEXT: setne %cl ++; X87-NEXT: orb %al, %cl ++; X87-NEXT: testb $1, %cl ++; X87-NEXT: jne .LBB26_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax +-; X87-NEXT: .LBB26_3: ++; X87-NEXT: movl (%eax), %eax ++; X87-NEXT: retl ++; X87-NEXT: .LBB26_1: ++; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax + ; X87-NEXT: retl + ; +@@ -1986,10 +2219,13 @@ + ; X87-CMOV-NEXT: fucompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setp %al ++; X87-CMOV-NEXT: setne %cl ++; X87-CMOV-NEXT: orb %al, %cl ++; X87-CMOV-NEXT: testb $1, %cl + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; X87-CMOV-NEXT: cmovnel %eax, %ecx +-; X87-CMOV-NEXT: cmovpl %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmp.f64( +@@ -2004,9 +2240,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movsd {{.*#+}} xmm0 = mem[0],zero + ; SSE-32-NEXT: ucomisd {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setp %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovpl %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -2021,9 +2259,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovsd {{.*#+}} xmm0 = mem[0],zero + ; AVX-32-NEXT: vucomisd {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setp %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovpl %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -2043,7 +2283,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: jp .LBB27_1 ++; X87-NEXT: setp %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB27_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -2060,9 +2302,11 @@ + ; X87-CMOV-NEXT: fucompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setp %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovpl %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmp.f64( +@@ -2077,10 +2321,13 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; SSE-32-NEXT: comiss {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setnp %al ++; SSE-32-NEXT: sete %cl ++; SSE-32-NEXT: andb %al, %cl ++; SSE-32-NEXT: testb $1, %cl + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; SSE-32-NEXT: cmovnel %eax, %ecx +-; SSE-32-NEXT: cmovpl %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -2096,10 +2343,13 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; AVX-32-NEXT: vcomiss {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setnp %al ++; AVX-32-NEXT: sete %cl ++; AVX-32-NEXT: andb %al, %cl ++; AVX-32-NEXT: testb $1, %cl + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; AVX-32-NEXT: cmovnel %eax, %ecx +-; AVX-32-NEXT: cmovpl %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -2120,13 +2370,17 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: leal {{[0-9]+}}(%esp), %eax +-; X87-NEXT: jne .LBB28_3 +-; X87-NEXT: # %bb.1: +-; X87-NEXT: jp .LBB28_3 ++; X87-NEXT: setnp %al ++; X87-NEXT: sete %cl ++; X87-NEXT: andb %al, %cl ++; X87-NEXT: testb $1, %cl ++; X87-NEXT: jne .LBB28_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax +-; X87-NEXT: .LBB28_3: ++; X87-NEXT: movl (%eax), %eax ++; X87-NEXT: retl ++; X87-NEXT: .LBB28_1: ++; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax + ; X87-NEXT: retl + ; +@@ -2137,10 +2391,13 @@ + ; X87-CMOV-NEXT: fcompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setnp %al ++; X87-CMOV-NEXT: sete %cl ++; X87-CMOV-NEXT: andb %al, %cl ++; X87-CMOV-NEXT: testb $1, %cl + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; X87-CMOV-NEXT: cmovnel %eax, %ecx +-; X87-CMOV-NEXT: cmovpl %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmps.f32( +@@ -2155,9 +2412,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; SSE-32-NEXT: comiss {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: seta %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmoval %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -2172,9 +2431,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; AVX-32-NEXT: vcomiss {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: seta %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmoval %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -2194,7 +2455,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: ja .LBB29_1 ++; X87-NEXT: seta %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB29_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -2211,9 +2474,11 @@ + ; X87-CMOV-NEXT: fcompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: seta %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmoval %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmps.f32( +@@ -2228,9 +2493,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; SSE-32-NEXT: comiss {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setae %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovael %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -2245,9 +2512,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; AVX-32-NEXT: vcomiss {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setae %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovael %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -2267,7 +2536,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: jae .LBB30_1 ++; X87-NEXT: setae %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB30_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -2284,9 +2555,11 @@ + ; X87-CMOV-NEXT: fcompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setae %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovael %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmps.f32( +@@ -2301,9 +2574,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; SSE-32-NEXT: comiss {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: seta %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmoval %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -2318,9 +2593,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; AVX-32-NEXT: vcomiss {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: seta %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmoval %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -2340,7 +2617,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: ja .LBB31_1 ++; X87-NEXT: seta %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB31_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -2357,9 +2636,11 @@ + ; X87-CMOV-NEXT: fcompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: seta %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmoval %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmps.f32( +@@ -2374,9 +2655,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; SSE-32-NEXT: comiss {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setae %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovael %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -2391,9 +2674,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; AVX-32-NEXT: vcomiss {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setae %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovael %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -2413,7 +2698,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: jae .LBB32_1 ++; X87-NEXT: setae %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB32_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -2430,9 +2717,11 @@ + ; X87-CMOV-NEXT: fcompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setae %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovael %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmps.f32( +@@ -2447,6 +2736,8 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; SSE-32-NEXT: comiss {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setne %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; SSE-32-NEXT: cmovnel %eax, %ecx +@@ -2464,6 +2755,8 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; AVX-32-NEXT: vcomiss {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setne %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; AVX-32-NEXT: cmovnel %eax, %ecx +@@ -2486,6 +2779,8 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf ++; X87-NEXT: setne %al ++; X87-NEXT: testb $1, %al + ; X87-NEXT: jne .LBB33_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax +@@ -2503,6 +2798,8 @@ + ; X87-CMOV-NEXT: fcompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setne %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; X87-CMOV-NEXT: cmovnel %eax, %ecx +@@ -2520,9 +2817,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; SSE-32-NEXT: comiss {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setnp %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovnpl %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -2537,9 +2836,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; AVX-32-NEXT: vcomiss {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setnp %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovnpl %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -2559,7 +2860,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: jnp .LBB34_1 ++; X87-NEXT: setnp %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB34_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -2576,9 +2879,11 @@ + ; X87-CMOV-NEXT: fcompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setnp %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovnpl %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmps.f32( +@@ -2593,9 +2898,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; SSE-32-NEXT: comiss {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: sete %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovel %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -2610,9 +2917,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; AVX-32-NEXT: vcomiss {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: sete %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovel %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -2632,7 +2941,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: je .LBB35_1 ++; X87-NEXT: sete %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB35_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -2649,9 +2960,11 @@ + ; X87-CMOV-NEXT: fcompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: sete %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovel %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmps.f32( +@@ -2666,9 +2979,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; SSE-32-NEXT: comiss {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setb %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovbl %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -2683,9 +2998,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; AVX-32-NEXT: vcomiss {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setb %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovbl %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -2705,7 +3022,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: jb .LBB36_1 ++; X87-NEXT: setb %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB36_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -2722,9 +3041,11 @@ + ; X87-CMOV-NEXT: fcompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setb %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovbl %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmps.f32( +@@ -2739,9 +3060,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; SSE-32-NEXT: comiss {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setbe %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovbel %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -2756,9 +3079,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; AVX-32-NEXT: vcomiss {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setbe %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovbel %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -2778,7 +3103,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: jbe .LBB37_1 ++; X87-NEXT: setbe %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB37_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -2795,9 +3122,11 @@ + ; X87-CMOV-NEXT: fcompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setbe %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovbel %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmps.f32( +@@ -2812,9 +3141,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; SSE-32-NEXT: comiss {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setb %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovbl %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -2829,9 +3160,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; AVX-32-NEXT: vcomiss {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setb %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovbl %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -2851,7 +3184,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: jb .LBB38_1 ++; X87-NEXT: setb %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB38_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -2868,9 +3203,11 @@ + ; X87-CMOV-NEXT: fcompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setb %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovbl %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmps.f32( +@@ -2885,9 +3222,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; SSE-32-NEXT: comiss {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setbe %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovbel %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -2902,9 +3241,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; AVX-32-NEXT: vcomiss {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setbe %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovbel %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -2924,7 +3265,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: jbe .LBB39_1 ++; X87-NEXT: setbe %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB39_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -2941,9 +3284,11 @@ + ; X87-CMOV-NEXT: fcompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setbe %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovbel %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmps.f32( +@@ -2958,10 +3303,13 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; SSE-32-NEXT: comiss {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setp %al ++; SSE-32-NEXT: setne %cl ++; SSE-32-NEXT: orb %al, %cl ++; SSE-32-NEXT: testb $1, %cl + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; SSE-32-NEXT: cmovnel %eax, %ecx +-; SSE-32-NEXT: cmovpl %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -2977,10 +3325,13 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; AVX-32-NEXT: vcomiss {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setp %al ++; AVX-32-NEXT: setne %cl ++; AVX-32-NEXT: orb %al, %cl ++; AVX-32-NEXT: testb $1, %cl + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; AVX-32-NEXT: cmovnel %eax, %ecx +-; AVX-32-NEXT: cmovpl %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -3001,13 +3352,17 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: leal {{[0-9]+}}(%esp), %eax +-; X87-NEXT: jne .LBB40_3 +-; X87-NEXT: # %bb.1: +-; X87-NEXT: jp .LBB40_3 ++; X87-NEXT: setp %al ++; X87-NEXT: setne %cl ++; X87-NEXT: orb %al, %cl ++; X87-NEXT: testb $1, %cl ++; X87-NEXT: jne .LBB40_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax +-; X87-NEXT: .LBB40_3: ++; X87-NEXT: movl (%eax), %eax ++; X87-NEXT: retl ++; X87-NEXT: .LBB40_1: ++; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax + ; X87-NEXT: retl + ; +@@ -3018,10 +3373,13 @@ + ; X87-CMOV-NEXT: fcompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setp %al ++; X87-CMOV-NEXT: setne %cl ++; X87-CMOV-NEXT: orb %al, %cl ++; X87-CMOV-NEXT: testb $1, %cl + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; X87-CMOV-NEXT: cmovnel %eax, %ecx +-; X87-CMOV-NEXT: cmovpl %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmps.f32( +@@ -3036,9 +3394,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; SSE-32-NEXT: comiss {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setp %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovpl %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -3053,9 +3413,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovss {{.*#+}} xmm0 = mem[0],zero,zero,zero + ; AVX-32-NEXT: vcomiss {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setp %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovpl %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -3075,7 +3437,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: jp .LBB41_1 ++; X87-NEXT: setp %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB41_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -3092,9 +3456,11 @@ + ; X87-CMOV-NEXT: fcompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setp %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovpl %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmps.f32( +@@ -3109,10 +3475,13 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movsd {{.*#+}} xmm0 = mem[0],zero + ; SSE-32-NEXT: comisd {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setnp %al ++; SSE-32-NEXT: sete %cl ++; SSE-32-NEXT: andb %al, %cl ++; SSE-32-NEXT: testb $1, %cl + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; SSE-32-NEXT: cmovnel %eax, %ecx +-; SSE-32-NEXT: cmovpl %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -3128,10 +3497,13 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovsd {{.*#+}} xmm0 = mem[0],zero + ; AVX-32-NEXT: vcomisd {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setnp %al ++; AVX-32-NEXT: sete %cl ++; AVX-32-NEXT: andb %al, %cl ++; AVX-32-NEXT: testb $1, %cl + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; AVX-32-NEXT: cmovnel %eax, %ecx +-; AVX-32-NEXT: cmovpl %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -3152,13 +3524,17 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: leal {{[0-9]+}}(%esp), %eax +-; X87-NEXT: jne .LBB42_3 +-; X87-NEXT: # %bb.1: +-; X87-NEXT: jp .LBB42_3 ++; X87-NEXT: setnp %al ++; X87-NEXT: sete %cl ++; X87-NEXT: andb %al, %cl ++; X87-NEXT: testb $1, %cl ++; X87-NEXT: jne .LBB42_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax +-; X87-NEXT: .LBB42_3: ++; X87-NEXT: movl (%eax), %eax ++; X87-NEXT: retl ++; X87-NEXT: .LBB42_1: ++; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax + ; X87-NEXT: retl + ; +@@ -3169,10 +3545,13 @@ + ; X87-CMOV-NEXT: fcompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setnp %al ++; X87-CMOV-NEXT: sete %cl ++; X87-CMOV-NEXT: andb %al, %cl ++; X87-CMOV-NEXT: testb $1, %cl + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; X87-CMOV-NEXT: cmovnel %eax, %ecx +-; X87-CMOV-NEXT: cmovpl %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmps.f64( +@@ -3187,9 +3566,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movsd {{.*#+}} xmm0 = mem[0],zero + ; SSE-32-NEXT: comisd {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: seta %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmoval %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -3204,9 +3585,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovsd {{.*#+}} xmm0 = mem[0],zero + ; AVX-32-NEXT: vcomisd {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: seta %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmoval %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -3226,7 +3609,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: ja .LBB43_1 ++; X87-NEXT: seta %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB43_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -3243,9 +3628,11 @@ + ; X87-CMOV-NEXT: fcompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: seta %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmoval %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmps.f64( +@@ -3260,9 +3647,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movsd {{.*#+}} xmm0 = mem[0],zero + ; SSE-32-NEXT: comisd {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setae %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovael %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -3277,9 +3666,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovsd {{.*#+}} xmm0 = mem[0],zero + ; AVX-32-NEXT: vcomisd {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setae %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovael %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -3299,7 +3690,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: jae .LBB44_1 ++; X87-NEXT: setae %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB44_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -3316,9 +3709,11 @@ + ; X87-CMOV-NEXT: fcompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setae %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovael %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmps.f64( +@@ -3333,9 +3728,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movsd {{.*#+}} xmm0 = mem[0],zero + ; SSE-32-NEXT: comisd {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: seta %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmoval %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -3350,9 +3747,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovsd {{.*#+}} xmm0 = mem[0],zero + ; AVX-32-NEXT: vcomisd {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: seta %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmoval %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -3372,7 +3771,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: ja .LBB45_1 ++; X87-NEXT: seta %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB45_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -3389,9 +3790,11 @@ + ; X87-CMOV-NEXT: fcompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: seta %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmoval %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmps.f64( +@@ -3406,9 +3809,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movsd {{.*#+}} xmm0 = mem[0],zero + ; SSE-32-NEXT: comisd {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setae %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovael %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -3423,9 +3828,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovsd {{.*#+}} xmm0 = mem[0],zero + ; AVX-32-NEXT: vcomisd {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setae %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovael %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -3445,7 +3852,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: jae .LBB46_1 ++; X87-NEXT: setae %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB46_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -3462,9 +3871,11 @@ + ; X87-CMOV-NEXT: fcompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setae %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovael %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmps.f64( +@@ -3479,6 +3890,8 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movsd {{.*#+}} xmm0 = mem[0],zero + ; SSE-32-NEXT: comisd {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setne %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; SSE-32-NEXT: cmovnel %eax, %ecx +@@ -3496,6 +3909,8 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovsd {{.*#+}} xmm0 = mem[0],zero + ; AVX-32-NEXT: vcomisd {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setne %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; AVX-32-NEXT: cmovnel %eax, %ecx +@@ -3518,6 +3933,8 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf ++; X87-NEXT: setne %al ++; X87-NEXT: testb $1, %al + ; X87-NEXT: jne .LBB47_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax +@@ -3535,6 +3952,8 @@ + ; X87-CMOV-NEXT: fcompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setne %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; X87-CMOV-NEXT: cmovnel %eax, %ecx +@@ -3552,9 +3971,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movsd {{.*#+}} xmm0 = mem[0],zero + ; SSE-32-NEXT: comisd {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setnp %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovnpl %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -3569,9 +3990,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovsd {{.*#+}} xmm0 = mem[0],zero + ; AVX-32-NEXT: vcomisd {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setnp %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovnpl %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -3591,7 +4014,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: jnp .LBB48_1 ++; X87-NEXT: setnp %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB48_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -3608,9 +4033,11 @@ + ; X87-CMOV-NEXT: fcompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setnp %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovnpl %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmps.f64( +@@ -3625,9 +4052,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movsd {{.*#+}} xmm0 = mem[0],zero + ; SSE-32-NEXT: comisd {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: sete %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovel %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -3642,9 +4071,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovsd {{.*#+}} xmm0 = mem[0],zero + ; AVX-32-NEXT: vcomisd {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: sete %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovel %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -3664,7 +4095,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: je .LBB49_1 ++; X87-NEXT: sete %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB49_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -3681,9 +4114,11 @@ + ; X87-CMOV-NEXT: fcompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: sete %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovel %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmps.f64( +@@ -3698,9 +4133,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movsd {{.*#+}} xmm0 = mem[0],zero + ; SSE-32-NEXT: comisd {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setb %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovbl %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -3715,9 +4152,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovsd {{.*#+}} xmm0 = mem[0],zero + ; AVX-32-NEXT: vcomisd {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setb %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovbl %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -3737,7 +4176,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: jb .LBB50_1 ++; X87-NEXT: setb %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB50_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -3754,9 +4195,11 @@ + ; X87-CMOV-NEXT: fcompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setb %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovbl %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmps.f64( +@@ -3771,9 +4214,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movsd {{.*#+}} xmm0 = mem[0],zero + ; SSE-32-NEXT: comisd {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setbe %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovbel %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -3788,9 +4233,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovsd {{.*#+}} xmm0 = mem[0],zero + ; AVX-32-NEXT: vcomisd {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setbe %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovbel %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -3810,7 +4257,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: jbe .LBB51_1 ++; X87-NEXT: setbe %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB51_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -3827,9 +4276,11 @@ + ; X87-CMOV-NEXT: fcompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setbe %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovbel %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmps.f64( +@@ -3844,9 +4295,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movsd {{.*#+}} xmm0 = mem[0],zero + ; SSE-32-NEXT: comisd {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setb %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovbl %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -3861,9 +4314,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovsd {{.*#+}} xmm0 = mem[0],zero + ; AVX-32-NEXT: vcomisd {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setb %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovbl %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -3883,7 +4338,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: jb .LBB52_1 ++; X87-NEXT: setb %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB52_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -3900,9 +4357,11 @@ + ; X87-CMOV-NEXT: fcompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setb %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovbl %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmps.f64( +@@ -3917,9 +4376,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movsd {{.*#+}} xmm0 = mem[0],zero + ; SSE-32-NEXT: comisd {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setbe %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovbel %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -3934,9 +4395,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovsd {{.*#+}} xmm0 = mem[0],zero + ; AVX-32-NEXT: vcomisd {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setbe %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovbel %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -3956,7 +4419,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: jbe .LBB53_1 ++; X87-NEXT: setbe %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB53_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -3973,9 +4438,11 @@ + ; X87-CMOV-NEXT: fcompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setbe %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovbel %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmps.f64( +@@ -3990,10 +4457,13 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movsd {{.*#+}} xmm0 = mem[0],zero + ; SSE-32-NEXT: comisd {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setp %al ++; SSE-32-NEXT: setne %cl ++; SSE-32-NEXT: orb %al, %cl ++; SSE-32-NEXT: testb $1, %cl + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; SSE-32-NEXT: cmovnel %eax, %ecx +-; SSE-32-NEXT: cmovpl %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -4009,10 +4479,13 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovsd {{.*#+}} xmm0 = mem[0],zero + ; AVX-32-NEXT: vcomisd {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setp %al ++; AVX-32-NEXT: setne %cl ++; AVX-32-NEXT: orb %al, %cl ++; AVX-32-NEXT: testb $1, %cl + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; AVX-32-NEXT: cmovnel %eax, %ecx +-; AVX-32-NEXT: cmovpl %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -4033,13 +4506,17 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: leal {{[0-9]+}}(%esp), %eax +-; X87-NEXT: jne .LBB54_3 +-; X87-NEXT: # %bb.1: +-; X87-NEXT: jp .LBB54_3 ++; X87-NEXT: setp %al ++; X87-NEXT: setne %cl ++; X87-NEXT: orb %al, %cl ++; X87-NEXT: testb $1, %cl ++; X87-NEXT: jne .LBB54_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax +-; X87-NEXT: .LBB54_3: ++; X87-NEXT: movl (%eax), %eax ++; X87-NEXT: retl ++; X87-NEXT: .LBB54_1: ++; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax + ; X87-NEXT: retl + ; +@@ -4050,10 +4527,13 @@ + ; X87-CMOV-NEXT: fcompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setp %al ++; X87-CMOV-NEXT: setne %cl ++; X87-CMOV-NEXT: orb %al, %cl ++; X87-CMOV-NEXT: testb $1, %cl + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; X87-CMOV-NEXT: cmovnel %eax, %ecx +-; X87-CMOV-NEXT: cmovpl %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmps.f64( +@@ -4068,9 +4548,11 @@ + ; SSE-32: # %bb.0: + ; SSE-32-NEXT: movsd {{.*#+}} xmm0 = mem[0],zero + ; SSE-32-NEXT: comisd {{[0-9]+}}(%esp), %xmm0 ++; SSE-32-NEXT: setp %al ++; SSE-32-NEXT: testb $1, %al + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SSE-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; SSE-32-NEXT: cmovpl %eax, %ecx ++; SSE-32-NEXT: cmovnel %eax, %ecx + ; SSE-32-NEXT: movl (%ecx), %eax + ; SSE-32-NEXT: retl + ; +@@ -4085,9 +4567,11 @@ + ; AVX-32: # %bb.0: + ; AVX-32-NEXT: vmovsd {{.*#+}} xmm0 = mem[0],zero + ; AVX-32-NEXT: vcomisd {{[0-9]+}}(%esp), %xmm0 ++; AVX-32-NEXT: setp %al ++; AVX-32-NEXT: testb $1, %al + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %eax + ; AVX-32-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; AVX-32-NEXT: cmovpl %eax, %ecx ++; AVX-32-NEXT: cmovnel %eax, %ecx + ; AVX-32-NEXT: movl (%ecx), %eax + ; AVX-32-NEXT: retl + ; +@@ -4107,7 +4591,9 @@ + ; X87-NEXT: fnstsw %ax + ; X87-NEXT: # kill: def $ah killed $ah killed $ax + ; X87-NEXT: sahf +-; X87-NEXT: jp .LBB55_1 ++; X87-NEXT: setp %al ++; X87-NEXT: testb $1, %al ++; X87-NEXT: jne .LBB55_1 + ; X87-NEXT: # %bb.2: + ; X87-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-NEXT: movl (%eax), %eax +@@ -4124,9 +4610,11 @@ + ; X87-CMOV-NEXT: fcompi %st(1), %st + ; X87-CMOV-NEXT: fstp %st(0) + ; X87-CMOV-NEXT: wait ++; X87-CMOV-NEXT: setp %al ++; X87-CMOV-NEXT: testb $1, %al + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X87-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx +-; X87-CMOV-NEXT: cmovpl %eax, %ecx ++; X87-CMOV-NEXT: cmovnel %eax, %ecx + ; X87-CMOV-NEXT: movl (%ecx), %eax + ; X87-CMOV-NEXT: retl + %cond = call i1 @llvm.experimental.constrained.fcmps.f64( +diff --git a/test/CodeGen/X86/fp128-libcalls-strict.ll b/test/CodeGen/X86/fp128-libcalls-strict.ll +index ad2d690fd7..5dbc28230d 100644 +--- a/test/CodeGen/X86/fp128-libcalls-strict.ll ++++ b/test/CodeGen/X86/fp128-libcalls-strict.ll +@@ -3898,6 +3898,7 @@ + ; X86-NEXT: calll __unordtf2 + ; X86-NEXT: addl $32, %esp + ; X86-NEXT: orb %bl, %al ++; X86-NEXT: testb $1, %al + ; X86-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; X86-NEXT: cmovnel %eax, %ecx +@@ -3981,6 +3982,7 @@ + ; WIN-X86-NEXT: calll ___unordtf2 + ; WIN-X86-NEXT: addl $32, %esp + ; WIN-X86-NEXT: orb %bl, %al ++; WIN-X86-NEXT: testb $1, %al + ; WIN-X86-NEXT: jne LBB39_1 + ; WIN-X86-NEXT: # %bb.2: + ; WIN-X86-NEXT: leal 16(%ebp), %ecx +diff --git a/test/CodeGen/X86/fp80-strict-scalar-cmp.ll b/test/CodeGen/X86/fp80-strict-scalar-cmp.ll +index cb2361fbb8..f95738d9e5 100644 +--- a/test/CodeGen/X86/fp80-strict-scalar-cmp.ll ++++ b/test/CodeGen/X86/fp80-strict-scalar-cmp.ll +@@ -12,13 +12,17 @@ + ; X86-NEXT: fnstsw %ax + ; X86-NEXT: # kill: def $ah killed $ah killed $ax + ; X86-NEXT: sahf +-; X86-NEXT: leal {{[0-9]+}}(%esp), %eax +-; X86-NEXT: jne .LBB0_3 +-; X86-NEXT: # %bb.1: +-; X86-NEXT: jp .LBB0_3 ++; X86-NEXT: setnp %al ++; X86-NEXT: sete %cl ++; X86-NEXT: andb %al, %cl ++; X86-NEXT: testb $1, %cl ++; X86-NEXT: jne .LBB0_1 + ; X86-NEXT: # %bb.2: + ; X86-NEXT: leal {{[0-9]+}}(%esp), %eax +-; X86-NEXT: .LBB0_3: ++; X86-NEXT: movl (%eax), %eax ++; X86-NEXT: retl ++; X86-NEXT: .LBB0_1: ++; X86-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-NEXT: movl (%eax), %eax + ; X86-NEXT: retl + ; +@@ -50,7 +54,9 @@ + ; X86-NEXT: fnstsw %ax + ; X86-NEXT: # kill: def $ah killed $ah killed $ax + ; X86-NEXT: sahf +-; X86-NEXT: ja .LBB1_1 ++; X86-NEXT: seta %al ++; X86-NEXT: testb $1, %al ++; X86-NEXT: jne .LBB1_1 + ; X86-NEXT: # %bb.2: + ; X86-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-NEXT: movl (%eax), %eax +@@ -87,7 +93,9 @@ + ; X86-NEXT: fnstsw %ax + ; X86-NEXT: # kill: def $ah killed $ah killed $ax + ; X86-NEXT: sahf +-; X86-NEXT: jae .LBB2_1 ++; X86-NEXT: setae %al ++; X86-NEXT: testb $1, %al ++; X86-NEXT: jne .LBB2_1 + ; X86-NEXT: # %bb.2: + ; X86-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-NEXT: movl (%eax), %eax +@@ -124,7 +132,9 @@ + ; X86-NEXT: fnstsw %ax + ; X86-NEXT: # kill: def $ah killed $ah killed $ax + ; X86-NEXT: sahf +-; X86-NEXT: ja .LBB3_1 ++; X86-NEXT: seta %al ++; X86-NEXT: testb $1, %al ++; X86-NEXT: jne .LBB3_1 + ; X86-NEXT: # %bb.2: + ; X86-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-NEXT: movl (%eax), %eax +@@ -161,7 +171,9 @@ + ; X86-NEXT: fnstsw %ax + ; X86-NEXT: # kill: def $ah killed $ah killed $ax + ; X86-NEXT: sahf +-; X86-NEXT: jae .LBB4_1 ++; X86-NEXT: setae %al ++; X86-NEXT: testb $1, %al ++; X86-NEXT: jne .LBB4_1 + ; X86-NEXT: # %bb.2: + ; X86-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-NEXT: movl (%eax), %eax +@@ -198,6 +210,8 @@ + ; X86-NEXT: fnstsw %ax + ; X86-NEXT: # kill: def $ah killed $ah killed $ax + ; X86-NEXT: sahf ++; X86-NEXT: setne %al ++; X86-NEXT: testb $1, %al + ; X86-NEXT: jne .LBB5_1 + ; X86-NEXT: # %bb.2: + ; X86-NEXT: leal {{[0-9]+}}(%esp), %eax +@@ -235,7 +249,9 @@ + ; X86-NEXT: fnstsw %ax + ; X86-NEXT: # kill: def $ah killed $ah killed $ax + ; X86-NEXT: sahf +-; X86-NEXT: jnp .LBB6_1 ++; X86-NEXT: setnp %al ++; X86-NEXT: testb $1, %al ++; X86-NEXT: jne .LBB6_1 + ; X86-NEXT: # %bb.2: + ; X86-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-NEXT: movl (%eax), %eax +@@ -272,7 +288,9 @@ + ; X86-NEXT: fnstsw %ax + ; X86-NEXT: # kill: def $ah killed $ah killed $ax + ; X86-NEXT: sahf +-; X86-NEXT: je .LBB7_1 ++; X86-NEXT: sete %al ++; X86-NEXT: testb $1, %al ++; X86-NEXT: jne .LBB7_1 + ; X86-NEXT: # %bb.2: + ; X86-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-NEXT: movl (%eax), %eax +@@ -309,7 +327,9 @@ + ; X86-NEXT: fnstsw %ax + ; X86-NEXT: # kill: def $ah killed $ah killed $ax + ; X86-NEXT: sahf +-; X86-NEXT: jb .LBB8_1 ++; X86-NEXT: setb %al ++; X86-NEXT: testb $1, %al ++; X86-NEXT: jne .LBB8_1 + ; X86-NEXT: # %bb.2: + ; X86-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-NEXT: movl (%eax), %eax +@@ -346,7 +366,9 @@ + ; X86-NEXT: fnstsw %ax + ; X86-NEXT: # kill: def $ah killed $ah killed $ax + ; X86-NEXT: sahf +-; X86-NEXT: jbe .LBB9_1 ++; X86-NEXT: setbe %al ++; X86-NEXT: testb $1, %al ++; X86-NEXT: jne .LBB9_1 + ; X86-NEXT: # %bb.2: + ; X86-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-NEXT: movl (%eax), %eax +@@ -383,7 +405,9 @@ + ; X86-NEXT: fnstsw %ax + ; X86-NEXT: # kill: def $ah killed $ah killed $ax + ; X86-NEXT: sahf +-; X86-NEXT: jb .LBB10_1 ++; X86-NEXT: setb %al ++; X86-NEXT: testb $1, %al ++; X86-NEXT: jne .LBB10_1 + ; X86-NEXT: # %bb.2: + ; X86-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-NEXT: movl (%eax), %eax +@@ -420,7 +444,9 @@ + ; X86-NEXT: fnstsw %ax + ; X86-NEXT: # kill: def $ah killed $ah killed $ax + ; X86-NEXT: sahf +-; X86-NEXT: jbe .LBB11_1 ++; X86-NEXT: setbe %al ++; X86-NEXT: testb $1, %al ++; X86-NEXT: jne .LBB11_1 + ; X86-NEXT: # %bb.2: + ; X86-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-NEXT: movl (%eax), %eax +@@ -457,13 +483,17 @@ + ; X86-NEXT: fnstsw %ax + ; X86-NEXT: # kill: def $ah killed $ah killed $ax + ; X86-NEXT: sahf +-; X86-NEXT: leal {{[0-9]+}}(%esp), %eax +-; X86-NEXT: jne .LBB12_3 +-; X86-NEXT: # %bb.1: +-; X86-NEXT: jp .LBB12_3 ++; X86-NEXT: setp %al ++; X86-NEXT: setne %cl ++; X86-NEXT: orb %al, %cl ++; X86-NEXT: testb $1, %cl ++; X86-NEXT: jne .LBB12_1 + ; X86-NEXT: # %bb.2: + ; X86-NEXT: leal {{[0-9]+}}(%esp), %eax +-; X86-NEXT: .LBB12_3: ++; X86-NEXT: movl (%eax), %eax ++; X86-NEXT: retl ++; X86-NEXT: .LBB12_1: ++; X86-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-NEXT: movl (%eax), %eax + ; X86-NEXT: retl + ; +@@ -495,7 +525,9 @@ + ; X86-NEXT: fnstsw %ax + ; X86-NEXT: # kill: def $ah killed $ah killed $ax + ; X86-NEXT: sahf +-; X86-NEXT: jp .LBB13_1 ++; X86-NEXT: setp %al ++; X86-NEXT: testb $1, %al ++; X86-NEXT: jne .LBB13_1 + ; X86-NEXT: # %bb.2: + ; X86-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-NEXT: movl (%eax), %eax +@@ -532,13 +564,17 @@ + ; X86-NEXT: fnstsw %ax + ; X86-NEXT: # kill: def $ah killed $ah killed $ax + ; X86-NEXT: sahf +-; X86-NEXT: leal {{[0-9]+}}(%esp), %eax +-; X86-NEXT: jne .LBB14_3 +-; X86-NEXT: # %bb.1: +-; X86-NEXT: jp .LBB14_3 ++; X86-NEXT: setnp %al ++; X86-NEXT: sete %cl ++; X86-NEXT: andb %al, %cl ++; X86-NEXT: testb $1, %cl ++; X86-NEXT: jne .LBB14_1 + ; X86-NEXT: # %bb.2: + ; X86-NEXT: leal {{[0-9]+}}(%esp), %eax +-; X86-NEXT: .LBB14_3: ++; X86-NEXT: movl (%eax), %eax ++; X86-NEXT: retl ++; X86-NEXT: .LBB14_1: ++; X86-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-NEXT: movl (%eax), %eax + ; X86-NEXT: retl + ; +@@ -570,7 +606,9 @@ + ; X86-NEXT: fnstsw %ax + ; X86-NEXT: # kill: def $ah killed $ah killed $ax + ; X86-NEXT: sahf +-; X86-NEXT: ja .LBB15_1 ++; X86-NEXT: seta %al ++; X86-NEXT: testb $1, %al ++; X86-NEXT: jne .LBB15_1 + ; X86-NEXT: # %bb.2: + ; X86-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-NEXT: movl (%eax), %eax +@@ -607,7 +645,9 @@ + ; X86-NEXT: fnstsw %ax + ; X86-NEXT: # kill: def $ah killed $ah killed $ax + ; X86-NEXT: sahf +-; X86-NEXT: jae .LBB16_1 ++; X86-NEXT: setae %al ++; X86-NEXT: testb $1, %al ++; X86-NEXT: jne .LBB16_1 + ; X86-NEXT: # %bb.2: + ; X86-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-NEXT: movl (%eax), %eax +@@ -644,7 +684,9 @@ + ; X86-NEXT: fnstsw %ax + ; X86-NEXT: # kill: def $ah killed $ah killed $ax + ; X86-NEXT: sahf +-; X86-NEXT: ja .LBB17_1 ++; X86-NEXT: seta %al ++; X86-NEXT: testb $1, %al ++; X86-NEXT: jne .LBB17_1 + ; X86-NEXT: # %bb.2: + ; X86-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-NEXT: movl (%eax), %eax +@@ -681,7 +723,9 @@ + ; X86-NEXT: fnstsw %ax + ; X86-NEXT: # kill: def $ah killed $ah killed $ax + ; X86-NEXT: sahf +-; X86-NEXT: jae .LBB18_1 ++; X86-NEXT: setae %al ++; X86-NEXT: testb $1, %al ++; X86-NEXT: jne .LBB18_1 + ; X86-NEXT: # %bb.2: + ; X86-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-NEXT: movl (%eax), %eax +@@ -718,6 +762,8 @@ + ; X86-NEXT: fnstsw %ax + ; X86-NEXT: # kill: def $ah killed $ah killed $ax + ; X86-NEXT: sahf ++; X86-NEXT: setne %al ++; X86-NEXT: testb $1, %al + ; X86-NEXT: jne .LBB19_1 + ; X86-NEXT: # %bb.2: + ; X86-NEXT: leal {{[0-9]+}}(%esp), %eax +@@ -755,7 +801,9 @@ + ; X86-NEXT: fnstsw %ax + ; X86-NEXT: # kill: def $ah killed $ah killed $ax + ; X86-NEXT: sahf +-; X86-NEXT: jnp .LBB20_1 ++; X86-NEXT: setnp %al ++; X86-NEXT: testb $1, %al ++; X86-NEXT: jne .LBB20_1 + ; X86-NEXT: # %bb.2: + ; X86-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-NEXT: movl (%eax), %eax +@@ -792,7 +840,9 @@ + ; X86-NEXT: fnstsw %ax + ; X86-NEXT: # kill: def $ah killed $ah killed $ax + ; X86-NEXT: sahf +-; X86-NEXT: je .LBB21_1 ++; X86-NEXT: sete %al ++; X86-NEXT: testb $1, %al ++; X86-NEXT: jne .LBB21_1 + ; X86-NEXT: # %bb.2: + ; X86-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-NEXT: movl (%eax), %eax +@@ -829,7 +879,9 @@ + ; X86-NEXT: fnstsw %ax + ; X86-NEXT: # kill: def $ah killed $ah killed $ax + ; X86-NEXT: sahf +-; X86-NEXT: jb .LBB22_1 ++; X86-NEXT: setb %al ++; X86-NEXT: testb $1, %al ++; X86-NEXT: jne .LBB22_1 + ; X86-NEXT: # %bb.2: + ; X86-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-NEXT: movl (%eax), %eax +@@ -866,7 +918,9 @@ + ; X86-NEXT: fnstsw %ax + ; X86-NEXT: # kill: def $ah killed $ah killed $ax + ; X86-NEXT: sahf +-; X86-NEXT: jbe .LBB23_1 ++; X86-NEXT: setbe %al ++; X86-NEXT: testb $1, %al ++; X86-NEXT: jne .LBB23_1 + ; X86-NEXT: # %bb.2: + ; X86-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-NEXT: movl (%eax), %eax +@@ -903,7 +957,9 @@ + ; X86-NEXT: fnstsw %ax + ; X86-NEXT: # kill: def $ah killed $ah killed $ax + ; X86-NEXT: sahf +-; X86-NEXT: jb .LBB24_1 ++; X86-NEXT: setb %al ++; X86-NEXT: testb $1, %al ++; X86-NEXT: jne .LBB24_1 + ; X86-NEXT: # %bb.2: + ; X86-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-NEXT: movl (%eax), %eax +@@ -940,7 +996,9 @@ + ; X86-NEXT: fnstsw %ax + ; X86-NEXT: # kill: def $ah killed $ah killed $ax + ; X86-NEXT: sahf +-; X86-NEXT: jbe .LBB25_1 ++; X86-NEXT: setbe %al ++; X86-NEXT: testb $1, %al ++; X86-NEXT: jne .LBB25_1 + ; X86-NEXT: # %bb.2: + ; X86-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-NEXT: movl (%eax), %eax +@@ -977,13 +1035,17 @@ + ; X86-NEXT: fnstsw %ax + ; X86-NEXT: # kill: def $ah killed $ah killed $ax + ; X86-NEXT: sahf +-; X86-NEXT: leal {{[0-9]+}}(%esp), %eax +-; X86-NEXT: jne .LBB26_3 +-; X86-NEXT: # %bb.1: +-; X86-NEXT: jp .LBB26_3 ++; X86-NEXT: setp %al ++; X86-NEXT: setne %cl ++; X86-NEXT: orb %al, %cl ++; X86-NEXT: testb $1, %cl ++; X86-NEXT: jne .LBB26_1 + ; X86-NEXT: # %bb.2: + ; X86-NEXT: leal {{[0-9]+}}(%esp), %eax +-; X86-NEXT: .LBB26_3: ++; X86-NEXT: movl (%eax), %eax ++; X86-NEXT: retl ++; X86-NEXT: .LBB26_1: ++; X86-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-NEXT: movl (%eax), %eax + ; X86-NEXT: retl + ; +@@ -1015,7 +1077,9 @@ + ; X86-NEXT: fnstsw %ax + ; X86-NEXT: # kill: def $ah killed $ah killed $ax + ; X86-NEXT: sahf +-; X86-NEXT: jp .LBB27_1 ++; X86-NEXT: setp %al ++; X86-NEXT: testb $1, %al ++; X86-NEXT: jne .LBB27_1 + ; X86-NEXT: # %bb.2: + ; X86-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-NEXT: movl (%eax), %eax +diff --git a/test/CodeGen/X86/isel-select-cmov.ll b/test/CodeGen/X86/isel-select-cmov.ll +index d013ad2c7f..6ced7f45b6 100644 +--- a/test/CodeGen/X86/isel-select-cmov.ll ++++ b/test/CodeGen/X86/isel-select-cmov.ll +@@ -47,7 +47,7 @@ + ; + ; SDAG-X86-LABEL: select_cmov_i8: + ; SDAG-X86: ## %bb.0: +-; SDAG-X86-NEXT: cmpb $0, {{[0-9]+}}(%esp) ++; SDAG-X86-NEXT: testb $1, {{[0-9]+}}(%esp) + ; SDAG-X86-NEXT: jne LBB0_1 + ; SDAG-X86-NEXT: ## %bb.2: + ; SDAG-X86-NEXT: leal {{[0-9]+}}(%esp), %eax +@@ -60,7 +60,7 @@ + ; + ; SDAG-X86-CMOV-LABEL: select_cmov_i8: + ; SDAG-X86-CMOV: ## %bb.0: +-; SDAG-X86-CMOV-NEXT: cmpb $0, {{[0-9]+}}(%esp) ++; SDAG-X86-CMOV-NEXT: testb $1, {{[0-9]+}}(%esp) + ; SDAG-X86-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SDAG-X86-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; SDAG-X86-CMOV-NEXT: cmovnel %eax, %ecx +@@ -155,7 +155,7 @@ + ; + ; SDAG-X86-LABEL: select_cmov_i16: + ; SDAG-X86: ## %bb.0: +-; SDAG-X86-NEXT: cmpb $0, {{[0-9]+}}(%esp) ++; SDAG-X86-NEXT: testb $1, {{[0-9]+}}(%esp) + ; SDAG-X86-NEXT: jne LBB1_1 + ; SDAG-X86-NEXT: ## %bb.2: + ; SDAG-X86-NEXT: leal {{[0-9]+}}(%esp), %eax +@@ -168,7 +168,7 @@ + ; + ; SDAG-X86-CMOV-LABEL: select_cmov_i16: + ; SDAG-X86-CMOV: ## %bb.0: +-; SDAG-X86-CMOV-NEXT: cmpb $0, {{[0-9]+}}(%esp) ++; SDAG-X86-CMOV-NEXT: testb $1, {{[0-9]+}}(%esp) + ; SDAG-X86-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SDAG-X86-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; SDAG-X86-CMOV-NEXT: cmovnel %eax, %ecx +@@ -360,7 +360,7 @@ + ; + ; SDAG-X86-LABEL: select_cmov_i32: + ; SDAG-X86: ## %bb.0: +-; SDAG-X86-NEXT: cmpb $0, {{[0-9]+}}(%esp) ++; SDAG-X86-NEXT: testb $1, {{[0-9]+}}(%esp) + ; SDAG-X86-NEXT: jne LBB3_1 + ; SDAG-X86-NEXT: ## %bb.2: + ; SDAG-X86-NEXT: leal {{[0-9]+}}(%esp), %eax +@@ -373,7 +373,7 @@ + ; + ; SDAG-X86-CMOV-LABEL: select_cmov_i32: + ; SDAG-X86-CMOV: ## %bb.0: +-; SDAG-X86-CMOV-NEXT: cmpb $0, {{[0-9]+}}(%esp) ++; SDAG-X86-CMOV-NEXT: testb $1, {{[0-9]+}}(%esp) + ; SDAG-X86-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SDAG-X86-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; SDAG-X86-CMOV-NEXT: cmovnel %eax, %ecx +@@ -549,7 +549,7 @@ + ; + ; SDAG-X86-LABEL: select_cmov_i64: + ; SDAG-X86: ## %bb.0: +-; SDAG-X86-NEXT: cmpb $0, {{[0-9]+}}(%esp) ++; SDAG-X86-NEXT: testb $1, {{[0-9]+}}(%esp) + ; SDAG-X86-NEXT: jne LBB5_1 + ; SDAG-X86-NEXT: ## %bb.2: + ; SDAG-X86-NEXT: leal {{[0-9]+}}(%esp), %ecx +@@ -563,7 +563,7 @@ + ; + ; SDAG-X86-CMOV-LABEL: select_cmov_i64: + ; SDAG-X86-CMOV: ## %bb.0: +-; SDAG-X86-CMOV-NEXT: cmpb $0, {{[0-9]+}}(%esp) ++; SDAG-X86-CMOV-NEXT: testb $1, {{[0-9]+}}(%esp) + ; SDAG-X86-CMOV-NEXT: leal {{[0-9]+}}(%esp), %eax + ; SDAG-X86-CMOV-NEXT: leal {{[0-9]+}}(%esp), %ecx + ; SDAG-X86-CMOV-NEXT: cmovnel %eax, %ecx +diff --git a/test/CodeGen/X86/select-constant-xor.ll b/test/CodeGen/X86/select-constant-xor.ll +index efc367d204..5d80e04fef 100644 +--- a/test/CodeGen/X86/select-constant-xor.ll ++++ b/test/CodeGen/X86/select-constant-xor.ll +@@ -172,8 +172,10 @@ + define i32 @icmpasreq(i32 %input, i32 %a, i32 %b) { + ; X86-LABEL: icmpasreq: + ; X86: # %bb.0: +-; X86-NEXT: cmpl $0, {{[0-9]+}}(%esp) +-; X86-NEXT: js .LBB8_1 ++; X86-NEXT: movl {{[0-9]+}}(%esp), %eax ++; X86-NEXT: sarl $31, %eax ++; X86-NEXT: cmpl $-1, %eax ++; X86-NEXT: je .LBB8_1 + ; X86-NEXT: # %bb.2: + ; X86-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-NEXT: movl (%eax), %eax +@@ -198,8 +200,10 @@ + define i32 @icmpasrne(i32 %input, i32 %a, i32 %b) { + ; X86-LABEL: icmpasrne: + ; X86: # %bb.0: +-; X86-NEXT: cmpl $0, {{[0-9]+}}(%esp) +-; X86-NEXT: jns .LBB9_1 ++; X86-NEXT: movl {{[0-9]+}}(%esp), %eax ++; X86-NEXT: sarl $31, %eax ++; X86-NEXT: cmpl $-1, %eax ++; X86-NEXT: jne .LBB9_1 + ; X86-NEXT: # %bb.2: + ; X86-NEXT: leal {{[0-9]+}}(%esp), %eax + ; X86-NEXT: movl (%eax), %eax +diff --git a/test/CodeGen/X86/select-mmx.ll b/test/CodeGen/X86/select-mmx.ll +index 8a4308a5af..cc66033820 100644 +--- a/test/CodeGen/X86/select-mmx.ll ++++ b/test/CodeGen/X86/select-mmx.ll +@@ -85,8 +85,8 @@ + ; X86-NEXT: .cfi_def_cfa_register %ebp + ; X86-NEXT: andl $-8, %esp + ; X86-NEXT: subl $8, %esp +-; X86-NEXT: movl 8(%ebp), %eax +-; X86-NEXT: orl 12(%ebp), %eax ++; X86-NEXT: movl 12(%ebp), %eax ++; X86-NEXT: orl 8(%ebp), %eax + ; X86-NEXT: je .LBB1_1 + ; X86-NEXT: # %bb.2: + ; X86-NEXT: leal 24(%ebp), %eax +diff --git a/test/CodeGen/X86/select-of-load-poison.ll b/test/CodeGen/X86/select-of-load-poison.ll +new file mode 100644 +index 0000000000..1f71f812d2 +--- /dev/null ++++ b/test/CodeGen/X86/select-of-load-poison.ll +@@ -0,0 +1,20 @@ ++; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 6 ++; RUN: llc -mtriple=x86_64-unknown-linux-gnu < %s | FileCheck %s ++ ++; Make sure there is an and 1, otherwise a case where the select condition ++; was poison could result in an out of bounds read instead. ++define i32 @test(i32 %x, ptr %p) { ++; CHECK-LABEL: test: ++; CHECK: # %bb.0: ++; CHECK-NEXT: # kill: def $edi killed $edi def $rdi ++; CHECK-NEXT: andl $1, %edi ++; CHECK-NEXT: movl 4(%rsi,%rdi,4), %eax ++; CHECK-NEXT: retq ++ %p1 = getelementptr i8, ptr %p, i64 4 ++ %v1 = load i32, ptr %p1 ++ %p2 = getelementptr i8, ptr %p, i64 8 ++ %v2 = load i32, ptr %p2 ++ %c = trunc nuw i32 %x to i1 ++ %v = select i1 %c, i32 %v2, i32 %v1 ++ ret i32 %v ++} diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index a886dac9c709..2b872a8a45c8 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -222,7 +222,19 @@ stdenv.mkDerivation ( hash = "sha256-3hkbYPUVRAtWpo5qBmc2jLZLivURMx8T0GQomvNZesc="; stripLen = 1; } - ); + ) + ++ lib.optionals (lib.versions.major release_version == "21") [ + # Several LLVM versions have a bug in SelectionDAG that causes + # miscompilations around conditional poisions. This was exposed due to + # Rust 1.97.0 exercising the involved code path heavily and generating + # segfaulting code. The patch was made to LLVM 23, but the tests have + # many conflicts, so we vendor a version-specific modified version. + # + # Rust issue: https://github.com/rust-lang/rust/issues/159035 + # LLVM issue: https://github.com/llvm/llvm-project/issues/208611 + # LLVM PR: https://github.com/llvm/llvm-project/pull/208683 + (getVersionFile "llvm/sdag-freeze-condition-in-select-of-load-fold.patch") + ]; nativeBuildInputs = [ cmake diff --git a/pkgs/development/compilers/mlton/meta.nix b/pkgs/development/compilers/mlton/meta.nix index acfc311ead7a..da20c74428a7 100644 --- a/pkgs/development/compilers/mlton/meta.nix +++ b/pkgs/development/compilers/mlton/meta.nix @@ -19,7 +19,6 @@ "i686-linux" "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; } diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index c3a3d41f63f9..a060945dd550 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -39,10 +39,6 @@ stdenv.mkDerivation rec { url = url + "linux-arm64.tar.gz"; sha256 = "1ws5h337xq0l06zrs9010h6wj2hq5cqk5ikp9arq7hj7lxf43vn5"; }; - "x86_64-darwin" = fetchurl { - url = url + "macos.tar.gz"; - sha256 = "178ix54k2yragcgn0j8z1cfa78s1qbh1bsx3v9jnngby8igr6yn3"; - }; "aarch64-darwin" = fetchurl { url = url + "macos-arm64.tar.gz"; sha256 = "0bi231z1yhb7kjfn228wjkj6rv9lgpagz9f4djr2wy3kqgck4xg0"; @@ -90,7 +86,6 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "purs"; diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix index 7bf77a6832a2..5e0e8a633ba2 100644 --- a/pkgs/development/compilers/rust/binary.nix +++ b/pkgs/development/compilers/rust/binary.nix @@ -79,7 +79,6 @@ rec { targetPlatformsWithHostTools = [ # Platforms with host tools from # https://doc.rust-lang.org/nightly/rustc/platform-support.html - "x86_64-darwin" "aarch64-darwin" "i686-freebsd" "x86_64-freebsd" diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 112349190c1f..439a3d5fe62e 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -326,7 +326,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.attrNames bootstrapBinaries ++ [ # These aren’t bootstrapped using the binary distribution but compiled # using a separate (lisp) host - "x86_64-darwin" "x86_64-linux" "aarch64-darwin" "aarch64-linux" diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix index c31d89f5b588..0882b425b7e0 100644 --- a/pkgs/development/compilers/smlnj/default.nix +++ b/pkgs/development/compilers/smlnj/default.nix @@ -89,7 +89,6 @@ stdenv.mkDerivation { platforms = [ "x86_64-linux" "i686-linux" - "x86_64-darwin" "aarch64-darwin" ]; maintainers = with lib.maintainers; [ diff --git a/pkgs/development/compilers/zulu/11.nix b/pkgs/development/compilers/zulu/11.nix index c2cd6f3de104..1e52cceeab2d 100644 --- a/pkgs/development/compilers/zulu/11.nix +++ b/pkgs/development/compilers/zulu/11.nix @@ -30,15 +30,6 @@ callPackage ./common.nix ( "sha256-j6ItLEU1W32zgfky+M2mD5WSmeKDYWfXnwzLOxRl8Ps="; }; - x86_64-darwin = { - inherit zuluVersion jdkVersion; - hash = - if enableJavaFX then - "sha256-slk4EU7Zl0cW2y2JBiCJ8yGs5h+cK2f81tRCgBOq5uA=" - else - "sha256-+3OC3mQOo2ucJG0OACk7IJtTvTwPn5WPbcG5cT9DAAc="; - }; - aarch64-darwin = { inherit zuluVersion jdkVersion; hash = diff --git a/pkgs/development/compilers/zulu/17.nix b/pkgs/development/compilers/zulu/17.nix index fa68676e51b0..e90fa2f17bf7 100644 --- a/pkgs/development/compilers/zulu/17.nix +++ b/pkgs/development/compilers/zulu/17.nix @@ -30,15 +30,6 @@ callPackage ./common.nix ( "sha256-wX1WV6ZzwM/AmenYA+0wSYSViU1zWf0QZNRjCT7ZhQs="; }; - x86_64-darwin = { - inherit zuluVersion jdkVersion; - hash = - if enableJavaFX then - "sha256-3DHXEjYN9RXYD4sB/75/fATzPAwJmZv3D+PaSU8qrog=" - else - "sha256-anuLI/JBnqHd5+6s4NWkzF2+e7yDqN2jXcZKoSJp0EE="; - }; - aarch64-darwin = { inherit zuluVersion jdkVersion; hash = diff --git a/pkgs/development/compilers/zulu/21.nix b/pkgs/development/compilers/zulu/21.nix index 8ac8b68956a3..53651e64c312 100644 --- a/pkgs/development/compilers/zulu/21.nix +++ b/pkgs/development/compilers/zulu/21.nix @@ -32,15 +32,6 @@ callPackage ./common.nix ( "sha256-zUvl6u1Q0rgUhd/iYOL6t+LJCoVL8Rt7+07raTZ1fEo="; }; - x86_64-darwin = { - inherit zuluVersion jdkVersion; - hash = - if enableJavaFX then - "sha256-5/L0FqpL6488uwzimXh9G6Io2cCTnU1+8n/6E+CNDK8=" - else - "sha256-kGmQy+WZcx48jshfem8uctSg+ewcwYtrUqFuHi/Fk00="; - }; - aarch64-darwin = { inherit zuluVersion jdkVersion; hash = diff --git a/pkgs/development/compilers/zulu/25.nix b/pkgs/development/compilers/zulu/25.nix index 02565164dc60..359e374ed355 100644 --- a/pkgs/development/compilers/zulu/25.nix +++ b/pkgs/development/compilers/zulu/25.nix @@ -32,15 +32,6 @@ callPackage ./common.nix ( "sha256-JhDlxk35TO5ftZHXAYPFv4Uy2OHTlMdU6LoGdRvM6xs="; }; - x86_64-darwin = { - inherit zuluVersion jdkVersion; - hash = - if enableJavaFX then - "sha256-jOSgISihoNoGa5x8kBUpudCQi7Vj3O3H3jOG3W3UujA=" - else - "sha256-7MAFv3sSnANTeeDem+v9ZnvpMJj18eMpzUmMRnaRZ64="; - }; - aarch64-darwin = { inherit zuluVersion jdkVersion; hash = diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index 8c34bd80dd05..7df788337edc 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/pkgs/development/compilers/zulu/8.nix @@ -30,15 +30,6 @@ callPackage ./common.nix ( "sha256-JPXoGDpS77WrzuK4FzsIhwibp0dvEbwVYDRkNTzE5Kg="; }; - x86_64-darwin = { - inherit zuluVersion jdkVersion; - hash = - if enableJavaFX then - "sha256-5r2/yl4xHjLpaakRZ/khICGxUaoKk1GDvPJ56pliIwc=" - else - "sha256-URSyabiOPYmw1rLCivDJa1SJ80D7re2PoXYTsq3KGAw="; - }; - aarch64-darwin = { inherit zuluVersion jdkVersion; hash = diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index 0957c9fe52ce..33bcd8bc337a 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -18,7 +18,6 @@ let targets = { x86_64-linux = "x86_64-linux"; aarch64-linux = "aarch64-linux"; - x86_64-darwin = "x86_64-macos"; aarch64-darwin = "aarch64-macos"; riscv32-linux = "rv32-linux"; riscv64-linux = "rv64-linux"; diff --git a/pkgs/development/interpreters/janet/jpm.nix b/pkgs/development/interpreters/janet/jpm.nix index be7b1ed40671..b28da4b06710 100644 --- a/pkgs/development/interpreters/janet/jpm.nix +++ b/pkgs/development/interpreters/janet/jpm.nix @@ -9,7 +9,6 @@ let platformFiles = { aarch64-darwin = "macos_config.janet"; aarch64-linux = "linux_config.janet"; - x86_64-darwin = "macos_config.janet"; x86_64-linux = "linux_config.janet"; }; diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index cf84bbe2b86c..164d1e56bc2a 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -163,7 +163,6 @@ aarch64-linux = "sha256-/onU/UrxP3bf5zFZdQA1GM8XZSDjzOwVRKiNF09QkQ4="; x86_64-linux = "sha256-04RFUIwurxTrs4DZwd7TIcXr6uMcfmaAAXPYPLjd9CM="; aarch64-darwin = "sha256-KHgOC5CK1ttLTglvQjcSS+eezJcxlG2EDZyHSetnp1k="; - x86_64-darwin = "sha256-a+KNRI2OZP/8WG2bCuTQkGSoPMrrW4BgxlHFzZrgaHg="; } .${stdenv.system}; pythonVersion = "2.7"; @@ -183,7 +182,6 @@ aarch64-linux = "sha256-ryeliRePERmOIkSrZcpRBjC6l8Ex18zEAh61vFjef1c="; x86_64-linux = "sha256-xzrCzCOArJIn/Sl0gr8qPheoBhi6Rtt1RNU1UVMh7B4="; aarch64-darwin = "sha256-PbigP8SWFkgBZGhE1/OxK6oK2zrZoLfLEkUhvC4WijY="; - x86_64-darwin = "sha256-LF5cKjOsiCVR1/KLmNGdSGuJlapQgkpztO3Mau7DXGM="; } .${stdenv.system}; pythonVersion = "3.10"; @@ -203,7 +201,6 @@ aarch64-linux = "sha256-EyB9v4HOJOltp2CxuGNie3e7ILH7TJUZHgKgtyOD33Q="; x86_64-linux = "sha256-kXfZ4LuRsF+SHGQssP9xoPNlO10ppC1A1qB4wVt1cg8="; aarch64-darwin = "sha256-dwTg1TAuU5INMtz+mv7rEENtTJQjPogwz2A6qVWoYcE="; - x86_64-darwin = "sha256-okOfnTDf2ulqXpEBx9xUqKaLVsnXMU6jmbCiXT6H67I="; } .${stdenv.system}; pythonVersion = "3.11"; diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index dc27dd608c2a..01af9e249839 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -398,7 +398,6 @@ stdenv.mkDerivation rec { "aarch64-linux" "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" ]; broken = optimizationLevel == "0"; # generates invalid code maintainers = with lib.maintainers; [ diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix index 36246d0dbf68..6d5ce0fc11c9 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -63,7 +63,6 @@ let aarch64-linux = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-aarch64.tar.bz2"; x86_64-linux = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-linux64.tar.bz2"; aarch64-darwin = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-macos_arm64.tar.bz2"; - x86_64-darwin = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-macos_x86_64.tar.bz2"; }; in diff --git a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix index 04d249224c90..ea547c5f8bac 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix @@ -63,7 +63,6 @@ let aarch64-linux = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-aarch64.tar.bz2"; x86_64-linux = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-linux64.tar.bz2"; aarch64-darwin = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-macos_arm64.tar.bz2"; - x86_64-darwin = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-macos_x86_64.tar.bz2"; }; in diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix index 03cb3ae0db47..a5291d643e80 100644 --- a/pkgs/development/libraries/audio/libbass/default.nix +++ b/pkgs/development/libraries/audio/libbass/default.nix @@ -27,7 +27,6 @@ let x86_64-linux = "libs/x86_64/libbass.so"; armv7l-linux = "libs/armhf/libbass.so"; aarch64-linux = "libs/aarch64/libbass.so"; - x86_64-darwin = "libbass.dylib"; aarch64-darwin = "libbass.dylib"; }; url = { @@ -52,7 +51,6 @@ let x86_64-linux = "libs/x86_64/libbass_fx.so"; armv7l-linux = "libs/armhf/libbass_fx.so"; aarch64-linux = "libs/aarch64/libbass_fx.so"; - x86_64-darwin = "libbass_fx.dylib"; aarch64-darwin = "libbass_fx.dylib"; }; url = { @@ -80,7 +78,6 @@ let x86_64-linux = "libs/x86_64/libbassmidi.so"; armv7l-linux = "libs/armhf/libbassmidi.so"; aarch64-linux = "libs/aarch64/libbassmidi.so"; - x86_64-darwin = "libbassmidi.dylib"; aarch64-darwin = "libbassmidi.dylib"; }; url = { @@ -105,7 +102,6 @@ let x86_64-linux = "libs/x86_64/libbassmix.so"; armv7l-linux = "libs/armhf/libbassmix.so"; aarch64-linux = "libs/aarch64/libbassmix.so"; - x86_64-darwin = "libbassmix.dylib"; aarch64-darwin = "libbassmix.dylib"; }; url = { diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 89b6496971c1..2bb188c0d669 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -145,7 +145,6 @@ let armv5tel-linux = "./Configure linux-armv4 -march=armv5te"; armv6l-linux = "./Configure linux-armv4 -march=armv6"; armv7l-linux = "./Configure linux-armv4 -march=armv7-a"; - x86_64-darwin = "./Configure darwin64-x86_64-cc"; aarch64-darwin = "./Configure darwin64-arm64-cc"; x86_64-linux = "./Configure linux-x86_64"; x86_64-solaris = "./Configure solaris64-x86_64-gcc"; diff --git a/pkgs/development/libraries/qt-5/modules/qtmacextras.nix b/pkgs/development/libraries/qt-5/modules/qtmacextras.nix index 38fc7d0caae1..d54096a0ea31 100644 --- a/pkgs/development/libraries/qt-5/modules/qtmacextras.nix +++ b/pkgs/development/libraries/qt-5/modules/qtmacextras.nix @@ -2,11 +2,17 @@ lib, qtModule, qtbase, + llvmPackages, }: qtModule { pname = "qtmacextras"; propagatedBuildInputs = [ qtbase ]; + + # TODO: Remove once #536365 reaches this branch + nativeBuildInputs = [ llvmPackages.lld ]; + env.NIX_CFLAGS_LINK = "-fuse-ld=lld"; + meta = { maintainers = [ ]; platforms = lib.platforms.darwin; diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix index 8facbea4362b..1fab79f3eaef 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix @@ -284,7 +284,6 @@ qtModule { meta = { description = "Web engine based on the Chromium web browser"; platforms = [ - "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "armv7a-linux" diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix index 6416a1428ff1..8601104423a2 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix @@ -177,7 +177,6 @@ let "armv6l-linux" "armv7l-linux" "aarch64-linux" - "x86_64-darwin" ]; }; }; @@ -198,7 +197,6 @@ let "x86_64-linux" "armv6l-linux" "armv7l-linux" - "x86_64-darwin" ]; }; }; @@ -451,7 +449,6 @@ let "armv6l-linux" "armv7l-linux" "aarch64-linux" - "x86_64-darwin" ]; }; }; @@ -538,7 +535,6 @@ let "armv6l-linux" "armv7l-linux" "aarch64-linux" - "x86_64-darwin" ]; }; }; diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index ee5e6f12caa8..b1a0175dfde1 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -92,15 +92,6 @@ let USE_OPENMP = true; }; - x86_64-darwin = { - BINARY = 64; - TARGET = setTarget "ATHLON"; - DYNAMIC_ARCH = setDynamicArch true; - NO_AVX512 = !enableAVX512; - USE_OPENMP = false; - MACOSX_DEPLOYMENT_TARGET = "10.7"; - }; - x86_64-linux = { BINARY = 64; TARGET = setTarget "ATHLON"; diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 2cc05aa87349..31b17ddb90c8 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -236,7 +236,6 @@ { x86_64-linux = "https://packages.microsoft.com/debian/11/prod/pool/main/m/msodbcsql${finalAttrs.versionMajor}/msodbcsql${finalAttrs.versionMajor}_${finalAttrs.version}_amd64.deb"; aarch64-linux = "https://packages.microsoft.com/debian/11/prod/pool/main/m/msodbcsql${finalAttrs.versionMajor}/msodbcsql${finalAttrs.versionMajor}_${finalAttrs.version}_arm64.deb"; - x86_64-darwin = "https://download.microsoft.com/download/6/4/0/64006503-51e3-44f0-a6cd-a9b757d0d61b/msodbcsql${finalAttrs.versionMajor}-${finalAttrs.version}-amd64.tar.gz"; aarch64-darwin = "https://download.microsoft.com/download/6/4/0/64006503-51e3-44f0-a6cd-a9b757d0d61b/msodbcsql${finalAttrs.versionMajor}-${finalAttrs.version}-arm64.tar.gz"; } .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); @@ -244,7 +243,6 @@ { x86_64-linux = "sha256:1f0rmh1aynf1sqmjclbsyh2wz5jby0fixrwz71zp6impxpwvil52"; aarch64-linux = "sha256:0zphnbvkqdbkcv6lvv63p7pyl68h5bs2dy6vv44wm6bi89svms4a"; - x86_64-darwin = "sha256:1fn80byn1yihflznxcm9cpj42mpllnz54apnk9n46vzm2ng2lj6d"; aarch64-darwin = "sha256:116xl8r2apr5b48jnq6myj9fwqs88yccw5176yfyzh4534fznj5x"; } .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index e9abdb69085d..5146a9936fe4 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -471,18 +471,18 @@ final: prev: { }: buildLuarocksPackage { pname = "compat53"; - version = "0.14.4-1"; + version = "0.15.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/compat53-0.14.4-1.rockspec"; - sha256 = "01ahfb6g7ibxrlvypvrsry4pwzfj978afjfa9c5w1s7ahjf95d40"; + url = "mirror://luarocks/compat53-0.15.0-1.rockspec"; + sha256 = "0389ghggjdbfxxa6nrb7364z55dmb832qyb8v4474nzcws0b0aqf"; }).outPath; src = fetchzip { - url = "https://github.com/lunarmodules/lua-compat-5.3/archive/v0.14.4.zip"; - sha256 = "16mvf6qq290m8pla3fq3r6d6fmbbysjy8b5rxi40hchs4ngrn847"; + url = "https://github.com/lunarmodules/lua-compat-5.3/archive/v0.15.0.zip"; + sha256 = "164hcigjz7my1zlgccdbvsld89bvz6y16v82rjc8n2qa8ah5j45d"; }; - disabled = luaOlder "5.1" || luaAtLeast "5.5"; + disabled = luaOlder "5.1" || luaAtLeast "5.6"; meta = { homepage = "https://github.com/lunarmodules/lua-compat-5.3"; @@ -1167,15 +1167,15 @@ final: prev: { }: buildLuarocksPackage { pname = "grug-far.nvim"; - version = "1.6.72-1"; + version = "1.6.74-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/grug-far.nvim-1.6.72-1.rockspec"; - sha256 = "1ky24vksn0wvv058pvv03r163ba07s8b051mwi99qna2y77js2ds"; + url = "mirror://luarocks/grug-far.nvim-1.6.74-1.rockspec"; + sha256 = "0g8nb4w6l6bwnpy54xy5qncwn3hp0dcay1gfqrjfsf9j5pm3ysmg"; }).outPath; src = fetchzip { - url = "https://github.com/MagicDuck/grug-far.nvim/archive/c69859c1d5427ab5fc7ed12380ab521b4e336691.zip"; - sha256 = "0yp64zp64zk5skf3blx359dmchy9wwfv4nf30hhdagvm8phbkkpx"; + url = "https://github.com/MagicDuck/grug-far.nvim/archive/1cc080f55706b38aabfa97d40acb6adf59ac4a5a.zip"; + sha256 = "0aybgj5h8d6ydm304ybgw506rrrvmcdis3pclyjv9adi4z61a9fn"; }; disabled = luaOlder "5.1"; @@ -5186,8 +5186,8 @@ final: prev: { src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "a1d504892f2bc56c2e79b65c6faded2fd21f3eca"; - hash = "sha256-uzfM8DLRKshESsYmUAbSfXtos9COWpe/fVkxNJPIUFw="; + rev = "2ffe79f1f021def8dd1fcd81deb16f1bb0d989f3"; + hash = "sha256-YN8KAXVv1AFc3DajWVIl+EppOx/s3vdxiKMlb/lj5qc="; }; disabled = luaOlder "5.1" || luaAtLeast "5.4"; @@ -6125,17 +6125,17 @@ final: prev: { }: buildLuarocksPackage { pname = "teal-language-server"; - version = "0.2.0-1"; + version = "0.2.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/teal-language-server-0.2.0-1.rockspec"; - sha256 = "16345jk69raavia6gnx6qcnllwlhmjqbnaffbr67if20iglgwyy6"; + url = "mirror://luarocks/teal-language-server-0.2.1-1.rockspec"; + sha256 = "0dfqalvzsmvspmxp54pp9z4icx6k7ah6xz99lrnkhx01f798kf8z"; }).outPath; src = fetchFromGitHub { owner = "teal-language"; repo = "teal-language-server"; - tag = "0.2.0"; - hash = "sha256-ZjvGvdyd+NLQU1lSYvHQYtt9ShbszMKqhNtOoWpzO1g="; + tag = "0.2.1"; + hash = "sha256-nrgop5L9RARx64ZbyIWzW3/8n9Vm4YSugLHgOnznVSs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index 7a92939e33fb..6d854daf2331 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -167,7 +167,6 @@ let os = { x86_64-linux = "linux"; - x86_64-darwin = "macosx"; aarch64-linux = "linux"; aarch64-darwin = "macosx"; } @@ -177,7 +176,6 @@ let arch = { x86_64-linux = "x64"; - x86_64-darwin = "x64"; aarch64-linux = "aarch64"; aarch64-darwin = "aarch64"; } diff --git a/pkgs/development/php-packages/relay/default.nix b/pkgs/development/php-packages/relay/default.nix index de06abf98913..f6f257af3b44 100644 --- a/pkgs/development/php-packages/relay/default.nix +++ b/pkgs/development/php-packages/relay/default.nix @@ -220,7 +220,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/development/python-modules/asyncinotify/default.nix b/pkgs/development/python-modules/asyncinotify/default.nix index 93b913c23f41..1161fee3e85c 100644 --- a/pkgs/development/python-modules/asyncinotify/default.nix +++ b/pkgs/development/python-modules/asyncinotify/default.nix @@ -30,7 +30,6 @@ buildPythonPackage rec { badPlatforms = [ # Unsupported and crashing on import in dlsym with symbol not found "aarch64-darwin" - "x86_64-darwin" ]; description = "Module for inotify"; homepage = "https://github.com/absperf/asyncinotify/"; diff --git a/pkgs/development/python-modules/clarifai-protocol/default.nix b/pkgs/development/python-modules/clarifai-protocol/default.nix index d3036cb894ae..c8f9dc905823 100644 --- a/pkgs/development/python-modules/clarifai-protocol/default.nix +++ b/pkgs/development/python-modules/clarifai-protocol/default.nix @@ -15,7 +15,6 @@ let "aarch64-linux" = "manylinux_2_17_aarch64.manylinux2014_aarch64"; "x86_64-linux" = "manylinux_2_17_x86_64.manylinux2014_x86_64"; "aarch64-darwin" = "macosx_11_0_universal2"; - "x86_64-darwin" = "macosx_11_0_universal2"; }; key = diff --git a/pkgs/development/python-modules/cloudflare/default.nix b/pkgs/development/python-modules/cloudflare/default.nix index b5058ee3e3bb..33f08b7e66d4 100644 --- a/pkgs/development/python-modules/cloudflare/default.nix +++ b/pkgs/development/python-modules/cloudflare/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "cloudflare"; - version = "5.4.0"; + version = "5.5.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-hj8qI0p9LM6ff/nErgt+YvOfWFBElLxJ2QI6IT0prOs="; + hash = "sha256-pXFvBqv/FyHQLsuc6DuhXYeVwhbQHCEtTlWzvKb6hiE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/datefinder/default.nix b/pkgs/development/python-modules/datefinder/default.nix index 953bd24bb409..e69eb68848fd 100644 --- a/pkgs/development/python-modules/datefinder/default.nix +++ b/pkgs/development/python-modules/datefinder/default.nix @@ -2,25 +2,30 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, pytestCheckHook, python-dateutil, pytz, regex, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "datefinder"; version = "0.7.3"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "akoumjian"; repo = "datefinder"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-uOSwS+mHgbvEL+rTfs4Ax9NvJnhYemxFVqqDssy2i7g="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ regex pytz python-dateutil @@ -39,4 +44,4 @@ buildPythonPackage rec { despsyched ]; }; -} +}) diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 74cd18a20174..17373e25ec6a 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -87,7 +87,6 @@ buildPythonPackage rec { "i686-linux" = "-shared -o attach_linux_x86.so"; "aarch64-linux" = "-shared -o attach_linux_arm64.so"; "riscv64-linux" = "-shared -o attach_linux_riscv64.so"; - "x86_64-darwin" = "-D_REENTRANT -dynamiclib -lc -o attach.dylib"; "aarch64-darwin" = "-D_REENTRANT -dynamiclib -lc -o attach.dylib"; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}") @@ -156,7 +155,6 @@ buildPythonPackage rec { "x86_64-linux" "i686-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" "riscv64-linux" ]; diff --git a/pkgs/development/python-modules/django-haystack/default.nix b/pkgs/development/python-modules/django-haystack/default.nix index 847843fd21e4..0991cfbd6d1a 100644 --- a/pkgs/development/python-modules/django-haystack/default.nix +++ b/pkgs/development/python-modules/django-haystack/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "django-haystack"; - version = "3.3.0"; + version = "3.4.0"; pyproject = true; src = fetchPypi { pname = "django_haystack"; inherit version; - hash = "sha256-487ta4AAYl2hTUCetNrGmJSQXirIrBj5v9tZMjygLqs="; + hash = "sha256-Eianyc4T4efq2KyD9uh7/vSZbxRu0klx/eeJYRWxxTA="; }; build-system = [ @@ -59,8 +59,6 @@ buildPythonPackage rec { ''; meta = { - # crashes in threading during tests - broken = pythonAtLeast "3.14"; description = "Pluggable search for Django"; homepage = "http://haystacksearch.org/"; changelog = "https://github.com/django-haystack/django-haystack/releases/tag/v${version}"; diff --git a/pkgs/development/python-modules/frida-python/default.nix b/pkgs/development/python-modules/frida-python/default.nix index 54c58c43304f..b27adaa57ef1 100644 --- a/pkgs/development/python-modules/frida-python/default.nix +++ b/pkgs/development/python-modules/frida-python/default.nix @@ -20,10 +20,6 @@ let hash = "sha256-00gr7AWA0ynXmZrvNWphPWkkpeDOOqWIZMKe+jbeAFA="; platform = "manylinux2014_aarch64"; }; - x86_64-darwin = { - hash = "sha256-7d7jWTT5yueVBfIYSZoxCDHXcxjom9JP9nfzBJqxd8I="; - platform = "macosx_10_13_x86_64"; - }; aarch64-darwin = { hash = "sha256-AmTFwqjE2huyFwabx6gWdRnymy+pPVqBvlJWzQQb3H4="; platform = "macosx_11_0_arm64"; @@ -65,7 +61,6 @@ buildPythonPackage { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/development/python-modules/gurobipy/default.nix b/pkgs/development/python-modules/gurobipy/default.nix index ff9e30f2ef1f..7f6688a7ee19 100644 --- a/pkgs/development/python-modules/gurobipy/default.nix +++ b/pkgs/development/python-modules/gurobipy/default.nix @@ -9,11 +9,10 @@ let format = "wheel"; pyShortVersion = "cp" + builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; - platforms = rec { + platforms = { aarch64-darwin = if pyShortVersion == "cp314" then "macosx_10_15_universal2" else "macosx_10_13_universal2"; aarch64-linux = "manylinux_2_26_aarch64"; - x86_64-darwin = aarch64-darwin; x86_64-linux = "manylinux2014_x86_64.manylinux_2_17_x86_64"; }; platform = platforms.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); diff --git a/pkgs/development/python-modules/hyperscan/default.nix b/pkgs/development/python-modules/hyperscan/default.nix index 5931a4ef227a..2d74a368bf31 100644 --- a/pkgs/development/python-modules/hyperscan/default.nix +++ b/pkgs/development/python-modules/hyperscan/default.nix @@ -59,7 +59,6 @@ buildPythonPackage rec { changelog = "https://github.com/darvid/python-hyperscan/blob/${src.tag}/CHANGELOG.md"; platforms = [ "x86_64-linux" - "x86_64-darwin" ]; license = lib.licenses.mit; maintainers = [ ]; diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index 1dce7d1025ad..7b4324041314 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -145,12 +145,5 @@ buildPythonPackage { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ samuela ]; - badPlatforms = [ - # Fails at pythonImportsCheckPhase: - # ...-python-imports-check-hook.sh/nix-support/setup-hook: line 10: 28017 Illegal instruction: 4 - # /nix/store/5qpssbvkzfh73xih07xgmpkj5r565975-python3-3.11.9/bin/python3.11 -c - # 'import os; import importlib; list(map(lambda mod: importlib.import_module(mod), os.environ["pythonImportsCheck"].split()))' - "x86_64-darwin" - ]; }; } diff --git a/pkgs/development/python-modules/jedi-language-server/default.nix b/pkgs/development/python-modules/jedi-language-server/default.nix index ee63c0a81d29..67906be1a8f5 100644 --- a/pkgs/development/python-modules/jedi-language-server/default.nix +++ b/pkgs/development/python-modules/jedi-language-server/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, # build-system - poetry-core, + hatchling, # dependencies docstring-to-markdown, @@ -23,18 +23,18 @@ buildPythonPackage rec { pname = "jedi-language-server"; - version = "0.46.0"; + version = "0.47.0"; pyproject = true; src = fetchFromGitHub { owner = "pappasam"; repo = "jedi-language-server"; tag = "v${version}"; - hash = "sha256-8B/FYktdWtZvB8Us6zQ3gvx1MxJTzP2xyj1VhnM+Viw="; + hash = "sha256-UXFIVj2g/s669vgS9uLH+5qFjNFoIFhS5S6XDbzRYwU="; }; build-system = [ - poetry-core + hatchling ]; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/june-analytics-python/default.nix b/pkgs/development/python-modules/june-analytics-python/default.nix index 11866121c9bb..37d0a4c204c4 100644 --- a/pkgs/development/python-modules/june-analytics-python/default.nix +++ b/pkgs/development/python-modules/june-analytics-python/default.nix @@ -12,7 +12,7 @@ buildPythonPackage { pname = "june-analytics-python"; - version = "unstable-2022-07-26"; + version = "2.3.0-unstable-2022-07-26"; pyproject = true; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/kaleido/default.nix b/pkgs/development/python-modules/kaleido/default.nix index fcaf7d5adaac..5875c39af2ec 100644 --- a/pkgs/development/python-modules/kaleido/default.nix +++ b/pkgs/development/python-modules/kaleido/default.nix @@ -34,10 +34,6 @@ buildPythonPackage rec { url = "https://files.pythonhosted.org/packages/py2.py3/k/kaleido/kaleido-${version}-py2.py3-none-manylinux2014_aarch64.whl"; hash = "sha256-hFgZhEyAgslGnZwX5CYh+/hcKyN++KhuyKhSf5i2USo="; }; - x86_64-darwin = fetchurl { - url = "https://files.pythonhosted.org/packages/py2.py3/k/kaleido/kaleido-${version}-py2.py3-none-macosx_10_11_x86_64.whl"; - hash = "sha256-ym9z5/8AquvyhD9z8dO6zeGTDvUEEJP+drg6FXhQSac="; - }; aarch64-darwin = fetchurl { url = "https://files.pythonhosted.org/packages/py2.py3/k/kaleido/kaleido-${version}-py2.py3-none-macosx_11_0_arm64.whl"; hash = "sha256-u5pdH3EDV9XUMu4kDvZlim0STD5hCTWBe0tC2px4fAU="; @@ -98,7 +94,6 @@ buildPythonPackage rec { changelog = "https://github.com/plotly/Kaleido/releases"; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; diff --git a/pkgs/development/python-modules/paddleocr/default.nix b/pkgs/development/python-modules/paddleocr/default.nix index fe4bfbff0f11..5768eba865f4 100644 --- a/pkgs/development/python-modules/paddleocr/default.nix +++ b/pkgs/development/python-modules/paddleocr/default.nix @@ -111,7 +111,6 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ happysalada ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/development/python-modules/paddlex/default.nix b/pkgs/development/python-modules/paddlex/default.nix index 447ab23e545e..aa0f54ce56fb 100644 --- a/pkgs/development/python-modules/paddlex/default.nix +++ b/pkgs/development/python-modules/paddlex/default.nix @@ -79,7 +79,6 @@ buildPythonPackage (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/development/python-modules/pcodec/default.nix b/pkgs/development/python-modules/pcodec/default.nix index efa0a5bab919..9d87bcba9880 100644 --- a/pkgs/development/python-modules/pcodec/default.nix +++ b/pkgs/development/python-modules/pcodec/default.nix @@ -48,9 +48,5 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ flokli ]; - badPlatforms = [ - # Illegal instruction: 4 - "x86_64-darwin" - ]; }; } diff --git a/pkgs/development/python-modules/pyscf/default.nix b/pkgs/development/python-modules/pyscf/default.nix index 012d23f0dcfb..62db4dfa5c42 100644 --- a/pkgs/development/python-modules/pyscf/default.nix +++ b/pkgs/development/python-modules/pyscf/default.nix @@ -131,7 +131,6 @@ buildPythonPackage (finalAttrs: { license = lib.licenses.asl20; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; maintainers = [ lib.maintainers.sheepforce ]; diff --git a/pkgs/development/python-modules/pysdl3/default.nix b/pkgs/development/python-modules/pysdl3/default.nix index 86d8d5d637a9..9819fb6d9bde 100644 --- a/pkgs/development/python-modules/pysdl3/default.nix +++ b/pkgs/development/python-modules/pysdl3/default.nix @@ -106,7 +106,6 @@ buildPythonPackage rec { "aarch64-windows" "x86_64-windows" "aarch64-darwin" - "x86_64-darwin" ]; }; } diff --git a/pkgs/development/python-modules/python3-eventlib/0001-fixes-for-python3.14.patch b/pkgs/development/python-modules/python3-eventlib/0001-fixes-for-python3.14.patch new file mode 100644 index 000000000000..738b2f500328 --- /dev/null +++ b/pkgs/development/python-modules/python3-eventlib/0001-fixes-for-python3.14.patch @@ -0,0 +1,49 @@ +From c3076f3ae4567af11dc6815550487adaff69ce03 Mon Sep 17 00:00:00 2001 +From: phanirithvij +Date: Sun, 5 Jul 2026 18:30:15 +0530 +Subject: [PATCH] fixes for python3.14 + +Add fallback stubs for urllib attributes removed in Python 3.14. +--- + eventlib/green/urllib.py | 18 ++++++++++++++++-- + 1 file changed, 16 insertions(+), 2 deletions(-) + +diff --git a/eventlib/green/urllib.py b/eventlib/green/urllib.py +index 0c8e375..ba82160 100644 +--- a/eventlib/green/urllib.py ++++ b/eventlib/green/urllib.py +@@ -7,7 +7,12 @@ from eventlib.green import socket, time + from urllib.error import( __all__ ) + from urllib.response import( __all__ ) + from urllib.robotparser import( __all__ ) +-from urllib.request import( __all__, __version__, MAXFTPCACHE, ftpcache, ftpwrapper, _noheaders, noheaders, proxy_bypass, addinfourl, url2pathname, getproxies) ++try: ++ from urllib.request import( __all__, __version__, MAXFTPCACHE, ftpcache, ftpwrapper, _noheaders, noheaders, proxy_bypass, addinfourl, url2pathname, getproxies) ++except ImportError: ++ from urllib.request import( __all__, __version__, ftpwrapper, _noheaders, noheaders, proxy_bypass, addinfourl, url2pathname, getproxies) ++ MAXFTPCACHE = 10 ++ ftpcache = {} + from urllib.parse import( __all__, quote, unwrap, unquote, splithost, splituser, splittype, splitattr, splitpasswd, splitport, splitquery, splitvalue) + from urllib.parse import urljoin as basejoin + +@@ -41,7 +46,16 @@ def urlcleanup(): + _urlopener.cleanup() + + +-class URLopener(urllib.request.URLopener): ++try: ++ _URLopener = urllib.request.URLopener ++ _FancyURLopener = urllib.request.FancyURLopener ++except AttributeError: ++ class _URLopener(object): ++ def __init__(self, *args, **kwargs): pass ++ class _FancyURLopener(_URLopener): ++ pass ++ ++class URLopener(_URLopener): + + def open_http(self, url, data=None): + """Use HTTP protocol.""" +-- +2.54.0 + diff --git a/pkgs/development/python-modules/python3-eventlib/default.nix b/pkgs/development/python-modules/python3-eventlib/default.nix index a2e63e597ffa..34958a136738 100644 --- a/pkgs/development/python-modules/python3-eventlib/default.nix +++ b/pkgs/development/python-modules/python3-eventlib/default.nix @@ -20,6 +20,11 @@ buildPythonPackage (finalAttrs: { hash = "sha256-jN9nn+rI4TJLrEiEIoVxQ3XnXWSws1FenGUfG3doc94="; }; + patches = [ + # remove once new release with https://github.com/AGProjects/python3-eventlib/pull/4 + ./0001-fixes-for-python3.14.patch + ]; + build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix index 3dfedfa3eb98..37510d043d82 100644 --- a/pkgs/development/python-modules/qtile/default.nix +++ b/pkgs/development/python-modules/qtile/default.nix @@ -209,7 +209,7 @@ buildPythonPackage (finalAttrs: { ''; meta = { - homepage = "http://www.qtile.org/"; + homepage = "https://qtile.org/"; license = lib.licenses.mit; description = "Small, flexible, scriptable tiling window manager written in Python"; changelog = "https://github.com/qtile/qtile/blob/v${finalAttrs.version}/CHANGELOG"; diff --git a/pkgs/development/python-modules/scalene/default.nix b/pkgs/development/python-modules/scalene/default.nix index c1d583cd9bba..67ff7b76f9c5 100644 --- a/pkgs/development/python-modules/scalene/default.nix +++ b/pkgs/development/python-modules/scalene/default.nix @@ -138,10 +138,9 @@ buildPythonPackage (finalAttrs: { # The scalene doesn't seem to account for arm64 linux "aarch64-linux" - # On darwin, builds 1) assume aarch64 and 2) mistakenly compile one part as - # x86 and the other as arm64 then tries to link them into a single binary + # On darwin, builds mistakenly compile one part as x86 and the + # other as arm64 then tries to link them into a single binary # which fails. - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/development/python-modules/semgrep/common.nix b/pkgs/development/python-modules/semgrep/common.nix index cd5ff594de3c..e6343b7edba9 100644 --- a/pkgs/development/python-modules/semgrep/common.nix +++ b/pkgs/development/python-modules/semgrep/common.nix @@ -35,10 +35,6 @@ rec { platform = "manylinux_2_34_aarch64"; hash = "sha256-N24E9xOyRO7pXopRs+gSQM2nwHE214GfcntcoH7H7Kk="; }; - x86_64-darwin = { - platform = "macosx_10_14_x86_64"; - hash = "sha256-O0kSaWou5GeoVo1UMP4J2m4RAQOQUqA+YG3PaOvjfAo="; - }; aarch64-darwin = { platform = "macosx_11_0_arm64"; hash = "sha256-AsKxA5Wmy3NEQJ0kS6ylE33d0W86e9F494aiIkwyrcA="; diff --git a/pkgs/development/python-modules/starlette-admin/default.nix b/pkgs/development/python-modules/starlette-admin/default.nix index 500a940a2139..4e943633c6c8 100644 --- a/pkgs/development/python-modules/starlette-admin/default.nix +++ b/pkgs/development/python-modules/starlette-admin/default.nix @@ -41,14 +41,14 @@ buildPythonPackage rec { pname = "starlette-admin"; - version = "0.16.1"; + version = "0.17.0"; pyproject = true; src = fetchFromGitHub { owner = "jowilf"; repo = "starlette-admin"; tag = version; - hash = "sha256-K6FHC7nzOjRh7O47QHveMPwspfvPChHzB6Tpyfsx02U="; + hash = "sha256-1hLBGFECucEv1pHDGtk5GXUKUmWWetA72dnn7ayHA4U="; }; patches = [ diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index 4edddcbf0d99..23d61c163664 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -240,7 +240,6 @@ buildPythonPackage (finalAttrs: { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.asl20; maintainers = [ ]; - badPlatforms = [ "x86_64-darwin" ]; # unsupported combination broken = stdenv.hostPlatform.isDarwin && cudaSupport; }; diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index cdc0883ab92b..ddaa3a9a981f 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -526,7 +526,6 @@ let "sha256-ty5+51BwHWE1xR4/0WcWTp608NzSAS/iiyN+9zx7/wI=" else "sha256-9btXrNHqd720oXTPDhSmFidv5iaZRLjCVX8opmrMjXk="; - x86_64-darwin = "sha256-gqb03kB0z2pZQ6m1fyRp1/Nbt8AVVHWpOJSeZNCLc4w="; aarch64-darwin = "sha256-WdgAaFZU+ePwWkVBhLzjlNT7ELfGHOTaMdafcAMD5yo="; } .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); diff --git a/pkgs/development/python-modules/ultralytics/default.nix b/pkgs/development/python-modules/ultralytics/default.nix index 1c7ff6bfe8df..b4ab1b2b0d7a 100644 --- a/pkgs/development/python-modules/ultralytics/default.nix +++ b/pkgs/development/python-modules/ultralytics/default.nix @@ -138,10 +138,5 @@ buildPythonPackage (finalAttrs: { osbm mana-byte ]; - badPlatforms = [ - # Tests crash with: - # Fatal Python error: Segmentation fault for x86_64 Darwin in tests/python.py - "x86_64-darwin" - ]; }; }) diff --git a/pkgs/development/python-modules/unstructured-inference/default.nix b/pkgs/development/python-modules/unstructured-inference/default.nix index c177b301f2a1..b0818f002391 100644 --- a/pkgs/development/python-modules/unstructured-inference/default.nix +++ b/pkgs/development/python-modules/unstructured-inference/default.nix @@ -106,7 +106,6 @@ buildPythonPackage (finalAttrs: { maintainers = with lib.maintainers; [ happysalada ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/development/python-modules/utils/default.nix b/pkgs/development/python-modules/utils/default.nix index d7d229d44ed7..ced84a781e69 100644 --- a/pkgs/development/python-modules/utils/default.nix +++ b/pkgs/development/python-modules/utils/default.nix @@ -2,22 +2,27 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, mock, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "utils"; version = "1.0.1"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "haaksmash"; repo = "pyutils"; - rev = version; - sha256 = "07pr39cfw5ayzkp6h53y7lfpd0w19pphsdzsf100fsyy3npavgbr"; + tag = finalAttrs.version; + hash = "sha256-eb2trh3eawdAcPo3De9NgYN2HT1+FGju/F4V7lga+R4="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ mock pytestCheckHook @@ -31,4 +36,4 @@ buildPythonPackage rec { license = with lib.licenses; [ lgpl3Only ]; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/vcversioner/default.nix b/pkgs/development/python-modules/vcversioner/default.nix index d0f69829980e..0917620dd968 100644 --- a/pkgs/development/python-modules/vcversioner/default.nix +++ b/pkgs/development/python-modules/vcversioner/default.nix @@ -2,21 +2,29 @@ lib, buildPythonPackage, fetchPypi, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "vcversioner"; version = "2.16.0.0"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; - sha256 = "16z10sm78jd7ca3jbkgc3q5i8a8q7y1h21q1li21yy3rlhbhrrns"; + pname = "vcversioner"; + inherit (finalAttrs) version; + hash = "sha256-2uYMF6R5eB9EpAEHAYM/GCkUCx7szSWHYqdJdKoG4Zs="; }; + build-system = [ setuptools ]; + + pythonImportsCheck = [ "vcversioner" ]; + meta = { description = "Take version numbers from version control"; homepage = "https://github.com/habnabit/vcversioner"; license = lib.licenses.isc; }; -} +}) diff --git a/pkgs/development/python-modules/vl-convert-python/librusty_v8.nix b/pkgs/development/python-modules/vl-convert-python/librusty_v8.nix index 636b86d4c6e1..7a1c99a03f23 100644 --- a/pkgs/development/python-modules/vl-convert-python/librusty_v8.nix +++ b/pkgs/development/python-modules/vl-convert-python/librusty_v8.nix @@ -24,7 +24,6 @@ fetch_librusty_v8 { shas = { x86_64-linux = "sha256-f7aDA74Jn2h4rp9sACGHX4DBbN6yevgWCEKdfI1fJDU="; aarch64-linux = "sha256-vuEP7in+A/PrBXSunRq1SC77dOuMiScsKcA712AuNuk="; - x86_64-darwin = "sha256-sNe2VCwZvy64jdbPwx7pZ91fFRv1xosOcGiAtSPbt8A="; aarch64-darwin = "sha256-GmwTJADMxArwOvRN/w5KVmWGc1+WfraBc/wWe7dxHMg="; }; } diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix index 8bd0a566fe8a..e7cf14357a5c 100644 --- a/pkgs/development/python-modules/vllm/default.nix +++ b/pkgs/development/python-modules/vllm/default.nix @@ -598,11 +598,6 @@ buildPythonPackage.override { stdenv = torch.stdenv; } (finalAttrs: { # vLLM CPU backend requires AVX512, AVX2, Power9+ ISA, S390X ISA, ARMv8 or # RISC-V support. "aarch64-darwin" - - # CMake Error at cmake/cpu_extension.cmake:78 (find_isa): - # find_isa Function invoked with incorrect arguments for function named: - # find_isa - "x86_64-darwin" ]; knownVulnerabilities = [ "CVE-2026-25960" diff --git a/pkgs/development/python-modules/wassima/default.nix b/pkgs/development/python-modules/wassima/default.nix index b39234226445..270fe5121bd6 100644 --- a/pkgs/development/python-modules/wassima/default.nix +++ b/pkgs/development/python-modules/wassima/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "wassima"; - version = "2.1.1"; + version = "2.1.2"; pyproject = true; src = fetchFromGitHub { owner = "jawah"; repo = "wassima"; tag = finalAttrs.version; - hash = "sha256-uH8UBsdqnPbGyQX/Tn5Ct3vcbfLEyUC8pDSCM4PwWZg="; + hash = "sha256-19y1dohS1WikfxRGOrgIqwdfBdGe7MDo9MTSXnNjfWA="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index d4247b7a1329..749ab60242f5 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -115,7 +115,6 @@ let "aarch64-linux" "i686-windows" "x86_64-cygwin" - "x86_64-darwin" "x86_64-linux" "x86_64-windows" ], diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix index a913a12d13b8..764689ce0a3e 100644 --- a/pkgs/development/tools/electron/binary/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -53,7 +53,6 @@ let mainProgram = "electron"; teams = [ lib.teams.electron ]; platforms = [ - "x86_64-darwin" "x86_64-linux" "armv7l-linux" "aarch64-linux" @@ -83,7 +82,6 @@ let x86_64-linux = "linux-x64"; armv7l-linux = "linux-armv7l"; aarch64-linux = "linux-arm64"; - x86_64-darwin = "darwin-x64"; aarch64-darwin = "darwin-arm64"; }; diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index a1d798116a09..3623ba531641 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -5,7 +5,6 @@ "aarch64-linux": "8d01f0063ce2cc83a68b5c723db813c2bb8621ff63ba2ddec786a589baef7247", "armv7l-linux": "6e4d0d96b5ed98b9973868b8ea6234a5511cae866f15e586be7003a753b7afcc", "headers": "0sb9biq3z92f32dklisiax9pk5kj8yhwvihchcsp6v4vag7jx45v", - "x86_64-darwin": "de5389b3a1a8803fa50e2a2c2a9a8816f1fd5d996ac66a217c04396109d42e6b", "x86_64-linux": "92e8b031fa5327c78a972279fd75fc8503fcd1773401809f4557e4de583eabd1" }, "version": "39.8.10" @@ -16,7 +15,6 @@ "aarch64-linux": "1c6566cf63bed400a2b17b223c4657f199477a7389b2e540a76497d754cb2e78", "armv7l-linux": "be9dd6389e49aeb237647ccb3c7683059e98fbcc33b61ae0dc26f61d29f56a35", "headers": "1rq2wn46l7svsprzhs61h9c26nldacyhhwyawa863kkw68b8r5bd", - "x86_64-darwin": "8f3ba9bdfa2e4a2f0681b74befe8ee40f916c590b8ee303f86d48932fe7c9f29", "x86_64-linux": "4664bf23f722c6580ba77af5beb5a2c2db31da83bedb9d402f4277d99fa57639" }, "version": "40.10.5" @@ -27,7 +25,6 @@ "aarch64-linux": "a77dc2804fda466e704907befa6facd8e7c9d0342db319c742ebb58ebe99a9c5", "armv7l-linux": "b7ff0470b1efc424b96b81ecc3e7f353551bd1694bfbc75b307f319133f26258", "headers": "115rlwjj5yyn4ic9acih1q5x29k5q7fz8q82c0ab7prfi01f9y6h", - "x86_64-darwin": "719ad75b073bc34ff3c03694703a896c6ffdc40976c76efd959dfde108798150", "x86_64-linux": "4b8eca04c7f96828e297d8b3b4d303727db9123ae69b86c6041418651b6c227f" }, "version": "41.9.1" @@ -38,7 +35,6 @@ "aarch64-linux": "1575fa5cc64b3bf502d03632a915cdca4934e85d2b14fbf900752e8febfadd5c", "armv7l-linux": "861d1ad6e41f395aac18deb6c2b36dd203c6364b7d2f358d5241a1ffeabd96d5", "headers": "1ibm3ds3k2ih6bpmynics2dzhi437l73l8b3bmhx7gh4ghflaln0", - "x86_64-darwin": "608f68cc8c5db54b7b3d853e3672a447bd7ad06d5b2caa9bc0a83d56479374fd", "x86_64-linux": "3a729b020acb04aefac2c9b4b29c65b37dd7126a14a04d1ef29acb256d3edbd1" }, "version": "42.5.1" diff --git a/pkgs/development/tools/electron/chromedriver/generic.nix b/pkgs/development/tools/electron/chromedriver/generic.nix index 1a1818235ee4..d3833152f588 100644 --- a/pkgs/development/tools/electron/chromedriver/generic.nix +++ b/pkgs/development/tools/electron/chromedriver/generic.nix @@ -32,7 +32,6 @@ let ]; teams = [ lib.teams.electron ]; platforms = [ - "x86_64-darwin" "x86_64-linux" "armv7l-linux" "aarch64-linux" @@ -52,7 +51,6 @@ let x86_64-linux = "linux-x64"; aarch64-linux = "linux-arm64"; armv7l-linux = "linux-armv7l"; - x86_64-darwin = "darwin-x64"; aarch64-darwin = "darwin-arm64"; }; diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index 71c49c5380d8..e20b48423ffd 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -5,7 +5,6 @@ "aarch64-linux": "c6fa8afa312dd4fa13ab4c34ea1a97481f8225cf78f3cc8bbe2dedf27fa0f2b0", "armv7l-linux": "68963e6ab1d9eae92776782f194a31c9c48db2371d6a4c70058b4495cc244d2b", "headers": "0sb9biq3z92f32dklisiax9pk5kj8yhwvihchcsp6v4vag7jx45v", - "x86_64-darwin": "8e8c9feeec3416a79223fcdbd855c5df121567b341366d516ae6f7f15769498c", "x86_64-linux": "90dc451e7faad8e2efb4aa6a01e74195b607896a29f168f2f60a8eaf92af0e33" }, "version": "39.8.10" @@ -16,7 +15,6 @@ "aarch64-linux": "1d9c9a5252ea3db9229ded8968ffe2c01a41e676cc18c5a4c87818de029c1442", "armv7l-linux": "5f893df0d9e16ad06ceb53df5ac833298da0ce03d7e63608fcb7f64bf95ec817", "headers": "1rq2wn46l7svsprzhs61h9c26nldacyhhwyawa863kkw68b8r5bd", - "x86_64-darwin": "5f461d11062eb20dde58eab29c0c9d7ab293ead00129e365e8f1e45ead533ac8", "x86_64-linux": "6c3476f46d4a7581d74093fcb4c6a24a1b45a26a562443068b91063ba0a098dc" }, "version": "40.10.5" @@ -27,7 +25,6 @@ "aarch64-linux": "bf33e3258036e2fff74795be213060858fdf37f2c61ddfe551289697d7d8b528", "armv7l-linux": "0e65fd875ce97a9bc9241bd7c3476bcdccd22b90da2bc9d5bff6282372c55efe", "headers": "115rlwjj5yyn4ic9acih1q5x29k5q7fz8q82c0ab7prfi01f9y6h", - "x86_64-darwin": "d9b5d5c960caf575cdc26dd35edfbd8078198d8b9ba5dfd9653c3753187b5485", "x86_64-linux": "6060783bb08fc89cececf9731290b3f22b6ff847b2577f5cbd768ee8bb3fdee3" }, "version": "41.9.1" @@ -38,7 +35,6 @@ "aarch64-linux": "859700b9cb1e98f70208baa92e431eb1d102bd27621a5a695aa7a75327e072e6", "armv7l-linux": "308bd2664d9797512e93f9b2ed17bf62fae9e12cd12ff6812b4493d388cd0904", "headers": "1ibm3ds3k2ih6bpmynics2dzhi437l73l8b3bmhx7gh4ghflaln0", - "x86_64-darwin": "21db8529629a1a69fc5e2b6475d99c44985a78d49b7cc7aa314465d7568d78a6", "x86_64-linux": "e0db56b8781035a48aae7fefdac311abb8993a7f6e72009e7adfb70926565bf0" }, "version": "42.5.1" diff --git a/pkgs/development/tools/godot/common.nix b/pkgs/development/tools/godot/common.nix index 1ff39286d4bf..a0cba15c4584 100644 --- a/pkgs/development/tools/godot/common.nix +++ b/pkgs/development/tools/godot/common.nix @@ -788,7 +788,6 @@ let ++ lib.optional (!withMono) "i686-linux" # 4.3 doesn't compile on darwin, and 4.4 doesn't pass tests ++ lib.optionals (lib.versionAtLeast version "4.5") [ - "x86_64-darwin" "aarch64-darwin" ]; maintainers = with lib.maintainers; [ diff --git a/pkgs/development/tools/infisical/default.nix b/pkgs/development/tools/infisical/default.nix index a01989eade0d..61b58a958a9b 100644 --- a/pkgs/development/tools/infisical/default.nix +++ b/pkgs/development/tools/infisical/default.nix @@ -31,7 +31,6 @@ let # map the platform name to the golang toolchain suffix # NOTE: must be synchronized with update.sh! x86_64-linux = "linux_amd64"; - x86_64-darwin = "darwin_amd64"; aarch64-linux = "linux_arm64"; aarch64-darwin = "darwin_arm64"; } @@ -90,7 +89,6 @@ stdenv.mkDerivation (finalAttrs: { "x86_64-linux" "aarch64-linux" "aarch64-darwin" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/development/tools/infisical/hashes.json b/pkgs/development/tools/infisical/hashes.json index 2b543d4e4ee9..f4b015db3c1c 100644 --- a/pkgs/development/tools/infisical/hashes.json +++ b/pkgs/development/tools/infisical/hashes.json @@ -1,6 +1,6 @@ { "_comment": "@generated by pkgs/development/tools/infisical/update.sh" , "x86_64-linux": "sha256-/2fksPX6/hsz6hYGdn5iNah0LMR+avY0zf9UuNH8zAo=" -, "x86_64-darwin": "sha256-SQD0zqHl8eLBz8jsSf6tOqKSFimgrjAX+7M0o8yAEqo=" + , "aarch64-linux": "sha256-lrkyolCSgLQiet287Br0aGYCP/daaYzJAaqMvsqsbsw=" , "aarch64-darwin": "sha256-pw06koxiY9gYvDw0b6tRTMy3BGYS36mxV0q8TWEA7vM=" } diff --git a/pkgs/development/tools/misc/premake/5.nix b/pkgs/development/tools/misc/premake/5.nix index efa213aa0fde..b1e83f610786 100644 --- a/pkgs/development/tools/misc/premake/5.nix +++ b/pkgs/development/tools/misc/premake/5.nix @@ -92,7 +92,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/development/tools/selenium/chromedriver/binary.nix b/pkgs/development/tools/selenium/chromedriver/binary.nix index 0a1ed753a8c9..84ab490d6dc9 100644 --- a/pkgs/development/tools/selenium/chromedriver/binary.nix +++ b/pkgs/development/tools/selenium/chromedriver/binary.nix @@ -14,10 +14,6 @@ let # See ./source.nix for Linux allSpecs = { - x86_64-darwin = { - system = "mac-x64"; - hash = upstream-info.hash_darwin; - }; aarch64-darwin = { system = "mac-arm64"; diff --git a/pkgs/development/web/playwright/browser-downloads.nix b/pkgs/development/web/playwright/browser-downloads.nix index f399b582672f..280734257919 100644 --- a/pkgs/development/web/playwright/browser-downloads.nix +++ b/pkgs/development/web/playwright/browser-downloads.nix @@ -21,35 +21,30 @@ in chromium = { x86_64-linux = mk (cftUrl "linux64/chrome-linux64.zip") true; aarch64-linux = mk (registryUrl "chromium" "chromium-linux-arm64.zip") true; - x86_64-darwin = mk (cftUrl "mac-x64/chrome-mac-x64.zip") false; aarch64-darwin = mk (cftUrl "mac-arm64/chrome-mac-arm64.zip") false; }; "chromium-headless-shell" = { x86_64-linux = mk (cftUrl "linux64/chrome-headless-shell-linux64.zip") false; aarch64-linux = mk (registryUrl "chromium" "chromium-headless-shell-linux-arm64.zip") false; - x86_64-darwin = mk (cftUrl "mac-x64/chrome-headless-shell-mac-x64.zip") false; aarch64-darwin = mk (cftUrl "mac-arm64/chrome-headless-shell-mac-arm64.zip") false; }; firefox = { x86_64-linux = mk (registryUrl "firefox" "firefox-ubuntu-24.04.zip") true; aarch64-linux = mk (registryUrl "firefox" "firefox-ubuntu-24.04-arm64.zip") true; - x86_64-darwin = mk (registryUrl "firefox" "firefox-mac.zip") false; aarch64-darwin = mk (registryUrl "firefox" "firefox-mac-arm64.zip") false; }; webkit = { x86_64-linux = mk (registryUrl "webkit" "webkit-ubuntu-24.04.zip") false; aarch64-linux = mk (registryUrl "webkit" "webkit-ubuntu-24.04-arm64.zip") false; - x86_64-darwin = mk (registryUrl "webkit" "webkit-mac-15.zip") false; aarch64-darwin = mk (registryUrl "webkit" "webkit-mac-15-arm64.zip") false; }; ffmpeg = { x86_64-linux = mk (registryUrl "ffmpeg" "ffmpeg-linux.zip") false; aarch64-linux = mk (registryUrl "ffmpeg" "ffmpeg-linux-arm64.zip") false; - x86_64-darwin = mk (registryUrl "ffmpeg" "ffmpeg-mac.zip") false; aarch64-darwin = mk (registryUrl "ffmpeg" "ffmpeg-mac-arm64.zip") false; }; } diff --git a/pkgs/development/web/playwright/chromium-headless-shell.nix b/pkgs/development/web/playwright/chromium-headless-shell.nix index 9f2d0766d765..645d15fd5559 100644 --- a/pkgs/development/web/playwright/chromium-headless-shell.nix +++ b/pkgs/development/web/playwright/chromium-headless-shell.nix @@ -72,7 +72,6 @@ let inherit (download) url stripRoot; hash = { - x86_64-darwin = "sha256-eZXicAwu+9OFELVz+O/Lv6jEMTeLY6i+BZhY5RZ0+xA="; aarch64-darwin = "sha256-qWrMOreqTOFhmFBROlXIPXrM3wqNT7iJJwpelVFke6I="; } .${system} or throwSystem; @@ -81,7 +80,6 @@ in { x86_64-linux = linux; aarch64-linux = linux; - x86_64-darwin = darwin; aarch64-darwin = darwin; } .${system} or throwSystem diff --git a/pkgs/development/web/playwright/chromium.nix b/pkgs/development/web/playwright/chromium.nix index 89766a2db0be..4d92563b30a1 100644 --- a/pkgs/development/web/playwright/chromium.nix +++ b/pkgs/development/web/playwright/chromium.nix @@ -130,7 +130,6 @@ let inherit (download) url stripRoot; hash = { - x86_64-darwin = "sha256-LGnaeRgWq496mgoosN20ayiGmNyIFHMLM2Jl/lpALMg="; aarch64-darwin = "sha256-aJbvZQ1hY0FfDC+ZktfW2yNW3nwc0kh/P30+n/cmLf0="; } .${system} or throwSystem; @@ -139,7 +138,6 @@ in { x86_64-linux = chromium-linux; aarch64-linux = chromium-linux; - x86_64-darwin = chromium-darwin; aarch64-darwin = chromium-darwin; } .${system} or throwSystem diff --git a/pkgs/development/web/playwright/ffmpeg.nix b/pkgs/development/web/playwright/ffmpeg.nix index f6ea2d06b130..1735e151f5eb 100644 --- a/pkgs/development/web/playwright/ffmpeg.nix +++ b/pkgs/development/web/playwright/ffmpeg.nix @@ -17,7 +17,6 @@ fetchzip { { x86_64-linux = "sha256-AWTiui+ccKHxsIaQSgc5gWCJT5gYwIWzAEqSuKgVqZU="; aarch64-linux = "sha256-1mOKO2lcnlwLsC6ob//xKnKrCOp94pw8X14uBxCdj0Q="; - x86_64-darwin = "sha256-zJ8BMzdneV6LlEt4I034l5u86dwW4UmO/UazWikpKV4="; aarch64-darwin = "sha256-ky10UQj+XPVGpaWAPvKd51C5brml0y9xQ6iKcrxAMRc="; } .${system} or throwSystem; diff --git a/pkgs/development/web/playwright/firefox.nix b/pkgs/development/web/playwright/firefox.nix index 0451dfddbfa1..e757f9af593d 100644 --- a/pkgs/development/web/playwright/firefox.nix +++ b/pkgs/development/web/playwright/firefox.nix @@ -42,7 +42,6 @@ let inherit (download) url stripRoot; hash = { - x86_64-darwin = "sha256-nV+oV7Zp2rAWkMWAs//PnWCA0q2jzS5hjr5AEXuEoos="; aarch64-darwin = "sha256-Opwa5SbuAaXf2A+qrldHc6BkhRaOzzl0dy7R4vodG5w="; } .${system} or throwSystem; @@ -51,7 +50,6 @@ in { x86_64-linux = firefox-linux; aarch64-linux = firefox-linux; - x86_64-darwin = firefox-darwin; aarch64-darwin = firefox-darwin; } .${system} or throwSystem diff --git a/pkgs/development/web/playwright/webkit.nix b/pkgs/development/web/playwright/webkit.nix index 1981e2ed06b7..da2028c325b1 100644 --- a/pkgs/development/web/playwright/webkit.nix +++ b/pkgs/development/web/playwright/webkit.nix @@ -204,7 +204,6 @@ let inherit (download) url stripRoot; hash = { - x86_64-darwin = "sha256-FFWFWKHroNBeDw4KYDe4UeucaJzMyin0Ca/qxN2iaO0="; aarch64-darwin = "sha256-glVkYnthOFBPp1gZXTue9WwjP+oCgQpq6j9Mlm/bjmg="; } .${system} or throwSystem; @@ -213,7 +212,6 @@ in { x86_64-linux = webkit-linux; aarch64-linux = webkit-linux; - x86_64-darwin = webkit-darwin; aarch64-darwin = webkit-darwin; } .${system} or throwSystem diff --git a/pkgs/games/dwarf-fortress/df.lock.json b/pkgs/games/dwarf-fortress/df.lock.json index 03bf7fd55d19..3f69718c270e 100644 --- a/pkgs/games/dwarf-fortress/df.lock.json +++ b/pkgs/games/dwarf-fortress/df.lock.json @@ -1,28 +1,28 @@ { "game": { "latest": { - "linux": "53.14", + "linux": "53.15", "darwin": "0.47.05" }, "versions": { - "53.14": { + "53.15": { "df": { - "version": "53.14", + "version": "53.15", "urls": { "linux": { - "url": "https://www.bay12games.com/dwarves/df_53_14_linux.tar.bz2", - "outputHash": "sha256-ZU/va7bblzh5UuPuuctjUHzEmcFLtzjXp9R86UV+G9k=" + "url": "https://www.bay12games.com/dwarves/df_53_15_linux.tar.bz2", + "outputHash": "sha256-LreGXGk8Pgmr8Mk37VT3U0tCFOhRKZFdEsXBzmJtN4o=" } } }, "hack": { - "version": "53.14-r2", + "version": "53.15-r1", "git": { "url": "https://github.com/DFHack/dfhack.git", - "revision": "53.14-r2", - "outputHash": "sha256-8OvJ8NULgfR+S0kzOSmQvplhPT7wcxw02sRkG450ptE=" + "revision": "53.15-r1", + "outputHash": "sha256-7vNk/JmNu0tQEevZ7XeGX/435EydR15dJJIHEyS1a7c=" }, - "xmlRev": "01aae95cacd98850e4f477c45a4b75f800bacecc" + "xmlRev": "80a6267faddb7aa99759c9df94186de3f873dd97" } }, "52.05": { diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index eb3469b519ab..e5d52e9cb85a 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -37,7 +37,6 @@ let # Map Dwarf Fortress platform names to Nixpkgs platform names. platforms = { x86_64-linux = "linux"; - x86_64-darwin = "darwin"; }; dfVersionTuple = splitVersion dfVersion; diff --git a/pkgs/servers/home-assistant/custom-components/systemair/package.nix b/pkgs/servers/home-assistant/custom-components/systemair/package.nix index be387f0dd7aa..c9436486048b 100644 --- a/pkgs/servers/home-assistant/custom-components/systemair/package.nix +++ b/pkgs/servers/home-assistant/custom-components/systemair/package.nix @@ -5,18 +5,22 @@ fetchFromGitHub, async-timeout, aiohttp, + websocket-client, + beautifulsoup4, + pytestCheckHook, + pytest-homeassistant-custom-component, }: buildHomeAssistantComponent rec { owner = "AN3Orik"; domain = "systemair"; - version = "1.0.28"; + version = "1.0.29"; src = fetchFromGitHub { inherit owner; repo = "systemair"; tag = "v${version}"; - hash = "sha256-6JLcWBZU5YXgdcZUuCIs2KAJJJ8U7nawYwOgSjsNajc="; + hash = "sha256-qpwF1HZZ8pEDywkFij9ipF3BPFe3oAj8wQKILNuKoHc="; }; ignoreVersionRequirement = [ @@ -27,6 +31,17 @@ buildHomeAssistantComponent rec { pymodbus async-timeout aiohttp + websocket-client + beautifulsoup4 + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-homeassistant-custom-component + ]; + + pytestFlags = [ + "-Wignore::pytest.PytestRemovedIn9Warning" ]; meta = { diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix index 8e91d793346a..2880c6bbd9bd 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix @@ -6,7 +6,6 @@ grafanaPlugin rec { zipHash = { x86_64-linux = "sha256-fmYrMoLMFSA/bG7db7IhEKcgYAd3ukRTZOtT6h0bCbw="; aarch64-linux = "sha256-TTo85HkQrq6bbifAfG30BPVP72nqOYP9yaJ7INpBN1U="; - x86_64-darwin = "sha256-Evu/YUQS62y7E/efJeQOJEgsbL0212Bl1aFl4SzMUqM="; aarch64-darwin = "sha256-NC5yVkrnD1J1LiDbSnKwNZsUOCShgfSZy8FuDnXpZWs="; }; meta = { diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix index c000c67d892e..d3523734f3cd 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix @@ -6,7 +6,6 @@ grafanaPlugin { zipHash = { x86_64-linux = "sha256-hKElyWX4fcQtF3eyYVRuaJjvNWY9CV2bNoNkFLeJQLc="; aarch64-linux = "sha256-+ygxJc+ovlqjcs68QD71JQepINTeauA41sKrJa6h8gc="; - x86_64-darwin = "sha256-ZrvBxCi6gyRFly0NtTPWUWzTbH3rp92Vy0C4n1hO/pA="; aarch64-darwin = "sha256-s4q+k1gbOBCeMDpkTpui0egOxzoBjbKoX63pwVqmY6A="; }; meta = { diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix index 757b77f9d928..42fd24fb0f3b 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix @@ -6,7 +6,6 @@ grafanaPlugin { zipHash = { x86_64-linux = "sha256-Y6UvMLw+bAg0HTKsc2FdpY+S4Zf7gpgIVdZDFgr+mog="; aarch64-linux = "sha256-feBfv07DrKdeJbeD0gnYoOhg1LG636cghVu1x8n9rCQ="; - x86_64-darwin = "sha256-nVbhhlfSkJwZ1PXzhYSz9pXxbcRyO32RoOPlV7OGAOk="; aarch64-darwin = "sha256-0iv1oUj6bLw7kUOwkW69rs+4NIetp+uEgJ7YULkKYLE="; }; meta = { diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix index 5d9224e525cb..7752eb8e3bb2 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix @@ -6,7 +6,6 @@ grafanaPlugin { zipHash = { x86_64-linux = "sha256-uJbG8C8ggvlZIRC++KVL/psU/a0s8PMsgTph2F7a+XE="; aarch64-linux = "sha256-UndB+T++ega5Gg4hIMXPP0zQyWed4s5DY8nu4J8QuUw="; - x86_64-darwin = "sha256-alrPXVaxjspRF2CzfBaK9J/0IllKHvm+O5FVEK9xubc="; aarch64-darwin = "sha256-qoc2DK7/7WhX0tJ0K/BLojZxbMm1A/1Ibv7EfrRB50Y="; }; meta = { diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix index bd1224ef6828..4c987ac2427e 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix @@ -6,7 +6,6 @@ grafanaPlugin { zipHash = { x86_64-linux = "sha256-IH1y3tbY++piN+Zlw9Jw2Z7c7pFcPQ7z/X3C0t3iAo8="; aarch64-linux = "sha256-3Zm3omgkdYwHe0/39QCR+iwqe0bURKLB1k1cDkUYiAc="; - x86_64-darwin = "sha256-UJB56s/JEacST6sWTLv8lKt0ecpO4IHqelV8Awf6Wq0="; aarch64-darwin = "sha256-QU+0jig8y/+7cshDTJ0J0LGGRVd1uJ5jtSyZcfDjx2k="; }; meta = { diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix index 78672ba69c8a..9aa4fc50d80f 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix @@ -31,7 +31,6 @@ stdenvNoCC.mkDerivation ( + { x86_64-linux = "?os=linux&arch=amd64"; aarch64-linux = "?os=linux&arch=arm64"; - x86_64-darwin = "?os=darwin&arch=amd64"; aarch64-darwin = "?os=darwin&arch=arm64"; } .${plat} or (throw "Unsupported system: ${plat}"); diff --git a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-csv-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-csv-datasource/default.nix index 372ab395cdd8..c4e8b6db3603 100644 --- a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-csv-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-csv-datasource/default.nix @@ -6,7 +6,6 @@ grafanaPlugin { zipHash = { x86_64-linux = "sha256-lG8kpRSPXYWPag4fBAPi9QU73hAawJ0kpFsmKVdZpyc="; aarch64-linux = "sha256-k8ba5JY1ezQSzey1BORFuQ1K2oVMy8mfnZn6m6BhaOo="; - x86_64-darwin = "sha256-Mf0Ck7m9H3nI83XJy7P5ToruADRNdPqoUTvwjl6vptw="; aarch64-darwin = "sha256-9XNbx4KdBVOYKmHA+whnTsG7ykVNb3jMHlsRswDAoGE="; }; meta = { diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix index 15c00f4e8794..54c6ece2bb53 100644 --- a/pkgs/servers/search/elasticsearch/7.x.nix +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -18,7 +18,6 @@ let plat = lib.elemAt info 1; hashes = { x86_64-linux = "sha512-xlbdx/fFQxilECdDiN80U+s+huBowo9Qf5tDIYwZ1z9gUCriNL0rMNDkvzUDL73BEI3WMFMqHdbi3cn7b5l9gA=="; - x86_64-darwin = "sha512-hiTSp7lO/x6tBYiUgKglce39k/oxT4hUlTAoC50pYFiqANALAN+2E0HtZdvsMmrOn4aGLxh+SKVglMHfrGxr+g=="; aarch64-linux = "sha512-MPrDfBMcwNCgWW8dpOeAtlz9Odfk/0z8i+Rn08hTp35kU849KdPQLTmexlvnf/jVwqfwzN2xWJtNF0sQO26pUA=="; aarch64-darwin = "sha512-uq5VVwvbOX4Rv32iLFw+RalFPBxQqA+1hBjFw3svzOaD1caOOrGHD4lJVHFxsFw0xl//AZuSG7S3r7Eh9AmWvQ=="; }; diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix index c61f8d86ac5a..6ec8ed207a4e 100644 --- a/pkgs/tools/misc/logstash/7.x.nix +++ b/pkgs/tools/misc/logstash/7.x.nix @@ -18,13 +18,11 @@ let if enableUnfree then { x86_64-linux = "sha512-9JzopnY43Osoy4/0G9gxJYlbCl1a9Qy2pL4GL1uyjJ3uSNoOskEBhhsqLp9BhtJXOaquuRDgbJnXhbBrlE0rKg=="; - x86_64-darwin = "sha512-ZcdKWFrIQUmGtxoWbLc2F7g85quXfRqy62DyVPR/9zBtMTgFH0eG4Cj40ELpW7nYXZqglmAUTF/0mZZYUg2Ciw=="; aarch64-linux = "sha512-V2Nt/lup4ofgoMqpAH3OHF8Fp0PvC1M8nl6sCKmTf+ZXQYHNjAJkJwGJwHeQQ0L/348JHyCkeWL43dS7Jr6ZJQ=="; } else { x86_64-linux = "sha512-L11ZUdXC8VDiSEVDBMous2OaMlAFgvkQ+eDbmbA9r/sDIXY8W7dx3jgPNXoorDtatTemwy8aXw1XJGaVmj4T3Q=="; - x86_64-darwin = "sha512-az5ujFtwcuNNGuITDeGRu1FB2bb8/hIUmGMvm0Xcfvs0GZPnCZVY6ScsiHZYjT8X+qBYkn/httT3MYozrPOy4Q=="; aarch64-linux = "sha512-iVft0kZYhvFJ1NKCfdePhRxDljPTwV+3G7wV94iykYISgLTVoehzDTMdxUyfK/mmQhu3hmmHbVpw1jXjTrS7ng=="; }; this = stdenv.mkDerivation rec { diff --git a/pkgs/tools/misc/tdarr/common.nix b/pkgs/tools/misc/tdarr/common.nix index 6c4b35b95834..299545175845 100644 --- a/pkgs/tools/misc/tdarr/common.nix +++ b/pkgs/tools/misc/tdarr/common.nix @@ -40,7 +40,6 @@ let { x86_64-linux = "linux_x64"; aarch64-linux = "linux_arm64"; - x86_64-darwin = "darwin_x64"; aarch64-darwin = "darwin_arm64"; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -211,7 +210,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; maintainers = with lib.maintainers; [ mistyttm ]; diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix index 15bdcea84f1b..1ff571a5a7c7 100644 --- a/pkgs/tools/security/ghidra/build.nix +++ b/pkgs/tools/security/ghidra/build.nix @@ -204,7 +204,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix index 3a403dd48358..6bb8195a1949 100644 --- a/pkgs/tools/security/ghidra/default.nix +++ b/pkgs/tools/security/ghidra/default.nix @@ -79,7 +79,6 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; diff --git a/pkgs/tools/security/ghidra/extensions/kaiju/default.nix b/pkgs/tools/security/ghidra/extensions/kaiju/default.nix index e38375a92083..2aded838a94d 100644 --- a/pkgs/tools/security/ghidra/extensions/kaiju/default.nix +++ b/pkgs/tools/security/ghidra/extensions/kaiju/default.nix @@ -11,7 +11,6 @@ let { x86_64-linux = "linux_x86_64"; aarch64-linux = "linux_x86_64"; - x86_64-darwin = "mac_x86_64"; aarch64-darwin = "mac_arm_64"; } .${stdenv.hostPlatform.system} @@ -64,7 +63,6 @@ let platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2b33a0259fea..d0c2e449cb2c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -655,6 +655,7 @@ mapAliases { devdocs-desktop = throw "'devdocs-desktop' has been removed as it is unmaintained upstream and vendors insecure dependencies"; # Added 2025-06-11 dfilemanager = throw "'dfilemanager' has been dropped as it was unmaintained"; # Added 2025-06-03 discord-screenaudio = throw "discord-screenaudio has been removed because it was archived upstream. Use vesktop instead."; # added 2025-11-29 + disk-inventory-x = throw "disk-inventory-x has been removed as it only supported x86_64-darwin"; # Added 2026-07-12 DisnixWebService = warnAlias "'DisnixWebService' has been renamed to 'disnix-web-service'" disnix-web-service; # Added 2026-01-14 djmount = throw "'djmount' has been removed as it is no longer maintained"; # Added 2026-05-19 dleyna-connector-dbus = throw "'dleyna-connector-dbus' has been renamed to/replaced by 'dleyna'"; # Converted to throw 2025-10-27 @@ -663,6 +664,7 @@ mapAliases { dleyna-server = throw "'dleyna-server' has been renamed to/replaced by 'dleyna'"; # Converted to throw 2025-10-27 dnscrypt-proxy2 = throw "'dnscrypt-proxy2' has been renamed to/replaced by 'dnscrypt-proxy'"; # Converted to throw 2025-10-27 docker-distribution = throw "'docker-distribution' has been renamed to/replaced by 'distribution'"; # Converted to throw 2025-10-27 + docker-machine-hyperkit = throw "docker-machine-hyperkit has been removed as it only supported x86_64-darwin"; # Added 2026-07-12 docker-sync = throw "'docker-sync' has been removed because it was broken and unmaintained"; # Added 2025-08-26 docker_26 = throw "'docker_26' has been removed because it has been unmaintained since February 2025. Use docker_28 or newer instead."; # Added 2025-06-21 docker_27 = throw "'docker_27' has been removed because it has been unmaintained since May 2025. Use docker_28 or newer instead."; # Added 2025-06-15 @@ -689,6 +691,7 @@ mapAliases { dumb = throw "'dumb' has been archived by upstream. Upstream recommends libopenmpt as a replacement."; # Added 2025-09-14 dump1090 = throw "'dump1090' has been renamed to/replaced by 'dump1090-fa'"; # Converted to throw 2025-10-27 dune_1 = throw "'dune_1' has been removed"; # Added 2025-11-13 + dxmt = throw "dxmt has been removed as it only supported x86_64-darwin"; # Added 2026-07-12 e17gtk = throw "'e17gtk' has been removed because it was archived upstream."; # Added 2026-01-15 e-search = throw "'e-search' has been removed due to outdated KF5 dependencies"; # Added 2026-05-01 eagle = throw "'eagle' has been removed because official support ends 2026-06-07. It depended on qt5 webengine, which was removed for its numerous security issues. For more details, see the autodesk announcement at https://www.autodesk.com/support/technical/article/caas/sfdcarticles/sfdcarticles/Autodesk-EAGLE-Announcement-Next-steps-and-FAQ.html"; # Added 2026-04-26 @@ -776,6 +779,7 @@ mapAliases { fedifetcher = throw "'fedifetcher' has been removed because there is now a similar native feature in Mastodon."; # Added 2025-12-08 fennel = throw "'fennel' has been renamed to/replaced by 'luaPackages.fennel'"; # Converted to throw 2025-10-27 fetchbower = throw "fetchbower has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17 + fflogs = throw "fflogs has been removed because it stopped working on 2026-06-29 and was replaced by archon-lite"; # Added 2026-07-03 FIL-plugins = throw "'FIL-plugins' has been renamed to/replaced by 'fil-plugins'"; # Converted to throw 2025-10-27 filesender = throw "'filesender' has been removed because of its simplesamlphp dependency"; # Added 2025-10-17 finger_bsd = throw "'finger_bsd' has been renamed to/replaced by 'bsd-finger'"; # Converted to throw 2025-10-27 @@ -1783,6 +1787,7 @@ mapAliases { pcp = throw "'pcp' has been removed because the upstream repo was archived and it hasn't been updated since 2021"; # Added 2025-09-23 pcre16 = throw "'pcre16' has been removed because it is obsolete. Consider migrating to 'pcre2' instead."; # Added 2025-05-29 pcsctools = throw "'pcsctools' has been renamed to/replaced by 'pcsc-tools'"; # Converted to throw 2025-10-27 + pcsx2-bin = throw "pcsx2-bin has been removed as it only supported x86_64-darwin"; # Added 2026-06-26 pdf2djvu = throw "pdf2djvu has been removed because it was broken and archived upstream"; # added 2025-12-06 pdf4tcl = throw "'pdf4tcl' has been renamed to/replaced by 'tclPackages.pdf4tcl'"; # Converted to throw 2025-10-27 pdf-quench = throw "'pdf-quench' has been removed as it was unmaintained upstream and depended on the outdated and vulnerable pypdf2"; # Added 2026-03-29 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8592c1222a67..c65f4856aadb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8532,9 +8532,6 @@ with pkgs; docker-client = docker.override { clientOnly = true; }; docker-gc = callPackage ../applications/virtualization/docker/gc.nix { }; - docker-machine-hyperkit = - callPackage ../applications/networking/cluster/docker-machine/hyperkit.nix - { }; docker-buildx = callPackage ../applications/virtualization/docker/buildx.nix { }; docker-compose = callPackage ../applications/virtualization/docker/compose.nix { }; docker-sbom = callPackage ../applications/virtualization/docker/sbom.nix { };