Nick Cao
5ec98c543d
Merge pull request #333000 from r-ryantm/auto-update/mxt-app
...
mxt-app: 1.38 -> 1.40
2024-08-09 18:07:54 -04:00
Sachi King
42903be7da
ArmTrustedFirmwareRK3588: Don't include unused HDCP blob
...
The HDCP blob is only for the RK3399, so it is not needed on RK3588.
The blob being present during build pollutes the license with
"UnfreeRedistributable" unnecessary as it is not contained in the
output.
The SHA256 hash bl31.elf with HDCP.bin available and unavailable in the
build tree are identical.
cf1c4e4e8c6803a1e8185af8b45318729167cee0336c105f19037edfb9b2d956 removed/bl31.elf
cf1c4e4e8c6803a1e8185af8b45318729167cee0336c105f19037edfb9b2d956 available/bl31.elf
2024-08-09 10:01:23 +10:00
Peder Bergebakken Sundt
c3f597a013
Merge pull request #331622 from ryand56/update/scrcpy
...
scrcpy: 2.5 -> 2.6.1; migrate to pkgs/by-name
2024-08-09 01:01:03 +02:00
R. Ryantm
80e1839b5d
mxt-app: 1.38 -> 1.40
2024-08-07 13:42:49 +00:00
OTABI Tomoya
de7067cf2f
Merge pull request #326236 from eclairevoyant/frescobaldi-fix
...
frescobaldi: fix build; cleanup deps
2024-08-07 17:51:58 +09:00
Sergei Trofimovich
1ed6ea6793
sndio: 1.9.0 -> 1.10.0
2024-08-06 21:57:11 +01:00
Robert Schütz
3d19c4d6ed
Merge pull request #330940 from dotlambda/node-pre-gyp
...
node-pre-gyp: init at 1.0.11
2024-08-06 05:24:38 -07:00
éclairevoyant
4162e31004
frescobaldi: pin to python 3.11 to fix build
2024-08-06 00:07:27 -04:00
Robert Schütz
fb2725b4cc
base16-builder: drop superfluous supplement input
2024-08-05 03:34:40 -07:00
Peder Bergebakken Sundt
d1d4ca2ebe
Merge pull request #330458 from lluchs/canon-cups-ufr2-5.90
...
canon-cups-ufr2: 5.70 -> 5.90
2024-08-04 22:07:15 +02:00
Aleksana
dbefbaba4b
Merge pull request #329397 from r-ryantm/auto-update/seafile-shared
...
seafile-shared: 9.0.6 -> 9.0.7
2024-08-04 19:36:49 +08:00
Francesco Gazzetta
cc6fa17c00
translatelocally-models: update
2024-08-02 14:52:30 +00:00
tomberek
222fc10b60
Merge pull request #329816 from r-ryantm/auto-update/lilypond
...
lilypond: 2.24.3 -> 2.24.4
2024-08-02 02:34:31 -04:00
Ryan Omasta
abbda0a917
scrcpy: 2.5 -> 2.6; migrate to pkgs/by-name
2024-08-01 16:20:34 -06:00
R. Ryantm
1085c87668
jitsi-meet-prosody: 1.0.8043 -> 1.0.8091
2024-08-01 19:01:04 +00:00
Florian
1149f210e7
Merge pull request #330674 from tobim/pkgs/adopt-perf-logrotate-ghostscript
...
ghostscript, logrotate, linux-perf: adopt
2024-08-01 11:24:27 +02:00
Shawn8901
c1d26a15a3
epson-escpr2: 1.2.12 -> 1.2.13
...
use autoreconfHook to avoid version incompatibilities,
use configureFlags for setting output of cupsppddir and cupsfilterdir
remove custom patch as it is overriden on autoreconf
2024-07-29 20:45:17 +02:00
Jörg Thalheim
5356420466
treewide: remove unused with statements from maintainer lists
...
$ find -type f -name '*.nix' -print0 | xargs -P "$(nproc)" -0 sed -i \
-e 's!with lib.maintainers; \[ *\];![ ];!' \
-e 's!with maintainers; \[ *\];![ ];!'
2024-07-29 10:06:20 +08:00
Sandro
6eaaad7c3b
Merge pull request #329683 from redyf/tmux-floax
2024-07-28 22:27:36 +02:00
Tobias Mayer
4535a56495
ghostscript, logrotate, linux-perf: adopt
2024-07-28 17:15:17 +02:00
Lukas Werling
aea44d2f19
canon-cups-ufr2: 5.70 -> 5.90
2024-07-27 18:46:40 +02:00
K900
1410c766c8
Merge remote-tracking branch 'origin/master' into staging-next
2024-07-26 08:41:08 +03:00
Aleksana
38171c5009
Merge pull request #329307 from arthsmn/hplip-remove-maintainer
...
hplip: remove arthsmn from maintainers
2024-07-26 11:41:20 +08:00
redyf
7c57f195d4
tmuxPlugins.tmux-floax: init at unstable-2024-07-24
...
Co-authored-by: éclairevoyant <848000+eclairevoyant@users.noreply.github.com>
2024-07-25 17:44:14 -03:00
R. Ryantm
eaaf0eba0b
lilypond: 2.24.3 -> 2.24.4
2024-07-25 04:30:48 +00:00
github-actions[bot]
7208220b63
Merge master into staging-next
2024-07-24 18:01:18 +00:00
Ivan Trubach
90fbf71333
treewide: remove maintainer goibhniu
...
Inactive in Nixpkgs since 2018 (and a single PR in 2022).
https://github.com/NixOS/nixpkgs/issues?q=author%3Acillianderoiste
2024-07-24 13:38:22 +03:00
Vladimír Čunát
cd346565bb
Merge branch 'master' into staging-next
2024-07-24 07:19:19 +02:00
R. Ryantm
d5dcf82d19
seafile-shared: 9.0.6 -> 9.0.7
2024-07-23 12:24:25 +00:00
arthsmn
52d2734b0c
hplip: remove arthsmn from maintainers
2024-07-22 22:59:38 -03:00
Javi Merino
d2d3b359ad
tmuxPlugins.tmux-pass: init at 0-unstable-2020-02-28
2024-07-22 10:01:19 +01:00
Vladimír Čunát
577f40b8a9
Merge branch 'staging' into staging-next
2024-07-20 16:12:24 +02:00
K900
30c7d92af3
Merge pull request #326845 from Luflosi/init/ubootOrangePiZero3
...
ubootOrangePiZero3: init
2024-07-20 13:28:34 +03:00
github-actions[bot]
637b531dcf
Merge staging-next into staging
2024-07-19 18:01:40 +00:00
Peder Bergebakken Sundt
cfe6ad13d5
Merge pull request #327484 from ryand56/update-scrcpy
...
scrcpy: 2.4 -> 2.5
2024-07-19 17:30:32 +02:00
github-actions[bot]
f316203fda
Merge staging-next into staging
2024-07-19 00:03:05 +00:00
K900
a1717b8456
uboot: 2024.04 -> 2024.07
2024-07-18 14:27:09 +03:00
Randy Eckenrode
f9b7f4ec09
tree-wide: use top-level cctools
2024-07-17 22:36:19 -04:00
Ryan Omasta
5b0bddfae6
scrcpy: 2.4 -> 2.5
2024-07-15 17:03:57 -06:00
github-actions[bot]
31817540ee
Merge staging-next into staging
2024-07-14 18:01:37 +00:00
Aleksana
3ea85ac338
Merge pull request #326827 from Aleksanaa/trivial-sha256-fix
...
treewide: sha256 -> hash attribute for gitlab.com,codeberg.org fetchers
2024-07-14 22:40:25 +08:00
Vladimír Čunát
211398c03e
Merge branch 'staging-next' into staging
2024-07-14 08:35:35 +02:00
aleksana
07c1bc2034
treewide: sha256 -> hash attribute for pypi fetchers
2024-07-14 01:25:22 +08:00
Luflosi
d14c296d19
ubootOrangePiZero3: init
2024-07-13 16:59:58 +02:00
aleksana
1a89942243
treewide: sha256 -> hash attribute for gitlab.com fetchers
2024-07-13 22:28:37 +08:00
github-actions[bot]
81b9c6ab7a
Merge staging-next into staging
2024-07-13 06:01:31 +00:00
Bruno BELANYI
cb4ceede85
Merge pull request #311179 from redyf/tmux-power-update
2024-07-13 01:40:05 +01:00
Redyf
6d5dbe79a4
tmuxPlugins.power-theme: unstable-2020-11-18 -> unstable-2024-05-12
...
https://github.com/wfxr/tmux-power
2024-07-12 21:34:28 -03:00
github-actions[bot]
b66506a79e
Merge staging-next into staging
2024-07-12 12:01:44 +00:00
Maximilian Bosch
c7f54ca757
Merge pull request #325904 from Shawn8901/update-epson-escpr2
...
epson-escpr2: 1.2.11 -> 1.2.12
2024-07-12 10:41:28 +00:00
Vladimír Čunát
2c053848df
Merge branch 'master' into staging
2024-07-11 22:05:05 +02:00
Nick Cao
9c7fcf487f
Merge pull request #323609 from NickCao/opensbi
...
opensbi: 1.4 -> 1.5
2024-07-11 08:59:38 -04:00
Martin Weinelt
176a56c40f
Merge remote-tracking branch 'origin/staging-next' into staging
...
Conflicts:
- pkgs/applications/misc/blender/default.nix
- pkgs/development/web/nodejs/nodejs.nix
2024-07-11 01:06:28 +02:00
Sandro
eec72fd9d1
Merge pull request #325178 from alois31/hplip
2024-07-10 14:05:52 +02:00
Alois Wohlschlager
57428640ff
hplip: 3.23.8 -> 3.24.4
...
Remove a patch that does no longer apply and seems to be not needed any more.
2024-07-10 05:55:13 +02:00
Alois Wohlschlager
ac20a96efd
hplip: fix dependencies
...
Wrapping with gobject-introspection is required so that hp-systray is able to
find dbus. Sip4 is outdated and seems no longer required.
2024-07-10 05:55:05 +02:00
Peder Bergebakken Sundt
e5b4380d11
Merge pull request #321089 from deinferno/master
...
pantum-driver: 1.1.106 -> 1.1.123
2024-07-10 00:17:15 +02:00
Shawn8901
b64581addf
epson-escpr2: 1.2.11 -> 1.2.12
2024-07-09 20:18:33 +02:00
Shawn8901
3996f01a89
epson-escpr2: format with nixfmt-rfc-style
2024-07-09 20:14:17 +02:00
Aleksana
13b2d037d0
Merge pull request #325016 from omidmnz/fix-lilypond-invoke-editor
...
lilypond: avoid resetting the PATH in makeWrapper
2024-07-09 20:38:46 +08:00
Leona Maroni
aab7c21bdb
Merge pull request #325682 from jchw-forks/fix/hplip
...
hplip: fix
2024-07-09 11:25:30 +02:00
Michael Hoang
eb725313bc
treewide: remove Enzime
2024-07-09 14:32:33 +10:00
John Chadwick
fc8576c062
hplip: fix
2024-07-08 20:26:45 -04:00
R. Ryantm
e7a4e19ed5
jitsi-meet-prosody: 1.0.7952 -> 1.0.8043
2024-07-08 05:05:10 +00:00
Weijia Wang
7038f0bab2
Merge pull request #320583 from r-ryantm/auto-update/cups
...
cups: 2.4.8 -> 2.4.10
2024-07-07 14:52:44 +02:00
Omid Momenzadeh
670ac47e52
lilypond: avoid resetting the PATH in makeWrapper
...
Using `--set` obscures the user's `PATH`, which
`lilypond-invoke-editor` depends on. The problem can be reproduced by
setting the `LYEDITOR` environment variable before executing
`lilypond-invoke-editor`.
2024-07-06 15:20:25 +03:30
Martin Weinelt
e7b1ee45cf
Merge remote-tracking branch 'origin/staging-next' into staging
...
Conflicts:
- pkgs/tools/misc/watchlog/default.nix
2024-07-06 01:52:35 +02:00
Martin Weinelt
d9610a9f2e
Merge remote-tracking branch 'origin/master' into staging-next
2024-07-06 01:51:14 +02:00
Marcus Ramberg
cd11caeb12
Merge pull request #311474 from redyf/add-tokyo-night-tmux
...
tmuxPlugins.tokyo-night-tmux: init at 1.5.3
2024-07-05 22:27:41 +02:00
github-actions[bot]
e14242d985
Merge staging-next into staging
2024-07-04 12:01:37 +00:00
Vladimír Čunát
44b36397c2
Merge branch 'master' into staging-next
...
Conflicts - GitHub wouldn't auto-resolve them but my local git did:
pkgs/development/cuda-modules/cuda/overrides.nix
2024-07-04 10:10:22 +02:00
Masum Reza
410d1213cd
Merge pull request #323983 from Aleksanaa/cargoSha256-change
...
treewide: remove all cargoSha256 usage
2024-07-04 10:50:18 +05:30
adisbladis
1be927ca66
Merge pull request #316983 from edolstra/let-float-json
...
Let-float various fromJSON calls to avoid repeated JSON reading/parsing
2024-07-04 13:47:08 +12:00
github-actions[bot]
aba75819b6
Merge master into staging-next
2024-07-03 18:01:04 +00:00
éclairevoyant
83a657cacd
Merge pull request #324353 from delan/bye
...
maintainers: remove delan
2024-07-03 17:39:29 +00:00
Vladimír Čunát
c76085b3a9
Merge branch 'master' into staging-next
2024-07-03 19:07:35 +02:00
aleksana
1862813d11
treewide: convert cargoSha256 to cargoHash
...
This is done with the following bash script:
```
#!/usr/bin/env bash
process_line() {
local filename=${1%:}
if [[ $4 =~ \"(.*)\"\; ]]; then
local sha256="${BASH_REMATCH[1]}"
fi
[[ -z $sha256 ]] && return 0
local hash=$(nix hash to-sri --type sha256 $sha256)
echo "Processing: $filename"
echo " $sha256 => $hash"
sed -i "s|cargoSha256 = \"$sha256\"|cargoHash = \"$hash\"|"
$filename
}
# split output by line
grep -r 'cargoSha256 = ' . | while IFS= read -r line; do
# split them further by space
read -r -a parts <<< "$line"
process_line "${parts[@]}"
done
```
2024-07-03 21:54:10 +08:00
Delan Azabani
01aa077998
maintainers: remove delan
2024-07-03 19:54:30 +08:00
Jussi Kuokkanen
9b4703cf14
pkgs/misc: remove licenses.gpl2
2024-07-03 14:24:14 +03:00
github-actions[bot]
d77a3adc09
Merge master into staging-next
2024-07-03 00:02:45 +00:00
Weijia Wang
3814f8ed46
Merge pull request #322685 from r-ryantm/auto-update/mxt-app
...
mxt-app: 1.36 -> 1.38
2024-07-02 23:10:41 +02:00
K900
665f1d6183
Merge remote-tracking branch 'origin/master' into staging-next
2024-07-02 08:32:46 +03:00
Janik H.
76cd1d2211
maintainers: drop janik
...
I guess my time has come as well...
With this commit, I'm not just dropping my maintainer entry, but I'm also
resigning from my duties as a board observer and NixCon project lead.
I also terminated my Summer of Nix contract today.
I'll also stop hosting the local NixOS meetup.
The only "project" I'll finish under the NixOS Foundation umbrella is
Google Summer of Code because the mentees aren't even remotely
responsible for why I'm leaving, and it would be unfair to leave them
hanging.
I'm grateful for all the things I was able to learn, for all the experiences
I could gather, and for all the friends I made along the way.
NixOS is what makes computers bearable for me, so I'll go and work on
some fork (*something something* you always meet twice in life).
2024-07-02 02:36:42 +02:00
pennae
5c5aaaaaae
maintainers: remove pennae
...
https://discourse.nixos.org/t/nca-jonringer-joint-announcement/48231
https://web.archive.org/web/20240701165505/https://discourse.nixos.org/t/nca-jonringer-joint-announcement/48231
we had little faith in the NCA process, but this is going deep, *deep*
into the territory of wilfully insulting all those had placed even a
modicum of trust in that process.
have you fucking nazi bar.
2024-07-01 18:56:40 +02:00
Martin Weinelt
9b79a05ae1
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
- pkgs/development/python-modules/flexcache/default.nix
- pkgs/development/python-modules/flexparser/default.nix
- pkgs/development/python-modules/odp-amsterdam/default.nix
- pkgs/development/python-modules/pint/default.nix
- pkgs/development/python-modules/uncertainties/default.nix
- pkgs/top-level/python-packages.nix
2024-07-01 01:07:21 +02:00
Nick Cao
2d1ae120c5
opensbi: 1.4 -> 1.5
...
Diff: https://github.com/riscv-software-src/opensbi/compare/v1.4...v1.5
2024-06-30 11:06:00 -04:00
Michele Guerini Rocco
373ef925ca
Merge pull request #323235 from rnhmjoj/pr-scc
...
sc-controller: 0.4.8.13 -> 0.4.8.17
2024-06-30 01:11:01 +02:00
K900
bde999c03e
Merge branch 'master' into staging-next
2024-06-29 10:13:13 +03:00
rnhmjoj
6ac745ef3c
sc-controller: 0.4.8.13 -> 0.4.8.17
...
The Ryochan7's fork has been archived, development continues over at
C0rn3j's fork. Hopefully this will me merged into the official
project sooner or later...
2024-06-28 22:20:50 +02:00
Ryan Hendrickson
c81ecdf95b
Merge pull request #322284 from rhendric/rhendric/genericUpdater-allowedVersions
...
common-updater-scripts: add allowedVersions parameter
2024-06-28 15:35:00 -04:00
R. Ryantm
a5b1a60fe8
mxt-app: 1.36 -> 1.38
2024-06-26 16:46:30 +00:00
github-actions[bot]
27074b7d07
Merge master into staging-next
2024-06-26 00:02:13 +00:00
Weijia Wang
68bf0f3d71
Merge pull request #321186 from r-ryantm/auto-update/lilypond-unstable
...
lilypond-unstable: 2.25.16 -> 2.25.17
2024-06-26 00:05:09 +02:00
Ryan Hendrickson
77a9e911a6
alock: use allowedVersions in updateScript
2024-06-25 17:45:57 -04:00
R. Ryantm
9088fd75eb
cups: 2.4.8 -> 2.4.10
2024-06-24 13:17:02 +00:00
github-actions[bot]
88140ced6d
Merge master into staging-next
2024-06-24 12:01:17 +00:00
Martin Weinelt
74f29cd4b6
libjack2: fix python 3.12 support
...
Backports the waf 2.0.26 update, which adds Python 3.12 support to the
build system.
2024-06-24 12:18:23 +02:00
Shawn8901
0415c9c1f4
epson-escpr2: 1.2.10 -> 1.2.11
2024-06-23 22:31:59 +02:00
Martin Weinelt
2096642430
Merge remote-tracking branch 'origin/staging-next' into staging
...
Conflicts:
- pkgs/os-specific/windows/mingw-w64/default.nix
2024-06-23 19:09:00 +02:00
Emily
fbda1dbfd6
treewide: replace freeglut with libglut
...
Allow the macOS GLUT framework to be used automatically in many
cases. Packages that specifically search for freeglut or require its
additional APIs should still explicitly depend on it.
Deliberately skip the Haskell package set, which is mostly
automatically generated, and mupdf, which has its own fork of freeglut.
2024-06-22 18:06:51 +01:00
R. Ryantm
44210d5c23
fastly: 10.12.2 -> 10.12.3
2024-06-22 07:02:02 +00:00
github-actions[bot]
c6707a9686
Merge staging-next into staging
2024-06-21 12:01:53 +00:00
Samuel Dionne-Riel
c7882d9a4d
hll2390dw-cups: Drop unmaintained package
2024-06-21 01:06:01 -04:00
Samuel Dionne-Riel
caf402f789
uboot*: Drop samueldr as maintainer
2024-06-20 20:45:18 -04:00
R. Ryantm
82f78e7510
lilypond-unstable: 2.25.16 -> 2.25.17
2024-06-20 07:44:46 +00:00
deinferno
0097354da1
pantum-driver: 1.1.106 -> 1.1.123
2024-06-19 23:26:09 +05:00
Martin Weinelt
f822b2ba5c
Merge remote-tracking branch 'origin/staging-next' into staging
...
Conflicts:
- pkgs/development/python-modules/langsmith/default.nix
- pkgs/development/python-modules/rich-pixels/default.nix
- pkgs/servers/teleport/generic.nix
2024-06-18 20:16:19 +02:00
Ben Siraphob
8222aa9278
Merge pull request #315183 from jopejoe1/fix-pname
...
treewide: replace name with pname
2024-06-16 12:34:01 +00:00
Aleksana
ee9cf00e6d
Merge pull request #315240 from Cryolitia/ghost-font
...
ghostscript: add output `fonts`
2024-06-15 19:32:39 +08:00
jopejoe1
f9cd82dcfd
lssecret: use pname instead of name
2024-06-15 09:56:43 +02:00
github-actions[bot]
eccfb1ee94
Merge staging-next into staging
2024-06-15 00:02:47 +00:00
Weijia Wang
f006c8e547
Merge pull request #319753 from r-ryantm/auto-update/fastly
...
fastly: 10.12.1 -> 10.12.2
2024-06-14 22:39:12 +02:00
github-actions[bot]
098fe8ee26
Merge staging-next into staging
2024-06-14 18:01:39 +00:00
Guillaume Girol
a5ca25f03d
Merge pull request #319840 from nova-r/new-plugin-epkowa
...
epkowa: add plugin for Perfection V100 Photo
2024-06-14 18:28:36 +02:00
nova madeline
82aeb7fba1
epkowa: add plugin for Perfection V100 Photo
2024-06-14 16:40:55 +02:00
Martin Weinelt
abdf5dc772
treewide: remove pythonRelaxDepsHook references
...
It is is now provided automatically, when `pythonRelaxDeps` or
`pythonRemoveDeps` is defined through `mk-python-derivation`.
2024-06-14 14:52:00 +02:00
R. Ryantm
3df1fb8b73
fastly: 10.12.1 -> 10.12.2
2024-06-14 07:34:32 +00:00
Shawn8901
05ae9bdbb3
epson-escpr2: 1.2.9 -> 1.2.10
2024-06-13 22:25:09 +02:00
github-actions[bot]
477d2d32ff
Merge master into staging-next
2024-06-12 00:02:10 +00:00
Rafael Fernández López
07fd30b47a
fastly: 10.12.0 -> 10.12.1
2024-06-11 08:26:14 +02:00
github-actions[bot]
0cc78468fa
Merge master into staging-next
2024-06-10 18:01:13 +00:00
Rafael Fernández López
9a7c749bd7
fastly: 10.11.0 -> 10.12.0
2024-06-10 13:08:07 +02:00
Alyssa Ross
3df6bb2c85
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/applications/blockchains/polkadot/default.nix
2024-06-09 22:47:12 +01:00
Alexis Hildebrandt
f8c4a98e8e
treewide: Remove the definite article from meta.description
...
nix run nixpkgs#silver-searcher -- -G '\.nix$' -0l 'description.*"([Tt]he)? ' pkgs \
| xargs -0 nix run nixpkgs#gnused -- -i '' -Ee 's/(description.*")[Tt]he (.)/\1\U\2/'
2024-06-09 23:08:46 +02:00
Alexis Hildebrandt
755b915a15
treewide: Remove indefinite article from meta.description
...
nix run nixpkgs#silver-searcher -- -G '\.nix$' -0l 'description.*"[Aa]n?' pkgs \
| xargs -0 nix run nixpkgs#gnused -- -i '' -Ee 's/(description.*")[Aa]n? (.)/\1\U\2/'
2024-06-09 23:07:45 +02:00
Alexis Hildebrandt
bf995e3641
treewide: Remove ending period from meta.description
...
nix run nixpkgs#silver-searcher -- -G '\.nix$' -0l 'description.*".*\.";' pkgs \
| xargs -0 nix run nixpkgs#gnused -- -i '' -Ee 's/(description.*)\.";/\1";/'
2024-06-09 23:04:51 +02:00
github-actions[bot]
f22f5c2c0c
Merge master into staging-next
2024-06-08 00:02:16 +00:00
Nick Cao
e6d9a1261b
Merge pull request #317872 from r-ryantm/auto-update/fastly
...
fastly: 10.10.0 -> 10.11.0
2024-06-07 15:42:13 -04:00
github-actions[bot]
e7fb1ff4be
Merge master into staging-next
2024-06-07 06:01:17 +00:00
R. Ryantm
18eab3db52
fastly: 10.10.0 -> 10.11.0
2024-06-07 00:58:19 +00:00
Stanisław Pitucha
4ba83903ac
auditbeat7,filebeat7,heartbeat7,metricbeat7,packetbeat7: fix meta merging
...
With a set merge, most of the meta was lost, including the license and
platform information. Change to deep merge to preserve the attributes.
2024-06-06 21:46:38 +10:00
github-actions[bot]
f1f4d07f90
Merge master into staging-next
2024-06-05 12:01:21 +00:00
Pol Dellaiera
88d8b82748
Merge pull request #316457 from o0th/add-tmux-nova
...
tmuxPlugins.tmux-nova: init at 1.2.0
2024-06-05 09:34:41 +02:00
Alyssa Ross
f27b3096c3
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/os-specific/linux/util-linux/default.nix
2024-06-04 13:31:26 +01:00
Sigmanificient
d48a9bb622
treewide: remove unused fetchpatch arguments
2024-06-04 12:40:25 +02:00
github-actions[bot]
c5a290d7d7
Merge master into staging-next
2024-06-04 00:02:20 +00:00
Artturin
0e2ddadf23
Merge pull request #316912 from JohnRTitor/ananicy-cpp-patch
...
ananicy-cpp: enable regex support
2024-06-03 22:33:16 +03:00
github-actions[bot]
ddde12c6f7
Merge master into staging-next
2024-06-03 18:02:09 +00:00
Eelco Dolstra
8d2a765adf
Let-float various fromJSON calls to avoid repeated JSON reading/parsing
...
Some of these were read/parsed dozens of times in a `nix search`
invocation, and in particular the MELPA recipes archive (3 MiB) was
read 4 times.
2024-06-03 18:52:42 +02:00
John Titor
9f5f2746ad
ananicy-cpp: move to by-name
2024-06-03 18:35:17 +05:30
Sandro Jäckel
41452802cb
treewide: fix all obviously wrong mkEnableOptions
2024-06-03 13:20:32 +02:00
github-actions[bot]
97d15b22bf
Merge master into staging-next
2024-06-02 18:01:10 +00:00
Sandro
380c5735c0
Merge pull request #309334 from Yarny0/foomatic-db-update
2024-06-02 17:58:13 +02:00
Weijia Wang
0d36eb85bb
Merge pull request #311106 from r-ryantm/auto-update/lilypond-unstable
...
lilypond-unstable: 2.25.15 -> 2.25.16
2024-06-02 16:37:05 +02:00
o0th
0a32172a22
tmuxPlugins.tmux-nova: init at 1.2.0
2024-06-02 12:23:47 +02:00
github-actions[bot]
f4392ae842
Merge master into staging-next
2024-06-01 18:01:06 +00:00
Artturin
3be6823649
Merge pull request #270437 from mtzanidakis/fix/cups-brother-hl1210w
...
cups-brother-hl1210w: fix ppd symlink path
2024-06-01 16:12:07 +03:00
github-actions[bot]
f7de25c01e
Merge master into staging-next
2024-06-01 12:01:11 +00:00
Vladimír Čunát
5804775d03
Merge branch 'staging' into staging-next
2024-05-31 07:30:41 +02:00
Marek Maksimczyk
0fa6932b80
tmuxPlugins.session-wizard: 1.2.0 -> 1.3.1
2024-05-30 14:23:33 +02:00
