Merge commit 'a1dd419c1ffacea87eba066a2bb332e03cb68f66'

author: Alyssa Ross <hi@alyssa.is> 2019-06-18 18:30:18 +0000
committer: Alyssa Ross <hi@alyssa.is> 2019-06-18 18:30:18 +0000
commit: ef93931efff0323fd13c4270415b578c73b5ef35 (patch)
tree: e5b089306c481ce3237027bfb46c940fed1e2114 /nixpkgs/pkgs/development
parent: c5571a126859eb658ffd7340cb580f7d91f12bb6 (diff)
parent: a1dd419c1ffacea87eba066a2bb332e03cb68f66 (diff)
download: nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar
nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.gz
nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.bz2
nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.lz
nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.xz
nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.zst
nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.zip
98 files changed, 3067 insertions, 1484 deletions
diff --git a/nixpkgs/pkgs/development/compilers/binaryen/default.nix b/nixpkgs/pkgs/development/compilers/binaryen/default.nix
index 7c3203fe62eb..8ebed6f4b5bd 100644
--- a/nixpkgs/pkgs/development/compilers/binaryen/default.nix
+++ b/nixpkgs/pkgs/development/compilers/binaryen/default.nix
@@ -1,11 +1,11 @@
 { stdenv, cmake, python, fetchFromGitHub, emscriptenRev ? null }:
 
 let
-  defaultVersion = "83";
+  defaultVersion = "84";
 
   # Map from git revs to SHA256 hashes
   sha256s = {
-    "version_83" = "0vggd9n6anfxsdk4kiyylysi4cfm2rp39f66sq9zkg0h7vw5x5sm";
+    "version_84" = "189zqc5gp8fm7clsgby9h2s758ijil7ma4liwbf81wnwkb4kqxc0";
     "1.38.28" = "172s7y5f38736ic8ri3mnbdqcrkadd40a26cxcfwbscc53phl11v";
   };
 in
diff --git a/nixpkgs/pkgs/development/compilers/ghc/head.nix b/nixpkgs/pkgs/development/compilers/ghc/head.nix
index b263b8b187d3..141516015429 100644
--- a/nixpkgs/pkgs/development/compilers/ghc/head.nix
+++ b/nixpkgs/pkgs/development/compilers/ghc/head.nix
@@ -27,7 +27,7 @@
 , # Whetherto build terminfo.
   enableTerminfo ? !stdenv.targetPlatform.isWindows
 
-, version ? "8.7.20190115"
+, version ? "8.9.20190601"
 , # What flavour to build. An empty string indicates no
   # specific flavour and falls back to ghc default values.
   ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
@@ -89,14 +89,24 @@ stdenv.mkDerivation (rec {
 
   src = fetchgit {
     url = "https://gitlab.haskell.org/ghc/ghc.git/";
-    rev = "c9756dbf1ee58b117ea5c4ded45dea88030efd65";
-    sha256 = "0ja3ivyz4jrqkw6z1mdgsczxaqkjy5vw0nyyqlqr0bqxiw9p8834";
+    rev = "9bc10993bb300d3712b0f13ec6e28621d75d4204";
+    sha256 = "1s7vbinywx8ffj09nxr0h32nggjiqpssrvgmj7820k32w2yi7i8v";
   };
 
   enableParallelBuilding = true;
 
   outputs = [ "out" "doc" ];
 
+  patches = [
+    (fetchpatch rec { # https://github.com/haskell/haddock/issues/900
+     url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff";
+     name = "loadpluginsinmodules.diff";
+     sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1";
+     extraPrefix = "utils/haddock/";
+     stripLen = 1;
+   })
+  ];
+
   postPatch = "patchShebangs .";
 
   # GHC is a bit confused on its cross terminology.
diff --git a/nixpkgs/pkgs/development/compilers/llvm/7/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/7/llvm.nix
index c288fd3e2a5c..d3d9a4c506de 100644
--- a/nixpkgs/pkgs/development/compilers/llvm/7/llvm.nix
+++ b/nixpkgs/pkgs/development/compilers/llvm/7/llvm.nix
@@ -84,6 +84,14 @@ in stdenv.mkDerivation (rec {
     substituteInPlace unittests/Support/CMakeLists.txt \
       --replace "add_subdirectory(DynamicLibrary)" ""
     rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
+  '' + optionalString stdenv.hostPlatform.isAarch32 ''
+    # skip failing X86 test cases on armv7l
+    rm test/DebugInfo/X86/debug_addr.ll
+    rm test/tools/llvm-dwarfdump/X86/debug_addr.s
+    rm test/tools/llvm-dwarfdump/X86/debug_addr_address_size_mismatch.s
+    rm test/tools/llvm-dwarfdump/X86/debug_addr_dwarf4.s
+    rm test/tools/llvm-dwarfdump/X86/debug_addr_unsupported_version.s
+    rm test/tools/llvm-dwarfdump/X86/debug_addr_version_mismatch.s
   '' + ''
     patchShebangs test/BugPoint/compile-custom.ll.py
   '';
diff --git a/nixpkgs/pkgs/development/compilers/ocaml/4.08.nix b/nixpkgs/pkgs/development/compilers/ocaml/4.08.nix
index a4172e8f2b7c..cdc5314f3c77 100644
--- a/nixpkgs/pkgs/development/compilers/ocaml/4.08.nix
+++ b/nixpkgs/pkgs/development/compilers/ocaml/4.08.nix
@@ -1,8 +1,8 @@
 import ./generic.nix {
   major_version = "4";
   minor_version = "08";
-  patch_version = "0+rc1";
-  sha256 = "014yincnkfg0j2jy0cn30l5hb1y4sf2qf1gy9ix9ghgn32iw5ndk";
+  patch_version = "0+rc2";
+  sha256 = "09wp2iig6v5pivkjcnibdvkg5mchcj3q4zms6ij67039xczm8qrg";
 
   # If the executable is stripped it does not work
   dontStrip = true;
diff --git a/nixpkgs/pkgs/development/compilers/orc/default.nix b/nixpkgs/pkgs/development/compilers/orc/default.nix
index 83869e1b6214..4540a3016106 100644
--- a/nixpkgs/pkgs/development/compilers/orc/default.nix
+++ b/nixpkgs/pkgs/development/compilers/orc/default.nix
@@ -15,8 +15,9 @@ stdenv.mkDerivation rec {
     sed "/^toolsdir=/ctoolsdir=$dev/bin" -i "$dev"/lib/pkgconfig/orc*.pc
   '';
 
-  # https://bugzilla.gnome.org/show_bug.cgi?id=728129#c15
-  doCheck = stdenv.hostPlatform.system != "i686-linux"; # not sure about cross-compiling
+  # i686   https://gitlab.freedesktop.org/gstreamer/orc/issues/18
+  # armv7l https://gitlab.freedesktop.org/gstreamer/orc/issues/9
+  doCheck = (!stdenv.hostPlatform.isi686 && !stdenv.hostPlatform.isAarch32);
 
   meta = with stdenv.lib; {
     description = "The Oil Runtime Compiler";
diff --git a/nixpkgs/pkgs/development/compilers/osl/default.nix b/nixpkgs/pkgs/development/compilers/osl/default.nix
index a498eafd4254..ff4e387f07e7 100644
--- a/nixpkgs/pkgs/development/compilers/osl/default.nix
+++ b/nixpkgs/pkgs/development/compilers/osl/default.nix
@@ -8,13 +8,13 @@ in clangStdenv.mkDerivation rec {
   # In theory this could use GCC + Clang rather than just Clang,
   # but https://github.com/NixOS/nixpkgs/issues/29877 stops this
   name = "openshadinglanguage-${version}";
-  version = "1.10.4";
+  version = "1.10.5";
 
   src = fetchFromGitHub {
     owner = "imageworks";
     repo = "OpenShadingLanguage";
-    rev = "Release-1.10.4";
-    sha256 = "0qarxlm139y5sb9dd9rrljb2xnz8mvyfj497via6yqgwy90zr26g";
+    rev = "Release-1.10.5";
+    sha256 = "1g7izkjqb5xmp87k2aw0fgkxhcf7b9jn9hi60lwav3yhs50j8qsi";
   };
 
   cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ];
diff --git a/nixpkgs/pkgs/development/compilers/scala/default.nix b/nixpkgs/pkgs/development/compilers/scala/2.12.nix
index ce863ef9c915..ce863ef9c915 100644
--- a/nixpkgs/pkgs/development/compilers/scala/default.nix
+++ b/nixpkgs/pkgs/development/compilers/scala/2.12.nix
diff --git a/nixpkgs/pkgs/development/compilers/scala/2.13.nix b/nixpkgs/pkgs/development/compilers/scala/2.13.nix
new file mode 100644
index 000000000000..ab27d93a7cf9
--- /dev/null
+++ b/nixpkgs/pkgs/development/compilers/scala/2.13.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }:
+
+stdenv.mkDerivation rec {
+  name = "scala-2.13.0";
+
+  src = fetchurl {
+    url = "https://www.scala-lang.org/files/archive/${name}.tgz";
+    sha256 = "12g0a9i0xxqxxcvmimm5w2wgmrdhq80p8bsp52d6yldz4lrnbm7p";
+  };
+
+  propagatedBuildInputs = [ jre ] ;
+  buildInputs = [ makeWrapper ] ;
+
+  installPhase = ''
+    mkdir -p $out
+    rm "bin/"*.bat
+    mv * $out
+
+    # put docs in correct subdirectory
+    mkdir -p $out/share/doc
+    mv $out/doc $out/share/doc/scala
+
+    for p in $(ls $out/bin/) ; do
+      wrapProgram $out/bin/$p \
+        --prefix PATH ":" ${coreutils}/bin \
+        --prefix PATH ":" ${gnugrep}/bin \
+        --prefix PATH ":" ${jre}/bin \
+        --set JAVA_HOME ${jre}
+    done
+  '';
+
+  meta = {
+    description = "General purpose programming language";
+    longDescription = ''
+      Scala is a general purpose programming language designed to express
+      common programming patterns in a concise, elegant, and type-safe way.
+      It smoothly integrates features of object-oriented and functional
+      languages, enabling Java and other programmers to be more productive.
+      Code sizes are typically reduced by a factor of two to three when
+      compared to an equivalent Java application.
+    '';
+    homepage = https://www.scala-lang.org/;
+    license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix b/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix
index ee1aeb1503e0..874b99f2bebf 100644
--- a/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/QuickChick/default.nix
@@ -14,23 +14,23 @@ let params =
       sha256 = "0fri4nih40vfb0fbr82dsi631ydkw48xszinq43lyinpknf54y17";
     };
 
-    "8.7" = {
-      version = "20171212";
-      rev = "195e550a1cf0810497734356437a1720ebb6d744";
-      sha256 = "0zm23y89z0h4iamy74qk9qi2pz2cj3ga6ygav0w79n0qyqwhxcq1";
-    };
     "8.8" = rec {
-      preConfigure = "substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native";
       version = "20190311";
       rev = "22af9e9a223d0038f05638654422e637e863b355";
       sha256 = "00rnr19lg6lg0haq1sy4ld38p7imzand6fc52fvfq27gblxkp2aq";
-      buildInputs = with coq.ocamlPackages; [ ocamlbuild num ];
-      propagatedBuildInputs = [ coq-ext-lib simple-io ];
+    };
+
+    "8.9" = rec {
+      version = "1.1.0";
+      rev = "v${version}";
+      sha256 = "1c34v1k37rk7v0xk2czv5n79mbjxjrm6nh3llg2mpfmdsqi68wf3";
     };
   };
   param = params."${coq.coq-version}";
 in
 
+let recent = stdenv.lib.versionAtLeast coq.coq-version "8.8"; in
+
 stdenv.mkDerivation rec {
 
   name = "coq${coq.coq-version}-QuickChick-${param.version}";
@@ -41,16 +41,19 @@ stdenv.mkDerivation rec {
     inherit (param) rev sha256;
   };
 
+  preConfigure = stdenv.lib.optionalString recent
+    "substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native";
+
   buildInputs = [ coq ]
   ++ (with coq.ocamlPackages; [ ocaml camlp5 findlib ])
-  ++ (param.buildInputs or [])
+  ++ stdenv.lib.optionals recent
+     (with coq.ocamlPackages; [ ocamlbuild num ])
   ;
-  propagatedBuildInputs = [ ssreflect ] ++ (param.propagatedBuildInputs or []);
+  propagatedBuildInputs = [ ssreflect ]
+  ++ stdenv.lib.optionals recent [ coq-ext-lib simple-io ];
 
   enableParallelBuilding = false;
 
-  preConfigure = param.preConfigure or null;
-
   installPhase = ''
     make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
   '';
diff --git a/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix b/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix
index e685de4e9741..e74b158d33a3 100644
--- a/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix
+++ b/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, coq, coq-ext-lib }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.0";
+  version = "1.2.0";
   name = "coq${coq.coq-version}-simple-io-${version}";
   src = fetchFromGitHub {
     owner = "Lysxia";
     repo = "coq-simple-io";
     rev = version;
-    sha256 = "06gnbl8chv6ig18rlxnp8gg0np6863kxd7j15h46q0v1cnpx84lp";
+    sha256 = "1im1vwp7l7ha8swnhgbih0qjg187n8yx14i003nf6yy7p0ryxc9m";
   };
 
   buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml ocamlbuild ]);
diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix
index 26e0f56d506c..ff0b2bd82241 100644
--- a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix
@@ -357,6 +357,7 @@ self: super: {
   pwstore-cli = dontCheck super.pwstore-cli;
   quantities = dontCheck super.quantities;
   redis-io = dontCheck super.redis-io;
+  reflex = dontCheck super.reflex; # test suite uses hlint, which has different haskell-src-exts version
   rethinkdb = dontCheck super.rethinkdb;
   Rlang-QQ = dontCheck super.Rlang-QQ;
   safecopy = dontCheck super.safecopy;
@@ -860,7 +861,7 @@ self: super: {
   # Wrap the generated binaries to include their run-time dependencies in
   # $PATH. Also, cryptol needs a version of sbl that's newer than what we have
   # in LTS-13.x.
-  cryptol = overrideCabal (super.cryptol.override { sbv = self.sbv_8_2; }) (drv: {
+  cryptol = overrideCabal (super.cryptol.override { sbv = self.sbv_8_3; }) (drv: {
     buildTools = drv.buildTools or [] ++ [ pkgs.makeWrapper ];
     postInstall = drv.postInstall or "" + ''
       for b in $out/bin/cryptol $out/bin/cryptol-html; do
@@ -1099,7 +1100,14 @@ self: super: {
 
   # Generate shell completion.
   cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
-  stack = generateOptparseApplicativeCompletion "stack" super.stack;
+  stack = generateOptparseApplicativeCompletion "stack" (super.stack.overrideScope (self: super: {
+    ansi-terminal = self.ansi-terminal_0_9_1;
+    concurrent-output = self.concurrent-output_1_10_10; # needed for new ansi-terminal version
+    rio = self.rio_0_1_9_2;
+    hi-file-parser = dontCheck super.hi-file-parser;    # Avoid depending on newer hspec versions.
+    http-download = dontCheck super.http-download;
+    pantry-tmp = dontCheck super.pantry-tmp;
+  }));
 
   # musl fixes
   # dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test
@@ -1174,14 +1182,13 @@ self: super: {
   # https://github.com/mgajda/json-autotype/issues/25
   json-autotype = dontCheck super.json-autotype;
 
-  # The LTS-13.x version doesn't suffice to build hlint, hoogle, etc.
+  # The LTS-13.x versions doesn't suffice to build these packages.
   hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; });
   hoogle = super.hoogle.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; });
 
   # Jailbreak tasty < 1.2: https://github.com/phadej/tdigest/issues/30
   tdigest = doJailbreak super.tdigest; # until tdigest > 0.2.1
   these = doJailbreak super.these; # until these >= 0.7.6
-  insert-ordered-containers = appendPatch super.insert-ordered-containers ./patches/insert-ordered-containers-fix-test.patch;
 
   uri-bytestring = appendPatch super.uri-bytestring (pkgs.fetchpatch {
     url = "https://github.com/Soostone/uri-bytestring/commit/e5c5602a97160a6a6304a24947e33e47c9155460.patch";
@@ -1218,8 +1225,11 @@ self: super: {
 
   # Use latest pandoc despite what LTS says.
   # Test suite fails in both 2.5 and 2.6: https://github.com/jgm/pandoc/issues/5309.
-  pandoc = doDistribute super.pandoc_2_7_2;
+  cmark-gfm = self.cmark-gfm_0_2_0;
+  pandoc = dontCheck (doDistribute super.pandoc_2_7_3);  # test suite failure: https://github.com/jgm/pandoc/issues/5582
   pandoc-citeproc = doDistribute super.pandoc-citeproc_0_16_2;
+  skylighting = self.skylighting_0_8_1_1;
+  skylighting-core = self.skylighting-core_0_8_1_1;
 
   # Current versions of tasty-hedgehog need hedgehog 1.x, which
   # we don't have in LTS-13.x.
@@ -1271,4 +1281,13 @@ self: super: {
   # https://github.com/pruvisto/heap/issues/11
   heap = dontCheck super.heap;
 
+  # https://github.com/hslua/tasty-lua/issues/1
+  tasty-lua = dontCheck super.tasty-lua;
+
+  # Test suite won't link for no apparent reason.
+  constraints-deriving = dontCheck super.constraints-deriving;
+
+  # The old LTS-13.x version does not compile.
+  ip = self.ip_1_5_0;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 3d215cb03eda..3044f64e53de 100644
--- a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -43,8 +43,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  - ghc-lib-parser ==0.20190523  # newer versions break hlint
-  # LTS Haskell 13.24
+  # LTS Haskell 13.25
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -212,7 +211,7 @@ default-package-overrides:
   - asn1-types ==0.3.2
   - assert-failure ==0.1.2.2
   - astro ==0.4.2.1
-  - async ==2.2.1
+  - async ==2.2.2
   - async-extra ==0.2.0.0
   - async-refresh ==0.3.0.0
   - async-refresh-tokens ==0.4.0.0
@@ -237,7 +236,7 @@ default-package-overrides:
   - avers ==0.0.17.1
   - avers-api ==0.1.0
   - avers-server ==0.1.0.1
-  - avro ==0.4.4.2
+  - avro ==0.4.4.3
   - avwx ==0.3.0.2
   - axel ==0.0.9
   - backprop ==0.2.6.2
@@ -446,7 +445,7 @@ default-package-overrides:
   - concurrent-supply ==0.1.8
   - cond ==0.4.1.1
   - conduit ==1.3.1.1
-  - conduit-algorithms ==0.0.9.0
+  - conduit-algorithms ==0.0.10.1
   - conduit-combinators ==1.3.0
   - conduit-concurrent-map ==0.1.1
   - conduit-connection ==0.1.0.4
@@ -464,7 +463,7 @@ default-package-overrides:
   - console-style ==0.0.2.1
   - constraint ==0.1.3.0
   - constraints ==0.10.1
-  - contravariant ==1.5.1
+  - contravariant ==1.5.2
   - contravariant-extras ==0.3.4
   - control-bool ==0.2.1
   - control-dsl ==0.2.1.3
@@ -526,7 +525,7 @@ default-package-overrides:
   - cusparse ==0.2.0.0
   - cutter ==0.0
   - cyclotomic ==1.0
-  - czipwith ==1.0.1.1
+  - czipwith ==1.0.1.2
   - data-accessor ==0.2.2.8
   - data-accessor-mtl ==0.2.0.4
   - data-accessor-template ==0.2.1.16
@@ -584,7 +583,7 @@ default-package-overrides:
   - dhall ==1.19.1
   - dhall-bash ==1.0.18
   - dhall-json ==1.2.6
-  - dhall-text ==1.0.17
+  - dhall-text ==1.0.18
   - diagrams ==1.4
   - diagrams-contrib ==1.4.3
   - diagrams-core ==1.4.1.1
@@ -624,7 +623,7 @@ default-package-overrides:
   - double-conversion ==2.0.2.0
   - download ==0.3.2.7
   - drinkery ==0.4
-  - dsp ==0.2.4.1
+  - dsp ==0.2.5
   - dual-tree ==0.2.2
   - dublincore-xml-conduit ==0.1.0.2
   - dunai ==0.5.1
@@ -672,7 +671,7 @@ default-package-overrides:
   - errors ==2.3.0
   - errors-ext ==0.4.2
   - error-util ==0.0.1.2
-  - ersatz ==0.4.6
+  - ersatz ==0.4.7
   - esqueleto ==2.6.0
   - etc ==0.4.1.0
   - eventful-core ==0.2.0
@@ -828,19 +827,19 @@ default-package-overrides:
   - ghc-typelits-knownnat ==0.6
   - ghc-typelits-natnormalise ==0.6.2
   - ghost-buster ==0.1.1.0
-  - gi-atk ==2.0.15
+  - gi-atk ==2.0.18
   - gi-cairo ==1.0.17
   - gi-gdk ==3.0.16
-  - gi-gdkpixbuf ==2.0.18
+  - gi-gdkpixbuf ==2.0.20
   - gi-gio ==2.0.19
   - gi-glib ==2.0.17
-  - gi-gobject ==2.0.16
+  - gi-gobject ==2.0.19
   - gi-gtk ==3.0.27
   - gi-gtk-hs ==0.3.6.3
   - gi-gtksource ==3.0.16
   - gi-javascriptcore ==4.0.16
   - gingersnap ==0.3.1.0
-  - gi-pango ==1.0.16
+  - gi-pango ==1.0.19
   - giphy-api ==0.6.0.1
   - githash ==0.1.3.1
   - github-release ==1.2.4
@@ -894,7 +893,7 @@ default-package-overrides:
   - hamtsolo ==1.0.3
   - HandsomeSoup ==0.4.2
   - hapistrano ==0.3.9.2
-  - happy ==1.19.10
+  - happy ==1.19.11
   - hasbolt ==0.1.3.3
   - hashable ==1.2.7.0
   - hashable-time ==0.2.0.2
@@ -1045,7 +1044,7 @@ default-package-overrides:
   - http-common ==0.8.2.0
   - http-conduit ==2.3.7.1
   - http-date ==0.0.8
-  - http-directory ==0.1.2
+  - http-directory ==0.1.4
   - httpd-shed ==0.4.0.3
   - http-link-header ==1.0.3.1
   - http-media ==0.7.1.3
@@ -1073,8 +1072,8 @@ default-package-overrides:
   - hw-json ==0.9.0.1
   - hw-mquery ==0.1.0.3
   - hw-packed-vector ==0.0.0.1
-  - hw-parser ==0.1.0.0
-  - hw-prim ==0.6.2.24
+  - hw-parser ==0.1.0.1
+  - hw-prim ==0.6.2.25
   - hw-rankselect ==0.12.0.4
   - hw-rankselect-base ==0.3.2.1
   - hw-streams ==0.0.0.10
@@ -1117,7 +1116,7 @@ default-package-overrides:
   - inline-c-cpp ==0.3.0.2
   - inliterate ==0.1.0
   - insert-ordered-containers ==0.2.2
-  - inspection-testing ==0.4.1.2
+  - inspection-testing ==0.4.2.1
   - instance-control ==0.1.2.0
   - integer-logarithms ==1.0.3
   - integration ==0.2.1
@@ -1145,8 +1144,8 @@ default-package-overrides:
   - IPv6Addr ==1.1.2
   - ipython-kernel ==0.9.1.0
   - irc ==0.6.1.0
-  - irc-client ==1.1.0.6
-  - irc-conduit ==0.3.0.2
+  - irc-client ==1.1.0.7
+  - irc-conduit ==0.3.0.3
   - irc-ctcp ==0.1.3.0
   - islink ==0.1.0.0
   - iso3166-country-codes ==0.20140203.8
@@ -1211,6 +1210,7 @@ default-package-overrides:
   - leancheck ==0.8.0
   - leancheck-instances ==0.0.3
   - leapseconds-announced ==2017.1.0.1
+  - learn-physics ==0.6.4
   - lens ==4.17.1
   - lens-action ==0.2.3
   - lens-aeson ==1.0.2
@@ -1281,7 +1281,7 @@ default-package-overrides:
   - markdown ==0.1.17.4
   - markdown-unlit ==0.5.0
   - markov-chain ==0.0.3.4
-  - massiv ==0.2.8.0
+  - massiv ==0.2.8.1
   - massiv-io ==0.1.6.0
   - mathexpr ==0.3.0.0
   - math-functions ==0.3.1.0
@@ -1424,7 +1424,7 @@ default-package-overrides:
   - network-ip ==0.3.0.2
   - network-messagepack-rpc ==0.1.1.0
   - network-multicast ==0.2.0
-  - network-simple ==0.4.3
+  - network-simple ==0.4.4
   - network-simple-tls ==0.3.2
   - network-transport ==0.5.4
   - network-transport-composed ==0.2.1
@@ -1442,6 +1442,7 @@ default-package-overrides:
   - nonemptymap ==0.0.6.0
   - non-empty-sequence ==0.2.0.2
   - non-negative ==0.1.2
+  - not-gloss ==0.7.7.0
   - nowdoc ==0.1.1.0
   - nqe ==0.6.1
   - nsis ==0.3.3
@@ -1543,7 +1544,7 @@ default-package-overrides:
   - pg-transact ==0.1.0.1
   - phantom-state ==0.2.1.2
   - pid1 ==0.1.2.0
-  - pipes ==4.3.9
+  - pipes ==4.3.10
   - pipes-aeson ==0.4.1.8
   - pipes-attoparsec ==0.5.1.5
   - pipes-binary ==0.4.2
@@ -1634,7 +1635,7 @@ default-package-overrides:
   - protolude ==0.2.3
   - proxied ==0.3.1
   - psql-helpers ==0.1.0.0
-  - psqueues ==0.2.7.1
+  - psqueues ==0.2.7.2
   - pureMD5 ==2.1.3
   - purescript-bridge ==0.13.0.0
   - pure-zlib ==0.6.4
@@ -1662,7 +1663,7 @@ default-package-overrides:
   - ramus ==0.1.2
   - rando ==0.0.0.4
   - random ==1.1
-  - random-bytestring ==0.1.3.1
+  - random-bytestring ==0.1.3.2
   - random-fu ==0.2.7.0
   - random-shuffle ==0.0.4
   - random-source ==0.3.0.6
@@ -1706,7 +1707,7 @@ default-package-overrides:
   - regex-tdfa ==1.2.3.2
   - regex-tdfa-text ==1.0.0.3
   - regex-with-pcre ==1.0.2.0
-  - registry ==0.1.5.2
+  - registry ==0.1.6.0
   - reinterpret-cast ==0.1.0
   - relapse ==1.0.0.0
   - relational-query ==0.12.2.1
@@ -1731,6 +1732,7 @@ default-package-overrides:
   - rev-state ==0.1.2
   - rfc1751 ==0.1.2
   - rfc5051 ==0.1.0.4
+  - rg ==1.4.0.0
   - rio ==0.1.8.0
   - rio-orphans ==0.1.1.0
   - rng-utils ==0.3.0
@@ -1809,7 +1811,7 @@ default-package-overrides:
   - servant-foreign ==0.15
   - servant-js ==0.9.4
   - servant-JuicyPixels ==0.3.0.4
-  - servant-kotlin ==0.1.1.7
+  - servant-kotlin ==0.1.1.8
   - servant-lucid ==0.8.1
   - servant-mock ==0.8.5
   - servant-pandoc ==0.5.0.0
@@ -1885,6 +1887,7 @@ default-package-overrides:
   - sox ==0.2.3.1
   - soxlib ==0.0.3.1
   - sparse-linear-algebra ==0.3.1
+  - spatial-math ==0.5.0.1
   - special-values ==0.1.0.0
   - speculate ==0.3.5
   - speedy-slice ==0.3.0
@@ -1928,7 +1931,7 @@ default-package-overrides:
   - streaming ==0.2.2.0
   - streaming-attoparsec ==1.0.0.1
   - streaming-bytestring ==0.1.6
-  - streaming-commons ==0.2.1.0
+  - streaming-commons ==0.2.1.1
   - streaming-wai ==0.1.1
   - streamly ==0.5.2
   - streamproc ==1.6.2
@@ -2077,7 +2080,7 @@ default-package-overrides:
   - tldr ==0.4.0.1
   - tls ==1.4.1
   - tls-debug ==0.4.5
-  - tls-session-manager ==0.0.0.2
+  - tls-session-manager ==0.0.1.0
   - tmapchan ==0.0.3
   - tmapmvar ==0.0.4
   - tmp-postgres ==0.1.2.2
@@ -2102,7 +2105,8 @@ default-package-overrides:
   - tuple-sop ==0.3.1.0
   - tuple-th ==0.2.5
   - turtle ==1.5.14
-  - typed-process ==0.2.4.0
+  - TypeCompose ==0.9.14
+  - typed-process ==0.2.4.1
   - type-fun ==0.1.1
   - type-hint ==0.1
   - type-level-integers ==0.0.1
@@ -2145,7 +2149,7 @@ default-package-overrides:
   - unix-bytestring ==0.3.7.3
   - unix-compat ==0.5.1
   - unix-time ==0.4.5
-  - unliftio ==0.2.10
+  - unliftio ==0.2.11
   - unliftio-core ==0.1.2.0
   - unlit ==0.4.0.0
   - unordered-containers ==0.2.9.0
@@ -2206,7 +2210,7 @@ default-package-overrides:
   - wai-app-static ==3.1.6.3
   - wai-cli ==0.1.1
   - wai-conduit ==3.0.0.4
-  - wai-cors ==0.2.6
+  - wai-cors ==0.2.7
   - wai-eventsource ==3.0.0
   - wai-extra ==3.0.26
   - wai-handler-launch ==3.0.2.4
@@ -2729,6 +2733,7 @@ broken-packages:
   - algebra
   - algebra-sql
   - algebraic
+  - algebraic-graphs
   - algebraic-prelude
   - algo-s
   - AlgoRhythm
@@ -3166,6 +3171,7 @@ broken-packages:
   - blockhash
   - Blogdown
   - blogination
+  - BlogLiterately
   - BlogLiterately-diagrams
   - bloodhound
   - bloodhound-amazonka-auth
@@ -3652,6 +3658,8 @@ broken-packages:
   - conduit-resumablesink
   - conduit-throttle
   - conduit-tokenize-attoparsec
+  - conduit-vfs
+  - conduit-vfs-zip
   - conduit-zstd
   - conf
   - confcrypt
@@ -3674,6 +3682,7 @@ broken-packages:
   - consistent
   - console-program
   - const-math-ghc-plugin
+  - constrained-categories
   - constrained-category
   - constrained-dynamic
   - constrained-monads
@@ -3681,7 +3690,6 @@ broken-packages:
   - constraint-manip
   - constraint-reflection
   - ConstraintKinds
-  - constraints-deriving
   - constraints-emerge
   - constraints-extras
   - constructive-algebra
@@ -4020,6 +4028,7 @@ broken-packages:
   - dgs
   - dhall-check
   - dhall-nix
+  - dhall-to-cabal
   - dhcp-lease-parser
   - di
   - di-df1
@@ -4058,6 +4067,7 @@ broken-packages:
   - digestive-functors-hsp
   - DigitalOcean
   - digitalocean-kzs
+  - digraph
   - dimensional-tf
   - DimensionalHash
   - dingo-core
@@ -4073,6 +4083,7 @@ broken-packages:
   - direct-rocksdb
   - directed-cubical
   - dirfiles
+  - dirtree
   - discogs-haskell
   - discord-gateway
   - discord-haskell
@@ -4139,6 +4150,7 @@ broken-packages:
   - doctest-discover-configurator
   - doctest-driver-gen
   - doctest-prop
+  - docusign-client
   - docusign-example
   - docvim
   - doi
@@ -4174,6 +4186,7 @@ broken-packages:
   - DrIFT-cabalized
   - drifter-postgresql
   - drmaa
+  - drone
   - dropbox-sdk
   - dropsolve
   - ds-kanren
@@ -4277,6 +4290,7 @@ broken-packages:
   - Emping
   - Empty
   - empty-monad
+  - enchant
   - encoding
   - encoding-io
   - engine-io-growler
@@ -4818,12 +4832,27 @@ broken-packages:
   - ghclive
   - ght
   - gi-cairo-again
+  - gi-dbusmenu
+  - gi-dbusmenugtk3
+  - gi-gdkx11
+  - gi-ggit
+  - gi-girepository
+  - gi-gst
+  - gi-gstaudio
+  - gi-gstbase
   - gi-gstpbutils
   - gi-gsttag
+  - gi-gstvideo
   - gi-gtkosxapplication
+  - gi-handy
   - gi-notify
+  - gi-ostree
+  - gi-pangocairo
   - gi-poppler
+  - gi-secret
+  - gi-soup
   - gi-wnck
+  - gi-xlib
   - giak
   - Gifcurry
   - ginger
@@ -4852,6 +4881,7 @@ broken-packages:
   - github-webhook-handler
   - github-webhook-handler-snap
   - gitignore
+  - gitit
   - gitlab-api
   - gitlib-cross
   - gitlib-libgit2
@@ -4872,6 +4902,7 @@ broken-packages:
   - gli
   - glicko
   - glider-nlp
+  - glirc
   - GLMatrix
   - glob-posix
   - global
@@ -5013,6 +5044,7 @@ broken-packages:
   - GTALib
   - gtfs
   - gtk-serialized-event
+  - gtk-sni-tray
   - gtk-toy
   - gtk2hs-hello
   - gtk2hs-rpn
@@ -5351,6 +5383,7 @@ broken-packages:
   - hasql-backend
   - hasql-class
   - hasql-cursor-query
+  - hasql-cursor-transaction
   - hasql-dynamic-statements
   - hasql-generic
   - hasql-implicits
@@ -5382,6 +5415,7 @@ broken-packages:
   - haxl-amazonka
   - haxl-facebook
   - haxparse
+  - haxr
   - haxr-th
   - haxy
   - hayland
@@ -5442,6 +5476,7 @@ broken-packages:
   - heckle
   - hedgehog-checkers
   - hedgehog-checkers-lens
+  - hedgehog-classes
   - hedgehog-fn
   - hedgehog-gen-json
   - hedgehog-quickcheck
@@ -5593,6 +5628,7 @@ broken-packages:
   - hjsonpointer
   - hjsonschema
   - HJVM
+  - hkgr
   - hlatex
   - hlbfgsb
   - hlcm
@@ -5730,6 +5766,7 @@ broken-packages:
   - hpqtypes
   - hpqtypes-extras
   - hprotoc-fork
+  - hprox
   - hps
   - hps-cairo
   - hps-kmeans
@@ -5742,6 +5779,7 @@ broken-packages:
   - hR
   - hranker
   - HRay
+  - hrfsize
   - hricket
   - Hricket
   - hriemann
@@ -5845,7 +5883,6 @@ broken-packages:
   - hslinks
   - hslogger-reader
   - hslogstash
-  - hslua-module-system
   - hsluv-haskell
   - hsmagick
   - HSmarty
@@ -5957,6 +5994,7 @@ broken-packages:
   - http-querystring
   - http-response-decoder
   - http-shed
+  - http-streams
   - http-wget
   - http2-client-grpc
   - http2-grpc-types
@@ -5966,6 +6004,7 @@ broken-packages:
   - htune
   - htvm
   - htzaar
+  - hubigraph
   - huck
   - HueAPI
   - huff
@@ -5999,6 +6038,7 @@ broken-packages:
   - hw-dump
   - hw-eliasfano
   - hw-excess
+  - hw-fingertree
   - hw-ip
   - hw-json
   - hw-json-lens
@@ -6188,7 +6228,6 @@ broken-packages:
   - iostring
   - iothread
   - iotransaction
-  - ip
   - ip2location
   - ip2proxy
   - ipatch
@@ -6612,6 +6651,7 @@ broken-packages:
   - limp-cbc
   - linda
   - linden
+  - line-drawing
   - linear-accelerate
   - linear-algebra-cblas
   - linear-circuit
@@ -6991,6 +7031,7 @@ broken-packages:
   - mollie-api-haskell
   - monad-atom
   - monad-atom-simple
+  - monad-chronicle
   - monad-codec
   - monad-dijkstra
   - monad-exception
@@ -7070,6 +7111,9 @@ broken-packages:
   - mosaico-lib
   - moto
   - moto-postgresql
+  - motor
+  - motor-diagrams
+  - motor-reflection
   - mount
   - movie-monad
   - mp
@@ -7315,6 +7359,7 @@ broken-packages:
   - NoTrace
   - np-linear
   - nptools
+  - ntha
   - ntrip-client
   - NTRU
   - null-canvas
@@ -7708,6 +7753,7 @@ broken-packages:
   - plugins
   - plugins-auto
   - plugins-multistage
+  - plur
   - plural
   - png-file
   - pngload
@@ -7732,6 +7778,9 @@ broken-packages:
   - polydata
   - polydata-core
   - polynomial
+  - polysemy
+  - polysemy-plugin
+  - polysemy-zoo
   - polyseq
   - polysoup
   - polytypeable
@@ -8097,7 +8146,6 @@ broken-packages:
   - refh
   - refined
   - reflection-extras
-  - reflex
   - reflex-animation
   - reflex-backend-wai
   - reflex-basic-host
@@ -8214,6 +8262,7 @@ broken-packages:
   - reversi
   - ReviewBoard
   - rewrite
+  - rewrite-inspector
   - rewriting
   - rezoom
   - rfc
@@ -8430,6 +8479,7 @@ broken-packages:
   - secret-sharing
   - secrm
   - sednaDBXML
+  - selda-json
   - selectors
   - SelectSequencesFromMSA
   - selenium
@@ -8439,6 +8489,8 @@ broken-packages:
   - Semantique
   - semdoc
   - semi-iso
+  - semialign
+  - semialign-indexed
   - semibounded-lattices
   - Semigroup
   - semigroupoids-syntax
@@ -8502,6 +8554,7 @@ broken-packages:
   - servant-pushbullet-client
   - servant-py
   - servant-quickcheck
+  - servant-reason
   - servant-reflex
   - servant-router
   - servant-scotty
@@ -8522,6 +8575,7 @@ broken-packages:
   - serversession-frontend-snap
   - serversession-frontend-yesod
   - services
+  - ses-html
   - ses-html-snaplet
   - SessionLogger
   - sessions
@@ -8868,28 +8922,6 @@ broken-packages:
   - stable-marriage
   - stable-memo
   - stable-tree
-  - stack-bump
-  - stack-hpc-coveralls
-  - stack-lib
-  - stack-network
-  - stack-prism
-  - stack-run
-  - stack-run-auto
-  - stack-type
-  - stack2cabal
-  - stackage
-  - stackage-build-plan
-  - stackage-cabal
-  - stackage-cli
-  - stackage-curator
-  - stackage-metadata
-  - stackage-query
-  - stackage-sandbox
-  - stackage-setup
-  - stackage-to-hackage
-  - stackage-types
-  - stackage-upload
-  - stackage2nix
   - standalone-derive-topdown
   - standalone-haddock
   - starling
@@ -8979,6 +9011,7 @@ broken-packages:
   - stripe
   - stripe-haskell
   - stripe-http-client
+  - stripe-http-streams
   - strongswan-sql
   - structural-induction
   - structural-traversal
@@ -9123,7 +9156,6 @@ broken-packages:
   - tasty-jenkins-xml
   - tasty-laws
   - tasty-lens
-  - tasty-lua
   - tasty-quickcheck-laws
   - tasty-stats
   - tasty-tap
@@ -9203,6 +9235,7 @@ broken-packages:
   - text-containers
   - text-generic-pretty
   - text-icu-normalized
+  - text-icu-translit
   - text-lens
   - text-locale-encoding
   - text-markup
@@ -9210,6 +9243,7 @@ broken-packages:
   - text-plus
   - text-position
   - text-register-machine
+  - text-show-instances
   - text-time
   - text-utf8
   - text-xml-qq
@@ -9240,6 +9274,7 @@ broken-packages:
   - Theora
   - theoremquest
   - theoremquest-client
+  - these-lens
   - these-skinny
   - thih
   - thimk
@@ -9344,6 +9379,7 @@ broken-packages:
   - trace-function-call
   - traced
   - tracetree
+  - tracing
   - tracker
   - trackit
   - traction
@@ -9374,6 +9410,16 @@ broken-packages:
   - travis-meta-yaml
   - trawl
   - traypoweroff
+  - tree-sitter
+  - tree-sitter-go
+  - tree-sitter-haskell
+  - tree-sitter-java
+  - tree-sitter-json
+  - tree-sitter-php
+  - tree-sitter-python
+  - tree-sitter-ruby
+  - tree-sitter-tsx
+  - tree-sitter-typescript
   - tree-traversals
   - TreeCounter
   - treemap-html
@@ -9822,6 +9868,7 @@ broken-packages:
   - word2vec-model
   - WordAlignment
   - wordchoice
+  - wordify
   - WordNet
   - WordNet-ghc74
   - wordpass
@@ -10080,6 +10127,7 @@ broken-packages:
   - yuuko
   - yx
   - yxdb-utils
+  - z3
   - z3-encoding
   - z85
   - zabt
diff --git a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix
index b25a8fcc99f7..94cd5c4783fa 100644
--- a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix
@@ -537,6 +537,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) freealut;};
 
+  "ALUT_2_4_0_3" = callPackage
+    ({ mkDerivation, base, freealut, OpenAL, StateVar, transformers }:
+     mkDerivation {
+       pname = "ALUT";
+       version = "2.4.0.3";
+       sha256 = "04nrh7vribs4jvg99hj3fmshzcw6kkf45r842iys19ln3l51p2bi";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base OpenAL StateVar transformers ];
+       librarySystemDepends = [ freealut ];
+       description = "A binding for the OpenAL Utility Toolkit";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) freealut;};
+
   "AMI" = callPackage
     ({ mkDerivation, base, bytestring, containers, mtl, network
      , pureMD5, stm
@@ -1990,6 +2005,8 @@ self: {
        executableHaskellDepends = [ base cmdargs ];
        description = "A tool for posting Haskelly articles to blogs";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BlogLiterately-diagrams" = callPackage
@@ -5317,10 +5334,8 @@ self: {
      }:
      mkDerivation {
        pname = "Euterpea";
-       version = "2.0.6";
-       sha256 = "0smaa34s0yz90q4qx104glyx8s93k6vn6r60m6aq9infm7rkffxw";
-       revision = "1";
-       editedCabalFile = "1yrr18wv22ri1v8mij4lazl5lpri7sf8bxbz7igsbs8dngmycn9r";
+       version = "2.0.7";
+       sha256 = "0kxdilxzg0dgz1684csbyfv4cifh9d92ac6pwp6dnrcwwpwskiw8";
        libraryHaskellDepends = [
          array arrows base bytestring containers deepseq ghc-prim HCodecs
          heap PortMidi random stm
@@ -6506,6 +6521,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "GLUT_2_7_0_15" = callPackage
+    ({ mkDerivation, array, base, containers, OpenGL, StateVar
+     , transformers
+     }:
+     mkDerivation {
+       pname = "GLUT";
+       version = "2.7.0.15";
+       sha256 = "0271vnf6wllhxjwy0m348x90kv27aybxcbqkkglmd5w4cpwjg5g9";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base containers OpenGL StateVar transformers
+       ];
+       description = "A binding for the OpenGL Utility Toolkit";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "GLUtil" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, directory
      , filepath, hpp, JuicyPixels, linear, OpenGL, OpenGLRaw
@@ -14489,6 +14522,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) openal;};
 
+  "OpenAL_1_7_0_5" = callPackage
+    ({ mkDerivation, base, ObjectName, openal, OpenGL, StateVar
+     , transformers
+     }:
+     mkDerivation {
+       pname = "OpenAL";
+       version = "1.7.0.5";
+       sha256 = "167qgbls1439wbckva281cf61bclkca0krbbi4451l7qjinm8fil";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base ObjectName OpenGL StateVar transformers
+       ];
+       librarySystemDepends = [ openal ];
+       description = "A binding to the OpenAL cross-platform 3D audio API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) openal;};
+
   "OpenCL" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, mtl, OpenCL, QuickCheck }:
      mkDerivation {
@@ -14539,6 +14591,8 @@ self: {
        pname = "OpenGL";
        version = "3.0.3.0";
        sha256 = "069fg8jcxqq2z9iikynd8vi3jxm2b5y3qywdh4bdviyzab3zy1as";
+       revision = "1";
+       editedCabalFile = "1748mrb6r9mpf5jbrx436lwbg8w6dadyy8dhxw2dwnrj5z7zf741";
        libraryHaskellDepends = [
          base bytestring containers GLURaw ObjectName OpenGLRaw StateVar
          text transformers
@@ -14578,6 +14632,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libGL;};
 
+  "OpenGLRaw_3_3_3_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, fixed, half, libGL
+     , text, transformers
+     }:
+     mkDerivation {
+       pname = "OpenGLRaw";
+       version = "3.3.3.0";
+       sha256 = "0zgllb4bcash2i2cispa3j565aw3dpxs41ghmhpvyvi4a6xmyldx";
+       libraryHaskellDepends = [
+         base bytestring containers fixed half text transformers
+       ];
+       librarySystemDepends = [ libGL ];
+       description = "A raw binding for the OpenGL graphics system";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) libGL;};
+
   "OpenGLRaw21" = callPackage
     ({ mkDerivation, OpenGLRaw }:
      mkDerivation {
@@ -23710,6 +23781,30 @@ self: {
        broken = true;
      }) {};
 
+  "aeson-typescript_0_2_0_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , filepath, hspec, interpolate, mtl, process, template-haskell
+     , temporary, text, th-abstraction, unordered-containers
+     }:
+     mkDerivation {
+       pname = "aeson-typescript";
+       version = "0.2.0.0";
+       sha256 = "15w28x2b8h402fic5agq96g51ssryvd7q3zs22n5mz9aa43qlphw";
+       libraryHaskellDepends = [
+         aeson base containers interpolate mtl template-haskell text
+         th-abstraction unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers directory filepath hspec
+         interpolate mtl process template-haskell temporary text
+         th-abstraction unordered-containers
+       ];
+       description = "Generate TypeScript definition files from your ADTs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "aeson-utils" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, scientific
      , text
@@ -24684,6 +24779,8 @@ self: {
        ];
        description = "A library for algebraic graph construction and transformation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "algebraic-graphs_0_4" = callPackage
@@ -24704,6 +24801,7 @@ self: {
        description = "A library for algebraic graph construction and transformation";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "algebraic-prelude" = callPackage
@@ -31783,6 +31881,18 @@ self: {
        broken = true;
      }) {};
 
+  "ast-path" = callPackage
+    ({ mkDerivation, base, tasty, tasty-hunit }:
+     mkDerivation {
+       pname = "ast-path";
+       version = "0.1.2";
+       sha256 = "18glmgnjsp25q88430h8v0a617sc0y468n55nlrgq85a073b6nwf";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
+       description = "vocabulary representation for predicting program properties";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "astar" = callPackage
     ({ mkDerivation, base, hashable, psqueues, unordered-containers }:
      mkDerivation {
@@ -31873,26 +31983,6 @@ self: {
      }:
      mkDerivation {
        pname = "async";
-       version = "2.2.1";
-       sha256 = "09whscli1q5z7lzyq9rfk0bq1ydplh6pjmc6qv0x668k5818c2wg";
-       revision = "2";
-       editedCabalFile = "130rc6icx3h471qs417lkw9b2pfn27xd009liw58cmdk66zscizp";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base hashable stm ];
-       testHaskellDepends = [
-         base HUnit stm test-framework test-framework-hunit
-       ];
-       description = "Run IO operations asynchronously and wait for their results";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "async_2_2_2" = callPackage
-    ({ mkDerivation, base, hashable, HUnit, stm, test-framework
-     , test-framework-hunit
-     }:
-     mkDerivation {
-       pname = "async";
        version = "2.2.2";
        sha256 = "1zxvfcyy4sg8lmzphi5dgnavksj5pav6rbvd5kc48lf4hanb2jjb";
        isLibrary = true;
@@ -31903,7 +31993,6 @@ self: {
        ];
        description = "Run IO operations asynchronously and wait for their results";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "async-ajax" = callPackage
@@ -33650,40 +33739,6 @@ self: {
      }:
      mkDerivation {
        pname = "avro";
-       version = "0.4.4.2";
-       sha256 = "1x01f05rhz4nhvzbzai5817c9ajqnph1vfn0z8cp4y7r4srm55w0";
-       libraryHaskellDepends = [
-         aeson array base base16-bytestring bifunctors binary bytestring
-         containers data-binary-ieee754 deepseq fail hashable mtl scientific
-         semigroups tagged template-haskell text tf-random
-         unordered-containers vector zlib
-       ];
-       testHaskellDepends = [
-         aeson array base base16-bytestring bifunctors binary bytestring
-         containers directory extra fail hashable hspec lens lens-aeson mtl
-         pure-zlib QuickCheck raw-strings-qq scientific semigroups tagged
-         template-haskell text tf-random transformers unordered-containers
-         vector
-       ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [
-         aeson base bytestring containers gauge hashable mtl random
-         raw-strings-qq text transformers unordered-containers vector
-       ];
-       description = "Avro serialization support for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "avro_0_4_4_3" = callPackage
-    ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors
-     , binary, bytestring, containers, data-binary-ieee754, deepseq
-     , directory, extra, fail, gauge, hashable, hspec, hspec-discover
-     , lens, lens-aeson, mtl, pure-zlib, QuickCheck, random
-     , raw-strings-qq, scientific, semigroups, tagged, template-haskell
-     , text, tf-random, transformers, unordered-containers, vector, zlib
-     }:
-     mkDerivation {
-       pname = "avro";
        version = "0.4.4.3";
        sha256 = "12r08n7bz8qwknv8108qz3j0n7x12ia0wnzqng54pjb47jfdgfzi";
        libraryHaskellDepends = [
@@ -33706,7 +33761,6 @@ self: {
        ];
        description = "Avro serialization support for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "avwx" = callPackage
@@ -36885,6 +36939,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bglib" = callPackage
+    ({ mkDerivation, async, base, binary, bytestring, monad-loops, mtl
+     , optparse-applicative, serialport, stm
+     }:
+     mkDerivation {
+       pname = "bglib";
+       version = "1.0.0.1";
+       sha256 = "09nifakgbx45l4qgqvb4jyaq06cx7gy6pnry31hpim3g82czsixs";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring monad-loops mtl serialport stm
+       ];
+       executableHaskellDepends = [
+         async base bytestring mtl optparse-applicative serialport stm
+       ];
+       description = "Implementation of the BGAPI serial protocol";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "bgmax" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, time }:
      mkDerivation {
@@ -37208,6 +37282,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bimap_0_4_0" = callPackage
+    ({ mkDerivation, base, containers, deepseq, exceptions, QuickCheck
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "bimap";
+       version = "0.4.0";
+       sha256 = "1794iykd7rhj29y0w4vyjyn6wnw28hi8sxzvm1j5ivdzmf39d8yi";
+       libraryHaskellDepends = [ base containers deepseq exceptions ];
+       testHaskellDepends = [
+         base containers deepseq exceptions QuickCheck template-haskell
+       ];
+       description = "Bidirectional mapping between two key types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bimap-server" = callPackage
     ({ mkDerivation, aeson, base, bimap, binary, directory, http-types
      , unix, wai, warp
@@ -37275,22 +37366,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "binary_0_8_6_0" = callPackage
-    ({ mkDerivation, array, attoparsec, base, bytestring, Cabal, cereal
-     , containers, criterion, deepseq, directory, filepath
-     , generic-deriving, HUnit, mtl, QuickCheck, random, test-framework
-     , test-framework-quickcheck2, unordered-containers, zlib
+  "binary_0_8_7_0" = callPackage
+    ({ mkDerivation, array, attoparsec, base, base-orphans, bytestring
+     , Cabal, cereal, containers, criterion, deepseq, directory
+     , filepath, generic-deriving, HUnit, mtl, QuickCheck, random
+     , test-framework, test-framework-quickcheck2, unordered-containers
+     , zlib
      }:
      mkDerivation {
        pname = "binary";
-       version = "0.8.6.0";
-       sha256 = "0pz1va9bmj4daw8gi8r6d1rrnqsd4bislky6d8pjwwbyrgrw9s8y";
-       revision = "1";
-       editedCabalFile = "1mig95fa26jpjr0lwdkgl1l6ldxg5wzgnd1psps17xzv15cbahb2";
+       version = "0.8.7.0";
+       sha256 = "1r29yg94imhrbzjsv8ghf3217rhlas7945cp9i3dxzskzviyz78x";
        libraryHaskellDepends = [ array base bytestring containers ];
        testHaskellDepends = [
-         array base bytestring Cabal containers directory filepath HUnit
-         QuickCheck random test-framework test-framework-quickcheck2
+         array base base-orphans bytestring Cabal containers directory
+         filepath HUnit QuickCheck random test-framework
+         test-framework-quickcheck2
        ];
        benchmarkHaskellDepends = [
          array attoparsec base bytestring cereal containers criterion
@@ -38714,6 +38805,8 @@ self: {
        pname = "bindynamic";
        version = "1.0.0.1";
        sha256 = "1dp52xagwgzmm77f1cm8mvwjy7xnckbkf1inxskq0c7xcch4wbfb";
+       revision = "1";
+       editedCabalFile = "0mq2h1j1xd52irb35y9j0znxzpk661w3dl4d5a011sln4jd3f663";
        libraryHaskellDepends = [ base binary bytestring rank1dynamic ];
        description = "A variation of Data.Dynamic.Dynamic with a Binary instance";
        license = stdenv.lib.licenses.gpl3;
@@ -39049,8 +39142,8 @@ self: {
      }:
      mkDerivation {
        pname = "birch-beer";
-       version = "0.1.2.1";
-       sha256 = "18mz6qij6frpg7d4jh1cw6jwkxd5gymrhdvprm8yq84ndcn6jxrx";
+       version = "0.1.3.0";
+       sha256 = "1mgiv9al30v1y78cz65rfb8251mwkgk34j1i3dygjp44071kxqcq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -42543,6 +42636,28 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "bson_0_3_2_8" = callPackage
+    ({ mkDerivation, base, binary, bytestring, cryptohash-md5
+     , data-binary-ieee754, mtl, network, QuickCheck, test-framework
+     , test-framework-quickcheck2, text, time
+     }:
+     mkDerivation {
+       pname = "bson";
+       version = "0.3.2.8";
+       sha256 = "1xqxjs0vhlrvnclkxn8y5dr4liaja4flqizphk1000km2kvvw748";
+       libraryHaskellDepends = [
+         base binary bytestring cryptohash-md5 data-binary-ieee754 mtl
+         network text time
+       ];
+       testHaskellDepends = [
+         base bytestring QuickCheck test-framework
+         test-framework-quickcheck2 text time
+       ];
+       description = "BSON documents are JSON-like objects with a standard binary encoding";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bson-generic" = callPackage
     ({ mkDerivation, base, bson, ghc-prim, text }:
      mkDerivation {
@@ -43227,8 +43342,8 @@ self: {
      }:
      mkDerivation {
        pname = "butcher";
-       version = "1.3.2.1";
-       sha256 = "16jwhj3lrghn11igc5ci484r4xc1ii6hz6ysj39njds547dmznda";
+       version = "1.3.2.3";
+       sha256 = "0lpicayq9k59m2ydz989xsypr653xwhp6mmhlp7nmjzk6jwpq5q5";
        libraryHaskellDepends = [
          base bifunctors containers deque extra free microlens microlens-th
          mtl multistate pretty transformers unsafe void
@@ -55359,43 +55474,6 @@ self: {
      }:
      mkDerivation {
        pname = "conduit-algorithms";
-       version = "0.0.9.0";
-       sha256 = "1d2d9ak3mn77lklxr80xw9xpay31f71h5hd66mgrixk48bfr9p8i";
-       libraryHaskellDepends = [
-         async base bytestring bzlib-conduit conduit conduit-combinators
-         conduit-extra conduit-zstd containers deepseq exceptions
-         lzma-conduit monad-control mtl pqueue resourcet stm stm-conduit
-         streaming-commons transformers unliftio-core vector
-       ];
-       testHaskellDepends = [
-         async base bytestring bzlib-conduit conduit conduit-combinators
-         conduit-extra conduit-zstd containers deepseq directory exceptions
-         HUnit lzma-conduit monad-control mtl pqueue resourcet stm
-         stm-conduit streaming-commons test-framework test-framework-hunit
-         test-framework-th transformers unliftio-core vector
-       ];
-       benchmarkHaskellDepends = [
-         async base bytestring bzlib-conduit conduit conduit-combinators
-         conduit-extra conduit-zstd containers criterion deepseq exceptions
-         lzma-conduit monad-control mtl pqueue resourcet stm stm-conduit
-         streaming-commons transformers unliftio-core vector
-       ];
-       description = "Conduit-based algorithms";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "conduit-algorithms_0_0_10_1" = callPackage
-    ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit
-     , conduit-combinators, conduit-extra, conduit-zstd, containers
-     , criterion, deepseq, directory, exceptions, HUnit, lzma-conduit
-     , monad-control, mtl, pqueue, resourcet, stm, stm-conduit
-     , streaming-commons, test-framework, test-framework-hunit
-     , test-framework-th, transformers, unliftio-core, vector
-     }:
-     mkDerivation {
-       pname = "conduit-algorithms";
        version = "0.0.10.1";
        sha256 = "0lil9krb1gj4lckyfqlf9jmdb21n3wrf00kiiwcv1qc277p39z6y";
        libraryHaskellDepends = [
@@ -55544,6 +55622,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "conduit-connection_0_1_0_5" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, connection, HUnit
+     , network, resourcet, test-framework, test-framework-hunit
+     , transformers
+     }:
+     mkDerivation {
+       pname = "conduit-connection";
+       version = "0.1.0.5";
+       sha256 = "0mvsvxfps6pnlanl5zx7cz6qxpn907qgx5bcl18vb9vhn8frh0m6";
+       libraryHaskellDepends = [
+         base bytestring conduit connection resourcet transformers
+       ];
+       testHaskellDepends = [
+         base bytestring conduit connection HUnit network resourcet
+         test-framework test-framework-hunit transformers
+       ];
+       description = "Conduit source and sink for Network.Connection.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "conduit-extra_1_2_3_2" = callPackage
     ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring
      , bytestring-builder, conduit, criterion, directory, exceptions
@@ -55605,6 +55704,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "conduit-extra_1_3_2" = callPackage
+    ({ mkDerivation, async, attoparsec, base, bytestring
+     , bytestring-builder, conduit, directory, exceptions, filepath
+     , gauge, hspec, network, primitive, process, QuickCheck, resourcet
+     , stm, streaming-commons, text, transformers, transformers-base
+     , typed-process, unliftio-core
+     }:
+     mkDerivation {
+       pname = "conduit-extra";
+       version = "1.3.2";
+       sha256 = "1fs61dsdkk61rqfkrv11plkq5n1z44kq5cscv7iwbgb5s0ds6j5i";
+       libraryHaskellDepends = [
+         async attoparsec base bytestring conduit directory filepath network
+         primitive process resourcet stm streaming-commons text transformers
+         typed-process unliftio-core
+       ];
+       testHaskellDepends = [
+         async attoparsec base bytestring bytestring-builder conduit
+         directory exceptions filepath hspec process QuickCheck resourcet
+         stm streaming-commons text transformers transformers-base
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring bytestring-builder conduit gauge transformers
+       ];
+       description = "Batteries included conduit: adapters for common libraries";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "conduit-find" = callPackage
     ({ mkDerivation, attoparsec, base, conduit, conduit-combinators
      , conduit-extra, directory, doctest, either, exceptions, filepath
@@ -55777,6 +55905,60 @@ self: {
        broken = true;
      }) {};
 
+  "conduit-vfs" = callPackage
+    ({ mkDerivation, base, bytestring, classy-prelude, conduit
+     , conduit-extra, directory, exceptions, extra, filepath
+     , monad-loops, mono-traversable, mtl, resourcet, text, transformers
+     , unix, unliftio, unordered-containers
+     }:
+     mkDerivation {
+       pname = "conduit-vfs";
+       version = "0.1.0.3";
+       sha256 = "1nsq4s0cxag6drynkfl79q0lirh37r3l59nzhkdyjlak4bzq5g1f";
+       libraryHaskellDepends = [
+         base bytestring classy-prelude conduit conduit-extra directory
+         exceptions extra filepath monad-loops mono-traversable mtl
+         resourcet text transformers unix unliftio unordered-containers
+       ];
+       testHaskellDepends = [
+         base bytestring classy-prelude conduit conduit-extra directory
+         exceptions extra filepath monad-loops mono-traversable mtl
+         resourcet text transformers unix unliftio unordered-containers
+       ];
+       description = "Virtual file system for Conduit; disk, pure, and in-memory impls";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "conduit-vfs-zip" = callPackage
+    ({ mkDerivation, base, bytestring, classy-prelude, conduit
+     , conduit-extra, conduit-vfs, directory, exceptions, extra
+     , filepath, monad-loops, mono-traversable, mtl, resourcet, text
+     , transformers, unix, unliftio, unordered-containers, zip-archive
+     }:
+     mkDerivation {
+       pname = "conduit-vfs-zip";
+       version = "0.1.0.1";
+       sha256 = "07c2r03if3bminakcf4z7k990c8nf94w3q41csrzd4zy3qk0acr5";
+       libraryHaskellDepends = [
+         base bytestring classy-prelude conduit conduit-extra conduit-vfs
+         directory exceptions extra filepath monad-loops mono-traversable
+         mtl resourcet text transformers unix unliftio unordered-containers
+         zip-archive
+       ];
+       testHaskellDepends = [
+         base bytestring classy-prelude conduit conduit-extra conduit-vfs
+         directory exceptions extra filepath monad-loops mono-traversable
+         mtl resourcet text transformers unix unliftio unordered-containers
+         zip-archive
+       ];
+       description = "Zip archive interface for the Conduit Virtual File System";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "conduit-zstd" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-combinators
      , conduit-extra, directory, HUnit, test-framework
@@ -56020,10 +56202,8 @@ self: {
      }:
      mkDerivation {
        pname = "config-schema";
-       version = "0.5.0.1";
-       sha256 = "18zdq0w65cs2zy8p0pvb0jfqffcyxq9km1c2h5fvky8c689lp0gp";
-       revision = "3";
-       editedCabalFile = "102mwr18aas924hlxsyyx5pi8skkb2misic1h95f6khpz7wcy3vy";
+       version = "1.0.0.0";
+       sha256 = "0yziw7yqyzdxfxzrzp8wq0858njxxf3ikdbzivf63zfn3sf79y61";
        libraryHaskellDepends = [
          base config-value containers free kan-extensions pretty
          semigroupoids text transformers
@@ -56510,6 +56690,8 @@ self: {
        ];
        description = "Constrained clones of the category-theory type classes, using ConstraintKinds";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "constrained-category" = callPackage
@@ -56691,8 +56873,6 @@ self: {
        ];
        description = "Manipulating constraints and deriving class instances programmatically";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "constraints-emerge" = callPackage
@@ -56868,24 +57048,13 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "containers_0_6_0_1" = callPackage
-    ({ mkDerivation, array, base, ChasingBottoms, criterion, deepseq
-     , ghc-prim, HUnit, QuickCheck, random, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, transformers
-     }:
+  "containers_0_6_1_1" = callPackage
+    ({ mkDerivation, array, base, deepseq }:
      mkDerivation {
        pname = "containers";
-       version = "0.6.0.1";
-       sha256 = "0smc1g58l968jxcjxhxcd4qpfm4zk7zr6r4q6wf6ay75av9rf4d7";
-       libraryHaskellDepends = [ array base deepseq ghc-prim ];
-       testHaskellDepends = [
-         array base ChasingBottoms deepseq ghc-prim HUnit QuickCheck
-         test-framework test-framework-hunit test-framework-quickcheck2
-         transformers
-       ];
-       benchmarkHaskellDepends = [
-         base criterion deepseq ghc-prim random transformers
-       ];
+       version = "0.6.1.1";
+       sha256 = "101w44h7rz1isqpnl8lgmazjxg290cha5nqnk47sy5ijwgdq3lsd";
+       libraryHaskellDepends = [ array base deepseq ];
        description = "Assorted concrete container types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -57143,25 +57312,11 @@ self: {
     ({ mkDerivation, base, StateVar, transformers }:
      mkDerivation {
        pname = "contravariant";
-       version = "1.5.1";
-       sha256 = "1jcfbv3mmx2hb49h4djn72bb13j609wvsy9z4wcbj461cvhcr2q8";
-       revision = "2";
-       editedCabalFile = "016p9bn2glarmyizs3cw86ilxqajy5iriz4fvq0ibzf9f0aj4vnq";
-       libraryHaskellDepends = [ base StateVar transformers ];
-       description = "Contravariant functors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "contravariant_1_5_2" = callPackage
-    ({ mkDerivation, base, StateVar, transformers }:
-     mkDerivation {
-       pname = "contravariant";
        version = "1.5.2";
        sha256 = "0366gl62wwwdbl9i6kqy60asf60876k55v91la6bmhnwwcj2q9n4";
        libraryHaskellDepends = [ base StateVar transformers ];
        description = "Contravariant functors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "contravariant-extras" = callPackage
@@ -61468,25 +61623,12 @@ self: {
     ({ mkDerivation, base, template-haskell, transformers }:
      mkDerivation {
        pname = "czipwith";
-       version = "1.0.1.1";
-       sha256 = "0hs296mwx62alp9fkpkhw9jsjqlygagvb911nx22b0pgyiwqa52a";
-       libraryHaskellDepends = [ base template-haskell ];
-       testHaskellDepends = [ base transformers ];
-       description = "CZipWith class and deriving via TH";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "czipwith_1_0_1_2" = callPackage
-    ({ mkDerivation, base, template-haskell, transformers }:
-     mkDerivation {
-       pname = "czipwith";
        version = "1.0.1.2";
        sha256 = "17zf2blgjp47dahjcprkpymg9kb1ll6386pkr109gjr78f261gs1";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base transformers ];
        description = "CZipWith class and deriving via TH";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "d-bus" = callPackage
@@ -67162,23 +67304,6 @@ self: {
     ({ mkDerivation, base, dhall, optparse-applicative, text }:
      mkDerivation {
        pname = "dhall-text";
-       version = "1.0.17";
-       sha256 = "0bs246857r801qnqvh8cb5wm1rplr7grynl4h989i61qz7vcqf53";
-       revision = "1";
-       editedCabalFile = "1avvybk495zngswlnjiqj8nk7iycwzzhxx3cml4w2yhqlic3xx2g";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base dhall optparse-applicative text
-       ];
-       description = "Template text using Dhall";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dhall-text_1_0_18" = callPackage
-    ({ mkDerivation, base, dhall, optparse-applicative, text }:
-     mkDerivation {
-       pname = "dhall-text";
        version = "1.0.18";
        sha256 = "1nwvj67glqyn5yd62ni16wqppv8d3hy7d9aw87p35zkch1vr8vsd";
        isLibrary = false;
@@ -67188,7 +67313,6 @@ self: {
        ];
        description = "Template text using Dhall";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhall-to-cabal" = callPackage
@@ -67217,6 +67341,8 @@ self: {
        ];
        description = "Compile Dhall expressions to Cabal files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dhcp-lease-parser" = callPackage
@@ -68213,8 +68339,8 @@ self: {
      }:
      mkDerivation {
        pname = "differential";
-       version = "0.1.1.0";
-       sha256 = "0h6w082zq4f4p7j61bdi3jzpb42wwgh1d3067jywlnx2qwa0ijhp";
+       version = "0.1.2.0";
+       sha256 = "1mw70yrxi72q55h5xvyds7qp5az7j1qc3xix6ahck17dv5w8fpyl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -68565,6 +68691,8 @@ self: {
        testHaskellDepends = [ base fgl hashable massiv QuickCheck ];
        description = "Directed Graphs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dihaa" = callPackage
@@ -68632,13 +68760,16 @@ self: {
      }) {};
 
   "dimensions" = callPackage
-    ({ mkDerivation, base, Cabal, QuickCheck }:
+    ({ mkDerivation, base, Cabal, constraints-deriving, ghc, QuickCheck
+     }:
      mkDerivation {
        pname = "dimensions";
-       version = "1.0.1.1";
-       sha256 = "18f0b82vgzwk8yf0d8h10ni18jq2x34rgb1lsprlb1xxpw0dskda";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base Cabal QuickCheck ];
+       version = "2.0.0.0";
+       sha256 = "1k0j8lcshscs5cd18i6qqiwb7sjy55mcfha5kl5f4x9nxrnn6xa8";
+       libraryHaskellDepends = [ base constraints-deriving ghc ];
+       testHaskellDepends = [
+         base Cabal constraints-deriving QuickCheck
+       ];
        description = "Safe type-level dimensionality for multidimensional data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69071,6 +69202,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A small library for working with directories";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "disassembler" = callPackage
@@ -69286,19 +69419,17 @@ self: {
 
   "discrimination" = callPackage
     ({ mkDerivation, array, base, containers, contravariant, criterion
-     , deepseq, ghc-prim, hashable, primitive, profunctors, promises
-     , semigroups, transformers, transformers-compat
+     , deepseq, ghc-prim, hashable, integer-gmp, primitive, profunctors
+     , promises, semigroups, transformers, transformers-compat
      , unordered-containers, vector, void
      }:
      mkDerivation {
        pname = "discrimination";
-       version = "0.3";
-       sha256 = "18scvjb4vj1y9mwhanr8h73bs80h1d23m2vrixm48riyg22v5m6n";
-       revision = "1";
-       editedCabalFile = "1p39vcdmv9k9wxlkh49w1dr1isvn2hvhjjbs95qwljpxca74i23g";
+       version = "0.4";
+       sha256 = "085lhsvyp4d135p9yhgyl2s92f4cjdsghk1nsp8mjjddh6hxl20a";
        libraryHaskellDepends = [
          array base containers contravariant deepseq ghc-prim hashable
-         primitive profunctors promises semigroups transformers
+         integer-gmp primitive profunctors promises semigroups transformers
          transformers-compat vector void
        ];
        benchmarkHaskellDepends = [
@@ -71006,19 +71137,22 @@ self: {
   "docusign-client" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
      , data-default, docusign-base-minimal, exceptions, http-client
-     , http-client-tls, http-types, servant-client, text, uuid
+     , http-client-tls, http-types, servant-client, servant-client-core
+     , text, uuid
      }:
      mkDerivation {
        pname = "docusign-client";
-       version = "0.0.2";
-       sha256 = "14dpb1wdi6372b129hi85ksj2klxdvwnq758742akrrhaaz3lisx";
+       version = "0.0.3";
+       sha256 = "0gaqcxdl40fhpik6n8fgs717gri1g90xkhmxii5535513lp67id2";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring data-default
          docusign-base-minimal exceptions http-client http-client-tls
-         http-types servant-client text uuid
+         http-types servant-client servant-client-core text uuid
        ];
        description = "Client bindings for the DocuSign API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "docusign-example" = callPackage
@@ -71748,6 +71882,29 @@ self: {
        broken = true;
      }) {};
 
+  "dprox" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers, dns
+     , hspec, iproute, network, optparse-applicative, streaming-commons
+     , unix, unordered-containers
+     }:
+     mkDerivation {
+       pname = "dprox";
+       version = "0.1.2.1";
+       sha256 = "16z7qx76qy2gjz2j630maa2jgiqhphi8vpphbdywgk1abg7iwhrz";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         attoparsec base bytestring containers dns iproute network
+         optparse-applicative streaming-commons unix unordered-containers
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring containers dns hspec iproute network
+         optparse-applicative streaming-commons unix unordered-containers
+       ];
+       description = "a lightweight DNS proxy server";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "drClickOn" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -71939,6 +72096,8 @@ self: {
          microlens req servant-server text warp
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dropbox-sdk" = callPackage
@@ -72118,20 +72277,6 @@ self: {
     ({ mkDerivation, array, base, containers, QuickCheck, random }:
      mkDerivation {
        pname = "dsp";
-       version = "0.2.4.1";
-       sha256 = "0b748v9v9i7kw2djnb9a89yjw0nhwhb5sfml3x6ajydjhx79a8ik";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ array base containers random ];
-       testHaskellDepends = [ array base containers QuickCheck ];
-       description = "Haskell Digital Signal Processing";
-       license = "GPL";
-     }) {};
-
-  "dsp_0_2_5" = callPackage
-    ({ mkDerivation, array, base, containers, QuickCheck, random }:
-     mkDerivation {
-       pname = "dsp";
        version = "0.2.5";
        sha256 = "1lka6l0xf3p7cb9ikzvszwgr7pl3gjm0s5v312p6k4w1fqqsycl5";
        isLibrary = true;
@@ -72140,7 +72285,6 @@ self: {
        testHaskellDepends = [ array base containers QuickCheck ];
        description = "Haskell Digital Signal Processing";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dstring" = callPackage
@@ -73249,14 +73393,21 @@ self: {
      }) {};
 
   "easytensor" = callPackage
-    ({ mkDerivation, base, Cabal, dimensions, QuickCheck, time }:
+    ({ mkDerivation, base, Cabal, constraints-deriving, dimensions
+     , QuickCheck, template-haskell, time
+     }:
      mkDerivation {
        pname = "easytensor";
-       version = "1.0.1.0";
-       sha256 = "0s1w8ldd25m3jlqysikhzs4ygv4ar476iynbcy18nfn5qh8dvf8k";
-       libraryHaskellDepends = [ base dimensions ];
-       testHaskellDepends = [ base Cabal dimensions QuickCheck ];
-       benchmarkHaskellDepends = [ base dimensions time ];
+       version = "2.0.1.0";
+       sha256 = "018g738yq7ac386ahbl18jnkjzd25jbgb744fg0kxz90734iwwdv";
+       libraryHaskellDepends = [ base constraints-deriving dimensions ];
+       testHaskellDepends = [
+         base Cabal constraints-deriving dimensions QuickCheck
+         template-haskell
+       ];
+       benchmarkHaskellDepends = [
+         base constraints-deriving dimensions time
+       ];
        description = "Pure, type-indexed haskell vector, matrix, and tensor library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73267,8 +73418,8 @@ self: {
     ({ mkDerivation, base, dimensions, easytensor, vulkan-api }:
      mkDerivation {
        pname = "easytensor-vulkan";
-       version = "1.0.1.0";
-       sha256 = "1mbykmlba5wlf66apiy2l2120fkj3wjhijj8b67plgpqrcw1kpp9";
+       version = "2.0.1.0";
+       sha256 = "0j3np8b24kr30bc2lcrvgpnv440a0mzcksjiyf37sp6l9fml65m5";
        libraryHaskellDepends = [ base dimensions easytensor vulkan-api ];
        description = "Use easytensor with vulkan-api";
        license = stdenv.lib.licenses.bsd3;
@@ -73943,8 +74094,8 @@ self: {
      }:
      mkDerivation {
        pname = "egison";
-       version = "3.8.1";
-       sha256 = "1qr4abniwhigx2b5bjgc444r17gbn59qrmafnb1d0vn4p2872n5w";
+       version = "3.8.2";
+       sha256 = "090zhf89faakidbf8kkbsa8ck0rl7fqbpg3fwymjqlafgnfx1jc2";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -75389,6 +75540,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Binding to the Enchant library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) enchant;};
 
   "enclosed-exceptions" = callPackage
@@ -76629,34 +76782,6 @@ self: {
      }:
      mkDerivation {
        pname = "ersatz";
-       version = "0.4.6";
-       sha256 = "0h99i04690c7f1zpkzbh31p641nmxyj7grisxw5yaavdbinagmvq";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         array attoparsec base bytestring containers data-default lens mtl
-         process semigroups temporary transformers unordered-containers
-       ];
-       executableHaskellDepends = [
-         array base containers fail lens mtl parsec semigroups
-       ];
-       testHaskellDepends = [ array base directory doctest filepath mtl ];
-       description = "A monad for expressing SAT or QSAT problems using observable sharing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "ersatz_0_4_7" = callPackage
-    ({ mkDerivation, array, attoparsec, base, bytestring, Cabal
-     , cabal-doctest, containers, data-default, directory, doctest, fail
-     , filepath, lens, mtl, parsec, process, semigroups, temporary
-     , transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "ersatz";
        version = "0.4.7";
        sha256 = "0kddsh02yrpn7xack6xcs0c93hmf4gkmh56zip2n6q7j0xgdrl6d";
        isLibrary = true;
@@ -79068,20 +79193,20 @@ self: {
     ({ mkDerivation, async, base, bytestring, containers, data-default
      , deepseq, directory, exceptions, extensible-effects, filepath
      , hostname, HUnit, lens, monad-control, mtl, network, parallel
-     , pretty-types, process, QuickCheck, safe-exceptions, stm, tasty
-     , tasty-discover, tasty-hunit, text, time, transformers-base
+     , pretty-types, process, QuickCheck, safe-exceptions, stm, tagged
+     , tasty, tasty-discover, tasty-hunit, text, time, transformers-base
      }:
      mkDerivation {
        pname = "extensible-effects-concurrent";
-       version = "0.25.0";
-       sha256 = "135vj952zq4qgs9fsdnkn9rrpkyzkzl5dz6izghyx2i3rfyi7mnf";
+       version = "0.25.1";
+       sha256 = "0c8569lys8pj432kmwcf30gxaxz2mnrqqpg7blk504fa5zrdxs69";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          async base bytestring containers data-default deepseq directory
          exceptions extensible-effects filepath hostname lens monad-control
          mtl network parallel pretty-types process QuickCheck
-         safe-exceptions stm text time transformers-base
+         safe-exceptions stm tagged text time transformers-base
        ];
        executableHaskellDepends = [
          base data-default deepseq directory extensible-effects filepath
@@ -79816,6 +79941,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fast-logger_2_4_16" = callPackage
+    ({ mkDerivation, array, auto-update, base, bytestring, directory
+     , easy-file, filepath, hspec, hspec-discover, text, unix-compat
+     , unix-time
+     }:
+     mkDerivation {
+       pname = "fast-logger";
+       version = "2.4.16";
+       sha256 = "090wv1as2ylr7f90dzhp5g9xzagg03zv0swy1zz08kar9qx3fwhc";
+       libraryHaskellDepends = [
+         array auto-update base bytestring directory easy-file filepath text
+         unix-compat unix-time
+       ];
+       testHaskellDepends = [ base bytestring directory hspec ];
+       testToolDepends = [ hspec-discover ];
+       description = "A fast logging system";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fast-math" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -80768,6 +80913,8 @@ self: {
        pname = "feed";
        version = "1.1.0.0";
        sha256 = "05hiasa6k13v1pzp9cs991zh04njda0ax9868rc7k906b19qqkjg";
+       revision = "1";
+       editedCabalFile = "0bn0vnn6v373ycrbxwqzp1ncmq649h13f2na8q8yf0i68mxampks";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base-compat bytestring old-locale old-time safe text time
@@ -82413,6 +82560,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fixed_0_3" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "fixed";
+       version = "0.3";
+       sha256 = "10l2sh179xarb774q92cff2gkb20rsrlilfwp1fk61rzmz9yn64j";
+       libraryHaskellDepends = [ base ];
+       description = "Signed 15.16 precision fixed point arithmetic";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fixed-length" = callPackage
     ({ mkDerivation, base, non-empty, storable-record, tfp, utility-ht
      }:
@@ -82913,14 +83072,14 @@ self: {
      }) {};
 
   "flags-applicative" = callPackage
-    ({ mkDerivation, base, containers, hspec, mtl, text }:
+    ({ mkDerivation, base, containers, hspec, mtl, network, text }:
      mkDerivation {
        pname = "flags-applicative";
-       version = "0.0.4.4";
-       sha256 = "19iary62l31vhsbmp1y67pwjl8vik4bi5ijxs82gszqp5syg46mh";
+       version = "0.0.4.5";
+       sha256 = "1qwps2f8ifdm0801v0kgg33q9kj3fmhh7pjgqz43ba4b8qb3ni6m";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base containers mtl text ];
+       libraryHaskellDepends = [ base containers mtl network text ];
        executableHaskellDepends = [ base text ];
        testHaskellDepends = [ base hspec text ];
        description = "Applicative flag parsing";
@@ -87227,8 +87386,8 @@ self: {
      }:
      mkDerivation {
        pname = "futhark";
-       version = "0.10.2";
-       sha256 = "0mff8kdjihakaf2gmy3a1ln9ghnqis72gqldssp9b4ahn2xni1v8";
+       version = "0.11.1";
+       sha256 = "0a5682k3gksn08ca5wahk4s8spvjccly5pzq6125ppg976h6w4j8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -90579,25 +90738,6 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-lib-parser";
-       version = "0.20190523";
-       sha256 = "0z023rimlifffds03h25r9m1s5c51wfwra0d0isfiijqfxmq3ki7";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         array base binary bytestring containers deepseq directory filepath
-         ghc-prim hpc pretty process time transformers unix
-       ];
-       libraryToolDepends = [ alex happy ];
-       description = "The GHC API, decoupled from GHC versions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-lib-parser_8_8_0_20190424" = callPackage
-    ({ mkDerivation, alex, array, base, binary, bytestring, containers
-     , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty
-     , process, time, transformers, unix
-     }:
-     mkDerivation {
-       pname = "ghc-lib-parser";
        version = "8.8.0.20190424";
        sha256 = "12gsh994pr13bsybwlravmi21la66dyw74pk74yfw2pnz682wv10";
        enableSeparateDataOutput = true;
@@ -90608,7 +90748,6 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "The GHC API, decoupled from GHC versions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-make" = callPackage
@@ -91701,28 +91840,27 @@ self: {
      }:
      mkDerivation {
        pname = "gi-atk";
-       version = "2.0.15";
-       sha256 = "1vmzby12nvbrka6f44pr1pjwccl0p6s984pxvibajzp72x2knxc9";
+       version = "2.0.18";
+       sha256 = "15lh4pxif4gw3b7lly5135wabj9156jxsylrwsdppkcfcvxlbp26";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi
          haskell-gi-base haskell-gi-overloading text transformers
        ];
        libraryPkgconfigDepends = [ atk ];
-       doHaddock = false;
        description = "Atk bindings";
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) atk;};
 
-  "gi-atk_2_0_17" = callPackage
+  "gi-atk_2_0_19" = callPackage
     ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
      , text, transformers
      }:
      mkDerivation {
        pname = "gi-atk";
-       version = "2.0.17";
-       sha256 = "0xdhc2na8hx56czyhq12470gjsqmy8jdhj7gq77vny26vngpz7xb";
+       version = "2.0.19";
+       sha256 = "014pmfnwbhx7a6gnf79i2rxw1rzqzljz5bcinh998dnfq1y8s5m6";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi
@@ -91758,15 +91896,15 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) cairo;};
 
-  "gi-cairo_1_0_19" = callPackage
+  "gi-cairo_1_0_21" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, containers
      , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
      , transformers
      }:
      mkDerivation {
        pname = "gi-cairo";
-       version = "1.0.19";
-       sha256 = "1sj5887w2yqj6f2srq85yhlrshdyfzlklglrggrvq93zdc3jmady";
+       version = "1.0.21";
+       sha256 = "0w90mapgxs79iy0nwfvdwy79r5msgajn52p9b9q2am63abpcpmyl";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers haskell-gi haskell-gi-base
@@ -91838,8 +91976,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-dbusmenu";
-       version = "0.4.3";
-       sha256 = "0vjkanjc4ylmqv6gihpf78627gigvag83866hyc0gq2a42h0qf75";
+       version = "0.4.5";
+       sha256 = "0439zf2hghnr38h5iwpzip4si2rxp8b7jr76iixvs3mi22ysna56";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi
@@ -91848,6 +91986,8 @@ self: {
        libraryPkgconfigDepends = [ libdbusmenu ];
        description = "Dbusmenu bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libdbusmenu;};
 
   "gi-dbusmenugtk3" = callPackage
@@ -91858,8 +91998,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-dbusmenugtk3";
-       version = "0.4.4";
-       sha256 = "1jcjk4iw6y6pqhl1p9n5zp23gp1yphjk1653jsddvpw1k855kjx9";
+       version = "0.4.6";
+       sha256 = "001agjm5qma5bxqribgh82hqwiqhlnlqq1wknqxlffvggr3ln1ws";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-dbusmenu gi-gdk gi-gdkpixbuf
@@ -91869,6 +92009,8 @@ self: {
        libraryPkgconfigDepends = [ gtk3 libdbusmenu-gtk3 ];
        description = "DbusmenuGtk bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;};
 
   "gi-gdk" = callPackage
@@ -91892,7 +92034,7 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) gtk3;};
 
-  "gi-gdk_3_0_18" = callPackage
+  "gi-gdk_3_0_20" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
      , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3
      , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
@@ -91900,8 +92042,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gdk";
-       version = "3.0.18";
-       sha256 = "1668vyiahl7h9hhhgpc1ay23k2pr01nvwmdq4sfdldpzqf5fkqqk";
+       version = "3.0.20";
+       sha256 = "0ad8802rac65gm5jl0zqwdq24qxva6n8qz935l7gg26waqs7dz73";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib
@@ -91921,28 +92063,27 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gdkpixbuf";
-       version = "2.0.18";
-       sha256 = "1b9ypv07siyr9gry471skc3qlaiwqf055ywz8nib5x39vs6rfcpj";
+       version = "2.0.20";
+       sha256 = "1i3z9yk2zb15pwpgijdvyr08q8yc7yzm92jijgscwly9z6nin6x4";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
          haskell-gi-base haskell-gi-overloading text transformers
        ];
        libraryPkgconfigDepends = [ gdk_pixbuf ];
-       doHaddock = false;
        description = "GdkPixbuf bindings";
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) gdk_pixbuf;};
 
-  "gi-gdkpixbuf_2_0_19" = callPackage
+  "gi-gdkpixbuf_2_0_21" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf
      , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, text, transformers
      }:
      mkDerivation {
        pname = "gi-gdkpixbuf";
-       version = "2.0.19";
-       sha256 = "1zj3m8mlfwrh986109xi1xh5mizmgz9kb3256qsbw2ghb97pyb12";
+       version = "2.0.21";
+       sha256 = "1xxvrqi86n833xs2lmarbv1qyjmm34vvv5cj7lgfmb1ak0h4wihh";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
@@ -91961,8 +92102,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gdkx11";
-       version = "3.0.5";
-       sha256 = "118cdj23vc4ggnkcdl257wp00bi38gm6bic99dsmkbg2f8v7gm7j";
+       version = "3.0.7";
+       sha256 = "1dql529dj041a0ch6z2wky20y7kyavwjb3vhrgsgxcrqdyhxcjkd";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-gdk gi-gio gi-gobject
@@ -91972,6 +92113,8 @@ self: {
        libraryPkgconfigDepends = [ gtk3 ];
        description = "GdkX11 bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtk3;};
 
   "gi-ggit" = callPackage
@@ -91981,8 +92124,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-ggit";
-       version = "1.0.4";
-       sha256 = "0ak054y6lcg7ir7wwp6n6a0as2pvl46x3n96nah3jfgbsh3c58b1";
+       version = "1.0.6";
+       sha256 = "08qz7lbjfyfk6c57xh6f64dsa085ilpajskqgvgrk38rc3cm15ak";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
@@ -91991,6 +92134,8 @@ self: {
        libraryPkgconfigDepends = [ libgit2-glib ];
        description = "libgit2-glib bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libgit2-glib;};
 
   "gi-gio" = callPackage
@@ -92012,15 +92157,15 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
-  "gi-gio_2_0_21" = callPackage
+  "gi-gio_2_0_23" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, glib, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, text, transformers
      }:
      mkDerivation {
        pname = "gi-gio";
-       version = "2.0.21";
-       sha256 = "1w1xqscd3l8qm9kzrn1r1rkybir240paxi7yay9sipn5vf9spqic";
+       version = "2.0.23";
+       sha256 = "04rnisx6la0aki6diqsf044hn2ykcxh6gaijnfwxdizar1crm8w5";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi
@@ -92039,8 +92184,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-girepository";
-       version = "1.0.18";
-       sha256 = "1x98db448v1w2fsanj1djdar7nm4hszdqlq9g40bfj45xf5zb8ja";
+       version = "1.0.20";
+       sha256 = "1y8c2dqvija13y748nz8465knybds5ymx4vvfzgh0ryyq56q9ka8";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi
@@ -92049,6 +92194,8 @@ self: {
        libraryPkgconfigDepends = [ gobject-introspection ];
        description = "GIRepository (gobject-introspection) bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gobject-introspection;};
 
   "gi-glib" = callPackage
@@ -92070,15 +92217,15 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
-  "gi-glib_2_0_19" = callPackage
+  "gi-glib_2_0_21" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, glib
      , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
      , transformers
      }:
      mkDerivation {
        pname = "gi-glib";
-       version = "2.0.19";
-       sha256 = "0yws8cgl810ss0gjnrx3d8w28im7s20v5qv68addr0qf118yl5xl";
+       version = "2.0.21";
+       sha256 = "053bm03x0dwybblzn8qz02dgj65bbxp35imf1j02wiq72gp2jwwf";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers haskell-gi haskell-gi-base
@@ -92097,28 +92244,27 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gobject";
-       version = "2.0.16";
-       sha256 = "1bgn4ywx94py0v213iv7mbjjvvy3y7gvpgw4wpn38s2np7al8y65";
+       version = "2.0.19";
+       sha256 = "1s10417vmrzdbzwkqzxj88c8mvcvicpxgdc9hm1m99c2z132rj23";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib haskell-gi haskell-gi-base
          haskell-gi-overloading text transformers
        ];
        libraryPkgconfigDepends = [ glib ];
-       doHaddock = false;
        description = "GObject bindings";
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
-  "gi-gobject_2_0_18" = callPackage
+  "gi-gobject_2_0_20" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib
      , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
      , transformers
      }:
      mkDerivation {
        pname = "gi-gobject";
-       version = "2.0.18";
-       sha256 = "1p77i466as1kjrjgvsrgcgijkz9w8p4i4afh57h1xzb3yxc8j9wv";
+       version = "2.0.20";
+       sha256 = "1q78imn19g9b6d5ydh5scbpkbi7gn2iafsxqfg0si4zzdvi9iwb0";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib haskell-gi haskell-gi-base
@@ -92137,8 +92283,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gst";
-       version = "1.0.18";
-       sha256 = "0zr7calvl7ivqck2gxgq9ms2g6pwll3bwkr1wdqyz0i96i6hz2pz";
+       version = "1.0.20";
+       sha256 = "119gh8569mcqwjrm8h3kxxqvxvhrgnfnwvvwk6b70dygbh8dgnhi";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi
@@ -92147,6 +92293,8 @@ self: {
        libraryPkgconfigDepends = [ gstreamer ];
        description = "GStreamer bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs.gst_all_1) gstreamer;};
 
   "gi-gstaudio" = callPackage
@@ -92156,8 +92304,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gstaudio";
-       version = "1.0.17";
-       sha256 = "02d4ixjmiv600avmv0lyaynfbywkiahcfyw4zz6ihzlbxwrifznq";
+       version = "1.0.19";
+       sha256 = "1pfp945haffpgrxd8zr8lyqr1dxriqyh3wmw1rhqh5j2rb7li2c3";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
@@ -92166,6 +92314,8 @@ self: {
        libraryPkgconfigDepends = [ gst-plugins-base ];
        description = "GStreamerAudio bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs.gst_all_1) gst-plugins-base;};
 
   "gi-gstbase" = callPackage
@@ -92175,8 +92325,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gstbase";
-       version = "1.0.18";
-       sha256 = "0mxys3r67rcwk9kfg7bk70ppyswafx3mqvmacwrnjqkp187bbw02";
+       version = "1.0.20";
+       sha256 = "195v4j1xj79qwjfm4py0ikgdymfvzd2gxdarpwk51grdshwp94v7";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst haskell-gi
@@ -92185,6 +92335,8 @@ self: {
        libraryPkgconfigDepends = [ gst-plugins-base ];
        description = "GStreamerBase bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs.gst_all_1) gst-plugins-base;};
 
   "gi-gstpbutils" = callPackage
@@ -92195,8 +92347,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gstpbutils";
-       version = "1.0.17";
-       sha256 = "07x8pibdj24qsx90rym4fnd6bp9wfdlkwmmwpkj0wbmk1r22zsyx";
+       version = "1.0.19";
+       sha256 = "1kk3xlpn7syzb9k93b933xykc1jpaf5gsqqhckx69rghrx9x09nv";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst gi-gstaudio
@@ -92217,8 +92369,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gsttag";
-       version = "1.0.17";
-       sha256 = "06rv6c22hlqfnv74gkgwp0yjlr65s6jf9cn9m087i73l5d7x3j1m";
+       version = "1.0.19";
+       sha256 = "0sb3qpp23gj4h2cgx6a5qvd3s8x9z1h0kdkh8wi7x9nnzsykms31";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
@@ -92238,8 +92390,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gstvideo";
-       version = "1.0.18";
-       sha256 = "01q9rl0qvwa9swim1y7gdlsn16pjk9d9z3w09x1sm5mvmilpa2sz";
+       version = "1.0.20";
+       sha256 = "155hysdl97mssjflrk9hq1sgn96v6wn32rdaxvdddmwp880kxrgb";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
@@ -92248,6 +92400,8 @@ self: {
        libraryPkgconfigDepends = [ gst-plugins-base ];
        description = "GStreamerVideo bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs.gst_all_1) gst-plugins-base;};
 
   "gi-gtk" = callPackage
@@ -92271,7 +92425,7 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) gtk3;};
 
-  "gi-gtk_3_0_28" = callPackage
+  "gi-gtk_3_0_30" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
      , gi-pango, gtk3, haskell-gi, haskell-gi-base
@@ -92279,8 +92433,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtk";
-       version = "3.0.28";
-       sha256 = "1v0inwj2adl4qrmnk4i8l3nvsij8w1mxfjlgnwc2b3fk9xbvplq4";
+       version = "3.0.30";
+       sha256 = "19qy6r3r1nnk982zir90nq13h88c3inkq2mrcrlm9r83hhlghc4v";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
@@ -92410,7 +92564,7 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) gtksourceview3;};
 
-  "gi-gtksource_3_0_18" = callPackage
+  "gi-gtksource_3_0_20" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
      , gi-gtk, gi-pango, gtksourceview3, haskell-gi, haskell-gi-base
@@ -92418,8 +92572,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtksource";
-       version = "3.0.18";
-       sha256 = "19rp6qf5i0g2scqgzy1x52hcjmy2g4bprxyyr06b0ba45n57mv24";
+       version = "3.0.20";
+       sha256 = "0wqdmp953f1frkh239346z2qv1sippvijqcn5dy3ryzqaa7flg08";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
@@ -92440,8 +92594,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-handy";
-       version = "0.0.2";
-       sha256 = "1n7klswgpyrpj8wwbavajcz8bh7vwg21sh8f746lfv9dbsxddgm2";
+       version = "0.0.4";
+       sha256 = "1amzr50s610b3zwrx861y2m3llvlnrp2l8197b3r8a6lr2qwyh4v";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject
@@ -92451,6 +92605,8 @@ self: {
        libraryPkgconfigDepends = [ libhandy ];
        description = "libhandy bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libhandy;};
 
   "gi-javascriptcore" = callPackage
@@ -92474,15 +92630,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) webkitgtk;};
 
-  "gi-javascriptcore_4_0_17" = callPackage
+  "gi-javascriptcore_4_0_19" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
      , text, transformers, webkitgtk
      }:
      mkDerivation {
        pname = "gi-javascriptcore";
-       version = "4.0.17";
-       sha256 = "0xkvk8zsk7afyz6k236qmli54c7c0rwrmjd81srwwx4pfp3lg6q9";
+       version = "4.0.19";
+       sha256 = "01idxk90ac7dcssx5hfh45a3gdcrclag0qm1bl67i0zpvnwn1zd4";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi
@@ -92501,8 +92657,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-notify";
-       version = "0.7.17";
-       sha256 = "1ch8bg8l7pzj0rcfm3q6hzfk47ls17bmx71apzpq9sm9svqxb8p3";
+       version = "0.7.19";
+       sha256 = "0kbpvzxxkjm0b33sch5kwb496l92jhmjgdg9ld3qwmlskxljsikf";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gdkpixbuf gi-glib gi-gobject
@@ -92522,8 +92678,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-ostree";
-       version = "1.0.8";
-       sha256 = "16p54x0pryi4dn944kkshbrkrlsjicmqfibzr4hsmjwxn54wx6hl";
+       version = "1.0.10";
+       sha256 = "0z9zqpd1mn06wh9015lk8lm1591ds3znd4acargwqswx0a1ld3s3";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
@@ -92533,6 +92689,8 @@ self: {
        description = "OSTree bindings";
        license = stdenv.lib.licenses.lgpl21;
        platforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) ostree;};
 
   "gi-pango" = callPackage
@@ -92542,8 +92700,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-pango";
-       version = "1.0.16";
-       sha256 = "1x3q1q4ww1v6v42p1wcaghxsja8cigqaqvklkfg4gxyp2f2cdg57";
+       version = "1.0.19";
+       sha256 = "1zrxqi5w9w3lgnmw64pah36y1iwp96vsgnzxwzjizmxc03waaf98";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi
@@ -92558,15 +92716,15 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) cairo; inherit (pkgs) pango;};
 
-  "gi-pango_1_0_18" = callPackage
+  "gi-pango_1_0_20" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, containers
      , gi-glib, gi-gobject, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, pango, text, transformers
      }:
      mkDerivation {
        pname = "gi-pango";
-       version = "1.0.18";
-       sha256 = "1h9qpx87dn956awfhrn90nksjq5lgcvpg02jmqklhd3hbi0y09gx";
+       version = "1.0.20";
+       sha256 = "009r17247iww4pprq9sv3q70bl5pabbh1i6vrs96793sf36fjw6k";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi
@@ -92590,8 +92748,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-pangocairo";
-       version = "1.0.19";
-       sha256 = "002bir4pdgjdsi0psppfh335y07f53g747axm7ip29005mki0y4r";
+       version = "1.0.21";
+       sha256 = "0qxb6zdai8lcy7hqqc0xs6v9pwfnz1ax6bxdybbjl0xm6jysqp52";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-glib gi-gobject gi-pango
@@ -92604,6 +92762,8 @@ self: {
        '';
        description = "PangoCairo bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) cairo; inherit (pkgs) pango;};
 
   "gi-poppler" = callPackage
@@ -92613,8 +92773,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-poppler";
-       version = "0.18.17";
-       sha256 = "14vnqc3nxg5ysajr5g357vhzx7pgag82l9irvkhk9q1y4q1w5akc";
+       version = "0.18.19";
+       sha256 = "0ifpx03jsb1xqqz8cldyi25par557vqg778jbghixyapp77jkpcl";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-gio gi-glib gi-gobject
@@ -92634,8 +92794,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-secret";
-       version = "0.0.7";
-       sha256 = "13qfzglg7r6yhdkxp1jdlmraijw7677cssjh9zyd805xrz6974cx";
+       version = "0.0.9";
+       sha256 = "1pxl30lnmj46jibwfgzrxvhcdkqh5mv5p33l2w2q6mv5j062faf1";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
@@ -92644,6 +92804,8 @@ self: {
        libraryPkgconfigDepends = [ libsecret ];
        description = "Libsecret bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libsecret;};
 
   "gi-soup" = callPackage
@@ -92653,8 +92815,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-soup";
-       version = "2.4.18";
-       sha256 = "1k0x01lkpbk75gp2l9rrjib3hcijdr1d73fi766pnix66cwk7b44";
+       version = "2.4.20";
+       sha256 = "1390n03cb62zfzszw73pnkd3im6pj23a9axbc9dn0d5pavba6ngb";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
@@ -92663,6 +92825,8 @@ self: {
        libraryPkgconfigDepends = [ libsoup ];
        description = "Libsoup bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libsoup;};
 
   "gi-vte" = callPackage
@@ -92686,7 +92850,7 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {vte_291 = pkgs.vte;};
 
-  "gi-vte_2_91_21" = callPackage
+  "gi-vte_2_91_23" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi
      , haskell-gi-base, haskell-gi-overloading, text, transformers
@@ -92694,8 +92858,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-vte";
-       version = "2.91.21";
-       sha256 = "075xibks1cpk61rhjr62gr9iywc1pns0pg6g13gaf2gk68isahkb";
+       version = "2.91.23";
+       sha256 = "104riv8q9lxf5dzhbjkv3z8sh33yqvc6nynspl1nawzpkjkql96f";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject
@@ -92739,8 +92903,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-webkit2";
-       version = "4.0.21";
-       sha256 = "0k236cnfal15vxfb2ggxfdnxpvshyxs50ra3s99h1wjp3h931db0";
+       version = "4.0.23";
+       sha256 = "0jvbxzxfpwcsp125v656anikiwvb3p3xvlpg5vpsyiz63xqnpxxx";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib
@@ -92761,8 +92925,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-webkit2webextension";
-       version = "4.0.20";
-       sha256 = "097x8d3ddvbd26hshd89f9rbv6nyca465v2s3lcbn5g8gdwvcbmf";
+       version = "4.0.22";
+       sha256 = "0qk2mvj8j954h99vrckksyff8rjw9304p9lw3007b2qi6x918j27";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-gobject gi-gtk
@@ -92783,8 +92947,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-wnck";
-       version = "3.0.3";
-       sha256 = "0bnajlayk3flliy6ih34pizl9a1ljhk6hipg1jcj75mw3apqy62i";
+       version = "3.0.5";
+       sha256 = "0bd3lhkjbcrg09y491hpq090p1jwr1xqnnnhjjvhrgsqgzsf073v";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-gdk gi-gdkpixbuf gi-gobject
@@ -92805,8 +92969,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-xlib";
-       version = "2.0.4";
-       sha256 = "1f04kl5fc2cyzjknffkgiynn5k8a2y9ib9rwdm9vxkkl96ff3h5m";
+       version = "2.0.6";
+       sha256 = "0ppcizy17j69cczcfl76ij9p1jcis2xnmhjg45ysqhh0fcnj8jvi";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers haskell-gi haskell-gi-base
@@ -92815,6 +92979,8 @@ self: {
        libraryPkgconfigDepends = [ xlibsWrapper ];
        description = "xlib bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) xlibsWrapper;};
 
   "giak" = callPackage
@@ -92858,8 +93024,8 @@ self: {
      }:
      mkDerivation {
        pname = "ginger";
-       version = "0.8.4.1";
-       sha256 = "0mvqp9p4lz4qzdiymv91858ywrkjjbra0ah0hryya9h4jdnbid5p";
+       version = "0.9.0.0";
+       sha256 = "14racx3vadxypk8h5cwj2qhg5fpc2pma6gmwlmr2ga6yswpgkl29";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -93850,6 +94016,8 @@ self: {
        ];
        description = "Wiki using happstack, git or darcs, and pandoc";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gitlab-api" = callPackage
@@ -94114,8 +94282,8 @@ self: {
      }:
      mkDerivation {
        pname = "gitter";
-       version = "0.4";
-       sha256 = "0lvsjpb1iakpbvh8prnwd90p8fp7hhj5120yp2w5ra9pm5fqcl49";
+       version = "0.5";
+       sha256 = "13whv4bv7b69vzq1c6xdcim9mlsr4qsnsjiwv36g7fykcvbr72rl";
        libraryHaskellDepends = [
          aeson base bytestring exceptions lens lens-aeson mtl text wreq
        ];
@@ -94183,8 +94351,8 @@ self: {
        pname = "gl";
        version = "0.8.0";
        sha256 = "0f8l1ra05asqjnk97sliqb3wqvr6lic18rfs1f9dm1kw2lw2hkda";
-       revision = "2";
-       editedCabalFile = "0zbpf559ajlcwnylpbm6dbi4m3g3s08fciqfp5am3i2vrmw0wpi9";
+       revision = "3";
+       editedCabalFile = "0q8d4237ds78y4p35xl2arlmmpgs2ag7krw9chby6q9dcs00zxrl";
        setupHaskellDepends = [
          base Cabal containers directory filepath hxt transformers
        ];
@@ -94568,6 +94736,8 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "Console IRC client";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gll" = callPackage
@@ -98342,6 +98512,31 @@ self: {
        broken = true;
      }) {};
 
+  "grab" = callPackage
+    ({ mkDerivation, base, criterion, hedgehog }:
+     mkDerivation {
+       pname = "grab";
+       version = "0.0.0.1";
+       sha256 = "1jsi8g538w4a441w412siqvrkzmvx8sff74nax93b5paiaqfwcrf";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hedgehog ];
+       benchmarkHaskellDepends = [ base criterion ];
+       description = "Applicative non-linear consumption";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "grab-form" = callPackage
+    ({ mkDerivation, base, containers, grab, hedgehog, text }:
+     mkDerivation {
+       pname = "grab-form";
+       version = "0.0.0.1";
+       sha256 = "0pgg7f7nxrw0rxwgvfkcqwz11qx1g92n6hxghrqy8pz9cxirh1np";
+       libraryHaskellDepends = [ base containers grab text ];
+       testHaskellDepends = [ base containers hedgehog text ];
+       description = "Applicative parsers for form parameter lists";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "graceful" = callPackage
     ({ mkDerivation, base, directory, filepath, hspec, network, process
      , stm, unix
@@ -98970,8 +99165,8 @@ self: {
      }:
      mkDerivation {
        pname = "graphite";
-       version = "0.10.0.0";
-       sha256 = "0cgsn0nwixgcamg9yp4qsz88dmm3rdmkcl7ahlnpvksgw7llnxa8";
+       version = "0.10.0.1";
+       sha256 = "1aqadpg3jm9f1z43ylpmh512gi320kqnnfl6qksp2l1w26lnd0vs";
        libraryHaskellDepends = [
          base bytestring cassava containers deepseq graphviz hashable
          process QuickCheck random semigroups text unordered-containers
@@ -99433,6 +99628,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "greskell-core_0_1_2_6" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, doctest
+     , doctest-discover, hashable, hspec, QuickCheck, scientific
+     , semigroups, text, unordered-containers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "greskell-core";
+       version = "0.1.2.6";
+       sha256 = "0p68kwcwccmqn58dx1vyy4k1sc9zk2n2l8hiligik6zpbv4vmkdz";
+       libraryHaskellDepends = [
+         aeson base containers hashable scientific semigroups text
+         unordered-containers uuid vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring doctest doctest-discover hspec QuickCheck
+         text unordered-containers vector
+       ];
+       description = "Haskell binding for Gremlin graph query language - core data types and tools";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "greskell-websocket" = callPackage
     ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring
      , greskell-core, hashtables, hspec, safe-exceptions, stm, text
@@ -100385,6 +100602,8 @@ self: {
        ];
        description = "A standalone StatusNotifierItem/AppIndicator tray";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtk3;};
 
   "gtk-strut" = callPackage
@@ -105002,23 +105221,6 @@ self: {
      }:
      mkDerivation {
        pname = "happy";
-       version = "1.19.10";
-       sha256 = "1vfaa8x6asmyabmd4i1ygyl2a8501h97xhkx3ip3jnqhjxn61sr2";
-       isLibrary = false;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal directory filepath ];
-       executableHaskellDepends = [ array base containers mtl ];
-       testHaskellDepends = [ base process ];
-       description = "Happy is a parser generator for Haskell";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "happy_1_19_11" = callPackage
-    ({ mkDerivation, array, base, Cabal, containers, directory
-     , filepath, mtl, process
-     }:
-     mkDerivation {
-       pname = "happy";
        version = "1.19.11";
        sha256 = "0xszsjl4943kp7cjzlpf7g5lx6yzqxj8xmgzy4s0m66vs2gd354h";
        isLibrary = false;
@@ -105028,7 +105230,6 @@ self: {
        testHaskellDepends = [ base process ];
        description = "Happy is a parser generator for Haskell";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happy-meta" = callPackage
@@ -106746,7 +106947,7 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;};
 
-  "haskell-gi_0_22_1" = callPackage
+  "haskell-gi_0_22_4" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers
      , directory, doctest, filepath, glib, gobject-introspection
      , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe
@@ -106754,8 +106955,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-gi";
-       version = "0.22.1";
-       sha256 = "0bjwbfsai1mpkca670qzfl9f59bz4b0k14asifadhg5g9sandgqr";
+       version = "0.22.4";
+       sha256 = "0ay9q7a3bmjif4dpp0dnqxxrdz1d9zq1a7la6298w89bkyhlmaf5";
        libraryHaskellDepends = [
          attoparsec base bytestring Cabal containers directory filepath
          haskell-gi-base mtl pretty-show process regex-tdfa safe semigroups
@@ -106780,12 +106981,12 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
-  "haskell-gi-base_0_22_0" = callPackage
+  "haskell-gi-base_0_22_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, glib, text }:
      mkDerivation {
        pname = "haskell-gi-base";
-       version = "0.22.0";
-       sha256 = "03lihqjy46igja2vzw7avhx635iww5v97wj12n5yhqhqqh5j50aq";
+       version = "0.22.2";
+       sha256 = "0rv46x4xgsdk25s1vd3zm95cjgc5vy4rwsbaxk1hyc5ga5qjyzx0";
        libraryHaskellDepends = [ base bytestring containers text ];
        libraryPkgconfigDepends = [ glib ];
        description = "Foundation for libraries generated by haskell-gi";
@@ -106982,33 +107183,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "haskell-lsp_0_13_0_0" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, containers
-     , data-default, directory, filepath, hashable, haskell-lsp-types
-     , hslogger, hspec, hspec-discover, lens, mtl, network-uri, parsec
-     , QuickCheck, quickcheck-instances, rope-utf16-splay, sorted-list
-     , stm, temporary, text, time, transformers, unordered-containers
-     , vector
+  "haskell-lsp_0_14_0_0" = callPackage
+    ({ mkDerivation, aeson, async, attoparsec, base, bytestring
+     , containers, data-default, directory, filepath, hashable
+     , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl
+     , network-uri, QuickCheck, quickcheck-instances, rope-utf16-splay
+     , sorted-list, stm, temporary, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "haskell-lsp";
-       version = "0.13.0.0";
-       sha256 = "0mxmgw32j9fzr63qj1pviszcd2fb3mqdxnhz6ghv83lgj5j8517c";
-       revision = "1";
-       editedCabalFile = "0qni50rymq7qx95i6jcj3mb49zxc123ciyyih82vvm15gks62fp2";
+       version = "0.14.0.0";
+       sha256 = "15dnvsfyj18rac9kn7hgi1v7zb26qyy28qykh2bdnzyzvd9rzy94";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson async base bytestring containers data-default directory
-         filepath hashable haskell-lsp-types hslogger lens mtl network-uri
-         parsec rope-utf16-splay sorted-list stm temporary text time
+         aeson async attoparsec base bytestring containers data-default
+         directory filepath hashable haskell-lsp-types hslogger lens mtl
+         network-uri rope-utf16-splay sorted-list stm temporary text time
          unordered-containers
        ];
-       executableHaskellDepends = [
-         aeson base bytestring containers data-default directory filepath
-         hslogger lens mtl network-uri parsec rope-utf16-splay stm text time
-         transformers unordered-containers vector
-       ];
        testHaskellDepends = [
          aeson base bytestring containers data-default directory filepath
          hashable hspec lens network-uri QuickCheck quickcheck-instances
@@ -107061,17 +107254,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "haskell-lsp-types_0_13_0_0" = callPackage
+  "haskell-lsp-types_0_14_0_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, deepseq
      , filepath, hashable, lens, network-uri, scientific, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "haskell-lsp-types";
-       version = "0.13.0.0";
-       sha256 = "18np1n5qvy5020vzvvcpj431fn4dbnd3zgzqngfnhv604yymywx8";
-       revision = "2";
-       editedCabalFile = "02yh8lkxbr7pzr97n5w2waz9cr1fisb8c0k16ajibhj57y3dn8il";
+       version = "0.14.0.1";
+       sha256 = "1zrgv1wp8b1vb3adp6l1xz0clig2g2s62icvpwi86cbip1i76fl4";
        libraryHaskellDepends = [
          aeson base bytestring data-default deepseq filepath hashable lens
          network-uri scientific text unordered-containers
@@ -109146,12 +109337,12 @@ self: {
      , haskoin-node, hspec, hspec-discover, http-types, monad-logger
      , mtl, network, nqe, optparse-applicative, random, resourcet
      , rocksdb-haskell, rocksdb-query, scotty, string-conversions, text
-     , time, transformers, unliftio, unordered-containers
+     , time, transformers, unliftio, unordered-containers, uuid
      }:
      mkDerivation {
        pname = "haskoin-store";
-       version = "0.16.2";
-       sha256 = "1dwb6vmrfj0yjhav7l8axvqmgdadcpj8z7ma8sqpvi7842yapd77";
+       version = "0.16.4";
+       sha256 = "08kgm2r9kr15gn2mpbjg6bi64pawz8lrav5565zg4lp5k530vwf9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -109159,21 +109350,21 @@ self: {
          hashable haskoin-core haskoin-node http-types monad-logger mtl
          network nqe random resourcet rocksdb-haskell rocksdb-query scotty
          string-conversions text time transformers unliftio
-         unordered-containers
+         unordered-containers uuid
        ];
        executableHaskellDepends = [
          aeson base bytestring cereal conduit containers data-default
          filepath hashable haskoin-core haskoin-node http-types monad-logger
          mtl network nqe optparse-applicative random resourcet
          rocksdb-haskell rocksdb-query scotty string-conversions text time
-         transformers unliftio unordered-containers
+         transformers unliftio unordered-containers uuid
        ];
        testHaskellDepends = [
          aeson base bytestring cereal conduit containers data-default
          hashable haskoin-core haskoin-node hspec http-types monad-logger
          mtl network nqe random resourcet rocksdb-haskell rocksdb-query
          scotty string-conversions text time transformers unliftio
-         unordered-containers
+         unordered-containers uuid
        ];
        testToolDepends = [ hspec-discover ];
        description = "Storage and index for Bitcoin and Bitcoin Cash";
@@ -110138,6 +110329,8 @@ self: {
        ];
        description = "An abstraction for simultaneous fetching from multiple PostgreSQL cursors";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasql-dynamic-statements" = callPackage
@@ -110935,6 +111128,8 @@ self: {
        ];
        description = "XML-RPC client and server library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haxr-th" = callPackage
@@ -112089,8 +112284,8 @@ self: {
      }:
      mkDerivation {
        pname = "heatitup";
-       version = "0.5.3.3";
-       sha256 = "1bqindh91i4ra67516nl0c5i98fgm9bwsjy7vv0qjzmfqk3bqp84";
+       version = "0.5.4.0";
+       sha256 = "07qwsmk2hszm2q7ky4avmpwmd2j4xqprid7kvcrhh1s6d9f8nbz2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -112117,8 +112312,8 @@ self: {
      }:
      mkDerivation {
        pname = "heatitup-complete";
-       version = "0.5.3.3";
-       sha256 = "1djs5hni6s4mzs4fniamfz6k7590l34mgvd1d2kglmdpb5m22pcz";
+       version = "0.5.4.0";
+       sha256 = "0zxyxwvpj0mkz10y4rf793cpxmd0bmlz3d4p8c0icgainacs6dsg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -112358,20 +112553,23 @@ self: {
      }) {};
 
   "hedgehog-classes" = callPackage
-    ({ mkDerivation, aeson, base, containers, hedgehog, pretty-show
-     , semirings, transformers, wl-pprint-annotated
+    ({ mkDerivation, aeson, base, binary, containers, hedgehog
+     , pretty-show, semirings, silently, transformers
+     , wl-pprint-annotated
      }:
      mkDerivation {
        pname = "hedgehog-classes";
-       version = "0.1.2";
-       sha256 = "0lvlsv7mgmys03v4xnjvfb19426xa1vwfnrbpf0yg8h0pv6hz7wv";
+       version = "0.2.1";
+       sha256 = "1hkkbmsn397a73aqaasi2c076nx9g8s8vsdp6wdqq33a96q1b0mq";
        libraryHaskellDepends = [
-         aeson base containers hedgehog pretty-show semirings transformers
-         wl-pprint-annotated
+         aeson base binary containers hedgehog pretty-show semirings
+         silently transformers wl-pprint-annotated
        ];
-       testHaskellDepends = [ aeson base containers hedgehog ];
+       testHaskellDepends = [ aeson base binary containers hedgehog ];
        description = "Hedgehog will eat your typeclass bugs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hedgehog-corpus" = callPackage
@@ -114655,6 +114853,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hi-file-parser" = callPackage
+    ({ mkDerivation, base, binary, bytestring, hspec, rio, vector }:
+     mkDerivation {
+       pname = "hi-file-parser";
+       version = "0.1.0.0";
+       sha256 = "09gs26z0jvkkhb1r43gj27pq0k5fc4i6fpr59g397vz4sm86gb2l";
+       revision = "1";
+       editedCabalFile = "1hylfzkd42mqap2ydh4wq96vwbblyp26zb8wwyn63yl72swbww23";
+       libraryHaskellDepends = [ base binary bytestring rio vector ];
+       testHaskellDepends = [ base binary bytestring hspec rio vector ];
+       description = "Parser for GHC's hi files";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hi3status" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, dbus, dyre
      , network, prefix-units, process, regex-pcre-builtin, text, time
@@ -114952,8 +115164,8 @@ self: {
      }:
      mkDerivation {
        pname = "higgledy";
-       version = "0.2.0.1";
-       sha256 = "1rbx7f3gkby3jx772p63z02hf61xa5amaqm76ba2lfd24s62g228";
+       version = "0.2.1.0";
+       sha256 = "087p68h4sjjbmjszh48ayidmnvgvhg4k2fnw27z28p37xdp4ys21";
        libraryHaskellDepends = [ barbies base generic-lens QuickCheck ];
        testHaskellDepends = [
          barbies base doctest hspec lens QuickCheck
@@ -116231,6 +116443,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hkgr" = callPackage
+    ({ mkDerivation, base, directory, filepath, simple-cmd
+     , simple-cmd-args
+     }:
+     mkDerivation {
+       pname = "hkgr";
+       version = "0.0";
+       sha256 = "1qd4xccgmhh6lhx5bl9fbw6ii4469qfln2bh0rqlxvyhpk94rad0";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base directory filepath simple-cmd simple-cmd-args
+       ];
+       description = "Simple Hackage release workflow for package maintainers";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "hkt" = callPackage
     ({ mkDerivation, base, hspec, inspection-testing, protolude, text
      }:
@@ -116749,10 +116980,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlint";
-       version = "2.1.22";
-       sha256 = "0v4kqpbvpsmgsl7jrkcbxjl4mrr7wx3qxh4rn3715dfn6rlqxblz";
-       revision = "1";
-       editedCabalFile = "0x1dpinkm4kw0x5d7wj0bb4fkccfnsifnbhc7n1g7gn012z00wd9";
+       version = "2.1.24";
+       sha256 = "0x8qyg8g7l6rx7l2gccf9pydkfh0wd3cxak1vrg7kqsx2hmd2s06";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -117074,6 +117303,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) gsl;};
 
+  "hmatrix-gsl-stats_0_4_1_8" = callPackage
+    ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex
+     , vector
+     }:
+     mkDerivation {
+       pname = "hmatrix-gsl-stats";
+       version = "0.4.1.8";
+       sha256 = "1cq049sj3q5r06x7i35hqrkf2jc4p4kfi9zv0jmi2vp7w4644i5q";
+       libraryHaskellDepends = [
+         base binary hmatrix storable-complex vector
+       ];
+       libraryPkgconfigDepends = [ gsl ];
+       description = "GSL Statistics interface";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) gsl;};
+
   "hmatrix-mmap" = callPackage
     ({ mkDerivation, base, hmatrix, mmap }:
      mkDerivation {
@@ -120025,6 +120271,29 @@ self: {
        broken = true;
      }) {};
 
+  "hprox" = callPackage
+    ({ mkDerivation, async, base, base64-bytestring, binary, bytestring
+     , case-insensitive, conduit, conduit-extra, http-client
+     , http-reverse-proxy, http-types, optparse-applicative, tls, unix
+     , wai, wai-extra, warp, warp-tls
+     }:
+     mkDerivation {
+       pname = "hprox";
+       version = "0.1.0.2";
+       sha256 = "0ajyv9zmi6nr8add7admfxavd691g3rvyy8ll6gra6hhpn0lwp0m";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         async base base64-bytestring binary bytestring case-insensitive
+         conduit conduit-extra http-client http-reverse-proxy http-types
+         optparse-applicative tls unix wai wai-extra warp warp-tls
+       ];
+       description = "a lightweight HTTP proxy server, and more";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "hps" = callPackage
     ({ mkDerivation, base, filepath, hcg-minus, process }:
      mkDerivation {
@@ -120282,6 +120551,8 @@ self: {
        testHaskellDepends = [ base process tasty tasty-hunit ];
        description = "File size in human readable format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hricket" = callPackage
@@ -122340,6 +122611,20 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "hsemail_2_1_0" = callPackage
+    ({ mkDerivation, base, hspec, mtl, parsec, time }:
+     mkDerivation {
+       pname = "hsemail";
+       version = "2.1.0";
+       sha256 = "1m6x2lzjfs31pl4c0jz8xbhdcs13p5fxf58yymcahhw4aqmx12x6";
+       libraryHaskellDepends = [ base mtl parsec time ];
+       testHaskellDepends = [ base hspec parsec time ];
+       description = "Parsec parsers for the RFC2822 Internet Message format";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
+     }) {};
+
   "hsemail-ns" = callPackage
     ({ mkDerivation, base, doctest, hspec, mtl, old-time, parsec }:
      mkDerivation {
@@ -122886,8 +123171,6 @@ self: {
        testHaskellDepends = [ base hslua tasty tasty-hunit text ];
        description = "Lua module wrapper around Haskell's System module";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hslua-module-text" = callPackage
@@ -126006,31 +126289,14 @@ self: {
      }:
      mkDerivation {
        pname = "http-directory";
-       version = "0.1.2";
-       sha256 = "0p6m2xlgrs9sgn2nsn85z6gawa9509lxbsw44kdfxya3gcgyg2rp";
-       libraryHaskellDepends = [
-         base bytestring html-conduit http-client http-client-tls http-date
-         http-types text time xml-conduit
-       ];
-       description = "http directory listing library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "http-directory_0_1_3" = callPackage
-    ({ mkDerivation, base, bytestring, html-conduit, http-client
-     , http-client-tls, http-date, http-types, text, time, xml-conduit
-     }:
-     mkDerivation {
-       pname = "http-directory";
-       version = "0.1.3";
-       sha256 = "0z73qa8hccjk0njajsa7i9704p4ml2wl5kkmf53lpr0bgvh3v1zk";
+       version = "0.1.4";
+       sha256 = "0cs42s38kg4334j345balxl6bkqx12n5d7arsxbh9l4wg8rlca3g";
        libraryHaskellDepends = [
          base bytestring html-conduit http-client http-client-tls http-date
          http-types text time xml-conduit
        ];
        description = "http directory listing library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-dispatch" = callPackage
@@ -126052,6 +126318,34 @@ self: {
        broken = true;
      }) {};
 
+  "http-download" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring, conduit
+     , conduit-extra, cryptonite, cryptonite-conduit, directory
+     , exceptions, filepath, hspec, hspec-discover, http-client
+     , http-conduit, http-types, memory, path, path-io, retry, rio
+     , rio-prettyprint
+     }:
+     mkDerivation {
+       pname = "http-download";
+       version = "0.1.0.0";
+       sha256 = "0wip7l6cls734ag306s5l0683qqh273b3lk5ibig66racmysjqyb";
+       revision = "2";
+       editedCabalFile = "0aprl9vnc0i96qbdyjlw5v30aq91nbv65yxd71jca8vbkij3v7iv";
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring conduit conduit-extra cryptonite
+         cryptonite-conduit directory exceptions filepath http-client
+         http-conduit http-types memory path path-io retry rio
+         rio-prettyprint
+       ];
+       testHaskellDepends = [
+         base cryptonite hspec hspec-discover http-client path path-io retry
+         rio rio-prettyprint
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Verified downloads with retries";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "http-encodings" = callPackage
     ({ mkDerivation, base, bytestring, HTTP, iconv, mime, mtl, parsec
      , text, utf8-string, zlib
@@ -126506,6 +126800,8 @@ self: {
        ];
        description = "An HTTP client using io-streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-test" = callPackage
@@ -126861,6 +127157,8 @@ self: {
        libraryHaskellDepends = [ base containers haxr mtl ];
        description = "A haskell wrap for Ubigraph";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hubris" = callPackage
@@ -127528,6 +127826,35 @@ self: {
        broken = true;
      }) {};
 
+  "hw-balancedparens_0_2_2_0" = callPackage
+    ({ mkDerivation, base, criterion, deepseq, hedgehog, hspec
+     , hspec-discover, hw-bits, hw-excess, hw-fingertree
+     , hw-hspec-hedgehog, hw-prim, hw-rankselect-base, transformers
+     , vector
+     }:
+     mkDerivation {
+       pname = "hw-balancedparens";
+       version = "0.2.2.0";
+       sha256 = "105s6slx9h3rx6r6iqp4c4mjpp674h4fss7p40bvv18mgxki9pzz";
+       libraryHaskellDepends = [
+         base deepseq hedgehog hspec hw-bits hw-excess hw-fingertree hw-prim
+         hw-rankselect-base vector
+       ];
+       testHaskellDepends = [
+         base hedgehog hspec hw-bits hw-hspec-hedgehog hw-prim
+         hw-rankselect-base transformers vector
+       ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [
+         base criterion hedgehog hw-bits hw-prim vector
+       ];
+       doHaddock = false;
+       description = "Balanced parentheses";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "hw-bits" = callPackage
     ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec
      , hspec-discover, hw-hspec-hedgehog, hw-int, hw-prim
@@ -127537,6 +127864,8 @@ self: {
        pname = "hw-bits";
        version = "0.7.0.6";
        sha256 = "0c3bfr4x52fvvp3yin54xbfxz7nq936v2ac89vcim1gscyw51hvm";
+       revision = "1";
+       editedCabalFile = "0yl5b2qcrb2bjncwv2k9j006582cwxmpfgsggcyk5vw7i6iwhmhb";
        libraryHaskellDepends = [
          base bytestring hw-int hw-prim hw-string-parse safe vector
        ];
@@ -127715,6 +128044,42 @@ self: {
        broken = true;
      }) {};
 
+  "hw-eliasfano_0_1_1_0" = callPackage
+    ({ mkDerivation, base, binary, bytestring, criterion, deepseq
+     , generic-lens, hedgehog, hspec, hspec-discover, hw-bits
+     , hw-hedgehog, hw-hspec-hedgehog, hw-int, hw-packed-vector, hw-prim
+     , hw-rankselect, hw-rankselect-base, lens, mmap
+     , optparse-applicative, vector
+     }:
+     mkDerivation {
+       pname = "hw-eliasfano";
+       version = "0.1.1.0";
+       sha256 = "0q3lrpw72krsbfbykjkkm55aca43ravyl4b1d3k0wgh5wv340a3v";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base deepseq hw-bits hw-int hw-packed-vector hw-prim hw-rankselect
+         hw-rankselect-base vector
+       ];
+       executableHaskellDepends = [
+         base binary bytestring generic-lens hw-packed-vector lens
+         optparse-applicative vector
+       ];
+       testHaskellDepends = [
+         base hedgehog hspec hw-bits hw-hedgehog hw-hspec-hedgehog hw-int
+         hw-packed-vector hw-prim vector
+       ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion hedgehog hspec hw-bits hw-hedgehog
+         hw-hspec-hedgehog hw-int hw-packed-vector hw-prim mmap vector
+       ];
+       description = "Elias-Fano";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "hw-excess" = callPackage
     ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec
      , hspec-discover, hw-bits, hw-hspec-hedgehog, hw-prim
@@ -127741,21 +128106,49 @@ self: {
        broken = true;
      }) {};
 
+  "hw-excess_0_2_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec
+     , hspec-discover, hw-bits, hw-hspec-hedgehog, hw-prim
+     , hw-rankselect-base, QuickCheck, safe, vector
+     }:
+     mkDerivation {
+       pname = "hw-excess";
+       version = "0.2.2.0";
+       sha256 = "07d6q5m98z6r7p4hhzzm8ihn9sbd05hhf40a0hcq3ixxrdz7yyrb";
+       libraryHaskellDepends = [
+         base hw-bits hw-prim hw-rankselect-base safe vector
+       ];
+       testHaskellDepends = [
+         base hedgehog hspec hw-bits hw-hspec-hedgehog hw-prim QuickCheck
+         vector
+       ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion hw-prim vector
+       ];
+       description = "Excess";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "hw-fingertree" = callPackage
     ({ mkDerivation, base, deepseq, hedgehog, hspec, hspec-discover
-     , hw-hspec-hedgehog
+     , hw-hspec-hedgehog, hw-prim
      }:
      mkDerivation {
        pname = "hw-fingertree";
-       version = "0.1.0.3";
-       sha256 = "0r5bbhyc9gwr23s2h39qfdrsvjil56k2jfj8897hswn2q1fxcpjv";
-       libraryHaskellDepends = [ base deepseq ];
+       version = "0.1.1.0";
+       sha256 = "096lj6bhyk3pyal3jnif8cm6yprir1kpr5cvjl576kbfhyxdnhmy";
+       libraryHaskellDepends = [ base deepseq hw-prim ];
        testHaskellDepends = [
          base deepseq hedgehog hspec hw-hspec-hedgehog
        ];
        testToolDepends = [ hspec-discover ];
        description = "Generic finger-tree structure, with example instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hw-fingertree-strict" = callPackage
@@ -127856,21 +128249,31 @@ self: {
        broken = true;
      }) {};
 
-  "hw-ip_2_3_1_0" = callPackage
-    ({ mkDerivation, appar, base, containers, generic-lens, hedgehog
-     , hspec, hw-bits, hw-hspec-hedgehog, iproute, text
+  "hw-ip_2_3_1_1" = callPackage
+    ({ mkDerivation, appar, base, binary, bytestring, containers
+     , generic-lens, hedgehog, hspec, hspec-discover, hw-bits
+     , hw-hspec-hedgehog, iproute, lens, optparse-applicative, text
      }:
      mkDerivation {
        pname = "hw-ip";
-       version = "2.3.1.0";
-       sha256 = "19a2z6lx064y4y2qzhfzzwwpy4hisf86a57ah1f9jjjrvnxr1363";
+       version = "2.3.1.1";
+       sha256 = "15y5zbbyh0fkz5b8gv027irjpimmcx5fzilhaai83hcnnv0kbamf";
+       revision = "1";
+       editedCabalFile = "0h56lr70p90xzw9qx2d91rynn6iywhdnd725bjx208pg6mz4ia86";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          appar base containers generic-lens hw-bits iproute text
        ];
+       executableHaskellDepends = [
+         appar base binary bytestring generic-lens lens optparse-applicative
+         text
+       ];
        testHaskellDepends = [
          appar base generic-lens hedgehog hspec hw-bits hw-hspec-hedgehog
          text
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Library for manipulating IP addresses and CIDR blocks";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127926,6 +128329,8 @@ self: {
        pname = "hw-json";
        version = "1.0.0.2";
        sha256 = "0lb38kfxhamvdhp6z3aw4as57nc6jxf6wj7nr3lmiry6h2gx15js";
+       revision = "1";
+       editedCabalFile = "1laxwrcjdjrpym4gghnqa39xvdvbxsp2sbpzcc703ac3kj7v2b6h";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -128139,22 +128544,30 @@ self: {
        broken = true;
      }) {};
 
-  "hw-parser" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, hw-prim, text }:
+  "hw-packed-vector_0_0_0_2" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, hedgehog, hspec
+     , hspec-discover, hw-bits, hw-hedgehog, hw-hspec-hedgehog, hw-prim
+     , vector
+     }:
      mkDerivation {
-       pname = "hw-parser";
-       version = "0.1.0.0";
-       sha256 = "14ck19m0fizv7zpqxnpgv7fah9x3fp0p5ax5a5zxr5s52b52mq2x";
+       pname = "hw-packed-vector";
+       version = "0.0.0.2";
+       sha256 = "1a4avk679l8c1a0hc3ziy508b8y94afr16av64cfldgbc904qr8y";
        libraryHaskellDepends = [
-         attoparsec base bytestring hw-prim text
+         base bytestring deepseq hw-bits hw-prim vector
        ];
-       description = "Simple parser support";
+       testHaskellDepends = [
+         base bytestring hedgehog hspec hw-bits hw-hedgehog
+         hw-hspec-hedgehog hw-prim vector
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Packed Vector";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
      }) {};
 
-  "hw-parser_0_1_0_1" = callPackage
+  "hw-parser" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, hedgehog, hspec
      , hspec-discover, hw-hspec-hedgehog, hw-prim, text
      }:
@@ -128162,6 +128575,8 @@ self: {
        pname = "hw-parser";
        version = "0.1.0.1";
        sha256 = "0df3238y4ld9j9w4p1x4lcv13lip9cf3fqn88z98xqjqmfzjdffn";
+       revision = "1";
+       editedCabalFile = "1nf0s726vr90dggcjxp1qz1msnvckjj908rsc4f991524gz4ygh7";
        libraryHaskellDepends = [
          attoparsec base bytestring hw-prim text
        ];
@@ -128180,10 +128595,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-prim";
-       version = "0.6.2.24";
-       sha256 = "17bm69hva7cb6pf8qx4w027bckhgcci4mrqlfpf0vkbbzg3vm3wf";
-       revision = "1";
-       editedCabalFile = "0cb3d4i765jhxwmmak84v1qzlbiggm5n1awr2djfsd2nr4q6xqbi";
+       version = "0.6.2.25";
+       sha256 = "1pdl26vpy4pss90b48xnhc4n29310clphf4kfp5fppvnpnxrr5bs";
        libraryHaskellDepends = [
          base bytestring ghc-prim mmap semigroups transformers vector
        ];
@@ -128201,15 +128614,15 @@ self: {
        broken = true;
      }) {};
 
-  "hw-prim_0_6_2_25" = callPackage
+  "hw-prim_0_6_2_26" = callPackage
     ({ mkDerivation, base, bytestring, criterion, directory, exceptions
      , ghc-prim, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog
      , mmap, QuickCheck, semigroups, transformers, vector
      }:
      mkDerivation {
        pname = "hw-prim";
-       version = "0.6.2.25";
-       sha256 = "1pdl26vpy4pss90b48xnhc4n29310clphf4kfp5fppvnpnxrr5bs";
+       version = "0.6.2.26";
+       sha256 = "1bim58jvvf68cxvjpy1d8zqcry4jicns9a2rzk4xdr8p2xi3h2xj";
        libraryHaskellDepends = [
          base bytestring ghc-prim mmap semigroups transformers vector
        ];
@@ -128295,6 +128708,8 @@ self: {
        pname = "hw-rankselect";
        version = "0.13.0.0";
        sha256 = "13cdsrg7akizf5gcjvpwr8mwhl6ds9n3y7ql559w52xy5s8viqzv";
+       revision = "1";
+       editedCabalFile = "17f9zdy7620d36mrrcakpr9rhzzr7rkv8hd5n47cqllmhzvns5mg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -128329,6 +128744,8 @@ self: {
        pname = "hw-rankselect-base";
        version = "0.3.2.1";
        sha256 = "0q4kywln4bls2dvazhqh2acw4yqnabnx0mdkhldgg70q8amnq2nj";
+       revision = "1";
+       editedCabalFile = "1sx2ibjz7anhiir76ycf7bmm0s16adn7l705clck0fk53dz3h8ds";
        libraryHaskellDepends = [
          base bits-extra hw-bits hw-int hw-prim hw-string-parse safe vector
        ];
@@ -128453,6 +128870,8 @@ self: {
        pname = "hw-uri";
        version = "0.0.0.1";
        sha256 = "11cibgdyk4r1ad6hamb81ffcf27yar9w8045533f2sr6vfnhrj6m";
+       revision = "1";
+       editedCabalFile = "0lmga3mr4ww59mv1nv2gj8gf00q7fnylgm4fjqk98kk1y98zi0in";
        libraryHaskellDepends = [
          amazonka amazonka-core amazonka-s3 antiope-core antiope-s3 base
          bytestring directory exceptions filepath http-client http-types
@@ -131292,38 +131711,43 @@ self: {
      }) {};
 
   "imm" = callPackage
-    ({ mkDerivation, aeson, atom-conduit, base, base-noprelude
+    ({ mkDerivation, aeson, async, atom-conduit, base-noprelude, binary
      , blaze-html, blaze-markup, bytestring, case-insensitive, conduit
-     , connection, containers, directory, dyre, fast-logger, filepath
+     , connection, containers, dhall, directory, fast-logger, filepath
      , hashable, HaskellNet, HaskellNet-SSL, http-client
      , http-client-tls, http-types, microlens, mime-mail, monad-time
-     , monoid-subclasses, mtl, network, opml-conduit
-     , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal
-     , refined, relude, rss-conduit, safe-exceptions, stm
-     , streaming-bytestring, streaming-with, streamly, text, time
-     , timerep, tls, transformers-base, uri-bytestring, xml, xml-conduit
-     , xml-types
+     , network, opml-conduit, optparse-applicative, prettyprinter
+     , prettyprinter-ansi-terminal, refined, relude, rss-conduit
+     , safe-exceptions, stm, stm-chans, streaming-bytestring
+     , streaming-with, text, time, timerep, tls, typed-process
+     , uri-bytestring, xml-conduit, xml-types
      }:
      mkDerivation {
        pname = "imm";
-       version = "1.5.0.0";
-       sha256 = "005idmw68z28pfj8q6x6al809w5hd83m0jykg5m8m1xy9fv1plja";
+       version = "1.6.1.0";
+       sha256 = "1fgf2q19n6qhyl0yvl63lpqv6sciv148y0izhj3jmww3ak6pg4sy";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         aeson atom-conduit base-noprelude blaze-html blaze-markup
-         bytestring case-insensitive conduit connection containers directory
-         dyre fast-logger filepath hashable HaskellNet HaskellNet-SSL
-         http-client http-client-tls http-types microlens mime-mail
-         monad-time monoid-subclasses mtl network opml-conduit
+         aeson async atom-conduit base-noprelude binary conduit containers
+         dhall directory filepath hashable http-types microlens monad-time
+         prettyprinter prettyprinter-ansi-terminal refined relude
+         rss-conduit safe-exceptions text time timerep tls uri-bytestring
+         xml-conduit xml-types
+       ];
+       executableHaskellDepends = [
+         aeson async atom-conduit base-noprelude blaze-html blaze-markup
+         bytestring case-insensitive conduit connection containers dhall
+         directory fast-logger filepath HaskellNet HaskellNet-SSL
+         http-client http-client-tls mime-mail network opml-conduit
          optparse-applicative prettyprinter prettyprinter-ansi-terminal
-         refined relude rss-conduit safe-exceptions stm streaming-bytestring
-         streaming-with streamly text time timerep tls transformers-base
-         uri-bytestring xml xml-conduit xml-types
+         refined relude rss-conduit safe-exceptions stm stm-chans
+         streaming-bytestring streaming-with text time typed-process
+         uri-bytestring xml-conduit xml-types
        ];
-       executableHaskellDepends = [ base ];
-       description = "Execute arbitrary actions for each unread element of RSS/Atom feeds";
-       license = stdenv.lib.licenses.publicDomain;
+       description = "Execute arbitrary callbacks for each element of RSS/Atom feeds";
+       license = stdenv.lib.licenses.cc0;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
      }) {};
@@ -131816,6 +132240,20 @@ self: {
        broken = true;
      }) {};
 
+  "indent" = callPackage
+    ({ mkDerivation, base, containers, optparse-applicative, text }:
+     mkDerivation {
+       pname = "indent";
+       version = "0.0.5";
+       sha256 = "0xqvdns8rqdfqw872rcmnbiwnms8dkdp15vkczcypsxic1bliv5w";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base containers text ];
+       executableHaskellDepends = [ base optparse-applicative text ];
+       description = "Fix your indentation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "indentation" = callPackage
     ({ mkDerivation, base, indentation-core, indentation-parsec
      , indentation-trifecta, mtl, parsec, parsers, trifecta
@@ -132690,31 +133128,14 @@ self: {
      }:
      mkDerivation {
        pname = "inspection-testing";
-       version = "0.4.1.2";
-       sha256 = "1rh744nswl7i6wk2gv9qx5rbz74ndd1j5ynmfzdhw3i4jjr99q4v";
-       libraryHaskellDepends = [
-         base containers ghc mtl template-haskell transformers
-       ];
-       testHaskellDepends = [ base ];
-       description = "GHC plugin to do inspection testing";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "inspection-testing_0_4_2" = callPackage
-    ({ mkDerivation, base, containers, ghc, mtl, template-haskell
-     , transformers
-     }:
-     mkDerivation {
-       pname = "inspection-testing";
-       version = "0.4.2";
-       sha256 = "0ikngy54i53aa1w48mxl1a8i9gavr1bagwi7h4s79x0dr65yikxg";
+       version = "0.4.2.1";
+       sha256 = "1aw6yj7aikzlisjk5w0gfvby1hqdxm7vj5a65haxs41nxfyifrfd";
        libraryHaskellDepends = [
          base containers ghc mtl template-haskell transformers
        ];
        testHaskellDepends = [ base ];
        description = "GHC plugin to do inspection testing";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inspector-wrecker" = callPackage
@@ -134098,8 +134519,6 @@ self: {
        ];
        description = "Library for IP and MAC addresses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ip_1_5_0" = callPackage
@@ -134131,7 +134550,6 @@ self: {
        description = "Library for IP and MAC addresses";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ip-quoter" = callPackage
@@ -134483,8 +134901,8 @@ self: {
      }:
      mkDerivation {
        pname = "irc-client";
-       version = "1.1.0.6";
-       sha256 = "0mp8zqrjplaa2xdzrbfaz4g78frhhh47a3v8l2r2p57j4v96l2b1";
+       version = "1.1.0.7";
+       sha256 = "0vfcf4fsyqwvr6mjf89x368121m3dqscywrsgpn1qm80gpzsncj2";
        libraryHaskellDepends = [
          base bytestring conduit connection containers contravariant
          exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale
@@ -134513,8 +134931,8 @@ self: {
      }:
      mkDerivation {
        pname = "irc-conduit";
-       version = "0.3.0.2";
-       sha256 = "12352l9qx7cj2f2y2rk144llfr2p4ibks67gq4krjvsnhx7231m5";
+       version = "0.3.0.3";
+       sha256 = "1wbgczkiwnbpcwwcpsv9zf8n7nisv0iv2kivpjrxnhin2j4c48y1";
        libraryHaskellDepends = [
          async base bytestring conduit conduit-extra connection irc irc-ctcp
          network-conduit-tls profunctors text time tls transformers
@@ -144429,6 +144847,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lens-regex-pcre" = callPackage
+    ({ mkDerivation, base, hspec, lens, pcre-heavy, pcre-light
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "lens-regex-pcre";
+       version = "0.3.0.0";
+       sha256 = "1010nhik7vfk6gll9h8cwnq7mx3v4gnl3nlyn7ma5y93ghq0ckvs";
+       libraryHaskellDepends = [
+         base lens pcre-heavy pcre-light template-haskell text
+       ];
+       testHaskellDepends = [
+         base hspec lens pcre-heavy pcre-light template-haskell text
+       ];
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lens-simple" = callPackage
     ({ mkDerivation, base, lens-family, lens-family-core
      , lens-family-th, mtl, transformers
@@ -145884,6 +146319,20 @@ self: {
        broken = true;
      }) {};
 
+  "lie" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "lie";
+       version = "0.1.0.0";
+       sha256 = "1kvy0zsgwq2kgdbiz7z88q9d3ldhb9z9fb057x7mnhli7b3hd8fh";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
+       description = "Lie Algebras";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "life" = callPackage
     ({ mkDerivation, array, base, GLUT, OpenGL, random }:
      mkDerivation {
@@ -146381,6 +146830,20 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "line-drawing" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "line-drawing";
+       version = "0.1.0.0";
+       sha256 = "19hdx810mraygd1li8bw9l3i18ygbzmyxsqkyvh6q90saayglr4f";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       description = "raster line drawing";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "line-size" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -146622,8 +147085,8 @@ self: {
        pname = "linearmap-category";
        version = "0.3.5.0";
        sha256 = "0qmd0nz343j3j3kprbhwfkglcswfcawfy0y6g4ai6nzdga42nfrf";
-       revision = "1";
-       editedCabalFile = "15yqlsx8wdp8lxkr8pgr1cfrjpy5v1zsgpi584bcd7szwm76mmsw";
+       revision = "2";
+       editedCabalFile = "129fgr6m9691cd3nzy1magiwd7f9x2jip96pqj10d0lgb931frzg";
        libraryHaskellDepends = [
          base call-stack constrained-categories containers
          free-vector-spaces ieee754 lens linear manifolds-core semigroups
@@ -148375,6 +148838,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "load-env_0_2_1_0" = callPackage
+    ({ mkDerivation, base, directory, doctest, filepath, hspec, parsec
+     , temporary
+     }:
+     mkDerivation {
+       pname = "load-env";
+       version = "0.2.1.0";
+       sha256 = "184l0km1i6rfliq9nsj9p67ynsx6nlq466hf056lbgmrzvx6vv73";
+       libraryHaskellDepends = [ base directory filepath parsec ];
+       testHaskellDepends = [
+         base directory doctest hspec parsec temporary
+       ];
+       description = "Load environment variables from a file";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "load-font" = callPackage
     ({ mkDerivation, base, c2hs, Cabal }:
      mkDerivation {
@@ -149921,8 +150401,8 @@ self: {
        broken = true;
      }) {};
 
-  "lsp-test_0_5_2_3" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base
+  "lsp-test_0_5_4_0" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base
      , bytestring, conduit, conduit-parse, containers, data-default
      , Diff, directory, filepath, haskell-lsp, hspec, lens, mtl
      , parser-combinators, process, rope-utf16-splay, text, transformers
@@ -149930,10 +150410,10 @@ self: {
      }:
      mkDerivation {
        pname = "lsp-test";
-       version = "0.5.2.3";
-       sha256 = "1l4fdmqm6mvjpyz8imnf5q52pcls0jg5fqsxhkmj7ywnam66xfrk";
+       version = "0.5.4.0";
+       sha256 = "028nvfdchc73klwd3wm14bxzdrfvk5f5axbizz4gqijb0v1mha6p";
        libraryHaskellDepends = [
-         aeson aeson-pretty ansi-terminal base bytestring conduit
+         aeson aeson-pretty ansi-terminal async base bytestring conduit
          conduit-parse containers data-default Diff directory filepath
          haskell-lsp lens mtl parser-combinators process rope-utf16-splay
          text transformers unix unordered-containers
@@ -151294,8 +151774,8 @@ self: {
      }:
      mkDerivation {
        pname = "mail-pool";
-       version = "2.0.0";
-       sha256 = "06z1g21flxi0cpy84sdvg3pjfzrf5sjpp3rm9dni58gdj0lhg4f3";
+       version = "2.1.0";
+       sha256 = "1cjl7y6djiwr94h6vhrmwjv381xp89y8hv1zmbzz8fy0dywsiyiz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -152104,8 +152584,8 @@ self: {
      }:
      mkDerivation {
        pname = "manifold-random";
-       version = "0.5.0.2";
-       sha256 = "073bqcsv09ckgdcpimq2siggh79wf8g070w05jdzmi7pvds9ys2g";
+       version = "0.5.0.3";
+       sha256 = "12k5h3r6wnqjy5vzia3hypwjrh953cc5n912k1rfdwm4m4pznq03";
        libraryHaskellDepends = [
          base constrained-categories linearmap-category manifolds random-fu
          semigroups vector-space
@@ -152127,8 +152607,8 @@ self: {
      }:
      mkDerivation {
        pname = "manifolds";
-       version = "0.5.0.2";
-       sha256 = "07jv4qvjxc1hhlvy95r3wmb9f4zlifiixjy5vhj7s02lkdpyd7xb";
+       version = "0.5.0.3";
+       sha256 = "16g0xfs99xcccyngknplgmargz4y4ncfw0wjm7sinjcrfd7js9fb";
        libraryHaskellDepends = [
          array base binary call-stack comonad constrained-categories
          containers deepseq free free-vector-spaces ieee754 lens linear
@@ -152151,8 +152631,8 @@ self: {
     ({ mkDerivation, base, call-stack, tagged, vector-space }:
      mkDerivation {
        pname = "manifolds-core";
-       version = "0.5.0.2";
-       sha256 = "1i2a9nz3v19v155pjhvqwzcsnd9iqv9p28s98ms09fnjb7j1i954";
+       version = "0.5.0.3";
+       sha256 = "1r459qjbdqygxplv06bnqrysfl0xvmx5i7jkwgah1blpmipr4nwz";
        libraryHaskellDepends = [ base call-stack tagged vector-space ];
        description = "The basic classes for the manifolds hierarchy";
        license = stdenv.lib.licenses.gpl3;
@@ -152745,8 +153225,8 @@ self: {
      }:
      mkDerivation {
        pname = "massiv";
-       version = "0.2.8.0";
-       sha256 = "01z57p6byvrrbl9hhr1jq90kpb823kjfbq0inhvmjjbcnbngqrf3";
+       version = "0.2.8.1";
+       sha256 = "10fq5h3nkgfibh0yix8j3h0ldqapyxivxj74jyrzc5zjbpa1j8pb";
        libraryHaskellDepends = [
          base bytestring data-default-class deepseq ghc-prim primitive
          vector
@@ -154146,6 +154626,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "mega-sdist_0_4_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, optparse-simple, pantry-tmp
+     , path, path-io, rio, rio-orphans, yaml
+     }:
+     mkDerivation {
+       pname = "mega-sdist";
+       version = "0.4.0.0";
+       sha256 = "0d8z0jj4xm091zdlydkp5fgs22xrjrsydfm9czfr79pmcx83bdi4";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring optparse-simple pantry-tmp path path-io rio
+         rio-orphans yaml
+       ];
+       description = "Handles uploading to Hackage from mega repos";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "megaparsec_6_5_0" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , criterion, deepseq, hspec, hspec-discover, hspec-expectations
@@ -155778,8 +156277,8 @@ self: {
      }:
      mkDerivation {
        pname = "mighttpd2";
-       version = "3.4.4";
-       sha256 = "0n73zr3scn6sgqwaqjzcm3gybf2j0nwdcfq4cmsq9wanc5naz1pd";
+       version = "3.4.5";
+       sha256 = "18a8az9qj1jldrpya72r3h303awhl5ny4xidkjzxgj3r6xz3ffz4";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -157645,6 +158144,8 @@ self: {
        ];
        description = "These as a transformer, ChronicleT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-classes" = callPackage
@@ -159549,6 +160050,8 @@ self: {
        pname = "more-containers";
        version = "0.1.2.0";
        sha256 = "0q3ljqjzzrx1y0vbsgvrnmbmvysxkfk2ky5xxix1kirpn1q45yjj";
+       revision = "1";
+       editedCabalFile = "1q6svybm9lgyrhvp3frky59dd0zqj42884cb3zcdd0cwrlc6795l";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec ];
        description = "A few more collections";
@@ -159611,39 +160114,46 @@ self: {
 
   "morley" = callPackage
     ({ mkDerivation, aeson, aeson-options, aeson-pretty, base-noprelude
-     , base16-bytestring, base58-bytestring, bifunctors, bytestring
-     , containers, cryptonite, data-default, directory, filepath, fmt
-     , formatting, hex-text, hspec, hspec-golden-aeson, HUnit, lens
-     , megaparsec, memory, morley-prelude, mtl, named
-     , optparse-applicative, parser-combinators, pretty-simple
+     , base16-bytestring, base58-bytestring, binary, bytestring
+     , constraints, containers, cryptonite, data-default, directory
+     , filepath, fmt, formatting, generic-arbitrary, ghc-prim, hex-text
+     , hspec, hspec-expectations, HUnit, lens, megaparsec, memory
+     , morley-prelude, mtl, named, optparse-applicative
+     , parser-combinators, pretty-simple, qm-interpolated-string
      , QuickCheck, quickcheck-arbitrary-adt, quickcheck-instances
-     , singletons, text, time, timerep, transformers-compat, universum
-     , vinyl, wl-pprint-text
+     , singletons, syb, tasty, tasty-ant-xml, tasty-discover
+     , tasty-hspec, tasty-quickcheck, template-haskell, text, time
+     , timerep, transformers-compat, vector, vinyl, wl-pprint-text
      }:
      mkDerivation {
        pname = "morley";
-       version = "0.2.0.1";
-       sha256 = "1mkc3hfhm9isnw2m2zvdpmjcxw8fh2s7gzcp5r532spy2pv82wiz";
+       version = "0.3.0.1";
+       sha256 = "042kzx6n7jc6chqjvm7l14gpyywvy2s193xsnsvax5cisppm752m";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-options aeson-pretty base-noprelude base16-bytestring
-         base58-bytestring bifunctors bytestring containers cryptonite
-         data-default directory fmt formatting hex-text hspec lens
-         megaparsec memory morley-prelude mtl named parser-combinators
-         QuickCheck singletons text time timerep transformers-compat vinyl
+         base58-bytestring binary bytestring constraints containers
+         cryptonite data-default filepath fmt formatting ghc-prim hex-text
+         hspec lens megaparsec memory morley-prelude mtl named
+         parser-combinators QuickCheck quickcheck-arbitrary-adt
+         quickcheck-instances singletons syb tasty tasty-ant-xml
+         template-haskell text time timerep transformers-compat vector vinyl
          wl-pprint-text
        ];
        executableHaskellDepends = [
-         base-noprelude fmt megaparsec morley-prelude named
-         optparse-applicative pretty-simple text
+         base-noprelude data-default directory filepath fmt megaparsec
+         morley-prelude named optparse-applicative pretty-simple text
        ];
        testHaskellDepends = [
-         aeson base-noprelude containers directory filepath fmt formatting
-         hspec hspec-golden-aeson HUnit lens megaparsec morley-prelude
-         QuickCheck quickcheck-arbitrary-adt quickcheck-instances text time
-         universum vinyl
+         aeson base-noprelude bytestring containers data-default directory
+         filepath fmt formatting generic-arbitrary hex-text hspec
+         hspec-expectations HUnit lens megaparsec morley-prelude mtl
+         qm-interpolated-string QuickCheck quickcheck-arbitrary-adt
+         quickcheck-instances singletons syb tasty tasty-hspec
+         tasty-quickcheck text
        ];
+       testToolDepends = [ tasty-discover ];
        description = "Developer tools for the Michelson Language";
        license = stdenv.lib.licenses.agpl3Plus;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -159654,8 +160164,8 @@ self: {
     ({ mkDerivation, base-noprelude, universum }:
      mkDerivation {
        pname = "morley-prelude";
-       version = "0.1.0.4";
-       sha256 = "0k96m27ix80awh6cg7qncps6nn2gd0yr423b5gc22rw4ayqsdlr1";
+       version = "0.2.0.1";
+       sha256 = "0dc0hi1gnw5ri7m0fl0pk3frgsnav1al4b6h4kwamhz4qh3av9b2";
        libraryHaskellDepends = [ base-noprelude universum ];
        description = "A custom prelude used in Morley";
        license = stdenv.lib.licenses.agpl3Plus;
@@ -159894,6 +160404,8 @@ self: {
        testHaskellDepends = [ base indexed indexed-extras row-types ];
        description = "Type-safe effectful state machines in Haskell";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "motor-diagrams" = callPackage
@@ -159913,6 +160425,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Generate state diagrams from Motor FSM typeclasses";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "motor-reflection" = callPackage
@@ -159930,6 +160444,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Reflect on Motor FSM typeclasses to obtain runtime representations";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mount" = callPackage
@@ -160299,8 +160815,8 @@ self: {
      }:
      mkDerivation {
        pname = "ms-tds";
-       version = "0.1.0.1";
-       sha256 = "0mgn7a1h15bd69n2hngmvz8dr7ksvxx8d1c4jdqsbd12j6230w3z";
+       version = "0.1.0.2";
+       sha256 = "002im2x8wsypjnqm1s8l663gadb8km8fk8a6az0jn41ddljmcvwk";
        libraryHaskellDepends = [
          array base binary bytestring data-default-class mtl network text
          time tls uuid-types x509-store x509-system
@@ -160439,8 +160955,8 @@ self: {
      }:
      mkDerivation {
        pname = "mssql-simple";
-       version = "0.1.0.2";
-       sha256 = "0k0ijffl4xq5jb12gnwpnpc4r6cd64r1a344mqwybqaymjyblm66";
+       version = "0.1.0.3";
+       sha256 = "0x058v58silxchxyjck1g68npfwkckkkzlvgxx31r0iy929ccq75";
        libraryHaskellDepends = [
          base binary bytestring hostname ms-tds network text time tls
        ];
@@ -162616,8 +163132,8 @@ self: {
      }:
      mkDerivation {
        pname = "mysql-simple-typed";
-       version = "0.1.1.3";
-       sha256 = "1gfj7s9rxp8n0fws8x6f94z3mi7kysa0vscvm6hky9awq83avbv4";
+       version = "0.1.2.0";
+       sha256 = "160pyhcazmg3qnqsvzl05gc4xrm0cd1s622zv4z8n9z2w7xqh5qa";
        libraryHaskellDepends = [
          base mysql mysql-simple template-haskell typedquery utf8-string
        ];
@@ -164797,12 +165313,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "network-byte-order_0_1_0_0" = callPackage
+  "network-byte-order_0_1_1_0" = callPackage
     ({ mkDerivation, base, bytestring, doctest }:
      mkDerivation {
        pname = "network-byte-order";
-       version = "0.1.0.0";
-       sha256 = "064b7p1kfvn0s1c07wckxr2jfmf235x01pd2xxf24j551ac2knn8";
+       version = "0.1.1.0";
+       sha256 = "16prqgaqxn1h56gw9r446cq5a4jyaiplg50pjy1ji4k7cvcpx5vk";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring doctest ];
        description = "Network byte order utilities";
@@ -165282,10 +165798,8 @@ self: {
      }:
      mkDerivation {
        pname = "network-simple";
-       version = "0.4.3";
-       sha256 = "0a4hag26ry6lg90q4ppchvrm5xaij50jd4633mhfkfq8scgczm8d";
-       revision = "2";
-       editedCabalFile = "073g0agplvgan62s638w5hcq25biq8f811xhha6drfyxybs6cspn";
+       version = "0.4.4";
+       sha256 = "0mzgpa3mwc98w35klgwgqli5j6fdz4sz6h8lniapqakrfwi7hvh2";
        libraryHaskellDepends = [
          base bytestring network safe-exceptions socks transformers
        ];
@@ -165293,6 +165807,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "network-simple_0_4_5" = callPackage
+    ({ mkDerivation, base, bytestring, network, network-bsd
+     , safe-exceptions, socks, transformers
+     }:
+     mkDerivation {
+       pname = "network-simple";
+       version = "0.4.5";
+       sha256 = "17hpgcwrsx2h8lrb2wwzy0anp33mn80dnwcgnqmb8prajwjvz807";
+       libraryHaskellDepends = [
+         base bytestring network network-bsd safe-exceptions socks
+         transformers
+       ];
+       description = "Simple network sockets usage patterns";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "network-simple-sockaddr" = callPackage
     ({ mkDerivation, base, bytestring, directory, exceptions, network
      , transformers
@@ -167046,20 +167577,20 @@ self: {
        broken = true;
      }) {};
 
-  "nonempty-containers_0_2_0_0" = callPackage
-    ({ mkDerivation, base, comonad, containers, data-or, deepseq
-     , hedgehog, hedgehog-fn, semigroupoids, tasty, tasty-hedgehog, text
+  "nonempty-containers_0_3_1_0" = callPackage
+    ({ mkDerivation, base, comonad, containers, deepseq, hedgehog
+     , hedgehog-fn, semigroupoids, tasty, tasty-hedgehog, text, these
      }:
      mkDerivation {
        pname = "nonempty-containers";
-       version = "0.2.0.0";
-       sha256 = "1rj8ynavi9h31l4fpivx7xkb7b8gcwcig2yl7d332z4xc76yg0jw";
+       version = "0.3.1.0";
+       sha256 = "15flyfv6w4078wk69d2nb2lx21b76xr6c34rxs0w8jz1mb497f6l";
        libraryHaskellDepends = [
-         base comonad containers data-or deepseq semigroupoids
+         base comonad containers deepseq semigroupoids these
        ];
        testHaskellDepends = [
-         base comonad containers data-or hedgehog hedgehog-fn semigroupoids
-         tasty tasty-hedgehog text
+         base comonad containers hedgehog hedgehog-fn semigroupoids tasty
+         tasty-hedgehog text these
        ];
        description = "Non-empty variants of containers data types, with full API";
        license = stdenv.lib.licenses.bsd3;
@@ -167294,17 +167825,17 @@ self: {
      }) {};
 
   "notmuch" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, deepseq, mtl, notmuch
-     , profunctors, tagged, talloc, text, time
+    ({ mkDerivation, base, bytestring, c2hs, deepseq, filepath, mtl
+     , notmuch, profunctors, tagged, talloc, text, time
      }:
      mkDerivation {
        pname = "notmuch";
-       version = "0.2.0.0";
-       sha256 = "1w3g4747q02m0r0n8l5bkfp8icwwnvkp4bf9amkh7h80vidzmspy";
+       version = "0.3.0.0";
+       sha256 = "0f4sq7wajxr9d614gyw727g2zbsbfbaw4spni1hgs9c9rllxrmsn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring deepseq mtl profunctors tagged text time
+         base bytestring deepseq filepath mtl profunctors tagged text time
        ];
        librarySystemDepends = [ notmuch talloc ];
        libraryToolDepends = [ c2hs ];
@@ -167524,6 +168055,8 @@ self: {
        testHaskellDepends = [ base containers hspec pretty ];
        description = "A tiny statically typed functional programming language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nthable" = callPackage
@@ -171829,34 +172362,30 @@ self: {
      }) {};
 
   "pads-haskell" = callPackage
-    ({ mkDerivation, base, byteorder, bytestring, Cabal, containers
-     , directory, Glob, haskell-src, haskell-src-meta, HUnit
-     , mainland-pretty, mtl, normaldistribution, old-locale, parsec
+    ({ mkDerivation, base, byteorder, bytestring, containers, ghc-prim
+     , haskell-src-meta, HUnit, mainland-pretty, mtl, mwc-random, parsec
      , QuickCheck, random, regex-posix, syb, template-haskell
      , test-framework, test-framework-hunit, test-framework-quickcheck2
      , th-lift, time, transformers
      }:
      mkDerivation {
        pname = "pads-haskell";
-       version = "0.0.0.1";
-       sha256 = "1glf9zfzl8lg6hvqzh76y7kpi1d8jhxgxplnkzz4pdzrh1dfzm9a";
-       revision = "1";
-       editedCabalFile = "1nfh2i2g4xzqr534hkwa7gygkgsdvyjk4g075n78dp6r48zynbz6";
+       version = "0.1.0.0";
+       sha256 = "0c4by0amwp5kki7h46pygd6p6f5yx0zzlbzcfhd68h5ka0alkfdf";
        libraryHaskellDepends = [
-         base byteorder bytestring containers Glob haskell-src
-         haskell-src-meta HUnit mainland-pretty normaldistribution
-         old-locale parsec random regex-posix syb template-haskell th-lift
-         time transformers
+         base byteorder bytestring containers ghc-prim haskell-src-meta
+         HUnit mainland-pretty mtl mwc-random parsec random regex-posix syb
+         template-haskell th-lift time transformers
        ];
        testHaskellDepends = [
-         base byteorder bytestring Cabal containers directory Glob
-         haskell-src haskell-src-meta HUnit mainland-pretty mtl old-locale
-         parsec QuickCheck regex-posix syb template-haskell test-framework
+         base byteorder bytestring containers ghc-prim haskell-src-meta
+         HUnit mainland-pretty mtl mwc-random parsec QuickCheck random
+         regex-posix syb template-haskell test-framework
          test-framework-hunit test-framework-quickcheck2 th-lift time
          transformers
        ];
        description = "PADS data description language for Haskell";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
      }) {};
@@ -172145,26 +172674,24 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
-  "pandoc_2_7_2" = callPackage
+  "pandoc_2_7_3" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
      , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
      , case-insensitive, cmark-gfm, containers, criterion, data-default
      , deepseq, Diff, directory, doctemplates, exceptions
      , executable-path, filepath, Glob, haddock-library, hslua
-     , hslua-module-text, HsYAML, HTTP, http-client, http-client-tls
-     , http-types, ipynb, JuicyPixels, mtl, network, network-uri
-     , pandoc-types, parsec, process, QuickCheck, random, safe
-     , scientific, SHA, skylighting, split, syb, tagsoup, tasty
-     , tasty-golden, tasty-hunit, tasty-quickcheck, temporary, texmath
-     , text, time, unicode-transforms, unix, unordered-containers
-     , vector, weigh, xml, zip-archive, zlib
+     , hslua-module-system, hslua-module-text, HsYAML, HTTP, http-client
+     , http-client-tls, http-types, ipynb, JuicyPixels, mtl, network
+     , network-uri, pandoc-types, parsec, process, QuickCheck, random
+     , safe, scientific, SHA, skylighting, split, syb, tagsoup, tasty
+     , tasty-golden, tasty-hunit, tasty-lua, tasty-quickcheck, temporary
+     , texmath, text, time, unicode-transforms, unix
+     , unordered-containers, vector, weigh, xml, zip-archive, zlib
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "2.7.2";
-       sha256 = "1qjla7zk8whx17qapmv3zji6b98qdpd464gwhi4zv8g4hfzv7010";
-       revision = "3";
-       editedCabalFile = "17m7pd1d1q7blavh5vv9m9ll2v9z4pj48k7cn3x6k884c9haicwc";
+       version = "2.7.3";
+       sha256 = "0dpjrr40h54cljzhvixyym07z792a9izg6b9dmqpjlgcg4rj0xx8";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -172173,19 +172700,19 @@ self: {
          aeson aeson-pretty attoparsec base base64-bytestring binary
          blaze-html blaze-markup bytestring case-insensitive cmark-gfm
          containers data-default deepseq directory doctemplates exceptions
-         filepath Glob haddock-library hslua hslua-module-text HsYAML HTTP
-         http-client http-client-tls http-types ipynb JuicyPixels mtl
-         network network-uri pandoc-types parsec process random safe
-         scientific SHA skylighting split syb tagsoup temporary texmath text
-         time unicode-transforms unix unordered-containers vector xml
-         zip-archive zlib
+         filepath Glob haddock-library hslua hslua-module-system
+         hslua-module-text HsYAML HTTP http-client http-client-tls
+         http-types ipynb JuicyPixels mtl network network-uri pandoc-types
+         parsec process random safe scientific SHA skylighting split syb
+         tagsoup temporary texmath text time unicode-transforms unix
+         unordered-containers vector xml zip-archive zlib
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
          base base64-bytestring bytestring containers Diff directory
          executable-path filepath Glob hslua pandoc-types process QuickCheck
-         tasty tasty-golden tasty-hunit tasty-quickcheck temporary text time
-         xml zip-archive
+         tasty tasty-golden tasty-hunit tasty-lua tasty-quickcheck temporary
+         text time xml zip-archive
        ];
        benchmarkHaskellDepends = [
          base bytestring containers criterion mtl text time weigh
@@ -172815,6 +173342,60 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "pantry-tmp" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans
+     , base64-bytestring, bytestring, Cabal, conduit, conduit-extra
+     , containers, contravariant, cryptonite, cryptonite-conduit
+     , deepseq, digest, directory, exceptions, filelock, filepath
+     , generic-deriving, ghc-prim, hackage-security, hashable, hedgehog
+     , hpack, hspec, http-client, http-client-tls, http-conduit
+     , http-download, http-types, integer-gmp, memory, mono-traversable
+     , mtl, network, network-uri, path, path-io, persistent
+     , persistent-sqlite, persistent-template, primitive, QuickCheck
+     , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint
+     , safe, syb, tar-conduit, template-haskell, text, text-metrics
+     , th-lift, th-lift-instances, th-orphans, th-reify-many
+     , th-utilities, time, transformers, unix-compat, unliftio
+     , unordered-containers, vector, yaml, zip-archive
+     }:
+     mkDerivation {
+       pname = "pantry-tmp";
+       version = "0.1.0.0";
+       sha256 = "18b2ac5kb6xzkxa2c5hhl6n37npxcxzxghi0p5wnv5rps3ahsmnn";
+       revision = "2";
+       editedCabalFile = "1zz8cpl55dlfgyhn3g89l1y4hppc3g92y3410i1ahmzcs5pfzmpc";
+       libraryHaskellDepends = [
+         aeson ansi-terminal array base base-orphans base64-bytestring
+         bytestring Cabal conduit conduit-extra containers contravariant
+         cryptonite cryptonite-conduit deepseq digest directory filelock
+         filepath generic-deriving ghc-prim hackage-security hashable hpack
+         http-client http-client-tls http-conduit http-download http-types
+         integer-gmp memory mono-traversable mtl network network-uri path
+         path-io persistent persistent-sqlite persistent-template primitive
+         resourcet rio rio-orphans rio-prettyprint safe syb tar-conduit
+         template-haskell text text-metrics th-lift th-lift-instances
+         th-orphans th-reify-many th-utilities time transformers unix-compat
+         unliftio unordered-containers vector yaml zip-archive
+       ];
+       testHaskellDepends = [
+         aeson ansi-terminal array base base-orphans base64-bytestring
+         bytestring Cabal conduit conduit-extra containers contravariant
+         cryptonite cryptonite-conduit deepseq digest directory exceptions
+         filelock filepath generic-deriving ghc-prim hackage-security
+         hashable hedgehog hpack hspec http-client http-client-tls
+         http-conduit http-download http-types integer-gmp memory
+         mono-traversable mtl network network-uri path path-io persistent
+         persistent-sqlite persistent-template primitive QuickCheck
+         raw-strings-qq resourcet rio rio-orphans rio-prettyprint safe syb
+         tar-conduit template-haskell text text-metrics th-lift
+         th-lift-instances th-orphans th-reify-many th-utilities time
+         transformers unix-compat unliftio unordered-containers vector yaml
+         zip-archive
+       ];
+       description = "Content addressable Haskell package management";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "papa" = callPackage
     ({ mkDerivation, base, papa-base, papa-base-export
      , papa-base-implement, papa-bifunctors, papa-bifunctors-export
@@ -173553,6 +174134,8 @@ self: {
        pname = "paripari";
        version = "0.6.0.0";
        sha256 = "1604py5ms14xhmvsxdqx56xfbs3g4wkhjd8f5gsmhpqwz7acy511";
+       revision = "2";
+       editedCabalFile = "074z7wrb1p4c8wxwmqv3nxs6kp835r9pxmmnspqaajj0rag70ny3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -173893,6 +174476,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "parser-combinators_1_1_0" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "parser-combinators";
+       version = "1.1.0";
+       sha256 = "149yhbnrrl108h1jinrsxni3rwrldhphpk9bbmbpr90q5fbl4xmc";
+       libraryHaskellDepends = [ base ];
+       description = "Lightweight package providing commonly useful parser combinators";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "parser-combinators-tests" = callPackage
     ({ mkDerivation, base, hspec, hspec-discover, hspec-expectations
      , hspec-megaparsec, megaparsec, megaparsec-tests
@@ -173900,10 +174495,8 @@ self: {
      }:
      mkDerivation {
        pname = "parser-combinators-tests";
-       version = "1.0.3";
-       sha256 = "0xnmf5sfr9qg2jdcvgjsfvv5b8rd4z06vgk75lsbrwv019srpamm";
-       revision = "1";
-       editedCabalFile = "08hns8ycdlvqvi0il8077c4mbzf2npvaglzd89979wqpki8jm7l2";
+       version = "1.1.0";
+       sha256 = "0m3xgdi1q3q638zfvgpdqyrhfq9abqwjripvbdx5z9rai4whzqmz";
        isLibrary = false;
        isExecutable = false;
        testHaskellDepends = [
@@ -175571,6 +176164,8 @@ self: {
        pname = "pencil";
        version = "1.0.1";
        sha256 = "0a1lb0dclv6p6qkd6nd3zp665n6spkv10yd1i2m67rrqabg802cl";
+       revision = "1";
+       editedCabalFile = "012afvs4wghdw7adz0hw01pmi8ai89r8jhpykdwfyf4ignbrfpvq";
        libraryHaskellDepends = [
          base data-default directory edit-distance filepath hashable hsass
          mtl pandoc parsec semigroups text time unordered-containers vector
@@ -178163,31 +178758,6 @@ self: {
      }:
      mkDerivation {
        pname = "pipes";
-       version = "4.3.9";
-       sha256 = "1jqs4x3xw2ya3834p36p1ycx8nxjgn2ypaibhdv97xcw3wsxlk2w";
-       revision = "2";
-       editedCabalFile = "0pw4i3pdg3i98a9mbps0ycgb70vf4p7dqv08xf365iy4dzdm3a1i";
-       libraryHaskellDepends = [
-         base exceptions mmorph mtl semigroups transformers void
-       ];
-       testHaskellDepends = [
-         base mtl QuickCheck test-framework test-framework-quickcheck2
-         transformers
-       ];
-       benchmarkHaskellDepends = [
-         base criterion mtl optparse-applicative transformers
-       ];
-       description = "Compositional pipelines";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes_4_3_10" = callPackage
-    ({ mkDerivation, base, criterion, exceptions, mmorph, mtl
-     , optparse-applicative, QuickCheck, semigroups, test-framework
-     , test-framework-quickcheck2, transformers, void
-     }:
-     mkDerivation {
-       pname = "pipes";
        version = "4.3.10";
        sha256 = "1vhq8z3518y6xl0nzgdxmcd44ax40c8fghlccwhgqq132bf59nb2";
        libraryHaskellDepends = [
@@ -178202,7 +178772,6 @@ self: {
        ];
        description = "Compositional pipelines";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-aeson" = callPackage
@@ -179508,17 +180077,17 @@ self: {
      }) {};
 
   "pkgtreediff" = callPackage
-    ({ mkDerivation, async, base, directory, filepath, http-directory
-     , simple-cmd, simple-cmd-args, text
+    ({ mkDerivation, async, base, directory, filepath, Glob
+     , http-directory, simple-cmd, simple-cmd-args, text
      }:
      mkDerivation {
        pname = "pkgtreediff";
-       version = "0.2.1";
-       sha256 = "0m9jslk08dg7gy8bx6vzabrasgmvqycgqrsirxxrqmj8xbrj5hpw";
+       version = "0.3";
+       sha256 = "0n39cn75cdxzk39hn6fiimb7rm1qrvksmqidy5fgnx997y78z8s9";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         async base directory filepath http-directory simple-cmd
+         async base directory filepath Glob http-directory simple-cmd
          simple-cmd-args text
        ];
        description = "Package tree diff tool";
@@ -180187,6 +180756,8 @@ self: {
        testHaskellDepends = [ base hedgehog hedgehog-classes ];
        description = "Plurality monad: Zero, one, or at least two";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plural" = callPackage
@@ -180843,8 +181414,8 @@ self: {
      }:
      mkDerivation {
        pname = "polysemy";
-       version = "0.3.0.0";
-       sha256 = "00jm95sv685xj8j11k93r0qbgwz4v6dqdzasawg7f1xp3rjfcsvn";
+       version = "0.4.0.0";
+       sha256 = "151l2x73fwyvk77r35bf57xjbygdqwk0n83qcx9krlij5ljyrl83";
        libraryHaskellDepends = [
          base containers mtl syb template-haskell th-abstraction
          transformers
@@ -180859,26 +181430,30 @@ self: {
        ];
        description = "Higher-order, low-boilerplate, zero-cost free monads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polysemy-plugin" = callPackage
-    ({ mkDerivation, base, ghc, ghc-tcplugins-extra, hspec
+    ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra, hspec
      , inspection-testing, polysemy, should-not-typecheck, syb
      , transformers
      }:
      mkDerivation {
        pname = "polysemy-plugin";
-       version = "0.2.0.1";
-       sha256 = "1w8hzsl9ms1h20nd44kwxl30sxq5ny7jbymi91f9na1lajpm2drc";
+       version = "0.2.0.3";
+       sha256 = "1svd5fa4fqp5l3ibzxzv8ym2s54k2mwzglvr4s65kw5ny9w9v9qq";
        libraryHaskellDepends = [
-         base ghc ghc-tcplugins-extra polysemy syb transformers
+         base containers ghc ghc-tcplugins-extra polysemy syb transformers
        ];
        testHaskellDepends = [
-         base ghc ghc-tcplugins-extra hspec inspection-testing polysemy
-         should-not-typecheck syb transformers
+         base containers ghc ghc-tcplugins-extra hspec inspection-testing
+         polysemy should-not-typecheck syb transformers
        ];
        description = "Disambiguate obvious uses of effects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polysemy-zoo" = callPackage
@@ -180888,8 +181463,8 @@ self: {
      }:
      mkDerivation {
        pname = "polysemy-zoo";
-       version = "0.1.2.0";
-       sha256 = "1pcq3krsfzbv5b9v85p6rmiqlbap7zpcwffkn5spryd9f41k8rw8";
+       version = "0.1.2.1";
+       sha256 = "0wy70sx6nq7imqjsgs8i344qv6vmxv07bjrzjvzg97fms0kk9jlk";
        libraryHaskellDepends = [
          base constraints containers mtl polysemy polysemy-plugin random
          random-fu random-source reflection
@@ -180900,6 +181475,8 @@ self: {
        ];
        description = "Experimental, user-contributed effects and interpreters for polysemy";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polyseq" = callPackage
@@ -181371,12 +181948,12 @@ self: {
      }) {};
 
   "porter" = callPackage
-    ({ mkDerivation, haskell2010 }:
+    ({ mkDerivation, base }:
      mkDerivation {
        pname = "porter";
-       version = "0.1";
-       sha256 = "0aw1gq7z3h5ag5vzl6crw7vijg9w25s0jvxr4rkniv4jk0wlfmnk";
-       libraryHaskellDepends = [ haskell2010 ];
+       version = "0.1.0.2";
+       sha256 = "12pvav3xx4mdjnvza15yhkdcphxlsjns2s1i66h2nfgbb9lc8h0q";
+       libraryHaskellDepends = [ base ];
        description = "Implementation of the Porter stemming algorithm";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -186377,19 +186954,17 @@ self: {
   "psqueues" = callPackage
     ({ mkDerivation, array, base, containers, criterion, deepseq
      , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue
-     , QuickCheck, random, tagged, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, unordered-containers
+     , QuickCheck, random, tagged, tasty, tasty-hunit, tasty-quickcheck
+     , unordered-containers
      }:
      mkDerivation {
        pname = "psqueues";
-       version = "0.2.7.1";
-       sha256 = "1hcfxb977lzxsmd47z0snjj4xdhiwnqzif8xkpwzw28dspn44zh4";
-       revision = "1";
-       editedCabalFile = "0336d9ckixv4n23vy5l3xk0wavfn3z9xk105gig0zv70b3jh3r3y";
+       version = "0.2.7.2";
+       sha256 = "1yckx2csqswghiy9nfj03cybmza8104nmnpbpcc9ngwlbmakn9i6";
        libraryHaskellDepends = [ base deepseq ghc-prim hashable ];
        testHaskellDepends = [
-         array base deepseq ghc-prim hashable HUnit QuickCheck tagged
-         test-framework test-framework-hunit test-framework-quickcheck2
+         array base deepseq ghc-prim hashable HUnit QuickCheck tagged tasty
+         tasty-hunit tasty-quickcheck
        ];
        benchmarkHaskellDepends = [
          base containers criterion deepseq fingertree-psqueue ghc-prim
@@ -190011,25 +190586,6 @@ self: {
      }:
      mkDerivation {
        pname = "random-bytestring";
-       version = "0.1.3.1";
-       sha256 = "1d0f3y8n87fyyvlkn1c87d47xi50qn4cn11bnsn052860kyjda1k";
-       revision = "1";
-       editedCabalFile = "0gk5hcx1j06rklfd2cv63kh5dzjk8hr184riam784c7s9zg3s9a4";
-       libraryHaskellDepends = [ base bytestring mwc-random pcg-random ];
-       benchmarkHaskellDepends = [
-         async base bytestring criterion cryptonite entropy ghc-prim
-         mwc-random pcg-random primitive random
-       ];
-       description = "Efficient generation of random bytestrings";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "random-bytestring_0_1_3_2" = callPackage
-    ({ mkDerivation, async, base, bytestring, criterion, cryptonite
-     , entropy, ghc-prim, mwc-random, pcg-random, primitive, random
-     }:
-     mkDerivation {
-       pname = "random-bytestring";
        version = "0.1.3.2";
        sha256 = "16mjdb1sy7ppfbj5hshjpyrly6mklzvxip8vrqcvsfm869pkzayw";
        libraryHaskellDepends = [ base bytestring mwc-random pcg-random ];
@@ -190039,7 +190595,6 @@ self: {
        ];
        description = "Efficient generation of random bytestrings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "random-class" = callPackage
@@ -194092,8 +194647,8 @@ self: {
      }:
      mkDerivation {
        pname = "registry";
-       version = "0.1.5.2";
-       sha256 = "1spvc9y985820f945zvp822w8bxrrmny7rwcfy94nky4mv5gk4i0";
+       version = "0.1.6.0";
+       sha256 = "142d71n52s9j27nwm8if930j3psx41k2jh8lwsphp1lsd1m653cg";
        libraryHaskellDepends = [
          base containers exceptions hashable mmorph mtl protolude resourcet
          semigroupoids semigroups template-haskell text transformers-base
@@ -194112,7 +194667,7 @@ self: {
        broken = true;
      }) {};
 
-  "registry_0_1_5_4" = callPackage
+  "registry_0_1_6_1" = callPackage
     ({ mkDerivation, async, base, containers, exceptions, generic-lens
      , hashable, hedgehog, io-memoize, mmorph, MonadRandom, mtl
      , multimap, protolude, random, resourcet, semigroupoids, semigroups
@@ -194121,8 +194676,8 @@ self: {
      }:
      mkDerivation {
        pname = "registry";
-       version = "0.1.5.4";
-       sha256 = "1rz6grjgcahgpkbm19ipm93w8nzip3swj0vcd53vn73gv21kii79";
+       version = "0.1.6.1";
+       sha256 = "05wqgy0lbvab7iykzj8xw4winkv0pi1dqbgbybi35dirapp153qi";
        libraryHaskellDepends = [
          base containers exceptions hashable mmorph mtl protolude resourcet
          semigroupoids semigroups template-haskell text transformers-base
@@ -194149,8 +194704,8 @@ self: {
      }:
      mkDerivation {
        pname = "registry-hedgehog";
-       version = "0.2.0.2";
-       sha256 = "19yffjqdggic25vfwn33hpc34jn4dsg655bl542mnrl2h4fkgd2x";
+       version = "0.2.0.3";
+       sha256 = "138x33b9sficpy20dvcayf9isilv9crng2d46m2gh7ckidw94ghp";
        libraryHaskellDepends = [
          base containers hedgehog mmorph multimap protolude registry tasty
          tasty-discover tasty-hedgehog tasty-th template-haskell text
@@ -196524,6 +197079,8 @@ self: {
        executableHaskellDepends = [ base prettyprinter ];
        description = "Inspection of rewriting steps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rewriting" = callPackage
@@ -196793,8 +197350,8 @@ self: {
      }:
      mkDerivation {
        pname = "rg";
-       version = "1.2.0.0";
-       sha256 = "0vwrwbhi61lqzvj9zr5j2akypfm095b208zlmdilsi6yb84qbqxc";
+       version = "1.4.0.0";
+       sha256 = "1cnh3pmq80vziwr2rnz2zinlhak5abrkcpcrrs6x6jz0aq9npnj7";
        libraryHaskellDepends = [
          array base fmt possibly text unordered-containers vector
        ];
@@ -197257,6 +197814,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "rio-prettyprint" = callPackage
+    ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array
+     , base, Cabal, colour, mtl, path, rio, text
+     }:
+     mkDerivation {
+       pname = "rio-prettyprint";
+       version = "0.1.0.0";
+       sha256 = "0n8ldc73i0954c6s8jh0hibxrisp84yh5pcxv3x3q0wg4v2xvr0m";
+       revision = "1";
+       editedCabalFile = "0ya7i766srm62p19idm7lwwfk01b81f8795q7jqqwl7rwk5rcdag";
+       libraryHaskellDepends = [
+         aeson annotated-wl-pprint ansi-terminal array base Cabal colour mtl
+         path rio text
+       ];
+       description = "Pretty-printing for RIO";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "riot" = callPackage
     ({ mkDerivation, base, containers, directory, haskell98, mtl
      , ncurses, old-locale, packedstring, process, unix
@@ -200622,6 +201197,34 @@ self: {
        license = stdenv.lib.licenses.lgpl3;
      }) {};
 
+  "sbp_2_6_3" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, array, base
+     , base64-bytestring, basic-prelude, binary, binary-conduit
+     , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754
+     , lens, lens-aeson, monad-loops, resourcet, tasty, tasty-hunit
+     , template-haskell, text, time, yaml
+     }:
+     mkDerivation {
+       pname = "sbp";
+       version = "2.6.3";
+       sha256 = "03d2wa73lg5l417c39di742x5x00bjjbqp7wkyr2vkpy04ilqvii";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson array base base64-bytestring basic-prelude binary bytestring
+         data-binary-ieee754 lens lens-aeson monad-loops template-haskell
+         text
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty base basic-prelude binary-conduit bytestring
+         cmdargs conduit conduit-extra resourcet time yaml
+       ];
+       testHaskellDepends = [ base basic-prelude tasty tasty-hunit ];
+       description = "SwiftNav's SBP Library";
+       license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sbp2udp" = callPackage
     ({ mkDerivation, base, basic-prelude, binary, binary-conduit
      , bytestring, conduit, conduit-extra, network, optparse-generic
@@ -200669,7 +201272,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) z3;};
 
-  "sbv_8_2" = callPackage
+  "sbv_8_3" = callPackage
     ({ mkDerivation, array, async, base, bytestring, containers
      , crackNum, deepseq, directory, doctest, filepath, generic-deriving
      , ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random, syb
@@ -200678,10 +201281,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbv";
-       version = "8.2";
-       sha256 = "11jvjgcbipnk65yxv758p5cja89fpjf3nkf8nvqi69lyx1jgb72q";
-       revision = "1";
-       editedCabalFile = "1bn2k9ydx5vyy4z91y22lc6yhnv299y7z2cyzp1prxpvb1dgh5xv";
+       version = "8.3";
+       sha256 = "0d2ph3wr6qga3x43w7xlrvdr63zzsx4x3xn8p7l994b6i7d6rdzd";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async base containers crackNum deepseq directory filepath
@@ -202203,6 +202804,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) SDL2;};
 
+  "sdl2_2_5_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, exceptions, linear
+     , SDL2, StateVar, text, transformers, vector, weigh
+     }:
+     mkDerivation {
+       pname = "sdl2";
+       version = "2.5.0.0";
+       sha256 = "1x368yhdd55b3cvx8dvj1sj6nzygzigbhrwhssjs4k0rcxlwqfw8";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring exceptions linear StateVar text transformers vector
+       ];
+       librarySystemDepends = [ SDL2 ];
+       libraryPkgconfigDepends = [ SDL2 ];
+       testHaskellDepends = [ base deepseq linear vector weigh ];
+       description = "Both high- and low-level bindings to the SDL library (version 2.0.6+).";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) SDL2;};
+
   "sdl2-cairo" = callPackage
     ({ mkDerivation, base, cairo, linear, sdl2 }:
      mkDerivation {
@@ -202828,6 +203451,8 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring selda text ];
        description = "JSON support for the Selda database library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "selda-postgresql" = callPackage
@@ -203111,6 +203736,8 @@ self: {
        ];
        description = "Align and Zip type-classes from the common Semialign ancestor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "semialign-indexed" = callPackage
@@ -203127,6 +203754,8 @@ self: {
        ];
        description = "SemialignWithIndex, i.e. izip and ialign";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "semibounded-lattices" = callPackage
@@ -205397,31 +206026,6 @@ self: {
      }:
      mkDerivation {
        pname = "servant-kotlin";
-       version = "0.1.1.7";
-       sha256 = "138xx3jn2ay38fradssi7biff5cc6g1g3wk003bid349irmgvid4";
-       libraryHaskellDepends = [
-         base containers directory formatting lens servant servant-foreign
-         text time wl-pprint-text
-       ];
-       testHaskellDepends = [
-         aeson base containers directory formatting hspec http-api-data lens
-         servant servant-foreign text time wl-pprint-text
-       ];
-       benchmarkHaskellDepends = [
-         aeson base containers directory formatting http-api-data lens
-         servant servant-foreign shelly text time wl-pprint-text
-       ];
-       description = "Automatically derive Kotlin class to query servant webservices";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "servant-kotlin_0_1_1_8" = callPackage
-    ({ mkDerivation, aeson, base, containers, directory, formatting
-     , hspec, http-api-data, lens, servant, servant-foreign, shelly
-     , text, time, wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "servant-kotlin";
        version = "0.1.1.8";
        sha256 = "0w68sfsf7x0wvj67klbl464jzkibr8p78knxix5fqxxd5kb5d25r";
        libraryHaskellDepends = [
@@ -205438,7 +206042,6 @@ self: {
        ];
        description = "Automatically derive Kotlin class to query servant webservices";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-lucid" = callPackage
@@ -205946,6 +206549,8 @@ self: {
        ];
        description = "Derive Reason types to interact with a Haskell backend";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-reflex" = callPackage
@@ -206419,6 +207024,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-swagger-ui_0_3_4_3_22_2" = callPackage
+    ({ mkDerivation, base, bytestring, file-embed-lzma, servant
+     , servant-server, servant-swagger-ui-core, swagger2, text
+     }:
+     mkDerivation {
+       pname = "servant-swagger-ui";
+       version = "0.3.4.3.22.2";
+       sha256 = "0ig05xzh4iybnwzh7bx8i7a337j0xfmsxbmfi9iaiz4g6f9s5clm";
+       libraryHaskellDepends = [
+         base bytestring file-embed-lzma servant servant-server
+         servant-swagger-ui-core swagger2 text
+       ];
+       description = "Servant swagger ui";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-swagger-ui-core" = callPackage
     ({ mkDerivation, base, blaze-markup, bytestring, http-media
      , servant, servant-blaze, servant-server, swagger2, text
@@ -206926,6 +207548,8 @@ self: {
        ];
        description = "Send HTML formatted emails using Amazon's SES REST API with blaze";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ses-html-snaplet" = callPackage
@@ -208909,8 +209533,8 @@ self: {
      }:
      mkDerivation {
        pname = "shower";
-       version = "0.2";
-       sha256 = "0jxsv08w7cmlkr820f2m9qbx00m2h6h3hp6lrng7iz03i89gwpf2";
+       version = "0.2.0.1";
+       sha256 = "13qxddl6v3kcfgyr5q281hrr4xkflnc3nafbs3jq0w5k6njn7djb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base megaparsec pretty ];
@@ -209410,6 +210034,17 @@ self: {
        broken = true;
      }) {};
 
+  "simple-cabal" = callPackage
+    ({ mkDerivation, base, Cabal, directory, filepath }:
+     mkDerivation {
+       pname = "simple-cabal";
+       version = "0.0.0";
+       sha256 = "051xfg48y09qa6avndllv29nibpchys5ksp38d1p3lk82qqywvqd";
+       libraryHaskellDepends = [ base Cabal directory filepath ];
+       description = "Cabal file wrapper library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "simple-cmd" = callPackage
     ({ mkDerivation, base, directory, filepath, process, unix }:
      mkDerivation {
@@ -210149,6 +210784,25 @@ self: {
        broken = true;
      }) {};
 
+  "simple-vec3_0_6" = callPackage
+    ({ mkDerivation, base, criterion, doctest, doctest-driver-gen
+     , QuickCheck, tasty, tasty-quickcheck, vector
+     }:
+     mkDerivation {
+       pname = "simple-vec3";
+       version = "0.6";
+       sha256 = "1vw03xlnf8hj6rlcgpblg3swcbvqj4qp04zdv3a9j2a47j780qhh";
+       libraryHaskellDepends = [ base QuickCheck vector ];
+       testHaskellDepends = [
+         base doctest doctest-driver-gen tasty tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [ base criterion vector ];
+       description = "Three-dimensional vectors of doubles with basic operations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "simple-zipper" = callPackage
     ({ mkDerivation, base, hspec, lens }:
      mkDerivation {
@@ -211043,7 +211697,7 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "skylighting_0_8_1" = callPackage
+  "skylighting_0_8_1_1" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
      , base64-bytestring, binary, blaze-html, bytestring
      , case-insensitive, colour, containers, directory, filepath, hxt
@@ -211052,8 +211706,8 @@ self: {
      }:
      mkDerivation {
        pname = "skylighting";
-       version = "0.8.1";
-       sha256 = "02damyql5v7kf69ai74cwnkbyjr217gc0n4a1yf9nkiaxk7gbmnm";
+       version = "0.8.1.1";
+       sha256 = "0q1zkb053szbgx3lqpmllxas0krb9m425qi0aplffhdqwmd05w8w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -211099,7 +211753,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "skylighting-core_0_8_1" = callPackage
+  "skylighting-core_0_8_1_1" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
      , base64-bytestring, binary, blaze-html, bytestring
      , case-insensitive, colour, containers, criterion, Diff, directory
@@ -211109,8 +211763,8 @@ self: {
      }:
      mkDerivation {
        pname = "skylighting-core";
-       version = "0.8.1";
-       sha256 = "189w4fg428zpsqjj7bahmhnm2lchhkf8m2qw9ys7zh2ggb563cdb";
+       version = "0.8.1.1";
+       sha256 = "1klk9jlnyz5ciz2gm1dx5mh85nkvz6y1xsflvyf45c2gw9grc2km";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -214952,8 +215606,8 @@ self: {
        pname = "spatial-rotations";
        version = "0.1.0.1";
        sha256 = "02nysw4dbg5l37j83kdybxkrdzgjxn20h3lknnphwz0hr0n489ii";
-       revision = "1";
-       editedCabalFile = "1g2ib60nhwwdb9fjdnmn7z0bzrsac6xcsl6bs7wi6s5rr991pp1c";
+       revision = "2";
+       editedCabalFile = "174y0jgf9bxqsc895f984q0gwn981sxdxmnwd3c25jp03iidc6c4";
        libraryHaskellDepends = [
          base linear manifolds-core vector-space
        ];
@@ -216601,30 +217255,32 @@ self: {
      }) {};
 
   "stack" = callPackage
-    ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, async
-     , attoparsec, base, base64-bytestring, bindings-uname, bytestring
-     , Cabal, conduit, conduit-extra, containers, cryptonite
+    ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array
+     , async, attoparsec, base, base64-bytestring, bytestring, Cabal
+     , colour, conduit, conduit-extra, containers, cryptonite
      , cryptonite-conduit, deepseq, directory, echo, exceptions, extra
      , file-embed, filelock, filepath, fsnotify, generic-deriving
-     , hackage-security, hashable, hpack, hpc, hspec, http-client
-     , http-client-tls, http-conduit, http-types, memory, microlens
-     , mintty, monad-logger, mono-traversable, mtl, mustache
-     , neat-interpolation, network-uri, open-browser
-     , optparse-applicative, path, path-io, persistent
+     , hackage-security, hashable, hi-file-parser, hpack, hpc, hspec
+     , http-client, http-client-tls, http-conduit, http-download
+     , http-types, memory, microlens, mintty, mono-traversable, mtl
+     , mustache, neat-interpolation, network-uri, open-browser
+     , optparse-applicative, pantry-tmp, path, path-io, persistent
      , persistent-sqlite, persistent-template, pretty, primitive
-     , process, project-template, QuickCheck, regex-applicative-text
-     , resourcet, retry, rio, semigroups, smallcheck, split, stm, store
-     , store-core, streaming-commons, tar, template-haskell, temporary
-     , text, text-metrics, th-reify-many, time, tls, transformers
-     , typed-process, unicode-transforms, unix, unix-compat, unliftio
-     , unordered-containers, vector, yaml, zip-archive, zlib
+     , process, project-template, QuickCheck, raw-strings-qq
+     , regex-applicative-text, resource-pool, resourcet, retry, rio
+     , rio-prettyprint, semigroups, smallcheck, split, stm
+     , streaming-commons, tar, template-haskell, temporary
+     , terminal-size, text, text-metrics, th-reify-many, time, tls
+     , transformers, typed-process, unicode-transforms, unix
+     , unix-compat, unliftio, unordered-containers, vector, yaml
+     , zip-archive, zlib
      }:
      mkDerivation {
        pname = "stack";
-       version = "1.9.3.1";
-       sha256 = "0lxx2gwwh4kjhy9d67ykdnhm5z9zsflv515jgsf97nkf6b8db8lj";
-       revision = "2";
-       editedCabalFile = "1fypvcvjlhyxnr81gll1w0l4nw6zvsr1vhb1y5g1jnyzy8f278zj";
+       version = "2.1.1.1";
+       sha256 = "1qqy0hkcvr4nblpknwljc71hck8ccpdiqxbxhj5mjwp9ybvag1j2";
+       revision = "1";
+       editedCabalFile = "1wn8lh8qxzj9rqvv1584gqz6rq33nkn1944ry7kpfsvwjl40vhkc";
        configureFlags = [
          "-fdisable-git-info" "-fhide-dependency-versions"
          "-fsupported-build"
@@ -216633,55 +217289,58 @@ self: {
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
        libraryHaskellDepends = [
-         aeson annotated-wl-pprint ansi-terminal async attoparsec base
-         base64-bytestring bindings-uname bytestring Cabal conduit
-         conduit-extra containers cryptonite cryptonite-conduit deepseq
-         directory echo exceptions extra file-embed filelock filepath
-         fsnotify generic-deriving hackage-security hashable hpack hpc
-         http-client http-client-tls http-conduit http-types memory
-         microlens mintty monad-logger mono-traversable mtl mustache
+         aeson annotated-wl-pprint ansi-terminal array async attoparsec base
+         base64-bytestring bytestring Cabal colour conduit conduit-extra
+         containers cryptonite cryptonite-conduit deepseq directory echo
+         exceptions extra file-embed filelock filepath fsnotify
+         generic-deriving hackage-security hashable hi-file-parser hpack hpc
+         http-client http-client-tls http-conduit http-download http-types
+         memory microlens mintty mono-traversable mtl mustache
          neat-interpolation network-uri open-browser optparse-applicative
-         path path-io persistent persistent-sqlite persistent-template
-         pretty primitive process project-template regex-applicative-text
-         resourcet retry rio semigroups split stm store store-core
-         streaming-commons tar template-haskell temporary text text-metrics
+         pantry-tmp path path-io persistent persistent-sqlite
+         persistent-template pretty primitive process project-template
+         regex-applicative-text resource-pool resourcet retry rio
+         rio-prettyprint semigroups split stm streaming-commons tar
+         template-haskell temporary terminal-size text text-metrics
          th-reify-many time tls transformers typed-process
          unicode-transforms unix unix-compat unliftio unordered-containers
          vector yaml zip-archive zlib
        ];
        executableHaskellDepends = [
-         aeson annotated-wl-pprint ansi-terminal async attoparsec base
-         base64-bytestring bindings-uname bytestring Cabal conduit
-         conduit-extra containers cryptonite cryptonite-conduit deepseq
-         directory echo exceptions extra file-embed filelock filepath
-         fsnotify generic-deriving hackage-security hashable hpack hpc
-         http-client http-client-tls http-conduit http-types memory
-         microlens mintty monad-logger mono-traversable mtl mustache
+         aeson annotated-wl-pprint ansi-terminal array async attoparsec base
+         base64-bytestring bytestring Cabal colour conduit conduit-extra
+         containers cryptonite cryptonite-conduit deepseq directory echo
+         exceptions extra file-embed filelock filepath fsnotify
+         generic-deriving hackage-security hashable hi-file-parser hpack hpc
+         http-client http-client-tls http-conduit http-download http-types
+         memory microlens mintty mono-traversable mtl mustache
          neat-interpolation network-uri open-browser optparse-applicative
-         path path-io persistent persistent-sqlite persistent-template
-         pretty primitive process project-template regex-applicative-text
-         resourcet retry rio semigroups split stm store store-core
-         streaming-commons tar template-haskell temporary text text-metrics
+         pantry-tmp path path-io persistent persistent-sqlite
+         persistent-template pretty primitive process project-template
+         regex-applicative-text resource-pool resourcet retry rio
+         rio-prettyprint semigroups split stm streaming-commons tar
+         template-haskell temporary terminal-size text text-metrics
          th-reify-many time tls transformers typed-process
          unicode-transforms unix unix-compat unliftio unordered-containers
          vector yaml zip-archive zlib
        ];
        testHaskellDepends = [
-         aeson annotated-wl-pprint ansi-terminal async attoparsec base
-         base64-bytestring bindings-uname bytestring Cabal conduit
-         conduit-extra containers cryptonite cryptonite-conduit deepseq
-         directory echo exceptions extra file-embed filelock filepath
-         fsnotify generic-deriving hackage-security hashable hpack hpc hspec
-         http-client http-client-tls http-conduit http-types memory
-         microlens mintty monad-logger mono-traversable mtl mustache
+         aeson annotated-wl-pprint ansi-terminal array async attoparsec base
+         base64-bytestring bytestring Cabal colour conduit conduit-extra
+         containers cryptonite cryptonite-conduit deepseq directory echo
+         exceptions extra file-embed filelock filepath fsnotify
+         generic-deriving hackage-security hashable hi-file-parser hpack hpc
+         hspec http-client http-client-tls http-conduit http-download
+         http-types memory microlens mintty mono-traversable mtl mustache
          neat-interpolation network-uri open-browser optparse-applicative
-         path path-io persistent persistent-sqlite persistent-template
-         pretty primitive process project-template QuickCheck
-         regex-applicative-text resourcet retry rio semigroups smallcheck
-         split stm store store-core streaming-commons tar template-haskell
-         temporary text text-metrics th-reify-many time tls transformers
-         typed-process unicode-transforms unix unix-compat unliftio
-         unordered-containers vector yaml zip-archive zlib
+         pantry-tmp path path-io persistent persistent-sqlite
+         persistent-template pretty primitive process project-template
+         QuickCheck raw-strings-qq regex-applicative-text resource-pool
+         resourcet retry rio rio-prettyprint semigroups smallcheck split stm
+         streaming-commons tar template-haskell temporary terminal-size text
+         text-metrics th-reify-many time tls transformers typed-process
+         unicode-transforms unix unix-compat unliftio unordered-containers
+         vector yaml zip-archive zlib
        ];
        doCheck = false;
        preCheck = "export HOME=$TMPDIR";
@@ -216716,8 +217375,6 @@ self: {
        ];
        description = "Dead simple version bumping for hpack packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-hpc-coveralls" = callPackage
@@ -216744,8 +217401,6 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-lib" = callPackage
@@ -216761,8 +217416,6 @@ self: {
        ];
        description = "Wrapper to use stack as a library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-network" = callPackage
@@ -216804,8 +217457,6 @@ self: {
        ];
        description = "A program for extending Stack to add distributed capabilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-prism" = callPackage
@@ -216824,8 +217475,6 @@ self: {
        testHaskellDepends = [ base template-haskell ];
        description = "Stack prisms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-run" = callPackage
@@ -216845,8 +217494,6 @@ self: {
        ];
        description = "An equivalent to cabal run for stack";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-run-auto" = callPackage
@@ -216874,8 +217521,6 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-tag" = callPackage
@@ -216908,8 +217553,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "The basic stack type";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-yaml" = callPackage
@@ -216944,8 +217587,6 @@ self: {
        ];
        description = "Convert stack projects to cabal.project + cabal.project.freeze";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack2nix" = callPackage
@@ -216990,8 +217631,6 @@ self: {
        ];
        description = "Dummy package forcing installation of other Stackage packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-build-plan" = callPackage
@@ -217016,8 +217655,6 @@ self: {
        ];
        description = "Calculate and print (in different formats) Stackage build plans";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-cabal" = callPackage
@@ -217038,8 +217675,6 @@ self: {
        ];
        description = "A CLI executable for cabal-based stackage commands";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-cli" = callPackage
@@ -217061,8 +217696,6 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "A CLI library for stackage commands";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-curator" = callPackage
@@ -217107,8 +217740,6 @@ self: {
        ];
        description = "Tools for curating Stackage bundles";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-install" = callPackage
@@ -217157,8 +217788,6 @@ self: {
        ];
        description = "DEPRECATED Grab current metadata for all packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-query" = callPackage
@@ -217182,8 +217811,6 @@ self: {
        ];
        description = "Tool for querying Stackage";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-sandbox" = callPackage
@@ -217204,8 +217831,6 @@ self: {
        ];
        description = "Work with shared stackage sandboxes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-setup" = callPackage
@@ -217229,8 +217854,6 @@ self: {
        ];
        description = "An executable for downloading a Haskell setup";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-to-hackage" = callPackage
@@ -217254,8 +217877,6 @@ self: {
        ];
        description = "Convert stack.yaml to cabal.project + cabal.project.freeze";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-types" = callPackage
@@ -217275,8 +217896,6 @@ self: {
        ];
        description = "Shared data types between various Stackage packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-update" = callPackage
@@ -217313,8 +217932,6 @@ self: {
        ];
        description = "A more secure version of cabal upload which uses HTTPS";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage2nix" = callPackage
@@ -217345,8 +217962,6 @@ self: {
        ];
        description = "Convert Stack files into Nix build instructions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stacked-dag" = callPackage
@@ -219485,28 +220100,6 @@ self: {
      }:
      mkDerivation {
        pname = "streaming-commons";
-       version = "0.2.1.0";
-       sha256 = "13fn6qmpiggwpn8lczyydgp77cyzfypwds7wxskrwir4i5cgxlfq";
-       libraryHaskellDepends = [
-         array async base bytestring directory network process random stm
-         text transformers unix zlib
-       ];
-       testHaskellDepends = [
-         array async base bytestring deepseq hspec network QuickCheck text
-         unix zlib
-       ];
-       benchmarkHaskellDepends = [ base bytestring deepseq gauge text ];
-       description = "Common lower-level functions needed by various streaming data libraries";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "streaming-commons_0_2_1_1" = callPackage
-    ({ mkDerivation, array, async, base, bytestring, deepseq, directory
-     , gauge, hspec, network, process, QuickCheck, random, stm, text
-     , transformers, unix, zlib
-     }:
-     mkDerivation {
-       pname = "streaming-commons";
        version = "0.2.1.1";
        sha256 = "1lmyx3wkjsayhy5yilzvy0kf8qwmycwlk26r1d8f3cxbfhkr7s52";
        libraryHaskellDepends = [
@@ -219520,7 +220113,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring deepseq gauge text ];
        description = "Common lower-level functions needed by various streaming data libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streaming-concurrency" = callPackage
@@ -220592,6 +221184,8 @@ self: {
        doCheck = false;
        description = "Stripe API for Haskell - http-streams backend";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stripe-scotty" = callPackage
@@ -221039,6 +221633,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "stylish-haskell_0_9_2_2" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , file-embed, filepath, haskell-src-exts, HUnit, mtl
+     , optparse-applicative, semigroups, strict, syb, test-framework
+     , test-framework-hunit, yaml
+     }:
+     mkDerivation {
+       pname = "stylish-haskell";
+       version = "0.9.2.2";
+       sha256 = "1zs624xqp6j8vrl6pfv18dm8vz8hvz25grri65ximxhcizgwhnax";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory file-embed filepath
+         haskell-src-exts mtl semigroups syb yaml
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers directory file-embed filepath
+         haskell-src-exts mtl optparse-applicative strict syb yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers directory file-embed filepath
+         haskell-src-exts HUnit mtl syb test-framework test-framework-hunit
+         yaml
+       ];
+       description = "Haskell code prettifier";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stylized" = callPackage
     ({ mkDerivation, ansi-terminal, base }:
      mkDerivation {
@@ -224296,6 +224920,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tagged-identity_0_1_3" = callPackage
+    ({ mkDerivation, base, mtl, transformers }:
+     mkDerivation {
+       pname = "tagged-identity";
+       version = "0.1.3";
+       sha256 = "1n5jafvcck6mq14fb1wrgclkrkxz4vd1x09y028awz66makn5v1c";
+       libraryHaskellDepends = [ base mtl transformers ];
+       description = "Trivial monad transformer that allows identical monad stacks have different types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tagged-list" = callPackage
     ({ mkDerivation, AbortT-transformers, base, binary, natural-number
      , type-equality, type-level-natural-number
@@ -225140,15 +225776,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "tasty_1_2_2" = callPackage
+  "tasty_1_2_3" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl
      , optparse-applicative, stm, tagged, unbounded-delays, unix
      , wcwidth
      }:
      mkDerivation {
        pname = "tasty";
-       version = "1.2.2";
-       sha256 = "0jng1smav3cyam5k3a5wswgqdirlvrkwdmjyc2d9jvx1i8549mih";
+       version = "1.2.3";
+       sha256 = "0qpn0avpw4w1qq5r2gwh2piipj0llqq6ylagr3xnqiraq6mhg8cc";
        libraryHaskellDepends = [
          ansi-terminal async base clock containers mtl optparse-applicative
          stm tagged unbounded-delays unix wcwidth
@@ -225561,8 +226197,6 @@ self: {
        ];
        description = "Write tests in Lua, integrate into tasty";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tasty-program" = callPackage
@@ -228258,6 +228892,8 @@ self: {
        ];
        description = "ICU transliteration";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) icu;};
 
   "text-json-qq" = callPackage
@@ -228697,6 +229333,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Additional instances for text-show";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-stream-decode" = callPackage
@@ -229091,6 +229729,17 @@ self: {
        broken = true;
      }) {};
 
+  "th-bang-compat" = callPackage
+    ({ mkDerivation, base, template-haskell }:
+     mkDerivation {
+       pname = "th-bang-compat";
+       version = "0.0.1.0";
+       sha256 = "0p5zpiqk8141a4n362m3kpd92sx0192gpv172ixdnfgabk07gn1z";
+       libraryHaskellDepends = [ base template-haskell ];
+       description = "Compatibility for bang-type template";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "th-build" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -229814,6 +230463,8 @@ self: {
        libraryHaskellDepends = [ base base-compat lens these ];
        description = "Lenses for These";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "these-skinny" = callPackage
@@ -231978,8 +232629,8 @@ self: {
     ({ mkDerivation, auto-update, base, clock, psqueues, tls }:
      mkDerivation {
        pname = "tls-session-manager";
-       version = "0.0.0.2";
-       sha256 = "0rvmln545vghsx8zhxp44f0f6pzma8cylarmfhhysy55ipywr1n5";
+       version = "0.0.1.0";
+       sha256 = "1hv3bmv0xxcc6fb1p383ivw2gfihiwhwclrsghyhqmrnjvlqqhf3";
        libraryHaskellDepends = [ auto-update base clock psqueues tls ];
        description = "In-memory TLS session manager";
        license = stdenv.lib.licenses.bsd3;
@@ -232690,8 +233341,8 @@ self: {
      }:
      mkDerivation {
        pname = "too-many-cells";
-       version = "0.1.6.1";
-       sha256 = "1bs2x7y1g11lbryvih78my6vnjplzm8pkxrl209s5vdkfks8pf8x";
+       version = "0.1.7.0";
+       sha256 = "0pn5lssfznaw4l9q9c22rg1cz666bkcal4phjn298hh54swvzxdx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -233164,8 +233815,8 @@ self: {
      }:
      mkDerivation {
        pname = "tptp";
-       version = "0.1.0.2";
-       sha256 = "0v9qh2kxdfl8g05s7wxknq3c02mzfrjka85j73576si79n06v9jq";
+       version = "0.1.0.3";
+       sha256 = "1h00g4263akyfgirvdw5ylbiskl3hhrx58jar59blj57k0i969wi";
        libraryHaskellDepends = [
          attoparsec base prettyprinter scientific text
        ];
@@ -233265,6 +233916,29 @@ self: {
        broken = true;
      }) {};
 
+  "tracing" = callPackage
+    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+     , case-insensitive, containers, hspec, http-client, ip, mtl
+     , network, random, stm, text, time, transformers, unliftio
+     }:
+     mkDerivation {
+       pname = "tracing";
+       version = "0.0.4.0";
+       sha256 = "1l0sh9rmbysjysh169902hzx86dahiffgss8wnac8vcz95kc5qjb";
+       libraryHaskellDepends = [
+         aeson base base16-bytestring bytestring case-insensitive containers
+         http-client ip mtl network random stm text time transformers
+         unliftio
+       ];
+       testHaskellDepends = [
+         base containers hspec mtl stm text unliftio
+       ];
+       description = "Distributed tracing";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "tracker" = callPackage
     ({ mkDerivation, base, containers, glib }:
      mkDerivation {
@@ -233742,15 +234416,15 @@ self: {
 
   "transient" = callPackage
     ({ mkDerivation, atomic-primops, base, bytestring, containers
-     , directory, mtl, random, stm, time, transformers
+     , directory, mtl, primitive, random, stm, time, transformers
      }:
      mkDerivation {
        pname = "transient";
-       version = "0.6.0.1";
-       sha256 = "1k3zh4ahzzmj5ni0jyahzhfhbnvksa1ybq93541faa4g98h44ggy";
+       version = "0.6.3";
+       sha256 = "02zy60hilgagxa08j7bvd35wkpap5dzffc5af258hxiy0gdpdw0a";
        libraryHaskellDepends = [
-         atomic-primops base bytestring containers directory mtl random stm
-         time transformers
+         atomic-primops base bytestring containers directory mtl primitive
+         random stm time transformers
        ];
        testHaskellDepends = [
          atomic-primops base bytestring containers directory mtl random stm
@@ -234154,6 +234828,159 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tree-sitter" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, directory, filepath
+     , fused-effects, hedgehog, hspec, split, template-haskell, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "tree-sitter";
+       version = "0.1.0.0";
+       sha256 = "16yanr4k3zc55xgm5yajka7wgy475x2aq9lfv4j5lmxk0z7m9n9m";
+       libraryHaskellDepends = [
+         aeson base bytestring directory filepath fused-effects hedgehog
+         split template-haskell text unordered-containers
+       ];
+       testHaskellDepends = [ base hedgehog hspec ];
+       description = "Unstable bindings for the tree-sitter parsing library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "tree-sitter-go" = callPackage
+    ({ mkDerivation, base, template-haskell, tree-sitter }:
+     mkDerivation {
+       pname = "tree-sitter-go";
+       version = "0.1.0.0";
+       sha256 = "0lpj6sphc8gfyy8yz4pkrykwvrly3vdhy7j9n7jiacjsxnbw33ag";
+       libraryHaskellDepends = [ base template-haskell tree-sitter ];
+       doHaddock = false;
+       description = "Tree-sitter grammar/parser for Go";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "tree-sitter-haskell" = callPackage
+    ({ mkDerivation, base, template-haskell, tree-sitter }:
+     mkDerivation {
+       pname = "tree-sitter-haskell";
+       version = "0.1.0.0";
+       sha256 = "0jglvy6p4xwdwpk7jn9sh83j0zv51crvzfc45l10s8lflprydk1m";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base template-haskell tree-sitter ];
+       doHaddock = false;
+       description = "Tree-sitter grammar/parser for Haskell (with GHC extensions)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "tree-sitter-java" = callPackage
+    ({ mkDerivation, base, template-haskell, tree-sitter }:
+     mkDerivation {
+       pname = "tree-sitter-java";
+       version = "0.1.0.0";
+       sha256 = "1npa7i8c24hb0ds52cphfhn5cw087f8iq5w56x5wsjkvm531zblr";
+       libraryHaskellDepends = [ base template-haskell tree-sitter ];
+       doHaddock = false;
+       description = "Tree-sitter grammar/parser for Java";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "tree-sitter-json" = callPackage
+    ({ mkDerivation, base, template-haskell, tree-sitter }:
+     mkDerivation {
+       pname = "tree-sitter-json";
+       version = "0.1.0.0";
+       sha256 = "0agmr5nj4rjdlwcf64ijjwbmkpgl10gbgg26v8bpnx84cxhfjpa3";
+       libraryHaskellDepends = [ base template-haskell tree-sitter ];
+       doHaddock = false;
+       description = "Tree-sitter grammar/parser for JSON";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "tree-sitter-php" = callPackage
+    ({ mkDerivation, base, template-haskell, tree-sitter }:
+     mkDerivation {
+       pname = "tree-sitter-php";
+       version = "0.1.0.0";
+       sha256 = "0a8sp6kvw2qxx5mmfyp08fgi65fvchizrw47ay985vbrkmmqgip5";
+       libraryHaskellDepends = [ base template-haskell tree-sitter ];
+       doHaddock = false;
+       description = "Tree-sitter grammar/parser for PHP";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "tree-sitter-python" = callPackage
+    ({ mkDerivation, aeson, base, directory, filepath, template-haskell
+     , tree-sitter
+     }:
+     mkDerivation {
+       pname = "tree-sitter-python";
+       version = "0.1.0.1";
+       sha256 = "0pq4cl4fb14x9dfnc83glpvzq65li4bvl0jidbsji34v9hzkr2x1";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base directory filepath template-haskell tree-sitter
+       ];
+       doHaddock = false;
+       description = "Tree-sitter grammar/parser for Python";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "tree-sitter-ruby" = callPackage
+    ({ mkDerivation, base, template-haskell, tree-sitter }:
+     mkDerivation {
+       pname = "tree-sitter-ruby";
+       version = "0.1.0.0";
+       sha256 = "1rcaqib1ly4p54vqwm2mivijqirc031w18hgkccrnyv97yxrbhw9";
+       libraryHaskellDepends = [ base template-haskell tree-sitter ];
+       doHaddock = false;
+       description = "Tree-sitter grammar/parser for Ruby";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "tree-sitter-tsx" = callPackage
+    ({ mkDerivation, base, template-haskell, tree-sitter }:
+     mkDerivation {
+       pname = "tree-sitter-tsx";
+       version = "0.1.0.0";
+       sha256 = "0jsc5kx5dw4b686dfs7n3vdafyg8mpf94cq2mscwmcyv9w1f3gma";
+       libraryHaskellDepends = [ base template-haskell tree-sitter ];
+       doHaddock = false;
+       description = "Tree-sitter grammar/parser for TSX";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "tree-sitter-typescript" = callPackage
+    ({ mkDerivation, base, template-haskell, tree-sitter }:
+     mkDerivation {
+       pname = "tree-sitter-typescript";
+       version = "0.1.0.0";
+       sha256 = "1mpk1vhahbva8733anx624vl66fg3h6l9lsby87kf98yrp55ycbn";
+       libraryHaskellDepends = [ base template-haskell tree-sitter ];
+       doHaddock = false;
+       description = "Tree-sitter grammar/parser for TypeScript";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "tree-traversals" = callPackage
     ({ mkDerivation, base, containers, doctest, mtl }:
      mkDerivation {
@@ -236737,10 +237564,8 @@ self: {
      }:
      mkDerivation {
        pname = "typed-process";
-       version = "0.2.4.0";
-       sha256 = "02xvyaq4sxwjqbmkn29n5x58l4rni6gbqp526r3q7wn6jalgazwr";
-       revision = "1";
-       editedCabalFile = "1i46snkrdpjjsfqbjjarnivadlrd7gbc4nab868ki848vd38qgf1";
+       version = "0.2.4.1";
+       sha256 = "0akmgrsvdr2ywq1asf3ra6nngxsdihn5mw1chvyxmw44i5l330rm";
        libraryHaskellDepends = [
          async base bytestring process stm transformers
        ];
@@ -237350,8 +238175,8 @@ self: {
        pname = "ucam-webauth";
        version = "0.1.0.0";
        sha256 = "14l989aasyqdw1x7aq9ikhcq9p3s1ax4qk53rd5s53wdgbc20n9k";
-       revision = "3";
-       editedCabalFile = "01j0296a60hpw0n5d50327hnqpkxwzz7pngxq8da5ram0q13cfzw";
+       revision = "4";
+       editedCabalFile = "1pdlj36ny2rm3sabpknhlw02s5y5r1ng77cvq3l350cv7k946i2f";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers cryptonite errors
          http-api-data http-types microlens microlens-mtl mtl
@@ -238252,6 +239077,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "unicode-transforms_0_3_6" = callPackage
+    ({ mkDerivation, base, bitarray, bytestring, deepseq, filepath
+     , gauge, getopt-generics, optparse-applicative, path, path-io
+     , QuickCheck, split, text
+     }:
+     mkDerivation {
+       pname = "unicode-transforms";
+       version = "0.3.6";
+       sha256 = "1akscvyssif4hki3g6hy0jmjyr8cqly1whzvzj0km2b3qh0x09l3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bitarray bytestring text ];
+       testHaskellDepends = [
+         base deepseq getopt-generics QuickCheck split text
+       ];
+       benchmarkHaskellDepends = [
+         base deepseq filepath gauge optparse-applicative path path-io text
+       ];
+       description = "Unicode normalization";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unicoder" = callPackage
     ({ mkDerivation, attoparsec, base, data-default, directory
      , filepath, text, twitch
@@ -239069,6 +239917,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "unix-time_0_4_6" = callPackage
+    ({ mkDerivation, base, binary, bytestring, hspec, hspec-discover
+     , old-locale, old-time, QuickCheck, time
+     }:
+     mkDerivation {
+       pname = "unix-time";
+       version = "0.4.6";
+       sha256 = "0cjxjbd3qgqhyfyw3r9g7vyvmli4apl2za6fzb8ym37jgaanl9q4";
+       libraryHaskellDepends = [ base binary bytestring old-time ];
+       testHaskellDepends = [
+         base bytestring hspec old-locale old-time QuickCheck time
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Unix time parser/formatter and utilities";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unjson" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , free, hashable, HUnit, invariant, pretty, primitive, scientific
@@ -239124,8 +239990,8 @@ self: {
      }:
      mkDerivation {
        pname = "unliftio";
-       version = "0.2.10";
-       sha256 = "0p0vrw8yxfc5d31zybx08mp302fafs0a6lwq3n40qd1wiy2nw78l";
+       version = "0.2.11";
+       sha256 = "1bc80845pbrs19xh0557w14k1ymzdysc8sf5vh63cfx63vpkw772";
        libraryHaskellDepends = [
          async base deepseq directory filepath process stm time transformers
          unix unliftio-core
@@ -243670,8 +244536,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "vulkan-api";
-       version = "1.1.4.0";
-       sha256 = "10q98v71miyb1yhnpvz9dlhjs38m4pbz7x1hndz8cfsnjk3n5b22";
+       version = "1.3.0.0";
+       sha256 = "1afnj053p3azm9wwdsr49w2s82k64lb0f12ak2g2v8vgidrjl7qk";
        libraryHaskellDepends = [ base ];
        description = "Low-level low-overhead vulkan api bindings";
        license = stdenv.lib.licenses.bsd3;
@@ -243834,8 +244700,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-app-file-cgi";
-       version = "3.1.7";
-       sha256 = "17cj50p16adyzqr28f28ll64g3gr8ri756dngrdgly0g7060fg53";
+       version = "3.1.8";
+       sha256 = "0yxhiba6yywv9yps8pal9l41wh8wi3bfhr1sm0mnvsirps4rk39y";
        libraryHaskellDepends = [
          array attoparsec attoparsec-conduit base bytestring
          case-insensitive conduit conduit-extra containers
@@ -243948,30 +244814,6 @@ self: {
      }:
      mkDerivation {
        pname = "wai-cors";
-       version = "0.2.6";
-       sha256 = "11m9d8hn9pb9brprz0kglldmcqj83kjkjdwdpxdbl12430ii1ina";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         attoparsec base base-unicode-symbols bytestring case-insensitive
-         http-types mtl transformers wai
-       ];
-       testHaskellDepends = [
-         base base-unicode-symbols directory filepath http-types network
-         process tasty tasty-hunit text wai wai-extra wai-websockets warp
-         websockets
-       ];
-       description = "CORS for WAI";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wai-cors_0_2_7" = callPackage
-    ({ mkDerivation, attoparsec, base, base-unicode-symbols, bytestring
-     , case-insensitive, directory, filepath, http-types, mtl, network
-     , process, tasty, tasty-hunit, text, transformers, wai, wai-extra
-     , wai-websockets, warp, websockets
-     }:
-     mkDerivation {
-       pname = "wai-cors";
        version = "0.2.7";
        sha256 = "10gv3jjlkcb13031frr818p56v2s0qf6dqjsfpwlhwdxdssvx5r5";
        enableSeparateDataOutput = true;
@@ -243986,7 +244828,6 @@ self: {
        ];
        description = "CORS for WAI";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-devel" = callPackage
@@ -244408,6 +245249,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wai-logger_2_3_5" = callPackage
+    ({ mkDerivation, base, byteorder, bytestring, Cabal, cabal-doctest
+     , doctest, fast-logger, http-types, network, wai
+     }:
+     mkDerivation {
+       pname = "wai-logger";
+       version = "2.3.5";
+       sha256 = "05gbipyw0672irynsc3wqvvgzqixhmq69ay2mxh2phb734r8bcmm";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base byteorder bytestring fast-logger http-types network wai
+       ];
+       testHaskellDepends = [ base doctest ];
+       description = "A logging system for WAI";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-logger-buffered" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default
      , http-types, time, wai, warp
@@ -246530,8 +247389,8 @@ self: {
      }:
      mkDerivation {
        pname = "webby";
-       version = "0.1.0.2";
-       sha256 = "1yndypl1x5pcxhc1mp2midbidbzvgvjy3s7h076lxpra1dvi6h7r";
+       version = "0.1.1";
+       sha256 = "0415vhp8h3lr8wlfkg6a7njq19ka1wyi9klcmsd117phd9m46whb";
        libraryHaskellDepends = [
          aeson base binary bytestring fast-logger formatting http-api-data
          http-types monad-logger protolude resourcet text unliftio
@@ -246652,7 +247511,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "webdriver_0_9" = callPackage
+  "webdriver_0_9_0_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , bytestring, call-stack, data-default-class, directory
      , directory-tree, exceptions, filepath, http-client, http-types
@@ -246662,8 +247521,8 @@ self: {
      }:
      mkDerivation {
        pname = "webdriver";
-       version = "0.9";
-       sha256 = "0m3ga11bysg86n6x3106k0g4v90bnx0dvghixvzm8mhk32l38jbq";
+       version = "0.9.0.1";
+       sha256 = "1w6z95swrz5ijmcxh0x3i521kpxqfp6pxgqfqwix7fc4jy450n8k";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bytestring call-stack
          data-default-class directory directory-tree exceptions filepath
@@ -247244,6 +248103,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "weekdaze" = callPackage
+    ({ mkDerivation, array, base, bytestring, Cabal, containers
+     , cryptohash, data-default, deepseq, directory, extra, factory
+     , filepath, hxt, mtl, parallel, QuickCheck, random, time, toolshed
+     , unix, xhtml
+     }:
+     mkDerivation {
+       pname = "weekdaze";
+       version = "0.0.0.1";
+       sha256 = "13nxi6gqm4by2y6wd3vwj0rqjircpfng0nz5h2spci2jrbmv52d3";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         array base bytestring Cabal containers cryptohash data-default
+         deepseq extra factory filepath hxt mtl random toolshed xhtml
+       ];
+       executableHaskellDepends = [
+         array base Cabal containers cryptohash data-default deepseq
+         directory extra factory filepath hxt mtl parallel random time
+         toolshed unix xhtml
+       ];
+       testHaskellDepends = [
+         array base Cabal containers factory mtl QuickCheck toolshed
+       ];
+       description = "A school-timetable problem-solver";
+       license = "GPL";
+     }) {};
+
   "weigh" = callPackage
     ({ mkDerivation, base, deepseq, mtl, process, split, temporary }:
      mkDerivation {
@@ -248473,6 +249361,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wordify" = callPackage
+    ({ mkDerivation, array, base, containers, directory, errors
+     , filepath, HUnit, listsafe, mtl, parsec, QuickCheck, random, safe
+     , semigroups, split, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "wordify";
+       version = "0.1.0.0";
+       sha256 = "1iw3sk8sspscl29chnvd69g8l7pfz7vlpj9vyai8fkwipmc3jrwv";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base containers errors listsafe mtl parsec random safe
+         semigroups split transformers unordered-containers
+       ];
+       executableHaskellDepends = [
+         array base containers errors listsafe mtl parsec random safe
+         semigroups split transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         array base containers directory errors filepath HUnit listsafe mtl
+         parsec QuickCheck random safe semigroups split test-framework
+         test-framework-hunit test-framework-quickcheck2 transformers
+         unordered-containers
+       ];
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "wordlist" = callPackage
     ({ mkDerivation, base, MonadRandom, optparse-applicative, text
      , vector
@@ -249442,6 +250361,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wuss_1_1_14" = callPackage
+    ({ mkDerivation, base, bytestring, connection, network, websockets
+     }:
+     mkDerivation {
+       pname = "wuss";
+       version = "1.1.14";
+       sha256 = "1r0ljrp7kfksvmm4029b633cypdg5lqk5nga31si22bi5yz7fkiq";
+       libraryHaskellDepends = [
+         base bytestring connection network websockets
+       ];
+       description = "Secure WebSocket (WSS) clients";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wx" = callPackage
     ({ mkDerivation, base, stm, time, wxcore }:
      mkDerivation {
@@ -250326,6 +251260,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "xls_0_1_2" = callPackage
+    ({ mkDerivation, base, conduit, filepath, getopt-generics
+     , resourcet, transformers
+     }:
+     mkDerivation {
+       pname = "xls";
+       version = "0.1.2";
+       sha256 = "0gpfc973g6ha9w3fqm9dy59kgl21hw20l2b444rrz0lxs9ix1wyp";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base conduit filepath resourcet transformers
+       ];
+       executableHaskellDepends = [
+         base conduit getopt-generics resourcet transformers
+       ];
+       testHaskellDepends = [ base ];
+       description = "Parse Microsoft Excel xls files (BIFF/Excel 97-2004)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "xlsior" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-markup, bytestring
      , conduit, conduit-extra, data-default, exceptions, mtl, resourcet
@@ -256185,6 +257141,8 @@ self: {
        pname = "yx";
        version = "0.0.2.0";
        sha256 = "05xh7x02ddh87kwslgckzh3g5i22r01vfrb160gns3zl6fv8sj2z";
+       revision = "1";
+       editedCabalFile = "19px5wf8ca7awam013ij62z04rsplgn7ks56j8jzhznarsg45ksq";
        libraryHaskellDepends = [ array base bytestring ];
        testHaskellDepends = [ array base bytestring hspec ];
        description = "Row-major coordinates";
@@ -256248,6 +257206,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Bindings for the Z3 Theorem Prover";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {gomp = null; inherit (pkgs) z3;};
 
   "z3-encoding" = callPackage
diff --git a/nixpkgs/pkgs/development/haskell-modules/patches/insert-ordered-containers-fix-test.patch b/nixpkgs/pkgs/development/haskell-modules/patches/insert-ordered-containers-fix-test.patch
deleted file mode 100644
index 1e9ac5aa66a4..000000000000
--- a/nixpkgs/pkgs/development/haskell-modules/patches/insert-ordered-containers-fix-test.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/insert-ordered-containers.cabal b/insert-ordered-containers.cabal
-index 0e8923a..bfbbec4 100644
---- a/insert-ordered-containers.cabal
-+++ b/insert-ordered-containers.cabal
-@@ -21,8 +21,8 @@ tested-with:
-   GHC==7.10.3,
-   GHC==8.0.1,
-   GHC==8.2.2,
--  GHC==8.4.3,
--  GHC==8.6.1
-+  GHC==8.4.4,
-+  GHC==8.6.3
- 
- extra-source-files:
-     CHANGELOG.md
-@@ -70,7 +70,7 @@ test-suite ins-ord-containers-tests
-     , unordered-containers
-     , base
-     , insert-ordered-containers
--    , tasty             >= 0.10.1.2 && <1.2
-+    , tasty             >= 0.10.1.2 && <1.3
-     , tasty-quickcheck  >= 0.8.3.2  && <0.11
-     , QuickCheck        >=2.7.6     && <2.13
-   default-language: Haskell2010
-
diff --git a/nixpkgs/pkgs/development/interpreters/erlang/R21.nix b/nixpkgs/pkgs/development/interpreters/erlang/R21.nix
index 8c4e1561ec0a..60eb6c8a6a5e 100644
--- a/nixpkgs/pkgs/development/interpreters/erlang/R21.nix
+++ b/nixpkgs/pkgs/development/interpreters/erlang/R21.nix
@@ -1,8 +1,8 @@
 { mkDerivation }:
 
 mkDerivation rec {
-  version = "21.3.7.1";
-  sha256 = "03vbp22vwra3zz76q3sjv23lmic60gi96a7dncry8whbfp4i4j8a";
+  version = "21.3.8.3";
+  sha256 = "1szybirrcpqsl2nmlmpbkxjqnm6i7l7bma87m5cpwi0kpvlxwmcw";
 
   prePatch = ''
     substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10'
diff --git a/nixpkgs/pkgs/development/interpreters/php/default.nix b/nixpkgs/pkgs/development/interpreters/php/default.nix
index 9a6b2f99f4ae..a4a0b41210a4 100644
--- a/nixpkgs/pkgs/development/interpreters/php/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/php/default.nix
@@ -1,10 +1,10 @@
 # pcre functionality is tested in nixos/tests/php-pcre.nix
-{ lib, stdenv, fetchurl, flex, bison, autoconf
+{ lib, stdenv, fetchurl, autoconf, bison, libtool, pkgconfig, re2c
 , mysql, libxml2, readline, zlib, curl, postgresql, gettext
-, openssl, pcre, pcre2, pkgconfig, sqlite, config, libjpeg, libpng, freetype
+, openssl, pcre, pcre2, sqlite, config, libjpeg, libpng, freetype
 , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, unixODBC
 , uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2
-, libzip, re2c, valgrind
+, libzip, valgrind
 }:
 
 with lib;
@@ -48,7 +48,7 @@ let
   , ftpSupport ? config.php.ftp or true
   , fpmSupport ? config.php.fpm or true
   , gmpSupport ? config.php.gmp or true
-  , ztsSupport ? config.php.zts or false
+  , ztsSupport ? (config.php.zts or false) || (apxs2Support)
   , calendarSupport ? config.php.calendar or true
   , sodiumSupport ? (config.php.sodium or true) && (versionAtLeast version "7.2")
   , tidySupport ? (config.php.tidy or false)
@@ -59,10 +59,8 @@ let
   , cliSupport ? config.php.cli or true
   , pharSupport ? config.php.phar or true
   , xmlrpcSupport ? (config.php.xmlrpc or false) && (libxml2Support)
-  , re2cSupport ? config.php.re2c or true
-  , cgotoSupport ? (config.php.cgoto or false) && (re2cSupport)
+  , cgotoSupport ? config.php.cgoto or false
   , valgrindSupport ? (config.php.valgrind or true) && (versionAtLeast version "7.2")
-  , valgrindPcreSupport ? (config.php.valgrindPcreSupport or false) && (valgrindSupport) && (versionAtLeast version "7.2")
   }:
 
     let
@@ -76,8 +74,8 @@ let
 
       enableParallelBuilding = true;
 
-      nativeBuildInputs = [ pkgconfig autoconf ];
-      buildInputs = [ flex bison ]
+      nativeBuildInputs = [ autoconf bison libtool pkgconfig re2c ];
+      buildInputs = [ ]
         ++ optional (versionOlder version "7.3") pcre
         ++ optional (versionAtLeast version "7.3") pcre2
         ++ optional withSystemd systemd
@@ -108,7 +106,6 @@ let
         ++ optional tidySupport html-tidy
         ++ optional argon2Support libargon2
         ++ optional libzipSupport libzip
-        ++ optional re2cSupport re2c
         ++ optional valgrindSupport valgrind;
 
       CXXFLAGS = optional stdenv.cc.isClang "-std=c++11";
@@ -192,8 +189,7 @@ let
       ++ optional (!pharSupport) "--disable-phar"
       ++ optional xmlrpcSupport "--with-xmlrpc"
       ++ optional cgotoSupport "--enable-re2c-cgoto"
-      ++ optional valgrindSupport "--with-valgrind=${valgrind.dev}"
-      ++ optional valgrindPcreSupport "--with-pcre-valgrind";
+      ++ optional valgrindSupport "--with-valgrind=${valgrind.dev}";
 
       hardeningDisable = [ "bindnow" ];
 
diff --git a/nixpkgs/pkgs/development/libraries/babl/default.nix b/nixpkgs/pkgs/development/libraries/babl/default.nix
index 947065997ec9..eff6ff626325 100644
--- a/nixpkgs/pkgs/development/libraries/babl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/babl/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "babl-0.1.62";
+  pname = "babl";
+  version = "0.1.66";
 
   src = fetchurl {
-    url = "https://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
-    sha256 = "047msfzj8v4sfl61a2xhd69r9rh2pjq4lzpk3j10ijyv9qbry9yw";
+    url = "https://ftp.gtk.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
+    sha256 = "0qx1dwbinxihwl2lmxi60qiqi402jlrdcnixx14kk6j88n9xi79n";
   };
 
   doCheck = true;
diff --git a/nixpkgs/pkgs/development/libraries/beignet/clang_llvm.patch b/nixpkgs/pkgs/development/libraries/beignet/clang_llvm.patch
index 88876f157cdb..bcdad510e10d 100644
--- a/nixpkgs/pkgs/development/libraries/beignet/clang_llvm.patch
+++ b/nixpkgs/pkgs/development/libraries/beignet/clang_llvm.patch
@@ -47,16 +47,3 @@ index a148321..96cafb8 100644
    set(CLANG_LIBRARIES ${CLANG_LIBRARIES} ${CLANG_LIB})
  	unset(CLANG_LIB CACHE)
  endmacro()
-diff --git a/./CMakeLists.txt b/../Beignet-1.1.2-Source_new/CMakeLists.txt
-index 88985d7..01bca9e 100644
---- a/./CMakeLists.txt
-+++ b/../Beignet-1.1.2-Source_new/CMakeLists.txt
-@@ -205,7 +205,7 @@ IF(OCLIcd_FOUND)
-     "intel-beignet.icd.in"
-     "${ICD_FILE_NAME}"
-   )
--  install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION /etc/OpenCL/vendors)
-+  install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/etc/OpenCL/vendors)
- ELSE(OCLIcd_FOUND)
-   MESSAGE(STATUS "Looking for OCL ICD header file - not found")
- ENDIF(OCLIcd_FOUND)
diff --git a/nixpkgs/pkgs/development/libraries/beignet/default.nix b/nixpkgs/pkgs/development/libraries/beignet/default.nix
index ba6fc7cb541b..05ff5593205a 100644
--- a/nixpkgs/pkgs/development/libraries/beignet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/beignet/default.nix
@@ -1,5 +1,5 @@
 { stdenv
-, fetchurl
+, fetchFromGitHub
 , cmake
 , pkgconfig
 , clang-unwrapped
@@ -19,11 +19,13 @@
 
 stdenv.mkDerivation rec {
   name = "beignet-${version}";
-  version = "1.3.2";
+  version = "unstable-2018.08.20";
 
-  src = fetchurl {
-    url = "https://01.org/sites/default/files/${name}-source.tar.gz"; 
-    sha256 = "0hqb04jhjjslnmi3fnpzphanz84zywwkyw2sjr1k5qlx2jxfsmf5";
+  src = fetchFromGitHub {
+    owner  = "intel";
+    repo   = "beignet";
+    rev    = "fc5f430cb7b7a8f694d86acbb038bd5b38ec389c";
+    sha256 = "1z64v69w7f52jrskh1jfyh1x46mzfhjrqxj9hhgzh3xxv9yla32h";
   };
 
   patches = [ ./clang_llvm.patch ];
@@ -31,6 +33,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   postPatch = ''
+    substituteInPlace CMakeLists.txt --replace /etc/OpenCL/vendors "\''${CMAKE_INSTALL_PREFIX}/etc/OpenCL/vendors"
     patchShebangs src/git_sha1.sh
   '';
 
@@ -101,8 +104,8 @@ stdenv.mkDerivation rec {
     homepage = https://cgit.freedesktop.org/beignet/;
     description = "OpenCL Library for Intel Ivy Bridge and newer GPUs";
     longDescription = ''
-      The package provides an open source implementation of the OpenCL specification for Intel GPUs. 
-      It supports the Intel OpenCL runtime library and compiler. 
+      The package provides an open source implementation of the OpenCL specification for Intel GPUs.
+      It supports the Intel OpenCL runtime library and compiler.
     '';
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ artuuge zimbatm ];
diff --git a/nixpkgs/pkgs/development/libraries/dbus/default.nix b/nixpkgs/pkgs/development/libraries/dbus/default.nix
index 6d85fe1233cf..60d0cc81d2bc 100644
--- a/nixpkgs/pkgs/development/libraries/dbus/default.nix
+++ b/nixpkgs/pkgs/development/libraries/dbus/default.nix
@@ -6,8 +6,8 @@ assert x11Support -> libX11 != null
                   && libSM != null;
 
 let
-  version = "1.12.12";
-  sha256 = "1y7mxhkw2shd9mi9s62k81lz8npjkrafapr4fyfms7hs04kg4ilm";
+  version = "1.12.14";
+  sha256 = "13aca7gzgl7z1dfdipfs23773w8n6z01d4rj5kmssv4gms8c5ya4";
 
 self = stdenv.mkDerivation {
     name = "dbus-${version}";
diff --git a/nixpkgs/pkgs/development/libraries/faad2/default.nix b/nixpkgs/pkgs/development/libraries/faad2/default.nix
index 50323846e980..e7e4835d2ed3 100644
--- a/nixpkgs/pkgs/development/libraries/faad2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/faad2/default.nix
@@ -12,6 +12,30 @@ stdenv.mkDerivation rec {
     sha256 = "1db37ydb6mxhshbayvirm5vz6j361bjim4nkpwjyhmy4ddfinmhl";
   };
 
+  patches = let
+    fp = { ver ? "2.8.8-3", pname, name ? (pname + ".patch"), sha256 }: fetchurl {
+      url = "https://salsa.debian.org/multimedia-team/faad2/raw/debian/${ver}"
+          + "/debian/patches/${pname}.patch?inline=false";
+      inherit name sha256;
+    };
+  in [
+    (fp {
+      # critical bug addressed in vlc 3.0.7 (but we use system-provided faad)
+      pname = "0004-Fix-a-couple-buffer-overflows";
+      sha256 = "1mwycdfagz6wpda9j3cp7lf93crgacpa8rwr58p3x0i5cirnnmwq";
+    })
+    (fp {
+      name = "CVE-2018-20362.patch";
+      pname = "0009-syntax.c-check-for-syntax-element-inconsistencies";
+      sha256 = "1z849l5qyvhyn5pvm6r07fa50nrn8nsqnrka2nnzgkhxlhvzpa81";
+    })
+    (fp {
+      name = "CVE-2018-20194.patch";
+      pname = "0010-sbr_hfadj-sanitize-frequency-band-borders";
+      sha256 = "1b1kbz4mv0zhpq8h3djnvqafh1gn12nikk9v3jrxyryywacirah4";
+    })
+  ];
+
   configureFlags = []
     ++ optional drmSupport "--with-drm";
 
diff --git a/nixpkgs/pkgs/development/libraries/flatpak/default.nix b/nixpkgs/pkgs/development/libraries/flatpak/default.nix
index aff5737432f5..4ea17e588a9b 100644
--- a/nixpkgs/pkgs/development/libraries/flatpak/default.nix
+++ b/nixpkgs/pkgs/development/libraries/flatpak/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2
 , gobject-introspection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc, xdg-dbus-proxy, p11-kit
 , bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, python2, hicolor-icon-theme
-, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3, gsettings-desktop-schemas }:
+, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3, gsettings-desktop-schemas, librsvg }:
 
 stdenv.mkDerivation rec {
   pname = "flatpak";
@@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
     ./respect-xml-catalog-files-var.patch
     ./use-flatpak-from-path.patch
     ./unset-env-vars.patch
+    ./validate-icon-pixbuf.patch
   ];
 
   nativeBuildInputs = [
@@ -44,6 +45,7 @@ stdenv.mkDerivation rec {
     bubblewrap bzip2 dbus gnome3.dconf glib gpgme json-glib libarchive libcap libseccomp
     libsoup lzma ostree polkit python3 systemd xorg.libXau
     gsettings-desktop-schemas glib-networking
+    librsvg # for flatpak-validate-icon
   ];
 
   checkInputs = [ valgrind ];
diff --git a/nixpkgs/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch b/nixpkgs/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch
new file mode 100644
index 000000000000..5b8cc2d0383f
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch
@@ -0,0 +1,13 @@
+diff --git a/icon-validator/validate-icon.c b/icon-validator/validate-icon.c
+index 6e23d9f2..f0659a78 100644
+--- a/icon-validator/validate-icon.c
++++ b/icon-validator/validate-icon.c
+@@ -193,6 +193,8 @@ rerun_in_sandbox (const char *arg_width,
+     add_args (args, "--setenv", "G_MESSAGES_DEBUG", g_getenv ("G_MESSAGES_DEBUG"), NULL);
+   if (g_getenv ("G_MESSAGES_PREFIXED"))
+     add_args (args, "--setenv", "G_MESSAGES_PREFIXED", g_getenv ("G_MESSAGES_PREFIXED"), NULL);
++  if (g_getenv ("GDK_PIXBUF_MODULE_FILE"))
++    add_args (args, "--setenv", "GDK_PIXBUF_MODULE_FILE", g_getenv ("GDK_PIXBUF_MODULE_FILE"), NULL);
+ 
+   add_args (args, validate_icon, arg_width, arg_height, filename, NULL);
+   g_ptr_array_add (args, NULL);
diff --git a/nixpkgs/pkgs/development/libraries/glib/default.nix b/nixpkgs/pkgs/development/libraries/glib/default.nix
index db4eee38b6e4..a2c7bdc5bde6 100644
--- a/nixpkgs/pkgs/development/libraries/glib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/glib/default.nix
@@ -46,7 +46,7 @@ let
   '';
 
   binPrograms = optional (!stdenv.isDarwin) "gapplication" ++ [ "gdbus" "gio" "gsettings" ];
-  version = "2.60.2";
+  version = "2.60.3";
 in
 
 stdenv.mkDerivation rec {
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1nc0iyday7866hq0hb78h7lxa44an998lzis8jhgvp8a0rsm9w9f";
+    sha256 = "1fb0nx9fcmic8rsh0fbp79lqpasfjxljvnshbw2hsya51mb0vaq4";
   };
 
   patches = optional stdenv.isDarwin ./darwin-compilation.patch
diff --git a/nixpkgs/pkgs/development/libraries/goffice/default.nix b/nixpkgs/pkgs/development/libraries/goffice/default.nix
index 3d3275b041f1..a14c40e6d87e 100644
--- a/nixpkgs/pkgs/development/libraries/goffice/default.nix
+++ b/nixpkgs/pkgs/development/libraries/goffice/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "goffice";
-  version = "0.10.44";
+  version = "0.10.45";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1fd7cm6j0g0mqgpqs4y22b4gd2ll4mcyvg4d0q22d5ndjapl4q3d";
+    sha256 = "702ba567e9ec0bbdd9b1a8161cd24648b4868d57a6cb89128f13c125f6f31947";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];
diff --git a/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix b/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix
index 7c364c0fcdf5..a405633c1b8d 100644
--- a/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix
+++ b/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix
@@ -8,7 +8,7 @@
 }:
 
 let
-  version = "2.3.1";
+  version = "2.5.1";
   inherit (stdenv.lib) optional optionals optionalString;
 in
 
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
   name = "harfbuzz${optionalString withIcu "-icu"}-${version}";
 
   src = fetchurl {
-    url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
-    sha256 = "0s74ramsbfa183rxkidqgfd2vbhrwicnrqzqsq440dwibffnj1gj";
+    url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.xz";
+    sha256 = "17kiyq23g7bnjvyn2yg4gyr7i7qjam65n20whsrplpxxk9bk8j3d";
   };
 
   postPatch = ''
diff --git a/nixpkgs/pkgs/development/libraries/hwloc/default.nix b/nixpkgs/pkgs/development/libraries/hwloc/default.nix
index 81e30d675d28..5866d6b8fedb 100644
--- a/nixpkgs/pkgs/development/libraries/hwloc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/hwloc/default.nix
@@ -7,7 +7,7 @@ assert x11Support -> libX11 != null && cairo != null;
 with stdenv.lib;
 
 let
-  version = "2.0.3";
+  version = "2.0.4";
   versmm = versions.major version + "." + versions.minor version;
   name = "hwloc-${version}";
 
@@ -16,7 +16,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.open-mpi.org/software/hwloc/v${versmm}/downloads/${name}.tar.bz2";
-    sha256 = "09f7ajak8wv5issr0hw72vs3jkldc7crcc7z5fd34sspkvrsm4z3";
+    sha256 = "1aa7s208gdijk19vvzzahyl8pglk1va3yd6kdbpfa5pz5ms0ag35";
   };
 
   configureFlags = [
diff --git a/nixpkgs/pkgs/development/libraries/libevent/default.nix b/nixpkgs/pkgs/development/libraries/libevent/default.nix
index 39d2c29b0127..2bc2bcb5b856 100644
--- a/nixpkgs/pkgs/development/libraries/libevent/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libevent/default.nix
@@ -6,25 +6,13 @@ assert sslSupport -> openssl != null;
 
 stdenv.mkDerivation rec {
   name = "libevent-${version}";
-  version = "2.1.8";
+  version = "2.1.10";
 
   src = fetchurl {
     url = "https://github.com/libevent/libevent/releases/download/release-${version}-stable/libevent-${version}-stable.tar.gz";
-    sha256 = "1hhxnxlr0fsdv7bdmzsnhdz16fxf3jg2r6vyljcl3kj6pflcap4n";
+    sha256 = "1c25928gdv495clxk2v1d4gkr5py7ack4gx2n7d13frnld0syr78";
   };
 
-  #NOTE: Patches to support libressl-2.7. These are taken from libevent upstream, and can both be dropped with the next release.
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/libevent/libevent/commit/22dd14945c25600de3cf8b91000c66703b551e4f.patch";
-      sha256 = "0fzcb241cp9mm7j6baw22blcglbc083ryigzyjaij8r530av10kd";
-    })
-    (fetchpatch {
-      url = "https://github.com/libevent/libevent/commit/28b8075400c70b2d2da2ce07e590c2ec6d11783d.patch";
-      sha256 = "0dkzlk44033xksg2iq5w90r3lnziwl1mgz291nzqq906zrya0sdb";
-    })
-  ];
-
   # libevent_openssl is moved into its own output, so that openssl isn't present
   # in the default closure.
   outputs = [ "out" "dev" ]
diff --git a/nixpkgs/pkgs/development/libraries/libical/default.nix b/nixpkgs/pkgs/development/libraries/libical/default.nix
index 8ca3dd727545..916530220526 100644
--- a/nixpkgs/pkgs/development/libraries/libical/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libical/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "libical-${version}";
   version = "3.0.4";
 
-  outputs = [ "out" "dev" "devdoc" ];
+  outputs = [ "out" "dev" ]; #"devdoc" ];
 
   src = fetchFromGitHub {
     owner = "libical";
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     perl pkgconfig cmake ninja vala gobject-introspection
     (python3.withPackages (pkgs: with pkgs; [ pygobject3 ])) # running libical-glib tests
-    gtk-doc docbook_xsl docbook_xml_dtd_43 # docs
+# Docs building fails: https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489
+#    gtk-doc docbook_xsl docbook_xml_dtd_43 # docs
   ];
   buildInputs = [ glib libxml2 icu ];
 
diff --git a/nixpkgs/pkgs/development/libraries/libidn2/default.nix b/nixpkgs/pkgs/development/libraries/libidn2/default.nix
index c0fadfeb6798..5ec5b8e04dd0 100644
--- a/nixpkgs/pkgs/development/libraries/libidn2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libidn2/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "libidn2-${version}";
-  version = "2.1.1a";
+  version = "2.2.0";
 
   src = fetchurl {
     url = "mirror://gnu/gnu/libidn/${name}.tar.gz";
-    sha256 = "0wlb0jrkccsdxlx90wx6ax5raqcm6y9c75dcgc6j6m6gdv7nnrjp";
+    sha256 = "1zl1cc2xgxw31pdhvhr5ij36x4vvpy16jq667rspin06nlr4fwzw";
   };
 
   outputs = [ "bin" "dev" "out" "info" "devdoc" ];
diff --git a/nixpkgs/pkgs/development/libraries/libnftnl/default.nix b/nixpkgs/pkgs/development/libraries/libnftnl/default.nix
index f94af3498421..ad51ac8d6dbb 100644
--- a/nixpkgs/pkgs/development/libraries/libnftnl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnftnl/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, libmnl }:
 
 stdenv.mkDerivation rec {
-  version = "1.1.2";
-  name = "libnftnl-${version}";
+  version = "1.1.3";
+  pname = "libnftnl";
 
   src = fetchurl {
-    url = "https://netfilter.org/projects/libnftnl/files/${name}.tar.bz2";
-    sha256 = "0pffmsv41alsn5ac7mwnb9fh3qpwzqk13jrzn6c5i71wq6kbgix5";
+    url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2";
+    sha256 = "03xszkcpqk3s1rqc6vh7g5j13kh3d3yjnvjhk5scds3an39rgp92";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/nixpkgs/pkgs/development/libraries/libpsl/default.nix b/nixpkgs/pkgs/development/libraries/libpsl/default.nix
index ac00920d054c..7e2443d31e92 100644
--- a/nixpkgs/pkgs/development/libraries/libpsl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpsl/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--disable-static"
-    "--enable-gtk-doc"
+#    "--enable-gtk-doc"
     "--enable-man"
     "--enable-valgrind-tests"
     "--with-psl-distfile=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"
diff --git a/nixpkgs/pkgs/development/libraries/librime/default.nix b/nixpkgs/pkgs/development/libraries/librime/default.nix
index b1e426172538..71362fd7ef7b 100644
--- a/nixpkgs/pkgs/development/libraries/librime/default.nix
+++ b/nixpkgs/pkgs/development/libraries/librime/default.nix
@@ -2,14 +2,14 @@
   libyamlcpp, gmock }:
 
 stdenv.mkDerivation rec {
-  name = "librime-${version}";
-  version = "1.4.0";
+  pname = "librime";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "rime";
     repo = "librime";
     rev = "${version}";
-    sha256 = "1zkx1wfbd94v55gfycyd2b94jxclfyk2zl7yw35pyjx63qdlb6sd";
+    sha256 = "10wvh1l4317yzcys4rzlkw42i6cj5p8g62r1xzyjw32ky2d0ndxl";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/nixpkgs/pkgs/development/libraries/libsodium/default.nix b/nixpkgs/pkgs/development/libraries/libsodium/default.nix
index 51f779bca6bf..8c88abd2c441 100644
--- a/nixpkgs/pkgs/development/libraries/libsodium/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libsodium/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libsodium-1.0.17";
+  name = "libsodium-1.0.18";
 
   src = fetchurl {
     url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz";
-    sha256 = "1cf2d9v1gylz1qcy2zappbf526qfmph6gd6fnn3w2b347vixmhqc";
+    sha256 = "1h9ncvj23qbbni958knzsli8dvybcswcjbx0qjjgi922nf848l3g";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/nixpkgs/pkgs/development/libraries/liburcu/default.nix b/nixpkgs/pkgs/development/libraries/liburcu/default.nix
index 0cc18d82720b..0cc1b0d08f9d 100644
--- a/nixpkgs/pkgs/development/libraries/liburcu/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liburcu/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  version = "0.10.2";
+  version = "0.11.0";
   name = "liburcu-${version}";
 
   src = fetchurl {
     url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2";
-    sha256 = "1k31faqz9plx5dwxq8g1fnczxda1is4s1x4ph0gjrq3gmy6qixmk";
+    sha256 = "1rxk5vbkbmqlsnjnvkjz0pkx2076mqnq6jzblpmz8rk29x66kx8s";
   };
 
   checkInputs = [ perl ];
diff --git a/nixpkgs/pkgs/development/libraries/liburing/default.nix b/nixpkgs/pkgs/development/libraries/liburing/default.nix
index 4564bab227bc..cce10a761d3f 100644
--- a/nixpkgs/pkgs/development/libraries/liburing/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liburing/default.nix
@@ -3,12 +3,12 @@
 
 stdenv.mkDerivation rec {
   name = "liburing-${version}";
-  version = "1.0.0pre132_${builtins.substring 0 7 src.rev}";
+  version = "1.0.0pre137_${builtins.substring 0 7 src.rev}";
 
   src = fetchgit {
     url    = "http://git.kernel.dk/liburing";
-    rev    = "f8865bc65feced660a3075175200a60968187bba";
-    sha256 = "13l6s5iyrhqa0yj272qax0261cfw3nz09hq5hpf0f0kb2952d4rc";
+    rev    = "91dde5c956b1af491bc6c16ee230daa4b4b66706";
+    sha256 = "0rk1ikrn3s6sp3gx7kc4y6msx7yncr3845m67vhk8lxvhd90sgza";
   };
 
   separateDebugInfo = true;
diff --git a/nixpkgs/pkgs/development/libraries/libuv/default.nix b/nixpkgs/pkgs/development/libraries/libuv/default.nix
index 78abbe7392c9..e725439a3f1a 100644
--- a/nixpkgs/pkgs/development/libraries/libuv/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libuv/default.nix
@@ -1,14 +1,14 @@
 { stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }:
 
 stdenv.mkDerivation rec {
-  version = "1.28.0";
+  version = "1.29.1";
   pname = "libuv";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "0l0gx69sdy3sv3pirjbca2ws54n9d83mj0j96h77k0ncywimvi64";
+    sha256 = "0scnircr6khgh7l3bw9zyfzdgx2c11mpfhd9d8qlw47arrvqg7l8";
   };
 
   postPatch = let
diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix
index 0724da8375e3..b34ca5253a29 100644
--- a/nixpkgs/pkgs/development/libraries/mesa/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix
@@ -19,7 +19,7 @@
 , libelfSupport ? stdenv.isLinux, libelf
 , llvmSupport ? true, llvmPackages
 , libglvndSupport ? true, libglvnd
-, valgrindSupport ? stdenv.isLinux, valgrind-light
+, withValgrind ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32, valgrind-light
 }:
 
 with lib;
@@ -41,10 +41,6 @@ assert enableRadv -> libdrmSupport && llvmSupport && libelfSupport;
   - libOSMesa is in $osmesa (~4 MB)
 */
 
-if ! elem stdenv.hostPlatform.system platforms.mesaPlatforms then
-  throw "${stdenv.system}: unsupported platform for Mesa"
-else
-
 let
   # platforms that have PCIe slots and thus can use most non-integrated GPUs
   pciePlatform = !stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64;
@@ -206,7 +202,7 @@ let
         ++ optional vdpauSupport libvdpau
         ++ optional vaSupport libva-minimal
         ++ optional omxBellagioSupport libomxil-bellagio
-        ++ optional valgrindSupport valgrind-light
+        ++ optional withValgrind valgrind-light
 
         ++ optionals (elem "x11" eglPlatforms)
           ((with xorg; [ xorgproto libX11 ]))
@@ -372,7 +368,7 @@ let
         description = "An open source implementation of OpenGL";
         homepage = https://www.mesa3d.org/;
         license = licenses.mit; # X11 variant, in most files
-        platforms = platforms.linux ++ platforms.darwin;
+        platforms = platforms.mesaPlatforms;
         maintainers = with maintainers; [ vcunat ];
       };
     };
diff --git a/nixpkgs/pkgs/development/libraries/mpich/default.nix b/nixpkgs/pkgs/development/libraries/mpich/default.nix
index ffe6b5edf961..1c6b8df15114 100644
--- a/nixpkgs/pkgs/development/libraries/mpich/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mpich/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation  rec {
   name = "mpich-${version}";
-  version = "3.3";
+  version = "3.3.1";
 
   src = fetchurl {
     url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz";
-    sha256 = "02zs118q9n4xz9qnfc24i2r84vnzgnwnyyqanfv03lf3wqpy17ij";
+    sha256 = "1raism1r4jsx4cybc9ddyr1xkccbxm0l8j3ryrw8kslfkkr1wmgy";
   };
 
   configureFlags = [
diff --git a/nixpkgs/pkgs/development/libraries/newt/default.nix b/nixpkgs/pkgs/development/libraries/newt/default.nix
index 1a5656b7ca16..60dc00a335d9 100644
--- a/nixpkgs/pkgs/development/libraries/newt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/newt/default.nix
@@ -1,11 +1,12 @@
 { fetchurl, stdenv, slang, popt }:
 
 stdenv.mkDerivation rec {
-  name = "newt-0.52.20";
+  pname = "newt";
+  version = "0.52.21";
 
   src = fetchurl {
-    url = "https://fedorahosted.org/releases/n/e/newt/${name}.tar.gz";
-    sha256 = "1g3dpfnvaw7vljbr7nzq1rl88d6r8cmrvvng9inphgzwxxmvlrld";
+    url = "https://fedorahosted.org/releases/n/e/${pname}/${pname}-${version}.tar.gz";
+    sha256 = "0cdvbancr7y4nrj8257y5n45hmhizr8isynagy4fpsnpammv8pi6";
   };
 
   patchPhase = ''
diff --git a/nixpkgs/pkgs/development/libraries/nss/default.nix b/nixpkgs/pkgs/development/libraries/nss/default.nix
index 87bc1a16f236..f3fc4caf3154 100644
--- a/nixpkgs/pkgs/development/libraries/nss/default.nix
+++ b/nixpkgs/pkgs/development/libraries/nss/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, nspr, perl, zlib, sqlite, fixDarwinDylibNames }:
+{ stdenv, fetchurl, nspr, perl, zlib, sqlite, fixDarwinDylibNames, buildPackages }:
 
 let
   nssPEM = fetchurl {
@@ -17,7 +17,11 @@ in stdenv.mkDerivation rec {
     sha256 = "1zvabgxlyvz3fnv4w89y4a5qkscjmm88naf929dgvvgfnrchwqm5";
   };
 
-  buildInputs = [ perl zlib sqlite ]
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+
+  nativeBuildInputs = [ perl ];
+
+  buildInputs = [ zlib sqlite ]
     ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   propagatedBuildInputs = [ nspr ];
@@ -43,7 +47,9 @@ in stdenv.mkDerivation rec {
 
   preConfigure = "cd nss";
 
-  makeFlags = [
+  makeFlags = let
+    cpu = stdenv.hostPlatform.parsed.cpu.name;
+  in [
     "NSPR_INCLUDE_DIR=${nspr.dev}/include"
     "NSPR_LIB_DIR=${nspr.out}/lib"
     "NSDISTMODE=copy"
@@ -52,6 +58,12 @@ in stdenv.mkDerivation rec {
     "NSS_ENABLE_ECC=1"
     "USE_SYSTEM_ZLIB=1"
     "NSS_USE_SYSTEM_SQLITE=1"
+    "NATIVE_CC=${buildPackages.stdenv.cc}/bin/cc"
+  ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "OS_TEST=${cpu}"
+    "CPU_ARCH=${cpu}"
+    "CROSS_COMPILE=1"
+    "NSS_DISABLE_GTESTS=1" # don't want to build tests when cross-compiling
   ] ++ stdenv.lib.optional stdenv.is64bit "USE_64=1"
     ++ stdenv.lib.optional stdenv.isDarwin "CCC=clang++";
 
@@ -95,7 +107,10 @@ in stdenv.mkDerivation rec {
     chmod 0755 $out/bin/nss-config
   '';
 
-  postFixup = ''
+  postFixup = let
+    isCross = stdenv.hostPlatform != stdenv.buildPlatform;
+    nss = if isCross then buildPackages.nss.tools else "$out";
+  in ''
     for libname in freebl3 nssdbm3 softokn3
     do '' +
     (if stdenv.isDarwin
@@ -106,7 +121,7 @@ in stdenv.mkDerivation rec {
        libfile="$out/lib/lib$libname.so"
        LD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \
      '') + ''
-        $out/bin/shlibsign -v -i "$libfile"
+        ${nss}/bin/shlibsign -v -i "$libfile"
     done
 
     moveToOutput bin "$tools"
diff --git a/nixpkgs/pkgs/development/libraries/opencascade/default.nix b/nixpkgs/pkgs/development/libraries/opencascade/default.nix
index 05d78488957a..8334bf195f7b 100644
--- a/nixpkgs/pkgs/development/libraries/opencascade/default.nix
+++ b/nixpkgs/pkgs/development/libraries/opencascade/default.nix
@@ -1,33 +1,49 @@
-{stdenv, fetchurl, libGLU_combined, tcl, tk, file, libXmu, cmake, libtool, qt4,
-ftgl, freetype}:
+{ stdenv, fetchFromGitHub, fetchpatch, libGL, libGLU, libXmu, cmake, ninja,
+  pkgconfig, fontconfig, freetype, expat, freeimage, vtk }:
 
 stdenv.mkDerivation rec {
-  name = "opencascade-oce-0.18.3";
-  src = fetchurl {
-    url = https://github.com/tpaviot/oce/archive/OCE-0.18.3.tar.gz;
-    sha256 = "0v4ny0qhr5hiialb2ss25bllfnd6j4g7mfxnqfmr1xsjpykxcly5";
+  pname = "opencascade-oce";
+  version = "0.18.3";
+
+  src = fetchFromGitHub {
+    owner = "tpaviot";
+    repo = "oce";
+    rev = "OCE-${version}";
+    sha256 = "17wy8dcf44vqisishv1jjf3cmcxyygqq29y9c3wjdj983qi2hsig";
   };
 
-  buildInputs = [ libGLU_combined tcl tk file libXmu libtool qt4 ftgl freetype cmake ];
+  nativeBuildInputs = [ cmake ninja pkgconfig ];
+  buildInputs = [ libGL libGLU libXmu freetype fontconfig expat freeimage vtk ];
 
-  # Fix for glibc 2.26
-  postPatch = ''
-    sed -i -e 's/^\( *#include <\)x\(locale.h>\)//' \
-      src/Standard/Standard_CLocaleSentry.hxx
-  '';
+  cmakeFlags = [
+    "-DOCE_INSTALL_PREFIX=${placeholder "out"}"
+    "-DOCE_WITH_FREEIMAGE=ON"
+    "-DOCE_WITH_VTK=ON"
+  ];
 
-  preConfigure = ''
-    cmakeFlags="$cmakeFlags -DOCE_INSTALL_PREFIX=$out"
-  '';
+  patches = [
+    # Use fontconfig instead of hardcoded directory list
+    # https://github.com/tpaviot/oce/pull/714
+    (fetchpatch {
+      url = "https://github.com/tpaviot/oce/commit/9643432b27fec8974ca0ee15c3c372f5fe8fc069.patch";
+      sha256 = "1wd940rszmh5apcpk5fv6126h8mcjcy4rjifrql5d4ac90v06v4c";
+    })
+    # Fix for glibc 2.26
+    (fetchpatch {
+      url = "https://github.com/tpaviot/oce/commit/3b44656e93270d782009b06ec4be84d2a13f8126.patch";
+      sha256 = "1ccakkcwy5g0184m23x0mnh22i0lk45xm8kgiv5z3pl7nh35dh8k";
+    })
+  ];
 
-  # https://bugs.freedesktop.org/show_bug.cgi?id=83631
-  NIX_CFLAGS_COMPILE = "-DGLX_GLXEXT_LEGACY";
-
-  enableParallelBuilding = true;
+  postPatch = ''
+    # make sure the installed cmake file uses absolute paths for fontconfig
+    substituteInPlace adm/cmake/TKService/CMakeLists.txt \
+      --replace FONTCONFIG_LIBRARIES FONTCONFIG_LINK_LIBRARIES
+  '';
 
   meta = with stdenv.lib; {
     description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation";
-    homepage = http://www.opencascade.org/;
+    homepage = "https://github.com/tpaviot/oce";
     maintainers = [ maintainers.viric ];
     platforms = platforms.linux;
     license = licenses.lgpl21;
diff --git a/nixpkgs/pkgs/development/libraries/openssl/default.nix b/nixpkgs/pkgs/development/libraries/openssl/default.nix
index 1c0d124b5c02..ef617a92eaa7 100644
--- a/nixpkgs/pkgs/development/libraries/openssl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openssl/default.nix
@@ -120,8 +120,8 @@ let
 in {
 
   openssl_1_0_2 = common {
-    version = "1.0.2r";
-    sha256 = "1mnh27zf6r1bhm5d9fxqq9slv2gz0d9z2ij9i679b0wapa5x0ldf";
+    version = "1.0.2s";
+    sha256 = "15mbmg8hf7s12vr3v2bdc0pi9y4pdbnsxhzk4fyyap42jaa5rgfa";
     patches = [
       ./1.0.2/nix-ssl-cert-file.patch
 
@@ -132,15 +132,10 @@ in {
   };
 
   openssl_1_1 = common {
-    version = "1.1.1b";
-    sha256 = "0jza8cmznnyiia43056dij1jdmz62dx17wsn0zxksh9h6817nmaw";
+    version = "1.1.1c";
+    sha256 = "142c7zdlz06hjrrvinb9f276czc78bnkyhd9xma621qmmmwk1yzn";
     patches = [
       ./1.1/nix-ssl-cert-file.patch
-      (fetchurl {
-        name = "long-chacha-nonce.patch";
-        url = "https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=f426625b6ae9a7831010750490a5f0ad689c5ba3";
-        sha256= "02ghqg3vzmzx3s1dwwwbm1p1l4asaiampyg4k9vfrjwficvgpdgp";
-      })
 
       (if stdenv.hostPlatform.isDarwin
        then ./1.1/use-etc-ssl-certs-darwin.patch
diff --git a/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix b/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix
index 54bf1cc442b9..40ccd8cfd20b 100644
--- a/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix
@@ -17,12 +17,16 @@ stdenv.mkDerivation rec {
     scheme-basic
     collection-pstricks
     collection-fontsrecommended
+    l3kernel
+    l3packages
     mathastext
     pgf
     relsize
     sfmath
+    siunitx
     xcolor
     xkeyval
+    xstring
     ;};
   buildInputs = [ hepmc imagemagick python2 latex makeWrapper ];
   propagatedBuildInputs = [ fastjet ghostscript gsl yoda ];
diff --git a/nixpkgs/pkgs/development/libraries/pyotherside/default.nix b/nixpkgs/pkgs/development/libraries/pyotherside/default.nix
index aff7b409ad07..c7d43ae70268 100644
--- a/nixpkgs/pkgs/development/libraries/pyotherside/default.nix
+++ b/nixpkgs/pkgs/development/libraries/pyotherside/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pyotherside";
-  version = "1.5.5";
+  version = "1.5.6";
 
   src = fetchFromGitHub {
     owner = "thp";
     repo = "pyotherside";
     rev = version;
-    sha256 = "1mczagl7mrgw9rqxlasgybrkfigdw1g7k542q75am8gp82m6wka9";
+    sha256 = "1cjx0fbrq9qvbirwy76pw1f5skm2afd51k4qb269ql4gpl67d5lv";
   };
 
   nativeBuildInputs = [ qmake ];
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix b/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix
index 935a4a4f2fbb..40b2ed775cd5 100644
--- a/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix
+++ b/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix
@@ -26,7 +26,7 @@ let
   # Determine the Android os identifier from Nix's system identifier
   os = if stdenv.system == "x86_64-linux" then "linux"
     else if stdenv.system == "x86_64-darwin" then "macosx"
-    else throw "No tarballs found for system architecture: ${stdenv.system}";
+    else throw "No Android SDK tarballs are available for system architecture: ${stdenv.system}";
 
   # Generated Nix packages
   packages = import ./generated/packages.nix {
diff --git a/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock
index f78fafb16524..fa170a21f3b3 100644
--- a/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock
+++ b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock
@@ -9,10 +9,10 @@ GEM
       tzinfo (~> 1.1)
     atomos (0.1.3)
     claide (1.0.2)
-    cocoapods (1.7.1)
+    cocoapods (1.7.2)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.7.1)
+      cocoapods-core (= 1.7.2)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -22,13 +22,13 @@ GEM
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
-      fourflusher (>= 2.2.0, < 3.0)
+      fourflusher (>= 2.3.0, < 3.0)
       gh_inspector (~> 1.0)
       molinillo (~> 0.6.6)
       nap (~> 1.0)
       ruby-macho (~> 1.4)
-      xcodeproj (>= 1.8.2, < 2.0)
-    cocoapods-core (1.7.1)
+      xcodeproj (>= 1.10.0, < 2.0)
+    cocoapods-core (1.7.2)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
@@ -45,7 +45,7 @@ GEM
     colored2 (3.1.2)
     concurrent-ruby (1.1.5)
     escape (0.0.4)
-    fourflusher (2.2.0)
+    fourflusher (2.3.0)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     i18n (0.9.5)
@@ -59,7 +59,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    xcodeproj (1.9.0)
+    xcodeproj (1.10.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
diff --git a/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock
index 1b16ad4d318e..cde74bbaedd5 100644
--- a/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock
+++ b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock
@@ -9,10 +9,10 @@ GEM
       tzinfo (~> 1.1)
     atomos (0.1.3)
     claide (1.0.2)
-    cocoapods (1.7.1)
+    cocoapods (1.7.2)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.7.1)
+      cocoapods-core (= 1.7.2)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -22,13 +22,13 @@ GEM
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
-      fourflusher (>= 2.2.0, < 3.0)
+      fourflusher (>= 2.3.0, < 3.0)
       gh_inspector (~> 1.0)
       molinillo (~> 0.6.6)
       nap (~> 1.0)
       ruby-macho (~> 1.4)
-      xcodeproj (>= 1.8.2, < 2.0)
-    cocoapods-core (1.7.1)
+      xcodeproj (>= 1.10.0, < 2.0)
+    cocoapods-core (1.7.2)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
@@ -45,7 +45,7 @@ GEM
     colored2 (3.1.2)
     concurrent-ruby (1.1.5)
     escape (0.0.4)
-    fourflusher (2.2.0)
+    fourflusher (2.3.0)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     i18n (0.9.5)
@@ -59,7 +59,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    xcodeproj (1.9.0)
+    xcodeproj (1.10.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
diff --git a/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix b/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix
index 0d898db82ed6..919f540c19e2 100644
--- a/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix
+++ b/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix
@@ -46,10 +46,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0iyk28wd5k77vcsl9w5c04x5wz4a00ximwz6p2smccm7xk6v07gs";
+      sha256 = "0hbz1i513prx3nk507h3jyfza71x9xa23921mm1qyq5874myiwi9";
       type = "gem";
     };
-    version = "1.7.1";
+    version = "1.7.2";
   };
   cocoapods-core = {
     dependencies = ["activesupport" "fuzzy_match" "nap"];
@@ -57,10 +57,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "090a57w0lrnf5f86hdmiz8snkal2f48998lin1sx84wlh3y0ng4x";
+      sha256 = "051pfrr1y1a8mky1nzlgql6nvhq4lwpg689rn45gb6lii1vn3yr4";
       type = "gem";
     };
-    version = "1.7.1";
+    version = "1.7.2";
   };
   cocoapods-deintegrate = {
     groups = ["default"];
@@ -169,10 +169,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1d2ksz077likjv8dcxy1rnqcjallbfa7yk2wvix3228gq7a4jkq3";
+      sha256 = "0b9kzw8pr7bg67fqvv7x6xdknyfa5i0wzipxqvkg6xpkjca0vvn8";
       type = "gem";
     };
-    version = "2.2.0";
+    version = "2.3.0";
   };
   fuzzy_match = {
     groups = ["default"];
@@ -292,9 +292,9 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0qhanxa4zbirbdq6skdpg7hvx1vivwy1i5x22c3xkdb7pykh7dm7";
+      sha256 = "1x2ypkxyfsr6k8qy75iy64p6af6b024fqnlmw8qvzzzixmwrr8q7";
       type = "gem";
     };
-    version = "1.9.0";
+    version = "1.10.0";
   };
 }
\ No newline at end of file
diff --git a/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix b/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix
index d503ca82fd42..d363a81ca0f5 100644
--- a/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix
+++ b/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix
@@ -40,10 +40,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0iyk28wd5k77vcsl9w5c04x5wz4a00ximwz6p2smccm7xk6v07gs";
+      sha256 = "0hbz1i513prx3nk507h3jyfza71x9xa23921mm1qyq5874myiwi9";
       type = "gem";
     };
-    version = "1.7.1";
+    version = "1.7.2";
   };
   cocoapods-core = {
     dependencies = ["activesupport" "fuzzy_match" "nap"];
@@ -51,10 +51,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "090a57w0lrnf5f86hdmiz8snkal2f48998lin1sx84wlh3y0ng4x";
+      sha256 = "051pfrr1y1a8mky1nzlgql6nvhq4lwpg689rn45gb6lii1vn3yr4";
       type = "gem";
     };
-    version = "1.7.1";
+    version = "1.7.2";
   };
   cocoapods-deintegrate = {
     groups = ["default"];
@@ -151,10 +151,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1d2ksz077likjv8dcxy1rnqcjallbfa7yk2wvix3228gq7a4jkq3";
+      sha256 = "0b9kzw8pr7bg67fqvv7x6xdknyfa5i0wzipxqvkg6xpkjca0vvn8";
       type = "gem";
     };
-    version = "2.2.0";
+    version = "2.3.0";
   };
   fuzzy_match = {
     source = {
@@ -254,9 +254,9 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0qhanxa4zbirbdq6skdpg7hvx1vivwy1i5x22c3xkdb7pykh7dm7";
+      sha256 = "1x2ypkxyfsr6k8qy75iy64p6af6b024fqnlmw8qvzzzixmwrr8q7";
       type = "gem";
     };
-    version = "1.9.0";
+    version = "1.10.0";
   };
 }
\ No newline at end of file
diff --git a/nixpkgs/pkgs/development/python-modules/acme-tiny/default.nix b/nixpkgs/pkgs/development/python-modules/acme-tiny/default.nix
index 759ed2086fce..e212e83c2708 100644
--- a/nixpkgs/pkgs/development/python-modules/acme-tiny/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/acme-tiny/default.nix
@@ -1,34 +1,26 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub
-, python, openssl }:
+{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm, fusepy, fuse
+, openssl }:
 
 buildPythonPackage rec {
   pname = "acme-tiny";
-  version = "2016-03-26";
+  version = "4.0.4";
 
-  src = fetchFromGitHub {
-    sha256 = "0ngmr3kxcvlqa9mrv3gx0rg4r67xvdjplqfminxliri3ipak853g";
-    rev = "7a5a2558c8d6e5ab2a59b9fec9633d9e63127971";
-    repo = "acme-tiny";
-    owner = "diafygi";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0vqlmvk34jgvgx3qdsh50q7m4aiy02786jyjjcq45dcws7a4f9f1";
   };
 
-  # source doesn't have any python "packaging" as such
-  configurePhase = " ";
-  buildPhase = " ";
-  # the tests are... complex
-  doCheck = false;
-
   patchPhase = ''
-    substituteInPlace acme_tiny.py --replace "openssl" "${openssl.bin}/bin/openssl"
+    substituteInPlace acme_tiny.py --replace '"openssl"' '"${openssl.bin}/bin/openssl"'
+    substituteInPlace tests/monkey.py --replace '"openssl"' '"${openssl.bin}/bin/openssl"'
+    substituteInPlace tests/test_module.py --replace '"openssl"' '"${openssl.bin}/bin/openssl"'
+    substituteInPlace tests/monkey.py --replace /etc/ssl/openssl.cnf ${openssl.out}/etc/ssl/openssl.cnf
   '';
 
-  installPhase = ''
-    mkdir -p $out/${python.sitePackages}/
-    cp acme_tiny.py $out/${python.sitePackages}/
-    mkdir -p $out/bin
-    ln -s $out/${python.sitePackages}/acme_tiny.py $out/bin/acme_tiny
-    chmod +x $out/bin/acme_tiny
-  '';
+  buildInputs = [ setuptools_scm ];
+  checkInputs = [ fusepy fuse ];
+
+  doCheck = false; # seems to hang, not sure
 
   meta = with stdenv.lib; {
     description = "A tiny script to issue and renew TLS certs from Let's Encrypt";
diff --git a/nixpkgs/pkgs/development/python-modules/aiohttp/cors.nix b/nixpkgs/pkgs/development/python-modules/aiohttp-cors/default.nix
index 00198cd27cff..00198cd27cff 100644
--- a/nixpkgs/pkgs/development/python-modules/aiohttp/cors.nix
+++ b/nixpkgs/pkgs/development/python-modules/aiohttp-cors/default.nix
diff --git a/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix b/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix
index 90bd7521ea41..5769109f7741 100644
--- a/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix
@@ -40,6 +40,14 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ attrs chardet multidict async-timeout yarl ]
     ++ lib.optionals (pythonOlder "3.7") [ idna-ssl typing-extensions ];
 
+  # Don't error on cryptography deprecation warning
+  postPatch = ''
+    substituteInPlace pytest.ini --replace "filterwarnings = error" ""
+  '';
+
+  # coroutine 'noop2' was never awaited
+  doCheck = false;
+
   meta = with lib; {
     description = "Asynchronous HTTP Client/Server for Python and asyncio";
     license = licenses.asl20;
diff --git a/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix b/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix
index 5320d5be1087..a078a4207163 100644
--- a/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "asyncssh";
-  version = "1.16.1";
+  version = "1.17.0";
   disabled = pythonOlder "3.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0qia1ay2dhwps5sfh0hif7mrv7yxvykxs9l7cmfp4m6hmqnn3r5r";
+    sha256 = "1qrpkdyl77956qg6g7g66bbd6bfvb2nwi2sjy3v3li8m3irx8d7d";
   };
 
   patches = [
@@ -21,13 +21,6 @@ buildPythonPackage rec {
     # However that broke the test on NixOS, failing with
     # "Operation not permitted"
     ./fix-sftp-chmod-test-nixos.patch
-
-    # Restore libnacl support for curve25519/ed25519 as a fallback for PyCA
-    # Fixes https://github.com/ronf/asyncssh/issues/206 with older openssl
-    (fetchpatch {
-      url = "https://github.com/ronf/asyncssh/commit/1dee113bb3e4a6888de562b0413e9abd6a0f0f04.patch";
-      sha256 = "04bckdj7i6xk24lizkn3a8cj375pkz7yc57fc0vk222c6jzwzaml";
-    })
   ];
 
   propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix b/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix
index f929180406b3..1c209353f0e3 100644
--- a/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "cli_helpers";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0p9yklddpplncr765h6qrii1dgvvlqxj25n5400dwqas9lmij4fj";
+    sha256 = "0rd194l06aw4612j09b44pgh8b8l4cwmz7xgwsgdj9v8m3m25nwq";
   };
 
   propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/cmd2/default.nix b/nixpkgs/pkgs/development/python-modules/cmd2/default.nix
index 3b76de33ce75..32f852a2b63b 100644
--- a/nixpkgs/pkgs/development/python-modules/cmd2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cmd2/default.nix
@@ -6,11 +6,11 @@
 }:
 buildPythonPackage rec {
   pname = "cmd2";
-  version = "0.9.12";
+  version = "0.9.13";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "14pyvihikml1z7q21q9cvdfxvvlf8lhbaasj05hpiq6fjyvd7zsc";
+    sha256 = "0f5f5rgwckci2fqwbzjk5sfpwxqn5gy0biz8sjll4v5zgvjsswxq";
   };
 
   LC_ALL="en_US.UTF-8";
diff --git a/nixpkgs/pkgs/development/python-modules/cmd2/old.nix b/nixpkgs/pkgs/development/python-modules/cmd2/old.nix
deleted file mode 100644
index 8f75170c58c4..000000000000
--- a/nixpkgs/pkgs/development/python-modules/cmd2/old.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ stdenv, buildPythonPackage, pythonOlder
-, pyperclip, six, pyparsing, vim
-, contextlib2 ? null, subprocess32 ? null
-, pytest, mock, which, fetchFromGitHub, glibcLocales
-, runtimeShell
-}:
-buildPythonPackage rec {
-  pname = "cmd2";
-  version = "0.8.0";
-
-  src = fetchFromGitHub {
-    owner = "python-cmd2";
-    repo = "cmd2";
-    rev = version;
-    sha256 = "0nw2b7n7zg51bc3glxw0l9fn91mwjnjshklhmxhyvjbsg7khf64z";
-  };
-
-  LC_ALL="en_US.UTF-8";
-
-  postPatch = stdenv.lib.optional stdenv.isDarwin ''
-    # Fake the impure dependencies pbpaste and pbcopy
-    mkdir bin
-    echo '#${runtimeShell}' > bin/pbpaste
-    echo '#${runtimeShell}' > bin/pbcopy
-    chmod +x bin/{pbcopy,pbpaste}
-    export PATH=$(realpath bin):$PATH
-  '';
-
-  checkInputs= [ pytest mock which vim glibcLocales ];
-  checkPhase = ''
-    # test_path_completion_user_expansion might be fixed in the next release
-    py.test -k 'not test_path_completion_user_expansion'
-  '';
-  doCheck = !stdenv.isDarwin;
-
-  propagatedBuildInputs = [
-    pyperclip
-    six
-    pyparsing
-  ]
-  ++ stdenv.lib.optional (pythonOlder "3.5") contextlib2
-  ++ stdenv.lib.optional (pythonOlder "3.0") subprocess32
-  ;
-
-  meta = with stdenv.lib; {
-    description = "Enhancements for standard library's cmd module";
-    homepage = https://github.com/python-cmd2/cmd2;
-    maintainers = with maintainers; [ teto ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/python-modules/cryptography/default.nix b/nixpkgs/pkgs/development/python-modules/cryptography/default.nix
index f40f0bf63d82..6b20b4b570a3 100644
--- a/nixpkgs/pkgs/development/python-modules/cryptography/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cryptography/default.nix
@@ -21,11 +21,11 @@
 
 buildPythonPackage rec {
   pname = "cryptography";
-  version = "2.6.1"; # Also update the hash in vectors.nix
+  version = "2.7"; # Also update the hash in vectors.nix
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "19iwz5avym5zl6jrrrkym1rdaa9h61j20ph4cswsqgv8xg5j3j16";
+    sha256 = "1inlnr36kl36551c9rcad99jmhk81v33by3glkadwdcgmi17fd76";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix b/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix
index 5679905cd143..ea24ed908016 100644
--- a/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix
+++ b/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix
@@ -7,7 +7,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1bsqcv3h49dzqnyn29ijq8r7k1ra8ikl1y9qcpcns9nbvhaq3wq3";
+    sha256 = "1g38zw90510azyfrj6mxbslx2gp9yrnv5dac0w2819k9ssdznbgi";
   };
 
   # No tests included
diff --git a/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix b/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix
index ca28f231831d..5708bf12d6bc 100644
--- a/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     description = "Python interface to Oracle";
     homepage = "https://oracle.github.io/python-cx_Oracle";
-    license = licenses.bsdOriginal;
+    license = licenses.bsd3;
     maintainers = with maintainers; [ y0no ];
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix b/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix
index 90c2349ae534..d7fbec5715de 100644
--- a/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix
@@ -4,15 +4,15 @@ with stdenv.lib;
 
 buildPythonPackage rec {
   pname = "Flask-Migrate";
-  version = "2.3.1";
+  version = "2.5.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1awlb4q1l9iv794qjjxxyhcv4i69j77kh7nsg17a6kb909mglml3";
+    sha256 = "00nm76w4xymsiih6hq8y46wp026v7zkzq15cx39hp929ba3z2vx9";
   };
 
-  checkInputs = optional isPy3k glibcLocales;
-  propagatedBuildInputs = [ flask flask_sqlalchemy flask_script alembic ];
+  checkInputs = [ flask_script ] ++ optional isPy3k glibcLocales;
+  propagatedBuildInputs = [ flask flask_sqlalchemy alembic ];
 
   # tests invoke the flask cli which uses click and therefore has py3k encoding troubles
   preCheck = optionalString isPy3k ''
diff --git a/nixpkgs/pkgs/development/python-modules/flask-script/default.nix b/nixpkgs/pkgs/development/python-modules/flask-script/default.nix
index 72a3fb0c6f85..51ba7ce4d7cd 100644
--- a/nixpkgs/pkgs/development/python-modules/flask-script/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-script/default.nix
@@ -6,7 +6,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0zqh2yq8zk7m9b4xw1ryqmrljkdigfb3hk5155a3b5hkfnn6xxyf";
+    sha256 = "0r8w2v89nj6b9p91p495cga5m72a673l2wc0hp0zqk05j4yrc9b4";
   };
 
   propagatedBuildInputs = [ flask ];
diff --git a/nixpkgs/pkgs/development/python-modules/http-ece/default.nix b/nixpkgs/pkgs/development/python-modules/http-ece/default.nix
new file mode 100644
index 000000000000..1f50608d3d1b
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/http-ece/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchPypi, buildPythonPackage
+, coverage, flake8, mock, nose
+, cryptography }:
+
+buildPythonPackage rec {
+  pname = "http_ece";
+  version = "1.1.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1y5ln09ji4dwpzhxr77cggk02kghq7lql60a6969a5n2lwpvqblk";
+  };
+
+  propagatedBuildInputs = [ cryptography ];
+
+  checkInputs = [ coverage flake8 mock nose ];
+
+  meta = with lib; {
+    description = "Encipher HTTP Messages";
+    homepage = https://github.com/martinthomson/encrypted-content-encoding;
+    license = licenses.mit;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/matchpy/default.nix b/nixpkgs/pkgs/development/python-modules/matchpy/default.nix
index dcac40b873ca..a9f37b52c1b4 100644
--- a/nixpkgs/pkgs/development/python-modules/matchpy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/matchpy/default.nix
@@ -3,7 +3,7 @@
 , fetchPypi
 , hopcroftkarp
 , multiset
-, pytest
+, pytest_3
 , pytestrunner
 , hypothesis
 , setuptools_scm
@@ -12,16 +12,20 @@
 
 buildPythonPackage rec {
   pname = "matchpy";
-  version = "0.4.6";
+  version = "0.5.1";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "eefa1e50a10e1255db61bc2522a6768ad0701f8854859f293ebaa442286faadd";
+    sha256 = "1vvf1cd9kw5z1mzvypc9f030nd18lgvvjc8j56b1s9b7dyslli2r";
   };
 
+  postPatch = ''
+    substituteInPlace setup.cfg --replace "hypothesis>=3.6,<4.0" "hypothesis"
+  '';
+
   buildInputs = [ setuptools_scm pytestrunner ];
-  checkInputs = [ pytest hypothesis ];
+  checkInputs = [ pytest_3 hypothesis ];
   propagatedBuildInputs = [ hopcroftkarp multiset ];
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/python-modules/nltk/default.nix b/nixpkgs/pkgs/development/python-modules/nltk/default.nix
index 9ae4f00b495b..2c6858915ce9 100644
--- a/nixpkgs/pkgs/development/python-modules/nltk/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nltk/default.nix
@@ -1,26 +1,17 @@
 { fetchPypi, buildPythonPackage, lib, six, singledispatch, isPy3k, fetchpatch }:
 
 buildPythonPackage rec {
-  version = "3.4";
+  version = "3.4.3";
   pname = "nltk";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "286f6797204ffdb52525a1d21ec0a221ec68b8e3fa4f2d25f412ac8e63c70e8d";
+    sha256 = "1cjkv4jmmlr0w4qi399ncgb6lp41mb9i352934288wh9xad15mqj";
   };
 
   propagatedBuildInputs = [ six ] ++ lib.optional (!isPy3k) singledispatch;
 
-  # TODO: remove patch during update to new version
-  patches = [
-    (fetchpatch {
-      url = https://github.com/nltk/nltk/commit/3966111cbf2f35fb86082b2f12acd90d75e9b8bb.patch;
-      includes = [ "setup.py" ];
-      sha256 = "1sxafnvf6nzv6d996xc1rys06x62s36swgpfqhsyh6l1lj7y38jw";
-    })
-  ];
-
   # Tests require some data, the downloading of which is impure. It would
   # probably make sense to make the data another derivation, but then feeding
   # that into the tests (given that we need nltk itself to download the data,
diff --git a/nixpkgs/pkgs/development/python-modules/py-vapid/default.nix b/nixpkgs/pkgs/development/python-modules/py-vapid/default.nix
new file mode 100644
index 000000000000..d5af1c1c33dd
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/py-vapid/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchPypi
+, flake8, mock, nose, pytest
+, cryptography
+}:
+
+buildPythonPackage rec {
+  pname = "py-vapid";
+  version = "1.5.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1b3g4ljkpi6ka5n63bl5y47r3qhxjmr6qfamqwxnmna2567b5las";
+  };
+
+  propagatedBuildInputs = [ cryptography ];
+
+  checkInputs = [ flake8 mock nose pytest ];
+
+  meta = with lib; {
+    description = "VAPID is a voluntary standard for WebPush subscription providers";
+    homepage = https://github.com/mozilla-services/vapid;
+    license = licenses.mpl20;
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix b/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix
index 835cdbaa6be1..706284b56dbc 100644
--- a/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix
@@ -3,11 +3,12 @@
 
 buildPythonPackage rec {
   pname = "pygraphviz";
-  version = "1.3.1";
+  version = "1.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7c294cbc9d88946be671cc0d8602aac176d8c56695c0a7d871eadea75a958408";
+    sha256 = "179i3mjprhn200gcj6jq7c4mdrzckyqlh1srz78hynnw0nijka2h";
+    extension = "zip";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix b/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix
new file mode 100644
index 000000000000..65c5e08d934c
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix
@@ -0,0 +1,36 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, redis
+, pytest
+, process-tests
+, pkgs
+, withDjango ? false, django_redis
+}:
+
+buildPythonPackage rec {
+  pname = "python-redis-lock";
+  version = "3.3.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "5316d473ce6ce86a774b9f9c110d84c3a9bd1a2abfda5d99e9c0c8a872a8e6d6";
+  };
+
+  checkInputs = [ pytest process-tests pkgs.redis ];
+
+  checkPhase = ''
+    pytest tests/
+  '';
+
+  propagatedBuildInputs = [ redis ]
+  ++ stdenv.lib.optional withDjango django_redis;
+
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/ionelmc/python-redis-lock";
+    license = licenses.bsd2;
+    description = "Lock context manager implemented via redis SETNX/BLPOP";
+    maintainers = with maintainers; [ vanschelven ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/pywebpush/default.nix b/nixpkgs/pkgs/development/python-modules/pywebpush/default.nix
new file mode 100644
index 000000000000..c9077c7a17c4
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pywebpush/default.nix
@@ -0,0 +1,28 @@
+{ lib, fetchPypi, buildPythonPackage
+, coverage, flake8, mock, nose
+, http-ece, py-vapid, requests }:
+
+buildPythonPackage rec {
+  pname = "pywebpush";
+  version = "1.9.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "03qkijz56fx7p8405sknw2wji4pfj5knajk2lmj9y58mjxydbpp3";
+  };
+
+  propagatedBuildInputs = [
+    http-ece py-vapid requests
+  ];
+
+  checkInputs = [
+    coverage flake8 mock nose
+  ];
+
+  meta = with lib; {
+    description = "Webpush Data encryption library for Python";
+    homepage = https://github.com/web-push-libs/pywebpush;
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/scandir/default.nix b/nixpkgs/pkgs/development/python-modules/scandir/default.nix
index 9aa2269c9575..2736eb2ee9a3 100644
--- a/nixpkgs/pkgs/development/python-modules/scandir/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/scandir/default.nix
@@ -2,13 +2,15 @@
 
 buildPythonPackage rec {
   pname = "scandir";
-  version = "1.7";
+  version = "1.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 ="0gbnhjzg42rj87ljv9kb648rfxph69ly3c8r9841dxy4d7l5pmdj";
+    sha256 ="1bkqwmf056pkchf05ywbnf659wqlp6lljcdb0y88wr9f0vv32ijd";
   };
 
+  checkPhase = "python test/run_tests.py";
+
   meta = with lib; {
     description = "A better directory iterator and faster os.walk()";
     homepage = https://github.com/benhoyt/scandir;
diff --git a/nixpkgs/pkgs/development/python-modules/spglib/default.nix b/nixpkgs/pkgs/development/python-modules/spglib/default.nix
index 7428e6e9e915..73af5d7b00c6 100644
--- a/nixpkgs/pkgs/development/python-modules/spglib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/spglib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, numpy, nose, pyyaml }:
+{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, numpy, nose, pyyaml }:
 
 buildPythonPackage rec {
   pname = "spglib";
@@ -9,6 +9,15 @@ buildPythonPackage rec {
     sha256 = "15b02b74c0f06179bc3650c43a710a5200abbba387c6eda3105bfd9236041443";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "fix-assertions.patch";
+      url = https://github.com/atztogo/spglib/commit/d57070831585a6f02dec0a31d25b375ba347798c.patch;
+      stripLen = 1;
+      sha256 = "0crmkc498rbrawiy9zbl39qis2nmsbfr4s6kk6k3zhdy8z2ppxw7";
+    })
+  ];
+
   propagatedBuildInputs = [ numpy ];
 
   checkInputs = [ nose pyyaml ];
diff --git a/nixpkgs/pkgs/development/python-modules/strategies/default.nix b/nixpkgs/pkgs/development/python-modules/strategies/default.nix
new file mode 100644
index 000000000000..2b03ddcf9c94
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/strategies/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchPypi
+, multipledispatch, toolz
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "strategies";
+  version = "0.2.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "02i4ydrs9k61p8iv2vl2akks8p9gc88rw8031wlwb1zqsyjmb328";
+  };
+
+  propagatedBuildInputs = [ multipledispatch toolz ];
+  checkInputs = [ pytest ];
+
+  meta = {
+    description = "A Python library for control flow programming";
+    homepage    = "https://github.com/logpy/strategies";
+    license     = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ suhr ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/wsproto/default.nix b/nixpkgs/pkgs/development/python-modules/wsproto/default.nix
index ca9872bfbf09..36aaf0ec8ceb 100644
--- a/nixpkgs/pkgs/development/python-modules/wsproto/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/wsproto/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "wsproto";
-  version = "0.14.0";
+  version = "0.14.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1p24dmym6pfsqsyxps6m2cxfl36cmkri0kdy5y5q7s300j3xmhsm";
+    sha256 = "051s127qb5dladxa14n9nqajwq7xki1dz1was5r5v9df5a0jq8pd";
   };
 
   propagatedBuildInputs = [ h11 enum34 ];
diff --git a/nixpkgs/pkgs/development/r-modules/default.nix b/nixpkgs/pkgs/development/r-modules/default.nix
index e571c72232c7..3ecd81d39f99 100644
--- a/nixpkgs/pkgs/development/r-modules/default.nix
+++ b/nixpkgs/pkgs/development/r-modules/default.nix
@@ -258,7 +258,7 @@ let
     Formula = [ pkgs.gmp ];
     geoCount = [ pkgs.gsl_1 ];
     gdtools = [ pkgs.cairo.dev pkgs.fontconfig.lib pkgs.freetype.dev ];
-    git2r = [ pkgs.zlib.dev pkgs.openssl.dev pkgs.libssh2.dev ];
+    git2r = [ pkgs.zlib.dev pkgs.openssl.dev pkgs.libssh2.dev pkgs.libgit2 pkgs.pkgconfig ];
     GLAD = [ pkgs.gsl_1 ];
     glpkAPI = [ pkgs.gmp pkgs.glpk ];
     gmp = [ pkgs.gmp.dev ];
diff --git a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix
index dfe1a6a10c77..ac9680c404c0 100644
--- a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flow";
-  version = "0.100.0";
+  version = "0.101.0";
 
   src = fetchFromGitHub {
     owner  = "facebook";
     repo   = "flow";
     rev    = "refs/tags/v${version}";
-    sha256 = "10i2r0w979lhqgkq25s1a7j5vxlnjmr2w7nknhc1cvfp3z17k9ay";
+    sha256 = "09m9arpb26fqwc16f2zgjgkrlmjg0gj55zd9rfv2s8x1l0lrx5z6";
   };
 
   installPhase = ''
diff --git a/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix b/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix
index c75a053acb27..1a56933548f6 100644
--- a/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix
+++ b/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix
@@ -10,13 +10,13 @@
 
 buildBazelPackage rec {
   name = "bazel-watcher-${version}";
-  version = "0.9.1";
+  version = "0.10.3";
 
   src = fetchFromGitHub {
     owner = "bazelbuild";
     repo = "bazel-watcher";
     rev = "v${version}";
-    sha256 = "1gjbv67ydyb0mafpp59qr9n8f8vva2mwhgan6lxxl0i9yfx7qc6p";
+    sha256 = "17z4nqqsdrainbh8fmhf6sgrxwf7aknadmn94z1yqpxa7kb9x33v";
   };
 
   nativeBuildInputs = [ go git python ];
@@ -49,7 +49,7 @@ buildBazelPackage rec {
       sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker
     '';
 
-    sha256 = "0p6yarz4wlb6h33n4slkczkdkaa93zc9jx55h8wl9vv81ahp0md5";
+    sha256 = "1ck1rsg5msd77abs889nl2n2i3jlah4d4vjz5wbsb3jyhzn8n5ny";
   };
 
   buildAttrs = {
diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix
index 3bbab475c573..fa6b310ce618 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/bash-tools-test.nix
@@ -1,4 +1,4 @@
-{ stdenv, writeText, runCommandCC, bazel }:
+{ stdenv, writeText, runCommandCC, bazel, runLocal, bazelTest }:
 
 # Tests that certain executables are available in bazel-executed bash shells.
 
@@ -22,21 +22,23 @@ let
     )
   '';
 
-  runLocal = name: script: runCommandCC name { preferLocalBuild = true; } script;
-
-  workspaceDir = runLocal "our_workspace" ''
+  workspaceDir = runLocal "our_workspace" {} ''
     mkdir $out
     cp ${WORKSPACE} $out/WORKSPACE
     cp ${fileIn} $out/input.txt
     cp ${fileBUILD} $out/BUILD
   '';
 
-  testBazel = runLocal "bazel-test-bash-tools" ''
-    export HOME=$(mktemp -d)
-    cp -r ${workspaceDir} wd && chmod +w wd && cd wd
-    ${bazel}/bin/bazel build :tool_usage
-    cp bazel-genfiles/output.txt $out
-    echo "Testing content" && [ "$(cat $out | wc -l)" == "2" ] && echo "OK"
-  '';
+  testBazel = bazelTest {
+    name = "bazel-test-bash-tools";
+    bazelPkg = bazel;
+    inherit workspaceDir;
+
+    bazelScript = ''
+      ${bazel}/bin/bazel build :tool_usage
+      cp bazel-genfiles/output.txt $out
+      echo "Testing content" && [ "$(cat $out | wc -l)" == "2" ] && echo "OK"
+    '';
+  };
 
 in testBazel
diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix
index e106c6962dc3..1ea0fc049ba8 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix
@@ -1,5 +1,7 @@
-{ stdenv, callPackage, lib, fetchurl, fetchpatch, runCommand, makeWrapper
-, zip, unzip, bash, writeCBin, coreutils
+{ stdenv, callPackage, lib, fetchurl, fetchpatch, runCommand, runCommandCC, makeWrapper
+# this package (through the fixpoint glass)
+, bazel
+, lr, xe, zip, unzip, bash, writeCBin, coreutils
 , which, python, perl, gawk, gnused, gnutar, gnugrep, gzip, findutils
 # Apple dependencies
 , cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation
@@ -14,14 +16,42 @@
 
 let
   srcDeps = [
+    # From: $REPO_ROOT/WORKSPACE
     (fetchurl {
       url = "https://github.com/google/desugar_jdk_libs/archive/915f566d1dc23bc5a8975320cd2ff71be108eb9c.zip";
       sha256 = "0b926df7yxyyyiwm9cmdijy6kplf0sghm23sf163zh8wrk87wfi7";
     })
-
     (fetchurl {
-        url = "https://mirror.bazel.build/bazel_java_tools/java_tools_pkg-0.5.1.tar.gz";
-        sha256 = "1ld8m5cj9j0r474f56pixcfi0xvx3w7pzwahxngs8f6ns0yimz5w";
+        url = "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/2d9566b21fbe405acf5f7bf77eda30df72a4744c.tar.gz";
+        sha256 = "4a1318fed4831697b83ce879b3ab70ae09592b167e5bda8edaff45132d1c3b3f";
+    })
+    (fetchurl {
+        url = "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz";
+        sha256 = "ba5d15ca230efca96320085d8e4d58da826d1f81b444ef8afccd8b23e0799b52";
+    })
+    (fetchurl {
+      url = "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz";
+      sha256 = "d868ce50d592ef4aad7dec4dd32ae68d2151261913450fac8390b3fd474bb898";
+    })
+     (fetchurl {
+         url = "https://mirror.bazel.build/bazel_java_tools/releases/javac10/v3.2/java_tools_javac10_linux-v3.2.zip";
+         sha256 = "b93e7c556b01815afb6c248aa73f06b7ec912805bde8898eedac1e20d08f2e67";
+     })
+    (fetchurl {
+        url = "https://mirror.bazel.build/bazel_java_tools/releases/javac10/v3.2/java_tools_javac10_darwin-v3.2.zip";
+        sha256 = "1437327179b4284f7082cee0bdc3328f040e62fc5cc59c32f6824b8c520e2b7b";
+    })
+    (fetchurl {
+        url = "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v1.0.zip";
+        sha256 = "cc470e529fafb6165b5be3929ff2d99b38429b386ac100878687416603a67889";
+    })
+    (fetchurl {
+        url = "https://github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip";
+        sha256 = "9b72bb0aea72d7cbcfc82a01b1e25bf3d85f791e790ddec16c65e2d906382ee0";
+    })
+    (fetchurl {
+        url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.2.tar.gz";
+        sha256 = "04f85f2dd049e87805511e3babc5cea3f5e72332b1627e34f3a5461cc38e815f";
     })
   ];
 
@@ -63,17 +93,19 @@ let
   # Java toolchain used for the build and tests
   javaToolchain = "@bazel_tools//tools/jdk:toolchain_host${buildJdkName}";
 
+  platforms = lib.platforms.linux ++ lib.platforms.darwin;
+
 in
 stdenv.mkDerivation rec {
 
-  version = "0.24.0";
+  version = "0.26.1";
 
   meta = with lib; {
     homepage = "https://github.com/bazelbuild/bazel/";
     description = "Build tool that builds code quickly and reliably";
     license = licenses.asl20;
     maintainers = [ maintainers.mboes ];
-    platforms = platforms.linux ++ platforms.darwin;
+    inherit platforms;
   };
 
   # Additional tests that check bazel’s functionality. Execute
@@ -81,16 +113,74 @@ stdenv.mkDerivation rec {
   #     nix-build . -A bazel.tests
   #
   # in the nixpkgs checkout root to exercise them locally.
-  passthru.tests = {
-    pythonBinPath = callPackage ./python-bin-path-test.nix {};
-    bashTools = callPackage ./bash-tools-test.nix {};
-  };
+  passthru.tests =
+    let
+      runLocal = name: attrs: script: runCommandCC name ({
+        preferLocalBuild = true;
+        meta.platforms = platforms;
+      } // attrs) script;
+
+      # bazel wants to extract itself into $install_dir/install every time it runs,
+      # so let’s do that only once.
+      extracted = bazelPkg:
+        let install_dir =
+          # `install_base` field printed by `bazel info`, minus the hash.
+          # yes, this path is kinda magic. Sorry.
+          "$HOME/.cache/bazel/_bazel_nixbld";
+        in runLocal "bazel-extracted-homedir" { passthru.install_dir = install_dir; } ''
+            export HOME=$(mktemp -d)
+            touch WORKSPACE # yeah, everything sucks
+            install_base="$(${bazelPkg}/bin/bazel info | grep install_base)"
+            # assert it’s actually below install_dir
+            [[ "$install_base" =~ ${install_dir} ]] \
+              || (echo "oh no! $install_base but we are \
+            trying to copy ${install_dir} to $out instead!"; exit 1)
+            cp -R ${install_dir} $out
+          '';
+
+      bazelTest = { name, bazelScript, workspaceDir, bazelPkg }:
+        let
+          be = extracted bazelPkg;
+        in runLocal name {} (
+          # skip extraction caching on Darwin, because nobody knows how Darwin works
+          (lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+            # set up home with pre-unpacked bazel
+            export HOME=$(mktemp -d)
+            mkdir -p ${be.install_dir}
+            cp -R ${be}/install ${be.install_dir}
+
+            # https://stackoverflow.com/questions/47775668/bazel-how-to-skip-corrupt-installation-on-centos6
+            # Bazel checks whether the mtime of the install dir files
+            # is >9 years in the future, otherwise it extracts itself again.
+            # see PosixFileMTime::IsUntampered in src/main/cpp/util
+            # What the hell bazel.
+            ${lr}/bin/lr -0 -U ${be.install_dir} | ${xe}/bin/xe -N0 -0 touch --date="9 years 6 months" {}
+          '')
+          +
+          ''
+            # Note https://github.com/bazelbuild/bazel/issues/5763#issuecomment-456374609
+            # about why to create a subdir for the workspace.
+            cp -r ${workspaceDir} wd && chmod u+w wd && cd wd
+
+            ${bazelScript}
+
+            touch $out
+          '');
+
+      bazelWithNixHacks = bazel.override { enableNixHacks = true; };
+    in {
+      pythonBinPathWithoutNixHacks = callPackage ./python-bin-path-test.nix{ inherit runLocal bazelTest; };
+      bashToolsWithoutNixHacks = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest; };
+
+      pythonBinPathWithNixHacks = callPackage ./python-bin-path-test.nix{ inherit runLocal bazelTest; bazel = bazelWithNixHacks; };
+      bashToolsWithNixHacks = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest; bazel = bazelWithNixHacks; };
+    };
 
   name = "bazel-${version}";
 
   src = fetchurl {
     url = "https://github.com/bazelbuild/bazel/releases/download/${version}/${name}-dist.zip";
-    sha256 = "11gsc00ghxqkbci8nrflkwq1lcvqawlgkaryj458b24si6bjl7b2";
+    sha256 = "000ny51hwnjyizm1md4w8q7m832jhf3c767pgbvg6nc7h67lzsf0";
   };
 
   # Necessary for the tests to pass on Darwin with sandbox enabled.
@@ -148,10 +238,6 @@ stdenv.mkDerivation rec {
       # https://github.com/NixOS/nixpkgs/pull/41589
       export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1"
 
-      # 10.10 apple_sdk Foundation doesn't have type arguments on classes
-      # Remove this when we update apple_sdk
-      sed -i -e 's/<.*\*>//g' tools/osx/xcode_locator.m
-
       # don't use system installed Xcode to run clang, use Nix clang instead
       sed -i -e "s;/usr/bin/xcrun clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation;g" \
         scripts/bootstrap/compile.sh \
@@ -159,6 +245,9 @@ stdenv.mkDerivation rec {
         src/tools/xcode/stdredirect/BUILD \
         tools/osx/BUILD
 
+      # nixpkgs's libSystem cannot use pthread headers directly, must import GCD headers instead
+      sed -i -e "/#include <pthread\/spawn.h>/i #include <dispatch/dispatch.h>" src/main/cpp/blaze_util_darwin.cc
+
       # clang installed from Xcode has a compatibility wrapper that forwards
       # invocations of gcc to clang, but vanilla clang doesn't
       sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl
@@ -193,7 +282,7 @@ stdenv.mkDerivation rec {
 
       # Fixup scripts that generate scripts. Not fixed up by patchShebangs below.
       substituteInPlace scripts/bootstrap/compile.sh \
-          --replace /bin/sh ${customBash}/bin/bash
+          --replace /bin/bash ${customBash}/bin/bash
 
       # add nix environment vars to .bazelrc
       cat >> .bazelrc <<EOF
@@ -297,7 +386,9 @@ stdenv.mkDerivation rec {
     cp ./bazel_src/scripts/zsh_completion/_bazel $out/share/zsh/site-functions/
   '';
 
-  doInstallCheck = true;
+  # Temporarily disabling for now. A new approach is needed for this derivation as Bazel
+  # accesses the internet during the tests which fails in a sandbox.
+  doInstallCheck = false;
   installCheckPhase = ''
     export TEST_TMPDIR=$(pwd)
 
diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/nix-hacks.patch b/nixpkgs/pkgs/development/tools/build-managers/bazel/nix-hacks.patch
index da3f6248f220..f58be89fabc1 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/bazel/nix-hacks.patch
+++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/nix-hacks.patch
@@ -1,33 +1,35 @@
 diff -Naur a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
---- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java	1980-01-01 00:00:00.000000000 -0500
-+++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java	2018-01-18 08:17:22.420459162 -0500
-@@ -287,21 +287,8 @@
-           markerData.put(key, value);
-         }
-       }
--      boolean result = false;
--      if (markerRuleKey.equals(ruleKey)) {
--        result = handler.verifyMarkerData(rule, markerData, env);
--        if (env.valuesMissing()) {
+--- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java	2019-06-12 20:39:37.420705161 -0700
++++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java	2019-06-12 20:44:18.894429744 -0700
+@@ -428,24 +428,7 @@
+       try {
+         content = FileSystemUtils.readContent(markerPath, StandardCharsets.UTF_8);
+         String markerRuleKey = readMarkerFile(content, markerData);
+-        boolean verified = false;
+-        if (Preconditions.checkNotNull(ruleKey).equals(markerRuleKey)
+-            && Objects.equals(
+-                markerData.get(MANAGED_DIRECTORIES_MARKER),
+-                this.markerData.get(MANAGED_DIRECTORIES_MARKER))) {
+-          verified = handler.verifyMarkerData(rule, markerData, env);
+-          if (env.valuesMissing()) {
+-            return null;
+-          }
+-        }
+-
+-        if (verified) {
+           return new Fingerprint().addString(content).digestAndReset();
+-        } else {
+-          // So that we are in a consistent state if something happens while fetching the repository
+-          markerPath.delete();
 -          return null;
 -        }
--      }
- 
--      if (result) {
--        return new Fingerprint().addString(content).digestAndReset();
--      } else {
--        // So that we are in a consistent state if something happens while fetching the repository
--        markerPath.delete();
--        return null;
--      }
-+      return new Fingerprint().addString(content).digestAndReset();
- 
-     } catch (IOException e) {
-       throw new RepositoryFunctionException(e, Transience.TRANSIENT);
+       } catch (IOException e) {
+         throw new RepositoryFunctionException(e, Transience.TRANSIENT);
+       }
 diff -Naur a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java
---- a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java	1980-01-01 00:00:00.000000000 -0500
-+++ b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java	2018-01-18 08:17:53.274877980 -0500
-@@ -129,7 +129,6 @@
+--- a/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java	2019-06-12 20:39:37.538708196 -0700
++++ b/src/main/java/com/google/devtools/build/lib/shell/JavaSubprocessFactory.java	2019-06-12 20:44:18.863429602 -0700
+@@ -146,7 +146,6 @@
      ProcessBuilder builder = new ProcessBuilder();
      builder.command(params.getArgv());
      if (params.getEnv() != null) {
diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix
index 54ae154a6207..08bc642b6307 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, writeText, runCommandCC, bazel }:
+{ stdenv, lib, writeText, bazel, bazelTest, runLocal }:
 
 let
   WORKSPACE = writeText "WORKSPACE" ''
@@ -22,16 +22,14 @@ let
       srcs = [ "lib.py" ],
     )
 
-    py_test(
+    py_binary(
       name = "bin",
       srcs = [ "bin.py" ],
       deps = [ ":lib" ],
     )
   '';
 
-  runLocal = name: script: runCommandCC name { preferLocalBuild = true; } script;
-
-  workspaceDir = runLocal "our_workspace" ''
+  workspaceDir = runLocal "our_workspace" {} ''
     mkdir $out
     cp ${WORKSPACE} $out/WORKSPACE
     mkdir $out/python
@@ -40,18 +38,16 @@ let
     cp ${pythonBUILD} $out/python/BUILD.bazel
   '';
 
-  testBazel = runLocal "bazel-test-builtin-rules" ''
-    export HOME=$(mktemp -d)
-    # Note https://github.com/bazelbuild/bazel/issues/5763#issuecomment-456374609
-    # about why to create a subdir for the workspace.
-    cp -r ${workspaceDir} wd && chmod u+w wd && cd wd
-    ${bazel}/bin/bazel \
-      test \
-        --test_output=errors \
-        --host_javabase='@local_jdk//:jdk' \
-        //...
-
-    touch $out
-  '';
+  testBazel = bazelTest {
+    name = "bazel-test-builtin-rules";
+    inherit workspaceDir;
+    bazelPkg = bazel;
+    bazelScript = ''
+      ${bazel}/bin/bazel \
+        run \
+          --host_javabase='@local_jdk//:jdk' \
+          //python:bin
+    '';
+  };
 
 in testBazel
diff --git a/nixpkgs/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch b/nixpkgs/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch
index f70e3811f654..8effc723bbab 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch
+++ b/nixpkgs/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch
@@ -1,6 +1,6 @@
---- Bear-2.3.11-src/bear/main.py.in	1970-01-01 01:00:01.000000000 +0100
-+++ Bear-2.3.11-src-patch/bear/main.py.in	1970-01-01 01:00:01.000000000 +0100
-@@ -49,6 +49,7 @@
+--- a/bear/main.py.in
++++ b/bear/main.py.in
+@@ -49,6 +49,7 @@ import tempfile
  import shutil
  import contextlib
  import logging
@@ -8,16 +8,20 @@
  
  # Map of ignored compiler option for the creation of a compilation database.
  # This map is used in _split_command method, which classifies the parameters
-@@ -540,7 +541,11 @@
-                 any(pattern.match(cmd) for pattern in COMPILER_PATTERNS_CXX)
+@@ -569,7 +570,15 @@ class Compilation:
+                 (compiler, language, rest of the command) otherwise """
  
          if command:  # not empty list will allow to index '0' and '1:'
 -            executable = os.path.basename(command[0])  # type: str
-+            absolute_executable = os.path.realpath(find_executable(command[0]))
-+            if 'wrapper' in absolute_executable:
-+                return None
-+
-+            executable = os.path.basename(absolute_executable) # type: str
++            executable_file = find_executable(command[0])
++            if executable_file:
++                absolute_executable = os.path.realpath(executable_file)
++                # Ignore Nix wrappers.
++                if 'wrapper' in absolute_executable:
++                    return None
++                executable = os.path.basename(absolute_executable)
++            else:
++                executable = os.path.basename(command[0])
              parameters = command[1:]  # type: List[str]
              # 'wrapper' 'parameters' and
              # 'wrapper' 'compiler' 'parameters' are valid.
\ No newline at end of file
diff --git a/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix b/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix
index 60b6fd1953ed..341585744a6e 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/rebar3/default.nix
@@ -3,7 +3,7 @@
   tree, hexRegistrySnapshot }:
 
 let
-  version = "3.10.0";
+  version = "3.11.1";
 
   bootstrapper = ./rebar3-nix-bootstrap;
 
@@ -74,10 +74,10 @@ stdenv.mkDerivation rec {
   inherit version erlang;
 
   src = fetchFromGitHub {
-    owner = "rebar";
+    owner = "erlang";
     repo = pname;
     rev = version;
-    sha256 = "1p34kfkrdmsixg95ad76rifjwfh484vp688lxsjaxg0kf2xjr2d2";
+    sha256 = "124l1alf7wx4hqjpf63l0nx70q68lilmgh582c1d413fz5ip0byd";
   };
 
   inherit bootstrapper;
diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 42e8f26970f5..07be22ae43f5 100644
--- a/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
 { lib, buildGoPackage, fetchFromGitLab, fetchurl }:
 
 let
-  version = "11.11.0";
+  version = "11.11.2";
   # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
   docker_x86_64 = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz";
-    sha256 = "0h35y3ifqqsirkbgg75jj30n1ggyyncbwjnnxwdhc3r9hbbc545y";
+    sha256 = "0q5i9517jsz3mw7hglbnjih7q114350dfd9nyzv7xfk56kc0172w";
   };
 
   docker_arm = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
-    sha256 = "1lphzy5xxyc4qgmnf7rrplida2zdn2mfl9p9fr3gyjs7gbcr92d7";
+    sha256 = "0q7g0ggaxg6akda06an867vbdqjrfcxf4c81b1cxfhbk7whxgxhv";
   };
 in
 buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     rev = "v${version}";
-    sha256 = "0i45p4z8f7ggdh7624473d8qhz7d75hlhz98p3z69dggx38vv49y";
+    sha256 = "0bnn89z7p2mrjjlq7i9yfr6ra903vr278qhhy2i126w56dlac6vf";
   };
 
   patches = [ ./fix-shell-path.patch ];
diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix
index babc46115e80..d7822886a5fd 100644
--- a/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jenkins-${version}";
-  version = "2.164.3";
+  version = "2.176.1";
 
   src = fetchurl {
     url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
-    sha256 = "03m5ykl6kqih9li2fhyq9rf8x8djaj2rgjd2p897zzw5j0grkbx8";
+    sha256 = "130f9x4fvnf9a9ykf48axj9fgqaj2ssr9jhsflpi1gg78ch6xg4b";
   };
 
   buildCommand = ''
diff --git a/nixpkgs/pkgs/development/tools/documentation/gtk-doc/0001-highlight-fix-permission-on-file-style.patch b/nixpkgs/pkgs/development/tools/documentation/gtk-doc/0001-highlight-fix-permission-on-file-style.patch
new file mode 100644
index 000000000000..f7e37a1a5e5a
--- /dev/null
+++ b/nixpkgs/pkgs/development/tools/documentation/gtk-doc/0001-highlight-fix-permission-on-file-style.patch
@@ -0,0 +1,24 @@
+From 95a75c95c5c4e641ce7cda0ded968d66f07f822a Mon Sep 17 00:00:00 2001
+From: worldofpeace <worldofpeace@protonmail.ch>
+Date: Sat, 18 May 2019 14:44:08 -0400
+Subject: [PATCH] highlight: fix permission on file style
+
+---
+ gtkdoc/highlight.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gtkdoc/highlight.py b/gtkdoc/highlight.py
+index 8f6e470..d11c432 100644
+--- a/gtkdoc/highlight.py
++++ b/gtkdoc/highlight.py
+@@ -47,6 +47,6 @@ def highlight_code(code, lang='c'):
+ 
+ 
+ def append_style_defs(css_file_name):
+-    os.chmod(css_file_name, stat.S_IWRITE)
++    os.chmod(css_file_name, 0o664)
+     with open(css_file_name, 'at', newline='\n', encoding='utf-8') as css:
+         css.write(HTML_FORMATTER.get_style_defs())
+-- 
+2.21.0
+
diff --git a/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix b/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix
index f6083a78bf89..44b5384106ea 100644
--- a/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/nixpkgs/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -1,30 +1,59 @@
-{ stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python3, libxml2Python, libxslt, which
-, docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, gettext, itstool, gnome3
+{ stdenv
+, fetchFromGitLab
+, meson
+, ninja
+, pkgconfig
+, python3
+, libxml2Python
+, docbook_xml_dtd_43
+, docbook_xsl
+, libxslt
+, gettext
+, gnome3
 , withDblatex ? false, dblatex
 }:
 
 stdenv.mkDerivation rec {
   pname = "gtk-doc";
-  version = "1.29";
+  version = "1.30";
 
-  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1cc6yl8l275qn3zpjl6f0s4fwmkczngjr9hhsdv74mln4h08wmql";
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "GNOME";
+    repo = pname;
+    rev = "GTK_DOC_${stdenv.lib.replaceStrings ["."] ["_"] version }";
+    sha256 = "05lr6apj3pd3s59a7k6p45k9ywwrp577ra4pvkhxvb5p7v90c2fi";
   };
 
   patches = [
     passthru.respect_xml_catalog_files_var_patch
+    # https://gitlab.gnome.org/GNOME/gtk-doc/issues/84
+    ./0001-highlight-fix-permission-on-file-style.patch
   ];
 
   outputDevdoc = "out";
 
-  nativeBuildInputs = [ autoreconfHook ];
-  buildInputs =
-    [ pkgconfig perl python3 libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl
-      gnome-doc-utils gettext which itstool
-    ] ++ stdenv.lib.optional withDblatex dblatex;
+  nativeBuildInputs = [
+    gettext
+    meson
+    ninja
+  ];
+
+  buildInputs = [
+    docbook_xml_dtd_43
+    docbook_xsl
+    libxslt
+    pkgconfig
+    python3
+    libxml2Python
+  ]
+  ++ stdenv.lib.optional withDblatex dblatex
+  ;
 
-  configureFlags = [ "--disable-scrollkeeper" ];
+  mesonFlags = [
+    "-Dtests=false"
+    "-Dyelp_manual=false"
+  ];
 
   # Make pygments available for binaries, python.withPackages creates a wrapper
   # but scripts are not allowed in shebangs so we link it into sys.path.
diff --git a/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix b/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix
index 5f8aaf07d730..fa00b8e5f890 100644
--- a/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix
+++ b/nixpkgs/pkgs/development/tools/flatpak-builder/default.nix
@@ -24,6 +24,9 @@
 , flatpak
 , gitMinimal
 , glib
+, glibcLocales
+, gnumake
+, gnupg
 , gnutar
 , json-glib
 , libcap
@@ -32,20 +35,23 @@
 , libyaml
 , ostree
 , patch
+, python2
 , rpm
 , unzip
 }:
 
 let
-  version = "1.0.6";
+  installed_testdir = "${placeholder "installedTests"}/libexec/installed-tests/flatpak-builder";
+  installed_test_metadir = "${placeholder "installedTests"}/share/installed-tests/flatpak-builder";
+  version = "1.0.7";
 in stdenv.mkDerivation rec {
   name = "flatpak-builder-${version}";
 
-  outputs = [ "out" "doc" "man" ];
+  outputs = [ "out" "doc" "man" "installedTests" ];
 
   src = fetchurl {
     url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz";
-    sha256 = "1fw9lzf9cy3fnnvn9q3g0schxcj7kaj6kjijhrmcmsfcnzbjlmrv";
+    sha256 = "04z9i2kahj4mffzq8ny0jvc4g3ah8kv8ilqv2rx9r1l8fhbq30jj";
   };
 
   nativeBuildInputs = [
@@ -95,8 +101,38 @@ in stdenv.mkDerivation rec {
       eustrip = "${elfutils}/bin/eu-strip";
       euelfcompress = "${elfutils}/bin/eu-elfcompress";
     })
+
+    # The test scripts in Flatpak repo were updated so we are basing
+    # this on our patch for Flatpak 0.99.
+    (substituteAll {
+      src = ./fix-test-paths.patch;
+      inherit glibcLocales python2;
+    })
   ];
 
+  configureFlags = [
+    "--enable-installed-tests"
+  ];
+
+  makeFlags = [
+    "installed_testdir=${installed_testdir}"
+    "installed_test_metadir=${installed_test_metadir}"
+  ];
+
+  # Some scripts used by tests  need to use shebangs that are available in Flatpak runtimes.
+  dontPatchShebangs = true;
+
+  # Installed tests
+  postFixup = ''
+    for file in ${installed_testdir}/{test-builder.sh,test-builder-python.sh}; do
+      patchShebangs $file
+    done
+  '';
+
+  passthru = {
+    installedTestsDependencies = [ gnupg ostree python2 gnumake ];
+  };
+
   meta = with stdenv.lib; {
     description = "Tool to build flatpaks from source";
     homepage = https://flatpak.org/;
diff --git a/nixpkgs/pkgs/development/tools/flatpak-builder/fix-test-paths.patch b/nixpkgs/pkgs/development/tools/flatpak-builder/fix-test-paths.patch
new file mode 100644
index 000000000000..96212a30fcf8
--- /dev/null
+++ b/nixpkgs/pkgs/development/tools/flatpak-builder/fix-test-paths.patch
@@ -0,0 +1,111 @@
+--- a/tests/libtest.sh
++++ b/tests/libtest.sh
+@@ -301,7 +301,7 @@
+ }
+ 
+ skip_without_python2 () {
+-    if ! test -f /usr/bin/python2 || ! /usr/bin/python2 -c "import sys; sys.exit(0 if sys.version_info >= (2, 7) else 1)" ; then
++    if ! test -f @python2@/bin/python2 || ! @python2@/bin/python2 -c "import sys; sys.exit(0 if sys.version_info >= (2, 7) else 1)" ; then
+         echo "1..0 # SKIP this test requires /usr/bin/python2 (2.7) support"
+         exit 0
+     fi
+--- a/tests/make-test-runtime.sh
++++ b/tests/make-test-runtime.sh
+@@ -26,6 +26,7 @@
+ PATH="$PATH:/usr/sbin:/sbin"
+ 
+ # Add bash and dependencies
++mkdir -p ${DIR}/nix/store
+ mkdir -p ${DIR}/usr/bin
+ mkdir -p ${DIR}/usr/lib
+ ln -s ../lib ${DIR}/usr/lib64
+@@ -35,73 +36,28 @@
+ else
+     cp `which ldconfig` ${DIR}/usr/bin
+ fi
+-LIBS=`mktemp`
+-BINS=`mktemp`
+-
+-add_bin() {
+-    local f=$1
+-    shift
+-
+-    if grep -qFe "${f}" $BINS; then
+-        # Already handled
+-        return 0
+-    fi
+-
+-    echo $f >> $BINS
+-
+-    # Add library dependencies
+-    (ldd "${f}" | sed "s/.* => //"  | awk '{ print $1}' | grep ^/ | sort -u -o $LIBS $LIBS -)  || true
+-
+-    local shebang=$(sed -n '1s/^#!\([^ ]*\).*/\1/p' "${f}")
+-    if [ x$shebang != x ]; then
+-        add_bin "$shebang"
+-    fi
+-}
+ 
+ for i in $@; do
+-    I=`which $i`
+-    add_bin $I
+-    if test $i == python2; then
+-        mkdir -p ${DIR}/usr/lib/python2.7/lib-dynload
+-        # This is a hardcoded minimal set of modules we need in the current tests.
+-        # Pretty hacky stuff. Add modules as needed.
+-        PYDIR=/usr/lib/python2.7
+-        if test -d /usr/lib64/python2.7; then PYDIR=/usr/lib64/python2.7; fi
+-        for py in site os stat posixpath genericpath warnings \
+-                       linecache types UserDict abc _abcoll \
+-                       _weakrefset copy_reg traceback sysconfig \
+-                       re sre_compile sre_parse sre_constants \
+-                       _sysconfigdata ; do
+-            cp ${PYDIR}/$py.py ${DIR}/usr/lib/python2.7
+-        done
+-        # These might not exist, depending how Python was configured; and the
+-        # part after ${so} might be "module" or ".x86_64-linux-gnu" or
+-        # something else
+-        for so in _locale strop ; do
+-            cp ${PYDIR}/lib-dynload/${so}*.so ${DIR}/usr/lib/python2.7/lib-dynload || :
+-        done
+-        for plat in $( cd ${PYDIR} && echo plat-* ); do
+-            test -e ${PYDIR}/${plat} || continue
+-            mkdir -p ${DIR}/usr/lib/python2.7/${plat}
+-            cp ${PYDIR}/${plat}/*.py ${DIR}/usr/lib/python2.7/${plat}/
+-        done
+-    fi
+-done
+-for i in `cat $BINS`; do
+-    echo Adding binary $i 1>&2
+-    cp "$i" ${DIR}/usr/bin/
+-done
+-for i in `cat $LIBS`; do
+-    echo Adding library $i 1>&2
+-    cp "$i" ${DIR}/usr/lib/
++    I=$(readlink -f $(which $i))
++    requisites=$(nix-store --query --requisites "$I")
++    for r in $requisites; do
++        # a single store item can be needed by multiple paths, no need to copy it again
++        if [ ! -e ${DIR}/$r ]; then
++            cp -r $r ${DIR}/$r
++        fi
++    done
++    ln -s $I ${DIR}/usr/bin/$i
+ done
+ ln -s bash ${DIR}/usr/bin/sh
+ 
+-# We copy the C.UTF8 locale and call it en_US. Its a bit of a lie, but
+-# the real en_US locale is often not available, because its in the
+-# local archive.
++mv ${DIR}/nix/store ${DIR}/usr/store # files outside /usr are not permitted, we will have to replace /nix/store with /usr/store
++chmod -R u+w ${DIR} # nix store has read-only directories which would cause problems during clean-up, files need to be writable for sed
++find ${DIR} -type f -print0 | xargs -0 sed -i 's~/nix/store/~/usr/store/~g' # replace hardcoded paths
++find ${DIR} -type l | xargs -I '{}' sh -c 'tg="$(readlink "$1")"; newtg="${tg#/nix/store/}"; if [ "$tg" != "$newtg" ]; then ln -fs "/usr/store/$newtg" "$1"; fi' -- '{}' # replace symlink targets
++
++# We copy the whole locale archive because we do not have C.UTF8 locale
+ mkdir -p ${DIR}/usr/lib/locale/
+-cp -r /usr/lib/locale/C.* ${DIR}/usr/lib/locale/en_US
++cp @glibcLocales@/lib/locale/locale-archive ${DIR}/usr/lib/locale/locale-archive
+ 
+ if [ x$COLLECTION_ID != x ]; then
+     collection_args=--collection-id=${COLLECTION_ID}
diff --git a/nixpkgs/pkgs/development/tools/kythe/default.nix b/nixpkgs/pkgs/development/tools/kythe/default.nix
index bd25a60f72c1..aaad6d31210c 100644
--- a/nixpkgs/pkgs/development/tools/kythe/default.nix
+++ b/nixpkgs/pkgs/development/tools/kythe/default.nix
@@ -1,12 +1,12 @@
 { stdenv, binutils , fetchurl, glibc, ncurses5 }:
 
 stdenv.mkDerivation rec {
-  version = "0.0.28";
-  name = "kythe-${version}";
+  version = "0.0.30";
+  pname = "kythe";
 
   src = fetchurl {
-    url = "https://github.com/google/kythe/releases/download/v0.0.28/kythe-v0.0.28.tar.gz";
-    sha256 = "1qc7cngpxw66m3krpr5x50ns7gb3bpv2bdfzpb5afl12qp0mi6zm";
+    url = "https://github.com/kythe/kythe/releases/download/v${version}/${pname}-v${version}.tar.gz";
+    sha256 = "12bwhqkxfbkh3mm4wfvqflwhmbzpmlhlfykdpy6h7p9ih9ky8w6r";
   };
 
   buildInputs =
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
                 write_entries write_tables entrystream; do
       echo "Patching:" $exe
       patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $exe
-      patchelf --set-rpath "${stdenv.cc.cc.lib}/lib64:${ncurses5}/lib" $exe
+      patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ncurses5 ]}" $exe
     done
     cd ../
     cp -R ./ $out
diff --git a/nixpkgs/pkgs/development/tools/libsigrok/default.nix b/nixpkgs/pkgs/development/tools/libsigrok/default.nix
index 93c8c6a6c716..a80b638625e5 100644
--- a/nixpkgs/pkgs/development/tools/libsigrok/default.nix
+++ b/nixpkgs/pkgs/development/tools/libsigrok/default.nix
@@ -1,20 +1,20 @@
 { stdenv, fetchurl, pkgconfig, libzip, glib, libusb1, libftdi1, check
 , libserialport, librevisa, doxygen, glibmm, python
-, version ? "0.5.0", sha256 ? "197kr5ip98lxn7rv10zs35d1w0j7265s0xvckx0mq2l8kdvqd32c"
+, version ? "0.5.1", sha256 ? "171b553dir5gn6w4f7n37waqk62nq2kf1jykx4ifjacdz5xdw3z4"
 }:
 
 stdenv.mkDerivation rec {
   inherit version;
-  name = "libsigrok-${version}";
+  pname = "libsigrok";
 
   src = fetchurl {
-    url = "https://sigrok.org/download/source/libsigrok/${name}.tar.gz";
+    url = "https://sigrok.org/download/source/${pname}/${pname}-${version}.tar.gz";
     inherit sha256;
   };
 
   firmware = fetchurl {
-    url = "https://sigrok.org/download/binary/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-bin-0.1.3.tar.gz";
-    sha256 = "1qr02ny97navqxr56xq1a227yzf6h09m8jlvc9bnjl0bsk6887bl";
+    url = "https://sigrok.org/download/binary/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-bin-0.1.6.tar.gz";
+    sha256 = "14sd8xqph4kb109g073daiavpadb20fcz7ch1ipn0waz7nlly4sw";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/nixpkgs/pkgs/development/tools/misc/gdb/default.nix b/nixpkgs/pkgs/development/tools/misc/gdb/default.nix
index 97657075d463..05e0b1cd96f6 100644
--- a/nixpkgs/pkgs/development/tools/misc/gdb/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/gdb/default.nix
@@ -29,6 +29,11 @@ stdenv.mkDerivation rec {
     sha256 = "0bnpzz0rl672xg5547q5qck2sxi6cnyixmk8bbb4gifw17ipwbw0";
   };
 
+  postPatch = if stdenv.isDarwin then ''
+    substituteInPlace gdb/darwin-nat.c \
+      --replace '#include "bfd/mach-o.h"' '#include "mach-o.h"'
+  '' else null;
+
   patches = [
     ./debug-info-from-env.patch
   ] ++ stdenv.lib.optionals stdenv.isDarwin [
diff --git a/nixpkgs/pkgs/development/tools/misc/libwhich/default.nix b/nixpkgs/pkgs/development/tools/misc/libwhich/default.nix
index 58aca8a8b5a4..c751c2755587 100644
--- a/nixpkgs/pkgs/development/tools/misc/libwhich/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/libwhich/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libwhich";
-  version = "2019-03-20";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "vtjnash";
     repo = pname;
-    rev = "b348872107c77cba50b60475aa8ce2ddba86aac0";
-    sha256 = "0fd8hsdc9b9v83j89mxvisgrz77q9rlxnbzd6j63wq66h95r02r9";
+    rev = "v${version}";
+    sha256 = "0s0pqai61jszmi495k621rdlf288ij67adkz72hwqqarqp54idhb";
   };
 
   installPhase = ''
diff --git a/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix b/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix
new file mode 100644
index 000000000000..65a7c9eef397
--- /dev/null
+++ b/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "reviewdog";
+  version = "0.9.12";
+
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0r7y8nbpwfbvinpapv6lgnlc93kwn4b6722cp5ihyf361fklcd02";
+  };
+
+  modSha256 = "1ydfirjhw238zbia5mk90fx9rrg3kvm2h54zjhiimlvnpls5y8c9";
+
+  subPackages = [ "cmd/reviewdog" ];
+
+  buildFlagsArray = [ "-ldflags=-X github.com/reviewdog/reviewdog/commands.Version=${version}" ];
+
+  meta = with lib; {
+    description = "Automated code review tool integrated with any code analysis tools regardless of programming language";
+    homepage = "https://github.com/reviewdog/reviewdog";
+    maintainers = [ maintainers.marsam ];
+    license = licenses.mit;
+  };
+}
diff --git a/nixpkgs/pkgs/development/tools/qtcreator/0001-Fix-clang-libcpp-regexp.patch b/nixpkgs/pkgs/development/tools/qtcreator/0001-Fix-clang-libcpp-regexp.patch
new file mode 100644
index 000000000000..8744b753a6e6
--- /dev/null
+++ b/nixpkgs/pkgs/development/tools/qtcreator/0001-Fix-clang-libcpp-regexp.patch
@@ -0,0 +1,15 @@
+diff --git a/src/plugins/cpptools/headerpathfilter.cpp b/src/plugins/cpptools/headerpathfilter.cpp
+index b514c46..5f96358 100644
+--- a/src/plugins/cpptools/headerpathfilter.cpp
++++ b/src/plugins/cpptools/headerpathfilter.cpp
+@@ -92,8 +92,8 @@ HeaderPaths::iterator resourceIterator(HeaderPaths &headerPaths, bool isMacOs)
+ {
+     // include/c++, include/g++, libc++\include and libc++abi\include
+     static const QString cppIncludes = R"((.*\/include\/.*(g\+\+|c\+\+).*))"
+-                                       R"(|(.*libc\+\+\/include))"
+-                                       R"(|(.*libc\+\+abi\/include))";
++                                       R"(|(.*libc\+\+.*\/include))"
++                                       R"(|(.*libc\+\+abi.*\/include))";
+     static const QRegularExpression includeRegExp("\\A(" + cppIncludes + ")\\z");
+ 
+     // The same as includeRegExp but also matches /usr/local/include
diff --git a/nixpkgs/pkgs/development/tools/qtcreator/default.nix b/nixpkgs/pkgs/development/tools/qtcreator/default.nix
index 3c892592d889..03b758cbdc6d 100644
--- a/nixpkgs/pkgs/development/tools/qtcreator/default.nix
+++ b/nixpkgs/pkgs/development/tools/qtcreator/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, makeWrapper
-, qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake
+{ stdenv, fetchurl, fetchgit, fetchpatch, makeWrapper
+, qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake, llvmPackages_8
 , withDocumentation ? false
 }:
 
@@ -8,6 +8,17 @@ with stdenv.lib;
 let
   baseVersion = "4.9";
   revision = "1";
+
+  # Fetch clang from qt vendor, this contains submodules like this:
+  # clang<-clang-tools-extra<-clazy. 
+  clang_qt_vendor = llvmPackages_8.clang-unwrapped.overrideAttrs (oldAttrs: rec {
+    src = fetchgit {
+      url = "https://code.qt.io/clang/clang.git";
+      rev = "c12b012bb7465299490cf93c2ae90499a5c417d5";
+      sha256 = "0mgmnazgr19hnd03xcrv7d932j6dpz88nhhx008b0lv4bah9mqm0";
+    };
+    unpackPhase = "";
+  });
 in
 
 stdenv.mkDerivation rec {
@@ -19,10 +30,29 @@ stdenv.mkDerivation rec {
     sha256 = "10ddp1365rf0z4bs7yzc9hajisp3j6mzjshyd0vpi4ki126j5f3r";
   };
 
-  buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ];
+  buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative llvmPackages_8.libclang clang_qt_vendor llvmPackages_8.llvm ];
 
   nativeBuildInputs = [ qmake makeWrapper ];
 
+  # 0001-Fix-clang-libcpp-regexp.patch is for fixing regexp that is used to 
+  # find clang libc++ library include paths. By default it's not covering paths
+  # like libc++-version, which is default name for libc++ folder in nixos.
+  patches = [ ./0001-Fix-clang-libcpp-regexp.patch 
+
+    # Fix clazy plugin name. This plugin was renamed with clang8 
+    # release, and patch didn't make it into 4.9.1 release. Should be removed 
+    # on qtcreator update, if this problem is fixed.
+    (fetchpatch {
+      url = "https://code.qt.io/cgit/qt-creator/qt-creator.git/patch/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp?id=53c407bc0c87e0b65b537bf26836ddd8e00ead82";
+      sha256 = "1lanp7jg0x8jffajb852q8p4r34facg41l410xsz6s1k91jskbi9";
+    })
+
+    (fetchpatch {
+      url = "https://code.qt.io/cgit/qt-creator/qt-creator.git/patch/src/plugins/clangtools/clangtidyclazyrunner.cpp?id=53c407bc0c87e0b65b537bf26836ddd8e00ead82";
+      sha256 = "1rl0rc2l297lpfhhawvkkmj77zb081hhp0bbi7nnykf3q9ch0clh";
+    })
+  ]; 
+
   doCheck = true;
 
   enableParallelBuilding = true;
@@ -34,6 +64,20 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     substituteInPlace src/plugins/plugins.pro \
       --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls'
+
+    # Fix paths for llvm/clang includes directories.
+    substituteInPlace src/shared/clang/clang_defines.pri \
+      --replace '$$clean_path($${LLVM_LIBDIR}/clang/$${LLVM_VERSION}/include)' '${clang_qt_vendor}/lib/clang/8.0.0/include' \
+      --replace '$$clean_path($${LLVM_BINDIR})' '${clang_qt_vendor}/bin'
+
+    # Fix include path to find clang and clang-c include directories.  
+    substituteInPlace src/plugins/clangtools/clangtools.pro \
+      --replace 'INCLUDEPATH += $$LLVM_INCLUDEPATH' 'INCLUDEPATH += $$LLVM_INCLUDEPATH ${clang_qt_vendor}'
+
+    # Fix paths to libclang library.
+    substituteInPlace src/shared/clang/clang_installation.pri \
+      --replace 'LIBCLANG_LIBS = -L$${LLVM_LIBDIR}' 'LIBCLANG_LIBS = -L${llvmPackages_8.libclang}/lib' \
+      --replace 'LIBCLANG_LIBS += $${CLANG_LIB}' 'LIBCLANG_LIBS += -lclang'
   '';
 
   preBuild = optional withDocumentation ''
diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix
index ab625d7ea357..da42e819ced6 100644
--- a/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix
@@ -2,7 +2,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-make";
-  version = "0.19.4";
+  version = "0.19.5";
 
   src =
     let
@@ -10,11 +10,11 @@ rustPlatform.buildRustPackage rec {
         owner = "sagiegurari";
         repo = pname;
         rev = version;
-        sha256 = "019dn401p4bds144fbvqxbnn8vswcj0lxr8cvgpxb2y22640z60l";
+        sha256 = "0xjyzsi3n3lb5g4gl6v0s4p87nazkqgjf244m792iji9i568ynjb";
       };
       cargo-lock = fetchurl {
-        url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/c5b9fde279a9f6d55d97e0ba4e0b4cd62e0ab2bf/cargo-make-Cargo.lock";
-        sha256 = "1d5md3m8hxwf3pwvx059fsk1b3vvqm17pxbbyiisn9v4psrsmld5";
+        url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/285cf8f9b0ab33db0d656fdc8e759feed55c0167/cargo-make-Cargo.lock";
+        sha256 = "0l2i2hq43k482m2w6hpapaq53r8bjljfcszp6csljj4fvxcl62yj";
       };
     in
     runCommand "cargo-make-src" {} ''
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
 
-  cargoSha256 = "0wf60ck0w3m9fa19dz99q84kw05sxlj2pp6bd8r1db3cfy8f8h8j";
+  cargoSha256 = "1rmdmvr5wc2m0yv3dy07cv9y1xrwlfri3hk97zjwv5f73wgncspy";
 
   # Some tests fail because they need network access.
   # However, Travis ensures a proper build.
diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix
index 5f74932a6920..413e1c2debff 100644
--- a/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix
@@ -2,20 +2,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-xbuild";
-  version = "0.5.11";
+  version = "0.5.12";
 
   src = fetchFromGitHub {
     owner = "rust-osdev";
     repo = pname;
     rev = "v${version}";
-    sha256 = "04vgb443bmrfklvzhjfidpi3pp2svbc3bwq674m9fn7sbdp6rnwm";
+    sha256 = "1vjsss2zrja4kpr83vw6g0hf9xdx658wjhdiymzndbcf32qrx7x1";
   };
 
   cargoSha256 = "1r9i79lymfwpbcx2lp509v435qpkl9bqly1ya369p41n5yprrcjv";
 
   meta = with stdenv.lib; {
     description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc";
-    homepage = https://github.com/rust-osdev/cargo-xbuild;
+    homepage = "https://github.com/rust-osdev/cargo-xbuild";
     license = with licenses; [ mit asl20 ];
     maintainers = with maintainers; [ xrelkd ];
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/development/web/grails/default.nix b/nixpkgs/pkgs/development/web/grails/default.nix
index b4d78ef08501..018c7f969697 100644
--- a/nixpkgs/pkgs/development/web/grails/default.nix
+++ b/nixpkgs/pkgs/development/web/grails/default.nix
@@ -11,11 +11,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "grails-${version}";
-  version = "3.3.9";
+  version = "3.3.10";
 
   src = fetchurl {
     url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip";
-    sha256 = "0xnwi9m9l8rz4wdwjp2i3yfzsq1szz37z886nc6lbfxd5mj19hnn";
+    sha256 = "1lykawfi47c2k6lq4vrnghlz8gcnmqsslxsnaq4d2n78g0y3yyr2";
   };
 
   buildInputs = [ unzip ];
author	Alyssa Ross <hi@alyssa.is>	2019-06-18 18:30:18 +0000
committer	Alyssa Ross <hi@alyssa.is>	2019-06-18 18:30:18 +0000
commit	ef93931efff0323fd13c4270415b578c73b5ef35 (patch)
tree	e5b089306c481ce3237027bfb46c940fed1e2114 /nixpkgs/pkgs/development
parent	c5571a126859eb658ffd7340cb580f7d91f12bb6 (diff)
parent	a1dd419c1ffacea87eba066a2bb332e03cb68f66 (diff)
download	nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.gz nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.bz2 nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.lz nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.xz nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.tar.zst nixlib-ef93931efff0323fd13c4270415b578c73b5ef35.zip