Merge master into staging-next

25 files changed, 638 insertions, 156 deletions

diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
index 60c6f332847..4a43bec09ac 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
@@ -1,7 +1,10 @@
-{ lib, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , makeWrapper, makeDesktopItem, mkYarnPackage
 , electron, element-web
 , callPackage
+, Security
+, AppKit
+, CoreServices
 }:
 # Notes for maintainers:
 # * versions of `element-web` and `element-desktop` should be kept in sync.
@@ -16,6 +19,7 @@ let
     rev = "v${version}";
     sha256 = "sha256-4d2IOngiRcKd4k0jnilAR3Sojkfru3dlqtoBYi3zeLY=";
   };
+  electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron";
 in mkYarnPackage rec {
   name = "element-desktop-${version}";
   inherit version src;
@@ -25,8 +29,8 @@ in mkYarnPackage rec {
 
   nativeBuildInputs = [ makeWrapper ];
 
-  seshat = callPackage ./seshat {};
-  keytar = callPackage ./keytar {};
+  seshat = callPackage ./seshat { inherit CoreServices; };
+  keytar = callPackage ./keytar { inherit Security AppKit; };
 
   buildPhase = ''
     runHook preBuild
@@ -63,7 +67,7 @@ in mkYarnPackage rec {
     ln -s "${desktopItem}/share/applications" "$out/share/applications"
 
     # executable wrapper
-    makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
+    makeWrapper '${electron_exec}' "$out/bin/${executableName}" \
       --add-flags "$out/share/element/electron"
   '';
 
diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix
index 87ef174271d..f848601874a 100644
--- a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix
+++ b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, nodejs-14_x, python3, callPackage, fixup_yarn_lock, yarn, pkg-config, libsecret }:
+{ lib, stdenv, fetchFromGitHub, nodejs-14_x, python3, callPackage
+, fixup_yarn_lock, yarn, pkg-config, libsecret, xcbuild, Security, AppKit }:
 
 stdenv.mkDerivation rec {
   pname = "keytar";
@@ -11,8 +12,10 @@ stdenv.mkDerivation rec {
     sha256 = "0ajvr4kjbyw2shb1y14c0dsghdlnq30f19hk2sbzj6n9y3xa3pmi";
   };
 
-  nativeBuildInputs = [ nodejs-14_x python3 yarn pkg-config];
-  buildInputs = [ libsecret ];
+  nativeBuildInputs = [ nodejs-14_x python3 yarn pkg-config ]
+    ++ lib.optional  stdenv.isDarwin xcbuild;
+  buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ]
+    ++ lib.optionals stdenv.isDarwin [ Security AppKit ];
 
   npm_config_nodedir = nodejs-14_x;
 
@@ -21,7 +24,8 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     cp ${./yarn.lock} ./yarn.lock
     chmod u+w . ./yarn.lock
-    export HOME=/tmp
+    export HOME=$PWD/tmp
+    mkdir -p $HOME
     yarn config --offline set yarn-offline-mirror ${yarnOfflineCache}
     ${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock
     yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
@@ -34,6 +38,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     shopt -s extglob
     rm -rf node_modules
+    rm -rf $HOME
     mkdir -p $out
     cp -r ./!(build) $out
     install -D -t $out/build/Release build/Release/keytar.node
diff --git a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix
index 6dbd15efe72..ae9dd96228b 100644
--- a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix
@@ -1,4 +1,4 @@
-{ rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs-14_x, python3, yarn, fixup_yarn_lock }:
+{ lib, stdenv, rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs-14_x, python3, yarn, fixup_yarn_lock, CoreServices }:
 
 rustPlatform.buildRustPackage rec {
   pname = "seshat-node";
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   sourceRoot = "source/seshat-node/native";
 
   nativeBuildInputs = [ nodejs-14_x python3 yarn ];
-  buildInputs = [ sqlcipher ];
+  buildInputs = [ sqlcipher ] ++ lib.optional stdenv.isDarwin CoreServices;
 
   npm_config_nodedir = nodejs-14_x;
 
@@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec {
   buildPhase = ''
     cd ..
     chmod u+w . ./yarn.lock
-    export HOME=/tmp
+    export HOME=$PWD/tmp
+    mkdir -p $HOME
     yarn config --offline set yarn-offline-mirror ${yarnOfflineCache}
     ${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock
     yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
@@ -37,6 +38,7 @@ rustPlatform.buildRustPackage rec {
     shopt -s extglob
     rm -rf native/!(index.node)
     rm -rf node_modules
+    rm -rf $HOME
     cp -r . $out
   '';
 
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index dbd2c7b3ec7..67ce817f11a 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -28,7 +28,7 @@ let
       else "");
 in stdenv.mkDerivation rec {
   pname = "signal-desktop";
-  version = "5.11.0"; # Please backport all updates to the stable channel.
+  version = "5.12.0"; # Please backport all updates to the stable channel.
   # All releases have a limited lifetime and "expire" 90 days after the release.
   # When releases "expire" the application becomes unusable until an update is
   # applied. The expiration date for the current release can be extracted with:
@@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "17r7apmsz5bvcfnf81m6jjsj17a4h7bhgy1vllwyyvaa585nspmp";
+    sha256 = "0cvh70ijx61rq7qjzrmn85lhkm8vkcbxvgjvkpls21v3yl5anrjb";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 4bda09670ab..1001f90023a 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -549,8 +549,6 @@ rec {
             then tag
             else
               lib.head (lib.strings.splitString "-" (baseNameOf result.outPath));
-        # Docker can't be made to run darwin binaries
-        meta.badPlatforms = lib.platforms.darwin;
       } ''
         ${lib.optionalString (tag == null) ''
           outName="$(basename "$out")"
diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix
index 6b53f3fdd95..ccbd58485ea 100644
--- a/pkgs/build-support/emacs/wrapper.nix
+++ b/pkgs/build-support/emacs/wrapper.nix
@@ -27,7 +27,7 @@ let customEmacsPackages =
         # use the unstable MELPA version of magit
         magit = self.melpaPackages.magit;
       });
-in customEmacsPackages.emacs.pkgs.withPackages (epkgs: [ epkgs.evil epkgs.magit ])
+in customEmacsPackages.withPackages (epkgs: [ epkgs.evil epkgs.magit ])
 ```
 
 */
diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json
index d36b8342fdd..81b45836a60 100644
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@@ -1,6 +1,6 @@
 {
-  "commit": "e40930a03e038e12969b8eac001e86d7aa7355b4",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e40930a03e038e12969b8eac001e86d7aa7355b4.tar.gz",
-  "sha256": "16wzasswii49xj9pyxmr4r5lwp2qqc2z90a4gq5ihclcy15r8kdc",
-  "msg": "Update from Hackage at 2021-07-26T15:54:23Z"
+  "commit": "7060a9c8a2b0e92be86d0338296697df3e9a713f",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7060a9c8a2b0e92be86d0338296697df3e9a713f.tar.gz",
+  "sha256": "1dzdylg00j1rm8s0rs23jv22cvv9wy3abizzhnryq1wkp13npsc7",
+  "msg": "Update from Hackage at 2021-07-29T16:00:40Z"
 }
diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix
index eabea78fd09..c8bb4591b3a 100644
--- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix
+++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix
@@ -8,10 +8,10 @@
 }:
 mkDerivation {
   pname = "cabal2nix";
-  version = "unstable-2021-07-21";
+  version = "unstable-2021-07-29";
   src = fetchzip {
-    url = "https://github.com/NixOS/cabal2nix/archive/b5b8981921771af9c592cd48631b7f8f21745dff.tar.gz";
-    sha256 = "1r2rkqq0knnn4m8xhjmnkl07mv4cb13adf88y2qq69zpxkb24frn";
+    url = "https://github.com/NixOS/cabal2nix/archive/614852fa4be21ffc283046b92ed9e5b75c7e38af.tar.gz";
+    sha256 = "00p6vmy5s016nkgjk5zf0hqym8y2glgwga81lm6xc1vc3zzkidmc";
   };
   isLibrary = true;
   isExecutable = true;
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 9bc5a936e28..935e56a9b97 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -749,6 +749,9 @@ self: super: {
 
   # Needs pginit to function and pgrep to verify.
   tmp-postgres = overrideCabal super.tmp-postgres (drv: {
+    # Flaky tests: https://github.com/jfischoff/tmp-postgres/issues/274
+    doCheck = false;
+
     preCheck = ''
       export HOME="$TMPDIR"
     '' + (drv.preCheck or "");
@@ -1715,9 +1718,7 @@ self: super: {
   # https://github.com/obsidiansystems/database-id/issues/1
   database-id-class = doJailbreak super.database-id-class;
 
-  cabal2nix-unstable = overrideCabal (super.cabal2nix-unstable.override {
-    distribution-nixpkgs = self.distribution-nixpkgs_1_6_0;
-  }) {
+  cabal2nix-unstable = overrideCabal super.cabal2nix-unstable {
     passthru.updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-unstable.sh;
   };
 
diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix
index 492af32edb1..48484dec9b3 100644
--- a/pkgs/development/haskell-modules/configuration-darwin.nix
+++ b/pkgs/development/haskell-modules/configuration-darwin.nix
@@ -174,6 +174,7 @@ self: super: {
   hls-fourmolu-plugin = dontCheck super.hls-fourmolu-plugin;
   hls-module-name-plugin = dontCheck super.hls-module-name-plugin;
   hls-splice-plugin = dontCheck super.hls-splice-plugin;
+  hls-ormolu-plugin = dontCheck super.hls-ormolu-plugin;
 
   # We are lacking pure pgrep at the moment for tests to work
   tmp-postgres = dontCheck super.tmp-postgres;
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index a6329c8f9e3..624002162f3 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -925,6 +925,7 @@ broken-packages:
   - data-nat
   - data-object
   - datapacker
+  - data-pdf-fieldreader
   - data-pprint
   - data-quotientref
   - data-reify-cse
@@ -2485,6 +2486,7 @@ broken-packages:
   - interpolatedstring-qq2
   - interruptible
   - interval
+  - interval-algebra
   - IntFormats
   - int-multimap
   - intricacy
@@ -2522,6 +2524,7 @@ broken-packages:
   - itcli
   - itemfield
   - iteratee
+  - iterative-forward-search
   - iterIO
   - it-has
   - ivory
@@ -2821,6 +2824,7 @@ broken-packages:
   - loch
   - log2json
   - log4hs
+  - log-base
   - logentries
   - logger
   - logging-effect-extra-file
@@ -3673,6 +3677,7 @@ broken-packages:
   - postgres-embedded
   - postgresql-lo-stream
   - postgresql-named
+  - postgresql-resilient
   - postgresql-simple-bind
   - postgresql-simple-named
   - postgresql-simple-sop
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index 8bd6c316f28..e5e4672e1d5 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -91,7 +91,6 @@ default-package-overrides:
   - streamly-bytestring < 0.1.3
   - streamly-lmdb < 0.3.0
   - streamly-process
-  - distribution-nixpkgs < 1.6.0        # 2021-07-26: required until cabal2nix 2.17.1 is released
 
 extra-packages:
   - base16-bytestring < 1               # required for cabal-install etc.
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
index dbc93b59045..fa5e7e5d8c5 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@@ -1972,10 +1972,12 @@ dont-distribute-packages:
  - llvm-tf
  - llvm-tools
  - lmonad-yesod
+ - lnd-client
  - local-search
  - localize
  - locked-poll
  - log
+ - log-elasticsearch
  - log-postgres
  - log-utils
  - logging-effect-extra
@@ -3145,6 +3147,7 @@ dont-distribute-packages:
  - wai-dispatch
  - wai-handler-snap
  - wai-hastache
+ - wai-log
  - wai-middleware-brotli
  - wai-middleware-cache
  - wai-middleware-cache-redis
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 3ebdfe48fdd..e3baf23a06f 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -7271,6 +7271,8 @@ self: {
        pname = "Glob";
        version = "0.10.1";
        sha256 = "05fknrb114qvfzv6324ngx0fz43cwgrhrc700l3h2is9jinlgr6a";
+       revision = "1";
+       editedCabalFile = "1mnhsl38mv9p46njns72xi4564nikx7v6plg2s6jilr3y3sfijqp";
        libraryHaskellDepends = [
          base containers directory dlist filepath transformers
          transformers-compat
@@ -10756,6 +10758,21 @@ self: {
        license = lib.licenses.publicDomain;
      }) {inherit (pkgs) openssl;};
 
+  "HsOpenSSL_0_11_7_1" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }:
+     mkDerivation {
+       pname = "HsOpenSSL";
+       version = "0.11.7.1";
+       sha256 = "1vkcs0crifjpgr1rxkbzkwyhl4zg84m5bfxkp095mgry557gqzm8";
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [ base bytestring network time ];
+       librarySystemDepends = [ openssl ];
+       testHaskellDepends = [ base bytestring ];
+       description = "Partial OpenSSL binding for Haskell";
+       license = lib.licenses.publicDomain;
+       hydraPlatforms = lib.platforms.none;
+     }) {inherit (pkgs) openssl;};
+
   "HsOpenSSL-x509-system" = callPackage
     ({ mkDerivation, base, bytestring, HsOpenSSL, unix }:
      mkDerivation {
@@ -11558,6 +11575,35 @@ self: {
        broken = true;
      }) {};
 
+  "Jikka" = callPackage
+    ({ mkDerivation, alex, ansi-terminal, array, base, containers
+     , deepseq, doctest, happy, hlint, hspec, hspec-discover, mtl
+     , ormolu, text, transformers, vector
+     }:
+     mkDerivation {
+       pname = "Jikka";
+       version = "5.0.11.2";
+       sha256 = "03f6xvg9jhalpa43k27dr9vzc02rchhf15irwp6gbzq3g63vzqi5";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-terminal array base containers deepseq mtl text transformers
+         vector
+       ];
+       libraryToolDepends = [ alex happy ];
+       executableHaskellDepends = [
+         ansi-terminal array base containers deepseq mtl text transformers
+         vector
+       ];
+       testHaskellDepends = [
+         ansi-terminal array base containers deepseq doctest hlint hspec mtl
+         ormolu text transformers vector
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "A transpiler from Python to C++ for competitive programming";
+       license = lib.licenses.asl20;
+     }) {};
+
   "JsContracts" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, mtl, parsec
      , pretty, syb, WebBits, WebBits-Html
@@ -26916,6 +26962,8 @@ self: {
        pname = "alsa-seq";
        version = "0.6.0.8";
        sha256 = "00f7873484nifbimdav0b25sipgx3rn6xx1il6qgvz0p70pzzljv";
+       revision = "1";
+       editedCabalFile = "1mzdlqgxrgjmr3ljf4xg8rcks1fdq0s0zpb4lkipcm1lyq0kk32j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -33178,6 +33226,24 @@ self: {
        broken = true;
      }) {};
 
+  "arrow-utils" = callPackage
+    ({ mkDerivation, base, QuickCheck, test-framework
+     , test-framework-quickcheck2, vector-sized
+     }:
+     mkDerivation {
+       pname = "arrow-utils";
+       version = "0.1.0.0";
+       sha256 = "1l8njh623a00hvfd3cczvb4ngh7c39z6f0kfhr8hr6xhbkrgwqnc";
+       revision = "1";
+       editedCabalFile = "1jdl1jmr8hbjiybrjnfr8rraqdf95l4qia3nna3nh9pvh8c69jln";
+       libraryHaskellDepends = [ base vector-sized ];
+       testHaskellDepends = [
+         base QuickCheck test-framework test-framework-quickcheck2
+       ];
+       description = "functions for working with arrows";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "arrowapply-utils" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -49578,10 +49644,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal2nix";
-       version = "2.17.0";
-       sha256 = "0y91agkhgpzzaf9l7l1h7x516iryj8z2vk1in1h7pyjlxaiak6lm";
-       revision = "2";
-       editedCabalFile = "05lb28s4l4c1s6jv1zaqpm9mwx5r4gm113akzq9xr1w5447vw2c3";
+       version = "2.18.0";
+       sha256 = "11hzic1l7amd2hwqwgfmy2r855z9w0m2rvvx7r52x347q0nn142b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -49854,6 +49918,22 @@ self: {
        license = lib.licenses.asl20;
      }) {};
 
+  "cached-json-file" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, directory, filepath
+     , http-query, time, xdg-basedir
+     }:
+     mkDerivation {
+       pname = "cached-json-file";
+       version = "0.1.0";
+       sha256 = "1w1zxzcbyf4c0p5hg4j2b531r6vg95745ah3qqwiafwb4z11l7ih";
+       libraryHaskellDepends = [
+         aeson base bytestring directory filepath http-query time
+         xdg-basedir
+       ];
+       description = "Locally cache a json file obtained by http";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "cached-traversable" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, directory
      , filepath, mtl
@@ -58436,18 +58516,19 @@ self: {
      }) {};
 
   "coincident-root-loci" = callPackage
-    ({ mkDerivation, array, base, combinat, containers, random, tasty
-     , tasty-hunit, transformers
+    ({ mkDerivation, array, base, combinat, containers
+     , polynomial-algebra, random, tasty, tasty-hunit, transformers
      }:
      mkDerivation {
        pname = "coincident-root-loci";
-       version = "0.2";
-       sha256 = "0p6wm5gd57m809cqr0p3hb29drs1q25f539j2pf1cw03hlkahpxh";
+       version = "0.3";
+       sha256 = "1m7a1f2qxkq4jgbvmyn8zzz6pq44a4cfkkm74zlssg74xmx0d4ir";
        libraryHaskellDepends = [
-         array base combinat containers random transformers
+         array base combinat containers polynomial-algebra random
+         transformers
        ];
        testHaskellDepends = [
-         array base combinat containers tasty tasty-hunit
+         array base combinat containers polynomial-algebra tasty tasty-hunit
        ];
        description = "Equivariant CSM classes of coincident root loci";
        license = lib.licenses.bsd3;
@@ -60569,15 +60650,12 @@ self: {
      }) {};
 
   "conceit" = callPackage
-    ({ mkDerivation, base, bifunctors, semigroupoids, semigroups, void
-     }:
+    ({ mkDerivation, base }:
      mkDerivation {
        pname = "conceit";
-       version = "0.4.0.0";
-       sha256 = "02wq99h7rnsvzkkm6i7x6qk7d4fiy6llg5yr75h2zks387yalwl9";
-       libraryHaskellDepends = [
-         base bifunctors semigroupoids semigroups void
-       ];
+       version = "0.5.0.0";
+       sha256 = "0aprzrslrbsl3d7j49nmx0kxx71m39zi7xlfyw8wnazqpi8mfwwb";
+       libraryHaskellDepends = [ base ];
        description = "Concurrent actions that may fail with a value";
        license = lib.licenses.bsd3;
      }) {};
@@ -63426,12 +63504,12 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
-  "contravariant_1_5_4" = callPackage
+  "contravariant_1_5_5" = callPackage
     ({ mkDerivation, base, StateVar, transformers }:
      mkDerivation {
        pname = "contravariant";
-       version = "1.5.4";
-       sha256 = "19bwqkxvpgdfvjamk0g8wk1q4rfvbhxain6lx78ldhjmc7m5v9ql";
+       version = "1.5.5";
+       sha256 = "1ynz89vfn7czxpa203zmdqknkvpylzzl9rlkpasx1anph1jxcbq6";
        libraryHaskellDepends = [ base StateVar transformers ];
        description = "Contravariant functors";
        license = lib.licenses.bsd3;
@@ -64864,6 +64942,8 @@ self: {
        pname = "cpuid";
        version = "0.2.3";
        sha256 = "126xg98yaf3q61h85yrs1cm6wxlayf590l0a3h0gw6c282s8l6gq";
+       revision = "1";
+       editedCabalFile = "1nq08npkjpl4j047d268qrwxii5xhc30iwji7azkc8dh2gja6g2j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base data-accessor enumset ];
@@ -69605,6 +69685,18 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "data-fix_0_3_2" = callPackage
+    ({ mkDerivation, base, deepseq, hashable }:
+     mkDerivation {
+       pname = "data-fix";
+       version = "0.3.2";
+       sha256 = "1k0rcbb6dzv0ggdxqa2bh4jr829y0bczjrg98mrk5733q0xjs5rs";
+       libraryHaskellDepends = [ base deepseq hashable ];
+       description = "Fixpoint data types";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "data-fix-cse" = callPackage
     ({ mkDerivation, base, containers, data-fix, transformers }:
      mkDerivation {
@@ -70099,6 +70191,26 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "data-pdf-fieldreader" = callPackage
+    ({ mkDerivation, base, bytestring, containers, optparse-applicative
+     , text
+     }:
+     mkDerivation {
+       pname = "data-pdf-fieldreader";
+       version = "0.1.0.0";
+       sha256 = "1h57hva0dkhnshallf2yxwfmzfqzd6wm20cbxn8qm94jp95a627d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bytestring containers text ];
+       executableHaskellDepends = [
+         base bytestring containers optparse-applicative text
+       ];
+       description = "Read PDF form fields";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "data-pprint" = callPackage
     ({ mkDerivation, base, deepseq, mtl, parallel, pretty, time }:
      mkDerivation {
@@ -77502,26 +77614,10 @@ self: {
      }:
      mkDerivation {
        pname = "distribution-nixpkgs";
-       version = "1.5.0";
-       sha256 = "07z1dkyzz9sabxda48cy6y2pfyq14sz2m9bv6y6dajn15cy7m3pk";
-       libraryHaskellDepends = [
-         aeson base bytestring Cabal containers deepseq language-nix lens
-         pretty process split
-       ];
-       testHaskellDepends = [ base deepseq hspec lens ];
-       description = "Types and functions to manipulate the Nixpkgs distribution";
-       license = lib.licenses.bsd3;
-       maintainers = with lib.maintainers; [ peti ];
-     }) {};
-
-  "distribution-nixpkgs_1_6_0" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, Cabal, containers
-     , deepseq, hspec, language-nix, lens, pretty, process, split
-     }:
-     mkDerivation {
-       pname = "distribution-nixpkgs";
        version = "1.6.0";
        sha256 = "0m1kw3wy0n611487qhskldivrxmkh7m5bkzib44d8n0qfg5lv06i";
+       revision = "1";
+       editedCabalFile = "0j35y7ws7rbc68vkmyvpa4m2dyfpzpzzvm4lv7h6r7x34w331dgg";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring Cabal containers deepseq language-nix lens
@@ -77530,7 +77626,6 @@ self: {
        testHaskellDepends = [ base deepseq hspec lens ];
        description = "Types and functions to manipulate the Nixpkgs distribution";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
        maintainers = with lib.maintainers; [ peti ];
      }) {};
 
@@ -84638,6 +84733,21 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "enumset_0_1" = callPackage
+    ({ mkDerivation, base, data-accessor, semigroups, storable-record
+     }:
+     mkDerivation {
+       pname = "enumset";
+       version = "0.1";
+       sha256 = "1flsyc8a9hj33pl35jkcls8sdc7yw8yc9xfflynm0h9ncq1frlcr";
+       libraryHaskellDepends = [
+         base data-accessor semigroups storable-record
+       ];
+       description = "Sets of enumeration values represented by machine words";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "env-extra" = callPackage
     ({ mkDerivation, base, exceptions, tasty, tasty-hunit, text
      , transformers
@@ -85445,6 +85555,8 @@ self: {
        pname = "errors";
        version = "2.3.0";
        sha256 = "0x8znwn31qcx6kqx99wp7bc86kckfb39ncz3zxvj1s07kxlfawk7";
+       revision = "1";
+       editedCabalFile = "08y607nwnw12vlbmwcppv1ydw726x8p3kwwx4rgaiss906hgnzrp";
        libraryHaskellDepends = [
          base exceptions safe text transformers transformers-compat
        ];
@@ -87165,6 +87277,24 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "exception-transformers_0_4_0_10" = callPackage
+    ({ mkDerivation, base, HUnit, test-framework, test-framework-hunit
+     , transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "exception-transformers";
+       version = "0.4.0.10";
+       sha256 = "11ghvxm32q3kzccbngz4068j2rrrhs03amlaq5i5r1vankrbxg0n";
+       libraryHaskellDepends = [ base transformers transformers-compat ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit transformers
+         transformers-compat
+       ];
+       description = "Type classes and monads for unchecked extensible exceptions";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "exception-via" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -87712,6 +87842,27 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "exon" = callPackage
+    ({ mkDerivation, base, flatparse, haskell-src-exts
+     , haskell-src-meta, hedgehog, relude, tasty, tasty-hedgehog
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "exon";
+       version = "0.1.0.0";
+       sha256 = "014jbbzhb9ar3azxqjnagyyasack0dik32h2d0lzb6yr0yiwsv8m";
+       libraryHaskellDepends = [
+         base flatparse haskell-src-exts haskell-src-meta relude
+         template-haskell text
+       ];
+       testHaskellDepends = [
+         base flatparse haskell-src-exts haskell-src-meta hedgehog relude
+         tasty tasty-hedgehog template-haskell text
+       ];
+       description = "Monoidal Quasiquote Interpolation";
+       license = "BSD-2-Clause-Patent";
+     }) {};
+
   "exotic-list-monads" = callPackage
     ({ mkDerivation, base, hspec, hspec-core, hspec-discover
      , QuickCheck
@@ -89842,26 +89993,23 @@ self: {
      , config-ini, directory, email-validate, extra, filepath
      , http-conduit, http-directory, http-query, koji, lens, lens-aeson
      , network-uri, optparse-applicative, pretty-terminal, process
-     , rpmbuild-order, simple-cmd, simple-cmd-args, text, time
+     , rpm-nvr, rpmbuild-order, simple-cmd, simple-cmd-args, text, time
      , typed-process, unordered-containers, utf8-string, xdg-basedir
      }:
      mkDerivation {
        pname = "fbrnch";
-       version = "0.9";
-       sha256 = "1basamg578nyyjl677q3fax31pxcckxvdpw4f48gdmnmlnd9f6vm";
+       version = "0.9.1";
+       sha256 = "1da3q7i2qsrc0hal97rbmmp6609n3z9hqn1i67a5lhi4z7mk8fab";
        isLibrary = false;
        isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base http-query lens lens-aeson text time
-       ];
        executableHaskellDepends = [
          aeson async base bugzilla-redhat bytestring config-ini directory
          email-validate extra filepath http-conduit http-directory
-         http-query koji network-uri optparse-applicative pretty-terminal
-         process rpmbuild-order simple-cmd simple-cmd-args text time
-         typed-process unordered-containers utf8-string xdg-basedir
+         http-query koji lens lens-aeson network-uri optparse-applicative
+         pretty-terminal process rpm-nvr rpmbuild-order simple-cmd
+         simple-cmd-args text time typed-process unordered-containers
+         utf8-string xdg-basedir
        ];
-       doHaddock = false;
        description = "Build and create Fedora package repos and branches";
        license = lib.licenses.gpl2Only;
        hydraPlatforms = lib.platforms.none;
@@ -90886,6 +91034,20 @@ self: {
        license = lib.licenses.bsd3;
      }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;};
 
+  "fftw-ffi" = callPackage
+    ({ mkDerivation, base, enumset, fftw, fftwFloat, netlib-ffi }:
+     mkDerivation {
+       pname = "fftw-ffi";
+       version = "0.1";
+       sha256 = "1a0a28i54s1gjyf0lk96l512gm6i2rn6ac1hh76r3gk5n7ijbx7p";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base enumset netlib-ffi ];
+       libraryPkgconfigDepends = [ fftw fftwFloat ];
+       description = "Low-level interface to FFTW (Fast Fourier Transform)";
+       license = lib.licenses.bsd3;
+     }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;};
+
   "fftwRaw" = callPackage
     ({ mkDerivation, base, fftw }:
      mkDerivation {
@@ -92255,6 +92417,24 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "fix-whitespace_0_0_6" = callPackage
+    ({ mkDerivation, base, directory, extra, filepath, filepattern
+     , text, yaml
+     }:
+     mkDerivation {
+       pname = "fix-whitespace";
+       version = "0.0.6";
+       sha256 = "087sp7bf7k4h9clmhqdzk8j1y12rc6lhd22p2w6kp7w1ppgg06aw";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base directory extra filepath filepattern text yaml
+       ];
+       description = "Fixes whitespace issues";
+       license = "unknown";
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "fixed" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -92280,6 +92460,22 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "fixed-length_0_2_3" = callPackage
+    ({ mkDerivation, base, non-empty, storable-record, tfp
+     , transformers, utility-ht
+     }:
+     mkDerivation {
+       pname = "fixed-length";
+       version = "0.2.3";
+       sha256 = "0g2z9vswjbzishbx6wl6vln7x4avl8glxc14kr4bjwxdlvvn2ic1";
+       libraryHaskellDepends = [
+         base non-empty storable-record tfp transformers utility-ht
+       ];
+       description = "Lists with statically known length based on non-empty package";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "fixed-list" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -93866,6 +94062,34 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "fmt_0_6_2_0" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring, call-stack
+     , containers, criterion, deepseq, doctest, doctest-discover
+     , formatting, hspec, interpolate, microlens, neat-interpolation
+     , QuickCheck, text, time, time-locale-compat, vector
+     }:
+     mkDerivation {
+       pname = "fmt";
+       version = "0.6.2.0";
+       sha256 = "14h5f7nz9czfg1ar0ga9vry4ck2xf7h6rxiyk276w871yra01l9g";
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring call-stack containers formatting
+         microlens text time time-locale-compat
+       ];
+       testHaskellDepends = [
+         base bytestring call-stack containers doctest hspec
+         neat-interpolation QuickCheck text vector
+       ];
+       testToolDepends = [ doctest-discover ];
+       benchmarkHaskellDepends = [
+         base bytestring containers criterion deepseq formatting interpolate
+         text vector
+       ];
+       description = "A new formatting library";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "fmt-for-rio" = callPackage
     ({ mkDerivation, base, enum-text-rio }:
      mkDerivation {
@@ -94533,8 +94757,8 @@ self: {
      }:
      mkDerivation {
        pname = "forex2ledger";
-       version = "1.0.0.1";
-       sha256 = "0v6adrl9c9vjpf4gm8x729qxq7yl84bfbiawmdpks2jzdckxvgdb";
+       version = "1.0.0.2";
+       sha256 = "1x6ln7pw77psppryi71jbsz5px4z4a96ppz6wmj4kjr7rwkkbrg4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -134354,8 +134578,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpqtypes";
-       version = "1.9.1.1";
-       sha256 = "0s5dyia6v59vz7xk8m6gj0shdygk39pmks5yr7dlzksb8gqfgral";
+       version = "1.9.1.2";
+       sha256 = "1dvyvsj5f5fpqs6jgqxhrf1dfq2nwb75rf797zkyy3m4a278d58q";
        setupHaskellDepends = [ base Cabal directory filepath ];
        libraryHaskellDepends = [
          aeson async base bytestring containers exceptions lifted-base
@@ -135710,8 +135934,8 @@ self: {
      }:
      mkDerivation {
        pname = "hs-term-emulator";
-       version = "0.1.0.0";
-       sha256 = "03aidqaw9pmwggd1w8ir6qhb08hlhv0q5gnl0hqa5zjj86dd0rp2";
+       version = "0.1.0.3";
+       sha256 = "0agl1xhidj4a9vm3nx4ahkx06kvv2kk83qxfv7l5mb9ml3myrqnp";
        libraryHaskellDepends = [
          ansi-terminal attoparsec base bytestring containers lens text
          vector
@@ -147651,6 +147875,8 @@ self: {
        pname = "indexed-traversable";
        version = "0.1.1";
        sha256 = "0fc18vdm1894yjbjkj9wjm27bf37ac3gvkzak677mgiw2pinmhvs";
+       revision = "1";
+       editedCabalFile = "0krvp9v5dh4w2076kar48cpkk62ndqp769v2ai3b38rsa5bj6q74";
        libraryHaskellDepends = [ array base containers transformers ];
        description = "FunctorWithIndex, FoldableWithIndex, TraversableWithIndex";
        license = lib.licenses.bsd2;
@@ -149278,21 +149504,23 @@ self: {
      }) {};
 
   "interval-algebra" = callPackage
-    ({ mkDerivation, base, containers, hspec, QuickCheck, safe, time
-     , witherable
+    ({ mkDerivation, base, containers, foldl, hspec, QuickCheck, safe
+     , time, witherable
      }:
      mkDerivation {
        pname = "interval-algebra";
-       version = "0.8.3";
-       sha256 = "0bqsynrzkgl8350spwja96c3hx20srdd9a9g0971jmbrws8kvlpj";
+       version = "0.8.6";
+       sha256 = "1k9x1c7hrbrq6zgj82k8w28ak1jp1v9iq19bicl5355r4p2wiqsa";
        libraryHaskellDepends = [
-         base containers QuickCheck safe time witherable
+         base containers foldl QuickCheck safe time witherable
        ];
        testHaskellDepends = [
-         base containers hspec QuickCheck safe time
+         base containers hspec QuickCheck safe time witherable
        ];
        description = "An implementation of Allen's interval algebra for temporal logic";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "interval-functor" = callPackage
@@ -151171,6 +151399,28 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "iterative-forward-search" = callPackage
+    ({ mkDerivation, base, containers, criterion, deepseq, fingertree
+     , hashable, random, time, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "iterative-forward-search";
+       version = "0.1.0.0";
+       sha256 = "03cnrhnr93va6vd1fi6ccqzdlng37ggkh0ff45bk9m4b25pwrgql";
+       libraryHaskellDepends = [
+         base containers deepseq fingertree hashable random time
+         transformers unordered-containers
+       ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq fingertree hashable random time
+         transformers unordered-containers
+       ];
+       description = "An IFS constraint solver";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "iterio-server" = callPackage
     ({ mkDerivation, base, bytestring, filepath, iterIO, ListLike
      , monadIO, mtl, network, split, transformers, unix
@@ -151754,6 +152004,8 @@ self: {
        pname = "jack";
        version = "0.7.2";
        sha256 = "0aa7nz8ybsw7s0nmf12kxnjm5z1afj88c97b1w17b7lvdwvfs3cx";
+       revision = "1";
+       editedCabalFile = "16g5xc67811jvckfn0xfvcwbxi0kcx1qh87pyhrqvrp4k8m68g2v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -154861,6 +155113,8 @@ self: {
        pname = "kan-extensions";
        version = "5.2.2";
        sha256 = "184qhhjd24i15mcs4lq8fdb86pdg3g5nxhx1x41prigrmi6cxwrv";
+       revision = "1";
+       editedCabalFile = "1scfkj28l7dcrlzcvf0x4vlkpg8d0r4s08l3ccnwlhnxvzsmwkj7";
        libraryHaskellDepends = [
          adjunctions array base comonad containers contravariant
          distributive free invariant mtl profunctors semigroupoids tagged
@@ -154870,6 +155124,25 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "kan-extensions_5_2_3" = callPackage
+    ({ mkDerivation, adjunctions, array, base, comonad, containers
+     , contravariant, distributive, free, invariant, mtl, profunctors
+     , semigroupoids, tagged, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "kan-extensions";
+       version = "5.2.3";
+       sha256 = "1rkjxwc2k2425d2shdra6wzd4f4dpj76hxmq8mish4f0lz9gxxml";
+       libraryHaskellDepends = [
+         adjunctions array base comonad containers contravariant
+         distributive free invariant mtl profunctors semigroupoids tagged
+         transformers transformers-compat
+       ];
+       description = "Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "kangaroo" = callPackage
     ({ mkDerivation, array, base }:
      mkDerivation {
@@ -160437,6 +160710,27 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "lazy-async" = callPackage
+    ({ mkDerivation, base, exceptions, hedgehog, lifted-async
+     , monad-control, optics-core, optics-th, rank2classes, stm
+     , transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "lazy-async";
+       version = "1.0.0.0";
+       sha256 = "0kk8pzwm04z4jljl38gd0n03nkxw3mxg8rg93ka0rvnibfwm8dda";
+       libraryHaskellDepends = [
+         base exceptions lifted-async monad-control rank2classes stm
+         transformers transformers-base
+       ];
+       testHaskellDepends = [
+         base exceptions hedgehog lifted-async monad-control optics-core
+         optics-th rank2classes stm transformers transformers-base
+       ];
+       description = "Asynchronous actions that don't start right away";
+       license = lib.licenses.mit;
+     }) {};
+
   "lazy-csv" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -163011,19 +163305,21 @@ self: {
      }) {};
 
   "libsodium" = callPackage
-    ({ mkDerivation, base, hedgehog, libsodium, tasty, tasty-hedgehog
-     , tasty-hunit
+    ({ mkDerivation, base, c2hs, hedgehog, libsodium, tasty
+     , tasty-hedgehog, tasty-hunit
      }:
      mkDerivation {
        pname = "libsodium";
-       version = "1.0.18.1";
-       sha256 = "0injknfijncmfq10szdl1ay75wwpi8rgm3qfdl654aprd95kvpf1";
+       version = "1.0.18.2";
+       sha256 = "021167kkpii8szx32m5ljgmy5vhvhdijasnz350b14wr047n5iww";
        libraryHaskellDepends = [ base ];
        libraryPkgconfigDepends = [ libsodium ];
+       libraryToolDepends = [ c2hs ];
        testHaskellDepends = [
          base hedgehog tasty tasty-hedgehog tasty-hunit
        ];
        testPkgconfigDepends = [ libsodium ];
+       testToolDepends = [ c2hs ];
        description = "Low-level bindings to the libsodium C library";
        license = lib.licenses.isc;
      }) {inherit (pkgs) libsodium;};
@@ -163867,16 +164163,16 @@ self: {
   "line-bot-sdk" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, base64-bytestring
      , bytestring, cryptohash-sha256, deepseq, free, hspec
-     , hspec-expectations, hspec-wai, http-api-data, http-client
-     , http-client-tls, http-media, http-types, mtl, scientific, servant
-     , servant-client, servant-client-core, servant-server
-     , string-conversions, text, time, transformers, wai, wai-extra
-     , warp
+     , hspec-discover, hspec-expectations, hspec-wai, http-api-data
+     , http-client, http-client-tls, http-media, http-types, mtl
+     , scientific, servant, servant-client, servant-client-core
+     , servant-server, string-conversions, text, time, transformers, wai
+     , wai-extra, warp
      }:
      mkDerivation {
        pname = "line-bot-sdk";
-       version = "0.7.0";
-       sha256 = "05pw5qj0bd62gdb8llalsdpm62y8vhxxfch3zc18152qajn228yp";
+       version = "0.7.1";
+       sha256 = "0q7nzycmd3adckpzrskjfjw72bcxia278qb9z72sa991riyawscz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -163894,6 +164190,7 @@ self: {
          http-client-tls http-types servant servant-client
          servant-client-core servant-server text time transformers wai warp
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Haskell SDK for LINE Messaging API";
        license = lib.licenses.bsd3;
      }) {};
@@ -166013,6 +166310,8 @@ self: {
        pname = "llvm-extra";
        version = "0.10.1";
        sha256 = "0m8fxip4345k92nq5n0dqdbjyahah0nind6lrwa5r7f9ff9j8gc9";
+       revision = "1";
+       editedCabalFile = "12b7icp5vk26nwl5q8jhsrcqp10h0w72yxqsw9dzr3lzca4g6wl2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -166035,6 +166334,8 @@ self: {
        pname = "llvm-ffi";
        version = "9.1.0.1";
        sha256 = "19bj8gkzmzg3khnj1pnksc789p1hls0ji48kvwp72zbhhzgpr75d";
+       revision = "1";
+       editedCabalFile = "0iq9csqrbzrhvpzgz8nbs9k390sh3440002ipcicjlqkm4ssi330";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base enumset ];
@@ -166294,6 +166595,8 @@ self: {
        pname = "llvm-tf";
        version = "9.2";
        sha256 = "1p4r9m1svp6k235r0azx6dkpdarakgy3420z3kk06bdiy1m2jk1s";
+       revision = "1";
+       editedCabalFile = "0maav3vis08vdvp0zwclyjznf2k4r8qi7szpwxhkya0xa87fh96d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -166427,6 +166730,46 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "lnd-client" = callPackage
+    ({ mkDerivation, aeson, asn1-encoding, asn1-types, async, base
+     , base16-bytestring, base64-bytestring, bytestring, chronos
+     , containers, cryptohash-sha256, cryptonite, deepseq, envparse
+     , extra, hspec, http2, http2-client, http2-client-grpc
+     , http2-grpc-proto-lens, http2-grpc-types, JuicyPixels, katip
+     , microlens, network-bitcoin, pem, persistent, proto-lens
+     , proto-lens-runtime, qrcode-core, qrcode-juicypixels, scientific
+     , stm, template-haskell, text, unbounded-delays, universum
+     , unliftio, x509
+     }:
+     mkDerivation {
+       pname = "lnd-client";
+       version = "0.1.0.0";
+       sha256 = "0fjjm9gamj50scd9m55mv587klhn8xpj35x8abvms5pmpf0npzgq";
+       libraryHaskellDepends = [
+         aeson asn1-encoding asn1-types async base base16-bytestring
+         base64-bytestring bytestring chronos containers cryptohash-sha256
+         cryptonite deepseq envparse extra hspec http2 http2-client
+         http2-client-grpc http2-grpc-proto-lens http2-grpc-types
+         JuicyPixels katip microlens network-bitcoin pem persistent
+         proto-lens proto-lens-runtime qrcode-core qrcode-juicypixels
+         scientific stm template-haskell text unbounded-delays universum
+         unliftio x509
+       ];
+       testHaskellDepends = [
+         aeson asn1-encoding asn1-types async base base16-bytestring
+         base64-bytestring bytestring chronos containers cryptohash-sha256
+         cryptonite deepseq envparse extra hspec http2 http2-client
+         http2-client-grpc http2-grpc-proto-lens http2-grpc-types
+         JuicyPixels katip microlens network-bitcoin pem persistent
+         proto-lens proto-lens-runtime qrcode-core qrcode-juicypixels
+         scientific stm template-haskell text unbounded-delays universum
+         unliftio x509
+       ];
+       description = "Lightning Network Daemon (LND) client library for Haskell";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "load-balancing" = callPackage
     ({ mkDerivation, base, containers, hslogger, PSQueue, stm }:
      mkDerivation {
@@ -166759,8 +167102,8 @@ self: {
      }:
      mkDerivation {
        pname = "log-base";
-       version = "0.10.0.0";
-       sha256 = "1rbp34p7a89w960rpwmqwfqrj6nvqybbc5aqiji60zldxigvy3si";
+       version = "0.10.0.1";
+       sha256 = "0h4b7hjxcc75swj43wx0axcp5znsndkrnhn9c8fm7f7a2gmvb8l1";
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring deepseq exceptions mmorph
          monad-control mtl semigroups stm text time transformers-base
@@ -166768,6 +167111,8 @@ self: {
        ];
        description = "Structured logging solution (base package)";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "log-domain" = callPackage
@@ -166842,6 +167187,7 @@ self: {
        ];
        description = "Structured logging solution (Elasticsearch back end)";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "log-postgres" = callPackage
@@ -166852,8 +167198,8 @@ self: {
      }:
      mkDerivation {
        pname = "log-postgres";
-       version = "0.8.0.0";
-       sha256 = "0vc3n53rpn3qwysp8y5i19ajaag386izsrf9h9k7c2g907k1skw6";
+       version = "0.8.0.1";
+       sha256 = "0bc63v9w023xw1fq0pkfnk4ac336hgliayy21ny0zaz9xf39a24l";
        libraryHaskellDepends = [
          aeson aeson-pretty base base64-bytestring bytestring deepseq
          hpqtypes http-client lifted-base log-base mtl semigroups split text
@@ -168300,8 +168646,8 @@ self: {
      }:
      mkDerivation {
        pname = "lti13";
-       version = "0.2.0.1";
-       sha256 = "1fcjypadap94f238vnhbchq9dy61mhgwlqpy4v22m34881dvx8gf";
+       version = "0.2.0.2";
+       sha256 = "1a8ag4ny61rjyy15fa4mihrgqkinipzj5cvpasscl9yw8jik9s1i";
        libraryHaskellDepends = [
          aeson base bytestring containers http-client http-types jose-jwt
          oidc-client safe-exceptions text
@@ -176463,6 +176809,8 @@ self: {
        pname = "mmorph";
        version = "1.2.0";
        sha256 = "1022d8mm523dihkf85mqsqxpm9rnyicmv91c8rm4csv7xdc80cv1";
+       revision = "1";
+       editedCabalFile = "13j6znh33pnnk8yfxnndqiiwal1w6rs2jigs7fgpa26883ff2788";
        libraryHaskellDepends = [
          base mtl transformers transformers-compat
        ];
@@ -177473,6 +177821,22 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "monad-control_1_0_3" = callPackage
+    ({ mkDerivation, base, stm, transformers, transformers-base
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "monad-control";
+       version = "1.0.3";
+       sha256 = "16rdv4s85ni1xdbd8nzarm4sh331198jnmakrn5wxla9hrfwg2fi";
+       libraryHaskellDepends = [
+         base stm transformers transformers-base transformers-compat
+       ];
+       description = "Lift control operations, like exception catching, through monad transformers";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "monad-control-aligned" = callPackage
     ({ mkDerivation, base, stm, transformers, transformers-base
      , transformers-compat
@@ -190191,6 +190555,8 @@ self: {
        pname = "o-clock";
        version = "1.2.1";
        sha256 = "17y44aajipysw1p268rq8a6lhv9cdhkvxjcpcdij93sqp818q96z";
+       revision = "1";
+       editedCabalFile = "1n8ns0f4ljbarb5xmlwfs1lq24jg30m3hv0gmpgd26y666d3hh95";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ghc-prim ];
@@ -193414,6 +193780,8 @@ self: {
        pname = "optparse-applicative";
        version = "0.16.1.0";
        sha256 = "16nnrkmgd28h540f17nb017ziq4gbzgkxpdraqicaczkca1jf1b2";
+       revision = "1";
+       editedCabalFile = "0401ik87gm9gjpch6lmkczygp59na3f1j7bcs6mc2r929c2xgsqn";
        libraryHaskellDepends = [
          ansi-wl-pprint base process transformers transformers-compat
        ];
@@ -198027,6 +198395,8 @@ self: {
        pname = "patch-image";
        version = "0.3.3.1";
        sha256 = "0nvp2y2f5cb29vzk2a9bvr3mgf17j70ir0nhb648pzfa0h1xj76k";
+       revision = "1";
+       editedCabalFile = "0l21xqwh95v5jdv46qbmaw6d4rfbmn1yx3zraq0srxawc1fgdfgx";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -201617,10 +201987,10 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "phonetic-languages-rhythmicity";
-       version = "0.3.2.0";
-       sha256 = "1r52qjghqv54f2brk132cabjrd3c96jnx96c78irlks5vd0cgblk";
+       version = "0.5.0.0";
+       sha256 = "0lvlrjg424d5jqvplqml3zybai1nhg5zc6kmk5vd01dph2ny3zxw";
        libraryHaskellDepends = [ base ];
-       description = "Allows to estimate the rhythmicity properties for the text (usually, the Ukrainian poetic one)";
+       description = "Allows to estimate the rhythmicity properties for the text";
        license = lib.licenses.mit;
      }) {};
 
@@ -201667,8 +202037,8 @@ self: {
      }:
      mkDerivation {
        pname = "phonetic-languages-simplified-examples-array";
-       version = "0.5.0.1";
-       sha256 = "0wrh3bmwa6l5vfjv481wvnqqd82xgm27vcbm9xg1nm7psihj6gqj";
+       version = "0.6.0.0";
+       sha256 = "0cr7cqc9vkim5cr30lqkglfqyxaqnpaqjicfzzfbr75wqrjljjpm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -201729,8 +202099,8 @@ self: {
      }:
      mkDerivation {
        pname = "phonetic-languages-simplified-generalized-examples-array";
-       version = "0.5.0.1";
-       sha256 = "0gif3xwcbc5v4qjyhn1qwyj36jkqj7rdrq35fzxsr7xbmjcw13h2";
+       version = "0.6.0.0";
+       sha256 = "0knihshb5ahrvdzabbfvgnmhxq94kv985k4cjimh4h4dkzvlmkpj";
        libraryHaskellDepends = [
          base heaps mmsyn2-array mmsyn3 parallel
          phonetic-languages-constraints-array
@@ -201768,8 +202138,8 @@ self: {
      }:
      mkDerivation {
        pname = "phonetic-languages-simplified-generalized-properties-array";
-       version = "0.3.0.0";
-       sha256 = "192i7dr6kpzrclvym1y1j3zgabcx3fldaan07rgxhhys3k7gbqxa";
+       version = "0.4.0.0";
+       sha256 = "1k4s7nr6kcf2y0954grn08s8q49pwq9sq11fyzbil3vsxgb6cy82";
        libraryHaskellDepends = [
          base phonetic-languages-phonetics-basics
          phonetic-languages-rhythmicity phonetic-languages-simplified-base
@@ -201820,8 +202190,8 @@ self: {
      }:
      mkDerivation {
        pname = "phonetic-languages-simplified-properties-array";
-       version = "0.3.0.0";
-       sha256 = "1m836lvnmzsf918jh9kx5vb8hirrjfskcbg1jyz2nar6yqijkr8z";
+       version = "0.4.0.0";
+       sha256 = "19g1xd50k6gvqjq58a5yzqxnq92acgv2ni8m1vp95ajw9cwacsc2";
        libraryHaskellDepends = [
          base phonetic-languages-rhythmicity
          phonetic-languages-simplified-base ukrainian-phonetics-basic-array
@@ -205383,6 +205753,8 @@ self: {
        pname = "poll";
        version = "0.0.0.2";
        sha256 = "1bllh4yr96p7k44bc10zyhdx2zdh3brl0im3gnn5a1m6irsx6j42";
+       revision = "1";
+       editedCabalFile = "05ghv8acp0gr86wlxsmjd0x6jaj981213ggg629hb78a95119f2q";
        libraryHaskellDepends = [ base enumset utility-ht ];
        description = "Bindings to poll.h";
        license = lib.licenses.bsd3;
@@ -206073,11 +206445,16 @@ self: {
      }:
      mkDerivation {
        pname = "polysemy-readline";
-       version = "0.1.0.0";
-       sha256 = "19nic0n5k3r5qbmhnrzwrkncj61ba43qmg86mx0y190mvx540yz1";
+       version = "0.2.0.0";
+       sha256 = "0zkzlrwcbxkxiy2xmh3ms9saa379lmw49d9hfkmd487vi33q0isn";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base exceptions haskeline polysemy polysemy-plugin
        ];
+       executableHaskellDepends = [
+         base exceptions haskeline polysemy polysemy-plugin
+       ];
        testHaskellDepends = [
          base exceptions haskeline polysemy polysemy-plugin
        ];
@@ -207669,20 +208046,35 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-replicant";
-       version = "0.1.0.1";
-       sha256 = "1jlmbi5inwwpwyvrfg13b91fv642xcahfv8nhi0y6dqrvfj69h0q";
+       version = "0.2.0.0";
+       sha256 = "06r5psp6zv2pdbn4l5mp9mh8gywx4s75rny21qbbizramvl77h1k";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson async attoparsec base bits bytestring cereal containers
          keep-alive postgresql-libpq scientific stm text time
        ];
-       executableHaskellDepends = [ base postgresql-libpq ];
+       executableHaskellDepends = [ aeson base postgresql-libpq ];
        testHaskellDepends = [ base binary bytestring cereal hspec ];
        description = "PostgreSQL logical streaming replication library";
        license = lib.licenses.bsd3;
      }) {};
 
+  "postgresql-resilient" = callPackage
+    ({ mkDerivation, base, exceptions, postgresql-simple }:
+     mkDerivation {
+       pname = "postgresql-resilient";
+       version = "0.1.0.0";
+       sha256 = "178hq0mdd2cnw2ysncyqva6nqbfwxd2ka5np53zyjjp8jga59lgj";
+       revision = "1";
+       editedCabalFile = "0j2klssj7d379i4vyp34p6n37wrc0ipl89az6k1aknh7n92c1ga2";
+       libraryHaskellDepends = [ base exceptions postgresql-simple ];
+       description = "Automatic re-connection support for PostgreSQL";
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "postgresql-schema" = callPackage
     ({ mkDerivation, base, basic-prelude, optparse-applicative
      , postgresql-simple, shelly, text, time
@@ -210551,14 +210943,14 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
-  "process_1_6_13_1" = callPackage
+  "process_1_6_13_2" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, directory, filepath
      , unix
      }:
      mkDerivation {
        pname = "process";
-       version = "1.6.13.1";
-       sha256 = "1fkaapar94w5prsvdpyybqb0j4hyjhf68czdlr5psb42i314lnj7";
+       version = "1.6.13.2";
+       sha256 = "01p3lqj23czqpmih4mdz1lknsy1c4z6ly3iyrnx4pxxmw9vnp2lw";
        libraryHaskellDepends = [ base deepseq directory filepath unix ];
        testHaskellDepends = [ base bytestring directory ];
        description = "Process libraries";
@@ -215096,8 +215488,8 @@ self: {
        pname = "quickcheck-instances";
        version = "0.3.25.2";
        sha256 = "0ihqbarl2ddrfgq3mq09lswwn8213qpw13g49qxs5mjkcm6gbk3h";
-       revision = "1";
-       editedCabalFile = "0pmsq83jzf7gxr59h8j85121n6n0iqbl3smccl9v7n3gkp70kr2q";
+       revision = "2";
+       editedCabalFile = "1lsa3pbg4ljlk29fhm3mdklnx3hwffyga1nr5krbpcyc3ywq8fq8";
        libraryHaskellDepends = [
          array base bytestring case-insensitive containers data-fix hashable
          integer-logarithms old-time QuickCheck scientific splitmix strict
@@ -229662,6 +230054,29 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "scheduler_2_0_0" = callPackage
+    ({ mkDerivation, atomic-primops, base, deepseq, doctest, exceptions
+     , genvalidity-hspec, hspec, hspec-discover, mwc-random, primitive
+     , pvar, QuickCheck, template-haskell, unliftio, unliftio-core
+     , vector
+     }:
+     mkDerivation {
+       pname = "scheduler";
+       version = "2.0.0";
+       sha256 = "1i0fz2gj2q12gfl1h8ar0ikkqksznr1rij7fsx1v0qi6qg9d7cc3";
+       libraryHaskellDepends = [
+         atomic-primops base deepseq exceptions primitive pvar unliftio-core
+       ];
+       testHaskellDepends = [
+         base deepseq doctest genvalidity-hspec hspec mwc-random QuickCheck
+         template-haskell unliftio vector
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Work stealing scheduler";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "schedyield" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -231906,6 +232321,8 @@ self: {
        pname = "semialign";
        version = "1.2";
        sha256 = "04dcyj69g7bm1sydxk89vin9mh2pmm0pqf0cm9v981i98xp6xxdj";
+       revision = "1";
+       editedCabalFile = "0s5s5k0xngb3wgnzyiwsqqnpy8c6nma4rn9146zk17shzsjy7ryk";
        libraryHaskellDepends = [
          base containers hashable indexed-traversable
          indexed-traversable-instances semigroupoids tagged these
@@ -232033,6 +232450,8 @@ self: {
        pname = "semigroupoids";
        version = "5.3.5";
        sha256 = "1c66sc9w9724xhlly9wfjhghmnnw99z9al69264i2izk7vhihbsm";
+       revision = "1";
+       editedCabalFile = "13ssan43xr6yk465axy35m87jrxy3rmrsbzxah055jmsldjp5bg9";
        libraryHaskellDepends = [
          base base-orphans bifunctors comonad containers contravariant
          distributive hashable tagged template-haskell transformers
@@ -232070,6 +232489,8 @@ self: {
        pname = "semigroups";
        version = "0.19.1";
        sha256 = "0j36cha1wb9vxnd8axfna92b2q5hnrn3ap8d8yin89c69gk63rvr";
+       revision = "1";
+       editedCabalFile = "10hp5ij4zivkgh1paxiwnwclgwf5xv3zrkfyvqkpgdf2l2mpm0nd";
        libraryHaskellDepends = [ base ];
        description = "Anything that associates";
        license = lib.licenses.bsd3;
@@ -241268,6 +241689,21 @@ self: {
        broken = true;
      }) {};
 
+  "slugger" = callPackage
+    ({ mkDerivation, base, hspec, text, text-icu }:
+     mkDerivation {
+       pname = "slugger";
+       version = "0.1.0.1";
+       sha256 = "1d1cx9c3qv8yd7q72q2vjp16mcsim4aw47dxv880q6xi5nmddcka";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base text text-icu ];
+       executableHaskellDepends = [ base text text-icu ];
+       testHaskellDepends = [ base hspec text text-icu ];
+       description = "Clean URI slugs for Haskell";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "slugify" = callPackage
     ({ mkDerivation, base, hspec, hspec-discover, QuickCheck, text
      , unicode-transforms
@@ -250809,6 +251245,8 @@ self: {
        pname = "strict";
        version = "0.4.0.1";
        sha256 = "0hb24a09c3agsq7sdv8r2b2jc2f4g1blg2xvj4cfadynib0apxnz";
+       revision = "1";
+       editedCabalFile = "04js9aj6h49gr8plrgqm7jall0baw5wjkvqjxbpmi8ji0xspw62h";
        libraryHaskellDepends = [
          assoc base binary bytestring deepseq ghc-prim hashable text these
          transformers
@@ -259113,7 +259551,7 @@ self: {
        license = lib.licenses.asl20;
        hydraPlatforms = lib.platforms.none;
        broken = true;
-     }) {libtensorflow = null;};
+     }) {inherit (pkgs) libtensorflow;};
 
   "tensorflow-core-ops" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, directory, filepath
@@ -262351,8 +262789,8 @@ self: {
        pname = "these";
        version = "1.1.1.1";
        sha256 = "027m1gd7i6jf2ppfkld9qrv3xnxg276587pmx10z9phpdvswk66p";
-       revision = "1";
-       editedCabalFile = "1bzi28jvaxil9rc6z1hkf87pfjsa3r5gfc9n0ixffnnv519cd0g9";
+       revision = "2";
+       editedCabalFile = "16x3am622jn97j1d9879x7j5zbjn33bkfaa0dq0xyp1fbc0s7h5x";
        libraryHaskellDepends = [ assoc base binary deepseq hashable ];
        description = "An either-or-both data type";
        license = lib.licenses.bsd3;
@@ -266586,6 +267024,8 @@ self: {
        pname = "transformers-base";
        version = "0.4.5.2";
        sha256 = "1s256bi0yh0x2hp2gwd30f3mg1cv53zz397dv1yhfsnfzmihrj6h";
+       revision = "1";
+       editedCabalFile = "18j122ypx12rbl9bbf622fvj8nif4rsci8z4qw2llmznbvfl09s0";
        libraryHaskellDepends = [
          base base-orphans stm transformers transformers-compat
        ];
@@ -267799,6 +268239,22 @@ self: {
        broken = true;
      }) {};
 
+  "trimdent" = callPackage
+    ({ mkDerivation, base, doctest, hspec
+     , hspec-expectations-pretty-diff, raw-strings-qq
+     }:
+     mkDerivation {
+       pname = "trimdent";
+       version = "0.1.0.0";
+       sha256 = "1jvhfmkha9a0g2ikxqdbwv0mvafysva2hym1z7ws2sfirfx483dp";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base doctest hspec hspec-expectations-pretty-diff raw-strings-qq
+       ];
+       description = "A utility for neat multiline string trimming";
+       license = lib.licenses.agpl3Only;
+     }) {};
+
   "trimpolya" = callPackage
     ({ mkDerivation, base, bio, bytestring, simpleargs }:
      mkDerivation {
@@ -273042,8 +273498,8 @@ self: {
        pname = "unix";
        version = "2.7.2.2";
        sha256 = "1b6ygkasn5bvmdci8g3zjkahl34kfqhf5jrayibvnrcdnaqlxpcq";
-       revision = "6";
-       editedCabalFile = "1wjy6cr4ls9gaisbq97knkw4rzk7aavcwvl4szx1vs7dbrfzrf6x";
+       revision = "7";
+       editedCabalFile = "1hkmb19m2mm8h2v69awip25i7cpg0967yih89q5npqsxknix4hkw";
        libraryHaskellDepends = [ base bytestring time ];
        description = "POSIX functionality";
        license = lib.licenses.bsd3;
@@ -279213,6 +279669,7 @@ self: {
        ];
        description = "A logging middleware for WAI applications";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "wai-logger" = callPackage
@@ -289118,8 +289575,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-lti13";
-       version = "0.2.0.1";
-       sha256 = "1ylwg85q6j04rmq0lclyiv7by3dgwmpya5hv1dqhaw62nlfh05r6";
+       version = "0.2.0.2";
+       sha256 = "19x8a3jfwrsrizg8lj8wrc9k2b0p4lga3q5fqqa60jjsr6lm73j3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix
index 44da759409e..1874e3d8255 100644
--- a/pkgs/development/libraries/sqlcipher/default.nix
+++ b/pkgs/development/libraries/sqlcipher/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, openssl, tcl, installShellFiles, readline ? null, ncurses ? null }:
+{ stdenv, lib, fetchFromGitHub, openssl, tcl, installShellFiles, buildPackages, readline ? null, ncurses ? null }:
 
 assert readline != null -> ncurses != null;
 
@@ -13,14 +13,15 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-E23PTNnVZbBQtHL0YjUwHNVUA76XS8rlARBOVvX6zZw=";
   };
 
-  nativeBuildInputs = [ installShellFiles ];
-
-  buildInputs = [ readline ncurses openssl tcl ];
+  nativeBuildInputs = [ installShellFiles tcl ];
+  buildInputs = [ readline ncurses openssl ];
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
 
   configureFlags = [ "--enable-threadsafe" "--disable-tcl" ];
 
   CFLAGS = [ "-DSQLITE_ENABLE_COLUMN_METADATA=1" "-DSQLITE_SECURE_DELETE=1" "-DSQLITE_ENABLE_UNLOCK_NOTIFY=1" "-DSQLITE_HAS_CODEC" ];
   LDFLAGS = lib.optional (readline != null) "-lncurses";
+  BUILD_CC = "$(CC_FOR_BUILD)";
 
   doCheck = false; # fails. requires tcl?
 
diff --git a/pkgs/development/python-modules/forecast-solar/default.nix b/pkgs/development/python-modules/forecast-solar/default.nix
index 91b9ce3da00..71c517c52b8 100644
--- a/pkgs/development/python-modules/forecast-solar/default.nix
+++ b/pkgs/development/python-modules/forecast-solar/default.nix
@@ -1,24 +1,28 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, pythonOlder
 , aiodns
 , aiohttp
+, backports-zoneinfo
 }:
 
 buildPythonPackage rec {
   pname = "forecast-solar";
-  version = "1.3.1";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "forecast_solar";
     rev = version;
-    sha256 = "1kqzr1ypvdjw0zvac4spb6xdd2qpms9h8nr6vf0w9qx756ir0f95";
+    sha256 = "12d9bb3q7gp0yy152x0rcbi727wrg3w9458asp2nhnqlb8nm6j4d";
   };
 
   propagatedBuildInputs = [
     aiodns
     aiohttp
+  ] ++ lib.optionals (pythonOlder "3.9") [
+    backports-zoneinfo
   ];
 
   # no unit tests implemented
diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix
index ad157fbda4c..97396595608 100644
--- a/pkgs/development/python-modules/fritzconnection/default.nix
+++ b/pkgs/development/python-modules/fritzconnection/default.nix
@@ -2,14 +2,14 @@
 
 buildPythonPackage rec {
   pname = "fritzconnection";
-  version = "1.5.0";
+  version = "1.6.0";
 
   # no tests on PyPI
   src = fetchFromGitHub {
     owner = "kbr";
     repo = pname;
     rev = version;
-    sha256 = "sha256-Iw7R+39rpoCTrRD74kBihF7AMcJWxy2xdPhKLznWdlo=";
+    sha256 = "16sbv6ql6jd13lim88z8vl5205xppza10340bmq5m5f3lvzb7mpc";
   };
 
   disabled = pythonOlder "3.6";
diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix
index 0f1240549af..2239b5824e1 100644
--- a/pkgs/development/python-modules/regenmaschine/default.nix
+++ b/pkgs/development/python-modules/regenmaschine/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "regenmaschine";
-  version = "3.1.4";
+  version = "3.1.5";
   format = "pyproject";
   disabled = pythonOlder "3.6";
 
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "bachya";
     repo = pname;
     rev = version;
-    sha256 = "07ldbajm1y92szdc36z5cl02dpvbarsb8clq9m45849gm8g7yczd";
+    sha256 = "0jm4x66kk7aa19hablkij43vsnsyy85a638zjfjsqghwqppwklgw";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 6c2595386e0..9f0f566494d 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,13 +1,13 @@
 { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.276";
+  version = "4.4.277";
   extraMeta.branch = "4.4";
   extraMeta.broken = stdenv.isAarch64;
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1hf9h5kr1ws2lvinzq6cv7aps8af1kx4q8j4bsk2vv4i2zvmfr7y";
+    sha256 = "1m5zkssh523f15fvy80rcvfwqzdkldz3jhny6vbaj8q0zvk3w5r5";
   };
 
   kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ];
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 0dc5cfeae6e..5d3a556da3d 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,13 +1,13 @@
 { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.276";
+  version = "4.9.277";
   extraMeta.branch = "4.9";
   extraMeta.broken = stdenv.isAarch64;
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "16jp05jhmqcp8lawqga69gxn1acdkxsskn3a6wf0635863fky3hv";
+    sha256 = "1pkjcz9llc7hkmzfyjcx20b5njnqbkwlzyy1ncc8na71nn6rvsg6";
   };
 
   kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ];
diff --git a/pkgs/os-specific/linux/kernel/linux-5.13.nix b/pkgs/os-specific/linux/kernel/linux-5.13.nix
index bece15821a8..2f2dc1516b2 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.13.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.13.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "5.13.6";
+  version = "5.13.7";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,7 +13,7 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0xjjl8dmilp425b1cp977v26qxlg1147gh54kni949pzxwh1fb56";
+    sha256 = "0fg41dv62vsnv2hywym15zz0n08rhdzwqvcarspm9r5gac85c7pr";
   };
 
   kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ];
diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix
index f02c1ad1250..854218f74d8 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -1,8 +1,8 @@
 { stdenv, lib, fetchsvn, linux
 , scripts ? fetchsvn {
     url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
-    rev = "18191";
-    sha256 = "0ggaccg7z540kh5if48v6sjy39xllzvznqx5srvrlycrs2r89iyr";
+    rev = "18210";
+    sha256 = "1vp3d44ha68hhhk13g86j9lk0isfwqfkk1rbm0gihzjjzvpkxbab";
   }
 , ...
 }:
diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix
index 00f7b510346..44be5b97e67 100644
--- a/pkgs/servers/monitoring/icinga2/default.nix
+++ b/pkgs/servers/monitoring/icinga2/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "icinga2${nameSuffix}";
-  version = "2.12.5";
+  version = "2.13.0";
 
   src = fetchFromGitHub {
     owner = "icinga";
     repo = "icinga2";
     rev = "v${version}";
-    sha256 = "sha256-sEmxKX+q7hPXQWEqbywgsEG5/bSE5AkNKurL3UGQFLA=";
+    sha256 = "sha256-ibZruP9/8D3DJSTFkIi84ADPGjwWeyTCHv/tTEcy6ns=";
   };
 
   patches = [
diff --git a/pkgs/tools/package-management/apk-tools/default.nix b/pkgs/tools/package-management/apk-tools/default.nix
index b39c74dd57c..8d8645de2de 100644
--- a/pkgs/tools/package-management/apk-tools/default.nix
+++ b/pkgs/tools/package-management/apk-tools/default.nix
@@ -4,14 +4,14 @@
 
 stdenv.mkDerivation rec {
   pname = "apk-tools";
-  version = "2.12.6";
+  version = "2.12.7";
 
   src = fetchFromGitLab {
     domain = "gitlab.alpinelinux.org";
     owner = "alpine";
     repo = "apk-tools";
     rev = "v${version}";
-    sha256 = "0ki306k2ilwwg8ia302i62qa00f31g9g5q56xfbanyl7b620wd1f";
+    sha256 = "sha256-sGAsC5HZV5jaaUXgaPDUf4+vDL4zSGldzhykpdZlFS4=";
   };
 
   nativeBuildInputs = [ pkg-config scdoc ]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d4f0c1d8f2c..4577fbc3131 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2632,7 +2632,9 @@ in
 
   element = callPackage ../applications/science/chemistry/element { };
 
-  element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { };
+  element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix {
+    inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices;
+  };
 
   element-web = callPackage ../applications/networking/instant-messengers/element/element-web.nix {
     conf = config.element-web.conf or {};