Commit Graph

632930 Commits

Author SHA1 Message Date
Yueh-Shun Li
fe656cbe32 .gitignore: ignore .direnv
Add a rule to .gitignore to exclude .direnv, the name of the temporary
directory created by direnv, from the source tree.

Commit f0160baa7a (".envrc: init for new shell.nix") is introduced to
the "master" branch, invoking an official .envrc direnv configuration
when a developer enters the Nixpkgs source directory.

When checking out the stable-release branches, the rule to exclude the
temporary directory .direnv got lost from .gitignore, and the temporary
directory became visible to source control, creating a risk of polluting
the source tree.

This patch backports the .gitignore rule against .direnv to the stable
release branch and eliminates such risk of pollution.

Even though the necessity of .envrc inside the source tree is under
debate, the opinions from both sides support the non-negligible use of
direct as a developer tool by Nixpkgs contributors, and it would be
beneficial to have a .gitignore rule to exclude the corresponding
temporary files whether we have an official .envrc or not.

Partially backport f0160baa7a
2024-07-13 05:32:46 +08:00
❄️
c171878653
Merge pull request #326628 from tweag/fix-maintainer-list
[24.05] maintainer-list: Fix formatting
2024-07-12 17:23:13 -03:00
Jörg Thalheim
46a0fead56
Merge pull request #325199 from NixOS/backport-323742-to-release-24.05
[Backport release-24.05] sweet: 4.0 -> 5.0
2024-07-12 21:55:22 +02:00
Maximilian Bosch
9b665d7b30
Merge pull request #326589 from Shawn8901/backport-325904-to-release-24.05
[Backport release-24.05] epson-escpr2: 1.2.11 -> 1.2.12
2024-07-12 19:06:01 +00:00
Silvan Mosberger
78f1351fff maintainer-list: Fix formatting
Not sure which nixfmt version was used in
https://github.com/NixOS/nixpkgs/pull/325548, but it doesn't look like
the right one, because CI fails:
https://github.com/NixOS/nixpkgs/actions/runs/9910609620/job/27381383799?pr=326589
2024-07-12 21:01:31 +02:00
❄️
b8914c5025
Merge pull request #326624 from NixOS/backport-322962-to-release-24.05
[Backport release-24.05] vscode-extensions.phind.phind: 0.22.2 -> 0.25.3
2024-07-12 15:42:52 -03:00
Weijia Wang
ed82509021
Merge pull request #325778 from NixOS/backport-316166-to-release-24.05
[Backport release-24.05] aegisub: fix build on darwin
2024-07-12 20:35:07 +02:00
Jonas Heinrich
a05370c8c5 vscode-extensions.phind.phind: 0.22.2 -> 0.25.3
(cherry picked from commit bd3e369cd7)
2024-07-12 18:28:10 +00:00
Shawn8901
8ca91f3adb epson-escpr2: 1.2.11 -> 1.2.12
(cherry picked from commit b64581addf)
2024-07-12 17:48:12 +02:00
Shawn8901
f5a73cb508 epson-escpr2: format with nixfmt-rfc-style
(cherry picked from commit 3996f01a89)
2024-07-12 17:48:07 +02:00
Masum Reza
d216ba96e1
Merge pull request #324421 from benjamb/backport-321427-to-release-24.05
[Backport release-24.05] rbw: 1.10.2 -> 1.11.1
2024-07-12 18:00:40 +05:30
Masum Reza
4bfbed4292
Merge pull request #326507 from NixOS/backport-326148-to-release-24.05
[Backport release-24.05] {tor,mullvad}-browser: 13.5 -> 13.5.1
2024-07-12 17:48:57 +05:30
Emily
b6e9ed15cc
Merge pull request #326503 from NixOS/backport-326381-to-release-24.05
[Backport release-24.05] miniflux: 2.1.3 -> 2.1.4
2024-07-12 13:44:17 +02:00
Maximilian Bosch
f79c994e9e
Merge pull request #322137 from NixOS/backport-322032-to-release-24.05
[Backport release-24.05] epson-escpr2: 1.2.10 -> 1.2.11
2024-07-12 10:45:29 +00:00
seth
80336b4578 lix: 2.90.0-rc1 -> 2.90.0
(cherry picked from commit 1a409e5745)
2024-07-12 12:14:23 +02:00
Felix Schröter
fd5b6bb244 {tor,mullvad}-browser: migrate to pkgs/by-name
(cherry picked from commit 6f841e3bab)
2024-07-12 08:21:07 +00:00
Felix Schröter
02555f1107 mullvad-browser: 13.5 -> 13.5.1
https://github.com/mullvad/mullvad-browser/releases/tag/13.5.1
(cherry picked from commit 916bc34bf3)
2024-07-12 08:21:07 +00:00
Felix Schröter
9c52009c89 tor-browser: 13.5 -> 13.5.1
https://blog.torproject.org/new-release-tor-browser-1351/
(cherry picked from commit 8c612ed6a3)
2024-07-12 08:21:07 +00:00
Sergei Trofimovich
5dfc4498ee miniflux: 2.1.3 -> 2.1.4
Changes: https://github.com/miniflux/v2/releases/tag/2.1.4
(cherry picked from commit 02f01b0224)
2024-07-12 07:59:30 +00:00
Nick Cao
dd9851f861
Merge pull request #326404 from NixOS/backport-326007-to-release-24.05
[Backport release-24.05] viceroy: 0.9.7 -> 0.10.0
2024-07-11 21:53:37 -04:00
R. Ryantm
6db47412ae viceroy: 0.9.7 -> 0.10.0
(cherry picked from commit 7395889fff)
2024-07-11 23:54:37 +00:00
Johannes Jöns
cb5e9b8aa1
Merge pull request #326370 from NixOS/backport-326186-to-release-24.05
[Backport release-24.05] discord: updates
2024-07-11 23:37:29 +00:00
jopejoe1
b9ae4aaa54 pkgsCross.aarch64-darwin.discord-development: 0.0.43 -> 0.0.44
(cherry picked from commit d78001dab7)
2024-07-11 19:32:35 +00:00
jopejoe1
4c75ae16cc pkgsCross.aarch64-darwin.discord-canary: 0.0.547 -> 0.0.559
(cherry picked from commit 0ed9bd5d2a)
2024-07-11 19:32:35 +00:00
jopejoe1
0c30bba970 pkgsCross.aarch64-darwin.discord-ptb: 0.0.121 -> 0.0.122
(cherry picked from commit 0abd1457a5)
2024-07-11 19:32:35 +00:00
jopejoe1
0e21682ff1 pkgsCross.aarch64-darwin.discord: 0.0.309 -> 0.0.310
(cherry picked from commit acdbfb6175)
2024-07-11 19:32:35 +00:00
jopejoe1
9679441d0f discord-development: 0.0.21 -> 0.0.22
(cherry picked from commit ae47299f5a)
2024-07-11 19:32:35 +00:00
jopejoe1
46ea4751c9 discord-canary: 0.0.438 -> 0.0.450
(cherry picked from commit d4f3c6c415)
2024-07-11 19:32:35 +00:00
jopejoe1
95cacf7656 discord-ptb: 0.0.92 -> 0.0.93
(cherry picked from commit 9ead844c54)
2024-07-11 19:32:35 +00:00
jopejoe1
e33261e74d discord: 0.0.58 -> 0.0.59
(cherry picked from commit d44c6c8a50)
2024-07-11 19:32:35 +00:00
Robert Scott
b5f78e3ffc
Merge pull request #326201 from NixOS/backport-325898-to-release-24.05
[Backport release-24.05] python312Packages.django_5: 5.0.5 -> 5.0.7
2024-07-11 19:49:38 +01:00
K900
82f5327337
Merge pull request #326330 from NixOS/backport-326290-to-release-24.05
[Backport release-24.05] Kernel updates for 2024-07-11
2024-07-11 18:07:29 +03:00
K900
0a19336765 linux/hardened: fix syntax in update-script
(cherry picked from commit 161aa16c6d)
2024-07-11 15:06:28 +00:00
K900
896a260d9a linux_latest-libre: 19584 -> 19597
(cherry picked from commit c63531f954)
2024-07-11 15:06:28 +00:00
K900
4838d52906 linux-rt_5_10: 5.10.219-rt111 -> 5.10.220-rt112
(cherry picked from commit 6210e32854)
2024-07-11 15:06:27 +00:00
K900
3c747708f8 linux_6_1: 6.1.97 -> 6.1.98
(cherry picked from commit 3e77292ce1)
2024-07-11 15:06:27 +00:00
K900
f5e9a7caf2 linux_6_6: 6.6.37 -> 6.6.39
(cherry picked from commit 232f3042f2)
2024-07-11 15:06:27 +00:00
K900
95ec60ca9f linux_6_9: 6.9.8 -> 6.9.9
(cherry picked from commit a7135630ba)
2024-07-11 15:06:27 +00:00
K900
9b876f3bb3 linux_testing: 6.10-rc6 -> 6.10-rc7
(cherry picked from commit 8ee0a2c46c)
2024-07-11 15:06:27 +00:00
Franz Pletz
50ea933e42
Merge pull request #326300 from NixOS/backport-326185-to-release-24.05 2024-07-11 16:29:32 +02:00
Masum Reza
d9697b0ed8
Merge pull request #326301 from NixOS/backport-326153-to-release-24.05
[Backport release-24.05] nixVersions.nix_{2_19,2_20,2_21,2_22}: update
2024-07-11 18:57:47 +05:30
Emily
68fdfb07f5 nixVersions.nix_2_22: 2.22.2 -> 2.22.3
Diff: https://github.com/NixOS/nix/compare/2.22.2...2.22.3
(cherry picked from commit 993ef54373)
2024-07-11 12:24:56 +00:00
Emily
3819697a6b nixVersions.nix_2_21: 2.21.3 -> 2.21.4
Diff: https://github.com/NixOS/nix/compare/2.21.3...2.21.4
(cherry picked from commit f3f9b31b68)
2024-07-11 12:24:56 +00:00
Emily
dc1987c126 nixVersions.nix_2_20: 2.20.7 -> 2.20.8
Diff: https://github.com/NixOS/nix/compare/2.20.7...2.20.8
(cherry picked from commit c739c1064d)
2024-07-11 12:24:56 +00:00
Emily
32de9875b3 nixVersions.nix_2_19: 2.19.5 -> 2.19.6
Diff: https://github.com/NixOS/nix/compare/2.19.5...2.19.6
(cherry picked from commit 0916bdf8c3)
2024-07-11 12:24:56 +00:00
Jonathan Davies
d0ffbb70f1 prometheus: 2.53.0 → 2.53.1
(cherry picked from commit d0a0a11d0b)
2024-07-11 12:21:23 +00:00
Franz Pletz
47c71d41a1
Merge pull request #326207 from NixOS/backport-321003-to-release-24.05 2024-07-11 14:20:39 +02:00
Masum Reza
b1c16f181d
Merge pull request #326246 from NixOS/backport-326053-to-release-24.05
[Backport release-24.05] neothesia: install icon
2024-07-11 15:45:59 +05:30
github-actions[bot]
277e33f286
rustdesk-flutter: explicitly use fuse3 (#326144)
`rustdesk-flutter` supports `fuse3` so there is no reason to rely on the older
`fuse2`. This allows the package to be used on systems which have a filesystem
that is not supported by the older `fuse2`.

Note, `fuse` currently defaults to `fuse2`.

(cherry picked from commit b56eed9fc4)

Co-authored-by: S. Nordin Abouzahra <NordinAbouzahra@gmail.com>
2024-07-11 12:11:08 +02:00
K900
a046c1202e
Merge pull request #326270 from NixOS/backport-326267-to-release-24.05
[Backport release-24.05] pt2-clone: fix NixOS test failure due to whitespace in icon name
2024-07-11 12:45:31 +03:00