···3131* `releaseRev` (optional, defaults to `(v: v)`), provides a default mapping from release names to revision hashes/branch names/tags,
3232* `displayVersion` (optional), provides a way to alter the computation of `name` from `pname`, by explaining how to display version numbers,
3333* `namePrefix` (optional, defaults to `[ "coq" ]`), provides a way to alter the computation of `name` from `pname`, by explaining which dependencies must occur in `name`,
3434-* `nativeBuildInputs` (optional), is a list of executables that are required to build the current derivation, in addition to the default ones (namely `which`, `dune` and `ocaml` depending on whether `useDune2`, `useDune2ifVersion` and `mlPlugin` are set).
3434+* `nativeBuildInputs` (optional), is a list of executables that are required to build the current derivation, in addition to the default ones (namely `which`, `dune` and `ocaml` depending on whether `useDune`, `useDuneifVersion` and `mlPlugin` are set).
3535* `extraNativeBuildInputs` (optional, deprecated), an additional list of derivation to add to `nativeBuildInputs`,
3636* `overrideNativeBuildInputs` (optional) replaces the default list of derivation to which `nativeBuildInputs` and `extraNativeBuildInputs` adds extra elements,
3737* `buildInputs` (optional), is a list of libraries and dependencies that are required to build and run the current derivation, in addition to the default one `[ coq ]`,
···3939* `overrideBuildInputs` (optional) replaces the default list of derivation to which `buildInputs` and `extraBuildInputs` adds extras elements,
4040* `propagatedBuildInputs` (optional) is passed as is to `mkDerivation`, we recommend to use this for Coq libraries and Coq plugin dependencies, as this makes sure the paths of the compiled libraries and plugins will always be added to the build environements of subsequent derivation, which is necessary for Coq packages to work correctly,
4141* `mlPlugin` (optional, defaults to `false`). Some extensions (plugins) might require OCaml and sometimes other OCaml packages. Standard dependencies can be added by setting the current option to `true`. For a finer grain control, the `coq.ocamlPackages` attribute can be used in `nativeBuildInputs`, `buildInputs`, and `propagatedBuildInputs` to depend on the same package set Coq was built against.
4242-* `useDune2ifVersion` (optional, default to `(x: false)` uses Dune2 to build the package if the provided predicate evaluates to true on the version, e.g. `useDune2ifVersion = versions.isGe "1.1"` will use dune if the version of the package is greater or equal to `"1.1"`,
4343-* `useDune2` (optional, defaults to `false`) uses Dune2 to build the package if set to true, the presence of this attribute overrides the behavior of the previous one.
4242+* `useDuneifVersion` (optional, default to `(x: false)` uses Dune to build the package if the provided predicate evaluates to true on the version, e.g. `useDuneifVersion = versions.isGe "1.1"` will use dune if the version of the package is greater or equal to `"1.1"`,
4343+* `useDune` (optional, defaults to `false`) uses Dune to build the package if set to true, the presence of this attribute overrides the behavior of the previous one.
4444* `opam-name` (optional, defaults to concatenating with a dash separator the components of `namePrefix` and `pname`), name of the Dune package to build.
4545* `enableParallelBuilding` (optional, defaults to `true`), since it is activated by default, we provide a way to disable it.
4646* `extraInstallFlags` (optional), allows to extend `installFlags` which initializes the variable `COQMF_COQLIB` so as to install in the proper subdirectory. Indeed Coq libraries should be installed in `$(out)/lib/coq/${coq.coq-version}/user-contrib/`. Such directories are automatically added to the `$COQPATH` environment variable by the hook defined in the Coq derivation.
···505505 </listitem>
506506 <listitem>
507507 <para>
508508- The (previously undocumented) Nixpkgs configuration option
509509- <literal>checkMeta</literal> now defaults to
510510- <literal>true</literal>. This may cause evaluation failures
511511- for packages with incorrect <literal>meta</literal> attribute.
512512- </para>
513513- </listitem>
514514- <listitem>
515515- <para>
516508 xow package removed along with the
517509 <literal>hardware.xow</literal> module, due to the project
518510 being deprecated in favor of <literal>xone</literal>, which is
-3
nixos/doc/manual/release-notes/rl-2211.section.md
···172172173173- riak package removed along with `services.riak` module, due to lack of maintainer to update the package.
174174175175-- The (previously undocumented) Nixpkgs configuration option `checkMeta` now defaults to `true`. This may cause evaluation
176176- failures for packages with incorrect `meta` attribute.
177177-178175- xow package removed along with the `hardware.xow` module, due to the project being deprecated in favor of `xone`, which is available via the `hardware.xone` module.
179176180177- dd-agent package removed along with the `services.dd-agent` module, due to the project being deprecated in favor of `datadog-agent`, which is available via the `services.datadog-agent` module.
+11-2
nixos/modules/services/security/fail2ban.nix
···9191 example = "nftables-multiport";
9292 description = lib.mdDoc ''
9393 Default banning action (e.g. iptables, iptables-new, iptables-multiport,
9494- shorewall, etc) It is used to define action_* variables. Can be overridden
9595- globally or per section within jail.local file
9494+ iptables-ipset-proto6-allports, shorewall, etc) It is used to
9595+ define action_* variables. Can be overridden globally or per
9696+ section within jail.local file
9697 '';
9798 };
9899···212213 filter = apache-nohome
213214 action = iptables-multiport[name=HTTP, port="http,https"]
214215 logpath = /var/log/httpd/error_log*
216216+ backend = auto
215217 findtime = 600
216218 bantime = 600
217219 maxretry = 5
218220 ''';
221221+ dovecot = '''
222222+ # block IPs which failed to log-in
223223+ # aggressive mode add blocking for aborted connections
224224+ enabled = true
225225+ filter = dovecot[mode=aggressive]
226226+ maxretry = 3
227227+ ''';
219228 }
220229 '';
221230 type = types.attrsOf types.lines;
+1-3
nixos/tests/vengi-tools.nix
···2020 machine.wait_for_x()
2121 machine.execute("vengi-voxedit >&2 &")
2222 machine.wait_for_window("voxedit")
2323- # OCR on voxedit's window is very expensive, so we avoid wasting a try
2424- # by letting the window load fully first
2323+ # Let the window load fully
2524 machine.sleep(15)
2626- machine.wait_for_text("Solid")
2725 machine.screenshot("screen")
2826 '';
2927})
+1-1
pkgs/applications/audio/tauon/default.nix
···132132 description = "The Linux desktop music player from the future";
133133 homepage = "https://tauonmusicbox.rocks/";
134134 license = licenses.gpl3;
135135- maintainers = with maintainers; [ SuperSandro2000 ];
135135+ maintainers = with maintainers; [ jansol ];
136136 platforms = platforms.linux;
137137 };
138138}
···1616 { case = range "8.11" "8.12"; out = "0.4"; }
1717 ] null;
18181919- useDune2 = true;
1919+ useDune = true;
20202121 meta = {
2222 description = "Exploration of some properties of Kirby and Paris' hydra battles, with the help of Coq";
···4545 ];
46464747 postPatch = ''
4848- for f in libfishcamp/CMakeLists.txt libsbig/CMakeLists.txt
4848+ for f in {libfishcamp,libsbig,libqhy}/CMakeLists.txt
4949 do
5050 substituteInPlace $f --replace "/lib/firmware" "lib/firmware"
5151 done
···3333 substituteInPlace tensorboardX/pytorch_graph.py --replace \
3434 "torch.onnx.set_training(model, False)" \
3535 "torch.onnx.select_model_mode_for_export(model, torch.onnx.TrainingMode.EVAL)"
3636+3737+ # Version detection seems broken here, the version reported by python is
3838+ # newer than the protobuf package itself.
3939+ sed -i -e "s/'protobuf[^']*'/'protobuf'/" setup.py
3640 '';
37413842 # Wanted protobuf version is mentioned here:
···11{ lib, stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap
22, expat, libxml2, openssl, pkg-config, systemd
33+, cppunit
34}:
4556stdenv.mkDerivation rec {
···3132 "--enable-htcp"
3233 ] ++ lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl)
3334 "--enable-linux-netfilter";
3535+3636+ doCheck = true;
3737+ checkInputs = [ cppunit ];
3838+ preCheck = ''
3939+ # tests attempt to copy around "/bin/true" to make some things
4040+ # no-ops but this doesn't work if our "true" is a multi-call
4141+ # binary, so make our own fake "true" which will work when used
4242+ # this way
4343+ echo "#!$SHELL" > fake-true
4444+ chmod +x fake-true
4545+ grep -rlF '/bin/true' test-suite/ | while read -r filename ; do
4646+ substituteInPlace "$filename" \
4747+ --replace "$(type -P true)" "$(realpath fake-true)" \
4848+ --replace "/bin/true" "$(realpath fake-true)"
4949+ done
5050+ '';
34513552 meta = with lib; {
3653 description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more";
···6677# Version of Google Cloud SDK from
88# https://cloud.google.com/sdk/docs/release-notes
99-VERSION="400.0.0"
99+VERSION="404.0.0"
10101111function genMainSrc() {
1212 local url="${BASE_URL}-${VERSION}-${1}-${2}.tar.gz"