Merge release-20.03 into staging-20.03

2026-10-03 13:30:36 +00:00 · 2020-05-09 09:46:01 +02:00
parent 4e78311709 f860b7b608
commit 3d4548bc80
15 changed files with 411 additions and 32 deletions
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -433,6 +433,7 @@ in

      services.zfs.zed.settings = {
        ZED_EMAIL_PROG = mkDefault "${pkgs.mailutils}/bin/mail";
+        PATH = lib.makeBinPath [ packages.zfsUser pkgs.utillinux pkgs.gawk pkgs.gnused pkgs.gnugrep pkgs.coreutils pkgs.curl ];
      };

      environment.etc = genAttrs
--- a/pkgs/applications/graphics/graphicsmagick/CVE-2020-10938.patch
+++ b/pkgs/applications/graphics/graphicsmagick/CVE-2020-10938.patch
@@ -0,0 +1,296 @@
+
+# HG changeset patch
+# User Bob Friesenhahn <bfriesen@GraphicsMagick.org>
+# Date 1573921897 21600
+# Node ID 95abc2b694ceb0866f8aae94849bdf4033272035
+# Parent  751e9e822b09b60713a51b218bd7722c381d3634
+HuffmanDecodeImage(): Fix signed overflow on range check which leads to heap overflow in 32-bit applications. Ascii85Tuple(): Fix thread safety issue.
+
+diff -r 751e9e822b09 -r 95abc2b694ce magick/compress.c
+--- a/magick/compress.c	Sun Nov 10 13:33:34 2019 -0600
+++ b/magick/compress.c	Sat Nov 16 10:31:37 2019 -0600
+@@ -1,5 +1,5 @@
+ /*
+-% Copyright (C) 2003 - 2015 GraphicsMagick Group
+% Copyright (C) 2003-2019 GraphicsMagick Group
+ % Copyright (C) 2002 ImageMagick Studio
+ % Copyright 1991-1999 E. I. du Pont de Nemours and Company
+ %
+@@ -53,21 +53,26 @@
+ */
+ typedef struct HuffmanTable
+ {
+  unsigned int
+    id;
+
+   int
+-    id,
+-    code,
+    code;
+
+  unsigned int
+     length,
+     count;
+
+ } HuffmanTable;
+ 
+ /*
+   Huffman coding declarations.
+ */
+-#define TWId  23
+-#define MWId  24
+-#define TBId  25
+-#define MBId  26
+-#define EXId  27
+#define TWId  23U
+#define MWId  24U
+#define TBId  25U
+#define MBId  26U
+#define EXId  27U
+ 
+ static const HuffmanTable
+   MBTable[]=
+@@ -202,37 +207,38 @@
+ */
+ #define MaxLineExtent  36
+ 
+-static char *Ascii85Tuple(unsigned char *data)
+static char *Ascii85Tuple(char tuple[6], const unsigned char * restrict data)
+ {
+-  static char
+-    tuple[6];
+  magick_uint32_t
+    code;
+ 
+-  register long
+-    i,
+-    x;
+-
+-  unsigned long
+-    code,
+-    quantum;
+-
+-  code=((((unsigned long) data[0] << 8) | (unsigned long) data[1]) << 16) |
+-    ((unsigned long) data[2] << 8) | (unsigned long) data[3];
+-  if (code == 0L)
+  code=((((magick_uint32_t) data[0] << 8) | (magick_uint32_t) data[1]) << 16) |
+    ((magick_uint32_t) data[2] << 8) | (magick_uint32_t) data[3];
+  if (code == 0)
+     {
+       tuple[0]='z';
+       tuple[1]='\0';
+-      return(tuple);
+     }
+-  quantum=85UL*85UL*85UL*85UL;
+-  for (i=0; i < 4; i++)
+-  {
+-    x=(long) (code/quantum);
+-    code-=quantum*x;
+-    tuple[i]=(char) (x+(int) '!');
+-    quantum/=85L;
+-  }
+-  tuple[4]=(char) ((code % 85L)+(int) '!');
+-  tuple[5]='\0';
+  else
+    {
+      register magick_int32_t
+        i,
+        x;
+
+      magick_uint32_t
+        quantum;
+
+      quantum=85U*85U*85U*85U;
+      for (i=0; i < 4; i++)
+        {
+          x=(magick_int32_t) (code/quantum);
+          code-=quantum*x;
+          tuple[i]=(char) (x+(int) '!');
+          quantum/=85;
+        }
+      tuple[4]=(char) ((code % 85)+(int) '!');
+      tuple[5]='\0';
+    }
+   return(tuple);
+ }
+ 
+@@ -255,6 +261,9 @@
+ 
+ MagickExport void Ascii85Flush(Image *image)
+ {
+  char
+    tuple_buff[6];
+
+   register char
+     *tuple;
+ 
+@@ -266,7 +275,7 @@
+       image->ascii85->buffer[image->ascii85->offset]=0;
+       image->ascii85->buffer[image->ascii85->offset+1]=0;
+       image->ascii85->buffer[image->ascii85->offset+2]=0;
+-      tuple=Ascii85Tuple(image->ascii85->buffer);
+      tuple=Ascii85Tuple(tuple_buff, image->ascii85->buffer);
+       (void) WriteBlob(image,image->ascii85->offset+1,
+         *tuple == 'z' ? "!!!!" : tuple);
+     }
+@@ -286,6 +295,9 @@
+   register unsigned char
+     *p;
+ 
+  char
+    tuple_buff[6];
+
+   assert(image != (Image *) NULL);
+   assert(image->signature == MagickSignature);
+   assert(image->ascii85 != (Ascii85Info *) NULL);
+@@ -296,7 +308,7 @@
+   p=image->ascii85->buffer;
+   for (n=image->ascii85->offset; n >= 4; n-=4)
+   {
+-    for (q=Ascii85Tuple(p); *q; q++)
+    for (q=Ascii85Tuple(tuple_buff,p); *q; q++)
+     {
+       image->ascii85->line_break--;
+       if ((image->ascii85->line_break < 0) && (*q != '%'))
+@@ -355,11 +367,11 @@
+ %
+ %
+ */
+-#define HashSize  1021
+-#define MBHashA  293
+-#define MBHashB  2695
+-#define MWHashA  3510
+-#define MWHashB  1178
+#define HashSize 1021U
+#define MBHashA  293U
+#define MBHashB  2695U
+#define MWHashA  3510U
+#define MWHashB  1178U
+ 
+ #define InitializeHashTable(hash,table,a,b) \
+ { \
+@@ -401,26 +413,30 @@
+     byte,
+     code,
+     color,
+-    length,
+     null_lines,
+     runlength;
+ 
+   unsigned int
+     bit,
+     index,
+    length,
+     mask;
+ 
+   long
+-    count,
+    count;
+
+  unsigned long
+     y;
+ 
+   register IndexPacket
+     *indexes;
+ 
+-  register long
+-    i,
+  register unsigned long
+     x;
+ 
+  unsigned int
+    i;
+
+   register PixelPacket
+     *q;
+ 
+@@ -481,13 +497,13 @@
+   image->x_resolution=204.0;
+   image->y_resolution=196.0;
+   image->units=PixelsPerInchResolution;
+-  for (y=0; ((y < (long) image->rows) && (null_lines < 3)); )
+  for (y=0; ((y < image->rows) && (null_lines < 3)); )
+   {
+     /*
+       Initialize scanline to white.
+     */
+     p=scanline;
+-    for (x=0; x < (long) image->columns; x++)
+    for (x=0; x < image->columns; x++)
+       *p++=0;
+     /*
+       Decode Huffman encoded scanline.
+@@ -502,7 +518,7 @@
+     {
+       if (byte == EOF)
+         break;
+-      if (x >= (long) image->columns)
+      if (x >= image->columns)
+         {
+           while (runlength < 11)
+             InputBit(bit);
+@@ -563,7 +579,7 @@
+         case TBId:
+         {
+           count+=entry->count;
+-          if ((x+count) > (long) image->columns)
+          if ((x+(unsigned long) count) > image->columns)
+             count=(long) image->columns-x;
+           if (count > 0)
+             {
+@@ -603,7 +619,7 @@
+         break;
+       }
+     indexes=AccessMutableIndexes(image);
+-    for (x=0; x < (long) image->columns; x++)
+    for (x=0; x < image->columns; x++)
+     {
+       index=(unsigned int) (*p++);
+       indexes[x]=index;
+@@ -695,7 +711,9 @@
+     runlength;
+ 
+   long
+-    n,
+    n;
+
+  unsigned long
+     y;
+ 
+   Image
+@@ -704,8 +722,10 @@
+   register const IndexPacket
+     *indexes;
+ 
+-  register long
+-    i,
+  unsigned long
+    i;
+
+  register unsigned long
+     x;
+ 
+   register const PixelPacket
+@@ -772,10 +792,10 @@
+     polarity=(PixelIntensityToQuantum(&huffman_image->colormap[0]) <
+       PixelIntensityToQuantum(&huffman_image->colormap[1]) ? 0x00 : 0x01);
+   q=scanline;
+-  for (i=(long) width; i > 0; i--)
+  for (i=0; i < width; i++) /* was: for (i=(long) width; i > 0; i--) */
+     *q++=(unsigned char) polarity;
+   q=scanline;
+-  for (y=0; y < (long) huffman_image->rows; y++)
+  for (y=0; y < huffman_image->rows; y++)
+   {
+     p=AcquireImagePixels(huffman_image,0,y,huffman_image->columns,1,
+       &huffman_image->exception);
+@@ -785,7 +805,7 @@
+         break;
+       }
+     indexes=AccessImmutableIndexes(huffman_image);
+-    for (x=0; x < (long) huffman_image->columns; x++)
+    for (x=0; x < huffman_image->columns; x++)
+     {
+       *q=(unsigned char) (indexes[x] == polarity ? !polarity : polarity);
+       q++;
+
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
  patches = [
    ./disable-popen.patch
    ./1.3.32-darwin-png-strlcat-fix.patch
+    ./CVE-2020-10938.patch
  ];

  configureFlags = [
--- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
@@ -20,13 +20,13 @@ let
  pname = "wire-desktop";

  version = {
-    x86_64-darwin = "3.16.3630";
-    x86_64-linux = "3.16.2923";
+    x86_64-darwin = "3.17.3666";
+    x86_64-linux = "3.17.2924";
  }.${system} or throwSystem;

  sha256 = {
-    x86_64-darwin = "1lnjn45bhd36n9xgx6xx9cggwivvkr2s6r4zai2dwg0aac1bywr5";
-    x86_64-linux = "0c8jmlsg2gnxsvly04xj1al80nj52rg4czfdha58sg14x14lyspz";
+    x86_64-darwin = "0r3ckfrdx0ah6wn364ii1q1laya2nmmfz9jsikc6ss28lijb6ipn";
+    x86_64-linux = "16f8zawdx7dyrb8hp3fd2j821jj7jlan60knmdlrrk84phlc9ldd";
  }.${system} or throwSystem;

  meta = with stdenv.lib; {
--- a/pkgs/applications/science/logic/elan/default.nix
+++ b/pkgs/applications/science/logic/elan/default.nix
@@ -2,13 +2,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "elan";
-  version = "0.9.0";
+  version = "0.10.0";

  src = fetchFromGitHub {
    owner = "kha";
    repo = "elan";
    rev = "v${version}";
-    sha256 = "17i8sn53hk03fsawpwfinm1w0nb6lcmdbk8ar2mxyhkxczd45vag";
+    sha256 = "0aw538shvpfbk481y0gw3z97nsazdnk8qh8fwsb6ji62p2r51v6f";
  };

  cargoSha256 = "0q0xlvyyf88dbz43r7kk9v8rrp6hj0nl5i2i9mg6ibk2gphgdv6v";
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -46991,8 +46991,8 @@ self: {
     }:
     mkDerivation {
       pname = "cabal2nix";
-       version = "2.15.0";
-       sha256 = "1xfskgmwr75f1lk8a6mllp2h62jdl7hkwb01r74gpi0n6h17p3nm";
+       version = "2.15.3";
+       sha256 = "1l4jhl842g5jmwhmi1gqljkxa8ia80xbk2vmlhg6hlw1nkl9wfrz";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
--- a/pkgs/development/libraries/libssh/default.nix
+++ b/pkgs/development/libraries/libssh/default.nix
@@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "libssh";
-  version = "0.8.8";
+  version = "0.8.9";

  src = fetchurl {
    url = "https://www.libssh.org/files/0.8/${pname}-${version}.tar.xz";
-    sha256 = "1qk5bm9r6199jbfk54f8w24vkl52051g8s3kmq4z2kdc6vbpy4jb";
+    sha256 = "09b8w9m5qiap8wbvz4613nglsynpk8hn0q9b929ny2y4l2fy2nc5";
  };

  postPatch = ''
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
  pname = "cups";

  # After 2.2.6, CUPS requires headers only available in macOS 10.12+
-  version = if stdenv.isDarwin then "2.2.6" else "2.3.1";
+  version = if stdenv.isDarwin then "2.2.6" else "2.3.3";

  passthru = { inherit version; };

@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
    url = "https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz";
    sha256 = if version == "2.2.6"
             then "16qn41b84xz6khrr2pa2wdwlqxr29rrrkjfi618gbgdkq9w5ff20"
-             else "1kkpmj17205j8w9hdff2bfpk6lwdmr3gx0j4r35nhgvya24rvjhv";
+             else "1vpk0b2vq830f8fvf9z8qjsm5k141i7pi8djbinpnr78pi4dj7r6";
  };

  outputs = [ "out" "lib" "dev" "man" ];
--- a/pkgs/os-specific/linux/microcode/intel.nix
+++ b/pkgs/os-specific/linux/microcode/intel.nix
@@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "microcode-intel";
-  version = "20191115";
+  version = "20200508";

  src = fetchFromGitHub {
    owner = "intel";
    repo = "Intel-Linux-Processor-Microcode-Data-Files";
    rev = "microcode-${version}";
-    sha256 = "0pzi5qmrcrdf6nsds4bvyq1hnvv9d1dlrvqrbzcrpxk84rcjwq1x";
+    sha256 = "1cs4b7q9j2lw2y09rfa82aijbfmy4lddahz8qlz9gwajf2ziqns8";
  };

  nativeBuildInputs = [ iucode-tool libarchive ];
--- a/pkgs/servers/blockbook/default.nix
+++ b/pkgs/servers/blockbook/default.nix
@@ -14,7 +14,8 @@

 buildGoPackage rec {
  pname = "blockbook";
-  version = "0.3.1";
+  version = "0.3.2";
+  commit = "d1fd665";

  goPackagePath = "blockbook";

@@ -22,7 +23,7 @@ buildGoPackage rec {
    owner = "trezor";
    repo = "blockbook";
    rev = "v${version}";
-    sha256 = "0qgd1f3b4vavw55mvpvwvlya39dx1c3kjsc7n46nn7kpc152jv1l";
+    sha256 = "0hcgz4b7k8ia4dnjg6bbii95sqg3clc40ybwwc4qz3jv21ikc54x";
  };

  goDeps = ./deps.nix;
@@ -31,6 +32,13 @@ buildGoPackage rec {

  nativeBuildInputs = [ pkg-config packr ];

+  buildFlagsArray = ''
+    -ldflags=
+       -X blockbook/common.version=${version}
+       -X blockbook/common.gitcommit=${commit}
+       -X blockbook/common.buildDate=unknown
+  '';
+
  preBuild = lib.optionalString stdenv.isDarwin ''
    ulimit -n 8192
  '' + ''
@@ -51,4 +59,3 @@ buildGoPackage rec {
    platforms = platforms.all;
  };
 }
-
--- a/pkgs/servers/blockbook/deps.nix
+++ b/pkgs/servers/blockbook/deps.nix
@@ -9,6 +9,33 @@
      sha256 = "02davg672v9sz8l7a8s0b8m87154p42hkm5r6pavf4gqziw8bmr4";
    };
  }
+  {
+    goPackagePath  = "github.com/allegro/bigcache";
+    fetch = {
+      type = "git";
+      url = "https://github.com/allegro/bigcache";
+      rev =  "69ea0af04088faa57adb9ac683934277141e92a5";
+      sha256 = "0ac9pgzgi9lhklkqmc5f5x3d0cbyxjfpadc6mdbd7hdr7rfrjmxf";
+    };
+  }
+  {
+    goPackagePath  = "github.com/aristanetworks/goarista";
+    fetch = {
+      type = "git";
+      url = "https://github.com/aristanetworks/goarista";
+      rev =  "8e7d5b18fe7ad671e07097d5445dbc70422663b2";
+      sha256 = "1jbjviz8qi8izhvdvnbc5d9nqyxfww75ffcvxyhw5yxw9r1v0sn2";
+    };
+  }
+  {
+    goPackagePath  = "github.com/agl/ed25519";
+    fetch = {
+      type = "git";
+      url = "https://github.com/agl/ed25519";
+      rev =  "5312a61534124124185d41f09206b9fef1d88403";
+      sha256 = "1v8mhkf1m3ga5262s75vabskxvsw5rpqvi5nwhxwiv7gfk6h823i";
+    };
+  }
  {
    goPackagePath  = "github.com/beorn7/perks";
    fetch = {
@@ -45,6 +72,15 @@
      sha256 = "02dl46wcnfpg9sqvg0ipipkpnd7lrf4fnvb9zy56jqa7mfcwc7wk";
    };
  }
+  {
+    goPackagePath  = "github.com/dchest/blake256";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dchest/blake256";
+      rev =  "dee3fe6eb0e98dc774a94fc231f85baf7c29d360";
+      sha256 = "18hkfm1zlkf6fsjzljiz5cjxxcf3kl5p9617si8xjggb33adzhyg";
+    };
+  }
  {
    goPackagePath  = "github.com/deckarep/golang-set";
    fetch = {
@@ -54,13 +90,40 @@
      sha256 = "01kaqrc5ywbwa46b6lz3db7kkg8q6v383h4lnxds4z3kjglkqaff";
    };
  }
+  {
+    goPackagePath  = "github.com/decred/base58";
+    fetch = {
+      type = "git";
+      url = "https://github.com/decred/base58";
+      rev =  "dbeddd8aab76c31eb2ea98351a63fa2c6bf46888";
+      sha256 = "0fm0gsz5myin4n15gx3fhi9pk82p6v0sxza945yvny7n13q44ns5";
+    };
+  }
+  {
+    goPackagePath  = "github.com/decred/dcrd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/decred/dcrd";
+      rev =  "e3e8c47c68b010dbddeb783ebad32a3a4993dd71";
+      sha256 = "0zifsxhrjx282kvsqj80qr3v4af8hx4g6dqvrb6xggpkcaski8b4";
+    };
+  }
+  {
+    goPackagePath  = "github.com/decred/slog";
+    fetch = {
+      type = "git";
+      url = "https://github.com/decred/slog";
+      rev =  "fbd821ef791ba2b8ae945f5d44f4e49396d230c5";
+      sha256 = "0n3c7saiv4j22kjc1pf3771n6khx4g99n8vn4qvvv0i5vv04585n";
+    };
+  }
  {
    goPackagePath  = "github.com/ethereum/go-ethereum";
    fetch = {
      type = "git";
      url = "https://github.com/ethereum/go-ethereum";
-      rev =  "8bbe72075e4e16442c4e28d999edee12e294329e";
-      sha256 = "0q0w0vz85d94wym3xni8y22vly886j6g6zn9hizcww1nanvk4nl6";
+      rev =  "24d727b6d6e2c0cde222fa12155c4a6db5caaf2e";
+      sha256 = "0vrhwfavx3gciihf406f2qfrhvhnygvlj2icbswq0d01dx3s566m";
    };
  }
  {
@@ -140,8 +203,8 @@
    fetch = {
      type = "git";
      url = "https://github.com/martinboehm/btcutil";
-      rev =  "225ed00dbbd5cb8d8b3949a0ee7c9ea540754585";
-      sha256 = "0dn5s6h1524q38glp6fcdws97lyvmchq26dhbd3dqazrq61dhdvy";
+      rev =  "a3d2b8457b77d37c3813742d4030e199b6e09111";
+      sha256 = "0152cyabklv9l39dm1g30jb7hzdv9rj45mp3v9x4kvaza58nz0x4";
    };
  }
  {
@@ -275,8 +338,8 @@
    fetch = {
      type = "git";
      url = "https://go.googlesource.com/crypto";
-      rev =  "d6449816ce06963d9d136eee5a56fca5b0616e7e";
-      sha256 = "17dkprbbk84q165275zwhcn0s6pcarigq37zlhsxj23pq2qz3aqy";
+      rev =  "a832865fa7ada6126f4c6124ac49f71be71bff2a";
+      sha256 = "0bikp74pdi9fsvfdgy0k0r8ipzz96hy28zm8qpky0vdbwqci0a8p";
    };
  }
  {
--- a/pkgs/servers/squid/default.nix
+++ b/pkgs/servers/squid/default.nix
@@ -1,15 +1,24 @@
-{ stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap
+{ stdenv, fetchurl, fetchpatch, perl, openldap, pam, db, cyrus_sasl, libcap
 , expat, libxml2, openssl, pkgconfig
 }:

 stdenv.mkDerivation rec {
-  name = "squid-4.10";
+  pname = "squid";
+  version = "4.10";

  src = fetchurl {
-    url = "http://www.squid-cache.org/Versions/v4/${name}.tar.xz";
+    url = "http://www.squid-cache.org/Versions/v4/${pname}-${version}.tar.xz";
    sha256 = "07sz0adv8nkhy797675bpra7lvdkwjq9isw1ddgylhlazl511w4q";
  };

+  patches = [
+    (fetchpatch {
+      name = "CVE-2020-11945.patch";
+      url = "http://www.squid-cache.org/Versions/v4/changesets/squid-4-eeebf0f37a72a2de08348e85ae34b02c34e9a811.patch";
+      sha256 = "1mdi1camvaa6pmpiypw4zmmc4a4mgqgcvdic5wajysgwsqvbz1f3";
+    })
+  ];
+
  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [
    perl openldap db cyrus_sasl expat libxml2 openssl
--- a/pkgs/tools/misc/clipman/default.nix
+++ b/pkgs/tools/misc/clipman/default.nix
@@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "clipman";
-  version = "1.5.0";
+  version = "1.5.1";

  src = fetchFromGitHub {
    owner = "yory8";
    repo = pname;
    rev = "v${version}";
-    sha256 = "15s7np57pvh7mqmq016mvhz34f189wd1vrfiamzmps37mdz2nq9i";
+    sha256 = "09qvd7p63y7kh2i22pc89kr5wdnsbkraj5az9ds3bp3yj4q2mfyn";
  };

  modSha256 = "1sim3x794kj3wdw0g432zbgh1cimdmmg1hjgynh9jgm3y8w9q7ij";
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -18,11 +18,11 @@ buildPythonPackage rec {
  # The websites youtube-dl deals with are a very moving target. That means that
  # downloads break constantly. Because of that, updates should always be backported
  # to the latest stable release.
-  version = "2020.05.03";
+  version = "2020.05.08";

  src = fetchurl {
    url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "0qigk1bml6vkck4rs0wnmr46j5gkz04zn30jvnw1r4czjs7vnpal";
+    sha256 = "16zxa8ss2rka7cvkqyi67s8i1h9f4nxx88w9vjbxchbga6w0scc6";
  };

  nativeBuildInputs = [ installShellFiles makeWrapper ];
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1185,7 +1185,9 @@ in

  blink = libsForQt5.callPackage ../applications/networking/instant-messengers/blink { };

-  blockbook = callPackage ../servers/blockbook { };
+  blockbook = callPackage ../servers/blockbook { 
+    buildGoPackage = buildGo113Package;
+  };

  blockhash = callPackage ../tools/graphics/blockhash { };

@@ -1328,7 +1330,7 @@ in

  cue2pops = callPackage ../tools/cd-dvd/cue2pops { };

-  cabal2nix = haskell.lib.overrideCabal (haskell.lib.generateOptparseApplicativeCompletion "cabal2nix" haskell.packages.ghc881.cabal2nix) (drv: {
+  cabal2nix = haskell.lib.overrideCabal (haskell.lib.generateOptparseApplicativeCompletion "cabal2nix" haskellPackages.cabal2nix) (drv: {
    isLibrary = false;
    enableSharedExecutables = false;
    executableToolDepends = (drv.executableToolDepends or []) ++ [ makeWrapper ];