+3
-1
.github/workflows/merge-staging.yml
+3
-1
.github/workflows/merge-staging.yml
·········-An automatic merge [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}).
·········+An automatic merge${{ (steps.staging_next.outcome == 'failure' && ' from master to staging-next') || ((steps.staging.outcome == 'failure' && ' from staging-next to staging') || '') }} [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}).
+14
-9
lib/systems/parse.nix
+14
-9
lib/systems/parse.nix
···
···
+15
-1
nixos/doc/manual/release-notes/rl-2105.xml
+15
-1
nixos/doc/manual/release-notes/rl-2105.xml
······The <package>yadm</package> dotfile manager has been updated from 2.x to 3.x, which has new (XDG) default locations for some data/state files. Most yadm commands will fail and print a legacy path warning (which describes how to upgrade/migrate your repository). If you have scripts, daemons, scheduled jobs, shell profiles, etc. that invoke yadm, expect them to fail or misbehave until you perform this migration and prepare accordingly.
······The <package>yadm</package> dotfile manager has been updated from 2.x to 3.x, which has new (XDG) default locations for some data/state files. Most yadm commands will fail and print a legacy path warning (which describes how to upgrade/migrate your repository). If you have scripts, daemons, scheduled jobs, shell profiles, etc. that invoke yadm, expect them to fail or misbehave until you perform this migration and prepare accordingly.
+4
-4
nixos/modules/installer/tools/nix-fallback-paths.nix
+4
-4
nixos/modules/installer/tools/nix-fallback-paths.nix
···
···
+1
nixos/modules/services/monitoring/prometheus/exporters.nix
+1
nixos/modules/services/monitoring/prometheus/exporters.nix
+38
nixos/modules/services/monitoring/prometheus/exporters/kea.nix
+38
nixos/modules/services/monitoring/prometheus/exporters/kea.nix
···
···
+152
-44
nixos/modules/services/networking/radicale.nix
+152
-44
nixos/modules/services/networking/radicale.nix
······
······+warnings = optional (isNull cfg.package && versionOlder config.system.stateVersion "17.09") ''
+9
-7
nixos/modules/services/web-servers/apache-httpd/default.nix
+9
-7
nixos/modules/services/web-servers/apache-httpd/default.nix
·········wants = concatLists (map (certName: [ "acme-finished-${certName}.target" ]) dependentCertNames);after = [ "network.target" ] ++ map (certName: "acme-selfsigned-${certName}.service") dependentCertNames;······unitConfig.ConditionPathExists = map (certName: certs.${certName}.directory + "/fullchain.pem") dependentCertNames;···
·········wants = concatLists (map (certName: [ "acme-finished-${certName}.target" ]) dependentCertNames);after = [ "network.target" ] ++ map (certName: "acme-selfsigned-${certName}.service") dependentCertNames;······unitConfig.ConditionPathExists = map (certName: certs.${certName}.directory + "/fullchain.pem") dependentCertNames;···
+1
nixos/tests/all-tests.nix
+1
nixos/tests/all-tests.nix
···
+99
nixos/tests/dendrite.nix
+99
nixos/tests/dendrite.nix
···
···
+51
nixos/tests/prometheus-exporters.nix
+51
nixos/tests/prometheus-exporters.nix
···
+77
-122
nixos/tests/radicale.nix
+77
-122
nixos/tests/radicale.nix
···
···
+14
nixos/tests/sway.nix
+14
nixos/tests/sway.nix
···# Need to switch to a different VGA card / GPU driver than the default one (std) so that Sway can launch:···
···# Need to switch to a different VGA card / GPU driver than the default one (std) so that Sway can launch:···
-4
pkgs/applications/audio/strawberry/default.nix
-4
pkgs/applications/audio/strawberry/default.nix
+25
-20
pkgs/applications/editors/emacs-modes/elpa-generated.nix
+25
-20
pkgs/applications/editors/emacs-modes/elpa-generated.nix
··················
··················
+6
-6
pkgs/applications/editors/emacs-modes/org-generated.nix
+6
-6
pkgs/applications/editors/emacs-modes/org-generated.nix
······
······
+1096
-1015
pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
+1096
-1015
pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
·············································································································································································································································································································································································································································································································································································································································································································································································································································
·······································································································································································································································+"Initialized empty Git repository in /run/user/1000/git-checkout-tmp-CWrbtBP5/flycheck-grammalecte-f488739/.git/\nfatal: unable to access 'https://git.umaneti.net/flycheck-grammalecte/': OpenSSL SSL_connect: SSL_ERROR_SYSCALL in connection to git.umaneti.net:443 \nerror: Unable to get pack file https://git.umaneti.net/flycheck-grammalecte/objects/pack/pack-242bc54824844c700bc4fe4a590b9082bf927286.pack\nOpenSSL SSL_read: Connection timed out, errno 110\nerror: Unable to find e9a9751059211e2725b4b68614a5f47ba34f0788 under https://git.umaneti.net/flycheck-grammalecte\nCannot obtain needed object e9a9751059211e2725b4b68614a5f47ba34f0788\nwhile processing commit af9a044c1efab8a9b315cad110b15e9e143a6642.\nerror: fetch failed.\nUnable to checkout f488739aea2ef5c8d39bd28083dd72fdfee46e02 from https://git.umaneti.net/flycheck-grammalecte/.\n"+"Initialized empty Git repository in /run/user/1000/git-checkout-tmp-CWrbtBP5/flycheck-grammalecte-f488739/.git/\nfatal: unable to access 'https://git.umaneti.net/flycheck-grammalecte/': OpenSSL SSL_connect: SSL_ERROR_SYSCALL in connection to git.umaneti.net:443 \nerror: Unable to get pack file https://git.umaneti.net/flycheck-grammalecte/objects/pack/pack-242bc54824844c700bc4fe4a590b9082bf927286.pack\nOpenSSL SSL_read: Connection timed out, errno 110\nerror: Unable to find e9a9751059211e2725b4b68614a5f47ba34f0788 under https://git.umaneti.net/flycheck-grammalecte\nCannot obtain needed object e9a9751059211e2725b4b68614a5f47ba34f0788\nwhile processing commit af9a044c1efab8a9b315cad110b15e9e143a6642.\nerror: fetch failed.\nUnable to checkout f488739aea2ef5c8d39bd28083dd72fdfee46e02 from https://git.umaneti.net/flycheck-grammalecte/.\n"······································································································································································································································································································································································································································································································································································································
+1
-1
pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix
+1
-1
pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix
···
+5
-5
pkgs/applications/editors/vscode/vscode.nix
+5
-5
pkgs/applications/editors/vscode/vscode.nix
······
······
+3
-2
pkgs/applications/graphics/ImageMagick/6.x.nix
+3
-2
pkgs/applications/graphics/ImageMagick/6.x.nix
······
······
+2
-2
pkgs/applications/networking/browsers/brave/default.nix
+2
-2
pkgs/applications/networking/browsers/brave/default.nix
···url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
···url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
+2
-2
pkgs/applications/networking/cluster/kubernetes/default.nix
+2
-2
pkgs/applications/networking/cluster/kubernetes/default.nix
···
···
+3
-3
pkgs/applications/networking/dnscontrol/default.nix
+3
-3
pkgs/applications/networking/dnscontrol/default.nix
···
···
+2
-1
pkgs/applications/networking/p2p/transmission/default.nix
+2
-1
pkgs/applications/networking/p2p/transmission/default.nix
+6
-2
pkgs/applications/science/biology/cd-hit/default.nix
+6
-2
pkgs/applications/science/biology/cd-hit/default.nix
······
······+"CC=${stdenv.cc.targetPrefix}c++" # remove once https://github.com/weizhongli/cdhit/pull/114 is merged
+2
-2
pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix
+2
-2
pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix
···
···
+2
-2
pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix
+2
-2
pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix
···
···
+4
-4
pkgs/applications/video/kodi/unwrapped.nix
+4
-4
pkgs/applications/video/kodi/unwrapped.nix
···
···
+2
-2
pkgs/data/themes/amber/default.nix
+2
-2
pkgs/data/themes/amber/default.nix
···
···
+1
pkgs/development/compilers/copper/default.nix
+1
pkgs/development/compilers/copper/default.nix
+20
-10
pkgs/development/compilers/zig/default.nix
+20
-10
pkgs/development/compilers/zig/default.nix
······"General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software";
······"General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software";
+2
-2
pkgs/development/interpreters/erlang/R23.nix
+2
-2
pkgs/development/interpreters/erlang/R23.nix
+48
pkgs/development/interpreters/lua-5/5.4.darwin.patch
+48
pkgs/development/interpreters/lua-5/5.4.darwin.patch
···
···+CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o+LIB_O= lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o
+6
pkgs/development/interpreters/lua-5/default.nix
+6
pkgs/development/interpreters/lua-5/default.nix
···
+2
-1
pkgs/development/interpreters/lua-5/interpreter.nix
+2
-1
pkgs/development/interpreters/lua-5/interpreter.nix
···-makeFlagsArray+=(CFLAGS='-O2 -fPIC${lib.optionalString compat " -DLUA_COMPAT_ALL"} $(SYSCFLAGS)' )makeFlagsArray+=(${lib.optionalString stdenv.isDarwin "CC=\"$CC\""}${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " 'AR=${stdenv.cc.targetPrefix}ar rcu'"})
···makeFlagsArray+=(${lib.optionalString stdenv.isDarwin "CC=\"$CC\""}${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " 'AR=${stdenv.cc.targetPrefix}ar rcu'"})
+2
-2
pkgs/development/libraries/libxc/default.nix
+2
-2
pkgs/development/libraries/libxc/default.nix
······
······
+10
-29
pkgs/development/libraries/taglib/default.nix
+10
-29
pkgs/development/libraries/taglib/default.nix
···-url = "https://github.com/taglib/taglib/commit/272648ccfcccae30e002ccf34a22e075dd477278.patch";-url = "https://github.com/taglib/taglib/commit/9336c82da3a04552168f208cd7a5fa4646701ea4.patch";···
······
+2
-2
pkgs/development/python-modules/adafruit-platformdetect/default.nix
+2
-2
pkgs/development/python-modules/adafruit-platformdetect/default.nix
+8
-6
pkgs/development/python-modules/ansible-lint/default.nix
+8
-6
pkgs/development/python-modules/ansible-lint/default.nix
············
············
+1
-1
pkgs/development/python-modules/ansible/collections.nix
+1
-1
pkgs/development/python-modules/ansible/collections.nix
+14
-4
pkgs/development/python-modules/gpapi/default.nix
+14
-4
pkgs/development/python-modules/gpapi/default.nix
······
······
+42
-22
pkgs/development/python-modules/pycurl/default.nix
+42
-22
pkgs/development/python-modules/pycurl/default.nix
·········
·········+# OSError: tests/fake-curl/libcurl/with_openssl.so: cannot open shared object file: No such file or directory+# OSError: tests/fake-curl/libcurl/with_nss.so: cannot open shared object file: No such file or directory+# OSError: tests/fake-curl/libcurl/with_gnutls.so: cannot open shared object file: No such file or directory
+4
pkgs/development/python-modules/pydicom/default.nix
+4
pkgs/development/python-modules/pydicom/default.nix
······
+4
-12
pkgs/development/python-modules/pyfuse3/default.nix
+4
-12
pkgs/development/python-modules/pyfuse3/default.nix
···-{ lib, buildPythonPackage, fetchPypi, fetchpatch, pkg-config, fuse3, trio, pytestCheckHook, pytest-trio, which }:-url = "https://github.com/libfuse/pyfuse3/commit/0070eddfc33fc2fba8eb4fe9353a2d2fa1ae575b.patch";···
···+{ lib, buildPythonPackage, fetchPypi, pkg-config, fuse3, trio, pytestCheckHook, pytest-trio, which }:···
+15
-36
pkgs/development/python-modules/pytaglib/default.nix
+15
-36
pkgs/development/python-modules/pytaglib/default.nix
···-url = "https://github.com/supermihi/pytaglib/commit/0c4ae750fcd5b18d2553975c7e3e183e9dca5bf1.patch";-url = "https://github.com/supermihi/pytaglib/commit/ba7a1406ddf35ddc41ed57f1c8d1f2bc2ed2c93a.patch";-url = "https://github.com/supermihi/pytaglib/commit/28772f6f94d37f05728071381a0fa04c6a14783a.patch";
···
+2
-11
pkgs/development/python-modules/rfc3339-validator/default.nix
+2
-11
pkgs/development/python-modules/rfc3339-validator/default.nix
···-# Fixes test failure on darwin. Filed upstream: https://github.com/naimetti/rfc3339-validator/pull/3.-url = "https://github.com/rmcgibbo/rfc3339-validator/commit/4b6bb62c30bd158d3b4663690dcba1084ac31770.patch";
+2
pkgs/development/python-modules/telfhash/default.nix
+2
pkgs/development/python-modules/telfhash/default.nix
+30
pkgs/development/python-modules/telfhash/telfhash-new-tlsh-hash.patch
+30
pkgs/development/python-modules/telfhash/telfhash-new-tlsh-hash.patch
···
···+- files_list = [x for x in list(telfhash_data.keys()) if telfhash_data[x]["telfhash"] is not None and len(telfhash_data[x]["telfhash"]) == 70]++ files_list = [x for x in list(telfhash_data.keys()) if telfhash_data[x]["telfhash"] is not None and len(telfhash_data[x]["telfhash"]) == 72]
+3
-2
pkgs/development/tools/ecpdap/default.nix
+3
-2
pkgs/development/tools/ecpdap/default.nix
······
+31
pkgs/development/tools/misc/jiq/default.nix
+31
pkgs/development/tools/misc/jiq/default.nix
···
···
+2
pkgs/development/tools/pypi2nix/default.nix
+2
pkgs/development/tools/pypi2nix/default.nix
+3
-3
pkgs/development/tools/rust/cargo-msrv/default.nix
+3
-3
pkgs/development/tools/rust/cargo-msrv/default.nix
···
···
+5
-3
pkgs/development/web/postman/default.nix
+5
-3
pkgs/development/web/postman/default.nix
······
······
+2
-2
pkgs/misc/vscode-extensions/python/default.nix
+2
-2
pkgs/misc/vscode-extensions/python/default.nix
···url = "https://github.com/microsoft/vscode-python/releases/download/${mktplcRef.version}/ms-python-release.vsix";
···url = "https://github.com/microsoft/vscode-python/releases/download/${mktplcRef.version}/ms-python-release.vsix";
+2
-2
pkgs/os-specific/linux/ell/default.nix
+2
-2
pkgs/os-specific/linux/ell/default.nix
···
···
+2
-1
pkgs/os-specific/linux/iputils/default.nix
+2
-1
pkgs/os-specific/linux/iputils/default.nix
+4
-2
pkgs/os-specific/linux/iwd/default.nix
+4
-2
pkgs/os-specific/linux/iwd/default.nix
······
······
+2
-2
pkgs/servers/computing/slurm/default.nix
+2
-2
pkgs/servers/computing/slurm/default.nix
······
······
+5
-1
pkgs/servers/dendrite/default.nix
+5
-1
pkgs/servers/dendrite/default.nix
······
+6
-2
pkgs/servers/irc/inspircd/default.nix
+6
-2
pkgs/servers/irc/inspircd/default.nix
·········
·········
+33
pkgs/servers/monitoring/prometheus/kea-exporter.nix
+33
pkgs/servers/monitoring/prometheus/kea-exporter.nix
···
···
+2
-2
pkgs/servers/web-apps/wallabag/default.nix
+2
-2
pkgs/servers/web-apps/wallabag/default.nix
···
···
+4
-4
pkgs/servers/xmpp/prosody/default.nix
+4
-4
pkgs/servers/xmpp/prosody/default.nix
·········
·········
+3
-3
pkgs/shells/oil/default.nix
+3
-3
pkgs/shells/oil/default.nix
······
······
+3
-3
pkgs/tools/admin/clair/default.nix
+3
-3
pkgs/tools/admin/clair/default.nix
···
···
+2
-2
pkgs/tools/audio/volctl/default.nix
+2
-2
pkgs/tools/audio/volctl/default.nix
+3
-1
pkgs/tools/graphics/dmtx-utils/default.nix
+3
-1
pkgs/tools/graphics/dmtx-utils/default.nix
······
+4
pkgs/tools/misc/code-minimap/default.nix
+4
pkgs/tools/misc/code-minimap/default.nix
······
+2
-2
pkgs/tools/misc/jdupes/default.nix
+2
-2
pkgs/tools/misc/jdupes/default.nix
···
···
+4
-4
pkgs/tools/misc/lorri/default.nix
+4
-4
pkgs/tools/misc/lorri/default.nix
···
···
+2
-2
pkgs/tools/misc/nix-direnv/default.nix
+2
-2
pkgs/tools/misc/nix-direnv/default.nix
···
···
+34
pkgs/tools/networking/calendar-cli/default.nix
+34
pkgs/tools/networking/calendar-cli/default.nix
···
···
+2
-2
pkgs/tools/networking/chrony/default.nix
+2
-2
pkgs/tools/networking/chrony/default.nix
+5
-4
pkgs/tools/networking/findomain/default.nix
+5
-4
pkgs/tools/networking/findomain/default.nix
···
···
+2
-1
pkgs/tools/networking/inetutils/default.nix
+2
-1
pkgs/tools/networking/inetutils/default.nix
+2
-2
pkgs/tools/networking/ofono/default.nix
+2
-2
pkgs/tools/networking/ofono/default.nix
···
···
+2
-9
pkgs/tools/package-management/nix/default.nix
+2
-9
pkgs/tools/package-management/nix/default.nix
···
···
+1
-1
pkgs/tools/security/metasploit/Gemfile
+1
-1
pkgs/tools/security/metasploit/Gemfile
+9
-7
pkgs/tools/security/metasploit/Gemfile.lock
+9
-7
pkgs/tools/security/metasploit/Gemfile.lock
··················
··················
+2
-2
pkgs/tools/security/metasploit/default.nix
+2
-2
pkgs/tools/security/metasploit/default.nix
···
···
+21
-11
pkgs/tools/security/metasploit/gemset.nix
+21
-11
pkgs/tools/security/metasploit/gemset.nix
··················
··················
+11
-9
pkgs/tools/typesetting/tex/auctex/default.nix
+11
-9
pkgs/tools/typesetting/tex/auctex/default.nix
······-description = "Extensible package for writing and formatting TeX files in GNU Emacs and XEmacs";
······+description = "Extensible package for writing and formatting TeX files in GNU Emacs and XEmacs";
+14
-4
pkgs/top-level/all-packages.nix
+14
-4
pkgs/top-level/all-packages.nix
·········prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { };prometheus-jitsi-exporter = callPackage ../servers/monitoring/prometheus/jitsi-exporter.nix { };prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { };prometheus-keylight-exporter = callPackage ../servers/monitoring/prometheus/keylight-exporter.nix { };prometheus-knot-exporter = callPackage ../servers/monitoring/prometheus/knot-exporter.nix { };············
·········prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { };prometheus-jitsi-exporter = callPackage ../servers/monitoring/prometheus/jitsi-exporter.nix { };prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { };+prometheus-kea-exporter = callPackage ../servers/monitoring/prometheus/kea-exporter.nix { };prometheus-keylight-exporter = callPackage ../servers/monitoring/prometheus/keylight-exporter.nix { };prometheus-knot-exporter = callPackage ../servers/monitoring/prometheus/knot-exporter.nix { };············