Merge master into staging-next

58 files changed, 1400 insertions, 1876 deletions

diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix
index ec93ba79d44..f7429933453 100644
--- a/pkgs/development/compilers/sdcc/default.nix
+++ b/pkgs/development/compilers/sdcc/default.nix
@@ -1,22 +1,27 @@
-{ stdenv, fetchurl, bison, flex, boost, texinfo, gputils ? null }:
+{ stdenv, fetchurl, autoconf, bison, boost, flex, texinfo, gputils ? null
+, excludePorts ? [] }:
+
+with stdenv.lib;
+
+let
+  # choices: mcs51 z80 z180 r2k r3ka gbz80 tlcs90 ds390 ds400 pic14 pic16 hc08 s08 stm8
+  excludedPorts = excludePorts ++ (optionals (gputils == null) [ "pic14" "pic16" ]);
+in
 
 stdenv.mkDerivation rec {
-  version = "3.7.0";
   name = "sdcc-${version}";
+  version = "3.7.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2";
     sha256 = "13llvx0j3v5qa7qd4fh7nix4j3alpd3ccprxvx163c4q8q4lfkc5";
   };
 
-  # TODO: remove this comment when gputils != null is tested
-  buildInputs = [ bison flex boost texinfo gputils ];
+  buildInputs = [ autoconf bison boost flex gputils texinfo ];
 
-  configureFlags = ''
-    ${if gputils == null then "--disable-pic14-port --disable-pic16-port" else ""}
-  '';
+  configureFlags = map (f: "--disable-${f}-port") excludedPorts;
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "Small Device C Compiler";
     longDescription = ''
       SDCC is a retargettable, optimizing ANSI - C compiler suite that targets
@@ -27,8 +32,8 @@ stdenv.mkDerivation rec {
       PIC18 targets. It can be retargeted for other microprocessors.
     '';
     homepage = http://sdcc.sourceforge.net/;
-    license = licenses.gpl2;
+    license = with licenses; if (gputils == null) then gpl2 else unfreeRedistributable;
+    maintainers = with maintainers; [ bjornfor yorickvp ];
     platforms = platforms.linux;
-    maintainers = [ maintainers.bjornfor ];
   };
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index b2e9d43ef08..42712df3295 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -44,4 +44,17 @@ self: super: {
   # Use to be a core-library, but no longer is since GHC 8.4.x.
   hoopl = self.hoopl_3_10_2_2;
 
+  # lts-12.x versions do not compile.
+  primitive = self.primitive_0_6_4_0;
+  tagged = self.tagged_0_8_6;
+
+  # Over-specified constraints.
+  async = doJailbreak super.async;                           # base >=4.3 && <4.12, stm >=2.2 && <2.5
+  ChasingBottoms = doJailbreak super.ChasingBottoms;         # base >=4.2 && <4.12, containers >=0.3 && <0.6
+  hashable = doJailbreak super.hashable;                     # base >=4.4 && <4.1
+  hashable-time = doJailbreak super.hashable-time;           # base >=4.7 && <4.12
+  integer-logarithms = doJailbreak super.integer-logarithms; # base >=4.3 && <4.12
+  tar = doJailbreak super.tar;                               # containers >=0.2 && <0.6
+  test-framework = doJailbreak super.test-framework;         # containers >=0.1 && <0.6
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 1daaf3409b5..f50b02a7a95 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -43,7 +43,7 @@ core-packages:
 default-package-overrides:
   # Newer versions require contravariant-1.5.*, which many builds refuse at the moment.
   - base-compat-batteries ==0.10.1
-  # LTS Haskell 12.0
+  # LTS Haskell 12.1
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -217,7 +217,7 @@ default-package-overrides:
   - authenticate ==1.3.4
   - authenticate-oauth ==1.6
   - auto ==0.4.3.1
-  - autoexporter ==1.1.9
+  - autoexporter ==1.1.10
   - auto-update ==0.1.4
   - avro ==0.3.2.0
   - avwx ==0.3.0.2
@@ -232,7 +232,7 @@ default-package-overrides:
   - base64-string ==0.2
   - base-compat ==0.10.4
   - base-compat-batteries ==0.10.1
-  - basement ==0.0.7
+  - basement ==0.0.8
   - base-orphans ==0.7
   - base-prelude ==1.3
   - base-unicode-symbols ==0.2.2.4
@@ -302,7 +302,7 @@ default-package-overrides:
   - boundingboxes ==0.2.3
   - bower-json ==1.0.0.1
   - boxes ==0.1.5
-  - brick ==0.37.1
+  - brick ==0.37.2
   - brittany ==0.11.0.0
   - broadcast-chan ==0.1.1
   - bsb-http-chunked ==0.0.0.2
@@ -424,7 +424,7 @@ default-package-overrides:
   - composable-associations-aeson ==0.1.0.0
   - composition ==1.0.2.1
   - composition-extra ==2.0.0
-  - composition-prelude ==1.5.0.6
+  - composition-prelude ==1.5.0.8
   - compressed ==3.11
   - concise ==0.1.0.1
   - concurrency ==1.6.0.0
@@ -495,7 +495,7 @@ default-package-overrides:
   - crypto-random ==0.0.9
   - crypto-random-api ==0.2.0
   - crypt-sha512 ==0
-  - csg ==0.1.0.3
+  - csg ==0.1.0.4
   - csp ==1.4.0
   - css-syntax ==0.0.7
   - css-text ==0.1.3.0
@@ -557,13 +557,13 @@ default-package-overrides:
   - Decimal ==0.5.1
   - declarative ==0.5.2
   - deepseq-generics ==0.2.0.0
-  - dejafu ==1.11.0.1
+  - dejafu ==1.11.0.3
   - dependent-map ==0.2.4.0
   - dependent-sum ==0.4
   - dependent-sum-template ==0.0.0.6
   - deque ==0.2.1
-  - deriving-compat ==0.5
-  - derulo ==1.0.2
+  - deriving-compat ==0.5.1
+  - derulo ==1.0.3
   - detour-via-sci ==1.0.0
   - df1 ==0.1.1
   - dhall ==1.15.1
@@ -653,7 +653,7 @@ default-package-overrides:
   - elm-core-sources ==1.0.0
   - elm-export ==0.6.0.1
   - email-validate ==2.3.2.6
-  - enclosed-exceptions ==1.0.2
+  - enclosed-exceptions ==1.0.3
   - entropy ==0.4.1.1
   - enummapset ==0.5.2.2
   - enumset ==0.0.4.1
@@ -677,7 +677,7 @@ default-package-overrides:
   - eventful-sqlite ==0.2.0
   - eventful-test-helpers ==0.2.0
   - event-list ==0.1.2
-  - eventstore ==1.1.4
+  - eventstore ==1.1.5
   - every ==0.0.1
   - exact-combinatorics ==0.2.0.8
   - exact-pi ==0.4.1.3
@@ -695,7 +695,7 @@ default-package-overrides:
   - exp-pairs ==0.1.6.0
   - extensible ==0.4.9
   - extensible-exceptions ==0.1.1.4
-  - extra ==1.6.8
+  - extra ==1.6.9
   - extractable-singleton ==0.0.1
   - extrapolate ==0.3.1
   - facts ==0.0.1.0
@@ -729,7 +729,7 @@ default-package-overrides:
   - FindBin ==0.0.5
   - find-clumpiness ==0.2.3.1
   - fingertree ==0.1.4.1
-  - finite-typelits ==0.1.3.0
+  - finite-typelits ==0.1.4.2
   - first-class-patterns ==0.3.2.4
   - fixed ==0.2.1.1
   - fixed-length ==0.2
@@ -741,7 +741,7 @@ default-package-overrides:
   - flay ==0.4
   - flexible-defaults ==0.0.2
   - floatshow ==0.2.4
-  - flow ==1.0.13
+  - flow ==1.0.14
   - fmlist ==0.9.2
   - fn ==0.3.0.2
   - focus ==0.1.5.2
@@ -757,7 +757,7 @@ default-package-overrides:
   - forma ==1.1.0
   - format-numbers ==0.1.0.0
   - formatting ==6.3.6
-  - foundation ==0.0.20
+  - foundation ==0.0.21
   - free ==5.0.2
   - freenect ==1.2.1
   - freer-simple ==1.1.0.0
@@ -819,12 +819,12 @@ default-package-overrides:
   - ghcjs-codemirror ==0.0.0.2
   - ghc-parser ==0.2.0.2
   - ghc-paths ==0.1.0.9
-  - ghc-prof ==1.4.1.2
+  - ghc-prof ==1.4.1.3
   - ghc-syntax-highlighter ==0.0.2.0
   - ghc-tcplugins-extra ==0.3
-  - ghc-typelits-extra ==0.2.5
-  - ghc-typelits-knownnat ==0.5
-  - ghc-typelits-natnormalise ==0.6.1
+  - ghc-typelits-extra ==0.2.6
+  - ghc-typelits-knownnat ==0.5.1
+  - ghc-typelits-natnormalise ==0.6.2
   - ghost-buster ==0.1.1.0
   - gi-atk ==2.0.15
   - gi-cairo ==1.0.17
@@ -841,7 +841,7 @@ default-package-overrides:
   - gi-pango ==1.0.16
   - giphy-api ==0.6.0.1
   - github ==0.19
-  - github-release ==1.2.1
+  - github-release ==1.2.2
   - github-types ==0.2.1
   - github-webhooks ==0.10.0
   - gitrev ==1.3.1
@@ -888,7 +888,7 @@ default-package-overrides:
   - hamtsolo ==1.0.3
   - HandsomeSoup ==0.4.2
   - handwriting ==0.1.0.3
-  - hapistrano ==0.3.5.7
+  - hapistrano ==0.3.5.8
   - happstack-server ==7.5.1.1
   - happy ==1.19.9
   - hasbolt ==0.1.3.0
@@ -911,14 +911,14 @@ default-package-overrides:
   - haskell-src-exts-simple ==1.20.0.0
   - haskell-src-exts-util ==0.2.3
   - haskell-src-meta ==0.8.0.3
-  - haskell-tools-ast ==1.1.0.1
-  - haskell-tools-backend-ghc ==1.1.0.1
-  - haskell-tools-builtin-refactorings ==1.1.0.1
-  - haskell-tools-debug ==1.1.0.1
-  - haskell-tools-demo ==1.1.0.1
-  - haskell-tools-prettyprint ==1.1.0.1
-  - haskell-tools-refactor ==1.1.0.1
-  - haskell-tools-rewrite ==1.1.0.1
+  - haskell-tools-ast ==1.1.0.2
+  - haskell-tools-backend-ghc ==1.1.0.2
+  - haskell-tools-builtin-refactorings ==1.1.0.2
+  - haskell-tools-debug ==1.1.0.2
+  - haskell-tools-demo ==1.1.0.2
+  - haskell-tools-prettyprint ==1.1.0.2
+  - haskell-tools-refactor ==1.1.0.2
+  - haskell-tools-rewrite ==1.1.0.2
   - haskey ==0.3.0.2
   - haskey-btree ==0.3.0.0
   - haskey-mtl ==0.3.1.0
@@ -973,7 +973,7 @@ default-package-overrides:
   - hmpfr ==0.4.4
   - Hoed ==0.5.1
   - hoopl ==3.10.2.2
-  - hOpenPGP ==2.7
+  - hOpenPGP ==2.7.1
   - hopenpgp-tools ==0.21.1
   - hopfli ==0.2.2.1
   - hostname ==1.0
@@ -995,8 +995,8 @@ default-package-overrides:
   - hsdns ==1.7.1
   - hsebaysdk ==0.4.0.0
   - hsemail ==2
-  - HSet ==0.0.1
   - hset ==2.2.0
+  - HSet ==0.0.1
   - hsexif ==0.6.1.5
   - hs-functors ==0.1.2.0
   - hs-GeoIP ==0.3
@@ -1044,7 +1044,7 @@ default-package-overrides:
   - http2 ==1.6.3
   - http-api-data ==0.3.8.1
   - http-client ==0.5.13.1
-  - http-client-openssl ==0.2.1.1
+  - http-client-openssl ==0.2.2.0
   - http-client-tls ==0.3.5.3
   - http-common ==0.8.2.0
   - http-conduit ==2.3.2
@@ -1065,7 +1065,7 @@ default-package-overrides:
   - hw-conduit ==0.2.0.3
   - hw-diagnostics ==0.0.0.5
   - hweblib ==0.6.3
-  - hw-excess ==0.2.0.0
+  - hw-excess ==0.2.0.2
   - hw-fingertree-strict ==0.1.1.1
   - hw-hedgehog ==0.1.0.1
   - hw-hspec-hedgehog ==0.1.0.5
@@ -1127,7 +1127,7 @@ default-package-overrides:
   - IntervalMap ==0.6.0.0
   - intervals ==0.8.1
   - intro ==0.3.1.0
-  - invariant ==0.5
+  - invariant ==0.5.1
   - invertible ==0.2.0.5
   - invertible-grammar ==0.1.1
   - io-choice ==0.0.6
@@ -1164,7 +1164,7 @@ default-package-overrides:
   - js-flot ==0.8.3
   - js-jquery ==3.3.1
   - json ==0.9.2
-  - json-feed ==1.0.2
+  - json-feed ==1.0.3
   - json-rpc-client ==0.2.5.0
   - json-rpc-generic ==0.2.1.4
   - json-rpc-server ==0.2.6.0
@@ -1188,17 +1188,17 @@ default-package-overrides:
   - kraken ==0.1.0
   - l10n ==0.1.0.1
   - labels ==0.3.3
-  - lackey ==1.0.4
+  - lackey ==1.0.5
   - LambdaHack ==0.8.3.0
   - lame ==0.1.1
   - language-c ==0.8.1
   - language-c-quote ==0.12.2
-  - language-docker ==6.0.3
+  - language-docker ==6.0.4
   - language-ecmascript ==0.19
   - language-haskell-extract ==0.2.4
   - language-java ==0.2.9
   - language-javascript ==0.6.0.11
-  - language-puppet ==1.3.19
+  - language-puppet ==1.3.19.1
   - lapack-carray ==0.0.2
   - lapack-ffi ==0.0.2
   - lapack-ffi-tools ==0.1.0.1
@@ -1300,7 +1300,7 @@ default-package-overrides:
   - median-stream ==0.7.0.0
   - med-module ==0.1.1
   - megaparsec ==6.5.0
-  - mega-sdist ==0.3.3
+  - mega-sdist ==0.3.3.1
   - memory ==0.14.16
   - MemoTrie ==0.6.9
   - mercury-api ==0.1.0.1
@@ -1309,7 +1309,7 @@ default-package-overrides:
   - messagepack-rpc ==0.5.1
   - metrics ==0.4.1.1
   - mfsolve ==0.3.2.0
-  - microformats2-parser ==1.0.1.8
+  - microformats2-parser ==1.0.1.9
   - microlens ==0.4.9.1
   - microlens-aeson ==2.3.0
   - microlens-contra ==0.1.0.1
@@ -1505,7 +1505,7 @@ default-package-overrides:
   - pandoc-types ==1.17.5.1
   - pango ==0.13.5.0
   - papillon ==0.1.0.6
-  - parallel ==3.2.1.1
+  - parallel ==3.2.2.0
   - parallel-io ==0.3.3
   - parseargs ==0.2.0.8
   - parsec ==3.1.13.0
@@ -1610,7 +1610,7 @@ default-package-overrides:
   - prettyprinter-compat-wl-pprint ==1.0.0.1
   - prettyprinter-convert-ansi-wl-pprint ==1.1
   - pretty-show ==1.7
-  - pretty-simple ==2.1.0.0
+  - pretty-simple ==2.1.0.1
   - pretty-types ==0.2.3.1
   - primes ==0.2.1.0
   - primitive ==0.6.3.0
@@ -1676,10 +1676,10 @@ default-package-overrides:
   - rank2classes ==1.1.0.1
   - Rasterific ==0.7.3
   - rasterific-svg ==0.3.3.1
-  - ratel ==1.0.4
-  - ratel-wai ==1.0.2
+  - ratel ==1.0.5
+  - ratel-wai ==1.0.3
   - ratio-int ==0.1.2
-  - rattletrap ==4.1.1
+  - rattletrap ==4.1.2
   - rawfilepath ==0.2.4
   - rawstring-qm ==0.2.3.0
   - raw-strings-qq ==1.1
@@ -1713,7 +1713,7 @@ default-package-overrides:
   - regex-tdfa-text ==1.0.0.3
   - reinterpret-cast ==0.1.0
   - relational-query ==0.12.0.1
-  - relational-query-HDBC ==0.7.0.0
+  - relational-query-HDBC ==0.7.0.1
   - relational-record ==0.2.2.0
   - relational-schemas ==0.1.6.2
   - renderable ==0.2.0.1
@@ -1754,7 +1754,7 @@ default-package-overrides:
   - safe-money ==0.6
   - SafeSemaphore ==0.10.1
   - saltine ==0.1.0.1
-  - salve ==1.0.3
+  - salve ==1.0.4
   - sample-frame ==0.0.3
   - sample-frame-np ==0.0.4.1
   - sampling ==0.3.3
@@ -1762,8 +1762,8 @@ default-package-overrides:
   - sandman ==0.2.0.1
   - say ==0.1.0.0
   - sbp ==2.3.16
-  - SCalendar ==1.1.0
   - scalendar ==1.2.0
+  - SCalendar ==1.1.0
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2
@@ -1824,10 +1824,10 @@ default-package-overrides:
   - servant-tracing ==0.1.0.2
   - servant-websockets ==1.1.0
   - servant-yaml ==0.1.0.0
-  - serverless-haskell ==0.6.1
+  - serverless-haskell ==0.6.2
   - serversession ==1.0.1
   - serversession-frontend-wai ==1.0
-  - servius ==1.2.0.3
+  - servius ==1.2.1.0
   - ses-html ==0.4.0.0
   - set-cover ==0.0.9
   - setenv ==0.1.1.3
@@ -1887,7 +1887,7 @@ default-package-overrides:
   - speculation ==1.5.0.3
   - speedy-slice ==0.3.0
   - sphinx ==0.6.0.2
-  - Spintax ==0.3.2
+  - Spintax ==0.3.3
   - splice ==0.6.1.1
   - split ==0.2.3.3
   - splitmix ==0.0.1
@@ -1927,7 +1927,7 @@ default-package-overrides:
   - store ==0.5.0
   - store-core ==0.4.4
   - Strafunski-StrategyLib ==5.0.1.0
-  - stratosphere ==0.24.1
+  - stratosphere ==0.24.3
   - streaming ==0.2.1.0
   - streaming-attoparsec ==1.0.0
   - streaming-bytestring ==0.1.6
@@ -1947,7 +1947,7 @@ default-package-overrides:
   - string-qq ==0.0.2
   - stringsearch ==0.3.6.6
   - string-transform ==1.1.0
-  - strive ==5.0.5
+  - strive ==5.0.6
   - structs ==0.1.1
   - stylish-haskell ==0.9.2.0
   - summoner ==1.0.4
@@ -2184,7 +2184,7 @@ default-package-overrides:
   - vector-bytes-instances ==0.1.1
   - vector-instances ==3.4
   - vector-mmap ==0.0.3
-  - vector-sized ==1.0.3.0
+  - vector-sized ==1.0.4.0
   - vector-space ==0.13
   - vector-split ==1.0.0.2
   - vector-th-unbox ==0.2.1.6
@@ -2192,7 +2192,7 @@ default-package-overrides:
   - verbosity ==0.2.3.0
   - versions ==3.4.0.1
   - ViennaRNAParser ==1.3.3
-  - viewprof ==0.0.0.18
+  - viewprof ==0.0.0.19
   - vinyl ==0.8.1.1
   - vivid ==0.3.0.2
   - vivid-osc ==0.3.0.0
@@ -2205,7 +2205,7 @@ default-package-overrides:
   - wai-conduit ==3.0.0.4
   - wai-cors ==0.2.6
   - wai-eventsource ==3.0.0
-  - wai-extra ==3.0.22.1
+  - wai-extra ==3.0.23.0
   - wai-handler-launch ==3.0.2.4
   - wai-logger ==2.3.2
   - wai-middleware-caching ==0.1.0.2
@@ -2221,7 +2221,7 @@ default-package-overrides:
   - wai-slack-middleware ==0.2.0
   - wai-transformers ==0.1.0
   - wai-websockets ==3.0.1.2
-  - warp ==3.2.22
+  - warp ==3.2.23
   - warp-tls ==3.2.4.3
   - warp-tls-uid ==0.2.0.5
   - wave ==0.1.5
@@ -2269,7 +2269,7 @@ default-package-overrides:
   - writer-cps-mtl ==0.1.1.4
   - writer-cps-transformers ==0.1.1.3
   - ws ==0.0.4
-  - wuss ==1.1.9
+  - wuss ==1.1.10
   - X11 ==1.9
   - X11-xft ==0.3.1
   - x11-xim ==0.0.9.0
@@ -2303,22 +2303,22 @@ default-package-overrides:
   - xml-types ==0.3.6
   - xss-sanitize ==0.3.6
   - xxhash-ffi ==0.2.0.0
-  - yaml ==0.8.31.1
+  - yaml ==0.8.32
   - yeshql ==4.1.0.0
   - yeshql-core ==4.1.0.0
   - yeshql-hdbc ==4.1.0.0
   - yesod ==1.6.0
   - yesod-alerts ==0.1.2.0
-  - yesod-auth ==1.6.3
+  - yesod-auth ==1.6.4.1
   - yesod-auth-fb ==1.9.0
   - yesod-auth-hashdb ==1.7
   - yesod-bin ==1.6.0.3
-  - yesod-core ==1.6.5
+  - yesod-core ==1.6.6
   - yesod-csp ==0.2.4.0
   - yesod-eventsource ==1.6.0
   - yesod-fb ==0.5.0
-  - yesod-form ==1.6.1
-  - yesod-form-bootstrap4 ==1.0.0
+  - yesod-form ==1.6.2
+  - yesod-form-bootstrap4 ==1.0.2
   - yesod-gitrepo ==0.3.0
   - yesod-gitrev ==0.2.0.0
   - yesod-newsfeed ==1.6.1.0
@@ -2327,7 +2327,7 @@ default-package-overrides:
   - yesod-recaptcha2 ==0.2.4
   - yesod-sitemap ==1.6.0
   - yesod-static ==1.6.0
-  - yesod-test ==1.6.4
+  - yesod-test ==1.6.5
   - yesod-text-markdown ==0.1.10
   - yesod-websockets ==0.3.0
   - yes-precure5-command ==5.5.3
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 86494e9323b..4e62d470506 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -442,7 +442,7 @@ self: super: builtins.intersectAttrs super {
     then addBuildDepend (dontCheck super.fsnotify) pkgs.darwin.apple_sdk.frameworks.Cocoa
     else dontCheck super.fsnotify;
 
-  hidapi = addExtraLibrary super.hidapi pkgs.libudev;
+  hidapi = addExtraLibrary super.hidapi pkgs.udev;
 
   hs-GeoIP = super.hs-GeoIP.override { GeoIP = pkgs.geoipWithDatabase; };
 
@@ -494,7 +494,7 @@ self: super: builtins.intersectAttrs super {
   # Break cyclic reference that results in an infinite recursion.
   partial-semigroup = dontCheck super.partial-semigroup;
   colour = dontCheck super.colour;
-  manifolds = super.manifolds.override { spatial-rotations = dontCheck self.spatial-rotations; };
+  spatial-rotations = dontCheck super.spatial-rotations;
 
   LDAP = dontCheck (overrideCabal super.LDAP (drv: {
     librarySystemDepends = drv.librarySystemDepends or [] ++ [ pkgs.cyrus_sasl.dev ];
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index c68d84bdb8a..80274f515c5 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -394,6 +394,9 @@ stdenv.mkDerivation ({
         local pkgId=$( ${gnused}/bin/sed -n -e 's|^id: ||p' $packageConfFile )
         mv $packageConfFile $packageConfDir/$pkgId.conf
       done
+
+      # delete confdir if there are no libraries
+      find $packageConfDir -maxdepth 0 -empty -delete;
     ''}
     ${optionalString isGhcjs ''
       for exeDir in "$out/bin/"*.jsexe; do
diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix
index 9ea9dae02db..591de1236d4 100644
--- a/pkgs/development/haskell-modules/generic-stack-builder.nix
+++ b/pkgs/development/haskell-modules/generic-stack-builder.nix
@@ -27,7 +27,7 @@ in stdenv.mkDerivation (args // {
 
   buildInputs =
     buildInputs ++
-    optional stdenv.isLinux glibcLocales ++
+    optional (stdenv.hostPlatform.libc == "glibc") glibcLocales ++
     [ ghc pkgconfig stack ];
 
   STACK_PLATFORM_VARIANT="nix";
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index c8ae0ef4236..5816f295e0d 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -10135,8 +10135,8 @@ self: {
      }:
      mkDerivation {
        pname = "IPv6DB";
-       version = "0.2.6";
-       sha256 = "1dshvq3amnwfvf50g4gs93rc307sk1hi3snjhflzjz0dfn8xa2d4";
+       version = "0.3.0";
+       sha256 = "0dz0ar75nd04l1cbca7iz9laqv24mach7ajr4k5ibl2717kczkpa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -10151,7 +10151,7 @@ self: {
        testHaskellDepends = [
          aeson base hspec http-client http-types vector
        ];
-       description = "A RESTful Web Service for IPv6-related data";
+       description = "A RESTful microService for IPv6-related data";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -13312,14 +13312,19 @@ self: {
      }) {};
 
   "OTP" = callPackage
-    ({ mkDerivation, base, Crypto, time }:
+    ({ mkDerivation, base, bytestring, cryptohash-sha1
+     , cryptohash-sha256, cryptohash-sha512, tasty, tasty-hunit, time
+     }:
      mkDerivation {
        pname = "OTP";
-       version = "0.0.0.1";
-       sha256 = "0vcxyfk1vx30cfngq5cv3lc34x0sxsirykhbi4ygw5pvd9ylzadb";
-       libraryHaskellDepends = [ base Crypto time ];
-       testHaskellDepends = [ base Crypto time ];
-       description = "HMAC-Based and Time-Based One-Time Passwords";
+       version = "0.1.0.0";
+       sha256 = "1r7vpc0bv89d70j6pc3z3vam93gahl4j0y5w8smknxwjliwqxkcb";
+       libraryHaskellDepends = [
+         base bytestring cryptohash-sha1 cryptohash-sha256 cryptohash-sha512
+         time
+       ];
+       testHaskellDepends = [ base bytestring tasty tasty-hunit time ];
+       description = "HMAC-Based and Time-Based One-Time Passwords (HOTP & TOTP)";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -16785,19 +16790,6 @@ self: {
     ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }:
      mkDerivation {
        pname = "Spintax";
-       version = "0.3.2";
-       sha256 = "0j7hkdskc66h02yxrw6aah1drqrwxdhq9c33w5mg0rg0gj0j1rpp";
-       libraryHaskellDepends = [
-         attoparsec base extra mtl mwc-random text
-       ];
-       description = "Random text generation based on spintax";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Spintax_0_3_3" = callPackage
-    ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }:
-     mkDerivation {
-       pname = "Spintax";
        version = "0.3.3";
        sha256 = "04vb07r26p4rxgsym5zhqsnyx4sr2a112sa31mdda5hjpy9j3pr1";
        libraryHaskellDepends = [
@@ -16805,7 +16797,6 @@ self: {
        ];
        description = "Random text generation based on spintax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Spock" = callPackage
@@ -30320,20 +30311,6 @@ self: {
     ({ mkDerivation, base, Cabal, directory, filepath }:
      mkDerivation {
        pname = "autoexporter";
-       version = "1.1.9";
-       sha256 = "0hm0njnfgjfbnpjjqmhim773zbzgkfq96caxckcv8vkrj78l839v";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base Cabal directory filepath ];
-       executableHaskellDepends = [ base Cabal directory filepath ];
-       description = "Automatically re-export modules";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "autoexporter_1_1_10" = callPackage
-    ({ mkDerivation, base, Cabal, directory, filepath }:
-     mkDerivation {
-       pname = "autoexporter";
        version = "1.1.10";
        sha256 = "0rf28h7nzm5ngcrj1900d0vgwbfr1y3s4q7wwbvdw2mg29rw4f0r";
        isLibrary = true;
@@ -30342,7 +30319,6 @@ self: {
        executableHaskellDepends = [ base Cabal directory filepath ];
        description = "Automatically re-export modules";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "autom" = callPackage
@@ -32449,23 +32425,11 @@ self: {
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
        pname = "basement";
-       version = "0.0.7";
-       sha256 = "0w2g4k9bs2ph00p0fgrmcrng8ypdz6xis0r10g380nzkg2rvj0dm";
-       libraryHaskellDepends = [ base ghc-prim ];
-       description = "Foundation scrap box of array & string";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "basement_0_0_8" = callPackage
-    ({ mkDerivation, base, ghc-prim }:
-     mkDerivation {
-       pname = "basement";
        version = "0.0.8";
        sha256 = "194jw567di4q2758943q9rrwkbf9gl261my7qc21i9xhyabipx67";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Foundation scrap box of array & string";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "basen-bytestring" = callPackage
@@ -33272,8 +33236,8 @@ self: {
      }:
      mkDerivation {
        pname = "bench-graph";
-       version = "0.1.2";
-       sha256 = "055g038zp8px22dwb5h113fxms5m9g46b5x81h249nyybp258fyk";
+       version = "0.1.3";
+       sha256 = "15xsaqxms61p8d5r0lsxhlrdfh451ha6fpldcmh8vcw0q4yb1q47";
        libraryHaskellDepends = [
          base Chart Chart-diagrams csv directory filepath transformers
        ];
@@ -38166,8 +38130,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.37.1";
-       sha256 = "04rpiafw7a30drbk8gmp01m6l3iawayy1ma1hn8m257rh2zk66qy";
+       version = "0.37.2";
+       sha256 = "176rq7xpwww1c3h7hm6n6z7sxbd3wc2zhxvnk65llk9lipc6rf3w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -40975,8 +40939,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal2nix";
-       version = "2.10.0";
-       sha256 = "1ry2zk81x7jd14ayi49vh8nan10sbphkbj6s5y15a6w0vs4wznn1";
+       version = "2.10.1";
+       sha256 = "1xwfr53flc2cv7gk583ycmiw7v9x93v1gvhiy6ilqw8a8915vncb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -41019,6 +40983,27 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "cabal2spec_2_2_0" = callPackage
+    ({ mkDerivation, base, Cabal, filepath, optparse-applicative, tasty
+     , tasty-golden, time
+     }:
+     mkDerivation {
+       pname = "cabal2spec";
+       version = "2.2.0";
+       sha256 = "0pcai2ikp6gna1h60dihclq7apj9jczwz4n0lnfc9fr176gzsprp";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base Cabal filepath time ];
+       executableHaskellDepends = [
+         base Cabal filepath optparse-applicative
+       ];
+       testHaskellDepends = [ base Cabal filepath tasty tasty-golden ];
+       description = "Convert Cabal files into rpm spec files";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
+     }) {};
+
   "cabalQuery" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, MissingH
      , pretty
@@ -49007,23 +48992,11 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "composition-prelude";
-       version = "1.5.0.6";
-       sha256 = "13rjy6i48nsy3nqk79b4cqgiapjg11knzkzajmxy6ps6iq308vjn";
-       libraryHaskellDepends = [ base ];
-       description = "Higher-order function combinators";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "composition-prelude_1_5_0_8" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "composition-prelude";
        version = "1.5.0.8";
        sha256 = "1pgpjmb5pnnil98h6xrr9vmxxn8hgh20k9gjzm3jqzmx0l6dyspc";
        libraryHaskellDepends = [ base ];
        description = "Higher-order function combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "composition-tree" = callPackage
@@ -54188,8 +54161,8 @@ self: {
      }:
      mkDerivation {
        pname = "csg";
-       version = "0.1.0.3";
-       sha256 = "17ysbi3585ag7a098lv7wjr4xsjm8mm3zz5hfvz2ahis2g151ipx";
+       version = "0.1.0.4";
+       sha256 = "1dril9ayqng04s6jnh28r8by604kkygbjiblp2c4px0bqvz3g5cx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -56629,8 +56602,8 @@ self: {
        pname = "data-interval";
        version = "1.3.0";
        sha256 = "1i00cci7lzvkxqd1l8dacn7i0mrnccbs23mdciz6nrhlvlgsfiy9";
-       revision = "1";
-       editedCabalFile = "09n6gklg64lgn4x1f48ga9ynssyl4fm8x376blls1mx1xg6kgbz6";
+       revision = "2";
+       editedCabalFile = "16frb3rlkca5z30lwhw8vpwi4g1y42scvg8v41lvih90jq82pg2s";
        libraryHaskellDepends = [
          base containers deepseq extended-reals hashable lattices
        ];
@@ -57167,10 +57140,8 @@ self: {
     ({ mkDerivation, base, hashable, unordered-containers }:
      mkDerivation {
        pname = "data-standards";
-       version = "0.1.0.0";
-       sha256 = "014fk5lsj35iax9amgcn0r9kifyr2ar3afi4zs651l1xl7csmywz";
-       revision = "1";
-       editedCabalFile = "0g4hlyzkski4zha53w6asanjnk9s2jp5dgql353szm4flldfsx07";
+       version = "0.1.0.1";
+       sha256 = "0nx8hgv653nh138f9s2x36hwv92sbj5wzl4isaylxn12qqlwx94d";
        libraryHaskellDepends = [ base hashable unordered-containers ];
        description = "A collection of standards representable by simple data types";
        license = stdenv.lib.licenses.mpl20;
@@ -59101,22 +59072,6 @@ self: {
      }:
      mkDerivation {
        pname = "dejafu";
-       version = "1.11.0.1";
-       sha256 = "04a4nnipb7qlw0kz4gy7flzndas3zppjxjbp8vvpcc7n5mqcj89x";
-       libraryHaskellDepends = [
-         base concurrency containers contravariant deepseq exceptions
-         leancheck profunctors random transformers
-       ];
-       description = "A library for unit-testing concurrent programs";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "dejafu_1_11_0_3" = callPackage
-    ({ mkDerivation, base, concurrency, containers, contravariant
-     , deepseq, exceptions, leancheck, profunctors, random, transformers
-     }:
-     mkDerivation {
-       pname = "dejafu";
        version = "1.11.0.3";
        sha256 = "192a0wv2kdk1js56lm6ikp9mx08fkb0wkxl1yba03p7dfnlj6bnx";
        libraryHaskellDepends = [
@@ -59125,7 +59080,6 @@ self: {
        ];
        description = "A library for unit-testing concurrent programs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "deka" = callPackage
@@ -59655,30 +59609,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "deriving-compat" = callPackage
-    ({ mkDerivation, base, base-compat, base-orphans, containers
-     , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged
-     , template-haskell, th-abstraction, transformers
-     , transformers-compat
+  "deriveJsonNoPrefix" = callPackage
+    ({ mkDerivation, aeson, base, hspec, template-haskell, text
+     , unordered-containers
      }:
      mkDerivation {
-       pname = "deriving-compat";
-       version = "0.5";
-       sha256 = "1777569bgb7p1xn9ch90jbg2mk4gph04mzmw3r8c6kq84db1484m";
-       libraryHaskellDepends = [
-         base containers ghc-boot-th ghc-prim template-haskell
-         th-abstraction transformers transformers-compat
-       ];
+       pname = "deriveJsonNoPrefix";
+       version = "0.1.0.1";
+       sha256 = "1zwk181c8fv0cv6w3daz3gyb0rwp2cm56piv19iz2vfv3jk9rqqs";
+       libraryHaskellDepends = [ aeson base template-haskell ];
        testHaskellDepends = [
-         base base-compat base-orphans hspec QuickCheck tagged
-         template-haskell transformers transformers-compat
+         aeson base hspec template-haskell text unordered-containers
        ];
-       testToolDepends = [ hspec-discover ];
-       description = "Backports of GHC deriving extensions";
-       license = stdenv.lib.licenses.bsd3;
+       description = "Derive ToJSON/FromJSON instances in a more prefix-friendly manner";
+       license = stdenv.lib.licenses.asl20;
      }) {};
 
-  "deriving-compat_0_5_1" = callPackage
+  "deriving-compat" = callPackage
     ({ mkDerivation, base, base-compat, base-orphans, containers
      , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged
      , template-haskell, th-abstraction, transformers
@@ -59699,7 +59646,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Backports of GHC deriving extensions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "derp" = callPackage
@@ -59729,21 +59675,6 @@ self: {
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "derulo";
-       version = "1.0.2";
-       sha256 = "0kyh5fcbv6337baz2prghak5w4x29ms0ccybbp1qkq0cvmvfwrvq";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [ base doctest ];
-       description = "Parse and render JSON simply";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "derulo_1_0_3" = callPackage
-    ({ mkDerivation, base, doctest }:
-     mkDerivation {
-       pname = "derulo";
        version = "1.0.3";
        sha256 = "1z2yv4476a42xndws1zqw0kmiy4wqw1ydqgp7hf7rk3s067wz33m";
        isLibrary = true;
@@ -59753,7 +59684,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Parse and render JSON simply";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "descrilo" = callPackage
@@ -62893,6 +62823,26 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "distribution-opensuse" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, containers
+     , deepseq, Diff, extra, foldl, hashable, hsemail, mtl, parsec-class
+     , pretty, text, time, turtle
+     }:
+     mkDerivation {
+       pname = "distribution-opensuse";
+       version = "1.0.0";
+       sha256 = "0zy0whx8badksaqqkswslrgrz57mpx3pfjjhrqrvn7088anwb7rr";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base binary bytestring containers deepseq Diff extra foldl
+         hashable hsemail mtl parsec-class pretty text time turtle
+       ];
+       executableHaskellDepends = [ base containers text turtle ];
+       description = "Types, functions, and tools to manipulate the openSUSE distribution";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "distribution-plot" = callPackage
     ({ mkDerivation, base, Chart, Chart-cairo, colour, containers
      , data-default-class, distribution, lens
@@ -65902,6 +65852,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "edges" = callPackage
+    ({ mkDerivation, base, cereal, contravariant, deferred-folds, foldl
+     , monad-par, pointed, potoki, potoki-cereal, primitive
+     , primitive-extras, profunctors, QuickCheck, quickcheck-instances
+     , rerebase, semigroupoids, tasty, tasty-hunit, tasty-quickcheck
+     , text, vector
+     }:
+     mkDerivation {
+       pname = "edges";
+       version = "0.4.0.1";
+       sha256 = "1a599zi2im1ics8gnb0v0iv2rpzwzl8i2qfglgi1cxzdhcymn5sa";
+       libraryHaskellDepends = [
+         base cereal contravariant deferred-folds foldl monad-par pointed
+         potoki potoki-cereal primitive primitive-extras profunctors
+         QuickCheck semigroupoids text vector
+       ];
+       testHaskellDepends = [
+         cereal foldl QuickCheck quickcheck-instances rerebase tasty
+         tasty-hunit tasty-quickcheck
+       ];
+       description = "Tools for efficient immutable graphs";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "edis" = callPackage
     ({ mkDerivation, base, bytestring, cereal, hedis }:
      mkDerivation {
@@ -66315,8 +66289,8 @@ self: {
      }:
      mkDerivation {
        pname = "eigen";
-       version = "2.1.7";
-       sha256 = "080dv9hxjfqaarj0vzmaxjc382a3aqp4z69k6nl4vs09g2i1cfg4";
+       version = "3.3.4.1";
+       sha256 = "0kpbnl5yrsp9923al5g9x48yf88m4vsdryq69g8fmlh0wdqkdapa";
        libraryHaskellDepends = [
          base binary bytestring primitive transformers vector
        ];
@@ -67471,28 +67445,6 @@ self: {
      }:
      mkDerivation {
        pname = "enclosed-exceptions";
-       version = "1.0.2";
-       sha256 = "1wc9h6zdnb5impvvml6vnjapajjanw7zgpnzg7c0v7115nwfm6vv";
-       revision = "1";
-       editedCabalFile = "0rjm8g2bm9a7qzklkp0rh5az4qh8nsl0hl119gjik671knygkdj0";
-       libraryHaskellDepends = [
-         base deepseq lifted-base monad-control transformers
-         transformers-base
-       ];
-       testHaskellDepends = [
-         async base deepseq hspec lifted-base monad-control QuickCheck stm
-         transformers transformers-base
-       ];
-       description = "Catching all exceptions from within an enclosed computation";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "enclosed-exceptions_1_0_3" = callPackage
-    ({ mkDerivation, async, base, deepseq, hspec, lifted-base
-     , monad-control, QuickCheck, stm, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "enclosed-exceptions";
        version = "1.0.3";
        sha256 = "1fghjj7nkiddrf03ks8brjpr5x25yi9fs7xg6adbi4mc2gqr6vdg";
        libraryHaskellDepends = [
@@ -67505,7 +67457,6 @@ self: {
        ];
        description = "Catching all exceptions from within an enclosed computation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "encode-string" = callPackage
@@ -68494,6 +68445,26 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "errors-ext_0_4_2" = callPackage
+    ({ mkDerivation, base, binary-ext, bytestring, conduit, errors
+     , exceptions, HUnit, monad-control, monad-loops, mtl, transformers
+     }:
+     mkDerivation {
+       pname = "errors-ext";
+       version = "0.4.2";
+       sha256 = "064nvpc8yy3n6nvc7cmxmgblmarg4wlvawj0k7bc3mj6h0rnavj0";
+       libraryHaskellDepends = [
+         base errors exceptions monad-control mtl transformers
+       ];
+       testHaskellDepends = [
+         base binary-ext bytestring conduit errors exceptions HUnit
+         monad-control monad-loops mtl transformers
+       ];
+       description = "`bracket`-like functions for `ExceptT` over `IO` monad";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ersaconcat" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, HTTP
      , network-uri, process, QuickCheck, tagsoup, template-haskell
@@ -69596,41 +69567,6 @@ self: {
      }:
      mkDerivation {
        pname = "eventstore";
-       version = "1.1.4";
-       sha256 = "0xhhw5dxq1h4w7dpngrhnaipzhfpzvs4y7jdvimzk86hvgv0mmfj";
-       libraryHaskellDepends = [
-         aeson array base bifunctors bytestring cereal clock connection
-         containers dns dotnet-timespan ekg-core exceptions fast-logger
-         hashable http-client interpolate lifted-async lifted-base machines
-         monad-control monad-logger mono-traversable mtl protobuf random
-         safe-exceptions semigroups stm stm-chans text time
-         transformers-base unordered-containers uuid
-       ];
-       testHaskellDepends = [
-         aeson async base bytestring cereal connection containers
-         dotnet-timespan exceptions fast-logger hashable lifted-async
-         lifted-base monad-control mono-traversable protobuf safe-exceptions
-         semigroups stm stm-chans tasty tasty-hspec tasty-hunit text time
-         transformers-base unordered-containers uuid
-       ];
-       description = "EventStore TCP Client";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "x86_64-darwin" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "eventstore_1_1_5" = callPackage
-    ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring
-     , cereal, clock, connection, containers, dns, dotnet-timespan
-     , ekg-core, exceptions, fast-logger, hashable, http-client
-     , interpolate, lifted-async, lifted-base, machines, monad-control
-     , monad-logger, mono-traversable, mtl, protobuf, random
-     , safe-exceptions, semigroups, stm, stm-chans, tasty, tasty-hspec
-     , tasty-hunit, text, time, transformers-base, unordered-containers
-     , uuid
-     }:
-     mkDerivation {
-       pname = "eventstore";
        version = "1.1.5";
        sha256 = "1c8iiq943smldh5yvjpfycfjzy8hnsb2dmvcnbzk41cpcdq2zkx8";
        libraryHaskellDepends = [
@@ -70595,6 +70531,8 @@ self: {
        pname = "extended-reals";
        version = "0.2.3.0";
        sha256 = "170nxxza6lkczh05qi2qxr8nbr3gmdjpfvl1m703gjq9xwrwg2kw";
+       revision = "1";
+       editedCabalFile = "114s55sx0wq0zq9mgxrhaz4kd87c80zf8s35ani3h4dh1bb33j9w";
        libraryHaskellDepends = [ base deepseq hashable ];
        testHaskellDepends = [
          base deepseq HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -70755,22 +70693,6 @@ self: {
      }:
      mkDerivation {
        pname = "extra";
-       version = "1.6.8";
-       sha256 = "1kngk46nkrjkpqaj845c6r823r8aawlk1ir693lr6rskhy1k7dlp";
-       libraryHaskellDepends = [
-         base clock directory filepath process time unix
-       ];
-       testHaskellDepends = [ base directory filepath QuickCheck unix ];
-       description = "Extra functions I use";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "extra_1_6_9" = callPackage
-    ({ mkDerivation, base, clock, directory, filepath, process
-     , QuickCheck, time, unix
-     }:
-     mkDerivation {
-       pname = "extra";
        version = "1.6.9";
        sha256 = "0xxcpb00pgwi9cmy6a7ghh6rblxry42p8pz5ssfgj20fs1xwzj1b";
        libraryHaskellDepends = [
@@ -70779,7 +70701,6 @@ self: {
        testHaskellDepends = [ base directory filepath QuickCheck unix ];
        description = "Extra functions I use";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extract-dependencies" = callPackage
@@ -73319,8 +73240,8 @@ self: {
        pname = "finite-field";
        version = "0.9.0";
        sha256 = "026l5qrc7vsm2s19z10xx30lrsfkwwcymyznyy5hrcrwqj9wf643";
-       revision = "1";
-       editedCabalFile = "0npwa4gv94b87y4bam9valnjlsy3rbhk7n7hdc1mx1bwkn4acyds";
+       revision = "2";
+       editedCabalFile = "11zivn1cjwxc7xy8q50raz1wpfgl0b459ai0f4j304rv7yiwrhdp";
        libraryHaskellDepends = [
          base deepseq hashable singletons template-haskell
        ];
@@ -73337,23 +73258,11 @@ self: {
     ({ mkDerivation, base, deepseq }:
      mkDerivation {
        pname = "finite-typelits";
-       version = "0.1.3.0";
-       sha256 = "17a82djlpapdzw34afv79w99jrpy5nlbdw1k1xjs59bvvqv36wyv";
-       libraryHaskellDepends = [ base deepseq ];
-       description = "A type inhabited by finitely many values, indexed by type-level naturals";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "finite-typelits_0_1_4_2" = callPackage
-    ({ mkDerivation, base, deepseq }:
-     mkDerivation {
-       pname = "finite-typelits";
        version = "0.1.4.2";
        sha256 = "0iyp9fyd2ki9qcmk9infz9p6rjhsx9jrs3f5yz0yqs8vj5na81yj";
        libraryHaskellDepends = [ base deepseq ];
        description = "A type inhabited by finitely many values, indexed by type-level naturals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "firebase-database" = callPackage
@@ -74406,25 +74315,12 @@ self: {
     ({ mkDerivation, base, doctest, QuickCheck, template-haskell }:
      mkDerivation {
        pname = "flow";
-       version = "1.0.13";
-       sha256 = "0dg29g1d7xi14yf4yjxiy9cmslqgz5c4z141q4bzqn6ms0rwrxx7";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base doctest QuickCheck template-haskell ];
-       description = "Write more understandable Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "flow_1_0_14" = callPackage
-    ({ mkDerivation, base, doctest, QuickCheck, template-haskell }:
-     mkDerivation {
-       pname = "flow";
        version = "1.0.14";
        sha256 = "0k6j0mh3lr2fpvjs2jl1agybng32g9z8w3qf5b542ydjl02nvk08";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest QuickCheck template-haskell ];
        description = "Write more understandable Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flow-er" = callPackage
@@ -75786,19 +75682,6 @@ self: {
     ({ mkDerivation, base, basement, gauge, ghc-prim }:
      mkDerivation {
        pname = "foundation";
-       version = "0.0.20";
-       sha256 = "0bg4g0xf4pb2vmahnfp8c4f0a3v0av73lb5g8bwnp170khxfcsms";
-       libraryHaskellDepends = [ base basement ghc-prim ];
-       testHaskellDepends = [ base basement ];
-       benchmarkHaskellDepends = [ base basement gauge ];
-       description = "Alternative prelude with batteries and no dependencies";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "foundation_0_0_21" = callPackage
-    ({ mkDerivation, base, basement, gauge, ghc-prim }:
-     mkDerivation {
-       pname = "foundation";
        version = "0.0.21";
        sha256 = "1q43y8wfj0wf9gdq2kzphwjwq6m5pvryy1lqgk954aq5z3ks1lsf";
        libraryHaskellDepends = [ base basement ghc-prim ];
@@ -75806,7 +75689,6 @@ self: {
        benchmarkHaskellDepends = [ base basement gauge ];
        description = "Alternative prelude with batteries and no dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foundation-edge" = callPackage
@@ -80730,27 +80612,6 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-prof";
-       version = "1.4.1.2";
-       sha256 = "0rippzp76g2zn8vhxfkvpf9r2l62lid6525ym6zz1pyq4xzsbqrf";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base containers scientific text time
-       ];
-       testHaskellDepends = [
-         attoparsec base containers directory filepath process tasty
-         tasty-hunit temporary text
-       ];
-       description = "Library for parsing GHC time and allocation profiling reports";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-prof_1_4_1_3" = callPackage
-    ({ mkDerivation, attoparsec, base, containers, directory, filepath
-     , process, scientific, tasty, tasty-hunit, temporary, text, time
-     }:
-     mkDerivation {
-       pname = "ghc-prof";
        version = "1.4.1.3";
        sha256 = "16ckk4ldpkq7khka5mhkngrcazrnfxw394rm7mcshhlr7f41ydlr";
        isLibrary = true;
@@ -80764,7 +80625,6 @@ self: {
        ];
        description = "Library for parsing GHC time and allocation profiling reports";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-prof-aeson" = callPackage
@@ -80983,27 +80843,6 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-typelits-extra";
-       version = "0.2.5";
-       sha256 = "0waznf99wryc0sjyk9xb5c0vsalmmhx0v5vbqsyf5q7r6cjcig4s";
-       libraryHaskellDepends = [
-         base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat
-         ghc-typelits-natnormalise integer-gmp transformers
-       ];
-       testHaskellDepends = [
-         base ghc-typelits-knownnat ghc-typelits-natnormalise tasty
-         tasty-hunit template-haskell
-       ];
-       description = "Additional type-level operations on GHC.TypeLits.Nat";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "ghc-typelits-extra_0_2_6" = callPackage
-    ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra
-     , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp
-     , tasty, tasty-hunit, template-haskell, transformers
-     }:
-     mkDerivation {
-       pname = "ghc-typelits-extra";
        version = "0.2.6";
        sha256 = "0dx6rk6lpklqqklj74mg92vjn66kkjfxp87hwazzlx9wai23r3cm";
        libraryHaskellDepends = [
@@ -81016,7 +80855,6 @@ self: {
        ];
        description = "Additional type-level operations on GHC.TypeLits.Nat";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-typelits-knownnat" = callPackage
@@ -81026,26 +80864,6 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-typelits-knownnat";
-       version = "0.5";
-       sha256 = "0mix7zgbnyc3216ykcrjl09rpidq5n2y886k03g8r5pziq1xki00";
-       libraryHaskellDepends = [
-         base ghc ghc-tcplugins-extra ghc-typelits-natnormalise
-         template-haskell transformers
-       ];
-       testHaskellDepends = [
-         base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck
-       ];
-       description = "Derive KnownNat constraints from other KnownNat constraints";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "ghc-typelits-knownnat_0_5_1" = callPackage
-    ({ mkDerivation, base, ghc, ghc-tcplugins-extra
-     , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck
-     , template-haskell, transformers
-     }:
-     mkDerivation {
-       pname = "ghc-typelits-knownnat";
        version = "0.5.1";
        sha256 = "0yvdb3y82wrm41p9sbbsmfq91cp9kzx7mmqr20wgxrqamhnw952v";
        libraryHaskellDepends = [
@@ -81057,7 +80875,6 @@ self: {
        ];
        description = "Derive KnownNat constraints from other KnownNat constraints";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-typelits-natnormalise" = callPackage
@@ -81066,22 +80883,6 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-typelits-natnormalise";
-       version = "0.6.1";
-       sha256 = "0xzwlxcmd3vll86mdjk8pph6f0nw3vq0h3airzv7jagc4j3x9c7x";
-       libraryHaskellDepends = [
-         base ghc ghc-tcplugins-extra integer-gmp transformers
-       ];
-       testHaskellDepends = [ base tasty tasty-hunit template-haskell ];
-       description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "ghc-typelits-natnormalise_0_6_2" = callPackage
-    ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty
-     , tasty-hunit, template-haskell, transformers
-     }:
-     mkDerivation {
-       pname = "ghc-typelits-natnormalise";
        version = "0.6.2";
        sha256 = "04a338yfcl6jm1daax08zsy03myii4llzih4mlprkyid8i0yn740";
        libraryHaskellDepends = [
@@ -81090,7 +80891,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit template-haskell ];
        description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-typelits-presburger" = callPackage
@@ -83098,29 +82898,6 @@ self: {
      }:
      mkDerivation {
        pname = "github-release";
-       version = "1.2.1";
-       sha256 = "1q01yk6nl60iylsqzz1gzg3q1gpjn6bi13p5lddx1z5hd6hri80h";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring http-client http-client-tls http-types
-         mime-types optparse-generic text unordered-containers uri-templater
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring http-client http-client-tls http-types
-         mime-types optparse-generic text unordered-containers uri-templater
-       ];
-       description = "Upload files to GitHub releases";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "github-release_1_2_2" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, http-client
-     , http-client-tls, http-types, mime-types, optparse-generic, text
-     , unordered-containers, uri-templater
-     }:
-     mkDerivation {
-       pname = "github-release";
        version = "1.2.2";
        sha256 = "0mnkj8p90inaw6cic60hx05yq2lf2aahmv313qi59di5jqkyg106";
        isLibrary = true;
@@ -83135,7 +82912,6 @@ self: {
        ];
        description = "Upload files to GitHub releases";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "github-tools" = callPackage
@@ -89408,55 +89184,6 @@ self: {
      }:
      mkDerivation {
        pname = "hOpenPGP";
-       version = "2.7";
-       sha256 = "0s4afs5s6sz2j9vkgz6xhx426dva72i6gk8804avjphjrfvvgdzg";
-       libraryHaskellDepends = [
-         aeson asn1-encoding attoparsec base base16-bytestring
-         base64-bytestring bifunctors binary binary-conduit bytestring bzlib
-         conduit conduit-extra containers crypto-cipher-types cryptonite
-         errors hashable incremental-parser ixset-typed lens memory
-         monad-loops nettle network-uri newtype openpgp-asciiarmor
-         prettyprinter resourcet semigroups split text time
-         time-locale-compat transformers unliftio-core unordered-containers
-         zlib
-       ];
-       testHaskellDepends = [
-         aeson asn1-encoding attoparsec base base16-bytestring bifunctors
-         binary binary-conduit bytestring bzlib conduit conduit-extra
-         containers crypto-cipher-types cryptonite errors hashable
-         incremental-parser ixset-typed lens memory monad-loops nettle
-         network network-uri newtype prettyprinter QuickCheck
-         quickcheck-instances resourcet semigroups split tasty tasty-hunit
-         tasty-quickcheck text time time-locale-compat transformers
-         unliftio-core unordered-containers zlib
-       ];
-       benchmarkHaskellDepends = [
-         aeson base base16-bytestring base64-bytestring bifunctors binary
-         binary-conduit bytestring bzlib conduit conduit-extra containers
-         criterion crypto-cipher-types cryptonite errors hashable
-         incremental-parser ixset-typed lens memory monad-loops nettle
-         network network-uri newtype openpgp-asciiarmor prettyprinter
-         resourcet semigroups split text time time-locale-compat
-         transformers unliftio-core unordered-containers zlib
-       ];
-       description = "native Haskell implementation of OpenPGP (RFC4880)";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hOpenPGP_2_7_1" = callPackage
-    ({ mkDerivation, aeson, asn1-encoding, attoparsec, base
-     , base16-bytestring, base64-bytestring, bifunctors, binary
-     , binary-conduit, bytestring, bzlib, conduit, conduit-extra
-     , containers, criterion, crypto-cipher-types, cryptonite, errors
-     , hashable, incremental-parser, ixset-typed, lens, memory
-     , monad-loops, nettle, network, network-uri, newtype
-     , openpgp-asciiarmor, prettyprinter, QuickCheck
-     , quickcheck-instances, resourcet, semigroups, split, tasty
-     , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat
-     , transformers, unliftio-core, unordered-containers, zlib
-     }:
-     mkDerivation {
-       pname = "hOpenPGP";
        version = "2.7.1";
        sha256 = "02nws5px5zb9rvsl3hpqr15iw56n0d2pwgdrk3d047l4hx9cbm95";
        libraryHaskellDepends = [
@@ -89490,7 +89217,6 @@ self: {
        ];
        description = "native Haskell implementation of OpenPGP (RFC4880)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hPDB" = callPackage
@@ -92295,32 +92021,6 @@ self: {
      }:
      mkDerivation {
        pname = "hapistrano";
-       version = "0.3.5.7";
-       sha256 = "0fis5g2fg0x5pw7r0p7qy090v90gzqza5qjnpzinnq1yipmr872p";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base filepath formatting gitrev mtl path process time transformers
-       ];
-       executableHaskellDepends = [
-         aeson async base formatting gitrev optparse-applicative path
-         path-io stm yaml
-       ];
-       testHaskellDepends = [
-         base directory filepath hspec mtl path path-io process temporary
-       ];
-       description = "A deployment library for Haskell applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hapistrano_0_3_5_8" = callPackage
-    ({ mkDerivation, aeson, async, base, directory, filepath
-     , formatting, gitrev, hspec, mtl, optparse-applicative, path
-     , path-io, process, stm, temporary, time, transformers, yaml
-     }:
-     mkDerivation {
-       pname = "hapistrano";
        version = "0.3.5.8";
        sha256 = "0yg1wgg4mkfjf49xfcnijrwmj747yzbybsvkaq515i618nz5x57z";
        isLibrary = true;
@@ -92338,7 +92038,6 @@ self: {
        ];
        description = "A deployment library for Haskell applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happindicator" = callPackage
@@ -95463,22 +95162,6 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-ast";
-       version = "1.1.0.1";
-       sha256 = "1g450ikg2wi7whw46ibm9pc7jdnk5lng8l7lqryi0nigmrmgz355";
-       libraryHaskellDepends = [
-         base classyplate ghc mtl pretty references template-haskell
-         uniplate
-       ];
-       description = "Haskell AST for efficient tooling";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-tools-ast_1_1_0_2" = callPackage
-    ({ mkDerivation, base, classyplate, ghc, mtl, pretty, references
-     , template-haskell, uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-tools-ast";
        version = "1.1.0.2";
        sha256 = "0j81dmg2mgxlc4wy054a13bvx549xs19fr729rirdj2illdgbw1c";
        libraryHaskellDepends = [
@@ -95487,7 +95170,6 @@ self: {
        ];
        description = "Haskell AST for efficient tooling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-ast-fromghc" = callPackage
@@ -95548,23 +95230,6 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-backend-ghc";
-       version = "1.1.0.1";
-       sha256 = "030ylilmgn4drp00d3683kwfyq9rky5i8ihpvmqjkphyq7bbwva4";
-       libraryHaskellDepends = [
-         base bytestring containers ghc ghc-boot-th haskell-tools-ast mtl
-         references safe split template-haskell transformers uniplate
-       ];
-       description = "Creating the Haskell-Tools AST from GHC's representations";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-tools-backend-ghc_1_1_0_2" = callPackage
-    ({ mkDerivation, base, bytestring, containers, ghc, ghc-boot-th
-     , haskell-tools-ast, mtl, references, safe, split, template-haskell
-     , transformers, uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-tools-backend-ghc";
        version = "1.1.0.2";
        sha256 = "0c054gvnn38r5vlpka5jsvq3n8lcn3j77jg45g1zl1az0099mzhl";
        libraryHaskellDepends = [
@@ -95573,7 +95238,6 @@ self: {
        ];
        description = "Creating the Haskell-Tools AST from GHC's representations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-builtin-refactorings" = callPackage
@@ -95587,38 +95251,6 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-builtin-refactorings";
-       version = "1.1.0.1";
-       sha256 = "0xlcwyydspn73nv7yi1djncqhswszqn9skrm6hm96scfyqvvxbwa";
-       libraryHaskellDepends = [
-         aeson base Cabal classyplate containers deepseq directory filepath
-         ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc
-         haskell-tools-prettyprint haskell-tools-refactor
-         haskell-tools-rewrite minisat-solver mtl portable-lines references
-         split template-haskell transformers uniplate
-       ];
-       testHaskellDepends = [
-         base Cabal containers directory either filepath ghc ghc-paths
-         haskell-tools-ast haskell-tools-backend-ghc
-         haskell-tools-prettyprint haskell-tools-refactor
-         haskell-tools-rewrite mtl references split tasty tasty-hunit
-         template-haskell time transformers uniplate
-       ];
-       description = "Refactoring Tool for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haskell-tools-builtin-refactorings_1_1_0_2" = callPackage
-    ({ mkDerivation, aeson, base, Cabal, classyplate, containers
-     , deepseq, directory, either, filepath, ghc, ghc-paths
-     , haskell-tools-ast, haskell-tools-backend-ghc
-     , haskell-tools-prettyprint, haskell-tools-refactor
-     , haskell-tools-rewrite, minisat-solver, mtl, portable-lines
-     , references, split, tasty, tasty-hunit, template-haskell, time
-     , transformers, uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-tools-builtin-refactorings";
        version = "1.1.0.2";
        sha256 = "1wm7c63cw4izg6vlrm2xdyrfvf4cwcqs2n144y8k0zf442xaq5l9";
        libraryHaskellDepends = [
@@ -95719,31 +95351,6 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-debug";
-       version = "1.1.0.1";
-       sha256 = "1l84y0pqwcq1y6509gg68flfa1ai5zl2psn57lp1nm17i7cddsjw";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base classyplate criterion filepath ghc ghc-paths haskell-tools-ast
-         haskell-tools-backend-ghc haskell-tools-builtin-refactorings
-         haskell-tools-prettyprint haskell-tools-refactor mtl references
-         split template-haskell uniplate
-       ];
-       executableHaskellDepends = [ base ];
-       description = "Debugging Tools for Haskell-tools";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haskell-tools-debug_1_1_0_2" = callPackage
-    ({ mkDerivation, base, classyplate, criterion, filepath, ghc
-     , ghc-paths, haskell-tools-ast, haskell-tools-backend-ghc
-     , haskell-tools-builtin-refactorings, haskell-tools-prettyprint
-     , haskell-tools-refactor, mtl, references, split, template-haskell
-     , uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-tools-debug";
        version = "1.1.0.2";
        sha256 = "1lnv9j4h45g0z1s9pf86py39p2bs8dbz3xybg0bwz89yix8h7nhl";
        isLibrary = true;
@@ -95770,37 +95377,6 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-demo";
-       version = "1.1.0.1";
-       sha256 = "1rzpwy7fvc51vs9sqpxvja84bqjgrpj6943cc2p06d1ynl7vzmk5";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers directory filepath ghc ghc-paths
-         haskell-tools-ast haskell-tools-backend-ghc
-         haskell-tools-builtin-refactorings haskell-tools-prettyprint
-         haskell-tools-refactor http-types mtl references transformers wai
-         wai-websockets warp websockets
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         aeson base bytestring directory filepath HUnit network tasty
-         tasty-hunit websockets
-       ];
-       description = "A web-based demo for Haskell-tools Refactor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haskell-tools-demo_1_1_0_2" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, ghc, ghc-paths, haskell-tools-ast
-     , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings
-     , haskell-tools-prettyprint, haskell-tools-refactor, http-types
-     , HUnit, mtl, network, references, tasty, tasty-hunit, transformers
-     , wai, wai-websockets, warp, websockets
-     }:
-     mkDerivation {
-       pname = "haskell-tools-demo";
        version = "1.1.0.2";
        sha256 = "0c2m6xqcl22x9ay3n9j64lphmsvxsgcwymvbxscwpki9mv7wbvkx";
        isLibrary = true;
@@ -95859,22 +95435,6 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-prettyprint";
-       version = "1.1.0.1";
-       sha256 = "1x8zz8i66cfnvif991bj9nkidp2bwlhs9zfkxwlyhvhrlda45q8f";
-       libraryHaskellDepends = [
-         base containers ghc haskell-tools-ast mtl references split text
-         uniplate
-       ];
-       description = "Pretty printing of Haskell-Tools AST";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-tools-prettyprint_1_1_0_2" = callPackage
-    ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl
-     , references, split, text, uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-tools-prettyprint";
        version = "1.1.0.2";
        sha256 = "01j212inqx7hq24kcw7n0619bgz7bj576xrh06h10n0wqhd6qfbq";
        libraryHaskellDepends = [
@@ -95883,7 +95443,6 @@ self: {
        ];
        description = "Pretty printing of Haskell-Tools AST";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-refactor" = callPackage
@@ -95896,36 +95455,6 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-refactor";
-       version = "1.1.0.1";
-       sha256 = "0kfw41f4js9s6mf533q7vm7ym63hb289j77r2ypm08490bqjhi9g";
-       libraryHaskellDepends = [
-         aeson base Cabal containers directory filepath ghc ghc-paths
-         haskell-tools-ast haskell-tools-backend-ghc
-         haskell-tools-prettyprint haskell-tools-rewrite mtl references
-         split template-haskell transformers uniplate
-       ];
-       testHaskellDepends = [
-         base Cabal containers directory either filepath ghc ghc-paths
-         haskell-tools-ast haskell-tools-backend-ghc
-         haskell-tools-prettyprint haskell-tools-rewrite mtl old-time
-         polyparse references split tasty tasty-hunit template-haskell time
-         transformers uniplate
-       ];
-       description = "Refactoring Tool for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haskell-tools-refactor_1_1_0_2" = callPackage
-    ({ mkDerivation, aeson, base, Cabal, containers, directory, either
-     , filepath, ghc, ghc-paths, haskell-tools-ast
-     , haskell-tools-backend-ghc, haskell-tools-prettyprint
-     , haskell-tools-rewrite, mtl, old-time, polyparse, references
-     , split, tasty, tasty-hunit, template-haskell, time, transformers
-     , uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-tools-refactor";
        version = "1.1.0.2";
        sha256 = "12gkmji62kvnqjih9845hmsdj2f52hvmqgrz7s5wclpn3b5fhczq";
        libraryHaskellDepends = [
@@ -95953,28 +95482,6 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-tools-rewrite";
-       version = "1.1.0.1";
-       sha256 = "0j1925x0qkkm8n0klqbawgd419ra9jrfl4y4hn75j3w4zxzh3v5j";
-       libraryHaskellDepends = [
-         base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl
-         references
-       ];
-       testHaskellDepends = [
-         base directory filepath haskell-tools-ast haskell-tools-prettyprint
-         tasty tasty-hunit
-       ];
-       description = "Facilities for generating new parts of the Haskell-Tools AST";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haskell-tools-rewrite_1_1_0_2" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath, ghc
-     , haskell-tools-ast, haskell-tools-prettyprint, mtl, references
-     , tasty, tasty-hunit
-     }:
-     mkDerivation {
-       pname = "haskell-tools-rewrite";
        version = "1.1.0.2";
        sha256 = "1az7924bsiapn7g8gj75vdi47alrlly0wnwhcd7p8a24kh1hj055";
        libraryHaskellDepends = [
@@ -105742,7 +105249,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hpack_0_29_4" = callPackage
+  "hpack_0_29_5" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
      , containers, cryptonite, deepseq, directory, filepath, Glob, hspec
      , http-client, http-client-tls, http-types, HUnit, infer-license
@@ -105752,8 +105259,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpack";
-       version = "0.29.4";
-       sha256 = "1d1kn4bzcwqmqkc6y9mp63674hgayx4mprv9fg8mrr29z3fl09hj";
+       version = "0.29.5";
+       sha256 = "1jm70x2d1d5la780aksq3088k5vj8s6j2srslij9slsfkw6mmv56";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -105818,8 +105325,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpack-dhall";
-       version = "0.2.0";
-       sha256 = "0avkxcrpa1qgyw56wqna773404gcglvqxr81jmzr0hij406x4c8m";
+       version = "0.3.0";
+       sha256 = "0dplb37npz47cxya1c3dnj6bjcnprjph83yifb08a5qf6vnhcjyh";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -109148,6 +108655,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec_2_5_5" = callPackage
+    ({ mkDerivation, base, call-stack, directory, hspec-core
+     , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck
+     , stringbuilder, transformers
+     }:
+     mkDerivation {
+       pname = "hspec";
+       version = "2.5.5";
+       sha256 = "1yv4k5b5kkig2q3waj28587sq28wms7wfav5a3lq4dra6jybimfm";
+       libraryHaskellDepends = [
+         base call-stack hspec-core hspec-discover hspec-expectations HUnit
+         QuickCheck transformers
+       ];
+       testHaskellDepends = [
+         base call-stack directory hspec-core hspec-discover
+         hspec-expectations hspec-meta HUnit QuickCheck stringbuilder
+         transformers
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "A Testing Framework for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-attoparsec" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, hspec
      , hspec-expectations, text
@@ -109243,6 +108774,33 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-core_2_5_5" = callPackage
+    ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
+     , deepseq, directory, filepath, hspec-expectations, hspec-meta
+     , HUnit, process, QuickCheck, quickcheck-io, random, setenv
+     , silently, stm, temporary, tf-random, transformers
+     }:
+     mkDerivation {
+       pname = "hspec-core";
+       version = "2.5.5";
+       sha256 = "1vfrqlpn32s9wiykmkxbnrnd5p56yznw20pf8fwzw78ar4wpz55x";
+       libraryHaskellDepends = [
+         ansi-terminal array base call-stack clock deepseq directory
+         filepath hspec-expectations HUnit QuickCheck quickcheck-io random
+         setenv stm tf-random transformers
+       ];
+       testHaskellDepends = [
+         ansi-terminal array base call-stack clock deepseq directory
+         filepath hspec-expectations hspec-meta HUnit process QuickCheck
+         quickcheck-io random setenv silently stm temporary tf-random
+         transformers
+       ];
+       testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
+       description = "A Testing Framework for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-dirstream" = callPackage
     ({ mkDerivation, base, dirstream, filepath, hspec, hspec-core
      , pipes, pipes-safe, system-filepath, text
@@ -109298,6 +108856,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-discover_2_5_5" = callPackage
+    ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
+     }:
+     mkDerivation {
+       pname = "hspec-discover";
+       version = "2.5.5";
+       sha256 = "04aidzi91ccr9bygmfkjzshz34z9vh8wvqj4zinx2clxq6r7gqfz";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base directory filepath ];
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [
+         base directory filepath hspec-meta QuickCheck
+       ];
+       description = "Automatically discover and run Hspec tests";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-expectations" = callPackage
     ({ mkDerivation, base, call-stack, HUnit, nanospec }:
      mkDerivation {
@@ -111376,23 +110953,6 @@ self: {
      }:
      mkDerivation {
        pname = "http-client-openssl";
-       version = "0.2.1.1";
-       sha256 = "173s2m73xcf6ramy680ky4zhxhmrymh98g2hv5xa2pnj489j7vi4";
-       libraryHaskellDepends = [ base HsOpenSSL http-client network ];
-       testHaskellDepends = [
-         base HsOpenSSL hspec http-client http-types
-       ];
-       doCheck = false;
-       description = "http-client backend using the OpenSSL library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "http-client-openssl_0_2_2_0" = callPackage
-    ({ mkDerivation, base, HsOpenSSL, hspec, http-client, http-types
-     , network
-     }:
-     mkDerivation {
-       pname = "http-client-openssl";
        version = "0.2.2.0";
        sha256 = "1ahh2b34cwkmspwg8zilf2llmayf03p33z2gsw455wkhgfbhshcn";
        libraryHaskellDepends = [ base HsOpenSSL http-client network ];
@@ -111402,7 +110962,6 @@ self: {
        doCheck = false;
        description = "http-client backend using the OpenSSL library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-client-request-modifiers" = callPackage
@@ -113035,14 +112594,14 @@ self: {
 
   "hw-excess" = callPackage
     ({ mkDerivation, base, hspec, hw-bits, hw-prim, hw-rankselect-base
-     , QuickCheck, safe, storable-record, vector
+     , QuickCheck, safe, vector
      }:
      mkDerivation {
        pname = "hw-excess";
-       version = "0.2.0.0";
-       sha256 = "1ab1nl03pzqsxkp6xcxwfrjp7h7jrfxjaw6p01yk7c7mk1h4nypi";
+       version = "0.2.0.2";
+       sha256 = "1xm1nwab2zhlyd0n536pd5sny4miqr8p41pasl9mqvg89v6x0db7";
        libraryHaskellDepends = [
-         base hw-bits hw-prim hw-rankselect-base safe storable-record vector
+         base hw-bits hw-prim hw-rankselect-base safe vector
        ];
        testHaskellDepends = [
          base hspec hw-bits hw-prim QuickCheck vector
@@ -113499,6 +113058,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-simd" = callPackage
+    ({ mkDerivation, base, bits-extra, bytestring, c2hs, cassava
+     , containers, criterion, deepseq, directory, hedgehog, hspec
+     , hw-bits, hw-hspec-hedgehog, hw-prim, hw-rankselect
+     , hw-rankselect-base, mmap, text, vector
+     }:
+     mkDerivation {
+       pname = "hw-simd";
+       version = "0.0.0.3";
+       sha256 = "1kkaigvkh932gcdvn7ll93qkz332bp6ylg5wsf8saxnir1n1362k";
+       libraryHaskellDepends = [
+         base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect
+         hw-rankselect-base vector
+       ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [
+         base bits-extra bytestring deepseq directory hedgehog hspec hw-bits
+         hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base text
+         vector
+       ];
+       benchmarkHaskellDepends = [
+         base bits-extra bytestring cassava containers criterion deepseq
+         directory hw-bits hw-prim hw-rankselect hw-rankselect-base mmap
+         vector
+       ];
+       description = "SIMD library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hw-string-parse" = callPackage
     ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }:
      mkDerivation {
@@ -116713,6 +116301,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "indexation" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus
+     , foldl, hashable, list-t, potoki, potoki-cereal, profunctors
+     , stm-containers, text, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "indexation";
+       version = "0.2.0.2";
+       sha256 = "10wm6k8rjdk4pq9pypnbh9pbqzr0vxbfgmj66d18grpr9g2mk5j1";
+       libraryHaskellDepends = [
+         base bytestring cereal deferred-folds focus foldl hashable list-t
+         potoki potoki-cereal profunctors stm-containers text transformers
+         unordered-containers vector
+       ];
+       description = "Tools for entity indexation";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "indexed" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -118171,30 +117777,6 @@ self: {
 
   "invariant" = callPackage
     ({ mkDerivation, array, base, bifunctors, comonad, containers
-     , contravariant, ghc-prim, hspec, profunctors, QuickCheck
-     , semigroups, StateVar, stm, tagged, template-haskell
-     , th-abstraction, transformers, transformers-compat
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "invariant";
-       version = "0.5";
-       sha256 = "1zz9a5irmpma5qchvvp7qin1s7cfnhvpg3b452xxysgbxvmcmfw0";
-       revision = "2";
-       editedCabalFile = "01n0v2qmbyd44z3wvha6vmbf1nr3bar205nk1r8hsq9jsmrfzaj1";
-       libraryHaskellDepends = [
-         array base bifunctors comonad containers contravariant ghc-prim
-         profunctors semigroups StateVar stm tagged template-haskell
-         th-abstraction transformers transformers-compat
-         unordered-containers
-       ];
-       testHaskellDepends = [ base hspec QuickCheck template-haskell ];
-       description = "Haskell98 invariant functors";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "invariant_0_5_1" = callPackage
-    ({ mkDerivation, array, base, bifunctors, comonad, containers
      , contravariant, ghc-prim, hspec, hspec-discover, profunctors
      , QuickCheck, semigroups, StateVar, stm, tagged, template-haskell
      , th-abstraction, transformers, transformers-compat
@@ -118214,7 +117796,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Haskell98 invariant functors";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "invertible" = callPackage
@@ -119670,8 +119251,8 @@ self: {
      }:
      mkDerivation {
        pname = "ivory-backend-c";
-       version = "0.1.0.7";
-       sha256 = "1xj492gzlypwd66w71mz4ndvl27vx2c712nz61myp3i4lx4rnpay";
+       version = "0.1.0.8";
+       sha256 = "1zp5kddiczkb85ac7y6wn145bzx3hpvzzhincgq8f1ykcr23miz9";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base base-compat bytestring containers directory filepath ivory
@@ -119748,8 +119329,8 @@ self: {
     ({ mkDerivation, base, filepath, ivory, ivory-artifact }:
      mkDerivation {
        pname = "ivory-hw";
-       version = "0.1.0.5";
-       sha256 = "0h21r9ij3n49b0m3dcjx22vyxc68v4jifl6yv1wpyn1hgrzxlyck";
+       version = "0.1.0.6";
+       sha256 = "0az65nj7pl32gyffv2z2vmcgm36cm740y765n4r7389drls5lj5d";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
        description = "Ivory hardware model (STM32F4)";
@@ -120734,14 +120315,14 @@ self: {
     ({ mkDerivation, base, haskeline, hspec, HUnit }:
      mkDerivation {
        pname = "jord";
-       version = "0.1.0.0";
-       sha256 = "1dnjxlyclk1a1bghkg1c6wash37pq88grqpv8pr3gr6in3wkibc5";
+       version = "0.2.0.0";
+       sha256 = "0akf6jjijwgn4jsvlzvj7mh9fx9wx0p05gf7bara6hiqj58y6k65";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base haskeline ];
        testHaskellDepends = [ base hspec HUnit ];
-       description = "Geographic position calculations on Great Circles";
+       description = "Geographical Position Calculations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -121306,25 +120887,6 @@ self: {
      }:
      mkDerivation {
        pname = "json-feed";
-       version = "1.0.2";
-       sha256 = "1485c4rljprf09nn8hd5fdpipjzpcylgmzz3ckw4nna5fhyx2n40";
-       libraryHaskellDepends = [
-         aeson base bytestring mime-types network-uri tagsoup text time
-       ];
-       testHaskellDepends = [
-         aeson base bytestring filepath hspec mime-types network-uri tagsoup
-         text time
-       ];
-       description = "JSON Feed";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "json-feed_1_0_3" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, filepath, hspec
-     , mime-types, network-uri, tagsoup, text, time
-     }:
-     mkDerivation {
-       pname = "json-feed";
        version = "1.0.3";
        sha256 = "08y6w4sad6f0f5gs3znw9yfp51cskw9q81xq5q70g6glq14lph50";
        libraryHaskellDepends = [
@@ -121336,7 +120898,6 @@ self: {
        ];
        description = "JSON Feed";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-fu" = callPackage
@@ -123101,9 +122662,12 @@ self: {
      }:
      mkDerivation {
        pname = "keccak";
-       version = "0.1.1";
-       sha256 = "1mps3w7d9yq262anpw8zdrhni2xw0idfw9364jh5rjs3fv41h4l1";
+       version = "0.1.2";
+       sha256 = "0jrnx5w2nxxc47lmw71c57cqja3mynx8j3fr89rjwby6mym5yw4g";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
+       executableHaskellDepends = [ base base16-bytestring bytestring ];
        testHaskellDepends = [
          base base16-bytestring bytestring cryptonite HUnit memory parsec
          QuickCheck quickcheck-instances test-framework test-framework-hunit
@@ -124390,25 +123954,12 @@ self: {
     ({ mkDerivation, base, hspec, servant, servant-foreign, text }:
      mkDerivation {
        pname = "lackey";
-       version = "1.0.4";
-       sha256 = "1x0jrsk9jp7k0l6xz7nxrcdkglld1ab21kh6w1a253zklpwd3vz1";
-       libraryHaskellDepends = [ base servant servant-foreign text ];
-       testHaskellDepends = [ base hspec servant servant-foreign text ];
-       description = "Generate Ruby clients from Servant APIs";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "lackey_1_0_5" = callPackage
-    ({ mkDerivation, base, hspec, servant, servant-foreign, text }:
-     mkDerivation {
-       pname = "lackey";
        version = "1.0.5";
        sha256 = "0ixiqppj7sdkbhp2i6nr4xch82j4r6gxwwn0rvbb0x6wzikkdrf3";
        libraryHaskellDepends = [ base servant servant-foreign text ];
        testHaskellDepends = [ base hspec servant servant-foreign text ];
        description = "Generate Ruby clients from Servant APIs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lacroix" = callPackage
@@ -125239,17 +124790,17 @@ self: {
   "language-ats" = callPackage
     ({ mkDerivation, alex, ansi-wl-pprint, array, base
      , composition-prelude, containers, cpphs, criterion, deepseq, happy
-     , hspec, hspec-dirstream, micro-recursion-schemes, microlens
-     , microlens-th, system-filepath, transformers
+     , hspec, hspec-dirstream, microlens, recursion-schemes
+     , system-filepath, transformers
      }:
      mkDerivation {
        pname = "language-ats";
-       version = "1.2.0.11";
-       sha256 = "1kz30k8fdmnrx5zcyy3kpvr81p50m7bwsxgp5qqjrhk2i1a1igfp";
+       version = "1.2.0.14";
+       sha256 = "13nafbk4h8z3vx12i6zs250795c3ipsgxq83bhgha2w0wjr49d18";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint array base composition-prelude containers deepseq
-         micro-recursion-schemes microlens microlens-th transformers
+         microlens recursion-schemes transformers
        ];
        libraryToolDepends = [ alex cpphs happy ];
        testHaskellDepends = [
@@ -125443,28 +124994,6 @@ self: {
      }:
      mkDerivation {
        pname = "language-docker";
-       version = "6.0.3";
-       sha256 = "0rp94hgbh2knz8xn146shgaw0qp6lnp0skxzknsi0l6d3xzzr7qr";
-       libraryHaskellDepends = [
-         base bytestring containers free megaparsec mtl prettyprinter split
-         template-haskell text th-lift time
-       ];
-       testHaskellDepends = [
-         base bytestring containers directory filepath free Glob hspec HUnit
-         megaparsec mtl prettyprinter process QuickCheck split
-         template-haskell text th-lift time
-       ];
-       description = "Dockerfile parser, pretty-printer and embedded DSL";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "language-docker_6_0_4" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , free, Glob, hspec, HUnit, megaparsec, mtl, prettyprinter, process
-     , QuickCheck, split, template-haskell, text, th-lift, time
-     }:
-     mkDerivation {
-       pname = "language-docker";
        version = "6.0.4";
        sha256 = "1brlqlxa1h7iv2p17h4nb6ly7nr4dr9j815z3yiz0gbj91bgj4c1";
        libraryHaskellDepends = [
@@ -125478,7 +125007,6 @@ self: {
        ];
        description = "Dockerfile parser, pretty-printer and embedded DSL";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-dockerfile" = callPackage
@@ -126039,51 +125567,6 @@ self: {
      }:
      mkDerivation {
        pname = "language-puppet";
-       version = "1.3.19";
-       sha256 = "1g6b6dmjx1nk29r55qccvk6csbjig2yc493bmq0dlnqgbn0aiimp";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
-         case-insensitive containers cryptonite directory exceptions
-         filecache filepath formatting hashable hruby hslogger hspec
-         http-api-data http-client lens lens-aeson megaparsec memory mtl
-         operational parsec pcre-utils process protolude random
-         regex-pcre-builtin scientific servant servant-client split stm
-         strict-base-types text time transformers unix unordered-containers
-         vector yaml
-       ];
-       executableHaskellDepends = [
-         aeson ansi-wl-pprint base bytestring containers Glob hslogger
-         http-client lens megaparsec mtl optparse-applicative parallel-io
-         regex-pcre-builtin strict-base-types text transformers
-         unordered-containers vector yaml
-       ];
-       testHaskellDepends = [
-         base Glob hslogger hspec hspec-megaparsec lens megaparsec mtl
-         pcre-utils protolude scientific strict-base-types temporary text
-         transformers unordered-containers vector
-       ];
-       description = "Tools to parse and evaluate the Puppet DSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-linux" ];
-     }) {};
-
-  "language-puppet_1_3_19_1" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
-     , base16-bytestring, bytestring, case-insensitive, containers
-     , cryptonite, directory, exceptions, filecache, filepath
-     , formatting, Glob, hashable, hruby, hslogger, hspec
-     , hspec-megaparsec, http-api-data, http-client, lens, lens-aeson
-     , megaparsec, memory, mtl, operational, optparse-applicative
-     , parallel-io, parsec, pcre-utils, process, protolude, random
-     , regex-pcre-builtin, scientific, servant, servant-client, split
-     , stm, strict-base-types, temporary, text, time, transformers, unix
-     , unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "language-puppet";
        version = "1.3.19.1";
        sha256 = "0f1g9sq3ysyjyps8p68wxh1rmjb3v7iw9gmj8zd7wb5kyjlc4xph";
        isLibrary = true;
@@ -126112,7 +125595,7 @@ self: {
        ];
        description = "Tools to parse and evaluate the Puppet DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "x86_64-linux" ];
      }) {};
 
   "language-python" = callPackage
@@ -128538,8 +128021,8 @@ self: {
     ({ mkDerivation, base, bytestring, glib, gtk, libnotify }:
      mkDerivation {
        pname = "libnotify";
-       version = "0.2";
-       sha256 = "0nazjlilbz3l32fn11shwxjlabvd2kfpxa7vnirpfp1y6k406mk6";
+       version = "0.2.1";
+       sha256 = "0a55lmalnn840zbryva19k3z4y79fq2q2qjl88wii3im53x0mzmy";
        libraryHaskellDepends = [ base bytestring glib gtk ];
        librarySystemDepends = [ libnotify ];
        description = "Bindings to libnotify library";
@@ -134461,8 +133944,8 @@ self: {
      }:
      mkDerivation {
        pname = "mandrill";
-       version = "0.5.3.3";
-       sha256 = "0hhyif8lqq16i25bvpz7z54n2rmnq9q198pjdm4vssh02597lnn8";
+       version = "0.5.3.4";
+       sha256 = "0gaz5drb8wvlr12ynwag4rcgmsyzd713j0qgpv9ydy3jlk65nrf7";
        libraryHaskellDepends = [
          aeson base base64-bytestring blaze-html bytestring containers
          email-validate http-client http-client-tls http-types lens mtl
@@ -135223,15 +134706,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "math-functions_0_3_0_0" = callPackage
+  "math-functions_0_3_0_1" = callPackage
     ({ mkDerivation, base, data-default-class, deepseq, erf, HUnit
      , primitive, QuickCheck, test-framework, test-framework-hunit
      , test-framework-quickcheck2, vector, vector-th-unbox
      }:
      mkDerivation {
        pname = "math-functions";
-       version = "0.3.0.0";
-       sha256 = "19kbc0kyxfjb7lhs2kkla59gqj7ag96r2z8ba2rfhl2104n3709k";
+       version = "0.3.0.1";
+       sha256 = "1nrslskbgsy9yx0kzc5a0jdahch218qd16343j001pdxkygq21b2";
        libraryHaskellDepends = [
          base data-default-class deepseq primitive vector vector-th-unbox
        ];
@@ -136320,25 +135803,6 @@ self: {
      }:
      mkDerivation {
        pname = "mega-sdist";
-       version = "0.3.3";
-       sha256 = "0vwk3fq34f8nnviw7fxpyqx365v4khvjr45pzgxsgc7rfx7hcw9c";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base bytestring conduit conduit-extra http-conduit optparse-simple
-         rio rio-orphans tar-conduit yaml
-       ];
-       description = "Handles uploading to Hackage from mega repos";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "mega-sdist_0_3_3_1" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, conduit-extra
-     , http-conduit, optparse-simple, rio, rio-orphans, tar-conduit
-     , yaml
-     }:
-     mkDerivation {
-       pname = "mega-sdist";
        version = "0.3.3.1";
        sha256 = "0p4n5m91i80cns1g5n18bczpyxm8jcc205syr3k8xd7x9gwg69ww";
        isLibrary = false;
@@ -136349,7 +135813,6 @@ self: {
        ];
        description = "Handles uploading to Hackage from mega repos";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "megaparsec" = callPackage
@@ -136771,8 +136234,8 @@ self: {
        pname = "menoh";
        version = "0.1.1";
        sha256 = "0cbkhafibm65yn4222kfy8j6zkw6q6k3962hwjhbvp2n57avh789";
-       revision = "1";
-       editedCabalFile = "1mbn1aq24dvaa1amwypik69dmg1x8mm1dz1h4kadzvljc4ld870i";
+       revision = "2";
+       editedCabalFile = "1hfgg9n86cp3qa9ziycx2134zsvsn76ilkmwrqnc7yb50279dw1b";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -137275,43 +136738,6 @@ self: {
      }:
      mkDerivation {
        pname = "microformats2-parser";
-       version = "1.0.1.8";
-       sha256 = "0hb5i60w369lngfw5a3bai5zvlgchcf1vvxshp9md77lyl7h49ar";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-qq attoparsec base base-compat blaze-markup bytestring
-         containers data-default either errors html-conduit lens-aeson
-         network-uri pcre-heavy safe tagsoup text time transformers
-         unordered-containers vector xml-lens xss-sanitize
-       ];
-       executableHaskellDepends = [
-         aeson aeson-pretty base base-compat blaze-html blaze-markup
-         data-default network network-uri options scotty text wai-cli
-         wai-extra
-       ];
-       testHaskellDepends = [
-         aeson-qq base base-compat bytestring data-default hspec
-         hspec-expectations-pretty-diff html-conduit mtl network-uri
-         raw-strings-qq template-haskell text time xml-lens
-       ];
-       description = "A Microformats 2 parser";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "microformats2-parser_1_0_1_9" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, aeson-qq, attoparsec, base
-     , base-compat, blaze-html, blaze-markup, bytestring, containers
-     , data-default, either, errors, hspec
-     , hspec-expectations-pretty-diff, html-conduit, lens-aeson, mtl
-     , network, network-uri, options, pcre-heavy, raw-strings-qq, safe
-     , scotty, tagsoup, template-haskell, text, time, transformers
-     , unordered-containers, vector, wai-cli, wai-extra, xml-lens
-     , xss-sanitize
-     }:
-     mkDerivation {
-       pname = "microformats2-parser";
        version = "1.0.1.9";
        sha256 = "1lxbw825yg16nmflf93l1sy6mxa3dnd7a5mdalc034brsnf1vish";
        isLibrary = true;
@@ -145620,6 +145046,42 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "network-messagepack-rpc" = callPackage
+    ({ mkDerivation, base, bytestring, data-msgpack, safe-exceptions
+     , text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "network-messagepack-rpc";
+       version = "0.1.0.0";
+       sha256 = "0yqisywmhl0y6f88ifpkv8dlldg5s2c2h8z8cv6mhhqj4qdzp1h3";
+       libraryHaskellDepends = [
+         base bytestring data-msgpack safe-exceptions text
+         unordered-containers
+       ];
+       description = "MessagePack RPC";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "network-messagepack-rpc-websocket" = callPackage
+    ({ mkDerivation, async, base, bytestring, data-msgpack, envy, hspec
+     , network-messagepack-rpc, QuickCheck, skews, text, websockets
+     , wss-client
+     }:
+     mkDerivation {
+       pname = "network-messagepack-rpc-websocket";
+       version = "0.1.0.0";
+       sha256 = "1q7ckch5z08wxrdsv62z07ivdihqvmcwfg2pgcbf66dhgc9bq4f6";
+       libraryHaskellDepends = [
+         base network-messagepack-rpc text websockets wss-client
+       ];
+       testHaskellDepends = [
+         async base bytestring data-msgpack envy hspec
+         network-messagepack-rpc QuickCheck skews text wss-client
+       ];
+       description = "WebSocket backend for MessagePack RPC";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "network-metrics" = callPackage
     ({ mkDerivation, base, binary, bytestring, data-default, network
      , random, time
@@ -151742,6 +151204,55 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "pandoc_2_2_2" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
+     , binary, blaze-html, blaze-markup, bytestring, Cabal
+     , 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, JuicyPixels, mtl, network, network-uri, pandoc-types
+     , parsec, process, QuickCheck, random, safe, SHA, skylighting
+     , split, syb, tagsoup, tasty, tasty-golden, tasty-hunit
+     , tasty-quickcheck, temporary, texmath, text, time, unix
+     , unordered-containers, vector, weigh, xml, zip-archive, zlib
+     }:
+     mkDerivation {
+       pname = "pandoc";
+       version = "2.2.2";
+       sha256 = "0rbr6mjm7kfzxrjbglqj6bgz1l1zlbiiff3pi59nhqava3nindqc";
+       configureFlags = [ "-fhttps" "-f-trypandoc" ];
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [
+         aeson aeson-pretty 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 JuicyPixels mtl network
+         network-uri pandoc-types parsec process random safe SHA skylighting
+         split syb tagsoup temporary texmath text time 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
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring containers criterion mtl text time weigh
+       ];
+       doCheck = false;
+       description = "Conversion between markup formats";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
+     }) {};
+
   "pandoc-citeproc" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , Cabal, containers, data-default, directory, filepath, hs-bibutils
@@ -152701,19 +152212,6 @@ self: {
      }) {};
 
   "parallel" = callPackage
-    ({ mkDerivation, array, base, containers, deepseq }:
-     mkDerivation {
-       pname = "parallel";
-       version = "3.2.1.1";
-       sha256 = "05rw8zhpqhx31zi6vg7zpyciaarh24j7g2p613xrpyrnksybjfrj";
-       revision = "1";
-       editedCabalFile = "12sgigg7r4nmyhbfn1p09ajf4s576yca31b7daj5zpp1mxgb5x7i";
-       libraryHaskellDepends = [ array base containers deepseq ];
-       description = "Parallel programming library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "parallel_3_2_2_0" = callPackage
     ({ mkDerivation, array, base, containers, deepseq, ghc-prim }:
      mkDerivation {
        pname = "parallel";
@@ -152722,7 +152220,6 @@ self: {
        libraryHaskellDepends = [ array base containers deepseq ghc-prim ];
        description = "Parallel programming library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parallel-io" = callPackage
@@ -159320,8 +158817,8 @@ self: {
        pname = "polyvariadic";
        version = "0.3.0.3";
        sha256 = "0zf7znslayjmcnajmsymc79f0lyyk7ph9zfczq78inirg0hv7hq1";
-       revision = "1";
-       editedCabalFile = "11jrr3xbkc828564sg3cc6ca1qaibbp43lbyrgi32kjy5l97w7y0";
+       revision = "2";
+       editedCabalFile = "0bcckgz6v7707rdgipaahqws6gkcmmrq5wyl407awb3fssnqxfkn";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base ];
        description = "Creation and application of polyvariadic functions";
@@ -160654,8 +160151,8 @@ self: {
      }:
      mkDerivation {
        pname = "potoki-cereal";
-       version = "0.2.1.1";
-       sha256 = "19rd5ykifa7bv32cyxp8hi942sl7xwav0cqhygp6kngw3vsrsnv8";
+       version = "0.3";
+       sha256 = "0m7g9dkvzb94iwywf3bil8h57xbs2d3zvgn4d8la54qz5izimszp";
        libraryHaskellDepends = [
          acquire attoparsec base base-prelude bytestring cereal potoki-core
          text
@@ -161599,25 +161096,6 @@ self: {
      }:
      mkDerivation {
        pname = "pretty-simple";
-       version = "2.1.0.0";
-       sha256 = "1jiq9l2zlgk3yzy6mif84fdzvwx3vzzbsh9zvwdph12zxa2y4b68";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-terminal base containers mtl parsec text transformers
-       ];
-       testHaskellDepends = [ base doctest Glob ];
-       benchmarkHaskellDepends = [ base criterion ];
-       description = "pretty printer for data types with a 'Show' instance";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pretty-simple_2_1_0_1" = callPackage
-    ({ mkDerivation, ansi-terminal, base, containers, criterion
-     , doctest, Glob, mtl, parsec, text, transformers
-     }:
-     mkDerivation {
-       pname = "pretty-simple";
        version = "2.1.0.1";
        sha256 = "1lfkbjpcgyiv915xvhpirhx8x7ng1jgrlxd6zlilcvnpkkm2xacs";
        isLibrary = true;
@@ -161629,7 +161107,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "pretty printer for data types with a 'Show' instance";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pretty-sop" = callPackage
@@ -163875,8 +163352,8 @@ self: {
        pname = "pseudo-boolean";
        version = "0.1.6.0";
        sha256 = "1v28vbhcrx0mvciazlanwyaxwav0gfjc7sxz7adgims7mj64g1ra";
-       revision = "1";
-       editedCabalFile = "11n7wcfpahbyg8lmq90vvq11fm2ls4761qf9q7pkbvd7vkm6by2n";
+       revision = "2";
+       editedCabalFile = "1wnp16zs9nx3b250cmh6j84scv821arc0grb8k08h0a3kphavqx1";
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-builder containers deepseq
          dlist hashable megaparsec parsec void
@@ -167784,27 +167261,6 @@ self: {
      }:
      mkDerivation {
        pname = "ratel";
-       version = "1.0.4";
-       sha256 = "14ivx9hb7hjy0i7ybz92mcr800zzfspfldzw9jr6qpmrnv43nqdd";
-       libraryHaskellDepends = [
-         aeson base bytestring case-insensitive containers http-client
-         http-client-tls http-types text uuid
-       ];
-       testHaskellDepends = [
-         aeson base bytestring case-insensitive containers filepath hspec
-         http-client http-client-tls http-types text uuid
-       ];
-       description = "Notify Honeybadger about exceptions";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ratel_1_0_5" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, case-insensitive
-     , containers, filepath, hspec, http-client, http-client-tls
-     , http-types, text, uuid
-     }:
-     mkDerivation {
-       pname = "ratel";
        version = "1.0.5";
        sha256 = "0an55fbl8q7d0h4zlpx8vg4kijwmw99f2fvf50nq06c6snlfjg4r";
        libraryHaskellDepends = [
@@ -167817,7 +167273,6 @@ self: {
        ];
        description = "Notify Honeybadger about exceptions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ratel-wai" = callPackage
@@ -167826,21 +167281,6 @@ self: {
      }:
      mkDerivation {
        pname = "ratel-wai";
-       version = "1.0.2";
-       sha256 = "07hpsmv3c75r8lc9fpa2mn5xsz5xml5nadzlzq8dihbgv6ma4mss";
-       libraryHaskellDepends = [
-         base bytestring case-insensitive containers http-client ratel wai
-       ];
-       description = "Notify Honeybadger about exceptions via a WAI middleware";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ratel-wai_1_0_3" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, containers
-     , http-client, ratel, wai
-     }:
-     mkDerivation {
-       pname = "ratel-wai";
        version = "1.0.3";
        sha256 = "0bkk41qk0040a6sbsc5ky968gw1y5501ji7l2040hwz8j4z8wm84";
        libraryHaskellDepends = [
@@ -167848,7 +167288,6 @@ self: {
        ];
        description = "Notify Honeybadger about exceptions via a WAI middleware";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rating-systems" = callPackage
@@ -167880,36 +167319,6 @@ self: {
      }:
      mkDerivation {
        pname = "rattletrap";
-       version = "4.1.1";
-       sha256 = "1wwglqr84ijzrbsrid5cfhm96ljnfdj59z766wjbr8fx5gmrcdfw";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty base binary binary-bits bytestring containers
-         filepath http-client http-client-tls template-haskell text
-         transformers
-       ];
-       executableHaskellDepends = [
-         aeson aeson-pretty base binary binary-bits bytestring containers
-         filepath http-client http-client-tls template-haskell text
-         transformers
-       ];
-       testHaskellDepends = [
-         aeson aeson-pretty base binary binary-bits bytestring containers
-         filepath http-client http-client-tls HUnit template-haskell
-         temporary text transformers
-       ];
-       description = "Parse and generate Rocket League replays";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "rattletrap_4_1_2" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits
-     , bytestring, containers, filepath, http-client, http-client-tls
-     , HUnit, template-haskell, temporary, text, transformers
-     }:
-     mkDerivation {
-       pname = "rattletrap";
        version = "4.1.2";
        sha256 = "0zmacxdf1k5mnvmrrkkvgjghzr4h948z5g73lavhmfg56i6vpkb2";
        isLibrary = true;
@@ -167931,7 +167340,6 @@ self: {
        ];
        description = "Parse and generate Rocket League replays";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "raven-haskell" = callPackage
@@ -170910,6 +170318,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "relational-query_0_12_1_0" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, dlist
+     , names-th, persistable-record, product-isomorphic
+     , quickcheck-simple, sql-words, template-haskell, text
+     , th-reify-compat, time, time-locale-compat, transformers
+     }:
+     mkDerivation {
+       pname = "relational-query";
+       version = "0.12.1.0";
+       sha256 = "1mdd3lh4kpqaa7l0aqnsnwgi95hbwh9p8dx61js8011wl50j9l9k";
+       libraryHaskellDepends = [
+         array base bytestring containers dlist names-th persistable-record
+         product-isomorphic sql-words template-haskell text th-reify-compat
+         time time-locale-compat transformers
+       ];
+       testHaskellDepends = [
+         base containers product-isomorphic quickcheck-simple transformers
+       ];
+       description = "Typeful, Modular, Relational, algebraic query engine";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "relational-query-HDBC" = callPackage
     ({ mkDerivation, base, containers, convertible, dlist, HDBC
      , HDBC-session, names-th, persistable-record, product-isomorphic
@@ -170919,8 +170350,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query-HDBC";
-       version = "0.7.0.0";
-       sha256 = "1kzryjkfkg4f616ijyx28p72v9a45gpvjs7jpksb1by24ll9ly46";
+       version = "0.7.0.1";
+       sha256 = "0dlg4ykjh0yjr2c2vrxhss1z33myc0z86im6am8b7g64rjaxhpm0";
        libraryHaskellDepends = [
          base containers convertible dlist HDBC HDBC-session names-th
          persistable-record product-isomorphic relational-query
@@ -170934,7 +170365,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "relational-query-HDBC_0_7_0_1" = callPackage
+  "relational-query-HDBC_0_7_1_1" = callPackage
     ({ mkDerivation, base, containers, convertible, dlist, HDBC
      , HDBC-session, names-th, persistable-record, product-isomorphic
      , QuickCheck, quickcheck-simple, relational-query
@@ -170943,8 +170374,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query-HDBC";
-       version = "0.7.0.1";
-       sha256 = "0dlg4ykjh0yjr2c2vrxhss1z33myc0z86im6am8b7g64rjaxhpm0";
+       version = "0.7.1.1";
+       sha256 = "0lgzkqx4nhvwrrgdrr423d4yyadf6x8l664030l2xi4zrxjws2mk";
        libraryHaskellDepends = [
          base containers convertible dlist HDBC HDBC-session names-th
          persistable-record product-isomorphic relational-query
@@ -175643,25 +175074,12 @@ self: {
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "salve";
-       version = "1.0.3";
-       sha256 = "1688sd4zrw8swb61svnjawaq7w85hgvh4ww7zz3yppl40sl82irj";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base doctest ];
-       description = "Semantic version numbers and constraints";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "salve_1_0_4" = callPackage
-    ({ mkDerivation, base, doctest }:
-     mkDerivation {
-       pname = "salve";
        version = "1.0.4";
        sha256 = "0q9z7smss3lf33lq982ghrq8dhv71cppc73zi61b22f0b076njvd";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        description = "Semantic version numbers and constraints";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "salvia" = callPackage
@@ -178169,16 +177587,16 @@ self: {
 
   "self-extract" = callPackage
     ({ mkDerivation, base, binary, bytestring, Cabal, extra, file-embed
-     , path, path-io, process, unix-compat, ztar
+     , path, path-io, unix-compat, ztar
      }:
      mkDerivation {
        pname = "self-extract";
-       version = "0.3.1";
-       sha256 = "01kzvjzb6rh86jzvh4n4802bvzgjz34rwmcrpm4aqzxpca9ax556";
+       version = "0.3.2";
+       sha256 = "0w4pqh9bcdnkyjmy24am2b894627x9is33vbyw03r0br9pd7q82q";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base binary bytestring Cabal extra file-embed path path-io process
+         base binary bytestring Cabal extra file-embed path path-io
          unix-compat ztar
        ];
        executableHaskellDepends = [ base ];
@@ -180999,8 +180417,8 @@ self: {
      }:
      mkDerivation {
        pname = "serverless-haskell";
-       version = "0.6.1";
-       sha256 = "1amv4plafwjnw2nd4hc429zpybvd70c4c76hvnmkwc4d13z3rh3b";
+       version = "0.6.2";
+       sha256 = "1nlby06n8wkildflwlszcy9iljji19mdfkaw0fnnll0l7gir14v5";
        libraryHaskellDepends = [
          aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
          amazonka-s3 base bytestring case-insensitive http-types iproute
@@ -181223,24 +180641,6 @@ self: {
 
   "servius" = callPackage
     ({ mkDerivation, base, blaze-builder, blaze-html, bytestring
-     , http-types, markdown, shakespeare, text, wai, wai-app-static
-     }:
-     mkDerivation {
-       pname = "servius";
-       version = "1.2.0.3";
-       sha256 = "1w330lvkikbsv92g398kmnlw71wym6l080d8xsdfdx2wwl0iyqj7";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base blaze-builder blaze-html bytestring http-types markdown
-         shakespeare text wai wai-app-static
-       ];
-       description = "Warp web server with template rendering";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "servius_1_2_1_0" = callPackage
-    ({ mkDerivation, base, blaze-builder, blaze-html, bytestring
      , cmark-gfm, http-types, shakespeare, text, wai, wai-app-static
      }:
      mkDerivation {
@@ -181255,7 +180655,6 @@ self: {
        ];
        description = "Warp web server with template rendering";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ses-html" = callPackage
@@ -183241,8 +182640,8 @@ self: {
        pname = "sign";
        version = "0.4.3";
        sha256 = "0i3m3zylss4nxmf290wmc8ldck0pnx0m5z4y8nhxnz51adlmp1bp";
-       revision = "1";
-       editedCabalFile = "112xj46k2fzhxiqsnh2fs7fmfrhs6k4q65jxw8mkn58mwl9sr86f";
+       revision = "2";
+       editedCabalFile = "1j4kxvxd3cl9k2nhlgnx8zrh1ygd0m75q0m2wrqcqv0pf1z39lya";
        libraryHaskellDepends = [
          base containers deepseq hashable lattices universe-base
        ];
@@ -184940,6 +184339,8 @@ self: {
        pname = "skylighting-core";
        version = "0.7.2";
        sha256 = "066fwmwsd7xcvwlinfk2izlzq0xp8697i6lnbgsbl71jdybyackq";
+       revision = "1";
+       editedCabalFile = "0qjmk3i9kjnd3195fhphjgqvsgbw6blfjl40mdyiblw1piyvc6yw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -185161,6 +184562,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "slick" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, containers, lens
+     , lens-aeson, mustache, pandoc, shake, text, time
+     }:
+     mkDerivation {
+       pname = "slick";
+       version = "0.1.0.0";
+       sha256 = "0irp1d9z5l8jr33qgbnkq05lpkpll6dw84qyl0cd2xnqs1iklyds";
+       libraryHaskellDepends = [
+         aeson base binary bytestring containers lens lens-aeson mustache
+         pandoc shake text time
+       ];
+       testHaskellDepends = [
+         aeson base binary bytestring containers lens lens-aeson mustache
+         pandoc shake text time
+       ];
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "slidemews" = callPackage
     ({ mkDerivation, aeson, base, bytestring, MonadCatchIO-transformers
      , mtl, pandoc, snap-core, snap-server, utf8-string
@@ -187690,6 +187110,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "solve" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "solve";
+       version = "1.0";
+       sha256 = "06sk2imqgzk9zjr10ignigs04avnjjxfsi2qkk7vqfslhcfzgqnq";
+       libraryHaskellDepends = [ base containers ];
+       description = "Solving simple games";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "sonic-visualiser" = callPackage
     ({ mkDerivation, array, base, bytestring, bzlib, containers, mtl
      , pretty, utf8-string, xml
@@ -192000,30 +191431,6 @@ self: {
      }:
      mkDerivation {
        pname = "stratosphere";
-       version = "0.24.1";
-       sha256 = "1kgky2713bik420i93k982zwlnp4ldr6lik2brg4nqwplwzf091i";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring containers hashable lens
-         template-haskell text unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson aeson-pretty base bytestring containers hashable hspec
-         hspec-discover lens template-haskell text unordered-containers
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "EDSL for AWS CloudFormation";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "stratosphere_0_24_3" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
-     , hashable, hspec, hspec-discover, lens, template-haskell, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "stratosphere";
        version = "0.24.3";
        sha256 = "1dvac89fzciklhkkagmhq93sk7mscnp3k4nw9izbfr5gyfdmvvdz";
        isLibrary = true;
@@ -192039,7 +191446,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "EDSL for AWS CloudFormation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stratum-tool" = callPackage
@@ -192281,24 +191687,25 @@ self: {
      }) {};
 
   "streaming-benchmarks" = callPackage
-    ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, conduit
-     , csv, deepseq, directory, gauge, list-t, list-transformer, logict
-     , machines, mtl, pipes, random, split, streaming, streamly, text
-     , transformers, typed-process, vector
+    ({ mkDerivation, base, bench-graph, bytestring, Chart
+     , Chart-diagrams, conduit, csv, deepseq, directory, drinkery, gauge
+     , getopt-generics, machines, mtl, pipes, random, split, streaming
+     , streamly, template-haskell, text, transformers, typed-process
+     , vector
      }:
      mkDerivation {
        pname = "streaming-benchmarks";
-       version = "0.1.0";
-       sha256 = "0nyv4z828fj8jhan7q0bx2s351xmbxz9z81g2x3nyk4ad1rqjpyq";
+       version = "0.2.0";
+       sha256 = "1vpflmvz2vrll9bangl61rdjnngdxbrmpzg3xha8h85ij3458c0x";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base bytestring Chart Chart-diagrams csv directory split text
-         typed-process
+         base bench-graph bytestring Chart Chart-diagrams csv directory
+         getopt-generics split text transformers typed-process
        ];
        benchmarkHaskellDepends = [
-         base conduit deepseq gauge list-t list-transformer logict machines
-         mtl pipes random streaming streamly transformers vector
+         base conduit deepseq drinkery gauge machines mtl pipes random
+         streaming streamly template-haskell transformers vector
        ];
        description = "Benchmarks to compare streaming packages";
        license = stdenv.lib.licenses.mit;
@@ -193373,29 +192780,6 @@ self: {
      }:
      mkDerivation {
        pname = "strive";
-       version = "5.0.5";
-       sha256 = "1kzkhq791ycx5q20vg6pfl1y1mirlk9h00s4ii1pf5l56lw6kgq1";
-       libraryHaskellDepends = [
-         aeson base bytestring data-default gpolyline http-client
-         http-client-tls http-types template-haskell text time transformers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring data-default gpolyline http-client
-         http-client-tls http-types markdown-unlit template-haskell text
-         time transformers
-       ];
-       testToolDepends = [ markdown-unlit ];
-       description = "A client for the Strava V3 API";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "strive_5_0_6" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline
-     , http-client, http-client-tls, http-types, markdown-unlit
-     , template-haskell, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "strive";
        version = "5.0.6";
        sha256 = "0dpf986nbsz5j47dl26073qyz290nznghi85mzj2gw0rlj9dp937";
        libraryHaskellDepends = [
@@ -193410,7 +192794,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "A client for the Strava V3 API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strptime" = callPackage
@@ -193486,8 +192869,8 @@ self: {
      }:
      mkDerivation {
        pname = "structured-cli";
-       version = "0.9.3.1";
-       sha256 = "0cw358jcdmlvgxsl2cjpb6gfyjizhxhsvlwqh52cwrs87sg9vpsp";
+       version = "0.9.4.0";
+       sha256 = "1mwrr0brmjb15ncjqapqaslrz3akzn3bs3ajnwsa1d0ji25l2igd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -194062,6 +193445,33 @@ self: {
        license = stdenv.lib.licenses.mpl20;
      }) {};
 
+  "summoner_1_0_5" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, bytestring, directory
+     , filepath, generic-deriving, hedgehog, neat-interpolation
+     , optparse-applicative, process, tasty, tasty-discover
+     , tasty-hedgehog, text, time, tomland, universum
+     }:
+     mkDerivation {
+       pname = "summoner";
+       version = "1.0.5";
+       sha256 = "0sxgg1g2d6pwvmp0rbyny3cizbajd0iq2wdyxspfw3rapkjap5j2";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal base bytestring directory filepath
+         generic-deriving neat-interpolation optparse-applicative process
+         text time tomland universum
+       ];
+       executableHaskellDepends = [ base universum ];
+       testHaskellDepends = [
+         base hedgehog tasty tasty-hedgehog universum
+       ];
+       testToolDepends = [ tasty-discover ];
+       description = "Tool for creating completely configured production Haskell projects";
+       license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sump" = callPackage
     ({ mkDerivation, base, bytestring, data-default, lens, serialport
      , transformers, vector
@@ -194379,8 +193789,8 @@ self: {
      }:
      mkDerivation {
        pname = "superrecord";
-       version = "0.5.0.0";
-       sha256 = "1bg2kjkwl78lhf34j1xb20lpypp26bavd0h6cnhj4m6d4sq3z86a";
+       version = "0.5.0.1";
+       sha256 = "0l1zimami83701djj47nk3izb10m6jxszq52zwmb8411dbn9pclb";
        libraryHaskellDepends = [
          aeson base bytestring constraints deepseq ghc-prim mtl text
        ];
@@ -212003,22 +211413,6 @@ self: {
      }:
      mkDerivation {
        pname = "vector-sized";
-       version = "1.0.3.0";
-       sha256 = "1mjg8hncv7xd3w7fsdalvhwiwnsr83nxv21njc01bgj891as44bx";
-       libraryHaskellDepends = [
-         adjunctions base deepseq distributive finite-typelits
-         indexed-list-literals primitive vector
-       ];
-       description = "Size tagged vectors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "vector-sized_1_0_4_0" = callPackage
-    ({ mkDerivation, adjunctions, base, deepseq, distributive
-     , finite-typelits, indexed-list-literals, primitive, vector
-     }:
-     mkDerivation {
-       pname = "vector-sized";
        version = "1.0.4.0";
        sha256 = "1rdryc5ykqvdpjgx3a895cx2i14ixg0ryhppn89fjzhann79mgk4";
        libraryHaskellDepends = [
@@ -212027,7 +211421,6 @@ self: {
        ];
        description = "Size tagged vectors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-space" = callPackage
@@ -212436,24 +211829,6 @@ self: {
      }:
      mkDerivation {
        pname = "viewprof";
-       version = "0.0.0.18";
-       sha256 = "1cf37vhj21yd6d1bia7jlwwc0bw6d2lwj7wkl936argn3zzxrqf6";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base brick containers directory ghc-prof lens scientific text
-         vector vector-algorithms vty
-       ];
-       description = "Text-based interactive GHC .prof viewer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "viewprof_0_0_0_19" = callPackage
-    ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens
-     , scientific, text, vector, vector-algorithms, vty
-     }:
-     mkDerivation {
-       pname = "viewprof";
        version = "0.0.0.19";
        sha256 = "1v8lnc3naklznwrla34zgx4hf5vzb2762f9p1cxkb5fdnwslbmlc";
        isLibrary = false;
@@ -212464,7 +211839,6 @@ self: {
        ];
        description = "Text-based interactive GHC .prof viewer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "views" = callPackage
@@ -213545,36 +212919,6 @@ self: {
      }:
      mkDerivation {
        pname = "wai-extra";
-       version = "3.0.22.1";
-       sha256 = "0bvj0nc3m314hh6n4rpz6dzb4bqg24b1sz4x0w7bj5ah8msr0z3y";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-terminal base base64-bytestring bytestring
-         case-insensitive containers cookie data-default-class deepseq
-         directory fast-logger http-types iproute lifted-base network
-         old-locale resourcet streaming-commons stringsearch text time
-         transformers unix unix-compat vault void wai wai-logger word8 zlib
-       ];
-       testHaskellDepends = [
-         base bytestring case-insensitive cookie fast-logger hspec
-         http-types HUnit resourcet text time transformers wai zlib
-       ];
-       description = "Provides some basic WAI handlers and middleware";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wai-extra_3_0_23_0" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
-     , bytestring, case-insensitive, containers, cookie
-     , data-default-class, deepseq, directory, fast-logger, hspec
-     , http-types, HUnit, iproute, lifted-base, network, old-locale
-     , resourcet, streaming-commons, stringsearch, text, time
-     , transformers, unix, unix-compat, vault, void, wai, wai-logger
-     , word8, zlib
-     }:
-     mkDerivation {
-       pname = "wai-extra";
        version = "3.0.23.0";
        sha256 = "10chij5jy057q1c4zybmb6jq5kff9i9iqijz31q51s6l0fh1zkw8";
        isLibrary = true;
@@ -213592,7 +212936,6 @@ self: {
        ];
        description = "Provides some basic WAI handlers and middleware";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-frontend-monadcgi" = callPackage
@@ -215051,40 +214394,6 @@ self: {
      }:
      mkDerivation {
        pname = "warp";
-       version = "3.2.22";
-       sha256 = "03jrby2q3xb16xgbmlk3yl36g1mnwq56lj62whks438568626nv4";
-       libraryHaskellDepends = [
-         array async auto-update base bsb-http-chunked bytestring
-         case-insensitive containers ghc-prim hashable http-date http-types
-         http2 iproute network simple-sendfile stm streaming-commons text
-         unix unix-compat vault wai word8
-       ];
-       testHaskellDepends = [
-         array async auto-update base bsb-http-chunked bytestring
-         case-insensitive containers directory doctest ghc-prim hashable
-         hspec http-client http-date http-types http2 HUnit iproute
-         lifted-base network process QuickCheck silently simple-sendfile stm
-         streaming-commons text time transformers unix unix-compat vault wai
-         word8
-       ];
-       benchmarkHaskellDepends = [
-         auto-update base bytestring containers gauge hashable http-date
-         http-types network unix unix-compat
-       ];
-       description = "A fast, light-weight web server for WAI applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "warp_3_2_23" = callPackage
-    ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
-     , bytestring, case-insensitive, containers, directory, doctest
-     , gauge, ghc-prim, hashable, hspec, http-client, http-date
-     , http-types, http2, HUnit, iproute, lifted-base, network, process
-     , QuickCheck, silently, simple-sendfile, stm, streaming-commons
-     , text, time, transformers, unix, unix-compat, vault, wai, word8
-     }:
-     mkDerivation {
-       pname = "warp";
        version = "3.2.23";
        sha256 = "12v9qhi4hyp0sb90yddsax16jj7x47nmqwn53sv7b5nszcxgzam0";
        libraryHaskellDepends = [
@@ -215107,7 +214416,6 @@ self: {
        ];
        description = "A fast, light-weight web server for WAI applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "warp-dynamic" = callPackage
@@ -218396,20 +217704,6 @@ self: {
      }:
      mkDerivation {
        pname = "wuss";
-       version = "1.1.9";
-       sha256 = "1la0zvdsb1w0k2sj8f9wrnsirljjnbx0a1kalzwalh6d82h2jd9z";
-       libraryHaskellDepends = [
-         base bytestring connection network websockets
-       ];
-       description = "Secure WebSocket (WSS) clients";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wuss_1_1_10" = callPackage
-    ({ mkDerivation, base, bytestring, connection, network, websockets
-     }:
-     mkDerivation {
-       pname = "wuss";
        version = "1.1.10";
        sha256 = "0l4mlmr3b8ndx4nmb3rf0n0bpjxhzxmqv1mslxl432kf02312z09";
        libraryHaskellDepends = [
@@ -218417,7 +217711,6 @@ self: {
        ];
        description = "Secure WebSocket (WSS) clients";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wx" = callPackage
@@ -221047,14 +220340,14 @@ self: {
 
   "yaml" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
-     , conduit, containers, directory, filepath, hspec, HUnit, libyaml
-     , mockery, resourcet, scientific, semigroups, template-haskell
-     , temporary, text, transformers, unordered-containers, vector
+     , conduit, containers, directory, filepath, hspec, HUnit, mockery
+     , resourcet, scientific, semigroups, template-haskell, temporary
+     , text, transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "yaml";
-       version = "0.8.31.1";
-       sha256 = "0lwbdlz2r54nvdr5snmjp5lnkv6wwk118bhy13v1vjz62wclb88v";
+       version = "0.8.32";
+       sha256 = "0cbsyh4ilvjzq1q7pxls43k6pdqxg1l85xzibcwpbvmlvrizh86w";
        configureFlags = [ "-fsystem-libyaml" ];
        isLibrary = true;
        isExecutable = true;
@@ -221063,15 +220356,15 @@ self: {
          filepath resourcet scientific semigroups template-haskell text
          transformers unordered-containers vector
        ];
-       libraryPkgconfigDepends = [ libyaml ];
        testHaskellDepends = [
-         aeson base base-compat bytestring conduit directory hspec HUnit
-         mockery resourcet temporary text transformers unordered-containers
-         vector
+         aeson attoparsec base base-compat bytestring conduit containers
+         directory filepath hspec HUnit mockery resourcet scientific
+         semigroups template-haskell temporary text transformers
+         unordered-containers vector
        ];
        description = "Support for parsing and rendering YAML documents";
        license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) libyaml;};
+     }) {};
 
   "yaml_0_9_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
@@ -221646,6 +220939,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yeshql_4_1_0_1" = callPackage
+    ({ mkDerivation, base, yeshql-core, yeshql-hdbc }:
+     mkDerivation {
+       pname = "yeshql";
+       version = "4.1.0.1";
+       sha256 = "1dlxq8vp18fagfymlzqa4j0ns174s31d7p1vi54wz0b55ml91if4";
+       libraryHaskellDepends = [ base yeshql-core yeshql-hdbc ];
+       description = "YesQL-style SQL database abstraction (legacy compatibility wrapper)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yeshql-core" = callPackage
     ({ mkDerivation, base, containers, convertible, filepath, parsec
      , stm, tasty, tasty-hunit, tasty-quickcheck, template-haskell
@@ -221665,6 +220970,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yeshql-core_4_1_0_1" = callPackage
+    ({ mkDerivation, base, containers, convertible, filepath, parsec
+     , stm, tasty, tasty-hunit, tasty-quickcheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "yeshql-core";
+       version = "4.1.0.1";
+       sha256 = "1v15n7h69j6v3zgvdbvy08l8in9z3yl9cbbfny4998i4p7fl2nzn";
+       libraryHaskellDepends = [
+         base containers convertible filepath parsec template-haskell
+       ];
+       testHaskellDepends = [
+         base containers stm tasty tasty-hunit tasty-quickcheck
+       ];
+       description = "YesQL-style SQL database abstraction (core)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yeshql-hdbc" = callPackage
     ({ mkDerivation, base, containers, convertible, filepath, HDBC
      , parsec, stm, tasty, tasty-hunit, tasty-quickcheck
@@ -221686,6 +221010,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yeshql-hdbc_4_1_0_1" = callPackage
+    ({ mkDerivation, base, containers, convertible, filepath, HDBC
+     , parsec, stm, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, yeshql-core
+     }:
+     mkDerivation {
+       pname = "yeshql-hdbc";
+       version = "4.1.0.1";
+       sha256 = "0a5wkjkq1lfqk5cv7wmxbx28j6r3xqj8bbkafxfjvs2s02x4qvvc";
+       libraryHaskellDepends = [
+         base containers convertible filepath HDBC parsec template-haskell
+         yeshql-core
+       ];
+       testHaskellDepends = [
+         base containers HDBC stm tasty tasty-hunit tasty-quickcheck
+       ];
+       description = "YesQL-style SQL database abstraction (HDBC backend)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yeshql-postgresql-simple" = callPackage
     ({ mkDerivation, base, bytestring, containers, convertible
      , filepath, parsec, postgresql-simple, stm, tasty, tasty-hunit
@@ -221693,8 +221038,8 @@ self: {
      }:
      mkDerivation {
        pname = "yeshql-postgresql-simple";
-       version = "4.1.0.0";
-       sha256 = "1dnwlrgnxg3gvfg6xmfrxqvqbi73402g9m82phqb6s624ifjir0c";
+       version = "4.1.0.1";
+       sha256 = "09sypmx1w5shn8sazhll02a4yjdhrrxr3cic74vr7ch08pjpkkyq";
        libraryHaskellDepends = [
          base containers convertible filepath parsec postgresql-simple
          template-haskell yeshql-core
@@ -221833,35 +221178,6 @@ self: {
   "yesod-auth" = callPackage
     ({ mkDerivation, aeson, authenticate, base, base16-bytestring
      , base64-bytestring, binary, blaze-builder, blaze-html
-     , blaze-markup, byteable, bytestring, conduit, conduit-extra
-     , containers, cryptonite, data-default, email-validate, file-embed
-     , http-client, http-client-tls, http-conduit, http-types, memory
-     , mime-mail, network-uri, nonce, persistent, persistent-template
-     , random, resourcet, safe, shakespeare, template-haskell, text
-     , time, transformers, unliftio, unliftio-core, unordered-containers
-     , wai, yesod-core, yesod-form, yesod-persistent
-     }:
-     mkDerivation {
-       pname = "yesod-auth";
-       version = "1.6.3";
-       sha256 = "1f4qhsfgar7c2yq7rsm7g3wndg6hhwbmcmjz8dbljdwmzmxl5px0";
-       libraryHaskellDepends = [
-         aeson authenticate base base16-bytestring base64-bytestring binary
-         blaze-builder blaze-html blaze-markup byteable bytestring conduit
-         conduit-extra containers cryptonite data-default email-validate
-         file-embed http-client http-client-tls http-conduit http-types
-         memory mime-mail network-uri nonce persistent persistent-template
-         random resourcet safe shakespeare template-haskell text time
-         transformers unliftio unliftio-core unordered-containers wai
-         yesod-core yesod-form yesod-persistent
-       ];
-       description = "Authentication for Yesod";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-auth_1_6_4_1" = callPackage
-    ({ mkDerivation, aeson, authenticate, base, base16-bytestring
-     , base64-bytestring, binary, blaze-builder, blaze-html
      , blaze-markup, bytestring, conduit, conduit-extra, containers
      , cryptonite, data-default, email-validate, file-embed, http-client
      , http-client-tls, http-conduit, http-types, memory, network-uri
@@ -221885,7 +221201,6 @@ self: {
        ];
        description = "Authentication for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-account" = callPackage
@@ -222421,45 +221736,6 @@ self: {
     ({ mkDerivation, aeson, async, auto-update, base, blaze-html
      , blaze-markup, byteable, bytestring, case-insensitive, cereal
      , clientsession, conduit, conduit-extra, containers, cookie
-     , deepseq, deepseq-generics, directory, fast-logger, gauge, hspec
-     , hspec-expectations, http-types, HUnit, monad-logger, mtl, network
-     , old-locale, parsec, path-pieces, primitive, QuickCheck, random
-     , resourcet, safe, semigroups, shakespeare, streaming-commons
-     , template-haskell, text, time, transformers, unix-compat, unliftio
-     , unordered-containers, vector, wai, wai-extra, wai-logger, warp
-     , word8
-     }:
-     mkDerivation {
-       pname = "yesod-core";
-       version = "1.6.5";
-       sha256 = "0yj06bfw7cln4waf76nfj1dm1f5fd13i896f5iy33035xc0bwiml";
-       libraryHaskellDepends = [
-         aeson auto-update base blaze-html blaze-markup byteable bytestring
-         case-insensitive cereal clientsession conduit conduit-extra
-         containers cookie deepseq deepseq-generics directory fast-logger
-         http-types monad-logger mtl old-locale parsec path-pieces primitive
-         random resourcet safe semigroups shakespeare template-haskell text
-         time transformers unix-compat unliftio unordered-containers vector
-         wai wai-extra wai-logger warp word8
-       ];
-       testHaskellDepends = [
-         async base bytestring clientsession conduit conduit-extra
-         containers cookie hspec hspec-expectations http-types HUnit network
-         path-pieces QuickCheck random resourcet shakespeare
-         streaming-commons template-haskell text transformers unliftio wai
-         wai-extra
-       ];
-       benchmarkHaskellDepends = [
-         base blaze-html bytestring gauge shakespeare text transformers
-       ];
-       description = "Creation of type-safe, RESTful web applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-core_1_6_6" = callPackage
-    ({ mkDerivation, aeson, async, auto-update, base, blaze-html
-     , blaze-markup, byteable, bytestring, case-insensitive, cereal
-     , clientsession, conduit, conduit-extra, containers, cookie
      , deepseq, fast-logger, gauge, hspec, hspec-expectations
      , http-types, HUnit, monad-logger, mtl, network, parsec
      , path-pieces, random, resourcet, rio, shakespeare
@@ -222490,7 +221766,6 @@ self: {
        ];
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-crud" = callPackage
@@ -222755,29 +222030,6 @@ self: {
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, byteable, bytestring, containers, data-default
      , email-validate, hspec, network-uri, persistent, resourcet
-     , semigroups, shakespeare, template-haskell, text, time
-     , transformers, wai, xss-sanitize, yesod-core, yesod-persistent
-     }:
-     mkDerivation {
-       pname = "yesod-form";
-       version = "1.6.1";
-       sha256 = "05pnsgnhcsq74w91r74p8psh567yxbmyhddj04mnrfzlzzm19zxq";
-       libraryHaskellDepends = [
-         aeson attoparsec base blaze-builder blaze-html blaze-markup
-         byteable bytestring containers data-default email-validate
-         network-uri persistent resourcet semigroups shakespeare
-         template-haskell text time transformers wai xss-sanitize yesod-core
-         yesod-persistent
-       ];
-       testHaskellDepends = [ base hspec text time ];
-       description = "Form handling support for Yesod Web Framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-form_1_6_2" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
-     , blaze-markup, byteable, bytestring, containers, data-default
-     , email-validate, hspec, network-uri, persistent, resourcet
      , semigroups, shakespeare, text, time, transformers, wai
      , xss-sanitize, yesod-core, yesod-persistent
      }:
@@ -222794,23 +222046,9 @@ self: {
        testHaskellDepends = [ base hspec text time ];
        description = "Form handling support for Yesod Web Framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-form-bootstrap4" = callPackage
-    ({ mkDerivation, base, shakespeare, text, yesod-core, yesod-form }:
-     mkDerivation {
-       pname = "yesod-form-bootstrap4";
-       version = "1.0.0";
-       sha256 = "0z19w6d612qxl0w6nmq2vc467s9s9q6ncbjjc2l620px2i7iqrfq";
-       libraryHaskellDepends = [
-         base shakespeare text yesod-core yesod-form
-       ];
-       description = "renderBootstrap4";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-form-bootstrap4_1_0_2" = callPackage
     ({ mkDerivation, base, text, yesod-core, yesod-form }:
      mkDerivation {
        pname = "yesod-form-bootstrap4";
@@ -222819,7 +222057,6 @@ self: {
        libraryHaskellDepends = [ base text yesod-core yesod-form ];
        description = "renderBootstrap4";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-form-bulma" = callPackage
@@ -223719,32 +222956,6 @@ self: {
 
   "yesod-test" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
-     , blaze-markup, bytestring, case-insensitive, conduit, containers
-     , cookie, hspec, hspec-core, html-conduit, http-types, HUnit
-     , network, persistent, pretty-show, semigroups, text, time
-     , transformers, unliftio, wai, wai-extra, xml-conduit, xml-types
-     , yesod-core, yesod-form
-     }:
-     mkDerivation {
-       pname = "yesod-test";
-       version = "1.6.4";
-       sha256 = "0nxrscg4rxdwvivpxfsc735zr8w72w5vrlgaw1mq6ikn4cwidyng";
-       libraryHaskellDepends = [
-         attoparsec base blaze-builder blaze-html blaze-markup bytestring
-         case-insensitive conduit containers cookie hspec-core html-conduit
-         http-types HUnit network persistent pretty-show semigroups text
-         time transformers wai wai-extra xml-conduit xml-types yesod-core
-       ];
-       testHaskellDepends = [
-         base bytestring containers hspec html-conduit http-types HUnit text
-         unliftio wai wai-extra xml-conduit yesod-core yesod-form
-       ];
-       description = "integration testing for WAI/Yesod Applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-test_1_6_5" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
      , bytestring, case-insensitive, conduit, containers, cookie, hspec
      , hspec-core, html-conduit, http-types, HUnit, network, pretty-show
      , semigroups, text, time, transformers, unliftio, wai, wai-extra
@@ -223766,7 +222977,6 @@ self: {
        ];
        description = "integration testing for WAI/Yesod Applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-test-json" = callPackage
@@ -225651,8 +224861,8 @@ self: {
     ({ mkDerivation, base, binary, bytestring, containers }:
      mkDerivation {
        pname = "zmidi-core";
-       version = "0.8.2";
-       sha256 = "02895shbxbswnczgljafr9k7vfrxg7w2sqhnlx8azixkw84lk5mh";
+       version = "0.9.0";
+       sha256 = "127c36pdp7rq03amz6r3pji1crw0f7q5xp0baf782yq71fjgy4c5";
        libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Read and write MIDI files";
        license = stdenv.lib.licenses.bsd3;
@@ -225904,18 +225114,21 @@ self: {
      }) {};
 
   "ztar" = callPackage
-    ({ mkDerivation, base, bytestring, directory, extra, filepath, path
-     , path-io, QuickCheck, tar, tasty, tasty-quickcheck, zip, zlib
+    ({ mkDerivation, base, bytestring, bytestring-arbitrary, deepseq
+     , directory, extra, filepath, path, path-io, process, QuickCheck
+     , tasty, tasty-quickcheck, text, unix-compat, zip, zlib
      }:
      mkDerivation {
        pname = "ztar";
-       version = "0.1.0";
-       sha256 = "12jndqj9ls67wdx840c25zrvms2s3prbb59scc9dgi93zb6s0k9d";
+       version = "0.1.3";
+       sha256 = "12pzskr90a724x3wh1dsbpbszh6a58lbp4sxl7sd7s1bk3m2kgq1";
        libraryHaskellDepends = [
-         base bytestring directory filepath path tar zip zlib
+         base bytestring deepseq directory filepath path process text
+         unix-compat zip zlib
        ];
        testHaskellDepends = [
-         base extra path path-io QuickCheck tasty tasty-quickcheck
+         base bytestring bytestring-arbitrary extra path path-io QuickCheck
+         tasty tasty-quickcheck
        ];
        description = "Creating and extracting arbitrary archives";
        license = stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 87ac65307aa..95dac230cc5 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -128,7 +128,7 @@ let
       preferLocalBuild = true;
       phases = ["installPhase"];
       LANG = "en_US.UTF-8";
-      LOCALE_ARCHIVE = pkgs.lib.optionalString buildPlatform.isLinux "${buildPackages.glibcLocales}/lib/locale/locale-archive";
+      LOCALE_ARCHIVE = pkgs.lib.optionalString (buildPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive";
       installPhase = ''
         export HOME="$TMP"
         mkdir -p "$out"
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 36d1a8326e7..d002f6eb31c 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -5,7 +5,7 @@
 , readline, sqlite
 , disableDocs ? false
 , CoreFoundation
-, gsettings_desktop_schemas
+, gsettings-desktop-schemas
 }:
 
 let
@@ -20,7 +20,7 @@ let
     glib
     gmp
     gtk3
-    gsettings_desktop_schemas
+    gsettings-desktop-schemas
     libedit
     libjpeg
     libpng
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     (stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation")
   ];
 
-  buildInputs = [ fontconfig libffi libtool makeWrapper sqlite gsettings_desktop_schemas gtk3 ]
+  buildInputs = [ fontconfig libffi libtool makeWrapper sqlite gsettings-desktop-schemas gtk3 ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation ];
 
   preConfigure = ''
diff --git a/pkgs/development/libraries/elementary-cmake-modules/default.nix b/pkgs/development/libraries/elementary-cmake-modules/default.nix
index 5287db75609..710338842f8 100644
--- a/pkgs/development/libraries/elementary-cmake-modules/default.nix
+++ b/pkgs/development/libraries/elementary-cmake-modules/default.nix
@@ -1,7 +1,8 @@
 { stdenv, lib, fetchFromGitHub, cmake, pkgconfig }:
 
-stdenv.mkDerivation {
-  name = "elementary-cmake-modules";
+stdenv.mkDerivation rec {
+  name = "elementary-cmake-modules-${version}";
+  version = "0.1.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
index a229beb5ccb..b8b55d6a874 100644
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/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
-, gobjectIntrospection, gtk_doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc
-, bubblewrap, bzip2, dbus, glib, gpgme, json_glib, libarchive, libcap, libseccomp, coreutils, python2, hicolor-icon-theme
-, libsoup, lzma, ostree, polkit, python3, systemd, xlibs, valgrind, glib_networking, makeWrapper, gnome3 }:
+, gobjectIntrospection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc
+, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, python2, hicolor-icon-theme
+, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, makeWrapper, gnome3 }:
 
 let
   version = "0.99.3";
@@ -28,12 +28,12 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoreconfHook libxml2 docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 docbook_xsl which gobjectIntrospection
-    gtk_doc intltool libxslt pkgconfig xmlto appstream-glib yacc makeWrapper
+    gtk-doc intltool libxslt pkgconfig xmlto appstream-glib yacc makeWrapper
   ] ++ stdenv.lib.optionals doCheck checkInputs;
 
   buildInputs = [
-    bubblewrap bzip2 dbus glib gpgme json_glib libarchive libcap libseccomp
-    libsoup lzma ostree polkit python3 systemd xlibs.libXau
+    bubblewrap bzip2 dbus glib gpgme json-glib libarchive libcap libseccomp
+    libsoup lzma ostree polkit python3 systemd xorg.libXau
   ];
 
   checkInputs = [ valgrind ];
@@ -60,7 +60,7 @@ in stdenv.mkDerivation rec {
 
   postFixup = ''
     wrapProgram $out/bin/flatpak \
-      --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \
+      --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \
       --prefix XDG_DATA_DIRS : "${desktop_schemas}/share/gsettings-schemas/${desktop_schemas.name}"
   '';
 
diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix
index 67bf7503db9..2b3f75b80db 100644
--- a/pkgs/development/libraries/flint/default.nix
+++ b/pkgs/development/libraries/flint/default.nix
@@ -37,6 +37,10 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optionals withBlas [
     "--with-blas=${openblas}"
   ];
+
+  # issues with ntl -- https://github.com/wbhart/flint2/issues/487
+  NIX_CFLAGS_COMPILE = [ "-std=c++11" ];
+
   patches = [
     (fetchpatch {
       # Always produce libflint.so.MAJOR; will be included in the next flint version
diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix
index 5796425e438..56d8cd21f84 100644
--- a/pkgs/development/libraries/geis/default.nix
+++ b/pkgs/development/libraries/geis/default.nix
@@ -3,7 +3,7 @@
 , python3Packages
 , wrapGAppsHook
 , atk
-, dbus_libs
+, dbus
 , evemu
 , frame
 , gdk_pixbuf
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     [ pygobject3  ];
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook python3Packages.wrapPython];
-  buildInputs = [ atk dbus_libs evemu frame gdk_pixbuf gobjectIntrospection grail
+  buildInputs = [ atk dbus evemu frame gdk_pixbuf gobjectIntrospection grail
     gtk3 libX11 libXext libXi libXtst pango python3Packages.python xorgserver
   ];
 
diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix
index fafcf82258a..af0830ab704 100644
--- a/pkgs/development/libraries/glew/1.10.nix
+++ b/pkgs/development/libraries/glew/1.10.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libGLU, x11, libXmu, libXi
+{ stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi
 , buildPlatform, hostPlatform
 , AGL ? null
 }:
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
     sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r";
   };
 
-  buildInputs = [ x11 libXmu libXi ] ++ optionals stdenv.isDarwin [ AGL ];
+  buildInputs = [ xlibsWrapper libXmu libXi ]
+              ++ optionals stdenv.isDarwin [ AGL ];
   propagatedBuildInputs = [ libGLU ]; # GL/glew.h includes GL/glu.h
 
   patchPhase = ''
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index ff870f525f2..fd6e0a65abc 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -4,7 +4,8 @@
 , utillinuxMinimal ? null
 
 # this is just for tests (not in closure of any regular package)
-, coreutils, dbus_daemon, libxml2, tzdata, desktop-file-utils, shared-mime-info, doCheck ? false
+, coreutils, dbus, libxml2, tzdata, desktop-file-utils
+, shared-mime-info, doCheck ? false
 }:
 
 with stdenv.lib;
@@ -121,7 +122,7 @@ stdenv.mkDerivation rec {
     export XDG_RUNTIME_HOME="$TMP"
     export HOME="$TMP"
     export XDG_DATA_DIRS="${desktop-file-utils}/share:${shared-mime-info}/share"
-    export G_TEST_DBUS_DAEMON="${dbus_daemon.out}/bin/dbus-daemon"
+    export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon"
     export PATH="$PATH:$(pwd)/gobject"
     echo "PATH=$PATH"
 
diff --git a/pkgs/development/libraries/gupnp-dlna/default.nix b/pkgs/development/libraries/gupnp-dlna/default.nix
index 642e10ea541..75818f75692 100644
--- a/pkgs/development/libraries/gupnp-dlna/default.nix
+++ b/pkgs/development/libraries/gupnp-dlna/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig,  gobjectIntrospection, gupnp, gst_plugins_base }:
+{ stdenv, fetchurl, pkgconfig,  gobjectIntrospection, gupnp, gst-plugins-base }:
 
 stdenv.mkDerivation rec {
   name = "gupnp-dlna-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
-  buildInputs = [ gupnp gst_plugins_base ];
+  buildInputs = [ gupnp gst-plugins-base ];
 
   meta = {
     homepage = https://wiki.gnome.org/Projects/GUPnP/;
diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch
index a74340a6dc9..66f10f4abc1 100644
--- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch
+++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch
@@ -1,21 +1,23 @@
-Index: extra-cmake-modules-5.18.0/kde-modules/KDEInstallDirs.cmake
-===================================================================
---- extra-cmake-modules-5.18.0.orig/kde-modules/KDEInstallDirs.cmake
-+++ extra-cmake-modules-5.18.0/kde-modules/KDEInstallDirs.cmake
-@@ -200,32 +200,6 @@
+diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
+index 52b2eb2..a04596c 100644
+--- a/kde-modules/KDEInstallDirs.cmake
++++ b/kde-modules/KDEInstallDirs.cmake
+@@ -232,34 +232,6 @@
  # GNUInstallDirs code deals with re-configuring, but that is dealt with
  # by the _define_* macros in this module).
  set(_LIBDIR_DEFAULT "lib")
 -# Override this default 'lib' with 'lib64' iff:
 -#  - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
 -#  - we are NOT on debian
+-#  - we are NOT on flatpak
 -#  - we are on a 64 bits system
 -# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
 -# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
 -# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
 -# See http://wiki.debian.org/Multiarch
 -if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
--   AND NOT CMAKE_CROSSCOMPILING)
+-   AND NOT CMAKE_CROSSCOMPILING
+-   AND NOT DEFINED ENV{FLATPAK_ID})
 -  if (EXISTS "/etc/debian_version") # is this a debian system ?
 -    if(CMAKE_LIBRARY_ARCHITECTURE)
 -      set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index 9b4f26a9063..1d389f914dd 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.47/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.48/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
index 0a600fe8d05..68b5c08aa09 100644
--- a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
@@ -1,6 +1,6 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, docbook_xml_dtd_45, docbook5_xsl,
+  extra-cmake-modules, docbook_xml_dtd_45, docbook_xsl_ns,
   karchive, ki18n, qtbase,
   perl, perlPackages
 }:
@@ -24,7 +24,7 @@ mkDerivation {
   patches = [ ./kdoctools-no-find-docbook-xml.patch ];
   cmakeFlags = [
     "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
-    "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"
+    "-DDocBookXSL_DIR=${docbook_xsl_ns}/xml/xsl/docbook"
   ];
   postFixup = ''
     moveToOutput "share/doc" "$dev"
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index d0db2284509..1ad2254ccf8 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -3,627 +3,627 @@
 
 {
   attica = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/attica-5.47.0.tar.xz";
-      sha256 = "17i580hhi9rpd6d4nf408snlnf8xivwskkzbjja0snajx0nrd8bj";
-      name = "attica-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/attica-5.48.0.tar.xz";
+      sha256 = "1q2133gmhfi3wd9978556syzzqc1s6zgjc0p1353w6dmfwxfyzq8";
+      name = "attica-5.48.0.tar.xz";
     };
   };
   baloo = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/baloo-5.47.0.tar.xz";
-      sha256 = "15jpbl47pr86h5ji2x3079b6x38fchc2pf03rjqlf5mgkabdpafq";
-      name = "baloo-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/baloo-5.48.0.tar.xz";
+      sha256 = "0rgz2gx99c1k8vgfskx7w6q1sjf98wcvybv88djdlj2s6h2qn8lj";
+      name = "baloo-5.48.0.tar.xz";
     };
   };
   bluez-qt = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/bluez-qt-5.47.0.tar.xz";
-      sha256 = "1pqgvpgr9xmgv8cxgvqx08jnabgmgzh2skkhwc9d9rdc2i4g7b1k";
-      name = "bluez-qt-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/bluez-qt-5.48.0.tar.xz";
+      sha256 = "149px5gnplk0y7cl3cz258qks3rq5p0kkk9rc48y59zvlxiyy949";
+      name = "bluez-qt-5.48.0.tar.xz";
     };
   };
   breeze-icons = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/breeze-icons-5.47.0.tar.xz";
-      sha256 = "0fyzk196r8r0mzvijs9ws8ldh5vrw4yrgnvd1szb57vyy1agnnd7";
-      name = "breeze-icons-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/breeze-icons-5.48.0.tar.xz";
+      sha256 = "1p0krrxfz6p0qhy79lnjyi0xsrprw1q4z65xah89kj0wmfriiyqh";
+      name = "breeze-icons-5.48.0.tar.xz";
     };
   };
   extra-cmake-modules = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/extra-cmake-modules-5.47.0.tar.xz";
-      sha256 = "1591d27r6a2b7jn6zi2ik0i195pvl014dwxfpxv974hbbb8qnvcp";
-      name = "extra-cmake-modules-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/extra-cmake-modules-5.48.0.tar.xz";
+      sha256 = "1675xnc9hv8z8gp95ici2zqmbv7i6f65g0kln4fskxmlxnfplnzw";
+      name = "extra-cmake-modules-5.48.0.tar.xz";
     };
   };
   frameworkintegration = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/frameworkintegration-5.47.0.tar.xz";
-      sha256 = "0iwdfa7q8ryszsl2w3bgix8bxkn3jj2lfdlcicfz9qh6av76p4yf";
-      name = "frameworkintegration-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/frameworkintegration-5.48.0.tar.xz";
+      sha256 = "1na913ndc55nlmfc61122b1p29h4prxnpc5pqvh6drsgfyacnm8y";
+      name = "frameworkintegration-5.48.0.tar.xz";
     };
   };
   kactivities = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kactivities-5.47.0.tar.xz";
-      sha256 = "01h5a4m0wkgz1gafhbqdidxdr2x6g5siwcx4csv9293pc5xf0qcd";
-      name = "kactivities-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kactivities-5.48.0.tar.xz";
+      sha256 = "1zxdzwz8j43hh8d7v1qfihf95kwxvsbqki0zgdhlnj7s0xds0yz8";
+      name = "kactivities-5.48.0.tar.xz";
     };
   };
   kactivities-stats = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kactivities-stats-5.47.0.tar.xz";
-      sha256 = "0linsga4d7lincnpj747wnbgidp2x7xk3jzh31lpfq8izkmqz1q5";
-      name = "kactivities-stats-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kactivities-stats-5.48.0.tar.xz";
+      sha256 = "11r61qnrjpc4ls18apb4a13j1lizjq48bxfw3f8p8hjxxxh8z0j6";
+      name = "kactivities-stats-5.48.0.tar.xz";
     };
   };
   kapidox = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kapidox-5.47.0.tar.xz";
-      sha256 = "1z2ka5fnwqsmjhxdbahk7gkjmhgzndg3lq6196dmpws1zjqf14vq";
-      name = "kapidox-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kapidox-5.48.0.tar.xz";
+      sha256 = "1b22np0lygnm2r2q1anh0f4b7dh2h0lccx767g4r2w0fw5r1bbb4";
+      name = "kapidox-5.48.0.tar.xz";
     };
   };
   karchive = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/karchive-5.47.0.tar.xz";
-      sha256 = "0r8xxfg1wsnpzyfggpzhxap853gqfsnmbci1al6xyd0pslgcsb5r";
-      name = "karchive-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/karchive-5.48.0.tar.xz";
+      sha256 = "10qbx8k1yqqfp1pq5yj8ln3gpj2wnfnlln99gczf99f51fqd65p6";
+      name = "karchive-5.48.0.tar.xz";
     };
   };
   kauth = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kauth-5.47.0.tar.xz";
-      sha256 = "1s80grzkxvbkw39z5xida50ijb0k3aqy80k5h0025m9rqpbc7ir9";
-      name = "kauth-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kauth-5.48.0.tar.xz";
+      sha256 = "00mpbs24dm9ycabpcm2wwlv1vdq4dq5qr2zw6bbqpgj3jplakbs7";
+      name = "kauth-5.48.0.tar.xz";
     };
   };
   kbookmarks = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kbookmarks-5.47.0.tar.xz";
-      sha256 = "0b4b2yp3pvlisf0g1gwnisn2rc94wn874aad3dlg0607kd11xmwk";
-      name = "kbookmarks-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kbookmarks-5.48.0.tar.xz";
+      sha256 = "11ics7gbdkx1f0pxryf2xwjq4fyqh6a3gzcizymm1m7gmygggqar";
+      name = "kbookmarks-5.48.0.tar.xz";
     };
   };
   kcmutils = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kcmutils-5.47.0.tar.xz";
-      sha256 = "0qpsjijd51cxmp3y8knr6k6bx8bg5hhngsh63nr8yskpms38kj5d";
-      name = "kcmutils-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kcmutils-5.48.0.tar.xz";
+      sha256 = "0nvlzvv2gmc2hz11w6bixz4mccnj09g69byrnvsrwh0psf1kqlmw";
+      name = "kcmutils-5.48.0.tar.xz";
     };
   };
   kcodecs = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kcodecs-5.47.0.tar.xz";
-      sha256 = "1qhdj54cx98dqdy8bqkxm8jgq8mm2i7l3h9vyd2bvvzc8nzhd1hv";
-      name = "kcodecs-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kcodecs-5.48.0.tar.xz";
+      sha256 = "1pz0s3krb4vv01hvpjdr5ngnw1ndxgsfln944fm9pfj0pmk7p92n";
+      name = "kcodecs-5.48.0.tar.xz";
     };
   };
   kcompletion = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kcompletion-5.47.0.tar.xz";
-      sha256 = "1wdw434bi90ldmdxw8wpkgszligqapy19klpnn528vh3gv5is00p";
-      name = "kcompletion-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kcompletion-5.48.0.tar.xz";
+      sha256 = "129mmh46y0r6dcnbxf5yswsr48qj5l25n930nlx7wzaav28y55lp";
+      name = "kcompletion-5.48.0.tar.xz";
     };
   };
   kconfig = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kconfig-5.47.0.tar.xz";
-      sha256 = "0ifv7i6w7jz221rw07vb40sljx95kdjhxd7l9nfx95dbd5bjb0nq";
-      name = "kconfig-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kconfig-5.48.0.tar.xz";
+      sha256 = "1g640cnd9j2jp35bb5zgjfxskbg3fj9p03r0yf3dkm1d1681x9a3";
+      name = "kconfig-5.48.0.tar.xz";
     };
   };
   kconfigwidgets = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kconfigwidgets-5.47.0.tar.xz";
-      sha256 = "05pxa7519f0730wrbh2bsqzfvc9dwvrh8l9vjh24rkaiaxnzhd6k";
-      name = "kconfigwidgets-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kconfigwidgets-5.48.0.tar.xz";
+      sha256 = "0xlnbw34zbmy7fwsi9iks4iv7shki4fqs7wd3yblmyxa2l18ldh9";
+      name = "kconfigwidgets-5.48.0.tar.xz";
     };
   };
   kcoreaddons = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kcoreaddons-5.47.0.tar.xz";
-      sha256 = "0ihbggv5ziazhv66cnc6d4h4m2bci0cgwh498k49phaagrsh9zs0";
-      name = "kcoreaddons-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kcoreaddons-5.48.0.tar.xz";
+      sha256 = "157k4l67iswny5krinfigfc6pabqfyfzya6hc5gcjrdplmnccy1f";
+      name = "kcoreaddons-5.48.0.tar.xz";
     };
   };
   kcrash = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kcrash-5.47.0.tar.xz";
-      sha256 = "15wn4g7c26f3cpk7q2imci7p8pmcksw47h6csihyvlpi3b6ykqg9";
-      name = "kcrash-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kcrash-5.48.0.tar.xz";
+      sha256 = "0qqwdx7piz4wfm4lh41kknfcyw5saw17qh07ghhi7j80whpkazk8";
+      name = "kcrash-5.48.0.tar.xz";
     };
   };
   kdbusaddons = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kdbusaddons-5.47.0.tar.xz";
-      sha256 = "04270rnfmasb9cq7kj40wny7vgkb7hksjnhr4sgyg4v2p8v5dmib";
-      name = "kdbusaddons-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kdbusaddons-5.48.0.tar.xz";
+      sha256 = "0vpd4cij52v43fsifbk3nnmi5csik8h4avima6jw0b09s8xdz8rr";
+      name = "kdbusaddons-5.48.0.tar.xz";
     };
   };
   kdeclarative = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kdeclarative-5.47.0.tar.xz";
-      sha256 = "183l926yyhdw270rcwqh2lf1rjd4a9vbkcjlqyss2k7d79mj6m9s";
-      name = "kdeclarative-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kdeclarative-5.48.0.tar.xz";
+      sha256 = "09nfp6vrj6dc3kfknicr8629ifz976wi4wxdh5bfx15z9296l8pd";
+      name = "kdeclarative-5.48.0.tar.xz";
     };
   };
   kded = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kded-5.47.0.tar.xz";
-      sha256 = "0z5xsxalxasnyhhkvy247a08l37012fiaahwyy0477p7p5x3c845";
-      name = "kded-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kded-5.48.0.tar.xz";
+      sha256 = "13527iv6cf44wgxpqfhmkhryihjfi02fi78lf2bnvgwmhd2nl954";
+      name = "kded-5.48.0.tar.xz";
     };
   };
   kdelibs4support = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/portingAids/kdelibs4support-5.47.0.tar.xz";
-      sha256 = "1rij23ns9axlwi2fvbiz2wv3y3vh1p9cm3nxkkrj3axc0hs39n20";
-      name = "kdelibs4support-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/portingAids/kdelibs4support-5.48.0.tar.xz";
+      sha256 = "058s5h6sfhi1i3pa59hwpyxzd01jgpb8r68nnbphmryimi5nazqf";
+      name = "kdelibs4support-5.48.0.tar.xz";
     };
   };
   kdesignerplugin = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kdesignerplugin-5.47.0.tar.xz";
-      sha256 = "0ijdjjfqj2wpl0jrr2n90i74d378986lkqwdicig2rwkylsivr1g";
-      name = "kdesignerplugin-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kdesignerplugin-5.48.0.tar.xz";
+      sha256 = "1kswvxgjpyi1p1kg4z5x5df8yqhrwhcpavzx4a83dg6hp5xk0l2l";
+      name = "kdesignerplugin-5.48.0.tar.xz";
     };
   };
   kdesu = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kdesu-5.47.0.tar.xz";
-      sha256 = "1rc2v13d4i0wwzmgrbwf6i6khcd4wfa79flq764cvx62flingfvr";
-      name = "kdesu-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kdesu-5.48.0.tar.xz";
+      sha256 = "14ka3h06xbfv357z29zgbwnjcfwspi42f0fm3m7lszqhz9skj4v5";
+      name = "kdesu-5.48.0.tar.xz";
     };
   };
   kdewebkit = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kdewebkit-5.47.0.tar.xz";
-      sha256 = "1yg4lydz03y6cc1f44larfd4xnvnbnzpkfa97qxjzvvrk06hdxx3";
-      name = "kdewebkit-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kdewebkit-5.48.0.tar.xz";
+      sha256 = "0wf2prv85sayz1mqq0ymrqw3p0f3ikakhgzy01pixrp7qgwqkkrv";
+      name = "kdewebkit-5.48.0.tar.xz";
     };
   };
   kdnssd = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kdnssd-5.47.0.tar.xz";
-      sha256 = "0xgv4fvhyr3gk99vaicq45zqf5mnbc4xpyz66jfhsk1w655bqijp";
-      name = "kdnssd-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kdnssd-5.48.0.tar.xz";
+      sha256 = "01hra59b0sm82j7ry78f3clrypc80q59vx9h0ahacbab4pzq41p5";
+      name = "kdnssd-5.48.0.tar.xz";
     };
   };
   kdoctools = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kdoctools-5.47.0.tar.xz";
-      sha256 = "06zlk04ldi9cq3ricni74s3737gmvs73g2k9mgfkdjq5grcsw177";
-      name = "kdoctools-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kdoctools-5.48.0.tar.xz";
+      sha256 = "0v8x198kfgz2p56nyy9cb6lks5yazdbdg55c4ps5bw36dbmpd3v8";
+      name = "kdoctools-5.48.0.tar.xz";
     };
   };
   kemoticons = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kemoticons-5.47.0.tar.xz";
-      sha256 = "1hg72mf629g67wll5b80rw9k85qia1jdfhabg64vy7n7i9fm912y";
-      name = "kemoticons-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kemoticons-5.48.0.tar.xz";
+      sha256 = "166sjwrn9dm4km8sypdwcfsylcamhl1gfl28h8hrv498zhnyrfb9";
+      name = "kemoticons-5.48.0.tar.xz";
     };
   };
   kfilemetadata = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kfilemetadata-5.47.0.tar.xz";
-      sha256 = "0ywp45akvn0cky757azkf6p4ql2l02xy7fplbhv7j6qz39s0p2vm";
-      name = "kfilemetadata-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kfilemetadata-5.48.0.tar.xz";
+      sha256 = "0krn53a2s950fb980gdap5hwf994kxfd4h8zk7a4s9cick957z5f";
+      name = "kfilemetadata-5.48.0.tar.xz";
     };
   };
   kglobalaccel = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kglobalaccel-5.47.0.tar.xz";
-      sha256 = "1lcac55kanddpn6nphmyixp33mk8zmhfih7p9vzhnxvrc5k9r6hb";
-      name = "kglobalaccel-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kglobalaccel-5.48.0.tar.xz";
+      sha256 = "15dlpm69d38bsgl6hc7f1mjjq8qyxac010whx4rcsk4vsrwdfnm7";
+      name = "kglobalaccel-5.48.0.tar.xz";
     };
   };
   kguiaddons = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kguiaddons-5.47.0.tar.xz";
-      sha256 = "14pivzmpsmmqrhvmvlc10fc7mc6gdq214qy27r4dsxmjdvgljhhj";
-      name = "kguiaddons-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kguiaddons-5.48.0.tar.xz";
+      sha256 = "0viqq9qg448fh12isc1kkmzcnnsjqw5fx4wlshyza19gfr4ym0dz";
+      name = "kguiaddons-5.48.0.tar.xz";
     };
   };
   kholidays = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kholidays-5.47.0.tar.xz";
-      sha256 = "001misp4bdd4q05ns4bch7gx1j8h2wpa2is7zdazqy0bp1blsfwb";
-      name = "kholidays-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kholidays-5.48.0.tar.xz";
+      sha256 = "04vjp2jm2c6qgj50jbqkkgqh8b759pd4dpsczfkyq30p03vybxr4";
+      name = "kholidays-5.48.0.tar.xz";
     };
   };
   khtml = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/portingAids/khtml-5.47.0.tar.xz";
-      sha256 = "1c9fja1mb2jrlrial2mz2bvw004s14kn7jnakawqg0d19fhlqg1h";
-      name = "khtml-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/portingAids/khtml-5.48.0.tar.xz";
+      sha256 = "1zrilnvvvvjq82hm6gbh5pvzfygy8w7a0140d3l74jjgy01394m1";
+      name = "khtml-5.48.0.tar.xz";
     };
   };
   ki18n = {
-    version = "5.47.0";
+    version = "5.48.1";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/ki18n-5.47.0.tar.xz";
-      sha256 = "1a190wf2ms09cwzpk1ylx7kjfz8yvzv2p14fjwyld6vf32hgl9r6";
-      name = "ki18n-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/ki18n-5.48.1.tar.xz";
+      sha256 = "0m9x6bagviqrnm0hx7ykggqiykxv3qi11bmi0xz2f02y78q89f3h";
+      name = "ki18n-5.48.1.tar.xz";
     };
   };
   kiconthemes = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kiconthemes-5.47.0.tar.xz";
-      sha256 = "14j8d1glrcd6a9xn86jxa7wx80bpf5wax5vkv09swcbbshp7vqdp";
-      name = "kiconthemes-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kiconthemes-5.48.0.tar.xz";
+      sha256 = "1xqbg10qlk1zdha4kfyya1471r35gnz63iyj0ks3gzyfjvbivpy4";
+      name = "kiconthemes-5.48.0.tar.xz";
     };
   };
   kidletime = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kidletime-5.47.0.tar.xz";
-      sha256 = "0dirflwwnq83nxml66kk4bf70nl04dhrg8pvh9md3hip5cn6mq2f";
-      name = "kidletime-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kidletime-5.48.0.tar.xz";
+      sha256 = "184b1qdh4bwsdg9lyl4d8rcs833fqcmfvbb5qmdd3mqvvg8xv9mm";
+      name = "kidletime-5.48.0.tar.xz";
     };
   };
   kimageformats = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kimageformats-5.47.0.tar.xz";
-      sha256 = "19j6wdfv9yncdgcm5ij0rz5rv0a3jlgdnwmyrw1gjyz5isv2qp4f";
-      name = "kimageformats-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kimageformats-5.48.0.tar.xz";
+      sha256 = "1myxp583gw5d50ddkkv6ipbdzf6k3sdk9gambklay1dzmy4b91sc";
+      name = "kimageformats-5.48.0.tar.xz";
     };
   };
   kinit = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kinit-5.47.0.tar.xz";
-      sha256 = "1rc0ig4gw7lkvkpwcik6krn5w1zqj6y710c58i9kr9vxxpffj170";
-      name = "kinit-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kinit-5.48.0.tar.xz";
+      sha256 = "08sf3j1bpxzqjim777d6znn8f7rzs5vpm4wz21s1ng3f32z2km9a";
+      name = "kinit-5.48.0.tar.xz";
     };
   };
   kio = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kio-5.47.0.tar.xz";
-      sha256 = "0847dxrhdywrx2v6knf6l70slm8dfz4n4j1c1si13jrj1fp2w4ji";
-      name = "kio-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kio-5.48.0.tar.xz";
+      sha256 = "0am03nwbfidb5dxs8j8qaan4mcs7xv75sk135rslwfp5q56v1fa0";
+      name = "kio-5.48.0.tar.xz";
     };
   };
   kirigami2 = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kirigami2-5.47.0.tar.xz";
-      sha256 = "1mdahdb5z0i9bf63480b2j6xm7cgsh1anx0cljn2hivglpixjbgd";
-      name = "kirigami2-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kirigami2-5.48.0.tar.xz";
+      sha256 = "0f01rnzzv2w7mmb0war8kph46c3wbdbz7s9i6rwh6g7kg6zvzn52";
+      name = "kirigami2-5.48.0.tar.xz";
     };
   };
   kitemmodels = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kitemmodels-5.47.0.tar.xz";
-      sha256 = "0151arf7s5ns2qadn86z385i9v9z8rga0jcj8pnw329k4pjpc2ks";
-      name = "kitemmodels-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kitemmodels-5.48.0.tar.xz";
+      sha256 = "13b0fqy4yg4zahqq8376gnna36mfg94yb5d1fz0cgw7fk9d920gf";
+      name = "kitemmodels-5.48.0.tar.xz";
     };
   };
   kitemviews = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kitemviews-5.47.0.tar.xz";
-      sha256 = "0dnk7y50d5wxpl4fppb0hdzy5w6xa04a178y49zggpjm5x048mp5";
-      name = "kitemviews-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kitemviews-5.48.0.tar.xz";
+      sha256 = "0cdyw0gy67yhhxv44j1bhhd4qnj7rwi0fjzf275532bf3js1j12w";
+      name = "kitemviews-5.48.0.tar.xz";
     };
   };
   kjobwidgets = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kjobwidgets-5.47.0.tar.xz";
-      sha256 = "05vgqm3nfpbwbnv46ajb8hc5wzs1444513ahay1qn8vpah4kqbpp";
-      name = "kjobwidgets-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kjobwidgets-5.48.0.tar.xz";
+      sha256 = "0a5awpbka6mk4r4m5if7s9i5ybysykpcmlj69liabzcv0k1x5y6w";
+      name = "kjobwidgets-5.48.0.tar.xz";
     };
   };
   kjs = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/portingAids/kjs-5.47.0.tar.xz";
-      sha256 = "1rhvmdwmsr48ih0qrpwphiwcl25af8shwj8nrkq619krc549gf8q";
-      name = "kjs-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/portingAids/kjs-5.48.0.tar.xz";
+      sha256 = "0ysbf6m63cw2iywwr7p5ngsh7s7ml9sc1sqkhnbh7racn0pzc1l4";
+      name = "kjs-5.48.0.tar.xz";
     };
   };
   kjsembed = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/portingAids/kjsembed-5.47.0.tar.xz";
-      sha256 = "104nv33zpqh78zxqj1z9sj6cyliv0l9gzgmsc4n9nq9fcr1f2hdd";
-      name = "kjsembed-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/portingAids/kjsembed-5.48.0.tar.xz";
+      sha256 = "0j74g3xb23k55pixk76z2ib6yyc7f2iwvwqvvw1f907rn43g6qqx";
+      name = "kjsembed-5.48.0.tar.xz";
     };
   };
   kmediaplayer = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/portingAids/kmediaplayer-5.47.0.tar.xz";
-      sha256 = "0cz0m2sa48893p6vq4pm92xmvq2aqqgfmijlskzdpd3gp3x9l1qw";
-      name = "kmediaplayer-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/portingAids/kmediaplayer-5.48.0.tar.xz";
+      sha256 = "1kw35c5dmwsrkinfgmylzgvw3zcg0yimlfcl52bhdg0x7sgdbjkq";
+      name = "kmediaplayer-5.48.0.tar.xz";
     };
   };
   knewstuff = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/knewstuff-5.47.0.tar.xz";
-      sha256 = "04zn4iy0gy00d835qjfmb0prm802ggphj4aw328v29474nqs14nf";
-      name = "knewstuff-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/knewstuff-5.48.0.tar.xz";
+      sha256 = "0g2sxk6wqqgynmqgz6jxknlrsmpj4y94cn7vpw84isd9brsr5hfv";
+      name = "knewstuff-5.48.0.tar.xz";
     };
   };
   knotifications = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/knotifications-5.47.0.tar.xz";
-      sha256 = "08cm2aks35lzspchyb6p25bfk4mrljb6wf7yi29674k4kg7gr6sv";
-      name = "knotifications-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/knotifications-5.48.0.tar.xz";
+      sha256 = "11p03jgkw8zvfsal6q3yxz5shkpxiknnryw2a120sjmsab87imzb";
+      name = "knotifications-5.48.0.tar.xz";
     };
   };
   knotifyconfig = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/knotifyconfig-5.47.0.tar.xz";
-      sha256 = "0zava15sabmxc38ngmw9yylwnm27h8ah8df0jadxbqjpaaf0jssl";
-      name = "knotifyconfig-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/knotifyconfig-5.48.0.tar.xz";
+      sha256 = "1rlzmp1lzrniav2d5sjzh43mdm47i5dpa2rlsqppqq5887wjphcm";
+      name = "knotifyconfig-5.48.0.tar.xz";
     };
   };
   kpackage = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kpackage-5.47.0.tar.xz";
-      sha256 = "1pwlvcmn9crjgqf1ccwb86zq962jnwavx6h6dcx7vb982z772j98";
-      name = "kpackage-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kpackage-5.48.0.tar.xz";
+      sha256 = "18q6gp1gmzjyid803j7mcm9dbqg4bcd059qlp6sb6rkllygv4pcr";
+      name = "kpackage-5.48.0.tar.xz";
     };
   };
   kparts = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kparts-5.47.0.tar.xz";
-      sha256 = "1b21kmn8bjq69qhldacqpby9pa56c4y8j84kkwailylk3nngilsf";
-      name = "kparts-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kparts-5.48.0.tar.xz";
+      sha256 = "1p4xdrxfvq5xj17zf8gfxc0c9lryp8n9ahinardlb3rnb1wcw4hv";
+      name = "kparts-5.48.0.tar.xz";
     };
   };
   kpeople = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kpeople-5.47.0.tar.xz";
-      sha256 = "13x1f5jwxhmdq5qq43qzfmxm20j95dwa0fck1ns1rg8k7gazmdqb";
-      name = "kpeople-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kpeople-5.48.0.tar.xz";
+      sha256 = "1gddld3phsqknm3x0k0wnhgqid5dqsqbw06v91vbl8746np04zf7";
+      name = "kpeople-5.48.0.tar.xz";
     };
   };
   kplotting = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kplotting-5.47.0.tar.xz";
-      sha256 = "0sw448g5wa2gz6krzp7d8q1ryh6qs51hgxv432fjpblijnwzb6xx";
-      name = "kplotting-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kplotting-5.48.0.tar.xz";
+      sha256 = "17f78wppaj433x6fm108z5zw849qvnjsxisa92rxmkm9c64wzijg";
+      name = "kplotting-5.48.0.tar.xz";
     };
   };
   kpty = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kpty-5.47.0.tar.xz";
-      sha256 = "1q4hkm701ridf07a4m93zvifi1sk6vn8z1h0b1rz5srxasaxnxlh";
-      name = "kpty-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kpty-5.48.0.tar.xz";
+      sha256 = "0ywkiw7gpqx7zrj6wrvfsn2sjkyxzsmqn8p91z0kz1s3id2s04fk";
+      name = "kpty-5.48.0.tar.xz";
     };
   };
   kross = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/portingAids/kross-5.47.0.tar.xz";
-      sha256 = "13nav8fihj1pammiwz8na482qpsmcxmyxd47rqhwldvxz1z0kbq1";
-      name = "kross-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/portingAids/kross-5.48.0.tar.xz";
+      sha256 = "0zxhn8wai71ll1113k47xmcspbp16iz1rybm6m2qs6f4j5ghif8q";
+      name = "kross-5.48.0.tar.xz";
     };
   };
   krunner = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/krunner-5.47.0.tar.xz";
-      sha256 = "0j3j6831y5j96cl19jdwcnd9h4rl95ymj3gy5sxilazgafzfihbd";
-      name = "krunner-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/krunner-5.48.0.tar.xz";
+      sha256 = "0mdwyvx656ba8pwvg4qw8jr268iffqrp9ipr28m71hkx0sh7k6hn";
+      name = "krunner-5.48.0.tar.xz";
     };
   };
   kservice = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kservice-5.47.0.tar.xz";
-      sha256 = "0ryipmvydh924zjpfzmwivwagaad9dicnfcfa4drrygbwnm60bd9";
-      name = "kservice-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kservice-5.48.0.tar.xz";
+      sha256 = "1r5d3cdvmbyqn8hm2hjalgg1ncnpdh1w7fd5rr0k97j5qj29ypis";
+      name = "kservice-5.48.0.tar.xz";
     };
   };
   ktexteditor = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/ktexteditor-5.47.0.tar.xz";
-      sha256 = "1k089k9ssk06734wnjyfmvlgxy2hqxh7fgy5qiyjvp807kmf4jkb";
-      name = "ktexteditor-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/ktexteditor-5.48.0.tar.xz";
+      sha256 = "1fnq6d3ky277rbg3ngq55gdswrgfxsn19c43s23xcbfaymmhapj7";
+      name = "ktexteditor-5.48.0.tar.xz";
     };
   };
   ktextwidgets = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/ktextwidgets-5.47.0.tar.xz";
-      sha256 = "19w84d6v8yrci4fb6c7m91q2ykc9p24cf85cnm6lsb8ggis4dsyr";
-      name = "ktextwidgets-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/ktextwidgets-5.48.0.tar.xz";
+      sha256 = "0hf4rpnkc9qfpnpfm6bsrrjrvvkr6785pnakqyfbjcgbyavp58hg";
+      name = "ktextwidgets-5.48.0.tar.xz";
     };
   };
   kunitconversion = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kunitconversion-5.47.0.tar.xz";
-      sha256 = "0avm3g78zfzrh4h6ampf54n9j715ii5cra8praq0waiy94idn7cq";
-      name = "kunitconversion-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kunitconversion-5.48.0.tar.xz";
+      sha256 = "0hipqjj82zkq8ysvg304m5jblxxrvjh8vfc3wgl93zvj0mwx06db";
+      name = "kunitconversion-5.48.0.tar.xz";
     };
   };
   kwallet = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kwallet-5.47.0.tar.xz";
-      sha256 = "0hy3kzkcqbzkjkvnaaanfdcnwcidnbw6j14ifvhlh2padql7kyix";
-      name = "kwallet-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kwallet-5.48.0.tar.xz";
+      sha256 = "047jp26igla05isq6hg5bq9l3xd3dfa3v8dq3rz4im7dwa10hshr";
+      name = "kwallet-5.48.0.tar.xz";
     };
   };
   kwayland = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kwayland-5.47.0.tar.xz";
-      sha256 = "0j15xzlzxqi0g8lj5k9w0lbnvx26h6bblgz8rhqlkl80ml2wzgfv";
-      name = "kwayland-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kwayland-5.48.0.tar.xz";
+      sha256 = "1qcb2kg1a23fvl6i0xky6mzmn3f6pqkvpv0dy245bd01x7q4csg4";
+      name = "kwayland-5.48.0.tar.xz";
     };
   };
   kwidgetsaddons = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kwidgetsaddons-5.47.0.tar.xz";
-      sha256 = "0d2sxh6g7igjdsgj9agknx8zvymyvq9rb0xkfbr044vg5q0g99js";
-      name = "kwidgetsaddons-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kwidgetsaddons-5.48.0.tar.xz";
+      sha256 = "079f28ifadxhvk4miwlnhw3dvg7bmb6gjiqcg2w65bmp21rsywb7";
+      name = "kwidgetsaddons-5.48.0.tar.xz";
     };
   };
   kwindowsystem = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kwindowsystem-5.47.0.tar.xz";
-      sha256 = "1hfbjy17b6iw6443a3zw304syi4j0vid7nmm5hqdv8685lnp4wx6";
-      name = "kwindowsystem-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kwindowsystem-5.48.0.tar.xz";
+      sha256 = "1b6cvx3yqkqmvji2y7ys421hmj98xhww1rlgphfdvrdaqzl4579n";
+      name = "kwindowsystem-5.48.0.tar.xz";
     };
   };
   kxmlgui = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kxmlgui-5.47.0.tar.xz";
-      sha256 = "194linh0px5mk404hbgrzcfx9zblk4q835nvj4lrbl62nffzwnlp";
-      name = "kxmlgui-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kxmlgui-5.48.0.tar.xz";
+      sha256 = "0n38bxxip1c4fgj00jvph98qhb11ifx40z4m0pjafm52bg0kaa2h";
+      name = "kxmlgui-5.48.0.tar.xz";
     };
   };
   kxmlrpcclient = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/kxmlrpcclient-5.47.0.tar.xz";
-      sha256 = "1wmsycpg5yljdpa0slv47baqpag6jzg75g0l2jddl3knznp7br8i";
-      name = "kxmlrpcclient-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/kxmlrpcclient-5.48.0.tar.xz";
+      sha256 = "0s0xrx2p0jngk83zb8zjn4vkwnj46wzbxzj904g71ca428nmfx40";
+      name = "kxmlrpcclient-5.48.0.tar.xz";
     };
   };
   modemmanager-qt = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/modemmanager-qt-5.47.0.tar.xz";
-      sha256 = "00wxsc4wz5fflld4h1w77726w1c06g1ql5qld2r30yibx1fb2slb";
-      name = "modemmanager-qt-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/modemmanager-qt-5.48.0.tar.xz";
+      sha256 = "17pnzpv3g3g25vnh9jjjk3fk6i3lhk6icl56ifcsmpj09nlw41im";
+      name = "modemmanager-qt-5.48.0.tar.xz";
     };
   };
   networkmanager-qt = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/networkmanager-qt-5.47.0.tar.xz";
-      sha256 = "02c2d1jm3azzbwd52awq6ikjsgfg9f2dc12dkw14zkz41r87gcyh";
-      name = "networkmanager-qt-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/networkmanager-qt-5.48.0.tar.xz";
+      sha256 = "15qikndykampl63bnp6rik1vkmwpivqf1krbsb0r29fmwyzhy38v";
+      name = "networkmanager-qt-5.48.0.tar.xz";
     };
   };
   oxygen-icons5 = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/oxygen-icons5-5.47.0.tar.xz";
-      sha256 = "19w7ab5b7qdhj3j0pg8378k918kwjd1m5lm13jdg2kkn1f4j0j4m";
-      name = "oxygen-icons5-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/oxygen-icons5-5.48.0.tar.xz";
+      sha256 = "08y1gy2xgzby9wxbh90cfzly1aym9nym5r8m7z848a4v7chp0wpw";
+      name = "oxygen-icons5-5.48.0.tar.xz";
     };
   };
   plasma-framework = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/plasma-framework-5.47.0.tar.xz";
-      sha256 = "1d3f2k5y966jnwrjps1x5lx9scpakq3ri3111m5h0vidkrlvnhsa";
-      name = "plasma-framework-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/plasma-framework-5.48.0.tar.xz";
+      sha256 = "1hl1q1v8kmq20bzm2bfrpjx1f1rljg2akib0sc65nw6vclrcgh82";
+      name = "plasma-framework-5.48.0.tar.xz";
     };
   };
   prison = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/prison-5.47.0.tar.xz";
-      sha256 = "17j12mg11fnjnlj04fzxd5x95cs2f34xc2lk09hjlm7ihkw932xh";
-      name = "prison-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/prison-5.48.0.tar.xz";
+      sha256 = "04asjh9k6qhz6mzqvcw5famjh8fdfrjj5gwhar9lpzvl53k9236q";
+      name = "prison-5.48.0.tar.xz";
     };
   };
   purpose = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/purpose-5.47.0.tar.xz";
-      sha256 = "1symzvzk50d3szz2rh7c9jd60hzpvlv6d8n7r6j9rzrplvshk879";
-      name = "purpose-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/purpose-5.48.0.tar.xz";
+      sha256 = "015dcsz2pybfl13dq0fhja7j05bvchjd6bcwmniq8cwc2dg2qxyp";
+      name = "purpose-5.48.0.tar.xz";
     };
   };
   qqc2-desktop-style = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/qqc2-desktop-style-5.47.0.tar.xz";
-      sha256 = "1w897ixs0bfhzrzq8v4yg3rsrd8zmb08j5xh52ysb4mp7zs8jcyk";
-      name = "qqc2-desktop-style-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/qqc2-desktop-style-5.48.0.tar.xz";
+      sha256 = "1wc4vxjipdw3zq1lqwz3s7f0gzrcvs8svy9ip5r40qcz2w55s4an";
+      name = "qqc2-desktop-style-5.48.0.tar.xz";
     };
   };
   solid = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/solid-5.47.0.tar.xz";
-      sha256 = "041fvxxlazbpdl5ncdpxzj8jq48rk31kd1nqsm8p5wqglzrz6dsl";
-      name = "solid-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/solid-5.48.0.tar.xz";
+      sha256 = "0fy070kbqs9hvi1ngmqzfz8a9vnry0mrin51z1yfdc44806bk2ns";
+      name = "solid-5.48.0.tar.xz";
     };
   };
   sonnet = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/sonnet-5.47.0.tar.xz";
-      sha256 = "14nfrv1z1lpjhxsxhjx8bi88yp1qx4dzwf6v22w0mk71qc6z2rgr";
-      name = "sonnet-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/sonnet-5.48.0.tar.xz";
+      sha256 = "1mzl2a61jrqflnlkkrp079z428sf2bc811qwfx0rdh0jp7bc7sq4";
+      name = "sonnet-5.48.0.tar.xz";
     };
   };
   syntax-highlighting = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/syntax-highlighting-5.47.0.tar.xz";
-      sha256 = "0bv25cv3xvhl9v23dn3yxhdcv5ag2i1zhvna6gnng6k30n316v0c";
-      name = "syntax-highlighting-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/syntax-highlighting-5.48.0.tar.xz";
+      sha256 = "03cfljg90iszpxmx6f0dv1w1r451yqzi9bk27x56s5xzsghj8bv5";
+      name = "syntax-highlighting-5.48.0.tar.xz";
     };
   };
   threadweaver = {
-    version = "5.47.0";
+    version = "5.48.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.47/threadweaver-5.47.0.tar.xz";
-      sha256 = "0h48b6mvgq3igbs6jzngj1iad7m5kgkird17shk86ma79k6igriz";
-      name = "threadweaver-5.47.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.48/threadweaver-5.48.0.tar.xz";
+      sha256 = "0pks8sddqdhlcrqgb106b6jy0gh3gfcss2rdavqfck6d9780v125";
+      name = "threadweaver-5.48.0.tar.xz";
     };
   };
 }
diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix
index e84df0c1aed..b5402984d16 100644
--- a/pkgs/development/libraries/libblockdev/default.nix
+++ b/pkgs/development/libraries/libblockdev/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, libxslt, docbook_xsl
-, docbook_xml_dtd_43, python3, gobjectIntrospection, glib, libudev, kmod, parted, libyaml
-, cryptsetup, devicemapper, dmraid, utillinux, libbytesize, libndctl, nss, volume_key
+, docbook_xml_dtd_43, python3, gobjectIntrospection, glib, udev, kmod, parted, libyaml
+, cryptsetup, lvm2, dmraid, utillinux, libbytesize, libndctl, nss, volume_key
 }:
 
 let
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    glib libudev kmod parted cryptsetup devicemapper dmraid utillinux libbytesize libndctl nss volume_key libyaml
+    glib udev kmod parted cryptsetup lvm2 dmraid utillinux libbytesize libndctl nss volume_key libyaml
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix
index b2a0021d53b..e7157afbaee 100644
--- a/pkgs/development/libraries/libgnome-keyring/default.nix
+++ b/pkgs/development/libraries/libgnome-keyring/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig,
+{ stdenv, fetchurl, glib, dbus, libgcrypt, pkgconfig,
 intltool }:
 
 stdenv.mkDerivation {
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   outputs = [ "out" "dev" ];
 
-  propagatedBuildInputs = [ glib dbus_libs libgcrypt ];
+  propagatedBuildInputs = [ glib dbus libgcrypt ];
   nativeBuildInputs = [ pkgconfig intltool ];
 
   meta = {
diff --git a/pkgs/development/libraries/libindicate/default.nix b/pkgs/development/libraries/libindicate/default.nix
index 1bde9336c66..1f5ee90337a 100644
--- a/pkgs/development/libraries/libindicate/default.nix
+++ b/pkgs/development/libraries/libindicate/default.nix
@@ -2,7 +2,7 @@
 
 { stdenv, fetchurl, lib, file
 , pkgconfig, autoconf
-, glib, dbus-glib, libdbusmenu-glib
+, glib, dbus-glib, libdbusmenu
 , gtkVersion ? "3", gtk2 ? null, gtk3 ? null
 , pythonPackages, gobjectIntrospection, vala, gnome-doc-utils
 , monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig autoconf gobjectIntrospection vala gnome-doc-utils ];
 
   buildInputs = [
-    glib dbus-glib libdbusmenu-glib
+    glib dbus-glib libdbusmenu
     python pygobject2 pygtk
   ] ++ (if gtkVersion == "2"
     then [ gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ]
diff --git a/pkgs/development/libraries/libstroke/default.nix b/pkgs/development/libraries/libstroke/default.nix
index bd54b3aa343..400a107c518 100644
--- a/pkgs/development/libraries/libstroke/default.nix
+++ b/pkgs/development/libraries/libstroke/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, automake, autoconf, x11}:
+{stdenv, fetchurl, automake, autoconf, xlibsWrapper}:
 
 stdenv.mkDerivation {
   name = "libstroke-0.5.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "0bbpqzsqh9zrc6cg62f6vp1p4dzvv37blsd0gdlzdskgwvyzba8d";
   };
 
-  buildInputs = [ automake autoconf x11 ];
+  buildInputs = [ automake autoconf xlibsWrapper ];
 
   # libstroke ships with an ancient config.sub that doesn't know about x86_64, so regenerate it.
   # Also, modern automake doesn't like things and returns error code 63.  But it generates the file.
diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index c902a8b216a..ce8d741adf2 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   patches = [
     (fetchpatch {
-      url = "https://github.com/libuv/libuv/pull/1909.patch";
+      url = "https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d.patch";
       sha256 = "1s2692h4dvqnzwwicrkpj0zph1i2bhv39w31z5vh7ssgvykaradj";
     })
   ];
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index b12ed961351..02c13e413e3 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchgit
 , pkgconfig, makeWrapper, libtool, autoconf, automake
-, coreutils, libxml2, gnutls, devicemapper, perl, python2, attr
+, coreutils, libxml2, gnutls, perl, python2, attr
 , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext
 , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
 , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
@@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
   ] ++ optionals (!buildFromTarball) [
     libtool autoconf automake
   ] ++ optionals stdenv.isLinux [
-    libpciaccess devicemapper lvm2 utillinux systemd libnl numad zfs
+    libpciaccess lvm2 lvm2 utillinux systemd libnl numad zfs
     libapparmor libcap_ng numactl attr parted
   ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [
     xen
diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix
index 1150d04e1b4..263796cdc78 100644
--- a/pkgs/development/libraries/libxklavier/default.nix
+++ b/pkgs/development/libraries/libxklavier/default.nix
@@ -1,15 +1,16 @@
-{ stdenv, fetchurl, pkgconfig, xkeyboard_config, libxml2, xorg
+{ stdenv, fetchgit, autoreconfHook, pkgconfig, gtk-doc, xkeyboard_config, libxml2, xorg, docbook_xsl
 , glib, isocodes, gobjectIntrospection }:
 
 let
-  version = "5.3";
+  version = "5.4";
 in
 stdenv.mkDerivation rec {
   name = "libxklavier-${version}";
 
-  src = fetchurl {
-    url = "mirror://gnome/sources/libxklavier/${version}/${name}.tar.xz";
-    sha256 = "016lpdv35z0qsw1cprdc2k5qzkdi5waj6qmr0a2q6ljn9g2kpv7b";
+  src = fetchgit {
+    url = "git://anongit.freedesktop.org/git/libxklavier";
+    rev = name;
+    sha256 = "1w1x5mrgly2ldiw3q2r6y620zgd89gk7n90ja46775lhaswxzv7a";
   };
 
   outputs = [ "out" "dev" "devdoc" ];
@@ -17,14 +18,20 @@ stdenv.mkDerivation rec {
   # TODO: enable xmodmap support, needs xmodmap DB
   propagatedBuildInputs = with xorg; [ libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig gtk-doc docbook_xsl ];
 
   buildInputs = [ gobjectIntrospection ];
 
+  preAutoreconf = ''
+    export NOCONFIGURE=1
+    gtkdocize
+  '';
+
   configureFlags = [
     "--with-xkb-base=${xkeyboard_config}/etc/X11/xkb"
     "--with-xkb-bin-base=${xorg.xkbcomp}/bin"
     "--disable-xmodmap-support"
+    "--enable-gtk-doc"
   ];
 
   meta = with stdenv.lib; {
@@ -34,4 +41,3 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
   };
 }
-
diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix
index 3828ebcb7a7..367c4e96384 100644
--- a/pkgs/development/libraries/mailcore2/default.nix
+++ b/pkgs/development/libraries/mailcore2/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, cmake, libetpan, icu, cyrus_sasl, libctemplate
-, libuchardet, pkgconfig, glib, libtidy, libxml2, libuuid, openssl
+, libuchardet, pkgconfig, glib, html-tidy, libxml2, libuuid, openssl
 }:
 
 stdenv.mkDerivation rec {
@@ -17,14 +17,14 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     libetpan cmake icu cyrus_sasl libctemplate libuchardet glib
-    libtidy libxml2 libuuid openssl
+    html-tidy libxml2 libuuid openssl
   ];
 
   postPatch = ''
     substituteInPlace CMakeLists.txt \
        --replace " icule iculx" "" \
        --replace "tidy/tidy.h" "tidy.h" \
-       --replace "/usr/include/tidy" "${libtidy}/include" \
+       --replace "/usr/include/tidy" "${html-tidy}/include" \
        --replace "/usr/include/libxml2" "${libxml2.dev}/include/libxml2"
     substituteInPlace src/core/basetypes/MCHTMLCleaner.cpp \
       --replace buffio.h tidybuffio.h
diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix
index 32467e4849b..ab50cf1e17c 100644
--- a/pkgs/development/libraries/ntl/default.nix
+++ b/pkgs/development/libraries/ntl/default.nix
@@ -1,27 +1,60 @@
-{ stdenv, fetchurl, perl, gmp, libtool
+{ stdenv
+, lib
+, fetchurl
+, perl
+, gmp
+, gf2x ? null
+# I asked the ntl maintainer weather or not to include gf2x by default:
+# > If I remember correctly, gf2x is now thread safe, so there's no reason not to use it.
+, withGf2x ? true
+, tune ? false # tune for current system; non reproducible and time consuming
 }:
 
+assert withGf2x -> gf2x != null;
+
 stdenv.mkDerivation rec {
   name = "ntl-${version}";
-  version = "9.11.0";
+  version = "11.2.1";
   src = fetchurl {
     url = "http://www.shoup.net/ntl/ntl-${version}.tar.gz";
-    sha256 = "1wcwxpcby1c50llncz131334qq26lzh3dz21rahymgvakrq0369p";
+    sha256 = "04avzmqflx2a33n7v9jj32g83p7m6z712fg1mw308jk5ca2qp489";
   };
 
-  buildInputs = [ perl gmp libtool ];
+  buildInputs = [
+    gmp
+  ];
+
+  nativeBuildInputs = [
+    perl # needed for ./configure
+  ];
 
   sourceRoot = "${name}/src";
 
   enableParallelBuilding = true;
 
-  dontAddPrefix = true;
+  dontAddPrefix = true; # DEF_PREFIX instead
 
-  configureFlags = [ "DEF_PREFIX=$(out)" "WIZARD=off" "SHARED=on" "NATIVE=off" "CXX=c++" ];
+  # reference: http://shoup.net/ntl/doc/tour-unix.html
+  configureFlags = [
+    "DEF_PREFIX=$(out)"
+    "SHARED=on" # genereate a shared library (as well as static)
+    "NATIVE=off" # don't target code to current hardware (reproducibility, portability)
+    "TUNE=${
+      if tune then
+        "auto"
+      else if stdenv.targetPlatform.isx86 then
+        "x86" # "chooses options that should be well suited for most x86 platforms"
+      else
+        "generic" # "chooses options that should be OK for most platforms"
+    }"
+  ] ++ lib.optionals withGf2x [
+    "NTL_GF2X_LIB=on"
+    "GF2X_PREFIX=${gf2x}"
+  ];
 
-  # doCheck = true; # takes some time
+  doCheck = true; # takes some time
 
-  meta = {
+  meta = with lib; {
     description = "A Library for doing Number Theory";
     longDescription = ''
       NTL is a high-performance, portable C++ library providing data
@@ -30,7 +63,8 @@ stdenv.mkDerivation rec {
       the integers and over finite fields.
     '';
     homepage = http://www.shoup.net/ntl/;
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.all;
+    maintainers = with maintainers; [ timokau ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index 7e7314c936d..c50fc9fb35c 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind
-, glib, dbus, gst_all_1, v4l_utils, alsaLib, ffmpeg, libjack2, libudev, libva, xorg
+, glib, dbus, gst_all_1, v4l_utils, alsaLib, ffmpeg, libjack2, udev, libva, xorg
 , sbc, SDL2, makeFontsConf, freefont_ttf
 }:
 
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
   ];
   buildInputs = [
     glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer v4l_utils
-    alsaLib ffmpeg libjack2 libudev libva xorg.libX11 sbc SDL2
+    alsaLib ffmpeg libjack2 udev libva xorg.libX11 sbc SDL2
   ];
 
   mesonFlags = [
diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix
index 84709441b5e..9a43470de3b 100644
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/pkgs/development/libraries/podofo/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "podofo-0.9.5";
+  name = "podofo-0.9.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/podofo/${name}.tar.gz";
-    sha256 = "012kgfx5j5n6w4zkc1d290d2cwjk60jhzsjlr2x19g3yi75q2jc5";
+    sha256 = "0wj0y4zcmj4q79wrn3vv3xq4bb0vhhxs8yifafwy9f2sjm83c5p9";
   };
 
   propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng libidn expat ];
diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix
index 1a98ecc8743..c89e9e4296c 100644
--- a/pkgs/development/libraries/science/math/cudnn/default.nix
+++ b/pkgs/development/libraries/science/math/cudnn/default.nix
@@ -9,10 +9,11 @@ in
 
 {
   cudnn_cudatoolkit_7 = generic rec {
-    version = "4.0";
+    # Old URL is v4 instead of v4.0 for some reason...
+    version = "4";
     cudatoolkit = cudatoolkit_7;
-    srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v${version}-prod.tgz";
-    sha256 = "0zgr6qdbc29qw6sikhrh6diwwz7150rqc8a49f2qf37j2rvyyr2f";
+    srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v4.0-prod.tgz";
+    sha256 = "01a4v5j4v9n2xjqcc4m28c3m67qrvsx87npvy7zhx7w8smiif2fd";
   };
 
   cudnn_cudatoolkit_7_5 = generic rec {
diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix
index 51bda19cf13..bb1258655b5 100644
--- a/pkgs/development/libraries/science/math/cudnn/generic.nix
+++ b/pkgs/development/libraries/science/math/cudnn/generic.nix
@@ -5,24 +5,18 @@
 
 { stdenv
 , lib
-, requireFile
 , cudatoolkit
+, fetchurl
 }:
 
 stdenv.mkDerivation rec {
   name = "cudatoolkit-${cudatoolkit.majorVersion}-cudnn-${version}";
 
   inherit version;
-
-  src = requireFile rec {
-    name = srcName;
+  src = fetchurl {
+    # URL from NVIDIA docker containers: https://gitlab.com/nvidia/cuda/blob/centos7/7.0/runtime/cudnn4/Dockerfile
+    url = "https://developer.download.nvidia.com/compute/redist/cudnn/v${version}/${srcName}";
     inherit sha256;
-    message = ''
-      This nix expression requires that ${name} is already part of the store.
-      Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the cuDNN library
-      at https://developer.nvidia.com/cudnn, and run the following command in the download directory:
-      nix-prefetch-url file://\$PWD/${name}
-    '';
   };
 
   installPhase = ''
diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix
index 63060bf5553..36768acd991 100644
--- a/pkgs/development/libraries/strigi/default.nix
+++ b/pkgs/development/libraries/strigi/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, qt4, perl, bzip2, libxml2, exiv2
-, clucene_core, fam, zlib, dbus_tools, pkgconfig
+, clucene_core, fam, zlib, dbus, pkgconfig
 }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   CLUCENE_HOME = clucene_core;
 
   buildInputs =
-    [ zlib bzip2 libxml2 qt4 exiv2 clucene_core fam dbus_tools ];
+    [ zlib bzip2 libxml2 qt4 exiv2 clucene_core fam dbus.out ];
 
   nativeBuildInputs = [ cmake pkgconfig perl ];
 
diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix
index 24dc3667d17..d14010c857e 100644
--- a/pkgs/development/libraries/telepathy/qt/default.nix
+++ b/pkgs/development/libraries/telepathy/qt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python2Packages, dbus-glib, dbus_daemon
+{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python2Packages, dbus-glib, dbus
 , telepathy-farstream, telepathy-glib, fetchpatch }:
 
 let
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig python ];
   propagatedBuildInputs = [ qtbase telepathy-farstream telepathy-glib ];
   buildInputs = [ dbus-glib ];
-  checkInputs = [ dbus_daemon dbus-python ];
+  checkInputs = [ dbus.daemon dbus-python ];
 
   patches = [
     # https://github.com/TelepathyIM/telepathy-qt/issues/25
diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix
index 4dd01f664d1..a8515975c35 100644
--- a/pkgs/development/libraries/volume-key/default.nix
+++ b/pkgs/development/libraries/volume-key/default.nix
@@ -1,36 +1,27 @@
-{ stdenv, fetchgit, fetchpatch, autoreconfHook, pkgconfig, gettext, python2
-, swig, glib, utillinux, cryptsetup, nss, gpgme
+{ stdenv, fetchgit, autoreconfHook, pkgconfig, gettext, python3
+, ncurses, swig, glib, utillinux, cryptsetup, nss, gpgme
 }:
 
 let
-  version = "0.3.10";
+  version = "0.3.11";
 in stdenv.mkDerivation rec {
   name = "volume_key-${version}";
 
   src = fetchgit {
     url = https://pagure.io/volume_key.git;
-    rev = "ece1ce305234da454e330905c615ec474d9781c5";
-    sha256 = "16qdi5s6ycsh0iyc362gly7ggrwamky8i0zgbd4ajp3ymk9vqdva";
+    rev = "volume_key-${version}";
+    sha256 = "1sqdbcih1c39bjiv4mm1m7acc3lfh2i2hf2r9i7rk8adfzq8awma";
   };
 
   outputs = [ "out" "man" "dev" "py" ];
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig gettext python2 swig ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig gettext python3 ncurses swig ];
 
   buildInputs = [ glib cryptsetup nss utillinux gpgme ];
 
-  patches = [
-    # Use pkg-config for locating Python.h
-    # https://pagure.io/volume_key/pull-request/12
-    (fetchpatch {
-      url = https://pagure.io/fork/cathay4t/volume_key/c/8eda66d3b734ea335e37cf9d7d173b9e8ebe2fd9.patch;
-      sha256 = "01lr1zijk0imkk681zynm4w5ad3y6c9vdrmrzaib7w7ima75iczr";
-    })
-  ];
-
   makeFlags = [
-    "pyexecdir=$(py)/${python2.sitePackages}"
-    "pythondir=$(py)/${python2.sitePackages}"
+    "pyexecdir=$(py)/${python3.sitePackages}"
+    "pythondir=$(py)/${python3.sitePackages}"
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix
index 4b84f696eec..e44a678194a 100644
--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/pkgs/development/libraries/vulkan-loader/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig,
-  x11, libxcb, libXrandr, libXext, wayland, libGL_driver }:
+  xlibsWrapper, libxcb, libXrandr, libXext, wayland, libGL_driver }:
 let version = "1.1.77.0"; in
 assert version == vulkan-headers.version;
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake python3 x11 libxcb libXrandr libXext wayland ];
+  buildInputs = [ cmake python3 xlibsWrapper libxcb libXrandr libXext wayland ];
   enableParallelBuilding = true;
 
   cmakeFlags = [
diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix
index a672bbf52a9..2b9244ff1b1 100644
--- a/pkgs/development/libraries/wlc/default.nix
+++ b/pkgs/development/libraries/wlc/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig
 , wayland, pixman, libxkbcommon, libinput, xcbutilwm, xcbutilimage, libGL
-, libX11, dbus_libs, wayland-protocols, libdrm, mesa_noglu
+, libX11, dbus, wayland-protocols, libdrm, mesa_noglu
 , libpthreadstubs, libXdmcp, libXext, libXfixes
 , withOptionalPackages ? true, zlib, valgrind, doxygen
 }:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     wayland pixman libxkbcommon libinput xcbutilwm xcbutilimage libGL
-    libX11 libXfixes dbus_libs wayland-protocols
+    libX11 libXfixes dbus wayland-protocols
     libpthreadstubs libXdmcp libXext libdrm mesa_noglu ]
     ++ stdenv.lib.optionals withOptionalPackages [ zlib valgrind doxygen ];
 
diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix
index 33cf5dd4af8..7acbaa260a0 100644
--- a/pkgs/development/libraries/zeitgeist/default.nix
+++ b/pkgs/development/libraries/zeitgeist/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, pkgconfig, glib, sqlite, vala_0_38
-, autoconf, automake, libtool, gettext, dbus_libs, telepathy-glib
+, autoconf, automake, libtool, gettext, dbus, telepathy-glib
 , gtk3, json-glib, librdf_raptor2, dbus-glib
 , pythonSupport ? true, python2Packages
 }:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoconf automake libtool pkgconfig gettext vala_0_38 python2Packages.python ];
   buildInputs = [
-    glib sqlite dbus_libs telepathy-glib dbus-glib
+    glib sqlite dbus telepathy-glib dbus-glib
     gtk3 json-glib librdf_raptor2 python2Packages.rdflib
   ];
 
diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix
index f207683d2b0..8f3f331fd50 100644
--- a/pkgs/development/python-modules/dbus/default.nix
+++ b/pkgs/development/python-modules/dbus/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, buildPythonPackage, python, pkgconfig, dbus, dbus-glib, dbus_tools, isPyPy
+{ lib, fetchurl, buildPythonPackage, python, pkgconfig, dbus, dbus-glib, isPyPy
 , ncurses, pygobject3 }:
 
 if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else buildPythonPackage rec {
@@ -15,7 +15,7 @@ if isPyPy then throw "dbus-python not supported for interpreter ${python.executa
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ dbus dbus-glib ]
-    ++ lib.optionals doCheck [ dbus_tools pygobject3 ]
+    ++ lib.optionals doCheck [ dbus.out pygobject3 ]
     # My guess why it's sometimes trying to -lncurses.
     # It seems not to retain the dependency anyway.
     ++ lib.optional (! python ? modules) ncurses;
diff --git a/pkgs/development/python-modules/graphite-api/default.nix b/pkgs/development/python-modules/graphite-api/default.nix
new file mode 100644
index 00000000000..7f1726a2c4b
--- /dev/null
+++ b/pkgs/development/python-modules/graphite-api/default.nix
@@ -0,0 +1,45 @@
+{ buildPythonPackage, fetchFromGitHub, lib, flask, flask-caching, cairocffi, pyparsing, pytz, pyyaml
+, raven, six, structlog, tzlocal, nose, mock, cairo, isPyPy
+}:
+
+buildPythonPackage rec {
+  pname = "graphite-api";
+  version = "1.1.3";
+
+  disabled = isPyPy;
+
+  src = fetchFromGitHub {
+    owner = "brutasse";
+    repo = "graphite-api";
+    rev = version;
+    sha256 = "0sz3kav2024ms2z4q03pigcf080gsr5v774z9bp3zw29k2p47ass";
+  };
+
+  # https://github.com/brutasse/graphite-api/pull/239 rebased onto 1.1.3
+  patches = [ ./flask-caching-rebased.patch ];
+
+  checkPhase = "nosetests";
+
+  propagatedBuildInputs = [
+    flask
+    flask-caching
+    cairocffi
+    pyparsing
+    pytz
+    pyyaml
+    raven
+    six
+    structlog
+    tzlocal
+  ];
+
+  checkInputs = [ nose mock ];
+
+  LD_LIBRARY_PATH = "${cairo.out}/lib";
+
+  meta = with lib; {
+    description = "Graphite-web, without the interface. Just the rendering HTTP API";
+    homepage = https://github.com/brutasse/graphite-api;
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/development/python-modules/graphite-api/flask-caching-rebased.patch b/pkgs/development/python-modules/graphite-api/flask-caching-rebased.patch
new file mode 100644
index 00000000000..2d4a2f29bc4
--- /dev/null
+++ b/pkgs/development/python-modules/graphite-api/flask-caching-rebased.patch
@@ -0,0 +1,132 @@
+diff --git a/graphite_api/config.py b/graphite_api/config.py
+index 5e1e382..dc033a8 100644
+--- a/graphite_api/config.py
++++ b/graphite_api/config.py
+@@ -112,11 +112,11 @@ def configure(app):
+     app.cache = None
+     if 'cache' in config:
+         try:
+-            from flask.ext.cache import Cache
++            from flask_caching import Cache
+         except ImportError:
+             warnings.warn("'cache' is provided in the configuration but "
+-                          "Flask-Cache is not installed. Please `pip install "
+-                          "Flask-Cache`.")
++                          "flask-caching is not installed. Please `pip "
++                          "install flask-caching`.")
+         else:
+             cache_conf = {'CACHE_DEFAULT_TIMEOUT': 60,
+                           'CACHE_KEY_PREFIX': 'graphite-api:'}
+diff --git a/requirements.txt b/requirements.txt
+index c68b446..7826b0c 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -1,5 +1,5 @@
+ Flask
+-Flask-Cache
++Flask-Caching
+ cairocffi
+ pyparsing>=1.5.7
+ pytz
+diff --git a/setup.py b/setup.py
+index 0337cbe..df07989 100644
+--- a/setup.py
++++ b/setup.py
+@@ -38,7 +38,7 @@ setup(
+     extras_require={
+         'sentry': ['raven[flask]'],
+         'cyanite': ['cyanite'],
+-        'cache': ['Flask-Cache'],
++        'cache': ['Flask-Caching'],
+         'statsd': ['statsd'],
+     },
+     zip_safe=False,
+diff --git a/tests/test_render.py b/tests/test_render.py
+index be5609d..a0e7190 100644
+--- a/tests/test_render.py
++++ b/tests/test_render.py
+@@ -8,7 +8,7 @@ from graphite_api._vendor import whisper
+ from . import TestCase, WHISPER_DIR
+ 
+ try:
+-    from flask.ext.cache import Cache
++    from flask_caching import Cache
+ except ImportError:
+     Cache = None
+ 
+diff --git a/tox.ini b/tox.ini
+index 85a0abb..c820393 100644
+--- a/tox.ini
++++ b/tox.ini
+@@ -47,7 +47,7 @@ basepython = python2.7
+ deps =
+ 	{[testenv]deps}
+ 	Flask
+-	Flask-Cache
++	Flask-Caching
+ 	pyparsing
+ 	mock
+ 
+@@ -56,7 +56,7 @@ basepython = python3.3
+ deps =
+ 	{[testenv]deps}
+ 	Flask
+-	Flask-Cache
++	Flask-Caching
+ 	pyparsing
+ 
+ [testenv:py34]
+@@ -66,7 +66,7 @@ commands =
+ deps =
+ 	{[testenv]deps}
+ 	Flask
+-	Flask-Cache
++	Flask-Caching
+ 	pyparsing
+ 
+ [testenv:py35]
+@@ -76,7 +76,7 @@ commands =
+ deps =
+ 	{[testenv]deps}
+ 	Flask
+-	Flask-Cache
++	Flask-Caching
+ 	pyparsing
+ 
+ [testenv:pyparsing1]
+@@ -84,7 +84,7 @@ basepython = python2.7
+ deps =
+ 	{[testenv]deps}
+ 	Flask
+-	Flask-Cache
++	Flask-Caching
+ 	pyparsing==1.5.7
+ 	mock
+ 
+@@ -93,7 +93,7 @@ basepython = pypy
+ deps =
+ 	{[testenv]deps}
+ 	Flask
+-	Flask-Cache
++	Flask-Caching
+ 	pyparsing
+ 	mock
+ 
+@@ -102,7 +102,7 @@ basepython = python2.7
+ deps =
+ 	{[testenv]deps}
+ 	Flask<0.9
+-	Flask-Cache
++	Flask-Caching
+ 	pyparsing
+ 	mock
+ 
+@@ -111,7 +111,7 @@ basepython = python2.7
+ deps =
+ 	{[testenv]deps}
+ 	Flask<0.10
+-	Flask-Cache
++	Flask-Caching
+ 	pyparsing
+ 	mock
+ 
diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix
index 0be0f892d73..9aabd6d94e2 100644
--- a/pkgs/development/python-modules/mysqlclient/default.nix
+++ b/pkgs/development/python-modules/mysqlclient/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, buildPythonPackage, fetchPypi, libmysql }:
+{ stdenv, buildPythonPackage, fetchPypi, mysql }:
 
 buildPythonPackage rec {
   pname = "mysqlclient";
   version = "1.3.12";
 
   buildInputs = [
-    libmysql
+    mysql.connector-c
   ];
 
   # Tests need a MySQL database
diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix
index 0efb77d27b3..a747d42e418 100644
--- a/pkgs/development/python-modules/pyqt/4.x.nix
+++ b/pkgs/development/python-modules/pyqt/4.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pythonPackages, qt4, pkgconfig, lndir, dbus_libs, makeWrapper }:
+{ stdenv, fetchurl, pythonPackages, qt4, pkgconfig, lndir, dbus, makeWrapper }:
 
 let
   pname = "PyQt-x11-gpl";
@@ -42,7 +42,7 @@ in buildPythonPackage {
   '';
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ makeWrapper qt4 lndir dbus_libs ];
+  buildInputs = [ makeWrapper qt4 lndir dbus ];
 
   propagatedBuildInputs = [ sip ];
 
diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index b669c145641..ebad81f809b 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -1,5 +1,5 @@
 { lib, fetchurl, fetchpatch, pythonPackages, pkgconfig, makeWrapper
-, qmake, lndir, qtbase, qtsvg, qtwebkit, qtwebengine, dbus_libs
+, qmake, lndir, qtbase, qtsvg, qtwebkit, qtwebengine, dbus
 , withWebSockets ? false, qtwebsockets
 , withConnectivity ? false, qtconnectivity
 }:
@@ -32,7 +32,7 @@ in buildPythonPackage {
 
   nativeBuildInputs = [ pkgconfig qmake lndir ];
 
-  buildInputs = [ dbus_libs ];
+  buildInputs = [ dbus ];
 
   propagatedBuildInputs = [
     sip qtbase qtsvg qtwebkit qtwebengine
@@ -53,7 +53,7 @@ in buildPythonPackage {
 
     ${python.executable} configure.py  -w \
       --confirm-license \
-      --dbus=${dbus_libs.dev}/include/dbus-1.0 \
+      --dbus=${dbus.dev}/include/dbus-1.0 \
       --no-qml-plugin \
       --bindir=$out/bin \
       --destdir=$out/${python.sitePackages} \
diff --git a/pkgs/development/python-modules/simpy/default.nix b/pkgs/development/python-modules/simpy/default.nix
new file mode 100644
index 00000000000..981b6693f7d
--- /dev/null
+++ b/pkgs/development/python-modules/simpy/default.nix
@@ -0,0 +1,18 @@
+{ buildPythonPackage, fetchPypi, lib }:
+
+buildPythonPackage rec {
+  pname = "simpy";
+  version = "3.0.11";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0hqgxk3lggf21jq9lh8838cdl24mdkdnpzh0w4m28d0zn2wjb5nh";
+  };
+
+  meta = with lib; {
+    homepage = https://simpy.readthedocs.io/en/latest/;
+    description = "A process-based discrete-event simulation framework based on standard Python.";
+    license = [ licenses.mit ];
+    maintainers = with maintainers; [ shlevy ];
+  };
+}
diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix
index 9a6a3c39eec..0f96b100435 100644
--- a/pkgs/development/python-modules/trezor/default.nix
+++ b/pkgs/development/python-modules/trezor/default.nix
@@ -1,11 +1,13 @@
 { lib, fetchPypi, buildPythonPackage,
-  protobuf, hidapi, ecdsa, mnemonic, requests, pyblake2, click, libusb1, rlp
+  protobuf, hidapi, ecdsa, mnemonic, requests, pyblake2, click, libusb1, rlp, isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "trezor";
   version = "0.9.1";
 
+  disabled = !isPy3k;
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "a481191011bade98f1e9f1201e7c72a83945050657bbc90dc4ac32dc8b8b46a4";
diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix
index bf1d1357f5e..d2c27b9f485 100644
--- a/pkgs/development/tools/analysis/jdepend/default.nix
+++ b/pkgs/development/tools/analysis/jdepend/default.nix
@@ -30,5 +30,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.clarkware.com/software/JDepend.html;
     license = licenses.bsd3;
     platforms = platforms.linux;
+    maintainers = with maintainers; [ pSub ];
   };
 }
diff --git a/pkgs/development/tools/analysis/valkyrie/default.nix b/pkgs/development/tools/analysis/valkyrie/default.nix
index 1da6c6a1e86..1ecdd9f32ce 100644
--- a/pkgs/development/tools/analysis/valkyrie/default.nix
+++ b/pkgs/development/tools/analysis/valkyrie/default.nix
@@ -8,14 +8,23 @@ stdenv.mkDerivation rec {
     sha256 = "0hwvsncf62mdkahwj9c8hpmm94c1wr5jn89370k6rj894kxry2x7";
   };
 
+  patchPhase = ''
+    sed -i '1s;^;#include <unistd.h>\n;' src/objects/tool_object.cpp
+    sed -i '1s;^;#include <unistd.h>\n;' src/utils/vk_config.cpp
+    sed -i '1s;^;#include <sys/types.h>\n;' src/utils/vk_config.cpp
+    sed -i '1s;^;#include <unistd.h>\n;' src/utils/vk_utils.cpp
+    sed -i '1s;^;#include <sys/types.h>\n;' src/utils/vk_utils.cpp
+  '';
+
   buildInputs = [ qt4 ];
+
   nativeBuildInputs = [ qmake4Hook ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.valgrind.org/;
     description = "Qt4-based GUI for the Valgrind 3.6.x series";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-    broken = true;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pSub ];
   };
 }
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 0441ba0c665..b59a93d3732 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, lib, fetchurl, jdk, zip, unzip, bash, writeCBin, coreutils, makeWrapper, which, python, gnused
+{ stdenv, lib, fetchurl, runCommand, makeWrapper
+, jdk, zip, unzip, bash, writeCBin, coreutils
+, which, python, gnused, gnugrep, findutils
 # Always assume all markers valid (don't redownload dependencies).
 # Also, don't clean up environment variables.
 , enableNixHacks ? false
@@ -6,9 +8,25 @@
 , libcxx, CoreFoundation, CoreServices, Foundation
 }:
 
+let
+  srcDeps = stdenv.lib.singleton (
+    fetchurl {
+      url = "https://github.com/google/desugar_jdk_libs/archive/f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip";
+      sha256 = "c80f3f3d442d8a6ca7adc83f90ecd638c3864087fdd6787ffac070b6f1cc8f9b";
+    }
+  );
+
+  distDir = runCommand "bazel-deps" {} ''
+    mkdir -p $out
+    for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done
+  '';
+
+  defaultShellPath = lib.makeBinPath [ bash coreutils findutils gnugrep gnused which ];
+
+in
 stdenv.mkDerivation rec {
 
-  version = "0.13.0";
+  version = "0.15.1";
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/bazelbuild/bazel/";
@@ -22,7 +40,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
-    sha256 = "143nd9dmw2x88azf8spinl2qnvw9m8lqlqc765l9q2v6hi807sc2";
+    sha256 = "0v7wdwbxy4bcx488lm1glf4iv3wfdwbkg8fh6kmmmfn1lhgkaay6";
   };
 
   sourceRoot = ".";
@@ -41,7 +59,7 @@ stdenv.mkDerivation rec {
 
     int main(int argc, char *argv[]) {
       char *path = getenv("PATH");
-      char *pathToAppend = "${lib.makeBinPath [ coreutils gnused ]}";
+      char *pathToAppend = "${defaultShellPath}";
       char *newPath;
       if (path != NULL) {
         int length = strlen(path) + 1 + strlen(pathToAppend) + 1;
@@ -67,6 +85,9 @@ 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
+
+    echo "build --experimental_distdir=${distDir}" >> .bazelrc
+    echo "fetch --experimental_distdir=${distDir}" >> .bazelrc
     echo "build --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\"" >> .bazelrc
     echo "build --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\"" >> .bazelrc
     echo "build --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\"" >> .bazelrc
@@ -75,6 +96,15 @@ stdenv.mkDerivation rec {
     sed -i -e "361 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh
     sed -i -e "361 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh
     sed -i -e "361 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh
+
+    # --experimental_strict_action_env (which will soon become the
+    # default, see bazelbuild/bazel#2574) hardcodes the default
+    # action environment to a value that on NixOS at least is bogus.
+    # So we hardcode it to something useful.
+    substituteInPlace \
+		  src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java \
+      --replace /bin:/usr/bin ${defaultShellPath}
+
     patchShebangs .
   '';
 
@@ -126,7 +156,7 @@ stdenv.mkDerivation rec {
   # Save paths to hardcoded dependencies so Nix can detect them.
   postFixup = ''
     mkdir -p $out/nix-support
-    echo "${customBash} ${gnused} ${coreutils}" > $out/nix-support/depends
+    echo "${customBash} ${defaultShellPath}" > $out/nix-support/depends
   '';
 
   dontStrip = true;
diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index b820dc997e4..2dca2b6cd42 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand
-, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree, libselinux, libseccomp
+, gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, ostree, libselinux, libseccomp
 , go-md2man }:
 
 let
@@ -26,7 +26,7 @@ in buildGoPackage rec {
   hardeningDisable = [ "fortify" ];
 
   nativeBuildInputs = [ pkgconfig go-md2man.bin ];
-  buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree libselinux libseccomp ];
+  buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs ostree libselinux libseccomp ];
 
   # Copied from the skopeo package, doesn’t seem to make a difference?
   # If something related to these libs failed, uncomment these lines.
diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix
index 377791007a3..b4a35b3a21c 100644
--- a/pkgs/development/tools/flatpak-builder/default.nix
+++ b/pkgs/development/tools/flatpak-builder/default.nix
@@ -25,7 +25,7 @@
 , gitMinimal
 , glib
 , gnutar
-, json_glib
+, json-glib
 , libcap
 , libdwarf
 , libsoup
@@ -67,7 +67,7 @@ in stdenv.mkDerivation rec {
     elfutils
     flatpak
     glib
-    json_glib
+    json-glib
     libcap
     libdwarf
     libsoup
diff --git a/pkgs/development/tools/misc/gputils/default.nix b/pkgs/development/tools/misc/gputils/default.nix
new file mode 100644
index 00000000000..aaaee20b81a
--- /dev/null
+++ b/pkgs/development/tools/misc/gputils/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "gputils-${version}";
+  version = "1.5.0-1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/gputils/${name}.tar.bz2";
+    sha256 = "055v83fdgqljprapf7rmh8x66mr13fj0qypj49xba5spx0ca123g";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://gputils.sourceforge.io/;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ yorickvp ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix
index de94b7a8eff..38d385d1d55 100644
--- a/pkgs/development/tools/qtcreator/default.nix
+++ b/pkgs/development/tools/qtcreator/default.nix
@@ -6,8 +6,8 @@
 with stdenv.lib;
 
 let
-  baseVersion = "4.5";
-  revision = "0";
+  baseVersion = "4.6";
+  revision = "2";
 in
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz";
-    sha256 = "1yfrfma23xxzz8hl43g7pk7ay5lg25l9lscjlih617lyv6jmc0hl";
+    sha256 = "1k23i1qsw6d06sy7g0vd699rbvwv6vbw211fy0nn0705a5zndbxv";
   };
 
   buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ];
diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix
index 5e88384c58d..775b744f839 100644
--- a/pkgs/development/tools/react-native-debugger/default.nix
+++ b/pkgs/development/tools/react-native-debugger/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, unzip, cairo, xorg, gdk_pixbuf, fontconfig, pango, gnome2, atk, gtk2, glib
-, freetype, dbus, nss, nspr, alsaLib, cups, expat, libudev, makeDesktopItem
+, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem
 }:
 
 let
@@ -19,7 +19,7 @@ let
     alsaLib
     cups
     expat
-    libudev
+    udev
 
     gnome2.GConf
 
diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix
index 0535a11e0ce..dc157b67253 100644
--- a/pkgs/development/tools/skopeo/default.nix
+++ b/pkgs/development/tools/skopeo/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand
-, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree, libselinux
+, gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, ostree, libselinux
 , go-md2man }:
 
 with stdenv.lib;
@@ -28,7 +28,7 @@ buildGoPackage rec {
   excludedPackages = "integration";
 
   nativeBuildInputs = [ pkgconfig (lib.getBin go-md2man) ];
-  buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree libselinux ];
+  buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs ostree libselinux ];
 
   buildFlagsArray = ''
     -ldflags=
@@ -37,8 +37,8 @@ buildGoPackage rec {
   '';
 
   preBuild = ''
-    export CGO_CFLAGS="-I${getDev gpgme}/include -I${getDev libgpgerror}/include -I${getDev devicemapper}/include -I${getDev btrfs-progs}/include"
-    export CGO_LDFLAGS="-L${getLib gpgme}/lib -L${getLib libgpgerror}/lib -L${getLib devicemapper}/lib"
+    export CGO_CFLAGS="-I${getDev gpgme}/include -I${getDev libgpgerror}/include -I${getDev lvm2}/include -I${getDev btrfs-progs}/include"
+    export CGO_LDFLAGS="-L${getLib gpgme}/lib -L${getLib libgpgerror}/lib -L${getLib lvm2}/lib"
   '';
 
   postBuild = ''
diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix
index 8951f16e43c..da2612415ba 100644
--- a/pkgs/development/tools/vulkan-validation-layers/default.nix
+++ b/pkgs/development/tools/vulkan-validation-layers/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, vulkan-loader,
-  glslang, pkgconfig, x11, libxcb, libXrandr, wayland }:
+  glslang, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }:
 
 stdenv.mkDerivation rec {
   name = "vulkan-validation-layers-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake python3 vulkan-headers vulkan-loader x11 libxcb libXrandr wayland ];
+  buildInputs = [ cmake python3 vulkan-headers vulkan-loader xlibsWrapper libxcb libXrandr wayland ];
   enableParallelBuilding = true;
 
   cmakeFlags = [ "-DGLSLANG_INSTALL_DIR=${glslang}" ];
diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix
index fbf76842c20..1487ed4e1dd 100644
--- a/pkgs/development/web/insomnia/default.nix
+++ b/pkgs/development/web/insomnia/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, makeWrapper, fetchurl, dpkg
-, alsaLib, atk, cairo, cups, dbus_daemon, expat, fontconfig, freetype
+, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype
 , gdk_pixbuf, glib, gnome2, gtk2-x11, nspr, nss
 , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext
 , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, nghttp2
@@ -8,8 +8,8 @@
 
 let
   libPath = lib.makeLibraryPath [
-    alsaLib atk cairo cups dbus_daemon.lib expat fontconfig freetype gdk_pixbuf glib gnome2.GConf gnome2.pango
-    gtk2-x11 nspr nss stdenv.cc.cc.lib libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes
+    alsaLib atk cairo cups dbus expat fontconfig freetype gdk_pixbuf glib gnome2.GConf gnome2.pango
+    gtk2-x11 nspr nss stdenv.cc.cc libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes
     libXi libXrandr libXrender libXtst libxcb
   ];
   runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl openssl nghttp2 ];