Merge staging-next into staging

2022-02-14 18:01:54 +00:00 · 2022-02-14 18:01:54 +00:00 · 2bae93ca3b
commit 2bae93ca3b
parent 71c7eb2600 d8a6d7584d
35 changed files with 1697 additions and 1064 deletions
--- a/nixos/modules/services/misc/paperless-ng.nix
+++ b/nixos/modules/services/misc/paperless-ng.nix
@ -6,12 +6,18 @@ let

  defaultUser = "paperless";

+  hasCustomRedis = hasAttr "PAPERLESS_REDIS" cfg.extraConfig;
+
  env = {
    PAPERLESS_DATA_DIR = cfg.dataDir;
    PAPERLESS_MEDIA_ROOT = cfg.mediaDir;
    PAPERLESS_CONSUMPTION_DIR = cfg.consumptionDir;
    GUNICORN_CMD_ARGS = "--bind=${cfg.address}:${toString cfg.port}";
-  } // lib.mapAttrs (_: toString) cfg.extraConfig;
+  } // (
+    lib.mapAttrs (_: toString) cfg.extraConfig
+  ) // (optionalAttrs (!hasCustomRedis) {
+    PAPERLESS_REDIS = "unix://${config.services.redis.servers.paperless-ng.unixSocket}";
+  });

  manage = let
    setupEnv = lib.concatStringsSep "\n" (mapAttrsToList (name: val: "export ${name}=\"${val}\"") env);
@ -30,7 +36,7 @@ let
      "-/etc/hosts"
      "-/etc/localtime"
      "-/run/postgresql"
-    ];
+    ] ++ (optional (!hasCustomRedis) config.services.redis.servers.paperless-ng.unixSocket);
    BindPaths = [
      cfg.consumptionDir
      cfg.dataDir
@ -44,8 +50,7 @@ let
    NoNewPrivileges = true;
    PrivateDevices = true;
    PrivateMounts = true;
-    # Needs to connect to redis
-    # PrivateNetwork = true;
+    PrivateNetwork = true;
    PrivateTmp = true;
    PrivateUsers = true;
    ProcSubset = "pid";
@ -65,6 +70,7 @@ let
    RestrictNamespaces = true;
    RestrictRealtime = true;
    RestrictSUIDSGID = true;
+    SupplementaryGroups = optional (!hasCustomRedis) config.services.redis.servers.paperless-ng.user;
    SystemCallArchitectures = "native";
    SystemCallFilter = [ "@system-service" "~@privileged @resources @setuid @keyring" ];
    # Does not work well with the temporary root
@ -190,7 +196,7 @@ in

  config = mkIf cfg.enable {
    # Enable redis if no special url is set
-    services.redis.enable = mkIf (!hasAttr "PAPERLESS_REDIS" env) true;
+    services.redis.servers.paperless-ng.enable = mkIf (!hasCustomRedis) true;

    systemd.tmpfiles.rules = [
      "d '${cfg.dataDir}' - ${cfg.user} ${config.users.users.${cfg.user}.group} - -"
@ -234,6 +240,8 @@ in
          echo "$superuserState" > "$superuserStateFile"
        fi
      '';
+    } // optionalAttrs (!hasCustomRedis) {
+      after = [ "redis-paperless-ng.service" ];
    };

    # Password copying can't be implemented as a privileged preStart script
@ -248,6 +256,8 @@ in
            '${cfg.passwordFile}' '${cfg.dataDir}/superuser-password'
        '';
        Type = "oneshot";
+        # Needs to talk to mail server for automated import rules
+        PrivateNetwork = false;
      };
    };

@ -279,6 +289,8 @@ in
        CapabilityBoundingSet = "CAP_NET_BIND_SERVICE";
        # gunicorn needs setuid
        SystemCallFilter = defaultServiceConfig.SystemCallFilter ++ [ "@setuid" ];
+        # Needs to serve web page
+        PrivateNetwork = false;
      };
      environment = env // {
        PATH = mkForce cfg.package.path;
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@ -16,11 +16,11 @@ let

 in stdenv.mkDerivation rec {
  pname = "nano";
-  version = "6.0";
+  version = "6.1";

  src = fetchurl {
    url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
-    sha256 = "k6yMtotK0Q4KrrgKLdFcW7ietmWkhE960Bxn78sWnqI=";
+    sha256 = "PVfsiT+/3tEmZbfw1WPXRDH8Q6vqzKzt6iO2avcE20A=";
  };

  nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
--- a/pkgs/applications/graphics/vengi-tools/default.nix
+++ b/pkgs/applications/graphics/vengi-tools/default.nix
@ -29,33 +29,15 @@

 stdenv.mkDerivation rec {
  pname = "vengi-tools";
-  version = "0.0.17";
+  version = "0.0.18";

  src = fetchFromGitHub {
    owner = "mgerhardy";
    repo = "vengi";
    rev = "v${version}";
-    sha256 = "sha256-h+R9L0BBD3NSFWUh43g4V2LBcNyqVInBeJiOLY03nRk=";
+    sha256 = "sha256-Ur1X5FhOa87jbjWBXievBfCHW+qP/8bqLiyKAC8+KU4=";
  };

-  # Patch from the project's author for fixing an issue with AnimationShaders.h
-  # not being included when turning off some components
-  patches = [(writeText "vengi-tools-fix-build.patch" ''
-    diff --git a/src/modules/voxelworldrender/CMakeLists.txt b/src/modules/voxelworldrender/CMakeLists.txt
-    index aebe5f97b..903e62b37 100644
-    --- a/src/modules/voxelworldrender/CMakeLists.txt
-    +++ b/src/modules/voxelworldrender/CMakeLists.txt
-    @@ -27,7 +27,7 @@ set(FILES
-            voxel/models/plants/3.qb
-            voxel/models/plants/4.qb
-     )
-    -engine_add_module(TARGET ''${LIB} SRCS ''${SRCS} ''${SRCS_SHADERS} FILES ''${FILES} DEPENDENCIES frontend voxelrender)
-    +engine_add_module(TARGET ''${LIB} SRCS ''${SRCS} ''${SRCS_SHADERS} FILES ''${FILES} DEPENDENCIES animation frontend voxelrender)
-     generate_shaders(''${LIB} world water postprocess)
-
-     set(TEST_SRCS
-  '')];
-
  nativeBuildInputs = [
    cmake
    pkg-config
@ -105,9 +87,7 @@ stdenv.mkDerivation rec {
  '';

  passthru.tests = {
-    # There used to be a roundtrip test here, but it started failing on 0.0.17
-    # Relevant upstream ticket:
-    # https://github.com/mgerhardy/vengi/issues/113
+    voxconvert-roundtrip = callPackage ./test-voxconvert-roundtrip.nix {};
    voxconvert-all-formats = callPackage ./test-voxconvert-all-formats.nix {};
    run-voxedit = nixosTests.vengi-tools;
  };
--- a/pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix
+++ b/pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix
@ -0,0 +1,15 @@
+{ stdenv
+, vengi-tools
+}:
+
+stdenv.mkDerivation {
+  name = "vengi-tools-test-voxconvert-roundtrip";
+  meta.timeout = 10;
+  buildCommand = ''
+    ${vengi-tools}/bin/vengi-voxconvert --input ${vengi-tools}/share/vengi-voxedit/chr_knight.qb --output chr_knight.vox
+    ${vengi-tools}/bin/vengi-voxconvert --input chr_knight.vox --output chr_knight.qb
+    ${vengi-tools}/bin/vengi-voxconvert --input chr_knight.qb --output chr_knight1.vox
+    diff chr_knight.vox chr_knight1.vox
+    touch $out
+  '';
+}
--- a/pkgs/applications/graphics/xournalpp/default.nix
+++ b/pkgs/applications/graphics/xournalpp/default.nix
@ -23,13 +23,13 @@

 stdenv.mkDerivation rec {
  pname = "xournalpp";
-  version = "1.1.0";
+  version = "1.1.1";

  src = fetchFromGitHub {
    owner = "xournalpp";
    repo = pname;
-    rev = version;
-    sha256 = "sha256-FIIpWgWvq1uo/lIQXpOkUTZ6YJPtOtxKF8VjXSgqrlE=";
+    rev = "v${version}";
+    sha256 = "sha256-AzLkXGcTjtfBaPOZ/Tc+TwL63vm08G2tZw3pGzoo7po=";
  };

  nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook ];
@ -55,6 +55,7 @@ stdenv.mkDerivation rec {
  meta = with lib; {
    description = "Xournal++ is a handwriting Notetaking software with PDF annotation support";
    homepage    = "https://xournalpp.github.io/";
+    changelog   = "https://github.com/xournalpp/xournalpp/blob/v${version}/CHANGELOG.md";
    license     = licenses.gpl2Plus;
    maintainers = with maintainers; [ andrew-d sikmir ];
    platforms   = platforms.linux;
--- a/pkgs/applications/networking/cluster/kn/default.nix
+++ b/pkgs/applications/networking/cluster/kn/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "kn";
-  version = "1.1.0";
+  version = "1.2.0";

  src = fetchFromGitHub {
    owner = "knative";
    repo = "client";
    rev = "knative-v${version}";
-    sha256 = "sha256-lRQ4IXV+q1idoTyhppJGlzjuUuRykP8DtQ3t/CsxhNw=";
+    sha256 = "sha256-yWzrMkkusRueHyWT4LwrflH4N7BNri2ycHIuAyvXceo=";
  };

  vendorSha256 = null;
--- a/pkgs/applications/networking/cluster/kubelogin/default.nix
+++ b/pkgs/applications/networking/cluster/kubelogin/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "kubelogin";
-  version = "0.0.10";
+  version = "0.0.11";

  src = fetchFromGitHub {
    owner = "Azure";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-YLYyU3k3I74ZuczFZBwcJoJSfCR4B9Z1EbFupA+xkiE=";
+    sha256 = "sha256-+u+75Z2Efaq16g7kGNq1GHavXwtKvNO6dytniUr8mlE=";
  };

  vendorSha256 = "sha256-vJfTf9gD/qrsPAfJeMYLjGa90mYLOshgDehv2Fcl6xM=";
--- a/pkgs/applications/networking/cluster/talosctl/default.nix
+++ b/pkgs/applications/networking/cluster/talosctl/default.nix
@ -1,19 +1,24 @@
-{ lib, buildGoModule, fetchFromGitHub }:
-
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
+let
+  # look for GO_LDFLAGS getting set in the Makefile
+  version = "0.14.2";
+  sha256 = "sha256-sQtry94T5cDO+836D/p/8ptQi3WYKDBLr1QZyEXdLQI=";
+  vendorSha256 = "sha256-cd2iNMxWmkSWqqkPLYocUG+fCUXoeUXEuGQxjUWQnXk=";
+  pkgsVersion = "0.9.0-4-gc875fbe";
+  extrasVersion = "0.7.0-2-gb4c9d21";
+in
 buildGoModule rec {
  pname = "talosctl";
-  version = "0.14.1";
+  inherit version vendorSha256;
+  # nixpkgs-update: no auto update

  src = fetchFromGitHub {
    owner = "talos-systems";
    repo = "talos";
    rev = "v${version}";
-    sha256 = "sha256-JeZ+Q6LTDJtoxfu4mJNc3wv3Y6OPcIUvgnozj9mWwLw=";
+    inherit sha256;
  };

-  vendorSha256 = "sha256-ujbEWvcNJJOUegVgAGEPwYF02TiqD1lZELvqc/Gmb4A=";
-
-  # look for GO_LDFLAGS getting set in the Makefile
  ldflags =
    let
      versionPkg = "github.com/talos-systems/talos/pkg/version"; # VERSION_PKG
@ -24,8 +29,8 @@ buildGoModule rec {
      "-X ${versionPkg}.Name=Talos"
      "-X ${versionPkg}.SHA=${src.rev}" # should be the hash, but as we build from tags, this needs to do
      "-X ${versionPkg}.Tag=${src.rev}"
-      "-X ${versionPkg}.PkgsVersion=v0.9.0-2-g447ce75" # PKGS
-      "-X ${versionPkg}.ExtrasVersion=v0.7.0-1-gd6b73a7" # EXTRAS
+      "-X ${versionPkg}.PkgsVersion=v${pkgsVersion}" # PKGS
+      "-X ${versionPkg}.ExtrasVersion=v${extrasVersion}" # EXTRAS
      "-X ${imagesPkgs}.Username=talos-systems" # USERNAME
      "-X ${imagesPkgs}.Registry=ghcr.io" # REGISTRY
      "-X ${mgmtHelpersPkg}.ArtifactsPath=_out" # ARTIFACTS
@ -33,6 +38,15 @@ buildGoModule rec {

  subPackages = [ "cmd/talosctl" ];

+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = ''
+    installShellCompletion --cmd talosctl \
+      --bash <($out/bin/talosctl completion bash) \
+      --fish <($out/bin/talosctl completion fish) \
+      --zsh <($out/bin/talosctl completion zsh)
+  '';
+
  doCheck = false;

  meta = with lib; {
--- a/pkgs/applications/networking/hyprspace/default.nix
+++ b/pkgs/applications/networking/hyprspace/default.nix
@ -2,7 +2,7 @@

 buildGoModule rec {
  pname = "hyprspace";
-  version = "0.1.7";
+  version = "0.2.2";

  propagatedBuildInputs = lib.optional stdenv.isDarwin iproute2mac;

@ -10,10 +10,10 @@ buildGoModule rec {
    owner = pname;
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-Ecdxs6see4uexY6DatZ/VSGgWR81zRjo3AeAsXSjJ4A=";
+    sha256 = "sha256-UlIQCy4moW58tQ1dqxrPsU5LN1Bs/Jy5X+2CEmXdYIk=";
  };

-  vendorSha256 = "sha256-nFiBHhtvTu9Ya6n1KUF+pOXrksHMOph7ABVtGSWVWlo=";
+  vendorSha256 = "sha256-EV59sXmjunWs+MC++CwyuBlbWzWZI1YXDLEsOaESgRU=";

  meta = with lib; {
    description = "A Lightweight VPN Built on top of Libp2p for Truly Distributed Networks.";
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@ -43,13 +43,13 @@ assert enablePsiMedia -> enablePlugins;

 mkDerivation rec {
  pname = "psi-plus";
-  version = "1.5.1596";
+  version = "1.5.1600";

  src = fetchFromGitHub {
    owner = "psi-plus";
    repo = "psi-plus-snapshots";
    rev = version;
-    sha256 = "sha256-8GnENdoFgFa+pDN8C+W5qoFxsCE7tl3dUHf5TBipo5g=";
+    sha256 = "sha256-AZSxElEpYUYa92KdYxVyM+ppKHpXXwwlBFVOOKH/O7g=";
  };

  cmakeFlags = [
--- a/pkgs/applications/networking/n8n/node-packages.nix
+++ b/pkgs/applications/networking/n8n/node-packages.nix
@ -7015,13 +7015,13 @@ let
        sha1 = "021e4d9c7705f21bbf37d03ceb58767402774c64";
      };
    };
-    "url-parse-1.5.5" = {
+    "url-parse-1.5.6" = {
      name = "url-parse";
      packageName = "url-parse";
-      version = "1.5.5";
+      version = "1.5.6";
      src = fetchurl {
-        url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.5.tgz";
-        sha512 = "LYNZ15yZDI+HPHUji/yJpj+MnWvQuPZIOJ+gDtHM6gJq33bbmXLfgODIic6SE8tLLes5KWPjZnI3dWlPG6JiTg==";
+        url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.6.tgz";
+        sha512 = "xj3QdUJ1DttD1LeSfvJlU1eiF1RvBSBfUu8GplFGdUzSO28y5yUtEl7wb//PI4Af6qh0o/K8545vUmucRrfWsw==";
      };
    };
    "utf7-1.0.2" = {
@ -7462,10 +7462,10 @@ in
  n8n = nodeEnv.buildNodePackage {
    name = "n8n";
    packageName = "n8n";
-    version = "0.163.0";
+    version = "0.163.1";
    src = fetchurl {
-      url = "https://registry.npmjs.org/n8n/-/n8n-0.163.0.tgz";
-      sha512 = "7znPwaONZgCGJKfkjkHP/zTsPiSf7+Wun6TjQ9j/NmyMiPku99EiwDtH3lW5GFCcy+Doo4GUVMqXpEM8GOcNVw==";
+      url = "https://registry.npmjs.org/n8n/-/n8n-0.163.1.tgz";
+      sha512 = "lhup+qIy3cG0oWvBuOWi57Tn3F2k5NBD00KJ3ilKgnk4VsY+LmAca2xvyZNKvlRPa9i++3ukG6XioPTDuXylgw==";
    };
    dependencies = [
      (sources."@azure/abort-controller-1.0.5" // {
@ -8627,7 +8627,7 @@ in
          sources."punycode-1.3.2"
        ];
      })
-      sources."url-parse-1.5.5"
+      sources."url-parse-1.5.6"
      (sources."utf7-1.0.2" // {
        dependencies = [
          sources."semver-5.3.0"
--- a/pkgs/applications/networking/wayback_machine_downloader/Gemfile
+++ b/pkgs/applications/networking/wayback_machine_downloader/Gemfile
@ -1,5 +1,4 @@
 # frozen_string_literal: true

-source 'https://rubygems.org' do
-  gem 'wayback_machine_downloader'
-end
+source 'https://rubygems.org'
+gem 'wayback_machine_downloader'
--- a/pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock
+++ b/pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock
@ -1,13 +1,13 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    wayback_machine_downloader (2.2.1)
+    wayback_machine_downloader (2.3.1)

 PLATFORMS
  ruby

 DEPENDENCIES
-  wayback_machine_downloader!
+  wayback_machine_downloader

 BUNDLED WITH
-   2.1.4
+   2.3.6
--- a/pkgs/applications/networking/wayback_machine_downloader/gemset.nix
+++ b/pkgs/applications/networking/wayback_machine_downloader/gemset.nix
@ -4,9 +4,9 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "12kb1qmvmmsaihqab1prn6cmynkn6cgb4vf41mgv22wkcgv5wgk2";
+      sha256 = "170426sashqc2k2angg8d0bhs7spi1x1isv6cyk2hif0l6xxm3cm";
      type = "gem";
    };
-    version = "2.2.1";
+    version = "2.3.1";
  };
 }
--- a/pkgs/applications/radio/welle-io/default.nix
+++ b/pkgs/applications/radio/welle-io/default.nix
@ -5,13 +5,13 @@

 mkDerivation rec {
  pname = "welle-io";
-  version = "2.3";
+  version = "2.4";

  src = fetchFromGitHub {
    owner = "AlbrechtL";
    repo = "welle.io";
    rev = "v${version}";
-    sha256 = "1xl1lanw0xgmgks67dbfb2h52jxnrd1i2zik56v0q8dwsr7f0daw";
+    sha256 = "sha256-xXiCL/A2SwCSr5SA4AQQEdieRzBksXx9Z78bHtlFiW4=";
  };

  nativeBuildInputs = [ cmake pkg-config ];
--- a/pkgs/applications/science/math/sage/patches/no-cython-sources-in-tracebacks-on-ipython8.patch
+++ b/pkgs/applications/science/math/sage/patches/no-cython-sources-in-tracebacks-on-ipython8.patch
@ -0,0 +1,52 @@
+diff --git a/src/sage/repl/interface_magic.py b/src/sage/repl/interface_magic.py
+index 8a455b69b0..a93e1c9e04 100644
+--- a/src/sage/repl/interface_magic.py
+++ b/src/sage/repl/interface_magic.py
+@@ -260,7 +260,7 @@ class InterfaceMagic(object):
+             2
+             120
+             sage: shell.run_cell('%%gap foo\n1+1;\n')
+-            ...File "<string>", line unknown
+            ...File...<string>...
+             SyntaxError: Interface magics have no options, got "foo"
+             <BLANKLINE>
+             sage: shell.run_cell('%%gap?')
+diff --git a/src/sage/repl/interpreter.py b/src/sage/repl/interpreter.py
+index 71dbe429fd..36b1d986d6 100644
+--- a/src/sage/repl/interpreter.py
+++ b/src/sage/repl/interpreter.py
+@@ -70,25 +70,6 @@ that shell.  The bulk of this functionality is provided through
+ 
+ TESTS:
+ 
+-Check that Cython source code appears in tracebacks::
+-
+-    sage: from sage.repl.interpreter import get_test_shell
+-    sage: shell = get_test_shell()
+-    sage: print("dummy line"); shell.run_cell('1/0') # see #25320 for the reason of the `...` and the dummy line in this test
+-    dummy line
+-    ...
+-    ZeroDivisionError...Traceback (most recent call last)
+-    <ipython-input-...> in <module>...
+-    ----> 1 Integer(1)/Integer(0)
+-    .../sage/rings/integer.pyx in sage.rings.integer.Integer...div...
+-    ...
+-    -> ...                  raise ZeroDivisionError("rational division by zero")
+-       ....:            x = <Rational> Rational.__new__(Rational)
+-       ....:            mpq_div_zz(x.value, ....value, (<Integer>right).value)
+-    <BLANKLINE>
+-    ZeroDivisionError: rational division by zero
+-    sage: shell.quit()
+-
+ Test prompt transformer::
+ 
+     sage: from sage.repl.interpreter import SagePromptTransformer
+@@ -423,7 +404,7 @@ def SagePreparseTransformer(lines):
+         sage: from sage.repl.interpreter import get_test_shell
+         sage: shell = get_test_shell()
+         sage: shell.run_cell(bad_syntax)
+-          File "<string>", line unknown
+          File...<string>...
+         SyntaxError: Mismatched ']'
+         <BLANKLINE>
+         sage: shell.quit()
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@ -119,6 +119,16 @@ stdenv.mkDerivation rec {
    # https://trac.sagemath.org/ticket/32959
    ./patches/linbox-1.7-upgrade.patch

+    # To emit better tracebacks, IPython 8 parses Python files using the ast
+    # module (via the stack_data package). Since Cython is a superset of Python,
+    # this results in no Cython code being printed in tracebacks. Fixing this
+    # properly is tracked in https://github.com/alexmojaki/stack_data/issues/21,
+    # but for now we just disable the corresponding test. An alternative would
+    # be to revert IPython's IPython/core/ultratb.py, but this would need to be
+    # Sage-specific (since it would worsen tracebacks for pure Python code).
+    # Sage tracks this at https://trac.sagemath.org/ticket/33170
+    ./patches/no-cython-sources-in-tracebacks-on-ipython8.patch
+
    # https://trac.sagemath.org/ticket/32968
    (fetchSageDiff {
      base = "9.5";
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@ -1,6 +1,6 @@
 {
-  "commit": "72a59574747346b3f9aa2cd91cb7469d4e168b53",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/72a59574747346b3f9aa2cd91cb7469d4e168b53.tar.gz",
-  "sha256": "0nspncjgh8lgr15zx8ss3fp289jl7gg21wchj0k821y3cz057ry3",
-  "msg": "Update from Hackage at 2022-01-31T19:23:21Z"
+  "commit": "a4422bb744c0b60e56ccbdd350df5c205caf0b20",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/a4422bb744c0b60e56ccbdd350df5c205caf0b20.tar.gz",
+  "sha256": "1ih77xavy81mjhf8d3nknbgvhpql14nbak01pddh7y195wv1dknd",
+  "msg": "Update from Hackage at 2022-02-06T15:34:38Z"
 }
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -63,6 +63,12 @@ self: super: {
  # works fine there.
  fakedata = dontCheck super.fakedata;

+  # The latest release on hackage has an upper bound on containers which
+  # breaks the build, though it works with the version of containers present
+  # and the upper bound doesn't exist in code anymore:
+  # > https://github.com/roelvandijk/numerals
+  numerals = doJailbreak (dontCheck super.numerals);
+
  # This test keeps being aborted because it runs too quietly for too long
  Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2;

@ -307,7 +313,6 @@ self: super: {
  network-dbus = dontCheck super.network-dbus;
  notcpp = dontCheck super.notcpp;
  ntp-control = dontCheck super.ntp-control;
-  numerals = dontCheck super.numerals;
  odpic-raw = dontCheck super.odpic-raw; # needs a running oracle database server
  opaleye = dontCheck super.opaleye;
  openpgp = dontCheck super.openpgp;
--- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
@ -87,10 +87,6 @@ self: super: {
  generic-lens_2_2_1_0 = dontCheck super.generic-lens_2_2_1_0;

  # Apply patches from head.hackage.
-  alex = appendPatch (pkgs.fetchpatch {
-    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_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";
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@ -1088,6 +1088,7 @@ broken-packages:
  - DigitalOcean
  - digitalocean-kzs
  - digits
+  - dijkstra-simple
  - DimensionalHash
  - dimensional-tf
  - diophantine
@ -3437,7 +3438,6 @@ broken-packages:
  - numbered-semigroups
  - NumberSieves
  - NumberTheory
-  - numerals
  - numerals-base
  - numeric-qq
  - numeric-ranges
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@ -168,6 +168,7 @@ extra-packages:
  - path == 0.9.0                       # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2
  - ormolu == 0.3.*                     # 2021-12-03: for HLS with GHC 9.0.2
  - fourmolu == 0.4.*                   # 2022-02-05: for HLS with GHC 9.0.2
+  - ghc-exactprint == 1.4.*             # 2022-02-07: preserve for now, 1.5.0 has a breaking change without type changes

 package-maintainers:
  abbradar:
@ -602,7 +603,6 @@ dont-distribute-packages:
  - dialog
  - ghcjs-dom-webkit
  - gi-webkit
-  - hs-mesos
  - hsqml
  - hsqml-datamodel
  - hsqml-demo-manic
@ -625,3 +625,6 @@ dont-distribute-packages:

  # glade relies on system libglade which is deprecated
  - glade
+
+  # mesos was removed from nixpkgs
+  - hs-mesos
--- 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.23
+# Stackage LTS 18.24
 # This file is auto-generated by
 # maintainers/scripts/haskell/update-stackage.sh
 default-package-overrides:
@ -38,7 +38,7 @@ default-package-overrides:
  - al ==0.1.4.2
  - alarmclock ==0.7.0.5
  - alerts ==0.1.2.0
-  - alex ==3.2.6
+  - alex ==3.2.7.1
  - alex-meta ==0.3.0.13
  - alg ==0.2.13.1
  - algebraic-graphs ==0.5
@ -139,7 +139,7 @@ default-package-overrides:
  - amazonka-waf ==1.6.1
  - amazonka-workspaces ==1.6.1
  - amazonka-xray ==1.6.1
-  - amqp ==0.22.0
+  - amqp ==0.22.1
  - amqp-utils ==0.6.3.2
  - annotated-wl-pprint ==0.7.0
  - ansi-terminal ==0.11.1
@ -195,7 +195,7 @@ default-package-overrides:
  - audacity ==0.0.2
  - aur ==7.0.7
  - aura ==3.2.5
-  - authenticate ==1.3.5
+  - authenticate ==1.3.5.1
  - authenticate-oauth ==1.6.0.1
  - autoexporter ==1.1.20
  - auto-update ==0.1.6
@ -398,9 +398,9 @@ default-package-overrides:
  - circle-packing ==0.1.0.6
  - circular ==0.4.0.1
  - citeproc ==0.4.0.1
-  - clash-ghc ==1.4.6
-  - clash-lib ==1.4.6
-  - clash-prelude ==1.4.6
+  - clash-ghc ==1.4.7
+  - clash-lib ==1.4.7
+  - clash-prelude ==1.4.7
  - classy-prelude ==1.5.0.2
  - classy-prelude-conduit ==1.5.0
  - clay ==0.13.3
@ -468,7 +468,7 @@ default-package-overrides:
  - connection-pool ==0.2.2
  - console-style ==0.0.2.1
  - constraint ==0.1.4.0
-  - constraints ==0.13.2
+  - constraints ==0.13.3
  - constraints-extras ==0.3.2.1
  - constraint-tuples ==0.1.2
  - construct ==0.3.0.2
@ -493,7 +493,7 @@ default-package-overrides:
  - crackNum ==3.1
  - crc32c ==0.0.0
  - credential-store ==0.1.2
-  - criterion ==1.5.12.0
+  - criterion ==1.5.13.0
  - criterion-measurement ==0.1.3.0
  - cron ==0.7.0
  - crypto-api ==0.13.3
@ -769,7 +769,7 @@ default-package-overrides:
  - filtrable ==0.1.4.0
  - fin ==0.2
  - FindBin ==0.0.5
-  - fingertree ==0.1.4.2
+  - fingertree ==0.1.5.0
  - finite-typelits ==0.1.4.2
  - first-class-families ==0.8.0.1
  - first-class-patterns ==0.3.2.5
@ -899,7 +899,7 @@ default-package-overrides:
  - ghc-parser ==0.2.3.0
  - ghc-paths ==0.1.0.12
  - ghc-prof ==1.4.1.9
-  - ghc-source-gen ==0.4.2.0
+  - ghc-source-gen ==0.4.3.0
  - ghc-syntax-highlighter ==0.0.6.0
  - ghc-tcplugins-extra ==0.4.2
  - ghc-trace-events ==0.1.2.4
@ -1025,7 +1025,7 @@ default-package-overrides:
  - hebrew-time ==0.1.2
  - hedgehog ==1.0.5
  - hedgehog-corpus ==0.2.0
-  - hedgehog-fakedata ==0.0.1.4
+  - hedgehog-fakedata ==0.0.1.5
  - hedgehog-fn ==1.0
  - hedgehog-quickcheck ==0.1.1
  - hedis ==0.14.4
@ -1558,7 +1558,7 @@ default-package-overrides:
  - monad-unlift ==0.2.0
  - monad-unlift-ref ==0.2.1
  - mongoDB ==2.7.1.1
-  - monoid-subclasses ==1.1.2
+  - monoid-subclasses ==1.1.3
  - monoid-transformer ==0.0.4
  - mono-traversable ==1.0.15.3
  - mono-traversable-instances ==0.1.1.0
@ -1581,7 +1581,7 @@ default-package-overrides:
  - multimap ==1.2.1
  - multipart ==0.2.1
  - multiset ==0.3.4.3
-  - multistate ==0.8.0.3
+  - multistate ==0.8.0.4
  - murmur3 ==1.0.5
  - murmur-hash ==0.1.0.10
  - MusicBrainz ==0.4.1
@ -1619,7 +1619,7 @@ default-package-overrides:
  - network-bsd ==2.8.1.0
  - network-byte-order ==0.1.6
  - network-conduit-tls ==1.3.2
-  - network-info ==0.2.0.10
+  - network-info ==0.2.1
  - network-ip ==0.3.0.3
  - network-messagepack-rpc ==0.1.2.0
  - network-messagepack-rpc-websocket ==0.1.1.1
@ -1763,15 +1763,15 @@ default-package-overrides:
  - persist ==0.1.1.5
  - persistable-record ==0.6.0.5
  - persistable-types-HDBC-pg ==0.0.3.5
-  - persistent ==2.13.2.2
+  - persistent ==2.13.3.0
  - persistent-mtl ==0.2.2.0
-  - persistent-mysql ==2.13.0.2
+  - persistent-mysql ==2.13.1.0
  - persistent-pagination ==0.1.1.2
-  - persistent-postgresql ==2.13.2.2
+  - persistent-postgresql ==2.13.4.0
  - persistent-qq ==2.12.0.2
-  - persistent-sqlite ==2.13.0.4
+  - persistent-sqlite ==2.13.1.0
  - persistent-template ==2.12.0.0
-  - persistent-test ==2.13.0.4
+  - persistent-test ==2.13.1.0
  - persistent-typed-db ==0.1.0.5
  - pg-harness-client ==0.6.0
  - pgp-wordlist ==0.1.0.3
@ -1948,7 +1948,7 @@ default-package-overrides:
  - readable ==0.3.1
  - read-editor ==0.1.0.2
  - read-env-var ==1.0.0.0
-  - reanimate ==1.1.4.0
+  - reanimate ==1.1.5.0
  - reanimate-svg ==0.13.0.1
  - rebase ==1.13.2
  - record-dot-preprocessor ==0.2.13
@ -2270,7 +2270,7 @@ default-package-overrides:
  - string-conversions ==0.4.0.1
  - string-interpolate ==0.3.1.1
  - string-qq ==0.0.4
-  - string-random ==0.1.4.1
+  - string-random ==0.1.4.2
  - stringsearch ==0.3.6.6
  - string-transform ==1.1.1
  - stripe-concepts ==1.0.3.1
@ -2490,7 +2490,7 @@ default-package-overrides:
  - type-operators ==0.2.0.0
  - typerep-map ==0.3.3.0
  - type-spec ==0.4.0.0
-  - tzdata ==0.2.20201021.0
+  - tzdata ==0.2.20211021.0
  - ua-parser ==0.7.6.0
  - uglymemo ==0.1.0.1
  - unagi-chan ==0.4.1.4
@ -2529,7 +2529,7 @@ default-package-overrides:
  - unix-bytestring ==0.3.7.6
  - unix-compat ==0.5.4
  - unix-time ==0.4.7
-  - unliftio ==0.2.20
+  - unliftio ==0.2.20.1
  - unliftio-core ==0.2.0.1
  - unliftio-pool ==0.2.1.1
  - unliftio-streams ==0.1.1.1
@ -2574,7 +2574,7 @@ default-package-overrides:
  - vector-buffer ==0.4.1
  - vector-builder ==0.3.8.3
  - vector-bytes-instances ==0.1.1
-  - vector-circular ==0.1.3
+  - vector-circular ==0.1.4
  - vector-instances ==3.4
  - vector-mmap ==0.0.3
  - vector-rotcev ==0.1.0.1
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@ -525,6 +525,9 @@ dont-distribute-packages:
 - base64-bytes
 - baserock-schema
 - batchd
+ - batchd-core
+ - batchd-docker
+ - batchd-libvirt
 - batching
 - battlenet-yesod
 - battleships
@ -725,9 +728,7 @@ dont-distribute-packages:
 - claferwiki
 - clash
 - clash-ghc
- - clash-ghc_1_4_7
 - clash-lib
- - clash-lib_1_4_7
 - clash-multisignal
 - clash-prelude-quickcheck
 - clash-shake
@ -786,6 +787,7 @@ dont-distribute-packages:
 - comic
 - commsec-keyexchange
 - comonad-random
+ - compaREST
 - compact-mutable
 - complexity
 - computational-algebra
@ -1485,6 +1487,12 @@ dont-distribute-packages:
 - hasql-cursor-query
 - hasql-postgres
 - hasql-postgres-options
+ - hasql-streams-conduit
+ - hasql-streams-core
+ - hasql-streams-example
+ - hasql-streams-pipes
+ - hasql-streams-streaming
+ - hasql-streams-streamly
 - hasql-th
 - hastache-aeson
 - haste-app
@ -2546,7 +2554,6 @@ dont-distribute-packages:
 - reactor
 - readpyc
 - reanimate
- - reanimate_1_1_5_0
 - record-aeson
 - record-gl
 - record-preprocessor
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@ -706,6 +706,10 @@ self: super: builtins.intersectAttrs super {
  } super.nix-output-monitor;

  haskell-language-server = overrideCabal (drv: {
+    # starting with 1.6.1.1 haskell-language-server wants to be linked dynamically
+    # by default. Unless we reflect this in the generic builder, GHC is going to
+    # produce some illegal references to /build/.
+    enableSharedExecutables = true;
    postInstall = "ln -s $out/bin/haskell-language-server $out/bin/haskell-language-server-${self.ghc.version}";
    testToolDepends = [ self.cabal-install pkgs.git ];
    testTarget = "func-test"; # wrapper test accesses internet
@ -730,12 +734,9 @@ self: super: builtins.intersectAttrs super {

  # based on https://github.com/gibiansky/IHaskell/blob/aafeabef786154d81ab7d9d1882bbcd06fc8c6c4/release.nix
  ihaskell = overrideCabal (drv: {
-    configureFlags = (drv.configureFlags or []) ++ [
-      # ihaskell's cabal file forces building a shared executable,
-      # but without passing --enable-executable-dynamic, the RPATH
-      # contains /build/ and leads to a build failure with nix
-      "--enable-executable-dynamic"
-    ];
+    # ihaskell's cabal file forces building a shared executable, which we need
+    # to reflect here or RPATH will contain a reference to /build/.
+    enableSharedExecutables = true;
    preCheck = ''
      export HOME=$TMPDIR/home
      export PATH=$PWD/dist/build/ihaskell:$PATH
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
--- a/pkgs/development/ocaml-modules/camlimages/4.2.4.nix
+++ b/pkgs/development/ocaml-modules/camlimages/4.2.4.nix
@ -15,7 +15,8 @@
 , ghostscript
 }:

-assert lib.versionOlder ocaml.version "4.06";
+lib.throwIfNot (lib.versionAtLeast ocaml.version "4.02" && lib.versionOlder ocaml.version "4.10")
+  "camlimages 4.2.4 is not available for OCaml ${ocaml.version}"

 stdenv.mkDerivation rec {
  name = "ocaml${ocaml.version}-${pname}-${version}";
@ -54,9 +55,9 @@ stdenv.mkDerivation rec {
  '';

  installPhase = ''
-    runHook preBuild
+    runHook preInstall
    omake install
-    runHook postBuild
+    runHook postInstall
  '';

  createFindlibDestdir = true;
--- a/pkgs/development/python-modules/flux-led/default.nix
+++ b/pkgs/development/python-modules/flux-led/default.nix
@ -8,7 +8,7 @@

 buildPythonPackage rec {
  pname = "flux-led";
-  version = "0.28.22";
+  version = "0.28.24";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
    owner = "Danielhiversen";
    repo = "flux_led";
    rev = version;
-    sha256 = "sha256-GNuc8WAiC0S4WFFUYgayU6c0treWCPfPhbyteZ68eWs=";
+    sha256 = "sha256-4VajN6w+W7WZzwnsqLAnR4IO2ODuolCEotbgxV9luYA=";
  };

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

 buildPythonPackage rec {
  pname = "omnikinverter";
-  version = "0.6.2";
+  version = "0.7.0";
  format = "pyproject";

-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";

  src = fetchFromGitHub {
    owner = "klaasnicolaas";
    repo = "python-omnikinverter";
    rev = "v${version}";
-    sha256 = "sha256-NnwjiaFUi2vzORu8sndtfdVpZEAIMCvT+9VEr2ZOx3k=";
+    sha256 = "sha256-IiU7nhwH0Mc6s+g9WtJugpORuL0qGNJFKDY5hvxIZAU=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/pywlroots/default.nix
+++ b/pkgs/development/python-modules/pywlroots/default.nix
@ -18,11 +18,11 @@

 buildPythonPackage rec {
  pname = "pywlroots";
-  version = "0.15.7";
+  version = "0.15.8";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "EJAqtzFKx9Zripspv3lXIDj54pqHV0in6RrOCgFUyU8=";
+    sha256 = "5oKeiNRO/5/6gWHPgatn0sHRtPL2B2Fa7S1A7LWr0qM=";
  };

  # The XWayland detection uses some hard-coded FHS paths. Since we
--- a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix
+++ b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix
@ -2,6 +2,7 @@
 , stdenv
 , supportedGhcVersions ? [ "884" "8107" "902" ]
    ++ lib.optionals (!stdenv.hostPlatform.isAarch64) [ "921" ]
+, dynamic ? false
 , haskellPackages
 , haskell
 }:
@ -13,19 +14,23 @@
 # for example. Read more about this in the haskell-language-server section of the nixpkgs manual.
 #
 let
-  inherit (lib) concatStringsSep concatMapStringsSep take splitString;
+  inherit (lib) concatStringsSep concatMapStringsSep take splitString pipe optionals;
+  inherit (haskell.lib.compose) justStaticExecutables overrideCabal enableCabalFlag disableCabalFlag;
  getPackages = version: haskell.packages."ghc${version}";
  tunedHls = hsPkgs:
-    haskell.lib.compose.justStaticExecutables
-    (haskell.lib.compose.overrideCabal (old: {
-      postInstall = ''
-        remove-references-to -t ${hsPkgs.ghc} $out/bin/haskell-language-server
-        remove-references-to -t ${hsPkgs.shake.data} $out/bin/haskell-language-server
-        remove-references-to -t ${hsPkgs.js-jquery.data} $out/bin/haskell-language-server
-        remove-references-to -t ${hsPkgs.js-dgtable.data} $out/bin/haskell-language-server
-        remove-references-to -t ${hsPkgs.js-flot.data} $out/bin/haskell-language-server
-      '';
-    }) hsPkgs.haskell-language-server);
+    lib.pipe hsPkgs.haskell-language-server ([
+      (haskell.lib.compose.overrideCabal (old: {
+        enableSharedExecutables = dynamic;
+        ${if !dynamic then "postInstall" else null} = ''
+          ${old.postInstall or ""}
+
+          remove-references-to -t ${hsPkgs.ghc} $out/bin/haskell-language-server
+        '';
+      }))
+      ((if dynamic then enableCabalFlag else disableCabalFlag) "dynamic")
+    ] ++ optionals (!dynamic) [
+      justStaticExecutables
+    ]);
  targets = version:
    let packages = getPackages version;
    in [
--- a/pkgs/development/tools/rust/rust-script/default.nix
+++ b/pkgs/development/tools/rust/rust-script/default.nix
@ -2,16 +2,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "rust-script";
-  version = "0.19.0";
+  version = "0.20.0";

  src = fetchFromGitHub {
    owner = "fornwall";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-CYeTt6PzVGu62/GJB+gUlOXG2bs4RV0LWECF4CN3Uic=";
+    sha256 = "sha256-WcvRkp57VyBB5gQgamFoR6wK1cRJ+3hQqixOBgeapJU=";
  };

-  cargoSha256 = "sha256-IUzaVeOTBAOo/jkDytk6qc7VatKX75l1yZy99iSIqyE=";
+  cargoSha256 = "sha256-qJIftByppOrT4g3sxmKRSLhxtpAW4eXWX0FhmMDJNu0=";

  # tests require network access
  doCheck = false;
--- a/pkgs/os-specific/linux/zenmonitor/default.nix
+++ b/pkgs/os-specific/linux/zenmonitor/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "zenmonitor";
-  version = "1.5.0";
+  version = "2.0.0";

  src = fetchFromGitHub {
    owner = "Ta180m";
    repo = "zenmonitor3";
    rev = "v${version}";
-    sha256 = "sha256-dbjLpfflIsEU+wTApghJYBPxBXqS/7MJqcMBcj50o6I=";
+    sha256 = "sha256-2EsuSMXnnMg0e0JD1TXJplsi7sOg9em0qqge2WlC6ro=";
  };

  buildInputs = [ gtk3 ];
--- a/pkgs/tools/backup/kopia/default.nix
+++ b/pkgs/tools/backup/kopia/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "kopia";
-  version = "0.10.4";
+  version = "0.10.5";

  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-L6aAcIGNNts4rsJNCmuKSFtBWe/VUzhwiNmlpKCZ+B4=";
+    sha256 = "sha256-9H57NlvyEEOX2F3ooWWqDAo7MnS9J+XrYv/cIyNo6+Y=";
  };

-  vendorSha256 = "sha256-jswXHGjDnH3dVjpvdbr/sMYyWmGvTAZB77oKBMkBsnI=";
+  vendorSha256 = "sha256-c8WohMyaOicPq2q+DkgNBBulMEJCZFNFe+xECUEpelI=";

  doCheck = false;

--- a/pkgs/tools/misc/latex2html/default.nix
+++ b/pkgs/tools/misc/latex2html/default.nix
@ -4,13 +4,13 @@

 stdenv.mkDerivation rec {
  pname = "latex2html";
-  version = "2021.2";
+  version = "2022";

  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-WxMB70TeN53S6PNYDUVZ7lBKw7DvKnJDiHek9/GUYcA=";
+    sha256 = "sha256-a+OFBNMtP6mDqg1k9rjDLEJhZDM+zdRpPbn3aeC+Qks=";
  };

  buildInputs = [ ghostscript netpbm perl ];