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 #183

Merged
merged 1,033 commits into from
Dec 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1033 commits
Select commit Hold shift + click to select a range
6e85d2a
Merge pull request #273298 from fabaff/dulwich-bump
fabaff Dec 11, 2023
36635a3
Merge pull request #273299 from fabaff/youtokentome
fabaff Dec 11, 2023
0da7306
Merge pull request #273300 from fabaff/nvdlib-bump
fabaff Dec 11, 2023
7d6c358
Merge pull request #273094 from fabaff/google-ai-generativelanguage-bump
fabaff Dec 11, 2023
ec14b74
python311Packages.ical: 6.1.0 -> 6.1.1
fabaff Dec 11, 2023
7c3de90
sigma-cli: 0.7.10 -> 0.7.11
fabaff Dec 11, 2023
e915c12
python311Packages.hatasmota: 0.7.3 -> 0.8.0
fabaff Dec 11, 2023
a95164a
python311Packages.hatasmota: refactor
fabaff Dec 11, 2023
3b13bd5
stdenv: Avoid some list allocations in check-meta when checking licenses
adisbladis Nov 24, 2023
9a0a097
stdenv: Avoid allocating intermediate attrset when checking meta vali…
adisbladis Nov 24, 2023
14655c8
binaryen: fix build with Node 20
K900 Dec 11, 2023
3b235f0
akkoma-frontends.admin-fe: build with Node 18
K900 Dec 11, 2023
d3edf81
python311Packages.zeroconf: 0.128.0 -> 0.128.4
fabaff Dec 11, 2023
c721fa2
Merge pull request #272488 from r-ryantm/auto-update/trivy
fabaff Dec 11, 2023
1053f30
linux_testing: 6.7-rc4 -> 6.7-rc5
K900 Dec 11, 2023
b52a113
linux_6_6: 6.6.5 -> 6.6.6
K900 Dec 11, 2023
082f3bc
linux_6_1: 6.1.66 -> 6.1.67
K900 Dec 11, 2023
4d0a013
homepage-dashboard: mark as broken for darwin
jnsgruk Dec 11, 2023
17f6e20
signal-desktop: refactor to make nix-update work
Mic92 Dec 9, 2023
306b3a1
Merge pull request #273527 from K900/kernels-20231211
K900 Dec 11, 2023
6ac7b92
Merge master into staging-next
github-actions[bot] Dec 11, 2023
287f916
Merge pull request #273433 from Nyabinary/vinegar
Lassulus Dec 11, 2023
cdc24ab
nixos/networking-interfaces: fix rootless ping
rnhmjoj Dec 11, 2023
6c8fb49
Merge pull request #273004 from hercules-ci/attrset-path-longest-prefix
roberth Dec 11, 2023
3ce2a25
strelka: add aarch64-linux support
wegank Dec 11, 2023
dc3322c
Merge pull request #273496 from r-ryantm/auto-update/clojure
thiagokokada Dec 11, 2023
6087889
Merge pull request #273424 from wegank/flwrap-stdenv
wegank Dec 11, 2023
3509303
Merge pull request #273504 from xrelkd/update/leftwm
wegank Dec 11, 2023
0e067ac
Merge pull request #273476 from aaronjheng/poretools
wegank Dec 11, 2023
11f7634
Merge pull request #272859 from wineee/deepin-icon-theme
wegank Dec 11, 2023
48b286b
Merge #273521: node 20 fixes
vcunat Dec 11, 2023
723cb64
Merge pull request #273515 from fabaff/ical-bump
fabaff Dec 11, 2023
80288e8
Merge pull request #273513 from fabaff/setupmeta-bump
fabaff Dec 11, 2023
a7b096a
Merge pull request #273512 from fabaff/asyauth-bump
fabaff Dec 11, 2023
5d79d9d
Merge pull request #273511 from fabaff/checkov-bump
fabaff Dec 11, 2023
34cbd93
openclonk: unbreak
wegank Dec 11, 2023
4d41816
uri: fix build on darwin
wegank Dec 11, 2023
b477b25
Merge pull request #271485 from Julow/ocaml-merlin-413
vbgl Dec 11, 2023
433d288
ariang: 1.3.6 -> 1.3.7
r-ryantm Dec 11, 2023
4979032
nixos/firejail: fix typo
SharzyL Dec 11, 2023
c23bbf7
Merge pull request #273507 from r-ryantm/auto-update/commitizen
lovesegfault Dec 11, 2023
dfb574c
planify: 4.1.4 -> 4.2.1
bobby285271 Dec 10, 2023
3b47d93
Merge pull request #273505 from r-ryantm/auto-update/cockpit
wegank Dec 11, 2023
18a9245
Merge pull request #273498 from r-ryantm/auto-update/cmctl
wegank Dec 11, 2023
590ef4e
Merge pull request #273245 from r-ryantm/auto-update/cargo-nextest
wegank Dec 11, 2023
4f860d3
Merge pull request #273193 from r-ryantm/auto-update/rocketchat-desktop
wegank Dec 11, 2023
78c754d
Merge pull request #273149 from r-ryantm/auto-update/davix
wegank Dec 11, 2023
7e0c488
Merge pull request #273120 from r-ryantm/auto-update/typos
wegank Dec 11, 2023
b708167
Merge pull request #273100 from r-ryantm/auto-update/calc
wegank Dec 11, 2023
cf2bc06
Merge pull request #273057 from r-ryantm/auto-update/sqldef
wegank Dec 11, 2023
38ac86c
Merge pull request #273031 from r-ryantm/auto-update/colima
wegank Dec 11, 2023
a3c60d2
nixos/nginx: make redirect status code configurable
Misterio77 Dec 1, 2023
8cc587b
Merge pull request #273522 from fabaff/hatasmota-bump
fabaff Dec 11, 2023
f9b3422
Merge pull request #273525 from fabaff/zeroconf-bump
fabaff Dec 11, 2023
db46548
Merge pull request #273523 from fabaff/sigma-cli-bump
fabaff Dec 11, 2023
3a47ec5
pantheon.appcenter: 7.4.0 -> 7.4.0-unstable-2023-12-04
bobby285271 Dec 10, 2023
fed0cb1
pantheon.elementary-feedback: Backport AppStream 1.0 build fix
bobby285271 Dec 10, 2023
2a26ff2
python311Packages.aws-sam-translator: 1.81.0 -> 1.82.0
fabaff Dec 11, 2023
4c1fd03
python311Packages.aws-lambda-builders: 1.42.0 -> 1.43.0
fabaff Dec 11, 2023
cd1eb08
hydra_unstable: add patch for fixing accessing git inputs on flakes
NickCao Dec 10, 2023
d93ab46
Merge pull request #261158 from NeverBehave/passmark-performance-test
NickCao Dec 11, 2023
6a25807
Merge pull request #271379 from pineapplehunter/circt-split-llvm
NickCao Dec 11, 2023
de92641
Merge pull request #199993 from wentasah/oauth2ms
NickCao Dec 11, 2023
15fe353
Merge pull request #273209 from katexochen/upx/4-2-1
NickCao Dec 11, 2023
81f5471
adw-gtk3: 5.1 -> 5.2
ciferkey Dec 11, 2023
d500f5a
Merge pull request #273501 from jnsgruk/homepage-dashboard-0.8.3
NickCao Dec 11, 2023
853559a
Merge pull request #273484 from r-ryantm/auto-update/genact
NickCao Dec 11, 2023
2c7703f
Merge pull request #273554 from ciferkey/master
NickCao Dec 11, 2023
5396aeb
Merge pull request #273506 from teutat3s/keycloak-23.0.1
NickCao Dec 11, 2023
6e9bc19
Merge pull request #273545 from SharzyL/firejail-fix-typo
NickCao Dec 11, 2023
df7f08b
Merge pull request #273546 from r-ryantm/auto-update/ariang
NickCao Dec 11, 2023
02293e9
Merge pull request #268089 from ereslibre/bump-unison
NickCao Dec 11, 2023
94d828a
corectrl: 1.3.6 -> 1.3.8
K900 Dec 11, 2023
a1c4054
pkgs/anki: add qtsvg to inputs to fix anki theme
euank Dec 11, 2023
4d61713
Merge pull request #273550 from fabaff/aws-lambda-builders-bump
NickCao Dec 11, 2023
9670702
free42: 3.1 -> 3.1.2
AndersonTorres Dec 11, 2023
d393ca6
Merge pull request #273368 from LeSuisse/quickjs-2023-12-09
NickCao Dec 11, 2023
197e9c2
Merge pull request #273354 from jvanbruegge/tandoor-import
NickCao Dec 11, 2023
20dc588
Merge pull request #273346 from wegank/yargy-fix
NickCao Dec 11, 2023
07c4539
Merge pull request #273429 from wegank/non-gcc-13
NickCao Dec 11, 2023
d76f20a
Merge pull request #273428 from wegank/xqilla-gcc-13
NickCao Dec 11, 2023
2be3474
Merge pull request #273426 from wegank/drumgizmo-gcc-13
NickCao Dec 11, 2023
cc4c44d
Merge pull request #273478 from jtbx/dmd+dtools-2.106.0
wegank Dec 11, 2023
336c61e
xed-editor: Backport libxml2 2.12 build fix
bobby285271 Dec 11, 2023
c4aaf5a
Merge pull request #272763 from MultisampledNight/rare-1.10.6
wegank Dec 11, 2023
6ceba1e
Merge pull request #272637 from flexiondotorg/lima-bin-0.19.0
wegank Dec 11, 2023
cdf0763
Merge pull request #272581 from nh2/nebula-1.8.0
wegank Dec 11, 2023
4485f3f
Merge pull request #272563 from ajaxbits/paperless-ngx-210-bump
wegank Dec 11, 2023
994c998
Merge pull request #272335 from r-ryantm/auto-update/okteto
wegank Dec 11, 2023
0ff62f0
path-of-building.data: 2.35.5 -> 2.36.1
K900 Dec 11, 2023
c340f89
Merge pull request #273574 from K900/pob-2.36.1
K900 Dec 11, 2023
2cbcae3
Merge pull request #273422 from Gerg-L/spicetify
NickCao Dec 11, 2023
1a6dc42
python311Packages.virt-firmware: init at 23.10 (#267914)
lheckemann Dec 11, 2023
6d69646
Merge pull request #273399 from niklaskorz/update-pocketbase
NickCao Dec 11, 2023
5b561ab
Merge pull request #273392 from TornaxO7/bump/rio
wegank Dec 11, 2023
9f20b6b
dependency-track-exporter: init at 0.1.2
fabaff Dec 11, 2023
64834cb
Merge pull request #273486 from r-ryantm/auto-update/kor
NickCao Dec 11, 2023
f09a822
Merge pull request #273331 from GaetanLepage/pymc
natsukium Dec 11, 2023
ecd6250
Merge pull request #273448 from wegank/loki-stdenv
wegank Dec 11, 2023
1cb5fc7
Merge pull request #273447 from wegank/opendbx-stdenv
wegank Dec 11, 2023
6ee016b
Merge pull request #273551 from fabaff/aws-sam-translator-bump
NickCao Dec 11, 2023
e5307b7
Merge pull request #273196 from nbraud/mpvScripts/webtorrent-mpv-hook
wegank Dec 11, 2023
0db55fa
Merge pull request #273488 from GaetanLepage/imageio
NickCao Dec 11, 2023
f19c975
faircamp: 0.8.0 -> 0.11.0
fgaz Dec 7, 2023
c813731
Merge pull request #273464 from wahjava/update-squid
7c6f434c Dec 11, 2023
50a1ab8
linux-firmware: 20231111 -> 20231211
K900 Dec 11, 2023
120a26f
Merge #271377: staging-next 2023-12-01
vcunat Dec 11, 2023
e863791
Merge pull request #273357 from wegank/dynd-gcc
wegank Dec 11, 2023
581adae
Merge pull request #273467 from adisbladis/lib-pipe-no-let
infinisil Dec 11, 2023
b1baf4c
Merge pull request #272574 from GaetanLepage/harpoon
teto Dec 11, 2023
3cb0c31
Merge pull request #272964 from NixOS/pr/opensubdiv_no_cuda
Dec 11, 2023
a9bf124
Merge pull request #273232 from SuperSamus/wine-update
7c6f434c Dec 11, 2023
711f215
circt: 1.59.0 -> 1.61.0
r-ryantm Dec 11, 2023
5812c53
Merge pull request #273474 from adisbladis/lib-cmakeOptionType-static…
infinisil Dec 11, 2023
6d8c222
Merge pull request #273470 from adisbladis/lib-tohexstring-static-values
infinisil Dec 11, 2023
04efefa
Merge pull request #273473 from adisbladis/lib-isConvertibleToString-…
infinisil Dec 11, 2023
5a3965e
python3Packages.torch: gate NCCL with cudaSupport
Dec 11, 2023
df774e4
Merge pull request #273420 from wegank/openclonk-aarch64
lheckemann Dec 11, 2023
4c16b1d
platformsh: 4.10.0 -> 4.11.4
suntropez Dec 11, 2023
1b789cb
diopser: fix build with gcc 11+
wegank Dec 11, 2023
a8dac2f
Merge pull request #273444 from wegank/uri-clang
wegank Dec 11, 2023
5e76843
Merge pull request #273582 from K900/linux-firmware-20231211
K900 Dec 11, 2023
5e2f2f9
Merge pull request #273564 from K900/corectrl-1.3.8
K900 Dec 11, 2023
6221bbd
footswitch: migrate to pkgs/by-name
Anomalocaridid Dec 11, 2023
b8dec75
Merge pull request #272117 from seanybaggins/add-mingw32-support-free…
wegank Dec 11, 2023
351a90c
pict-rs: 0.4.5 -> 0.4.6
K900 Dec 11, 2023
b42e01a
i3-balance-workspace: add mainProgram
pacien Dec 11, 2023
4727ba5
rss2email: add mainProgram
pacien Dec 11, 2023
aa02b28
Merge pull request #272184 from aaronjheng/pachyderm
Mindavi Dec 11, 2023
a0f4924
Merge pull request #273510 from rnhmjoj/pr-fix-ping
mweinelt Dec 11, 2023
aacd6d5
Merge pull request #273616 from K900/pict-rs-0.4.6
K900 Dec 11, 2023
afe86aa
footswitch: unstable-2022-04-12 -> unstable-2023-10-10
Anomalocaridid Dec 11, 2023
d1b0a4a
Merge pull request #270146 from Stunkymonkey/ploticus-remove-override…
Mindavi Dec 11, 2023
56a83d3
Merge pull request #268625 from GetPsyched/atlauncher
Mindavi Dec 11, 2023
7fa9037
Merge pull request #268522 from panicgh/bogofilter
Mindavi Dec 11, 2023
f736b49
Merge pull request #268215 from t4ccer/t4/fix-static-blink
Mindavi Dec 11, 2023
35c0470
eigenmath: unstable-2023-11-17 -> unstable-2023-12-11
r-ryantm Dec 11, 2023
e1892d2
blender: 4.0.1 -> 4.0.2 (#272559)
dritter Dec 11, 2023
3c1873e
Merge pull request #273594 from ConnorBaker/fix/pytorch-fix-gate-nccl…
Dec 11, 2023
086f558
shattered-pixel-dungeon: fix crash on startup
fgaz Dec 11, 2023
894467a
Merge pull request #273048 from SomeoneSerge/fix/cudatoolkit-hook-pro…
Dec 11, 2023
f4e620a
howl: set meta.mainProgram
pacien Dec 11, 2023
4e573fa
gscan2pdf: set meta.mainProgram
pacien Dec 11, 2023
1dfada3
urlscan: set meta.mainProgram
pacien Dec 11, 2023
01abc57
notmuch-addrlookup: set meta.mainProgram
pacien Dec 11, 2023
d67b73e
notmuch: set meta.mainProgram
pacien Dec 11, 2023
2320ecc
unison: set meta.mainProgram
pacien Dec 11, 2023
2cf28bb
beamerpresenter: set meta.mainProgram
pacien Dec 11, 2023
2ffd712
mdctags: set meta.mainProgram
pacien Dec 11, 2023
4b1cb34
matrix-appservice-discord: set meta.mainProgram
pacien Dec 11, 2023
53c19ef
rmfakecloud: set meta.mainProgram
pacien Dec 11, 2023
960547b
zrepl: set meta.mainProgram
pacien Dec 11, 2023
8a4824d
colordiff: set meta.mainProgram
pacien Dec 11, 2023
0cbd244
Merge pull request #273568 from atorres1985-contrib/free42
Mindavi Dec 11, 2023
9793888
signalbackup-tools: 20231114 -> 20231211
malob Dec 11, 2023
c51dd87
Merge pull request #273292 from r-ryantm/auto-update/moodle
LeSuisse Dec 11, 2023
24f6a70
fasm: add missing phase hooks
drupol Dec 11, 2023
605197b
dsdcc: use `finalAttrs` pattern
drupol Dec 11, 2023
a61937d
Merge pull request #272375 from r-ryantm/auto-update/altair
drupol Dec 11, 2023
e2b5c61
Merge pull request #272275 from r-ryantm/auto-update/arti
drupol Dec 11, 2023
8517f47
Merge pull request #273566 from euank/anki-svg
Mindavi Dec 11, 2023
e3d3bc8
Merge pull request #272952 from r-ryantm/auto-update/regbot
drupol Dec 11, 2023
8cfa000
Merge pull request #272949 from r-ryantm/auto-update/questdb
drupol Dec 11, 2023
e36b442
Merge pull request #272916 from r-ryantm/auto-update/gtree
drupol Dec 11, 2023
b582a3a
Merge pull request #272901 from r-ryantm/auto-update/saml2aws
drupol Dec 11, 2023
d9e518b
Merge pull request #272867 from r-ryantm/auto-update/apktool
drupol Dec 11, 2023
bd83c54
subnetcalc: use `finalAttrs` pattern
drupol Dec 11, 2023
edfbace
zrok: use `finalAttrs` pattern
drupol Dec 11, 2023
5079025
zef: use `finalAttrs` pattern
drupol Dec 11, 2023
dba565f
Merge pull request #273315 from r-ryantm/auto-update/xray
drupol Dec 11, 2023
2eb4a34
vtm: use `finalAttrs` pattern
drupol Dec 11, 2023
6aa414b
Merge pull request #269782 from adisbladis/stdenv-meta-tolist-license…
adisbladis Dec 11, 2023
1e66093
Merge pull request #269546 from adisbladis/stdenv-meta-no-intermediat…
adisbladis Dec 11, 2023
b555d9d
Merge pull request #269010 from malob/update-signalbackup-tools
NickCao Dec 11, 2023
eef6384
Merge pull request #272911 from manipuladordedados/master
thiagokokada Dec 11, 2023
9cde600
grafana-loki,promtail: 2.9.2 -> 2.9.3
emilylange Dec 11, 2023
9fbf0cf
Merge pull request #273069 from mfrw/mfrw/prometheus-2.48.1
Ma27 Dec 11, 2023
786cf36
python310Packages.rivet: 3.1.8 -> 3.1.9
r-ryantm Dec 10, 2023
5ba0745
mkFranzDerivation: also include libglvnd for opengl/vulkan drivers
Mic92 Nov 20, 2023
70efc8c
checkov: 3.1.31 -> 3.1.33
fabaff Dec 11, 2023
796d699
Merge pull request #273178 from nagy/nagy-swayimg
NickCao Dec 11, 2023
7c71bd5
Merge pull request #273629 from r-ryantm/auto-update/eigenmath
NickCao Dec 11, 2023
904913e
dump_syms: fix building with LLVM 16
ipetkov Dec 11, 2023
efd004c
Merge pull request #273412: gnomeExtensions: Update
piegamesde Dec 11, 2023
6b9f45a
python3.pkgs.buildsetupcfg: Remove function from python-packages-base…
adisbladis Dec 11, 2023
ef2a69c
setupcfg2nix: Remove package
adisbladis Dec 11, 2023
c68839c
Merge pull request #273614 from ipetkov/dump_syms
mweinelt Dec 11, 2023
1ee9473
firefox-beta-unwrapped: 121.0b5 -> 121.0b9
mweinelt Dec 11, 2023
25c5727
firefox-devedition-unwrapped: 121.0b5 -> 121.0b9
mweinelt Dec 11, 2023
a81c0c8
mobilizon: 4.0.0 -> 4.0.2
erictapen Dec 11, 2023
a8ecd7a
mpvScripts.sponsorblock-minimal: init at unstable-2023-08-20
Dec 10, 2023
e92546a
opencv4: drop ffmpeg_4 pin
Mic92 Nov 15, 2023
c23c5da
Merge pull request #273369 from bobby285271/upd/planify
bobby285271 Dec 11, 2023
45206eb
Merge pull request #273571 from bobby285271/upd/cinnamon-libxml2-fix
bobby285271 Dec 11, 2023
bea3c00
Merge pull request #273485 from r-ryantm/auto-update/kalign
natsukium Dec 11, 2023
30ce319
Merge pull request #273548 from bobby285271/upd/pantheon-appstream-fix
bobby285271 Dec 11, 2023
3df2965
bun: 1.0.15 -> 1.0.16
happysalada Dec 11, 2023
baed870
clisp: fix build
philiptaron Dec 9, 2023
1747ae1
Merge pull request #272668 from r-ryantm/auto-update/rtx
Kranzes Dec 12, 2023
729bd74
Merge pull request #265961 from 999eagle/feat/intiface-central
Kranzes Dec 12, 2023
8f47b40
yoda: 1.9.8 -> 1.9.9 (#273260)
veprbl Dec 12, 2023
f603fc8
Merge pull request #273667 from mweinelt/firefox-121.0b9
mweinelt Dec 12, 2023
f4a98e5
Merge pull request #273601 from suntropez/platformsh_10_11
wegank Dec 12, 2023
9a67c36
Merge pull request #273382 from wegank/strelka-aarch64
wegank Dec 12, 2023
9c5db27
Merge pull request #273600 from wegank/diopser-gcc-13
wegank Dec 12, 2023
5263c5b
Merge pull request #271709 from alven-shin/fix-pest-ide-tools
wegank Dec 12, 2023
01cfd8b
Merge pull request #273628 from Anomalocaridid/footswitch
wegank Dec 12, 2023
aa13edf
Merge pull request #273445 from wegank/bencode-stdenv
wegank Dec 12, 2023
9ea88b1
erigon: 2.54.0 -> 2.55.1
r-ryantm Dec 11, 2023
a143707
Merge pull request #273597 from r-ryantm/auto-update/circt
wegank Dec 12, 2023
9c26429
Merge pull request #273364 from wegank/swfmill-darwin
wegank Dec 12, 2023
4ad2a5f
Merge pull request #273423 from wegank/jigdo-refactor
wegank Dec 12, 2023
8f5df13
Merge pull request #273623 from pacien/rss2email-add-mainprogram
wegank Dec 12, 2023
b75852d
Merge pull request #273618 from pacien/i3-balance-workspace-add-mainp…
wegank Dec 12, 2023
d6a0fea
Merge pull request #273635 from pacien/add-meta-mainprogram-trivial
wegank Dec 12, 2023
b576bc2
apfel: 3.0.6 -> 3.1.0 (#273073)
veprbl Dec 12, 2023
18523de
release-python.nix: allow evaluation with openssl_1_1
mweinelt Dec 12, 2023
edea031
Merge pull request #273349 from r-ryantm/auto-update/zrok
drupol Dec 12, 2023
d9b360c
Merge pull request #273322 from r-ryantm/auto-update/zef
drupol Dec 12, 2023
dac1e3d
Merge pull request #272208 from r-ryantm/auto-update/fasm
drupol Dec 12, 2023
23959be
Merge pull request #272204 from r-ryantm/auto-update/dsdcc
drupol Dec 12, 2023
5d43a87
coqPackages.metacoq: update for coq 8.17 and 8.18 (#273541)
larsr Dec 12, 2023
2feabab
Merge pull request #273666 from adisbladis/setupcfg2nix-removal
FRidh Dec 12, 2023
b9e35d7
Merge pull request #272448 from drupol/php/composer-builder/filter-bat
drupol Dec 12, 2023
73a4603
clickhouse: 23.10.3.5 -> 23.11.1.2711
yuyuyureka Dec 7, 2023
663f20d
Merge pull request #272835 from r-ryantm/auto-update/subnetcalc
drupol Dec 12, 2023
37aa0ad
Merge pull request #273173 from r-ryantm/auto-update/vtm
drupol Dec 12, 2023
9c4a7e2
Merge pull request #273661 from fabaff/checkov-bump
fabaff Dec 12, 2023
a46c5b4
Merge pull request #273577 from fabaff/dependency-track-exporter
fabaff Dec 12, 2023
33b221d
Merge pull request #272804 from Vonfry/update/tdlib-1.8.22
pbsds Dec 12, 2023
867e24b
Merge pull request #272827 from r-ryantm/auto-update/nsd
hrdinka Dec 12, 2023
898f355
Merge pull request #273387 from arthsmn/sponsorblock-minimal
pbsds Dec 12, 2023
a59c736
warzone2100: fix fetch url
fgaz Dec 11, 2023
324c7bb
yq-go: 4.40.4 -> 4.40.5
katexochen Dec 12, 2023
e5a3053
php82Extensions.blackfire: block php zts builds
shyim Dec 11, 2023
ecb742f
Merge pull request #273079 from kilianar/broot-1.30.0
dywedir Dec 12, 2023
d92daec
ratman: migrate to prefetch-yarn-deps (#269285)
Stunkymonkey Dec 12, 2023
11a5040
lshw: fix static build
VergeDX Dec 12, 2023
b169e74
Merge pull request #273388 from NickCao/hydra-fix
lheckemann Dec 12, 2023
c979d0e
plasma5Packages.polonium: init at 0.6.0
peterhoeg Dec 6, 2023
b8927e2
ungoogled-chromium: add `ungoogled-` prefix to `chromium-unwrapped`
emilylange Dec 10, 2023
0eb389b
chromium: move stray patches into `./patches` directory
emilylange Dec 10, 2023
0ed60bb
chromium: fix increased build time for non-cross-compilation builds
emilylange Dec 10, 2023
3d2227a
Merge pull request #273651 from emilylange/loki
ajs124 Dec 12, 2023
ac12a78
Merge pull request #273677 from philiptaron/clisp
7c6f434c Dec 12, 2023
55ca793
Merge pull request #273741 from VergeDX/lshw
thiagokokada Dec 12, 2023
7fe7e5a
Merge pull request #273733 from katexochen/yq-go/4-40-5
nlewo Dec 12, 2023
3bb93fb
Merge pull request #271506 from Misterio77/nginx-redirect-status-code
RaitoBezarius Dec 12, 2023
1eae89b
Merge pull request #273516 from shyim/blackfire-block-zts-php
drupol Dec 12, 2023
5578364
Merge pull request #273702 from mweinelt/release-python-openssl
mweinelt Dec 12, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 1 addition & 2 deletions doc/languages-frameworks/rust.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -963,7 +963,7 @@ repository:
lib.updateManyAttrsByPath [{
path = [ "packages" "stable" ];
update = old: old.overrideScope(final: prev: {
rustc = prev.rustc.overrideAttrs (_: {
rustc-unwrapped = prev.rustc-unwrapped.overrideAttrs (_: {
src = lib.cleanSource /git/scratch/rust;
# do *not* put passthru.isReleaseTarball=true here
});
Expand Down Expand Up @@ -1003,4 +1003,3 @@ nix-build $NIXPKGS -A package-broken-by-rust-changes
The `git submodule update --init` and `cargo vendor` commands above
require network access, so they can't be performed from within the
`rustc` derivation, unfortunately.

17 changes: 8 additions & 9 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
nixpkgs = self;
};

lib = import ./lib;
libVersionInfoOverlay = import ./lib/flake-version-info.nix self;
lib = (import ./lib).extend libVersionInfoOverlay;

forAllSystems = lib.genAttrs lib.systems.flakeExposed;
in
Expand All @@ -20,13 +21,7 @@

nixosSystem = args:
import ./nixos/lib/eval-config.nix (
args // {
modules = args.modules ++ [{
system.nixos.versionSuffix =
".${final.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}.${self.shortRev or "dirty"}";
system.nixos.revision = final.mkIf (self ? rev) self.rev;
}];
} // lib.optionalAttrs (! args?system) {
args // { inherit (self) lib; } // lib.optionalAttrs (! args?system) {
# Allow system to be set modularly in nixpkgs.system.
# We set it to null, to remove the "legacy" entrypoint's
# non-hermetic default.
Expand All @@ -53,7 +48,11 @@
# attribute it displays `omitted` instead of evaluating all packages,
# which keeps `nix flake show` on Nixpkgs reasonably fast, though less
# information rich.
legacyPackages = forAllSystems (system: import ./. { inherit system; });
legacyPackages = forAllSystems (system:
(import ./. { inherit system; }).extend (final: prev: {
lib = prev.lib.extend libVersionInfoOverlay;
})
);

nixosModules = {
notDetected = ./nixos/modules/installer/scan/not-detected.nix;
Expand Down
72 changes: 72 additions & 0 deletions lib/attrsets.nix
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,19 @@ rec {

/* Return if an attribute from nested attribute set exists.

**Laws**:
1. ```nix
hasAttrByPath [] x == true
```

Example:
x = { a = { b = 3; }; }
hasAttrByPath ["a" "b"] x
=> true
hasAttrByPath ["z" "z"] x
=> false
hasAttrByPath [] (throw "no need")
=> true

Type:
hasAttrByPath :: [String] -> AttrSet -> Bool
Expand All @@ -80,6 +87,71 @@ rec {
in
hasAttrByPath' 0 e;

/*
Return the longest prefix of an attribute path that refers to an existing attribute in a nesting of attribute sets.

Can be used after [`mapAttrsRecursiveCond`](#function-library-lib.attrsets.mapAttrsRecursiveCond) to apply a condition,
although this will evaluate the predicate function on sibling attributes as well.

Note that the empty attribute path is valid for all values, so this function only throws an exception if any of its inputs does.

**Laws**:
1. ```nix
attrsets.longestValidPathPrefix [] x == []
```

2. ```nix
hasAttrByPath (attrsets.longestValidPathPrefix p x) x == true
```

Example:
x = { a = { b = 3; }; }
attrsets.longestValidPathPrefix ["a" "b" "c"] x
=> ["a" "b"]
attrsets.longestValidPathPrefix ["a"] x
=> ["a"]
attrsets.longestValidPathPrefix ["z" "z"] x
=> []
attrsets.longestValidPathPrefix ["z" "z"] (throw "no need")
=> []

Type:
attrsets.longestValidPathPrefix :: [String] -> Value -> [String]
*/
longestValidPathPrefix =
# A list of strings representing the longest possible path that may be returned.
attrPath:
# The nested attribute set to check.
v:
let
lenAttrPath = length attrPath;
getPrefixForSetAtIndex =
# The nested attribute set to check, if it is an attribute set, which
# is not a given.
remainingSet:
# The index of the attribute we're about to check, as well as
# the length of the prefix we've already checked.
remainingPathIndex:

if remainingPathIndex == lenAttrPath then
# All previously checked attributes exist, and no attr names left,
# so we return the whole path.
attrPath
else
let
attr = elemAt attrPath remainingPathIndex;
in
if remainingSet ? ${attr} then
getPrefixForSetAtIndex
remainingSet.${attr} # advance from the set to the attribute value
(remainingPathIndex + 1) # advance the path
else
# The attribute doesn't exist, so we return the prefix up to the
# previously checked length.
take remainingPathIndex attrPath;
in
getPrefixForSetAtIndex v 0;

/* Create a new attribute set with `value` set at the nested attribute location specified in `attrPath`.

Example:
Expand Down
20 changes: 20 additions & 0 deletions lib/flake-version-info.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# This function produces a lib overlay to be used by the nixpkgs
# & nixpkgs/lib flakes to provide meaningful values for
# `lib.trivial.version` et al..
#
# Internal and subject to change, don't use this anywhere else!
# Instead, consider using a public interface, such as this flake here
# in this directory, `lib/`, or use the nixpkgs flake, which applies
# this logic for you in its `lib` output attribute.

self: # from the flake

finalLib: prevLib: # lib overlay

{
trivial = prevLib.trivial // {
versionSuffix =
".${finalLib.substring 0 8 (self.lastModifiedDate or "19700101")}.${self.shortRev or "dirty"}";
revisionWithDefault = default: self.rev or default;
};
}
7 changes: 6 additions & 1 deletion lib/flake.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
description = "Library of low-level helper functions for nix expressions.";

outputs = { self }: { lib = import ./.; };
outputs = { self }:
let
lib0 = import ./.;
in {
lib = lib0.extend (import ./flake-version-info.nix self);
};
}
2 changes: 2 additions & 0 deletions lib/modules.nix
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,8 @@ let
"The option `${optText}' does not exist. Definition values:${defText}";
in
if attrNames options == [ "_module" ]
# No options were declared at all (`_module` is built in)
# but we do have unmatched definitions, and no freeformType (earlier conditions)
then
let
optionName = showOption prefix;
Expand Down
43 changes: 23 additions & 20 deletions lib/strings.nix
Original file line number Diff line number Diff line change
Expand Up @@ -715,12 +715,12 @@ rec {
getName pkgs.youtube-dl
=> "youtube-dl"
*/
getName = x:
let
parse = drv: (parseDrvName drv).name;
in if isString x
then parse x
else x.pname or (parse x.name);
getName = let
parse = drv: (parseDrvName drv).name;
in x:
if isString x
then parse x
else x.pname or (parse x.name);

/* This function takes an argument that's either a derivation or a
derivation's "name" attribute and extracts the version part from that
Expand All @@ -732,12 +732,12 @@ rec {
getVersion pkgs.youtube-dl
=> "2016.01.01"
*/
getVersion = x:
let
parse = drv: (parseDrvName drv).version;
in if isString x
then parse x
else x.version or (parse x.name);
getVersion = let
parse = drv: (parseDrvName drv).version;
in x:
if isString x
then parse x
else x.version or (parse x.name);

/* Extract name with version from URL. Ask for separator which is
supposed to start extension.
Expand Down Expand Up @@ -771,12 +771,13 @@ rec {
cmakeOptionType "string" "ENGINE" "sdl2"
=> "-DENGINE:STRING=sdl2"
*/
cmakeOptionType = type: feature: value:
assert (lib.elem (lib.toUpper type)
[ "BOOL" "FILEPATH" "PATH" "STRING" "INTERNAL" ]);
assert (lib.isString feature);
assert (lib.isString value);
"-D${feature}:${lib.toUpper type}=${value}";
cmakeOptionType = let
types = [ "BOOL" "FILEPATH" "PATH" "STRING" "INTERNAL" ];
in type: feature: value:
assert (elem (toUpper type) types);
assert (isString feature);
assert (isString value);
"-D${feature}:${toUpper type}=${value}";

/* Create a -D<condition>={TRUE,FALSE} string that can be passed to typical
CMake invocations.
Expand Down Expand Up @@ -977,9 +978,11 @@ rec {
Many types of value are coercible to string this way, including int, float,
null, bool, list of similarly coercible values.
*/
isConvertibleWithToString = x:
isConvertibleWithToString = let
types = [ "null" "int" "float" "bool" ];
in x:
isStringLike x ||
elem (typeOf x) [ "null" "int" "float" "bool" ] ||
elem (typeOf x) types ||
(isList x && lib.all isConvertibleWithToString x);

/* Check whether a value can be coerced to a string.
Expand Down
45 changes: 45 additions & 0 deletions lib/tests/misc.nix
Original file line number Diff line number Diff line change
Expand Up @@ -697,6 +697,51 @@ runTests {
expected = false;
};

testHasAttrByPathNonStrict = {
expr = hasAttrByPath [] (throw "do not use");
expected = true;
};

testLongestValidPathPrefix_empty_empty = {
expr = attrsets.longestValidPathPrefix [ ] { };
expected = [ ];
};

testLongestValidPathPrefix_empty_nonStrict = {
expr = attrsets.longestValidPathPrefix [ ] (throw "do not use");
expected = [ ];
};

testLongestValidPathPrefix_zero = {
expr = attrsets.longestValidPathPrefix [ "a" (throw "do not use") ] { d = null; };
expected = [ ];
};

testLongestValidPathPrefix_zero_b = {
expr = attrsets.longestValidPathPrefix [ "z" "z" ] "remarkably harmonious";
expected = [ ];
};

testLongestValidPathPrefix_one = {
expr = attrsets.longestValidPathPrefix [ "a" "b" "c" ] { a = null; };
expected = [ "a" ];
};

testLongestValidPathPrefix_two = {
expr = attrsets.longestValidPathPrefix [ "a" "b" "c" ] { a.b = null; };
expected = [ "a" "b" ];
};

testLongestValidPathPrefix_three = {
expr = attrsets.longestValidPathPrefix [ "a" "b" "c" ] { a.b.c = null; };
expected = [ "a" "b" "c" ];
};

testLongestValidPathPrefix_three_extra = {
expr = attrsets.longestValidPathPrefix [ "a" "b" "c" ] { a.b.c.d = throw "nope"; };
expected = [ "a" "b" "c" ];
};

testFindFirstIndexExample1 = {
expr = lists.findFirstIndex (x: x > 3) (abort "index found, so a default must not be evaluated") [ 1 6 4 ];
expected = 1;
Expand Down
8 changes: 8 additions & 0 deletions lib/tests/modules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,14 @@ checkConfigOutput '^true$' config.result ./module-argument-default.nix
# gvariant
checkConfigOutput '^true$' config.assertion ./gvariant.nix

# https://github.com/NixOS/nixpkgs/pull/131205
# We currently throw this error already in `config`, but throwing in `config.wrong1` would be acceptable.
checkConfigError 'It seems as if you.re trying to declare an option by placing it into .config. rather than .options.' config.wrong1 ./error-mkOption-in-config.nix
# We currently throw this error already in `config`, but throwing in `config.nest.wrong2` would be acceptable.
checkConfigError 'It seems as if you.re trying to declare an option by placing it into .config. rather than .options.' config.nest.wrong2 ./error-mkOption-in-config.nix
checkConfigError 'The option .sub.wrong2. does not exist. Definition values:' config.sub ./error-mkOption-in-submodule-config.nix
checkConfigError '.*This can happen if you e.g. declared your options in .types.submodule.' config.sub ./error-mkOption-in-submodule-config.nix

# types.pathInStore
checkConfigOutput '".*/store/0lz9p8xhf89kb1c1kk6jxrzskaiygnlh-bash-5.2-p15.drv"' config.pathInStore.ok1 ./types.nix
checkConfigOutput '".*/store/0fb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15"' config.pathInStore.ok2 ./types.nix
Expand Down
14 changes: 14 additions & 0 deletions lib/tests/modules/error-mkOption-in-config.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{ lib, ... }:
let
inherit (lib) mkOption;
in
{
wrong1 = mkOption {
};
# This is not actually reported separately, so could be omitted from the test
# but it makes the example more realistic.
# Making it parse this _config_ as options would too risky. What if it's not
# options but other values, that abort, throw, diverge, etc?
nest.wrong2 = mkOption {
};
}
12 changes: 12 additions & 0 deletions lib/tests/modules/error-mkOption-in-submodule-config.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{ lib, ... }:
let
inherit (lib) mkOption;
in
{
options.sub = lib.mkOption {
type = lib.types.submodule {
wrong2 = mkOption {};
};
default = {};
};
}
Loading