Merge staging-next into staging

nixos/doc/manual/from_md/release-notes/rl-2211.section.xml

···
       </listitem>
       <listitem>
         <para>
+          The <literal>services.graphite.api</literal> and
+          <literal>services.graphite.beacon</literal> NixOS options, and
+          the <literal>python3.pkgs.graphite_api</literal>,
+          <literal>python3.pkgs.graphite_beacon</literal> and
+          <literal>python3.pkgs.influxgraph</literal> packages, have
+          been removed due to lack of upstream maintenance.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           (Neo)Vim can not be configured with
           <literal>configure.pathogen</literal> anymore to reduce
           maintainance burden. Use <literal>configure.packages</literal>

nixos/doc/manual/release-notes/rl-2211.section.md

···
 
 - riak package removed along with `services.riak` module, due to lack of maintainer to update the package.
 
+- The `services.graphite.api` and `services.graphite.beacon` NixOS options, and
+  the `python3.pkgs.graphite_api`, `python3.pkgs.graphite_beacon` and
+  `python3.pkgs.influxgraph` packages, have been removed due to lack of upstream
+  maintenance.
+
 - (Neo)Vim can not be configured with `configure.pathogen` anymore to reduce maintainance burden.
 Use `configure.packages` instead.
 

nixos/modules/services/monitoring/graphite.nix

···
     + cfg.web.extraConfig
   );
 
-  graphiteApiConfig = pkgs.writeText "graphite-api.yaml" ''
-    search_index: ${dataDir}/index
-    ${optionalString (config.time.timeZone != null) "time_zone: ${config.time.timeZone}"}
-    ${optionalString (cfg.api.finders != []) "finders:"}
-    ${concatMapStringsSep "\n" (f: "  - " + f.moduleName) cfg.api.finders}
-    ${optionalString (cfg.api.functions != []) "functions:"}
-    ${concatMapStringsSep "\n" (f: "  - " + f) cfg.api.functions}
-    ${cfg.api.extraConfig}
-  '';
-
   seyrenConfig = {
     SEYREN_URL = cfg.seyren.seyrenUrl;
     MONGO_URL = cfg.seyren.mongoUrl;
···
 in {
 
   imports = [
+    (mkRemovedOptionModule ["services" "graphite" "api"] "")
+    (mkRemovedOptionModule ["services" "graphite" "beacon"] "")
     (mkRemovedOptionModule ["services" "graphite" "pager"] "")
   ];
 
···
       };
     };
 
-    api = {
-      enable = mkOption {
-        description = ''
-          Whether to enable graphite api. Graphite api is lightweight alternative
-          to graphite web, with api and without dashboard. It's advised to use
-          grafana as alternative dashboard and influxdb as alternative to
-          graphite carbon.
-
-          For more information visit
-          <link xlink:href="https://graphite-api.readthedocs.org/en/latest/"/>
-        '';
-        default = false;
-        type = types.bool;
-      };
-
-      finders = mkOption {
-        description = "List of finder plugins to load.";
-        default = [];
-        example = literalExpression "[ pkgs.python3Packages.influxgraph ]";
-        type = types.listOf types.package;
-      };
-
-      functions = mkOption {
-        description = "List of functions to load.";
-        default = [
-          "graphite_api.functions.SeriesFunctions"
-          "graphite_api.functions.PieFunctions"
-        ];
-        type = types.listOf types.str;
-      };
-
-      listenAddress = mkOption {
-        description = "Graphite web service listen address.";
-        default = "127.0.0.1";
-        type = types.str;
-      };
-
-      port = mkOption {
-        description = "Graphite api service port.";
-        default = 8080;
-        type = types.int;
-      };
-
-      package = mkOption {
-        description = "Package to use for graphite api.";
-        default = pkgs.python3Packages.graphite_api;
-        defaultText = literalExpression "pkgs.python3Packages.graphite_api";
-        type = types.package;
-      };
-
-      extraConfig = mkOption {
-        description = "Extra configuration for graphite api.";
-        default = ''
-          whisper:
-            directories:
-                - ${dataDir}/whisper
-        '';
-        defaultText = literalExpression ''
-          '''
-            whisper:
-              directories:
-                - ''${config.${opt.dataDir}}/whisper
-          '''
-        '';
-        example = ''
-          allowed_origins:
-            - dashboard.example.com
-          cheat_times: true
-          influxdb:
-            host: localhost
-            port: 8086
-            user: influxdb
-            pass: influxdb
-            db: metrics
-          cache:
-            CACHE_TYPE: 'filesystem'
-            CACHE_DIR: '/tmp/graphite-api-cache'
-        '';
-        type = types.lines;
-      };
-    };
-
     carbon = {
       config = mkOption {
         description = "Content of carbon configuration file.";
···
         '';
       };
     };
-
-    beacon = {
-      enable = mkEnableOption "graphite beacon";
-
-      config = mkOption {
-        description = "Graphite beacon configuration.";
-        default = {};
-        type = types.attrs;
-      };
-    };
   };
 
   ###### implementation
···
       environment.systemPackages = [ pkgs.python3Packages.graphite-web ];
     }))
 
-    (mkIf cfg.api.enable {
-      systemd.services.graphiteApi = {
-        description = "Graphite Api Interface";
-        wantedBy = [ "multi-user.target" ];
-        after = [ "network.target" ];
-        environment = {
-          PYTHONPATH = let
-              aenv = pkgs.python3.buildEnv.override {
-                extraLibs = [ cfg.api.package pkgs.cairo pkgs.python3Packages.cffi ] ++ cfg.api.finders;
-              };
-            in "${aenv}/${pkgs.python3.sitePackages}";
-          GRAPHITE_API_CONFIG = graphiteApiConfig;
-          LD_LIBRARY_PATH = "${pkgs.cairo.out}/lib";
-        };
-        serviceConfig = {
-          ExecStart = ''
-            ${pkgs.python3Packages.waitress}/bin/waitress-serve \
-            --host=${cfg.api.listenAddress} --port=${toString cfg.api.port} \
-            graphite_api.app:app
-          '';
-          User = "graphite";
-          Group = "graphite";
-          PermissionsStartOnly = true;
-        };
-        preStart = ''
-          if ! test -e ${dataDir}/db-created; then
-            mkdir -p ${dataDir}/cache/
-            chmod 0700 ${dataDir}/cache/
-
-            chown graphite:graphite ${cfg.dataDir}
-            chown -R graphite:graphite ${cfg.dataDir}/cache
-
-            touch ${dataDir}/db-created
-          fi
-        '';
-      };
-    })
-
     (mkIf cfg.seyren.enable {
       systemd.services.seyren = {
         description = "Graphite Alerting Dashboard";
···
       services.mongodb.enable = mkDefault true;
     })
 
-    (mkIf cfg.beacon.enable {
-      systemd.services.graphite-beacon = {
-        description = "Grpahite Beacon Alerting Daemon";
-        wantedBy = [ "multi-user.target" ];
-        serviceConfig = {
-          ExecStart = ''
-            ${pkgs.python3Packages.graphite_beacon}/bin/graphite-beacon \
-              --config=${pkgs.writeText "graphite-beacon.json" (builtins.toJSON cfg.beacon.config)}
-          '';
-          User = "graphite";
-          Group = "graphite";
-        };
-      };
-    })
-
     (mkIf (
       cfg.carbon.enableCache || cfg.carbon.enableAggregator || cfg.carbon.enableRelay ||
-      cfg.web.enable || cfg.api.enable ||
-      cfg.seyren.enable || cfg.beacon.enable
+      cfg.web.enable || cfg.seyren.enable
      ) {
       users.users.graphite = {
         uid = config.ids.uids.graphite;

nixos/modules/services/monitoring/prometheus/exporters/node.nix

···
       ];
       # The timex collector needs to access clock APIs
       ProtectClock = any (collector: collector == "timex") cfg.disabledCollectors;
+      # Allow space monitoring under /home
+      ProtectHome = true;
     };
   };
 }

nixos/modules/services/web-apps/hedgedoc.nix

···
     then "hedgedoc"
     else "codimd";
 
+  settingsFormat = pkgs.formats.json {};
+
   prettyJSON = conf:
     pkgs.runCommandLocal "hedgedoc-config.json" {
       nativeBuildInputs = [ pkgs.jq ];
     } ''
-      echo '${builtins.toJSON conf}' | jq \
-        '{production:del(.[]|nulls)|del(.[][]?|nulls)}' > $out
+      jq '{production:del(.[]|nulls)|del(.[][]?|nulls)}' \
+        < ${settingsFormat.generate "hedgedoc-ugly.json" cfg.settings} \
+        > $out
     '';
 in
 {
   imports = [
     (mkRenamedOptionModule [ "services" "codimd" ] [ "services" "hedgedoc" ])
+    (mkRenamedOptionModule
+      [ "services" "hedgedoc" "configuration" ] [ "services" "hedgedoc" "settings" ])
   ];
 
   options.services.hedgedoc = {
···
       '';
     };
 
-    configuration = {
+    settings = let options = {
       debug = mkEnableOption "debug mode";
       domain = mkOption {
         type = types.nullOr types.str;
···
         default = null;
         description = "Configure the SAML integration.";
       };
+    }; in lib.mkOption {
+      type = lib.types.submodule {
+        freeformType = settingsFormat.type;
+        inherit options;
+      };
+      description = ''
+        HedgeDoc configuration, see
+        <link xlink:href="https://docs.hedgedoc.org/configuration/"/>
+        for documentation.
+      '';
     };
 
     environmentFile = mkOption {
···
         Package that provides HedgeDoc.
       '';
     };
+
   };
 
   config = mkIf cfg.enable {
     assertions = [
-      { assertion = cfg.configuration.db == {} -> (
-          cfg.configuration.dbURL != "" && cfg.configuration.dbURL != null
+      { assertion = cfg.settings.db == {} -> (
+          cfg.settings.dbURL != "" && cfg.settings.dbURL != null
         );
         message = "Database configuration for HedgeDoc missing."; }
     ];
···
       preStart = ''
         ${pkgs.envsubst}/bin/envsubst \
           -o ${cfg.workDir}/config.json \
-          -i ${prettyJSON cfg.configuration}
-        mkdir -p ${cfg.configuration.uploadsPath}
+          -i ${prettyJSON cfg.settings}
+        mkdir -p ${cfg.settings.uploadsPath}
       '';
       serviceConfig = {
         WorkingDirectory = cfg.workDir;
-        StateDirectory = [ cfg.workDir cfg.configuration.uploadsPath ];
+        StateDirectory = [ cfg.workDir cfg.settings.uploadsPath ];
         ExecStart = "${cfg.package}/bin/hedgedoc";
         EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ];
         Environment = [

nixos/tests/all-tests.nix

···
   libreddit = handleTest ./libreddit.nix {};
   libresprite = handleTest ./libresprite.nix {};
   libreswan = handleTest ./libreswan.nix {};
+  librewolf = handleTest ./firefox.nix { firefoxPackage = pkgs.librewolf; };
   lidarr = handleTest ./lidarr.nix {};
   lightdm = handleTest ./lightdm.nix {};
   limesurvey = handleTest ./limesurvey.nix {};

nixos/tests/firefox.nix

···
-import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }: {
-  name = "firefox";
+import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }:
+let firefoxPackage' = firefoxPackage.override (args: {
+      extraPrefsFiles = (args.extraPrefsFiles or []) ++ [
+        # make sure that autoplay is enabled by default for the audio test
+        (builtins.toString (builtins.toFile "autoplay-pref.js" ''defaultPref("media.autoplay.default",0);''))
+      ];
+  });
+
+in
+{
+  name = firefoxPackage'.unwrapped.binaryName;
   meta = with pkgs.lib.maintainers; {
     maintainers = [ eelco shlevy ];
   };
···
 
     { imports = [ ./common/x11.nix ];
       environment.systemPackages = [
-        firefoxPackage
+        firefoxPackage'
         pkgs.xdotool
       ];
 
···
 
       with subtest("Wait until Firefox has finished loading the Valgrind docs page"):
           machine.execute(
-              "xterm -e 'firefox file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html' >&2 &"
+              "xterm -e '${firefoxPackage'.unwrapped.binaryName} file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html' >&2 &"
           )
           machine.wait_for_window("Valgrind")
           machine.sleep(40)
···
       with subtest("Check whether Firefox can play sound"):
           with record_audio(machine):
               machine.succeed(
-                  "firefox file://${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/phone-incoming-call.oga >&2 &"
+                  "${firefoxPackage'.unwrapped.binaryName} file://${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/phone-incoming-call.oga >&2 &"
               )
               wait_for_sound(machine)
           machine.copy_from_vm("/tmp/record.wav")

nixos/tests/graphite.nix

···
               SECRET_KEY = "abcd";
             '';
           };
-          api = {
-            enable = true;
-            port = 8082;
-            finders = [ ];
-          };
           carbon.enableCache = true;
           seyren.enable = false;  # Implicitely requires openssl-1.0.2u which is marked insecure
-          beacon.enable = true;
         };
       };
   };
···
     start_all()
     one.wait_for_unit("default.target")
     one.wait_for_unit("graphiteWeb.service")
-    one.wait_for_unit("graphiteApi.service")
-    one.wait_for_unit("graphite-beacon.service")
     one.wait_for_unit("carbonCache.service")
     # The services above are of type "simple". systemd considers them active immediately
     # even if they're still in preStart (which takes quite long for graphiteWeb).
     # Wait for ports to open so we're sure the services are up and listening.
     one.wait_for_open_port(8080)
-    one.wait_for_open_port(8082)
     one.wait_for_open_port(2003)
     one.succeed('echo "foo 1 `date +%s`" | nc -N localhost 2003')
     one.wait_until_succeeds(
         "curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo >&2"
-    )
-    one.wait_until_succeeds(
-        "curl 'http://localhost:8082/metrics/find/?query=foo&format=treejson' --silent | grep foo >&2"
     )
   '';
 })

nixos/tests/hedgedoc.nix

···
       services = {
         hedgedoc = {
           enable = true;
-          configuration.dbURL = "sqlite:///var/lib/hedgedoc/hedgedoc.db";
+          settings.dbURL = "sqlite:///var/lib/hedgedoc/hedgedoc.db";
         };
       };
     };
···
       services = {
         hedgedoc = {
           enable = true;
-          configuration.dbURL = "postgres://hedgedoc:\${DB_PASSWORD}@localhost:5432/hedgedocdb";
+          settings.dbURL = "postgres://hedgedoc:\${DB_PASSWORD}@localhost:5432/hedgedocdb";
 
           /*
            * Do not use pkgs.writeText for secrets as

pkgs/applications/editors/notepad-next/default.nix

···
 
 mkDerivation rec {
   pname = "notepad-next";
-  version = "0.5.2";
+  version = "0.5.3";
 
   src = fetchFromGitHub {
     owner = "dail8859";
     repo = "NotepadNext";
     rev = "v${version}";
-    sha256 = "sha256-LyUV85wW6FGlkV0qSIfkLMHpXXj1qvRnGZuYy8ASwZ8=";
+    sha256 = "sha256-9VbtSpWiSVNRydqpTJ0Zd2/9mXy18Drl6q61BHZ0zrs=";
     # External dependencies - https://github.com/dail8859/NotepadNext/issues/135
     fetchSubmodules = true;
   };

pkgs/applications/networking/browsers/librewolf/default.nix

···
-{ stdenv, lib, callPackage, buildMozillaMach }:
+{ stdenv, lib, callPackage, buildMozillaMach, nixosTests }:
 
 let
   librewolf-src = callPackage ./librewolf.nix { };
···
     maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115)
     license = lib.licenses.mpl20;
   };
+  tests = [ nixosTests.librewolf ];
   updateScript = callPackage ./update.nix {
     attrPath = "librewolf-unwrapped";
   };

pkgs/applications/science/logic/coq/default.nix

···
 { lib, stdenv, fetchzip, writeText, pkg-config, gnumake42
 , customOCamlPackages ? null
 , ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ocamlPackages_4_12, ncurses
-, buildIde ? true
+, buildIde ? null # default is true for Coq < 8.14 and false for Coq >= 8.14
 , glib, gnome, wrapGAppsHook, makeDesktopItem, copyDesktopItems
 , csdp ? null
-, version, coq-version ? null,
+, version, coq-version ? null
 }@args:
 let lib' = lib; in
 let lib = import ../../../../build-support/coq/extra-lib.nix {lib = lib';}; in
···
   version = fetched.version;
   coq-version = args.coq-version or (if version != "dev" then versions.majorMinor version else "dev");
   coqAtLeast = v: coq-version == "dev" || versionAtLeast coq-version v;
+  buildIde = args.buildIde or (!coqAtLeast "8.14");
   ideFlags = optionalString (buildIde && !coqAtLeast "8.10")
     "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt";
   csdpPatch = if csdp != null then ''

pkgs/applications/version-management/git-and-tools/git-extras/default.nix

···
-{ lib, stdenv, fetchFromGitHub, unixtools, which }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, unixtools
+, which
+}:
 
 stdenv.mkDerivation rec {
   pname = "git-extras";
···
     rev = version;
     sha256 = "sha256-Cn7IXMzgg0QIsNIHz+X14Gkmop0UbsSBlGlGkmg71ek=";
   };
+
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/tj/git-extras/commit/66961ad4911cd0f1a908530f2b725bacc7d198e1.patch";
+      sha256 = "sha256-iC1lUf/NmuAPADxDWZ2JScHIMgYjIaR0edlGpq0qCOc=";
+    })
+  ];
 
   postPatch = ''
     patchShebangs check_dependencies.sh

pkgs/data/icons/papirus-icon-theme/default.nix

···
 
 stdenvNoCC.mkDerivation rec {
   pname = "papirus-icon-theme";
-  version = "20220606";
+  version = "20220710";
 
   src = fetchFromGitHub {
     owner = "PapirusDevelopmentTeam";
     repo = pname;
     rev = version;
-    sha256 = "sha256-HJb77ArzwMX9ZYTp0Ffxxtst1/xhPAa+eEP5n950DSs=";
+    sha256 = "sha256-CInoUlWMmLwc4mMi1krmXr2a2JCWZ7XcPe20wFSNjqk=";
   };
 
   nativeBuildInputs = [ gtk3 papirus-folders ];

pkgs/development/compilers/gcc/12/PR106102-musl-poison-cpp.patch

···
+https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=3b21c21f3f5726823e19728fdd1571a14aae0fb3
+https://gcc.gnu.org/PR106102
+--- a/gcc/cp/mapper-client.cc
++++ b/gcc/cp/mapper-client.cc
+@@ -27,6 +27,7 @@ along with GCC; see the file COPYING3.  If not see
+ #define INCLUDE_STRING
+ #define INCLUDE_VECTOR
+ #define INCLUDE_MAP
++#define INCLUDE_MEMORY
+ #include "system.h"
+ 
+ #include "line-map.h"
+--- a/gcc/cp/mapper-resolver.cc
++++ b/gcc/cp/mapper-resolver.cc
+@@ -25,6 +25,7 @@ along with GCC; see the file COPYING3.  If not see
+ #define INCLUDE_VECTOR
+ #define INCLUDE_ALGORITHM
+ #define INCLUDE_MAP
++#define INCLUDE_MEMORY
+ #include "system.h"
+ 
+ // We don't want or need to be aware of networking
+--- a/gcc/cp/module.cc
++++ b/gcc/cp/module.cc
+@@ -206,6 +206,7 @@ Classes used:
+ 
+ #define _DEFAULT_SOURCE 1 /* To get TZ field of struct tm, if available.  */
+ #include "config.h"
++#define INCLUDE_MEMORY
+ #define INCLUDE_STRING
+ #define INCLUDE_VECTOR
+ #include "system.h"
+--- a/libcc1/libcc1plugin.cc
++++ b/libcc1/libcc1plugin.cc
+@@ -31,6 +31,7 @@
+ #undef PACKAGE_TARNAME
+ #undef PACKAGE_VERSION
+ 
++#define INCLUDE_MEMORY
+ #include "gcc-plugin.h"
+ #include "system.h"
+ #include "coretypes.h"
+--- a/libcc1/libcp1plugin.cc
++++ b/libcc1/libcp1plugin.cc
+@@ -32,6 +32,7 @@
+ #undef PACKAGE_TARNAME
+ #undef PACKAGE_VERSION
+ 
++#define INCLUDE_MEMORY
+ #include "gcc-plugin.h"
+ #include "system.h"
+ #include "coretypes.h"

pkgs/development/compilers/gcc/12/PR106102-musl-poison-jit.patch

···
+https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=49d508065bdd36fb1a9b6aad9666b1edb5e06474
+https://gcc.gnu.org/PR106102
+--- a/gcc/jit/jit-playback.cc
++++ b/gcc/jit/jit-playback.cc
+@@ -19,6 +19,7 @@ along with GCC; see the file COPYING3.  If not see
+ <http://www.gnu.org/licenses/>.  */
+ 
+ #include "config.h"
++#define INCLUDE_PTHREAD_H
+ #include "system.h"
+ #include "coretypes.h"
+ #include "target.h"
+@@ -41,8 +42,6 @@ along with GCC; see the file COPYING3.  If not see
+ #include "diagnostic.h"
+ #include "stmt.h"
+ 
+-#include <pthread.h>
+-
+ #include "jit-playback.h"
+ #include "jit-result.h"
+ #include "jit-builtins.h"
+--- a/gcc/jit/jit-recording.cc
++++ b/gcc/jit/jit-recording.cc
+@@ -19,13 +19,13 @@ along with GCC; see the file COPYING3.  If not see
+ <http://www.gnu.org/licenses/>.  */
+ 
+ #include "config.h"
++#define INCLUDE_PTHREAD_H
+ #include "system.h"
+ #include "coretypes.h"
+ #include "tm.h"
+ #include "pretty-print.h"
+ #include "toplev.h"
+ 
+-#include <pthread.h>
+ 
+ #include "jit-builtins.h"
+ #include "jit-recording.h"
+--- a/gcc/jit/libgccjit.cc
++++ b/gcc/jit/libgccjit.cc
+@@ -19,12 +19,12 @@ along with GCC; see the file COPYING3.  If not see
+ <http://www.gnu.org/licenses/>.  */
+ 
+ #include "config.h"
++#define INCLUDE_PTHREAD_H
+ #include "system.h"
+ #include "coretypes.h"
+ #include "timevar.h"
+ #include "typed-splay-tree.h"
+ #include "cppbuiltin.h"
+-#include <pthread.h>
+ 
+ #include "libgccjit.h"
+ #include "jit-recording.h"
+--- a/gcc/system.h
++++ b/gcc/system.h
+@@ -753,6 +753,10 @@ extern int vsnprintf (char *, size_t, const char *, va_list);
+ #endif
+ #endif
+ 
++#ifdef INCLUDE_PTHREAD_H
++#include <pthread.h>
++#endif
++
+ #ifdef INCLUDE_ISL
+ #ifdef HAVE_isl
+ #include <isl/options.h>

pkgs/development/compilers/gcc/12/default.nix

···
         ../gnat-cflags-11.patch
         ../gcc-12-gfortran-driving.patch
         ../ppc-musl.patch
+        # Backports. Should be removed with 12.2.0 release:
+        ./PR106102-musl-poison-cpp.patch
+        ./PR106102-musl-poison-jit.patch
       ] ++ optional (stdenv.isDarwin && stdenv.isAarch64) (fetchpatch {
         url = "https://github.com/fxcoudert/gcc/compare/releases/gcc-11.1.0...gcc-11.1.0-arm-20210504.diff";
         sha256 = "sha256-JqCGJAfbOxSmkNyq49aFHteK/RFsCSLQrL9mzUCnaD0=";

pkgs/development/coq-modules/coqide/default.nix

···
+{ lib
+, makeDesktopItem
+, copyDesktopItems
+, wrapGAppsHook
+, glib
+, gnome
+, mkCoqDerivation
+, coq
+, version ? null }:
+
+with lib; mkCoqDerivation rec {
+  pname = "coqide";
+  inherit version;
+
+  inherit (coq) src;
+  release."${coq.version}" = {};
+
+  defaultVersion = if versions.isGe "8.14" coq.version then coq.version else null;
+
+  preConfigure = ''
+    patchShebangs dev/tools/
+  '';
+  prefixKey = "-prefix ";
+
+  useDune2 = true;
+
+  buildInputs = [
+    copyDesktopItems
+    wrapGAppsHook
+    coq.ocamlPackages.lablgtk3-sourceview3
+    glib
+    gnome.adwaita-icon-theme
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+    dune build -p ${pname} -j $NIX_BUILD_CORES
+    runHook postBuild
+  '';
+  installPhase = ''
+    runHook preInstall
+    dune install --prefix $out ${pname}
+    runHook postInstall
+  '';
+
+  desktopItems = makeDesktopItem {
+    name = "coqide";
+    exec = "coqide";
+    icon = "coq";
+    desktopName = "CoqIDE";
+    comment = "Graphical interface for the Coq proof assistant";
+    categories = [ "Development" "Science" "Math" "IDE" "GTK" ];
+  };
+
+  meta = with lib; {
+    homepage = "https://coq.inria.fr";
+    description = "The CoqIDE user interface for the Coq proof assistant";
+    license = licenses.lgpl21Plus;
+    maintainers = [ maintainers.Zimmi48 ];
+  };
+}

pkgs/development/dhall-modules/dhall-grafana.nix

···
   name = "grafana";
   owner = "weeezes";
   repo = "dhall-grafana";
-  # 2021-11-12
-  rev = "d5630dc55deacf5100a99802a4df1d9680b263b3";
-  sha256 = "01320hpqgr5r4grsydmdl9yznmly1ssnlc9gcwa8rj1ah0a8xlgz";
+  # 2022-07-10
+  rev = "49a3ee4801cf64f479e3f0bad839a5dd8e5b4932";
+  sha256 = "1i8b98xx20b73afkmr78l4x4ci3dk2sc737hxkcaxp3sgncwnz1b";
   dependencies = [ Prelude ];
 }

pkgs/development/libraries/libadwaita/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "libadwaita";
-  version = "1.1.2";
+  version = "1.1.3";
 
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "devdoc"; # demo app
···
     owner = "GNOME";
     repo = "libadwaita";
     rev = version;
-    hash = "sha256-OyjuUWfKE8GoGFCmaCS7YAf5GAS0VwMPht7cvFtkA/Y=";
+    hash = "sha256-Mjv4Z9YaIT9atD8ekepBAA1ZV30kWnMnV8+kOuGULnw=";
   };
 
   nativeBuildInputs = [

pkgs/development/ocaml-modules/erm_xmpp/default.nix

···
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.3+20200317";
+  version = "0.3+20220404";
   pname = "ocaml${ocaml.version}-erm_xmpp";
 
   src = fetchFromGitHub {
     owner  = "hannesm";
     repo   = "xmpp";
-    rev    = "7fa5bea252671fd88625c6af109998b879ca564f";
-    sha256 = "0spzyd9kbyizzwl8y3mq8z19zlkzxnkh2fppry4lyc7vaw7bqrwq";
+    rev    = "e54d54e142ac9770c37e144693473692bf473530";
+    sha256 = "sha256-Ize8Em4LI54Cy1Xuzr9BjQGV7JMr3W6KI1YzI8G1q/U=";
   };
 
   nativeBuildInputs = [ ocaml findlib ocamlbuild camlp4 ];

pkgs/development/python-modules/aioaladdinconnect/default.nix

···
+{ lib
+, aiohttp
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "aioaladdinconnect";
+  version = "0.1.21";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchPypi {
+    pname = "AIOAladdinConnect";
+    inherit version;
+    hash = "sha256-Zr9QLiQNmphPpAVnFVpoOlVbuWUVtWXIacYKAnth+E4=";
+  };
+
+  propagatedBuildInputs = [
+    aiohttp
+  ];
+
+  # Module has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "AIOAladdinConnect"
+  ];
+
+  meta = with lib; {
+    description = "Library for controlling Genie garage doors connected to Aladdin Connect devices";
+    homepage = "https://github.com/mkmer/AIOAladdinConnect";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}

pkgs/development/python-modules/aiomusiccast/default.nix

···
 
 buildPythonPackage rec {
   pname = "aiomusiccast";
-  version = "0.14.4";
+  version = "0.14.5";
 
   format = "pyproject";
   disabled = pythonOlder "3.8";
···
     owner = "vigonotion";
     repo = "aiomusiccast";
     rev = "refs/tags/${version}";
-    hash = "sha256-vSf4Fcioz+ZrXCaFQQbHzhz7vOknCOEFJXduXJlO/wE=";
+    hash = "sha256-YssBrG4sFtQtrzKU/O/tWEVL9eq8dpszejY/1So5Mec=";
   };
 
   postPatch = ''

pkgs/development/python-modules/graphite-api/default.nix

···
-{ stdenv, buildPythonPackage, fetchFromGitHub, lib, flask, flask-caching, cairocffi, pyparsing, pytz, pyyaml
-, raven, six, structlog, tzlocal, nose, mock, cairo, isPyPy
-}:
-
-buildPythonPackage rec {
-  pname = "graphite-api";
-  version = "1.1.3";
-
-  disabled = isPyPy;
-
-  src = fetchFromGitHub {
-    owner = "brutasse";
-    repo = "graphite-api";
-    rev = version;
-    sha256 = "0sz3kav2024ms2z4q03pigcf080gsr5v774z9bp3zw29k2p47ass";
-  };
-
-  # https://github.com/brutasse/graphite-api/pull/239 rebased onto 1.1.3
-  patches = [ ./flask-caching-rebased.patch ];
-
-  checkPhase = "nosetests";
-
-  propagatedBuildInputs = [
-    flask
-    flask-caching
-    cairocffi
-    pyparsing
-    pytz
-    pyyaml
-    raven
-    six
-    structlog
-    tzlocal
-  ];
-
-  checkInputs = [ nose mock ];
-
-  LD_LIBRARY_PATH = "${cairo.out}/lib";
-
-  meta = with lib; {
-    broken = stdenv.isDarwin;
-    description = "Graphite-web, without the interface. Just the rendering HTTP API";
-    homepage = "https://github.com/brutasse/graphite-api";
-    license = licenses.asl20;
-  };
-}

pkgs/development/python-modules/graphite-api/flask-caching-rebased.patch

···
-diff --git a/graphite_api/config.py b/graphite_api/config.py
-index 5e1e382..dc033a8 100644
---- a/graphite_api/config.py
-+++ b/graphite_api/config.py
-@@ -112,11 +112,11 @@ def configure(app):
-     app.cache = None
-     if 'cache' in config:
-         try:
--            from flask.ext.cache import Cache
-+            from flask_caching import Cache
-         except ImportError:
-             warnings.warn("'cache' is provided in the configuration but "
--                          "Flask-Cache is not installed. Please `pip install "
--                          "Flask-Cache`.")
-+                          "flask-caching is not installed. Please `pip "
-+                          "install flask-caching`.")
-         else:
-             cache_conf = {'CACHE_DEFAULT_TIMEOUT': 60,
-                           'CACHE_KEY_PREFIX': 'graphite-api:'}
-diff --git a/requirements.txt b/requirements.txt
-index c68b446..7826b0c 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -1,5 +1,5 @@
- Flask
--Flask-Cache
-+Flask-Caching
- cairocffi
- pyparsing>=1.5.7
- pytz
-diff --git a/setup.py b/setup.py
-index 0337cbe..df07989 100644
---- a/setup.py
-+++ b/setup.py
-@@ -38,7 +38,7 @@ setup(
-     extras_require={
-         'sentry': ['raven[flask]'],
-         'cyanite': ['cyanite'],
--        'cache': ['Flask-Cache'],
-+        'cache': ['Flask-Caching'],
-         'statsd': ['statsd'],
-     },
-     zip_safe=False,
-diff --git a/tests/test_render.py b/tests/test_render.py
-index be5609d..a0e7190 100644
---- a/tests/test_render.py
-+++ b/tests/test_render.py
-@@ -8,7 +8,7 @@ from graphite_api._vendor import whisper
- from . import TestCase, WHISPER_DIR
- 
- try:
--    from flask.ext.cache import Cache
-+    from flask_caching import Cache
- except ImportError:
-     Cache = None
- 
-diff --git a/tox.ini b/tox.ini
-index 85a0abb..c820393 100644
---- a/tox.ini
-+++ b/tox.ini
-@@ -47,7 +47,7 @@ basepython = python2.7
- deps =
- 	{[testenv]deps}
- 	Flask
--	Flask-Cache
-+	Flask-Caching
- 	pyparsing
- 	mock
- 
-@@ -56,7 +56,7 @@ basepython = python3.3
- deps =
- 	{[testenv]deps}
- 	Flask
--	Flask-Cache
-+	Flask-Caching
- 	pyparsing
- 
- [testenv:py34]
-@@ -66,7 +66,7 @@ commands =
- deps =
- 	{[testenv]deps}
- 	Flask
--	Flask-Cache
-+	Flask-Caching
- 	pyparsing
- 
- [testenv:py35]
-@@ -76,7 +76,7 @@ commands =
- deps =
- 	{[testenv]deps}
- 	Flask
--	Flask-Cache
-+	Flask-Caching
- 	pyparsing
- 
- [testenv:pyparsing1]
-@@ -84,7 +84,7 @@ basepython = python2.7
- deps =
- 	{[testenv]deps}
- 	Flask
--	Flask-Cache
-+	Flask-Caching
- 	pyparsing==1.5.7
- 	mock
- 
-@@ -93,7 +93,7 @@ basepython = pypy
- deps =
- 	{[testenv]deps}
- 	Flask
--	Flask-Cache
-+	Flask-Caching
- 	pyparsing
- 	mock
- 
-@@ -102,7 +102,7 @@ basepython = python2.7
- deps =
- 	{[testenv]deps}
- 	Flask<0.9
--	Flask-Cache
-+	Flask-Caching
- 	pyparsing
- 	mock
- 
-@@ -111,7 +111,7 @@ basepython = python2.7
- deps =
- 	{[testenv]deps}
- 	Flask<0.10
--	Flask-Cache
-+	Flask-Caching
- 	pyparsing
- 	mock
- 

pkgs/development/python-modules/graphite_beacon/default.nix

···
-{ lib, buildPythonPackage, fetchPypi
-, tornado_5, pyyaml, funcparserlib
-, nixosTests
-}:
-
-buildPythonPackage rec {
-  pname = "graphite_beacon";
-  version = "0.27.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "03bp4wyfn3xhcqyvs5hnk1n87m4smsmm1p7qp459m7j8hwpbq2ks";
-  };
-
-  propagatedBuildInputs = [ tornado_5 pyyaml funcparserlib ];
-
-  postPatch = ''
-    substituteInPlace requirements.txt --replace "==" ">="
-  '';
-
-  pythonImportsCheck = [ "graphite_beacon" ];
-
-  passthru.tests = {
-    nixos = nixosTests.graphite;
-  };
-
-  meta = with lib; {
-    description = "A simple alerting application for Graphite metrics";
-    homepage = "https://github.com/klen/graphite-beacon";
-    maintainers = [ maintainers.offline ];
-    license = licenses.mit;
-  };
-}

pkgs/development/python-modules/humanize/default.nix

···
 , buildPythonPackage
 , fetchFromGitHub
 , freezegun
+, gettext
 , importlib-metadata
 , pytestCheckHook
 , pythonOlder
···
 }:
 
 buildPythonPackage rec {
-  version = "4.1.0";
+  version = "4.2.3";
   pname = "humanize";
   format = "pyproject";
 
···
     owner = "python-humanize";
     repo = pname;
     rev = version;
-    hash = "sha256-5xL3gfEohDjnF085Pgx/PBXWWM76X4FU2KR+8OGshMw=";
+    hash = "sha256-cAlNtN9sUnDAkCQj2bJfT72B2TQDYRBB4P4NJY9mUU0=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
 
   nativeBuildInputs = [
     setuptools-scm
+    gettext
   ];
 
   propagatedBuildInputs = [
···
     importlib-metadata
   ];
 
+  postBuild = ''
+    scripts/generate-translation-binaries.sh
+  '';
+
+  postInstall = ''
+    cp -r 'src/humanize/locale' "$out/lib/"*'/site-packages/humanize/'
+  '';
+
   checkInputs = [
     freezegun
     pytestCheckHook
···
     description = "Python humanize utilities";
     homepage = "https://github.com/python-humanize/humanize";
     license = licenses.mit;
-    maintainers = with maintainers; [ rmcgibbo ];
+    maintainers = with maintainers; [ rmcgibbo Luflosi ];
   };
 }

pkgs/development/python-modules/influxgraph/default.nix

···
-{ lib, buildPythonPackage, fetchPypi, isPy3k
-, influxdb, graphite_api, python-memcached
-}:
-
-buildPythonPackage rec {
-  pname = "influxgraph";
-  version = "1.5.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0l33sfwdh4bfprmzp2kx0d9098g6yxbnhyyx9qr3kzczpm0jg9vy";
-  };
-
-  propagatedBuildInputs = [ influxdb graphite_api python-memcached ];
-
-  passthru.moduleName = "influxgraph.InfluxDBFinder";
-
-  meta = with lib; {
-    description = "InfluxDB storage plugin for Graphite-API";
-    homepage = "https://github.com/InfluxGraph/influxgraph";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ basvandijk ];
-  };
-}

pkgs/development/python-modules/python-swiftclient/default.nix

···
 { lib
 , buildPythonApplication
 , fetchPypi
+, installShellFiles
 , mock
 , openstacksdk
 , pbr
···
     hash = "sha256-V7bx/yO0ZoQ4AqaBb0trvGiWtq0F1ld6/udiK+OilTg=";
   };
 
+  nativeBuildInputs = [
+    installShellFiles
+  ];
+
   propagatedBuildInputs = [
     pbr
     python-keystoneclient
···
   ];
 
   postInstall = ''
-    install -Dm644 tools/swift.bash_completion $out/share/bash_completion.d/swift
+    installShellCompletion --cmd swift \
+      --bash tools/swift.bash_completion
+    installManPage doc/manpages/*
   '';
 
   checkPhase = ''

pkgs/development/python-modules/softlayer/default.nix

···
 , testtools
 , tkinter
 , urllib3
+, prettytable
+, rich
+, zeep
 }:
 
 buildPythonPackage rec {
   pname = "softlayer";
-  version = "5.9.9";
+  version = "6.1.0";
   disabled = pythonOlder "3.5";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = "softlayer-python";
     rev = "v${version}";
-    sha256 = "sha256-LskPz5KXOi7olb3+DUP9uEFESQeo6ec/ZLx9B/w6Ni0=";
+    sha256 = "sha256-T49KVAsgcAZySkaJi47IrFcMHGZvEkGDjPWsdMarzwM=";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py \
+        --replace 'rich == 12.3.0' 'rich >= 12.3.0'
+  '';
+
   propagatedBuildInputs = [
     click
     prompt-toolkit
···
     pygments
     requests
     urllib3
+    prettytable
+    rich
   ];
 
   checkInputs = [
···
     sphinx
     testtools
     tkinter
+    zeep
+  ];
+
+  # Otherwise soap_tests.py will fail to create directory
+  # Permission denied: '/homeless-shelter'
+  preCheck = ''
+    export HOME=$(mktemp -d)
+  '';
+
+  disabledTestPaths = [
+    # Test fails with ConnectionError trying to connect to api.softlayer.com
+    "tests/transports/soap_tests.py"
   ];
 
   pythonImportsCheck = [ "SoftLayer" ];
 
   meta = with lib; {
-    broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
     description = "Python libraries that assist in calling the SoftLayer API";
     homepage = "https://github.com/softlayer/softlayer-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ onny ];
   };
 }

pkgs/development/python-modules/swift/default.nix

···
 , eventlet
 , greenlet
 , iana-etc
+, installShellFiles
 , libredirect
 , lxml
 , mock
···
     rm test/functional/s3api/{__init__.py,s3_test_client.py}
   '';
 
-  nativeBuildInputs = [ pbr ];
+  nativeBuildInputs = [
+    installShellFiles
+    pbr
+  ];
 
   propagatedBuildInputs = [
     cryptography
···
     six
     xattr
   ];
+
+  postInstall = ''
+    installManPage doc/manpages/*
+  '';
 
   checkInputs = [
     boto3

pkgs/development/tools/ocaml/ocamlformat/default.nix

···
     version = "0.22.4";
   };
 
-  ocamlformat = ocamlformat_0_22_4;
+  ocamlformat_0_23_0 = mkOCamlformat {
+    version = "0.23.0";
+  };
+
+  ocamlformat = ocamlformat_0_23_0;
 }

pkgs/development/tools/ocaml/ocamlformat/generic.nix

···
       "0.20.1" = "sha256-fTpRZFQW+ngoc0T6A69reEUAZ6GmHkeQvxspd5zRAjU=";
       "0.21.0" = "sha256-KhgX9rxYH/DM6fCqloe4l7AnJuKrdXSe6Y1XY3BXMy0=";
       "0.22.4" = "sha256-61TeK4GsfMLmjYGn3ICzkagbc3/Po++Wnqkb2tbJwGA=";
+      "0.23.0" = "sha256-m9Pjz7DaGy917M1GjyfqG5Lm5ne7YSlJF2SVcDHe3+0=";
     }."${version}";
   };
   ocamlPackages = ocaml-ng.ocamlPackages;

pkgs/misc/cups/drivers/canon/default.nix

···
 }:
 
 let
-
   i686_NIX_GCC = pkgsi686Linux.callPackage ({ gcc }: gcc) { };
   ld32 =
     if stdenv.hostPlatform.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32"
···
   };
 
   buildInputs = [ cups zlib jbigkit glib gtk3 pkg-config gnome2.libglade libxml2 gdk-pixbuf pango cairo atk ];
-
 in
-
-
 stdenv.mkDerivation rec {
   pname = "canon-cups-ufr2";
   inherit version;
   src = src_canon;
 
   postUnpack = ''
-    (cd $sourceRoot; tar -xzf Sources/cnrdrvcups-lb-${version}-1.tar.gz)
-    (cd $sourceRoot; sed -ie "s@_prefix=/usr@_prefix=$out@" cnrdrvcups-common-${version}/allgen.sh)
-    (cd $sourceRoot; sed -ie "s@_libdir=/usr/lib@_libdir=$out/lib@" cnrdrvcups-common-${version}/allgen.sh)
-    (cd $sourceRoot; sed -ie "s@_bindir=/usr/bin@_libdir=$out/bin@" cnrdrvcups-common-${version}/allgen.sh)
-    (cd $sourceRoot; sed -ie "s@etc/cngplp@$out/etc/cngplp@" cnrdrvcups-common-${version}/cngplp/Makefile.am)
-    (cd $sourceRoot; sed -ie "s@usr/share/cngplp@$out/usr/share/cngplp@" cnrdrvcups-common-${version}/cngplp/src/Makefile.am)
-    (cd $sourceRoot; patchShebangs cnrdrvcups-common-${version})
+    (
+      cd $sourceRoot
+      tar -xzf Sources/cnrdrvcups-lb-${version}-1.tar.gz
+      sed -ie "s@_prefix=/usr@_prefix=$out@" cnrdrvcups-common-${version}/allgen.sh
+      sed -ie "s@_libdir=/usr/lib@_libdir=$out/lib@" cnrdrvcups-common-${version}/allgen.sh
+      sed -ie "s@_bindir=/usr/bin@_bindir=$out/bin@" cnrdrvcups-common-${version}/allgen.sh
+      sed -ie "s@etc/cngplp@$out/etc/cngplp@" cnrdrvcups-common-${version}/cngplp/Makefile.am
+      sed -ie "s@usr/share/cngplp@$out/usr/share/cngplp@" cnrdrvcups-common-${version}/cngplp/src/Makefile.am
+      patchShebangs cnrdrvcups-common-${version}
 
-    (cd $sourceRoot; sed -ie "s@_prefix=/usr@_prefix=$out@" cnrdrvcups-lb-${version}/allgen.sh)
-    (cd $sourceRoot; sed -ie "s@_libdir=/usr/lib@_libdir=$out/lib@" cnrdrvcups-lb-${version}/allgen.sh)
-    (cd $sourceRoot; sed -ie "s@_bindir=/usr/bin@_libdir=$out/bin@" cnrdrvcups-lb-${version}/allgen.sh)
-    (cd $sourceRoot; sed -ie '/^cd \.\.\/cngplp/,/^cd files/{/^cd files/!{d}}' cnrdrvcups-lb-${version}/allgen.sh)
-    (cd $sourceRoot; sed -ie "s@cd \.\./pdftocpca@cd pdftocpca@" cnrdrvcups-lb-${version}/allgen.sh)
-    (cd $sourceRoot; sed -i "/CNGPLPDIR/d" cnrdrvcups-lb-${version}/Makefile)
-    (cd $sourceRoot; patchShebangs cnrdrvcups-lb-${version})
+      sed -ie "s@_prefix=/usr@_prefix=$out@" cnrdrvcups-lb-${version}/allgen.sh
+      sed -ie "s@_libdir=/usr/lib@_libdir=$out/lib@" cnrdrvcups-lb-${version}/allgen.sh
+      sed -ie "s@_bindir=/usr/bin@_bindir=$out/bin@" cnrdrvcups-lb-${version}/allgen.sh
+      sed -ie '/^cd \.\.\/cngplp/,/^cd files/{/^cd files/!{d}}' cnrdrvcups-lb-${version}/allgen.sh
+      sed -ie "s@cd \.\./pdftocpca@cd pdftocpca@" cnrdrvcups-lb-${version}/allgen.sh
+      sed -i "/CNGPLPDIR/d" cnrdrvcups-lb-${version}/Makefile
+      patchShebangs cnrdrvcups-lb-${version}
+    )
   '';
 
   nativeBuildInputs = [ makeWrapper unzip autoconf automake libtool_1_5 ];

pkgs/os-specific/linux/kernel/common-config.nix

···
         (whenBetween "5.2" "5.18" yes)
       ];
       DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT = whenAtLeast "5.18" yes;
+      # Reduced debug info conflict with BTF and have been enabled in
+      # aarch64 defconfig since 5.13
+      DEBUG_INFO_REDUCED        = whenAtLeast "5.13" (option no);
       # Disabled on 32-bit platforms, fails to build on 5.15+ with `Failed to parse base BTF 'vmlinux': -22`
       DEBUG_INFO_BTF            = whenAtLeast "5.2" (option (if stdenv.hostPlatform.is32bit && (versionAtLeast version "5.15") then no else yes));
       BPF_LSM                   = whenAtLeast "5.7" (option yes);

pkgs/servers/home-assistant/component-packages.nix

···
       aioairzone
     ];
     "aladdin_connect" = ps: with ps; [
-    ]; # missing inputs: AIOAladdinConnect
+      aioaladdinconnect
+    ];
     "alarm_control_panel" = ps: with ps; [
     ];
     "alarmdecoder" = ps: with ps; [
···
     "airtouch4"
     "airvisual"
     "airzone"
+    "aladdin_connect"
     "alarm_control_panel"
     "alarmdecoder"
     "alert"

pkgs/servers/roundcube/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "roundcube";
-  version = "1.5.2";
+  version = "1.5.3";
 
   src = fetchurl {
     url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
-    sha256 = "sha256-8DloOBFW/nkNhYr34GnFVQqFd/uWT5ZiRDSJUnIFODg=";
+    sha256 = "sha256-S8+sIZ8uAAXJEtrDIndDzB7Q3tacgi90yBpw0EHlo70=";
   };
 
   patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ];

pkgs/tools/backup/discordchatexporter-cli/default.nix

···
 
 buildDotnetModule rec {
   pname = "discordchatexporter-cli";
-  version = "2.34.1";
+  version = "2.35";
 
   src = fetchFromGitHub {
     owner = "tyrrrz";
     repo = "discordchatexporter";
     rev = version;
-    sha256 = "U+AwxHvyLD2BwrJH3h0yKKHBsgBM/D657TuG9IgllPs=";
+    sha256 = "xPHXs7lk7WaSTr5jH7q8mN1O6Z9cdD2EACx2CmLelJ8=";
   };
 
   projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj";

pkgs/tools/backup/discordchatexporter-cli/deps.nix

···
 { fetchNuGet }: [
+  (fetchNuGet { pname = "AdvancedStringBuilder"; version = "0.1.0"; sha256 = "1lpv5sggdxza0bmcqmzf5r4i340f0m7nr5073lac18naj5697q5g"; })
   (fetchNuGet { pname = "CliFx"; version = "2.2.5"; sha256 = "1bk716rdswy28h53qy68xywci8k1h2iqdy2iz1yf7v8g0sa2n79p"; })
+  (fetchNuGet { pname = "DotnetRuntimeBootstrapper"; version = "2.3.1"; sha256 = "0zsicyizachdam64mjm1brh5a3nzf7j8nalyhwnw26wk3v3rgmc9"; })
   (fetchNuGet { pname = "Gress"; version = "2.0.1"; sha256 = "00xhyfkrlc38nbl6aymr7zwxc3kj0rxvx5gwk6fkfrvi1pzgq0wc"; })
   (fetchNuGet { pname = "JsonExtensions"; version = "1.2.0"; sha256 = "0g54hibabbqqfhxjlnxwv1rxagpali5agvnpymp2w3dk8h6q66xy"; })
   (fetchNuGet { pname = "MiniRazor.CodeGen"; version = "2.2.1"; sha256 = "1mrjw3vq59pbiqvayilazjgv6l87j20j8hmhcpbacz9p5bl1hvvr"; })
···
   (fetchNuGet { pname = "Polly"; version = "7.2.3"; sha256 = "1iws4jd5iqj5nlfp16fg9p5vfqqas1si0cgh8xcj64y433a933cv"; })
   (fetchNuGet { pname = "Spectre.Console"; version = "0.44.0"; sha256 = "0f4q52rmib0q3vg7ij6z73mnymyas7c7wrm8dfdhrkdzn53zwl6p"; })
   (fetchNuGet { pname = "Superpower"; version = "3.0.0"; sha256 = "0p6riay4732j1fahc081dzgs9q4z3n2fpxrin4zfpj6q2226dhz4"; })
+  (fetchNuGet { pname = "WebMarkupMin.Core"; version = "2.9.0"; sha256 = "1m184n0zdfxzk9vi2q9y8c8987a0c044vy97i9iginndzxvwazgg"; })
 ]

pkgs/tools/misc/hdf5/1.10.nix

···
 let inherit (lib) optional optionals; in
 
 stdenv.mkDerivation rec {
-  # pinned to 1.10.6 for pythonPackages.tables v3.6.1. tables has test errors for hdf5 > 1.10.6. https://github.com/PyTables/PyTables/issues/845
-  version = "1.10.6";
+  version = "1.10.9";
   pname = "hdf5";
   src = fetchurl {
     url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${lib.versions.majorMinor version}/${pname}-${version}/src/${pname}-${version}.tar.bz2";
-    sha256 = "1gf38x51128hn00744358w27xgzjk0ff4wra4yxh2lk804ck1mh9";
+    sha256 = "sha256-AMS+cJbzb9yvpPl04SbGwUEkKOOOvHsYHZB0WeeB8ZE=";
   };
 
   outputs = [ "out" "dev" ];
···
   configureFlags = optional enableShared "--enable-shared"
     ++ optional javaSupport "--enable-java";
 
-  patches = [
-    ./bin-mv.patch
-  ];
+  patches = [ ];
 
   postInstall = ''
     find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' +

pkgs/tools/misc/trackma/default.nix

···
 , gobject-introspection
 , glib
 , gtk3
+, qt5
+, makeDesktopItem
+, copyDesktopItems
 , withCurses ? false
-, withGtk ? false
+, withGTK ? false
+, withQT ? false
 }:
-
+let
+  mkDesktopItem = name: desktopName: comment: terminal: makeDesktopItem {
+    inherit name desktopName comment terminal;
+    icon = "trackma";
+    exec = name + " %u";
+    type = "Application";
+    categories = [ "Network" ];
+  };
+in
 python3.pkgs.buildPythonApplication rec {
   pname = "trackma";
   version = "0.8.4";
···
     repo = "trackma";
     rev = "v${version}";
     sha256 = "sha256-drc39ID4WYBQ/L2py57CB5OkQNfRKNigPQW0Lp8GIMc=";
+    fetchSubmodules = true; # for anime-relations submodule
   };
 
-  nativeBuildInputs = lib.optionals withGtk [ wrapGAppsHook ];
+  nativeBuildInputs = [ copyDesktopItems ]
+    ++ lib.optionals withGTK [ wrapGAppsHook ]
+    ++ lib.optionals withQT [ qt5.wrapQtAppsHook ];
 
-  buildInputs = lib.optionals withGtk [ glib gobject-introspection gtk3 ];
+  buildInputs = lib.optionals withGTK [ glib gobject-introspection gtk3 ];
 
-  propagatedBuildInputs = [ python3.pkgs.urllib3  python3.pkgs.dbus-python ]
-    ++ lib.optionals withGtk [ python3.pkgs.pillow python3.pkgs.pygobject3 python3.pkgs.pycairo ]
-    ++ lib.optionals withCurses [ python3.pkgs.urwid ]
-    ++ lib.optionals stdenv.isLinux [ python3.pkgs.pyinotify ];
+  propagatedBuildInputs = with python3.pkgs; ([ urllib3 ]
+    ++ lib.optionals withQT [ pyqt5 ]
+    ++ lib.optionals withGTK [ pycairo ]
+    ++ lib.optionals withCurses [ urwid ]
+    ++ lib.optionals stdenv.isLinux [ dbus-python pygobject3 pyinotify ]
+    ++ lib.optionals (withGTK || withQT) [ pillow ]);
 
   # broken with gobject-introspection setup hook, see https://github.com/NixOS/nixpkgs/issues/56943
   strictDeps = false;
 
-  dontWrapGApps = true; # prevent double wrapping
+  dontWrapQtApps = true;
+  dontWrapGApps = true;
+
+  preFixup = lib.optional withQT "wrapQtApp $out/bin/trackma-qt"
+    ++ lib.optional withGTK "wrapGApp $out/bin/trackma-gtk";
 
-  preFixup = ''
-    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  desktopItems = lib.optional withQT (mkDesktopItem "trackma-qt" "Trackma (Qt)" "Trackma Updater (Qt-frontend)" false)
+    ++ lib.optional withGTK (mkDesktopItem "trackma-gtk" "Trackma (GTK)" "Trackma Updater (Gtk-frontend)" false)
+    ++ lib.optional withCurses (mkDesktopItem "trackma-curses" "Trackma (ncurses)" "Trackma Updater (ncurses frontend)" true);
+
+  postInstall = ''
+    install -Dvm444 $src/trackma/data/icon.png $out/share/pixmaps/trackma.png
   '';
 
   doCheck = false;
 
   pythonImportsCheck = [ "trackma" ];
 
-  # FIXME(trackma-qt): https://github.com/NixOS/nixpkgs/pull/179715#issuecomment-1171371059
-  postDist = ''
-    rm $out/bin/trackma-qt
-    ${lib.optionalString (!withGtk) "rm $out/bin/trackma-gtk"}
-    ${lib.optionalString (!withCurses) "rm $out/bin/trackma-curses"}
-  '';
+  postDist = lib.optional (!withQT) "rm $out/bin/trackma-qt"
+    ++ lib.optional (!withGTK) "rm $out/bin/trackma-gtk"
+    ++ lib.optional (!withCurses) "rm $out/bin/trackma-curses";
 
   passthru.updateScript = ./update.sh;
 

pkgs/tools/security/jadx/default.nix

···
 
 let
   pname = "jadx";
-  version = "1.3.5";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "skylot";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-uDNHjajGqEeXOIC5SaluhHWOkA2j3LUvB6O3MHB2+YA=";
+    hash = "sha256-WSQyym9RMrCiWlb2O4Cd7/ra2UNTL8XsaSNnSTAmhjs=";
   };
 
   deps = stdenv.mkDerivation {
···
     '';
 
     outputHashMode = "recursive";
-    outputHash = "sha256-SFj3VPCIxEA2mj/xsibXZ1MDmV/BnmvQJUBav1gfEGM=";
+    outputHash = "sha256-LCF03nTC7T2YxlLIWO3zgrbJVTCQOU8Who9NIqvicb4=";
   };
 in stdenv.mkDerivation {
   inherit pname version src;

pkgs/top-level/all-packages.nix

···
 
   trackma-curses = trackma.override { withCurses = true; };
 
-  trackma-gtk = trackma.override { withGtk = true; };
+  trackma-gtk = trackma.override { withGTK = true; };
+
+  trackma-qt = trackma.override { withQT = true; };
 
   tpmmanager = libsForQt5.callPackage ../applications/misc/tpmmanager { };
 
···
   inherit (callPackage ../development/tools/ocaml/ocamlformat { })
     ocamlformat # latest version
     ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0
-    ocamlformat_0_22_4;
+    ocamlformat_0_22_4 ocamlformat_0_23_0;
 
   orc = callPackage ../development/compilers/orc { };
 

pkgs/top-level/coq-packages.nix

···
       coq-record-update = callPackage ../development/coq-modules/coq-record-update { };
       coqeal = callPackage ../development/coq-modules/coqeal {};
       coqhammer = callPackage ../development/coq-modules/coqhammer {};
+      coqide = callPackage ../development/coq-modules/coqide {};
       coqprime = callPackage ../development/coq-modules/coqprime {};
       coqtail-math = callPackage ../development/coq-modules/coqtail-math {};
       coquelicot = callPackage ../development/coq-modules/coquelicot {};

pkgs/top-level/python-aliases.nix

···
   glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28
   google_api_python_client = google-api-python-client; # added 2021-03-19
   googleapis_common_protos = googleapis-common-protos; # added 2021-03-19
+  graphite_api = throw "graphite_api was removed, because it is no longer maintained"; # added 2022-07-10
+  graphite_beacon = throw "graphite_beacon was removed, because it is no longer maintained"; # added 2022-07-09
   grpc_google_iam_v1 = grpc-google-iam-v1; # added 2021-08-21
   ha-av = throw "ha-av was removed, because it is no longer maintained"; # added 2022-04-06
   HAP-python = hap-python; # added 2021-06-01
···
   hyperkitty = throw "Please use pkgs.mailmanPackages.hyperkitty"; # added 2022-04-29
   IMAPClient = imapclient; # added 2021-10-28
   ipaddress = throw "ipaddress has been removed because it is no longer required since python 2.7."; # added 2022-05-30
+  influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10
   jupyter_client = jupyter-client; # added 2021-10-15
   Keras = keras; # added 2021-11-25
   lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04

pkgs/top-level/python-packages.nix

···
 
   aioairzone = callPackage ../development/python-modules/aioairzone { };
 
+  aioaladdinconnect = callPackage ../development/python-modules/aioaladdinconnect { };
+
   aioambient = callPackage ../development/python-modules/aioambient { };
 
   aioapns = callPackage ../development/python-modules/aioapns { };
···
 
   grapheme = callPackage ../development/python-modules/grapheme { };
 
-  graphite_api = callPackage ../development/python-modules/graphite-api { };
-
-  graphite_beacon = callPackage ../development/python-modules/graphite_beacon { };
-
   graphite-web = callPackage ../development/python-modules/graphite-web { };
 
   graphene = callPackage ../development/python-modules/graphene { };
···
   influxdb = callPackage ../development/python-modules/influxdb { };
 
   influxdb-client = callPackage ../development/python-modules/influxdb-client { };
-
-  influxgraph = callPackage ../development/python-modules/influxgraph { };
 
   inform = callPackage ../development/python-modules/inform { };
 
···
   # Used by circus and grab-site, 2020-08-29
   tornado_4 = callPackage ../development/python-modules/tornado/4.nix { };
 
-  # Used by streamlit, graphite_beacon, 2021-01-29
+  # Used by streamlit, 2021-01-29
   tornado_5 = callPackage ../development/python-modules/tornado/5.nix { };
 
   torrequest = callPackage ../development/python-modules/torrequest { };