Merge staging-next into staging

2021-11-19 00:02:17 +00:00 · 2021-11-19 00:02:17 +00:00 · 9747d437c5
commit 9747d437c5
parent 10667af7e7 c83cfc58e5
70 changed files with 1948 additions and 809 deletions
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@ -157,7 +157,7 @@ in {

    pruneNames = mkOption {
      type = listOf str;
-      default = [];
+      default = [ ".bzr" ".cache" ".git" ".hg" ".svn" ];
      description = ''
        Directory components which should exclude paths containing them from indexing
      '';
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@ -40,6 +40,7 @@
    # Tools to create / manipulate filesystems.
    pkgs.ntfsprogs # for resizing NTFS partitions
    pkgs.dosfstools
+    pkgs.mtools
    pkgs.xfsprogs.bin
    pkgs.jfsutils
    pkgs.f2fs-tools
--- a/nixos/modules/services/monitoring/cadvisor.nix
+++ b/nixos/modules/services/monitoring/cadvisor.nix
@ -111,6 +111,8 @@ in {
        wantedBy = [ "multi-user.target" ];
        after = [ "network.target" "docker.service" "influxdb.service" ];

+        path = optionals config.boot.zfs.enabled [ pkgs.zfs ];
+
        postStart = mkBefore ''
          until ${pkgs.curl.bin}/bin/curl -s -o /dev/null 'http://${cfg.listenAddress}:${toString cfg.port}/containers/'; do
            sleep 1;
--- a/nixos/modules/services/x11/hardware/libinput.nix
+++ b/nixos/modules/services/x11/hardware/libinput.nix
@ -13,7 +13,7 @@ let cfg = config.services.xserver.libinput;
        example = "/dev/input/event0";
        description =
          ''
-            Path for ${deviceType} device.  Set to null to apply to any
+            Path for ${deviceType} device.  Set to <literal>null</literal> to apply to any
            auto-detected ${deviceType}.
          '';
      };
@ -24,8 +24,8 @@ let cfg = config.services.xserver.libinput;
        example = "flat";
        description =
          ''
-            Sets  the pointer acceleration profile to the given profile.
-            Permitted values are adaptive, flat.
+            Sets the pointer acceleration profile to the given profile.
+            Permitted values are <literal>adaptive</literal>, <literal>flat</literal>.
            Not all devices support this option or all profiles.
            If a profile is unsupported, the default profile for this is used.
            <literal>flat</literal>: Pointer motion is accelerated by a constant
@ -38,12 +38,14 @@ let cfg = config.services.xserver.libinput;
      accelSpeed = mkOption {
        type = types.nullOr types.str;
        default = null;
+        example = "-0.5";
        description = "Cursor acceleration (how fast speed increases from minSpeed to maxSpeed).";
      };

      buttonMapping = mkOption {
        type = types.nullOr types.str;
        default = null;
+        example = "1 6 3 4 5 0 7";
        description =
          ''
            Sets the logical button mapping for this device, see XSetPointerMapping(3). The string  must
@ -58,9 +60,10 @@ let cfg = config.services.xserver.libinput;
      calibrationMatrix = mkOption {
        type = types.nullOr types.str;
        default = null;
+        example = "0.5 0 0 0 0.8 0.1 0 0 1";
        description =
          ''
-            A  string  of  9 space-separated floating point numbers.  Sets the calibration matrix to the
+            A string of 9 space-separated floating point numbers. Sets the calibration matrix to the
            3x3 matrix where the first row is (abc), the second row is (def) and the third row is (ghi).
          '';
      };
@ -68,6 +71,7 @@ let cfg = config.services.xserver.libinput;
      clickMethod = mkOption {
        type = types.nullOr (types.enum [ "none" "buttonareas" "clickfinger" ]);
        default = null;
+        example = "buttonareas";
        description =
          ''
            Enables a click method. Permitted values are <literal>none</literal>,
@ -166,8 +170,9 @@ let cfg = config.services.xserver.libinput;
      transformationMatrix = mkOption {
        type = types.nullOr types.str;
        default = null;
+        example = "0.5 0 0 0 0.8 0.1 0 0 1";
        description = ''
-          A  string  of  9 space-separated floating point numbers.  Sets the transformation matrix to
+          A string of 9 space-separated floating point numbers. Sets the transformation matrix to
          the 3x3 matrix where the first row is (abc), the second row is (def) and the third row is (ghi).
        '';
      };
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@ -306,7 +306,7 @@ in
    virtualisation.msize =
      mkOption {
        type = types.ints.positive;
-        default = 16384;
+        default = pkgs.vmTools.default9PMsizeBytes;
        description =
          ''
            The msize (maximum packet size) option passed to 9p file systems, in
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@ -228,9 +228,10 @@ in
  kubernetes = handleTestOn ["x86_64-linux"] ./kubernetes {};
  latestKernel.login = handleTest ./login.nix { latestKernel = true; };
  leaps = handleTest ./leaps.nix {};
+  libinput = handleTest ./libinput.nix {};
  libreddit = handleTest ./libreddit.nix {};
-  lidarr = handleTest ./lidarr.nix {};
  libreswan = handleTest ./libreswan.nix {};
+  lidarr = handleTest ./lidarr.nix {};
  lightdm = handleTest ./lightdm.nix {};
  limesurvey = handleTest ./limesurvey.nix {};
  litestream = handleTest ./litestream.nix {};
--- a/nixos/tests/libinput.nix
+++ b/nixos/tests/libinput.nix
@ -0,0 +1,38 @@
+import ./make-test-python.nix ({ ... }:
+
+{
+  name = "libinput";
+
+  machine = { ... }:
+    {
+      imports = [
+        ./common/x11.nix
+        ./common/user-account.nix
+      ];
+
+      test-support.displayManager.auto.user = "alice";
+
+      services.xserver.libinput = {
+        enable = true;
+        mouse = {
+          naturalScrolling = true;
+          leftHanded = true;
+          middleEmulation = false;
+          horizontalScrolling = false;
+        };
+      };
+    };
+
+  testScript = ''
+    def expect_xserver_option(option, value):
+        machine.succeed(f"""cat /var/log/X.0.log | grep -F 'Option "{option}" "{value}"'""")
+
+    machine.start()
+    machine.wait_for_x()
+    machine.succeed("""cat /var/log/X.0.log | grep -F "Using input driver 'libinput'" """)
+    expect_xserver_option("NaturalScrolling", "on")
+    expect_xserver_option("LeftHanded", "on")
+    expect_xserver_option("MiddleEmulation", "off")
+    expect_xserver_option("HorizontalScrolling", "off")
+  '';
+})
--- a/pkgs/applications/blockchains/clightning/default.nix
+++ b/pkgs/applications/blockchains/clightning/default.nix
@ -39,11 +39,9 @@ stdenv.mkDerivation rec {
      devtools/sql-rewrite.py
  '';

-  configurePhase = ''
-    ./configure --prefix=$out --disable-developer --disable-valgrind
-  '';
+  configureFlags = [ "--disable-developer" "--disable-valgrind" ];

-  makeFlags = [ "prefix=$(out) VERSION=v${version}" ];
+  makeFlags = [ "VERSION=v${version}" ];

  enableParallelBuilding = true;

--- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix
+++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
@ -2,12 +2,12 @@

 let
  pname = "ledger-live-desktop";
-  version = "2.35.0";
+  version = "2.35.1";
  name = "${pname}-${version}";

  src = fetchurl {
    url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
-    hash = "sha256-o2XGBTqyHqQ/yq54B0GBFEk35Zxt2ZWGZCTjbEbKqiw=";
+    hash = "sha256:0z60c4sjq63r5rs95rbv7afliia05l1p9bgfd5zv7i51qxgzfs4a";
  };

  appimageContents = appimageTools.extractType2 {
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@ -2,13 +2,13 @@

 mkDerivation rec {
  pname = "gpxsee";
-  version = "9.11";
+  version = "9.12";

  src = fetchFromGitHub {
    owner = "tumic0";
    repo = "GPXSee";
    rev = version;
-    sha256 = "sha256-5FGdcmkVOxjDngVQIlXnH3OPRMjaixqJ2Xb239usUuo=";
+    sha256 = "sha256-hIDphwmS4UNSTvE+Icupipo6AmT2fiPdaufT/I3EeJ4=";
  };

  patches = (substituteAll {
@ -23,7 +23,7 @@ mkDerivation rec {
    lrelease gpxsee.pro
  '';

-  postInstall = with stdenv; lib.optionalString isDarwin ''
+  postInstall = lib.optionalString stdenv.isDarwin ''
    mkdir -p $out/Applications
    mv GPXSee.app $out/Applications
  '';
--- a/pkgs/applications/misc/ulauncher/default.nix
+++ b/pkgs/applications/misc/ulauncher/default.nix
@ -33,6 +33,7 @@ python3Packages.buildPythonApplication rec {
    distutils_extra
    intltool
    wrapGAppsHook
+    gdk-pixbuf
  ];

  buildInputs = [
@ -58,6 +59,7 @@ python3Packages.buildPythonApplication rec {
    pyinotify
    python-Levenshtein
    pyxdg
+    pycairo
    requests
    websocket-client
  ];
@ -105,7 +107,10 @@ python3Packages.buildPythonApplication rec {
  # do not double wrap
  dontWrapGApps = true;
  preFixup = ''
-    makeWrapperArgs+=("''${gappsWrapperArgs[@]}" --prefix PATH : "${lib.makeBinPath [ wmctrl ]}")
+    makeWrapperArgs+=(
+     "''${gappsWrapperArgs[@]}"
+     --prefix PATH : "${lib.makeBinPath [ wmctrl ]}"
+    )
  '';

  passthru = {
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@ -229,12 +229,13 @@
    "version": "0.1.0"
  },
  "consul": {
-    "owner": "terraform-providers",
+    "owner": "hashicorp",
    "provider-source-address": "registry.terraform.io/hashicorp/consul",
    "repo": "terraform-provider-consul",
-    "rev": "v2.8.0",
-    "sha256": "1brd0fp9ksc3x8cygxm0k2q1sh4v5x89298pnidg6xirn41lvcr4",
-    "version": "2.8.0"
+    "rev": "v2.14.0",
+    "sha256": "19kmjjg4f74askwwwslbh5wvi5ndcr4wzm0374qr8gc57qiwxkpy",
+    "vendorSha256": null,
+    "version": "2.14.0"
  },
  "ct": {
    "owner": "poseidon",
@ -362,11 +363,13 @@
    "version": "1.1.0"
  },
  "github": {
-    "owner": "terraform-providers",
+    "owner": "integrations",
+    "provider-source-address": "registry.terraform.io/integrations/github",
    "repo": "terraform-provider-github",
-    "rev": "v3.1.0",
-    "sha256": "1xl4fd1lfbn1vnrdmg2xljnv8hy6rmf0iv7g8pzbnzbvj2pi7w3b",
-    "version": "3.1.0"
+    "rev": "v4.18.0",
+    "sha256": "0vr7vxlpq1lbp85qm2084w7mqkz5yp7gxj5ln29plhm7xjpd87bp",
+    "vendorSha256": null,
+    "version": "4.18.0"
  },
  "gitlab": {
    "owner": "gitlabhq",
@ -687,11 +690,13 @@
    "version": "0.0.1"
  },
  "nomad": {
-    "owner": "terraform-providers",
+    "owner": "hashicorp",
+    "provider-source-address": "registry.terraform.io/hashicorp/nomad",
    "repo": "terraform-provider-nomad",
-    "rev": "v1.4.5",
-    "sha256": "1sccm4mspjn92ky6nscsrmbb573mx53wzsvvapsf2p4119h9s30i",
-    "version": "1.4.5"
+    "rev": "v1.4.15",
+    "sha256": "18rrvp7h27f51di8hajl2jb53v7wadqv4241rxdx1d180fas69k1",
+    "vendorSha256": "1y5wpilnqn17zbi88z23159gx2p57a9c10ajb7gn9isbxfdqj9mb",
+    "version": "1.4.15"
  },
  "ns1": {
    "owner": "terraform-providers",
@ -1109,8 +1114,8 @@
    "repo": "terraform-provider-vault",
    "rev": "v2.24.1",
    "sha256": "1xk14q06js774lqyylkbp53dnlsbgh3vi38mqqmndh80xigs6d99",
-    "version": "2.24.1",
-    "vendorSha256": "1ksla455qfgxpk2dmq3pg52nyyw3v0bg6fm5s60j6cb0lzvjbq48"
+    "vendorSha256": "1ksla455qfgxpk2dmq3pg52nyyw3v0bg6fm5s60j6cb0lzvjbq48",
+    "version": "2.24.1"
  },
  "vcd": {
    "owner": "terraform-providers",
--- a/pkgs/applications/networking/cluster/terraform-providers/update-provider
+++ b/pkgs/applications/networking/cluster/terraform-providers/update-provider
@ -165,7 +165,7 @@ if [[ -z "$vendorSha256" ]]; then
    vendorSha256=$(echo "${BASH_REMATCH[1]#sha256:}" | head -n 1)
    # Deal with nix unstable
    if [[ $vendorSha256 = sha256-* ]]; then
-      vendorSha256=$(nix to-base32 "$vendorSha256")
+      vendorSha256=$(nix --extra-experimental-features nix-command hash to-base32 "$vendorSha256")
    fi
  fi
 fi
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-googlechat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-googlechat/default.nix
@ -0,0 +1,27 @@
+{ lib, stdenv, fetchFromGitHub, pidgin, glib, json-glib, protobuf, protobufc }:
+
+stdenv.mkDerivation {
+  pname = "purple-googlechat";
+  version = "unstable-2021-10-18";
+
+  src = fetchFromGitHub {
+    owner = "EionRobb";
+    repo = "purple-googlechat";
+    rev = "56ba7f79883eca67d37629d365776f6c0b40abdc";
+    sha256 = "sha256-iTYVgYI9+6rqqBl5goeEAXpK8FgHDv0MmPsV/82reWA=";
+  };
+
+  nativeBuildInputs = [ protobufc ];
+  buildInputs = [ pidgin glib json-glib protobuf ];
+
+  PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2";
+  PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share";
+
+  meta = with lib; {
+    homepage = "https://github.com/EionRobb/purple-googlechat";
+    description = "Native Google Chat support for pidgin";
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ dtzWill ];
+  };
+}
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@ -110,7 +110,7 @@ rec {

    echo "mounting Nix store..."
    mkdir -p /fs${storeDir}
-    mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,cache=loose
+    mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,cache=loose,msize=${toString default9PMsizeBytes}

    mkdir -p /fs/tmp /fs/run /fs/var
    mount -t tmpfs -o "mode=1777" none /fs/tmp
@ -119,7 +119,7 @@ rec {

    echo "mounting host's temporary directory..."
    mkdir -p /fs/tmp/xchg
-    mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L
+    mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,msize=${toString default9PMsizeBytes}

    mkdir -p /fs/proc
    mount -t proc none /fs/proc
@ -1174,4 +1174,9 @@ rec {
     `debDistros' sets. */
  diskImages = lib.mapAttrs (name: f: f {}) diskImageFuns;

+  # The default 9P msize value is 8 KiB, which according to QEMU is
+  # insufficient and would degrade performance.
+  # See: https://wiki.qemu.org/Documentation/9psetup#msize
+  # Use 500 KiB as a conservative default, see also https://github.com/NixOS/nixpkgs/pull/142577#issuecomment-953848731
+  default9PMsizeBytes = 512000;
 }
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@ -1,6 +1,6 @@
 {
-  "commit": "da98cdcb5ec11aea3b1979174b3b1cab24014908",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/da98cdcb5ec11aea3b1979174b3b1cab24014908.tar.gz",
-  "sha256": "14qdmvlqkaixv331g1lfr8hghrvzdx45xhn69fz1g7zhv4w88jix",
-  "msg": "Update from Hackage at 2021-11-05T06:34:09Z"
+  "commit": "f38385b8e3e064360be513204f114418ea0206de",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/f38385b8e3e064360be513204f114418ea0206de.tar.gz",
+  "sha256": "08yrxx2cslwbbrcrjn13va2vbynjrwfbkc3fs4mf9qc17bdvxmgj",
+  "msg": "Update from Hackage at 2021-11-12T03:22:57Z"
 }
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@ -41,7 +41,7 @@
 , # Whether to build terminfo.
  enableTerminfo ? !stdenv.targetPlatform.isWindows

-, version ? "9.3.20210913"
+, version ? "9.3.20211111"
 , # What flavour to build. An empty string indicates no
  # specific flavour and falls back to ghc default values.
  ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
@ -160,8 +160,8 @@ stdenv.mkDerivation (rec {

  src = fetchgit {
    url = "https://gitlab.haskell.org/ghc/ghc.git/";
-    rev = "64923cf295ea914db458547432237a5ed1eff571";
-    sha256 = "1s9sm4gf4r71lk0s7h9v217rxfwjf435q1jji90hlxz23wvmhr6d";
+    rev = "cc635da167fdec2dead0603b0026cb841f0aa645";
+    sha256 = "1lj76l546zriwkcn2r7i5a4j35bx9fh5iggwfz2xvhh8aq8j2i46";
  };

  enableParallelBuilding = true;
--- a/pkgs/development/compilers/ghcjs/8.10/default.nix
+++ b/pkgs/development/compilers/ghcjs/8.10/default.nix
@ -3,7 +3,7 @@
 , callPackage
 , fetchgit
 , ghcjsSrcJson ? null
-, ghcjsSrc ? fetchgit lib.importJSON ghcjsSrcJson
+, ghcjsSrc ? fetchgit (lib.importJSON ghcjsSrcJson)
 , bootPkgs
 , stage0
 , haskellLib
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -15,6 +15,9 @@ with haskellLib;

 self: super: {

+  # There are numerical tests on random data, that may fail occasionally
+  lapack = dontCheck super.lapack;
+
  # Arion's test suite needs a Nixpkgs, which is cumbersome to do from Nixpkgs
  # itself. For instance, pkgs.path has dirty sources and puts a huge .git in the
  # store. Testing is done upstream.
@ -60,7 +63,7 @@ self: super: {

  # The Hackage tarball is purposefully broken, because it's not intended to be, like, useful.
  # https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/
-  git-annex = (overrideSrc {
+  git-annex = overrideCabal (drv: {
    src = pkgs.fetchgit {
      name = "git-annex-${super.git-annex.version}-src";
      url = "git://git-annex.branchable.com/";
@ -74,11 +77,15 @@ self: super: {
        rm -r $out/doc/?ndroid*
      '';
    };
-  } super.git-annex).override {
-    dbus = if pkgs.stdenv.isLinux then self.dbus else null;
-    fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null;
-    hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
-  };
+    patches = [
+      # Allows compilation with git-lfs 1.2.0
+      (pkgs.fetchpatch {
+        url = "https://git.joeyh.name/index.cgi/git-annex.git/patch/?id=f3326b8b5ae4d1caa5c6e3e192c58c6e064c425a";
+        sha256 = "1nzg4mna462ndylisyy3nfih49aznhzzf7b3krb4p9p0j1zrcy2s";
+        excludes = [ "doc/**" "CHANGELOG" ];
+      })
+    ] ++ (drv.patches or []);
+  }) super.git-annex;

  # Fix test trying to access /home directory
  shell-conduit = overrideCabal (drv: {
@ -844,7 +851,7 @@ self: super: {

  # hledger-lib 1.23 depends on doctest >= 0.18
  hledger-lib_1_23 = super.hledger-lib_1_23.override {
-    doctest = self.doctest_0_18_1;
+    doctest = self.doctest_0_18_2;
  };

  # Copy hledger man pages from data directory into the proper place. This code
@ -1338,21 +1345,21 @@ self: super: {
    resource-pool = self.hasura-resource-pool;
    ekg-core = self.hasura-ekg-core;
    ekg-json = self.hasura-ekg-json;
-    hspec = dontCheck self.hspec_2_8_3;
-    hspec-core = dontCheck self.hspec-core_2_8_3;
-    hspec-discover = dontCheck super.hspec-discover_2_8_3;
+    hspec = dontCheck self.hspec_2_8_4;
+    hspec-core = dontCheck self.hspec-core_2_8_4;
+    hspec-discover = dontCheck super.hspec-discover_2_8_4;
    tasty-hspec = self.tasty-hspec_1_2;
  }));
  hasura-ekg-core = super.hasura-ekg-core.overrideScope (self: super: {
-    hspec = dontCheck self.hspec_2_8_3;
-    hspec-core = dontCheck self.hspec-core_2_8_3;
-    hspec-discover = dontCheck super.hspec-discover_2_8_3;
+    hspec = dontCheck self.hspec_2_8_4;
+    hspec-core = dontCheck self.hspec-core_2_8_4;
+    hspec-discover = dontCheck super.hspec-discover_2_8_4;
  });
  hasura-ekg-json = super.hasura-ekg-json.overrideScope (self: super: {
    ekg-core = self.hasura-ekg-core;
-    hspec = dontCheck self.hspec_2_8_3;
-    hspec-core = dontCheck self.hspec-core_2_8_3;
-    hspec-discover = dontCheck super.hspec-discover_2_8_3;
+    hspec = dontCheck self.hspec_2_8_4;
+    hspec-core = dontCheck self.hspec-core_2_8_4;
+    hspec-discover = dontCheck super.hspec-discover_2_8_4;
  });
  pg-client = overrideCabal (drv: {
    librarySystemDepends = with pkgs; [ postgresql krb5.dev openssl.dev ];
@ -1427,9 +1434,10 @@ self: super: {
  # 2021-09-14: Tests are broken because of undeterministic variable names
  hls-tactics-plugin = dontCheck super.hls-tactics-plugin;

-  # 2021-03-21 Test hangs
+  # 2021-03-21: Test hangs
  # https://github.com/haskell/haskell-language-server/issues/1562
-  ghcide = dontCheck super.ghcide;
+  # 2021-11-13: Too strict upper bound on implicit-hie-cradle
+  ghcide = doJailbreak (dontCheck super.ghcide);

  data-tree-print = doJailbreak super.data-tree-print;

@ -2070,15 +2078,13 @@ EOT
  # file revision on hackage was gifted CRLF line endings
  gogol-core = appendPatch ./patches/gogol-core-144.patch super.gogol-core;

-  # 2021-11-05: patch to permit our language-docker version
-  # This is based on c931c0a9689cd6dff4d2083fa002414c1f08a586 from
-  # language-docker upstream
-  hadolint = appendPatch (pkgs.fetchpatch {
-    url = "https://github.com/hadolint/hadolint/commit/c931c0a9689cd6dff4d2083fa002414c1f08a586.patch";
-    sha256 = "1kv06hfn7lgrcrg56q8lq0pvdffqvmjbshazg3prlhl3kjs541f8";
-    excludes = [ "stack.yaml" "package.yaml" "hadolint.cabal" ];
-  }) (super.hadolint.override {
+  # Jailbreak isn't sufficient, but this is ok as it's a leaf package.
+  hadolint = super.hadolint.overrideScope (self: super: {
    language-docker = self.language-docker_10_3_0;
+    hspec = dontCheck self.hspec_2_8_4;
+    hspec-core = dontCheck self.hspec-core_2_8_4;
+    hspec-discover = dontCheck self.hspec-discover_2_8_4;
+    colourista = doJailbreak super.colourista;
  });

  # These should be updated in lockstep
@ -2086,4 +2092,9 @@ EOT
    hledger-lib = self.hledger-lib_1_23;
  };

+  # Needs brick > 0.64
+  nix-tree = super.nix-tree.override {
+    brick = self.brick_0_64_2;
+  };
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
--- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
@ -92,7 +92,7 @@ self: super: {
    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/fe192e12b88b09499d4aff0e562713e820544bd6/patches/alex-3.2.6.patch";
    sha256 = "1rzs764a0nhx002v4fadbys98s6qblw4kx4g46galzjf5f7n2dn4";
  }) (dontCheck super.alex);
-  doctest = dontCheck (doJailbreak super.doctest_0_18_1);
+  doctest = dontCheck (doJailbreak super.doctest_0_18_2);
  language-haskell-extract = appendPatch (pkgs.fetchpatch {
    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/language-haskell-extract-0.2.4.patch";
    sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f";
--- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
@ -66,11 +66,6 @@ self: super: {
    sha256 = "0c8n2krz827cv87p3vb1vpl3v0k255aysjx9lq44gz3z1dhxd64z";
  }) super.basement);

-  cereal = appendPatch (pkgs.fetchpatch {
-    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/cereal-0.5.8.1.patch";
-    sha256 = "03v4nxwz9y6viaa8anxcmp4zdf2clczv4pf9fqq6lnpplpz5i128";
-  }) (doJailbreak super.cereal);
-
  # Tests fail because of typechecking changes
  conduit = dontCheck super.conduit;

@ -84,10 +79,7 @@ self: super: {
    Cabal = self.Cabal_3_6_2_0;
  });

-  doctest = appendPatch (pkgs.fetchpatch {
-    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/doctest-0.18.1.patch";
-    sha256 = "030kdsk0fg08cgdcjpyv6z8ym1vkkrbd34aacs91y5hqzc9g79y1";
-  }) (dontCheck (doJailbreak super.doctest_0_18_1));
+  doctest = dontCheck (doJailbreak super.doctest_0_18_2);

  # Tests fail in GHC 9.2
  extra = dontCheck super.extra;
@ -115,7 +107,7 @@ self: super: {
  ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_1;
  hackage-security = doJailbreak super.hackage-security;
  hashable = super.hashable_1_4_0_0;
-  hashable-time = doJailbreak super.hashable-time;
+  hashable-time = doJailbreak super.hashable-time_0_3;
  hedgehog = doJailbreak super.hedgehog;
  HTTP = overrideCabal (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; }) (doJailbreak super.HTTP);
  integer-logarithms = overrideCabal (drv: { postPatch = "sed -i -e 's, <1.1, <1.3,' integer-logarithms.cabal"; }) (doJailbreak super.integer-logarithms);
@ -142,7 +134,7 @@ self: super: {
  tasty-hspec = doJailbreak super.tasty-hspec;
  th-desugar = self.th-desugar_1_13;
  these = doJailbreak super.these;
-  time-compat = doJailbreak super.time-compat;
+  time-compat = doJailbreak super.time-compat_1_9_6_1;
  type-equality = doJailbreak super.type-equality;
  unordered-containers = doJailbreak super.unordered-containers;
  vector = doJailbreak (dontCheck super.vector);
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@ -834,6 +834,7 @@ broken-packages:
  - contstuff-monads-tf
  - contstuff-transformers
  - convert-annotation
+  - copilot-core
  - copilot-sbv
  - copr
  - COrdering
@ -1841,7 +1842,6 @@ broken-packages:
  - haddock-cheatsheet
  - haddock-leksah
  - haddock-test
-  - hadolint
  - hadoop-formats
  - hadoop-rpc
  - hafar
@ -2790,7 +2790,7 @@ broken-packages:
  - language-typescript
  - language-vhdl
  - language-webidl
-  - lapack
+  - lapack-hmatrix
  - LargeCardinalHierarchy
  - Lastik
  - latest-npm-version
@ -2918,10 +2918,8 @@ broken-packages:
  - llsd
  - llvm-base
  - llvm-ffi
-  - llvm-ffi-tools
  - llvm-general-pure
  - llvm-ht
-  - llvm-pkg-config
  - llvm-pretty
  - lmonad
  - load-balancing
@ -3205,6 +3203,7 @@ broken-packages:
  - morfette
  - morfeusz
  - morpheus-graphql-cli
+  - morpheus-graphql-code-gen
  - morphisms-functors
  - morphisms-objects
  - morte
@ -4034,6 +4033,7 @@ broken-packages:
  - read-bounded
  - read-ctags
  - read-io
+  - readline-in-other-words
  - readline-statevar
  - readme-lhs
  - readshp
@ -4792,7 +4792,6 @@ broken-packages:
  - syntax-trees
  - syntax-trees-fork-bairyn
  - synthesizer
-  - synthesizer-alsa
  - Sysmon
  - sys-process
  - system-canonicalpath
@ -5354,6 +5353,7 @@ broken-packages:
  - web-encodings
  - WeberLogic
  - webfinger-client
+  - webkitgtk3
  - webkit-javascriptcore
  - webmention
  - web-output
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@ -98,6 +98,9 @@ default-package-overrides:
  - futhark < 0.20.6
  # 2021-11-09: ghc-bignum is bundled starting with 9.0.1; only 1.0 builds with GHCs prior to 9.2.1
  - ghc-bignum == 1.0
+  # 2021-11-18: lucid-{alpine, htmx} are not in stackage, so we need to downgrade them
+  - lucid-alpine == 0.1.0.2
+  - lucid-htmx == 0.1.0.2

 extra-packages:
  - base16-bytestring < 1               # required for cabal-install etc.
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
@ -1,4 +1,4 @@
-# Stackage LTS 18.15
+# Stackage LTS 18.16
 # This file is auto-generated by
 # maintainers/scripts/haskell/update-stackage.sh
 default-package-overrides:
@ -363,7 +363,7 @@ default-package-overrides:
  - cborg-json ==0.2.3.0
  - cdar-mBound ==0.1.0.4
  - c-enum ==0.1.0.1
-  - cereal ==0.5.8.1
+  - cereal ==0.5.8.2
  - cereal-conduit ==0.8.0
  - cereal-text ==0.1.0.2
  - cereal-vector ==0.2.0.1
@ -716,7 +716,7 @@ default-package-overrides:
  - event-list ==0.1.2
  - eventstore ==1.4.1
  - every ==0.0.1
-  - exact-combinatorics ==0.2.0.10
+  - exact-combinatorics ==0.2.0.11
  - exact-pi ==0.5.0.1
  - exception-hierarchy ==0.1.0.4
  - exception-mtl ==0.4.0.1
@ -835,7 +835,7 @@ default-package-overrides:
  - gd ==3000.7.3
  - gdp ==0.0.3.0
  - general-games ==1.1.1
-  - generic-aeson ==0.2.0.12
+  - generic-aeson ==0.2.0.13
  - generic-arbitrary ==0.1.0
  - generic-constraints ==1.1.1.1
  - generic-data ==0.9.2.1
@ -1090,7 +1090,7 @@ default-package-overrides:
  - hruby ==0.3.8.1
  - hsass ==0.8.0
  - hs-bibutils ==6.10.0.0
-  - hsc2hs ==0.68.7
+  - hsc2hs ==0.68.8
  - hscolour ==1.24.4
  - hsdns ==1.8
  - hsebaysdk ==0.4.1.0
@ -1269,7 +1269,7 @@ default-package-overrides:
  - io-streams-haproxy ==1.0.1.0
  - ip6addr ==1.0.2
  - ipa ==0.3.1.1
-  - iproute ==1.7.11
+  - iproute ==1.7.12
  - IPv6Addr ==2.0.3
  - ipynb ==0.1.0.2
  - ipython-kernel ==0.10.2.1
@ -1313,7 +1313,7 @@ default-package-overrides:
  - jwt ==0.10.0
  - kan-extensions ==5.2.3
  - kanji ==3.4.1
-  - katip ==0.8.6.0
+  - katip ==0.8.7.0
  - katip-logstash ==0.1.0.0
  - kawhi ==0.3.0
  - kazura-queue ==0.1.0.4
@ -1458,7 +1458,7 @@ default-package-overrides:
  - mathexpr ==0.3.0.0
  - math-extras ==0.1.1.0
  - math-functions ==0.3.4.2
-  - matplotlib ==0.7.5
+  - matplotlib ==0.7.6
  - matrices ==0.5.0
  - matrix ==0.3.6.1
  - matrix-as-xyz ==0.1.2.2
@ -1875,7 +1875,7 @@ default-package-overrides:
  - protocol-radius-test ==0.1.0.1
  - protolude ==0.3.0
  - proxied ==0.3.1
-  - psqueues ==0.2.7.2
+  - psqueues ==0.2.7.3
  - ptr-poker ==0.1.1.4
  - publicsuffix ==0.20200526
  - pulse-simple ==0.1.14
@ -1946,7 +1946,7 @@ default-package-overrides:
  - reanimate ==1.1.4.0
  - reanimate-svg ==0.13.0.1
  - rebase ==1.13.0.1
-  - record-dot-preprocessor ==0.2.12
+  - record-dot-preprocessor ==0.2.13
  - record-hasfield ==1.0
  - records-sop ==0.1.1.0
  - record-wrangler ==0.1.1.0
@ -2386,7 +2386,7 @@ default-package-overrides:
  - th-constraint-compat ==0.0.1.0
  - th-data-compat ==0.1.0.0
  - th-desugar ==1.11
-  - th-env ==0.1.0.2
+  - th-env ==0.1.0.3
  - these ==1.1.1.1
  - these-lens ==1.0.1.2
  - these-optics ==1.0.1.2
@ -2520,7 +2520,7 @@ default-package-overrides:
  - universe-reverse-instances ==1.1.1
  - universe-some ==1.2.1
  - universum ==1.7.2
-  - unix-bytestring ==0.3.7.5
+  - unix-bytestring ==0.3.7.6
  - unix-compat ==0.5.3
  - unix-time ==0.4.7
  - unliftio ==0.2.20
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@ -822,6 +822,7 @@ dont-distribute-packages:
 - convertible-text
 - coordinate
 - copilot
+ - copilot-c99
 - copilot-cbmc
 - copilot-language
 - copilot-libraries
@ -948,6 +949,7 @@ dont-distribute-packages:
 - diagrams-pgf
 - diagrams-reflex
 - diagrams-wx
+ - dialog
 - difference-monoid
 - digestive-functors-hsp
 - dingo-core
@ -1222,6 +1224,7 @@ dont-distribute-packages:
 - ghc-mod
 - ghc-tags-plugin
 - ghci-pretty
+ - ghcjs-dom-webkit
 - ghcjs-hplay
 - ght
 - gi-cairo-again
@ -1485,6 +1488,8 @@ dont-distribute-packages:
 - hbb
 - hbcd
 - hbf
+ - hbro
+ - hbro-contrib
 - hcg-minus-cairo
 - hcheat
 - hcheckers
@ -1570,7 +1575,6 @@ dont-distribute-packages:
 - hmeap
 - hmeap-utils
 - hmep
- - hmm-lapack
 - hmm-lapack_0_4_1
 - hmt
 - hmt-diagrams
@ -1917,7 +1921,7 @@ dont-distribute-packages:
 - language-python-colour
 - language-qux
 - language-spelling
- - lapack-hmatrix
+ - lapack_0_4
 - lat
 - latex-formulae-hakyll
 - latex-formulae-pandoc
@ -1962,8 +1966,6 @@ dont-distribute-packages:
 - lightstep-haskell
 - lighttpd-conf
 - lighttpd-conf-qq
- - linear-circuit
- - linear-circuit_0_1_0_3
 - linearmap-category
 - linearscan-hoopl
 - linkchk
@ -2043,8 +2045,6 @@ dont-distribute-packages:
 - macosx-make-standalone
 - magic-wormhole
 - magicbane
- - magico
- - magico_0_0_2_2
 - mahoro
 - maid
 - mail-pool
@ -2122,6 +2122,7 @@ dont-distribute-packages:
 - mmark-cli
 - mmark-cli_0_0_5_1
 - mmark-ext
+ - mmark-ext_0_2_1_4
 - mmtl-base
 - moan
 - modify-fasta
@ -2143,6 +2144,8 @@ dont-distribute-packages:
 - moo-nad
 - morley
 - morloc
+ - morpheus-graphql-client_0_18_0
+ - morpheus-graphql_0_18_0
 - morphisms-functors-inventory
 - mosaico-lib
 - motor-diagrams
@ -2333,6 +2336,7 @@ dont-distribute-packages:
 - persona-idp
 - peyotls
 - peyotls-codec
+ - pg-entity
 - pgsql-simple
 - phonetic-languages-examples
 - phonetic-languages-general
@ -2577,8 +2581,6 @@ dont-distribute-packages:
 - replicant
 - repr
 - representable-tries
- - resistor-cube
- - resistor-cube_0_0_1_3
 - resource-pool-catchio
 - resource-simple
 - respond
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@ -155,6 +155,7 @@ self: super: builtins.intersectAttrs super {
  github-types = dontCheck super.github-types;          # http://hydra.cryp.to/build/1114046/nixlog/1/raw
  hadoop-rpc = dontCheck super.hadoop-rpc;              # http://hydra.cryp.to/build/527461/nixlog/2/raw
  hasql = dontCheck super.hasql;                        # http://hydra.cryp.to/build/502489/nixlog/4/raw
+  hasql-interpolate = dontCheck super.hasql-interpolate; # wants to connect to postgresql
  hasql-transaction = dontCheck super.hasql-transaction; # wants to connect to postgresql
  hjsonschema = overrideCabal (drv: { testTarget = "local"; }) super.hjsonschema;
  marmalade-upload = dontCheck super.marmalade-upload;  # http://hydra.cryp.to/build/501904/nixlog/1/raw
@ -516,25 +517,30 @@ self: super: builtins.intersectAttrs super {
      })
      (addBuildTools (with pkgs.buildPackages; [makeWrapper python3Packages.sphinx]) super.futhark);

-  git-annex = with pkgs;
-    if (!stdenv.isLinux) then
-      let path = lib.makeBinPath [ coreutils ];
-      in overrideCabal (_drv: {
-        # This is an instance of https://github.com/NixOS/nix/pull/1085
-        # Fails with:
-        #   gpg: can't connect to the agent: File name too long
-        postPatch = lib.optionalString stdenv.isDarwin ''
-          substituteInPlace Test.hs \
-            --replace ', testCase "crypto" test_crypto' ""
-        '';
-        # On Darwin, git-annex mis-detects options to `cp`, so we wrap the
-        # binary to ensure it uses Nixpkgs' coreutils.
-        postFixup = ''
-          wrapProgram $out/bin/git-annex \
-            --prefix PATH : "${path}"
-        '';
-      }) (addBuildTool buildPackages.makeWrapper super.git-annex)
-    else super.git-annex;
+  git-annex = let
+    pathForDarwin = pkgs.lib.makeBinPath [ pkgs.coreutils ];
+  in overrideCabal (drv: pkgs.lib.optionalAttrs (!pkgs.stdenv.isLinux) {
+    # This is an instance of https://github.com/NixOS/nix/pull/1085
+    # Fails with:
+    #   gpg: can't connect to the agent: File name too long
+    postPatch = pkgs.lib.optionalString pkgs.stdenv.isDarwin ''
+      substituteInPlace Test.hs \
+        --replace ', testCase "crypto" test_crypto' ""
+    '' + (drv.postPatch or "");
+    # On Darwin, git-annex mis-detects options to `cp`, so we wrap the
+    # binary to ensure it uses Nixpkgs' coreutils.
+    postFixup = ''
+      wrapProgram $out/bin/git-annex \
+        --prefix PATH : "${pathForDarwin}"
+    '' + (drv.postFixup or "");
+    buildTools = [
+      pkgs.buildPackages.makeWrapper
+    ] ++ (drv.buildTools or []);
+  }) (super.git-annex.override {
+    dbus = if pkgs.stdenv.isLinux then self.dbus else null;
+    fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null;
+    hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
+  });

  # The test suite has undeclared dependencies on git.
  githash = dontCheck super.githash;
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
--- a/pkgs/development/interpreters/erlang/R24.nix
+++ b/pkgs/development/interpreters/erlang/R24.nix
@ -3,6 +3,6 @@
 # How to obtain `sha256`:
 # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
 mkDerivation {
-  version = "24.1.5";
-  sha256 = "sha256-MSPoJpbL9WeERqCSh9fiw9jhJGssqolxudyURpiypb0=";
+  version = "24.1.6";
+  sha256 = "sha256-Jh9w3+ft1RZjmb4PriCmHPj0tgkx8LBFjsg1s4BGojs=";
 }
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@ -3,6 +3,7 @@
 , documentationSupport ? false, doxygen, graphviz # Documentation
 , eventGUISupport ? false, cairo, glib, gtk3 # GUI event viewer support
 , testsSupport ? false, check, valgrind, python3
+, nixosTests
 }:

 let
@ -76,6 +77,10 @@ stdenv.mkDerivation rec {

  doCheck = testsSupport && stdenv.hostPlatform == stdenv.buildPlatform;

+  passthru.tests = {
+    libinput-module = nixosTests.libinput;
+  };
+
  meta = with lib; {
    description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver";
    homepage    = "https://www.freedesktop.org/wiki/Software/libinput/";
--- a/pkgs/development/libraries/liburing/default.nix
+++ b/pkgs/development/libraries/liburing/default.nix
@ -33,16 +33,15 @@ stdenv.mkDerivation rec {

  outputs = [ "out" "bin" "dev" "man" ];

-  postInstall =
-  # Copy the examples into $bin. Most reverse dependency of this package should
-  # reference only the $out output
-  ''
+  postInstall = ''
+    # Copy the examples into $bin. Most reverse dependency of this package should
+    # reference only the $out output
    mkdir -p $bin/bin
    cp ./examples/io_uring-cp examples/io_uring-test $bin/bin
    cp ./examples/link-cp $bin/bin/io_uring-link-cp
+  '' + lib.optionalString stdenv.hostPlatform.isGnu ''
    cp ./examples/ucontext-cp $bin/bin/io_uring-ucontext-cp
-  ''
-  ;
+  '';

  meta = with lib; {
    description = "Userspace library for the Linux io_uring API";
--- a/pkgs/development/libraries/mumlib/default.nix
+++ b/pkgs/development/libraries/mumlib/default.nix
@ -1,28 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, cmake, pkg-config
-, boost, openssl, log4cpp, libopus, protobuf }:
-with lib; stdenv.mkDerivation {
-  pname = "mumlib";
-  version = "unstable-2018-12-12";
-
-  src = fetchFromGitHub {
-    owner = "slomkowski";
-    repo = "mumlib";
-    rev = "f91720de264c0ab5e02bb30deafc5c4b2c245eac";
-    sha256 = "0p29z8379dp2ra0420x8xjp4d3r2mf680lj38xmlc8npdzqjqjdp";
-  };
-
-  buildInputs = [ boost openssl libopus protobuf log4cpp ];
-  nativeBuildInputs = [ cmake pkg-config ];
-  installPhase = ''
-    install -Dm555 libmumlib.so $out/lib/libmumlib.so
-    cp -a ../include $out
-  '';
-
-  meta = {
-    description = "Fairy simple Mumble library written in C++, using boost::asio asynchronous networking framework";
-    homepage = "https://github.com/slomkowski/mumlib";
-    maintainers = with maintainers; [ das_j ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/development/libraries/science/math/scs/default.nix
+++ b/pkgs/development/libraries/science/math/scs/default.nix
@ -4,13 +4,13 @@ assert (!blas.isILP64) && (!lapack.isILP64);

 stdenv.mkDerivation rec {
  pname = "scs";
-  version = "2.1.1";
+  version = "3.0.0";

  src = fetchFromGitHub {
    owner = "cvxgrp";
    repo = "scs";
    rev = version;
-    sha256 = "14g5m3lcvrbwpq1bq0liq00jh0gm1947lg3z4jfsp43f6p5alb20";
+    sha256 = "sha256-Lly28KDDZ5hJyiMOhiX/3VaKs0iPcSqizOurZevhfCo=";
  };

  # Actually link and add libgfortran to the rpath
--- a/pkgs/development/libraries/sope/default.nix
+++ b/pkgs/development/libraries/sope/default.nix
@ -4,13 +4,13 @@ with lib;

 gnustep.stdenv.mkDerivation rec {
  pname = "sope";
-  version = "5.2.0";
+  version = "5.3.0";

  src = fetchFromGitHub {
    owner = "inverse-inc";
    repo = pname;
    rev = "SOPE-${version}";
-    sha256 = "14s9rcnglkwl0nmbmpdxxbiqqnr3m8n7x69idm1crgbbjkj4gi68";
+    sha256 = "0xqa7fsf60acbri5dd9x8nmf1zdkalxnmkm559w4xz7sdi569ssa";
  };

  hardeningDisable = [ "format" ];
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@ -1,10 +1,8 @@
-{ lib, stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null
+{ lib, stdenv, fetchurl, zlib, interactive ? false, readline, ncurses
 , python3Packages
 , enableDeserialize ? false
 }:

-assert interactive -> readline != null && ncurses != null;
-
 with lib;

 let
@ -93,6 +91,7 @@ stdenv.mkDerivation rec {
    downloadPage = "https://sqlite.org/download.html";
    homepage = "https://www.sqlite.org/";
    license = licenses.publicDomain;
+    mainProgram = "sqlite3";
    maintainers = with maintainers; [ eelco np ];
    platforms = platforms.unix ++ platforms.windows;
  };
--- a/pkgs/development/mobile/androidenv/emulator.nix
+++ b/pkgs/development/mobile/androidenv/emulator.nix
@ -3,7 +3,7 @@
 deployAndroidPackage {
  inherit package os;
  buildInputs = [ autoPatchelfHook makeWrapper ]
-  ++ lib.optional (os == "linux") [
+  ++ lib.optionals (os == "linux") [
    pkgs.glibc
    pkgs.xorg.libX11
    pkgs.xorg.libXext
@ -18,6 +18,7 @@ deployAndroidPackage {
    pkgs.libcxx
    pkgs.libGL
    pkgs.libpulseaudio
+    pkgs.libuuid
    pkgs.zlib
    pkgs.ncurses5
    pkgs.stdenv.cc.cc
--- a/pkgs/development/python-modules/casbin/default.nix
+++ b/pkgs/development/python-modules/casbin/default.nix
@ -2,22 +2,23 @@
 , buildPythonPackage
 , fetchFromGitHub
 , simpleeval
-, isPy27
+, pythonOlder
 , coveralls
 , wcmatch
 }:

 buildPythonPackage rec {
  pname = "casbin";
-  version = "1.9.6";
+  version = "1.9.7";
+  format = "setuptools";

-  disabled = isPy27;
+  disabled = pythonOlder "3.6";

  src = fetchFromGitHub {
    owner = pname;
    repo = "pycasbin";
    rev = "v${version}";
-    sha256 = "0r3pmkcgmsk3z6iy714fpg05mrs4ckb7ldyjsws6hwidcijha8rk";
+    sha256 = "sha256-wNygKs37PtMLij3f+pAh6PNLqQ45cvrpF43Aj+cO8p8=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/cvxpy/default.nix
+++ b/pkgs/development/python-modules/cvxpy/default.nix
@ -16,14 +16,14 @@

 buildPythonPackage rec {
  pname = "cvxpy";
-  version = "1.1.13";
+  version = "1.1.17";
  format = "pyproject";

  disabled = pythonOlder "3.5";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "012avhf0a8n9xyy4g3xcr5z8z2a3m6rnqic6gfs9fq6p9bkq3ix9";
+    sha256 = "sha256-M5fTuJ13Dqnw/DWbHJs6/t5qDTvqHP8g4mU7E0Uc24o=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/identify/default.nix
+++ b/pkgs/development/python-modules/identify/default.nix
@ -8,7 +8,7 @@

 buildPythonPackage rec {
  pname = "identify";
-  version = "2.3.6";
+  version = "2.3.7";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
    owner = "pre-commit";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-1+ILyqb0Ve+YmP9K+tin4iYIWUoRpi/+fbuyUFZOzBE=";
+    sha256 = "sha256-L71Zi0SWFh7K4BRwF57prdrIdxLp8Igs0k/gc6k1+Mo=";
  };

  checkInputs = [
--- a/pkgs/development/python-modules/niko-home-control/default.nix
+++ b/pkgs/development/python-modules/niko-home-control/default.nix
@ -0,0 +1,43 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, nclib
+, netaddr
+, netifaces
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "niko-home-control";
+  version = "0.2.2";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "NoUseFreak";
+    repo = pname;
+    rev = version;
+    sha256 = "0ah02dfnnbk98grvd180fp9rak5gpi58xiql1yyzig5pcbjidvk3";
+  };
+
+  propagatedBuildInputs = [
+    nclib
+    netaddr
+    netifaces
+  ];
+
+  # Project has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "nikohomecontrol"
+  ];
+
+  meta = with lib; {
+    description = "Python SDK for Niko Home Control";
+    homepage = "https://github.com/NoUseFreak/niko-home-control";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/pkgs/development/python-modules/pydyf/default.nix
+++ b/pkgs/development/python-modules/pydyf/default.nix
@ -1,15 +1,11 @@
-{ lib,
-  buildPythonPackage,
-  fetchPypi,
-  isPy3k,
-  pytestCheckHook,
-  coverage,
-  ghostscript,
-  pillow,
-  pytest,
-  pytest-cov,
-  pytest-flake8,
-  pytest-isort
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, pytestCheckHook
+, coverage
+, ghostscript
+, pillow
 }:

 buildPythonPackage rec {
@ -17,28 +13,24 @@ buildPythonPackage rec {
  version = "0.1.2";
  disabled = !isPy3k;

-  pytestFlagsArray = [
-    # setup.py is auto-generated and doesn't pass the flake8 check
-    "--ignore=setup.py"
-  ];
+  src = fetchPypi {
+    inherit version;
+    pname = "pydyf";
+    sha256 = "sha256-Hi9d5IF09QXeAlp9HnzwG73ZQiyoq5RReCvwDuF4YCw=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace "--isort --flake8 --cov --no-cov-on-fail" ""
+  '';

  checkInputs = [
    pytestCheckHook
    coverage
    ghostscript
    pillow
-    pytest
-    pytest-cov
-    pytest-flake8
-    pytest-isort
  ];

-  src = fetchPypi {
-    inherit version;
-    pname = "pydyf";
-    sha256 = "sha256-Hi9d5IF09QXeAlp9HnzwG73ZQiyoq5RReCvwDuF4YCw=";
-  };
-
  meta = with lib; {
    homepage = "https://doc.courtbouillon.org/pydyf/stable/";
    description = "Low-level PDF generator written in Python and based on PDF specification 1.7";
--- a/pkgs/development/python-modules/pyevilgenius/default.nix
+++ b/pkgs/development/python-modules/pyevilgenius/default.nix
@ -0,0 +1,42 @@
+{ lib
+, aiohttp
+, buildPythonPackage
+, fetchFromGitHub
+, async-timeout
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "pyevilgenius";
+  version = "1.0.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "home-assistant-libs";
+    repo = pname;
+    rev = version;
+    sha256 = "06xnl93sqklg7gx0z50vm79xwww0yyw05c1yynajc9aijfi8cmi3";
+  };
+
+  propagatedBuildInputs = [
+    aiohttp
+    async-timeout
+  ];
+
+  # Project has no test
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "pyevilgenius"
+  ];
+
+  meta = with lib; {
+    description = "Python SDK to interact with Evil Genius Labs devices";
+    homepage = "https://github.com/home-assistant-libs/pyevilgenius";
+    changelog = "https://github.com/home-assistant-libs/pyevilgenius/releases/tag/${version}";
+    license = with licenses; [ asl20 ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/pkgs/development/python-modules/pysmartapp/default.nix
+++ b/pkgs/development/python-modules/pysmartapp/default.nix
@ -4,17 +4,21 @@
 , httpsig
 , pytest-asyncio
 , pytestCheckHook
+, pythonOlder
 }:

 buildPythonPackage rec {
  pname = "pysmartapp";
-  version = "0.3.3";
+  version = "0.3.4";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.8";

  src = fetchFromGitHub {
    owner = "andrewsayre";
    repo = pname;
    rev = version;
-    sha256 = "03wk44siqxl15pa46x5vkg4q0mnga34ir7qn897576z2ivbx7awh";
+    sha256 = "sha256-zYjv7wRxQTS4PnNaY69bw9xE6I4DZMocwUzEICBfwqM=";
  };

  propagatedBuildInputs = [
@ -26,7 +30,9 @@ buildPythonPackage rec {
    pytestCheckHook
  ];

-  pythonImportsCheck = [ "pysmartapp" ];
+  pythonImportsCheck = [
+    "pysmartapp"
+  ];

  meta = with lib; {
    description = "Python implementation to work with SmartApp lifecycle events";
--- a/pkgs/development/python-modules/qcs-api-client/default.nix
+++ b/pkgs/development/python-modules/qcs-api-client/default.nix
@ -18,14 +18,14 @@

 buildPythonPackage rec {
  pname = "qcs-api-client";
-  version = "0.16.0";
+  version = "0.18.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "4ac6cf55e414494095ac1e1258f5700fed8eefa37d3b8da80264bd674cbfac43";
+    sha256 = "sha256-7qrE+XqXOCmfauD772epIbZ1Lzv+5pXrA7tgD8qCVSE=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/qiskit-aer/default.nix
+++ b/pkgs/development/python-modules/qiskit-aer/default.nix
@ -88,6 +88,7 @@ buildPythonPackage rec {
  ];
  # Slow tests
  disabledTests = [
+    "test_clifford" # fails on cvxpy >= 1.1.15. https://github.com/Qiskit/qiskit-aer/pull/1318. Remove in future.
    "test_snapshot" # TODO: these ~30 tests fail on setup due to pytest fixture issues?
    "test_initialize_2" # TODO: simulations appear incorrect, off by >10%.

@ -111,7 +112,6 @@ buildPythonPackage rec {
    "_144"
    "test_sparse_output_probabilities"
    "test_reset_2_qubit"
-    # "test_clifford"
  ];
  checkInputs = [
    pytestCheckHook
--- a/pkgs/development/python-modules/rtoml/default.nix
+++ b/pkgs/development/python-modules/rtoml/default.nix
@ -5,6 +5,7 @@
 , setuptools-rust
 , rustPlatform
 , pytestCheckHook
+, libiconv
 }:

 buildPythonPackage rec {
@ -32,6 +33,8 @@ buildPythonPackage rec {
    cargoSetupHook
  ];

+  buildInputs = [ libiconv ];
+
  pythonImportsCheck = [ "rtoml" ];

  checkInputs = [ pytestCheckHook ];
--- a/pkgs/development/python-modules/scs/default.nix
+++ b/pkgs/development/python-modules/scs/default.nix
@ -5,26 +5,22 @@
 , lapack
 , numpy
 , scipy
-, scs
  # check inputs
-, nose
+, pytestCheckHook
 }:

 buildPythonPackage rec {
-  inherit (scs) pname version;
+  pname = "scs";
+  version = "3.0.0";

  src = fetchFromGitHub {
    owner = "bodono";
    repo = "scs-python";
-    rev = "f02abdc0e2e0a5851464e30f6766ccdbb19d73f0"; # need to choose commit manually, untagged
-    sha256 = "174b5s7cwgrn1m55jlrszdl403zhpzc4yl9acs6kjv9slmg1mmjr";
+    rev = version;
+    sha256 = "sha256-7OgqCo21S0FDev8xv6/8iGFXg8naVi93zd8v1f9iaWw=";
+    fetchSubmodules = true;
  };

-  preConfigure = ''
-    rm -r scs
-    ln -s ${scs.src} scs
-  '';
-
  buildInputs = [
    lapack
    blas
@ -35,10 +31,7 @@ buildPythonPackage rec {
    scipy
  ];

-  checkInputs = [ nose ];
-  checkPhase = ''
-    nosetests
-  '';
+  checkInputs = [ pytestCheckHook ];
  pythonImportsCheck = [ "scs" ];

  meta = with lib; {
@ -50,7 +43,7 @@ buildPythonPackage rec {
    '';
    homepage = "https://github.com/cvxgrp/scs"; # upstream C package
    downloadPage = "https://github.com/bodono/scs-python";
-    license = licenses.gpl3;
+    license = licenses.mit;
    maintainers = with maintainers; [ drewrisinger ];
  };
 }
--- a/pkgs/development/python-modules/uptime-kuma-monitor/default.nix
+++ b/pkgs/development/python-modules/uptime-kuma-monitor/default.nix
@ -0,0 +1,40 @@
+{ lib
+, requests
+, buildPythonPackage
+, fetchPypi
+, prometheus-client
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "uptime-kuma-monitor";
+  version = "1.0.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchPypi {
+    pname = "uptime_kuma_monitor";
+    inherit version;
+    sha256 = "0zi4856hj5ar4yidh7366kx3xnh8qzydw9z8vlalcn98jf3jlnk9";
+  };
+
+  propagatedBuildInputs = [
+    requests
+    prometheus-client
+  ];
+
+  # Project has no test
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "uptime_kuma_monitor"
+  ];
+
+  meta = with lib; {
+    description = "Python wrapper around UptimeKuma /metrics endpoint";
+    homepage = "https://github.com/meichthys/utptime_kuma_monitor";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/pkgs/development/python-modules/weasyprint/default.nix
+++ b/pkgs/development/python-modules/weasyprint/default.nix
@ -1,31 +1,27 @@
-{ buildPythonPackage,
-  fetchPypi,
-  fetchpatch,
-  pytestCheckHook,
-  brotli,
-  cairosvg,
-  fonttools,
-  pydyf,
-  pyphen,
-  cffi,
-  cssselect,
-  lxml,
-  html5lib,
-  tinycss,
-  zopfli,
-  glib,
-  harfbuzz,
-  pango,
-  fontconfig,
-  lib, stdenv,
-  ghostscript,
-  pytest,
-  pytest-runner,
-  pytest-isort,
-  pytest-flake8,
-  pytest-cov,
-  isPy3k,
-  substituteAll
+{ buildPythonPackage
+, fetchPypi
+, fetchpatch
+, pytestCheckHook
+, brotli
+, cairosvg
+, fonttools
+, pydyf
+, pyphen
+, cffi
+, cssselect
+, lxml
+, html5lib
+, tinycss
+, zopfli
+, glib
+, harfbuzz
+, pango
+, fontconfig
+, lib
+, stdenv
+, ghostscript
+, isPy3k
+, substituteAll
 }:

 buildPythonPackage rec {
@ -33,26 +29,25 @@ buildPythonPackage rec {
  version = "53.4";
  disabled = !isPy3k;

-  pytestFlagsArray = [
-    # setup.py is auto-generated and doesn't pass the flake8 check
-    "--ignore=setup.py"
-    # ffi.py is patched by us and doesn't pass the flake8 check
-    "--ignore=weasyprint/text/ffi.py"
-  ];
+  src = fetchPypi {
+    inherit version;
+    pname = "weasyprint";
+    sha256 = "sha256-EMyxfVXHMJa98e3T7+WMuFWwfkwwfZutTryaPxP/RYA=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace "--isort --flake8 --cov --no-cov-on-fail" ""
+  '';

  disabledTests = [
-    # test_font_stretch needs the Ahem font (fails on macOS)
+    # needs the Ahem font (fails on macOS)
    "test_font_stretch"
  ];

  checkInputs = [
    pytestCheckHook
    ghostscript
-    pytest
-    pytest-runner
-    pytest-isort
-    pytest-flake8
-    pytest-cov
  ];

  FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf";
@ -83,12 +78,6 @@ buildPythonPackage rec {
    })
  ];

-  src = fetchPypi {
-    inherit version;
-    pname = "weasyprint";
-    sha256 = "sha256-EMyxfVXHMJa98e3T7+WMuFWwfkwwfZutTryaPxP/RYA=";
-  };
-
  meta = with lib; {
    homepage = "https://weasyprint.org/";
    description = "Converts web documents to PDF";
--- a/pkgs/development/tools/analysis/checkov/default.nix
+++ b/pkgs/development/tools/analysis/checkov/default.nix
@ -56,13 +56,13 @@ with py.pkgs;

 buildPythonApplication rec {
  pname = "checkov";
-  version = "2.0.582";
+  version = "2.0.587";

  src = fetchFromGitHub {
    owner = "bridgecrewio";
    repo = pname;
    rev = version;
-    sha256 = "sha256-25RT70HyOyfdg2jWLKMnEVgvNdlZuJ0e6eajlU486IQ=";
+    sha256 = "sha256-uLH3g3UeWdIZsMsUwCYpTehgxDKGraPBlENdTz+QYLI=";
  };

  nativeBuildInputs = with py.pkgs; [
--- a/pkgs/development/tools/haskell/hyper-haskell/default.nix
+++ b/pkgs/development/tools/haskell/hyper-haskell/default.nix
@ -49,8 +49,5 @@ in stdenvNoCC.mkDerivation rec {
    homepage = "https://github.com/HeinrichApfelmus/hyper-haskell";
    license = licenses.bsd3;
    maintainers = [ maintainers.rvl ];
-    # depends on electron-10.4.7 which is marked as insecure:
-    # https://github.com/NixOS/nixpkgs/pull/142641#issuecomment-957358476
-    broken = true;
  };
 }
--- a/pkgs/development/tools/rust/devserver/default.nix
+++ b/pkgs/development/tools/rust/devserver/default.nix
@ -1,8 +1,10 @@
 { lib
+, stdenv
 , fetchCrate
 , rustPlatform
 , openssl
 , pkg-config
+, CoreServices
 }:

 rustPlatform.buildRustPackage rec {
@ -16,7 +18,7 @@ rustPlatform.buildRustPackage rec {

  nativeBuildInputs = [ pkg-config ];

-  buildInputs = [ openssl ];
+  buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin CoreServices;

  cargoSha256 = "sha256-XlrQ6CvjeWnzvfaeNbe8FtMXMVSQNLxDVIEjyHm57Js=";

--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@ -573,7 +573,7 @@
    "nextcloud" = ps: with ps; [ nextcloudmonitor ];
    "nfandroidtv" = ps: with ps; [ ]; # missing inputs: notifications-android-tv
    "nightscout" = ps: with ps; [ ]; # missing inputs: py-nightscout
-    "niko_home_control" = ps: with ps; [ ]; # missing inputs: niko-home-control
+    "niko_home_control" = ps: with ps; [ niko-home-control ];
    "nilu" = ps: with ps; [ niluclient ];
    "nissan_leaf" = ps: with ps; [ pycarwings2 ];
    "nmap_tracker" = ps: with ps; [ aiohttp-cors getmac ifaddr netmap ]; # missing inputs: mac-vendor-lookup
--- a/pkgs/servers/monitoring/icinga2/default.nix
+++ b/pkgs/servers/monitoring/icinga2/default.nix
@ -1,5 +1,5 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, flex, bison, systemd
-, boost, openssl, patchelf, mariadb-connector-c, postgresql, zlib
+{ stdenv, runCommand, lib, fetchFromGitHub, fetchpatch, cmake, flex, bison, systemd
+, boost, openssl, patchelf, mariadb-connector-c, postgresql, zlib, tzdata
 # Databases
 , withMysql ? true, withPostgresql ? false
 # Features
@ -22,11 +22,6 @@ stdenv.mkDerivation rec {
    ./etc-icinga2.patch # Makes /etc/icinga2 relative to / instead of the store path
    ./no-systemd-service.patch # Prevent systemd service from being written to /usr
    ./no-var-directories.patch # Prevent /var directories from being created
-    # Fix the non-unity build
-    (fetchpatch {
-      url = "https://github.com/Icinga/icinga2/commit/2ad0a4b8c3852ad937fec9fc85780230257c821e.patch";
-      sha256 = "sha256:06qn7x73zbccmd8ycj46a29x2rr6qjwg0rr831wc2gc6q2k9d2g0";
-    })
  ];

  cmakeFlags = let
@ -40,7 +35,7 @@ stdenv.mkDerivation rec {
    "-DMYSQL_INCLUDE_DIR=${mariadb-connector-c.dev}/include/mariadb"
    "-DMYSQL_LIB=${mariadb-connector-c.out}/lib/mariadb/libmysqlclient.a"
    "-DICINGA2_PLUGINDIR=bin"
-    "-DICINGA2_UNITY_BUILD=no"
+    "-DICINGA2_LTO_BUILD=yes"
    # Features
    (mkFeatureFlag "MYSQL" withMysql)
    (mkFeatureFlag "PGSQL" withPostgresql)
@ -54,23 +49,28 @@ stdenv.mkDerivation rec {
    "-DICINGA2_USER=icinga2"
    "-DICINGA2_GROUP=icinga2"
    "-DICINGA2_GIT_VERSION_INFO=OFF"
-    "-DICINGA2_WITH_TESTS=OFF"
    "-DUSE_SYSTEMD=ON"
  ];

+  outputs = [ "out" "doc" ];
+
  buildInputs = [ boost openssl systemd ]
    ++ lib.optional withPostgresql postgresql;

  nativeBuildInputs = [ cmake flex bison patchelf ];

+  doCheck = true;
+  checkInputs = [ tzdata ]; # legacytimeperiod/dst needs this
+
  postFixup = ''
    rm -r $out/etc/logrotate.d $out/etc/sysconfig $out/lib/icinga2/prepare-dirs

    # Fix hardcoded paths
    sed -i 's:/usr/bin/::g' $out/etc/icinga2/scripts/*

-    # Cleanup sbin
+    # Get rid of sbin
    sed -i 's/sbin/bin/g' $out/lib/icinga2/safe-reload
+    sed -i 's/sbin/bin/g' $out/bin/icinga2
    rm $out/sbin

    ${lib.optionalString withMysql ''
@ -83,18 +83,10 @@ stdenv.mkDerivation rec {
    ''}
  '';

-  vim = stdenv.mkDerivation {
-    pname = "vim-icinga2";
-    inherit version src;
-
-    dontConfigure = true;
-    dontBuild = true;
-
-    installPhase = ''
-      mkdir -p $out/share/vim-plugins
-      cp -r tools/syntax/vim $out/share/vim-plugins/icinga2
-    '';
-  };
+  vim = runCommand "vim-icinga2-${version}" {} ''
+    mkdir -p $out/share/vim-plugins
+    cp -r "${src}/tools/syntax/vim" $out/share/vim-plugins/icinga2
+  '';

  meta = {
    description = "Open source monitoring system";
--- a/pkgs/servers/mumsi/default.nix
+++ b/pkgs/servers/mumsi/default.nix
@ -1,27 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, boost
-, log4cpp, pjsip, openssl, alsa-lib, mumlib }:
-with lib; stdenv.mkDerivation {
-  pname = "mumsi";
-  version = "unstable-2018-12-12";
-
-  src = fetchFromGitHub {
-    owner = "slomkowski";
-    repo = "mumsi";
-    rev = "961b75792f8da22fb5502e39edb286e32172d0b0";
-    sha256 = "0vrivl1fiiwjsz4v26nrn8ra3k9v0mcz7zjm2z319fw8hv6n1nrk";
-  };
-
-  buildInputs = [ boost log4cpp pkg-config pjsip mumlib openssl alsa-lib ];
-  nativeBuildInputs = [ cmake pkg-config ];
-  installPhase = ''
-    install -Dm555 mumsi $out/bin/mumsi
-  '';
-
-  meta = {
-    description = "SIP to Mumble gateway/bridge using PJSUA stack";
-    homepage = "https://github.com/slomkowski/mumsi";
-    maintainers = with maintainers; [ das_j ];
-    license = licenses.asl20;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/servers/web-apps/sogo/default.nix
+++ b/pkgs/servers/web-apps/sogo/default.nix
@ -2,13 +2,13 @@
 , openssl, openldap, sope, libmemcached, curl, libsodium, libytnef, libzip, pkg-config, nixosTests }:
 gnustep.stdenv.mkDerivation rec {
  pname = "SOGo";
-  version = "5.2.0";
+  version = "5.3.0";

  src = fetchFromGitHub {
    owner = "inverse-inc";
    repo = pname;
    rev = "SOGo-${version}";
-    sha256 = "0y9im5y6ffdc7sy2qphq0xai4ig1ks7vj10vy4mn1psdlc5kd516";
+    sha256 = "0f09b2ga43xdd8w14llclrsdxc1y8xb3g1h15lahxq82xkvixjjl";
  };

  nativeBuildInputs = [ gnustep.make makeWrapper python3 ];
--- a/pkgs/tools/archivers/pax/default.nix
+++ b/pkgs/tools/archivers/pax/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl }:
+{ lib, stdenv, fetchurl, utmp }:

 stdenv.mkDerivation rec {
  pname = "pax";
@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
    sha256 = "1p18nxijh323f4i1s2pg7pcr0557xljl5avv8ll5s9nfr34r5j0w";
  };

+  buildInputs = lib.optional stdenv.isDarwin utmp;
+
  buildPhase = ''
    sh Build.sh -r -tpax
  '';
--- a/pkgs/tools/misc/convbin/default.nix
+++ b/pkgs/tools/misc/convbin/default.nix
@ -13,6 +13,10 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-zCRM62xwaPaN8+cg+CeaqK/9hKpZmSBBeUOQqAvQGYw=";
  };

+  postPatch = lib.optionalString stdenv.isDarwin ''
+    substituteInPlace Makefile --replace "-flto" ""
+  '';
+
  makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];

  checkPhase = ''
--- a/pkgs/tools/misc/gparted/default.nix
+++ b/pkgs/tools/misc/gparted/default.nix
@ -1,6 +1,7 @@
 { lib, stdenv, fetchurl, intltool, gettext, coreutils, gnused, gnome
 , gnugrep, parted, glib, libuuid, pkg-config, gtkmm3, libxml2
 , gpart, hdparm, procps, util-linux, polkit, wrapGAppsHook, substituteAll
+, mtools, dosfstools
 }:

 stdenv.mkDerivation rec {
@ -29,7 +30,7 @@ stdenv.mkDerivation rec {

  preFixup = ''
    gappsWrapperArgs+=(
-       --prefix PATH : "${lib.makeBinPath [ gpart hdparm util-linux procps coreutils gnused gnugrep ]}"
+       --prefix PATH : "${lib.makeBinPath [ gpart hdparm util-linux procps coreutils gnused gnugrep mtools dosfstools ]}"
    )
  '';

--- a/pkgs/tools/misc/rates/default.nix
+++ b/pkgs/tools/misc/rates/default.nix
@ -1,6 +1,8 @@
 { lib
+, stdenv
 , fetchFromGitHub
 , rustPlatform
+, Security
 }:

 rustPlatform.buildRustPackage rec {
@ -16,6 +18,8 @@ rustPlatform.buildRustPackage rec {

  cargoSha256 = "041sskiq152iywwqd8p7aqsqzbj359zl7ilnp8ahzdqprz3slk1w";

+  buildInputs = lib.optional stdenv.isDarwin Security;
+
  meta = with lib; {
    description = "CLI tool that brings currency exchange rates right into your terminal";
    homepage = "https://github.com/lunush/rates";
--- a/pkgs/tools/networking/lychee/default.nix
+++ b/pkgs/tools/networking/lychee/default.nix
@ -7,16 +7,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "lychee";
-  version = "0.7.0";
+  version = "0.8.1";

  src = fetchFromGitHub {
    owner = "lycheeverse";
    repo = pname;
-    rev = version;
-    sha256 = "0kpwpbv0dqb0p4bxjlcjas6x1n91rdsvy2psrc1nyr1sh6gb1q5j";
+    rev = "v${version}";
+    sha256 = "sha256-TjjSysG4UCXVi5ytWaJVL31TFLHC3Ro5OEB56pzbn7s=";
  };

-  cargoSha256 = "1b915zkg41n3azk4hhg6fgc83n7iq8p7drvdyil2m2a4qdjvp9r3";
+  cargoSha256 = "sha256-apRXxd7RBnNjhZb0xAUr5hSTafyMbg0k1wgHT93Z66g=";

  nativeBuildInputs = [ pkg-config ];

--- a/pkgs/tools/security/exploitdb/default.nix
+++ b/pkgs/tools/security/exploitdb/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "exploitdb";
-  version = "2021-11-16";
+  version = "2021-11-18";

  src = fetchFromGitHub {
    owner = "offensive-security";
    repo = pname;
    rev = version;
-    sha256 = "sha256-xsTmZdEee/lrRYPemny7lUy13xXVVDrb7w1NBnkzmJM=";
+    sha256 = "sha256-GSqJIM/wAgSKn9BWOSEwmrVTwI6ZOTZGNHRcepDT7MI=";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/tools/security/metasploit/Gemfile
+++ b/pkgs/tools/security/metasploit/Gemfile
@ -1,4 +1,4 @@
 # frozen_string_literal: true
 source "https://rubygems.org"

-gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.14"
+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.15"
--- a/pkgs/tools/security/metasploit/Gemfile.lock
+++ b/pkgs/tools/security/metasploit/Gemfile.lock
@ -1,9 +1,9 @@
 GIT
  remote: https://github.com/rapid7/metasploit-framework
-  revision: 2c47df62b425e4083f4816d71405fed1c0e8b35b
-  ref: refs/tags/6.1.14
+  revision: 1dd828ca9f705d3f05d273b535ff666b5941ddd6
+  ref: refs/tags/6.1.15
  specs:
-    metasploit-framework (6.1.14)
+    metasploit-framework (6.1.15)
      actionpack (~> 6.0)
      activerecord (~> 6.0)
      activesupport (~> 6.0)
@ -128,13 +128,13 @@ GEM
    arel-helpers (2.12.1)
      activerecord (>= 3.1.0, < 7)
    aws-eventstream (1.2.0)
-    aws-partitions (1.528.0)
+    aws-partitions (1.533.0)
    aws-sdk-core (3.122.1)
      aws-eventstream (~> 1, >= 1.0.2)
      aws-partitions (~> 1, >= 1.525.0)
      aws-sigv4 (~> 1.1)
      jmespath (~> 1.0)
-    aws-sdk-ec2 (1.279.0)
+    aws-sdk-ec2 (1.281.0)
      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-iam (1.63.0)
@ -143,7 +143,7 @@ GEM
    aws-sdk-kms (1.51.0)
      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.105.1)
+    aws-sdk-s3 (1.106.0)
      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.4)
@ -288,7 +288,7 @@ GEM
      pcaprub
    patch_finder (1.0.2)
    pcaprub (0.12.4)
-    pdf-reader (2.5.0)
+    pdf-reader (2.6.0)
      Ascii85 (~> 1.0)
      afm (~> 0.2.1)
      hashery (~> 2.0)
@ -330,7 +330,7 @@ GEM
      rex-core
      rex-struct2
      rex-text
-    rex-core (0.1.18)
+    rex-core (0.1.20)
    rex-encoder (0.1.6)
      metasm
      rex-arch
--- a/pkgs/tools/security/metasploit/default.nix
+++ b/pkgs/tools/security/metasploit/default.nix
@ -15,13 +15,13 @@ let
  };
 in stdenv.mkDerivation rec {
  pname = "metasploit-framework";
-  version = "6.1.14";
+  version = "6.1.15";

  src = fetchFromGitHub {
    owner = "rapid7";
    repo = "metasploit-framework";
    rev = version;
-    sha256 = "sha256-ySQOc/k+kvdSj5g88ujm4e2apvPVbiaspzSbCdEQ4ZA=";
+    sha256 = "sha256-Wz5FeM7AvRS4mV3BJcWOdp1GgAzTOqRnjBAQp4/Oj5E=";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/tools/security/metasploit/gemset.nix
+++ b/pkgs/tools/security/metasploit/gemset.nix
@ -104,10 +104,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1awcpdvfk6dlb9n5wiksq8vhqwdpmkybv4ga8drmlx6x9li3my5k";
+      sha256 = "052y91z5xqysfmnclcp0k9cy7dgjk28xv6dskwww42ljdgjxcmxi";
      type = "gem";
    };
-    version = "1.528.0";
+    version = "1.533.0";
  };
  aws-sdk-core = {
    groups = ["default"];
@ -124,10 +124,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1cvf70lj99r59wn35pqxg5c6c2qkgnir0b8fqgi8h757xz6b9m72";
+      sha256 = "01ywgc5mh1h19ac10l1ck911qgkxqavwbanp4i6h9ddlcd9jmhm1";
      type = "gem";
    };
-    version = "1.279.0";
+    version = "1.281.0";
  };
  aws-sdk-iam = {
    groups = ["default"];
@ -154,10 +154,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "12j7i6l52b6hsnj59grn0m1s9pn6l38zmra6ad8i12vdsvd185w7";
+      sha256 = "06ix8lw1r0mw77hnc7ns0fqrsl616g35xw8qcsihzwzgvwb2z0mb";
      type = "gem";
    };
-    version = "1.105.1";
+    version = "1.106.0";
  };
  aws-sigv4 = {
    groups = ["default"];
@ -664,12 +664,12 @@
    platforms = [];
    source = {
      fetchSubmodules = false;
-      rev = "2c47df62b425e4083f4816d71405fed1c0e8b35b";
-      sha256 = "1471238hk6rllyn2cvnmyfk9mvg1wvlg4g4qix9gg4iyz5rhw969";
+      rev = "1dd828ca9f705d3f05d273b535ff666b5941ddd6";
+      sha256 = "14cgrs7sf40hiiks8fnk1j04d7bniv2jbhaxk6w19gf0rrw4agjv";
      type = "git";
      url = "https://github.com/rapid7/metasploit-framework";
    };
-    version = "6.1.14";
+    version = "6.1.15";
  };
  metasploit-model = {
    groups = ["default"];
@ -947,10 +947,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "14cxj3ra9nnn334qpm2vsx9s0zk3095s8ih6cwcp47h3hv03c73y";
+      sha256 = "0zgv9pp9cqd1cf8bwk7pb5lkm81gn7znnan0a7s42wd0qavs4nnz";
      type = "gem";
    };
-    version = "2.5.0";
+    version = "2.6.0";
  };
  pg = {
    groups = ["default"];
@ -1127,10 +1127,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1i3rn2ndf9ijgjfn3c8rpblw8lnqynm2flmfmm6dbfhjyhhawnaz";
+      sha256 = "0hy7xrd3pwyfk2199zkgfa6kz1fsx7ngf6s512gpk8gadjc8hq6j";
      type = "gem";
    };
-    version = "0.1.18";
+    version = "0.1.20";
  };
  rex-encoder = {
    groups = ["default"];
--- a/pkgs/tools/security/trufflehog/default.nix
+++ b/pkgs/tools/security/trufflehog/default.nix
@ -12,11 +12,11 @@ let
 in
  python3Packages.buildPythonApplication rec {
    pname = "truffleHog";
-    version = "2.1.11";
+    version = "2.2.1";

    src = python3Packages.fetchPypi {
      inherit pname version;
-      sha256 = "53619f0c5be082abd377f987291ace80bc3b88f864972b1a30494780980f769e";
+      sha256 = "sha256-fw0JyM2iqQrkL4FAXllEozJdkKWELS3eAURx5NZcceQ=";
    };

    # Relax overly restricted version constraint
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@ -576,6 +576,7 @@ mapAliases ({
  mssys = ms-sys; # added 2015-12-13
  mpv-with-scripts = self.wrapMpv self.mpv-unwrapped { }; # added 2020-05-22
  multipath_tools = multipath-tools;  # added 2016-01-21
+  mumsi = throw "mumsi has been removed from nixpkgs, as it's unmaintained and does not build anymore"; # added 2021-11-18
  mupen64plus1_5 = mupen64plus; # added 2016-02-12
  mx = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # added 2021-10-15
  mxisd = throw "mxisd has been removed from nixpkgs as it has reached end of life, see https://github.com/kamax-matrix/mxisd/blob/535e0a5b96ab63cb0ddef90f6f42c5866407df95/EOL.md#end-of-life-notice . ma1sd may be a suitable alternative."; # added 2021-04-15
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -4759,7 +4759,9 @@ with pkgs;
    inherit (darwin.apple_sdk.frameworks) Security;
  };

-  pax = callPackage ../tools/archivers/pax { };
+  pax = callPackage ../tools/archivers/pax {
+    inherit (pkgs.darwin.apple_sdk.libs) utmp;
+  };

  rage = callPackage ../tools/security/rage {
    inherit (darwin.apple_sdk.frameworks) Foundation Security;
@ -12912,7 +12914,9 @@ with pkgs;
    inherit (darwin.apple_sdk.frameworks) Security;
  };

-  devserver = callPackage ../development/tools/rust/devserver { };
+  devserver = callPackage ../development/tools/rust/devserver {
+    inherit (darwin.apple_sdk.frameworks) CoreServices;
+  };

  maturin = callPackage ../development/tools/rust/maturin {
    inherit (darwin.apple_sdk.frameworks) Security;
@ -18674,8 +18678,6 @@ with pkgs;

  mueval = callPackage ../development/tools/haskell/mueval { };

-  mumlib = callPackage ../development/libraries/mumlib { };
-
  muparser = callPackage ../development/libraries/muparser {
    inherit (darwin.stubs) setfile;
  };
@ -20928,8 +20930,6 @@ with pkgs;

  mullvad-vpn = callPackage ../applications/networking/mullvad-vpn { };

-  mumsi = callPackage ../servers/mumsi { };
-
  mycorrhiza = callPackage ../servers/mycorrhiza { };

  myserver = callPackage ../servers/http/myserver { };
@ -27534,6 +27534,8 @@ with pkgs;

  purple-discord = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-discord { };

+  purple-googlechat = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-googlechat { };
+
  purple-hangouts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-hangouts { };

  purple-lurch = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-lurch { };
@ -32816,7 +32818,9 @@ with pkgs;

  qdl = callPackage ../tools/misc/qdl { };

-  rates = callPackage ../tools/misc/rates { };
+  rates = callPackage ../tools/misc/rates {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };

  rargs = callPackage ../tools/misc/rargs { };

--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@ -128,7 +128,7 @@ in {
      llvmPackages = pkgs.llvmPackages_10;
    };
    ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
-      bootPkgs = packages.ghc901; # no binary yet
+      bootPkgs = packages.ghc8107Binary;
      inherit (buildPackages.python3Packages) sphinx;
      # Need to use apple's patched xattr until
      # https://github.com/xattr/xattr/issues/44 and
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -5106,6 +5106,8 @@ in {

  Nikola = callPackage ../development/python-modules/Nikola { };

+  niko-home-control = callPackage ../development/python-modules/niko-home-control { };
+
  nilearn = callPackage ../development/python-modules/nilearn { };

  niluclient = callPackage ../development/python-modules/niluclient { };
@ -6398,6 +6400,8 @@ in {

  pyevmasm = callPackage ../development/python-modules/pyevmasm { };

+  pyevilgenius = callPackage ../development/python-modules/pyevilgenius { };
+
  pyexcel = callPackage ../development/python-modules/pyexcel { };

  pyexcel-io = callPackage ../development/python-modules/pyexcel-io { };
@ -8434,7 +8438,7 @@ in {

  scikit-survival = callPackage ../development/python-modules/scikit-survival { };

-  scs = callPackage ../development/python-modules/scs { scs = pkgs.scs; };
+  scs = callPackage ../development/python-modules/scs { };

  sdnotify = callPackage ../development/python-modules/sdnotify { };

@ -9656,6 +9660,8 @@ in {

  uptime = callPackage ../development/python-modules/uptime { };

+  uptime-kuma-monitor = callPackage ../development/python-modules/uptime-kuma-monitor { };
+
  uranium = callPackage ../development/python-modules/uranium { };

  uritemplate = callPackage ../development/python-modules/uritemplate { };