503 Commits

Author SHA1 Message Date
K900 6cdd2420a3 qt6.qtdeclarative: avoid caching qml from store path symlinks (#543135) 2026-07-18 07:39:12 +00:00
outfoxxed b80cc82f37 qt6.qtdeclarative: avoid caching qml from store path symlinks 2026-07-17 23:20:05 -07:00
K900 45ae10c84d Merge remote-tracking branch 'origin/master' into staging-next 2026-07-15 10:52:37 +03:00
Emily fdb820602b treewide: drop simple x86_64-darwin mentions
To reproduce:

    $ nix run nixpkgs/3b32825de172d0bc85664f495edb096b10862524#ast-grep \
        -- scan --update-all --inline-rules '
          id: nix-x86_64-darwin
          language: nix
          rule:
            any:
              - pattern: "\"x86_64-darwin\""
                kind: list_expression > string_expression
              - pattern:
                  context: "{ \"x86_64-darwin\" = $EXPR; }"
                  selector: binding
              - pattern:
                  context: "{ x86_64-darwin = $EXPR; }"
                  selector: binding
          fix:
            template: ""
        ' pkgs
    $ nix run nixpkgs/3b32825de172d0bc85664f495edb096b10862524#ast-grep \
        -- scan --update-all --inline-rules '
          id: json-first-x86_64-darwin
          language: json
          rule:
            kind: object > pair:nth-child(1)
            has:
              pattern: "\"x86_64-darwin\""
              field: key
          fix:
            template: ""
            expandEnd: { regex: "," }
        ' pkgs
    $ nix run nixpkgs/3b32825de172d0bc85664f495edb096b10862524#ast-grep \
        -- scan --update-all --inline-rules '
          id: json-x86_64-darwin
          language: json
          rule:
            kind: object > pair
            has:
              pattern: "\"x86_64-darwin\""
              field: key
          fix:
            template: ""
            expandStart: { regex: "," }
        ' pkgs
    $ git restore pkgs/by-name/om/omnix/package.nix
    $ git diff --name-only -z \
        | nix shell nixpkgs/3b32825de172d0bc85664f495edb096b10862524#gnused \
            -c xargs -0 sed -i '/^$/N; /^\n\? \+$/d'
    $ treefmt
2026-07-15 03:58:16 +01:00
Emily 3bb4c65bd2 Revert "qtspeech: fix build on Darwin"
The ld64 issue has been fixed.

This reverts commit 23c83f33ec.
2026-07-15 03:26:25 +01:00
Emily 1d1caa92dd Revert "qt6.qtbase: work around ld64 hardening issue"
The ld64 issue has been fixed.

This reverts commit fc952632d9.
2026-07-15 03:26:25 +01:00
Mukul Agarwal 23c83f33ec qtspeech: fix build on Darwin 2026-07-13 20:16:46 -04:00
Martin Weinelt e8042ddc43 qt6.qtdeclarative: work around ld64 hardening issue 2026-07-08 05:03:15 +02:00
Martin Weinelt ca8fd57b70 qt6.qtmultimedia: work around ld64 hardening issue 2026-07-08 05:03:15 +02:00
Emily fc952632d9 qt6.qtbase: work around ld64 hardening issue 2026-07-03 16:53:14 +01:00
K900 b812bc2a4a treewide: drop gst-vaapi
Upstream dropped it and it no longer builds.
2026-06-28 17:18:22 +03:00
Weijia Wang 75e94d8a89 qt6.qtbase: fix darwin permissions for statically linked plugins (#530890) 2026-06-17 21:53:18 +00:00
Nathan Henrie 6e58884bf2 qt6.qtbase: fix darwin permissions for statically linked plugins
Assisted-by: Claude (Fable)

Fixes https://github.com/NixOS/nixpkgs/issues/530884
2026-06-11 18:10:53 -06:00
K900 336a60dc3a wrapQtAppsHook: support structuredAttrs (#526277) 2026-06-04 12:12:53 +00:00
Matt Sturgeon cd5e77db80 wrapQtAppsHook: support structuredAttrs
With `__structuredAttrs = true`, `qtWrapperArgs` is provided as an
array; without it, it is provided as a string.

Use stdenv's `concatTo` helper to normalize `qtWrapperArgs` to a bash
array, regardless of its representation.

Adjust the hook's tests to cover both __structuredAttrs true and false.
2026-06-04 01:43:31 +01:00
Matt Sturgeon 75a1c47a4e tests.{qt5,qt6}.wrapQtAppsHook: add coverage
Test that wrapQtAppsHook:
- normalizes qtWrapperArgs to a bash array
- preserves user-supplied wrapper arguments
- appends the expected Qt wrapper arguments
- produces wrappers with the expected runtime behaviour
2026-06-04 01:43:31 +01:00
Doron Behar a1965737fa qt6.qtdeclarative: patch another upstream bug 2026-06-02 18:55:11 +03:00
nixpkgs-ci[bot] 13e9f64a65 Merge staging-next into staging 2026-05-25 18:35:07 +00:00
Sigmanificient 0bbc8dffae treewide: set meta.license on hooks 2026-05-25 13:48:20 +02:00
K900 1b3320b2d9 qt6: 6.11.0 -> 6.11.1 2026-05-23 14:56:13 +03:00
K900 84c72525e9 qt6.qtbase: backport fix for another freetype related crash 2026-05-05 19:46:53 +03:00
K900 1ca5ef251d qt6.qtbase: backport crash fix for when freetype rendering fails
Recommended by KDE upstream.
2026-05-04 19:39:49 +03:00
Weijia Wang 6ad6f499dd qt6.qtwebengine: drop obsolete patch 2026-04-14 15:34:35 +02:00
K900 3690ecca3f qt6, pyside6: 6.10 -> 6.11 (#502680) 2026-03-26 19:19:22 +00:00
K900 1840314347 qt6: 6.10.2 -> 6.11
If anyone wants to package the new modules, be my guest.
2026-03-26 22:10:33 +03:00
Stefan Frijters 629fecb3b9 qt6Packages.qtmultimedia: move NIX_LDFLAGS into env for structuredAttrs 2026-03-23 12:39:10 +01:00
quantenzitrone d3354d8306 unixodbcDrivers: rename package set from unixODBCDrivers
fit package set name to new package name (see previous commit)
2026-02-27 10:52:16 +01:00
quantenzitrone 2226596501 unixodbc: refactor and rename from unixODBC
rename to lowercase to fit package naming conventions
2026-02-27 10:52:14 +01:00
Stefan Frijters 896e11b507 qt6.qtbase: fix incorrect substitution in setupHook 2026-02-25 11:56:09 +01:00
K900 daeb684bfa Merge remote-tracking branch 'origin/master' into staging-next 2026-02-12 15:22:32 +03:00
K900 3c4102eef4 Merge remote-tracking branch 'origin/staging-next' into staging 2026-02-06 15:58:23 +03:00
Martin Weinelt 743484c326 Merge remote-tracking branch 'origin/staging-next' into staging 2026-02-06 01:21:57 +01:00
quantenzitrone 837ce569f8 various: rename references from libXtst to libxtst
this shouldn't create any rebuilds
2026-02-06 00:29:24 +01:00
quantenzitrone cbb29acbad various: rename references from libXScrnSaver to libxscrnsaver
this shouldn't create any rebuilds
2026-02-06 00:29:23 +01:00
quantenzitrone f690155396 various: rename references from libXrender to libxrender
this shouldn't create any rebuilds
2026-02-06 00:29:19 +01:00
quantenzitrone 43cdce2c39 various: rename references from libXrandr to libxrandr
this shouldn't create any rebuilds
2026-02-06 00:29:06 +01:00
quantenzitrone 77837f424c various: rename references from libXi to libxi
this shouldn't create any rebuilds
2026-02-06 00:25:56 +01:00
quantenzitrone f67b5966bb various: rename references from libXext to libxext
this shouldn't create any rebuilds
2026-02-06 00:25:36 +01:00
quantenzitrone 8382a53a4c various: rename references from libXcursor to libxcursor
this shouldn't create any rebuilds
2026-02-06 00:24:45 +01:00
quantenzitrone a8971fc387 various: rename references from libXcomposite to libxcomposite
this shouldn't create any rebuilds
2026-02-06 00:24:45 +01:00
quantenzitrone 55280fa564 various: rename references from libX11 to libx11
this shouldn't create any rebuilds
2026-02-06 00:24:34 +01:00
quantenzitrone a024c30a8a xcbutil: rename references and deprecate alias
this shouldn't create any rebuilds
2026-02-04 22:58:58 +01:00
quantenzitrone 1fff2e7504 xcbutilimage: rename references and deprecate alias
this shouldn't create any rebuilds
2026-02-04 22:58:56 +01:00
quantenzitrone 584757f348 xcbutilkeysyms: rename references and deprecate alias
this shouldn't create any rebuilds
2026-02-04 22:58:56 +01:00
quantenzitrone f7a087d8f2 xcbutilrenderutil: rename references and deprecate alias
this shouldn't create any rebuilds
2026-02-04 22:58:51 +01:00
quantenzitrone 866aa37ba3 xcbutilwm: rename references and deprecate alias
this shouldn't create any rebuilds
2026-02-04 22:58:46 +01:00
K900 71adc1a57a qt6: 6.10.1 -> 6.10.2 2026-02-03 11:47:05 +03:00
Philip Taron 38945fdda9 qt6.qtbase: prepare for structuredAttrs (#472656) 2026-01-31 15:52:40 +00:00
K900 3ac81a5564 Merge remote-tracking branch 'origin/staging-next' into staging 2026-01-26 21:15:56 +03:00
quantenzitrone 7d8132a92c treewide: remove references to the xorg namespace in pkgs (automated)
this creates some eval errors that will be fixed in the next commit

done with the following script:

```fish
\#!/usr/bin/env fish

set packagesjson (nix eval --impure --json --expr '
let
  lib = import ./lib;
in
import pkgs/servers/x11/xorg/default.nix (lib.mapAttrs (
  name: _:
  if name == "lib" then
    lib
  else if name == "config" then
    { allowAliases = false; }
  else
    name
) (__functionArgs (import pkgs/servers/x11/xorg/default.nix))) { }
' | jq)

set one (grep '^    [A-Za-z0-9_-]*$' pkgs/servers/x11/xorg/default.nix | string trim | string replace -r '$' Z | sort | string sub -e -1)
set two (grep '^  [A-Za-z0-9_-]* = [A-Za-z0-9_-]*;$' pkgs/servers/x11/xorg/default.nix | cut -d= -f1 | string trim | string replace -r '$' Z | sort | string sub -e -1)

for arg in $one $two
    set oname $arg
    set nname (echo $packagesjson | jq -r .$oname)

    if test $nname = null
        echo (set_color red)warn:(set_color normal) unknown package xorg.$oname >&2
        continue
    end

    echo $oname "->" $nname

    # replace basic xorg.$name references
    for file in (rg -F "xorg.$oname" --files-with-matches pkgs)
        # special cases
        sd -F "$oname = xorg.$oname;" "$nname = $nname;" $file

        # replace
        sd -F "xorg.$oname" "$nname" $file

        # fixup function arguments

        # prevent duplicate function args
        if grep -E " ($oname|$nname),\$" $file >/dev/null
            continue
        end

        if grep 'xorg\..' $file >/dev/null # case1: there is more so we can't just remove the function arg

            if grep ' xorg,$' $file >/dev/null
                sd ' xorg,$' " xorg,
                $nname," $file

            else if grep ' xorg ? .*,$' $file >/dev/null
                sd 'xorg( ? .*),$' "xorg\$1,
                $nname," $file

            else
                sd -F 'xorg,' "$nname,
                xorg," $file
            end

        else # case there is no more xorg..* so we can just replace the function arg
            sd 'xorg(| ? .*),.*$' "$nname," $file
        end
    end
end

nix fmt
```
2026-01-25 22:28:09 +01:00