···51515252In addition to writing properly formatted commit messages, it's important to include relevant information so other developers can later understand *why* a change was made. While this information usually can be found by digging code, mailing list/Discourse archives, pull request discussions or upstream changes, it may require a lot of work.
53535454-For package version upgrades and such a one-line commit message is usually sufficient.
5454+Package version upgrades usually allow for simpler commit messages, including attribute name, old and new version, as well as a reference to the relevant release notes/changelog. Every once in a while a package upgrade requires more extensive changes, and that subsequently warrants a more verbose message.
55555656## Rebasing between branches (i.e. from master to staging)
5757
···994994 </listitem>
995995 <listitem>
996996 <para>
997997+ <literal>ocamlPackages.ocaml_extlib</literal> has been renamed
998998+ to <literal>ocamlPackages.extlib</literal>.
999999+ </para>
10001000+ </listitem>
10011001+ <listitem>
10021002+ <para>
9971003 <literal>pkgs.fetchNextcloudApp</literal> has been rewritten
9981004 to circumvent impurities in e.g. tarballs from GitHub and to
9991005 make it easier to apply patches. This means that your hashes
···10121018 <literal>services.syncthing.dataDir</literal>.
10131019 </para>
10141020 </listitem>
10211021+ <listitem>
10221022+ <para>
10231023+ <literal>services.github-runner</literal> and
10241024+ <literal>services.github-runners.<name></literal> gained
10251025+ the option <literal>serviceOverrides</literal> which allows
10261026+ overriding the systemd <literal>serviceConfig</literal>. If
10271027+ you have been overriding the systemd service configuration
10281028+ (i.e., by defining
10291029+ <literal>systemd.services.github-runner.serviceConfig</literal>),
10301030+ you have to use the <literal>serviceOverrides</literal> option
10311031+ now. Example:
10321032+ </para>
10331033+ <programlisting>
10341034+services.github-runner.serviceOverrides.SupplementaryGroups = [
10351035+ "docker"
10361036+];
10371037+</programlisting>
10381038+ </listitem>
10151039 </itemizedlist>
10161040 </section>
10171041 <section xml:id="sec-release-22.11-notable-changes">
···10231047 0.18.0 to 0.19.0, which brings some breaking changes. See the
10241048 <link xlink:href="https://github.com/sayanarijit/xplr/releases/tag/v0.19.0">upstream
10251049 release notes</link> for more details.
10501050+ </para>
10511051+ </listitem>
10521052+ <listitem>
10531053+ <para>
10541054+ Configuring multiple GitHub runners is now possible through
10551055+ <literal>services.github-runners.<name></literal>. The
10561056+ option <literal>services.github-runner</literal> remains.
10261057 </para>
10271058 </listitem>
10281059 <listitem>
···14311462 to be set. This also allows extensions to be installed via the
14321463 <literal>ExtensionSettings</literal> policy. The new options
14331464 are under <literal>programs.firefox</literal>.
14651465+ </para>
14661466+ </listitem>
14671467+ <listitem>
14681468+ <para>
14691469+ The option
14701470+ <literal>services.picom.experimentalBackends</literal> was
14711471+ removed since it is now the default and the option will cause
14721472+ <literal>picom</literal> to quit instead.
14341473 </para>
14351474 </listitem>
14361475 </itemizedlist>
+14
nixos/doc/manual/release-notes/rl-2211.section.md
···307307308308- `stylua` no longer accepts `lua52Support` and `luauSupport` overrides, use `features` instead, which defaults to `[ "lua54" "luau" ]`.
309309310310+- `ocamlPackages.ocaml_extlib` has been renamed to `ocamlPackages.extlib`.
311311+310312- `pkgs.fetchNextcloudApp` has been rewritten to circumvent impurities in e.g. tarballs from GitHub and to make it easier to
311313 apply patches. This means that your hashes are out-of-date and the (previously required) attributes `name` and `version`
312314 are no longer accepted.
···316318 In a future release other paths will be allowed again and interpreted
317319 relative to `services.syncthing.dataDir`.
318320321321+- `services.github-runner` and `services.github-runners.<name>` gained the option `serviceOverrides` which allows overriding the systemd `serviceConfig`. If you have been overriding the systemd service configuration (i.e., by defining `systemd.services.github-runner.serviceConfig`), you have to use the `serviceOverrides` option now. Example:
322322+323323+ ```
324324+ services.github-runner.serviceOverrides.SupplementaryGroups = [
325325+ "docker"
326326+ ];
327327+ ```
328328+319329<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
320330321331## Other Notable Changes {#sec-release-22.11-notable-changes}
322332323333- The `xplr` package has been updated from 0.18.0 to 0.19.0, which brings some breaking changes. See the [upstream release notes](https://github.com/sayanarijit/xplr/releases/tag/v0.19.0) for more details.
334334+335335+- Configuring multiple GitHub runners is now possible through `services.github-runners.<name>`. The option `services.github-runner` remains.
324336325337- `github-runner` gained support for ephemeral runners and registrations using a personal access token (PAT) instead of a registration token. See `services.github-runner.ephemeral` and `services.github-runner.tokenFile` for details.
326338···434446- The `mame` package does not ship with its tools anymore in the default output. They were moved to a separate `tools` output instead. For convenience, `mame-tools` package was added for those who want to use it.
435447436448- A NixOS module for Firefox has been added which allows preferences and [policies](https://github.com/mozilla/policy-templates/blob/master/README.md) to be set. This also allows extensions to be installed via the `ExtensionSettings` policy. The new options are under `programs.firefox`.
449449+450450+- The option `services.picom.experimentalBackends` was removed since it is now the default and the option will cause `picom` to quit instead.
437451438452<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
+1-3
nixos/modules/config/gtk/gtk-icon-cache.nix
···52525353 environment.extraSetup = ''
5454 # For each icon theme directory ...
5555-5656- find $out/share/icons -mindepth 1 -maxdepth 1 -print0 | while read -d $'\0' themedir
5555+ find $out/share/icons -exec test -d {} ';' -mindepth 1 -maxdepth 1 -print0 | while read -d $'\0' themedir
5756 do
5858-5957 # In order to build the cache, the theme dir should be
6058 # writable. When the theme dir is a symbolic link to somewhere
6159 # in the nix store it is not writable and it means that only
···307307 ''
308308 else
309309 throw ''
310310- Neither ${opt.hostPlatform} nor or the legacy option ${opt.system} has been set.
310310+ Neither ${opt.hostPlatform} nor the legacy option ${opt.system} has been set.
311311 You can set ${opt.hostPlatform} in hardware-configuration.nix by re-running
312312 a recent version of nixos-generate-config.
313313 The option ${opt.system} is still fully supported for NixOS 22.05 interoperability,
+3-3
nixos/modules/programs/zsh/zsh.nix
···173173 # This file is read for all shells.
174174175175 # Only execute this file once per shell.
176176- if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi
176176+ if [ -n "''${__ETC_ZSHENV_SOURCED-}" ]; then return; fi
177177 __ETC_ZSHENV_SOURCED=1
178178179179- if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then
179179+ if [ -z "''${__NIXOS_SET_ENVIRONMENT_DONE-}" ]; then
180180 . ${config.system.build.setEnvironment}
181181 fi
182182···206206 ${zshStartupNotes}
207207208208 # Only execute this file once per shell.
209209- if [ -n "$__ETC_ZPROFILE_SOURCED" ]; then return; fi
209209+ if [ -n "''${__ETC_ZPROFILE_SOURCED-}" ]; then return; fi
210210 __ETC_ZPROFILE_SOURCED=1
211211212212 # Setup custom login shell init stuff.
+12-8
nixos/modules/services/networking/adguardhome.nix
···5151 };
52525353 settings = mkOption {
5454- default = { };
5555- type = submodule {
5454+ default = null;
5555+ type = nullOr (submodule {
5656 freeformType = (pkgs.formats.yaml { }).type;
5757 options = {
5858 schema_version = mkOption {
···7979 '';
8080 };
8181 };
8282- };
8282+ });
8383 description = lib.mdDoc ''
8484 AdGuard Home configuration. Refer to
8585 <https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration#configuration-file>
···8989 On start and if {option}`mutableSettings` is `true`,
9090 these options are merged into the configuration file on start, taking
9191 precedence over configuration changes made on the web interface.
9292+9393+ Set this to `null` (default) for a non-declarative configuration without any
9494+ Nix-supplied values.
9595+ Declarative configurations are supplied with a default `schema_version`, `bind_host`, and `bind_port`.
9296 :::
9397 '';
9498 };
···105109 config = mkIf cfg.enable {
106110 assertions = [
107111 {
108108- assertion = cfg.settings != { }
109109- -> (hasAttrByPath [ "dns" "bind_host" ] cfg.settings)
112112+ assertion = cfg.settings != null -> cfg.mutableSettings
113113+ || (hasAttrByPath [ "dns" "bind_host" ] cfg.settings)
110114 || (hasAttrByPath [ "dns" "bind_hosts" ] cfg.settings);
111115 message =
112116 "AdGuard setting dns.bind_host or dns.bind_hosts needs to be configured for a minimal working configuration";
113117 }
114118 {
115115- assertion = cfg.settings != { }
116116- -> hasAttrByPath [ "dns" "bootstrap_dns" ] cfg.settings;
119119+ assertion = cfg.settings != null -> cfg.mutableSettings
120120+ || hasAttrByPath [ "dns" "bootstrap_dns" ] cfg.settings;
117121 message =
118122 "AdGuard setting dns.bootstrap_dns needs to be configured for a minimal working configuration";
119123 }
···128132 StartLimitBurst = 10;
129133 };
130134131131- preStart = optionalString (cfg.settings != { }) ''
135135+ preStart = optionalString (cfg.settings != null) ''
132136 if [ -e "$STATE_DIRECTORY/AdGuardHome.yaml" ] \
133137 && [ "${toString cfg.mutableSettings}" = "1" ]; then
134138 # Writing directly to AdGuardHome.yaml results in empty file
···4747 since picom v6 and was subsequently removed by upstream.
4848 See https://github.com/yshui/picom/commit/bcbc410
4949 '')
5050+ (mkRemovedOptionModule [ "services" "picom" "experimentalBackends" ] ''
5151+ This option was removed by upstream since picom v10.
5252+ '')
5053 ];
51545255 options.services.picom = {
···5558 default = false;
5659 description = lib.mdDoc ''
5760 Whether or not to enable Picom as the X.org composite manager.
5858- '';
5959- };
6060-6161- experimentalBackends = mkOption {
6262- type = types.bool;
6363- default = false;
6464- description = lib.mdDoc ''
6565- Whether to use the unstable new reimplementation of the backends.
6661 '';
6762 };
6863···306301 };
307302308303 serviceConfig = {
309309- ExecStart = "${pkgs.picom}/bin/picom --config ${configFile}"
310310- + (optionalString cfg.experimentalBackends " --experimental-backends");
304304+ ExecStart = "${pkgs.picom}/bin/picom --config ${configFile}";
311305 RestartSec = 3;
312306 Restart = "always";
313307 };
+2-1
nixos/modules/system/boot/systemd.nix
···558558 # Environment of PID 1
559559 systemd.managerEnvironment = {
560560 # Doesn't contain systemd itself - everything works so it seems to use the compiled-in value for its tools
561561- PATH = lib.makeBinPath config.system.fsPackages;
561561+ # util-linux is needed for the main fsck utility wrapping the fs-specific ones
562562+ PATH = lib.makeBinPath (config.system.fsPackages ++ [cfg.package.util-linux]);
562563 LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
563564 TZDIR = "/etc/zoneinfo";
564565 # If SYSTEMD_UNIT_PATH ends with an empty component (":"), the usual unit load path will be appended to the contents of the variable
+1-5
nixos/modules/tasks/filesystems.nix
···300300 boot.supportedFilesystems = map (fs: fs.fsType) fileSystems;
301301302302 # Add the mount helpers to the system path so that `mount' can find them.
303303- system.fsPackages = [
304304- pkgs.dosfstools
305305- # This is needed for the main fsck utility wrapping the fs-specific ones.
306306- pkgs.util-linux
307307- ];
303303+ system.fsPackages = [ pkgs.dosfstools ];
308304309305 environment.systemPackages = with pkgs; [ fuse3 fuse ] ++ config.system.fsPackages;
310306
···114114115115self: super: {
116116117117+ barbecue-nvim = super.vimshell-vim.overrideAttrs (old: {
118118+ dependencies = with self; [ nvim-lspconfig nvim-navic nvim-web-devicons ];
119119+ meta = {
120120+ description = "A VS Code like winbar for Neovim";
121121+ homepage = "https://github.com/utilyre/barbecue.nvim";
122122+ license = lib.licenses.mit;
123123+ maintainers = with lib.maintainers; [ lightquantum ];
124124+ };
125125+ });
126126+117127 clang_complete = super.clang_complete.overrideAttrs (old: {
118128 # In addition to the arguments you pass to your compiler, you also need to
119129 # specify the path of the C++ std header (if you are using C++).
···991010stdenv.mkDerivation rec {
1111 pname = "signal-desktop";
1212- version = "5.63.0"; # Please backport all updates to the stable channel.
1212+ version = "5.63.1"; # Please backport all updates to the stable channel.
1313 # All releases have a limited lifetime and "expire" 90 days after the release.
1414 # When releases "expire" the application becomes unusable until an update is
1515 # applied. The expiration date for the current release can be extracted with:
···19192020 src = fetchurl {
2121 url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
2222- sha256 = "sha256-f8gQUnmI/VU0FteoMVY0k0RK1R7Ho7JRx+WoMhKki4s=";
2222+ sha256 = "sha256-+zeYjWRFEY09f3o49TcJU14fM1Wks7uR0GsyU2eMJPk=";
2323 };
24242525 nativeBuildInputs = [
···189189 EXTRA_LINK=$(sed -n "s/^cargo:rustc-link-lib=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ')
190190 EXTRA_LINK_SEARCH=$(sed -n "s/^cargo:rustc-link-search=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u)
191191192192+ # We want to read part of every line that has cargo:rustc-env= prefix and
193193+ # export it as environment variables. This turns out tricky if the lines
194194+ # have spaces: we can't wrap the command in double quotes as that captures
195195+ # all the lines in single output. We can't use while read loop because
196196+ # exporting from inside of it doesn't make it to the outside scope. We
197197+ # can't use xargs as export is a built-in and does not work from it. As a
198198+ # last resort then, we change the IFS so that the for loop does not split
199199+ # on spaces and reset it after we are done. See ticket #199298.
200200+ #
201201+ _OLDIFS="$IFS"
202202+ IFS=$'\n'
192203 for env in $(sed -n "s/^cargo:rustc-env=\(.*\)/\1/p" target/build/${crateName}.opt); do
193193- export $env
204204+ export "$env"
194205 done
206206+ IFS="$_OLDIFS"
195207196208 CRATENAME=$(echo ${crateName} | sed -e "s/\(.*\)-sys$/\U\1/" -e "s/-/_/g")
197209 grep -P "^cargo:(?!(rustc-|warning=|rerun-if-changed=|rerun-if-env-changed))" target/build/${crateName}.opt \
+23
pkgs/data/fonts/linja-pi-pu-lukin/default.nix
···11+{ lib, fetchurl }:
22+33+fetchurl {
44+ pname = "linja-pi-pu-lukin";
55+ version = "unstable-2021-10-29";
66+77+ url = "https://web.archive.org/web/20211029000000/https://jansa-tp.github.io/linja-pi-pu-lukin/PuLukin.otf";
88+ hash = "sha256-VPdrMHWpiokFYON4S8zT+pSs4TsB17S8TZRtkjqIqU8=";
99+1010+ downloadToTemp = true;
1111+ recursiveHash = true;
1212+ postFetch = ''
1313+ install -D $downloadedFile $out/share/fonts/opentype/linja-pi-pu-lukin.otf
1414+ '';
1515+1616+ meta = with lib; {
1717+ description = "A sitelen pona font resembling the style found in Toki Pona: The Language of Good (lipu pu), by jan Sa.";
1818+ homepage = "https://jansa-tp.github.io/linja-pi-pu-lukin/";
1919+ license = licenses.unfree; # license is unspecified in repository
2020+ platforms = platforms.all;
2121+ maintainers = with maintainers; [ somasis ];
2222+ };
2323+}
···11-diff --git a/sqlite/gnatcoll_sqlite.gpr b/sqlite/gnatcoll_sqlite.gpr
22-index 5bd53d35..580739f8 100644
33---- a/sqlite/gnatcoll_sqlite.gpr
44-+++ b/sqlite/gnatcoll_sqlite.gpr
55-@@ -69,7 +69,12 @@ project GnatColl_Sqlite is
66- for Source_Dirs use (".", "amalgamation");
77- when "external" =>
88- for Source_Dirs use (".");
99-- for Library_Options use ("-lsqlite3") & Thread_Lib;
1010-+ case Library_Type is
1111-+ when "relocatable" =>
1212-+ for Library_Options use ("-lsqlite3") & Thread_Lib;
1313-+ when others =>
1414-+ null;
1515-+ end case;
1616- end case;
1717-1818- package Compiler is
···11-commit 37c815ee660d1bf37256638d23b0346ad7cc19e7
22-Author: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
33-Date: Wed Jul 21 00:18:30 2021 +0200
44-55- omp/setup.py: open version_information in text mode
66-77- Otherwise saving the config in setup_support.py will fail as a bytes
88- object is not encodeable as JSON. Luckily, version_information is text
99- anyways.
1010-1111-diff --git a/omp/setup.py b/omp/setup.py
1212-index 942ab1f5..5281398e 100755
1313---- a/omp/setup.py
1414-+++ b/omp/setup.py
1515-@@ -25,7 +25,7 @@ class GNATCollOMP(SetupApp):
1616-1717- # Set library version
1818- with open(os.path.join(config.source_dir, '..',
1919-- 'version_information'), 'rb') as fd:
2020-+ 'version_information'), 'r') as fd:
2121- version = fd.read().strip()
2222- config.set_data('GNATCOLL_VERSION', version, sub='gprbuild')
2323-
···11-diff --git a/kde-modules/KDEInstallDirsCommon.cmake b/kde-modules/KDEInstallDirsCommon.cmake
22-index c1d056b..d9e19f0 100644
33---- a/kde-modules/KDEInstallDirsCommon.cmake
44-+++ b/kde-modules/KDEInstallDirsCommon.cmake
55-@@ -15,35 +15,6 @@
66- # GNUInstallDirs code deals with re-configuring, but that is dealt with
77- # by the _define_* macros in this module).
88- set(_LIBDIR_DEFAULT "lib")
99--# Override this default 'lib' with 'lib64' if:
1010--# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
1111--# - we are NOT on debian
1212--# - we are NOT on flatpak
1313--# - we are on a 64 bits system
1414--# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
1515--# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
1616--# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
1717--# See https://wiki.debian.org/Multiarch
1818--if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
1919-- AND NOT CMAKE_CROSSCOMPILING
2020-- AND NOT EXISTS "/etc/arch-release"
2121-- AND NOT DEFINED ENV{FLATPAK_ID})
2222-- if (EXISTS "/etc/debian_version") # is this a debian system ?
2323-- if(CMAKE_LIBRARY_ARCHITECTURE)
2424-- set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
2525-- endif()
2626-- else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
2727-- if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
2828-- message(AUTHOR_WARNING
2929-- "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. "
3030-- "Please enable at least one language before including KDEInstallDirs.")
3131-- else()
3232-- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
3333-- set(_LIBDIR_DEFAULT "lib64")
3434-- endif()
3535-- endif()
3636-- endif()
3737--endif()
3838-3939- set(_gnu_install_dirs_vars
4040- BINDIR
···11-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.99/ -A '*.tar.xz' )
11+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.100/ -A '*.tar.xz' )
···11+From 9287fcfc36ed9f2bb936ec2253244f60df80711f Mon Sep 17 00:00:00 2001
22+From: Pascal Bach <pascal.bach@nextrem.ch>
33+Date: Wed, 22 Sep 2021 09:42:42 +0200
44+Subject: [PATCH] build: find pre-built heimdal build tools in case of embedded
55+ heimdal
66+77+This patch fixes the case of finding asn1_compile and compile_et for
88+building embedded heimdal, by setting
99+--bundled-libraries='!asn1_compile,!compile_et' as configure flags.
1010+1111+The Heimdal build tools compile_et and asn1_compile are needed *only*
1212+if we use the embedded heimdal (otherwise we don't build heimdal and
1313+use headers that have been generated by those tools elsewhere).
1414+1515+For cross-compilation with embedded heimdal, it is vital to use host build
1616+tools, and so asn1_compile and compile_et must be supplied and not
1717+built. One way of doing this would be to set the COMPILE_ET and
1818+ASN1_COMPILE env vars to the location of supplied binaries. Another way,
1919+which is more commonly used, is to exclude asn1_compile and compile_et
2020+from bundled packages via the switch
2121+-bundled-libraries='!asn1_compile,!compile_et'. When this is done,
2222+the build script searches the path for those tools and sets the
2323+ASN1_COMPILE and COMPILE_ET vars accordingly. (this is admittedly
2424+kind of a round-about way of doing things but this has become the
2525+de-facto standard amongst embedded distro builders).
2626+2727+In commit 8061983d4882f3ba3f12da71443b035d7b672eec, this process of
2828+finding the binaris has been moved to be carried out only in the
2929+system heimdal case. As explained above, we only need these tools,
3030+and hence the check, in bundled mode.
3131+3232+BUG: https://bugzilla.samba.org/show_bug.cgi?id=14164
3333+3434+Signed-off-by: Uri Simchoni <uri@samba.org>
3535+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
3636+[Bachp: rebased for version 4.15.0]
3737+3838+# Conflicts:
3939+# wscript_configure_system_heimdal
4040+---
4141+ wscript_configure_embedded_heimdal | 11 +++++++++++
4242+ wscript_configure_system_heimdal | 11 -----------
4343+ 2 files changed, 11 insertions(+), 11 deletions(-)
4444+4545+diff --git a/wscript_configure_embedded_heimdal b/wscript_configure_embedded_heimdal
4646+index 6066f2b39d7..e92cabad65f 100644
4747+--- a/wscript_configure_embedded_heimdal
4848++++ b/wscript_configure_embedded_heimdal
4949+@@ -6,3 +6,14 @@ if not conf.env['BISON']:
5050+5151+ conf.define('USING_EMBEDDED_HEIMDAL', 1)
5252+ conf.RECURSE('third_party/heimdal_build')
5353++
5454++def check_system_heimdal_binary(name):
5555++ if conf.LIB_MAY_BE_BUNDLED(name):
5656++ return False
5757++ if not conf.find_program(name, var=name.upper()):
5858++ return False
5959++ conf.define('USING_SYSTEM_%s' % name.upper(), 1)
6060++ return True
6161++
6262++check_system_heimdal_binary("compile_et")
6363++check_system_heimdal_binary("asn1_compile")
6464+diff --git a/wscript_configure_system_heimdal b/wscript_configure_system_heimdal
6565+index 6033dad08dc..c0a9bb95e87 100644
6666+--- a/wscript_configure_system_heimdal
6767++++ b/wscript_configure_system_heimdal
6868+@@ -37,14 +37,6 @@ def check_system_heimdal_lib(name, functions='', headers='', onlyif=None):
6969+ conf.define('USING_SYSTEM_%s' % name.upper(), 1)
7070+ return True
7171+7272+-def check_system_heimdal_binary(name):
7373+- if conf.LIB_MAY_BE_BUNDLED(name):
7474+- return False
7575+- if not conf.find_program(name, var=name.upper()):
7676+- return False
7777+- conf.define('USING_SYSTEM_%s' % name.upper(), 1)
7878+- return True
7979+-
8080+ check_system_heimdal_lib("com_err", "com_right_r com_err", "com_err.h")
8181+8282+ if check_system_heimdal_lib("roken", "rk_socket_set_reuseaddr", "roken.h"):
8383+@@ -86,9 +78,6 @@ finally:
8484+ #if conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h'):
8585+ # conf.define('USING_SYSTEM_TOMMATH', 1)
8686+8787+-check_system_heimdal_binary("compile_et")
8888+-check_system_heimdal_binary("asn1_compile")
8989+-
9090+ conf.env.KRB5_VENDOR = 'heimdal'
9191+ conf.define('USING_SYSTEM_KRB5', 1)
9292+ conf.define('USING_SYSTEM_HEIMDAL', 1)
9393+--
9494+2.37.3
9595+
+3-3
pkgs/servers/search/meilisearch/default.nix
···88, nixosTests
99}:
10101111-let version = "0.29.1";
1111+let version = "0.29.2";
1212in
1313rustPlatform.buildRustPackage {
1414 pname = "meilisearch";
···1717 owner = "meilisearch";
1818 repo = "MeiliSearch";
1919 rev = "v${version}";
2020- sha256 = "sha256-1zZqarUxaSlux2ndSnQ3qAs+if2MxN9FPuEAxDnVv28=";
2020+ sha256 = "sha256-ltfJUwz/QFwsXJzES0GVOaCXh7QbziuKMILQNvaCG+4=";
2121 };
2222- cargoSha256 = "sha256-VhCpqCBQhr4GgHEUJ30KPGMbN3EqhdJRKr7/PGYQ3OY=";
2222+ cargoSha256 = "sha256-HrPve9x7dSQx/CTxV7t4+SUu4gRmVNRHIZj+2S3CbLQ=";
2323 # Default features include mini dashboard which downloads something from the internet.
2424 buildNoDefaultFeatures = true;
2525 buildInputs = lib.optionals stdenv.isDarwin [ Security DiskArbitration Foundation ];
···15151616 meta = with lib; {
1717 # drutil is required on Darwin, which does not seem to be available in nixpkgs
1818- broken = stdenv.isDarwin;
1818+ broken = true; # 2022-11-16
1919 description = "Script to submit ISRCs from disc to MusicBrainz";
2020 license = licenses.gpl3Plus;
2121 homepage = "http://jonnyjd.github.io/musicbrainz-isrcsubmit/";
···3838 It outputs information in a neat concise manner and supports protocols like DoH, DoT, DoQ, and DNSCrypt as well
3939 '';
4040 license = licenses.gpl3Only;
4141- platforms = platforms.linux;
4141+ platforms = platforms.unix;
4242 maintainers = with maintainers; [ georgesalkhouri ];
4343 };
4444}
···4242 ''-DNIXPKGS_PASS=\"${lib.getBin pass}/bin/pass\"''
4343 ];
44444545- # there are *lots* of pointless warnings in v1.3.0
4646- cmakeFlags = [ "-Wno-dev" ];
4545+ cmakeFlags = [
4646+ # there are *lots* of pointless warnings in v1.3.0
4747+ "-Wno-dev"
4848+ # required for kf5auth to work correctly
4949+ "-DCMAKE_POLICY_DEFAULT_CMP0012=NEW"
5050+ ];
47514852 meta = with lib; {
4953 description = "Integrates krunner with pass the unix standard password manager (https://www.passwordstore.org/)";
···208208 tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05
209209 types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30
210210 types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30
211211+ Wand = wand; # added 2022-11-13
211212 WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29
212213 webapp2 = throw "webapp2 is unmaintained since 2012"; # added 2022-05-29
213214 websocket_client = websocket-client; # added 2021-06-15