diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c3d41c70bc03..aa1d153b5c2a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15629,6 +15629,12 @@ githubId = 632767; name = "Guillaume Maudoux"; }; + layzyoldman = { + email = "ricardopaivacampos@gmail.com"; + github = "layzyoldman"; + githubId = 193278607; + name = "Ricardo Campos"; + }; LazilyStableProton = { email = "LazilyStable@proton.me"; github = "LazyStability"; @@ -19310,6 +19316,12 @@ githubId = 220262; name = "Ion Mudreac"; }; + mugaizzo = { + email = "mugahedman@hotmail.com"; + github = "mugaizzo"; + githubId = 15838537; + name = "Mugahed Izzeldin"; + }; mulatta = { email = "seungwon@mulatta.io"; github = "mulatta"; @@ -19807,6 +19819,12 @@ githubId = 364510; name = "Tobias Geerinckx-Rice"; }; + ndavd = { + email = "email@ndavd.com"; + github = "ndavd"; + githubId = 74260683; + name = "Nuno David"; + }; ndl = { email = "ndl@endl.ch"; github = "ndl"; diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md index 4dfb4530656b..2b7750602776 100644 --- a/nixos/doc/manual/release-notes/rl-2611.section.md +++ b/nixos/doc/manual/release-notes/rl-2611.section.md @@ -77,6 +77,12 @@ - A number of options for `services.llama-cpp` have been removed in favor of the structured [](#opt-services.llama-cpp.settings) option, attributes from which are used as arguments to `llama-server` executable, you can see all available options by running `llama-server --help`. Configuring model presets using Nix attribute set via `services.llama-cpp.modelsPreset` is no longer supported, please use `services.llama-cpp.settings.models-preset` with a path to an INI file containing desired options. +- The `NIX_XDG_DESKTOP_PORTAL_DIR` environment variable is no longer used in the `xdg-desktop-portal` package and is therefore no longer set in `xdg.portal` module. + Instead the `XDG_DATA_DIRS` environment variable is used to find xdg-portals. + + If you were relying on `NIX_XDG_DESKTOP_PORTAL_DIR` to point at custom portal + definitions, add the package providing them to `xdg.portal.extraPortals`. + - Python 2 has been removed from the top-level package set, as it is long past end-of-life. The `python2`, `python27`, `python2Full`, `python27Full`, `python2Packages`, and `python27Packages` attributes, along with the legacy `python`, `pythonFull`, and `pythonPackages` aliases, now throw an error directing you to `python3`. The `isPy2` and `isPy27` package flags have been removed accordingly. The only remaining Python 2 interpreter is vendored inside the `resholve` package for its `oil` dependency and is not exposed for general use. - `security.polkit.enablePkexecWrapper` has been introduced, making the `pkexec` setuid wrapper opt-in. diff --git a/nixos/modules/config/xdg/portal.nix b/nixos/modules/config/xdg/portal.nix index 6bc6ce5e33e7..78bae2d49995 100644 --- a/nixos/modules/config/xdg/portal.nix +++ b/nixos/modules/config/xdg/portal.nix @@ -150,7 +150,6 @@ in sessionVariables = { NIXOS_XDG_OPEN_USE_PORTAL = mkIf cfg.xdgOpenUsePortal "1"; - NIX_XDG_DESKTOP_PORTAL_DIR = "/run/current-system/sw/share/xdg-desktop-portal/portals"; }; etc = lib.concatMapAttrs ( diff --git a/nixos/modules/services/misc/jellyfin.nix b/nixos/modules/services/misc/jellyfin.nix index d9e76154f0a8..7a6c5dae8536 100644 --- a/nixos/modules/services/misc/jellyfin.nix +++ b/nixos/modules/services/misc/jellyfin.nix @@ -33,7 +33,11 @@ let ; cfg = config.services.jellyfin; filteredDecodingCodecs = builtins.filter ( - c: c != "hevcRExt10bit" && c != "hevcRExt12bit" && cfg.transcoding.hardwareDecodingCodecs.${c} + c: + c != "hevc10bit" + && c != "hevcRExt10bit" + && c != "hevcRExt12bit" + && cfg.transcoding.hardwareDecodingCodecs.${c} ) (builtins.attrNames cfg.transcoding.hardwareDecodingCodecs); encodingXmlText = '' @@ -58,6 +62,7 @@ let ${boolToString cfg.transcoding.hardwareEncodingCodecs.av1} ${boolToString cfg.transcoding.enableIntelLowPowerEncoding} ${boolToString cfg.transcoding.enableIntelLowPowerEncoding} + ${boolToString cfg.transcoding.hardwareDecodingCodecs.hevc10bit} ${boolToString cfg.transcoding.hardwareDecodingCodecs.hevcRExt10bit} ${boolToString cfg.transcoding.hardwareDecodingCodecs.hevcRExt12bit} diff --git a/nixos/tests/jellyfin.nix b/nixos/tests/jellyfin.nix index 4896c13d4eca..7463b920727e 100644 --- a/nixos/tests/jellyfin.nix +++ b/nixos/tests/jellyfin.nix @@ -33,6 +33,7 @@ hardwareDecodingCodecs = { h264 = true; hevc = true; + hevc10bit = true; vp9 = true; hevcRExt10bit = true; hevcRExt12bit = true; @@ -174,7 +175,8 @@ assert config.get("EnableIntelLowPowerH264HwEncoder") == True, f"Intel low power H264: expected True, got '{config.get('EnableIntelLowPowerH264HwEncoder')}'" assert config.get("EnableIntelLowPowerHevcHwEncoder") == True, f"Intel low power HEVC: expected True, got '{config.get('EnableIntelLowPowerHevcHwEncoder')}'" - # HEVC RExt color depth verification + # HEVC color depth verification + assert config.get("EnableDecodingColorDepth10Hevc") == True, f"HEVC 10bit: expected True, got '{config.get('EnableDecodingColorDepth10Hevc')}'" assert config.get("EnableDecodingColorDepth10HevcRext") == True, f"HEVC RExt 10bit: expected True, got '{config.get('EnableDecodingColorDepth10HevcRext')}'" assert config.get("EnableDecodingColorDepth12HevcRext") == True, f"HEVC RExt 12bit: expected True, got '{config.get('EnableDecodingColorDepth12HevcRext')}'" diff --git a/pkgs/applications/emulators/wibo/default.nix b/pkgs/applications/emulators/wibo/default.nix index f982374e6b73..7a5b0ad8e937 100644 --- a/pkgs/applications/emulators/wibo/default.nix +++ b/pkgs/applications/emulators/wibo/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { meta.license = lib.licenses.unfree; }; in - lib.optionalString finalAttrs.doCheck '' + lib.optionalString finalAttrs.finalPackage.doCheck '' MWCIncludes=../test ./wibo ${gc}/GC/2.7/mwcceppc.exe -c ../test/test.c file test.o | grep "ELF 32-bit" ''; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 25a09ed2117b..608e4611d644 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1508,12 +1508,12 @@ "vendorHash": "sha256-8p6dJwGyTK+qtgplSLtIRKxnNAQAgHfs4z/EsBcg/iY=" }, "yandex-cloud_yandex": { - "hash": "sha256-YiUARVEsGfD4IUuTFSrkAIAD6kOyFUoLebSaZtW9FcE=", + "hash": "sha256-0155GXJMfoCnyqaJiF5SJIA1Qz1q2AYe/BB0AYODG/0=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.215.0", + "rev": "v0.218.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-YNCd1i2HDa0aToZ0vEr6tRugXnBXE+zymhLM+rmRNPI=" + "vendorHash": "sha256-FfZvuC/XXhKS03E+l4/9KCLSwx+uTP1LzywckZqX6pA=" } } diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 008b7b574509..117a95f4e476 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { # see also: https://profanity-im.github.io/guide/latest/build.html#expl mesonFlags = [ - (lib.mesonBool "tests" finalAttrs.doCheck) + (lib.mesonBool "tests" finalAttrs.finalPackage.doCheck) (lib.mesonEnable "notifications" notifySupport) (lib.mesonEnable "python-plugins" pythonPluginSupport) (lib.mesonEnable "c-plugins" true) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index c953bf906617..91be307654fe 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -420,18 +420,18 @@ in docker_29 = let - version = "29.6.1"; + version = "29.6.2"; in callPackage dockerGen { inherit version; cliRev = "v${version}"; - cliHash = "sha256-cpK2UMRP/WXHsehG9Sq5UJAjhMesmXTrhe00y4RMRZc="; + cliHash = "sha256-WpPSePMCfWAVxCkX1nZyI+sra/Vug009ZPmnVKDaX0I="; mobyRev = "docker-v${version}"; - mobyHash = "sha256-gv+mea9X5TYDWN3IBRpmw0+R2waGxCiubdatNTeUQZI="; + mobyHash = "sha256-zrvrZCRUuiZ2vixZNOUFeGmDehHzSI+FzDMzV1gMqMc="; runcRev = "v1.3.6"; runcHash = "sha256-cBMYZOElWHQ4OkF2NlYJSZrlW4833WD8CRJRkkXeKJc="; - containerdRev = "v2.2.5"; - containerdHash = "sha256-3ui+0AjEU6H4VHYwF3G85ggVMUdONCLJ5KfciFasmkk="; + containerdRev = "v2.2.6"; + containerdHash = "sha256-Ngo9x847cXFYPnj/0I+g7BeV7e1/5T2YXfA1zkIdiPg="; tiniRev = "369448a167e8b3da4ca5bca0b3307500c3371828"; tiniHash = "sha256-jCBNfoJAjmcTJBx08kHs+FmbaU82CbQcf0IVjd56Nuw="; }; diff --git a/pkgs/by-name/af/afew/package.nix b/pkgs/by-name/af/afew/package.nix index 88fe95b65f27..b05832844862 100644 --- a/pkgs/by-name/af/afew/package.nix +++ b/pkgs/by-name/af/afew/package.nix @@ -3,8 +3,7 @@ python3Packages, fetchPypi, pkgs, - testers, - afew, + versionCheckHook, }: python3Packages.buildPythonApplication (finalAttrs: { @@ -39,6 +38,7 @@ python3Packages.buildPythonApplication (finalAttrs: { nativeCheckInputs = [ pkgs.notmuch + versionCheckHook ] ++ (with python3Packages; [ freezegun @@ -55,12 +55,6 @@ python3Packages.buildPythonApplication (finalAttrs: { "man" ]; - passthru.tests = { - version = testers.testVersion { - package = afew; - }; - }; - meta = { homepage = "https://github.com/afewmail/afew"; description = "Initial tagging script for notmuch mail"; diff --git a/pkgs/by-name/ap/apparmor-parser/package.nix b/pkgs/by-name/ap/apparmor-parser/package.nix index 97f240c0bc1e..54076f01d675 100644 --- a/pkgs/by-name/ap/apparmor-parser/package.nix +++ b/pkgs/by-name/ap/apparmor-parser/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { "POD2HTML=${lib.getExe' buildPackages.perl "pod2html"}" "MANDIR=share/man" ] - ++ lib.optional finalAttrs.doCheck "PROVE=${lib.getExe' perl "prove"}"; + ++ lib.optional finalAttrs.finalPackage.doCheck "PROVE=${lib.getExe' perl "prove"}"; installFlags = [ "DESTDIR=$(out)" diff --git a/pkgs/by-name/ar/ardour/package.nix b/pkgs/by-name/ar/ardour/package.nix index e5924ad03e4b..0659af469370 100644 --- a/pkgs/by-name/ar/ardour/package.nix +++ b/pkgs/by-name/ar/ardour/package.nix @@ -193,7 +193,7 @@ let # https://discourse.ardour.org/t/ardour-8-2-released/109615/8 # "--use-external-libs" ] - ++ lib.optional finalAttrs.doCheck "--test" + ++ lib.optional finalAttrs.finalPackage.doCheck "--test" ++ lib.optional optimize "--optimize"; env = { diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index b19475fac5dd..92d95ced7137 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -345,9 +345,9 @@ vm-repair = mkAzExtension rec { pname = "vm-repair"; - version = "2.2.0"; + version = "2.2.1"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/vm_repair-${version}-py2.py3-none-any.whl"; - hash = "sha256-ppsK4rJa/nFFkO2XJvjnK0PIRp9/haVwWfqfF7oN5WQ="; + hash = "sha256-k/6ATtYT2YXaHm5nbb0Tf7xE98Oz9svRlbjodCOOuo8="; description = "Support for repairing Azure Virtual Machines"; propagatedBuildInputs = with python3Packages; [ opencensus ]; meta.maintainers = [ ]; diff --git a/pkgs/by-name/bi/bitcoin-knots/package.nix b/pkgs/by-name/bi/bitcoin-knots/package.nix index ee766f027c6e..1c6a88d022de 100644 --- a/pkgs/by-name/bi/bitcoin-knots/package.nix +++ b/pkgs/by-name/bi/bitcoin-knots/package.nix @@ -151,7 +151,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "WITH_USDT" enableTracing) (lib.cmakeFeature "RDTS_CONSENT" "RUNTIME_WARN") ] - ++ lib.optionals (!finalAttrs.doCheck) [ + ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [ (lib.cmakeBool "BUILD_TESTS" false) (lib.cmakeBool "BUILD_FUZZ_BINARY" false) (lib.cmakeBool "BUILD_GUI_TESTS" false) diff --git a/pkgs/by-name/bi/bitcoin/package.nix b/pkgs/by-name/bi/bitcoin/package.nix index e84c04887ac6..c7ecbabceeef 100644 --- a/pkgs/by-name/bi/bitcoin/package.nix +++ b/pkgs/by-name/bi/bitcoin/package.nix @@ -158,7 +158,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "WITH_ZMQ" true) (lib.cmakeBool "WITH_USDT" enableTracing) ] - ++ lib.optionals (!finalAttrs.doCheck) [ + ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [ (lib.cmakeBool "BUILD_TESTS" false) (lib.cmakeBool "BUILD_FUZZ_BINARY" false) (lib.cmakeBool "BUILD_GUI_TESTS" false) diff --git a/pkgs/by-name/br/brlcad/package.nix b/pkgs/by-name/br/brlcad/package.nix index 9629fc86897e..fde53331be81 100644 --- a/pkgs/by-name/br/brlcad/package.nix +++ b/pkgs/by-name/br/brlcad/package.nix @@ -227,7 +227,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "BRLCAD_ENABLE_STRICT" false) - (lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck) + (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) (lib.cmakeBool "BRLCAD_ENABLE_QT" enableQt) (lib.cmakeFeature "GTE_INCLUDE_DIR" "${gtmathematics}/include/gtmathematics") (lib.cmakeFeature "LMDB_LIBRARY" "${lmdb.out}/lib/liblmdb${stdenv.hostPlatform.extensions.sharedLibrary}") diff --git a/pkgs/by-name/ca/caesura/package.nix b/pkgs/by-name/ca/caesura/package.nix index d78a643d4778..ff1ef9060abe 100644 --- a/pkgs/by-name/ca/caesura/package.nix +++ b/pkgs/by-name/ca/caesura/package.nix @@ -1,7 +1,10 @@ { lib, fetchFromGitHub, + fetchpatch2, rustPlatform, + cacert, + writableTmpDirAsHomeHook, flac, lame, makeBinaryWrapper, @@ -16,24 +19,37 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "caesura"; - version = "0.27.2"; + version = "0.31.0"; src = fetchFromGitHub { owner = "RogueOneEcho"; repo = "caesura"; tag = "v${finalAttrs.version}"; - hash = "sha256-ifaZ+rmMmWhn8HM25sRPXJKuXvWE5VG+5hFMi9hqxA0="; + hash = "sha256-+REt+MKImO7fnYWJ32P6mKzulGJTnxc+9ednVF5aCJU="; }; - cargoHash = "sha256-g8Duhl5nZ6umIrAafW7s4vtDS+f06CWnFLoLSw0wa4o="; + patches = [ + (fetchpatch2 { + name = "normalize-sox-dependent-full-spectrogram-widths.patch"; + url = "https://github.com/RogueOneEcho/caesura/commit/3af818ae35a3e18f444c889d9d3b88294f4f110f.patch?full_index=1"; + hash = "sha256-znAbk6hFVj198BUUwwDo76SWei0cKINeXzlYEFvTwHA="; + }) + ]; + + cargoHash = "sha256-0+vZma8AC44XqVHzmJT/roV7sy8w6DYhujRK9N91J5c="; nativeBuildInputs = [ makeBinaryWrapper ]; - nativeCheckInputs = runtimeDeps; + nativeCheckInputs = [ + cacert + writableTmpDirAsHomeHook + ] + ++ runtimeDeps; env = { CAESURA_NIX = "1"; + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; }; postPatch = '' diff --git a/pkgs/by-name/ca/cargo-edit/package.nix b/pkgs/by-name/ca/cargo-edit/package.nix index 314d7c62b8ec..b9714260fc49 100644 --- a/pkgs/by-name/ca/cargo-edit/package.nix +++ b/pkgs/by-name/ca/cargo-edit/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-edit"; - version = "0.13.11"; + version = "0.13.13"; src = fetchFromGitHub { owner = "killercup"; repo = "cargo-edit"; rev = "v${finalAttrs.version}"; - hash = "sha256-u4mjbIs9rLZOZ4MUITc4QYnfEcTyZT5aXt6U7fwefoo="; + hash = "sha256-yaY6krZ+kt2g3Wnnzsw4P3xnpsaZuNwFfRk9GLvwps8="; }; - cargoHash = "sha256-1PCncmiY+olGGMOT2AfIbGY5sup4ysPVqdBmuecDWk0="; + cargoHash = "sha256-Q4GDA81w0JR9rcpKSPe9Y+9HPpFdAvYP2RI+91R4NWE="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix index 1c4dc8cbbc02..cfbc7a4b2abf 100644 --- a/pkgs/by-name/ca/cargo-expand/package.nix +++ b/pkgs/by-name/ca/cargo-expand/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-expand"; - version = "1.0.123"; + version = "1.0.124"; src = fetchFromGitHub { owner = "dtolnay"; repo = "cargo-expand"; tag = finalAttrs.version; - hash = "sha256-vd63DpKLZpE+fIdfy4gp9PDSSLICPXZdrjk7hMB9L0A="; + hash = "sha256-deGIcij3Tczsqc0HTBGUbncdUXKP+FGj5R+2fevQULA="; }; - cargoHash = "sha256-mLpihgQ5PNRE72xWRHgcA8KxujR7Pi4bGnwahOQJ4qo="; + cargoHash = "sha256-MYaKNoz8h5bt0/Z+8PwLKZDvIWUUCfsvB5vibMaDmf4="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/cl/closurecompiler/package.nix b/pkgs/by-name/cl/closurecompiler/package.nix index d7d84b3d6eb0..938b6a425f27 100644 --- a/pkgs/by-name/cl/closurecompiler/package.nix +++ b/pkgs/by-name/cl/closurecompiler/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/share/java $out/bin cp ${finalAttrs.src} $out/share/java/closure-compiler-v${finalAttrs.version}.jar makeWrapper ${jre}/bin/java $out/bin/closure-compiler \ - --add-flags "-jar $out/share/java/closure-compiler-v${finalAttrs.version}.jar" + --add-flags "\$NIX_JAVA_ARGS -jar $out/share/java/closure-compiler-v${finalAttrs.version}.jar" ''; meta = { diff --git a/pkgs/by-name/cm/cmocka/package.nix b/pkgs/by-name/cm/cmocka/package.nix index cae6effbbfbd..f2e4e6a38955 100644 --- a/pkgs/by-name/cm/cmocka/package.nix +++ b/pkgs/by-name/cm/cmocka/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; cmakeFlags = - lib.optional finalAttrs.doCheck "-DUNIT_TESTING=ON" + lib.optional finalAttrs.finalPackage.doCheck "-DUNIT_TESTING=ON" ++ lib.optional stdenv.hostPlatform.isStatic "-DBUILD_SHARED_LIBS=OFF"; doCheck = true; diff --git a/pkgs/by-name/el/elements/package.nix b/pkgs/by-name/el/elements/package.nix index 2bdac00f7537..6d0385633609 100644 --- a/pkgs/by-name/el/elements/package.nix +++ b/pkgs/by-name/el/elements/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { "--with-boost-libdir=${boost.out}/lib" "--disable-bench" ] - ++ lib.optionals (!finalAttrs.doCheck) [ + ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [ "--disable-tests" "--disable-gui-tests" ] diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix index 936f0caabe46..69f1b4480ae4 100644 --- a/pkgs/by-name/es/esphome/package.nix +++ b/pkgs/by-name/es/esphome/package.nix @@ -9,6 +9,7 @@ esptool, git, versionCheckHook, + addBinToPathHook, nixosTests, }: @@ -24,14 +25,14 @@ let in python.pkgs.buildPythonApplication (finalAttrs: { pname = "esphome"; - version = "2026.6.2"; + version = "2026.6.5"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "esphome"; tag = finalAttrs.version; - hash = "sha256-h7aMPSXmIUutCGMoZlE3Z1wX2xNxdmZsHfBllcFHBHc="; + hash = "sha256-4sbc/X86OWN/Bx2sPk3H2lgzGxdQNS6bIspNLAVqHz8="; }; patches = [ @@ -85,7 +86,6 @@ python.pkgs.buildPythonApplication (finalAttrs: { jinja2 paho-mqtt pillow - platformio puremagic py7zr pyparsing @@ -138,6 +138,7 @@ python.pkgs.buildPythonApplication (finalAttrs: { ++ [ git versionCheckHook + addBinToPathHook ]; disabledTestPaths = [ @@ -149,10 +150,6 @@ python.pkgs.buildPythonApplication (finalAttrs: { "tests/unit_tests/test_espidf_component.py" ]; - preCheck = '' - export PATH=$PATH:$out/bin - ''; - postInstall = let argcomplete = lib.getExe' python.pkgs.argcomplete "register-python-argcomplete"; @@ -164,8 +161,6 @@ python.pkgs.buildPythonApplication (finalAttrs: { --fish <(${argcomplete} --shell fish esphome) ''; - doInstallCheck = true; - disabledTests = [ # tries to import platformio, which is wrapped in an fhsenv "test_clean_build" @@ -207,6 +202,7 @@ python.pkgs.buildPythonApplication (finalAttrs: { picnoir thanegill karlbeecken + tmarkus ]; mainProgram = "esphome"; }; diff --git a/pkgs/by-name/fe/feedbackd-device-themes/package.nix b/pkgs/by-name/fe/feedbackd-device-themes/package.nix index 78deacafd2a5..02cd3b68cc7b 100644 --- a/pkgs/by-name/fe/feedbackd-device-themes/package.nix +++ b/pkgs/by-name/fe/feedbackd-device-themes/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { ]; mesonFlags = [ - (lib.mesonOption "validate" (if finalAttrs.doCheck then "enabled" else "disabled")) + (lib.mesonOption "validate" (if finalAttrs.finalPackage.doCheck then "enabled" else "disabled")) ]; doCheck = true; diff --git a/pkgs/by-name/fe/fex/package.nix b/pkgs/by-name/fe/fex/package.nix index ea2f4eece6da..0a9c395988f8 100644 --- a/pkgs/by-name/fe/fex/package.nix +++ b/pkgs/by-name/fe/fex/package.nix @@ -233,7 +233,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { cmakeFlagsArray+=("-DBUILD_TESTING:BOOL=FALSE") else echo "Keeping checkPhase as-is" - cmakeFlagsArray+=("${lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck}") + cmakeFlagsArray+=("${lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck}") fi ''; diff --git a/pkgs/by-name/fl/flatpak/package.nix b/pkgs/by-name/fl/flatpak/package.nix index 54f07a4a6c8b..7f909e0960d0 100644 --- a/pkgs/by-name/fl/flatpak/package.nix +++ b/pkgs/by-name/fl/flatpak/package.nix @@ -119,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: { # and cannot bind FHS paths since those are not available on NixOS. finalAttrs.passthru.icon-validator-patch ] - ++ lib.optionals finalAttrs.doCheck [ + ++ lib.optionals finalAttrs.finalPackage.doCheck [ # Hardcode paths used by tests and change test runtime generation to use files from Nix store. # https://github.com/flatpak/flatpak/issues/1460 (replaceVars ./fix-test-paths.patch { diff --git a/pkgs/by-name/ft/ftxui/package.nix b/pkgs/by-name/ft/ftxui/package.nix index 70bfe592bc97..cc659187d2f4 100644 --- a/pkgs/by-name/ft/ftxui/package.nix +++ b/pkgs/by-name/ft/ftxui/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "FTXUI_BUILD_EXAMPLES" false) (lib.cmakeBool "FTXUI_BUILD_DOCS" true) - (lib.cmakeBool "FTXUI_BUILD_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "FTXUI_BUILD_TESTS" finalAttrs.finalPackage.doCheck) ]; meta = { diff --git a/pkgs/by-name/fw/fwup/package.nix b/pkgs/by-name/fw/fwup/package.nix index 3ecaa0d8bf8e..3eddac5d52dc 100644 --- a/pkgs/by-name/fw/fwup/package.nix +++ b/pkgs/by-name/fw/fwup/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { unzip zip ] - ++ lib.optionals finalAttrs.doCheck [ + ++ lib.optionals finalAttrs.finalPackage.doCheck [ mtools dosfstools ]; diff --git a/pkgs/by-name/ge/gecode/package.nix b/pkgs/by-name/ge/gecode/package.nix index d07198f78125..d325f2501a3f 100644 --- a/pkgs/by-name/ge/gecode/package.nix +++ b/pkgs/by-name/ge/gecode/package.nix @@ -2,8 +2,8 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, bison, + cmake, flex, perl, gmp, @@ -12,30 +12,22 @@ enableGist ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gecode"; - version = "6.2.0"; + version = "6.4.0"; src = fetchFromGitHub { owner = "Gecode"; repo = "gecode"; - rev = "release-${version}"; - sha256 = "0b1cq0c810j1xr2x9y9996p894571sdxng5h74py17c6nr8c6dmk"; + tag = "release-${finalAttrs.version}"; + hash = "sha256-WhMN7QC+VQfvHUV1LLaW7I7fG++/fznh1ZDUY/Q8zD8="; }; - patches = [ - # https://github.com/Gecode/gecode/pull/74 - (fetchpatch { - name = "fix-const-weights-clang.patch"; - url = "https://github.com/Gecode/gecode/commit/c810c96b1ce5d3692e93439f76c4fa7d3daf9fbb.patch"; - sha256 = "0270msm22q5g5sqbdh8kmrihlxnnxqrxszk9a49hdxd72736p4fc"; - }) - ]; - enableParallelBuilding = true; dontWrapQtApps = true; nativeBuildInputs = [ bison + cmake flex ]; buildInputs = [ @@ -52,4 +44,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix index 9dba84a426c7..709ab371c729 100644 --- a/pkgs/by-name/gi/gitlab-runner/package.nix +++ b/pkgs/by-name/gi/gitlab-runner/package.nix @@ -12,16 +12,16 @@ buildGoModule (finalAttrs: { pname = "gitlab-runner"; - version = "19.0.0"; + version = "19.1.1"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; tag = "v${finalAttrs.version}"; - hash = "sha256-uScTzj4pSRtSFCMxoOR5KqipCbPknwnydPYG6xU5dOo="; + hash = "sha256-QKiHd4UFTuAZElQ/793Tyid983RnfU9TeNpe1gFwChA="; }; - vendorHash = "sha256-QqqTkIgR9ca1dYQ32SG7C+SpEIA07Hlf8x3lVhZ5vRQ="; + vendorHash = "sha256-Ed2PrEkkqZEWhFLtT1BJavWiacLuv4U7kIAcscMDQgM="; # For patchShebangs buildInputs = [ bash ]; diff --git a/pkgs/by-name/gi/gitte/package.nix b/pkgs/by-name/gi/gitte/package.nix index a1f8f3f5ba65..157a276ca285 100644 --- a/pkgs/by-name/gi/gitte/package.nix +++ b/pkgs/by-name/gi/gitte/package.nix @@ -22,7 +22,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "gitte"; - version = "0.9.0"; + version = "0.9.1"; __structuredAttrs = true; @@ -30,12 +30,12 @@ stdenv.mkDerivation (finalAttrs: { owner = "ckruse"; repo = "Gitte"; tag = finalAttrs.version; - hash = "sha256-k10Rqpf9fhcG+PU6WGr7Q2nVwZb0tLp2B2r3BNeicoI="; + hash = "sha256-/vVNWYuTsFf9SsL/PvM5hOJfULeibRn+9ukAbTs5rXk="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-eK8o/psq0eHwUlbfD0I/TwIqoA40Ay0eJ9CtZypZCi4="; + hash = "sha256-oz8pX33jua+bOBEmI87p4rkUxYrhzagBLcQvSHPOkp0="; }; strictDeps = true; diff --git a/pkgs/by-name/gs/gsl-lite/package.nix b/pkgs/by-name/gs/gsl-lite/package.nix index 7b53ae8762ee..07e497660fd5 100644 --- a/pkgs/by-name/gs/gsl-lite/package.nix +++ b/pkgs/by-name/gs/gsl-lite/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - (lib.cmakeBool "GSL_LITE_OPT_BUILD_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "GSL_LITE_OPT_BUILD_TESTS" finalAttrs.finalPackage.doCheck) ]; # Building tests is broken on Darwin. diff --git a/pkgs/by-name/gz/gz-cmake/package.nix b/pkgs/by-name/gz/gz-cmake/package.nix index 34d9fefd9806..40210a44177b 100644 --- a/pkgs/by-name/gz/gz-cmake/package.nix +++ b/pkgs/by-name/gz/gz-cmake/package.nix @@ -45,8 +45,8 @@ stdenv.mkDerivation (finalAttrs: { doBuildExamples = false; cmakeFlags = [ - (lib.cmakeBool "BUILDSYSTEM_TESTING" finalAttrs.doCheck) - (lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck) + (lib.cmakeBool "BUILDSYSTEM_TESTING" finalAttrs.finalPackage.doCheck) + (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) (lib.cmakeBool "BUILD_EXAMPLES" finalAttrs.doBuildExamples) ]; diff --git a/pkgs/by-name/ig/igprof/package.nix b/pkgs/by-name/ig/igprof/package.nix index a0fc1c0a5e58..127d77148346 100644 --- a/pkgs/by-name/ig/igprof/package.nix +++ b/pkgs/by-name/ig/igprof/package.nix @@ -4,32 +4,25 @@ fetchFromGitHub, libunwind, cmake, - pcre, + pcre2, gdb, }: stdenv.mkDerivation (finalAttrs: { - version = "5.9.18"; + version = "6.0.0"; pname = "igprof"; src = fetchFromGitHub { owner = "igprof"; repo = "igprof"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-UTrAaH8C79km78Z/7NxvQ6dnl4u4Ki80nORf4bsoSNw="; + hash = "sha256-RIDnilCoYlq0D9CBJKMX1zg1DBQ4RPcOlfGcZ2xosUo="; }; - postPatch = '' - substituteInPlace src/igprof \ - --replace-fail libigprof.so $out/lib/libigprof.so - substituteInPlace CMakeLists.txt \ - --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" "CMAKE_MINIMUM_REQUIRED(VERSION 3.10)" - ''; - buildInputs = [ libunwind gdb - pcre + pcre2 ]; nativeBuildInputs = [ cmake ]; @@ -41,7 +34,6 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { - broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Ignominous Profiler"; longDescription = '' diff --git a/pkgs/by-name/in/iniparser/package.nix b/pkgs/by-name/in/iniparser/package.nix index 260dfdf1887f..3d1a5af3a3f4 100644 --- a/pkgs/by-name/in/iniparser/package.nix +++ b/pkgs/by-name/in/iniparser/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-z10S9ODLprd7CbL5Ecgh7H4eOwTetYwFXiWBUm6fIr4="; }; - patches = lib.optional finalAttrs.doCheck ( + patches = lib.optional finalAttrs.finalPackage.doCheck ( # 1. Do not fetch the Unity GitHub repository # 2. Lookup the Unity pkgconfig file # 3. Get the generate_test_runner.rb file from the Unity share directory diff --git a/pkgs/by-name/ja/jasterix/package.nix b/pkgs/by-name/ja/jasterix/package.nix index 9b804aaabd26..2d95eb370e55 100644 --- a/pkgs/by-name/ja/jasterix/package.nix +++ b/pkgs/by-name/ja/jasterix/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED" (!stdenv.hostPlatform.isStatic)) (lib.cmakeBool "BUILD_STATIC" stdenv.hostPlatform.isStatic) - (lib.cmakeBool "WITH_UNIT_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "WITH_UNIT_TESTS" finalAttrs.finalPackage.doCheck) ]; buildInputs = [ diff --git a/pkgs/by-name/js/json-tui/package.nix b/pkgs/by-name/js/json-tui/package.nix index 852dba711ead..6dcac51bbb47 100644 --- a/pkgs/by-name/js/json-tui/package.nix +++ b/pkgs/by-name/js/json-tui/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-Wno-dev" # suppress cmake warning about deprecated usage - (lib.cmakeBool "JSON_TUI_BUILD_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "JSON_TUI_BUILD_TESTS" finalAttrs.finalPackage.doCheck) (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_GOOGLETEST" "${gtest.src}") ]; diff --git a/pkgs/by-name/ki/kiro-cli/package.nix b/pkgs/by-name/ki/kiro-cli/package.nix index 3e41ce545e9c..b2a468be6fea 100644 --- a/pkgs/by-name/ki/kiro-cli/package.nix +++ b/pkgs/by-name/ki/kiro-cli/package.nix @@ -3,10 +3,17 @@ stdenv, fetchurl, autoPatchelfHook, + makeBinaryWrapper, undmg, versionCheckHook, xz, bzip2, + wl-clipboard, + # On Wayland, kiro-cli shells out to wl-clipboard (wl-copy/wl-paste) for + # clipboard access. Enabling this puts wl-clipboard on the runtime PATH so + # clipboard support works out of the box under Wayland sessions. Has no + # effect on Darwin. + waylandSupport ? stdenv.hostPlatform.isLinux, }: let @@ -41,6 +48,9 @@ stdenv.mkDerivation (finalAttrs: { lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && waylandSupport) [ + makeBinaryWrapper + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ undmg ]; @@ -65,6 +75,12 @@ stdenv.mkDerivation (finalAttrs: { install -Dm755 bin/kiro-cli-chat $out/bin/kiro-cli-chat install -Dm755 bin/kiro-cli-term $out/bin/kiro-cli-term '' + + lib.optionalString (stdenv.hostPlatform.isLinux && waylandSupport) '' + for bin in kiro-cli kiro-cli-chat kiro-cli-term; do + wrapProgram $out/bin/$bin \ + --suffix PATH : ${lib.makeBinPath [ wl-clipboard ]} + done + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/bin $out/Applications cp -r "../Kiro CLI.app" "$out/Applications/" diff --git a/pkgs/by-name/ku/ku/package.nix b/pkgs/by-name/ku/ku/package.nix index 60d613cc5158..ee24a471399a 100644 --- a/pkgs/by-name/ku/ku/package.nix +++ b/pkgs/by-name/ku/ku/package.nix @@ -8,14 +8,14 @@ buildGo126Module (finalAttrs: { pname = "ku"; - version = "0.8.2"; + version = "0.9.0"; __structuredAttrs = true; src = fetchFromGitHub { owner = "bjarneo"; repo = "ku"; tag = "v${finalAttrs.version}"; - hash = "sha256-vUv4eKTCucJ/ol76z0Q3jOigYBSwM823ZxjvBFqv1yY="; + hash = "sha256-4z4lPvmkEqC7YBEaAa8cUyB42hkFkTFRkHGaA58/Vpg="; }; vendorHash = "sha256-x7O2/uKnIIFDr8WK0ej3FJiIGxN5Fq5Czqrv4OJ5A44="; diff --git a/pkgs/by-name/li/libmemcached/package.nix b/pkgs/by-name/li/libmemcached/package.nix index df17fef7a93a..9a4553d22000 100644 --- a/pkgs/by-name/li/libmemcached/package.nix +++ b/pkgs/by-name/li/libmemcached/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - (lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck) + (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) "-DENABLE_SASL=ON" ]; diff --git a/pkgs/by-name/li/libpointmatcher/package.nix b/pkgs/by-name/li/libpointmatcher/package.nix index aa099a0cd540..66d2c094807e 100644 --- a/pkgs/by-name/li/libpointmatcher/package.nix +++ b/pkgs/by-name/li/libpointmatcher/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeFeature "EIGEN_INCLUDE_DIR" "${eigen}/include/eigen3") - (lib.cmakeBool "BUILD_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck) ]; doCheck = true; diff --git a/pkgs/by-name/li/libvncserver/package.nix b/pkgs/by-name/li/libvncserver/package.nix index 29ce2959e878..1cc1489c93d9 100644 --- a/pkgs/by-name/li/libvncserver/package.nix +++ b/pkgs/by-name/li/libvncserver/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "WITH_SYSTEMD" withSystemd) (lib.cmakeBool "BUILD_SHARED_LIBS" enableShared) (lib.cmakeBool "WITH_EXAMPLES" buildExamples) - (lib.cmakeBool "WITH_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "WITH_TESTS" finalAttrs.finalPackage.doCheck) ]; # This test checks if using the **installed** headers works. diff --git a/pkgs/by-name/li/libxmp/package.nix b/pkgs/by-name/li/libxmp/package.nix index c170f837e902..327c21205901 100644 --- a/pkgs/by-name/li/libxmp/package.nix +++ b/pkgs/by-name/li/libxmp/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED" (!stdenv.hostPlatform.isStatic)) (lib.cmakeBool "BUILD_STATIC" stdenv.hostPlatform.isStatic) - (lib.cmakeBool "WITH_UNIT_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "WITH_UNIT_TESTS" finalAttrs.finalPackage.doCheck) ]; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; diff --git a/pkgs/by-name/ma/mathic/package.nix b/pkgs/by-name/ma/mathic/package.nix index fe2330fd28da..9d90e17fa8f5 100644 --- a/pkgs/by-name/ma/mathic/package.nix +++ b/pkgs/by-name/ma/mathic/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { ]; configureFlags = [ - (lib.withFeature finalAttrs.doCheck "gtest") + (lib.withFeature finalAttrs.finalPackage.doCheck "gtest") ]; __structuredAttrs = true; diff --git a/pkgs/by-name/ma/mathicgb/package.nix b/pkgs/by-name/ma/mathicgb/package.nix index cf88e8024712..f6cbbdcf9fbd 100644 --- a/pkgs/by-name/ma/mathicgb/package.nix +++ b/pkgs/by-name/ma/mathicgb/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; configureFlags = [ - (lib.withFeature finalAttrs.doCheck "gtest") + (lib.withFeature finalAttrs.finalPackage.doCheck "gtest") ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix index 6c9cffa76f22..618351a33b61 100644 --- a/pkgs/by-name/ma/matrix-authentication-service/package.nix +++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix @@ -20,21 +20,21 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-authentication-service"; - version = "1.20.0"; + version = "1.21.0"; src = fetchFromGitHub { owner = "element-hq"; repo = "matrix-authentication-service"; tag = "v${finalAttrs.version}"; - hash = "sha256-0fvGhBxwXhSzWvNhflreEFoCBycM10vMkMf4sj95vfY="; + hash = "sha256-4z+u1IM2pclccv9+IH8IWjCodDxWZmffbqWPC726sIg="; }; - cargoHash = "sha256-3V50qNvg24WZvQ9z7IZJAnPXHTibZ6o3EzUoinLU6Gw="; + cargoHash = "sha256-HQU0zaK7rLJnTX5WVZrqNEaT5HfFLDzs+pHRxx5XTaA="; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; fetcherVersion = 4; - hash = "sha256-j2A2VCKQPfoyrNDtazu8hzUHpS130Ju/Cy3yfu9tC5I="; + hash = "sha256-9a62WlBQW8lgXluMh+DM21CkFCqFYd7yUz220G1uTIY="; }; pnpmRoot = "frontend"; diff --git a/pkgs/by-name/ma/mayo/package.nix b/pkgs/by-name/ma/mayo/package.nix index 5baaa54006e6..3da00353fe45 100644 --- a/pkgs/by-name/ma/mayo/package.nix +++ b/pkgs/by-name/ma/mayo/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeOptionType "string" "Mayo_VersionMajor" (lib.versions.major finalAttrs.version)) (lib.cmakeOptionType "string" "Mayo_VersionMinor" (lib.versions.minor finalAttrs.version)) (lib.cmakeOptionType "string" "Mayo_VersionPatch" (lib.versions.patch finalAttrs.version)) - (lib.cmakeBool "Mayo_BuildTests" finalAttrs.doCheck) + (lib.cmakeBool "Mayo_BuildTests" finalAttrs.finalPackage.doCheck) ] ++ lib.optional withAssimp "-DMayo_BuildPluginAssimp=ON"; diff --git a/pkgs/by-name/me/memtailor/package.nix b/pkgs/by-name/me/memtailor/package.nix index a70d33ecf38d..ddfb329286af 100644 --- a/pkgs/by-name/me/memtailor/package.nix +++ b/pkgs/by-name/me/memtailor/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; configureFlags = [ - (lib.withFeature finalAttrs.doCheck "gtest") + (lib.withFeature finalAttrs.finalPackage.doCheck "gtest") ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/mi/mimalloc/package.nix b/pkgs/by-name/mi/mimalloc/package.nix index ed8ba80d66e5..6f4c2362a33e 100644 --- a/pkgs/by-name/mi/mimalloc/package.nix +++ b/pkgs/by-name/mi/mimalloc/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { MI_SECURE = secureBuild; MI_BUILD_SHARED = stdenv.hostPlatform.hasSharedLibraries; MI_LIBC_MUSL = stdenv.hostPlatform.libc == "musl"; - MI_BUILD_TESTS = finalAttrs.doCheck; + MI_BUILD_TESTS = finalAttrs.finalPackage.doCheck; # MI_OPT_ARCH is inaccurate (e.g. it assumes aarch64 == armv8.1-a). # Nixpkgs's native platform configuration does a better job. diff --git a/pkgs/by-name/mi/minizinc/package.nix b/pkgs/by-name/mi/minizinc/package.nix index 4747ebe471fa..22ed68a2228d 100644 --- a/pkgs/by-name/mi/minizinc/package.nix +++ b/pkgs/by-name/mi/minizinc/package.nix @@ -13,22 +13,6 @@ zlib, }: -let - gecode_6_3_0 = gecode.overrideAttrs (_: { - version = "6.3.0"; - src = fetchFromGitHub { - owner = "gecode"; - repo = "gecode"; - rev = "f7f0d7c273d6844698f01cec8229ebe0b66a016a"; - hash = "sha256-skf2JEtNkRqEwfHb44WjDGedSygxVuqUixskTozi/5k="; - }; - patches = [ ]; - }); -in -let - gecode = gecode_6_3_0; -in - stdenv.mkDerivation (finalAttrs: { pname = "minizinc"; version = "2.9.7"; diff --git a/pkgs/by-name/mi/minizip-ng/package.nix b/pkgs/by-name/mi/minizip-ng/package.nix index d7dd9bee6845..624d7e9b8d43 100644 --- a/pkgs/by-name/mi/minizip-ng/package.nix +++ b/pkgs/by-name/mi/minizip-ng/package.nix @@ -42,8 +42,8 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "MZ_OPENSSL" true) (lib.cmakeBool "MZ_PPMD" false) # PPMD support requres internet access to make a git clone (lib.cmakeBool "MZ_LIBCOMP" false) # builds only on Darwin by default where it fails due to mising headers - (lib.cmakeBool "MZ_BUILD_TESTS" finalAttrs.doCheck) - (lib.cmakeBool "MZ_BUILD_UNIT_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "MZ_BUILD_TESTS" finalAttrs.finalPackage.doCheck) + (lib.cmakeBool "MZ_BUILD_UNIT_TESTS" finalAttrs.finalPackage.doCheck) (lib.cmakeBool "MZ_COMPAT" enableCompat) ] ++ lib.optionals stdenv.hostPlatform.isi686 [ diff --git a/pkgs/by-name/mo/mosquitto/package.nix b/pkgs/by-name/mo/mosquitto/package.nix index b295de57ed23..56621743f089 100644 --- a/pkgs/by-name/mo/mosquitto/package.nix +++ b/pkgs/by-name/mo/mosquitto/package.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "WITH_BUNDLED_DEPS" false) (lib.cmakeBool "WITH_WEBSOCKETS" true) (lib.cmakeBool "WITH_SYSTEMD" withSystemd) - (lib.cmakeBool "WITH_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "WITH_TESTS" finalAttrs.finalPackage.doCheck) ]; postFixup = '' diff --git a/pkgs/by-name/mu/mu/package.nix b/pkgs/by-name/mu/mu/package.nix index f2f59b52606c..0187936e152d 100644 --- a/pkgs/by-name/mu/mu/package.nix +++ b/pkgs/by-name/mu/mu/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.strings.mesonEnable "guile" false) (lib.strings.mesonEnable "scm" false) (lib.strings.mesonEnable "readline" false) - (lib.strings.mesonEnable "tests" finalAttrs.doCheck) + (lib.strings.mesonEnable "tests" finalAttrs.finalPackage.doCheck) (lib.strings.mesonOption "lispdir" "${placeholder "mu4e"}/share/emacs/site-lisp") ]; diff --git a/pkgs/by-name/mu/muon/package.nix b/pkgs/by-name/mu/muon/package.nix index dd760d4519f4..f20d61af19b8 100644 --- a/pkgs/by-name/mu/muon/package.nix +++ b/pkgs/by-name/mu/muon/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals buildDocs [ scdoc ] - ++ lib.optionals (buildDocs || finalAttrs.doCheck) [ + ++ lib.optionals (buildDocs || finalAttrs.finalPackage.doCheck) [ (python3.withPackages (ps: [ ps.pyyaml ])) ]; @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { find subprojects -name "*.py" -exec chmod +x {} \; patchShebangs subprojects '' - + lib.optionalString finalAttrs.doCheck '' + + lib.optionalString finalAttrs.finalPackage.doCheck '' substituteInPlace \ "subprojects/meson-tests/common/14 configure file/test.py.in" \ "subprojects/meson-tests/common/274 customtarget exe for test/generate.py" \ @@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: { (muonBool "static" stdenv.targetPlatform.isStatic) (muonEnable "man-pages" buildDocs) (muonEnable "meson-docs" buildDocs) - (muonEnable "meson-tests" finalAttrs.doCheck) + (muonEnable "meson-tests" finalAttrs.finalPackage.doCheck) (muonEnable "samurai" embedSamurai) (muonEnable "tracy" false) (muonEnable "website" false) @@ -177,7 +177,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "muon-build"; rev = "db92588773a24f67cda2f331b945825ca3a63fa7"; hash = "sha256-z4Fc1lr/m2MwIwhXJwoFWpzeNg+udzMxuw5Q/zVvpSM="; - passthru.use = finalAttrs.doCheck; + passthru.use = finalAttrs.finalPackage.doCheck; }; }; diff --git a/pkgs/by-name/ne/nelm/package.nix b/pkgs/by-name/ne/nelm/package.nix index 5ed5dcfd2bbd..3c919c1f0a53 100644 --- a/pkgs/by-name/ne/nelm/package.nix +++ b/pkgs/by-name/ne/nelm/package.nix @@ -9,13 +9,13 @@ }: buildGoModule (finalAttrs: { pname = "nelm"; - version = "1.25.2"; + version = "1.25.3"; src = fetchFromGitHub { owner = "werf"; repo = "nelm"; tag = "v${finalAttrs.version}"; - hash = "sha256-2YIxnuHbY9zCVZer+b7JD0fbmUC/ZYyaWmHts7s5ldw="; + hash = "sha256-b0gO1V7yv8RMjIxwnqFX9CPRcRFm/j8u2PwNzyA7jtc="; }; vendorHash = "sha256-rIiphGjE/a5IwF6Fkk3Ffq36AfEkfAZb12ZljlYP6X4="; diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix index 0f60677bb40c..62f7b4fce9e4 100644 --- a/pkgs/by-name/ne/nexusmods-app/package.nix +++ b/pkgs/by-name/ne/nexusmods-app/package.nix @@ -70,7 +70,7 @@ buildDotnetModule (finalAttrs: { substituteInPlace src/NexusMods.Networking.NexusWebApi/NexusMods.Networking.NexusWebApi.csproj \ --replace-fail '$(BaseIntermediateOutputPath)games.json' ${./vendored/games.json} - ${lib.optionalString finalAttrs.doCheck '' + ${lib.optionalString finalAttrs.finalPackage.doCheck '' # For some reason these tests fail (intermittently?) with a zero timestamp touch tests/NexusMods.UI.Tests/WorkspaceSystem/*.verified.png ''} diff --git a/pkgs/by-name/ni/nil/package.nix b/pkgs/by-name/ni/nil/package.nix index 1cb2324dae1f..1df0684af385 100644 --- a/pkgs/by-name/ni/nil/package.nix +++ b/pkgs/by-name/ni/nil/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nil"; - version = "2025-06-13"; + version = "2026-07-23"; src = fetchFromGitHub { owner = "oxalica"; repo = "nil"; rev = finalAttrs.version; - hash = "sha256-oxvVAFUO9husnRk6XZcLFLjLWL9z0pW25Fk6kVKwt1c="; + hash = "sha256-upJVI2pq9sOKgF2AILt8l6O4/3GNcMtT/s0rmnbO5UA="; }; - cargoHash = "sha256-OZIajxv8xNfCGalVw/FUAwWdQzPqfGuDoeRg2E2RR7s="; + cargoHash = "sha256-ZyTrxGX0mRdskxp4o5ssDCyZzNn36rIgP9fDaA1fDws="; nativeBuildInputs = [ nix ]; diff --git a/pkgs/by-name/nl/nlopt/package.nix b/pkgs/by-name/nl/nlopt/package.nix index e6b9f8cd3a38..753837da46ac 100644 --- a/pkgs/by-name/nl/nlopt/package.nix +++ b/pkgs/by-name/nl/nlopt/package.nix @@ -88,7 +88,7 @@ clangStdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "NLOPT_MATLAB" false) (lib.cmakeBool "NLOPT_GUILE" false) (lib.cmakeBool "NLOPT_LUKSAN" (!withoutLuksanSolvers)) - (lib.cmakeBool "NLOPT_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "NLOPT_TESTS" finalAttrs.finalPackage.doCheck) ] ++ lib.optional withPython ( lib.cmakeFeature "Python_EXECUTABLE" "${buildPythonBindingsEnv.interpreter}" diff --git a/pkgs/by-name/ns/ns-3/package.nix b/pkgs/by-name/ns/ns-3/package.nix index 39aeb72c4e1d..91bf292685e0 100644 --- a/pkgs/by-name/ns/ns-3/package.nix +++ b/pkgs/by-name/ns/ns-3/package.nix @@ -152,7 +152,7 @@ stdenv.mkDerivation (finalAttrs: { "-DNS3_GTK3=ON" "-DGTK3_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" ] - ++ lib.optional finalAttrs.doCheck "-DNS3_TESTS=ON"; + ++ lib.optional finalAttrs.finalPackage.doCheck "-DNS3_TESTS=ON"; # strictoverflow prevents clang from discovering pyembed when bindings hardeningDisable = [ diff --git a/pkgs/by-name/on/onnx/package.nix b/pkgs/by-name/on/onnx/package.nix index 31adc3753a6c..fcab2143a192 100644 --- a/pkgs/by-name/on/onnx/package.nix +++ b/pkgs/by-name/on/onnx/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { # NOTE: Darwin requires a static build; otherwise, tests fail in the Python package. BUILD_SHARED_LIBS = if stdenv.hostPlatform.isDarwin then "0" else "1"; ONNX_BUILD_PYTHON = "1"; - ONNX_BUILD_TESTS = if finalAttrs.doCheck then "1" else "0"; + ONNX_BUILD_TESTS = if finalAttrs.finalPackage.doCheck then "1" else "0"; # ONNX_ML is enabled by default. # See: https://github.com/onnx/onnx/blob/b751946c3d59a3c8358abcc0569b59e6ddb08cdd/CMakeLists.txt#L66-L73 ONNX_ML = "1"; diff --git a/pkgs/by-name/on/onnxruntime/package.nix b/pkgs/by-name/on/onnxruntime/package.nix index 3e8ff9b51bd3..b1a972d4d220 100644 --- a/pkgs/by-name/on/onnxruntime/package.nix +++ b/pkgs/by-name/on/onnxruntime/package.nix @@ -286,7 +286,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { # fails to find protoc on darwin, so specify it (lib.cmakeFeature "ONNX_CUSTOM_PROTOC_EXECUTABLE" (lib.getExe buildPackages.protobuf)) (lib.cmakeBool "onnxruntime_BUILD_SHARED_LIB" true) - (lib.cmakeBool "onnxruntime_BUILD_UNIT_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "onnxruntime_BUILD_UNIT_TESTS" finalAttrs.finalPackage.doCheck) (lib.cmakeBool "onnxruntime_USE_FULL_PROTOBUF" withFullProtobuf) (lib.cmakeBool "onnxruntime_USE_CUDA" cudaSupport) (lib.cmakeBool "onnxruntime_USE_NCCL" ncclSupport) diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index 2a402879ce3f..258878ce0b3e 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -214,7 +214,7 @@ python3Packages.buildPythonApplication (finalAttrs: { gcp-storage-emulator moto oracledb - pinecone-client + pinecone playwright pymilvus pymongo diff --git a/pkgs/by-name/pa/particl-core/package.nix b/pkgs/by-name/pa/particl-core/package.nix index d018c782d470..9b9d090995a2 100644 --- a/pkgs/by-name/pa/particl-core/package.nix +++ b/pkgs/by-name/pa/particl-core/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { "--disable-bench" "--with-boost-libdir=${boost.out}/lib" ] - ++ lib.optionals (!finalAttrs.doCheck) [ + ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [ "--enable-tests=no" ]; diff --git a/pkgs/by-name/ph/phpantom-lsp/package.nix b/pkgs/by-name/ph/phpantom-lsp/package.nix index 3958930ba315..f025969d93c8 100644 --- a/pkgs/by-name/ph/phpantom-lsp/package.nix +++ b/pkgs/by-name/ph/phpantom-lsp/package.nix @@ -6,19 +6,17 @@ _experimental-update-script-combinators, nix-update-script, }: - let stubsSrc = fetchFromGitHub { owner = "JetBrains"; repo = "phpstorm-stubs"; - rev = "517b9ad1adaf2c5453c00ec2fbb02d192a4a9b6c"; - hash = "sha256-IDWAuy301avfTF/E7Mby2JQQtIr/gnN5flZ3uctUpus="; + rev = "f6dd2dd35d99fb774251a83555fe07bf2109d57e"; + hash = "sha256-H9Td/yi9Um0Z9ifxZdh74bvGCMVSC+MA1OHrtbGD8vE="; }; in - rustPlatform.buildRustPackage (finalAttrs: { pname = "phpantom-lsp"; - version = "0.8.0"; + version = "0.9.0"; __structuredAttrs = true; @@ -26,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "AJenbo"; repo = "phpantom_lsp"; tag = finalAttrs.version; - hash = "sha256-00NAiPm3qqxyS1u1GPpJlgnBlUjDx9VmjK6oOwH8kcU="; + hash = "sha256-euWaFH40VHefZewUcKvsLwwHZP+GwfTN8kfuAkaABB8="; }; postPatch = '' @@ -38,7 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: { > stubs/jetbrains/phpstorm-stubs/.commit ''; - cargoHash = "sha256-FyMI8Kb3QUD8Jui9k7vayMcQC+KWL8sZi3A05NPbXsg="; + cargoHash = "sha256-2MIJxVRqyCv5HzCwY1s+rCp1A4vFRsyAEEuyIEegZMA="; checkFlags = [ "--test" diff --git a/pkgs/by-name/pi/picolibc/package.nix b/pkgs/by-name/pi/picolibc/package.nix index 0243c1e0f797..aa5aaf9c170d 100644 --- a/pkgs/by-name/pi/picolibc/package.nix +++ b/pkgs/by-name/pi/picolibc/package.nix @@ -185,7 +185,7 @@ stdenv.mkDerivation (finalAttrs: { (mesonBool "want-math-errno" want-math-errno) ] - ++ lib.optionals finalAttrs.doCheck [ + ++ lib.optionals finalAttrs.finalPackage.doCheck [ (mesonBool "tests" true) # Something is broken with this and I'm not sure what. (mesonOption "tests-cdefs" "false") diff --git a/pkgs/by-name/po/pocket-id/package.nix b/pkgs/by-name/po/pocket-id/package.nix index 9ddd5193ac3a..8168c2ed9549 100644 --- a/pkgs/by-name/po/pocket-id/package.nix +++ b/pkgs/by-name/po/pocket-id/package.nix @@ -14,18 +14,18 @@ }: buildGo127Module (finalAttrs: { pname = "pocket-id"; - version = "2.10.0"; + version = "2.11.0"; src = fetchFromGitHub { owner = "pocket-id"; repo = "pocket-id"; tag = "v${finalAttrs.version}"; - hash = "sha256-ad8YlWwWeGEwsrx29qpq1asEr4UNN7BueGTBPfFrRuE="; + hash = "sha256-keib2ebju6hKlH1XJQRBmXwxBsUnVZOIs+djvYkXYqU="; }; sourceRoot = "${finalAttrs.src.name}/backend"; - vendorHash = "sha256-bQNeocRCmhiV7gwCJppjsNw7K5MnsJMK9M18jf0X/oM="; + vendorHash = "sha256-/5lXAnb2FHeGBgrpU4Jpt2KX+sgGyYH61odppTaulbs="; env.CGO_ENABLED = 0; ldflags = [ @@ -43,7 +43,7 @@ buildGo127Module (finalAttrs: { ]; # required for TestIsURLPrivate - __darwinAllowLocalNetworking = finalAttrs.doCheck; + __darwinAllowLocalNetworking = finalAttrs.finalPackage.doCheck; preFixup = '' mv $out/bin/cmd $out/bin/pocket-id @@ -67,7 +67,7 @@ buildGo127Module (finalAttrs: { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 4; - hash = "sha256-LVhTS3ertpGqLMsoodaoEgDb7sK3kTRTVB3KOyvJwpE="; + hash = "sha256-aJq5yLeeHY7zlOgSr1bOJCL8e1HBwCmoL7nTD2a06tg="; }; env.BUILD_OUTPUT_PATH = "dist"; diff --git a/pkgs/by-name/po/pomo/package.nix b/pkgs/by-name/po/pomo/package.nix new file mode 100644 index 000000000000..869588b34639 --- /dev/null +++ b/pkgs/by-name/po/pomo/package.nix @@ -0,0 +1,39 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + iana-etc, + libredirect, + stdenvNoCC, +}: +buildGoModule (finalAttrs: { + pname = "pomo"; + version = "1.2.1"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "Bahaaio"; + repo = "pomo"; + tag = "v${finalAttrs.version}"; + hash = "sha256-gQ7bHQGaQPujpOwVdcwKgiYQjUECi/Pjt5LKwa1v1J8="; + }; + + vendorHash = "sha256-kbTYq4Xc86bcmNMhInq1rwYTbGRmu2TEXT2e7bqT5YY="; + + nativeCheckInputs = lib.optionals stdenvNoCC.hostPlatform.isDarwin [ libredirect.hook ]; + + preCheck = lib.optionalString stdenvNoCC.hostPlatform.isDarwin '' + export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/services=${iana-etc}/etc/services + ''; + + meta = { + description = "Customizable TUI Pomodoro timer with ASCII art, progress bar, notifications, and stats"; + homepage = "https://github.com/Bahaaio/pomo"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + mugaizzo + ]; + mainProgram = "pomo"; + }; +}) diff --git a/pkgs/by-name/pr/prevail/package.nix b/pkgs/by-name/pr/prevail/package.nix index dc0228506381..7246c9749cb6 100644 --- a/pkgs/by-name/pr/prevail/package.nix +++ b/pkgs/by-name/pr/prevail/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - (lib.cmakeBool "prevail_ENABLE_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "prevail_ENABLE_TESTS" finalAttrs.finalPackage.doCheck) ]; installPhase = '' diff --git a/pkgs/by-name/pr/prometheus-imap-mailstat-exporter/package.nix b/pkgs/by-name/pr/prometheus-imap-mailstat-exporter/package.nix index 104b52d01c0f..51562b7b6662 100644 --- a/pkgs/by-name/pr/prometheus-imap-mailstat-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-imap-mailstat-exporter/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "imap-mailstat-exporter"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "bt909"; repo = "imap-mailstat-exporter"; tag = "${version}"; - hash = "sha256-dinHRHoTVc/0Lu+TzzmfoCyoDZQQhXw8AOlgbH46hm0="; + hash = "sha256-Q+Q7Q9zjJlp83FQ65yqi8eWO02+VkCXlYFRA66yptiE="; }; - vendorHash = "sha256-k3FjfIaNm6408I4uqmJpZsGgMiHel+NUtBclbGKTtZ4="; + vendorHash = "sha256-9rxlXhlQ269E6xtreMrDphqscaZj+IrfsNmssF/C78U="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/pv/pvetui/package.nix b/pkgs/by-name/pv/pvetui/package.nix index a2c37fd5ef31..382ac333e214 100644 --- a/pkgs/by-name/pv/pvetui/package.nix +++ b/pkgs/by-name/pv/pvetui/package.nix @@ -7,7 +7,7 @@ buildGoModule (finalAttrs: { pname = "pvetui"; - version = "1.4.2"; + version = "1.4.3"; __structuredAttrs = true; @@ -15,10 +15,10 @@ buildGoModule (finalAttrs: { owner = "devnullvoid"; repo = "pvetui"; tag = "v${finalAttrs.version}"; - hash = "sha256-yYYGXb+CriDRZcV8e/7MN4Pq8GKP35JdMrcxozWVBpE="; + hash = "sha256-8mfp5bfROqT6DcxByaHZRTkDHJpfclCpeaJaINLKmlk="; }; - vendorHash = "sha256-JOo/7/3J9LqefIYuRl9efSlSfzLvQ/B8Jpy2e5cdEio="; + vendorHash = "sha256-7Tuh9T3uTlNxdSlSL7gQIYXpfpNbCkQrRWj/FoU8fbU="; subPackages = [ "cmd/pvetui" ]; diff --git a/pkgs/by-name/ra/radiotray-ng/package.nix b/pkgs/by-name/ra/radiotray-ng/package.nix index fd13e9e97291..12c9744e29fc 100644 --- a/pkgs/by-name/ra/radiotray-ng/package.nix +++ b/pkgs/by-name/ra/radiotray-ng/package.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: { ''; cmakeFlags = [ - (lib.cmakeBool "BUILD_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck) ]; # 'wxFont::wxFont(int, int, int, int, bool, const wxString&, wxFontEncoding)' is deprecated diff --git a/pkgs/by-name/ru/rustfs/package.nix b/pkgs/by-name/ru/rustfs/package.nix index bd1f974cf4f6..af8a4991e755 100644 --- a/pkgs/by-name/ru/rustfs/package.nix +++ b/pkgs/by-name/ru/rustfs/package.nix @@ -15,7 +15,7 @@ let console = stdenv.mkDerivation (finalAttrs: { pname = "rustfs-console"; - version = "0.1.13"; + version = "0.1.16"; __structuredAttrs = true; __darwinAllowLocalNetworking = true; @@ -23,7 +23,7 @@ let owner = "rustfs"; repo = "console"; tag = "v${finalAttrs.version}"; - hash = "sha256-pxpT3kV30qA+Ob/RWi11rsapGyNc6h1EN79fcPi1e1E="; + hash = "sha256-WZ1vROBZJltcaXdwIuTsRmOY2iZxIoi7yW8lapZcaHo="; }; pnpmDeps = fetchPnpmDeps { @@ -51,14 +51,14 @@ let in rustPlatform.buildRustPackage rec { pname = "rustfs"; - version = "1.0.0-beta.9"; + version = "1.0.0-beta.10"; __structuredAttrs = true; src = fetchFromGitHub { owner = "rustfs"; repo = "rustfs"; tag = version; - hash = "sha256-aNbicnNHaJn05k5EffgPEURf/Uj2A8PjOHiH2UGPz4M="; + hash = "sha256-lBkfaTH36MhWHk39Ie2uQqcU+yf76uImPdV91C8kWV8="; }; postPatch = '' @@ -66,7 +66,7 @@ rustPlatform.buildRustPackage rec { cp -rL ${console} ./rustfs/static ''; - cargoHash = "sha256-abbsElP4dSSZnL4UfQEoHUtiEW8B/p6Y81UA7EbqbD4="; + cargoHash = "sha256-PMgC4+/n/UOpBa5oiZ1F17oht5YmN1RzoFIA0qE+h6M="; nativeBuildInputs = [ protobuf @@ -84,10 +84,11 @@ rustPlatform.buildRustPackage rec { cargoTestFlags = "-p rustfs"; checkFlags = [ - # failing since 1.0.0-beta.9, seem like upstream issues + # require real disks "--skip=app::capacity_dirty_scope_test" "--skip=app::delete_objects_stat_gating_test" "--skip=app::put_prelookup_gating_test" + # non-deterministically panics "--skip=two_embedded_servers_isolate_auth_and_data_planes" ]; diff --git a/pkgs/by-name/ru/rustywind/package.nix b/pkgs/by-name/ru/rustywind/package.nix index a48ee1a7133a..5eec1a568907 100644 --- a/pkgs/by-name/ru/rustywind/package.nix +++ b/pkgs/by-name/ru/rustywind/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rustywind"; - version = "0.25.2"; + version = "0.26.0"; src = fetchFromGitHub { owner = "avencera"; repo = "rustywind"; tag = "v${finalAttrs.version}"; - hash = "sha256-PeYKBLTQ7/fmNuWtIQiqC47omrdGuIlB55OPxBQJQiM="; + hash = "sha256-uxgp8cwOswrhDLtx5ZAxsdy96/+UjYhzNKwvt0DBmhk="; }; - cargoHash = "sha256-76gC+nw/eV4j68O74XsJDaDFYAEdqZB9EzsRj5vdOvs="; + cargoHash = "sha256-W5dPMSkihxWryLEpQhqt9IpiwyAYSsIgQLbwjnXVjEk="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/sc/schemat/package.nix b/pkgs/by-name/sc/schemat/package.nix index 909d11dd52fc..6cb69aa4d36b 100644 --- a/pkgs/by-name/sc/schemat/package.nix +++ b/pkgs/by-name/sc/schemat/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "schemat"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "raviqqe"; repo = "schemat"; tag = "v${finalAttrs.version}"; - hash = "sha256-Ij7JigbXhE2o0Z61uZ3W/pK7zcQyrX+SMpF0iKsVx30="; + hash = "sha256-vA5J76wU2FlKz1fxTgv8jVuV4RIOML+tI5Y/dXyc9f0="; }; - cargoHash = "sha256-oaET2IGU78TUC98HKsiQnbg7R262ugrn8oiLeKC767s="; + cargoHash = "sha256-LGZE3r9n+KtnCiCxc/3K981wq4fN6ZR/KD8b638DmeM="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/so/sobjectizer/package.nix b/pkgs/by-name/so/sobjectizer/package.nix index e46c47baafab..965db134ad98 100644 --- a/pkgs/by-name/so/sobjectizer/package.nix +++ b/pkgs/by-name/so/sobjectizer/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "SOBJECTIZER_BUILD_STATIC" withStatic) (lib.cmakeBool "SOBJECTIZER_BUILD_SHARED" withShared) (lib.cmakeBool "BUILD_EXAMPLES" (buildExamples && withStatic)) - (lib.cmakeBool "BUILD_TESTS" (finalAttrs.doCheck && withShared)) + (lib.cmakeBool "BUILD_TESTS" (finalAttrs.finalPackage.doCheck && withShared)) ]; # The tests require the shared library thanks to the patch. diff --git a/pkgs/by-name/sy/syncthingtray/package.nix b/pkgs/by-name/sy/syncthingtray/package.nix index 888359d44cbf..43b82684ef26 100644 --- a/pkgs/by-name/sy/syncthingtray/package.nix +++ b/pkgs/by-name/sy/syncthingtray/package.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeFeature "QT_PACKAGE_PREFIX" "Qt${lib.versions.major kdePackages.qtbase.version}") (lib.cmakeFeature "KF_PACKAGE_PREFIX" "KF${lib.versions.major kdePackages.qtbase.version}") - (lib.cmakeBool "BUILD_TESTING" (finalAttrs.doCheck or false)) + (lib.cmakeBool "BUILD_TESTING" (finalAttrs.finalPackage.doCheck or false)) # See https://github.com/Martchus/syncthingtray/issues/208 (lib.cmakeBool "EXCLUDE_TESTS_FROM_ALL" false) (lib.cmakeFeature "AUTOSTART_EXEC_PATH" autostartExecPath) diff --git a/pkgs/by-name/tp/tpm2-pkcs11/package.nix b/pkgs/by-name/tp/tpm2-pkcs11/package.nix index 08cb74052dce..f0ccd27b4c54 100644 --- a/pkgs/by-name/tp/tpm2-pkcs11/package.nix +++ b/pkgs/by-name/tp/tpm2-pkcs11/package.nix @@ -84,8 +84,8 @@ chosenStdenv.mkDerivation (finalAttrs: { ''; configureFlags = [ - (lib.enableFeature finalAttrs.doCheck "unit") - (lib.enableFeature finalAttrs.doCheck "integration") + (lib.enableFeature finalAttrs.finalPackage.doCheck "unit") + (lib.enableFeature finalAttrs.finalPackage.doCheck "integration") # Strangely, it uses --with-fapi=yes|no instead of a normal configure flag. "--with-fapi=${lib.boolToYesNo fapiSupport}" diff --git a/pkgs/by-name/tt/tt-umd/package.nix b/pkgs/by-name/tt/tt-umd/package.nix index 1baef8f79876..23b2e44c2cf8 100644 --- a/pkgs/by-name/tt/tt-umd/package.nix +++ b/pkgs/by-name/tt/tt-umd/package.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-g+ZPKBUhBGlgvce8uTkuR983unD2kbQKgoddko7x+fk="; }) )) - (lib.cmakeBool "TT_UMD_BUILD_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "TT_UMD_BUILD_TESTS" finalAttrs.finalPackage.doCheck) (lib.cmakeBool "TT_UMD_BUILD_STATIC" stdenv.hostPlatform.isStatic) (lib.cmakeBool "TT_UMD_BUILD_PYTHON" true) (lib.cmakeFeature "nanobind_DIR" "${python3.pkgs.nanobind}/${python3.sitePackages}/nanobind/cmake") diff --git a/pkgs/by-name/ve/vesta-viewer/package.nix b/pkgs/by-name/ve/vesta-viewer/package.nix index 71a53c730200..b783caa19ccf 100644 --- a/pkgs/by-name/ve/vesta-viewer/package.nix +++ b/pkgs/by-name/ve/vesta-viewer/package.nix @@ -6,9 +6,11 @@ makeDesktopItem, copyDesktopItems, autoPatchelfHook, + wrapGAppsHook3, + makeWrapper, _7zz, - glib, + gsettings-desktop-schemas, libGL, libGLU, libgcc, @@ -31,7 +33,10 @@ let platforms = [ "x86_64-linux" ]; - maintainers = with lib.maintainers; [ ulysseszhan ]; + maintainers = with lib.maintainers; [ + ulysseszhan + layzyoldman + ]; mainProgram = "VESTA"; }; @@ -39,9 +44,12 @@ let nativeBuildInputs = [ copyDesktopItems autoPatchelfHook + wrapGAppsHook3 + makeWrapper ]; buildInputs = [ glib + gsettings-desktop-schemas libGL libGLU libgcc @@ -52,6 +60,9 @@ let libxtst ]; + # Prevent wrapGAppsHook3 from auto-wrapping binaries. + dontWrapGApps = true; + src = fetchzip { url = "https://jp-minerals.org/vesta/archives/${version}/VESTA-gtk3.tar.bz2"; hash = "sha256-Dm4exMUgNZ6Sh8dVhsvLZGS38UXxe9t+9s3ttBQajGg="; @@ -64,7 +75,7 @@ let cp -r * $out/lib/VESTA mkdir -p $out/bin - ln -s $out/lib/VESTA/VESTA{,-core,-gui} -t $out/bin + ln -s $out/lib/VESTA/VESTA{-core,-gui} -t $out/bin mkdir -p $out/share/icons/hicolor/{128x128,256x256}/apps ln -s $out/lib/VESTA/img/logo.png $out/share/icons/hicolor/128x128/apps/VESTA.png @@ -73,6 +84,11 @@ let runHook postInstall ''; + # Wrap GSettings/XDG_DATA_DIRS into a single wrapper. + postFixup = '' + makeWrapper $out/lib/VESTA/VESTA $out/bin/VESTA "''${gappsWrapperArgs[@]}" + ''; + desktopItems = [ (makeDesktopItem { name = "vesta"; @@ -82,14 +98,18 @@ let exec = "VESTA %u"; icon = "VESTA"; categories = [ "Science" ]; - mimeTypes = [ "application/x-vesta" ]; + mimeTypes = [ + "chemical/x-cif" + "chemical/x-pdb" + "chemical/x-xyz" + ]; }) ]; }; darwinArgs = { nativeBuildInputs = [ - _7zz # instead of undmg because of APFS + _7zz ]; src = fetchurl { url = "https://jp-minerals.org/vesta/archives/${version}/VESTA.dmg"; diff --git a/pkgs/by-name/vi/vivliostyle/0001-allow-specifying-browser-path-via-env-var.patch b/pkgs/by-name/vi/vivliostyle/0001-allow-specifying-browser-path-via-env-var.patch new file mode 100644 index 000000000000..7bde073218b0 --- /dev/null +++ b/pkgs/by-name/vi/vivliostyle/0001-allow-specifying-browser-path-via-env-var.patch @@ -0,0 +1,20 @@ +--- + src/browser.ts | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/browser.ts b/src/browser.ts +index 8e653e2..ae57d2f 100644 +--- a/src/browser.ts ++++ b/src/browser.ts +@@ -355,6 +355,8 @@ export async function getExecutableBrowserPath({ + type, + tag, + }: ResolvedTaskConfig['browser']): Promise { ++ const envPath = process.env.VIVLIOSTYLE_BROWSER_PATH; ++ if (envPath && fs.existsSync(envPath)) return envPath; + const browsers = await importNodeModule('@puppeteer/browsers'); + const buildId = await resolveBuildId({ type, tag, browsers }); + return browsers.computeExecutablePath({ +-- +2.54.0 + diff --git a/pkgs/by-name/vi/vivliostyle/package.nix b/pkgs/by-name/vi/vivliostyle/package.nix new file mode 100644 index 000000000000..ce6cc9feee04 --- /dev/null +++ b/pkgs/by-name/vi/vivliostyle/package.nix @@ -0,0 +1,99 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchPnpmDeps, + nix-update-script, + + # build-time + makeBinaryWrapper, + nodejs, + pnpmBuildHook, + pnpmConfigHook, + pnpm_10, + + chromium, + defaultBrowser ? chromium, +}: + +let + pnpm = pnpm_10; +in + +stdenv.mkDerivation (finalAttrs: { + pname = "vivliostyle"; + version = "11.1.0"; + + src = fetchFromGitHub { + owner = "vivliostyle"; + repo = "vivliostyle-cli"; + tag = "v${finalAttrs.version}"; + hash = "sha256-rbb/av3amlLit7OjTc+S/pf1SrxEnsENQOArgnc7k3s="; + }; + + patches = [ + ./0001-allow-specifying-browser-path-via-env-var.patch + ]; + + __structuredAttrs = true; + strictDeps = true; + + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) pname version src; + inherit pnpm; + fetcherVersion = 4; + hash = "sha256-WPTCLAEWmD1TY84281TJCzp+mcjMFM5Xwf02s7U+M4U="; + }; + + nativeBuildInputs = [ + makeBinaryWrapper + nodejs + pnpm + pnpmBuildHook + pnpmConfigHook + ]; + + pnpmBuildFlags = [ + "--mode" + "production" + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,lib} + mv {node_modules,dist,examples,packages,package.json} $out/lib + + runHook postInstall + ''; + + postFixup = '' + chmod +x $out/lib/dist/cli.js + patchShebangs $out/usr/lib/dist/cli.js + + makeWrapper $out/lib/dist/cli.js $out/bin/vivliostyle \ + --prefix PATH : ${lib.makeBinPath [ nodejs ]} \ + --set VIVLIOSTYLE_BROWSER_PATH ${lib.getExe defaultBrowser} + + ln -s $out/bin/vivliostyle $out/bin/vs + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "CLI tool for typesetting HTML and Markdown documents"; + longDescription = '' + Vivliostyle is a CSS typesetting ecosystem for creating beautifully + formatted documents using web technologies. + ''; + homepage = "https://github.com/vivliostyle/vivliostyle-cli"; + changelog = "https://github.com/vivliostyle/vivliostyle-cli/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + mainProgram = "vivliostyle"; + license = lib.licenses.agpl3Only; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ eljamm ]; + teams = with lib.teams; [ ngi ]; + }; +}) diff --git a/pkgs/by-name/wi/wireguard-go/package.nix b/pkgs/by-name/wi/wireguard-go/package.nix index 438aacec0e10..be4c6d6746bd 100644 --- a/pkgs/by-name/wi/wireguard-go/package.nix +++ b/pkgs/by-name/wi/wireguard-go/package.nix @@ -39,7 +39,7 @@ buildGoModule (finalAttrs: { ''; # Tests require networking. - __darwinAllowLocalNetworking = finalAttrs.doCheck; + __darwinAllowLocalNetworking = finalAttrs.finalPackage.doCheck; postInstall = '' mv $out/bin/wireguard $out/bin/wireguard-go diff --git a/pkgs/by-name/xd/xdg-desktop-portal/nix-pkgdatadir-env.patch b/pkgs/by-name/xd/xdg-desktop-portal/nix-pkgdatadir-env.patch deleted file mode 100644 index 369dd2a860f1..000000000000 --- a/pkgs/by-name/xd/xdg-desktop-portal/nix-pkgdatadir-env.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/xdp-portal-impl.c -+++ b/src/xdp-portal-impl.c -@@ -277,6 +277,8 @@ load_installed_portals (gboolean opt_verbose) - - /* We need to override this in the tests */ - portal_dir = g_getenv ("XDG_DESKTOP_PORTAL_DIR"); -+ if (portal_dir == NULL) -+ portal_dir = g_getenv ("NIX_XDG_DESKTOP_PORTAL_DIR"); - if (portal_dir != NULL) - { - diff --git a/pkgs/by-name/xd/xdg-desktop-portal/package.nix b/pkgs/by-name/xd/xdg-desktop-portal/package.nix index fc618622942a..32c369a0e4a6 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal/package.nix @@ -76,11 +76,6 @@ stdenv.mkDerivation (finalAttrs: { # Allow installing installed tests to a separate output. ./installed-tests-path.patch - # Look for portal definitions under path from `NIX_XDG_DESKTOP_PORTAL_DIR` environment variable. - # While upstream has `XDG_DESKTOP_PORTAL_DIR`, it is meant for tests and actually blocks - # any configs from being loaded from anywhere else. - ./nix-pkgdatadir-env.patch - # test tries to read /proc/cmdline, which is not intended to be accessible in the sandbox ./trash-test.patch ]; diff --git a/pkgs/by-name/z3/z3/package.nix b/pkgs/by-name/z3/z3/package.nix index 30a177ebc7a4..1a943e5d0a04 100644 --- a/pkgs/by-name/z3/z3/package.nix +++ b/pkgs/by-name/z3/z3/package.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "Z3_SINGLE_THREADED" (!finalAttrs.enableParallelBuilding)) (lib.cmakeBool "Z3_BUILD_LIBZ3_SHARED" (!stdenv.hostPlatform.isStatic)) (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" (placeholder "out")) - (lib.cmakeBool "Z3_BUILD_TEST_EXECUTABLES" finalAttrs.doCheck) + (lib.cmakeBool "Z3_BUILD_TEST_EXECUTABLES" finalAttrs.finalPackage.doCheck) (lib.cmakeBool "Z3_ENABLE_EXAMPLE_TARGETS" false) ] ++ lib.optionals pythonBindings [ diff --git a/pkgs/by-name/ze/zellij/plugins/rust/cb.nix b/pkgs/by-name/ze/zellij/plugins/rust/cb.nix new file mode 100644 index 000000000000..b0a05441d3f4 --- /dev/null +++ b/pkgs/by-name/ze/zellij/plugins/rust/cb.nix @@ -0,0 +1,26 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "zellij-cb"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "ndavd"; + repo = "zellij-cb"; + tag = "v${finalAttrs.version}"; + hash = "sha256-wXUwtjMsSbReU6YFZkk3CUYKetvicEQChBOa8cDBzN4="; + }; + + cargoHash = "sha256-IUYl5lclnlfO9ftFF0KDqAle9afHzhBcl6GWOIUHRWA="; + + meta = { + description = "Customizable compact bar plugin for Zellij"; + homepage = "https://github.com/ndavd/zellij-cb"; + changelog = "https://github.com/ndavd/zellij-cb/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ndavd ]; + }; +}) diff --git a/pkgs/by-name/ze/zensical/package.nix b/pkgs/by-name/ze/zensical/package.nix index 3a8d0de45d54..2392cd490f0f 100644 --- a/pkgs/by-name/ze/zensical/package.nix +++ b/pkgs/by-name/ze/zensical/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "zensical"; - version = "0.0.50"; + version = "0.0.51"; pyproject = true; # We fetch from PyPi, because GitHub repo does not contain all sources. @@ -16,12 +16,12 @@ python3Packages.buildPythonApplication (finalAttrs: { # We could combine sources, but then nix-update won't work. src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-cEDlLr5eaideTt6zUb8rwxTQB/P7V1DxeKONhAcj5pw="; + hash = "sha256-3iXeBnvt+hj5FtfzZv1kp/vwm/zGFbRNHdvjtf4Cq0k="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-4f2nd+amOD6A8XX1470Z7PFXXpd+xFQdx7iepCKzTq0="; + hash = "sha256-QalP0MW52BOyoh4AlUbUM3OvVXyBFaywM7ST46hqQv0="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 439a3d5fe62e..3289dd72f3ab 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ texinfo ] - ++ lib.optionals finalAttrs.doCheck ( + ++ lib.optionals finalAttrs.finalPackage.doCheck ( [ which writableTmpDirAsHomeHook diff --git a/pkgs/development/coq-modules/coqeal/default.nix b/pkgs/development/coq-modules/coqeal/default.nix index 5e6eced48824..23f721b6bb00 100644 --- a/pkgs/development/coq-modules/coqeal/default.nix +++ b/pkgs/development/coq-modules/coqeal/default.nix @@ -30,8 +30,9 @@ let lib.switch [ coq.coq-version mathcomp.version ] [ - (case (range "8.20" "9.1") (isGe "2.3.0") "2.1.1") - (case (range "8.20" "9.1") (isGe "2.3.0") "2.1.0") + (case (range "9.0" "9.2") (isGe "2.5.0") "2.1.2") + (case (range "8.20" "9.1") (range "2.3.0" "2.5.0") "2.1.1") + (case (range "8.20" "9.1") (range "2.3.0" "2.5.0") "2.1.0") (case (range "8.16" "8.20") (isGe "2.1.0") "2.0.3") (case (range "8.16" "8.20") (isGe "2.0.0") "2.0.1") (case (range "8.16" "8.17") (isGe "2.0.0") "2.0.0") @@ -44,6 +45,7 @@ let ] null; + release."2.1.2".hash = "sha256-ktoejlxAtbPzWGdW+DXwLSAmxNHDzQTujkY1If4EM8E="; release."2.1.1".hash = "sha256-nAQAX35W9br7dgrT9FqGyHYSzwgMiMsuD1d7SztQDwY="; release."2.1.0".hash = "sha256-UoDxy2BKraDyRsO42GXRo26O74OF51biZQGkIMWLf8Y="; release."2.0.3".hash = "sha256-5lDq7IWlEW0EkNzYPu+dA6KOvRgy53W/alikpDr/Kd0="; @@ -58,7 +60,6 @@ let release."1.0.3".hash = "sha256:0hc63ny7phzbihy8l7wxjvn3haxx8jfnhi91iw8hkq8n29i23v24"; propagatedBuildInputs = [ - mathcomp.ssreflect mathcomp.algebra bignums multinomials @@ -74,10 +75,15 @@ let o.propagatedBuildInputs ++ lib.optional (lib.versions.isGe "1.1" o.version || o.version == "dev") mathcomp-real-closed; }); - patched-derivation = patched-derivation1.overrideAttrs (o: { + patched-derivation2 = patched-derivation1.overrideAttrs (o: { propagatedBuildInputs = o.propagatedBuildInputs ++ lib.optional (lib.versions.isLe "2.0.3" o.version && o.version != "dev") paramcoq; }); + patched-derivation3 = patched-derivation2.overrideAttrs (o: { + propagatedBuildInputs = + o.propagatedBuildInputs + ++ lib.optional (lib.versions.isLe "2.1.1" o.version && o.version != "dev") mathcomp.ssreflect; + }); in -patched-derivation +patched-derivation3 diff --git a/pkgs/development/coq-modules/multinomials/default.nix b/pkgs/development/coq-modules/multinomials/default.nix index 5990fde8eb17..4a2b180e370c 100644 --- a/pkgs/development/coq-modules/multinomials/default.nix +++ b/pkgs/development/coq-modules/multinomials/default.nix @@ -33,6 +33,7 @@ mkCoqDerivation { lib.switch [ coq.coq-version mathcomp.version ] [ + (case (range "9.0" "9.2") (range "2.6.0" "2.6.0") "2.5.0") # also works on MC 2.4 and 2.5 but breaks validsdp (case (range "8.18" "9.1") (range "2.1.0" "2.5.0") "2.4.0") (case (range "8.17" "9.0") (range "2.1.0" "2.3.0") "2.3.0") (case (range "8.17" "8.20") (isGe "2.1.0") "2.2.0") @@ -49,6 +50,7 @@ mkCoqDerivation { ] null; release = { + "2.5.0".hash = "sha256-e1C1NfulQV1Ep2XxNjjcxIoY5FGzndiCuwIy3upwO78="; "2.4.0".hash = "sha256-7zfIddRH+Sl4nhEPtS/lMZwRUZI45AVFpcC/UC8Z0Yo="; "2.3.0".hash = "sha256-usIcxHOAuN+f/j3WjVbPrjz8Hl9ac8R6kYeAKi3CEts="; "2.2.0".hash = "sha256-Cie6paweITwPZy6ej9+qIvHFWknVR382uJPW927t/fo="; diff --git a/pkgs/development/cuda-modules/packages/cutlass.nix b/pkgs/development/cuda-modules/packages/cutlass.nix index 1866bba22a03..cc3185bfe846 100644 --- a/pkgs/development/cuda-modules/packages/cutlass.nix +++ b/pkgs/development/cuda-modules/packages/cutlass.nix @@ -152,8 +152,8 @@ backendStdenv.mkDerivation (finalAttrs: { (cmakeBool "CUTLASS_ENABLE_EXAMPLES" false) # Tests. - (cmakeBool "CUTLASS_ENABLE_TESTS" finalAttrs.doCheck) - (cmakeBool "CUTLASS_ENABLE_GTEST_UNIT_TESTS" finalAttrs.doCheck) + (cmakeBool "CUTLASS_ENABLE_TESTS" finalAttrs.finalPackage.doCheck) + (cmakeBool "CUTLASS_ENABLE_GTEST_UNIT_TESTS" finalAttrs.finalPackage.doCheck) (cmakeBool "CUTLASS_USE_SYSTEM_GOOGLETEST" true) # NOTE: Both CUDNN and CUBLAS can be used by the examples and the profiler. Since they are large dependencies, they @@ -189,12 +189,12 @@ backendStdenv.mkDerivation (finalAttrs: { # NOTE: Because the test cases immediately create and try to run the binaries, we don't have an opportunity # to patch them with autoAddDriverRunpath. To get around this, we add the driver runpath to the environment. # TODO: This would break Jetson when using cuda_compat, as it must come first. - preCheck = optionalString finalAttrs.doCheck '' + preCheck = optionalString finalAttrs.finalPackage.doCheck '' export LD_LIBRARY_PATH="$(readlink -mnv "${addDriverRunpath.driverLink}/lib")" ''; # This is *not* a derivation you want to build on a small machine. - requiredSystemFeatures = optionals finalAttrs.doCheck [ + requiredSystemFeatures = optionals finalAttrs.finalPackage.doCheck [ "big-parallel" "cuda" ]; diff --git a/pkgs/development/libraries/wlroots/protocols.nix b/pkgs/development/libraries/wlroots/protocols.nix index b3ec30a0618f..a99566333c3a 100644 --- a/pkgs/development/libraries/wlroots/protocols.nix +++ b/pkgs/development/libraries/wlroots/protocols.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { pname = "wlr-protocols"; - version = "unstable-2022-09-05"; + version = "0-unstable-2022-09-05"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; @@ -22,8 +22,8 @@ stdenv.mkDerivation { patchPhase = '' substituteInPlace wlr-protocols.pc.in \ - --replace '=''${pc_sysrootdir}' "=" \ - --replace '=@prefix@' "=$out" + --replace-fail '=''${pc_sysrootdir}' "=" \ + --replace-fail '=@prefix@' "=$out" ''; doCheck = true; diff --git a/pkgs/development/ocaml-modules/graphql/cohttp.nix b/pkgs/development/ocaml-modules/graphql/cohttp.nix index cd326bdde201..a5aea393f5da 100644 --- a/pkgs/development/ocaml-modules/graphql/cohttp.nix +++ b/pkgs/development/ocaml-modules/graphql/cohttp.nix @@ -28,7 +28,7 @@ buildDunePackage (finalAttrs: { ocplib-endian ]; - checkInputs = lib.optionals finalAttrs.doCheck [ + checkInputs = lib.optionals finalAttrs.finalPackage.doCheck [ alcotest cohttp-lwt-unix graphql-lwt diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix deleted file mode 100644 index 977bf64866e2..000000000000 --- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - buildDunePackage, - fetchFromGitHub, - camlidl, - fuse, - dune-configurator, -}: - -buildDunePackage (finalAttrs: { - pname = "ocamlfuse"; - version = "2.7.1_cvs13"; - - src = fetchFromGitHub { - owner = "astrada"; - repo = "ocamlfuse"; - rev = "v${finalAttrs.version}"; - hash = "sha256-h1ExohTlr1gP2DwHKQW3PTwz6d3pust5gdeyTHJ2KBk="; - }; - - postPatch = '' - substituteInPlace lib/Fuse_main.c \ - --replace-warn "" "" - ''; - - nativeBuildInputs = [ camlidl ]; - buildInputs = [ dune-configurator ]; - propagatedBuildInputs = [ - camlidl - fuse - ]; - - meta = { - homepage = "https://sourceforge.net/projects/ocamlfuse"; - description = "OCaml bindings for FUSE"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ bennofs ]; - }; -}) diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix index 66e1a3fc5726..43f29e738079 100644 --- a/pkgs/development/ocaml-modules/uucp/default.nix +++ b/pkgs/development/ocaml-modules/uucp/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild - ${topkg.buildPhase} --with-cmdliner false --tests ${lib.boolToString finalAttrs.doCheck} + ${topkg.buildPhase} --with-cmdliner false --tests ${lib.boolToString finalAttrs.finalPackage.doCheck} runHook postBuild ''; diff --git a/pkgs/development/python-modules/haystack-ai/default.nix b/pkgs/development/python-modules/haystack-ai/default.nix index fd9700dd0579..1b4509671c42 100644 --- a/pkgs/development/python-modules/haystack-ai/default.nix +++ b/pkgs/development/python-modules/haystack-ai/default.nix @@ -71,7 +71,7 @@ pytesseract, faiss-cpu, # , faiss-gpu - pinecone-client, + pinecone, onnxruntime, onnxruntime-tools, # , onnxruntime-gpu @@ -209,7 +209,7 @@ buildPythonPackage rec { # only-faiss-gpu = [ # faiss-gpu # ]; - only-pinecone = [ pinecone-client ]; + only-pinecone = [ pinecone ]; onnx = [ onnxruntime onnxruntime-tools diff --git a/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix b/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix index 035de58d6efb..b31ee7c5e869 100644 --- a/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix +++ b/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix @@ -3,6 +3,7 @@ gitMinimal, buildPythonPackage, fetchFromGitHub, + pyprojectVersionPatchHook, flit-core, mkdocs, mkdocs-exclude, @@ -25,6 +26,10 @@ buildPythonPackage rec { hash = "sha256-guv+c4QwaATYEZ6XcWVZaOcZ7U9oLsW+RdWBtB1Xrnc="; }; + nativeBuildInputs = [ + pyprojectVersionPatchHook + ]; + build-system = [ flit-core ]; dependencies = [ diff --git a/pkgs/development/python-modules/osmnx/default.nix b/pkgs/development/python-modules/osmnx/default.nix index b5660833f762..3c172224d708 100644 --- a/pkgs/development/python-modules/osmnx/default.nix +++ b/pkgs/development/python-modules/osmnx/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "osmnx"; - version = "2.1.0"; + version = "2.1.1"; pyproject = true; src = fetchFromGitHub { owner = "gboeing"; repo = "osmnx"; tag = "v${version}"; - hash = "sha256-3uLgc6zptmXlPg93qtsWbqNxXiBD/SEnXBL/IM/1m2c="; + hash = "sha256-PX4Vhf3R9UGKMYp636+tJ5NV/oURd3Zzxfvj7LLCaPM="; }; build-system = [ uv-build ]; diff --git a/pkgs/development/python-modules/pinecone-client/default.nix b/pkgs/development/python-modules/pinecone/default.nix similarity index 97% rename from pkgs/development/python-modules/pinecone-client/default.nix rename to pkgs/development/python-modules/pinecone/default.nix index cd4f3df84388..871903f66127 100644 --- a/pkgs/development/python-modules/pinecone-client/default.nix +++ b/pkgs/development/python-modules/pinecone/default.nix @@ -13,7 +13,7 @@ }: buildPythonPackage rec { - pname = "pinecone-client"; + pname = "pinecone"; version = "8.1.2"; pyproject = true; diff --git a/pkgs/development/python-modules/remi/default.nix b/pkgs/development/python-modules/remi/default.nix index e477f4e9eb7b..329fbea46ffd 100644 --- a/pkgs/development/python-modules/remi/default.nix +++ b/pkgs/development/python-modules/remi/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, setuptools, pytestCheckHook, matplotlib, @@ -22,6 +23,14 @@ buildPythonPackage rec { hash = "sha256-VQn+Uzp6oGSit8ot0e8B0C2N41Q8+J+o91skyVN1gDA="; }; + patches = [ + (fetchpatch { + name = "remote-pkg_resources-dependency.patch"; + url = "https://github.com/rawpython/remi/commit/54b253ccd9d7e9626d8236ec4a8a32631ff2fca2.patch"; + hash = "sha256-VyTc5jFmNRWnAQqEupBB87Xw86+e7VgMoQeUrBcY+mg="; + }) + ]; + preCheck = '' # for some reason, REMI already deal with these using try blocks, but they fail substituteInPlace test/test_widget.py \ @@ -45,7 +54,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; dependencies = [ - setuptools # pkg_resources is referenced at runtime legacy-cgi ]; diff --git a/pkgs/development/python-modules/wirerope/default.nix b/pkgs/development/python-modules/wirerope/default.nix index 95b991b40cd3..daa9872baf62 100644 --- a/pkgs/development/python-modules/wirerope/default.nix +++ b/pkgs/development/python-modules/wirerope/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - setuptools, + setuptools_80, six, nix-update-script, pytestCheckHook, @@ -21,7 +21,7 @@ buildPythonPackage rec { hash = "sha256-oojnv+2+nwL/TJhN+QZ5eiV6WGHC3SCxBQrCri0aHQc="; }; - build-system = [ setuptools ]; + build-system = [ setuptools_80 ]; dependencies = [ six ]; diff --git a/pkgs/development/rocm-modules/rocprof-trace-decoder/default.nix b/pkgs/development/rocm-modules/rocprof-trace-decoder/default.nix index bac33aa72990..3ab1bb644688 100644 --- a/pkgs/development/rocm-modules/rocprof-trace-decoder/default.nix +++ b/pkgs/development/rocm-modules/rocprof-trace-decoder/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - (lib.cmakeBool "BUILD_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck) ]; nativeCheckInputs = [ diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 498a1255761d..898782104398 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { "-DNO_SETCAP_OR_SUID=true" "-Dsystemdunitdir=etc/systemd/system" "-DINSTALL_SYSTEMD_UNITS=true" - "-DSKIP_TESTS=${lib.boolToString (!finalAttrs.doCheck)}" + "-DSKIP_TESTS=${lib.boolToString (!finalAttrs.finalPackage.doCheck)}" ] # Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111): ++ lib.optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false"; diff --git a/pkgs/tools/system/nvtop/build-nvtop.nix b/pkgs/tools/system/nvtop/build-nvtop.nix index 7662dc24e943..0063e1e4a086 100644 --- a/pkgs/tools/system/nvtop/build-nvtop.nix +++ b/pkgs/tools/system/nvtop/build-nvtop.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ] - ++ lib.optionals finalAttrs.doCheck [ + ++ lib.optionals finalAttrs.finalPackage.doCheck [ gtest ] ++ lib.optional nvidia addDriverRunpath; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 7e85b77a462a..ba3abf469dce 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1574,8 +1574,6 @@ let callPackage ../development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix { }; - ocamlfuse = callPackage ../development/ocaml-modules/ocamlfuse { }; - ocamlgraph = callPackage ../development/ocaml-modules/ocamlgraph { }; ocamlgraph_gtk = callPackage ../development/ocaml-modules/ocamlgraph/gtk.nix { }; @@ -2394,6 +2392,7 @@ let ocaml-vdom = throw "2023-10-09: ocamlPackages.ocaml-vdom was renamed to ocamlPackages.vdom"; ocaml_lwt = throw "ocamlPackages.ocaml_lwt has been renamed to ocamlPackages.lwt"; # Added 2025-12-05 ocaml_mysql = throw "ocamlPackages.ocaml_mysql is not maintained, use ocamlPackages.mariadb instead"; + ocamlfuse = throw "ocamlPackages.ocamlfuse has been removed as it depends on fuse2"; torch = throw "ocamlPackages.torch has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05 } )).overrideScope diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 0f137fc7e207..26fba2adfa2c 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -437,6 +437,7 @@ mapAliases { percol = throw "percol has been removed because it hasn't been updated since 2019"; # added 2025-05-25 pilight = throw "'pilight' has been removed, because it is unmaintained since 2019 and the integration was removed from Home Assistant."; # added 2026-05-06 pillow-avif-plugin = throw "'pillow-avif-plugin' has been removed because 'pillow' has native avif support since 11.3"; # added 2025-11-26 + pinecone-client = warnAlias "'pinecone-client' has been renamed to 'pinecone'" pinecone; # added 2026-07-22 pizzapi = throw "pizzapi was removed because it no longer works"; # added 2025-12-03 pkuseg = throw "'pkuseg' has been removed because it was not supported on newer versions of Python"; # added 2026-01-20 ploomber-extension = throw "'ploomber-extension' has been removed since the upstream repo was archived"; # added 2026-02-16 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 59611c41a313..ae521dc418d2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13189,7 +13189,7 @@ self: super: with self; { pinboard = callPackage ../development/python-modules/pinboard { }; - pinecone-client = callPackage ../development/python-modules/pinecone-client { }; + pinecone = callPackage ../development/python-modules/pinecone { }; pinecone-plugin-assistant = callPackage ../development/python-modules/pinecone-plugin-assistant { };