diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 752bb5a64c63..f0a06a71c1e7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -25159,6 +25159,13 @@ githubId = 94006354; name = "steamwalker"; }; + Stebalien = { + email = "steven@stebalien.com"; + github = "Stebalien"; + githubId = 310393; + name = "Steven Allen"; + keys = [ { fingerprint = "327B 20CE 21EA 68CF A774 8675 7C92 3221 5899 410C"; } ]; + }; steeleduncan = { email = "steeleduncan@hotmail.com"; github = "steeleduncan"; diff --git a/nixos/modules/services/display-managers/ly.nix b/nixos/modules/services/display-managers/ly.nix index d49869530e84..073f26e16b1a 100644 --- a/nixos/modules/services/display-managers/ly.nix +++ b/nixos/modules/services/display-managers/ly.nix @@ -17,13 +17,14 @@ let iniFmt = pkgs.formats.iniWithGlobalSection { }; inherit (lib) - concatMapStrings attrNames + concatMapStrings getAttr mkIf mkOption mkEnableOption mkPackageOption + optionalAttrs ; xserverWrapper = pkgs.writeShellScript "xserver-wrapper" '' @@ -47,6 +48,11 @@ let setup_cmd = dmcfg.sessionData.wrapper; brightness_up_cmd = "${lib.getExe pkgs.brightnessctl} -q -n s +10%"; brightness_down_cmd = "${lib.getExe pkgs.brightnessctl} -q -n s 10%-"; + } + // optionalAttrs dmcfg.autoLogin.enable { + auto_login_service = "ly-autologin"; + auto_login_session = dmcfg.sessionData.autologinSession; + auto_login_user = dmcfg.autoLogin.user; }; finalConfig = defaultConfig // cfg.settings; @@ -84,17 +90,32 @@ in assertions = [ { - assertion = !dmcfg.autoLogin.enable; + assertion = dmcfg.autoLogin.enable -> dmcfg.sessionData.autologinSession != null; message = '' - ly doesn't support auto login. + ly auto-login requires that services.displayManager.defaultSession is set. ''; } ]; - security.pam.services.ly = { - startSession = true; - unixAuth = true; - enableGnomeKeyring = lib.mkDefault config.services.gnome.gnome-keyring.enable; + security.pam.services = { + ly = { + startSession = true; + unixAuth = true; + enableGnomeKeyring = lib.mkDefault config.services.gnome.gnome-keyring.enable; + }; + } + // optionalAttrs dmcfg.autoLogin.enable { + ly-autologin.text = '' + auth requisite pam_nologin.so + auth required pam_succeed_if.so uid >= 1000 quiet + auth required pam_permit.so + + account include ly + + password include ly + + session include ly + ''; }; environment = { diff --git a/nixos/modules/services/networking/coredns.nix b/nixos/modules/services/networking/coredns.nix index 46202fa088f1..4cfa23649ec3 100644 --- a/nixos/modules/services/networking/coredns.nix +++ b/nixos/modules/services/networking/coredns.nix @@ -42,7 +42,6 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - PermissionsStartOnly = true; LimitNPROC = 512; LimitNOFILE = 1048576; CapabilityBoundingSet = "cap_net_bind_service"; diff --git a/nixos/tests/ly.nix b/nixos/tests/ly.nix index a9c74c5f3ca7..2d9303308001 100644 --- a/nixos/tests/ly.nix +++ b/nixos/tests/ly.nix @@ -23,6 +23,18 @@ in services.displayManager.defaultSession = "none+icewm"; services.xserver.windowManager.icewm.enable = true; }; + nodes.machineAutologin = + { ... }: + lib.attrsets.recursiveUpdate machineBase { + services.displayManager.ly.x11Support = true; + services.xserver.enable = true; + services.displayManager.defaultSession = "none+icewm"; + services.xserver.windowManager.icewm.enable = true; + services.displayManager.autoLogin = { + enable = true; + user = "alice"; + }; + }; nodes.machineNoX11 = { ... }: lib.attrsets.recursiveUpdate machineBase { @@ -83,6 +95,14 @@ in machine.sleep(2) machine.screenshot("icewm") + machineAutologin.wait_until_succeeds("getfacl /dev/dri/card0 | grep video") + machineAutologin.send_key("ctrl-alt-f1") + machineAutologin.wait_for_file("/run/user/${toString user.uid}/lyxauth") + machineAutologin.succeed("xauth merge /run/user/${toString user.uid}/lyxauth") + machineAutologin.wait_for_window("^IceWM ") + machineAutologin.sleep(2) + machineAutologin.screenshot("autologin-icewm") + machineNoX11.wait_until_tty_matches("1", "password") machineNoX11.send_key("ctrl-alt-f1") machineNoX11.sleep(1) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix index bdce756a7ae0..09663744d933 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix @@ -10,12 +10,12 @@ vimUtils, }: let - version = "6b01f95-unstable-2026-01-24"; + version = "0523fe3-unstable-2026-01-25"; src = fetchFromGitHub { owner = "dmtrKovalenko"; repo = "fff.nvim"; - rev = "6b01f95ca6305511ef28175c42b250925376f181"; - hash = "sha256-vI1oOVzpTpYZ0ea6w0e2wyKa0TsyLFFauOZkhYbXLYM="; + rev = "0523fe39ffc59373de0648ba636705d35a6fdfc2"; + hash = "sha256-7rP6C/zPhpTMcsewR9LZlB23Ot7W23E2WM7Fnj89rlA="; }; fff-nvim-lib = rustPlatform.buildRustPackage { pname = "fff-nvim-lib"; diff --git a/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix b/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix index 5ad265dbabba..8090dadcaa6f 100644 --- a/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix +++ b/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-augment"; publisher = "augment"; - version = "0.754.2"; - hash = "sha256-PWcJr6hTCGeDLMG0h54x5D2n6zrK/bEqv7kygSZS/qo="; + version = "0.754.3"; + hash = "sha256-y7vBumet1aiLFP45QRSXMYFqqqkGvBMRD0k8A/CPoC8="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index aebda037324d..581caea33f36 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1005,8 +1005,8 @@ let mktplcRef = { name = "coder-remote"; publisher = "coder"; - version = "1.11.6"; - hash = "sha256-yMhbOnG7jVO0oPzLa+El5i7KlD1GCYTOcfF0cOUf5hQ="; + version = "1.12.2"; + hash = "sha256-0ZX0EQnPIqREsIy5dSML94PXD0Z+UZCIKwdqXVYTc1Q="; }; meta = { description = "Extension for Visual Studio Code to open any Coder workspace in VS Code with a single click"; diff --git a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix index 24012d54e91d..759160d1fa16 100644 --- a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix +++ b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "basedpyright"; publisher = "detachhead"; - version = "1.37.1"; - hash = "sha256-xucPJrYqKM+uCxHktfx0o4c0btpluIBMyNigr7d1FJU="; + version = "1.37.2"; + hash = "sha256-5ZkC84924JZe53EcXHHKeMw840O6DIFjydd6zT1QzLQ="; }; meta = { changelog = "https://github.com/detachhead/basedpyright/releases"; diff --git a/pkgs/applications/editors/vscode/extensions/oracle.oracle-java/default.nix b/pkgs/applications/editors/vscode/extensions/oracle.oracle-java/default.nix index 5dfd63e0dd48..a94b3bff2e48 100644 --- a/pkgs/applications/editors/vscode/extensions/oracle.oracle-java/default.nix +++ b/pkgs/applications/editors/vscode/extensions/oracle.oracle-java/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "oracle-java"; publisher = "oracle"; - version = "25.0.0"; - hash = "sha256-e0DO+42+3CyMP3+25gj0kLDFK53vkv4UqD2pQhXmqng="; + version = "25.0.1"; + hash = "sha256-6l1StFyGixGCvOfpq4iyHkoGQb1UZGlB4j0IQxAuXl8="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/teamtype.teamtype/default.nix b/pkgs/applications/editors/vscode/extensions/teamtype.teamtype/default.nix index 67356471a408..e5a043b390c0 100644 --- a/pkgs/applications/editors/vscode/extensions/teamtype.teamtype/default.nix +++ b/pkgs/applications/editors/vscode/extensions/teamtype.teamtype/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "teamtype"; name = "teamtype"; - version = "0.8.0"; - hash = "sha256-p9bynTMmCn6pu7SVEABeSawv9VjWpE8KecQOeIsE/LE="; + version = "0.8.2"; + hash = "sha256-qVZf+fOrdnDJzRUVA3GhTUDLhdJrH2tPRgvYW+ymVGw="; }; meta = { diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index f7d67e8d8baf..e8d4f2090b88 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -36,20 +36,20 @@ let hash = { - x86_64-linux = "sha256-qYthiZlioD6fWCyDPfg7Yfo5PqCHzcenk8NjgobLW7c="; - x86_64-darwin = "sha256-zwvdrstg6UtoG8EE87VXjDORT3zEbbKCFdAP0wPsD9s="; - aarch64-linux = "sha256-7DBRwwdQm06nyxRMR3wOH+4DqlnPvXGL/rMdq7jpxTw="; - aarch64-darwin = "sha256-YXmTzpsRSwdtbmoQLDRcJ5hcDURZnrkh5p8e8rYnA0Y="; - armv7l-linux = "sha256-VQ4/Ae4qeZYCFAJcTh8h8BWM15u8QEAfyJpkFx+1Xc8="; + x86_64-linux = "sha256-RqBae6s6y2XnXqtKbrKkMRwALKLfNE7mBFwOwwomG10="; + x86_64-darwin = "sha256-3N7xZIJsgQPX6izaH8ZoXy3SLcbXCNwJvE8ahFwVfF8="; + aarch64-linux = "sha256-8WigXl83hXEA7qsG6dOYKVSVISRDDpqJyv7L+9ks40Q="; + aarch64-darwin = "sha256-ZJ0QKqkFQYz3V7TEalM3sFJnqYnKBgQVqPXdsi2c+80="; + armv7l-linux = "sha256-m78hRkaI1nlqdeeP3t0HiNCUzNneMXxyenC8RmtuC68="; } .${system} or throwSystem; # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.108.1"; + version = "1.108.2"; # This is used for VS Code - Remote SSH test - rev = "585eba7c0c34fd6b30faac7c62a42050bfbc0086"; + rev = "c9d77990917f3102ada88be140d28b038d1dd7c7"; in buildVscode { pname = "vscode" + lib.optionalString isInsiders "-insiders"; @@ -82,7 +82,7 @@ buildVscode { src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - hash = "sha256-YilQLV1vQ1vHLa9pztvDIsaRz1CKzxcjT/INETrJy1I="; + hash = "sha256-bUnM+editWCYiiqR3mlIw4BRrM5gHd6T2GO65VKTDSE="; }; stdenv = stdenvNoCC; }; diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index faf1cf87777c..df29572cffb0 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -813,7 +813,7 @@ } }, "ungoogled-chromium": { - "version": "144.0.7559.96", + "version": "144.0.7559.109", "deps": { "depot_tools": { "rev": "2e88a3f08bd8c4a0014eae82729beca935f7f188", @@ -825,16 +825,16 @@ "hash": "sha256-04h38X/hqWwMiAOVsVu4OUrt8N+S7yS/JXc5yvRGo1I=" }, "ungoogled-patches": { - "rev": "144.0.7559.96-1", - "hash": "sha256-gbEKKGGi6FBhRoCEerSdJJtn5vXaFo9G74lYHDsz0Xs=" + "rev": "144.0.7559.109-1", + "hash": "sha256-PPZ87jk8zISyWcoI3cf5/Z11uA15+cb+K9EKxT93u0M=" }, "npmHash": "sha256-13sgV/5BD7QvDLBAEmoLN5vongw+S5v5znvZcctxhWc=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "d7b80622cfab91c265741194e7942eefd2d21811", - "hash": "sha256-Cz3iDS0raJHRh+byrs7GYp6sck54mJq7yzsjLUWDWqA=", + "rev": "6a8d5e49388fcc8a7d56d2a275e4ef424eb10960", + "hash": "sha256-3Wwc7Vb8dM2VGqQs6GOPehsTVBgcZ9in+kC1vN9S1FI=", "recompress": true }, "src/third_party/clang-format/script": { @@ -1619,8 +1619,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "6c2c296f23a5487ccb2536cf7c90d01f35d03077", - "hash": "sha256-gBzwGvl/tqj4Z6acdLN326I80kBLEk+Nn8oN6D193o4=" + "rev": "d75d178c137447df1a3e8830eae86b0bd72b9ac6", + "hash": "sha256-5oQP3+kpnKfUInGBYcTvL/uLK9UlcWCz1mDFGeXBnmM=" } } } diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix index 7e0984150dc0..b809fcc9b0fe 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix @@ -10,11 +10,11 @@ buildMozillaMach rec { pname = "firefox-beta"; binaryName = "firefox-beta"; - version = "148.0b6"; + version = "148.0b8"; applicationName = "Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "a8dfcff028d28d63dc635f9cda8e2dcf2f6b55363ac4e1686561c77aff56216d3f897b1d3686bf32f388eed4e1df146d3795a55eb2a696523dc7c176bb63cd07"; + sha512 = "7fc53c1f4545d09e5ec790ba12e1a0eb1d3c3949a5d92ff98f294e80bd6e37e1ba2ef6b76661cdd9717043ad7823ff9392f7138070f3f2418b414072f020b316"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix index e2f98242fa30..bf2ae40be7f8 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix @@ -10,13 +10,13 @@ buildMozillaMach rec { pname = "firefox-devedition"; binaryName = "firefox-devedition"; - version = "148.0b7"; + version = "148.0b8"; applicationName = "Firefox Developer Edition"; requireSigning = false; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "459aece0fb83ed42471f2037896eb6fce806b1bab396df81c822cf418cde3baf7f23021f0efce4c3717c4fa1cbfd18a7ffc7ec6751bb2c52bd997c2342b534bf"; + sha512 = "28c0efc1d7d287f6ed77b6e3d4c8e4a3d65b9dc6dc4ef48f9a6da9a889c24e1d03ef2bd1d484e67f260e08ababbe1c32a81cfb81e36934b54beb4e26dc11f726"; }; # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 25f406bda496..f3738390af49 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -54,11 +54,11 @@ "vendorHash": "sha256-ogQLStDbsM0aRf4QIbITB8Z+L9DUtZwoAPK6T4xylXI=" }, "aminueza_minio": { - "hash": "sha256-gl1mD4Ital/xhtWZW9UbalTJqYLJ2tr8ImDFLiTyyFg=", + "hash": "sha256-Rhwf0vnVzCxbv2Ikyk6YSGn/mJshEFfmqOSOZORfU2M=", "homepage": "https://registry.terraform.io/providers/aminueza/minio", "owner": "aminueza", "repo": "terraform-provider-minio", - "rev": "v3.13.0", + "rev": "v3.14.0", "spdx": "AGPL-3.0", "vendorHash": "sha256-6Tw4rCOzrvN2pK83NejdJJBjljfDfHEniIX+EdfqujA=" }, @@ -364,13 +364,13 @@ "vendorHash": "sha256-u/ycUCnEYlCBrDcI0VCkob4CGXrXYdGWwiw5EeJyuiw=" }, "e-breuninger_netbox": { - "hash": "sha256-nY0V4Pi5sF2ZiXBDfbXeJKz9ystKZpwhntoWRYMiefg=", + "hash": "sha256-gIqmj/skEUOmpZocx3nazRueUrNdvWcBszveqTOcblw=", "homepage": "https://registry.terraform.io/providers/e-breuninger/netbox", "owner": "e-breuninger", "repo": "terraform-provider-netbox", - "rev": "v5.0.1", + "rev": "v5.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-6dmHJzJGnpMWzYYelIuriMIrjOXD0KyJeVo1AUuYIRo=" + "vendorHash": "sha256-dzgI9WOABHVv8bJ1p36RAty4/2UAqDHagVJFPdEAnRU=" }, "equinix_equinix": { "hash": "sha256-F9WKIO8msltYTmxVjbF5FXkUX1jLK91zecOIq6xrGqY=", @@ -1310,11 +1310,11 @@ "vendorHash": "sha256-omxEb+ntQuHDfS2Rmt0rj0BF0Q2T8DLhobLua2uU/0o=" }, "tencentcloudstack_tencentcloud": { - "hash": "sha256-kXdu7rtGo4J9waREkVMWqFf4/Ki22fm6p/Nhtts/Ycs=", + "hash": "sha256-l5aywIsyAlQCX8SjvjJkEizqH+aZGmFN9zBbt/V/ri8=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.82.57", + "rev": "v1.82.62", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1499,12 +1499,12 @@ "vendorHash": "sha256-Z4DfoG4ApXbPNXZs9YvBWQj1bH7moLNI6P+nKDHt/Jc=" }, "yandex-cloud_yandex": { - "hash": "sha256-lNVCxNXYai+da2Hcg1+tcoYzoYRLRoCjzAQ/UB1WW4g=", + "hash": "sha256-UyrHFZDY2mQqF0yosPc1xS/Zm9nrGGhMH6awf3pdFdI=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.179.0", + "rev": "v0.181.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-JW8aCDhY0XLoeFN864bM9ZWPxDrGk7VGTAUhx3PiQ+E=" + "vendorHash": "sha256-Gj6ApI9xUL42KF4xYdvC8uwsAPNHJmouRkoz69yVVXQ=" } } diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix index 56866e101bee..65a25fb06dfa 100644 --- a/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -10,13 +10,13 @@ buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "7.3.0.1"; + version = "7.4.0"; src = fetchFromGitHub { owner = "anxdpanic"; repo = "plugin.video.youtube"; rev = "v${version}"; - hash = "sha256-e9V58R6hMaDGS0RKqtAU5IAjY9HED6bYMBz6hQJ606o="; + hash = "sha256-IEfgpl/uuELQ+4dVqek7/iCHW+sooVZ5eiASNXnm5EA="; }; propagatedBuildInputs = [ diff --git a/pkgs/by-name/ai/airwindows/package.nix b/pkgs/by-name/ai/airwindows/package.nix index 084830f733f3..0aa162ce2756 100644 --- a/pkgs/by-name/ai/airwindows/package.nix +++ b/pkgs/by-name/ai/airwindows/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation { pname = "airwindows"; - version = "0-unstable-2026-01-18"; + version = "0-unstable-2026-01-25"; src = fetchFromGitHub { owner = "airwindows"; repo = "airwindows"; - rev = "fe67011732dada5da0cdba5550d4244c657d0aaa"; - hash = "sha256-/eAa8qLRoplQoEYocdrczEI5RSCTMTxSezw0WAtk47w="; + rev = "597fcb482ef48a7f7a68736ea37b0badeecbb3c7"; + hash = "sha256-J+ZtneHb7hXZ1W7vt+5MSYS1P466tUVjH7zKMzn284Y="; }; # we patch helpers because honestly im spooked out by where those variables diff --git a/pkgs/by-name/an/anki/addons/anki-utils.nix b/pkgs/by-name/an/anki/addons/anki-utils.nix index 49bb331a0774..958defb8c241 100644 --- a/pkgs/by-name/an/anki/addons/anki-utils.nix +++ b/pkgs/by-name/an/anki/addons/anki-utils.nix @@ -21,6 +21,7 @@ runHook preBuild runHook postBuild '', + strictDeps ? true, dontPatchELF ? true, dontStrip ? true, passthru ? { }, @@ -35,6 +36,7 @@ inherit configurePhase buildPhase + strictDeps dontPatchELF dontStrip ; diff --git a/pkgs/by-name/ap/apko/package.nix b/pkgs/by-name/ap/apko/package.nix index 1abcceb294dd..c9a671fb7242 100644 --- a/pkgs/by-name/ap/apko/package.nix +++ b/pkgs/by-name/ap/apko/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "apko"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = "apko"; tag = "v${finalAttrs.version}"; - hash = "sha256-18i2xiVDjIRG0RD5R7t2BsyB9N+hhYOOByV6snGBCkM="; + hash = "sha256-7KDyTXqIM4hUnNVJt4xwsuUdP0eYSF+fSBRuSKs8VzQ="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-P8/0VSx4JfWgbMUuvo1Z0BhtC1TgGITSHLMHSzigeEg="; + vendorHash = "sha256-vHTJCfXVlbBLQXC/tsXJsGoACcxAhJmFlU/tq10836Q="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix b/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix index b5a07237c8b9..81120245a6dd 100644 --- a/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix +++ b/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix @@ -3,46 +3,28 @@ aws-encryption-sdk-cli, fetchPypi, nix-update-script, - python3, + python3Packages, testers, }: -let - localPython = python3.override { - self = localPython; - packageOverrides = final: prev: { - urllib3 = prev.urllib3.overridePythonAttrs (prev: rec { - version = "1.26.18"; - build-system = with final; [ - setuptools - ]; - postPatch = null; - src = prev.src.override { - inherit version; - hash = "sha256-+OzBu6VmdBNFfFKauVW/jGe0XbeZ0VkGYmFxnjKFgKA="; - }; - }); - }; - }; -in - -localPython.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "aws-encryption-sdk-cli"; - version = "4.2.0"; + version = "4.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-gORrscY+Bgmz2FrKdSBd56jP0yuEklytMeA3wr8tTZU="; + inherit version; + pname = "aws_encryption_sdk_cli"; + hash = "sha256-FfLgR7gocZ0cLV7bxqvKNI+Fs7kQF0XhR3zf6tHXwOE="; }; pythonRelaxDeps = [ "aws-encryption-sdk" ]; - build-system = with localPython.pkgs; [ + build-system = with python3Packages; [ setuptools ]; - dependencies = with localPython.pkgs; [ + dependencies = with python3Packages; [ attrs aws-encryption-sdk base64io @@ -52,7 +34,7 @@ localPython.pkgs.buildPythonApplication rec { doCheck = true; - nativeCheckInputs = with localPython.pkgs; [ + nativeCheckInputs = with python3Packages; [ mock pytest-mock pytest7CheckHook diff --git a/pkgs/by-name/ch/check-jsonschema/package.nix b/pkgs/by-name/ch/check-jsonschema/package.nix index 361f9ffc2f25..249c84287918 100644 --- a/pkgs/by-name/ch/check-jsonschema/package.nix +++ b/pkgs/by-name/ch/check-jsonschema/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "check-jsonschema"; - version = "0.36.0"; + version = "0.36.1"; pyproject = true; src = fetchFromGitHub { owner = "python-jsonschema"; repo = "check-jsonschema"; tag = version; - hash = "sha256-volbCQ0qxd614CDu0GIFKPXF1qSvgf5tTnJ8skcnnTg="; + hash = "sha256-s8a/9kWKSu+WuHQyoBsK4Vn30c+EA/eld/OD3kHYvbk="; }; build-system = with python3Packages; [ setuptools ]; diff --git a/pkgs/by-name/ch/checkmake/package.nix b/pkgs/by-name/ch/checkmake/package.nix index af78a16cbd7d..080e8e0fbfc2 100644 --- a/pkgs/by-name/ch/checkmake/package.nix +++ b/pkgs/by-name/ch/checkmake/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "checkmake"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "checkmake"; repo = "checkmake"; tag = "v${finalAttrs.version}"; - hash = "sha256-W+4bKERQL4nsPxrcCP19uYAwSw+tK9mAQp/fufzYcYg="; + hash = "sha256-5GIqmcIj1jU4lOqrFxuI8lDNYYpsRnUSft6RYGRbiAE="; }; vendorHash = "sha256-Iv3MFhHnwDLIuUH7G6NYyQUSAaivBYqYDWephHnBIho="; diff --git a/pkgs/by-name/ch/chirpstack-rest-api/package.nix b/pkgs/by-name/ch/chirpstack-rest-api/package.nix index 45acd2ff014d..eb67488ce189 100644 --- a/pkgs/by-name/ch/chirpstack-rest-api/package.nix +++ b/pkgs/by-name/ch/chirpstack-rest-api/package.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "chirpstack-rest-api"; - version = "4.15.0"; + version = "4.16.1"; src = fetchFromGitHub { owner = "chirpstack"; repo = "chirpstack-rest-api"; rev = "v${version}"; - hash = "sha256-YSMdE0f3usedyUItSvdtJ77L/x4rwrgIJa1TTg9ODek="; + hash = "sha256-utXayqQGlBYzmf7xW+s1Fh4oRhpBdfnV5g73X2ILKko="; }; - vendorHash = "sha256-+lAfgFb45WxZYh5fzONECRwTlXA64nl58rfstOPsDEg="; + vendorHash = "sha256-JnQaClgU+Yyz07lELoEyLYHLJwcmET5SLci2XQoFGKc="; ldflags = [ "-s" diff --git a/pkgs/by-name/ci/ciscoPacketTracer9/package.nix b/pkgs/by-name/ci/ciscoPacketTracer9/package.nix new file mode 100644 index 000000000000..d0e59507f916 --- /dev/null +++ b/pkgs/by-name/ci/ciscoPacketTracer9/package.nix @@ -0,0 +1,90 @@ +{ + appimageTools, + dpkg, + lib, + libpng, + libxkbfile, + requireFile, + stdenvNoCC, + version ? "9.0.0", +}: + +let + pname = "ciscoPacketTracer9"; + + appimage = stdenvNoCC.mkDerivation { + pname = "ciscoPacketTracer9-appimage"; + inherit version; + + src = + let + sources = { + "9.0.0" = { + name = "CiscoPacketTracer_900_Ubuntu_64bit.deb"; + hash = "sha256-3ZrA1Mf8N9y2j2J/18fm+m1CAMFEklJuVhi5vRcu2SA="; + }; + }; + in + requireFile { + inherit (sources."${version}") name hash; + url = "https://www.netacad.com/resources/lab-downloads"; + }; + + nativeBuildInputs = [ + dpkg + ]; + + installPhase = '' + runHook preInstall + + cp opt/pt/packettracer.AppImage $out + + runHook postInstall + ''; + }; + +in +appimageTools.wrapType2 rec { + inherit pname version; + src = appimage; + + extraPkgs = _: [ + libpng + libxkbfile + ]; + + extraBwrapArgs = [ + # fixes launch on wayland when the user sets QT_QPA_PLATFORM=wayland: + # "Fatal: This application failed to start because no Qt platform plugin could be initialized." + "--setenv QT_QPA_PLATFORM xcb" + ]; + + extraInstallCommands = + let + contents = appimageTools.extract { inherit pname version src; }; + in + '' + mv $out/bin/${pname} $out/bin/packettracer9 + + install -Dm444 ${contents}/CiscoPacketTracer-9.0.0.desktop $out/share/applications/cisco-packet-tracer-9.desktop + install -Dm444 ${contents}/CiscoPacketTracerPtsa-9.0.0.desktop $out/share/applications/cisco-packet-tracer-ptsa-9.desktop + substituteInPlace $out/share/applications/* \ + --replace-fail "Exec=@EXEC_PATH@" "Exec=packettracer9" \ + --replace-fail "Icon=app" "Icon=cisco-packet-tracer-9" + + install -Dm444 ${contents}/usr/share/icons/hicolor/48x48/apps/app.png $out/share/icons/hicolor/48x48/apps/cisco-packet-tracer-9.png + cp -r ${contents}/usr/share/icons/gnome/48x48/mimetypes $out/share/icons/hicolor/48x48/ + ''; + + meta = { + description = "Network simulation tool from Cisco"; + homepage = "https://www.netacad.com/courses/packet-tracer"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ + gepbird + ]; + mainProgram = "packettracer9"; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/pkgs/by-name/co/complgen/package.nix b/pkgs/by-name/co/complgen/package.nix index 077bf1f8d3e1..7dede6691e85 100644 --- a/pkgs/by-name/co/complgen/package.nix +++ b/pkgs/by-name/co/complgen/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "complgen"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "adaszko"; repo = "complgen"; tag = "v${finalAttrs.version}"; - hash = "sha256-fHSDYrfCoLQ4tU1DbrpD3iApufBv5qAGTIFri229pyE="; + hash = "sha256-DNmStSwuAFsLGC4pLU6dO2qhBQgxObPiUJxZoJf1d5A="; }; - cargoHash = "sha256-a6bGE2xxv8IdKlo98X8KNeQl8e//dc9pfaBgGHhx+5M="; + cargoHash = "sha256-whve1rNmqOLWjrM8gqxgocRTTWpEQ/VxT/0t+12uSKw="; meta = { changelog = "https://github.com/adaszko/complgen/blob/v${finalAttrs.version}/CHANGELOG.md"; diff --git a/pkgs/by-name/do/doppler/package.nix b/pkgs/by-name/do/doppler/package.nix index b5240b78209e..1bfbc54cf883 100644 --- a/pkgs/by-name/do/doppler/package.nix +++ b/pkgs/by-name/do/doppler/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "doppler"; - version = "3.75.1"; + version = "3.75.2"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - hash = "sha256-YyhDvBgdcy3CtVpQj60XQ0aqE2zT1LV9QXQJiJvlaic="; + hash = "sha256-S6g2wtF676Cc3nEKP1GpyhQRYyjKUQa9ACe41269vHY="; }; - vendorHash = "sha256-tSRtgkDPvDlEfwuNhahvs3Pvt4h7QAJrJtb1XQXGaFM="; + vendorHash = "sha256-u6SB3SXCqu7Y2aUoTAJ01mtDCxMofVQLAde1jDxVvks="; ldflags = [ "-s -w" diff --git a/pkgs/by-name/du/dunst/package.nix b/pkgs/by-name/du/dunst/package.nix index ee2838fa65d3..edcdae052fde 100644 --- a/pkgs/by-name/du/dunst/package.nix +++ b/pkgs/by-name/du/dunst/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dunst"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "dunst-project"; repo = "dunst"; tag = "v${finalAttrs.version}"; - hash = "sha256-HPmIcOLoYDD1GEgTh1elA9xiZGFKt1In4vsAtRsOukE="; + hash = "sha256-F7CONYJ95aKNZ+BpWNUerCBMflgJYgSaLAqp6XJ1G5k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ed/editorconfig-checker/package.nix b/pkgs/by-name/ed/editorconfig-checker/package.nix index 4c846ebe7329..f344bb156d43 100644 --- a/pkgs/by-name/ed/editorconfig-checker/package.nix +++ b/pkgs/by-name/ed/editorconfig-checker/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "editorconfig-checker"; - version = "3.6.0"; + version = "3.6.1"; src = fetchFromGitHub { owner = "editorconfig-checker"; repo = "editorconfig-checker"; tag = "v${finalAttrs.version}"; - hash = "sha256-HQYZXwxysGpbNDAzgAruzBtSlPxfwrLuzirkZSV2Xhs="; + hash = "sha256-kvRORmfquabvNoIchQdXEXKYKLpNjy8tgvkS6a0vmEk="; }; - vendorHash = "sha256-zlARI7bKf+4bdgCha9AlDZyTRbrOHtmvHeExJWhB85I="; + vendorHash = "sha256-Olp21Sbey3zW/OCc59w0wqcnq8lwRigu/De7A82H6YU="; # Tests run on source and don't expect vendor dir. doCheck = false; diff --git a/pkgs/by-name/ei/eigenwallet/package.nix b/pkgs/by-name/ei/eigenwallet/package.nix index c76e941dc1ae..9fc7b7afc79c 100644 --- a/pkgs/by-name/ei/eigenwallet/package.nix +++ b/pkgs/by-name/ei/eigenwallet/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "eigenwallet"; - version = "3.6.6"; + version = "3.6.7"; src = fetchurl { url = "https://github.com/eigenwallet/core/releases/download/${finalAttrs.version}/eigenwallet_${finalAttrs.version}_amd64.deb"; - hash = "sha256-2K1sls8YYvDirk9knVDoL5KDfjlxD7UbeKLIe+Z+wrc="; + hash = "sha256-kIu0TLFw5hxUnCItgSNB+XuxpC1gKXvu+k4vQH1UitA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/el/element-web/package.nix b/pkgs/by-name/el/element-web/package.nix index a5dbaf77b7b4..a469750f50dd 100644 --- a/pkgs/by-name/el/element-web/package.nix +++ b/pkgs/by-name/el/element-web/package.nix @@ -3,7 +3,8 @@ stdenv, jq, element-web-unwrapped, - conf ? { }, + config, + conf ? config.element-web.conf or { }, }: if (conf == { }) then diff --git a/pkgs/by-name/es/espeak-ng/package.nix b/pkgs/by-name/es/espeak-ng/package.nix index 0afba656b601..2dcc47110610 100644 --- a/pkgs/by-name/es/espeak-ng/package.nix +++ b/pkgs/by-name/es/espeak-ng/package.nix @@ -74,6 +74,12 @@ stdenv.mkDerivation rec { url = "https://github.com/espeak-ng/espeak-ng/commit/83e646e711af608fafa8c01dd812cd29e073f644.patch"; hash = "sha256-UHuURyqRy/JVYYJH5EI5J2cpBfCNeTE24sMmheb+D2Q="; }) + # Remove after next release. + (fetchpatch { + name = "cmake-default-ESPEAK_COMPAT-to-ON.patch"; + url = "https://github.com/espeak-ng/espeak-ng/commit/3dcbe7ea3ea85a9212968d0f05172dde4259e770.patch"; + hash = "sha256-U694hGe+cwy7qLe/6XmNHYIhccJGsbM0CzPZT5pIpUI="; + }) ] ++ lib.optionals mbrolaSupport [ # Hardcode correct mbrola paths. diff --git a/pkgs/by-name/ex/exo/package.nix b/pkgs/by-name/ex/exo/package.nix index b416735d340e..7a63cd3e0d92 100644 --- a/pkgs/by-name/ex/exo/package.nix +++ b/pkgs/by-name/ex/exo/package.nix @@ -18,13 +18,13 @@ nix-update-script, }: let - version = "1.0.65"; + version = "1.0.67"; src = fetchFromGitHub { name = "exo"; owner = "exo-explore"; repo = "exo"; tag = "v${version}"; - hash = "sha256-Zj174EySIILdj7+QJVT6ZGYvjO+jXHj+GizVsve2lFk="; + hash = "sha256-hipCiAqCkkyrVcQXEZKbGoVbgjM3hykUcazNPEbT+q8="; }; pyo3-bindings = python3Packages.buildPythonPackage (finalAttrs: { @@ -55,6 +55,10 @@ let enabledTestPaths = [ "rust/exo_pyo3_bindings/tests/" ]; + + # RuntimeError + # Attempted to create a NULL object + doCheck = !stdenv.hostPlatform.isDarwin; }); dashboard = buildNpmPackage (finalAttrs: { @@ -74,6 +78,19 @@ let hash = "sha256-3ZgE1ysb1OeB4BNszvlrnYcc7gOo7coPfOEQmMHC6E0="; }; }); + + # exo requires building mlx-lm from its main branch to use the kimi-k2.5 model + mlx-lm-unstable = python3Packages.mlx-lm.overridePythonAttrs (old: { + version = "0.30.4-unstable-2026-01-27"; + src = old.src.override { + rev = "96699e6dadb13b82b28285bb131a0741997d19ae"; + tag = null; + hash = "sha256-L1ws8XA8VhR18pRuRGbVal/yEfJaFNW8QzS16C1dFpE="; + }; + meta = old.meta // { + changelog = "https://github.com/ml-explore/mlx-lm/releases/tag/v0.30.5"; + }; + }); in python3Packages.buildPythonApplication (finalAttrs: { pname = "exo"; @@ -134,7 +151,7 @@ python3Packages.buildPythonApplication (finalAttrs: { loguru mflux mlx - mlx-lm + mlx-lm-unstable nvidia-ml-py openai openai-harmony diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index 8f0e21779ecf..fb0e6d316401 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -49,17 +49,17 @@ let in buildGoModule rec { pname = "forgejo-runner"; - version = "12.6.2"; + version = "12.6.3"; src = fetchFromGitea { domain = "code.forgejo.org"; owner = "forgejo"; repo = "runner"; rev = "v${version}"; - hash = "sha256-Y5dX1iemh4o5dZrDyhWeMEiocpplEe66p8UadtbJ4Jw="; + hash = "sha256-YBPUxKFHB6eqYyDAFBEbVVTLe5tfHwtLYfR+uCU73hc="; }; - vendorHash = "sha256-fvSiEIE4XSJ8Ot4Tcmt8chD11fHVsECD2/8xrgIKhJs="; + vendorHash = "sha256-MrumzEpSuLVmtrySnlI7Nb7GqxmW8Yk9agsaH4HA6QU="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/fr/freelens-bin/darwin.nix b/pkgs/by-name/fr/freelens-bin/darwin.nix index 546eeecf1639..40044b8a0f49 100644 --- a/pkgs/by-name/fr/freelens-bin/darwin.nix +++ b/pkgs/by-name/fr/freelens-bin/darwin.nix @@ -5,7 +5,8 @@ src, passthru, meta, - undmg, + _7zz, + autoSignDarwinBinariesHook, }: stdenvNoCC.mkDerivation { @@ -19,16 +20,18 @@ stdenvNoCC.mkDerivation { sourceRoot = "."; - nativeBuildInputs = [ undmg ]; + # APFS format is unsupported by undmg + nativeBuildInputs = [ + _7zz + autoSignDarwinBinariesHook + ]; installPhase = '' runHook preInstall mkdir -p "$out/Applications" - cp -R "Freelens.app" "$out/Applications/Freelens.app" + cp -R Freelens*/Freelens.app "$out/Applications/Freelens.app" runHook postInstall ''; - - dontFixup = true; } diff --git a/pkgs/by-name/fr/freelens-bin/package.nix b/pkgs/by-name/fr/freelens-bin/package.nix index b81d7a082d89..ed52fbae4962 100644 --- a/pkgs/by-name/fr/freelens-bin/package.nix +++ b/pkgs/by-name/fr/freelens-bin/package.nix @@ -5,7 +5,8 @@ lib, appimageTools, makeWrapper, - undmg, + _7zz, + darwin, writeShellScript, nix-update, jq, @@ -81,8 +82,9 @@ if stdenv.hostPlatform.isDarwin then src passthru meta - undmg + _7zz ; + autoSignDarwinBinariesHook = darwin.autoSignDarwinBinariesHook; } else import ./linux.nix { diff --git a/pkgs/by-name/fr/freetube/darwin-targets.patch b/pkgs/by-name/fr/freetube/darwin-targets.patch new file mode 100644 index 000000000000..509bca6a34cd --- /dev/null +++ b/pkgs/by-name/fr/freetube/darwin-targets.patch @@ -0,0 +1,13 @@ +diff --git a/_scripts/build.js b/_scripts/build.js +index ee1b7fa1c..1a4c9c6b2 100644 +--- a/_scripts/build.js ++++ b/_scripts/build.js +@@ -16,7 +16,7 @@ if (platform === 'darwin') { + arch = Arch.arm64 + } + +- targets = Platform.MAC.createTarget(['DMG', 'zip', '7z'], arch) ++ targets = Platform.MAC.createTarget(['dir'], arch) + } else if (platform === 'win32') { + let arch = Arch.x64 + diff --git a/pkgs/by-name/fr/freetube/package.nix b/pkgs/by-name/fr/freetube/package.nix index 26ed6654cbb2..539e54b68cb3 100644 --- a/pkgs/by-name/fr/freetube/package.nix +++ b/pkgs/by-name/fr/freetube/package.nix @@ -33,8 +33,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { postUnpack = if stdenvNoCC.hostPlatform.isDarwin then '' - cp -r ${electron.dist} electron-dist - chmod -R u+w electron-dist + cp -r ${electron.dist} source/electron-dist + chmod -R u+w source/electron-dist '' else '' @@ -45,6 +45,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { (replaceVars ./patch-build-script.patch { electron-version = electron.version; }) + ./darwin-targets.patch ]; yarnOfflineCache = fetchYarnDeps { @@ -74,7 +75,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { install -D _icons/icon.svg $out/share/icons/hicolor/scalable/apps/freetube.svg '' + lib.optionalString stdenvNoCC.hostPlatform.isDarwin '' - mkdir -p $out/Applications + mkdir -p $out/Applications $out/bin cp -r build/mac*/FreeTube.app $out/Applications ln -s "$out/Applications/FreeTube.app/Contents/MacOS/FreeTube" $out/bin/freetube '' @@ -110,11 +111,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { sigmasquadron ddogfoodd ]; - badPlatforms = [ - # output app is called "Electron.app" while derivation expects "FreeTube.app" - #see: https://github.com/NixOS/nixpkgs/pull/384596#issuecomment-2677141349 - lib.systems.inspect.patterns.isDarwin - ]; inherit (electron.meta) platforms; mainProgram = "freetube"; }; diff --git a/pkgs/by-name/ga/gat/package.nix b/pkgs/by-name/ga/gat/package.nix index ae55038e7adf..550e5c3004d2 100644 --- a/pkgs/by-name/ga/gat/package.nix +++ b/pkgs/by-name/ga/gat/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "gat"; - version = "0.26.0"; + version = "0.26.1"; src = fetchFromGitHub { owner = "koki-develop"; repo = "gat"; tag = "v${version}"; - hash = "sha256-aWGSn5eeFTfBrAsYj38jcf6Xsrz0X5crjjOe0fNu1Mo="; + hash = "sha256-tlRXWI8jdns+MFLBl5ZzcGo2qli6dKhlT9ekwSrxi+s="; }; - vendorHash = "sha256-C1Nm4czf6F2u/OU4jdRQLTXWKBo3mF0TqypbF1pO8yc="; + vendorHash = "sha256-0kNtZOTpWpeFVyRHFIf6ybM7gAWb5/JWVljm0FO5fK8="; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/gr/grpc-gateway/package.nix b/pkgs/by-name/gr/grpc-gateway/package.nix index 3ce546e565f6..c83c4b793759 100644 --- a/pkgs/by-name/gr/grpc-gateway/package.nix +++ b/pkgs/by-name/gr/grpc-gateway/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "grpc-gateway"; - version = "2.27.5"; + version = "2.27.6"; src = fetchFromGitHub { owner = "grpc-ecosystem"; repo = "grpc-gateway"; tag = "v${version}"; - sha256 = "sha256-xPm5oBxmtCfrOAIKoLMQFZA7PAp/buz6QRwQ8HFFpq4="; + sha256 = "sha256-Ll4iq8OLDM4UR6ZzVSqqHOzMAd4vwVSb9iKMRcKvIVg="; }; - vendorHash = "sha256-eEif65wAE06UNkkmDHz781DDuFPOTLkdvDq++XSP8XY="; + vendorHash = "sha256-SOAbRrzMf2rbKaG9PGSnPSLY/qZVgbHcNjOLmVonycY="; ldflags = [ "-X=main.version=${version}" diff --git a/pkgs/by-name/he/hexpatch/package.nix b/pkgs/by-name/he/hexpatch/package.nix index f765181dd649..e829d5c015b3 100644 --- a/pkgs/by-name/he/hexpatch/package.nix +++ b/pkgs/by-name/he/hexpatch/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "hexpatch"; - version = "1.12.4"; + version = "1.12.5"; src = fetchFromGitHub { owner = "Etto48"; repo = "HexPatch"; tag = "v${version}"; - hash = "sha256-ThHRf3zLNpOiIpB7drLqMBdyRl6MqW45oFpz44uBwsY="; + hash = "sha256-2FTFVKFql28S3/03M64FJyrwWuI0Zeg8z/nrWZJzGIo="; }; - cargoHash = "sha256-kMLLtrXjduQ2nyiNtiZOhlEfADhn1IKysF29WO6R8CE="; + cargoHash = "sha256-PQEq6g+VItcIG3GBl5sOFtPVZem27+n2JTPjK23xIt8="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/hi/hisat2/package.nix b/pkgs/by-name/hi/hisat2/package.nix index c8d98a4ea45c..6b392319ad2f 100644 --- a/pkgs/by-name/hi/hisat2/package.nix +++ b/pkgs/by-name/hi/hisat2/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "hisat2"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "DaehwanKimLab"; repo = "hisat2"; rev = "v${version}"; - sha256 = "0lmzdhzjkvxw7n5w40pbv5fgzd4cz0f9pxczswn3d4cr0k10k754"; + sha256 = "sha256-Ub7Oe363bU+R1xGiWVDkbXGV0PWJ5x2D9de+jTJSwOA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hy/hyprshutdown/package.nix b/pkgs/by-name/hy/hyprshutdown/package.nix index 8f3bb9df54ea..92fd6d6ae4f0 100644 --- a/pkgs/by-name/hy/hyprshutdown/package.nix +++ b/pkgs/by-name/hy/hyprshutdown/package.nix @@ -18,13 +18,13 @@ gcc15Stdenv.mkDerivation (finalAttrs: { pname = "hyprshutdown"; - version = "0-unstable-2026-01-11"; + version = "0-unstable-2026-01-27"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprshutdown"; - rev = "0c9cec7809a715c5c9a99a585db0b596bfb96a59"; - hash = "sha256-JMpLic41Jw6kDXXMtj6tEYUMu3QQ0Sg/M8EBxmAwapU="; + rev = "9f18be9c4e1a484c65b22dd53280815dc79a5a56"; + hash = "sha256-dp5lyZzKsjdqJLfwr0S4ILets8eu1kLfBB2y/LxspsU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/im/immer/package.nix b/pkgs/by-name/im/immer/package.nix index d2b5caf584ea..e6286f24d358 100644 --- a/pkgs/by-name/im/immer/package.nix +++ b/pkgs/by-name/im/immer/package.nix @@ -1,44 +1,62 @@ { lib, stdenv, - catch2, + catch2_3, fetchFromGitHub, cmake, + boehmgc, + boost, + fmt, nix-update-script, }: - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "immer"; - version = "0.8.1"; + + version = "0.9.1"; src = fetchFromGitHub { owner = "arximboldi"; repo = "immer"; - tag = "v${version}"; - hash = "sha256-Tyj2mNyLhrcFNQEn4xHC8Gz7/jtA4Dnkjtk8AAXJEw8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Qrr5mDbPF9cbLi9T2IVAKPN3CkTxffoivvqGNGLdkxE="; }; - nativeBuildInputs = [ - cmake - ]; + nativeBuildInputs = [ cmake ]; - buildInputs = [ - catch2 - ]; + cmakeFlags = [ (lib.cmakeBool "immer_BUILD_TESTS" finalAttrs.finalPackage.doCheck) ]; + + # immer is a header only library + dontBuild = true; + buildInputs = [ ]; + dontUseCmakeBuildDir = true; + + doCheck = false; strictDeps = true; - dontBuild = true; - dontUseCmakeBuildDir = true; - - passthru.updateScript = nix-update-script { }; + passthru = { + tests.test = finalAttrs.finalPackage.overrideAttrs (attrs: { + pname = "${attrs.pname}-test"; + doCheck = true; + checkInputs = [ + catch2_3 + boehmgc + boost + fmt + ]; + checkPhase = '' + make check + ''; + }); + updateScript = nix-update-script { }; + }; meta = { description = "Postmodern immutable and persistent data structures for C++ — value semantics at scale"; homepage = "https://sinusoid.es/immer"; - changelog = "https://github.com/arximboldi/immer/releases/tag/v${version}"; + changelog = "https://github.com/arximboldi/immer/releases/tag/v${finalAttrs.version}"; license = lib.licenses.boost; maintainers = with lib.maintainers; [ sifmelcara ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/in/interactsh/package.nix b/pkgs/by-name/in/interactsh/package.nix index 101e2ddf9398..bea8db7101cd 100644 --- a/pkgs/by-name/in/interactsh/package.nix +++ b/pkgs/by-name/in/interactsh/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "interactsh"; - version = "1.2.4"; + version = "1.3.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "interactsh"; tag = "v${version}"; - hash = "sha256-28d+ghJ/A/dg6aeypqPF4EAhDp8k3yXLYylxnQR/J+M="; + hash = "sha256-hbhVa+tXXJxSOeQqSFWcKKFv3tjcXhnCjqxLzg7/d+Q="; }; - vendorHash = "sha256-1ZTvIGgFEXxW//d3bD4kYRYj5+n/NzJW2oSnbjyXLGA="; + vendorHash = "sha256-g7dGmkxqj2UWap7TfNxocb93C7K0R76sAKD+n2kxDGo="; modRoot = "."; subPackages = [ diff --git a/pkgs/by-name/io/iosevka-bin/package.nix b/pkgs/by-name/io/iosevka-bin/package.nix index b209f8275ce4..db722f309e65 100644 --- a/pkgs/by-name/io/iosevka-bin/package.nix +++ b/pkgs/by-name/io/iosevka-bin/package.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "34.0.0"; + version = "34.1.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip"; diff --git a/pkgs/by-name/io/iosevka-bin/variants.nix b/pkgs/by-name/io/iosevka-bin/variants.nix index 87ce658cd745..1bb2a41d4eda 100644 --- a/pkgs/by-name/io/iosevka-bin/variants.nix +++ b/pkgs/by-name/io/iosevka-bin/variants.nix @@ -1,93 +1,93 @@ # This file was autogenerated. DO NOT EDIT! { - Iosevka = "049xg34s93adwnrj2ilwzprx19v1x76cwn1nj4fl6rhq188lxy5l"; - IosevkaAile = "0nx0i65fvsh4nhal2wkc7q97vr9bndnmdzn3kh2fyfyly9g35gwp"; - IosevkaCurly = "0b51fp7brgy0jy8md5zaryd2fj6lb1bnz1yrs5pbp65sqga1myvx"; - IosevkaCurlySlab = "12xn0639bxpc2zf64ygxli9j98q4nwsnfz75mpma5qd8viq8vr3k"; - IosevkaEtoile = "04clc64sqsqsm5bj5g3rabz1i3hhhi2lqm3ch43z2l9zb8jbn1bz"; - IosevkaSlab = "103b9zl481p3dy3d59sy0wn788hk72vlmvym3dfcdphclj6m2q2a"; - IosevkaSS01 = "00zvzi9s34xdy6q7lgh3g5qnrsprjqc71p773x82qzigzmr2x9ac"; - IosevkaSS02 = "1wnqpkl0jyd9hyy0ghizjhnw4rn84xzlj6dng438k9hbvjv4m81l"; - IosevkaSS03 = "1z250kgfslddc2k1nx03kan8i9ddngwskff0bsyaqwyxsbgvpkpv"; - IosevkaSS04 = "07b7g4bz4nvqhmklpn55rarzk0zyg6bwla88amkg9v6y86rs36d5"; - IosevkaSS05 = "0x4himbsrjw3c9c00ayqrb5dsyv56dh652ddagmx8ayx1dly78zs"; - IosevkaSS06 = "0nh9nf40ac1jw1wc2bpmw1dv7v9klbrjikhjrgjh4pa8ix63y93n"; - IosevkaSS07 = "17g7synzlkhq9kv8j0j5zg29v735ysfkik2nwcxs6jr3mq8b6c91"; - IosevkaSS08 = "1han2rn8x196v716zs78nz3nm9mlpdanx4ji6fnavlli7mrqqrr4"; - IosevkaSS09 = "16nlyw2z20jxs6cmi57vaswmjxd2fipbdva21dl9aq42q3f01v4y"; - IosevkaSS10 = "134fyhyi8hqjp72p4v734g0cbpb4wc49x8qvnw2lyv1c3zs806xh"; - IosevkaSS11 = "02yc1mmsrigp41l9d8pcksc2fmxrv3byyvafidialrwy134sp10n"; - IosevkaSS12 = "08f9754fai7xvyfyjxa010m7p3qg4cmbj6nbz1ij2r27clz3drpw"; - IosevkaSS13 = "16dmz5mj6l98ni8py3cj6ic5hvh7nhnlkyi7y9990zclr6jm75yc"; - IosevkaSS14 = "138i59bspwmf1lbpvzvbi5l1qaiqyh0gl7xrlv03vrn25bc2rlki"; - IosevkaSS15 = "1kwk5lr3r1rc45l05drgw0zkv3nsyn7yjphyrb61w3hiw8jvdrf3"; - IosevkaSS16 = "1acmn8danv4gmspj6ghfxrqdlnwdibf8b62zbgslb3zg2q4cxs46"; - IosevkaSS17 = "16pm15m0hklb75wf6kf3wr7dw9wsalsxlwrcwba0bpbcn3qd80ay"; - IosevkaSS18 = "1jlfxh6av584ng1szzqk47g7k4ii745s06i69scp4adag7n50gls"; - SGr-Iosevka = "0ak5vq49cc1lvj6kwz70yg0g82pvp5xzhn1g945hr04q3bg6k7kz"; - SGr-IosevkaCurly = "1ryh7v1aqvqj658q537hlkaglhb5xfqkskyp4sa2mmvv3hm9b0ch"; - SGr-IosevkaCurlySlab = "047vksiiw3vz37yn5y7a0c07ii5q9v8apbsqcx82cqjlgdy3yrfp"; - SGr-IosevkaFixed = "0f9zvwcxn652fsjynhvm8wpdiz8iz5h2iclzvgrgw74mb95rcpw6"; - SGr-IosevkaFixedCurly = "0llbli2mcadyjsgma4fg7m9sp8m4rknm4pfx4j8jls216c4hvkmq"; - SGr-IosevkaFixedCurlySlab = "1q3mwp7d1s8nc26p5lb6swv5qrjv4arcm5pisxxkgx8pgw35xmkb"; - SGr-IosevkaFixedSlab = "1xxphzvhhxnj612nxhin0kchxjqf4i3mm4nnaw0rrnwnmfk9kxd0"; - SGr-IosevkaFixedSS01 = "17ncsp460qsbwnvmcmbij1xw9cid978kmnks55fqjm7awqpylqak"; - SGr-IosevkaFixedSS02 = "076ai8i8a8m5akrra0czn9d7b8lc6wb3mlyxnzpfjblzdmzv2ca6"; - SGr-IosevkaFixedSS03 = "00jznjxv9gvzcgim21h67iszlcm9hhk5aig5nbbn38jnwcdpdmiw"; - SGr-IosevkaFixedSS04 = "1lahi2nip6qnrxpd8r5jjimlczcabk5hxzcb84h2aw3466ka84c1"; - SGr-IosevkaFixedSS05 = "0lhml3fzzhfzhs9nyk05aa4q075r69bvrqw3n3p0889j9zhp032h"; - SGr-IosevkaFixedSS06 = "12b50b4r3ipgx2wli3qn4gcpy23bhvmgibbcbyi80l3khrd1n72a"; - SGr-IosevkaFixedSS07 = "166vcyj3svawm3lmsdbs9mn50f1shn347jvwapr0q29pjkqf6wmw"; - SGr-IosevkaFixedSS08 = "0iml98i1bjxkhx7jw5wsc3r47qv3lzxy45p6ysvrldqp9rn6cyl9"; - SGr-IosevkaFixedSS09 = "0wr1s4qrnmi8ywch05m5x2bx22c4z2qywjcx2hy9sganhcpywdi8"; - SGr-IosevkaFixedSS10 = "0if1rlrb1lgxxyvl56f4lw8bfxp3178a0qiw9vsqlxrr23l697nr"; - SGr-IosevkaFixedSS11 = "1w1lsb0kmdn777xc38h2d6riwjiyhq5fml2zj4zv2vakjd7fsvzk"; - SGr-IosevkaFixedSS12 = "01krwyq4cfxwhji304k4ihm5q8ankiwi6fajmyc1x3xxxnqx7x57"; - SGr-IosevkaFixedSS13 = "1g4va6k35z732xm6q8pmjmif9fbddlcj6i3znypnqy1c9aklbdkc"; - SGr-IosevkaFixedSS14 = "1p10v2gwxiwim49xws9pnr9l286pl7l7syxc5hpy4xwsalb74mjl"; - SGr-IosevkaFixedSS15 = "1mci65bn9b70y7rzbabdgr0rchrjq1qrk6cvj740w6rym66v96pc"; - SGr-IosevkaFixedSS16 = "1cpclj67qbggai3cqp575b2q2dn0m0zp9w8mjgnm317q5kfhxlyp"; - SGr-IosevkaFixedSS17 = "130a2y4jkcnrgm71nn03060dx5017vjpsw9jwz97wff0akffdbbx"; - SGr-IosevkaFixedSS18 = "1s8p1cm8shjzklkfkzj2v9xhl7y33ckwq231kcawmam9njy8dazs"; - SGr-IosevkaSlab = "1i9b0rqxnivfd5vw425r7jpmfck7rk96kzj8shzms8jlxp7s83hj"; - SGr-IosevkaSS01 = "1qvshwpcrbiap0fmbmc4fgl08jfwrx6japkb56ps0bp8hcl4fbq4"; - SGr-IosevkaSS02 = "09z8qmq8g6dp6z82l6ax12xyz0fmblz2kwmkck82m9fd5x1y15hk"; - SGr-IosevkaSS03 = "1x141y7dgd6h0mpl6vlqkgzbva0pw31fjzdhakk9gnlkg7mqrrq4"; - SGr-IosevkaSS04 = "1jgxziyjsvvjr058plqwqmk0v9p25s3djqmh3b304q8pzwh8n5nv"; - SGr-IosevkaSS05 = "0gkiq20zbiqhv0dn34giv3ynnvmdry1spgfanjjqpc464lp9vnf7"; - SGr-IosevkaSS06 = "1lafg32clw1hl3nb46ypd0w43nz0gfcyg359pyplahfqil4k0y07"; - SGr-IosevkaSS07 = "1cwkvmmb4w9if4iha2yrnl636c8nmsb43a0r1qmmi7hrljnwqv66"; - SGr-IosevkaSS08 = "10zai3iw7bm9c848amkxf1p5bcd9bwb5pyvhlrld8x97hx86ah38"; - SGr-IosevkaSS09 = "01nr0lgg0hbr9j7xk4f73xwjjh8rwq5cpgrrbm7ix3n9zvwcppzl"; - SGr-IosevkaSS10 = "1akp2nndwkx0jfayq79yz3lpyf6d5qi5f5j2njpz0blmf9bxk513"; - SGr-IosevkaSS11 = "0f1z8qix2nd8xqknlm0962v1aylwd8aavsm9g8qhixjcp0zycb56"; - SGr-IosevkaSS12 = "02jcyagl2w0ky94fnm5g55r09fjzi6ny9a9ndh31dw4y1df0rq56"; - SGr-IosevkaSS13 = "152xkjjpp687523v93z62whj767jdmrq1103k49jdz0jsx719qs8"; - SGr-IosevkaSS14 = "0bjmyrwizasvj12wxmh4s2xz8fvjyrfxqlrrmjfcx2m7xl5fnpw8"; - SGr-IosevkaSS15 = "0v1yn16gwmkpabj4282db3vq9ww85p1n68gvr1fhvq9np5p51dbs"; - SGr-IosevkaSS16 = "0j7czrj6na618hdvgzk0pgf3wd19rr0d5pxp0a2mm08n4ba54zdx"; - SGr-IosevkaSS17 = "0fwjlsl5fmadqgim0pk3qz97wwf4mdds5vvw8p0j6gx131m0ghbx"; - SGr-IosevkaSS18 = "1588l6d7gdhbg8b3halbllfbr2ysz0nrxs7cbdj2fakvf4vbkwcn"; - SGr-IosevkaTerm = "07m9zsjpr1q8lbswakllwy9fxwfwy8j346ymqfcj9s2qdm0wliz2"; - SGr-IosevkaTermCurly = "1wcdjbdrlkjhapqz5r5v24dj5319nxib4gmgwqyp13wvl4s7w12r"; - SGr-IosevkaTermCurlySlab = "1y5j4a0mhdr02d5rnpfpjc11nmblgwl1sfm0kgqy9ching5a6wmg"; - SGr-IosevkaTermSlab = "0ydpajym193aisgqd31ibqal7f5d6klxbz36ifyvp1bi5xs1k4m3"; - SGr-IosevkaTermSS01 = "0f38yascmkla7dfn9sswczab707whamnj4nh83svwhdcn12zv24s"; - SGr-IosevkaTermSS02 = "1jj02783rfd7pyxypya8kqcs37q5vh6w7cxhx7dzsgf97rk73gxl"; - SGr-IosevkaTermSS03 = "0g8ki2gn56jx93y2m5np6g3gmvbgd2a2znf1pbf7zxpapqsr6d1f"; - SGr-IosevkaTermSS04 = "1v8zc59sbkqjf32cpw078ym2i429bqjrsylj8rnw7g1lfjgjzwk9"; - SGr-IosevkaTermSS05 = "04rdk0vajpyrpqlgb7y5ayvkiy7h65m53dk1m3mxnr6m6kix3ql4"; - SGr-IosevkaTermSS06 = "1rsk13m3w51nqpzvqzl8q056407kc8bg8minb2i4rrr41jaxkjp8"; - SGr-IosevkaTermSS07 = "0zbf4vgigz5hjv357zh460zarnrbmjy7z751vdn2l2nx5lrf3rln"; - SGr-IosevkaTermSS08 = "1x216ky05xmk28ydncbbgspbdzbdv0mglsz4v257lgqm36rkqm1s"; - SGr-IosevkaTermSS09 = "084chb52qrlv9jg1pxhvy5h31jpifqnls2ljg5hqpjj0b7c281rg"; - SGr-IosevkaTermSS10 = "1gvzd4wca9jv60m9rwnca3s7fka0zc917wsncn24ykp4rfiq5gw5"; - SGr-IosevkaTermSS11 = "11hr5dg08bp7ffcvn3cxz4c0flphbipbx1hagfqrmxl7q7bws7z6"; - SGr-IosevkaTermSS12 = "1687hy6bvgc0i3s4xfvg2cxvxywx2pszg811cn6r5prirf7w084f"; - SGr-IosevkaTermSS13 = "1gf28sgaswl2p7m4nvasp2i41k43bz6p7x09p5pja37jwfydvcpw"; - SGr-IosevkaTermSS14 = "0krgh1wq0n5z1gag90f4jfkah6a0qlwfbyggfbl4m4j9ha3ij3ya"; - SGr-IosevkaTermSS15 = "0sxsb4svrkbj9y18jby1z5ykh91dpkqkkifmm9sslzkw6if6dl1x"; - SGr-IosevkaTermSS16 = "06gv6xyh1ji54sqx6km43gfhprqzz11cmpnayszqflhcfc6ggkgy"; - SGr-IosevkaTermSS17 = "1daqp42rdw2qkc0vdncg99l62iamn03iyawwdmjpnqx8mhy0yvda"; - SGr-IosevkaTermSS18 = "02nnd8fjc5h0a3qs3gi3g5ffrgkvrhwv5ww5xnmnjp1ps8am680f"; + Iosevka = "1ks27r2aq6039qm6ds846ff0naazpn2f73qr2acy0d58g92mh1yn"; + IosevkaAile = "04y1c94ndhl7ffav80fk2pllxi4w8lp9gh78a2g8fkfsp032b834"; + IosevkaCurly = "0f70jjfagcv2xv7ni6p9ja7sfzfm7vjmkbmb7mrw1pabbxv1qv70"; + IosevkaCurlySlab = "1bhns6wfhpklir350xyvbqli11gv6ngv1hnqindfskvbjdgvksya"; + IosevkaEtoile = "1rj08pv191p5zh6x4lzb5wri39759jwif3vk6lbpdavjmh7n6ifb"; + IosevkaSlab = "1nwpgvmhfsrz9sarmjm4bv3fjw8v9xdnhgsk1qmail1ikd0r558b"; + IosevkaSS01 = "0rr9dpyjdf0zl6dnsd3ywx5bgsmxrmmdcvklr02xypbh0r48yk41"; + IosevkaSS02 = "0fms0w7k41g511haqc7g6a4y2mv053rrvlyymrldxpczavfmb452"; + IosevkaSS03 = "1mrk1shgz4b8gh71bz44mq7fc2rqj2dlqwzil3zhfmipp35khr8p"; + IosevkaSS04 = "0bfqg20pgyxxw9yxn1fn633w5rx87rij0scz37rrwx2ax21b9714"; + IosevkaSS05 = "1i4s47gwbhpipbcybwh7dj8zqhj3dibcxkm68zz7cqj7d0a3pgz1"; + IosevkaSS06 = "0b100pni0hfp9cwijasvhwv387zd0ss9ii4hrll6wwxdvl85kygp"; + IosevkaSS07 = "1138pcqknbs9qd08930q5ymgspvqfqmbvkmzza148q55pypakmhj"; + IosevkaSS08 = "170sfv87mi6n7mp60dfpkkqg2dckc4537vg1pa7kjqsdlz68w8cj"; + IosevkaSS09 = "0ggw8pw6rp3bzai453k0cxldjm5aah04h770k76izh8qcmdfn9cx"; + IosevkaSS10 = "07gpishi3kdvrj4rhiyzbh8689lq4idfwn9qwz8v2177k5hrc3xj"; + IosevkaSS11 = "0vgnmr4qqhxxqxfcn1i6fb81129gbcyyfx6s2hhsd0412m82za1m"; + IosevkaSS12 = "1am7l8kbjgzcdrh3rs4lll8rsdbl6nkfigj05ijxj99vy709b3ay"; + IosevkaSS13 = "0c4mljjijw5jdlcazz88fwaax1mlmslpvqjx04j4fa6y01b5lbwi"; + IosevkaSS14 = "00hc45hk39fnr1q1nfycyybipv8p7svnpd0v5a8gs2yziwp4lgmy"; + IosevkaSS15 = "0xklpd7hzbwr0hin7j2rmql5brsp9pnczkwmkv02dkz8wpaplsnh"; + IosevkaSS16 = "149vn4df6hqhhg4azvbg6ydrddfa2s9w6jl53y4jzh16k1qg299j"; + IosevkaSS17 = "0rhfkl90balv9q4kvlj7kqnpsq65v695y2420lgm0795jpzjjjqj"; + IosevkaSS18 = "0jlri23v1skwczqh5jlfgn48h9ax2l3c43ylr5j85ilnj141v83l"; + SGr-Iosevka = "13wh9xpd9snskargz50g6r12p7c605c9d021cidmrd17gv7xc9gy"; + SGr-IosevkaCurly = "02v5n4llvsfn5bz5f5bzwjg9sjddyy9g2by5x6vys28lrj1kjdpx"; + SGr-IosevkaCurlySlab = "1kcahdm2qh65979kjwma64kpqy07rx0vsbbm4nfq97dp89sf1r1v"; + SGr-IosevkaFixed = "1aqmz56378nsmk714y9zz5zpzn1y7qxir25fswb1q9i1d2a6jrjp"; + SGr-IosevkaFixedCurly = "08hz11jrg9d3kymfsdvv0pg3l15pfm58ywwwrz7x2s293v7dinij"; + SGr-IosevkaFixedCurlySlab = "1z7qzlam1611yfaa1x63qii40kv6ammiiq45z8h9ip1y1g89psfk"; + SGr-IosevkaFixedSlab = "1dh26p28jpcsvfw4rp9r59dzizg2b85a7sx49lzx420nq329nps1"; + SGr-IosevkaFixedSS01 = "0vba40a2yfxf30q8zskjw4xbyjynm4ddydgydclkbw4xk3lpv81c"; + SGr-IosevkaFixedSS02 = "06flqwi0xj6fcrf1kba4wmrixx8jp0ki5bl40jlk4b73y77pjdzl"; + SGr-IosevkaFixedSS03 = "1na81p6944raqfncwlamb6qq8iq3asy6pf3djbqb27q620vs1h2g"; + SGr-IosevkaFixedSS04 = "14mrnnxadlmkj289n89c0wjhpq9vsqp69jf4iknr0aw0zbxdzygg"; + SGr-IosevkaFixedSS05 = "096dxrl43955x1jxxmqrgblwcp09rm0bibwvlfzrhd858836ykgb"; + SGr-IosevkaFixedSS06 = "0g7iws86053z6cz9ccawfakbf5kc5hnv4pvkgw82nvczhswzj9w4"; + SGr-IosevkaFixedSS07 = "0zrsndf0kgzyar2ciskgnnq69761fz577w5x05cn8fi1j3bk8jw0"; + SGr-IosevkaFixedSS08 = "0i0b168zs4ivmphb6iv2pk738paqn9kqpxyy8p1hbnpxmhh6567k"; + SGr-IosevkaFixedSS09 = "1lqj8hac38g4apfy6mdhhvvghvfsicyw0mnihb1dhxfjrfglbgwv"; + SGr-IosevkaFixedSS10 = "1csr7pl77qcx89669215s52lk1xjk886xdhrxla8a14770vyqhc6"; + SGr-IosevkaFixedSS11 = "1r6hizv0bfk97sm98yr7frkrni6j3rdfrzkx8dg4k4kdawzgwl52"; + SGr-IosevkaFixedSS12 = "1g9azwdq9bymj77fvf4qkf19f0bc65z94xj1a47cc2m90q6lh64m"; + SGr-IosevkaFixedSS13 = "1f550yn0f8yi0wpmakvqxn841b40y3d2g2mkb0y6msh6lbknsyzv"; + SGr-IosevkaFixedSS14 = "059blzwwhc0vq2k4icxxv446srp3yx001r2pwb4yx9wvxz3s41iv"; + SGr-IosevkaFixedSS15 = "1f7cbs0zl3bz0bhm41c7155kdiqhz6csmkj9m56imdb9i43bc8dy"; + SGr-IosevkaFixedSS16 = "14f3ddmdhb3b97dv6hlp1h69xmxbyhya10nm97nhxx978wfb03wi"; + SGr-IosevkaFixedSS17 = "04ksk0479a6argapgw7cz948g18ji2lz6bgs9y6wgs2j23bdd202"; + SGr-IosevkaFixedSS18 = "0rrrb9qmr8mcs2w9j8ydgbi9mzh5qixc9wvvq243wf21f2ryyiv7"; + SGr-IosevkaSlab = "0104yjl6a90cfs1c0c7sv3w2bzxidrl3zwifi1cl7a9knmzf6q8c"; + SGr-IosevkaSS01 = "0w00c66pxah6cnh8i6da2k6rlj5wl5bjj1w78pc874y7l04bi5sh"; + SGr-IosevkaSS02 = "02gr60dcvlz961f99xcs3p76g8bdwbavm4qmgyadr9hla97bag5h"; + SGr-IosevkaSS03 = "01gsp69k7i3188z0gcrfbyl5ik5nhrpqm8qc5iafgdflw1cq3nbj"; + SGr-IosevkaSS04 = "11yj0r0fpxxbqz9wka4sl2b2yjy6ckk1srg0xf0zjj92ch5snp0c"; + SGr-IosevkaSS05 = "071y7zs923ngmiaiwfh87pirg5c65029wmbpk7ld3flqfclhcq52"; + SGr-IosevkaSS06 = "1p3fcwpf67v2br0c6q7ippx5blvj9qybx0kk3q823832i1ncrpxl"; + SGr-IosevkaSS07 = "15f2i563ii226gi9ysprw2gk9w5p71i8a7yqnx80m4ifhvvgchlc"; + SGr-IosevkaSS08 = "0jx9igvs79qskcdrjcj7cbkkdyj63m19smhv8dc34p189yf1ik3i"; + SGr-IosevkaSS09 = "108b1qnpm838sp82car9gg2y407r0nwdh4abaqlrgyr8dzk5f58n"; + SGr-IosevkaSS10 = "10g4bzfdk199qaplr4w3np6nkgh4mf1v7d9qsbvc3nrj8ll2aq5n"; + SGr-IosevkaSS11 = "0gxz2w0p0f0363c58nqfhks43r8wqq6pjy0v09yfdmnhqj6z7j9x"; + SGr-IosevkaSS12 = "1z9qzsmdgw34vcpzi3nbh5yj8hmxw6sxjgw4ixyhz43c4swf4cbn"; + SGr-IosevkaSS13 = "06lbzy7m3kdqk0f0hssbxidyqhzzgl2n2mpsg4yyxbyvbgdbhj8f"; + SGr-IosevkaSS14 = "0s8afcg7bcsc8s7rakg8bb561q4mfnf0wz1f5jxs19k1050zs0yd"; + SGr-IosevkaSS15 = "1q257hagk63bazl0prml0a1d47qyaq1v11f3j5aksdqw8pyd11g2"; + SGr-IosevkaSS16 = "1kwyrf0q077rn7x2qs454xbyr569a133c0k9a0al8jwjbpg7hsxw"; + SGr-IosevkaSS17 = "1l1mm2yz6dxzw73myd6spcbzdp2sy7zkg6j7mg06vlbnydk5xnz8"; + SGr-IosevkaSS18 = "04ppzgbb00anc4x6x6s82aih82pqz8n0isqnm65y4k1hddrm4h3i"; + SGr-IosevkaTerm = "0v21aqnfrnpkfkfzh6il344nfb3icmd9r5kiamigscc4vwqz6pn3"; + SGr-IosevkaTermCurly = "1955wg65w556blq2hi6ghgbayb53xq9lq5ajmk13x5hkp5fwbwpw"; + SGr-IosevkaTermCurlySlab = "0zh61dgfv4plwha45cz5ly3xgb1zk2c9wr0zlfjj30b1nqfffv4l"; + SGr-IosevkaTermSlab = "0wgq8d8cim0c2kw2qcp7pp65kpbkxkn7z9qsg5qmyv420p5fbckf"; + SGr-IosevkaTermSS01 = "1mfvqqa98wgsxfb17z3bcrgzblj9kqsah0jpmnblhvn6hrfcssyh"; + SGr-IosevkaTermSS02 = "1dklck1121y0i32c1vp5qnw8qy7fynn1858wmjq2rj0lzxbxv16s"; + SGr-IosevkaTermSS03 = "10nrg9bfzn6b7m0fnmy05dj6ma738bmxfcsd4cc2dnwcwj7ijckh"; + SGr-IosevkaTermSS04 = "0laxpzz7aayv8k8awdqaamaic7cvhnvbcpdgs6qm184vbxgkh25m"; + SGr-IosevkaTermSS05 = "0cppv8pywxi64mfd6r55l3pqwkdnkgiv3jxws8bx1sddy62vgwgm"; + SGr-IosevkaTermSS06 = "02mklk15iims5pqamlnmahwmsm1svsdc8066xrf3hncgavd493xg"; + SGr-IosevkaTermSS07 = "0xph1nanliln6vbd4n1yiz7rm0z5xniszlp9mhahqdpz0fd2rbfr"; + SGr-IosevkaTermSS08 = "15arp1z8yzhfmmf2z4xm7lwdyblr6xv1gqqrzw524xk24654hnq8"; + SGr-IosevkaTermSS09 = "01psmw8vbw1vbxmm70dq5cqgyh6fhpz26v9aics3dw1fdlpzk723"; + SGr-IosevkaTermSS10 = "01d7qnx3247cbcfq35q9dj937jwjlmb6k0c68bayc8ipnh6g6nmz"; + SGr-IosevkaTermSS11 = "019hg1vkj1smy20gkv277a59nr6bahprc38cql2pf3543cijwgzq"; + SGr-IosevkaTermSS12 = "14dnnxar7iig9iw8q45hsrilmjx7ygi4b8hm1x3hh1jcri3bywnb"; + SGr-IosevkaTermSS13 = "03ijmmhhah6994bllnfhjw2kf6llhawbslwrk0p2z92l8xia4cwn"; + SGr-IosevkaTermSS14 = "0znfgrcyrif6kdhywzzrv7dsq7k473kkm84rmk43crp3459jh7h1"; + SGr-IosevkaTermSS15 = "0d417ccl9q4zffq3c178g99wqranzqgaf07sna98x645anhyqqyg"; + SGr-IosevkaTermSS16 = "0fz2zn4gz6vyi4jw7jb8h2k99ll61sxzpfnw1x2gcbxap9qa7bgh"; + SGr-IosevkaTermSS17 = "0v92f25nqqd6hy84hy1522qspcbcrw5whz8r0vzvhf6k9bz2wma9"; + SGr-IosevkaTermSS18 = "0pijgwmf6ri92fjz0yv7z72bc4fqs1xwva0r55iibbmmk4n0lwch"; } diff --git a/pkgs/by-name/io/iotop-c/package.nix b/pkgs/by-name/io/iotop-c/package.nix index c1aa0d81d3f1..6096dddb5d6e 100644 --- a/pkgs/by-name/io/iotop-c/package.nix +++ b/pkgs/by-name/io/iotop-c/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "iotop-c"; - version = "1.30"; + version = "1.31"; src = fetchFromGitHub { owner = "Tomas-M"; repo = "iotop"; rev = "v${version}"; - sha256 = "sha256-L0zChYDtlEi9tdHdNNWO0KugTorFIbYK0zDPNcLUMuo="; + sha256 = "sha256-zJI6zPkkd9GIpnAfRMVLR9Xqog0sgxTnO/NTN3hsjKU="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ki/kickoff/package.nix b/pkgs/by-name/ki/kickoff/package.nix index ea10295d8691..ac2bfd7e72da 100644 --- a/pkgs/by-name/ki/kickoff/package.nix +++ b/pkgs/by-name/ki/kickoff/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "kickoff"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { owner = "j0ru"; repo = "kickoff"; rev = "v${finalAttrs.version}"; - hash = "sha256-V4MkVjg5Q8eAJ80V/4SvEIwjVy35/HVewaR1caYLguw="; + hash = "sha256-hDonn6as5TGoYOOFVzhWxOUKzqEQ66aFWz0O3gtBGS4="; }; - cargoHash = "sha256-bkum6NOQL0LVsLvOmKljFHE86ZU3lLDR8+I3wL0Efmk="; + cargoHash = "sha256-DOkgKcLPZzZaC+2vWNZ4BoaR0HhoaaKYQS7IQUJtK44="; libPath = lib.makeLibraryPath [ wayland diff --git a/pkgs/by-name/la/last/package.nix b/pkgs/by-name/la/last/package.nix index a582d8fd6c1d..e3c044822221 100644 --- a/pkgs/by-name/la/last/package.nix +++ b/pkgs/by-name/la/last/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1648"; + version = "1651"; src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; tag = version; - hash = "sha256-U1FGP6jzB36HLwTFKm/VMZWPPjo6mVuV/ePhGIkQgpg="; + hash = "sha256-TAc9prYydX5XO31f6p5DD7XMxVbNOW9ROtB7Agd7t8c="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mc/mcp-grafana/package.nix b/pkgs/by-name/mc/mcp-grafana/package.nix index bebf21bcc8f0..959b1485c45d 100644 --- a/pkgs/by-name/mc/mcp-grafana/package.nix +++ b/pkgs/by-name/mc/mcp-grafana/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "mcp-grafana"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "grafana"; repo = "mcp-grafana"; tag = "v${finalAttrs.version}"; - hash = "sha256-oMCRZaAkvotP0oD4MjdNASDRk0FUYnH2vR22IojilN8="; + hash = "sha256-oFSV/F63HZGN8zurdJG8/tf62Fu1k54E+wXUBZCzhxU="; }; vendorHash = "sha256-SjzOmWU+mrEdLsgeT1Y2+A3skOzWHxJXxWke7aHrt+A="; diff --git a/pkgs/by-name/me/meilisearch/package.nix b/pkgs/by-name/me/meilisearch/package.nix index 22abda087c41..844f540e3cee 100644 --- a/pkgs/by-name/me/meilisearch/package.nix +++ b/pkgs/by-name/me/meilisearch/package.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "meilisearch"; - version = "1.34.1"; + version = "1.34.3"; src = fetchFromGitHub { owner = "meilisearch"; repo = "meilisearch"; tag = "v${finalAttrs.version}"; - hash = "sha256-1wNaf36z4CIyhyhNOLZbKSSSIRjhTRB84hdkgtHU7rA="; + hash = "sha256-aO2OEXnYnejG3/7rVtpgIuPJkFW2clj4HooIWoEWDcE="; }; cargoBuildFlags = [ "--package=meilisearch" ]; - cargoHash = "sha256-8o4q2K93geIs3Ru7yUFShqCqELchVb0N2p4qEle6wss="; + cargoHash = "sha256-ZnztQOL+q+Bk+Vms5NiBVG2FrzKS0Cn+S3COWMe+tbw="; # Default features include mini dashboard which downloads something from the internet. buildNoDefaultFeatures = true; diff --git a/pkgs/by-name/me/meshtasticd/package.nix b/pkgs/by-name/me/meshtasticd/package.nix index 7a9ec6d4a12a..8c7a1efa6c16 100644 --- a/pkgs/by-name/me/meshtasticd/package.nix +++ b/pkgs/by-name/me/meshtasticd/package.nix @@ -16,13 +16,6 @@ libuv, libxkbcommon, ulfius, - openssl, - gnutls, - jansson, - zlib, - libmicrohttpd, - orcania, - yder, yaml-cpp, udevCheckHook, versionCheckHook, @@ -73,22 +66,15 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ bluez - gnutls i2c-tools - jansson libX11 libgpiod_1 libinput - libmicrohttpd libusb1 libuv libxkbcommon - openssl - orcania ulfius yaml-cpp - yder - zlib ]; preConfigure = '' diff --git a/pkgs/by-name/mi/micro/package.nix b/pkgs/by-name/mi/micro/package.nix index 9db5cb978321..9515b2c9fe69 100644 --- a/pkgs/by-name/mi/micro/package.nix +++ b/pkgs/by-name/mi/micro/package.nix @@ -5,6 +5,7 @@ fetchFromGitHub, installShellFiles, stdenv, + versionCheckHook, # Deprecated options # Remove them as soon as possible withXclip ? null, @@ -69,6 +70,9 @@ let wrapper = callPackage ./wrapper.nix { micro = self; }; }; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + meta = { homepage = "https://micro-editor.github.io"; changelog = "https://github.com/micro-editor/micro/releases/"; diff --git a/pkgs/by-name/mi/micro/tests/version.nix b/pkgs/by-name/mi/micro/tests/version.nix deleted file mode 100644 index 14d63a3a450b..000000000000 --- a/pkgs/by-name/mi/micro/tests/version.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ micro, testers }: - -testers.testVersion { - package = micro; - command = "micro -version"; -} diff --git a/pkgs/by-name/mi/mistral-vibe/package.nix b/pkgs/by-name/mi/mistral-vibe/package.nix index 8bd7b1a49181..0a03eb3aa178 100644 --- a/pkgs/by-name/mi/mistral-vibe/package.nix +++ b/pkgs/by-name/mi/mistral-vibe/package.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "mistral-vibe"; - version = "2.0.0"; + version = "2.0.1"; pyproject = true; src = fetchFromGitHub { owner = "mistralai"; repo = "mistral-vibe"; tag = "v${finalAttrs.version}"; - hash = "sha256-2waDKL1TWVw2BXl0oqV9+kH86w7dWpz1j61VQSxJW5Q="; + hash = "sha256-GqJHFgeaq2oBF1HI0g30IJ+QSj2szvCUUiT7up4VOpk="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix index 72c64f5b9ab5..88e2977b6510 100644 --- a/pkgs/by-name/my/myks/package.nix +++ b/pkgs/by-name/my/myks/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "myks"; - version = "5.6.0"; + version = "5.7.0"; src = fetchFromGitHub { owner = "mykso"; repo = "myks"; tag = "v${version}"; - hash = "sha256-0bK5ZnzGhQc0s0nQiNTGe5Z45BpwqXiv8kt0ne8EkpE="; + hash = "sha256-WxbADpvay7k0niTpKjf/1YqjQBxlMfdWl4MXY6+5iFY="; }; - vendorHash = "sha256-jNPo6TotuBhG2GW9vHu1zC6BYCIRfyqRZB6vbtCNCpI="; + vendorHash = "sha256-Va8x5kvrms/3/DH6TgcpndBh6MQ0fFatJApcOeH6gwc="; subPackages = "."; diff --git a/pkgs/by-name/nn/nnd/package.nix b/pkgs/by-name/nn/nnd/package.nix index f7ba0cfc44c3..e5defaf68909 100644 --- a/pkgs/by-name/nn/nnd/package.nix +++ b/pkgs/by-name/nn/nnd/package.nix @@ -8,16 +8,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "nnd"; - version = "0.68"; + version = "0.69"; src = fetchFromGitHub { owner = "al13n321"; repo = "nnd"; tag = "v${finalAttrs.version}"; - hash = "sha256-77WKsk/kKWJjSwikXtLDWY0pRf1pC6YkY9c9xDtheUI="; + hash = "sha256-LvCA6UXnsf4ZCSqb2dI5UzMFgiKk2kaiE0zpzcbs3uI="; }; - cargoHash = "sha256-I9TcZQqKjR4awufmT8fM883YDeyNZUozHaoZfEaE6+0="; + cargoHash = "sha256-FY6+EkkOvgg4irb7Fr1xE2szScAREkn1qFIle8JGZX0="; meta = { description = "Debugger for Linux"; diff --git a/pkgs/by-name/or/or-tools/package.nix b/pkgs/by-name/or/or-tools/package.nix index c2f7071a90fe..eb334bcd0b4d 100644 --- a/pkgs/by-name/or/or-tools/package.nix +++ b/pkgs/by-name/or/or-tools/package.nix @@ -232,7 +232,12 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' cmake . -DBUILD_EXAMPLES=OFF -DBUILD_PYTHON=OFF -DBUILD_SAMPLES=OFF cmake --install . - pip install --prefix="$python" python/ + + # Install the Python bindings. + # --no-build-isolation: Required because Nix provides build tools (setuptools/wheel) + # locally; without this, pip tries to download them from the internet. + # --no-index: Prevents pip from searching PyPI for packages. + pip install --no-index --no-build-isolation --prefix="$python" python/ ''; outputs = [ @@ -249,5 +254,10 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "fzn-cp-sat"; maintainers = with lib.maintainers; [ andersk ]; platforms = with lib.platforms; linux ++ darwin; + + # Only version 9.15 adds support for Python 3.14: https://github.com/google/or-tools/releases/tag/v9.15 + # Also this package is tied to pybind 2.13.6, and only 3.0.0 supports Python 3.14: https://github.com/pybind/pybind11/releases/tag/v3.0.0 + # Also, nix review fails to build python314Packages.ortools + broken = python3.pythonAtLeast "3.14"; }; }) diff --git a/pkgs/by-name/qr/qrrs/package.nix b/pkgs/by-name/qr/qrrs/package.nix index 5aec1bfd279f..057c507fd99b 100644 --- a/pkgs/by-name/qr/qrrs/package.nix +++ b/pkgs/by-name/qr/qrrs/package.nix @@ -6,16 +6,16 @@ }: rustPlatform.buildRustPackage rec { pname = "qrrs"; - version = "0.1.10"; + version = "0.1.11"; src = fetchFromGitHub { owner = "lenivaya"; repo = "qrrs"; rev = "v${version}"; - hash = "sha256-L8sqvLbh85b8Ds9EvXNkyGVXm8BF3ejFd8ZH7QoxJdU="; + hash = "sha256-lXfqKMJx9vtljQlYvbUAONFqMO3HKa4hx/29/YERw2U="; }; - cargoHash = "sha256-/aRr5UeGKGt+H9+C9MWcpMriPeIVEwp7xnigrUvMUiw="; + cargoHash = "sha256-blBZOnrKdNfq010b6u1NmTLY3W9Q2BjQAVbW+oNbDlE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/re/rescript-language-server/package.nix b/pkgs/by-name/re/rescript-language-server/package.nix index 71ea91149d41..143d0ffc0211 100644 --- a/pkgs/by-name/re/rescript-language-server/package.nix +++ b/pkgs/by-name/re/rescript-language-server/package.nix @@ -6,9 +6,10 @@ esbuild, nix-update-script, versionCheckHook, - rescript-editor-analysis, + vscode-extensions, }: let + inherit (vscode-extensions.chenglou92.rescript-vscode) rescript-editor-analysis; platformDir = if stdenv.hostPlatform.isLinux then "linux" diff --git a/pkgs/by-name/ro/rofimoji/package.nix b/pkgs/by-name/ro/rofimoji/package.nix index aa7cca6eb539..f30040df2022 100644 --- a/pkgs/by-name/ro/rofimoji/package.nix +++ b/pkgs/by-name/ro/rofimoji/package.nix @@ -3,9 +3,10 @@ python3Packages, fetchFromGitHub, installShellFiles, + stdenv, - waylandSupport ? true, - x11Support ? true, + waylandSupport ? (!stdenv.hostPlatform.isDarwin), + x11Support ? (!stdenv.hostPlatform.isDarwin), wl-clipboard, wtype, @@ -60,7 +61,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/fdw/rofimoji"; changelog = "https://github.com/fdw/rofimoji/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.mit; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ justinlovinger ]; }; } diff --git a/pkgs/by-name/te/teamtype/package.nix b/pkgs/by-name/te/teamtype/package.nix index 539f9a503049..e3cc9c0df571 100644 --- a/pkgs/by-name/te/teamtype/package.nix +++ b/pkgs/by-name/te/teamtype/package.nix @@ -9,18 +9,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "teamtype"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "teamtype"; repo = "teamtype"; tag = "v${finalAttrs.version}"; - hash = "sha256-B/4xR16cEG90fK12XQqjlpWzd6tyUVYXOBXK0j5fvNU="; + hash = "sha256-74MufpLTACkPevzOyaXw2Rr7S7VvaFEYHEyTQYwKVT8="; }; sourceRoot = "${finalAttrs.src.name}/daemon"; - cargoHash = "sha256-yuAk4SqYzNK1gD6lqVVDOyAJNq/NIf44DWdZ3aM/Q8s="; + cargoHash = "sha256-OIOffnCC9PlT/SXPOuTnKx3feZnkHP+jzbQIJWX0tzk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/tg/tg-archive/package.nix b/pkgs/by-name/tg/tg-archive/package.nix index d3971c3ca4ef..85218ba5ac96 100644 --- a/pkgs/by-name/tg/tg-archive/package.nix +++ b/pkgs/by-name/tg/tg-archive/package.nix @@ -6,7 +6,7 @@ let pname = "tg-archive"; - version = "1.3.0"; + version = "1.3.1"; in python3.pkgs.buildPythonApplication { @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication { owner = "knadh"; repo = "tg-archive"; tag = "v${version}"; - hash = "sha256-/b9LmHOyFqaKiQ5FHemLmg6DZU+3zzh1jLBEI7RTu4Q="; + hash = "sha256-GAy3dKkrrLO9IlRBUYaKxm4AswQK4cYUKIjezcBok/k="; }; pyproject = true; diff --git a/pkgs/by-name/ul/ulfius/package.nix b/pkgs/by-name/ul/ulfius/package.nix index 7b44f35fcdbe..21542df0d6ad 100644 --- a/pkgs/by-name/ul/ulfius/package.nix +++ b/pkgs/by-name/ul/ulfius/package.nix @@ -2,7 +2,18 @@ lib, stdenv, fetchFromGitHub, + + withJson ? true, + withHttps ? true, + withWebsockets ? true, + withCurl ? true, + withLogger ? true, + withUwsc ? withWebsockets, # uwsc depends on websockets + + # nativeBuildInputs cmake, + + # Optional dependencies curl, gnutls, jansson, @@ -29,14 +40,24 @@ stdenv.mkDerivation (finalAttrs: { cmake ]; - buildInputs = [ - curl - gnutls - jansson + propagatedBuildInputs = [ libmicrohttpd orcania - yder - zlib + ] + ++ lib.optionals withJson [ jansson ] + ++ lib.optionals withCurl [ curl ] + ++ lib.optionals (withHttps || withWebsockets) [ gnutls ] + ++ lib.optionals withLogger [ yder ] + ++ lib.optionals withWebsockets [ zlib ]; + + cmakeFlags = [ + (lib.cmakeBool "WITH_CURL" withCurl) + (lib.cmakeBool "WITH_JANSSON" withJson) + (lib.cmakeBool "WITH_GNUTLS" (withHttps || withWebsockets)) + (lib.cmakeBool "WITH_YDER" withLogger) + (lib.cmakeBool "BUILD_UWSC" (withUwsc && withWebsockets)) + (lib.cmakeBool "WITH_WEBSOCKET" withWebsockets) + (lib.cmakeBool "WITH_WEBSOCKET_MESSAGE_LIST" withWebsockets) ]; meta = { @@ -45,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/babelouest/ulfius/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.lgpl21Only; maintainers = with lib.maintainers; [ drupol ]; - mainProgram = "uwsc"; platforms = lib.platforms.all; - }; + } + // lib.optionalAttrs (withUwsc && withWebsockets) { mainProgram = "uwsc"; }; }) diff --git a/pkgs/by-name/un/unrar-free/package.nix b/pkgs/by-name/un/unrar-free/package.nix index 3f445bfd2e02..4fe0e9d8d41c 100644 --- a/pkgs/by-name/un/unrar-free/package.nix +++ b/pkgs/by-name/un/unrar-free/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + argp-standalone, fetchFromGitLab, autoreconfHook, libarchive, @@ -24,7 +25,14 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = [ libarchive ]; + buildInputs = [ + libarchive + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + argp-standalone + ]; + + env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-largp"; setupHook = ./setup-hook.sh; @@ -50,6 +58,5 @@ stdenv.mkDerivation (finalAttrs: { thiagokokada ]; platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/by-name/up/upsun/versions.json b/pkgs/by-name/up/upsun/versions.json index fc3506cc4d12..9c1debd7b395 100644 --- a/pkgs/by-name/up/upsun/versions.json +++ b/pkgs/by-name/up/upsun/versions.json @@ -1,19 +1,19 @@ { - "version": "5.8.0", + "version": "5.9.0", "darwin-amd64": { - "hash": "sha256-2nPuxOHrCa0j2HMYV8yeKfsRQOFdksp6KNQVQmSiS4I=", - "url": "https://github.com/platformsh/cli/releases/download/5.8.0/upsun_5.8.0_darwin_all.tar.gz" + "hash": "sha256-B1F+01ltzErGujECC1CM8tPRuVMUOIkcKSpypqlRG2M=", + "url": "https://github.com/platformsh/cli/releases/download/5.9.0/upsun_5.9.0_darwin_all.tar.gz" }, "darwin-arm64": { - "hash": "sha256-2nPuxOHrCa0j2HMYV8yeKfsRQOFdksp6KNQVQmSiS4I=", - "url": "https://github.com/platformsh/cli/releases/download/5.8.0/upsun_5.8.0_darwin_all.tar.gz" + "hash": "sha256-B1F+01ltzErGujECC1CM8tPRuVMUOIkcKSpypqlRG2M=", + "url": "https://github.com/platformsh/cli/releases/download/5.9.0/upsun_5.9.0_darwin_all.tar.gz" }, "linux-amd64": { - "hash": "sha256-9t4dktUu0u3+bUuYLlhfUOyHbfIizLeOUj7AXQ0VQGI=", - "url": "https://github.com/platformsh/cli/releases/download/5.8.0/upsun_5.8.0_linux_amd64.tar.gz" + "hash": "sha256-J8A4h39dEgMAJHKLwmgWBsj4Al9STIccUAal6JctPyQ=", + "url": "https://github.com/platformsh/cli/releases/download/5.9.0/upsun_5.9.0_linux_amd64.tar.gz" }, "linux-arm64": { - "hash": "sha256-8p1SUUuwaSLbt6j+tjcefom08dyW0NW/F2uxDMWaiv4=", - "url": "https://github.com/platformsh/cli/releases/download/5.8.0/upsun_5.8.0_linux_arm64.tar.gz" + "hash": "sha256-gyVqD4cBYo6L1Y0xMLl06WK4/sKvudFXLiqvEmcrRPE=", + "url": "https://github.com/platformsh/cli/releases/download/5.9.0/upsun_5.9.0_linux_arm64.tar.gz" } } diff --git a/pkgs/by-name/us/usb-modeswitch/data.nix b/pkgs/by-name/us/usb-modeswitch-data/package.nix similarity index 100% rename from pkgs/by-name/us/usb-modeswitch/data.nix rename to pkgs/by-name/us/usb-modeswitch-data/package.nix diff --git a/pkgs/by-name/uu/uutils-hostname/package.nix b/pkgs/by-name/uu/uutils-hostname/package.nix index f9de647f54b9..8d4b85bf4b76 100644 --- a/pkgs/by-name/uu/uutils-hostname/package.nix +++ b/pkgs/by-name/uu/uutils-hostname/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uutils-hostname"; - version = "0.0.1-unstable-2026-01-08"; + version = "0-unstable-2026-01-28"; src = fetchFromGitHub { owner = "uutils"; repo = "hostname"; - rev = "a5590e823e2cb488ad14f61dee92e04cb4dc2704"; - hash = "sha256-nWRkqONxbSwhphULpM+m14H/DSPmM4XdLJ7q2D4kooo="; + rev = "99bba3d33b03da1ff7d961d542ad5804d007b76c"; + hash = "sha256-f5LTvSsBsFbK9+MMiJQRvY2ze1t4qE2mEUsV0+2oO9A="; }; - cargoHash = "sha256-1H4h01IqLVZrXNjnI36lGgsmg8rxHDAn9sbuvUxqPEQ="; + cargoHash = "sha256-nbpyflP4J6V6aEeCp5I+FP2NNmXDS4JhbGWUBbOyJEc="; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; diff --git a/pkgs/by-name/uu/uutils-login/package.nix b/pkgs/by-name/uu/uutils-login/package.nix index c1bb42b59a8a..477bf720ca41 100644 --- a/pkgs/by-name/uu/uutils-login/package.nix +++ b/pkgs/by-name/uu/uutils-login/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uutils-login"; - version = "0.0.1-unstable-2026-01-08"; + version = "0-unstable-2026-01-28"; src = fetchFromGitHub { owner = "uutils"; repo = "login"; - rev = "24c158ef78ef8e769337a91c563223a1bf1b58a7"; - hash = "sha256-1pJhFtY3zJTDIKX9SXuv3yfrvPMNCiC/b7WKdBU1Nqk="; + rev = "ec2c270122a4fdb5f7cae5d8ff5ae9c66018fb69"; + hash = "sha256-LqlxsztC+9XgCqErtTLt7lYcBKz9Ht7pvWLclptW834="; }; - cargoHash = "sha256-V0Cb3Vz3MpVxqaHpIxrfYD+EAjjQ0jKI9Qc6pN13deg="; + cargoHash = "sha256-1Ph+vJeRTWYTfj2Qu74T7L8GpT1PiI1GKyOHTwo0HXA="; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; diff --git a/pkgs/by-name/uu/uutils-tar/package.nix b/pkgs/by-name/uu/uutils-tar/package.nix index 31a8d514bc64..7e296e5dd65b 100644 --- a/pkgs/by-name/uu/uutils-tar/package.nix +++ b/pkgs/by-name/uu/uutils-tar/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uutils-tar"; - version = "0.0.1-unstable-2026-01-08"; + version = "0-unstable-2026-01-28"; src = fetchFromGitHub { owner = "uutils"; repo = "tar"; - rev = "a73ac381d8fd78f8cb05236d26edfdae37a80ee3"; - hash = "sha256-b8Nzp5zZuULH5YkCexVOPxioPiuauGL4+KarBAdVAd4="; + rev = "113912e981c979efb95b4112d218563fa0ef6329"; + hash = "sha256-ZNK3dpdJx4L8un35LQPZgtXiPC6hcOTFIJ26YKAqSNg="; }; - cargoHash = "sha256-UFRe+dBQhsV91tenZY4uqw9gs4ZqbYDtvBeA98dk3po="; + cargoHash = "sha256-cpYhIH6aYaWCcD8IA4iYuHMrcDCkLvkiwkwPc+UJw3g="; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; diff --git a/pkgs/by-name/va/vanillatd/package.nix b/pkgs/by-name/va/vanillatd/package.nix index 5d5ccf4b8147..7cff83871c5a 100644 --- a/pkgs/by-name/va/vanillatd/package.nix +++ b/pkgs/by-name/va/vanillatd/package.nix @@ -24,7 +24,7 @@ symlinkJoin, rsync, - appName, + appName ? "vanillatd", CMAKE_BUILD_TYPE ? "RelWithDebInfo", # "Choose the type of build, recommended options are: Debug Release RelWithDebInfo" }: assert lib.assertOneOf "appName" appName [ diff --git a/pkgs/by-name/vt/vtfedit/package.nix b/pkgs/by-name/vt/vtfedit/package.nix index f222b329cc13..525eaf3ec79a 100644 --- a/pkgs/by-name/vt/vtfedit/package.nix +++ b/pkgs/by-name/vt/vtfedit/package.nix @@ -7,10 +7,12 @@ copyDesktopItems, makeWrapper, - wine, + wineWowPackages, winetricks, }: - +let + wine = wineWowPackages.staging; +in stdenv.mkDerivation rec { pname = "vtfedit"; version = "1.3.3"; diff --git a/pkgs/by-name/we/websurfx/package.nix b/pkgs/by-name/we/websurfx/package.nix index 4c24e97cc2e3..de317949693f 100644 --- a/pkgs/by-name/we/websurfx/package.nix +++ b/pkgs/by-name/we/websurfx/package.nix @@ -6,7 +6,7 @@ pkg-config, }: let - version = "1.24.35"; + version = "1.24.36"; in rustPlatform.buildRustPackage { pname = "websurfx"; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage { owner = "neon-mmd"; repo = "websurfx"; tag = "v${version}"; - hash = "sha256-qf8RU7cNHzXSjyzlRtHxuoxGlkSWNYTmYu/Z0hiqQpc="; + hash = "sha256-Iw/wG6IKp+KdBVhmC/wVU55h9B/Ew8qrb4ZrMfVF+Ic="; }; nativeBuildInputs = [ @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage { openssl ]; - cargoHash = "sha256-A9Cg9zZ4FNTTdA+oIvxVH2D2627t+mhNLnRKDsVeKb8="; + cargoHash = "sha256-S8XGsOfYK1Ua2rCt7kKyLKXMXs1G1G7M6kqJ9UcdBjc="; postPatch = '' substituteInPlace src/handler.rs \ diff --git a/pkgs/by-name/we/wechat/package.nix b/pkgs/by-name/we/wechat/package.nix index ed0298af3de3..aa1005ff20f2 100644 --- a/pkgs/by-name/we/wechat/package.nix +++ b/pkgs/by-name/we/wechat/package.nix @@ -30,14 +30,14 @@ let # https://dldir1.qq.com/weixin/mac/mac-release.xml any-darwin = let - version = "4.1.6.47-33480"; + version = "4.1.7.30-34346"; version' = lib.replaceString "-" "_" version; in { inherit version; src = fetchurl { url = "https://dldir1v6.qq.com/weixin/Universal/Mac/xWeChatMac_universal_${version'}.dmg"; - hash = "sha256-oEaMi1O6zdCIxPHQt61QYLQMqO+GAFO5d+zHUuJUk9U="; + hash = "sha256-/QbIkJ83EFCUBbmFUnY8aBbjPP9B5yw8qmRbhXxSwYE="; }; }; in diff --git a/pkgs/by-name/wi/wiremix/package.nix b/pkgs/by-name/wi/wiremix/package.nix index bf92c32a7d0e..3fb9751d0a59 100644 --- a/pkgs/by-name/wi/wiremix/package.nix +++ b/pkgs/by-name/wi/wiremix/package.nix @@ -8,14 +8,14 @@ rustPlatform.buildRustPackage rec { pname = "wiremix"; - version = "0.8.0"; + version = "0.9.0"; src = fetchCrate { inherit pname version; - hash = "sha256-wBE7gYR2fVbSc9NA8IGI2SGJwMACoPi1NTTdGq4UVF8="; + hash = "sha256-gs6KqluASHTf4fURZKEmNvERguQEH5UDc4044uJddrU="; }; - cargoHash = "sha256-0O8Oe4EppvvFIF9e0MzNSAGp0ZmnW3wr8DHw7G00UWY="; + cargoHash = "sha256-WqC+JVjE0zxvn9/64eGmMIwSqIBXj/OsEmvUHnGKEkA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/wt/wttrbar/package.nix b/pkgs/by-name/wt/wttrbar/package.nix index b9a41a5055d9..a7b3d12f4c67 100644 --- a/pkgs/by-name/wt/wttrbar/package.nix +++ b/pkgs/by-name/wt/wttrbar/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "wttrbar"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "bjesus"; repo = "wttrbar"; tag = finalAttrs.version; - hash = "sha256-TDjEIrxFkh6d0x89LxaiarsP0BIzP5+rxu3YCdXIQ2U="; + hash = "sha256-tOsyPBpZaotlwzV1atW9FnfFbemtR3v51cg7UFIwI6U="; }; - cargoHash = "sha256-yiShp9k5oiGAtj59jGDEFsQKujDFajO+Nwq0bLh/PtA="; + cargoHash = "sha256-C1PkpKYsb62s6H4VgRSo7WzHFBaUv1Yk6IXm9ep20p8="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/wv/wvkbd/package.nix b/pkgs/by-name/wv/wvkbd/package.nix index f7023d52f5fe..387f0be4cbdf 100644 --- a/pkgs/by-name/wv/wvkbd/package.nix +++ b/pkgs/by-name/wv/wvkbd/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "wvkbd"; - version = "0.19"; + version = "0.19.2"; src = fetchFromGitHub { owner = "jjsullivan5196"; repo = "wvkbd"; tag = "v${version}"; - hash = "sha256-oaySfijJBzD+tsaNMmXQ168un9Z0IMwN+7sxAmVr3xs="; + hash = "sha256-PHbgARSy2Zlr1dgzuUFbPxtqFvOYoayMK9vGLR6yaTA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/za/zapzap/package.nix b/pkgs/by-name/za/zapzap/package.nix index 3f66e0c4d7a1..2abe48e3b903 100644 --- a/pkgs/by-name/za/zapzap/package.nix +++ b/pkgs/by-name/za/zapzap/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "zapzap"; - version = "6.2.7"; + version = "6.2.8"; pyproject = true; src = fetchFromGitHub { owner = "rafatosta"; repo = "zapzap"; tag = version; - hash = "sha256-CCCQOkoTMk718DSuArt5CoooOfGb/8uYVsAkqHmCFj0="; + hash = "sha256-GV2Z1ZhcrCUCoOyc68oXKslVdQqIsXRiAI+w+hQIj5o="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index d12ccac8c903..f3d33f9322fa 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -106,7 +106,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.220.6"; + version = "0.221.4"; outputs = [ "out" @@ -119,7 +119,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-jwSh2QkQpShDvTurJPPvt4khGaNQmoVbJyiLcccp2PU="; + hash = "sha256-Uiwfs80eCjbd/rnXkOmv85NY05XeY9Qu0vf8I+cDElo="; }; postPatch = '' @@ -139,7 +139,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rm -r $out/git/*/candle-book/ ''; - cargoHash = "sha256-KWsxxAPz1BoO/fKiRG6cpXB8IBGC+n4ZdommcTauXdQ="; + cargoHash = "sha256-kwV6tejCUwkFLdBCClm/AOxTieSUXnE/dP2UERlLv7U="; nativeBuildInputs = [ cmake diff --git a/pkgs/development/libraries/qodeassist-plugin/default.nix b/pkgs/development/libraries/qodeassist-plugin/default.nix index 7db16e90f0a7..d4439ec2602e 100644 --- a/pkgs/development/libraries/qodeassist-plugin/default.nix +++ b/pkgs/development/libraries/qodeassist-plugin/default.nix @@ -17,13 +17,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "qodeassist-plugin"; - version = "0.9.8"; + version = "0.9.9"; src = fetchFromGitHub { owner = "Palm1r"; repo = "QodeAssist"; tag = "v${finalAttrs.version}"; - hash = "sha256-1Lr46N/M4SXpHjY/HLIz33IRf3C6MIyMF9lCyaJ17Uc="; + hash = "sha256-qxXlWgi/iKHPYzHzGsnrbEZKmcai30PeW6q2Lw8BE8k="; }; dontWrapQtApps = true; diff --git a/pkgs/development/python-modules/aioboto3/boto3-compat.patch b/pkgs/development/python-modules/aioboto3/boto3-compat.patch deleted file mode 100644 index 7f4b2272e509..000000000000 --- a/pkgs/development/python-modules/aioboto3/boto3-compat.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/aioboto3/session.py b/aioboto3/session.py -index b6c2129..c97eaaf 100644 ---- a/aioboto3/session.py -+++ b/aioboto3/session.py -@@ -79,7 +79,9 @@ class Session(boto3.session.Session): - - if any(creds): - if self._account_id_set_without_credentials( -- aws_account_id, aws_access_key_id, aws_secret_access_key -+ aws_account_id=aws_account_id, -+ aws_access_key_id=aws_access_key_id, -+ aws_secret_access_key=aws_secret_access_key - ): - raise NoCredentialsError() - diff --git a/pkgs/development/python-modules/aioboto3/default.nix b/pkgs/development/python-modules/aioboto3/default.nix index 6632580490ed..8f3a56165f65 100644 --- a/pkgs/development/python-modules/aioboto3/default.nix +++ b/pkgs/development/python-modules/aioboto3/default.nix @@ -16,19 +16,16 @@ buildPythonPackage rec { pname = "aioboto3"; - version = "15.1.0"; + version = "15.5.0"; pyproject = true; src = fetchFromGitHub { owner = "terricain"; repo = "aioboto3"; tag = "v${version}"; - hash = "sha256-H/hAfFyBfeBoR6nW0sv3/AzFPATUl2uJ+JbzNB5xemo="; + hash = "sha256-yGKjcZlXs1f72OGX5rUWvfDKZAYU3ZV2RVQnd0InxBQ="; }; - # https://github.com/terricain/aioboto3/pull/377 - patches = [ ./boto3-compat.patch ]; - pythonRelaxDeps = [ "aiobotocore" ]; diff --git a/pkgs/development/python-modules/amaranth-soc/default.nix b/pkgs/development/python-modules/amaranth-soc/default.nix index 6107b35ae50c..0823af52f151 100644 --- a/pkgs/development/python-modules/amaranth-soc/default.nix +++ b/pkgs/development/python-modules/amaranth-soc/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "amaranth-soc"; - version = "0.1a-unstable-2024-10-12"; + version = "0.1a-unstable-2026-01-28"; pyproject = true; # from `pdm show` realVersion = @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth-soc"; - rev = "5c43cf58f15d9cd9c69ff83c97997708d386b2dc"; - hash = "sha256-o9xjH/nmV7ovw6bQ6PaFGLcjz5gDGb+eQ9eGNRPnBV8="; + rev = "12a83ad650ae88fcc1b0821a4bb6f4bbf7e19707"; + hash = "sha256-qW2Uie4E/PeIHjTCEnnZwBO3mv4UBMH+vlYK+fHFh+Q="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/arelle/default.nix b/pkgs/development/python-modules/arelle/default.nix index 8be34e9c8af6..ec4f7521fe4b 100644 --- a/pkgs/development/python-modules/arelle/default.nix +++ b/pkgs/development/python-modules/arelle/default.nix @@ -52,14 +52,14 @@ buildPythonPackage (finalAttrs: { pname = "arelle${lib.optionalString (!gui) "-headless"}"; - version = "2.38.4"; + version = "2.38.7"; pyproject = true; src = fetchFromGitHub { owner = "Arelle"; repo = "Arelle"; tag = finalAttrs.version; - hash = "sha256-ngFhY6yngr2OVQ6gsdpk5UAhzIpIrwiw+S+HK3oqfec="; + hash = "sha256-9ARMEXqoiBuAnj8hRrA1PqArmTMmRMP1BwASekOTQoc="; }; outputs = [ diff --git a/pkgs/development/python-modules/arxiv/default.nix b/pkgs/development/python-modules/arxiv/default.nix index 0e969d47a6bb..f80714fc8081 100644 --- a/pkgs/development/python-modules/arxiv/default.nix +++ b/pkgs/development/python-modules/arxiv/default.nix @@ -4,7 +4,8 @@ fetchFromGitHub, # build-system - setuptools, + hatchling, + hatch-vcs, # dependencies feedparser, @@ -16,17 +17,20 @@ }: buildPythonPackage rec { pname = "arxiv"; - version = "2.3.1"; + version = "2.4.0"; pyproject = true; src = fetchFromGitHub { owner = "lukasschwab"; repo = "arxiv.py"; tag = version; - hash = "sha256-7TGepKZ6Y/WTgJK70oOGR2TlXRwK0YgzslXAnklRSCA="; + hash = "sha256-96m2UHNoilRhbMnzArUFbm0wZDQS6j97etgOJ7qZmEc="; }; - build-system = [ setuptools ]; + build-system = [ + hatchling + hatch-vcs + ]; dependencies = [ feedparser diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix index 11c6c725dc62..8863c76bc48b 100644 --- a/pkgs/development/python-modules/bugsnag/default.nix +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "bugsnag"; - version = "4.8.0"; + version = "4.8.1"; pyproject = true; src = fetchFromGitHub { owner = "bugsnag"; repo = "bugsnag-python"; tag = "v${version}"; - hash = "sha256-aN7/MpTdsRsAINPXOmSau4pG1+F8gmvjlx5czKpx7H8="; + hash = "sha256-WXBdlgUoWdptv1weJf82qyH8TTqNCC1rYFEa972TqDY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix index e3e6dd547673..b0f3ab52c877 100644 --- a/pkgs/development/python-modules/cohere/default.nix +++ b/pkgs/development/python-modules/cohere/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "cohere"; - version = "5.20.2"; + version = "5.20.3"; pyproject = true; src = fetchFromGitHub { owner = "cohere-ai"; repo = "cohere-python"; tag = version; - hash = "sha256-Z0EEtDjVWYkE19nyo1ZQF0qE+Pe0VXlORaLtriPGSDQ="; + hash = "sha256-KHuUsZYg3k0YogjAC9kCnj59isUOnkIJ2e8M4ZcWAnY="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index 14f5d0a0458b..6a73a14fc8b2 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -12,6 +12,7 @@ # dependencies clarabel, cvxopt, + highspy, osqp, scipy, scs, @@ -23,16 +24,16 @@ useOpenmp ? (!stdenv.hostPlatform.isDarwin), }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cvxpy"; - version = "1.7.5"; + version = "1.8.0"; pyproject = true; src = fetchFromGitHub { owner = "cvxpy"; repo = "cvxpy"; - tag = "v${version}"; - hash = "sha256-ze9znWob/Asba20AVpNeVCuz7UayiYeW40nc7eZlXHU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-RBRosw7mNQNdVxXU5aW0ehwM0OV2krPqP+ULBGGhrxM="; }; postPatch = @@ -53,6 +54,7 @@ buildPythonPackage rec { dependencies = [ clarabel cvxopt + highspy numpy osqp scipy @@ -92,8 +94,8 @@ buildPythonPackage rec { description = "Domain-specific language for modeling convex optimization problems in Python"; homepage = "https://www.cvxpy.org/"; downloadPage = "https://github.com/cvxpy/cvxpy//releases"; - changelog = "https://github.com/cvxpy/cvxpy/releases/tag/v${version}"; + changelog = "https://github.com/cvxpy/cvxpy/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.GaetanLepage ]; }; -} +}) diff --git a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix index 4ead484e8b06..5be90321586c 100644 --- a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix +++ b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "dbt-semantic-interfaces"; - version = "0.10.3"; + version = "0.10.4"; pyproject = true; src = fetchFromGitHub { owner = "dbt-labs"; repo = "dbt-semantic-interfaces"; tag = "v${version}"; - hash = "sha256-uTlz41eIcEqMvD9d9jvn7g9sZs4uEKUdsmZ0fwWkIuY="; + hash = "sha256-1FTK+vi2iFvb1knFe3WKfCtEdYioT7eeONb410RnmNU="; }; pythonRelaxDeps = [ "importlib-metadata" ]; diff --git a/pkgs/development/python-modules/docling-ibm-models/default.nix b/pkgs/development/python-modules/docling-ibm-models/default.nix index b4791aa59494..78665be7beab 100644 --- a/pkgs/development/python-modules/docling-ibm-models/default.nix +++ b/pkgs/development/python-modules/docling-ibm-models/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "docling-ibm-models"; - version = "3.10.3"; + version = "3.11.0"; pyproject = true; src = fetchFromGitHub { owner = "docling-project"; repo = "docling-ibm-models"; tag = "v${version}"; - hash = "sha256-eX0dnXh+WB/TIgKJzkpp1SOqJ2KSxoOD4JL+nsfqkLM="; + hash = "sha256-foRoxuTqwNqn2q/3pAXNoiUYrAKwzXVnAabNRietZ40="; }; build-system = [ diff --git a/pkgs/development/python-modules/fastmcp/default.nix b/pkgs/development/python-modules/fastmcp/default.nix index 996f00ccc253..b37187a8c73c 100644 --- a/pkgs/development/python-modules/fastmcp/default.nix +++ b/pkgs/development/python-modules/fastmcp/default.nix @@ -168,6 +168,9 @@ buildPythonPackage (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isDarwin [ # RuntimeError: Server failed to start after 10 attempts "test_unauthorized_access" + + # Failed: DID NOT RAISE + "test_stateless_proxy" ]; disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/development/python-modules/helium/default.nix b/pkgs/development/python-modules/helium/default.nix index 2c73e9c642e3..e230b0042c7d 100644 --- a/pkgs/development/python-modules/helium/default.nix +++ b/pkgs/development/python-modules/helium/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "helium"; - version = "5.1.2"; + version = "6.0.0"; pyproject = true; src = fetchFromGitHub { owner = "mherrmann"; repo = "helium"; tag = "v${version}"; - hash = "sha256-0XpXG4G9iANHZ5YPhHFtgQmCnug6PlmAdErCYgBLOgs="; + hash = "sha256-d64nzFB8nzLZ7nmhh+xcui3jPFAbyAF+diRksnujzGU="; }; build-system = [ diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix index afa64d0f522f..a6383e0573b1 100644 --- a/pkgs/development/python-modules/isbnlib/default.nix +++ b/pkgs/development/python-modules/isbnlib/default.nix @@ -2,20 +2,28 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonAtLeast, + + # build-system + setuptools, + + # tests pytestCheckHook, pytest-cov-stub, - setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "isbnlib"; version = "3.10.14"; pyproject = true; + # Several tests fail and suggest that the package is incompatible with python >= 3.14 + disabled = pythonAtLeast "3.14"; + src = fetchFromGitHub { owner = "xlcnd"; repo = "isbnlib"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-d6p0wv7kj+NOZJRE2rzQgb7PXv+E3tASIibYCjzCdx8="; }; @@ -32,8 +40,8 @@ buildPythonPackage rec { enabledTestPaths = [ "isbnlib/test/" ]; - # All disabled tests require a network connection disabledTests = [ + # Require a network connection "test_cache" "test_editions_any" "test_editions_merge" @@ -66,8 +74,8 @@ buildPythonPackage rec { meta = { description = "Extract, clean, transform, hyphenate and metadata for ISBNs"; homepage = "https://github.com/xlcnd/isbnlib"; - changelog = "https://github.com/xlcnd/isbnlib/blob/v${version}/CHANGES.txt"; + changelog = "https://github.com/xlcnd/isbnlib/blob/${finalAttrs.src.tag}/CHANGES.txt"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix index 2ab11955dceb..7f53c3e36a00 100644 --- a/pkgs/development/python-modules/islpy/default.nix +++ b/pkgs/development/python-modules/islpy/default.nix @@ -20,14 +20,14 @@ buildPythonPackage (finalAttrs: { pname = "islpy"; - version = "2025.2.5"; + version = "2026.1"; pyproject = true; src = fetchFromGitHub { owner = "inducer"; repo = "islpy"; tag = "v${finalAttrs.version}"; - hash = "sha256-E3DRj1WpMr79BVFUeJftp1JZafP2+Zn6yyf9ClfdWqI="; + hash = "sha256-WZl9ix9ZwJsoUCJ23bYcuYGiJzcOMh7I38PHVxWrPBo="; }; build-system = [ diff --git a/pkgs/development/python-modules/jishaku/default.nix b/pkgs/development/python-modules/jishaku/default.nix index 3bb5b74c6b16..582b1a306064 100644 --- a/pkgs/development/python-modules/jishaku/default.nix +++ b/pkgs/development/python-modules/jishaku/default.nix @@ -3,7 +3,6 @@ bash, buildPythonPackage, fetchFromGitHub, - fetchpatch, setuptools, discordpy, click, @@ -12,28 +11,20 @@ tabulate, pytestCheckHook, pytest-asyncio, - youtube-dl, + typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "jishaku"; - version = "2.6.0"; + version = "2.6.3"; pyproject = true; src = fetchFromGitHub { owner = "Gorialis"; repo = "jishaku"; - tag = version; - hash = "sha256-+J8Tr8jPN9K3eHLOuJTaP3We5A1kiyn9/yI1KChbuMY="; + tag = finalAttrs.version; + hash = "sha256-8kSdzrut7LYjglpHc5dToOIQTrPsW4lVAeIWY4rzdmU="; }; - patches = [ - (fetchpatch { - # add entrypoint for install script - url = "https://github.com/Gorialis/jishaku/commit/b96cd55a1c2fd154c548f08019ccd6f7be9c7f90.patch"; - hash = "sha256-laPoupwCC1Zthib8G+c1BXqTwZK0Z6up1DKVkhFicJ0="; - }) - ]; - postPatch = '' substituteInPlace jishaku/shell.py \ --replace-fail '"/bin/bash"' '"${lib.getExe bash}"' @@ -47,12 +38,12 @@ buildPythonPackage rec { braceexpand tabulate import-expression + typing-extensions ]; nativeCheckInputs = [ pytestCheckHook pytest-asyncio - youtube-dl ]; pythonImportsCheck = [ @@ -64,9 +55,9 @@ buildPythonPackage rec { meta = { description = "Debugging and testing cog for discord.py bots"; homepage = "https://jishaku.readthedocs.io/en/latest"; - changelog = "https://github.com/Gorialis/jishaku/releases/tag/${src.tag}"; + changelog = "https://github.com/Gorialis/jishaku/releases/tag/${finalAttrs.src.tag}"; maintainers = [ ]; mainProgram = "jishaku"; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/development/python-modules/llama-index-embeddings-google/default.nix b/pkgs/development/python-modules/llama-index-embeddings-google/default.nix index f74e0406567d..593f08cf91d3 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-google/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-google/default.nix @@ -7,15 +7,15 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "llama-index-embeddings-google"; - version = "0.4.1"; + version = "0.4.2"; pyproject = true; src = fetchPypi { pname = "llama_index_embeddings_google"; - inherit version; - hash = "sha256-bVVg+oHf8KPb04F/HE/2XVkn4NY/Bb+PPj3fypkJ/zE="; + inherit (finalAttrs) version; + hash = "sha256-dWV2fKudLsxfpHTGrGljMBU62vYUqzf8NarQ3Nl9poI="; }; pythonRelaxDeps = [ "google-generativeai" ]; @@ -38,4 +38,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/mizani/default.nix b/pkgs/development/python-modules/mizani/default.nix index 6035a4a37efd..d7f0c24b64b3 100644 --- a/pkgs/development/python-modules/mizani/default.nix +++ b/pkgs/development/python-modules/mizani/default.nix @@ -17,16 +17,16 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mizani"; - version = "0.14.3"; + version = "0.14.4"; pyproject = true; src = fetchFromGitHub { owner = "has2k1"; repo = "mizani"; - tag = "v${version}"; - hash = "sha256-LUustvdD+8J6xu4HrvdFlVHlPGnt+h/0ZvGH7ZiVBUY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-aBBT0zrBFi2LW1pU83sxeRJh0B2IXa/0UNyXMfWSyAI="; }; build-system = [ setuptools-scm ]; @@ -48,8 +48,8 @@ buildPythonPackage rec { meta = { description = "Scales for Python"; homepage = "https://github.com/has2k1/mizani"; - changelog = "https://github.com/has2k1/mizani/releases/tag/v${version}"; + changelog = "https://github.com/has2k1/mizani/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ samuela ]; }; -} +}) diff --git a/pkgs/development/python-modules/nvidia-ml-py/default.nix b/pkgs/development/python-modules/nvidia-ml-py/default.nix index 1b5289d0a540..3be09eaad685 100644 --- a/pkgs/development/python-modules/nvidia-ml-py/default.nix +++ b/pkgs/development/python-modules/nvidia-ml-py/default.nix @@ -9,16 +9,16 @@ nvidia-ml-py, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nvidia-ml-py"; - version = "13.590.44"; + version = "13.590.48"; pyproject = true; src = fetchPypi { pname = "nvidia_ml_py"; - inherit version; - hash = "sha256-s1jHYUsP3upLlfBG8ckBI7/iXRSKuTuxwAJIuDRwM3M="; + inherit (finalAttrs) version; + hash = "sha256-gYTRvlKRSsfwmRzRwNlGxl3IioQMdUzRLCdLd7iHYN0="; }; patches = [ @@ -61,4 +61,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ GaetanLepage ]; }; -} +}) diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index 2a6a1f2ee37a..b4e0f5e341d2 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, fetchpatch2, + pythonAtLeast, # build-system hatchling, @@ -45,16 +46,26 @@ pytest-cov-stub, sphinx, sphinx-click, + writableTmpDirAsHomeHook, }: -buildPythonPackage rec { + +buildPythonPackage (finalAttrs: { pname = "papis"; version = "0.14.1"; pyproject = true; + patches = [ + (fetchpatch2 { + name = "fix-support-new-click-in-papisrunner.patch"; + url = "https://github.com/papis/papis/commit/0e3ffff4bd1b62cdf0a9fdc7f54d6a2e2ab90082.patch?full_index=1"; + hash = "sha256-KUw5U5izTTWqXHzGWLibtqHWAsVxla6SA8x6SJ07/zU="; + }) + ]; + src = fetchFromGitHub { owner = "papis"; repo = "papis"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-V4YswLNYwfBYe/Td0PEeDG++ClZoF08yxXjUXuyppPI="; }; @@ -81,7 +92,7 @@ buildPythonPackage rec { requests stevedore ] - ++ lib.optionals withOptDeps optional-dependencies.complete; + ++ lib.optionals withOptDeps finalAttrs.passthru.optional-dependencies.complete; optional-dependencies = { complete = [ @@ -102,12 +113,9 @@ buildPythonPackage rec { pytest-cov-stub sphinx sphinx-click + writableTmpDirAsHomeHook ]; - preCheck = '' - export HOME=$(mktemp -d); - ''; - enabledTestPaths = [ "papis" "tests" @@ -126,23 +134,15 @@ buildPythonPackage rec { "test_git_cli" ]; - patches = [ - (fetchpatch2 { - name = "fix-support-new-click-in-papisrunner.patch"; - url = "https://github.com/papis/papis/commit/0e3ffff4bd1b62cdf0a9fdc7f54d6a2e2ab90082.patch?full_index=1"; - hash = "sha256-KUw5U5izTTWqXHzGWLibtqHWAsVxla6SA8x6SJ07/zU="; - }) - ]; - meta = { description = "Powerful command-line document and bibliography manager"; mainProgram = "papis"; homepage = "https://papis.readthedocs.io/"; - changelog = "https://github.com/papis/papis/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/papis/papis/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ nico202 teto ]; }; -} +}) diff --git a/pkgs/development/python-modules/paramax/default.nix b/pkgs/development/python-modules/paramax/default.nix index c224505027b8..26394247a3ee 100644 --- a/pkgs/development/python-modules/paramax/default.nix +++ b/pkgs/development/python-modules/paramax/default.nix @@ -16,16 +16,16 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "paramax"; - version = "0.0.3"; + version = "0.0.5"; pyproject = true; src = fetchFromGitHub { owner = "danielward27"; repo = "paramax"; - tag = "v${version}"; - hash = "sha256-aPbYG3UGR8YbRa2GLLrZvYPxRK5LRGMF8HBTpaZmKds="; + tag = "v${finalAttrs.version}"; + hash = "sha256-UPSnFtypQYtnDRl2GCoy+OQ8Ws7eX+iPsd8WWBsgmlo="; }; build-system = [ @@ -48,8 +48,8 @@ buildPythonPackage rec { meta = { description = "Small library of paramaterizations and parameter constraints for PyTrees"; homepage = "https://github.com/danielward27/paramax"; - changelog = "https://github.com/danielward27/paramax/releases/tag/v${version}"; + changelog = "https://github.com/danielward27/paramax/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; }; -} +}) diff --git a/pkgs/development/python-modules/py-key-value-aio/default.nix b/pkgs/development/python-modules/py-key-value-aio/default.nix index fbfc67f3e665..ca7f2530637e 100644 --- a/pkgs/development/python-modules/py-key-value-aio/default.nix +++ b/pkgs/development/python-modules/py-key-value-aio/default.nix @@ -58,7 +58,6 @@ inline-snapshot, py-key-value-shared-test, pytest-asyncio, - pytest-xdist, pytestCheckHook, }: @@ -81,6 +80,18 @@ buildPythonPackage (finalAttrs: { --replace-fail \ "uv_build>=0.8.2,<0.9.0" \ "uv_build" + '' + # Tests fail when using pytest-xdist ('Worker crashes') + # https://github.com/strawgate/py-key-value/issues/266 + + '' + substituteInPlace pyproject.toml \ + --replace-fail \ + '"-n=auto",' \ + "" + substituteInPlace pyproject.toml \ + --replace-fail \ + '"--dist=loadfile",' \ + "" ''; build-system = [ @@ -160,7 +171,6 @@ buildPythonPackage (finalAttrs: { inline-snapshot py-key-value-shared-test pytest-asyncio - pytest-xdist pytestCheckHook ] ++ finalAttrs.passthru.optional-dependencies.disk @@ -183,6 +193,10 @@ buildPythonPackage (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isDarwin [ # keyring.errors.PasswordSetError: Can't store password on keychain: (-61, 'Unknown Error') "tests/stores/keyring/test_keyring.py" + + # Worker crashes + # https://github.com/strawgate/py-key-value/issues/266 + "tests/stores/rocksdb/test_rocksdb.py" ]; meta = { diff --git a/pkgs/development/python-modules/pytest-markdown-docs/default.nix b/pkgs/development/python-modules/pytest-markdown-docs/default.nix index c13985c253b5..ef8627f4aea5 100644 --- a/pkgs/development/python-modules/pytest-markdown-docs/default.nix +++ b/pkgs/development/python-modules/pytest-markdown-docs/default.nix @@ -2,26 +2,36 @@ lib, buildPythonPackage, fetchFromGitHub, - poetry-core, + + # build-system + hatchling, + + # dependencies markdown-it-py, pytest, + + # tests + mdit-py-plugins, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest-markdown-docs"; - version = "0.5.1"; + version = "0.9.1"; pyproject = true; src = fetchFromGitHub { owner = "modal-com"; repo = "pytest-markdown-docs"; - tag = "v${version}"; - hash = "sha256-mclN28tfPcoFxswECjbrkeOI51XXSqUXfbvuSHrd7Sw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-7fGuKTHeaMEbsHD9Zje0ODP2FRWSi0WrCZsPwRYP6rg="; }; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; + pythonRelaxDeps = [ + "markdown-it-py" + ]; dependencies = [ markdown-it-py pytest @@ -29,7 +39,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "pytest_markdown_docs" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + mdit-py-plugins + pytestCheckHook + ]; meta = { description = "Run pytest on markdown code fence blocks"; @@ -37,4 +50,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; }; -} +}) diff --git a/pkgs/development/python-modules/python-aodhclient/default.nix b/pkgs/development/python-modules/python-aodhclient/default.nix index 60432f3f033a..38943e805d59 100644 --- a/pkgs/development/python-modules/python-aodhclient/default.nix +++ b/pkgs/development/python-modules/python-aodhclient/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "python-aodhclient"; - version = "3.9.1"; + version = "3.10.0"; pyproject = true; src = fetchFromGitHub { owner = "openstack"; repo = "python-aodhclient"; tag = version; - hash = "sha256-ymOMCHhntoWr3mROI1M/PN7oWWaDTN58Z9xb97qnP+w="; + hash = "sha256-+VBtsx9bjO7YIS5mGd6AaxvQyxg4En5gP5mKmoIFAtU="; }; env.PBR_VERSION = version; diff --git a/pkgs/development/python-modules/python-ironicclient/default.nix b/pkgs/development/python-modules/python-ironicclient/default.nix index 4949b5d88091..3e65f843cef4 100644 --- a/pkgs/development/python-modules/python-ironicclient/default.nix +++ b/pkgs/development/python-modules/python-ironicclient/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "python-ironicclient"; - version = "5.14.0"; + version = "5.15.0"; pyproject = true; src = fetchFromGitHub { owner = "openstack"; repo = "python-ironicclient"; tag = version; - hash = "sha256-Mang/QJAgkxiKnwx8+q37hy+aRAnsw2uOQgniO545yc="; + hash = "sha256-suN1Eam+vHhpvaQ+QyEQPsbyb0D8G9m7FnAZgnhWS80="; }; build-system = [ diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index e981bc874b27..4641d32ffa59 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -34,13 +34,13 @@ buildPythonPackage rec { pname = "python-openstackclient"; - version = "8.2.0"; + version = "8.3.0"; pyproject = true; src = fetchPypi { pname = "python_openstackclient"; inherit version; - hash = "sha256-1hKvGN/GbMjzHmzpZpC2wnOt6KJA7EC39INaiJb7vgE="; + hash = "sha256-zHsy5F8Lju2SFeAhiuoCUmYZpeewaCsngXaRNK/Xb/g="; }; build-system = [ diff --git a/pkgs/development/python-modules/python3-application/default.nix b/pkgs/development/python-modules/python3-application/default.nix index 212a90f2bede..4131d859d98e 100644 --- a/pkgs/development/python-modules/python3-application/default.nix +++ b/pkgs/development/python-modules/python3-application/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "python3-application"; - version = "3.0.9"; + version = "3.0.10"; pyproject = true; disabled = !isPy3k; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "AGProjects"; repo = "python3-application"; rev = "release-${version}"; - hash = "sha256-79Uu9zaBIuuc+1O5Y7Vp4Qg2/aOrwvmdi5G/4AvL+T4="; + hash = "sha256-ZVy5zfZPOYt6gxIGayeCMpcCG9GXCECDHM1S8SmODMY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/qpageview/default.nix b/pkgs/development/python-modules/qpageview/default.nix index 8ba43af1dcc4..a62b0bedbd0b 100644 --- a/pkgs/development/python-modules/qpageview/default.nix +++ b/pkgs/development/python-modules/qpageview/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "qpageview"; - version = "1.0.2"; + version = "1.0.3"; pyproject = true; src = fetchFromGitHub { owner = "frescobaldi"; repo = "qpageview"; tag = "v${version}"; - hash = "sha256-bUZI3ML3MN+0KLQxrPfQOC7lxdpvl3sxJ4zi0phsiCw="; + hash = "sha256-cKidVtsqNXGuWNTTgvVOP3Wyf6M+Xctwaq7pOZb8eeo="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix index 0df9b6176396..f05728d01d1b 100644 --- a/pkgs/development/python-modules/qutip/default.nix +++ b/pkgs/development/python-modules/qutip/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 3cf9a73b8458..7669ea249b5e 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2025.12.0"; + version = "2026.1.0"; pyproject = true; src = fetchFromGitHub { owner = "fsspec"; repo = "s3fs"; tag = version; - hash = "sha256-/r+2eXOXUcMQ7TxyrEofZ79S8n8sA3++pJxdH3eQrYw="; + hash = "sha256-wkcDViE2Vr1fFMMFz3o7ewlI5UvVnWV7jIa9Es8d9Do="; }; build-system = [ diff --git a/pkgs/development/python-modules/schwifty/default.nix b/pkgs/development/python-modules/schwifty/default.nix index 817227b07921..ba5cb0e4ee65 100644 --- a/pkgs/development/python-modules/schwifty/default.nix +++ b/pkgs/development/python-modules/schwifty/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "schwifty"; - version = "2025.9.0"; + version = "2026.1.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-QoO4pMAtrsgaJ1yUYHc+otG3eMpw67W8sS7B/H3AoJk="; + hash = "sha256-VhZBQDAewy23iyMfli9Xsf1zIAKO6Q38OWNEOW9pdJg="; }; build-system = [ diff --git a/pkgs/development/python-modules/starlink-grpc-core/default.nix b/pkgs/development/python-modules/starlink-grpc-core/default.nix index a59d52310271..54fd3c36daf4 100644 --- a/pkgs/development/python-modules/starlink-grpc-core/default.nix +++ b/pkgs/development/python-modules/starlink-grpc-core/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "starlink-grpc-core"; - version = "1.2.3"; + version = "1.2.4"; pyproject = true; src = fetchFromGitHub { owner = "sparky8512"; repo = "starlink-grpc-tools"; tag = "v${version}"; - hash = "sha256-TXj8cU5abVIA81vEylYgZCIAUk31BppwRdHMl9kOEPQ="; + hash = "sha256-kOs/kzlWXMRDGi3bhpT+rqznaqZ1609X9n2BnOaqTFQ="; }; pypaBuildFlags = [ "packaging" ]; diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index e994464202aa..ebcb284b3953 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "uproot"; - version = "5.6.9"; + version = "5.7.0"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "uproot5"; tag = "v${version}"; - hash = "sha256-y1+BPSIFWH+6QI0RaeyoCzVYJkvPqY/jictRNa5qfOY="; + hash = "sha256-G3UP+hz2uz58Col3THATDRIiXX8wczFy6ob75iRP9b0="; }; build-system = [ diff --git a/pkgs/development/tools/godot/common.nix b/pkgs/development/tools/godot/common.nix index 5f312cdb6937..80e2c029aa1a 100644 --- a/pkgs/development/tools/godot/common.nix +++ b/pkgs/development/tools/godot/common.nix @@ -1,8 +1,10 @@ { alsa-lib, + apple-sdk_26, autoPatchelfHook, buildPackages, callPackage, + darwin, dbus, dotnetCorePackages, embree, @@ -38,6 +40,7 @@ makeWrapper, mbedtls, miniupnpc, + moltenvk, openxr-loader, pcre2, perl, @@ -49,29 +52,34 @@ speechd-minimal, stdenv, stdenvNoCC, + strip-nondeterminism, testers, udev, + unzip, updateScript, version, vulkan-loader, wayland, wayland-scanner, - withAlsa ? true, + withAlsa ? stdenv.hostPlatform.isLinux, withDbus ? true, withFontconfig ? true, withMono ? false, nugetDeps ? null, - withPlatform ? "linuxbsd", + # only linux supports builtin_ flags properly + withBuiltins ? !stdenv.hostPlatform.isLinux, + withPlatform ? if stdenv.hostPlatform.isDarwin then "macos" else "linuxbsd", withPrecision ? "single", withPulseaudio ? true, withSpeechd ? true, withTouch ? true, - withUdev ? true, + withUdev ? stdenv.hostPlatform.isLinux, # Wayland in Godot requires X11 until upstream fix is merged # https://github.com/godotengine/godot/pull/73504 - withWayland ? true, - withX11 ? true, + withWayland ? stdenv.hostPlatform.isLinux, + withX11 ? stdenv.hostPlatform.isLinux, wslay, + zip, zstd, }: assert lib.asserts.assertOneOf "withPrecision" withPrecision [ @@ -90,6 +98,8 @@ let dottedVersion = lib.replaceStrings [ "-" ] [ "." ] version + lib.optionalString withMono ".mono"; + harfbuzz-icu = harfbuzz.override { withIcu = true; }; + mkTarget = target: let @@ -116,8 +126,14 @@ let } // lib.optionalAttrs editor ( let + platform = + { + linuxbsd = "Linux"; + macos = "macOS"; + } + .${withPlatform}; project-src = - runCommand "${pkg.name}-project-src" + runCommand "${pkg.name}-6" { nativeBuildInputs = [ pkg ] ++ lib.optional (dotnet-sdk != null) dotnet-sdk; } @@ -144,12 +160,19 @@ let monoNode.owner = node '' + '' + ${""} var scene = PackedScene.new() var scenePath = "res://test.tscn" scene.pack(node) node.free() var x = ResourceSaver.save(scene, scenePath) ProjectSettings["application/run/main_scene"] = scenePath + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + ${""} + ProjectSettings["rendering/textures/vram_compression/import_etc2_astc"] = true + '' + + '' ProjectSettings.save() quit() EOF @@ -164,13 +187,18 @@ let cat >export_presets.cfg <<'EOF' [preset.0] name="build" - platform="Linux" + platform="${platform}" runnable=true export_filter="all_resources" include_filter="" exclude_filter="" [preset.0.options] - binary_format/architecture="${arch}" + binary_format/architecture="${if stdenv.hostPlatform.isDarwin then "universal" else arch}" + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + application/bundle_identifier="test" + '' + + '' EOF '' + lib.optionalString withMono '' @@ -224,8 +252,11 @@ let runHook preBuild export HOME=$(mktemp -d) - mkdir -p $HOME/.local/share/godot/ - ln -s "${final.export-template}"/share/godot/export_templates "$HOME"/.local/share/godot/ + local dataDir="$HOME/${ + if stdenv.hostPlatform.isDarwin then "Library/Application Support/Godot" else ".local/share/godot" + }/" + mkdir -p "$dataDir" + ln -s "${final.export-template}"/share/godot/export_templates "$dataDir" godot${suffix} --headless --build-solutions -s create-scene.gd @@ -236,7 +267,7 @@ let runHook preInstall mkdir -p "$out"/bin - godot${suffix} --headless --export-release build "$out"/bin/test + godot${suffix} --headless --export-release build "$out"/bin/test${lib.optionalString stdenv.hostPlatform.isDarwin ".app"} runHook postInstall ''; @@ -247,7 +278,7 @@ let ( set -eo pipefail HOME=$(mktemp -d) - "${final.export}"/bin/test --headless | tail -n+3 | ( + "${final.export}"/bin/test${lib.optionalString stdenv.hostPlatform.isDarwin ".app/Contents/MacOS/Unnamed"} --headless | tail -n+3 | ( '' + lib.optionalString withMono '' # indent @@ -280,9 +311,8 @@ let export-template = pkg.export-templates-bin; export = prev.export.overrideAttrs (prev: { - nativeBuildInputs = prev.nativeBuildInputs or [ ] ++ [ - autoPatchelfHook - ]; + nativeBuildInputs = + prev.nativeBuildInputs or [ ] ++ lib.optional stdenv.hostPlatform.isElf autoPatchelfHook; # stripping dlls results in: # Failed to load System.Private.CoreLib.dll (error code 0x8007000B) @@ -291,15 +321,17 @@ let runtimeDependencies = prev.runtimeDependencies or [ ] ++ map lib.getLib [ - alsa-lib libpulseaudio libX11 libXcursor libXext libXi libXrandr - udev vulkan-loader + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + udev ]; }); } @@ -359,6 +391,11 @@ let dotnet restore modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk.sln ''; + # darwin needs $HOME/.cache/clang/ModuleCache + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' + export HOME=$(mktemp -d) + ''; + # From: https://github.com/godotengine/godot/blob/4.2.2-stable/SConstruct sconsFlags = mkSconsFlagsFromAttrSet ( { @@ -385,7 +422,8 @@ let # aliasing bugs exist with hardening+LTO # https://github.com/godotengine/godot/pull/104501 ccflags = "-fno-strict-aliasing"; - linkflags = "-Wl,--build-id"; + # on darwin: ld: unknown option: --build-id + linkflags = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-Wl,--build-id"; # libraries that aren't available in nixpkgs builtin_msdfgen = true; @@ -408,12 +446,19 @@ let // lib.optionalAttrs (lib.versionAtLeast version "4.5") { redirect_build_objects = false; # Avoid copying build objects to output } + // lib.optionalAttrs stdenv.hostPlatform.isDarwin { + generate_bundle = "yes"; + } ); enableParallelBuilding = true; strictDeps = true; + propagatedSandboxProfile = lib.optionalString stdenv.hostPlatform.isDarwin '' + (allow file-read* (subpath "/System/Library/CoreServices/SystemAppearance.bundle")) + ''; + patches = [ ./Linux-fix-missing-library-with-builtin_glslang-false.patch ] @@ -431,12 +476,17 @@ let # Fix a crash in the mono test project build. It no longer seems to # happen in 4.4, but an existing fix couldn't be identified. ./CSharpLanguage-fix-crash-in-reload_assemblies-after-.patch - ]; + ] + ++ lib.optional ( + stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "4.4" + ) ./fix-moltenvk-detection.patch; postPatch = '' # this stops scons from hiding e.g. NIX_CFLAGS_COMPILE perl -pi -e '{ $r += s:(env = Environment\(.*):\1\nenv["ENV"] = os.environ: } END { exit ($r != 1) }' SConstruct + '' + + lib.optionalString (!withBuiltins) '' # disable all builtin libraries by default perl -pi -e '{ $r |= s:(opts.Add\(BoolVariable\("builtin_.*, )True(\)\)):\1False\2: } END { exit ($r != 1) }' SConstruct @@ -444,9 +494,8 @@ let + lib.optionalString (lib.versionOlder version "4.6") '' substituteInPlace platform/linuxbsd/detect.py \ --replace-fail /usr/include/recastnavigation ${lib.escapeShellArg (lib.getDev recastnavigation)}/include/recastnavigation - '' - + '' + + lib.optionalString (libGL != null) '' substituteInPlace thirdparty/glad/egl.c \ --replace-fail \ 'static const char *NAMES[] = {"libEGL.so.1", "libEGL.so"}' \ @@ -461,69 +510,103 @@ let --replace-fail \ '"libGL.so.1"' \ '"${lib.getLib libGL}/lib/libGL.so"' - + '' + + '' substituteInPlace thirdparty/volk/volk.c \ --replace-fail \ 'dlopen("libvulkan.so.1"' \ 'dlopen("${lib.getLib vulkan-loader}/lib/libvulkan.so"' - ''; + '' + + lib.optionalString stdenv.hostPlatform.isDarwin ( + '' + substituteInPlace platform/macos/export/export_plugin.cpp \ + --replace-fail \ + /usr/bin/codesign \ + '${lib.getExe' darwin.sigtool "sigtool"}' + '' + # https://github.com/godotengine/godot/issues/107199 + + lib.optionalString (lib.versionAtLeast version "4.5") '' + substituteInPlace drivers/metal/SCsub \ + --replace-fail \ + 'env_metal.Append(CCFLAGS=["-fmodules", "-fcxx-modules"])' \ + "" + '' + # godot zips these files and fails if mtime < 1980 + + lib.optionalString (!editor) '' + find misc/dist/macos_template.app -exec touch {} \; + '' + ); depsBuildBuild = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ buildPackages.stdenv.cc pkg-config ]; - buildInputs = [ - embree - enet - freetype - glslang - graphite2 - (harfbuzz.override { withIcu = true; }) - icu - libtheora - libwebp - mbedtls - miniupnpc - openxr-loader - pcre2 - recastnavigation - wslay - zstd - ] - ++ lib.optionals (lib.versionAtLeast version "4.5") [ - libjpeg_turbo - sdl3 - ] - ++ lib.optionals (editor && withMono) dotnet-sdk.packages - ++ lib.optional withAlsa alsa-lib - ++ lib.optional (withX11 || withWayland) libxkbcommon - ++ lib.optionals withX11 [ - libX11 - libXcursor - libXext - libXfixes - libXi - libXinerama - libXrandr - libXrender - ] - ++ lib.optionals withWayland [ - libdecor - wayland - ] - ++ lib.optionals withDbus [ - dbus - ] - ++ lib.optionals withFontconfig [ - fontconfig - ] - ++ lib.optional withPulseaudio libpulseaudio - ++ lib.optionals withSpeechd [ - speechd-minimal - glib - ] - ++ lib.optional withUdev udev; + env.NIX_CFLAGS_COMPILE = toString ( + lib.optionals stdenv.hostPlatform.isDarwin [ + "-I${lib.getDev harfbuzz-icu}/include/harfbuzz" + "-I${lib.getDev recastnavigation}/include/recastnavigation" + ] + ); + + buildInputs = + lib.optionals (!withBuiltins) ( + [ + embree + enet + freetype + glslang + graphite2 + harfbuzz-icu + icu + libtheora + libwebp + mbedtls + miniupnpc + openxr-loader + pcre2 + recastnavigation + wslay + zstd + ] + ++ lib.optionals (lib.versionAtLeast version "4.5") [ + libjpeg_turbo + sdl3 + ] + ) + ++ lib.optionals (editor && withMono) dotnet-sdk.packages + ++ lib.optional withAlsa alsa-lib + ++ lib.optional (withX11 || withWayland) libxkbcommon + ++ lib.optionals withX11 [ + libX11 + libXcursor + libXext + libXfixes + libXi + libXinerama + libXrandr + libXrender + ] + ++ lib.optionals withWayland [ + libdecor + wayland + ] + ++ lib.optionals withDbus [ + dbus + ] + ++ lib.optionals withFontconfig [ + fontconfig + ] + ++ lib.optional withPulseaudio libpulseaudio + ++ lib.optionals withSpeechd [ + speechd-minimal + glib + ] + ++ lib.optional withUdev udev + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_26 + moltenvk + ]; nativeBuildInputs = [ installShellFiles @@ -535,7 +618,17 @@ let ++ lib.optional (editor && withMono) [ makeWrapper dotnet-sdk - ]; + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin ( + [ + darwin.sigtool + ] + ++ lib.optionals (!editor) [ + strip-nondeterminism + unzip + zip + ] + ); postBuild = lib.optionalString (editor && withMono) '' echo "Generating Glue" @@ -548,7 +641,7 @@ let runHook preInstall mkdir -p "$out"/{bin,libexec} - cp -r bin/* "$out"/libexec + cp -r bin/${binary} "$out"/libexec/ cd "$out"/bin ln -s ../libexec/${binary} godot${lib.versions.majorMinor version}${suffix} @@ -574,12 +667,17 @@ let cp icon.png "$out/share/icons/godot.png" '' + lib.optionalString withMono '' + cp -r bin/GodotSharp "$out"/libexec/ mkdir -p "$out"/share/nuget mv "$out"/libexec/GodotSharp/Tools/nupkgs "$out"/share/nuget/source wrapProgram "$out"/libexec/${binary} \ --prefix NUGET_FALLBACK_PACKAGES ';' "$out"/share/nuget/packages/ '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p "$out"/Applications + cp -r bin/godot_macos_editor.app "$out"/Applications/Godot.app + '' else let template = @@ -588,6 +686,7 @@ let [ { linuxbsd = "linux"; + macos = "macos"; } .${withPlatform} ] @@ -601,6 +700,15 @@ let mkdir -p "$templates" ln -s "$out"/libexec/${binary} "$templates"/${template} '' + # TODO: teach godot to use a template that isn't zipped. for now we + # just need to make it uncompressed so it doesn't break dependencies + + lib.optionalString stdenv.hostPlatform.isDarwin '' + cd bin + unzip godot_macos${lib.optionalString withMono "_mono"}.zip + zip -rq0 "$templates"/macos.zip macos_template.app + strip-nondeterminism --type zip "$templates"/macos.zip + cd - + '' ) + '' runHook postInstall @@ -639,7 +747,12 @@ let "x86_64-linux" "aarch64-linux" ] - ++ lib.optional (!withMono) "i686-linux"; + ++ 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; [ shiryel corngood diff --git a/pkgs/development/tools/godot/fix-moltenvk-detection.patch b/pkgs/development/tools/godot/fix-moltenvk-detection.patch new file mode 100644 index 000000000000..33a944c279cd --- /dev/null +++ b/pkgs/development/tools/godot/fix-moltenvk-detection.patch @@ -0,0 +1,16 @@ +diff --git a/platform/macos/detect.py b/platform/macos/detect.py +index 227738877d..5a4bfa77d9 100644 +--- a/platform/macos/detect.py ++++ b/platform/macos/detect.py +@@ -265,11 +265,6 @@ def configure(env: "SConsEnvironment"): + + if mvk_path != "": + env.Append(LINKFLAGS=["-L" + mvk_path]) +- else: +- print_error( +- "MoltenVK SDK installation directory not found, use 'vulkan_sdk_path' SCons parameter to specify SDK path." +- ) +- sys.exit(255) + + if len(extra_frameworks) > 0: + frameworks = [item for key in extra_frameworks for item in ["-framework", key]] diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix index 3bfa8858b03d..c6e0d821bb99 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/grammar-sources.nix @@ -727,6 +727,18 @@ }; }; + phpdoc = { + version = "0.1.8"; + url = "github:claytonrcarter/tree-sitter-phpdoc"; + hash = "sha256-X+ElKI0ZMLCmxEanKsDRL/1KzGZfBrG7zITsT+jSrtQ="; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + Stebalien + ]; + }; + }; + pioasm = { version = "0-unstable-2024-10-12"; url = "github:leo60228/tree-sitter-pioasm/afece58efdb30440bddd151ef1347fa8d6f744a9"; diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 8957d2359201..241319fe01aa 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -70,7 +70,7 @@ in }; tomcat11 = common { - version = "11.0.15"; - hash = "sha256-xRWg7bJzhGtNeSb6gXWqpGkF9F1eKvWI4BeD41qJppw="; + version = "11.0.18"; + hash = "sha256-9P5rc7LkEXinCDMuPeyasq4hNQDBiVdUYRvaKUXbKas="; }; } diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index 4e16c34739eb..53ccae41455f 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,24 +1,24 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.216.0"; + version = "3.217.1"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.216.0-linux-x64.tar.gz"; - sha256 = "0l1jw58739vaffsl16h0r0jnnvx8pvczqbx5gc8ga0za13m3p2lv"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.217.1-linux-x64.tar.gz"; + sha256 = "0bgzkjkkawivd8qhqmgfrj5i67lm47kn3ih4gi5j3876ks978k44"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.47.0-linux-amd64.tar.gz"; - sha256 = "1dc0b32pc3qapygvc4ialwqxn7ii67lswf4fk1y861vq99j0njch"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.48.0-linux-amd64.tar.gz"; + sha256 = "02ffwlprcqn8n7ghpmb6s33gfg03vizvah4zxkqi69dp6q3l3hws"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.3.0-linux-amd64.tar.gz"; sha256 = "1c8bd6m2kk6nzbmq3csb5babmbma83cxsvqxv7z0s59b2p6jc9r5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.92.0-linux-amd64.tar.gz"; - sha256 = "1pm5mx1fnxcljswry0z7qsmvv63xwiaxgjkryijwsmb76jy4np00"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.93.0-linux-amd64.tar.gz"; + sha256 = "1v67g9k97f5yzhfd66p5jg55vdvx9mk8n2nhf0nqn56cd0rhsmvi"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.1-linux-amd64.tar.gz"; @@ -117,16 +117,16 @@ sha256 = "1jhqqiy6nrkkhg7rnhcjgzm97jy5z0508b2bh8mhcjsqgbc8kxrk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.19.0-linux-amd64.tar.gz"; - sha256 = "0mhib1zn7l2rlhyv4yih48b2kk9g27gkfjjwbrhq4b2lc7n6giqd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.19.1-linux-amd64.tar.gz"; + sha256 = "127bwpfwkcq9ab0v190m3nr9zjwxbp8wfabm211jfccia2fx00zi"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.11.0-linux-amd64.tar.gz"; sha256 = "1ljw7va47k5db54s709a9z5haa2rygrx9h179139qhd3lrsml3yb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.128.1-linux-amd64.tar.gz"; - sha256 = "1w4bfps99km0xck81f20yh2lfy48rz7nh5kfz1l0r1xs5r9cwsgk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.128.2-linux-amd64.tar.gz"; + sha256 = "09bp5pw07hwfdas458va9j1wplnw5im75pdsjiyi9lb9b792frpp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-linux-amd64.tar.gz"; @@ -163,20 +163,20 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.216.0-darwin-x64.tar.gz"; - sha256 = "0hjllanz2zw7w1wy4vzj1csw4nzmsi6hsqlwgbsmx9hygmmzrdhh"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.217.1-darwin-x64.tar.gz"; + sha256 = "1avfk98qhk8aycf9d97nbcqvmsj0qn4xf0mk0n631csfiyidp6wn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.47.0-darwin-amd64.tar.gz"; - sha256 = "07fzvgf283kqir5bajmncr2lz9vkbp4y6zdn82kvv0fymw5x7q3x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.48.0-darwin-amd64.tar.gz"; + sha256 = "1zjs31cdhc9wryxigf5x1r88hkcvqsizkxdwydd1cn2svlc1pkik"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.3.0-darwin-amd64.tar.gz"; sha256 = "08i28x0fp4pxb14klgjdqi05hyw4ilj0iz5ri53mpmviyl1mrmaq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.92.0-darwin-amd64.tar.gz"; - sha256 = "06pz8jyd5g3i07h59bblvfmc5nzj4zvifbhhdpi1sch972m2frb7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.93.0-darwin-amd64.tar.gz"; + sha256 = "0zcr8a29n9a2wwm4jl0jqxjn2hbaywr1raajpdy51s5ij69vvw79"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.1-darwin-amd64.tar.gz"; @@ -275,16 +275,16 @@ sha256 = "0xyswa7bcci8maw1y0hzhmckcycnpvm492i8qihlmbsvz9ps7yk5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.19.0-darwin-amd64.tar.gz"; - sha256 = "02nm0d2vfi1nkzr06435npnq3wig5pib72frxrjgj0jcfy8z42p7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.19.1-darwin-amd64.tar.gz"; + sha256 = "0qqzq2p451znbkjj2zfx2rpj3y5iqk8yvhw74fj7ni6fzbhkdqih"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.11.0-darwin-amd64.tar.gz"; sha256 = "055pqfcqlns5hg92nlwx6gh0rfkb3r50g8s363xnvmksjhl655nm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.128.1-darwin-amd64.tar.gz"; - sha256 = "04hhzbns61fzd7qwyfpnm8lzq03z1vp95kqrph0sl6v2ygxvsqg4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.128.2-darwin-amd64.tar.gz"; + sha256 = "14waym55vv7yysyg709xk6h4nk97fqzplad6jpgi4wccrxbvan8p"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-darwin-amd64.tar.gz"; @@ -321,20 +321,20 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.216.0-linux-arm64.tar.gz"; - sha256 = "0y4j4fi6nxasp83b5awfn3p0g4xplapi81hkwpscy3m79f8vfkx5"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.217.1-linux-arm64.tar.gz"; + sha256 = "1g553c1c7mpx5v6fykly399rs9fvj4kk2br7x5d52v2jnhyqrw2w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.47.0-linux-arm64.tar.gz"; - sha256 = "051s1qdxwy68d2zpmgg7gwy491y0gf3z5d7vnid3wlfwfrs2zld9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.48.0-linux-arm64.tar.gz"; + sha256 = "0l2chxskd3lafgg7b04zv8y9p4hm3q29v1vjlky99anbcg0wjknw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.3.0-linux-arm64.tar.gz"; sha256 = "0l3sgb5l0rjxj9msff6ywkvygn3pq96nbif3b85xssq7a0qsvh3c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.92.0-linux-arm64.tar.gz"; - sha256 = "01m7jgkhsjv6pkf5g6z8difpn3nk7w3f3izzb82jdrgn1rcc4r3b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.93.0-linux-arm64.tar.gz"; + sha256 = "0s96qfbfv0dj1w9p2rqzl2vcq5zcny5r35c5fwbvwsjfmkjyyhwl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.1-linux-arm64.tar.gz"; @@ -433,16 +433,16 @@ sha256 = "02gnjz35rzs3333x282wcy9hjshnkwgl4nwravvgaiwipc3w7bgz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.19.0-linux-arm64.tar.gz"; - sha256 = "0ljwx3zdjqbayxlya02lnb82pvcm9mlj5adx23zvj63bdl9qpsz6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.19.1-linux-arm64.tar.gz"; + sha256 = "0ik976ygv03axshcrwr3k3s1zvz90zywzqs6pmk2zs1z3n1vznag"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.11.0-linux-arm64.tar.gz"; sha256 = "0b6vzycqbb0cpv6mmgxd08xdn62v5b1vswn2gx6ky2ajsw4m68ia"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.128.1-linux-arm64.tar.gz"; - sha256 = "0qkvsxzabswb782680m6kv2flhjxbnag89nhw26wb5b68w5vb6i7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.128.2-linux-arm64.tar.gz"; + sha256 = "1mkd94igd6nwfaawc59vvam4zd2k075h9q0r4hm5r888izl3qfvz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-linux-arm64.tar.gz"; @@ -479,20 +479,20 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.216.0-darwin-arm64.tar.gz"; - sha256 = "0yxj3ss8lxzlni8wkzrg5fjiw4li4d3cdg9j85zl2cgw604xzvbx"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.217.1-darwin-arm64.tar.gz"; + sha256 = "1xxv3d1wqq596wq4qh6wr9ci0w037sq5x7h4bdxn5wb0751yh51d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.47.0-darwin-arm64.tar.gz"; - sha256 = "0zi46nr0gjw58pxclggjjn9431hbbn4wh34y3d04qk46nyrwfhiy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.48.0-darwin-arm64.tar.gz"; + sha256 = "027y13r0f84kqcpfirwzyilnsmbn9240dsbdk1jl97m04zp0djhn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.3.0-darwin-arm64.tar.gz"; sha256 = "0hbrmmgh3pbsqcm20lz3kimxwls4s10cqssp19m344f9jwp33chq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.92.0-darwin-arm64.tar.gz"; - sha256 = "1s5v5jmvgld7ysm4dyzdk8614srbilx9l51hwx0kglp7hjhhv63k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.93.0-darwin-arm64.tar.gz"; + sha256 = "1gj2qx6vfc5kkajmz2r0qmwhjx3bxzdhw7c08bq2qkshfxhd78dg"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.1-darwin-arm64.tar.gz"; @@ -591,16 +591,16 @@ sha256 = "03xqhx0adxlqggk5fgs6wr8krd1jjwpsm7l594hd0ln892x5m80x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.19.0-darwin-arm64.tar.gz"; - sha256 = "1k7r06pxy1vwcl9i7n412bq6yr1rx7bnma6dam2sawvwsk8bysjy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.19.1-darwin-arm64.tar.gz"; + sha256 = "0ix35xf0l6jn5x9k0ic2jlk5jzyb8a7s34wvwsi24n1aw4cccdaa"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.11.0-darwin-arm64.tar.gz"; sha256 = "02dmd2qcljp4nv9q3sskv73hdga0bnq83zrr13llq66924lj7baf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.128.1-darwin-arm64.tar.gz"; - sha256 = "1dqb8b9bsqyriz9vn1i4ncv2h33hnpxw5m8fh4wpkcb9gp7wjn9n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.128.2-darwin-arm64.tar.gz"; + sha256 = "1cwv5v3ljjj3w937d814jypi9gzc3narx89i40ni9mdlrcyn0l4v"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/package-management/nix/modular/src/libstore/package.nix b/pkgs/tools/package-management/nix/modular/src/libstore/package.nix index 6c5978bfd7e8..3039120e37dc 100644 --- a/pkgs/tools/package-management/nix/modular/src/libstore/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libstore/package.nix @@ -25,7 +25,8 @@ withAWS ? # Default is this way because there have been issues building this dependency - lib.meta.availableOn stdenv.hostPlatform aws-c-common, + # TODO: aws-crt-cpp is broken on cygwin, find a good way to check that here + lib.meta.availableOn stdenv.hostPlatform aws-c-common && !stdenv.hostPlatform.isCygwin, }: mkMesonLibrary (finalAttrs: { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56af7fff1b8c..7d3d396b73cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1792,10 +1792,6 @@ with pkgs; easyocr = with python3.pkgs; toPythonApplication easyocr; - element-web = callPackage ../by-name/el/element-web/package.nix { - conf = config.element-web.conf or { }; - }; - espanso-wayland = espanso.override { x11Support = false; waylandSupport = !stdenv.hostPlatform.isDarwin; @@ -2148,8 +2144,6 @@ with pkgs; unify = with python3Packages; toPythonApplication unify; - usb-modeswitch-data = callPackage ../by-name/us/usb-modeswitch/data.nix { }; - persistent-evdev = python3Packages.callPackage ../servers/persistent-evdev { }; inherit (import ../development/libraries/libsbsms pkgs) @@ -6268,10 +6262,6 @@ with pkgs; replay-node-cli ; - rescript-language-server = callPackage ../by-name/re/rescript-language-server/package.nix { - rescript-editor-analysis = vscode-extensions.chenglou92.rescript-vscode.rescript-editor-analysis; - }; - rnginline = with python3Packages; toPythonApplication rnginline; rr = callPackage ../development/tools/analysis/rr { }; @@ -7987,10 +7977,6 @@ with pkgs; gtkVersion = "4"; }; - vtfedit = callPackage ../by-name/vt/vtfedit/package.nix { - wine = wineWowPackages.staging; - }; - inherit (callPackage ../development/libraries/vtk { }) vtk_9_5; vtk = vtk_9_5; @@ -12038,9 +12024,7 @@ with pkgs; pmars-x11 = pmars.override { enableXwinGraphics = true; }; - vanillatd = callPackage ../by-name/va/vanillatd/package.nix { appName = "vanillatd"; }; - - vanillara = callPackage ../by-name/va/vanillatd/package.nix { appName = "vanillara"; }; + vanillara = vanillatd.override { appName = "vanillara"; }; anki-utils = callPackage ../by-name/an/anki/addons/anki-utils.nix { }; ankiAddons = recurseIntoAttrs (callPackage ../by-name/an/anki/addons { });