Commit graph

1,008,523 commits

Author SHA1 Message Date
nixpkgs-ci[bot]
3d6f65645b
Merge release-26.05 into staging-nixos-26.05 2026-07-05 00:42:51 +00:00
isabel
cbe2bee06f
[Backport release-26.05] electron-mail: 5.3.7 -> 5.3.8 (#537500) 2026-07-04 22:34:57 +00:00
nixpkgs-ci[bot]
8c98ff9648
[Backport release-26.05] grav: 1.7.53 -> 1.7.53.2 (#538480) 2026-07-04 20:37:58 +00:00
Robert Helgesson
b11c4056e1 grav: 1.7.53 -> 1.7.53.2
(cherry picked from commit 3d92a88d7d)
2026-07-04 20:19:45 +00:00
nixpkgs-ci[bot]
58bafcd044
[Backport release-26.05] modrinth-app-unwrapped: 0.14.8 -> 0.15.1 (#538266) 2026-07-04 19:12:42 +00:00
Jared Baur
5dc3c8f1a8
[Backport release-26.05] coreboot-toolchain: 26.03 -> 26.06 (#538427) 2026-07-04 18:05:41 +00:00
Michael Daniels
0da4a6f668
[Backport release-26.05] gh: 2.93.0 -> 2.96.0 (#538001) 2026-07-04 17:35:46 +00:00
Leona Maroni
c66bf2ffad
[Backport release-26.05] keycloak: 26.6.3 -> 26.6.4 (#538436) 2026-07-04 17:07:46 +00:00
R. Ryantm
d4ad1dbfb7 keycloak: 26.6.3 -> 26.6.4
(cherry picked from commit f202b3a787)
2026-07-04 17:00:37 +00:00
Daniel Schaefer
88f5e71492 coreboot-toolchain: 26.03 -> 26.06
Signed-off-by: Daniel Schaefer <dhs@frame.work>
(cherry picked from commit e12059e66d)
2026-07-04 16:11:13 +00:00
nixpkgs-ci[bot]
95005a537e
[Backport release-26.05] umami: 3.1.0 -> 3.2.0 (#538344) 2026-07-04 14:02:59 +00:00
Kerstin Humm
e88a550586
[Backport release-26.05] mastodon: 4.6.2 -> 4.6.3 (#538253) 2026-07-04 13:54:03 +00:00
Bjørn Forsman
32ea6c4f59
[Backport release-26.05] obsidian: drop electron version pin (#538232) 2026-07-04 13:29:42 +00:00
nixpkgs-ci[bot]
74f86b02e8
[Backport release-26.05] space-station-14-launcher: 0.38.0 -> 0.39.0 (#538347) 2026-07-04 11:45:33 +00:00
Coca
2b8b447948 space-station-14-launcher: 0.38.0 -> 0.39.0
(cherry picked from commit ad9369938f)
2026-07-04 11:40:29 +00:00
Diogo Correia
3109dcb94e umami: 3.1.0 -> 3.2.0
(cherry picked from commit d9114b31e5)
2026-07-04 11:11:14 +00:00
Arne Keller
471ea87020
[Backport release-26.05] iredis: 1.15.2 -> 1.16.1 (#538331) 2026-07-04 11:01:58 +00:00
Hythera
e0526ede6e iredis: modernize
(cherry picked from commit 6cc3d60de2)
2026-07-04 09:20:10 +00:00
Hythera
cda195bdcb iredis: 1.15.2 -> 1.16.1
changelog: https://github.com/laixintao/iredis/blob/v1.16.1/CHANGELOG.md

diff: https://github.com/laixintao/iredis/compare/v1.15.2...v1.16.1
(cherry picked from commit 22b0bb0326)
2026-07-04 09:20:09 +00:00
Arne Keller
230911bdb9
[Backport release-26.05] vrcx: Use electron 41 (#538235) 2026-07-04 09:07:56 +00:00
adisbladis
a50de1b7d8
[Backport release-26.05] lib.sources.sourceByGlobs: init function (#538314) 2026-07-04 07:06:06 +00:00
zimbatm
ba1f4720f0 purescript.tests.minimal-module: use lib.sources.sourceByGlobs
Filter src to the .purs and .js files actually compiled, dropping
default.nix from the closure.

(cherry picked from commit df1b67fdfd)
2026-07-04 06:49:09 +00:00
zimbatm
576870d97c vimPluginsUpdater: use lib.sources.sourceByGlobs
Filter PYTHONPATH source to .py files only, dropping the 6 sibling
.nix files from the closure.

(cherry picked from commit 1b47667776)
2026-07-04 06:49:08 +00:00
zimbatm
9dc23bf891 pkgs.formats.javaProperties: use lib.sources.sourceByGlobs
Uses the cleaner expression

(cherry picked from commit edb4b053f5)
2026-07-04 06:49:08 +00:00
zimbatm
8b870d7666 lib.sources.sourceByGlobs: address review comments
(cherry picked from commit 01bdc186ae)
2026-07-04 06:49:08 +00:00
adisbladis
96d5ebc8c2 lib.sources.sourceByGlobs: init function
Adds a source filtering function inspired by [doublestar](https://github.com/bmatcuk/doublestar).

This has been in used in a few private repositories since the last ~6 months with success.

- Testing

This was originally tested with the nix-unit testsuite:
```
let
  inherit (import ./internal.nix) mkSourceFilter mkMatcher;
in
{
  mkMatcher = {
    empty = {
      testMatch = {
        expr = mkMatcher "" "" "regular";
        expected = true;
      };

      testNoMatch = {
        expr = mkMatcher "" "foo" "regular";
        expected = false;
      };
    };

    simple = {
      testMatch = {
        expr = mkMatcher "foo" "foo" "regular";
        expected = true;
      };

      testNoMatch = {
        expr = mkMatcher "foo" "bar" "regular";
        expected = false;
      };
    };

    singleStar = {
      testMatch = {
        expr = mkMatcher "*.js" "foo.js" "regular";
        expected = true;
      };

      testNoMatch = {
        expr = mkMatcher "*.js" "foo.py" "regular";
        expected = false;
      };
    };

    doubleStar = {
      testMatch = {
        expr = mkMatcher "foo/**/bar" "foo/baz/bar" "regular";
        expected = true;
      };

      testNoMatch = {
        expr = mkMatcher "foo/**/bar" "foo/bar/baz" "regular";
        expected = false;
      };

      testMultiMatch = {
        expr = mkMatcher "foo/**/bar" "foo/baz/xyz/bar" "regular";
        expected = true;
      };

      testMultiMatchDoubleGlob = {
        expr = mkMatcher "foo/**/**/bar" "foo/baz/xyz/bar" "regular";
        expected = true;
      };

      testInfixMatch = {
        expr = mkMatcher "foo/**/qux/**/bar" "foo/baz/qux/baz/bar" "regular";
        expected = true;
      };

      testInfixNoMatch = {
        expr = mkMatcher "foo/**/xyz/**/bar" "foo/baz/qux/baz/bar" "regular";
        expected = false;
      };

      # Technically a partial match
      testInfixDirMatch = {
        expr = mkMatcher "foo/**/xyz/**/bar" "foo/baz/qux/baz/bar" "directory";
        expected = true;
      };
    };
  };

  mkSourceFilter = {
    testSourceFilter = {
      expr = mkSourceFilter ./fixtures [
        "bar/*.js"
      ] "bar/bar.js" "regular";
      expected = true;
    };
  };
}
```
but it was dropped in this nixpkgs contribution as the structure of nixpkgs lib testing is too primitive to incorp this without more extensive refactoring than I'd like at the momment.

- Performance

It's hard to benchmark this against anything else meaningful except [globsset](https://github.com/pdtpartners/globset), which has a very similar API.

`sourceByGlobs` avoids performance pitfalls by:

  - Using `builtins.filterSource`

      This is more performant than the fileset API.
      The downside compared to the fileset API is that any directory which matches the filter will be added to the build, even if it's empty.

  - Match paths component by component

      By splitting each pattern into a token per / separator.
      This is much faster in Nix than the doublestar algorithm.

- Globset source

```json
{
    "cpuTime": 0.8585879802703857,
    "envs": {
        "bytes": 148252864,
        "elements": 11899843,
        "number": 6631765
    },
    "gc": {
        "heapSize": 402915328,
        "totalBytes": 671288560
    },
    "list": {
        "bytes": 3358664,
        "concats": 28658,
        "elements": 419833
    },
    "nrAvoided": 11562713,
    "nrFunctionCalls": 4816963,
    "nrLookups": 4316209,
    "nrOpUpdateValuesCopied": 5686407,
    "nrOpUpdates": 464060,
    "nrPrimOpCalls": 2966970,
    "nrThunks": 7796186,
    "sets": {
        "bytes": 196404672,
        "elements": 10837802,
        "number": 1437490
    },
    "sizes": {
        "Attr": 16,
        "Bindings": 16,
        "Env": 8,
        "Value": 24
    },
    "symbols": {
        "bytes": 340652,
        "number": 32026
    },
    "values": {
        "bytes": 207367440,
        "number": 8640310
    }
}
```

- Glob-filter source

```json
{
    "cpuTime": 0.3904629945755005,
    "envs": {
        "bytes": 13263440,
        "elements": 1005877,
        "number": 652053
    },
    "gc": {
        "heapSize": 402915328,
        "totalBytes": 146914896
    },
    "list": {
        "bytes": 3032168,
        "concats": 5899,
        "elements": 379021
    },
    "nrAvoided": 1666598,
    "nrFunctionCalls": 484399,
    "nrLookups": 112698,
    "nrOpUpdateValuesCopied": 3432135,
    "nrOpUpdates": 13426,
    "nrPrimOpCalls": 1041954,
    "nrThunks": 1205792,
    "sets": {
        "bytes": 64304800,
        "elements": 3978167,
        "number": 40883
    },
    "sizes": {
        "Attr": 16,
        "Bindings": 16,
        "Env": 8,
        "Value": 24
    },
    "symbols": {
        "bytes": 285306,
        "number": 28864
    },
    "values": {
        "bytes": 42963240,
        "number": 1790135
    }
}
```

(cherry picked from commit 59d55cbaa3)
2026-07-04 06:49:08 +00:00
nixpkgs-ci[bot]
19d9f7dd3f
[Backport release-26.05] xaos: fix desktop file install (#538273) 2026-07-04 04:12:40 +00:00
Ihar Hrachyshka
3b54b7f876
[Backport release-26.05] xquartz: Fix (nontrusted) X forwarding and crashloop (#537679) 2026-07-04 03:22:34 +00:00
Ihar Hrachyshka
cddf247518
[Backport release-26.05] thunderbird-latest-unwrapped: 152.0 -> 152.0.1 (#538291) 2026-07-04 02:27:59 +00:00
Matt Sturgeon
72d6518236
[Backport release-26.05] adw-bluetooth: 1.0.0 -> 1.1.0, init NixOS module (#536710) 2026-07-04 02:06:47 +00:00
@mjones
d568b2f5fd
[Backport release-26.05] mattermostLatest: 11.8.1 -> 11.8.2 (#538109) 2026-07-04 01:30:40 +00:00
R. Ryantm
73fcea124c thunderbird-latest-unwrapped: 152.0 -> 152.0.1
(cherry picked from commit 110fec6e02)
2026-07-04 01:26:19 +00:00
dotlambda
76c7ce9867
[Backport release-26.05] wol: fix Darwin build with gnu17 (#538255) 2026-07-04 01:11:55 +00:00
@mjones
e108b8dc6c
[Backport release-26.05] asn1c: 0.9.28 -> 0.9.29 (#538280) 2026-07-04 01:01:09 +00:00
Morgan Jones
1cf4918ad8 asn1c: 0.9.28 -> 0.9.29
(cherry picked from commit afacd7d03f)
2026-07-04 00:46:54 +00:00
nixpkgs-ci[bot]
12703384d2
Merge release-26.05 into staging-nixos-26.05 2026-07-04 00:39:53 +00:00
nixpkgs-ci[bot]
8fe04bebab
[Backport release-26.05] steam-devices-udev-rules: 1.0.0.61-unstable-2026-06-11 -> 1.0.0.61-unstable-2026-06-25 (#537842) 2026-07-03 23:31:41 +00:00
Emily
92e31f9b52
[Backport release-26.05] ungoogled-chromium: 149.0.7827.200-1 -> 150.0.7871.46-1 (#538264) 2026-07-03 23:31:41 +00:00
coolcuber
fd8e6b2402 xaos: fix desktop file install
(cherry picked from commit 95533ecf3d)
2026-07-03 23:20:51 +00:00
Gaétan Lepage
4b2e26aa0d
[Backport release-26.05] peertube: 8.1.8 -> 8.2.2 (#538259) 2026-07-03 23:19:42 +00:00
R. Ryantm
54ed788545 modrinth-app-unwrapped: 0.14.8 -> 0.15.1
(cherry picked from commit e179f51ea7)
2026-07-03 23:04:13 +00:00
emilylange
4e29180a4c ungoogled-chromium: 149.0.7827.200-1 -> 150.0.7871.46-1
https://developer.chrome.com/blog/new-in-chrome-150

https://developer.chrome.com/release_notes/150

https://chromereleases.googleblog.com/2026/06/stable-channel-update-for-desktop_0175352312.html

This update includes 433 security fixes.

(cherry picked from commit bb6e0bdd29)
2026-07-03 23:03:15 +00:00
nixpkgs-ci[bot]
b6a627afa7
[Backport release-26.05] r2modman: 3.2.17 -> 3.2.18 (#538258) 2026-07-03 22:58:38 +00:00
Grace Lovelace
dc18017713 peertube: 8.1.8 -> 8.2.2
Important security fix, CR comments.

(cherry picked from commit 195b95f5ac)
2026-07-03 22:48:11 +00:00
R. Ryantm
91a7def3f2 r2modman: 3.2.17 -> 3.2.18
(cherry picked from commit 91c209262d)
2026-07-03 22:47:05 +00:00
Bryan Lai
517835d82d wol: fix clang build with gnu17 flag
Co-authored-by: dotlambda <github@dotlambda.de>
(cherry picked from commit 509a095d5f)
2026-07-03 22:24:33 +00:00
Hythera
400f2e0dbc mastodon: 4.6.2 -> 4.6.3
changelog: https://github.com/mastodon/mastodon/releases/tag/v4.6.3

diff: https://github.com/mastodon/mastodon/compare/v4.6.2...v4.6.3
(cherry picked from commit efe13f56f7)
2026-07-03 22:17:26 +00:00
Bjørn Forsman
3d3618ab18
[Backport release-26.05] libxml2_13: fix CVE-2026-11979 (#538237) 2026-07-03 21:54:30 +00:00
Gutyina Gergő
3c77fd819e libxml2_13: fix CVE-2026-11979
(cherry picked from commit 72fd186ec8)
2026-07-03 21:17:22 +00:00
[Assassin]
5f771633cf vrcx: Use electron 41
(cherry picked from commit 2bfec9251e)
2026-07-03 21:09:13 +00:00