Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from NixOS:master #160

Merged
merged 978 commits into from
Oct 29, 2023
Merged

[pull] master from NixOS:master #160

merged 978 commits into from
Oct 29, 2023

Conversation

pull[bot]
Copy link

@pull pull bot commented Oct 27, 2023

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

@pull pull bot added the ⤵️ pull label Oct 28, 2023
flokli and others added 29 commits October 28, 2023 16:54
qdl: 2021-05-06 > 2023-04-11
anilibria-winmaclinux: build with libvlc
opkg: Fix localstatedir and sysconfdir
alacritty-theme: init at unstable-2023-10-12
nginxModules.vod: 1.31 -> 1.32 and patch MAX_CLIPS
nginxModules.videothumb-extractor: unstable -> 1.0.0 and switch to ffmpeg-headless
tradingview: fix directory structure (and desktop icon)
pbsds and others added 29 commits October 29, 2023 18:15
Revert "nixos/activation: remove specialfs activationScript"
When using iproute2's ip binary, you can omit the dev parameter, e.g. ip link set up eth0 instead of ip link set up dev eth0.

This breaks if for some reason your device is named e.g. he, hel, … because it is interpreted as ip link set up help.

I just encountered this bug using networking.bridges trying to create an interface named he.

I used a grep on nixpkgs to try to find iproute2 invocations using variables without the dev keyword, and found a few, and fixed them by providing the dev keyword.

I merely fixed what I found, but the use of abbreviated commands makes it a bit hard to be sure everything has been found (e.g. ip l set … up instead of ip link set … up).
kotlin-language-server: 1.3.5 -> 1.3.7
* luarocks-packages-updater: init

Goal is to make it possible to maintain out-of-tree luarocks packages
without needing to clone nixpkgs.

maintainers/scripts/update-luarocks-packages gets renamed to
pkgs/development/lua-modules/updater/updater.py

Once merged you can run for instance
nix run nixpkgs#luarocks-packages-updater -- -i contrib/luarocks-packages.csv -o contrib/generated-packages.nix

I also set the parallelism (--proc) to 1 by default else luarocks fails
because of luarocks/luarocks#1540

* Update maintainers/scripts/pluginupdate.py

Co-authored-by: Marc Jakobi <[email protected]>

---------

Co-authored-by: Marc Jakobi <[email protected]>
Remove mistakenly committed test output
telegram-desktop: 4.8.4 -> 4.11.1
It is a better name for this file, after all.
chromium{Beta,Dev},google-chrome-{beta,dev}: drop
…fs-decryption

systemd-stage-1: bcachefs decryption
cmus: ffmpeg 6 compatibility fix
nixos/sslh: update and refactor for RFC42
@pull pull bot merged commit 800965c into tomodachi94:master Oct 29, 2023
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.