+15
doc/contributing/coding-conventions.chapter.md
+15
doc/contributing/coding-conventions.chapter.md
···+- Filling lists condionally _should_ be done with `lib.optional(s)` instead of using `if cond then [ ... ] else null` or `if cond then [ ... ] else [ ]`.+As an exception, an explicit conditional expression with null can be used when fixing a important bug without triggering a mass rebuild.+If this is done a follow up pull request _should_ be created to change the code to `lib.optional(s)`.- Arguments should be listed in the order they are used, with the exception of `lib`, which always goes first.
+6
maintainers/maintainer-list.nix
+6
maintainers/maintainer-list.nix
···
+107
-5
nixos/modules/services/web-apps/nextcloud.nix
+107
-5
nixos/modules/services/web-apps/nextcloud.nix
·········${optionalString (c.defaultPhoneRegion != null) "'default_phone_region' => '${c.defaultPhoneRegion}',"}
·········+${optionalString (c.dbpassFile != null) "'dbpassword' => nix_read_secret('${c.dbpassFile}'),"}${optionalString (c.defaultPhoneRegion != null) "'default_phone_region' => '${c.defaultPhoneRegion}',"}
+11
-11
pkgs/applications/editors/eclipse/default.nix
+11
-11
pkgs/applications/editors/eclipse/default.nix
······url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";-sha512 = "3ggqiwa1nfszdqzdzw1lzs1sdikkvh2fqq10bqjxsq7xdxkis4zix8g4jcjiwlsz5gz98s61gp0k4m5rqsj0krpklxs9ijwq76khc7z";···url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz";-sha512 = "38cdhy6v8jmndanvl3bimfs3pnlnl3w066fqrljy2hwki58gqmxxmbld5mphbh9y5kz9b5kiqvhx06sf0l2ywbarxy9wfhynvzb2k17";···url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";-sha512 = "2chshmn09xdq42nix0jqryhac33xc5sg7nlp2vfmz5km6q4m6mc1k7pw10jmg86zzcvcsdl9k1wkrbcsj5y2gv4cg6rddzsbx9hw3s7";···url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";-sha512 = "308sszkmp5lkva5hfb1qc5cy9b1wajas96xz5nwjl7dm2fn4saiwg3ifh71hzq59wf337hndlb2c2dp6yczsfp3mzfqmsi5a3z7dchr";···url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz";-sha512 = "1wp3g85bsmv0mbpk76adsz1rzd3vbdn4y4ddv9z41bq96wi9npmybidckvwnrq57lbj8k5g8m0x0f1nhj2rv5bqbsnqjxjpknwa6is0";···url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-x86_64.tar.gz";-sha512 = "35v8kjpdlhbcxncqygx7c1kjqy1644c6rhrasg8gxnrhlc69zblf4nvgzf1894vd13qzpkzzxx0qll49933prnw98dqkrd0wxcx7f49";···url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz";-sha512 = "1jj5h69d4814j1mq6fjd47vkswq7bshbh2flgzmn8ibs0ys67x0nd2lm2ksxmvnipj4j9rw3mh9fmw8m0dzpp41c6q8xxfa93c7pqyg";···url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";-sha512 = "19fr63bdifxqp6imgb4d7v5dnkn9i0n2wmr08xzb0ph425ib936jiw84c2nwnsfnljh0yfj1r3wd36y2nn52fsj6ginl8plc6pi5416";
······url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";+sha512 = "3xdj7b0mlhdys9q4l19kkf1hm0d67dwx55gzfmgv90nvswv0jhyvs42my4wrlrmkh6lz8m0z6dakadhl1bxf2fd8pdp5sm4bv0w0gwc";···url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz";+sha512 = "20xy4vzqlmg4sdvqimz2nc212vb45k5kwh40qagm13r6h3vfv3yrl8bznnappaf4msfa9xdaxns2kz0x94hw444zjmrnbf7614a48xi";···url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";+sha512 = "29hab3ha3spk0048k3mf2x5m80hlh1l6nazsykx0xxrqy9vdkdibv6mq74dzf1n93h1bd5qh9axicnhs465kp7r1irdl04761c1wibi";···url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";+sha512 = "3ag7nfpnn1149gkva58x0037pbdb5wds0qpwv21lif7a6b1a1n7g2n056bn43a7fkxkkj38752gkz29nvqh5g8hqkg29lax8sjlm7sm";···url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz";+sha512 = "27h5wjr4k0jhi256rk74kbjbm5h7xi4hbml89n1jhppq1yfyv2mf75zb32iaia2pxclx6hc0cd1hvq85fwvcshnq79fw8za687yvbhv";···url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-x86_64.tar.gz";+sha512 = "03li2bkhkdybwp411xs8i3cp2hmrfg2xd7inbdsxh07y4b9806spi3q10vga97m7ngl6fl5n0mvgxwj8dbdvp133wn9mgrlajb1n4n8";···url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz";+sha512 = "38xwwvg59bdp0a6brmcvq0wlfikik0wnqq897abf5a8vyr0ci7xp5f4ii90x2l5sj5gmcc6jiwvi99c03cjbgivpalr741yka0p3pv5";···url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";+sha512 = "30hhy83lmjldcwwbjpk5q9zjai5r3xyhlrddalgrw8mspknayncaa2l32gg327fw0a8qaakzgwkh68gj81pmk3dps5wzy881pf22dhc";
+2
-2
pkgs/applications/editors/eclipse/plugins.nix
+2
-2
pkgs/applications/editors/eclipse/plugins.nix
···url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/${lib.versions.majorMinor version}/${name}/${name}.zip";
···url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/${lib.versions.majorMinor version}/${name}/${name}.zip";
+2
-2
pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix
+2
-2
pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix
+2
-2
pkgs/applications/editors/texstudio/default.nix
+2
-2
pkgs/applications/editors/texstudio/default.nix
···
···
+2
-2
pkgs/applications/kde/default.nix
+2
-2
pkgs/applications/kde/default.nix
+1
-1
pkgs/applications/kde/fetch.sh
+1
-1
pkgs/applications/kde/fetch.sh
+35
pkgs/applications/networking/cozy-drive/default.nix
+35
pkgs/applications/networking/cozy-drive/default.nix
···
···+url = "https://github.com/cozy-labs/cozy-desktop/releases/download/v${version}/Cozy-Drive-${version}-x86_64.AppImage";+description = "Cozy Drive is a synchronization tool for your files and folders with Cozy Cloud.";
+2
-2
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+2
-2
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
······url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
······url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
+10
pkgs/applications/networking/irc/catgirl/default.nix
+10
pkgs/applications/networking/irc/catgirl/default.nix
···
+3
-3
pkgs/applications/networking/remote/vmware-horizon-client/default.nix
+3
-3
pkgs/applications/networking/remote/vmware-horizon-client/default.nix
······-url = "https://download3.vmware.com/software/view/viewclients/CART22FQ1/VMware-Horizon-Client-Linux-2103-8.2.0-17742757.tar.gz";
······+url = "https://download3.vmware.com/software/view/viewclients/CART22FQ2/VMware-Horizon-Client-Linux-2106.1-8.3.1-18435609.tar.gz";
+2
-2
pkgs/applications/networking/remote/vmware-horizon-client/update.sh
+2
-2
pkgs/applications/networking/remote/vmware-horizon-client/update.sh
···-entryPointURL='https://my.vmware.com/channel/public/api/v1.0/products/getRelatedDLGList?locale=en_US&category=desktop_end_user_computing&product=vmware_horizon_clients&version=horizon_8&dlgType=PRODUCT_BINARY'-@uri "https://my.vmware.com/channel/public/api/v1.0/dlg/details?locale=en_US&downloadGroup=\(.code)&productId=\(.productId)&rPId=\(.releasePackageId)"
···+entryPointURL='https://customerconnect.vmware.com/channel/public/api/v1.0/products/getRelatedDLGList?locale=en_US&category=desktop_end_user_computing&product=vmware_horizon_clients&version=horizon_8&dlgType=PRODUCT_BINARY'+@uri "https://customerconnect.vmware.com/channel/public/api/v1.0/dlg/details?locale=en_US&downloadGroup=\(.code)&productId=\(.productId)&rPId=\(.releasePackageId)"
+10
-7
pkgs/applications/science/chemistry/siesta/default.nix
+10
-7
pkgs/applications/science/chemistry/siesta/default.nix
······
······
+12
-4
pkgs/development/interpreters/perl/default.nix
+12
-4
pkgs/development/interpreters/perl/default.nix
············++ optionals ((builtins.match ''5\.[0-9]*[13579]\..+'' version) != null) [ "-Dusedevel" "-Uversiononly" ]
······+url = "https://github.com/arsv/perl-cross/commit/3c318ae6572f8b36cb077c8b49c851e2f5fe181e.patch";······++ optionals ((builtins.match ''5\.[0-9]*[13579]\..+'' version) != null) [ "-Dusedevel" "-Uversiononly" ]
+23
pkgs/development/libraries/restinio/default.nix
+23
pkgs/development/libraries/restinio/default.nix
···
···+url = "https://github.com/Stiffstream/restinio/releases/download/v.${version}/${pname}-${version}-full.tar.bz2";+tar -xjf $downloadedFile --strip-components=3 -C $out/include/restinio --wildcards "*/dev/restinio"+description = "Cross-platform, efficient, customizable, and robust asynchronous HTTP/WebSocket server C++14 library";
+1
-1
pkgs/development/libraries/science/biology/elastix/default.nix
+1
-1
pkgs/development/libraries/science/biology/elastix/default.nix
+6
-6
pkgs/development/node-packages/default.nix
+6
-6
pkgs/development/node-packages/default.nix
···-sha512 = "sha512-+eZtWIL6hnOKUOvqq9WLBzSw2d/EbTmOx1Td1LI8/0XE40ctXMLG2N1p6NK5/+yivGaoNJ9PDpPsPL9lO4nJrQ==";-url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.1.0-24.c22652b7e418506fab23052d569b85d3aec4883f.tgz";-sha512 = "sha512-6NEp0VlLho3hVtIvj2P4h0e19AYqQSXtFGts8gSIXDnV+l5pRFZaDMfGo2RiLMR0Kfrs8c3ZYxYX0sWmVL0tWw==";
···+sha512 = "sha512-o8+DH0RD5DbP8QTZej2dsY64yvjOwOG3TWOlJyoCHQ+8DH9m4tzxo38j6IF/PqpN4PmAGPpHuNi/nssG1cvYlQ==";+url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.2.0-34.afdab2f10860244038c4e32458134112852d4dad.tgz";+sha512 = "sha512-MiZORXXsGORXTF9RqqKIlN/2ohkaxAWTsS7qxDJTy5ThTYLrXSmzxTSohM4qN/AI616B+o5WV7XTBhjlPKSufg==";
+2
-2
pkgs/development/python-modules/ailment/default.nix
+2
-2
pkgs/development/python-modules/ailment/default.nix
···
···
+2
-2
pkgs/development/python-modules/angr/default.nix
+2
-2
pkgs/development/python-modules/angr/default.nix
···
···
+2
-2
pkgs/development/python-modules/angrop/default.nix
+2
-2
pkgs/development/python-modules/angrop/default.nix
···
···
+2
-2
pkgs/development/python-modules/archinfo/default.nix
+2
-2
pkgs/development/python-modules/archinfo/default.nix
+2
-2
pkgs/development/python-modules/claripy/default.nix
+2
-2
pkgs/development/python-modules/claripy/default.nix
···
···
+2
-2
pkgs/development/python-modules/cle/default.nix
+2
-2
pkgs/development/python-modules/cle/default.nix
······
······
+2
-9
pkgs/development/python-modules/graphene/default.nix
+2
-9
pkgs/development/python-modules/graphene/default.nix
···-url = "https://github.com/graphql-python/graphene/commit/26b16f75b125e35eeb2274b7be503ec29f2e8a45.patch";
···
+8
-8
pkgs/development/python-modules/liquidctl/default.nix
+8
-8
pkgs/development/python-modules/liquidctl/default.nix
······
······
+2
-2
pkgs/development/python-modules/pyvex/default.nix
+2
-2
pkgs/development/python-modules/pyvex/default.nix
+5
-2
pkgs/development/python-modules/spacy-transformers/default.nix
+5
-2
pkgs/development/python-modules/spacy-transformers/default.nix
······
······
+2
-2
pkgs/development/python-modules/spacy/annotation-test/annotate.py
+2
-2
pkgs/development/python-modules/spacy/annotation-test/annotate.py
+15
-15
pkgs/development/python-modules/spacy/default.nix
+15
-15
pkgs/development/python-modules/spacy/default.nix
······
······
+110
-110
pkgs/development/python-modules/spacy/models.json
+110
-110
pkgs/development/python-modules/spacy/models.json
···
···
+19
-19
pkgs/development/python-modules/thinc/default.nix
+19
-19
pkgs/development/python-modules/thinc/default.nix
······
······
+3
-3
pkgs/development/tools/database/prisma-engines/default.nix
+3
-3
pkgs/development/tools/database/prisma-engines/default.nix
···
···
+2
-2
pkgs/development/tools/database/sqlfluff/default.nix
+2
-2
pkgs/development/tools/database/sqlfluff/default.nix
···
···
+16
-3
pkgs/development/tools/go-containerregistry/default.nix
+16
-3
pkgs/development/tools/go-containerregistry/default.nix
···[ "-s" "-w" "-X ${t}/cmd/crane/cmd.Version=v${version}" "-X ${t}/pkg/v1/remote/transport.Version=${version}" ];···description = "Tools for interacting with remote images and registries including crane and gcrane";
···[ "-s" "-w" "-X ${t}/cmd/crane/cmd.Version=v${version}" "-X ${t}/pkg/v1/remote/transport.Version=${version}" ];···description = "Tools for interacting with remote images and registries including crane and gcrane";
+41
pkgs/development/tools/regclient/default.nix
+41
pkgs/development/tools/regclient/default.nix
···
···
+57
pkgs/games/starsector/default.nix
+57
pkgs/games/starsector/default.nix
···
···+description = "Open-world single-player space-combat, roleplaying, exploration, and economic game";
+67
-12
pkgs/misc/emulators/duckstation/default.nix
+67
-12
pkgs/misc/emulators/duckstation/default.nix
···
···+description = "PlayStation 1 emulator focusing on playability, speed and long-term maintainability";
+92
pkgs/misc/uboot/0001-rpi-Copy-properties-from-firmware-dtb-to-the-loaded-.patch
+92
pkgs/misc/uboot/0001-rpi-Copy-properties-from-firmware-dtb-to-the-loaded-.patch
···
···+Origin: https://patchwork.ozlabs.org/project/uboot/patch/20210822143656.289891-1-sjoerd@collabora.com/
+13
-3
pkgs/misc/uboot/default.nix
+13
-3
pkgs/misc/uboot/default.nix
············
······+# Make U-Boot forward some important settings from the firmware-provided FDT. Fixes booting on BCM2711C0 boards.+# Source: https://patchwork.ozlabs.org/project/uboot/patch/20210822143656.289891-1-sjoerd@collabora.com/······
+24
pkgs/os-specific/linux/bpfmon/default.nix
+24
pkgs/os-specific/linux/bpfmon/default.nix
···
···
+2
-2
pkgs/os-specific/linux/kernel/linux-lqx.nix
+2
-2
pkgs/os-specific/linux/kernel/linux-lqx.nix
······
······
+2
-2
pkgs/servers/sql/postgresql/ext/pgroonga.nix
+2
-2
pkgs/servers/sql/postgresql/ext/pgroonga.nix
+2
-2
pkgs/servers/sql/postgresql/ext/pgvector.nix
+2
-2
pkgs/servers/sql/postgresql/ext/pgvector.nix
+3
-3
pkgs/tools/admin/lego/default.nix
+3
-3
pkgs/tools/admin/lego/default.nix
···
···
+46
pkgs/tools/misc/font-config-info/default.nix
+46
pkgs/tools/misc/font-config-info/default.nix
···
···+substituteInPlace font-config-info.c --replace "dump_xsettings |" "${xsettingsd}/bin/dump_xsettings |"
+35
pkgs/tools/security/spyre/default.nix
+35
pkgs/tools/security/spyre/default.nix
···
···
+45
pkgs/tools/security/usbrip/default.nix
+45
pkgs/tools/security/usbrip/default.nix
···
···
+21
pkgs/top-level/all-packages.nix
+21
pkgs/top-level/all-packages.nix
······························
······························
+3
-1
pkgs/top-level/python-packages.nix
+3
-1
pkgs/top-level/python-packages.nix
···