Merge master into staging-next

2021-08-16 18:01:13 +00:00
parent c30d1d56fe 6e01aa7ca6
commit cb937d70cd
133 changed files with 2783 additions and 1979 deletions
@@ -4755,6 +4755,12 @@
    githubId = 40566146;
    name = "Jonas Braun";
  };
+  j-hui = {
+    email = "j-hui@cs.columbia.edu";
+    github = "j-hui";
+    githubId = 11800204;
+    name = "John Hui";
+  };
  j-keck = {
    email = "jhyphenkeck@gmail.com";
    github = "j-keck";
@@ -8768,6 +8774,12 @@
    githubId = 5636;
    name = "Steve Purcell";
  };
+  putchar = {
+    email = "slim.cadoux@gmail.com";
+    github = "putchar";
+    githubId = 8208767;
+    name = "Slim Cadoux";
+  };
  puzzlewolf = {
    email = "nixos@nora.pink";
    github = "puzzlewolf";
@@ -668,11 +668,6 @@
          to use wildcards in the <literal>source</literal> argument.
        </para>
      </listitem>
-    </itemizedlist>
-    <para>
-      &lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
-    </para>
-    <itemizedlist>
      <listitem>
        <para>
          The <literal>openrazer</literal> and
@@ -715,6 +710,13 @@
          release is also still available.
        </para>
      </listitem>
+      <listitem>
+        <para>
+          The <literal>kubernetes</literal> package was upgraded to
+          1.22. The <literal>kubernetes.apiserver.kubeletHttps</literal>
+          option was removed and HTTPS is always used.
+        </para>
+      </listitem>
    </itemizedlist>
  </section>
  <section xml:id="sec-release-21.11-notable-changes">
@@ -171,7 +171,6 @@ pt-services.clipcat.enable).

 - `programs.neovim.runtime` switched to a `linkFarm` internally, making it impossible to use wildcards in the `source` argument.

-<<<<<<< HEAD
 - The `openrazer` and `openrazer-daemon` packages as well as the `hardware.openrazer` module now require users to be members of the `openrazer` group instead of `plugdev`. With this change, users no longer need be granted the entire set of `plugdev` group permissions, which can include permissions other than those required by `openrazer`. This is desirable from a security point of view. The setting [`harware.openrazer.users`](options.html#opt-services.hardware.openrazer.users) can be used to add users to the `openrazer` group.

 - The `yambar` package has been split into `yambar` and `yambar-wayland`, corresponding to the xorg and wayland backend respectively. Please switch to `yambar-wayland` if you are on wayland.
@@ -182,6 +181,8 @@ To be able to access the web UI this port needs to be opened in the firewall.

 - The `varnish` package was upgraded from 6.3.x to 6.5.x. `varnish60` for the last LTS release is also still available.

+- The `kubernetes` package was upgraded to 1.22.  The `kubernetes.apiserver.kubeletHttps` option was removed and HTTPS is always used.
+
 ## Other Notable Changes {#sec-release-21.11-notable-changes}

 - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets.
@@ -1029,10 +1029,11 @@ if __name__ == "__main__":

    args = arg_parser.parse_args()
    global test_script
+    testscript = pathlib.Path(args.testscript).read_text()

    def test_script() -> None:
        with log.nested("running the VM test script"):
-            exec(pathlib.Path(args.testscript).read_text(), globals())
+            exec(testscript, globals())

    log = Logger()

@@ -1061,7 +1062,8 @@ if __name__ == "__main__":
                process.terminate()
        log.close()

+    interactive = args.interactive or (not bool(testscript))
    tic = time.time()
-    run_tests(args.interactive)
+    run_tests(interactive)
    toc = time.time()
    print("test script finished in {:.2f}s".format(toc - tic))
@@ -186,6 +186,14 @@ rec {
          --set startScripts "''${vmStartScripts[*]}" \
          --set testScript "$out/test-script" \
          --set vlans '${toString vlans}'
+
+        ${lib.optionalString (testScript == "") ''
+          ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms
+          wrapProgram $out/bin/nixos-run-vms \
+            --set startScripts "''${vmStartScripts[*]}" \
+            --set testScript "${pkgs.writeText "start-all" "start_all(); join_all();"}" \
+            --set vlans '${toString vlans}'
+        ''}
      '');

  # Make a full-blown test
@@ -190,12 +190,6 @@ in
      type = nullOr path;
    };

-    kubeletHttps = mkOption {
-      description = "Whether to use https for connections to kubelet.";
-      default = true;
-      type = bool;
-    };
-
    preferredAddressTypes = mkOption {
      description = "List of the preferred NodeAddressTypes to use for kubelet connections.";
      type = nullOr str;
@@ -365,7 +359,6 @@ in
                "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \
              ${optionalString (cfg.basicAuthFile != null)
                "--basic-auth-file=${cfg.basicAuthFile}"} \
-              --kubelet-https=${boolToString cfg.kubeletHttps} \
              ${optionalString (cfg.kubeletClientCaFile != null)
                "--kubelet-certificate-authority=${cfg.kubeletClientCaFile}"} \
              ${optionalString (cfg.kubeletClientCertFile != null)
@@ -58,7 +58,7 @@ in
    services.kubernetes.addonManager.bootstrapAddons = mkIf ((storageBackend == "kubernetes") && (elem "RBAC" top.apiserver.authorizationMode)) {

      flannel-cr = {
-        apiVersion = "rbac.authorization.k8s.io/v1beta1";
+        apiVersion = "rbac.authorization.k8s.io/v1";
        kind = "ClusterRole";
        metadata = { name = "flannel"; };
        rules = [{
@@ -79,7 +79,7 @@ in
      };

      flannel-crb = {
-        apiVersion = "rbac.authorization.k8s.io/v1beta1";
+        apiVersion = "rbac.authorization.k8s.io/v1";
        kind = "ClusterRoleBinding";
        metadata = { name = "flannel"; };
        roleRef = {
@@ -2,11 +2,11 @@

 python3Packages.buildPythonApplication rec {
  pname = "Mopidy-Iris";
-  version = "3.54.0";
+  version = "3.58.0";

  src = python3Packages.fetchPypi {
    inherit pname version;
-    sha256 = "0qnshn77dv7fl6smwnpnbq67mbc1vic9gf85skiqnqy8v8w5829f";
+    sha256 = "1bsmc4p7b6v4mm8fi9zsy0knzdccnz1dc6ckrdr18kw2ji0hiyx2";
  };

  propagatedBuildInputs = [
@@ -2,11 +2,11 @@

 pythonPackages.buildPythonApplication rec {
  pname = "mopidy-spotify";
-  version = "4.0.1";
+  version = "4.1.1";

  src = fetchurl {
    url = "https://github.com/mopidy/mopidy-spotify/archive/v${version}.tar.gz";
-    sha256 = "1ac8r8050i5r3ag1hlblbcyskqjqz7wgamndbzsmw52qi6hxk44f";
+    sha256 = "0054gqvnx3brpfxr06dcby0z0dirwv9ydi6gj5iz0cxn0fbi6gv2";
  };

  propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ];
@@ -2,18 +2,18 @@
 , fetchurl, libsecret, gtk3, gsettings-desktop-schemas }:

 let
-  version = "3.5.18";
+  version = "3.8.18";
  pname = "standardnotes";
  name = "${pname}-${version}";

  plat = {
-    i386-linux = "-i386";
+    i386-linux = "i386";
    x86_64-linux = "x86_64";
  }.${stdenv.hostPlatform.system};

  sha256 = {
-    i386-linux = "009fnnd7ysxkyykkbmhvr0vn13b21j1j5mzwdvqdkhm9v3c9rbgj";
-    x86_64-linux = "1zrnvvr9x0s2gp948iajsmgn38xm6x0g2dgxrfjis39rpplsrdww";
+    i386-linux = "1xiypsmvpk8i6kab862pipbdfb0y5d5355hdwjmva7v7g26aa7h7";
+    x86_64-linux = "03qlxlgyypnvcr40jh6i4wriyax2jbfhrb798cq0n7qlc1y4pg8r";
  }.${stdenv.hostPlatform.system};

  src = fetchurl {
@@ -1,4 +1,11 @@
-{ mkDerivation, lib, fetchFromGitHub, qmake, qtbase }:
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, qmake
+, qtbase
+, qtimageformats
+, qtsvg
+}:

 mkDerivation rec {
  pname = "qview";
@@ -15,6 +22,8 @@ mkDerivation rec {

  buildInputs = [
    qtbase
+    qtimageformats
+    qtsvg
  ];

  patchPhase = ''
@@ -24,7 +33,7 @@ mkDerivation rec {
  meta = with lib; {
    description = "Practical and minimal image viewer";
    homepage = "https://interversehq.com/qview/";
-    license = licenses.gpl3;
+    license = licenses.gpl3Plus;
    maintainers = with maintainers; [ acowley ];
    platforms = platforms.all;
  };
@@ -5,16 +5,16 @@

 buildGoModule rec {
  pname = "dasel";
-  version = "1.18.0";
+  version = "1.19.0";

  src = fetchFromGitHub {
    owner = "TomWright";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-wp5GrOchNvGfQN9trcaq2hnhIHQ+W7zolvCzhCRDSqw=";
+    sha256 = "sha256-hV8+j66Z8cs6K1TElM+3ar2C8tSqJJBvBYoU+OWcqcU=";
  };

-  vendorSha256 = "sha256-BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY=";
+  vendorSha256 = "sha256-fRG70f2SZr8BOmF+MNLEdJmK1308h+HY4N0kkTpvuPc=";

  ldflags = [
    "-s" "-w" "-X github.com/tomwright/dasel/internal.Version=${version}"
@@ -30,11 +30,11 @@ let

 in stdenv.mkDerivation rec {
  pname = "obsidian";
-  version = "0.12.3";
+  version = "0.12.12";

  src = fetchurl {
    url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz";
-    sha256 = "sha256-nwtQp7BkMZwMzfnA5wdcMAhfezM//Lm9cf0pbvnOVZE=";
+    sha256 = "sha256-zvWJvMmb0TlFYXrT2QUgMG6uleT42+y+F4bSZQ2ftnE=";
  };

  nativeBuildInputs = [ makeWrapper graphicsmagick ];
@@ -0,0 +1,21 @@
+{ fetchFromGitHub, lib, xmrig }:
+
+xmrig.overrideAttrs (oldAttrs: rec {
+  pname = "xmrig-mo";
+  version = "6.14.1-mo1";
+
+  src = fetchFromGitHub {
+    owner = "MoneroOcean";
+    repo = "xmrig";
+    rev = "v${version}";
+    sha256 = "sha256-1YG0llNv1VR8ocNFxYLZFXMzowNNqpqSyIu7iCr/rfM=";
+  };
+
+  meta = with lib; {
+    description = "A fork of the XMRig CPU miner with support for algorithm switching";
+    homepage = "https://github.com/MoneroOcean/xmrig";
+    license = licenses.gpl3Plus;
+    platforms = [ "x86_64-linux" "x86_64-darwin" ];
+    maintainers = with maintainers; [ j0hax ];
+  };
+})
@@ -4,14 +4,14 @@ with pythonPackages;

 buildPythonApplication rec {
  pname = "rss2email";
-  version = "3.13";
+  version = "3.13.1";

  propagatedBuildInputs = [ feedparser html2text ];
  checkInputs = [ beautifulsoup4 ];

  src = fetchurl {
    url = "mirror://pypi/r/rss2email/${pname}-${version}.tar.gz";
-    sha256 = "09vp2y0ibv20y9yysniv6njzigif4h74pkj31l2a8xw5g19gclna";
+    sha256 = "3994444766874bb35c9f886da76f3b24be1cb7bbaf40fad12b16f2af80ac1296";
  };

  outputs = [ "out" "man" "doc" ];
@@ -0,0 +1,53 @@
+{ lib
+, fetchFromGitHub
+, buildGoPackage
+, btrfs-progs
+, go-md2man
+, installShellFiles
+, util-linux
+, nixosTests
+}:
+
+buildGoPackage rec {
+  pname = "containerd";
+  version = "1.4.9";
+
+  src = fetchFromGitHub {
+    owner = "containerd";
+    repo = "containerd";
+    rev = "v${version}";
+    sha256 = "1ykikks6ihgg899ibk9m9m0hqrbss0cx7l7z4yjb873b10bacj52";
+  };
+
+  goPackagePath = "github.com/containerd/containerd";
+  outputs = [ "out" "man" ];
+
+  nativeBuildInputs = [ go-md2man installShellFiles util-linux ];
+
+  buildInputs = [ btrfs-progs ];
+
+  buildFlags = [ "VERSION=v${version}" "REVISION=${src.rev}" ];
+
+  buildPhase = ''
+    cd go/src/${goPackagePath}
+    patchShebangs .
+    make binaries man $buildFlags
+  '';
+
+  installPhase = ''
+    install -Dm555 bin/* -t $out/bin
+    installManPage man/*.[1-9]
+    installShellCompletion --bash contrib/autocomplete/ctr
+    installShellCompletion --zsh --name _ctr contrib/autocomplete/zsh_autocomplete
+  '';
+
+  passthru.tests = { inherit (nixosTests) docker; };
+
+  meta = with lib; {
+    homepage = "https://containerd.io/";
+    description = "A daemon to control runC";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ ];
+    platforms = platforms.linux;
+  };
+}
@@ -12,7 +12,7 @@ rec {
      # package dependencies
      , stdenv, fetchFromGitHub, buildGoPackage
      , makeWrapper, installShellFiles, pkg-config, glibc
-      , go-md2man, go, containerd, runc, docker-proxy, tini, libtool
+      , go-md2man, go, containerd_1_4, runc, docker-proxy, tini, libtool
      , sqlite, iproute2, lvm2, systemd, docker-buildx
      , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git
      , procps, libseccomp
@@ -33,7 +33,7 @@ rec {
      patches = [];
    });

-    docker-containerd = containerd.overrideAttrs (oldAttrs: {
+    docker-containerd = containerd_1_4.overrideAttrs (oldAttrs: {
      name = "docker-containerd-${version}";
      inherit version;
      src = fetchFromGitHub {
@@ -210,7 +210,7 @@ rec {
      homepage = "https://www.docker.com/";
      description = "An open source project to pack, ship and run any application as a lightweight container";
      license = licenses.asl20;
-      maintainers = with maintainers; [ offline tailhook vdemeester periklis mikroskeem ];
+      maintainers = with maintainers; [ offline tailhook vdemeester periklis mikroskeem maxeaubrey ];
      platforms = with platforms; linux ++ darwin;
    };

@@ -221,20 +221,20 @@ rec {
  # Get revisions from
  # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/*
  docker_20_10 = callPackage dockerGen rec {
-    version = "20.10.7";
+    version = "20.10.8";
    rev = "v${version}";
-    sha256 = "1r854jrjph4v1n5lr82z0cl0241ycili4qr3qh3k3bmqx790cds3";
+    sha256 = "sha256-betZIAH4mFpb/OywWyixCjVmy5EGTrg+WbxDXkVRrsI=";
    moby-src = fetchFromGitHub {
      owner = "moby";
      repo = "moby";
      rev = "v${version}";
-      sha256 = "0xhn11kgcbzda4z9j0rflvq0nfivizh3jrzhanwn5vnghafy4zqw";
+      sha256 = "1pjjdwzad2z337zwby88w5zwl71ch4lcwbw0sy8slvyjv387jjlm";
    };
-    runcRev = "b9ee9c6314599f1b4a7f497e1f1f856fe433d3b7"; # v1.0.0-rc95
-    runcSha256 = "18sbvmlvb6kird4w3rqsfrjdj7n25firabvdxsl0rxjfy9r1g2xb";
-    containerdRev = "12dca9790f4cb6b18a6a7a027ce420145cb98ee7"; # v1.5.1
-    containerdSha256 = "16q34yiv5q98b9d5vgy1lmmppg8agrmnfd1kzpakkf4czkws0p4d";
-    tiniRev = "de40ad007797e0dcd8b7126f27bb87401d224240"; # v0.19.0
+    runcRev = "v1.0.1"; # v1.0.1
+    runcSha256 = "1zfa1zr8i9n1915nyv7hyaj7q27cy7fiihk9rr1377ayaqg3mpn5";
+    containerdRev = "v1.4.9"; # v1.4.9
+    containerdSha256 = "1ykikks6ihgg899ibk9m9m0hqrbss0cx7l7z4yjb873b10bacj52";
+    tiniRev = "v0.19.0"; # v0.19.0
    tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn";
  };
 }
@@ -1,6 +1,6 @@
 {
-  "commit": "8977803787241e1474bdbb35cbc704c57cce6fcd",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/8977803787241e1474bdbb35cbc704c57cce6fcd.tar.gz",
-  "sha256": "1ivdqlmpdqpa5m5cdwdk6l258nmnz9a6466y8xs19x0wkdx4b738",
-  "msg": "Update from Hackage at 2021-08-07T10:52:35Z"
+  "commit": "dfb0b040033334d2e676906786c7a90805310e7d",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/dfb0b040033334d2e676906786c7a90805310e7d.tar.gz",
+  "sha256": "0x53gkkpxlcm6qa38yksx8cws9phl2zxvdys5imjpg8dl1sal3pg",
+  "msg": "Update from Hackage at 2021-08-10T19:15:27Z"
 }
@@ -21,7 +21,7 @@

 stdenv.mkDerivation rec {
  pname = "xapps";
-  version = "2.0.6";
+  version = "2.2.3";

  outputs = [ "out" "dev" ];

@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
    owner = "linuxmint";
    repo = pname;
    rev = version;
-    sha256 = "11qbz547qlfsvkz4bdxhryrsf10aw5jc2f1glbik7pvmmm87gf4f";
+    sha256 = "sha256-hrSyoHA3XQXQb9N3YJ+NNfBjJNOuUhXhKEimh/n73MM=";
  };

  # TODO: https://github.com/NixOS/nixpkgs/issues/36468
@@ -25,13 +25,13 @@

 stdenv.mkDerivation rec {
  pname = "xviewer";
-  version = "2.8.3";
+  version = "3.0.2";

  src = fetchFromGitHub {
    owner = "linuxmint";
    repo = pname;
    rev = version;
-    sha256 = "0h3qgqaiz5swy09fr6z3ag2952hgzsk5d2fpwmwb78yjrzrhnzpy";
+    sha256 = "sha256-hvoTb9afyVdcm5suB1ZxkxUyNFSVRFjYuNVc0jE3RF0=";
  };

  nativeBuildInputs = [
@@ -311,6 +311,7 @@ stdenv.mkDerivation (rec {
    homepage = "http://haskell.org/ghc";
    description = "The Glasgow Haskell Compiler";
    maintainers = with lib.maintainers; [ marcweber andres peti ];
+    timeout = 24 * 3600;
    inherit (ghc.meta) license platforms;
    # ghcHEAD times out on aarch64-linux on Hydra.
    hydraPlatforms = builtins.filter (p: p != "aarch64-linux") ghc.meta.platforms;
@@ -1,12 +1,13 @@
 { lib, stdenv, fetchurl }:

 stdenv.mkDerivation rec {
-  name = "gprolog-1.5.0";
+  pname = "gprolog";
+  version = "1.5.0";

  src = fetchurl {
    urls = [
-      "mirror://gnu/gprolog/${name}.tar.gz"
-      "http://www.gprolog.org/${name}.tar.gz"
+      "mirror://gnu/gprolog/gprolog-${version}.tar.gz"
+      "http://www.gprolog.org/gprolog-${version}.tar.gz"
    ];
    sha256 = "sha256-ZwZCtDwPqifr1olh77F+vnB2iPkbaAlWbd1gYTlRLAE=";
  };
@@ -22,13 +23,13 @@ stdenv.mkDerivation rec {
    configureFlagsArray=(
      "--with-install-dir=$out"
      "--without-links-dir"
-      "--with-examples-dir=$out/share/${name}/examples"
-      "--with-doc-dir=$out/share/${name}/doc"
+      "--with-examples-dir=$out/share/gprolog-${version}/examples"
+      "--with-doc-dir=$out/share/gprolog-${version}/doc"
    )
  '';

  postInstall = ''
-    mv -v $out/[A-Z]* $out/gprolog.ico $out/share/${name}/
+    mv -v $out/[A-Z]* $out/gprolog.ico $out/share/gprolog-${version}/
  '';

  doCheck = true;
@@ -1458,6 +1458,10 @@ self: super: {
    addBuildDepend (unmarkBroken super.hercules-ci-cli) super.hercules-ci-optparse-applicative
  );

+  # Readline uses Distribution.Simple from Cabal 2, in a way that is not
+  # compatible with Cabal 3. No upstream repository found so far
+  readline =  appendPatch super.readline ./patches/readline-fix-for-cabal-3.patch;
+
  # 2020-12-05: http-client is fixed on too old version
  essence-of-live-coding-warp = doJailbreak (super.essence-of-live-coding-warp.override {
    http-client = self.http-client_0_7_8;
@@ -735,6 +735,7 @@ broken-packages:
  - compilation
  - complex-generic
  - compose-trans
+  - composite-dhall
  - composite-opaleye
  - composition-tree
  - comprehensions-ghc
@@ -2558,6 +2559,7 @@ broken-packages:
  - jenga
  - jenkinsPlugins2nix
  - jespresso
+  - jet-stream
  - jinquantities
  - jml-web-service
  - jni
@@ -3898,7 +3900,6 @@ broken-packages:
  - read-bounded
  - read-ctags
  - read-io
-  - readline
  - readme-lhs
  - readshp
  - really-simple-xml-parser
@@ -58,7 +58,6 @@ dont-distribute-packages:
 - CC-delcont-alt
 - CMCompare
 - CPBrainfuck
- - CPL
 - CSPM-Interpreter
 - CSPM-ToProlog
 - CSPM-cspm
@@ -371,8 +370,6 @@ dont-distribute-packages:
 - XSaiga
 - YACPong
 - Yablog
- - Yogurt
- - Yogurt-Standalone
 - Z-Botan
 - Z-IO
 - Z-MessagePack
@@ -1559,7 +1556,6 @@ dont-distribute-packages:
 - hoodle-publish
 - hoodle-render
 - hoovie
- - hoq
 - hp2any-graph
 - hp2any-manager
 - hpaco
@@ -1613,7 +1609,6 @@ dont-distribute-packages:
 - hset
 - hsfacter
 - hslogstash
- - hsnock
 - hspec-expectations-pretty
 - hspec-pg-transact
 - hspec-setup
@@ -1655,7 +1650,6 @@ dont-distribute-packages:
 - hunt-searchengine
 - hunt-server
 - hurdle
- - husky
 - huzzy
 - hw-all
 - hw-dsv
@@ -1973,6 +1967,8 @@ dont-distribute-packages:
 - llvm-tools
 - lmonad-yesod
 - lnd-client
+ - lnurl
+ - lnurl-authenticator
 - local-search
 - localize
 - locked-poll
@@ -2078,7 +2074,6 @@ dont-distribute-packages:
 - minecraft-data
 - minesweeper
 - mini-egison
- - miniforth
 - minilight-lua
 - minimung
 - minioperational
@@ -2087,7 +2082,6 @@ dont-distribute-packages:
 - missing-py2
 - mixed-strategies
 - mkbndl
- - mkcabal
 - mlist
 - mmark-cli
 - mmark-ext
@@ -2107,6 +2101,7 @@ dont-distribute-packages:
 - monetdb-mapi
 - mongrel2-handler
 - monky
+ - monomer
 - monte-carlo
 - moo
 - moo-nad
@@ -2385,6 +2380,7 @@ dont-distribute-packages:
 - postgresql-tx-query
 - postgresql-tx-squeal
 - postgresql-tx-squeal-compat-simple
+ - postgrest_8_0_0
 - postmark
 - potoki
 - potoki-cereal
@@ -2449,7 +2445,6 @@ dont-distribute-packages:
 - queryparser-hive
 - queryparser-presto
 - queryparser-vertica
- - questioner
 - queuelike
 - quickbench
 - quickcheck-combinators
@@ -2513,7 +2508,6 @@ dont-distribute-packages:
 - reactive-fieldtrip
 - reactive-glut
 - reactor
- - readline-statevar
 - readpyc
 - reanimate
 - record-aeson
@@ -2899,7 +2893,6 @@ dont-distribute-packages:
 - svg2q
 - svgone
 - swapper
- - swearjure
 - sweet-egison
 - switch
 - sylvia
@@ -3041,7 +3034,6 @@ dont-distribute-packages:
 - twidge
 - twilight-stm
 - twill
- - twitter
 - twitter-enumerator
 - type-assertions
 - type-cache
@@ -0,0 +1,8 @@
+--- a/Setup.hs	2021-02-04 14:01:09.557970245 +0100
+++ b/Setup.hs	2021-02-04 14:07:45.047443753 +0100
+@@ -3,4 +3,4 @@
+ import           Distribution.Simple
+ 
+ main :: IO ()
+-main = defaultMainWithHooks defaultUserHooks
+main = defaultMainWithHooks autoconfUserHooks
@@ -0,0 +1,12 @@
+diff --git a/Configure b/Configure
+index 494e0b3..0b448aa 100755
+--- a/Configure
+++ b/Configure
+@@ -652,6 +652,8 @@ my %table=(
+ "darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+ "debug-darwin64-x86_64-cc","cc:-arch x86_64 -ggdb -g2 -O0 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+ "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+"darwin64-arm64-cc","cc:-arch arm64 -O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch arm64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+"debug-darwin64-arm64-cc","cc:-arch arm64 -ggdb -g2 -O0 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch arm64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+ # iPhoneOS/iOS
+ "iphoneos-cross","llvm-gcc:-O3 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fomit-frame-pointer -fno-common::-D_REENTRANT:iOS:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
@@ -185,6 +185,8 @@ in {
      (if stdenv.hostPlatform.isDarwin
       then ./1.0.2/use-etc-ssl-certs-darwin.patch
       else ./1.0.2/use-etc-ssl-certs.patch)
+    ] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-darwin") [
+      ./1.0.2/darwin64-arm64.patch
    ];
    extraMeta.knownVulnerabilities = [ "Support for OpenSSL 1.0.2 ended with 2019." ];
  };
@@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "openxr-loader";
-  version = "1.0.14";
+  version = "1.0.18";

  src = fetchFromGitHub {
    owner = "KhronosGroup";
    repo = "OpenXR-SDK-Source";
    rev = "release-${version}";
-    sha256 = "sha256-ZmaxHm4MPd2q83PLduoavoynqRPEI79IpMfW32gkV14=";
+    sha256 = "sha256-Ek4gFL10/aRciCoJBNaaSX/Hdbap4X/K4k+KeAfpKDg=";
  };

  nativeBuildInputs = [ cmake python3 ];
@@ -8,7 +8,7 @@

 buildPythonPackage rec {
  pname = "aiomusiccast";
-  version = "0.8.2";
+  version = "0.9.1";

  format = "pyproject";

@@ -18,7 +18,7 @@ buildPythonPackage rec {
    owner = "vigonotion";
    repo = "aiomusiccast";
    rev = version;
-    sha256 = "sha256-XmDE704c9KJst8hrvdyQdS52Sd6RnprQZjBCIWAaiho=";
+    sha256 = "sha256-+BmymfRKwNPlksYcAUb/5cZYeOD5h85YhobmsNFJVE8=";
  };

  nativeBuildInputs = [
@@ -4,12 +4,12 @@
 }:

 buildPythonPackage rec {
-  version = "1.7.2";
+  version = "1.8.0";
  pname = "bids-validator";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "12398831a3a3a2ed7c67e693cf596610c23dd23e0889bfeae0830bbd1d41e5b9";
+    sha256 = "6d4ecc384121899e0cd5af773419c5ba722585cb176544560ec9a48f17dfd777";
  };

  # needs packages which are not available in nixpkgs
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pythonOlder
 , stdenv
 , packaging
@@ -10,12 +10,14 @@

 buildPythonPackage rec {
  pname = "desktop-notifier";
-  version = "3.3.0";
+  version = "3.3.1";
  disabled = pythonOlder "3.6";

-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-ROSZorkA2wAp2Ubh3B3KWIUxM/4r7cv/1aSJqeKnPqg=";
+  src = fetchFromGitHub {
+    owner = "SamSchott";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-GbsbwCKRTgLk0xK6MGKb1Tp6cd8q3h6OUdJ2f+VPyzk=";
  };

  propagatedBuildInputs = [
@@ -12,11 +12,11 @@

 buildPythonPackage rec {
  pname = "doc8";
-  version = "0.8.1";
+  version = "0.9.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "4d1df12598807cf08ffa9a1d5ef42d229ee0de42519da01b768ff27211082c12";
+    sha256 = "380b660474be40ce88b5f04fa93470449124dbc850a0318f2ef186162bc1360b";
  };

  buildInputs = [ pbr ];
@@ -11,12 +11,12 @@

 buildPythonPackage rec {
  pname = "flowlogs_reader";
-  version = "2.4.0";
+  version = "3.1.0";
  disabled = isPy27;

  src = fetchPypi {
    inherit pname version;
-    sha256 = "e47637b40a068a0c814ba2087fb691b43aa12e6174ab06b6cdb7109bb94624e4";
+    sha256 = "d99636423abc83bb4042d63edd56852ede9e2949cadcc3339eda8f3367826dd4";
  };

  propagatedBuildInputs = [ botocore boto3 docutils ];
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchPypi
+, sphinx
+, beautifulsoup4
+}:
+
+buildPythonPackage rec {
+  pname = "furo";
+  version = "2021.8.11b42";
+  format = "flit";
+  disable = pythonOlder "3.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-rhi2T57EfidQV1IHBkplCbzLlBCC5gVGmbkCf40s0qU=";
+  };
+
+  propagatedBuildInputs = [
+    sphinx
+    beautifulsoup4
+  ];
+
+  pythonImportsCheck = [ "furo" ];
+
+  meta = with lib; {
+    description = "A clean customizable documentation theme for Sphinx";
+    homepage = "https://github.com/pradyunsg/furo";
+    license = licenses.mit;
+    maintainers = with maintainers; [ Luflosi ];
+  };
+}
@@ -6,11 +6,11 @@

 buildPythonPackage rec {
  pname = "gipc";
-  version = "1.2.0";
+  version = "1.3.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "6045b22dfbd8aec5542fe15d71684e46df0a4de852ccae6a02c9db3a24076e01";
+    sha256 = "a25ccfd2f8c94b24d2113fa50a0de5c7a44499ca9f2ab7c91c3bec0ed96ddeb1";
  };

  propagatedBuildInputs = [ gevent ];
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , google-api-core
-, grpc_google_iam_v1
+, grpc-google-iam-v1
 , mock
 , proto-plus
 , pytest-asyncio
@@ -21,7 +21,7 @@ buildPythonPackage rec {

  propagatedBuildInputs = [
    google-api-core
-    grpc_google_iam_v1
+    grpc-google-iam-v1
    proto-plus
  ];

@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, grpc_google_iam_v1
+, grpc-google-iam-v1
 , google-api-core
 , google-cloud-access-context-manager
 , google-cloud-org-policy
@@ -30,7 +30,7 @@ buildPythonPackage rec {
  '';

  propagatedBuildInputs = [
-    grpc_google_iam_v1
+    grpc-google-iam-v1
    google-api-core
    google-cloud-access-context-manager
    google-cloud-org-policy
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , google-api-core
-, grpc_google_iam_v1
+, grpc-google-iam-v1
 , mock
 , proto-plus
 , pytest-asyncio
@@ -21,7 +21,7 @@ buildPythonPackage rec {

  propagatedBuildInputs = [
    google-api-core
-    grpc_google_iam_v1
+    grpc-google-iam-v1
    proto-plus
  ];

@@ -4,6 +4,7 @@
 , pytestCheckHook
 , freezegun
 , google-cloud-core
+, google-cloud-datacatalog
 , google-cloud-storage
 , google-cloud-testutils
 , google-resumable-media
@@ -38,6 +39,7 @@ buildPythonPackage rec {
    mock
    pandas
    psutil
+    google-cloud-datacatalog
    google-cloud-storage
    pytestCheckHook
  ];
@@ -53,6 +55,12 @@ buildPythonPackage rec {
    "TestBigQuery"
    # Mocking of _ensure_bqstorage_client fails
    "test_to_arrow_ensure_bqstorage_client_wo_bqstorage"
+    # requires network
+    "test_dbapi_create_view"
+    "test_list_rows_nullable_scalars_dtypes"
+    "test_parameterized_types_round_trip"
+    "test_structs"
+    "test_table_snapshots"
  ];

  pythonImportsCheck = [
@@ -3,7 +3,7 @@
 , fetchPypi
 , google-api-core
 , google-cloud-core
-, grpc_google_iam_v1
+, grpc-google-iam-v1
 , libcst
 , mock
 , proto-plus
@@ -22,7 +22,7 @@ buildPythonPackage rec {
  propagatedBuildInputs = [
    google-api-core
    google-cloud-core
-    grpc_google_iam_v1
+    grpc-google-iam-v1
    libcst
    proto-plus
  ];
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , google-api-core
-, grpc_google_iam_v1
+, grpc-google-iam-v1
 , libcst
 , mock
 , proto-plus
@@ -19,7 +19,7 @@ buildPythonPackage rec {
    sha256 = "sha256-nMUMGFU383TC7cXkj6EHaEe4HHS5NzcLBIxp1xgWUzg=";
  };

-  propagatedBuildInputs = [ google-api-core grpc_google_iam_v1 libcst proto-plus ];
+  propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ];

  checkInputs = [ mock pytestCheckHook pytest-asyncio ];

@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchPypi, libcst, google-api-core, grpc-google-iam-v1, proto-plus, pytest-asyncio, pytestCheckHook, mock }:
+
+buildPythonPackage rec {
+  pname = "google-cloud-datacatalog";
+  version = "3.4.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "2faca51e974c46203c09fd4cb2c03fd6e82cd572cc06a2bbc3b401aa419cb09f";
+  };
+
+  propagatedBuildInputs = [ libcst google-api-core grpc-google-iam-v1 proto-plus ];
+
+  checkInputs = [ pytest-asyncio pytestCheckHook mock ];
+
+  pythonImportsCheck = [ "google.cloud.datacatalog" ];
+
+  meta = with lib; {
+    description = "Google Cloud Data Catalog API API client library";
+    homepage = "https://github.com/googleapis/python-datacatalog";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , google-api-core
-, grpc_google_iam_v1
+, grpc-google-iam-v1
 , mock
 , proto-plus
 , pytest-asyncio
@@ -21,7 +21,7 @@ buildPythonPackage rec {

  propagatedBuildInputs = [
    google-api-core
-    grpc_google_iam_v1
+    grpc-google-iam-v1
    proto-plus
  ];

@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, grpc_google_iam_v1
+, grpc-google-iam-v1
 , google-api-core
 , libcst
 , proto-plus
@@ -19,7 +19,7 @@ buildPythonPackage rec {
    sha256 = "sha256-vMzq4ffA7877zRtdZ+VpFdEHU0BZhDdhgxuk5154hMU=";
  };

-  propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ];
+  propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ];

  checkInputs = [ mock pytestCheckHook pytest-asyncio ];

@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , pytestCheckHook
-, grpc_google_iam_v1
+, grpc-google-iam-v1
 , google-api-core
 , libcst
 , mock
@@ -19,7 +19,7 @@ buildPythonPackage rec {
    sha256 = "sha256-OuvpnIJeG+O+2Teopq8FYJOHIyi1V3RdlmJEq/fFSxM=";
  };

-  propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ];
+  propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ];

  checkInputs = [ mock pytestCheckHook pytest-asyncio ];

@@ -4,7 +4,7 @@
 , pytestCheckHook
 , google-api-core
 , google-cloud-testutils
-, grpc_google_iam_v1
+, grpc-google-iam-v1
 , libcst
 , mock
 , proto-plus
@@ -21,7 +21,7 @@ buildPythonPackage rec {
  };

  propagatedBuildInputs = [
-    grpc_google_iam_v1
+    grpc-google-iam-v1
    google-api-core
    libcst
    proto-plus
@@ -4,6 +4,8 @@
 , pytestCheckHook
 , google-cloud-core
 , google-api-core
+, grpc-google-iam-v1
+, proto-plus
 , mock
 }:

@@ -16,7 +18,7 @@ buildPythonPackage rec {
    sha256 = "sha256-5njC5yO7NTU81i9vmJoe1RBYPS1fU/3K5tgH7twyT+I=";
  };

-  propagatedBuildInputs = [ google-api-core google-cloud-core ];
+  propagatedBuildInputs = [ google-api-core google-cloud-core grpc-google-iam-v1 proto-plus ];

  checkInputs = [ mock pytestCheckHook ];

@@ -25,7 +27,10 @@ buildPythonPackage rec {
    rm -r google
  '';

-  pythonImportsCheck = [ "google.cloud.resource_manager" ];
+  pythonImportsCheck = [
+    "google.cloud.resourcemanager"
+    "google.cloud.resourcemanager_v3"
+  ];

  meta = with lib; {
    description = "Google Cloud Resource Manager API client library";
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , google-api-core
-, grpc_google_iam_v1
+, grpc-google-iam-v1
 , libcst
 , mock
 , proto-plus
@@ -21,7 +21,7 @@ buildPythonPackage rec {

  propagatedBuildInputs = [
    google-api-core
-    grpc_google_iam_v1
+    grpc-google-iam-v1
    libcst
    proto-plus
  ];
@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, grpc_google_iam_v1
+, grpc-google-iam-v1
 , google-api-core
 , libcst
 , mock
@@ -19,7 +19,7 @@ buildPythonPackage rec {
    sha256 = "sha256-DrdzC7Oe/8cq41OLcN51Qm208L0zPa9cxscHqmYji04=";
  };

-  propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ];
+  propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ];

  checkInputs = [ mock pytestCheckHook pytest-asyncio ];

@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, grpc_google_iam_v1
+, grpc-google-iam-v1
 , google-cloud-core
 , google-cloud-testutils
 , libcst
@@ -23,7 +23,7 @@ buildPythonPackage rec {

  propagatedBuildInputs = [
    google-cloud-core
-    grpc_google_iam_v1
+    grpc-google-iam-v1
    libcst
    proto-plus
    sqlparse
@@ -42,12 +42,18 @@ buildPythonPackage rec {
    "post"
    "test_build_api_url"
    "test_ctor_mtls"
+    "test_hmac_key_crud"
+    "test_list_buckets"
    "test_open"
+    "test_anonymous_client_access_to_public_bucket"
  ];

-  pytestFlagsArray = [
-    "--ignore=tests/unit/test_bucket.py"
-    "--ignore=tests/system/test_system.py"
+  disabledTestPaths = [
+    "tests/unit/test_bucket.py"
+    "tests/system/test_blob.py"
+    "tests/system/test_bucket.py"
+    "tests/system/test_fileio.py"
+    "tests/system/test_kms_integration.py"
  ];

  # prevent google directory from shadowing google imports
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , google-api-core
-, grpc_google_iam_v1
+, grpc-google-iam-v1
 , libcst
 , mock
 , proto-plus
@@ -19,7 +19,7 @@ buildPythonPackage rec {
    sha256 = "sha256-4QOKG7Forf3x5l1XQbbX4A8upIxe+eCiwhPily26du4=";
  };

-  propagatedBuildInputs = [ google-api-core grpc_google_iam_v1 libcst proto-plus ];
+  propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ];

  checkInputs = [ mock pytestCheckHook pytest-asyncio ];

@@ -10,14 +10,14 @@

 buildPythonPackage rec {
  pname = "googlemaps";
-  version = "4.4.5";
+  version = "4.5.3";
  disabled = pythonOlder "3.5";

  src = fetchFromGitHub {
    owner = "googlemaps";
    repo = "google-maps-services-python";
    rev = "v${version}";
-    sha256 = "sha256-Rdfp98UqTMbqcOpkzh0Dz8fNSSbuvCnCztCkxiBgaAA=";
+    sha256 = "1yfsfspvjngrb1lwaq04ahm94j9y2dwzdf4dsg3yl1c8w0vgf9yw";
  };

  propagatedBuildInputs = [ requests ];
@@ -3,7 +3,6 @@
 , fetchPypi
 , grpcio
 , googleapis-common-protos
-, pytest
 }:

 buildPythonPackage rec {
@@ -17,15 +16,18 @@ buildPythonPackage rec {

  propagatedBuildInputs = [ grpcio googleapis-common-protos ];

-  # non-standard test format, and python3 will load local google folder first
-  # but tests cannot be ran if google folder is removed or moved
+  # no tests run
  doCheck = false;
-  checkInputs = [ pytest ];
+
+  pythonImportsCheck = [
+    "google.iam"
+    "google.iam.v1"
+  ];

  meta = with lib; {
    description = "GRPC library for the google-iam-v1 service";
    homepage = "https://github.com/googleapis/googleapis";
    license = licenses.asl20;
-    maintainers = [ maintainers.costrouc ];
+    maintainers = with maintainers; [ SuperSandro2000 ];
  };
 }
@@ -14,12 +14,12 @@

 buildPythonPackage rec {
  pname = "locationsharinglib";
-  version = "4.1.6";
-  disabled = pythonOlder "3.6";
+  version = "4.1.8";
+  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "092j8z01nwjqh5zr7aj8mxl1zjd3j2irhrs39dhn47bd6db2a6ij";
+    sha256 = "sha256-69NzKSWpuU0Riwlj6cFC4h/shc/83e1mpq++zxDqftY=";
  };

  propagatedBuildInputs = [
@@ -39,6 +39,8 @@ buildPythonPackage rec {
    # Tests requirements want to pull in multiple modules which we don't need
    substituteInPlace setup.py \
      --replace "tests_require=test_requirements" "tests_require=[]"
+     substituteInPlace requirements.txt \
+       --replace "coloredlogs>=15.0.1" "coloredlogs"
  '';

  checkPhase = ''
@@ -11,14 +11,14 @@

 buildPythonPackage rec {
  pname = "pyezviz";
-  version = "0.1.8.9";
+  version = "0.1.9.1";
  disabled = pythonOlder "3.6";

  src = fetchFromGitHub {
    owner = "baqs";
    repo = "pyEzviz";
    rev = version;
-    sha256 = "sha256-ZjHDha7hSRXy86wm61bMMF8zMi5Lux6RbD0yFD/78J4=";
+    sha256 = "sha256-KsdJC09KugvAgkRZ5H5zrIJ5hC5Vt4QwGWML8kNnR7Y=";
  };

  propagatedBuildInputs = [
@@ -11,13 +11,13 @@

 buildPythonPackage rec {
  pname = "rokuecp";
-  version = "0.8.1";
+  version = "0.8.2";

  src = fetchFromGitHub {
    owner = "ctalkington";
    repo = "python-rokuecp";
    rev = version;
-    sha256 = "02mbmwljcvqj3ksj2irdm8849lcxzwa6fycgjqb0i75cgidxpans";
+    sha256 = "sha256-2FAnshIxaA52EwwwABBQ0sedAsz561YYxXDQo2Vcp1c=";
  };

  propagatedBuildInputs = [
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools-scm
+, pytestCheckHook
+, enrich
+}:
+
+buildPythonPackage rec {
+  pname = "subprocess-tee";
+  version = "0.3.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "01b0z8mcm568v9carhi0py1hs34wrbnlzyvdmhqzipql407kdpk2";
+  };
+
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+    enrich
+  ];
+
+  pythonImportsCheck = [
+    "subprocess_tee"
+  ];
+
+  meta = with lib; {
+    homepage = "https://github.com/pycontribs/subprocess-tee";
+    description = "A subprocess.run drop-in replacement that supports a tee mode";
+    license = licenses.mit;
+    maintainers = with maintainers; [ putchar ];
+  };
+}
@@ -44,6 +44,9 @@ buildPythonPackage rec {
    homepage = "https://typer.tiangolo.com/";
    description = "Typer, build great CLIs. Easy to code. Based on Python type hints.";
    license = licenses.mit;
+    # is incompatible with click8
+    # https://github.com/tiangolo/typer/issues/280
+    broken = true;
    maintainers = [ maintainers.winpat ];
  };
 }
--- a/Show More
+++ b/Show More