Merge commit '1036dc664169b32613ec11b58cc1740c7511a340'

143 files changed, 1624 insertions, 1676 deletions

diff --git a/nixpkgs/pkgs/development/compilers/colm/cross-compile.patch b/nixpkgs/pkgs/development/compilers/colm/cross-compile.patch
new file mode 100644
index 000000000000..470ea23aaf1b
--- /dev/null
+++ b/nixpkgs/pkgs/development/compilers/colm/cross-compile.patch
@@ -0,0 +1,13 @@
+--- a/configure.ac	2019-07-09 22:41:03.166948024 -0700
++++ b/configure.ac	2019-07-09 22:41:16.699948056 -0700
+@@ -40,9 +40,7 @@
+ 
+ dnl Choose a default for the build_manual var. If the dist file is present in
+ dnl the root then default to no, otherwise go for it.
+-AC_CHECK_FILES( [$srcdir/DIST], 
+-	[. $srcdir/DIST;], 
+-	[build_manual=yes; ] )
++build_manual=yes;
+ 
+ dnl Set to true if the manual should be built.
+ AM_CONDITIONAL(BUILD_MANUAL, [test "x$build_manual" = "xyes"])
diff --git a/nixpkgs/pkgs/development/compilers/colm/default.nix b/nixpkgs/pkgs/development/compilers/colm/default.nix
index 888750efdf97..237a80280ec8 100644
--- a/nixpkgs/pkgs/development/compilers/colm/default.nix
+++ b/nixpkgs/pkgs/development/compilers/colm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, gcc, asciidoc }:
+{ stdenv, fetchurl, makeWrapper, gcc, asciidoc, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "colm-${version}";
@@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
     sha256 = "0f76iri173l2wja2v7qrwmf958cqwh5g9x4bhj2z8wknmlla6gz4";
   };
 
-  nativeBuildInputs = [ makeWrapper asciidoc ];
+  patches = [ ./cross-compile.patch ];
+
+  nativeBuildInputs = [ makeWrapper asciidoc autoreconfHook ];
 
   doCheck = true;
 
diff --git a/nixpkgs/pkgs/development/compilers/dotnet/sdk/default.nix b/nixpkgs/pkgs/development/compilers/dotnet/sdk/default.nix
index b4f35b1c4c01..6c1fa37e81a4 100644
--- a/nixpkgs/pkgs/development/compilers/dotnet/sdk/default.nix
+++ b/nixpkgs/pkgs/development/compilers/dotnet/sdk/default.nix
@@ -28,7 +28,7 @@ in
       runHook preBuild
       patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" ./dotnet
       patchelf --set-rpath "${rpath}" ./dotnet
-      find -type f -name "*.so" -exec patchelf --set-rpath "${rpath}" {} \;
+      find -type f -name "*.so" -exec patchelf --set-rpath '$ORIGIN:${rpath}' {} \;
       echo -n "dotnet-sdk version: "
       ./dotnet --version
       runHook postBuild
diff --git a/nixpkgs/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/nixpkgs/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
index b6e2aea7eca5..6bd4af05da36 100644
--- a/nixpkgs/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
+++ b/nixpkgs/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://developer.nvidia.com/cg-toolkit;
+    homepage = https://developer.nvidia.com/cg-toolkit;
     license = lib.licenses.unfreeRedistributable;
   };
 }
diff --git a/nixpkgs/pkgs/development/compilers/ocaml/4.08.nix b/nixpkgs/pkgs/development/compilers/ocaml/4.08.nix
index cdc5314f3c77..4f9b8ebd294c 100644
--- a/nixpkgs/pkgs/development/compilers/ocaml/4.08.nix
+++ b/nixpkgs/pkgs/development/compilers/ocaml/4.08.nix
@@ -1,8 +1,8 @@
 import ./generic.nix {
   major_version = "4";
   minor_version = "08";
-  patch_version = "0+rc2";
-  sha256 = "09wp2iig6v5pivkjcnibdvkg5mchcj3q4zms6ij67039xczm8qrg";
+  patch_version = "0";
+  sha256 = "0si976y8snbmhm96671di65z0rrdyldxd55wjxn2mkn6654nryna";
 
   # If the executable is stripped it does not work
   dontStrip = true;
diff --git a/nixpkgs/pkgs/development/compilers/scala/dotty.nix b/nixpkgs/pkgs/development/compilers/scala/dotty.nix
index a999bd422e63..7bc7fa3d4c24 100644
--- a/nixpkgs/pkgs/development/compilers/scala/dotty.nix
+++ b/nixpkgs/pkgs/development/compilers/scala/dotty.nix
@@ -9,7 +9,7 @@ in
 stdenv.mkDerivation {
   name = "dotty-${dotty-bare.version}";
 
-  unpackPhase = ":";
+  dontUnpack = true;
 
   installPhase = ''
     mkdir -p $out/bin
diff --git a/nixpkgs/pkgs/development/go-packages/generic/default.nix b/nixpkgs/pkgs/development/go-packages/generic/default.nix
index 8e016fadface..b3386aaf24bf 100644
--- a/nixpkgs/pkgs/development/go-packages/generic/default.nix
+++ b/nixpkgs/pkgs/development/go-packages/generic/default.nix
@@ -72,14 +72,19 @@ let
 
   goPath = if goDeps != null then importGodeps { depsFile = goDeps; } ++ extraSrcs
                              else extraSrcs;
-  package = go.stdenv.mkDerivation (
+  package = stdenv.mkDerivation (
     (builtins.removeAttrs args [ "goPackageAliases" "disabled" "extraSrcs"]) // {
 
     nativeBuildInputs = [ removeReferencesTo go ]
       ++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs;
     buildInputs = buildInputs;
 
-    inherit (go) GOOS GOARCH;
+    inherit (go) GOOS GOARCH GO386 CGO_ENABLED;
+
+    GOHOSTARCH = go.GOHOSTARCH or null;
+    GOHOSTOS = go.GOHOSTOS or null;
+
+    GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
 
     configurePhase = args.configurePhase or ''
       runHook preConfigure
diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix
index 81d6c0a4458c..c975b1e2a2ca 100644
--- a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix
@@ -72,7 +72,7 @@ self: super: {
       name = "git-annex-${super.git-annex.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + super.git-annex.version;
-      sha256 = "02vj13qyzjbk14ddpabycq2mwzggsk63vddffjyzaqpy9d7x35s9";
+      sha256 = "11d4qyhmc774h2xyrpyn9rxx99x3vjs0fcxsg49gj5ayzmykafap";
     };
   }).override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;
diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index cb11bb6f4b93..ee519f903ca9 100644
--- a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2627,7 +2627,6 @@ broken-packages:
   - accelerate-arithmetic
   - accelerate-fftw
   - accelerate-fourier
-  - accelerate-llvm
   - accelerate-llvm-native
   - accelerate-random
   - accelerate-typelits
@@ -2691,7 +2690,6 @@ broken-packages:
   - aeson-applicative
   - aeson-decode
   - aeson-diff-generic
-  - aeson-extra
   - aeson-flowtyped
   - aeson-injector
   - aeson-native
@@ -2752,8 +2750,6 @@ broken-packages:
   - amazon-emailer
   - amazon-emailer-client-snap
   - amazon-products
-  - amazonka-cognito-identity
-  - amazonka-ecs
   - amby
   - AMI
   - ampersand
@@ -2866,7 +2862,6 @@ broken-packages:
   - asil
   - asn
   - asn1-codec
-  - AspectAG
   - assert
   - assertions
   - asset-map
@@ -2878,7 +2873,6 @@ broken-packages:
   - async-combinators
   - async-dejafu
   - async-manager
-  - async-pool
   - async-timer
   - asynchronous-exceptions
   - aterm
@@ -2900,13 +2894,11 @@ broken-packages:
   - AttoJson
   - attoparsec-data
   - attoparsec-enumerator
-  - attoparsec-ip
   - attoparsec-iteratee
   - attoparsec-text
   - attoparsec-text-enumerator
   - attoparsec-time
   - attoparsec-trans
-  - attoparsec-uri
   - attosplit
   - Attrac
   - atuin
@@ -3011,7 +3003,6 @@ broken-packages:
   - bdcs-api
   - beam
   - beam-newtype-field
-  - beam-postgres
   - beam-th
   - beamable
   - beautifHOL
@@ -3028,9 +3019,7 @@ broken-packages:
   - besout
   - bet
   - betacode
-  - betris
   - bff
-  - bgmax
   - bgzf
   - bhoogle
   - bibdb
@@ -3088,7 +3077,6 @@ broken-packages:
   - bindynamic
   - binembed
   - binembed-example
-  - bins
   - bio
   - bio-sequence
   - bioace
@@ -3123,6 +3111,7 @@ broken-packages:
   - bird
   - BirdPP
   - bisect-binary
+  - bishbosh
   - bit-array
   - bit-stream
   - bitcoin-hs
@@ -3195,10 +3184,8 @@ broken-packages:
   - boombox
   - boomslang
   - borel
-  - boring
   - boring-window-switcher
   - bot
-  - bound-extras
   - bounded-array
   - bowntz
   - braid
@@ -3215,7 +3202,6 @@ broken-packages:
   - bricks-rendering
   - bricks-syntax
   - brillig
-  - broadcast-chan
   - broadcast-chan-conduit
   - broadcast-chan-pipes
   - broadcast-chan-tests
@@ -3254,7 +3240,7 @@ broken-packages:
   - butterflies
   - bv-sized
   - bytable
-  - bytestring-arbitrary
+  - byteslice
   - bytestring-builder-varword
   - bytestring-class
   - bytestring-csv
@@ -3286,7 +3272,6 @@ broken-packages:
   - cabal-ghc-dynflags
   - cabal-ghci
   - cabal-graphdeps
-  - cabal-helper
   - Cabal-ide-backend
   - cabal-info
   - cabal-install-bundle
@@ -3317,7 +3302,6 @@ broken-packages:
   - cabin
   - cabocha
   - cached
-  - cacophony
   - caffegraph
   - cairo-core
   - cake
@@ -3335,7 +3319,6 @@ broken-packages:
   - call-haskell-from-anything
   - camfort
   - campfire
-  - canon
   - canonical-filepath
   - canonical-json
   - canteven-http
@@ -3346,7 +3329,6 @@ broken-packages:
   - cao
   - cap
   - Capabilities
-  - capability
   - capataz
   - capnp
   - capped-list
@@ -3372,7 +3354,6 @@ broken-packages:
   - cash
   - cassandra-cql
   - Cassava
-  - cassava-streams
   - cassette
   - cassy
   - castle
@@ -3429,8 +3410,8 @@ broken-packages:
   - chatwork
   - cheapskate-terminal
   - check-pvp
-  - Checked
   - checked
+  - Checked
   - checkmate
   - chessIO
   - chevalier-common
@@ -3573,7 +3554,6 @@ broken-packages:
   - colorless
   - colorless-http-client
   - colorless-scotty
-  - colour-accelerate
   - colour-space
   - coltrane
   - columbia
@@ -3585,8 +3565,6 @@ broken-packages:
   - combinatorial-problems
   - Combinatorrent
   - combobuffer
-  - comfort-array
-  - comic
   - Command
   - commander
   - Commando
@@ -3605,8 +3583,6 @@ broken-packages:
   - competition
   - compilation
   - complexity
-  - componentm
-  - componentm-devel
   - compose-trans
   - composite-aeson
   - composite-aeson-refined
@@ -3634,8 +3610,8 @@ broken-packages:
   - concurrent-state
   - Concurrential
   - ConcurrentUtils
-  - Condor
   - condor
+  - Condor
   - condorcet
   - conductive-base
   - conductive-hsc3
@@ -3643,15 +3619,11 @@ broken-packages:
   - conduit-audio-lame
   - conduit-audio-samplerate
   - conduit-find
-  - conduit-merge
   - conduit-network-stream
   - conduit-resumablesink
   - conduit-throttle
   - conduit-tokenize-attoparsec
-  - conduit-vfs
-  - conduit-vfs-zip
   - conf
-  - confcrypt
   - conffmt
   - confide
   - config-parser
@@ -3669,7 +3641,6 @@ broken-packages:
   - connection-string
   - Conscript
   - consistent
-  - console-program
   - const-math-ghc-plugin
   - constrained-categories
   - constrained-category
@@ -3680,7 +3651,6 @@ broken-packages:
   - constraint-reflection
   - ConstraintKinds
   - constraints-emerge
-  - constraints-extras
   - constructive-algebra
   - consul-haskell
   - Consumer
@@ -3699,7 +3669,6 @@ broken-packages:
   - continuum
   - continuum-client
   - Contract
-  - control-event
   - control-monad-attempt
   - control-monad-exception
   - control-monad-exception-monadsfd
@@ -3714,14 +3683,8 @@ broken-packages:
   - convert-annotation
   - convertible-ascii
   - convertible-text
-  - copilot
-  - copilot-c99
   - copilot-cbmc
-  - copilot-core
-  - copilot-language
-  - copilot-libraries
   - copilot-sbv
-  - copilot-theorem
   - copr
   - COrdering
   - core
@@ -3802,7 +3765,6 @@ broken-packages:
   - crystalfontz
   - cse-ghc-plugin
   - csg
-  - csound-catalog
   - CSPM-cspm
   - CSPM-FiringRules
   - CSPM-Frontend
@@ -3819,7 +3781,6 @@ broken-packages:
   - cube
   - cuboid
   - cudd
-  - curl-runnings
   - currency-convert
   - curry-frontend
   - CurryDB
@@ -3829,15 +3790,14 @@ broken-packages:
   - curves
   - custom-prelude
   - CV
-  - cyclotomic
   - cypher
   - d-bus
   - d3js
   - dag
   - DAG-Tournament
   - Dangerous
-  - Dao
   - dao
+  - Dao
   - dapi
   - darcs-benchmark
   - darcs-beta
@@ -3871,7 +3831,6 @@ broken-packages:
   - data-fin
   - data-fin-simple
   - data-flagset
-  - data-interval
   - data-ivar
   - data-kiln
   - data-layer
@@ -3892,8 +3851,8 @@ broken-packages:
   - data-repr
   - data-result
   - data-rev
-  - Data-Rope
   - data-rope
+  - Data-Rope
   - data-rtuple
   - data-size
   - data-spacepart
@@ -4009,7 +3968,6 @@ broken-packages:
   - deunicode
   - devil
   - dewdrop
-  - df1
   - dfinity-radix-tree
   - Dflow
   - dfsbuild
@@ -4017,11 +3975,7 @@ broken-packages:
   - dgs
   - dhall-check
   - dhall-nix
-  - dhall-to-cabal
   - dhcp-lease-parser
-  - di
-  - di-df1
-  - di-handle
   - dia-base
   - dia-functions
   - diagrams-boolean
@@ -4087,12 +4041,9 @@ broken-packages:
   - disjoint-set-stateful
   - diskhash
   - disposable
-  - Dist
   - dist-upload
   - distance
   - DisTract
-  - distributed-closure
-  - distributed-fork
   - distributed-fork-aws-lambda
   - distributed-process
   - distributed-process-async
@@ -4120,6 +4071,7 @@ broken-packages:
   - dixi
   - djembe
   - djinn-th
+  - dl-fedora
   - dmenu
   - dmenu-pkill
   - dmenu-pmount
@@ -4132,7 +4084,6 @@ broken-packages:
   - doc-review
   - doccheck
   - docidx
-  - docker
   - docker-build-cacher
   - dockercook
   - DocTest
@@ -4184,7 +4135,6 @@ broken-packages:
   - dsh-sql
   - dsmc
   - dsmc-tools
-  - dson
   - dson-parsec
   - DSTM
   - dstring
@@ -4224,8 +4174,6 @@ broken-packages:
   - easy-api
   - easyjson
   - easyplot
-  - easytensor
-  - easytensor-vulkan
   - ebeats
   - ebnf-bff
   - ecma262
@@ -4242,8 +4190,7 @@ broken-packages:
   - editline
   - EditTimeReport
   - effect-handlers
-  - effects
-  - effects-parser
+  - effect-stack
   - effin
   - egison-quote
   - egison-tutorial
@@ -4258,23 +4205,19 @@ broken-packages:
   - ekg-elasticsearch
   - ekg-influxdb
   - ekg-log
-  - ekg-prometheus-adapter
   - ekg-push
   - ekg-rrd
   - elevator
   - elision
   - elm-websocket
-  - elsa
   - emacs-keys
   - email
   - email-header
   - email-postmark
-  - email-validator
   - emailparse
   - embeddock
   - embeddock-example
   - embroidery
-  - emd
   - emgm
   - Emping
   - Empty
@@ -4286,7 +4229,6 @@ broken-packages:
   - engine-io-snap
   - engine-io-wai
   - engine-io-yesod
-  - ENIG
   - entangle
   - EntrezHTTP
   - entwine
@@ -4363,7 +4305,6 @@ broken-packages:
   - eventful-dynamodb
   - eventful-postgresql
   - eventlog2html
-  - eventloop
   - EventSocket
   - eventsource-geteventstore-store
   - eventstore
@@ -4372,7 +4313,6 @@ broken-packages:
   - exact-real
   - exact-real-positional
   - except-exceptions
-  - exception-hierarchy
   - exception-monads-fd
   - exchangerates
   - execs
@@ -4402,7 +4342,6 @@ broken-packages:
   - extemp
   - extended-categories
   - extensible-data
-  - extensible-effects-concurrent
   - Extra
   - extract-dependencies
   - extractelf
@@ -4411,6 +4350,7 @@ broken-packages:
   - f-ree-hack-cheats-free-v-bucks-generator
   - Facebook-Password-Hacker-Online-Latest-Version
   - faceted
+  - factory
   - Facts
   - factual-api
   - fadno
@@ -4419,7 +4359,6 @@ broken-packages:
   - failable-list
   - failure-detector
   - FailureT
-  - fake
   - fake-type
   - faktory
   - falling-turnip
@@ -4433,23 +4372,13 @@ broken-packages:
   - fastedit
   - fastirc
   - fastly
-  - fastparser
   - FastPush
   - FastxPipe
   - fathead-util
   - fault-tree
-  - fay
-  - fay-base
   - fay-builder
-  - fay-dom
-  - fay-geoposition
   - fay-hsx
-  - fay-jquery
-  - fay-ref
   - fay-simplejson
-  - fay-text
-  - fay-uri
-  - fay-websockets
   - fb-persistent
   - fbmessenger-api
   - fca
@@ -4499,15 +4428,14 @@ broken-packages:
   - FileManipCompat
   - fileneglect
   - filepath-io-access
-  - FilePather
   - filepather
+  - FilePather
   - Files
   - FileSystem
   - filesystem-conduit
   - filesystem-enumerator
   - filesystem-trees
   - fillit
-  - fin
   - final-pretty-printer
   - Finance-Quote-Yahoo
   - Finance-Treasury
@@ -4522,6 +4450,7 @@ broken-packages:
   - first-and-last
   - firstify
   - FirstOrderTheory
+  - fishfood
   - fit
   - fitsio
   - fix-parser-simple
@@ -4649,8 +4578,6 @@ broken-packages:
   - fresh
   - friday-devil
   - friday-scale-dct
-  - friendly
-  - front
   - frown
   - frp-arduino
   - frpnow
@@ -4669,7 +4596,6 @@ broken-packages:
   - FTPLine
   - ftshell
   - full-sessions
-  - full-text-search
   - fullstop
   - funbot
   - funbot-client
@@ -4739,7 +4665,6 @@ broken-packages:
   - GeneralTicTacToe
   - generators
   - generic-accessors
-  - generic-aeson
   - generic-binary
   - generic-church
   - generic-enum
@@ -4751,7 +4676,6 @@ broken-packages:
   - generic-tree
   - generic-xml
   - generic-xmlpickler
-  - generics-eot
   - genericserialize
   - genesis
   - genesis-test
@@ -4783,9 +4707,7 @@ broken-packages:
   - gh-labeler
   - ghc-core-smallstep
   - ghc-datasize
-  - ghc-dump-core
   - ghc-dump-tree
-  - ghc-dump-util
   - ghc-dup
   - ghc-events-analyze
   - ghc-events-parallel
@@ -4815,8 +4737,6 @@ broken-packages:
   - ghci-lib
   - ghci-ng
   - ghcjs-base-stub
-  - ghcjs-dom
-  - ghcjs-dom-jsaddle
   - ghcjs-dom-jsffi
   - ghcjs-fetch
   - ghcjs-hplay
@@ -4859,7 +4779,6 @@ broken-packages:
   - git-fmt
   - git-gpush
   - git-jump
-  - git-monitor
   - git-object
   - git-remote-ipfs
   - git-repair
@@ -4877,12 +4796,9 @@ broken-packages:
   - gitit
   - gitlab-api
   - gitlib-cross
-  - gitlib-libgit2
   - gitlib-s3
-  - gitlib-test
   - gitlib-utils
   - gitson
-  - gitter
   - glade
   - gladexml-accessor
   - glapp
@@ -4895,7 +4811,6 @@ broken-packages:
   - gli
   - glicko
   - glider-nlp
-  - glirc
   - GLMatrix
   - glob-posix
   - global
@@ -4904,7 +4819,6 @@ broken-packages:
   - glome-hs
   - GlomeTrace
   - GlomeView
-  - gloss-accelerate
   - gloss-banana
   - gloss-devil
   - gloss-export
@@ -4912,10 +4826,6 @@ broken-packages:
   - gloss-sodium
   - glpk-hs
   - glue
-  - glue-common
-  - glue-core
-  - glue-ekg
-  - glue-example
   - gmap
   - gmndl
   - gnome-desktop
@@ -4945,7 +4855,6 @@ broken-packages:
   - googlepolyline
   - GoogleSB
   - GoogleTranslate
-  - gopher-proxy
   - gopherbot
   - gore-and-ash
   - gore-and-ash-actor
@@ -4960,7 +4869,6 @@ broken-packages:
   - GotoT-transformers
   - gotta-go-fast
   - gpah
-  - GPipe
   - GPipe-Collada
   - GPipe-Examples
   - GPipe-GLFW
@@ -5023,7 +4931,6 @@ broken-packages:
   - GroteTrap
   - groundhog-converters
   - group-with
-  - grouped-list
   - growler
   - GrowlNotify
   - grpc-etcd-client
@@ -5098,8 +5005,6 @@ broken-packages:
   - hackmanager
   - hactor
   - hactors
-  - haddock
-  - haddock-api
   - haddock-leksah
   - haddock-test
   - haddocset
@@ -5127,15 +5032,9 @@ broken-packages:
   - hakyll-contrib-links
   - hakyll-convert
   - hakyll-dhall
-  - hakyll-dir-list
-  - hakyll-favicon
   - hakyll-filestore
-  - hakyll-images
   - hakyll-ogmarkup
   - hakyll-R
-  - hakyll-sass
-  - hakyll-series
-  - hakyll-shakespeare
   - hakyll-shortcode
   - hakyll-shortcut-links
   - halberd
@@ -5217,9 +5116,7 @@ broken-packages:
   - haroonga-httpd
   - harpy
   - harvest-api
-  - has
   - has-th
-  - HasBigDecimal
   - HasCacBDD
   - hascas
   - Haschoo
@@ -5254,7 +5151,6 @@ broken-packages:
   - haskell-conll
   - haskell-course-preludes
   - haskell-disque
-  - haskell-docs
   - haskell-eigen-util
   - haskell-formatter
   - haskell-ftp
@@ -5266,7 +5162,6 @@ broken-packages:
   - haskell-lsp-client
   - haskell-ml
   - haskell-mpfr
-  - haskell-names
   - haskell-neo4j-client
   - haskell-openflow
   - haskell-overridez
@@ -5441,8 +5336,8 @@ broken-packages:
   - hdaemonize-buildfix
   - hdbc-aeson
   - HDBC-mysql
-  - HDBC-postgresql-hstore
   - hdbc-postgresql-hstore
+  - HDBC-postgresql-hstore
   - hdbi
   - hdbi-conduit
   - hdbi-postgresql
@@ -5456,7 +5351,6 @@ broken-packages:
   - hdiscount
   - hdm
   - hdo
-  - hdocs
   - hdph
   - hdph-closure
   - hdr-histogram
@@ -5531,7 +5425,6 @@ broken-packages:
   - hexquote
   - hext
   - heyefi
-  - heyting-algebras
   - hF2
   - hfann
   - hfd
@@ -5564,7 +5457,6 @@ broken-packages:
   - hgrib
   - hharp
   - HHDL
-  - hhp
   - hi-file-parser
   - hi3status
   - hiccup
@@ -5578,7 +5470,6 @@ broken-packages:
   - hierarchy
   - hiernotify
   - Hieroglyph
-  - higgledy
   - HiggsSet
   - higherorder
   - highjson
@@ -5640,15 +5531,14 @@ broken-packages:
   - hlibfam
   - HList
   - HListPP
-  - HLogger
   - hlogger
+  - HLogger
   - hlongurl
   - hls
   - hlwm
   - hly
   - hmark
   - hmarkup
-  - hmatrix-backprop
   - hmatrix-banded
   - hmatrix-mmap
   - hmatrix-morpheus
@@ -5773,7 +5663,6 @@ broken-packages:
   - hR
   - hranker
   - HRay
-  - hrfsize
   - hricket
   - Hricket
   - hriemann
@@ -5930,8 +5819,6 @@ broken-packages:
   - hsreadability
   - hsseccomp
   - hsSqlite3
-  - hssqlppp
-  - hssqlppp-th
   - HsSVN
   - hstatistics
   - hstats
@@ -6035,24 +5922,18 @@ broken-packages:
   - hw-dump
   - hw-eliasfano
   - hw-excess
-  - hw-fingertree
   - hw-ip
   - hw-json
   - hw-json-lens
-  - hw-json-simd
   - hw-json-simple-cursor
   - hw-json-standard-cursor
   - hw-packed-vector
-  - hw-parser
-  - hw-prim
-  - hw-prim-bits
   - hw-rankselect
   - hw-rankselect-base
   - hw-simd
   - hw-streams
   - hw-succinct
   - hw-uri
-  - hw-vector
   - hw-xml
   - hwall-auth-iitk
   - hweblib
@@ -6152,6 +6033,7 @@ broken-packages:
   - imap
   - imapget
   - imbib
+  - imgur
   - imgurder
   - imj-animation
   - imj-base
@@ -6222,7 +6104,6 @@ broken-packages:
   - invertible-hlist
   - io-capture
   - io-reactive
-  - ion
   - IOR
   - IORefCAS
   - iostring
@@ -6269,16 +6150,7 @@ broken-packages:
   - iterIO
   - iterio-server
   - ivor
-  - ivory
-  - ivory-backend-c
   - ivory-bitdata
-  - ivory-eval
-  - ivory-examples
-  - ivory-hw
-  - ivory-opts
-  - ivory-quickcheck
-  - ivory-serialize
-  - ivory-stdlib
   - ivy-web
   - ixdopp
   - ixmonad
@@ -6286,14 +6158,13 @@ broken-packages:
   - iyql
   - j2hs
   - jack-bindings
-  - JackMiniMix
   - jackminimix
+  - JackMiniMix
   - jacobi-roots
   - jaeger-flamegraph
   - jail
   - jalaali
   - jalla
-  - jammittools
   - jarfind
   - jarify
   - jason
@@ -6328,7 +6199,6 @@ broken-packages:
   - jonathanscard
   - jpeg
   - js-good-parts
-  - jsaddle-dom
   - jsaddle-hello
   - jsaddle-warp
   - jsaddle-wkwebview
@@ -6359,7 +6229,7 @@ broken-packages:
   - JSONb
   - jsonextfilter
   - JsonGrammar
-  - JSONParser
+  - jsonpath
   - jsonresume
   - jsonrpc-conduit
   - jsons-to-schema
@@ -6387,10 +6257,9 @@ broken-packages:
   - kademlia
   - kafka-client
   - kaleidoscope
-  - Kalman
   - kalman
+  - Kalman
   - kangaroo
-  - kanji
   - kansas-lava
   - kansas-lava-cores
   - kansas-lava-papilio
@@ -6405,10 +6274,8 @@ broken-packages:
   - katip-syslog
   - katt
   - kawaii
-  - kazura-queue
   - kd-tree
   - kdesrc-build-extra
-  - kdt
   - keccak
   - keera-hails-i18n
   - keera-hails-mvc-environment-gtk
@@ -6458,7 +6325,6 @@ broken-packages:
   - ktx
   - kure
   - kure-your-boilerplate
-  - kurita
   - KyotoCabinet
   - l-bfgs-b
   - L-seed
@@ -6473,7 +6339,6 @@ broken-packages:
   - lambda-calculator
   - lambda-canvas
   - lambda-devs
-  - lambda-options
   - lambda-toolbox
   - lambda2js
   - lambdaBase
@@ -6557,7 +6422,6 @@ broken-packages:
   - language-vhdl
   - language-webidl
   - lapack
-  - lapack-comfort-array
   - Lastik
   - lat
   - latest-npm-version
@@ -6590,7 +6454,6 @@ broken-packages:
   - leanpub-wreq
   - leapseconds
   - learn
-  - learn-physics
   - learn-physics-examples
   - Learning
   - leetify
@@ -6600,7 +6463,6 @@ broken-packages:
   - legion-extra
   - leksah-server
   - lendingclub
-  - lens-accelerate
   - lens-filesystem
   - lens-prelude
   - lens-text-encoding
@@ -6624,7 +6486,6 @@ broken-packages:
   - libconfig
   - libcspm
   - libexpect
-  - libffi-dynamic
   - libGenI
   - libhbb
   - libinfluxdb
@@ -6642,7 +6503,6 @@ broken-packages:
   - librandomorg
   - librato
   - libsystemd-daemon
-  - libsystemd-journal
   - libtagc
   - libxls
   - libxml-enumerator
@@ -6662,7 +6522,6 @@ broken-packages:
   - linda
   - linden
   - line-drawing
-  - linear-accelerate
   - linear-algebra-cblas
   - linear-circuit
   - linear-code
@@ -6693,7 +6552,6 @@ broken-packages:
   - lio-simple
   - lipsum-gen
   - liquid
-  - liquidhaskell-cabal-demo
   - list-fusion-probe
   - list-mux
   - list-prompt
@@ -6722,7 +6580,6 @@ broken-packages:
   - llvm-general
   - llvm-general-pure
   - llvm-general-quote
-  - llvm-hs
   - llvm-hs-pretty
   - llvm-ht
   - llvm-pkg-config
@@ -6750,7 +6607,6 @@ broken-packages:
   - logging-effect-extra
   - logging-effect-extra-file
   - logging-effect-extra-handler
-  - logging-facade-journald
   - Logic
   - logic-classes
   - logic-TPTP
@@ -6792,12 +6648,10 @@ broken-packages:
   - LslPlus
   - lsp-test
   - lsystem
-  - ltext
   - ltk
   - lua-bc
   - luachunk
   - luautils
-  - lucid-svg
   - lucienne
   - Lucu
   - lui
@@ -6828,7 +6682,6 @@ broken-packages:
   - madlang
   - mage
   - magic-wormhole
-  - magicbane
   - MagicHaskeller
   - magico
   - magma
@@ -6866,7 +6719,6 @@ broken-packages:
   - mangopay
   - manifold-random
   - manifolds
-  - manifolds-core
   - map-exts
   - map-reduce-folds
   - map-syntax
@@ -6927,13 +6779,12 @@ broken-packages:
   - mecab
   - mech
   - Mecha
-  - Mechs
   - mechs
+  - Mechs
   - med-module
   - mediabus
   - mediabus-fdk-aac
   - mediabus-rtp
-  - median-stream
   - mediawiki
   - medium-sdk-haskell
   - mellon-core
@@ -7004,7 +6855,6 @@ broken-packages:
   - miniplex
   - minirotate
   - ministg
-  - minitypeset-opengl
   - minst-idx
   - mios
   - mirror-tweet
@@ -7020,25 +6870,25 @@ broken-packages:
   - ml-w
   - mlist
   - mltool
+  - mmark
+  - mmark-cli
+  - mmark-ext
   - mmtf
   - mmtl
   - mmtl-base
   - moan
   - Mobile-Legends-Hack-Cheats
-  - mockazo
-  - model
   - modelicaparser
   - modify-fasta
   - modsplit
-  - modular
   - modular-prelude
   - modular-prelude-classy
   - modularity
   - module-management
   - modulespection
   - modulo
-  - Moe
   - moe
+  - Moe
   - MoeDict
   - mohws
   - mole
@@ -7073,7 +6923,6 @@ broken-packages:
   - monad-unify
   - monad-var
   - monad-wrap
-  - monadacme
   - MonadCatchIO-mtl
   - MonadCatchIO-mtl-foreign
   - MonadCatchIO-transformers
@@ -7112,7 +6961,6 @@ broken-packages:
   - monzo
   - moo
   - moonshine
-  - more-containers
   - morfette
   - morfeusz
   - morley
@@ -7124,11 +6972,6 @@ broken-packages:
   - morte
   - mosaico-lib
   - moss
-  - moto
-  - moto-postgresql
-  - motor
-  - motor-diagrams
-  - motor-reflection
   - mount
   - movie-monad
   - mp
@@ -7146,8 +6989,6 @@ broken-packages:
   - mrifk
   - mrm
   - ms
-  - msgpack
-  - msgpack-aeson
   - msgpack-idl
   - msgpack-rpc
   - msh
@@ -7172,7 +7013,6 @@ broken-packages:
   - multiaddr
   - multiarg
   - multibase
-  - multifile
   - multifocal
   - multihash
   - multihash-serialise
@@ -7184,7 +7024,6 @@ broken-packages:
   - multirec-alt-deriver
   - multirec-binary
   - multisetrewrite
-  - multistate
   - multivariant
   - Munkres-simple
   - muon
@@ -7211,7 +7050,6 @@ broken-packages:
   - mvc
   - mvc-updates
   - mvclient
-  - mwc-random-accelerate
   - mxnet
   - mxnet-dataiter
   - mxnet-examples
@@ -7246,7 +7084,6 @@ broken-packages:
   - nanovg
   - nanovg-simple
   - nanq
-  - naqsha
   - narc
   - nat-sized-numbers
   - nationstates
@@ -7272,13 +7109,11 @@ broken-packages:
   - nested-sequence
   - NestedFunctor
   - nestedmap
-  - net-spider
   - net-spider-pangraph
   - net-spider-rpl
   - netclock
   - netcore
   - netease-fm
-  - netlib-comfort-array
   - netlines
   - netrium
   - NetSNMP
@@ -7318,7 +7153,6 @@ broken-packages:
   - network-transport-inmemory
   - network-transport-tcp
   - network-transport-tests
-  - network-transport-zeromq
   - network-voicetext
   - network-wai-router
   - network-websocket
@@ -7343,12 +7177,10 @@ broken-packages:
   - nice-html
   - nicovideo-translator
   - nikepub
-  - nimber
   - Ninjas
   - nirum
   - nitro
   - niv
-  - nix-eval
   - nixfromnpm
   - nixpkgs-update
   - nkjp
@@ -7378,7 +7210,6 @@ broken-packages:
   - notifications-tray-icon
   - notmuch-haskell
   - notmuch-web
-  - NoTrace
   - np-linear
   - nptools
   - ntha
@@ -7404,7 +7235,6 @@ broken-packages:
   - numhask-test
   - Nussinov78
   - Nutri
-  - nvim-hs-ghcid
   - NXT
   - NXTDSL
   - nylas
@@ -7440,11 +7270,10 @@ broken-packages:
   - oidc-client
   - ois-input-manager
   - olwrapper
-  - om-elm
   - omaketex
   - ombra
-  - Omega
   - omega
+  - Omega
   - omnifmt
   - on-a-horse
   - onama
@@ -7459,11 +7288,9 @@ broken-packages:
   - open-haddock
   - open-pandoc
   - open-signals
-  - open-typerep
   - OpenAFP
   - OpenAFP-Utils
   - openapi-petstore
-  - opench-meteo
   - OpenCL
   - OpenCLRaw
   - OpenCLWrappers
@@ -7529,7 +7356,6 @@ broken-packages:
   - packunused
   - pacman-memcache
   - padKONTROL
-  - pads-haskell
   - pagarme
   - PageIO
   - pagure-hook-receiver
@@ -7537,7 +7363,6 @@ broken-packages:
   - pam
   - panda
   - pandoc-include
-  - pandoc-include-code
   - pandoc-japanese-filters
   - pandoc-lens
   - pandoc-plantuml-diagrams
@@ -7564,7 +7389,6 @@ broken-packages:
   - Parallel-Arrows-Eden
   - parallel-tasks
   - parameterized
-  - parameterized-utils
   - paramtree
   - paranoia
   - parco
@@ -7595,7 +7419,6 @@ broken-packages:
   - pasta
   - pastis
   - pasty
-  - patat
   - patches-vector
   - Pathfinder
   - pathfindingcore
@@ -7630,7 +7453,6 @@ broken-packages:
   - pedestrian-dag
   - peg
   - peggy
-  - pencil
   - penny
   - penny-bin
   - penny-lib
@@ -7640,8 +7462,8 @@ broken-packages:
   - peregrin
   - perf
   - perf-analysis
-  - PerfectHash
   - perfecthash
+  - PerfectHash
   - perhaps
   - periodic
   - perm
@@ -7676,7 +7498,6 @@ broken-packages:
   - peyotls-codec
   - pez
   - pg-harness
-  - pg-harness-server
   - pg-recorder
   - pg-store
   - pg-transact
@@ -7702,7 +7523,6 @@ broken-packages:
   - picoparsec
   - picosat
   - pictikz
-  - pidfile
   - pier
   - pier-core
   - piet
@@ -7734,7 +7554,6 @@ broken-packages:
   - pipes-p2p
   - pipes-p2p-examples
   - pipes-protolude
-  - pipes-random
   - pipes-rt
   - pipes-s3
   - pipes-shell
@@ -7756,7 +7575,6 @@ broken-packages:
   - plan-applicative
   - plan-b
   - planar-graph
-  - planb-token-introspection
   - planet-mitchell
   - planet-mitchell-test
   - plankton
@@ -7810,7 +7628,6 @@ broken-packages:
   - polysoup
   - polytypeable
   - polytypeable-utils
-  - pomaps
   - pomodoro
   - pomohoro
   - ponder
@@ -7821,10 +7638,10 @@ broken-packages:
   - poppler
   - portager
   - porte
-  - porter
   - PortFusion
   - ports
   - posix-acl
+  - posix-api
   - posix-realtime
   - posix-waitpid
   - postcodes
@@ -7878,13 +7695,11 @@ broken-packages:
   - presburger
   - press
   - presto-hdbc
-  - pretty-ghci
   - pretty-ncols
   - pretty-relative-time
   - prettyprinter-vty
   - preview
   - prim-array
-  - prim-instances
   - primes-type
   - primitive-addr
   - primitive-atomic
@@ -7892,7 +7707,6 @@ broken-packages:
   - primitive-containers
   - primitive-extras
   - primitive-indexed
-  - primitive-maybe
   - primitive-simd
   - primitive-sort
   - primitive-unlifted
@@ -7930,7 +7744,6 @@ broken-packages:
   - project-m36
   - projectile
   - prolog-graph
-  - prometheus
   - prometheus-effect
   - promise
   - pronounce
@@ -7957,7 +7770,6 @@ broken-packages:
   - proxy-mapping
   - psc-ide
   - pseudo-trie
-  - pthread
   - PTQ
   - ptr
   - publicsuffixlistcreate
@@ -8029,7 +7841,6 @@ broken-packages:
   - QuickAnnotate
   - quickbooks
   - quickcheck-arbitrary-template
-  - quickcheck-classes
   - quickcheck-poly
   - quickcheck-property-comb
   - quickcheck-property-monad
@@ -8061,7 +7872,6 @@ broken-packages:
   - quoridor-hs
   - qux
   - R-pandoc
-  - raaz
   - rad
   - radium
   - radium-formula-parser
@@ -8094,7 +7904,6 @@ broken-packages:
   - rank1dynamic
   - rank2classes
   - Ranka
-  - rapid
   - rapid-term
   - rasa
   - rasa-example-config
@@ -8120,8 +7929,6 @@ broken-packages:
   - razom-text-util
   - rbr
   - rc
-  - rcu
-  - rdf
   - rdf4h
   - rdioh
   - react-flux
@@ -8171,12 +7978,9 @@ broken-packages:
   - refcount
   - Referees
   - refh
-  - refined
   - reflection-extras
   - reflex-animation
   - reflex-backend-wai
-  - reflex-basic-host
-  - reflex-dom-core
   - reflex-dom-svg
   - reflex-gloss
   - reflex-gloss-scene
@@ -8219,9 +8023,7 @@ broken-packages:
   - reified-records
   - reify
   - relacion
-  - relation
   - relational-postgresql8
-  - relational-record-examples
   - relative-date
   - reload
   - remark
@@ -8241,7 +8043,6 @@ broken-packages:
   - repa-flow
   - repa-linear-algebra
   - repa-plugin
-  - repa-scalar
   - repa-series
   - repa-stream
   - repa-v4l2
@@ -8301,13 +8102,8 @@ broken-packages:
   - rfc-redis
   - rfc-servant
   - rfc1413-server
-  - rhine
-  - rhine-gloss
   - rhythm-game-tutorial
-  - ribosome
   - RichConditional
-  - ridley
-  - ridley-extras
   - riemann
   - riff
   - ring-buffer
@@ -8333,14 +8129,12 @@ broken-packages:
   - RNAFoldProgs
   - RNAlien
   - RNAwolf
-  - rncryptor
   - rng-utils
   - rob
   - robin
   - robots-txt
   - roc-cluster
   - roc-cluster-demo
-  - rocksdb-query
   - roku-api
   - rollbar-hs
   - roller
@@ -8370,7 +8164,6 @@ broken-packages:
   - rspp
   - rss-conduit
   - rss2irc
-  - rtnetlink
   - rtorrent-rpc
   - rts-loader
   - ruby-marshal
@@ -8394,11 +8187,6 @@ broken-packages:
   - safe-json
   - safe-lazy-io
   - safe-length
-  - safe-money
-  - safe-money-aeson
-  - safe-money-cereal
-  - safe-money-serialise
-  - safe-money-store
   - safe-money-xmlbf
   - safe-plugins
   - safe-printf
@@ -8411,7 +8199,6 @@ broken-packages:
   - saferoute
   - sai-shape-syb
   - sajson
-  - salak
   - salak-toml
   - salak-yaml
   - Salsa
@@ -8456,7 +8243,6 @@ broken-packages:
   - scenegraph
   - schedevr
   - schedule-planner
-  - scheduler
   - schedyield
   - schematic
   - scholdoc
@@ -8464,6 +8250,7 @@ broken-packages:
   - scholdoc-texmath
   - scholdoc-types
   - SciBaseTypes
+  - scidb-hquery
   - science-constants-dimensional
   - SciFlow
   - SciFlow-drmaa
@@ -8515,21 +8302,18 @@ broken-packages:
   - SelectSequencesFromMSA
   - selenium
   - selenium-server
-  - self-extract
   - selinux
   - Semantique
   - semdoc
   - semi-iso
   - semialign
   - semialign-indexed
-  - semibounded-lattices
   - Semigroup
   - semigroupoids-syntax
   - semigroups-actions
   - semilattices
   - semiring
   - semiring-num
-  - semver-range
   - sendgrid-haskell
   - sendgrid-v3
   - sensei
@@ -8582,7 +8366,6 @@ broken-packages:
   - servant-pool
   - servant-postgresql
   - servant-proto-lens
-  - servant-purescript
   - servant-pushbullet-client
   - servant-py
   - servant-quickcheck
@@ -8667,7 +8450,6 @@ broken-packages:
   - shorten-strings
   - ShortestPathProblems
   - showdown
-  - shower
   - shpider
   - shuffle
   - si-clock
@@ -8675,7 +8457,6 @@ broken-packages:
   - sifflet
   - sifflet-lib
   - sigma-ij
-  - sign
   - signals
   - signed-multiset
   - silvi
@@ -8708,7 +8489,6 @@ broken-packages:
   - simple-tabular
   - simple-tar
   - simple-templates
-  - simple-ui
   - simple-units
   - simple-vec3
   - simple-zipper
@@ -8721,7 +8501,6 @@ broken-packages:
   - simplenote
   - simpleprelude
   - SimpleServer
-  - simplest-sqlite
   - simseq
   - singleton-dict
   - singleton-typelits
@@ -8758,7 +8537,6 @@ broken-packages:
   - slug
   - small-bytearray-builder
   - smallarray
-  - smallcaps
   - smallcheck-laws
   - smallcheck-lens
   - smallpt-hs
@@ -8792,7 +8570,6 @@ broken-packages:
   - snap-configuration-utilities
   - snap-error-collector
   - snap-extras
-  - snap-language
   - snap-routes
   - snap-stream
   - snap-testing
@@ -8892,7 +8669,6 @@ broken-packages:
   - sparsecheck
   - sparser
   - spata
-  - spatial-rotations
   - special-functors
   - special-keys
   - specialize-th
@@ -8916,10 +8692,7 @@ broken-packages:
   - splot
   - Spock
   - Spock-api-ghcjs
-  - Spock-api-server
   - Spock-auth
-  - Spock-core
-  - Spock-digestive
   - Spock-lucid
   - Spock-worker
   - spoonutil
@@ -8940,6 +8713,7 @@ broken-packages:
   - sqlvalue-list
   - sqsd-local
   - squeal-postgresql
+  - squeeze
   - srcinst
   - sscan
   - sscgi
@@ -8978,7 +8752,6 @@ broken-packages:
   - stackage-upload
   - stackage2nix
   - standalone-derive-topdown
-  - standalone-haddock
   - starling
   - stash
   - Stasis
@@ -8999,9 +8772,7 @@ broken-packages:
   - statsd
   - statsd-client
   - statsdi
-  - staversion
   - stb-image-redux
-  - stb-truetype
   - stdata
   - stdf
   - stdio
@@ -9011,13 +8782,11 @@ broken-packages:
   - stemmer-german
   - stepwise
   - stgi
-  - STL
   - stm-chunked-queues
   - stm-containers
   - stm-firehose
   - stm-hamt
   - stm-io-hooks
-  - stm-lifted
   - stm-promise
   - stm-stats
   - stmcontrol
@@ -9043,12 +8812,9 @@ broken-packages:
   - streamed
   - streaming-brotli
   - streaming-cassava
-  - streaming-concurrency
   - streaming-conduit
   - streaming-fft
   - streaming-lzma
-  - streaming-osm
-  - streaming-pcap
   - streaming-png
   - streaming-postgresql-simple
   - streaming-process
@@ -9067,7 +8833,6 @@ broken-packages:
   - stripe-haskell
   - stripe-http-client
   - stripe-http-streams
-  - strongswan-sql
   - structural-induction
   - structural-traversal
   - structured-mongoDB
@@ -9080,7 +8845,6 @@ broken-packages:
   - subleq-toolchain
   - submark
   - subsample
-  - substring-parser
   - subwordgraph
   - successors
   - suffix-array
@@ -9110,8 +8874,8 @@ broken-packages:
   - SVD2HS
   - svfactor
   - svg-builder-fork
-  - SVG2Q
   - svg2q
+  - SVG2Q
   - svgutils
   - svm-simple
   - svndump
@@ -9130,7 +8894,6 @@ broken-packages:
   - sym-plot
   - symantic
   - symantic-cli
-  - symantic-grammar
   - symantic-http-test
   - symantic-lib
   - symengine
@@ -9138,7 +8901,6 @@ broken-packages:
   - sync
   - sync-mht
   - syncthing-hs
-  - syntactic
   - syntax
   - syntax-attoparsec
   - syntax-example
@@ -9165,11 +8927,10 @@ broken-packages:
   - t3-server
   - ta
   - table
-  - table-layout
   - table-tennis
   - tableaux
-  - Tables
   - tables
+  - Tables
   - tablestorage
   - Tablify
   - tabloid
@@ -9211,7 +8972,6 @@ broken-packages:
   - tasty-jenkins-xml
   - tasty-laws
   - tasty-lens
-  - tasty-quickcheck-laws
   - tasty-stats
   - tasty-tap
   - tasty-travis
@@ -9257,7 +9017,6 @@ broken-packages:
   - terminal-punch
   - terminal-text
   - termination-combinators
-  - termonad
   - termplot
   - terntup
   - terrahs
@@ -9323,7 +9082,6 @@ broken-packages:
   - th-typegraph
   - thank-you-stars
   - theatre
-  - themoviedb
   - thentos-cookie-session
   - Theora
   - theoremquest
@@ -9335,14 +9093,12 @@ broken-packages:
   - Thingie
   - thorn
   - threadmanager
-  - threads-supervisor
   - threadscope
   - threepenny-gui-contextmenu
   - threepenny-gui-flexbox
   - thrift
   - throttled-io-loop
   - through-text
-  - throwable-exceptions
   - thumbnail-plus
   - tic-tac-toe
   - tickle
@@ -9361,7 +9117,6 @@ broken-packages:
   - time-http
   - time-io-access
   - time-machine
-  - time-parsers
   - time-quote
   - time-recurrence
   - time-series
@@ -9400,7 +9155,6 @@ broken-packages:
   - to-string-class
   - to-string-instances
   - toboggan
-  - todo
   - todos
   - tofromxml
   - toilet
@@ -9414,8 +9168,8 @@ broken-packages:
   - tomland
   - too-many-cells
   - toodles
-  - Top
   - top
+  - Top
   - topkata
   - torch
   - TORCS
@@ -9433,9 +9187,7 @@ broken-packages:
   - trace-function-call
   - traced
   - tracetree
-  - tracing
   - tracker
-  - trackit
   - traction
   - tracy
   - traildb
@@ -9456,10 +9208,6 @@ broken-packages:
   - translatable-intset
   - translate
   - translate-cli
-  - trasa
-  - trasa-client
-  - trasa-server
-  - trasa-th
   - travis
   - travis-meta-yaml
   - trawl
@@ -9489,7 +9237,6 @@ broken-packages:
   - tries
   - trigger
   - trimpolya
-  - triplesec
   - tripLL
   - trivia
   - tropical
@@ -9520,7 +9267,6 @@ broken-packages:
   - twee
   - tweet-hs
   - twentefp-eventloop-graphics
-  - twentefp-eventloop-trees
   - twentefp-graphs
   - twentefp-rosetree
   - twentefp-trees
@@ -9599,7 +9345,6 @@ broken-packages:
   - unagi-bloomfilter
   - unagi-streams
   - unamb-custom
-  - unbeliever
   - unbound
   - unbounded-delays-units
   - unboxed-containers
@@ -9641,7 +9386,6 @@ broken-packages:
   - unsequential
   - unused
   - uom-plugin
-  - up
   - update-nix-fetchgit
   - Updater
   - uploadcare
@@ -9661,7 +9405,6 @@ broken-packages:
   - urldecode
   - UrlDisp
   - urldisp-happstack
-  - urlpath
   - URLT
   - urn
   - urn-random
@@ -9687,6 +9430,7 @@ broken-packages:
   - uuagc-bootstrap
   - uuagc-diagrams
   - uuid-aeson
+  - uuid-orphans
   - uvector
   - uvector-algorithms
   - uxadt
@@ -9697,7 +9441,6 @@ broken-packages:
   - vacuum-graphviz
   - vacuum-opengl
   - vacuum-ubigraph
-  - vado
   - valid-names
   - validate-input
   - validated-literals
@@ -9711,7 +9454,6 @@ broken-packages:
   - variable-precision
   - variables
   - variation
-  - vault-tool
   - vault-tool-server
   - vault-trans
   - vaultaire-common
@@ -9720,7 +9462,6 @@ broken-packages:
   - vcf
   - vcsgui
   - vcswrapper
-  - vec
   - Vec-Boolean
   - Vec-OpenGLRaw
   - Vec-Transform
@@ -9731,7 +9472,6 @@ broken-packages:
   - vector-clock
   - vector-conduit
   - vector-endian
-  - vector-extras
   - vector-functorlazy
   - vector-heterogenous
   - vector-instances-collections
@@ -9749,7 +9489,6 @@ broken-packages:
   - verilog
   - versioning
   - versioning-servant
-  - vflow-types
   - vfr-waypoints
   - vgrep
   - vhd
@@ -9759,7 +9498,6 @@ broken-packages:
   - views
   - vigilance
   - Villefort
-  - vimeta
   - vimus
   - vintage-basic
   - vinyl-json
@@ -9789,7 +9527,6 @@ broken-packages:
   - vty-ui
   - vty-ui-extras
   - vulkan
-  - vulkan-api
   - waargonaut
   - wacom-daemon
   - waddle
@@ -9824,7 +9561,6 @@ broken-packages:
   - wai-request-spec
   - wai-responsible
   - wai-router
-  - wai-routes
   - wai-routing
   - wai-secure-cookies
   - wai-session-alt
@@ -9879,12 +9615,12 @@ broken-packages:
   - webfinger-client
   - webify
   - webkit-javascriptcore
-  - webkit2gtk3-javascriptcore
   - Webrexp
   - webserver
   - webshow
   - websockets-rpc
   - webwire
+  - weekdaze
   - weighted
   - weighted-regexp
   - welshy
@@ -9899,7 +9635,6 @@ broken-packages:
   - whiskers
   - whitespace
   - why3
-  - wide-word
   - WikimediaParser
   - wikipedia4epub
   - wild-bind-indicator
@@ -9911,7 +9646,6 @@ broken-packages:
   - Wired
   - wires
   - wiring
-  - withdependencies
   - wkt
   - wkt-geom
   - wl-pprint-ansiterm
@@ -9948,8 +9682,6 @@ broken-packages:
   - writer-cps-lens
   - writer-cps-monads-tf
   - writer-cps-morph
-  - ws
-  - ws-chans
   - wsdl
   - wsedit
   - wss-client
@@ -10014,7 +9746,6 @@ broken-packages:
   - xml2x
   - xmlbf-xmlhtml
   - XmlHtmlWriter
-  - XMLParser
   - xmltv
   - XMMS
   - xmms2-client
@@ -10049,8 +9780,6 @@ broken-packages:
   - yahoo-web-search
   - yajl
   - yajl-enumerator
-  - yam
-  - yam-datasource
   - yam-job
   - yam-redis
   - yam-servant
@@ -10079,7 +9808,6 @@ broken-packages:
   - yate
   - yavie
   - yaya
-  - yaya-hedgehog
   - yaya-unsafe
   - ycextra
   - yeller
@@ -10113,7 +9841,6 @@ broken-packages:
   - yesod-dsl
   - yesod-examples
   - yesod-fast-devel
-  - yesod-fay
   - yesod-form-richtext
   - yesod-gitrev
   - yesod-goodies
@@ -10124,7 +9851,6 @@ broken-packages:
   - yesod-mangopay
   - yesod-paginate
   - yesod-pagination
-  - yesod-paginator
   - yesod-paypal-rest
   - yesod-platform
   - yesod-pnotify
@@ -10202,7 +9928,6 @@ broken-packages:
   - zeromq4-clone-pattern
   - zeromq4-conduit
   - zeromq4-patterns
-  - zeromq4-simple
   - zeroth
   - ZFS
   - zifter
@@ -10232,7 +9957,5 @@ broken-packages:
   - zre
   - zsh-battery
   - zsyntax
-  - ztar
   - zuramaru
   - Zwaluw
-  - zxcvbn-c
diff --git a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix
index 60a805ad430a..c7443a42e5b6 100644
--- a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1111,16 +1111,14 @@ self: {
        pname = "AspectAG";
        version = "0.5.0.0";
        sha256 = "039k40swscsg21b4k4a3q95migvkflcp7sgx2a8gpzanrkx3ckz2";
-       revision = "1";
-       editedCabalFile = "0w5hlvwgwank3a930f4vcb0j966c6d0818lsp4rh85rjg5n9x7r7";
+       revision = "2";
+       editedCabalFile = "1afrgn3hhkfrb3khfnbj7x9p4dh8j682zjhp5lc7s7syr8zp8pxy";
        libraryHaskellDepends = [
          base containers ghc-prim mtl tagged template-haskell
          th-strict-compat
        ];
        description = "Strongly typed Attribute Grammars implemented using type-level programming";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AttoBencode" = callPackage
@@ -4542,8 +4540,6 @@ self: {
        testHaskellDepends = [ base containers MonadRandom ];
        description = "A Haskell library for probability distributions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DistanceTransform" = callPackage
@@ -4898,8 +4894,6 @@ self: {
        ];
        description = "Auto Korean conjugator/adjustor/adopter/converter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Earley" = callPackage
@@ -6595,8 +6589,6 @@ self: {
        ];
        description = "Typesafe functional GPU graphics programming";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GPipe-Collada" = callPackage
@@ -9690,8 +9682,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "A library for arbitrary precision decimal numbers";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HasCacBDD" = callPackage
@@ -11129,8 +11119,6 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "Parse JSON";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "JSONb" = callPackage
@@ -13986,8 +13974,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Remove all the functions come from Debug.Trace after debugging";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Noise" = callPackage
@@ -17078,8 +17064,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring cereal text ];
        description = "STL 3D geometry format parsing and pretty-printing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "STLinkUSB" = callPackage
@@ -18150,8 +18134,6 @@ self: {
        libraryHaskellDepends = [ base hvect mtl Spock-api Spock-core ];
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Spock-auth" = callPackage
@@ -18193,8 +18175,6 @@ self: {
        ];
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Spock-digestive" = callPackage
@@ -18211,8 +18191,6 @@ self: {
        ];
        description = "Digestive functors support for Spock";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Spock-lucid" = callPackage
@@ -20578,8 +20556,6 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "A library to parse xml";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "XMMS" = callPackage
@@ -21575,8 +21551,6 @@ self: {
        ];
        description = "Accelerate backend component generating LLVM IR";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "accelerate-llvm-native" = callPackage
@@ -23250,8 +23224,6 @@ self: {
        ];
        description = "Extra goodies for aeson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson-extra_0_4_1_2" = callPackage
@@ -23281,7 +23253,6 @@ self: {
        description = "Extra goodies for aeson";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson-filthy" = callPackage
@@ -25917,8 +25888,6 @@ self: {
        ];
        description = "Amazon Cognito Identity SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-cognito-idp" = callPackage
@@ -26272,8 +26241,6 @@ self: {
        ];
        description = "Amazon EC2 Container Service SDK";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka-efs" = callPackage
@@ -27902,6 +27869,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "amqp_0_18_3" = callPackage
+    ({ mkDerivation, base, binary, bytestring, clock, connection
+     , containers, data-binary-ieee754, hspec, hspec-expectations
+     , monad-control, network, network-uri, split, stm, text, vector
+     , xml
+     }:
+     mkDerivation {
+       pname = "amqp";
+       version = "0.18.3";
+       sha256 = "1cyzazl3hz5yd2i220b4g8xs0fm47xqlwyvgarxbnn5gnrm8ys21";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring clock connection containers
+         data-binary-ieee754 monad-control network network-uri split stm
+         text vector
+       ];
+       executableHaskellDepends = [ base containers xml ];
+       testHaskellDepends = [
+         base binary bytestring clock connection containers
+         data-binary-ieee754 hspec hspec-expectations network network-uri
+         split stm text vector
+       ];
+       description = "Client library for AMQP servers (currently only RabbitMQ)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amqp-conduit" = callPackage
     ({ mkDerivation, amqp, base, bytestring, conduit, exceptions, hspec
      , HUnit, lifted-base, monad-control, mtl, resourcet, text
@@ -32133,8 +32128,6 @@ self: {
        ];
        description = "A modified version of async that supports worker groups and many-to-many task dependencies";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "async-refresh" = callPackage
@@ -32898,8 +32891,6 @@ self: {
        ];
        description = "Parse IP data types with attoparsec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "attoparsec-iso8601" = callPackage
@@ -33043,8 +33034,6 @@ self: {
        ];
        description = "URI parser / printer using attoparsec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "attoparsec-varword" = callPackage
@@ -33390,6 +33379,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "auto-update_0_1_6" = callPackage
+    ({ mkDerivation, base, exceptions, hspec, HUnit, retry }:
+     mkDerivation {
+       pname = "auto-update";
+       version = "0.1.6";
+       sha256 = "1i36xc2i34aync8271x3pv515l3zb53i518dybn8ghqkhzf27q7l";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base exceptions hspec HUnit retry ];
+       description = "Efficiently run periodic, on-demand actions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "autoexporter" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath }:
      mkDerivation {
@@ -36435,8 +36437,6 @@ self: {
        ];
        description = "Connection layer between beam and postgres";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "beam-sqlite" = callPackage
@@ -36923,8 +36923,6 @@ self: {
        ];
        description = "A horizontal version of tetris for braille users";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "between" = callPackage
@@ -37008,8 +37006,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring time ];
        description = "Parse BgMax-files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bgzf" = callPackage
@@ -38923,8 +38919,6 @@ self: {
        ];
        description = "Aggregate continuous values into discrete bins";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bio" = callPackage
@@ -39297,6 +39291,8 @@ self: {
        ];
        description = "Plays chess";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bit-array" = callPackage
@@ -41117,14 +41113,14 @@ self: {
      }) {};
 
   "board-games" = callPackage
-    ({ mkDerivation, array, base, cgi, containers, html, httpd-shed
-     , network-uri, non-empty, QuickCheck, random, transformers
-     , utility-ht
+    ({ mkDerivation, array, base, cgi, containers, criterion, html
+     , httpd-shed, network-uri, non-empty, QuickCheck, random
+     , transformers, utility-ht
      }:
      mkDerivation {
        pname = "board-games";
-       version = "0.2";
-       sha256 = "1plgnwlpx0bw0wjwd0dxbh616vy37frclwir692x1fr2lq85y98c";
+       version = "0.2.1";
+       sha256 = "1gsbk1m58f82b1ic0fv1ygslz4lyxxdl0a849q5hl4qbl9s7rbqb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -41139,6 +41135,9 @@ self: {
          array base containers non-empty QuickCheck random transformers
          utility-ht
        ];
+       benchmarkHaskellDepends = [
+         base containers criterion non-empty utility-ht
+       ];
        description = "Three games for inclusion in a web server";
        license = "GPL";
      }) {};
@@ -41678,14 +41677,14 @@ self: {
        pname = "boring";
        version = "0.1.2";
        sha256 = "0978dq53rpb7clz1ydjm6x38nrx0vkp3safqcbjp2kq6jlaz29jr";
+       revision = "1";
+       editedCabalFile = "010k2mw8q3iby78ak56xamp6pzdwijn92r64r76hblw32k1i80c0";
        libraryHaskellDepends = [
          adjunctions base base-compat constraints dec fin generics-sop
          singleton-bool streams tagged transformers transformers-compat vec
        ];
        description = "Boring and Absurd types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "boring-game" = callPackage
@@ -41803,8 +41802,6 @@ self: {
        ];
        description = "ScopeH and ScopeT extras for bound";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bound-gen" = callPackage
@@ -42381,8 +42378,6 @@ self: {
        benchmarkHaskellDepends = [ async base criterion deepseq stm ];
        description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "broadcast-chan-conduit" = callPackage
@@ -43678,6 +43673,8 @@ self: {
        libraryHaskellDepends = [ base primitive primitive-addr ];
        description = "Slicing managed and unmanaged memory";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytestring_0_10_8_2" = callPackage
@@ -43715,8 +43712,6 @@ self: {
        ];
        description = "Arbitrary instances for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytestring-builder" = callPackage
@@ -44838,8 +44833,6 @@ self: {
        doCheck = false;
        description = "Simple interface to some of Cabal's configuration state, mainly used by ghc-mod";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-info" = callPackage
@@ -45881,8 +45874,6 @@ self: {
        ];
        description = "A library implementing the Noise protocol";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "caf" = callPackage
@@ -46366,8 +46357,6 @@ self: {
        libraryHaskellDepends = [ arithmoi array base containers random ];
        description = "Arithmetic for Psychedelically Large Numbers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "canonical-filepath" = callPackage
@@ -46603,8 +46592,6 @@ self: {
        ];
        description = "Extensional capabilities and deriving combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "capataz" = callPackage
@@ -47497,8 +47484,6 @@ self: {
        ];
        description = "io-streams interface for the cassava CSV library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cassette" = callPackage
@@ -53482,8 +53467,6 @@ self: {
        libraryHaskellDepends = [ accelerate base ];
        description = "Working with colours in Accelerate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "colour-space" = callPackage
@@ -53807,8 +53790,6 @@ self: {
        ];
        description = "Arrays where the index type is a function of the shape type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "comfort-graph" = callPackage
@@ -53843,8 +53824,6 @@ self: {
        ];
        description = "A format for describing comics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "comma" = callPackage
@@ -54437,8 +54416,6 @@ self: {
        ];
        description = "Monad for allocation and cleanup of application resources";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "componentm-devel" = callPackage
@@ -54452,8 +54429,6 @@ self: {
        ];
        description = "Easy REPL driven development using ComponentM";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "composable-associations" = callPackage
@@ -55897,8 +55872,6 @@ self: {
        libraryHaskellDepends = [ base conduit mtl ];
        description = "Merge multiple sorted conduits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conduit-network-stream" = callPackage
@@ -56026,8 +55999,6 @@ self: {
        ];
        description = "Virtual file system for Conduit; disk, pure, and in-memory impls";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conduit-vfs-zip" = callPackage
@@ -56054,8 +56025,6 @@ self: {
        ];
        description = "Zip archive interface for the Conduit Virtual File System";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conduit-zstd" = callPackage
@@ -56143,8 +56112,6 @@ self: {
          text transformers
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "confcrypt_0_2_3_3" = callPackage
@@ -56181,7 +56148,6 @@ self: {
        ];
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "confetti" = callPackage
@@ -56723,8 +56689,6 @@ self: {
        ];
        description = "Interpret the command line and a config file as commands and options";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "console-prompt" = callPackage
@@ -57002,8 +56966,6 @@ self: {
        executableHaskellDepends = [ aeson base constraints ];
        description = "Utility package for constraints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "constrictor" = callPackage
@@ -57498,8 +57460,6 @@ self: {
        testHaskellDepends = [ base containers stm time ];
        description = "Event scheduling system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "control-iso" = callPackage
@@ -57959,8 +57919,6 @@ self: {
        ];
        description = "A stream DSL for writing embedded C programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "copilot-c99" = callPackage
@@ -57978,8 +57936,6 @@ self: {
        ];
        description = "A compiler for Copilot targeting C99";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "copilot-cbmc" = callPackage
@@ -58011,8 +57967,6 @@ self: {
        ];
        description = "An intermediate representation for Copilot";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "copilot-language" = callPackage
@@ -58029,8 +57983,6 @@ self: {
        ];
        description = "A Haskell-embedded DSL for monitoring hard real-time distributed systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "copilot-libraries" = callPackage
@@ -58046,8 +57998,6 @@ self: {
        ];
        description = "Libraries for the Copilot language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "copilot-sbv" = callPackage
@@ -58082,8 +58032,6 @@ self: {
        ];
        description = "k-induction for Copilot";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "copr" = callPackage
@@ -60668,8 +60616,6 @@ self: {
        ];
        description = "a gallery of Csound instruments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "csound-expression" = callPackage
@@ -61306,8 +61252,6 @@ self: {
        testHaskellDepends = [ base directory hspec hspec-expectations ];
        description = "A framework for declaratively writing curl based API tests";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "curlhs" = callPackage
@@ -61691,8 +61635,6 @@ self: {
        ];
        description = "A subfield of the complex numbers for exact calculation";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cypher" = callPackage
@@ -63308,8 +63250,6 @@ self: {
        ];
        description = "Interval datatype, interval arithmetic and interval-based containers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-inttrie" = callPackage
@@ -67065,8 +67005,6 @@ self: {
        ];
        description = "Type, render and parse the df1 hierarchical structured log format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dfinity-radix-tree" = callPackage
@@ -67458,8 +67396,6 @@ self: {
        ];
        description = "Compile Dhall expressions to Cabal files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dhcp-lease-parser" = callPackage
@@ -67495,8 +67431,6 @@ self: {
        ];
        description = "Typeful hierarchical structured logging using di, mtl and df1";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "di-core" = callPackage
@@ -67535,8 +67469,6 @@ self: {
        ];
        description = "Write logs in the df1 format using the di logging framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "di-handle" = callPackage
@@ -67550,8 +67482,6 @@ self: {
        ];
        description = "IO support for file handles in di-core";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "di-monad" = callPackage
@@ -69747,8 +69677,6 @@ self: {
        testHaskellDepends = [ base binary hspec QuickCheck ];
        description = "Serializable closures for distributed programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-fork" = callPackage
@@ -69767,8 +69695,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit unix ];
        description = "Like 'forkIO', but uses remote machines instead of local threads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-fork-aws-lambda" = callPackage
@@ -70594,6 +70520,8 @@ self: {
        ];
        description = "Fedora image download tool";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dlist" = callPackage
@@ -70973,8 +70901,6 @@ self: {
        ];
        description = "An API client for docker written in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "docker-build-cacher" = callPackage
@@ -72421,8 +72347,6 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "Haskell Doge Serialized Object Notation Parser";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dson-parsec" = callPackage
@@ -73575,8 +73499,6 @@ self: {
        ];
        description = "Pure, type-indexed haskell vector, matrix, and tensor library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "easytensor-vulkan" = callPackage
@@ -73588,8 +73510,6 @@ self: {
        libraryHaskellDepends = [ base dimensions easytensor vulkan-api ];
        description = "Use easytensor with vulkan-api";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "easytest" = callPackage
@@ -74170,14 +74090,16 @@ self: {
      }) {};
 
   "effect-stack" = callPackage
-    ({ mkDerivation, base, transformers }:
+    ({ mkDerivation, base, constraints, mtl, transformers }:
      mkDerivation {
        pname = "effect-stack";
-       version = "0.1.0.1";
-       sha256 = "0w68nz93k7i5qg9ihqzasm0gsjy0v0ggjilq7pwqdf7mxx1pj1p3";
-       libraryHaskellDepends = [ base transformers ];
+       version = "0.2.1";
+       sha256 = "0sram572nbzpgwb3vi5fmg2f4ynsh693q05w0n5yjj8zl4a7p4ds";
+       libraryHaskellDepends = [ base constraints mtl transformers ];
        description = "Reducing the pain of transformer stacks with duplicated effects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "effective-aspects" = callPackage
@@ -74231,8 +74153,6 @@ self: {
        libraryHaskellDepends = [ base containers newtype-generics void ];
        description = "Computational Effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "effects-parser" = callPackage
@@ -74244,8 +74164,6 @@ self: {
        libraryHaskellDepends = [ base effects ];
        description = "Parser Effect for the Control.Effects Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "effin" = callPackage
@@ -74684,8 +74602,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Easily expose your EKG metrics to Prometheus";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ekg-push" = callPackage
@@ -75364,8 +75280,6 @@ self: {
        testHaskellDepends = [ base directory filepath tasty tasty-hunit ];
        description = "A tiny language for understanding the lambda-calculus";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "emacs-keys" = callPackage
@@ -75515,8 +75429,6 @@ self: {
        ];
        description = "Perform basic syntax and deliverability checks on email addresses";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "emailaddress" = callPackage
@@ -75642,8 +75554,6 @@ self: {
        testHaskellDepends = [ base containers HUnit ];
        description = "Empirical Mode Decomposition and Hilbert-Huang Transform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "emgm" = callPackage
@@ -78035,8 +77945,6 @@ self: {
        ];
        description = "A different take on an IO system. Based on Amanda's IO loop, this eventloop takes a function that maps input events to output events. It can easily be extended by modules that represent IO devices or join multiple modules together.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eventsource-api" = callPackage
@@ -78377,8 +78285,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Exception type hierarchy with TemplateHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exception-mailer" = callPackage
@@ -79289,6 +79195,18 @@ self: {
        broken = true;
      }) {};
 
+  "extend-record-data-th" = callPackage
+    ({ mkDerivation, attoparsec, base, template-haskell, text }:
+     mkDerivation {
+       pname = "extend-record-data-th";
+       version = "0.1.0.2";
+       sha256 = "1gy730iic17hiiqf08j4riz1086wpz6iv7i5carc04mi39zdjf4h";
+       libraryHaskellDepends = [ attoparsec base template-haskell text ];
+       testHaskellDepends = [ attoparsec base template-haskell text ];
+       description = "TH to define a new record data type that extends the existing record data type";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "extended-categories" = callPackage
     ({ mkDerivation, base, constraints, ghc-prim, tagged }:
      mkDerivation {
@@ -79418,8 +79336,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Message passing concurrency as extensible-effect";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "extensible-exceptions" = callPackage
@@ -79648,6 +79564,8 @@ self: {
        ];
        description = "Rational arithmetic in an irrational world";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "facts" = callPackage
@@ -79858,8 +79776,6 @@ self: {
        testHaskellDepends = [ base hspec random text time ];
        description = "Randomly generated fake data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fake-type" = callPackage
@@ -80351,8 +80267,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "A fast, but bare bones, bytestring parser combinators library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fastpbkdf2" = callPackage
@@ -80449,8 +80363,6 @@ self: {
        executableHaskellDepends = [ base mtl optparse-applicative split ];
        description = "A compiler for Fay, a Haskell subset that compiles to JavaScript";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fay-base" = callPackage
@@ -80463,8 +80375,6 @@ self: {
        libraryHaskellDepends = [ base fay ];
        description = "The base package for Fay";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fay-builder" = callPackage
@@ -80498,8 +80408,6 @@ self: {
        libraryHaskellDepends = [ fay-base ];
        description = "DOM FFI wrapper library for Fay";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fay-geoposition" = callPackage
@@ -80512,8 +80420,6 @@ self: {
        libraryHaskellDepends = [ fay-base fay-text ];
        description = "W3C compliant implementation of GeoPosition API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fay-hsx" = callPackage
@@ -80540,8 +80446,6 @@ self: {
        libraryHaskellDepends = [ fay-base fay-text ];
        description = "jQuery bindings for Fay";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fay-ref" = callPackage
@@ -80554,8 +80458,6 @@ self: {
        libraryHaskellDepends = [ fay-base ];
        description = "Like IORef but for Fay";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fay-simplejson" = callPackage
@@ -80584,8 +80486,6 @@ self: {
        libraryHaskellDepends = [ fay fay-base text ];
        description = "Fay Text type represented as JavaScript strings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fay-uri" = callPackage
@@ -80598,8 +80498,6 @@ self: {
        libraryHaskellDepends = [ fay-base ];
        description = "Persistent FFI bindings for using jsUri in Fay";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fay-websockets" = callPackage
@@ -80612,8 +80510,6 @@ self: {
        libraryHaskellDepends = [ fay-base ];
        description = "Websockets FFI library for Fay";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fb" = callPackage
@@ -82289,8 +82185,21 @@ self: {
        testHaskellDepends = [ base inspection-testing tagged ];
        description = "Nat and Fin: peano naturals and finite numbers";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "fin_0_1" = callPackage
+    ({ mkDerivation, base, dec, deepseq, hashable, inspection-testing
+     , tagged
+     }:
+     mkDerivation {
+       pname = "fin";
+       version = "0.1";
+       sha256 = "17nv26cznhslrfb1ajcgxa9g3zacvk3prmncr7f8d7rvh42g2gnn";
+       libraryHaskellDepends = [ base dec deepseq hashable ];
+       testHaskellDepends = [ base inspection-testing tagged ];
+       description = "Nat and Fin: peano naturals and finite numbers";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "final" = callPackage
@@ -82647,6 +82556,8 @@ self: {
        ];
        description = "Calculates file-size frequency-distribution";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fit" = callPackage
@@ -84211,6 +84122,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fmlist_0_9_3" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "fmlist";
+       version = "0.9.3";
+       sha256 = "1w9nhm2zybdx4c1lalkajwqr8wcs731lfjld2r8gknd7y96x8pwf";
+       libraryHaskellDepends = [ base ];
+       description = "FoldMap lists";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fmt" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, call-stack
      , containers, criterion, deepseq, doctest, doctest-discover
@@ -86383,8 +86306,6 @@ self: {
        ];
        description = "Attempt to pretty-print any input";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "friendly-time" = callPackage
@@ -86455,8 +86376,6 @@ self: {
        ];
        description = "A reactive frontend web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "frontmatter" = callPackage
@@ -86946,8 +86865,6 @@ self: {
        ];
        description = "In-memory full text search engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fullstop" = callPackage
@@ -88878,8 +88795,6 @@ self: {
        ];
        description = "Derivation of Aeson instances using GHC generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generic-arbitrary" = callPackage
@@ -89064,6 +88979,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "generic-lens_1_2_0_0" = callPackage
+    ({ mkDerivation, base, criterion, deepseq, doctest, HUnit
+     , inspection-testing, lens, profunctors, QuickCheck, tagged, text
+     }:
+     mkDerivation {
+       pname = "generic-lens";
+       version = "1.2.0.0";
+       sha256 = "0qf49s01xkbhlfclc4a3ybhhf65g6mmigkkqj2psdjndgjdaxhb2";
+       libraryHaskellDepends = [ base profunctors tagged text ];
+       testHaskellDepends = [
+         base doctest HUnit inspection-testing lens profunctors
+       ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq lens QuickCheck
+       ];
+       description = "Generically derive traversals, lenses and prisms";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "generic-lens-labels" = callPackage
     ({ mkDerivation, base, generic-lens }:
      mkDerivation {
@@ -89272,8 +89207,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "A library for generic programming that aims to be easy to understand";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generics-mrsop" = callPackage
@@ -90715,8 +90648,6 @@ self: {
        ];
        description = "An AST and compiler plugin for dumping GHC's Core representation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-dump-tree" = callPackage
@@ -90766,8 +90697,6 @@ self: {
        ];
        description = "Handy tools for working with @ghc-dump@ dumps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-dup" = callPackage
@@ -91926,8 +91855,6 @@ self: {
        ];
        description = "DOM library that supports both GHCJS and GHC";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghcjs-dom-hello" = callPackage
@@ -91962,8 +91889,6 @@ self: {
        doHaddock = false;
        description = "DOM library that supports both GHCJS and GHC using jsaddle";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghcjs-dom-jsffi" = callPackage
@@ -93651,8 +93576,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "7.20190626";
-       sha256 = "1xjywj2hn40cqwvdh8iaixgx9iscgnsmrwkn3xrlz7gjw858n3lv";
+       version = "7.20190708";
+       sha256 = "18s563swrp8mx479995pdhhmn40y3xwlbm1z3w63qsnjqmj7zlij";
        configureFlags = [
          "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime"
          "-f-networkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser"
@@ -93902,8 +93827,6 @@ self: {
        ];
        description = "Passively snapshots working tree changes efficiently";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "git-object" = callPackage
@@ -94552,8 +94475,6 @@ self: {
        ];
        description = "Libgit2 backend for gitlib";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gitlib-s3" = callPackage
@@ -94616,8 +94537,6 @@ self: {
        ];
        description = "Test library for confirming gitlib backend compliance";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gitlib-utils" = callPackage
@@ -94695,8 +94614,6 @@ self: {
        ];
        description = "Gitter.im API client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "givegif" = callPackage
@@ -95160,8 +95077,6 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "Console IRC client";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gll" = callPackage
@@ -95334,8 +95249,6 @@ self: {
        libraryHaskellDepends = [ accelerate base gloss gloss-rendering ];
        description = "Extras to interface Gloss and Accelerate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gloss-algorithms" = callPackage
@@ -95580,8 +95493,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Make better services and clients";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "glue-core" = callPackage
@@ -95606,8 +95517,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Make better services and clients";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "glue-ekg" = callPackage
@@ -95632,8 +95541,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Make better services and clients";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "glue-example" = callPackage
@@ -95654,8 +95561,6 @@ self: {
        ];
        description = "Make better services and clients";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gluturtle" = callPackage
@@ -98553,8 +98458,6 @@ self: {
        ];
        description = "proxy gopher over http";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gopherbot" = callPackage
@@ -100501,8 +100404,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Grouped lists. Equal consecutive elements are grouped.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "groupoid" = callPackage
@@ -103096,7 +102997,6 @@ self: {
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haddock_2_17_5" = callPackage
@@ -103114,7 +103014,6 @@ self: {
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haddock" = callPackage
@@ -103131,8 +103030,6 @@ self: {
        preCheck = "unset GHC_PACKAGE_PATH";
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haddock-api_2_15_0_2" = callPackage
@@ -103152,7 +103049,6 @@ self: {
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haddock-api_2_16_1" = callPackage
@@ -103172,7 +103068,6 @@ self: {
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haddock-api_2_17_4" = callPackage
@@ -103195,7 +103090,6 @@ self: {
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haddock-api" = callPackage
@@ -103221,8 +103115,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haddock-cheatsheet" = callPackage
@@ -104042,8 +103934,6 @@ self: {
        ];
        description = "Allow Hakyll to create hierarchical menues from directories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-elm" = callPackage
@@ -104072,8 +103962,6 @@ self: {
        executableHaskellDepends = [ base hakyll ];
        testHaskellDepends = [ base ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-filestore" = callPackage
@@ -104113,8 +104001,6 @@ self: {
        ];
        description = "Hakyll utilities to work with images";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-ogmarkup" = callPackage
@@ -104143,8 +104029,6 @@ self: {
        ];
        description = "Hakyll SASS compiler over hsass";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-series" = callPackage
@@ -104156,8 +104040,6 @@ self: {
        libraryHaskellDepends = [ base containers hakyll ];
        description = "Adds series functionality to hakyll";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-shakespeare" = callPackage
@@ -104175,8 +104057,6 @@ self: {
        ];
        description = "Hakyll Hamlet compiler";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-shortcode" = callPackage
@@ -106030,8 +105910,6 @@ self: {
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Entity based records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "has-th" = callPackage
@@ -107251,8 +107129,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "A program to find and display the docs and type of a name";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-eigen-util" = callPackage
@@ -107835,8 +107711,6 @@ self: {
        ];
        description = "Name resolution library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-names_0_9_6" = callPackage
@@ -107861,7 +107735,6 @@ self: {
        description = "Name resolution library for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-neo4j-client" = callPackage
@@ -112658,8 +112531,6 @@ self: {
        testHaskellDepends = [ base containers mtl ];
        description = "Haskell docs tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdph" = callPackage
@@ -114736,8 +114607,6 @@ self: {
        ];
        description = "Heyting and Boolean algebras";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hfann" = callPackage
@@ -115343,8 +115212,6 @@ self: {
        ];
        description = "Happy Haskell Programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hi" = callPackage
@@ -115698,8 +115565,6 @@ self: {
        ];
        description = "Partial types as a type constructor";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "highWaterMark" = callPackage
@@ -116262,6 +116127,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hint_0_9_0_1" = callPackage
+    ({ mkDerivation, base, containers, directory, exceptions
+     , extensible-exceptions, filepath, ghc, ghc-boot, ghc-paths, HUnit
+     , mtl, random, temporary, unix
+     }:
+     mkDerivation {
+       pname = "hint";
+       version = "0.9.0.1";
+       sha256 = "15cnam704p7ynk70lqz3nvy91src5bd9amfdknvkfzpi5yf2825b";
+       libraryHaskellDepends = [
+         base directory exceptions filepath ghc ghc-boot ghc-paths mtl
+         random temporary unix
+       ];
+       testHaskellDepends = [
+         base containers directory exceptions extensible-exceptions filepath
+         HUnit unix
+       ];
+       description = "Runtime Haskell interpreter (GHC API wrapper)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hint-server" = callPackage
     ({ mkDerivation, base, eprocess, exceptions, hint, monad-loops, mtl
      }:
@@ -117771,8 +117658,6 @@ self: {
        ];
        description = "hmatrix operations lifted for backprop";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmatrix-banded" = callPackage
@@ -118612,6 +118497,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hoauth2_1_8_8" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, exceptions, http-conduit
+     , http-types, microlens, text, unordered-containers, uri-bytestring
+     , uri-bytestring-aeson
+     }:
+     mkDerivation {
+       pname = "hoauth2";
+       version = "1.8.8";
+       sha256 = "0ji9887m11k3dh7n36g0m9q1gy4d4729ygvapdzqfa3vi501ndwa";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring exceptions http-conduit http-types microlens
+         text unordered-containers uri-bytestring uri-bytestring-aeson
+       ];
+       description = "Haskell OAuth2 authentication client";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hob" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , glib, gtk-largeTreeStore, gtk3, gtksourceview3, hspec, mtl, pango
@@ -121076,8 +120981,6 @@ self: {
        testHaskellDepends = [ base process tasty tasty-hunit ];
        description = "File size in human readable format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hricket" = callPackage
@@ -125265,8 +125168,8 @@ self: {
      }:
      mkDerivation {
        pname = "hssqlppp";
-       version = "0.6.1";
-       sha256 = "06rqf8gkz2f1ay1vd3ba0nzv9n1098vxm9sc9ls4dk2ismab7cgz";
+       version = "0.6.2";
+       sha256 = "0lzy6laqxi6v6hlz9j2kvxm9rc4i89m9lnffymfkfwxlrgq7wg0s";
        libraryHaskellDepends = [
          base containers mtl parsec pretty pretty-show syb text transformers
          uniplate
@@ -125277,8 +125180,6 @@ self: {
        ];
        description = "SQL parser and type checker";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hssqlppp-th" = callPackage
@@ -125287,8 +125188,8 @@ self: {
      }:
      mkDerivation {
        pname = "hssqlppp-th";
-       version = "0.6.1";
-       sha256 = "09mxb2pmnk43bvdl7f58r8wxaw3h372sy174p42k8pphlss9amkg";
+       version = "0.6.2";
+       sha256 = "1p17srzz09iikxn47yr7qmv5g6z7c5kc5svlszmxlhs5j0kgahb0";
        libraryHaskellDepends = [
          base hssqlppp syb template-haskell text
        ];
@@ -125297,8 +125198,6 @@ self: {
        ];
        description = "hssqlppp extras which need template-haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hstatistics" = callPackage
@@ -128706,8 +128605,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Generic finger-tree structure, with example instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-fingertree-strict" = callPackage
@@ -128956,8 +128853,6 @@ self: {
        testHaskellDepends = [ base bytestring hw-prim lens vector ];
        description = "SIMD-based JSON semi-indexer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-json-simple-cursor" = callPackage
@@ -129005,8 +128900,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-json-standard-cursor";
-       version = "0.2.1.0";
-       sha256 = "0xn2a2xzvkvizjmrxd9zmmcizlc527mvnl45hvrzcijs1makar5g";
+       version = "0.2.1.1";
+       sha256 = "0z0lxzciyw6b49w1s88yx9lcqgk0fjmh1zv7qs3jnn9sk0bqldh5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -129227,8 +129122,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Simple parser support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-prim" = callPackage
@@ -129253,8 +129146,6 @@ self: {
        ];
        description = "Primitive functions and data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-prim_0_6_2_29" = callPackage
@@ -129280,7 +129171,6 @@ self: {
        description = "Primitive functions and data types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-prim-bits" = callPackage
@@ -129301,8 +129191,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion vector ];
        description = "Primitive support for bit manipulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-rankselect" = callPackage
@@ -129540,8 +129428,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck vector ];
        description = "Vector type with convenient typeclass instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-xml" = callPackage
@@ -132263,6 +132149,8 @@ self: {
        ];
        description = "A function to post an image to imgur";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "imgurder" = callPackage
@@ -135113,8 +135001,6 @@ self: {
        ];
        description = "EDSL for concurrent, realtime, embedded programming on top of Ivory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ioref-stable" = callPackage
@@ -136507,8 +136393,6 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Safe embedded C programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ivory-artifact" = callPackage
@@ -136544,8 +136428,6 @@ self: {
        ];
        description = "Ivory C backend";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ivory-bitdata" = callPackage
@@ -136584,8 +136466,6 @@ self: {
        ];
        description = "Simple concrete evaluator for Ivory programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ivory-examples" = callPackage
@@ -136608,8 +136488,6 @@ self: {
        ];
        description = "Ivory examples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ivory-hw" = callPackage
@@ -136622,8 +136500,6 @@ self: {
        libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
        description = "Ivory hardware model (STM32F4)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ivory-opts" = callPackage
@@ -136640,8 +136516,6 @@ self: {
        ];
        description = "Ivory compiler optimizations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ivory-quickcheck" = callPackage
@@ -136663,8 +136537,6 @@ self: {
        ];
        description = "QuickCheck driver for Ivory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ivory-serialize" = callPackage
@@ -136681,8 +136553,6 @@ self: {
        ];
        description = "Serialization library for Ivory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ivory-stdlib" = callPackage
@@ -136695,8 +136565,6 @@ self: {
        libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
        description = "Ivory standard library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ivy-web" = callPackage
@@ -137055,8 +136923,6 @@ self: {
        executableHaskellDepends = [ base boxes directory filepath ];
        description = "Export sheet music and audio from Windows/Mac app Jammit";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "japanese-calendar" = callPackage
@@ -137948,8 +137814,6 @@ self: {
        ];
        description = "DOM library that uses jsaddle to support both GHCJS and GHC";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jsaddle-hello" = callPackage
@@ -138888,6 +138752,8 @@ self: {
        ];
        description = "Library to parse and execute JSONPath";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jsonresume" = callPackage
@@ -139676,8 +139542,6 @@ self: {
        benchmarkHaskellDepends = [ aeson base containers criterion text ];
        description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kansas-comet" = callPackage
@@ -140219,8 +140083,6 @@ self: {
        ];
        description = "Fast concurrent queues much inspired by unagi-chan";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kbq-gu" = callPackage
@@ -140308,8 +140170,6 @@ self: {
        ];
        description = "Fast and flexible k-d trees for various types of point queries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keccak" = callPackage
@@ -141683,8 +141543,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Find the alpha emoji";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kyotocabinet" = callPackage
@@ -142049,8 +141907,6 @@ self: {
        ];
        description = "Declarative command-line parser using type-driven pattern matching";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambda-placeholders" = callPackage
@@ -144092,8 +143948,6 @@ self: {
        ];
        description = "Auto-generated interface to Fortran LAPACK via comfort-array";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lapack-ffi" = callPackage
@@ -145118,8 +144972,6 @@ self: {
        ];
        description = "Haskell code for learning physics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "learn-physics-examples" = callPackage
@@ -145427,8 +145279,6 @@ self: {
        libraryHaskellDepends = [ accelerate base lens ];
        description = "Instances to mix lens with accelerate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lens-action" = callPackage
@@ -146309,8 +146159,6 @@ self: {
        librarySystemDepends = [ ffi ];
        description = "LibFFI interface with dynamic bidirectional type-driven binding generation";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {ffi = null;};
 
   "libgit" = callPackage
@@ -146965,8 +146813,6 @@ self: {
        libraryPkgconfigDepends = [ systemd ];
        description = "Haskell bindings to libsystemd-journal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) systemd;};
 
   "libtagc" = callPackage
@@ -147745,8 +147591,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Lifting linear vector spaces into Accelerate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linear-algebra-cblas" = callPackage
@@ -148551,7 +148395,6 @@ self: {
        description = "Demo of Liquid Haskell integration for Cabal and Stack";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lispparser" = callPackage
@@ -149348,8 +149191,6 @@ self: {
        ];
        description = "General purpose LLVM bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {llvm-config = null;};
 
   "llvm-hs-pretty" = callPackage
@@ -150376,8 +150217,6 @@ self: {
        ];
        description = "Journald back-end for logging-facade";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "logging-facade-syslog" = callPackage
@@ -150457,13 +150296,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "logict_0_7_0_0" = callPackage
-    ({ mkDerivation, base, mtl }:
+  "logict_0_7_0_1" = callPackage
+    ({ mkDerivation, base, mtl, tasty, tasty-hunit }:
      mkDerivation {
        pname = "logict";
-       version = "0.7.0.0";
-       sha256 = "0c33ng5ck7nx7cl7nyl9vprqqi0k3q8l3k935b6gjzn7vzyg5iy6";
+       version = "0.7.0.1";
+       sha256 = "1zzcfxdl156rrr120vjcn2wawa2qdrninm6d4mxj215ig1a3aak5";
        libraryHaskellDepends = [ base mtl ];
+       testHaskellDepends = [ base mtl tasty tasty-hunit ];
        description = "A backtracking logic-programming monad";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -151335,8 +151175,6 @@ self: {
        ];
        description = "Parameterized file evaluator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ltiv1p1" = callPackage
@@ -151575,8 +151413,6 @@ self: {
        ];
        description = "DSL for SVG using lucid for HTML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lucienne" = callPackage
@@ -152526,8 +152362,6 @@ self: {
        ];
        description = "A web framework that integrates Servant, RIO, EKG, fast-logger, wai-cli…";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "magico" = callPackage
@@ -153477,8 +153311,6 @@ self: {
        libraryHaskellDepends = [ base call-stack tagged vector-space ];
        description = "The basic classes for the manifolds hierarchy";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "map-classes" = callPackage
@@ -155399,8 +155231,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Constant-time queries for the median of a stream of numeric data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mediawiki" = callPackage
@@ -157895,8 +157725,6 @@ self: {
        ];
        description = "Layout and render text with TrueType fonts using OpenGL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "miniutter" = callPackage
@@ -158486,8 +158314,8 @@ self: {
        pname = "mmark";
        version = "0.0.7.0";
        sha256 = "0g7mx3xvvj8vgcids231zlz9kp7z3zjrq4xfhdm0wk0v1k51dflx";
-       revision = "1";
-       editedCabalFile = "1mj781f8b0hc57lw2zp1qag4sdxn0bkyzm5m321xagwk32iwz9qc";
+       revision = "2";
+       editedCabalFile = "06hr9p2lqyh4zx38i601yd24acbl08p69l0pwh8266qvfripcsm9";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base case-insensitive containers deepseq dlist email-validate
@@ -158502,6 +158330,37 @@ self: {
        benchmarkHaskellDepends = [ base criterion text weigh ];
        description = "Strict markdown processor for writers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "mmark_0_0_7_1" = callPackage
+    ({ mkDerivation, aeson, base, case-insensitive, containers
+     , criterion, deepseq, dlist, email-validate, foldl, hashable, hspec
+     , hspec-megaparsec, html-entity-map, lucid, megaparsec, microlens
+     , microlens-th, modern-uri, mtl, parser-combinators, QuickCheck
+     , text, text-metrics, unordered-containers, weigh, yaml
+     }:
+     mkDerivation {
+       pname = "mmark";
+       version = "0.0.7.1";
+       sha256 = "0apc582ck0g5ih0rpcljsfvss646ng62bjm37nj5z6k48symh16n";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base case-insensitive containers deepseq dlist email-validate
+         foldl hashable html-entity-map lucid megaparsec microlens
+         microlens-th modern-uri mtl parser-combinators text text-metrics
+         unordered-containers yaml
+       ];
+       testHaskellDepends = [
+         aeson base foldl hspec hspec-megaparsec lucid megaparsec modern-uri
+         QuickCheck text
+       ];
+       benchmarkHaskellDepends = [ base criterion text weigh ];
+       description = "Strict markdown processor for writers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mmark-cli" = callPackage
@@ -158525,6 +158384,8 @@ self: {
        ];
        description = "Command line interface to the MMark markdown processor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mmark-ext" = callPackage
@@ -158547,6 +158408,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Commonly useful extensions for the MMark markdown processor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mmorph" = callPackage
@@ -158657,8 +158520,6 @@ self: {
        ];
        description = "Mock records of functions easily";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mockery" = callPackage
@@ -158711,8 +158572,6 @@ self: {
        ];
        description = "Derive a model of a data type using Generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "modelicaparser" = callPackage
@@ -158817,8 +158676,6 @@ self: {
        libraryHaskellDepends = [ base ghc-typelits-knownnat ];
        description = "Type-safe modular arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "modular-arithmetic" = callPackage
@@ -160219,8 +160076,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "The Acme and AcmeT monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monadbi" = callPackage
@@ -161099,8 +160954,6 @@ self: {
        testHaskellDepends = [ base binary containers hspec ];
        description = "A few more collections";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "more-extensible-effects" = callPackage
@@ -161425,8 +161278,6 @@ self: {
        ];
        description = "General purpose migrations library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "moto-postgresql" = callPackage
@@ -161442,8 +161293,6 @@ self: {
        ];
        description = "PostgreSQL-based migrations registry for moto";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "motor" = callPackage
@@ -161465,8 +161314,6 @@ self: {
        testHaskellDepends = [ base indexed indexed-extras row-types ];
        description = "Type-safe effectful state machines in Haskell";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "motor-diagrams" = callPackage
@@ -161486,8 +161333,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Generate state diagrams from Motor FSM typeclasses";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "motor-reflection" = callPackage
@@ -161505,8 +161350,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Reflect on Motor FSM typeclasses to obtain runtime representations";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mount" = callPackage
@@ -161904,8 +161747,8 @@ self: {
      }:
      mkDerivation {
        pname = "ms-tds";
-       version = "0.1.0.4";
-       sha256 = "0937a0iawdw1xspx7xjfn7xw83kbk4radkgjhrlb5hs5sj9phvz4";
+       version = "0.2.0.0";
+       sha256 = "0675h4w8nayvh2gm644anz8sqk37b1n5ia4w5fgyaf9y6drafyda";
        libraryHaskellDepends = [
          array base binary bytestring crypto-random data-default-class mtl
          network template-haskell text time tls uuid-types x509-store
@@ -161938,8 +161781,6 @@ self: {
        ];
        description = "A Haskell implementation of MessagePack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "msgpack-aeson" = callPackage
@@ -161958,8 +161799,6 @@ self: {
        testHaskellDepends = [ aeson base msgpack tasty tasty-hunit ];
        description = "Aeson adapter for MessagePack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "msgpack-idl" = callPackage
@@ -162046,8 +161885,8 @@ self: {
      }:
      mkDerivation {
        pname = "mssql-simple";
-       version = "0.1.0.4";
-       sha256 = "00mybypxy9kni94xnggkkkzk9xmx2r7q71hk2nsg0vcygfzvmpnk";
+       version = "0.2.0.0";
+       sha256 = "1pqw2kr8fyy62kmamvm600zsqri9d2201kixvr6gdy6z0ivyl0sz";
        libraryHaskellDepends = [
          base binary bytestring hostname ms-tds network text time tls
        ];
@@ -162585,8 +162424,6 @@ self: {
        ];
        description = "create many files from one";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multifocal" = callPackage
@@ -163045,8 +162882,6 @@ self: {
        testHaskellDepends = [ base hspec transformers ];
        description = "like mtl's ReaderT / WriterT / StateT, but more than one contained value/type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multivariant" = callPackage
@@ -163795,8 +163630,6 @@ self: {
        libraryHaskellDepends = [ accelerate base mwc-random ];
        description = "Generate Accelerate arrays filled with high quality pseudorandom numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mwc-random-monad" = callPackage
@@ -164894,8 +164727,6 @@ self: {
        doHaddock = false;
        description = "A library for working with anything map related";
        license = "(Apache-2.0 OR BSD-3-Clause)";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "narc" = callPackage
@@ -165663,8 +165494,6 @@ self: {
        ];
        description = "A graph database middleware to maintain a time-varying graph";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "net-spider-pangraph" = callPackage
@@ -165808,8 +165637,6 @@ self: {
        ];
        description = "Helper modules for comfort-array wrappers to BLAS and LAPACK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "netlib-ffi" = callPackage
@@ -167188,8 +167015,6 @@ self: {
        ];
        description = "ZeroMQ backend for network-transport";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-uri" = callPackage
@@ -167913,8 +167738,6 @@ self: {
        libraryHaskellDepends = [ base integer-logarithms ];
        description = "Finite nimber arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nirum" = callPackage
@@ -168102,8 +167925,6 @@ self: {
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "Evaluate Haskell expressions using Nix to get packages";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nix-paths" = callPackage
@@ -169910,8 +169731,6 @@ self: {
        executableHaskellDepends = [ base nvim-hs ];
        description = "Neovim plugin that runs ghcid to update the quickfix list";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nvvm" = callPackage
@@ -170794,8 +170613,6 @@ self: {
        ];
        description = "Haskell utilities for building embedded Elm programs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "omaketex" = callPackage
@@ -171357,8 +171174,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Open type representations and dynamic types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "open-union" = callPackage
@@ -171430,8 +171245,6 @@ self: {
        libraryHaskellDepends = [ aeson base data-default text time ];
        description = "A Haskell implementation of the Swiss Meteo Net data API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "opencog-atomspace" = callPackage
@@ -173554,8 +173367,6 @@ self: {
        ];
        description = "PADS data description language for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pagarme" = callPackage
@@ -173692,34 +173503,36 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "pairing_0_3_1" = callPackage
+  "pairing_0_4_1" = callPackage
     ({ mkDerivation, arithmoi, base, binary, bytestring, criterion
-     , cryptonite, errors, integer-logarithms, memory, protolude
-     , QuickCheck, quickcheck-instances, random, tasty, tasty-discover
-     , tasty-hunit, tasty-quickcheck, wl-pprint-text
+     , errors, galois-field, hexstring, integer-logarithms, memory
+     , MonadRandom, protolude, QuickCheck, quickcheck-instances, random
+     , tasty, tasty-discover, tasty-hunit, tasty-quickcheck
+     , wl-pprint-text
      }:
      mkDerivation {
        pname = "pairing";
-       version = "0.3.1";
-       sha256 = "0acg7kix9yi5mjssb9j0f9ign9qm551vgiiv3864gw1lmcrxh2ip";
+       version = "0.4.1";
+       sha256 = "0phw8caxrxyr2wlk8gcmrr8k03d0vnc4rq5c88dh3bb9jz4fdpcw";
        libraryHaskellDepends = [
-         arithmoi base binary bytestring cryptonite errors
-         integer-logarithms memory protolude QuickCheck random
+         arithmoi base binary bytestring errors galois-field
+         integer-logarithms memory MonadRandom protolude QuickCheck random
          wl-pprint-text
        ];
        testHaskellDepends = [
-         arithmoi base binary bytestring cryptonite errors
-         integer-logarithms memory protolude QuickCheck quickcheck-instances
-         random tasty tasty-discover tasty-hunit tasty-quickcheck
-         wl-pprint-text
+         arithmoi base binary bytestring errors galois-field hexstring
+         integer-logarithms memory MonadRandom protolude QuickCheck
+         quickcheck-instances random tasty tasty-discover tasty-hunit
+         tasty-quickcheck wl-pprint-text
        ];
        testToolDepends = [ tasty-discover ];
        benchmarkHaskellDepends = [
-         arithmoi base binary bytestring criterion cryptonite errors
-         integer-logarithms memory protolude QuickCheck quickcheck-instances
-         random tasty tasty-hunit tasty-quickcheck wl-pprint-text
+         arithmoi base binary bytestring criterion errors galois-field
+         integer-logarithms memory MonadRandom protolude QuickCheck
+         quickcheck-instances random tasty tasty-hunit tasty-quickcheck
+         wl-pprint-text
        ];
-       description = "Optimal ate pairing over Barreto-Naehrig curves";
+       description = "Bilinear pairings";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -174137,8 +173950,6 @@ self: {
        ];
        description = "A Pandoc filter for including code from source files";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pandoc-japanese-filters" = callPackage
@@ -174386,8 +174197,8 @@ self: {
     ({ mkDerivation }:
      mkDerivation {
        pname = "pandora";
-       version = "0.1.6";
-       sha256 = "0cz6f17yh2zdr3zp3ld4pvi7xil5byi539dlqjslx8r442si694p";
+       version = "0.1.7";
+       sha256 = "1wmp5c7b9scdrhrh50cpjfpcw1riw4kxs1vy935mzwja1y4zalsj";
        description = "A box of patterns and paradigms";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -175176,8 +174987,6 @@ self: {
        ];
        description = "Classes and data structures for working with data-kind indexed types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "paramtree" = callPackage
@@ -176222,8 +176031,6 @@ self: {
        ];
        description = "Terminal-based presentations using Pandoc";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "patch-combinators" = callPackage
@@ -177374,8 +177181,6 @@ self: {
        ];
        description = "Static site generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "penn-treebank" = callPackage
@@ -178931,8 +178736,6 @@ self: {
        ];
        description = "REST service for creating temporary PostgreSQL databases";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pg-recorder" = callPackage
@@ -179665,8 +179468,6 @@ self: {
        libraryHaskellDepends = [ base unix ];
        description = "Run an IO action protected by a pidfile";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pier" = callPackage
@@ -180007,6 +179808,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes_4_3_11" = callPackage
+    ({ mkDerivation, base, criterion, exceptions, mmorph, mtl
+     , optparse-applicative, QuickCheck, semigroups, test-framework
+     , test-framework-quickcheck2, transformers, void
+     }:
+     mkDerivation {
+       pname = "pipes";
+       version = "4.3.11";
+       sha256 = "0h70djd6x306rci8zp356klqj6376xry6mkhyr12301adfhag8vv";
+       libraryHaskellDepends = [
+         base exceptions mmorph mtl semigroups transformers void
+       ];
+       testHaskellDepends = [
+         base mtl QuickCheck test-framework test-framework-quickcheck2
+         transformers
+       ];
+       benchmarkHaskellDepends = [
+         base criterion mtl optparse-applicative transformers
+       ];
+       description = "Compositional pipelines";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-aeson" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, pipes
      , pipes-attoparsec, pipes-bytestring, pipes-parse, transformers
@@ -180862,8 +180687,6 @@ self: {
        libraryHaskellDepends = [ base mwc-random pipes vector ];
        description = "Producers for handling randomness";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-rt" = callPackage
@@ -181454,8 +181277,6 @@ self: {
        ];
        description = "Token Introspection for PlanB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "planet-mitchell" = callPackage
@@ -182472,18 +182293,22 @@ self: {
      }) {};
 
   "poly" = callPackage
-    ({ mkDerivation, base, primitive, QuickCheck, quickcheck-classes
-     , semirings, tasty, tasty-quickcheck, vector
+    ({ mkDerivation, base, gauge, primitive, QuickCheck
+     , quickcheck-classes, semirings, tasty, tasty-quickcheck, vector
+     , vector-algorithms
      }:
      mkDerivation {
        pname = "poly";
-       version = "0.2.0.0";
-       sha256 = "19jdm2508ncwcci8bi9hwpaak3cymhbynnk3whmh0g6rny6zdla4";
-       libraryHaskellDepends = [ base primitive semirings vector ];
+       version = "0.3.0.0";
+       sha256 = "0kwh1n9b6zh21kg2036v02jpr9xvvay6x72b044j4la65pal5h8i";
+       libraryHaskellDepends = [
+         base primitive semirings vector vector-algorithms
+       ];
        testHaskellDepends = [
          base QuickCheck quickcheck-classes semirings tasty tasty-quickcheck
          vector
        ];
+       benchmarkHaskellDepends = [ base gauge semirings vector ];
        description = "Polynomials";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -182651,27 +182476,27 @@ self: {
   "polysemy" = callPackage
     ({ mkDerivation, async, base, containers, criterion, doctest
      , first-class-families, free, freer-simple, hspec, hspec-discover
-     , inspection-testing, loopbreaker, mtl, syb, template-haskell
-     , th-abstraction, transformers, type-errors, unagi-chan
+     , inspection-testing, mtl, syb, template-haskell, th-abstraction
+     , transformers, type-errors, unagi-chan
      }:
      mkDerivation {
        pname = "polysemy";
-       version = "0.6.0.0";
-       sha256 = "0q9psm4y9ywq8fqgjvaxlfnfy39m4pj53nqmsgscz5xcycmb5nd1";
+       version = "0.7.0.0";
+       sha256 = "0p9f5m2invppncmd1d9sim1kvnzcgramnq3y1vr0bisg02y0c8dc";
        libraryHaskellDepends = [
-         async base containers first-class-families loopbreaker mtl syb
-         template-haskell th-abstraction transformers type-errors unagi-chan
+         async base containers first-class-families mtl syb template-haskell
+         th-abstraction transformers type-errors unagi-chan
        ];
        testHaskellDepends = [
          async base containers doctest first-class-families hspec
-         inspection-testing loopbreaker mtl syb template-haskell
-         th-abstraction transformers type-errors unagi-chan
+         inspection-testing mtl syb template-haskell th-abstraction
+         transformers type-errors unagi-chan
        ];
        testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [
          async base containers criterion first-class-families free
-         freer-simple loopbreaker mtl syb template-haskell th-abstraction
-         transformers type-errors unagi-chan
+         freer-simple mtl syb template-haskell th-abstraction transformers
+         type-errors unagi-chan
        ];
        description = "Higher-order, low-boilerplate, zero-cost free monads";
        license = stdenv.lib.licenses.bsd3;
@@ -182849,8 +182674,6 @@ self: {
        ];
        description = "Maps and sets of partial orders";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pomodoro" = callPackage
@@ -183226,8 +183049,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Implementation of the Porter stemming algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ports" = callPackage
@@ -183316,6 +183137,8 @@ self: {
        testHaskellDepends = [ base primitive tasty tasty-hunit ];
        description = "posix bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "posix-error-codes" = callPackage
@@ -185257,8 +185080,6 @@ self: {
        ];
        description = "Functionality for beautifying GHCi";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pretty-hex" = callPackage
@@ -185639,8 +185460,6 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "Prim typeclass instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prim-ref" = callPackage
@@ -185900,8 +185719,6 @@ self: {
        ];
        description = "Arrays of Maybes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "primitive-offset" = callPackage
@@ -185981,8 +185798,8 @@ self: {
     ({ mkDerivation, base, primitive, stm }:
      mkDerivation {
        pname = "primitive-unlifted";
-       version = "0.1.1.0";
-       sha256 = "183lg1jbbs9b1ahwzdsf5d75djcqr6c0hjvd1liwz5i13ad3qdcr";
+       version = "0.1.2.0";
+       sha256 = "1zq5fx032shxsk23hlyj9js8jdbg4r17l0gigsrbrnlajnwk4683";
        libraryHaskellDepends = [ base primitive ];
        testHaskellDepends = [ base primitive stm ];
        description = "Primitive GHC types with unlifted types inside";
@@ -187119,8 +186936,6 @@ self: {
        ];
        description = "Prometheus Haskell Client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prometheus-client" = callPackage
@@ -188315,8 +188130,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Bindings for the pthread library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ptr" = callPackage
@@ -190479,8 +190292,6 @@ self: {
        ];
        description = "QuickCheck common typeclasses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickcheck-classes_0_6_2_1" = callPackage
@@ -190505,7 +190316,6 @@ self: {
        description = "QuickCheck common typeclasses";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickcheck-combinators" = callPackage
@@ -191373,8 +191183,6 @@ self: {
        ];
        description = "The raaz cryptographic library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rabocsv2qif" = callPackage
@@ -192393,8 +192201,6 @@ self: {
        ];
        description = "Rapid prototyping with GHCi: hot reloading of running components and reload-surviving values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rapid-term" = callPackage
@@ -192663,6 +192469,8 @@ self: {
        pname = "rasterific-svg";
        version = "0.3.3.2";
        sha256 = "1i0pl1hin1ipi3l0074ywd1khacpbvz3x0frx0j0hmbfiv4n3nq2";
+       revision = "1";
+       editedCabalFile = "19i9wlk951d85dqnmbgrnz0fg4xcw7cbv9cs2h8b440lycj3p4cv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -192736,8 +192544,8 @@ self: {
      }:
      mkDerivation {
        pname = "rating-chgk-info";
-       version = "0.3.6.4";
-       sha256 = "0sfrsjlxlg08k0g8g65v21i2qr1ibq0cfgy7sayb1xbkqc319jvr";
+       version = "0.3.6.5";
+       sha256 = "08qfrrhc8kg95jvhv5m99zrb062w64z1jzm46zm4ah6mdjlpac18";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -193123,8 +192931,6 @@ self: {
        ];
        description = "Read-Copy-Update for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rdf" = callPackage
@@ -193145,8 +192951,6 @@ self: {
        ];
        description = "Representation and Incremental Processing of RDF Data";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rdf4h" = callPackage
@@ -193857,13 +193661,13 @@ self: {
      , cubicbezier, diagrams, diagrams-contrib, diagrams-core
      , diagrams-lib, diagrams-svg, directory, filepath, fsnotify
      , hashable, JuicyPixels, lens, linear, matrices, matrix, mtl
-     , palette, parallel, process, reanimate-svg, svg-builder, text
-     , time, unix, websockets, xml
+     , open-browser, palette, parallel, process, reanimate-svg
+     , svg-builder, text, time, websockets, xml
      }:
      mkDerivation {
        pname = "reanimate";
-       version = "0.1.4.1";
-       sha256 = "04yzlznyrd4c21732ijl1y5c8kg6x3139jv3d5qvcxphsmkxw81f";
+       version = "0.1.5.0";
+       sha256 = "1jh9inlx92qn3klzi9385nfvphrwmmdbbs2gql019bdwmyhd815x";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -193871,8 +193675,8 @@ self: {
          attoparsec base bytestring containers cubicbezier diagrams
          diagrams-contrib diagrams-core diagrams-lib diagrams-svg directory
          filepath fsnotify hashable JuicyPixels lens linear matrices matrix
-         mtl palette parallel process reanimate-svg svg-builder text time
-         unix websockets xml
+         mtl open-browser palette parallel process reanimate-svg svg-builder
+         text time websockets xml
        ];
        description = "Animation library based on SVGs";
        license = stdenv.lib.licenses.publicDomain;
@@ -194753,8 +194557,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Refinement types with static and runtime checking";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflection" = callPackage
@@ -194891,8 +194693,6 @@ self: {
        executableHaskellDepends = [ base mtl reflex ];
        description = "A basic `reflex` host for backend work";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-dom" = callPackage
@@ -196253,8 +196053,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A data structure representing Relations on Sets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "relational-postgresql8" = callPackage
@@ -196360,8 +196158,6 @@ self: {
        ];
        description = "Examples of Haskell Relationa Record";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "relational-schemas" = callPackage
@@ -197009,8 +196805,6 @@ self: {
        ];
        description = "Scalar data types and conversions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "repa-series" = callPackage
@@ -198727,8 +198521,6 @@ self: {
        ];
        description = "Functional Reactive Programming with type-level clocks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rhine-gloss" = callPackage
@@ -198743,8 +198535,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Gloss backend for Rhine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rhythm-game-tutorial" = callPackage
@@ -198881,7 +198671,6 @@ self: {
        description = "api extensions for nvim-hs";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ribosome-root" = callPackage
@@ -198975,8 +198764,6 @@ self: {
        ];
        description = "Quick metrics to grow your app strong";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ridley-extras" = callPackage
@@ -198994,8 +198781,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Handy metrics that don't belong to ridley";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "riemann" = callPackage
@@ -199534,8 +199319,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Haskell implementation of the RNCryptor file format";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rng-utils" = callPackage
@@ -199746,8 +199529,6 @@ self: {
        ];
        description = "RocksDB database querying library for Haskell";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "roguestar" = callPackage
@@ -200834,8 +200615,6 @@ self: {
        ];
        description = "Manipulate network devices, addresses, and routes on Linux";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rtorrent-rpc" = callPackage
@@ -201487,8 +201266,6 @@ self: {
        ];
        description = "Type-safe and lossless encoding and manipulation of money, fiat currencies, crypto currencies and precious metals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safe-money-aeson" = callPackage
@@ -201506,8 +201283,6 @@ self: {
        ];
        description = "Instances from the aeson library for the safe-money library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safe-money-cereal" = callPackage
@@ -201525,8 +201300,6 @@ self: {
        ];
        description = "Instances from the cereal library for the safe-money library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safe-money-serialise" = callPackage
@@ -201544,8 +201317,6 @@ self: {
        ];
        description = "Instances from the serialise library for the safe-money library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safe-money-store" = callPackage
@@ -201563,8 +201334,6 @@ self: {
        ];
        description = "Instances from the store library for the safe-money library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safe-money-xmlbf" = callPackage
@@ -201892,8 +201661,6 @@ self: {
        ];
        description = "Configuration Loader";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "salak_0_2_9_3" = callPackage
@@ -201917,7 +201684,6 @@ self: {
        description = "Configuration Loader";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "salak-toml" = callPackage
@@ -203199,8 +202965,6 @@ self: {
        ];
        description = "Work stealing scheduler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "schedyield" = callPackage
@@ -203403,6 +203167,39 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "scidb-hquery" = callPackage
+    ({ mkDerivation, alex, array, base, BNFC, bytestring, Cabal
+     , connection, cryptonite, data-default-class, directory, exceptions
+     , filepath, happy, haskeline, hostname-validate, HTTP, http-client
+     , http-client-tls, http-conduit, http-types, memory, mtl, network
+     , process, regex, safe, split, terminal-size, text, tls, x509-store
+     }:
+     mkDerivation {
+       pname = "scidb-hquery";
+       version = "2.8.0.432";
+       sha256 = "0swjsgf84kwkzv7nwrnrzlpxbhdvi3i5pnnjrlgql9x4c30bqw6i";
+       isLibrary = true;
+       isExecutable = true;
+       setupHaskellDepends = [ base Cabal filepath ];
+       libraryHaskellDepends = [
+         array base bytestring connection cryptonite data-default-class
+         exceptions haskeline hostname-validate HTTP http-client
+         http-client-tls http-conduit http-types memory mtl network process
+         regex safe split terminal-size text tls x509-store
+       ];
+       libraryToolDepends = [ alex BNFC happy ];
+       executableHaskellDepends = [
+         array base bytestring connection cryptonite data-default-class
+         directory exceptions filepath haskeline hostname-validate HTTP
+         http-client http-client-tls http-conduit http-types memory mtl
+         network process regex safe split terminal-size text tls x509-store
+       ];
+       description = "Haskell query for SciDB via shim";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "science-constants" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -204939,12 +204736,12 @@ self: {
      }:
      mkDerivation {
        pname = "selective";
-       version = "0.2";
-       sha256 = "0xg0pd3vffdxfzwkiirhnzqwqsshfb7grs7a7p3lf4yrd08h90ms";
+       version = "0.3";
+       sha256 = "135lq99h1iaip44d5kh7wpb3fcf8f6ypn5rxngm5agazy6ia42as";
        libraryHaskellDepends = [ base containers transformers ];
        testHaskellDepends = [
          base containers mtl QuickCheck tasty tasty-expected-failure
-         tasty-quickcheck
+         tasty-quickcheck transformers
        ];
        description = "Selective applicative functors";
        license = stdenv.lib.licenses.mit;
@@ -205019,8 +204816,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A Haskell library to make self-extracting executables";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "selfrestart" = callPackage
@@ -205156,8 +204951,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "A Haskell implementation of semibounded lattices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "semigroupoid-extras" = callPackage
@@ -205395,8 +205188,6 @@ self: {
        ];
        description = "An implementation of semver and semantic version ranges";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sendfile" = callPackage
@@ -206595,7 +206386,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant-checked-exceptions_2_1_0_0" = callPackage
+  "servant-checked-exceptions_2_2_0_0" = callPackage
     ({ mkDerivation, base, bytestring, hspec-wai, http-types, servant
      , servant-checked-exceptions-core, servant-client
      , servant-client-core, servant-server, tasty, tasty-hspec
@@ -206603,8 +206394,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-checked-exceptions";
-       version = "2.1.0.0";
-       sha256 = "0dbbixk3852phxhfcj84v3525yp5nl5krcrw53wsgc91r0w529s7";
+       version = "2.2.0.0";
+       sha256 = "1shbnrjk2d0lq9nskl95jkfgr4ad79nx4k87zjg4c4m6m09nf5bh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -206642,20 +206433,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant-checked-exceptions-core_2_1_0_0" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, doctest, Glob, http-media
-     , http-types, profunctors, servant, servant-docs, tagged, text
-     , world-peace
+  "servant-checked-exceptions-core_2_2_0_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, contravariant, doctest
+     , Glob, http-media, http-types, mtl, profunctors, servant
+     , servant-docs, tagged, text, transformers, world-peace
      }:
      mkDerivation {
        pname = "servant-checked-exceptions-core";
-       version = "2.1.0.0";
-       sha256 = "1qmmbqniipx7bpinbjh9z0i2n0v71y6p3jak629aw0403rhq92pz";
+       version = "2.2.0.0";
+       sha256 = "1irakwsdj6f0yjp0cpgai6x01yq99qd2rwy1w3pb7xwiksdnxx6c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring http-media http-types profunctors servant
-         servant-docs tagged text world-peace
+         aeson base bytestring contravariant http-media http-types mtl
+         profunctors servant servant-docs tagged text transformers
+         world-peace
        ];
        testHaskellDepends = [ base doctest Glob ];
        description = "Checked exceptions for Servant APIs";
@@ -207786,8 +207578,6 @@ self: {
        ];
        description = "Generate PureScript accessor functions for you servant API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-pushbullet-client" = callPackage
@@ -210854,18 +210644,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "show-prettyprint_0_3" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, doctest, prettyprinter
-     , trifecta
+  "show-prettyprint_0_3_0_1" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, containers, doctest
+     , prettyprinter, trifecta
      }:
      mkDerivation {
        pname = "show-prettyprint";
-       version = "0.3";
-       sha256 = "1q5q7gr73m059gslj1fpmydhqr28yav1v6jjshl2cv3yhmpp2zsy";
+       version = "0.3.0.1";
+       sha256 = "030dzprz07ib41f8pg2409zdxymvkk8jq4m0vczvgaajq3gghkdk";
        libraryHaskellDepends = [
          ansi-wl-pprint base prettyprinter trifecta
        ];
-       testHaskellDepends = [ base doctest ];
+       testHaskellDepends = [
+         base containers doctest prettyprinter trifecta
+       ];
        description = "Robust prettyprinter for output of auto-generated Show instances";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -210919,8 +210711,6 @@ self: {
        ];
        description = "Clean up the formatting of 'show' output";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shpider" = callPackage
@@ -211174,8 +210964,6 @@ self: {
        ];
        description = "Arithmetic over signs and sets of signs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "signal" = callPackage
@@ -211991,20 +211779,16 @@ self: {
      }) {};
 
   "simple-sql-parser" = callPackage
-    ({ mkDerivation, base, HUnit, mtl, parsec, pretty, test-framework
-     , test-framework-hunit
-     }:
+    ({ mkDerivation, base, mtl, parsec, pretty, tasty, tasty-hunit }:
      mkDerivation {
        pname = "simple-sql-parser";
-       version = "0.4.4";
-       sha256 = "1j1p94mfb7kzrayi39xcwmagxcf5j9lvxi7niqxc5jr70958csnl";
+       version = "0.5.0";
+       sha256 = "0d063wyrz8qynngy499i00hjkacd0xg01qni1wx2cbrcxg0xwcpd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl parsec pretty ];
-       testHaskellDepends = [
-         base HUnit mtl parsec pretty test-framework test-framework-hunit
-       ];
-       description = "A parser for SQL queries";
+       testHaskellDepends = [ base mtl parsec pretty tasty tasty-hunit ];
+       description = "A parser for SQL";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -212121,8 +211905,6 @@ self: {
        ];
        description = "UI library for terminal";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-units" = callPackage
@@ -212341,8 +212123,6 @@ self: {
        librarySystemDepends = [ sqlite ];
        description = "Simplest SQLite3 binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) sqlite;};
 
   "simplex" = callPackage
@@ -213647,8 +213427,6 @@ self: {
        ];
        description = "Flatten camel case text in LaTeX files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smallcheck" = callPackage
@@ -214518,8 +214296,6 @@ self: {
        ];
        description = "Language handling for Snap";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snap-loader-dynamic" = callPackage
@@ -217080,8 +216856,6 @@ self: {
        ];
        description = "Rotate about any suitable axis";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "spawn" = callPackage
@@ -218299,6 +218073,8 @@ self: {
        ];
        description = "A file-packing application";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sr-extra" = callPackage
@@ -219551,8 +219327,6 @@ self: {
        ];
        description = "Generate standalone haddock documentation for a set of packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "star" = callPackage
@@ -220192,8 +219966,6 @@ self: {
        ];
        description = "What version is the package X in stackage lts-Y.ZZ?";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stb-image" = callPackage
@@ -220230,8 +220002,6 @@ self: {
        libraryHaskellDepends = [ array base bytestring containers ];
        description = "A wrapper around Sean Barrett's TrueType rasterizer library";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "std" = callPackage
@@ -220695,8 +220465,6 @@ self: {
        libraryHaskellDepends = [ base stm transformers ];
        description = "Software Transactional Memory lifted to MonadIO";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stm-linkedlist" = callPackage
@@ -221112,6 +220880,58 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "store_0_5_1_2" = callPackage
+    ({ mkDerivation, array, async, base, base-orphans
+     , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector
+     , clock, containers, contravariant, criterion, cryptohash, deepseq
+     , directory, filepath, free, ghc-prim, hashable, hspec
+     , hspec-smallcheck, integer-gmp, lifted-base, monad-control
+     , mono-traversable, network, primitive, resourcet, safe, semigroups
+     , smallcheck, store-core, syb, template-haskell, text, th-lift
+     , th-lift-instances, th-orphans, th-reify-many, th-utilities, time
+     , transformers, unordered-containers, vector
+     , vector-binary-instances, void, weigh
+     }:
+     mkDerivation {
+       pname = "store";
+       version = "0.5.1.2";
+       sha256 = "1abwlcj0z17hj5h94cbg1sgqfdsdgjhgfgd2aaspsn4zdfk5bjc5";
+       libraryHaskellDepends = [
+         array async base base-orphans base64-bytestring bifunctors
+         bytestring containers contravariant cryptohash deepseq directory
+         filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp
+         lifted-base monad-control mono-traversable network primitive
+         resourcet safe semigroups smallcheck store-core syb
+         template-haskell text th-lift th-lift-instances th-orphans
+         th-reify-many th-utilities time transformers unordered-containers
+         vector void
+       ];
+       testHaskellDepends = [
+         array async base base-orphans base64-bytestring bifunctors
+         bytestring clock containers contravariant cryptohash deepseq
+         directory filepath free ghc-prim hashable hspec hspec-smallcheck
+         integer-gmp lifted-base monad-control mono-traversable network
+         primitive resourcet safe semigroups smallcheck store-core syb
+         template-haskell text th-lift th-lift-instances th-orphans
+         th-reify-many th-utilities time transformers unordered-containers
+         vector void
+       ];
+       benchmarkHaskellDepends = [
+         array async base base-orphans base64-bytestring bifunctors
+         bytestring cereal cereal-vector containers contravariant criterion
+         cryptohash deepseq directory filepath free ghc-prim hashable hspec
+         hspec-smallcheck integer-gmp lifted-base monad-control
+         mono-traversable network primitive resourcet safe semigroups
+         smallcheck store-core syb template-haskell text th-lift
+         th-lift-instances th-orphans th-reify-many th-utilities time
+         transformers unordered-containers vector vector-binary-instances
+         void weigh
+       ];
+       description = "Fast binary serialization";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "store-core" = callPackage
     ({ mkDerivation, base, bytestring, ghc-prim, primitive, text
      , transformers
@@ -221654,8 +221474,6 @@ self: {
        ];
        description = "Concurrency support for the streaming ecosystem";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "streaming-conduit" = callPackage
@@ -221771,8 +221589,6 @@ self: {
        ];
        description = "A hand-written streaming byte parser for OpenStreetMap Protobuf data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "streaming-pcap" = callPackage
@@ -221794,8 +221610,6 @@ self: {
        ];
        description = "Stream packets via libpcap";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "streaming-png" = callPackage
@@ -222855,8 +222669,6 @@ self: {
        ];
        description = "Interface library for strongSwan SQL backend";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "strptime" = callPackage
@@ -223198,28 +223010,21 @@ self: {
      }) {};
 
   "suavemente" = callPackage
-    ({ mkDerivation, base, blaze-markup, bytestring, diagrams-core
-     , diagrams-lib, diagrams-svg, interpolatedstring-perl6, lens, mtl
-     , servant, servant-blaze, servant-server, servant-websockets, stm
-     , streaming, svg-builder, transformers, warp, websockets
+    ({ mkDerivation, aeson, base, blaze-markup, bytestring, colour
+     , containers, diagrams-core, diagrams-lib, diagrams-svg
+     , interpolatedstring-perl6, lens, mtl, servant, servant-blaze
+     , servant-server, servant-websockets, stm, streaming, svg-builder
+     , text, transformers, warp, websockets
      }:
      mkDerivation {
        pname = "suavemente";
-       version = "0.1.0.0";
-       sha256 = "1595jc7lqvdk60p0cc3vjag7lgd90ayfwb16n70i1j9sz3b2qvva";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.2.0.0";
+       sha256 = "0m5sfa3sx67mx1wsps0vpr4g4vq64rmdml6p930r1jp3b4rd41wa";
        libraryHaskellDepends = [
-         base blaze-markup bytestring diagrams-core diagrams-lib
-         diagrams-svg interpolatedstring-perl6 lens mtl servant
-         servant-blaze servant-server servant-websockets stm streaming
-         svg-builder transformers warp websockets
-       ];
-       executableHaskellDepends = [
-         base blaze-markup bytestring diagrams-core diagrams-lib
-         diagrams-svg interpolatedstring-perl6 lens mtl servant
+         aeson base blaze-markup bytestring colour containers diagrams-core
+         diagrams-lib diagrams-svg interpolatedstring-perl6 lens mtl servant
          servant-blaze servant-server servant-websockets stm streaming
-         svg-builder transformers warp websockets
+         svg-builder text transformers warp websockets
        ];
        description = "An applicative functor that seamlessly talks to HTML inputs";
        license = stdenv.lib.licenses.bsd3;
@@ -223365,8 +223170,6 @@ self: {
        ];
        description = "Match / replace substrings with a parser combinators";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "subtitleParser" = callPackage
@@ -224809,8 +224612,6 @@ self: {
        ];
        description = "Library for symantic grammars";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "symantic-http" = callPackage
@@ -225192,8 +224993,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Generic representation and manipulation of abstract syntax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "syntactical" = callPackage
@@ -226122,8 +225921,6 @@ self: {
        ];
        description = "Layout text as grid or table";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "table-tennis" = callPackage
@@ -227737,8 +227534,6 @@ self: {
        testHaskellDepends = [ base QuickCheck tasty ];
        description = "Pre-built tasty trees for checking lawful class properties using QuickCheck";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tasty-rerun" = callPackage
@@ -229333,8 +229128,6 @@ self: {
        ];
        description = "Terminal emulator configurable in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gtk3; vte_291 = pkgs.vte;};
 
   "termplot" = callPackage
@@ -231861,8 +231654,6 @@ self: {
        ];
        description = "Haskell API bindings for http://themoviedb.org";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "themplate" = callPackage
@@ -232202,8 +231993,6 @@ self: {
        ];
        description = "Simple, IO-based library for Erlang-style thread supervision";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "threadscope" = callPackage
@@ -232438,8 +232227,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "throwable-exceptions gives the easy way to throw exceptions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "thumbnail" = callPackage
@@ -233071,8 +232858,6 @@ self: {
        ];
        description = "Parsers for types in `time`";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "time-patterns" = callPackage
@@ -234377,8 +234162,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A todo bottom";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "todos" = callPackage
@@ -234672,7 +234455,7 @@ self: {
        broken = true;
      }) {};
 
-  "tomland_1_0_1_0" = callPackage
+  "tomland_1_1_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, deepseq
      , gauge, hashable, hedgehog, hspec-megaparsec, htoml
      , htoml-megaparsec, markdown-unlit, megaparsec, mtl, parsec
@@ -234682,8 +234465,8 @@ self: {
      }:
      mkDerivation {
        pname = "tomland";
-       version = "1.0.1.0";
-       sha256 = "1f5819bxv9ybj5ygpndlhyfsjl3i6x03xfrgpxnjkjk0pyjmywx2";
+       version = "1.1.0.0";
+       sha256 = "0ip3pp76jf6di18r10ksxw35a2594k7h1iygm0b4k77m4fx4bqzn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -235469,8 +235252,6 @@ self: {
        ];
        description = "Distributed tracing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tracker" = callPackage
@@ -235502,8 +235283,6 @@ self: {
        ];
        description = "A command-line tool for live monitoring";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "traction" = callPackage
@@ -236087,8 +235866,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Type Safe Web Routing";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trasa-client" = callPackage
@@ -236105,8 +235882,6 @@ self: {
        ];
        description = "Type safe http requests";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trasa-reflex" = callPackage
@@ -236140,8 +235915,6 @@ self: {
        ];
        description = "Type safe web server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trasa-th" = callPackage
@@ -236158,8 +235931,6 @@ self: {
        testHaskellDepends = [ base trasa ];
        description = "Template Haskell to generate trasa routes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "traverse-with-class" = callPackage
@@ -236861,8 +236632,6 @@ self: {
        ];
        description = "TripleSec is a simple, triple-paranoid, symmetric encryption library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trivia" = callPackage
@@ -237810,8 +237579,6 @@ self: {
        libraryHaskellDepends = [ base eventloop ];
        description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and RedBlackTree";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twentefp-graphs" = callPackage
@@ -240229,8 +239996,6 @@ self: {
        ];
        description = "Opinionated Haskell Interoperability";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unbound" = callPackage
@@ -242114,8 +241879,6 @@ self: {
        ];
        description = "Command-line tool to generate paths for moving upward in a file system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "up-grade" = callPackage
@@ -242589,8 +242352,6 @@ self: {
        ];
        description = "Painfully simple URL deployment";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "urn" = callPackage
@@ -243329,6 +243090,8 @@ self: {
        ];
        description = "Orphan instances for the UUID datatype";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uuid-quasi" = callPackage
@@ -243599,8 +243362,6 @@ self: {
        ];
        description = "Runs commands on remote machines using ssh";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "valid" = callPackage
@@ -244108,8 +243869,6 @@ self: {
        ];
        description = "Client library for HashiCorp's Vault tool (via HTTP API)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vault-tool-server" = callPackage
@@ -244358,8 +244117,26 @@ self: {
        benchmarkHaskellDepends = [ base criterion fin vector ];
        description = "Vec: length-indexed (sized) list";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "vec_0_1_1_1" = callPackage
+    ({ mkDerivation, adjunctions, base, base-compat, criterion, deepseq
+     , distributive, fin, hashable, inspection-testing, lens
+     , semigroupoids, tagged, transformers, vector
+     }:
+     mkDerivation {
+       pname = "vec";
+       version = "0.1.1.1";
+       sha256 = "0gzypyi4vv5ajysbmnpicm8r2qh95nmmrj9l6hp30b95i36cb5as";
+       libraryHaskellDepends = [
+         adjunctions base base-compat deepseq distributive fin hashable lens
+         semigroupoids transformers
+       ];
+       testHaskellDepends = [ base fin inspection-testing tagged ];
+       benchmarkHaskellDepends = [ base criterion fin vector ];
+       description = "Vec: length-indexed (sized) list";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vect" = callPackage
@@ -244626,8 +244403,6 @@ self: {
        ];
        description = "Utilities for the \"vector\" library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vector-fftw" = callPackage
@@ -245150,8 +244925,6 @@ self: {
        ];
        description = "types for ingesting vflow data with aeson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vfr-waypoints" = callPackage
@@ -245360,8 +245133,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Frontend for video metadata tagging tools";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vimus" = callPackage
@@ -246131,8 +245902,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Low-level low-overhead vulkan api bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "waargonaut" = callPackage
@@ -247657,8 +247426,6 @@ self: {
        ];
        description = "Typesafe URLs for Wai applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-routing" = callPackage
@@ -249415,8 +249182,6 @@ self: {
        libraryPkgconfigDepends = [ webkitgtk ];
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) webkitgtk;};
 
   "webkitgtk3" = callPackage
@@ -249737,6 +249502,8 @@ self: {
        ];
        description = "A school-timetable problem-solver";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "weigh" = callPackage
@@ -250045,8 +249812,6 @@ self: {
        ];
        description = "Data types for large but fixed width signed and unsigned integers";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wigner-symbols" = callPackage
@@ -250468,8 +250233,6 @@ self: {
        testHaskellDepends = [ base conduit hspec HUnit mtl ];
        description = "Run computations that depend on one or more elements in a stream";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "witherable" = callPackage
@@ -251268,6 +251031,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "world-peace_1_0_0_0" = callPackage
+    ({ mkDerivation, aeson, base, deepseq, doctest, Glob, profunctors
+     , should-not-typecheck, tagged, tasty, tasty-hunit, text
+     }:
+     mkDerivation {
+       pname = "world-peace";
+       version = "1.0.0.0";
+       sha256 = "1fx8f7dfrslqwmkbcyff5q7iafa5znc73f77il7y87hz23q9yzmx";
+       libraryHaskellDepends = [ aeson base deepseq profunctors tagged ];
+       testHaskellDepends = [
+         base doctest Glob should-not-typecheck tasty tasty-hunit text
+       ];
+       description = "Open Union and Open Product Types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wp-archivebot" = callPackage
     ({ mkDerivation, base, feed, HTTP, network, parallel, tagsoup }:
      mkDerivation {
@@ -251727,8 +251507,6 @@ self: {
        ];
        description = "A simple CLI utility for interacting with a websocket";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ws-chans" = callPackage
@@ -251751,8 +251529,6 @@ self: {
        ];
        description = "Unagi chan based websocket client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wsdl" = callPackage
@@ -254683,8 +254459,6 @@ self: {
        ];
        description = "Yam Web";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yam_0_6_3" = callPackage
@@ -254719,7 +254493,6 @@ self: {
        description = "A wrapper of servant";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yam-app" = callPackage
@@ -254774,8 +254547,6 @@ self: {
        ];
        description = "Yam DataSource Middleware";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yam-datasource_0_6_3" = callPackage
@@ -254794,7 +254565,6 @@ self: {
        description = "Yam DataSource Middleware";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yam-job" = callPackage
@@ -255518,8 +255288,6 @@ self: {
        libraryHaskellDepends = [ base deriving-compat hedgehog yaya ];
        description = "Hedgehog testing support for the Yaya recursion scheme library";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yaya-unsafe" = callPackage
@@ -256656,8 +256424,6 @@ self: {
        ];
        description = "Utilities for using the Fay Haskell-to-JS compiler with Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-fb" = callPackage
@@ -257048,8 +256814,6 @@ self: {
        ];
        description = "A pagination approach for yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-paypal-rest" = callPackage
@@ -259267,8 +259031,6 @@ self: {
        ];
        description = "More constrained extensions to zeromq4-haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zeroth" = callPackage
@@ -260122,8 +259884,6 @@ self: {
        ];
        description = "Creating and extracting arbitrary archives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zuramaru" = callPackage
@@ -260175,8 +259935,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Password strength estimation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
 }
diff --git a/nixpkgs/pkgs/development/interpreters/clojure/default.nix b/nixpkgs/pkgs/development/interpreters/clojure/default.nix
index 4fe1e1820954..8df64de3acb6 100644
--- a/nixpkgs/pkgs/development/interpreters/clojure/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/clojure/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, jdk, rlwrap, makeWrapper }:
+{ stdenv, fetchurl, jdk11, rlwrap, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "clojure-${version}";
-  version = "1.10.0.442";
+  pname = "clojure";
+  version = "1.10.1.462";
 
   src = fetchurl {
     url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
-    sha256 = "147pkid3pvw60gq8vansid3x6wwfy9pqdbla3wfd5qaxqbcrhclw";
+    sha256 = "0mi7fzqvkg2ihigxkkamc742m1iba0yzy8ivciavzmpcnw128sc6";
   };
 
   buildInputs = [ makeWrapper ];
@@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "prefix" ];
 
   installPhase = let
-    binPath = stdenv.lib.makeBinPath [ rlwrap jdk ];
+    binPath = stdenv.lib.makeBinPath [ rlwrap jdk11 ];
   in ''
     mkdir -p $prefix/libexec
     cp clojure-tools-${version}.jar $prefix/libexec
-    cp {,example-}deps.edn $prefix
+    cp example-deps.edn $prefix
 
     substituteInPlace clojure --replace PREFIX $prefix
 
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
       offers a software transactional memory system and reactive Agent
       system that ensure clean, correct, multithreaded designs.
     '';
-    maintainers = with maintainers; [ the-kenny ];
+    maintainers = with maintainers; [ jlesquembre ];
     platforms = platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/interpreters/erlang/R16B02-basho.nix b/nixpkgs/pkgs/development/interpreters/erlang/R16B02-basho.nix
index 714924514edb..c263551de2da 100644
--- a/nixpkgs/pkgs/development/interpreters/erlang/R16B02-basho.nix
+++ b/nixpkgs/pkgs/development/interpreters/erlang/R16B02-basho.nix
@@ -27,7 +27,7 @@ mkDerivation rec {
   installTargets = "install";
   postInstall = let
     manpages = pkgs.fetchurl {
-      url = "http://www.erlang.org/download/otp_doc_man_R16B02.tar.gz";
+      url = "https://www.erlang.org/download/otp_doc_man_R16B02.tar.gz";
       sha256 = "12apxjmmd591y9g9bhr97z5jbd1jarqg7wj0y2sqhl21hc1yp75p";
     };
   in ''
diff --git a/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix b/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix
index 914c3a0f5cfe..a795741869fc 100644
--- a/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix
+++ b/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix
@@ -108,8 +108,8 @@ in stdenv.mkDerivation ({
   setupHook = ./setup-hook.sh;
 
   meta = with stdenv.lib; ({
-    homepage = http://www.erlang.org/;
-    downloadPage = "http://www.erlang.org/download.html";
+    homepage = https://www.erlang.org/;
+    downloadPage = "https://www.erlang.org/download.html";
     description = "Programming language used for massively scalable soft real-time systems";
 
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/interpreters/jython/default.nix b/nixpkgs/pkgs/development/interpreters/jython/default.nix
index 3d82535d29aa..f822fdd9c8f0 100644
--- a/nixpkgs/pkgs/development/interpreters/jython/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/jython/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ makeWrapper ];
 
-  unpackPhase = ":";
+  dontUnpack = true;
 
   installPhase = ''
      mkdir -pv $out/bin
diff --git a/nixpkgs/pkgs/development/interpreters/python/build-python-package-wheel.nix b/nixpkgs/pkgs/development/interpreters/python/build-python-package-wheel.nix
index 7be0a4c304a3..e3c4e13c0e2d 100644
--- a/nixpkgs/pkgs/development/interpreters/python/build-python-package-wheel.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/build-python-package-wheel.nix
@@ -8,7 +8,7 @@
 attrs // {
   unpackPhase = ''
     mkdir dist
-    cp $src dist/"''${src#*-}"
+    cp "$src" "dist/$(stripHash "$src")"
   '';
 
   # Wheels are pre-compiled
diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/atomic_pyc.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/atomic_pyc.patch
new file mode 100644
index 000000000000..56c75cbdeeaf
--- /dev/null
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/atomic_pyc.patch
@@ -0,0 +1,41 @@
+diff --git a/Lib/py_compile.py b/Lib/py_compile.py
+index 978da73..3559eb9 100644
+--- a/Lib/py_compile.py
++++ b/Lib/py_compile.py
+@@ -120,16 +120,27 @@ def compile(file, cfile=None, dfile=None, doraise=False):
+             return
+     if cfile is None:
+         cfile = file + (__debug__ and 'c' or 'o')
+-    with open(cfile, 'wb') as fc:
+-        fc.write('\0\0\0\0')
+-        if "DETERMINISTIC_BUILD" in os.environ:
++    # Atomically write the pyc/pyo file.  Issue #13146.
++    # id() is used to generate a pseudo-random filename.
++    path_tmp = '{}.{}'.format(cfile, id(cfile))
++    try:
++        with open(path_tmp, 'wb') as fc:
+             fc.write('\0\0\0\0')
+-        else:
+-            wr_long(fc, timestamp)
+-        marshal.dump(codeobject, fc)
+-        fc.flush()
+-        fc.seek(0, 0)
+-        fc.write(MAGIC)
++            if "DETERMINISTIC_BUILD" in os.environ:
++                fc.write('\0\0\0\0')
++            else:
++                wr_long(fc, timestamp)
++            marshal.dump(codeobject, fc)
++            fc.flush()
++            fc.seek(0, 0)
++            fc.write(MAGIC)
++        os.rename(path_tmp, cfile)
++    except OSError:
++        try:
++            os.unlink(path_tmp)
++        except OSError:
++            pass
++        raise
+ 
+ def main(args=None):
+     """Compile several source files.
diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix
index e7d07b9ad1c0..1503c221bdd4 100644
--- a/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -79,6 +79,12 @@ let
         sha256 = "0l9rw6r5r90iybdkp3hhl2pf0h0s1izc68h5d3ywrm92pq32wz57";
       })
 
+      # Fix race-condition during pyc creation. Has a slight backwards
+      # incompatible effect: pyc symlinks will now be overridden
+      # (https://bugs.python.org/issue17222). Included in python >= 3.4,
+      # backported in debian since 2013.
+      # https://bugs.python.org/issue13146
+      ./atomic_pyc.patch
     ] ++ optionals (x11Support && stdenv.isDarwin) [
       ./use-correct-tcl-tk-on-darwin.patch
     ] ++ optionals stdenv.isLinux [
diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch
new file mode 100644
index 000000000000..a1f9d68eb166
--- /dev/null
+++ b/nixpkgs/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch
@@ -0,0 +1,100 @@
+From 597e73f2a4b2f0b508127931b36d5540d6941823 Mon Sep 17 00:00:00 2001
+From: Frederik Rietdijk <fridh@fridh.nl>
+Date: Mon, 28 Aug 2017 09:24:06 +0200
+Subject: [PATCH] Don't use ldconfig
+
+---
+ Lib/ctypes/util.py | 70 ++----------------------------------------------------
+ 1 file changed, 2 insertions(+), 68 deletions(-)
+
+diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
+index 5e8b31a854..7b45ce6c15 100644
+--- a/Lib/ctypes/util.py
++++ b/Lib/ctypes/util.py
+@@ -94,46 +94,7 @@ elif os.name == "posix":
+     import re, tempfile
+ 
+     def _findLib_gcc(name):
+-        # Run GCC's linker with the -t (aka --trace) option and examine the
+-        # library name it prints out. The GCC command will fail because we
+-        # haven't supplied a proper program with main(), but that does not
+-        # matter.
+-        expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name))
+-
+-        c_compiler = shutil.which('gcc')
+-        if not c_compiler:
+-            c_compiler = shutil.which('cc')
+-        if not c_compiler:
+-            # No C compiler available, give up
+-            return None
+-
+-        temp = tempfile.NamedTemporaryFile()
+-        try:
+-            args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name]
+-
+-            env = dict(os.environ)
+-            env['LC_ALL'] = 'C'
+-            env['LANG'] = 'C'
+-            try:
+-                proc = subprocess.Popen(args,
+-                                        stdout=subprocess.PIPE,
+-                                        stderr=subprocess.STDOUT,
+-                                        env=env)
+-            except OSError:  # E.g. bad executable
+-                return None
+-            with proc:
+-                trace = proc.stdout.read()
+-        finally:
+-            try:
+-                temp.close()
+-            except FileNotFoundError:
+-                # Raised if the file was already removed, which is the normal
+-                # behaviour of GCC if linking fails
+-                pass
+-        res = re.search(expr, trace)
+-        if not res:
+-            return None
+-        return os.fsdecode(res.group(0))
++        return None
+ 
+ 
+     if sys.platform == "sunos5":
+@@ -255,34 +216,7 @@ elif os.name == "posix":
+     else:
+ 
+         def _findSoname_ldconfig(name):
+-            import struct
+-            if struct.calcsize('l') == 4:
+-                machine = os.uname().machine + '-32'
+-            else:
+-                machine = os.uname().machine + '-64'
+-            mach_map = {
+-                'x86_64-64': 'libc6,x86-64',
+-                'ppc64-64': 'libc6,64bit',
+-                'sparc64-64': 'libc6,64bit',
+-                's390x-64': 'libc6,64bit',
+-                'ia64-64': 'libc6,IA-64',
+-                }
+-            abi_type = mach_map.get(machine, 'libc6')
+-
+-            # XXX assuming GLIBC's ldconfig (with option -p)
+-            regex = r'\s+(lib%s\.[^\s]+)\s+\(%s'
+-            regex = os.fsencode(regex % (re.escape(name), abi_type))
+-            try:
+-                with subprocess.Popen(['/sbin/ldconfig', '-p'],
+-                                      stdin=subprocess.DEVNULL,
+-                                      stderr=subprocess.DEVNULL,
+-                                      stdout=subprocess.PIPE,
+-                                      env={'LC_ALL': 'C', 'LANG': 'C'}) as p:
+-                    res = re.search(regex, p.stdout.read())
+-                    if res:
+-                        return os.fsdecode(res.group(1))
+-            except OSError:
+-                pass
++            return None
+ 
+         def _findLib_ld(name):
+             # See issue #9998 for why this is needed
+-- 
+2.15.0
+
diff --git a/nixpkgs/pkgs/development/interpreters/python/default.nix b/nixpkgs/pkgs/development/interpreters/python/default.nix
index 119c0a2728b4..7f21d03fc3a5 100644
--- a/nixpkgs/pkgs/development/interpreters/python/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/default.nix
@@ -98,6 +98,19 @@ in {
     inherit passthruFun;
   };
 
+  python38 = callPackage ./cpython {
+    self = python38;
+    sourceVersion = {
+      major = "3";
+      minor = "8";
+      patch = "0";
+      suffix = "b2";
+    };
+    sha256 = "1rh9dz5vmc56y45d6j2wfjw4m7x25i6v8vyld4mrqh06s2gn1hbl";
+    inherit (darwin) CF configd;
+    inherit passthruFun;
+  };
+
   pypy27 = callPackage ./pypy {
     self = pypy27;
     sourceVersion = {
diff --git a/nixpkgs/pkgs/development/interpreters/python/fetchpypi.nix b/nixpkgs/pkgs/development/interpreters/python/fetchpypi.nix
new file mode 100644
index 000000000000..e60c9df1f8bb
--- /dev/null
+++ b/nixpkgs/pkgs/development/interpreters/python/fetchpypi.nix
@@ -0,0 +1,28 @@
+# `fetchPypi` function for fetching artifacts from PyPI.
+{ fetchurl
+, makeOverridable
+}:
+
+let
+  computeUrl = {format ? "setuptools", ... } @attrs: let
+    computeWheelUrl = {pname, version, python ? "py2.py3", abi ? "none", platform ? "any"}:
+    # Fetch a wheel. By default we fetch an universal wheel.
+    # See https://www.python.org/dev/peps/pep-0427/#file-name-convention for details regarding the optional arguments.
+      "https://files.pythonhosted.org/packages/${python}/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}-${python}-${abi}-${platform}.whl";
+
+    computeSourceUrl = {pname, version, extension ? "tar.gz"}:
+    # Fetch a source tarball.
+      "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.${extension}";
+
+    compute = (if format == "wheel" then computeWheelUrl
+      else if format == "setuptools" then computeSourceUrl
+      else throw "Unsupported format ${format}");
+
+  in compute (builtins.removeAttrs attrs ["format"]);
+
+in makeOverridable( {format ? "setuptools", sha256 ? "", hash ? "", ... } @attrs:
+  let
+    url = computeUrl (builtins.removeAttrs attrs ["sha256" "hash"]) ;
+  in fetchurl {
+    inherit url sha256 hash;
+  })
diff --git a/nixpkgs/pkgs/development/interpreters/rascal/default.nix b/nixpkgs/pkgs/development/interpreters/rascal/default.nix
index 25e125b9af63..22eee0f6ead8 100644
--- a/nixpkgs/pkgs/development/interpreters/rascal/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/rascal/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ makeWrapper jdk ];
 
-  unpackPhase = "true";
+  dontUnpack = true;
 
   installPhase =
     ''
diff --git a/nixpkgs/pkgs/development/interpreters/supercollider/default.nix b/nixpkgs/pkgs/development/interpreters/supercollider/default.nix
index c16b57dcb9c5..057375182f53 100644
--- a/nixpkgs/pkgs/development/interpreters/supercollider/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/supercollider/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, pkgconfig, alsaLib
 , libjack2, libsndfile, fftw, curl, gcc
-, libXt, qtbase, qttools, qtwebkit, readline
-, useSCEL ? false, emacs
+, libXt, qtbase, qttools, qtwebengine
+, readline, qtwebsockets, useSCEL ? false, emacs
 }:
 
 let optional = stdenv.lib.optional;
@@ -9,12 +9,12 @@ in
 
 stdenv.mkDerivation rec {
   name = "supercollider-${version}";
-  version = "3.9.3";
+  version = "3.10.2";
 
 
   src = fetchurl {
     url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2";
-    sha256 = "1d8ixfl100jvlialxdizp8wqsl1mp5pi2bam25vp97bhjd59cfdr";
+    sha256 = "0ynz1ydcpsd5h57h1n4a7avm6p1cif5a8rkmz4qpr46pr8z9p6iq";
   };
 
   hardeningDisable = [ "stackprotector" ];
@@ -27,14 +27,15 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig qttools ];
 
   buildInputs = [
-    gcc libjack2 libsndfile fftw curl libXt qtbase qtwebkit readline ]
+    gcc libjack2 libsndfile fftw curl libXt qtbase qtwebengine qtwebsockets readline ]
       ++ optional (!stdenv.isDarwin) alsaLib
       ++ optional useSCEL emacs;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Programming language for real time audio synthesis";
     homepage = http://supercollider.sourceforge.net/;
-    license = stdenv.lib.licenses.gpl3Plus;
+    maintainers = with maintainers; [ mrmebelman ];
+    license = licenses.gpl3;
     platforms = [ "x686-linux" "x86_64-linux" ];
   };
 }
diff --git a/nixpkgs/pkgs/development/java-modules/jogl/default.nix b/nixpkgs/pkgs/development/java-modules/jogl/default.nix
index a3c3b2bf96f6..36c4af5f4961 100644
--- a/nixpkgs/pkgs/development/java-modules/jogl/default.nix
+++ b/nixpkgs/pkgs/development/java-modules/jogl/default.nix
@@ -58,7 +58,7 @@ in
 
       meta = with stdenv.lib; {
         description = "Java libraries for 3D Graphics, Multimedia and Processing";
-        homepage = http://jogamp.org/;
+        homepage = https://jogamp.org/;
         license = licenses.bsd3;
         platforms = [ "x86_64-linux" ];
       };
diff --git a/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix b/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix
new file mode 100644
index 000000000000..cd16dea56b18
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, cmake, cppunit }:
+
+stdenv.mkDerivation rec {
+  pname = "cpp-utilities";
+  version = "4.17.1";
+
+  src = fetchFromGitHub {
+    owner = "Martchus";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "12088cwg3jbqipmbn4843w1cgxi1q6vwx47gy042rkfvbk6azhxl";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  checkInputs = [ cppunit ];
+  # Otherwise, tests fail since the resulting shared object libc++utilities.so is only available in PWD of the make files
+  checkFlagsArray = [ "LD_LIBRARY_PATH=$(PWD)" ];
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/Martchus/cpp-utilities";
+    description = "Common C++ classes and routines used by @Martchus' applications featuring argument parser, IO and conversion utilities";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ doronbehar ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/elf-header/default.nix b/nixpkgs/pkgs/development/libraries/elf-header/default.nix
index 47b39eeb7e97..c1764e83c303 100644
--- a/nixpkgs/pkgs/development/libraries/elf-header/default.nix
+++ b/nixpkgs/pkgs/development/libraries/elf-header/default.nix
@@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation {
 
   src = null;
 
-  unpackPhase = "true";
+  dontUnpack = true;
 
   dontBuild = true;
 
diff --git a/nixpkgs/pkgs/development/libraries/expat/default.nix b/nixpkgs/pkgs/development/libraries/expat/default.nix
index 7e4d46c012dd..ef2574019459 100644
--- a/nixpkgs/pkgs/development/libraries/expat/default.nix
+++ b/nixpkgs/pkgs/development/libraries/expat/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "expat-2.2.6";
+  name = "expat-2.2.7";
 
   src = fetchurl {
     url = "mirror://sourceforge/expat/${name}.tar.bz2";
-    sha256 = "1wl1x93b5w457ddsdgj0lh7yjq4q6l7wfbgwhagkc8fm2qkkrd0p";
+    sha256 = "067cfhqwiswm4zynw7xaxl59mrrimaiyjhnn8byxma1i98pi1jfb";
   };
 
   outputs = [ "out" "dev" ]; # TODO: fix referrers
diff --git a/nixpkgs/pkgs/development/libraries/freetds/default.nix b/nixpkgs/pkgs/development/libraries/freetds/default.nix
index d8bb9e8e85b0..ee63ce2f2f9e 100644
--- a/nixpkgs/pkgs/development/libraries/freetds/default.nix
+++ b/nixpkgs/pkgs/development/libraries/freetds/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   version = "1.1.6";
 
   src = fetchurl {
-    url    = "http://www.freetds.org/files/stable/${name}.tar.bz2";
+    url    = "https://www.freetds.org/files/stable/${name}.tar.bz2";
     sha256 = "18rry59npbhxpzjb0l3ib7zlnlzj43srb5adcm65wyklklsh0gn2";
   };
 
diff --git a/nixpkgs/pkgs/development/libraries/glfw/3.x.nix b/nixpkgs/pkgs/development/libraries/glfw/3.x.nix
index 668fe436e915..13bd4a456c97 100644
--- a/nixpkgs/pkgs/development/libraries/glfw/3.x.nix
+++ b/nixpkgs/pkgs/development/libraries/glfw/3.x.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";
-    homepage = http://www.glfw.org/;
+    homepage = https://www.glfw.org/;
     license = licenses.zlib;
     maintainers = with maintainers; [ marcweber ];
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/glib-networking/default.nix b/nixpkgs/pkgs/development/libraries/glib-networking/default.nix
index a51183e4e11a..4f853e9821ff 100644
--- a/nixpkgs/pkgs/development/libraries/glib-networking/default.nix
+++ b/nixpkgs/pkgs/development/libraries/glib-networking/default.nix
@@ -3,14 +3,14 @@
 
 let
   pname = "glib-networking";
-  version = "2.60.2";
+  version = "2.60.3";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0cl74q7hvq4xqqc88vlzmfw1sh5n9hdh1yvn2v1vg9am1z8z68n0";
+    sha256 = "1mfw44qpmwvz6yzj8c6spx6z357wrmkk15byrkc5byagd82860fm";
   };
 
   outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs
diff --git a/nixpkgs/pkgs/development/libraries/gpgme/default.nix b/nixpkgs/pkgs/development/libraries/gpgme/default.nix
index fc7634128dc0..c462f2e685a2 100644
--- a/nixpkgs/pkgs/development/libraries/gpgme/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gpgme/default.nix
@@ -13,11 +13,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "gpgme-${version}";
-  version = "1.13.0";
+  version = "1.13.1";
 
   src = fetchurl {
     url = "mirror://gnupg/gpgme/${name}.tar.bz2";
-    sha256 = "0c6676g0yhfsmy32i1dgwh5cx0ja8vhcqf4k08zad177m53kxcnl";
+    sha256 = "0imyjfryvvjdbai454p70zcr95m94j9xnzywrlilqdw2fqi0pqy4";
   };
 
   outputs = [ "out" "dev" "info" ];
diff --git a/nixpkgs/pkgs/development/libraries/gtk+/3.x.nix b/nixpkgs/pkgs/development/libraries/gtk+/3.x.nix
index 21f1d4c39990..378f3904d5d1 100644
--- a/nixpkgs/pkgs/development/libraries/gtk+/3.x.nix
+++ b/nixpkgs/pkgs/development/libraries/gtk+/3.x.nix
@@ -53,8 +53,9 @@ stdenv.mkDerivation rec {
     ++ optional cupsSupport cups;
   #TODO: colord?
 
-  # demos fail to install, no idea where's the problem
-  preConfigure = "sed '/^SRC_SUBDIRS /s/demos//' -i Makefile.in";
+  ## (2019-06-12) Demos seem to install fine now. Keeping this around in case it fails again.
+  ## (2014-03-27) demos fail to install, no idea where's the problem
+  #preConfigure = "sed '/^SRC_SUBDIRS /s/demos//' -i Makefile.in";
 
   enableParallelBuilding = true;
 
diff --git a/nixpkgs/pkgs/development/libraries/hwloc/default.nix b/nixpkgs/pkgs/development/libraries/hwloc/default.nix
index 5866d6b8fedb..0f4ce4e6b97c 100644
--- a/nixpkgs/pkgs/development/libraries/hwloc/default.nix
+++ b/nixpkgs/pkgs/development/libraries/hwloc/default.nix
@@ -15,7 +15,7 @@ in stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
-    url = "http://www.open-mpi.org/software/hwloc/v${versmm}/downloads/${name}.tar.bz2";
+    url = "https://www.open-mpi.org/software/hwloc/v${versmm}/downloads/${name}.tar.bz2";
     sha256 = "1aa7s208gdijk19vvzzahyl8pglk1va3yd6kdbpfa5pz5ms0ag35";
   };
 
@@ -78,7 +78,7 @@ in stdenv.mkDerivation {
        more.
     '';
 
-    # http://www.open-mpi.org/projects/hwloc/license.php
+    # https://www.open-mpi.org/projects/hwloc/license.php
     license = licenses.bsd3;
     homepage = https://www.open-mpi.org/projects/hwloc/;
     maintainers = with maintainers; [ fpletz markuskowa ];
diff --git a/nixpkgs/pkgs/development/libraries/ilmbase/default.nix b/nixpkgs/pkgs/development/libraries/ilmbase/default.nix
index 42cf77802625..2d22788e1ecd 100644
--- a/nixpkgs/pkgs/development/libraries/ilmbase/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ilmbase/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   doCheck = stdenv.isx86_64;
 
   meta = with stdenv.lib; {
-    homepage = http://www.openexr.com/;
+    homepage = https://www.openexr.com/;
     license = licenses.bsd3;
     platforms = platforms.all;
   };
diff --git a/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix b/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix
index b543d47a050d..fa2b45ae948e 100644
--- a/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "jsoncpp";
-  version = "1.8.4";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "open-source-parsers";
     repo = "jsoncpp";
     rev = version;
-    sha256 = "1z0gj7a6jypkijmpknis04qybs1hkd04d1arr3gy89lnxmp6qzlm";
+    sha256 = "10wnwlq92gp32f5p55kjcc12jfsl0yq6f2y4abb0si6wym12krw9";
   };
 
   /* During darwin bootstrap, we have a cp that doesn't understand the
diff --git a/nixpkgs/pkgs/development/libraries/leatherman/default.nix b/nixpkgs/pkgs/development/libraries/leatherman/default.nix
index 9ab68e578fbf..95924050ff32 100644
--- a/nixpkgs/pkgs/development/libraries/leatherman/default.nix
+++ b/nixpkgs/pkgs/development/libraries/leatherman/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "leatherman-${version}";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
-    sha256 = "1dy1iisc0h1l28ff72pq7vxa4mj5zpq2jflpdghhx8yqksxhii4k";
+    sha256 = "0n6vcbc43hdaxg5inl2b43bsksdkj3k0qxis6gkkclipivp8pz0p";
     rev = version;
     repo = "leatherman";
     owner = "puppetlabs";
diff --git a/nixpkgs/pkgs/development/libraries/libdrm/default.nix b/nixpkgs/pkgs/development/libraries/libdrm/default.nix
index 7415aa754e7d..4ed3ad356a9f 100644
--- a/nixpkgs/pkgs/development/libraries/libdrm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdrm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }:
+{ stdenv, fetchurl, pkgconfig, meson, ninja, libpthreadstubs, libpciaccess, valgrind-light }:
 
 stdenv.mkDerivation rec {
   name = "libdrm-2.4.98";
@@ -10,9 +10,8 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "bin" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig meson ninja ];
   buildInputs = [ libpthreadstubs libpciaccess valgrind-light ];
-    # libdrm as of 2.4.70 does not actually do anything with udev.
 
   postPatch = ''
     for a in */*-symbol-check ; do
@@ -20,13 +19,15 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  configureFlags = [ "--enable-install-test-programs" ]
+  mesonFlags =
+    [ "-Dinstall-test-programs=true" ]
     ++ stdenv.lib.optionals (stdenv.isAarch32 || stdenv.isAarch64)
-      [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ]
-    ++ stdenv.lib.optional stdenv.isDarwin "-C"
-    ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-intel"
+      [ "-Dtegra=true" "-Detnaviv=true" ]
+    ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-Dintel=false"
     ;
 
+  enableParallelBuilding = true;
+
   meta = {
     homepage = https://dri.freedesktop.org/libdrm/;
     description = "Library for accessing the kernel's Direct Rendering Manager";
diff --git a/nixpkgs/pkgs/development/libraries/libelf/default.nix b/nixpkgs/pkgs/development/libraries/libelf/default.nix
index 55a01c75dcf2..5105bf7e73f0 100644
--- a/nixpkgs/pkgs/development/libraries/libelf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libelf/default.nix
@@ -12,6 +12,9 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./dont-hardcode-ar.patch
+    # Fix warnings from preprocessor instructions.
+    # https://github.com/NixOS/nixpkgs/issues/59929
+    ./preprocessor-warnings.patch
   ];
 
   doCheck = true;
diff --git a/nixpkgs/pkgs/development/libraries/libelf/preprocessor-warnings.patch b/nixpkgs/pkgs/development/libraries/libelf/preprocessor-warnings.patch
new file mode 100644
index 000000000000..e04c8ee202a0
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/libelf/preprocessor-warnings.patch
@@ -0,0 +1,264 @@
+diff --git a/lib/elf_repl.h b/lib/elf_repl.h
+index c5cf90f..7e1e8df 100644
+--- a/lib/elf_repl.h
++++ b/lib/elf_repl.h
+@@ -45,7 +45,7 @@ typedef __libelf_u32_t		Elf32_Word;
+ #define ELF32_FSZ_SWORD		4
+ #define ELF32_FSZ_WORD		4
+ 
+-#if __LIBELF64
++#if defined(__LIBELF64)
+ 
+ typedef __libelf_u64_t		Elf64_Addr;
+ typedef __libelf_u16_t		Elf64_Half;
+@@ -93,7 +93,7 @@ typedef struct {
+     Elf32_Half		e_shstrndx;
+ } Elf32_Ehdr;
+ 
+-#if __LIBELF64
++#if defined(__LIBELF64)
+ typedef struct {
+     unsigned char	e_ident[EI_NIDENT];
+     Elf64_Half		e_type;
+@@ -307,7 +307,7 @@ typedef struct {
+     Elf32_Word		sh_entsize;
+ } Elf32_Shdr;
+ 
+-#if __LIBELF64
++#if defined(__LIBELF64)
+ typedef struct {
+     Elf64_Word		sh_name;
+     Elf64_Word		sh_type;
+@@ -434,7 +434,7 @@ typedef struct {
+     Elf32_Half		st_shndx;
+ } Elf32_Sym;
+ 
+-#if __LIBELF64
++#if defined(__LIBELF64)
+ typedef struct {
+     Elf64_Word		st_name;
+     unsigned char	st_info;
+@@ -457,7 +457,7 @@ typedef struct {
+ #define ELF32_ST_TYPE(i)	((i)&0xf)
+ #define ELF32_ST_INFO(b,t)	(((b)<<4)+((t)&0xf))
+ 
+-#if __LIBELF64
++#if defined(__LIBELF64)
+ #define ELF64_ST_BIND(i)	((i)>>4)
+ #define ELF64_ST_TYPE(i)	((i)&0xf)
+ #define ELF64_ST_INFO(b,t)	(((b)<<4)+((t)&0xf))
+@@ -495,7 +495,7 @@ typedef struct {
+  * Macros for manipulating st_other
+  */
+ #define ELF32_ST_VISIBILITY(o)	((o)&0x3)
+-#if __LIBELF64
++#if defined(__LIBELF64)
+ #define ELF64_ST_VISIBILITY(o)	((o)&0x3)
+ #endif /* __LIBELF64 */
+ 
+@@ -521,7 +521,7 @@ typedef struct {
+     Elf32_Sword		r_addend;
+ } Elf32_Rela;
+ 
+-#if __LIBELF64
++#if defined(__LIBELF64)
+ typedef struct {
+     Elf64_Addr		r_offset;
+     Elf64_Xword		r_info;
+@@ -541,7 +541,7 @@ typedef struct {
+ #define ELF32_R_TYPE(i)		((unsigned char)(i))
+ #define ELF32_R_INFO(s,t)	(((s)<<8)+(unsigned char)(t))
+ 
+-#if __LIBELF64
++#if defined(__LIBELF64)
+ #define ELF64_R_SYM(i)		((Elf64_Xword)(i)>>32)
+ #define ELF64_R_TYPE(i)		((i)&0xffffffffL)
+ #define ELF64_R_INFO(s,t)	(((Elf64_Xword)(s)<<32)+((t)&0xffffffffL))
+@@ -556,7 +556,7 @@ typedef struct {
+     Elf32_Word		n_type;		/* descriptor type */
+ } Elf32_Nhdr;
+ 
+-#if __LIBELF64
++#if defined(__LIBELF64)
+ /* Solaris and GNU use this layout.  Be compatible. */
+ /* XXX: Latest ELF specs say it's 64-bit!!! */
+ typedef struct {
+@@ -587,7 +587,7 @@ typedef struct {
+     Elf32_Word		p_align;
+ } Elf32_Phdr;
+ 
+-#if __LIBELF64
++#if defined(__LIBELF64)
+ typedef struct {
+     Elf64_Word		p_type;
+     Elf64_Word		p_flags;
+@@ -654,7 +654,7 @@ typedef struct {
+     } d_un;
+ } Elf32_Dyn;
+ 
+-#if __LIBELF64
++#if defined(__LIBELF64)
+ typedef struct {
+     Elf64_Sxword	d_tag;
+     union {
+@@ -798,7 +798,7 @@ typedef struct {
+     Elf32_Half		si_flags;
+ } Elf32_Syminfo;
+ 
+-#if __LIBELF64
++#if defined(__LIBELF64)
+ typedef struct {
+     Elf64_Half		si_boundto;
+     Elf64_Half		si_flags;
+@@ -863,7 +863,7 @@ typedef struct {
+ 
+ typedef Elf32_Half	Elf32_Versym;
+ 
+-#if __LIBELF64
++#if defined(__LIBELF64)
+ 
+ typedef struct {
+     Elf64_Half		vd_version;
+@@ -933,7 +933,7 @@ typedef Elf64_Half	Elf64_Versym;
+ /*
+  * Move section
+  */
+-#if __LIBELF64
++#if defined(__LIBELF64)
+ 
+ typedef struct {
+     Elf32_Lword		m_value;
+@@ -973,7 +973,7 @@ typedef struct {
+     } c_un;
+ } Elf32_Cap;
+ 
+-#if __LIBELF64
++#if defined(__LIBELF64)
+ 
+ typedef struct {
+     Elf64_Xword     	c_tag;
+diff --git a/lib/gelf.h b/lib/gelf.h
+index 5af0558..98a759c 100644
+--- a/lib/gelf.h
++++ b/lib/gelf.h
+@@ -22,15 +22,15 @@
+ #ifndef _GELF_H
+ #define _GELF_H
+ 
+-#if __LIBELF_INTERNAL__
++#if defined(__LIBELF_INTERNAL__)
+ #include <libelf.h>
+ #else /* __LIBELF_INTERNAL__ */
+ #include <libelf/libelf.h>
+ #endif /* __LIBELF_INTERNAL__ */
+ 
+-#if __LIBELF_NEED_LINK_H
++#if defined(__LIBELF_NEED_LINK_H)
+ #include <link.h>
+-#elif __LIBELF_NEED_SYS_LINK_H
++#elif defined(__LIBELF_NEED_SYS_LINK_H)
+ #include <sys/link.h>
+ #endif /* __LIBELF_NEED_LINK_H */
+ 
+@@ -46,7 +46,7 @@ extern "C" {
+ # endif /* __STDC__ || defined(__cplusplus) */
+ #endif /* __P */
+ 
+-#if !__LIBELF64
++#if !defined(__LIBELF64)
+ 
+ #error "GElf is not supported on this system."
+ 
+@@ -71,7 +71,7 @@ typedef Elf64_Sym	GElf_Sym;
+ /*
+  * Symbol versioning
+  */
+-#if __LIBELF_SYMBOL_VERSIONS
++#if defined(__LIBELF_SYMBOL_VERSIONS)
+ typedef Elf64_Verdef	GElf_Verdef;
+ typedef Elf64_Verneed	GElf_Verneed;
+ typedef Elf64_Verdaux	GElf_Verdaux;
+diff --git a/lib/libelf.h b/lib/libelf.h
+index 3ebd0f3..788482d 100644
+--- a/lib/libelf.h
++++ b/lib/libelf.h
+@@ -25,7 +25,7 @@
+ #include <stddef.h>	/* for size_t */
+ #include <sys/types.h>
+ 
+-#if __LIBELF_INTERNAL__
++#if defined(__LIBELF_INTERNAL__)
+ #include <sys_elf.h>
+ #else /* __LIBELF_INTERNAL__ */
+ #include <libelf/sys_elf.h>
+@@ -224,7 +224,7 @@ extern Elf_Data *elf32_xlatetom __P((Elf_Data *__dst, const Elf_Data *__src,
+  */
+ extern long elf32_checksum __P((Elf *__elf));
+ 
+-#if __LIBELF64
++#if defined(__LIBELF64)
+ /*
+  * 64-bit ELF functions
+  * Not available on all platforms
+diff --git a/lib/sys_elf.h.in b/lib/sys_elf.h.in
+index b71a20d..722051b 100644
+--- a/lib/sys_elf.h.in
++++ b/lib/sys_elf.h.in
+@@ -68,7 +68,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ #ifdef __LIBELF_HEADER_ELF_H
+ # include __LIBELF_HEADER_ELF_H
+ #else /* __LIBELF_HEADER_ELF_H */
+-# if __LIBELF_INTERNAL__
++# if defined(__LIBELF_INTERNAL__)
+ #  include <elf_repl.h>
+ # else /* __LIBELF_INTERNAL__ */
+ #  include <libelf/elf_repl.h>
+@@ -92,7 +92,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ #  define STN_UNDEF	0
+ # endif /* STN_UNDEF */
+ 
+-# if __LIBELF64
++# if defined(__LIBELF64)
+ 
+ #  ifndef ELF64_FSZ_ADDR
+ #   define ELF64_FSZ_ADDR	8
+@@ -116,7 +116,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ #   define ELF64_R_INFO(s,t)	(((Elf64_Xword)(s)<<32)+((t)&0xffffffffL))
+ #  endif /* ELF64_R_SYM */
+ 
+-#  if __LIBELF64_LINUX
++#  if defined(__LIBELF64_LINUX)
+ typedef __libelf_u64_t	Elf64_Addr;
+ typedef __libelf_u16_t	Elf64_Half;
+ typedef __libelf_u64_t	Elf64_Off;
+diff --git a/lib/sys_elf.h.w32 b/lib/sys_elf.h.w32
+index 0f93c55..7360104 100644
+--- a/lib/sys_elf.h.w32
++++ b/lib/sys_elf.h.w32
+@@ -68,7 +68,7 @@
+ #ifdef __LIBELF_HEADER_ELF_H

+ # include __LIBELF_HEADER_ELF_H

+ #else /* __LIBELF_HEADER_ELF_H */

+-# if __LIBELF_INTERNAL__

++# if defined(__LIBELF_INTERNAL__)

+ #  include <elf_repl.h>

+ # else /* __LIBELF_INTERNAL__ */

+ #  include <libelf/elf_repl.h>

+@@ -92,7 +92,7 @@
+ #  define STN_UNDEF	0

+ # endif /* STN_UNDEF */

+ 

+-# if __LIBELF64

++# if defined(__LIBELF64)

+ 

+ #  ifndef ELF64_FSZ_ADDR

+ #   define ELF64_FSZ_ADDR	8

+@@ -116,7 +116,7 @@
+ #   define ELF64_R_INFO(s,t)	(((Elf64_Xword)(s)<<32)+((t)&0xffffffffL))

+ #  endif /* ELF64_R_SYM */

+ 

+-#  if __LIBELF64_LINUX

++#  if defined(__LIBELF64_LINUX)

+ typedef __libelf_u64_t	Elf64_Addr;

+ typedef __libelf_u16_t	Elf64_Half;

+ typedef __libelf_u64_t	Elf64_Off;

diff --git a/nixpkgs/pkgs/development/libraries/libinput/default.nix b/nixpkgs/pkgs/development/libraries/libinput/default.nix
index 651c43297082..0c759835183b 100644
--- a/nixpkgs/pkgs/development/libraries/libinput/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libinput/default.nix
@@ -27,11 +27,11 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libinput-${version}";
-  version = "1.13.2";
+  version = "1.13.4";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz";
-    sha256 = "0vbapc90m49n0z8w8w4v0qf1iiwaixw9h79jfmps9pj8hdls17qx";
+    sha256 = "07a0w7rak7rvnh6g4j0akwjxwinxfszc1xi9mrx12fv82k3mgsyk";
   };
 
   outputs = [ "bin" "out" "dev" ];
diff --git a/nixpkgs/pkgs/development/libraries/libnxml/default.nix b/nixpkgs/pkgs/development/libraries/libnxml/default.nix
index 8d97a13b0a08..0a6c58c8a015 100644
--- a/nixpkgs/pkgs/development/libraries/libnxml/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libnxml/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   buildInputs = [ curl ];
 
   meta = {
-    homepage = http://www.autistici.org/bakunin/libnxml/;
+    homepage = https://www.autistici.org/bakunin/libnxml/;
     description = "C library for parsing, writing and creating XML 1.0 and 1.1 files or streams";
     license = stdenv.lib.licenses.lgpl2;
 
diff --git a/nixpkgs/pkgs/development/libraries/libow/default.nix b/nixpkgs/pkgs/development/libraries/libow/default.nix
index 66cb0762c25a..7797061a71aa 100644
--- a/nixpkgs/pkgs/development/libraries/libow/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libow/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "1-Wire File System full library";
-    homepage = http://owfs.org/;
+    homepage = https://owfs.org/;
     license = licenses.gpl2;
     maintainers = with maintainers; [ disserman ];
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/libshout/default.nix b/nixpkgs/pkgs/development/libraries/libshout/default.nix
index 3753a070c639..849c93962f88 100644
--- a/nixpkgs/pkgs/development/libraries/libshout/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libshout/default.nix
@@ -4,11 +4,11 @@
 # need pkgconfig so that libshout installs ${out}/lib/pkgconfig/shout.pc
 
 stdenv.mkDerivation rec {
-  name = "libshout-2.4.2";
+  name = "libshout-2.4.3";
 
   src = fetchurl {
     url = "http://downloads.xiph.org/releases/libshout/${name}.tar.gz";
-    sha256 = "0qgwarqp2p6jy3zadds6dzj8z1jfb2mbwc3lsdlidf527h0a86ym";
+    sha256 = "1zhdshas539cs8fsz8022ljxnnncr5lafhfd1dqr1gs125fzb2hd";
   };
 
   outputs = [ "out" "dev" "doc" ];
diff --git a/nixpkgs/pkgs/development/libraries/libssh2/default.nix b/nixpkgs/pkgs/development/libraries/libssh2/default.nix
index 483a56dcdce6..d4205981499c 100644
--- a/nixpkgs/pkgs/development/libraries/libssh2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libssh2/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libssh2";
-  version = "1.8.2";
+  version = "1.9.0";
 
   src = fetchurl {
     url = "${meta.homepage}/download/${pname}-${version}.tar.gz";
-    sha256 = "0rqd37pc80nm2pz4sa2m9pfc48axys7jwq1l7z0vii5nyvchg0q8";
+    sha256 = "1zfsz9nldakfz61d2j70pk29zlmj7w2vv46s9l3x2prhcgaqpyym";
   };
 
   outputs = [ "out" "dev" "devdoc" ];
diff --git a/nixpkgs/pkgs/development/libraries/libuv/default.nix b/nixpkgs/pkgs/development/libraries/libuv/default.nix
index f5026da4c3b9..ade3f5796d51 100644
--- a/nixpkgs/pkgs/development/libraries/libuv/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libuv/default.nix
@@ -1,14 +1,14 @@
 { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }:
 
 stdenv.mkDerivation rec {
-  version = "1.29.1";
+  version = "1.30.0";
   pname = "libuv";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "0scnircr6khgh7l3bw9zyfzdgx2c11mpfhd9d8qlw47arrvqg7l8";
+    sha256 = "0j26nh799962l1gn3v3sw1x6fnia2dx5irhl33nc77gy2gzayv07";
   };
 
   postPatch = let
diff --git a/nixpkgs/pkgs/development/libraries/liquid-dsp/default.nix b/nixpkgs/pkgs/development/libraries/liquid-dsp/default.nix
index 391606d59e68..99ea6343d70f 100644
--- a/nixpkgs/pkgs/development/libraries/liquid-dsp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liquid-dsp/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook ];
 
   meta = {
-    homepage = http://liquidsdr.org/;
+    homepage = https://liquidsdr.org/;
     description = "Digital signal processing library for software-defined radios";
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix
index a35bdb5764bb..2c5e4a8e034e 100644
--- a/nixpkgs/pkgs/development/libraries/mesa/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurl, lib
-, pkgconfig, intltool, autoreconfHook
-, file, expat, libdrm, xorg, wayland, wayland-protocols, openssl
+{ stdenv, lib, fetchurl, fetchpatch
+, pkgconfig, intltool, ninja, meson
+, file, flex, bison, expat, libdrm, xorg, wayland, wayland-protocols, openssl
 , llvmPackages, libffi, libomxil-bellagio, libva-minimal
-, libelf, libvdpau, python2, python2Packages
+, libelf, libvdpau, python3Packages
 , libglvnd
 , enableRadv ? true
-, galliumDrivers ? null
-, driDrivers ? null
-, vulkanDrivers ? null
+, galliumDrivers ? ["auto"]
+, driDrivers ? ["auto"]
+, vulkanDrivers ? ["auto"]
 , eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ]
 , OpenGL, Xplugin
 , withValgrind ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32, valgrind-light
@@ -27,49 +27,13 @@
 with stdenv.lib;
 
 let
-  # platforms that have PCIe slots and thus can use most non-integrated GPUs
-  pciePlatform = !stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64;
-  defaultGalliumDrivers = optionals (elem "drm" eglPlatforms) ([ "virgl" ]
-    ++ lib.optionals pciePlatform [ "r300" "r600" "radeonsi" ]
-    ++ lib.optionals (pciePlatform || stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [ "nouveau" ]
-    ++ lib.optionals stdenv.hostPlatform.isx86 [ "i915" "svga" ]
-    ++ lib.optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [ "vc4" ]
-    ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "freedreno" "etnaviv" "imx" ]
-  );
-  defaultDriDrivers = optionals (elem "drm" eglPlatforms) ([ ]
-    ++ lib.optionals pciePlatform [ "radeon" "r200" ]
-    ++ lib.optionals (pciePlatform || stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [ "nouveau" ]
-    ++ lib.optionals stdenv.hostPlatform.isx86 [ "i915" "i965" ]);
-  defaultVulkanDrivers = optionals stdenv.hostPlatform.isLinux ([ ]
-    ++ lib.optional stdenv.hostPlatform.isx86 "intel"
-    ++ lib.optional enableRadv "radeon");
-in
-
-let gallium_ = galliumDrivers; dri_ = driDrivers; vulkan_ = vulkanDrivers; in
-
-let
-  galliumDrivers =
-    (if gallium_ == null
-          then defaultGalliumDrivers
-          else gallium_)
-    ++ lib.optional stdenv.isLinux "swrast";
-  driDrivers =
-    (if dri_ == null
-      then optionals (elem "drm" eglPlatforms) defaultDriDrivers
-      else dri_) ++ lib.optional stdenv.isLinux "swrast";
-  vulkanDrivers =
-    if vulkan_ == null
-    then defaultVulkanDrivers
-    else vulkan_;
-in
-
-let
-  version = "18.3.4";
+  version = "19.1.1";
   branch  = head (splitString "." version);
 in
 
-let self = stdenv.mkDerivation {
-  name = "mesa-${version}";
+stdenv.mkDerivation rec {
+  pname = "mesa";
+  inherit version;
 
   src =  fetchurl {
     urls = [
@@ -78,7 +42,7 @@ let self = stdenv.mkDerivation {
       "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
       "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
     ];
-    sha256 = "01xv03ah4l5lcfx015n3fg1620dh4nbbv6gmhh6zhdsx6sj4sc9j";
+    sha256 = "10amy5sdmpjbskr3xazgk0jyli8xpgi0y1nsmjr76hx8nhb4n4bj";
   };
 
   prePatch = "patchShebangs .";
@@ -87,60 +51,58 @@ let self = stdenv.mkDerivation {
   #  revive ./dricore-gallium.patch when it gets ported (from Ubuntu), as it saved
   #  ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog
   patches = [
-    ./symlink-drivers.patch
     ./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl
+    ./opencl-install-dir.patch
     ./disk_cache-include-dri-driver-path-in-cache-key.patch
-  ];
+  ] # do not prefix user provided dri-drivers-path
+    ++ lib.optional (lib.versionOlder version "19.0.0") (fetchpatch {
+      url = "https://gitlab.freedesktop.org/mesa/mesa/commit/f6556ec7d126b31da37c08d7cb657250505e01a0.patch";
+      sha256 = "0z6phi8hbrbb32kkp1js7ggzviq7faz1ria36wi4jbc4in2392d9";
+    })
+    ++ lib.optionals (lib.versionOlder version "19.1.0") [
+      # do not prefix user provided d3d-drivers-path
+      (fetchpatch {
+        url = "https://gitlab.freedesktop.org/mesa/mesa/commit/dcc48664197c7e44684ccfb970a4ae083974d145.patch";
+        sha256 = "1nhs0xpx3hiy8zfb5gx1zd7j7xha6h0hr7yingm93130a5902lkb";
+      })
+
+      # don't build libGLES*.so with GLVND
+      (fetchpatch {
+        url = "https://gitlab.freedesktop.org/mesa/mesa/commit/b01524fff05eef66e8cd24f1c5aacefed4209f03.patch";
+        sha256 = "1pszr6acx2xw469zq89n156p3bf3xf84qpbjw5fr1sj642lbyh7c";
+      })
+    ];
 
-  outputs = [ "out" "dev" "drivers" ]
-            ++ lib.optional (elem "swrast" galliumDrivers) "osmesa";
+  outputs = [ "out" "dev" "drivers" "osmesa" ];
 
   # TODO: Figure out how to enable opencl without having a runtime dependency on clang
-  configureFlags = [
-    "--sysconfdir=${libglvnd.driverLink}/etc"
-    "--localstatedir=/var"
-    "--with-dri-driverdir=$(drivers)/lib/dri"
-    "--with-dri-searchpath=${libglvnd.driverLink}/lib/dri"
-    "--with-platforms=${concatStringsSep "," eglPlatforms}"
-    "--with-gallium-drivers=${concatStringsSep "," galliumDrivers}"
-    "--with-dri-drivers=${concatStringsSep "," driDrivers}"
-    "--with-vulkan-drivers=${concatStringsSep "," vulkanDrivers}"
-    "--enable-texture-float"
-    (enableFeature stdenv.isLinux "dri3")
-    (enableFeature stdenv.isLinux "nine") # Direct3D in Wine
-    (enableFeature stdenv.isLinux "libglvnd")
-    "--enable-dri"
-    "--enable-driglx-direct"
-    "--enable-gles1"
-    "--enable-gles2"
-    "--enable-glx"
-    # https://bugs.freedesktop.org/show_bug.cgi?id=35268
-    (enableFeature (!stdenv.hostPlatform.isMusl) "glx-tls")
-    # used by wine
-    (enableFeature (elem "swrast" galliumDrivers) "gallium-osmesa")
-    "--enable-llvm"
-    (enableFeature stdenv.isLinux "egl")
-    (enableFeature stdenv.isLinux "xa") # used in vmware driver
-    (enableFeature stdenv.isLinux "gbm")
-    "--enable-xvmc"
-    "--enable-vdpau"
-    "--enable-shared-glapi"
-    "--enable-llvm-shared-libs"
-    (enableFeature stdenv.isLinux "omx-bellagio")
-    (enableFeature stdenv.isLinux "va")
-    "--disable-opencl"
-  ];
-
-  nativeBuildInputs = [
-    autoreconfHook intltool pkgconfig file
-    python2 python2Packages.Mako
+  mesonFlags = [
+    "--sysconfdir=/etc"
+
+    # Don't build in debug mode
+    # https://gitlab.freedesktop.org/mesa/mesa/blob/master/docs/meson.html#L327
+    "-Db_ndebug=true"
+
+    "-Ddisk-cache-key=${placeholder "drivers"}"
+    "-Ddri-search-path=${libglvnd.driverLink}/lib/dri"
+
+    "-Dplatforms=${concatStringsSep "," eglPlatforms}"
+    "-Ddri-drivers=${concatStringsSep "," driDrivers}"
+    "-Dgallium-drivers=${concatStringsSep "," galliumDrivers}"
+    "-Dvulkan-drivers=${concatStringsSep "," vulkanDrivers}"
+
+    "-Ddri-drivers-path=${placeholder "drivers"}/lib/dri"
+    "-Dvdpau-libs-path=${placeholder "drivers"}/lib/vdpau"
+    "-Dxvmc-libs-path=${placeholder "drivers"}/lib"
+    "-Domx-libs-path=${placeholder "drivers"}/lib/bellagio"
+    "-Dva-libs-path=${placeholder "drivers"}/lib/dri"
+    "-Dd3d-drivers-path=${placeholder "drivers"}/lib/d3d"
+  ] ++ optionals stdenv.isLinux [
+    "-Dglvnd=true"
+    "-Dosmesa=gallium" # used by wine
+    "-Dgallium-nine=true" # Direct3D in Wine
   ];
 
-  propagatedBuildInputs = with xorg; [
-    libXdamage libXxf86vm
-  ] ++ optional stdenv.isLinux libdrm
-    ++ optionals stdenv.isDarwin [ OpenGL Xplugin ];
-
   buildInputs = with xorg; [
     expat llvmPackages.llvm libglvnd xorgproto
     libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr
@@ -150,50 +112,38 @@ let self = stdenv.mkDerivation {
     ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ]
     ++ lib.optional withValgrind valgrind-light;
 
+  nativeBuildInputs = [
+    pkgconfig meson ninja
+    intltool bison flex file
+    python3Packages.python python3Packages.Mako
+  ];
+
+  propagatedBuildInputs = with xorg; [
+    libXdamage libXxf86vm
+  ] ++ optional stdenv.isLinux libdrm
+    ++ optionals stdenv.isDarwin [ OpenGL Xplugin ];
+
   enableParallelBuilding = true;
   doCheck = false;
 
-  installFlags = [
-    "sysconfdir=\${drivers}/etc"
-    "localstatedir=\${TMPDIR}"
-    "vendorjsondir=\${out}/share/glvnd/egl_vendor.d"
-  ];
-
-  # TODO: probably not all .la files are completely fixed, but it shouldn't matter;
   postInstall = ''
     # Some installs don't have any drivers so this directory is never created.
-    mkdir -p $drivers
-  '' + optionalString (galliumDrivers != []) ''
+    mkdir -p $drivers $osmesa
+  '' + optionalString stdenv.isLinux ''
+    mkdir -p $drivers/lib
+
     # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM
-    mv -t "$drivers/lib/"    \
-      $out/lib/libXvMC*      \
-      $out/lib/d3d           \
-      $out/lib/vdpau         \
-      $out/lib/bellagio      \
+    mv -t $drivers/lib       \
       $out/lib/libxatracker* \
       $out/lib/libvulkan_*
 
     # Move other drivers to a separate output
-    mv $out/lib/dri/* $drivers/lib/dri # */
-    rmdir "$out/lib/dri"
     mv $out/lib/lib*_mesa* $drivers/lib
 
     # move libOSMesa to $osmesa, as it's relatively big
-    mkdir -p {$osmesa,$drivers}/lib/
+    mkdir -p $osmesa/lib
     mv -t $osmesa/lib/ $out/lib/libOSMesa*
 
-    # now fix references in .la files
-    sed "/^libdir=/s,$out,$osmesa," -i $osmesa/lib/libOSMesa*.la
-
-    # set the default search path for DRI drivers; used e.g. by X server
-    substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${libglvnd.driverLink}"
-
-    # remove GLES libraries; they are provided by libglvnd
-    rm $out/lib/lib{GLESv1_CM,GLESv2}.*
-
-    # remove pkgconfig files for GL/GLES/EGL; they are provided by libGL.
-    rm $dev/lib/pkgconfig/{gl,egl,glesv1_cm,glesv2}.pc
-
     # move vendor files
     mv $out/share/ $drivers/
 
@@ -202,11 +152,6 @@ let self = stdenv.mkDerivation {
       substituteInPlace "$js" --replace '"libEGL_' '"'"$drivers/lib/libEGL_"
     done
 
-    # Update search path used by pkg-config
-    for pc in $dev/lib/pkgconfig/{d3d,dri,xatracker}.pc; do
-      substituteInPlace "$pc" --replace $out $drivers
-    done
-  '' + optionalString (vulkanDrivers != []) ''
     # Update search path used by Vulkan (it's pointing to $out but
     # drivers are in $drivers)
     for js in $drivers/share/vulkan/icd.d/*.json; do
@@ -217,7 +162,18 @@ let self = stdenv.mkDerivation {
   # TODO:
   #  check $out doesn't depend on llvm: builder failures are ignored
   #  for some reason grep -qv '${llvmPackages.llvm}' -R "$out";
-  postFixup = optionalString (galliumDrivers != []) ''
+  postFixup = optionalString stdenv.isLinux ''
+    # set the default search path for DRI drivers; used e.g. by X server
+    substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace "$drivers" "${libglvnd.driverLink}"
+
+    # remove pkgconfig files for GL/EGL; they are provided by libGL.
+    rm $dev/lib/pkgconfig/{gl,egl}.pc
+
+    # Update search path used by pkg-config
+    for pc in $dev/lib/pkgconfig/{d3d,dri,xatracker}.pc; do
+      substituteInPlace "$pc" --replace $out $drivers
+    done
+
     # add RPATH so the drivers can find the moved libgallium and libdricore9
     # moved here to avoid problems with stripping patchelfed files
     for lib in $drivers/lib/*.so* $drivers/lib/*/*.so*; do
@@ -227,81 +183,11 @@ let self = stdenv.mkDerivation {
     done
   '';
 
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-fno-common";
+
   passthru = {
-    inherit libdrm version;
+    inherit libdrm;
     inherit (libglvnd) driverLink;
-
-    # Use stub libraries from libglvnd and headers from Mesa.
-    stubs = stdenv.mkDerivation {
-      name = "libGL-${libglvnd.version}";
-      outputs = [ "out" "dev" ];
-
-      # On macOS, libglvnd is not supported, so we just use what mesa
-      # build. We need to also include OpenGL.framework, and some
-      # extra tricks to go along with. We add mesa’s libGLX to support
-      # the X extensions to OpenGL.
-      buildCommand = if stdenv.hostPlatform.isDarwin then ''
-        mkdir -p $out/nix-support $dev
-        echo ${OpenGL} >> $out/nix-support/propagated-build-inputs
-        ln -s ${self.out}/lib $out/lib
-
-        mkdir -p $dev/lib/pkgconfig $dev/nix-support
-        echo "$out" > $dev/nix-support/propagated-build-inputs
-        ln -s ${self.dev}/include $dev/include
-
-        cat <<EOF >$dev/lib/pkgconfig/gl.pc
-      Name: gl
-      Description: gl library
-      Version: ${self.version}
-      Libs: -L${self.out}/lib -lGL
-      Cflags: -I${self.dev}/include
-      EOF
-
-        cat <<EOF >$dev/lib/pkgconfig/glesv1_cm.pc
-      Name: glesv1_cm
-      Description: glesv1_cm library
-      Version: ${self.version}
-      Libs: -L${self.out}/lib -lGLESv1_CM
-      Cflags: -I${self.dev}/include
-      EOF
-
-        cat <<EOF >$dev/lib/pkgconfig/glesv2.pc
-      Name: glesv2
-      Description: glesv2 library
-      Version: ${self.version}
-      Libs: -L${self.out}/lib -lGLESv2
-      Cflags: -I${self.dev}/include
-      EOF
-      ''
-
-      # Otherwise, setup gl stubs to use libglvnd.
-      else ''
-        mkdir -p $out/nix-support
-        ln -s ${libglvnd.out}/lib $out/lib
-
-        mkdir -p $dev/{,lib/pkgconfig,nix-support}
-        echo "$out" > $dev/nix-support/propagated-build-inputs
-        ln -s ${self.dev}/include $dev/include
-
-        genPkgConfig() {
-          local name="$1"
-          local lib="$2"
-
-          cat <<EOF >$dev/lib/pkgconfig/$name.pc
-        Name: $name
-        Description: $lib library
-        Version: ${self.version}
-        Libs: -L${libglvnd.out}/lib -l$lib
-        Cflags: -I${self.dev}/include
-        EOF
-        }
-
-        genPkgConfig gl GL
-        genPkgConfig egl EGL
-        genPkgConfig glesv1_cm GLESv1_CM
-        genPkgConfig glesv2 GLESv2
-      '';
-    };
   };
 
   meta = with stdenv.lib; {
@@ -311,5 +197,4 @@ let self = stdenv.mkDerivation {
     platforms = platforms.mesaPlatforms;
     maintainers = with maintainers; [ vcunat ];
   };
-};
-in self
+}
diff --git a/nixpkgs/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch b/nixpkgs/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch
index 37813db89347..1e280b64ee5f 100644
--- a/nixpkgs/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch
+++ b/nixpkgs/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch
@@ -6,29 +6,30 @@ Subject: [PATCH] disk_cache: include dri driver path in cache key
 This fixes invalid cache hits on NixOS where all shared library
 timestamps in /nix/store are zero.
 ---
- src/util/Makefile.am  | 3 +++
+ meson_options.txt     | 6 ++++++
  src/util/disk_cache.c | 3 +++
- 2 files changed, 6 insertions(+)
+ src/util/meson.build  | 7 ++++++-
+ 3 files changed, 15 insertions(+), 1 deletion(-)
 
-diff --git a/src/util/Makefile.am b/src/util/Makefile.am
-index bafb57439a..a22e2e41eb 100644
---- a/src/util/Makefile.am
-+++ b/src/util/Makefile.am
-@@ -35,6 +35,9 @@ noinst_LTLIBRARIES = \
- 	libmesautil.la \
- 	libxmlconfig.la
- 
-+AM_CFLAGS = \
-+	-DDISK_CACHE_KEY=\"$(drivers)\"
-+
- AM_CPPFLAGS = \
- 	$(PTHREAD_CFLAGS) \
- 	-I$(top_srcdir)/include
+diff --git a/meson_options.txt b/meson_options.txt
+index a723b5406cf..65a8954291f 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -330,3 +330,9 @@ option(
+   value : true,
+   description : 'Enable direct rendering in GLX and EGL for DRI',
+ )
++option(
++  'disk-cache-key',
++  type : 'string',
++  value : '',
++  description : 'Mesa cache key.'
++)
 diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c
-index 368ec41792..071220b2ba 100644
+index 0aa2646a9bb..bd784d38e21 100644
 --- a/src/util/disk_cache.c
 +++ b/src/util/disk_cache.c
-@@ -388,8 +388,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id,
+@@ -389,8 +389,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id,
  
     /* Create driver id keys */
     size_t id_size = strlen(driver_id) + 1;
@@ -39,7 +40,7 @@ index 368ec41792..071220b2ba 100644
     cache->driver_keys_blob_size += gpu_name_size;
  
     /* We sometimes store entire structs that contains a pointers in the cache,
-@@ -410,6 +412,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id,
+@@ -411,6 +413,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id,
     uint8_t *drv_key_blob = cache->driver_keys_blob;
     DRV_KEY_CPY(drv_key_blob, &cache_version, cv_size)
     DRV_KEY_CPY(drv_key_blob, driver_id, id_size)
@@ -47,6 +48,24 @@ index 368ec41792..071220b2ba 100644
     DRV_KEY_CPY(drv_key_blob, gpu_name, gpu_name_size)
     DRV_KEY_CPY(drv_key_blob, &ptr_size, ptr_size_size)
     DRV_KEY_CPY(drv_key_blob, &driver_flags, driver_flags_size)
+diff --git a/src/util/meson.build b/src/util/meson.build
+index 397c2228129..77013563e5d 100644
+--- a/src/util/meson.build
++++ b/src/util/meson.build
+@@ -120,7 +120,12 @@ libmesa_util = static_library(
+   [files_mesa_util, format_srgb],
+   include_directories : inc_common,
+   dependencies : [dep_zlib, dep_clock, dep_thread, dep_atomic, dep_m],
+-  c_args : [c_msvc_compat_args, c_vis_args],
++  c_args : [
++    c_msvc_compat_args, c_vis_args,
++    '-DDISK_CACHE_KEY="@0@"'.format(
++      get_option('disk-cache-key')
++    ),
++  ],
+   build_by_default : false
+ )
+ 
 -- 
-2.19.1
+2.19.2
 
diff --git a/nixpkgs/pkgs/development/libraries/mesa/opencl-install-dir.patch b/nixpkgs/pkgs/development/libraries/mesa/opencl-install-dir.patch
new file mode 100644
index 000000000000..fe85d2c90bb2
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/mesa/opencl-install-dir.patch
@@ -0,0 +1,12 @@
+diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build
+index 317ad8dab4a..5567308caf0 100644
+--- a/src/gallium/targets/opencl/meson.build
++++ b/src/gallium/targets/opencl/meson.build
+@@ -68,6 +68,6 @@ if with_opencl_icd
+     input : 'mesa.icd.in',
+     output : 'mesa.icd',
+     install : true,
+-    install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'),
++    install_dir : join_paths(get_option('prefix'), 'etc', 'OpenCL', 'vendors'),
+   )
+ endif
diff --git a/nixpkgs/pkgs/development/libraries/mesa/stubs.nix b/nixpkgs/pkgs/development/libraries/mesa/stubs.nix
new file mode 100644
index 000000000000..5cb6ac3d4d13
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/mesa/stubs.nix
@@ -0,0 +1,75 @@
+{ stdenv
+, libglvnd, mesa
+, OpenGL }:
+
+stdenv.mkDerivation {
+  inherit (libglvnd) version;
+  pname = "libGL";
+  outputs = [ "out" "dev" ];
+
+  # On macOS, libglvnd is not supported, so we just use what mesa
+  # build. We need to also include OpenGL.framework, and some
+  # extra tricks to go along with. We add mesa’s libGLX to support
+  # the X extensions to OpenGL.
+  buildCommand = if stdenv.hostPlatform.isDarwin then ''
+    mkdir -p $out/nix-support $dev
+    echo ${OpenGL} >> $out/nix-support/propagated-build-inputs
+    ln -s ${mesa.out}/lib $out/lib
+
+    mkdir -p $dev/lib/pkgconfig $dev/nix-support
+    echo "$out" > $dev/nix-support/propagated-build-inputs
+    ln -s ${mesa.dev}/include $dev/include
+
+    cat <<EOF >$dev/lib/pkgconfig/gl.pc
+  Name: gl
+  Description: gl library
+  Version: ${mesa.version}
+  Libs: -L${mesa.out}/lib -lGL
+  Cflags: -I${mesa.dev}/include
+  EOF
+
+    cat <<EOF >$dev/lib/pkgconfig/glesv1_cm.pc
+  Name: glesv1_cm
+  Description: glesv1_cm library
+  Version: ${mesa.version}
+  Libs: -L${mesa.out}/lib -lGLESv1_CM
+  Cflags: -I${mesa.dev}/include
+  EOF
+
+    cat <<EOF >$dev/lib/pkgconfig/glesv2.pc
+  Name: glesv2
+  Description: glesv2 library
+  Version: ${mesa.version}
+  Libs: -L${mesa.out}/lib -lGLESv2
+  Cflags: -I${mesa.dev}/include
+  EOF
+  ''
+
+  # Otherwise, setup gl stubs to use libglvnd.
+  else ''
+    mkdir -p $out/nix-support
+    ln -s ${libglvnd.out}/lib $out/lib
+
+    mkdir -p $dev/{,lib/pkgconfig,nix-support}
+    echo "$out" > $dev/nix-support/propagated-build-inputs
+    ln -s ${mesa.dev}/include $dev/include
+
+    genPkgConfig() {
+      local name="$1"
+      local lib="$2"
+
+      cat <<EOF >$dev/lib/pkgconfig/$name.pc
+    Name: $name
+    Description: $lib library
+    Version: ${mesa.version}
+    Libs: -L${libglvnd.out}/lib -l$lib
+    Cflags: -I${mesa.dev}/include
+    EOF
+    }
+
+    genPkgConfig gl GL
+    genPkgConfig egl EGL
+    genPkgConfig glesv1_cm GLESv1_CM
+    genPkgConfig glesv2 GLESv2
+  '';
+}
diff --git a/nixpkgs/pkgs/development/libraries/mesa/symlink-drivers.patch b/nixpkgs/pkgs/development/libraries/mesa/symlink-drivers.patch
deleted file mode 100644
index af2ec9fdb096..000000000000
--- a/nixpkgs/pkgs/development/libraries/mesa/symlink-drivers.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/dri/Makefile.am mesa-12.0.3/src/gallium/targets/dri/Makefile.am
---- mesa-12.0.3-orig/src/gallium/targets/dri/Makefile.am	2016-09-08 18:57:48.000000000 +0200
-+++ mesa-12.0.3/src/gallium/targets/dri/Makefile.am	2016-09-22 14:42:19.173575498 +0200
-@@ -134,14 +134,13 @@
- 	done;
- endif
- 
--# hardlink each megadriver instance, but don't actually have
--# gallium_dri.so in the set of final installed files.
-+# symlink each megadriver instance.
- install-data-hook:
- 	for i in $(TARGET_DRIVERS); do                                  \
--		ln -f $(DESTDIR)$(dridir)/gallium_dri.so                \
-+		ln -srf $(DESTDIR)$(dridir)/gallium_dri.so              \
- 		      $(DESTDIR)$(dridir)/$${i}_dri.so;                 \
- 	done;                                                           \
--	$(RM) $(DESTDIR)$(dridir)/gallium_dri.*;                        \
-+	$(RM) $(DESTDIR)$(dridir)/gallium_dri.la                        \
- 	$(RM) -d $(DESTDIR)$(dridir) &>/dev/null || true
- 
- uninstall-hook:
- 	for i in $(TARGET_DRIVERS); do                                  \
-diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/va/Makefile.am mesa-12.0.3/src/gallium/targets/va/Makefile.am
---- mesa-12.0.3-orig/src/gallium/targets/va/Makefile.am	2016-09-08 18:57:48.000000000 +0200
-+++ mesa-12.0.3/src/gallium/targets/va/Makefile.am	2016-09-22 14:45:39.635963339 +0200
-@@ -71,10 +71,10 @@
- # gallium_drv_video.so in the set of final installed files.
- install-data-hook:
- 	for i in $(TARGET_DRIVERS); do                                  \
--		ln -f $(DESTDIR)$(vadir)/gallium_drv_video.so                \
-+		ln -srf $(DESTDIR)$(vadir)/gallium_drv_video.so                \
- 		      $(DESTDIR)$(vadir)/$${i}_drv_video.so;                 \
- 	done;                                                           \
--	$(RM) $(DESTDIR)$(vadir)/gallium_drv_video.*
-+	$(RM) $(DESTDIR)$(vadir)/gallium_drv_video.la
- 
- uninstall-hook:
- 	for i in $(TARGET_DRIVERS); do                                  \
-diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/vdpau/Makefile.am mesa-12.0.3/src/gallium/targets/vdpau/Makefile.am
---- mesa-12.0.3-orig/src/gallium/targets/vdpau/Makefile.am	2016-05-24 21:19:37.000000000 +0200
-+++ mesa-12.0.3/src/gallium/targets/vdpau/Makefile.am	2016-09-22 14:42:19.173575498 +0200
-@@ -103,15 +103,14 @@
- 	done;
- endif
- 
--# hardlink each megadriver instance, but don't actually have
--# libvdpau_gallium.so in the set of final installed files.
-+# symlink each megadriver instance.
- install-data-hook:
- 	$(AM_V_GEN)dest_dir=$(DESTDIR)/$(vdpaudir);			\
- 	for i in $(TARGET_DRIVERS); do					\
- 		j=libvdpau_gallium.$(LIB_EXT);				\
- 		k=libvdpau_$${i}.$(LIB_EXT);				\
- 		l=$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0;		\
--		ln -f $${dest_dir}/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \
-+		ln -srf $${dest_dir}/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \
- 		      $${dest_dir}/$${l};				\
- 		ln -sf $${l}						\
- 		       $${dest_dir}/$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR); \
-@@ -120,7 +119,7 @@
- 		ln -sf $${l}						\
- 		       $${dest_dir}/$${k};				\
- 	done;								\
--	$(RM) $${dest_dir}/libvdpau_gallium.*;				\
-+	$(RM) $${dest_dir}/libvdpau_gallium.la				\
- 	$(RM) -d $${dest_dir} &>/dev/null || true
- 
- uninstall-hook:
- 	for i in $(TARGET_DRIVERS); do					\
-diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/xvmc/Makefile.am mesa-12.0.3/src/gallium/targets/xvmc/Makefile.am
---- mesa-12.0.3-orig/src/gallium/targets/xvmc/Makefile.am	2016-05-24 21:19:37.000000000 +0200
-+++ mesa-12.0.3/src/gallium/targets/xvmc/Makefile.am	2016-09-22 14:54:22.291014543 +0200
-@@ -73,7 +73,7 @@
- 		j=libXvMCgallium.$(LIB_EXT);				\
- 		k=libXvMC$${i}.$(LIB_EXT);				\
- 		l=$${k}.$(XVMC_MAJOR).$(XVMC_MINOR).0;			\
--		ln -f $${dest_dir}/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0	\
-+		ln -srf $${dest_dir}/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0 \
- 		      $${dest_dir}/$${l};				\
- 		ln -sf $${l}						\
- 		       $${dest_dir}/$${k}.$(XVMC_MAJOR).$(XVMC_MINOR);	\
-@@ -82,7 +82,7 @@
- 		ln -sf $${l}						\
- 		       $${dest_dir}/$${k};				\
- 	done;								\
--	$(RM) $${dest_dir}/libXvMCgallium.*;				\
-+	$(RM) $${dest_dir}/libXvMCgallium.la				\
- 	$(RM) -d $${dest_dir} &>/dev/null || true
- 
- uninstall-hook:
- 	for i in $(TARGET_DRIVERS); do					\
-diff -ru -x '*~' mesa-12.0.3-orig/src/mesa/drivers/dri/Makefile.am mesa-12.0.3/src/mesa/drivers/dri/Makefile.am
---- mesa-12.0.3-orig/src/mesa/drivers/dri/Makefile.am	2016-09-08 18:57:48.000000000 +0200
-+++ mesa-12.0.3/src/mesa/drivers/dri/Makefile.am	2016-09-22 14:42:19.173575498 +0200
-@@ -94,14 +94,13 @@
- 	done;
- endif
- 
--# hardlink each megadriver instance, but don't actually have
--# mesa_dri_drivers.so in the set of final installed files.
-+# symink each megadriver instance.
- install-data-hook:
- 	for i in $(MEGADRIVERS); do \
--		ln -f $(DESTDIR)$(dridir)/mesa_dri_drivers.so \
-+		ln -srf $(DESTDIR)$(dridir)/mesa_dri_drivers.so \
- 		      $(DESTDIR)$(dridir)/$$i; \
- 	done;
--	$(RM) $(DESTDIR)$(dridir)/mesa_dri_drivers.*
-+	$(RM) $(DESTDIR)$(dridir)/mesa_dri_drivers.la
- 
- uninstall-hook:
- 	for i in $(MEGADRIVERS); do \
diff --git a/nixpkgs/pkgs/development/libraries/openexr/default.nix b/nixpkgs/pkgs/development/libraries/openexr/default.nix
index 54b617fdc014..072848d7bbca 100644
--- a/nixpkgs/pkgs/development/libraries/openexr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openexr/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
   doCheck = false; # fails 1 of 1 tests
 
   meta = with stdenv.lib; {
-    homepage = http://www.openexr.com/;
+    homepage = https://www.openexr.com/;
     license = licenses.bsd3;
     platforms = platforms.all;
   };
diff --git a/nixpkgs/pkgs/development/libraries/openmpi/default.nix b/nixpkgs/pkgs/development/libraries/openmpi/default.nix
index e597a26dad9f..17ad9e53005b 100644
--- a/nixpkgs/pkgs/development/libraries/openmpi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openmpi/default.nix
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
   name = "openmpi-${version}";
 
   src = with stdenv.lib.versions; fetchurl {
-    url = "http://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${name}.tar.bz2";
+    url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${name}.tar.bz2";
     sha256 = "02cpzcp113gj5hb0j2xc0cqma2fn04i2i0bzf80r71120p9bdryc";
   };
 
@@ -52,7 +52,7 @@ in stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = with stdenv.lib; {
-    homepage = http://www.open-mpi.org/;
+    homepage = https://www.open-mpi.org/;
     description = "Open source MPI-3 implementation";
     longDescription = "The Open MPI Project is an open source MPI-3 implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.";
     maintainers = with maintainers; [ markuskowa ];
diff --git a/nixpkgs/pkgs/development/libraries/packr/default.nix b/nixpkgs/pkgs/development/libraries/packr/default.nix
index c44695cb70a3..bc8133aaf822 100644
--- a/nixpkgs/pkgs/development/libraries/packr/default.nix
+++ b/nixpkgs/pkgs/development/libraries/packr/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "packr";
-  version = "2.5.1";
+  version = "2.5.2";
 
   src = fetchFromGitHub {
     owner = "gobuffalo";
     repo = pname;
     rev = "v${version}";
-    sha256 = "070hpnsr5w1r1cg9wl80cafmhkx4z3s29wq04fa7rk49hmwml4jy";
+    sha256 = "1ciffa5xbd93fylwz93wr4m4fj83dcla55dmdshaqz28rbsapnc1";
   };
 
-  modSha256 = "0xvpk9jjcqac44s4fp0jwpljxvs0ypjwc5qfg0w90s2r7jn50fxn";
+  modSha256 = "086gydrl3i35hawb5m7rsb4a0llcpdpgid1xfw2z9n6jkwkclw4n";
 
   meta = with lib; {
     description = "The simple and easy way to embed static files into Go binaries";
diff --git a/nixpkgs/pkgs/development/libraries/protobuf/3.4.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.4.nix
deleted file mode 100644
index 5a9034a56a80..000000000000
--- a/nixpkgs/pkgs/development/libraries/protobuf/3.4.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ callPackage, lib, ... }:
-
-lib.overrideDerivation (callPackage ./generic-v3.nix {
-  version = "3.4.1";
-  sha256 = "1lzxmbqlnmi34kymnf399azv86gmdbrf71xiad6wc24bzpkzqybb";
-}) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; })
diff --git a/nixpkgs/pkgs/development/libraries/protobuf/3.5.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.5.nix
deleted file mode 100644
index db9cb6f0371b..000000000000
--- a/nixpkgs/pkgs/development/libraries/protobuf/3.5.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ callPackage, lib, ... }:
-
-lib.overrideDerivation (callPackage ./generic-v3.nix {
-  version = "3.5.1.1";
-  sha256 = "1h4xydr5j2zg1888ncn8a1jvqq8fgpgckrmjg6lqzy9jpkvqvfdk";
-}) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; })
diff --git a/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix b/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix
index 610efcfef298..a98521a2d1ee 100644
--- a/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix
+++ b/nixpkgs/pkgs/development/libraries/protobuf/generic-v3.nix
@@ -40,10 +40,6 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec {
 
   dontDisableStatic = true;
 
-  NIX_CFLAGS_COMPILE = with stdenv.lib;
-    # gcc before 6 doesn't know this option
-    optionalString (hasPrefix "gcc-6" stdenv.cc.cc.name) "-Wno-error=misleading-indentation";
-
   meta = {
     description = "Google's data interchange format";
     longDescription =
diff --git a/nixpkgs/pkgs/development/libraries/science/math/fenics/default.nix b/nixpkgs/pkgs/development/libraries/science/math/fenics/default.nix
index 8134cc63eb02..4ae5ea522555 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/fenics/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/fenics/default.nix
@@ -83,7 +83,7 @@ let
     '';
     meta = {
       description = "A domain-specific language for finite element variational forms";
-      homepage = http://fenicsproject.org/;
+      homepage = https://fenicsproject.org/;
       platforms = stdenv.lib.platforms.all;
       license = stdenv.lib.licenses.lgpl3;
     };
@@ -102,7 +102,7 @@ let
     '';
     meta = {
       description = "A compiler for finite element variational forms";
-      homepage = http://fenicsproject.org/;
+      homepage = https://fenicsproject.org/;
       platforms = stdenv.lib.platforms.all;
       license = stdenv.lib.licenses.lgpl3;
     };
@@ -117,7 +117,7 @@ let
     buildInputs = [ numpy six ];
     meta = {
       description = "Instant inlining of C and C++ code in Python";
-      homepage = http://fenicsproject.org/;
+      homepage = https://fenicsproject.org/;
       platforms = stdenv.lib.platforms.all;
       license = stdenv.lib.licenses.lgpl3;
     };
@@ -162,7 +162,7 @@ stdenv.mkDerivation {
   postInstall = "source $out/share/dolfin/dolfin.conf";
   meta = {
     description = "The FEniCS Problem Solving Environment in Python and C++";
-    homepage = http://fenicsproject.org/;
+    homepage = https://fenicsproject.org/;
     platforms = stdenv.lib.platforms.darwin;
     license = stdenv.lib.licenses.lgpl3;
   };
diff --git a/nixpkgs/pkgs/development/libraries/speexdsp/default.nix b/nixpkgs/pkgs/development/libraries/speexdsp/default.nix
index 16be9fa1e3b1..4d74c7e05598 100644
--- a/nixpkgs/pkgs/development/libraries/speexdsp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/speexdsp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, fftw }:
 
 stdenv.mkDerivation rec {
-  name = "speexdsp-1.2rc3";
+  name = "speexdsp-1.2.0";
 
   src = fetchurl {
     url = "http://downloads.us.xiph.org/releases/speex/${name}.tar.gz";
-    sha256 = "1wcjyrnwlkayb20zdhp48y260rfyzg925qpjpljd5x9r01h8irja";
+    sha256 = "0wa7sqpk3x61zz99m7lwkgr6yv62ml6lfgs5xja65vlvdzy44838";
   };
 
   patches = [ ./build-fix.patch ];
diff --git a/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix b/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix
index d597fd16ad07..079d61ca3d58 100644
--- a/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix
@@ -109,7 +109,6 @@ stdenv.mkDerivation rec {
   PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions";
 
   mesonFlags = [
-    "-Dauto_features=enabled"
     "-Dcelt051=disabled"
     "-Dpulse=disabled" # is deprecated upstream
   ];
diff --git a/nixpkgs/pkgs/development/libraries/spice/default.nix b/nixpkgs/pkgs/development/libraries/spice/default.nix
index 9e50a3b86b94..d2c4ddb8631e 100644
--- a/nixpkgs/pkgs/development/libraries/spice/default.nix
+++ b/nixpkgs/pkgs/development/libraries/spice/default.nix
@@ -77,7 +77,6 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-fno-stack-protector";
 
   mesonFlags = [
-    "-Dauto_features=enabled"
     "-Dgstreamer=1.0"
     "-Dcelt051=disabled"
   ];
diff --git a/nixpkgs/pkgs/development/libraries/zlib/default.nix b/nixpkgs/pkgs/development/libraries/zlib/default.nix
index 3a5638b22814..7fb5be1c3434 100644
--- a/nixpkgs/pkgs/development/libraries/zlib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/zlib/default.nix
@@ -86,5 +86,5 @@ stdenv.mkDerivation (rec {
     export CHOST=${stdenv.hostPlatform.config}
   '';
 } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.libc == "msvcrt") {
-  configurePhase = ":";
+  dontConfigure = true;
 })
diff --git a/nixpkgs/pkgs/development/lua-modules/generated-packages.nix b/nixpkgs/pkgs/development/lua-modules/generated-packages.nix
index 835045bd7257..03651222a045 100644
--- a/nixpkgs/pkgs/development/lua-modules/generated-packages.nix
+++ b/nixpkgs/pkgs/development/lua-modules/generated-packages.nix
@@ -150,7 +150,7 @@ cjson = buildLuarocksPackage {
   propagatedBuildInputs = [ lua ];
 
   meta = with stdenv.lib; {
-    homepage = "http://www.kyne.com.au/~mark/software/lua-cjson.php";
+    homepage = "https://www.kyne.com.au/~mark/software/lua-cjson.php";
     description = "A fast JSON encoding/parsing module";
     license = {
       fullName = "MIT";
@@ -236,7 +236,7 @@ cyrussasl = buildLuarocksPackage {
   propagatedBuildInputs = [ lua ];
 
   meta = with stdenv.lib; {
-    homepage = "http://github.com/JorjBauer/lua-cyrussasl";
+    homepage = "https://github.com/JorjBauer/lua-cyrussasl";
     description = "Cyrus SASL library for Lua 5.1+";
     maintainers = with maintainers; [ vcunat ];
     license = {
@@ -385,7 +385,7 @@ lgi = buildLuarocksPackage {
   propagatedBuildInputs = [ lua ];
 
   meta = with stdenv.lib; {
-    homepage = "http://github.com/pavouk/lgi";
+    homepage = "https://github.com/pavouk/lgi";
     description = "Lua bindings to GObject libraries";
     license = {
       fullName = "MIT/X11";
@@ -480,7 +480,7 @@ lrexlib-gnu = buildLuarocksPackage {
   propagatedBuildInputs = [ lua ];
 
   meta = with stdenv.lib; {
-    homepage = "http://github.com/rrthomas/lrexlib";
+    homepage = "https://github.com/rrthomas/lrexlib";
     description = "Regular expression library binding (GNU flavour).";
     license = {
       fullName = "MIT/X11";
@@ -499,7 +499,7 @@ lrexlib-pcre = buildLuarocksPackage {
   propagatedBuildInputs = [ lua ];
 
   meta = with stdenv.lib; {
-    homepage = "http://github.com/rrthomas/lrexlib";
+    homepage = "https://github.com/rrthomas/lrexlib";
     description = "Regular expression library binding (PCRE flavour).";
     maintainers = with maintainers; [ vyp ];
     license = {
@@ -519,7 +519,7 @@ lrexlib-posix = buildLuarocksPackage {
   propagatedBuildInputs = [ lua ];
 
   meta = with stdenv.lib; {
-    homepage = "http://github.com/rrthomas/lrexlib";
+    homepage = "https://github.com/rrthomas/lrexlib";
     description = "Regular expression library binding (POSIX flavour).";
     license = {
       fullName = "MIT/X11";
@@ -567,7 +567,7 @@ lua-cmsgpack = buildLuarocksPackage {
   propagatedBuildInputs = [ lua ];
 
   meta = with stdenv.lib; {
-    homepage = "http://github.com/antirez/lua-cmsgpack";
+    homepage = "https://github.com/antirez/lua-cmsgpack";
     description = "MessagePack C implementation and bindings for Lua 5.1/5.2/5.3";
     license = {
       fullName = "Two-clause BSD";
@@ -955,7 +955,7 @@ luaposix = buildLuarocksPackage {
   propagatedBuildInputs = [ bit32 lua std_normalize ];
 
   meta = with stdenv.lib; {
-    homepage = "http://github.com/luaposix/luaposix/";
+    homepage = "https://github.com/luaposix/luaposix/";
     description = "Lua bindings for POSIX";
     maintainers = with maintainers; [ vyp lblasc ];
     license = {
diff --git a/nixpkgs/pkgs/development/misc/amdadl-sdk/default.nix b/nixpkgs/pkgs/development/misc/amdadl-sdk/default.nix
index c177d8fe03fd..5ef83ed77b3b 100644
--- a/nixpkgs/pkgs/development/misc/amdadl-sdk/default.nix
+++ b/nixpkgs/pkgs/development/misc/amdadl-sdk/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "API to access display driver functionality for ATI graphics cards";
-    homepage = http://developer.amd.com/tools/graphics-development/display-library-adl-sdk/;
+    homepage = https://developer.amd.com/tools/graphics-development/display-library-adl-sdk/;
     license = licenses.unfree;
     maintainers = [ maintainers.offline ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock
index 4783f9a8748b..2c881a5c45a7 100644
--- a/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock
+++ b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock
@@ -9,10 +9,10 @@ GEM
       tzinfo (~> 1.1)
     atomos (0.1.3)
     claide (1.0.2)
-    cocoapods (1.7.3)
+    cocoapods (1.7.4)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.7.3)
+      cocoapods-core (= 1.7.4)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -28,7 +28,7 @@ GEM
       nap (~> 1.0)
       ruby-macho (~> 1.4)
       xcodeproj (>= 1.10.0, < 2.0)
-    cocoapods-core (1.7.3)
+    cocoapods-core (1.7.4)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
@@ -59,7 +59,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    xcodeproj (1.10.0)
+    xcodeproj (1.11.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
diff --git a/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock
index 1ca395b5d925..758383455e0c 100644
--- a/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock
+++ b/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock
@@ -9,10 +9,10 @@ GEM
       tzinfo (~> 1.1)
     atomos (0.1.3)
     claide (1.0.2)
-    cocoapods (1.7.3)
+    cocoapods (1.7.4)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.7.3)
+      cocoapods-core (= 1.7.4)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -28,7 +28,7 @@ GEM
       nap (~> 1.0)
       ruby-macho (~> 1.4)
       xcodeproj (>= 1.10.0, < 2.0)
-    cocoapods-core (1.7.3)
+    cocoapods-core (1.7.4)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
@@ -59,7 +59,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    xcodeproj (1.10.0)
+    xcodeproj (1.11.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
diff --git a/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix b/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix
index 142f30615f6c..bd89b448eac2 100644
--- a/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix
+++ b/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix
@@ -46,10 +46,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0c0xh7wh8l34wqiiwwhdakm6zin8xd5svgh63c6pb2pd1d4phhyv";
+      sha256 = "1h0cnrxh5k61yfh3f3kdx67gwfkvnvaqgsmwbmqpl7ffbpsg5gsc";
       type = "gem";
     };
-    version = "1.7.3";
+    version = "1.7.4";
   };
   cocoapods-core = {
     dependencies = ["activesupport" "fuzzy_match" "nap"];
@@ -57,10 +57,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0p76z708fbb61x0m585iaf912f0s3qw0a1mryhpqa2wyrjrlmg31";
+      sha256 = "0xbpaisml77q9k5bk5f7hfkzmnjymzczinvhgim34nvwd00rd30c";
       type = "gem";
     };
-    version = "1.7.3";
+    version = "1.7.4";
   };
   cocoapods-deintegrate = {
     groups = ["default"];
@@ -292,9 +292,9 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1x2ypkxyfsr6k8qy75iy64p6af6b024fqnlmw8qvzzzixmwrr8q7";
+      sha256 = "1h73ilwyjwyyhj761an3pmicllw50514gxb6b1r4z4klc9rzxw4j";
       type = "gem";
     };
-    version = "1.10.0";
+    version = "1.11.0";
   };
 }
\ No newline at end of file
diff --git a/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix b/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix
index e3e2b13b259d..bb4ea396c09c 100644
--- a/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix
+++ b/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix
@@ -40,10 +40,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0c0xh7wh8l34wqiiwwhdakm6zin8xd5svgh63c6pb2pd1d4phhyv";
+      sha256 = "1h0cnrxh5k61yfh3f3kdx67gwfkvnvaqgsmwbmqpl7ffbpsg5gsc";
       type = "gem";
     };
-    version = "1.7.3";
+    version = "1.7.4";
   };
   cocoapods-core = {
     dependencies = ["activesupport" "fuzzy_match" "nap"];
@@ -51,10 +51,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0p76z708fbb61x0m585iaf912f0s3qw0a1mryhpqa2wyrjrlmg31";
+      sha256 = "0xbpaisml77q9k5bk5f7hfkzmnjymzczinvhgim34nvwd00rd30c";
       type = "gem";
     };
-    version = "1.7.3";
+    version = "1.7.4";
   };
   cocoapods-deintegrate = {
     groups = ["default"];
@@ -254,9 +254,9 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1x2ypkxyfsr6k8qy75iy64p6af6b024fqnlmw8qvzzzixmwrr8q7";
+      sha256 = "1h73ilwyjwyyhj761an3pmicllw50514gxb6b1r4z4klc9rzxw4j";
       type = "gem";
     };
-    version = "1.10.0";
+    version = "1.11.0";
   };
 }
\ No newline at end of file
diff --git a/nixpkgs/pkgs/development/ocaml-modules/cryptgps/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cryptgps/default.nix
index f8eb80837a3e..7720650ddfc9 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/cryptgps/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cryptgps/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ocaml findlib];
 
-  configurePhase = "true";	# Skip configure phase
+  dontConfigure = true;	# Skip configure phase
 
   createFindlibDestdir = true;
 
diff --git a/nixpkgs/pkgs/development/ocaml-modules/expat/0.9.nix b/nixpkgs/pkgs/development/ocaml-modules/expat/0.9.nix
index 5fcc317d9408..98ab04beb57c 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/expat/0.9.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/expat/0.9.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
       --replace "gcc" "\$(CC)"
   '';
 
-  configurePhase = "true";  	# Skip configure
+  dontConfigure = true;  	# Skip configure
 
   buildPhase = ''
     make all allopt
diff --git a/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix
index dba3e2569574..df0bd9133d3c 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   createFindlibDestdir = true;
 
-  configurePhase = "true";      # Skip configure
+  dontConfigure = true;      # Skip configure
   # De facto, option minimal=1 seems to be the default.  See the README.
   buildPhase     = "make ${if minimal then "minimal=1" else ""} build";
   installPhase   = "make ${if minimal then "minimal=1" else ""} install";
diff --git a/nixpkgs/pkgs/development/ocaml-modules/http/default.nix b/nixpkgs/pkgs/development/ocaml-modules/http/default.nix
index b9b530ac599e..4a8b39063361 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/http/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/http/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
     substituteInPlace Makefile --replace "SHELL=/bin/bash" "SHELL=$BASH"
   '';
 
-  configurePhase = "true";	# Skip configure phase
+  dontConfigure = true;	# Skip configure phase
 
   buildPhase = ''
     make all opt
diff --git a/nixpkgs/pkgs/development/ocaml-modules/pcre/default.nix b/nixpkgs/pkgs/development/ocaml-modules/pcre/default.nix
index fb3b67b03b78..6428670ebb2f 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/pcre/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/pcre/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   createFindlibDestdir = true;
 
-  configurePhase = "true";	# Skip configure phase
+  dontConfigure = true;	# Skip configure phase
 
   meta = with stdenv.lib; {
     homepage = https://bitbucket.org/mmottl/pcre-ocaml;
diff --git a/nixpkgs/pkgs/development/perl-modules/BerkeleyDB/default.nix b/nixpkgs/pkgs/development/perl-modules/BerkeleyDB/default.nix
index db94a3b07fe2..b23db8e1edfe 100644
--- a/nixpkgs/pkgs/development/perl-modules/BerkeleyDB/default.nix
+++ b/nixpkgs/pkgs/development/perl-modules/BerkeleyDB/default.nix
@@ -1,10 +1,11 @@
 {buildPerlPackage, fetchurl, db}:
 
-buildPerlPackage rec {
-  name = "BerkeleyDB-0.61";
+buildPerlPackage {
+  pname = "BerkeleyDB";
+  version = "0.61";
 
   src = fetchurl {
-    url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
+    url = "mirror://cpan/authors/id/P/PM/PMQS/BerkeleyDB-0.61.tar.gz";
     sha256 = "0l65v301cz6a9dxcw6a4ps2mnr5zq358yn81favap6i092krggiz";
   };
 
diff --git a/nixpkgs/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/nixpkgs/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
index 7c733742d2b0..1163b6cb15b3 100644
--- a/nixpkgs/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
+++ b/nixpkgs/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, buildPerlPackage, zlib, stdenv }:
 
-buildPerlPackage rec {
-  name = "Compress-Raw-Zlib-2.086";
+buildPerlPackage {
+  pname = "Compress-Raw-Zlib";
+  version = "2.086";
 
   src = fetchurl {
-    url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
+    url = mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Zlib-2.086.tar.gz;
     sha256 = "0va93wc968p4l2ql0k349bz189l2vbs09bpn865cvc36amqxwv9z";
   };
 
diff --git a/nixpkgs/pkgs/development/perl-modules/DBD-Oracle/default.nix b/nixpkgs/pkgs/development/perl-modules/DBD-Oracle/default.nix
index 9db926bf94da..a7ec1e2d1826 100644
--- a/nixpkgs/pkgs/development/perl-modules/DBD-Oracle/default.nix
+++ b/nixpkgs/pkgs/development/perl-modules/DBD-Oracle/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, buildPerlPackage, DBI, TestNoWarnings, oracle-instantclient }:
 
-buildPerlPackage rec {
-  name = "DBD-Oracle-1.76";
+buildPerlPackage {
+  pname = "DBD-Oracle";
+  version = "1.76";
 
   src = fetchurl {
-    url = "mirror://cpan/authors/id/Z/ZA/ZARQUON/${name}.tar.gz";
+    url = mirror://cpan/authors/id/Z/ZA/ZARQUON/DBD-Oracle-1.76.tar.gz;
     sha256 = "b6db7f43c6252179274cfe99c1950b93e248f8f0fe35b07e50388c85d814d5f3";
   };
 
diff --git a/nixpkgs/pkgs/development/perl-modules/DBD-Pg/default.nix b/nixpkgs/pkgs/development/perl-modules/DBD-Pg/default.nix
index f6b31aafaf65..339791215385 100644
--- a/nixpkgs/pkgs/development/perl-modules/DBD-Pg/default.nix
+++ b/nixpkgs/pkgs/development/perl-modules/DBD-Pg/default.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl, buildPerlPackage, DBI, postgresql }:
 
-buildPerlPackage rec {
-  name = "DBD-Pg-3.7.4";
+buildPerlPackage {
+  pname = "DBD-Pg";
+  version = "3.7.4";
 
   src = fetchurl {
-    url = "mirror://cpan/authors/id/T/TU/TURNSTEP/${name}.tar.gz";
+    url = "mirror://cpan/authors/id/T/TU/TURNSTEP/DBD-Pg-3.7.4.tar.gz";
     sha256 = "0gkqlvbmzbdm0g4k328nlkjdg3wrjm5i2n9jxj1i8sqxkm79rylz";
   };
 
diff --git a/nixpkgs/pkgs/development/perl-modules/DBD-SQLite/default.nix b/nixpkgs/pkgs/development/perl-modules/DBD-SQLite/default.nix
index ff84de40b30e..5a24687c2b01 100644
--- a/nixpkgs/pkgs/development/perl-modules/DBD-SQLite/default.nix
+++ b/nixpkgs/pkgs/development/perl-modules/DBD-SQLite/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, buildPerlPackage, perl, DBI, sqlite }:
 
-buildPerlPackage rec {
-  name = "DBD-SQLite-1.62";
+buildPerlPackage {
+  pname = "DBD-SQLite";
+  version = "1.62";
 
   src = fetchurl {
     url = mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.62.tar.gz;
diff --git a/nixpkgs/pkgs/development/perl-modules/DBD-mysql/default.nix b/nixpkgs/pkgs/development/perl-modules/DBD-mysql/default.nix
index 5365e0c6b95b..54df32f3eb20 100644
--- a/nixpkgs/pkgs/development/perl-modules/DBD-mysql/default.nix
+++ b/nixpkgs/pkgs/development/perl-modules/DBD-mysql/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, buildPerlPackage, DBI, DevelChecklib, mysql }:
 
 buildPerlPackage rec {
-  name = "DBD-mysql-4.050";
+  pname = "DBD-mysql";
+  version = "4.050";
 
   src = fetchurl {
-    url = "mirror://cpan/authors/id/D/DV/DVEEDEN/${name}.tar.gz";
+    url = mirror://cpan/authors/id/D/DV/DVEEDEN/DBD-mysql-4.050.tar.gz;
     sha256 = "0y4djb048i09dk19av7mzfb3khr72vw11p3ayw2p82jsy4gm8j2g";
   };
 
diff --git a/nixpkgs/pkgs/development/perl-modules/DBD-sybase/default.nix b/nixpkgs/pkgs/development/perl-modules/DBD-sybase/default.nix
index ced458396da5..e863663fc947 100644
--- a/nixpkgs/pkgs/development/perl-modules/DBD-sybase/default.nix
+++ b/nixpkgs/pkgs/development/perl-modules/DBD-sybase/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, buildPerlPackage, DBI, freetds }:
 
-buildPerlPackage rec {
-  name = "DBD-Sybase-1.16";
+buildPerlPackage {
+  pname = "DBD-Sybase";
+  version = "1.16";
 
   src = fetchurl {
-    url = "mirror://cpan/authors/id/M/ME/MEWP/${name}.tar.gz";
+    url = mirror://cpan/authors/id/M/ME/MEWP/DBD-Sybase-1.16.tar.gz;
     sha256 = "1k6n261nrrcll9wxn5xwi4ibpavqv1il96687k62mbpznzl2gx37";
   };
 
diff --git a/nixpkgs/pkgs/development/perl-modules/DB_File/default.nix b/nixpkgs/pkgs/development/perl-modules/DB_File/default.nix
index d37fb1f12daf..d63e3a487276 100644
--- a/nixpkgs/pkgs/development/perl-modules/DB_File/default.nix
+++ b/nixpkgs/pkgs/development/perl-modules/DB_File/default.nix
@@ -1,10 +1,11 @@
 {fetchurl, buildPerlPackage, db}:
 
-buildPerlPackage rec {
-  name = "DB_File-1.851";
+buildPerlPackage {
+  pname = "DB_File";
+  version = "1.851";
 
   src = fetchurl {
-    url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
+    url = "mirror://cpan/authors/id/P/PM/PMQS/DB_File-1.851.tar.gz";
     sha256 = "1j276mng1nwxxdxnb3my427s5lb6zlnssizcnxricnvaa170kdv8";
   };
 
diff --git a/nixpkgs/pkgs/development/perl-modules/MNI/default.nix b/nixpkgs/pkgs/development/perl-modules/MNI/default.nix
index dbb167e27b32..def32abf881c 100644
--- a/nixpkgs/pkgs/development/perl-modules/MNI/default.nix
+++ b/nixpkgs/pkgs/development/perl-modules/MNI/default.nix
@@ -1,7 +1,8 @@
 { fetchFromGitHub, buildPerlPackage, stdenv }:
 
-buildPerlPackage rec {
-  name = "MNI-Perllib-2012-04-13";
+buildPerlPackage {
+  pname = "MNI-Perllib";
+  version = "2012-04-13";
 
   src = fetchFromGitHub {
     owner  = "BIC-MNI";
diff --git a/nixpkgs/pkgs/development/perl-modules/generic/builder.sh b/nixpkgs/pkgs/development/perl-modules/generic/builder.sh
index e05cd07708d7..253e7e0bdc74 100644
--- a/nixpkgs/pkgs/development/perl-modules/generic/builder.sh
+++ b/nixpkgs/pkgs/development/perl-modules/generic/builder.sh
@@ -17,7 +17,7 @@ preConfigure() {
             first=$(dd if="$fn" count=2 bs=1 2> /dev/null)
             if test "$first" = "#!"; then
                 echo "patching $fn..."
-                sed -i "$fn" -e "s|^#\!\(.*[ /]perl.*\)$|#\!\1$perlFlags|"
+                sed -i "$fn" -e "s|^#\!\(.*\bperl\b.*\)$|#\!\1$perlFlags|"
             fi
         fi
     done
diff --git a/nixpkgs/pkgs/development/perl-modules/generic/default.nix b/nixpkgs/pkgs/development/perl-modules/generic/default.nix
index 3a28c50be39a..073b0f1c5ad3 100644
--- a/nixpkgs/pkgs/development/perl-modules/generic/default.nix
+++ b/nixpkgs/pkgs/development/perl-modules/generic/default.nix
@@ -1,7 +1,14 @@
 { lib, stdenv, perl, buildPerl, toPerlModule }:
 
-{ buildInputs ? [], nativeBuildInputs ? [], name, ... } @ attrs:
+{ buildInputs ? [], nativeBuildInputs ? [], ... } @ attrs:
 
+assert attrs?pname -> attrs?version;
+assert attrs?pname -> !(attrs?name);
+
+(if attrs ? name then
+  lib.trivial.warn "builtPerlPackage: `name' (\"${attrs.name}\") is deprecated, use `pname' and `version' instead"
+ else
+  (x: x))
 toPerlModule(stdenv.mkDerivation (
   (
   lib.recursiveUpdate
@@ -27,14 +34,15 @@ toPerlModule(stdenv.mkDerivation (
     # https://metacpan.org/pod/release/XSAWYERX/perl-5.26.0/pod/perldelta.pod#Removal-of-the-current-directory-%28%22.%22%29-from-@INC
     PERL_USE_UNSAFE_INC = "1";
 
-    meta.homepage = "https://metacpan.org/release/${(builtins.parseDrvName name).name}";
+    meta.homepage = "https://metacpan.org/release/${attrs.pname or (builtins.parseDrvName attrs.name).name}"; # TODO: phase-out `attrs.name`
     meta.platforms = perl.meta.platforms;
   }
   attrs
   )
   //
   {
-    name = "perl${perl.version}-${name}";
+    pname = "perl${perl.version}-${attrs.pname or (builtins.parseDrvName attrs.name).name}"; # TODO: phase-out `attrs.name`
+    version = attrs.version or (builtins.parseDrvName attrs.name).version;                   # TODO: phase-out `attrs.name`
     builder = ./builder.sh;
     buildInputs = buildInputs ++ [ perl ];
     nativeBuildInputs = nativeBuildInputs ++ [ (perl.dev or perl) ];
diff --git a/nixpkgs/pkgs/development/perl-modules/maatkit/default.nix b/nixpkgs/pkgs/development/perl-modules/maatkit/default.nix
index fabb3824129c..b23b7afa7a30 100644
--- a/nixpkgs/pkgs/development/perl-modules/maatkit/default.nix
+++ b/nixpkgs/pkgs/development/perl-modules/maatkit/default.nix
@@ -1,10 +1,11 @@
 {buildPerlPackage, stdenv, fetchurl, DBDmysql}:
 
-buildPerlPackage rec {
-  name = "maatkit-7540";
+buildPerlPackage {
+  pname = "maatkit";
+  version = "7540";
 
   src = fetchurl {
-    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/maatkit/${name}.tar.gz";
+    url = https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/maatkit/maatkit-7540.tar.gz;
     sha256 = "1a7rxrddkrsfxb2wj01ha91ld0vapfkqcy8j9p08l76zz2l8p2v1";
   };
 
diff --git a/nixpkgs/pkgs/development/pharo/vm/share.nix b/nixpkgs/pkgs/development/pharo/vm/share.nix
index 75ce2ff771c9..3bd72434eb3c 100644
--- a/nixpkgs/pkgs/development/pharo/vm/share.nix
+++ b/nixpkgs/pkgs/development/pharo/vm/share.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   version = "1.0";
   name = "pharo-share-${version}";
 
-  unpackPhase = "true";
+  dontUnpack = true;
 
   sources10Zip = fetchurl {
     url = http://files.pharo.org/sources/PharoV10.sources.zip;
diff --git a/nixpkgs/pkgs/development/python-modules/aiorpcx/default.nix b/nixpkgs/pkgs/development/python-modules/aiorpcx/default.nix
index a5f54d8e96cf..6350e3f0441a 100644
--- a/nixpkgs/pkgs/development/python-modules/aiorpcx/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/aiorpcx/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "aiorpcx";
-  version = "0.17.0";
+  version = "0.18.3";
 
   src = fetchPypi {
     inherit version;
     pname = "aiorpcX";
-    sha256 = "14np5r75rs0v45vsv20vbzmnv3qisvm9mdllj1j9s1633cvcik0k";
+    sha256 = "0k545hc7wl6sh1svydzbv6x7sx5pig2pqkl3yxs9riwmvzawx9xp";
   };
 
   propagatedBuildInputs = [ attrs ];
diff --git a/nixpkgs/pkgs/development/python-modules/altair/default.nix b/nixpkgs/pkgs/development/python-modules/altair/default.nix
index 9e3a97c1312e..4d78ad80cc32 100644
--- a/nixpkgs/pkgs/development/python-modules/altair/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/altair/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "altair";
-  version = "3.0.1";
+  version = "3.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "63934563a7a7b7186335858206a0b9be6043163b8b54a26cd3b3299a9e5e391f";
+    sha256 = "1zdznkybw3g8fd280h5j5cnnwcv30610gp8fl8vwqda1w2p6pgvp";
   };
 
   postPatch = ''
diff --git a/nixpkgs/pkgs/development/python-modules/anonip/default.nix b/nixpkgs/pkgs/development/python-modules/anonip/default.nix
new file mode 100644
index 000000000000..de9048bde343
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/anonip/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, lib, buildPythonPackage, fetchFromGitHub, ipaddress, isPy27 }:
+
+buildPythonPackage rec {
+  pname = "anonip";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "DigitaleGesellschaft";
+    repo = "Anonip";
+    rev = "v${version}";
+    sha256 = "0y5xqivcinp6pwx4whc8ca1n2wxrvff7a2lpbz2dhivilfanmljs";
+  };
+
+  propagatedBuildInputs = lib.optionals isPy27 [ ipaddress ];
+
+  checkPhase = "python tests.py";
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/DigitaleGesellschaft/Anonip";
+    description = "A tool to anonymize IP-addresses in log-files";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.mmahut ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/distributed/default.nix b/nixpkgs/pkgs/development/python-modules/distributed/default.nix
index 2fd6829bc464..da082643e0fd 100644
--- a/nixpkgs/pkgs/development/python-modules/distributed/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/distributed/default.nix
@@ -54,7 +54,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Distributed computation in Python.";
-    homepage = http://distributed.readthedocs.io/en/latest/;
+    homepage = https://distributed.readthedocs.io/en/latest/;
     license = lib.licenses.bsd3;
     platforms = lib.platforms.x86; # fails on aarch64
     maintainers = with lib.maintainers; [ teh costrouc ];
diff --git a/nixpkgs/pkgs/development/python-modules/distutils-cfg/default.nix b/nixpkgs/pkgs/development/python-modules/distutils-cfg/default.nix
index 204f4de5456a..cbf12c17582a 100644
--- a/nixpkgs/pkgs/development/python-modules/distutils-cfg/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/distutils-cfg/default.nix
@@ -21,7 +21,7 @@ in stdenv.mkDerivation {
 
   buildInputs = [ python ];
 
-  unpackPhase = "true";
+  dontUnpack = true;
 
   installPhase = ''
     dest="$out/lib/${python.libPrefix}/site-packages/distutils"
diff --git a/nixpkgs/pkgs/development/python-modules/faulthandler/default.nix b/nixpkgs/pkgs/development/python-modules/faulthandler/default.nix
index c4d600ec994e..d69c320ccaac 100644
--- a/nixpkgs/pkgs/development/python-modules/faulthandler/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/faulthandler/default.nix
@@ -13,6 +13,6 @@ buildPythonPackage rec {
     description = "Dump the Python traceback";
     license = stdenv.lib.licenses.bsd2;
     maintainers = with stdenv.lib.maintainers; [ sauyon ];
-    homepage = http://faulthandler.readthedocs.io/;
+    homepage = https://faulthandler.readthedocs.io/;
   };
 }
diff --git a/nixpkgs/pkgs/development/python-modules/fido2/default.nix b/nixpkgs/pkgs/development/python-modules/fido2/default.nix
index 96ba82f6d980..8922d6e05195 100644
--- a/nixpkgs/pkgs/development/python-modules/fido2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/fido2/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "fido2";
-  version = "0.5.0";
+  version = "0.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1pl8d2pr6jzqj4y9qiaddhjgnl92kikjxy0bgzm2jshkzzic8mp3";
+    sha256 = "11wdcjymw8y6wxgp29gbhdxff3lpc5yp5fcqnr5vnj88g192ic27";
   };
 
   propagatedBuildInputs = [ six cryptography ];
diff --git a/nixpkgs/pkgs/development/python-modules/flask-restful/default.nix b/nixpkgs/pkgs/development/python-modules/flask-restful/default.nix
index 41735c4d1c6e..89cc47cbcfbc 100644
--- a/nixpkgs/pkgs/development/python-modules/flask-restful/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/flask-restful/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ flask six pytz aniso8601 pycrypto ];
 
   meta = with lib; {
-    homepage = "http://flask-restful.readthedocs.io/";
+    homepage = "https://flask-restful.readthedocs.io/";
     description = "REST API building blocks for Flask";
     license = licenses.bsd3;
   };
diff --git a/nixpkgs/pkgs/development/python-modules/gentools/default.nix b/nixpkgs/pkgs/development/python-modules/gentools/default.nix
index b9d272ba0e50..57105f87a7c0 100644
--- a/nixpkgs/pkgs/development/python-modules/gentools/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/gentools/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Tools for generators, generator functions, and generator-based coroutines";
     license = licenses.mit;
-    homepage = http://gentools.readthedocs.io/;
+    homepage = https://gentools.readthedocs.io/;
     maintainers = with maintainers; [ mredaelli ];
   };
 
diff --git a/nixpkgs/pkgs/development/python-modules/habanero/default.nix b/nixpkgs/pkgs/development/python-modules/habanero/default.nix
index 09d82d74f2b1..b58d4a300201 100644
--- a/nixpkgs/pkgs/development/python-modules/habanero/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/habanero/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Python interface to Library Genesis";
-    homepage = http://habanero.readthedocs.io/en/latest/;
+    homepage = https://habanero.readthedocs.io/en/latest/;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.nico202 ];
   };
diff --git a/nixpkgs/pkgs/development/python-modules/hiro/default.nix b/nixpkgs/pkgs/development/python-modules/hiro/default.nix
index b2633e6c9d24..4d9ebdb0129e 100644
--- a/nixpkgs/pkgs/development/python-modules/hiro/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/hiro/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Time manipulation utilities for Python";
-    homepage = http://hiro.readthedocs.io/en/latest/;
+    homepage = https://hiro.readthedocs.io/en/latest/;
     license = licenses.mit;
     maintainers = with maintainers; [ nyarly ];
   };
diff --git a/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
index 01f80473feef..22f9b445d24f 100644
--- a/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
@@ -4,7 +4,7 @@
 
 buildPythonPackage rec {
   pname = "marshmallow-sqlalchemy";
-  version = "0.16.3";
+  version = "0.17.0";
 
   meta = {
     homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0qzpl53r58fk328cn41365c6jkliwmj41v16zkyjxb9d4s2mvn14";
+    sha256 = "17pnbv28n9vy3q66ckxfdbb9k1riy6s8lg63zfm5jsx00f0zqqnn";
   };
 
   propagatedBuildInputs = [ marshmallow sqlalchemy ];
diff --git a/nixpkgs/pkgs/development/python-modules/mautrix-appservice/default.nix b/nixpkgs/pkgs/development/python-modules/mautrix-appservice/default.nix
index 8f59d7ce7b5e..ba96e7d734be 100644
--- a/nixpkgs/pkgs/development/python-modules/mautrix-appservice/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/mautrix-appservice/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "mautrix-appservice";
-  version = "0.3.10.dev1";
+  version = "0.3.11";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ed827ff2a50b43f8125268145991d51b4a32ea4fbdd95b589ea15019b72a0bc3";
+    sha256 = "60192920cff75afdd096eea3a43276e33ec15f4f00bd04d2d1dda616c84f22a5";
   };
 
   propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/msrest/default.nix b/nixpkgs/pkgs/development/python-modules/msrest/default.nix
index 77a3e22f75c3..ba3dd00bfe49 100644
--- a/nixpkgs/pkgs/development/python-modules/msrest/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/msrest/default.nix
@@ -18,12 +18,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.6.7";
+  version = "0.6.8";
   pname = "msrest";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "07136g3j7zgcvkxki4v6q1p2dm1nzzc28181s8dwic0y4ml8qlq5";
+    sha256 = "0yd43fnmfxkvk3idkyn67ziwjgkwkn261kicr3szjibpqjqcpsf9";
   };
 
   propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix b/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix
index 7ceffb7a8dd2..f21624acf143 100644
--- a/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix
@@ -1,19 +1,18 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytest, setuptools, structlog, pytest-asyncio, pytest_xdist, flaky, tornado, pycurl }:
+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytest, setuptools, structlog, pytest-asyncio, flaky, tornado, pycurl }:
 
 buildPythonPackage rec {
   pname = "nvchecker";
-  version = "1.4.3";
+  version = "1.4.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0v340wkq4sn9pvcpjh076l8mcqkn3nrn7if8p6iysk02bjxvknbv";
+    sha256 = "6276ed2a897a30ccd71bfd7cf9e6b7842f37f3d5a86d7a70fe46f437c62b1875";
   };
 
   propagatedBuildInputs = [ setuptools structlog tornado pycurl ];
-  checkInputs = [ pytest pytest-asyncio pytest_xdist flaky ];
+  checkInputs = [ pytest pytest-asyncio flaky ];
 
-  # Disable tests for now, because our version of pytest seems to be too new
-  # https://github.com/lilydjwg/nvchecker/commit/42a02efec84824a073601e1c2de30339d251e4c7
+  # requires network access
   doCheck = false;
 
   checkPhase = ''
diff --git a/nixpkgs/pkgs/development/python-modules/papis/default.nix b/nixpkgs/pkgs/development/python-modules/papis/default.nix
index a1fdeec28f83..b2ae7cf73ed9 100644
--- a/nixpkgs/pkgs/development/python-modules/papis/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/papis/default.nix
@@ -47,7 +47,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Powerful command-line document and bibliography manager";
-    homepage = http://papis.readthedocs.io/en/latest/;
+    homepage = https://papis.readthedocs.io/en/latest/;
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ nico202 teto ];
   };
diff --git a/nixpkgs/pkgs/development/python-modules/pysmf/default.nix b/nixpkgs/pkgs/development/python-modules/pysmf/default.nix
new file mode 100644
index 000000000000..ef5e560b08c7
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/pysmf/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi, pkg-config, libsmf, glib, pytest }:
+
+buildPythonPackage rec {
+  pname = "pysmf";
+  version = "0.1.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "10i7vvvdx6c3gl4afsgnpdanwgzzag087zs0fxvfipnqknazj806";
+  };
+
+  nativeBuildInputs = [ pkg-config pytest ];
+  buildInputs = [ libsmf glib ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://das.nasophon.de/pysmf/";
+    description = "Python extension module for reading and writing Standard MIDI Files, based on libsmf.";
+    license = licenses.bsd2;
+    maintainers = [ maintainers.gnidorah ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix
index 027054920954..29c6950070a5 100644
--- a/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonPackage rec {
   pname = "python-jsonrpc-server";
-  version = "0.1.2";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "palantir";
     repo = "python-jsonrpc-server";
     rev = version;
-    sha256 = "0k55rpywghapk5db8dgp2jj5v5654q6m571s1gcz1mpn2qxkz69l";
+    sha256 = "054b0xm5z3f82jwp7zj21pkh7gwj9jd933jhymdx49n1n1iynfn0";
   };
 
   postPatch = ''
diff --git a/nixpkgs/pkgs/development/python-modules/recursive-pth-loader/default.nix b/nixpkgs/pkgs/development/python-modules/recursive-pth-loader/default.nix
index 359b482a1682..aaa095c53980 100644
--- a/nixpkgs/pkgs/development/python-modules/recursive-pth-loader/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/recursive-pth-loader/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.0";
   name = pname + "-" + version;
 
-  unpackPhase = "true";
+  dontUnpack = true;
 
   buildInputs = [ python ];
 
diff --git a/nixpkgs/pkgs/development/python-modules/scikitlearn/default.nix b/nixpkgs/pkgs/development/python-modules/scikitlearn/default.nix
index fc3cdadc7f9f..7eb020bbe609 100644
--- a/nixpkgs/pkgs/development/python-modules/scikitlearn/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/scikitlearn/default.nix
@@ -7,14 +7,13 @@
 , cython
 , joblib
 , llvmPackages
-, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "scikit-learn";
   version = "0.21.2";
   # UnboundLocalError: local variable 'message' referenced before assignment
-  disabled = stdenv.isi686 || (pythonOlder "3.5");  # https://github.com/scikit-learn/scikit-learn/issues/5534
+  disabled = stdenv.isi686;  # https://github.com/scikit-learn/scikit-learn/issues/5534
 
   src = fetchPypi {
     inherit pname version;
diff --git a/nixpkgs/pkgs/development/python-modules/spacy/default.nix b/nixpkgs/pkgs/development/python-modules/spacy/default.nix
index 80524154f671..178be8bd86ac 100644
--- a/nixpkgs/pkgs/development/python-modules/spacy/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/spacy/default.nix
@@ -34,7 +34,9 @@ buildPythonPackage rec {
 
   prePatch = ''
     substituteInPlace setup.py \
-      --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6"
+      --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6" \
+      --replace "regex==" "regex>=" \
+      --replace "wheel>=0.32.0,<0.33.0" "wheel>=0.32.0"
   '';
 
   propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/swagger-spec-validator/default.nix b/nixpkgs/pkgs/development/python-modules/swagger-spec-validator/default.nix
new file mode 100644
index 000000000000..dc4b99c40a7a
--- /dev/null
+++ b/nixpkgs/pkgs/development/python-modules/swagger-spec-validator/default.nix
@@ -0,0 +1,37 @@
+{ lib, buildPythonPackage, fetchFromGitHub, pyyaml, jsonschema, six, pytest, mock }:
+
+buildPythonPackage rec {
+  pname = "swagger-spec-validator";
+  version = "2.4.3";
+
+  src = fetchFromGitHub {
+    owner = "Yelp";
+    repo = "swagger_spec_validator";
+    rev = "v" + version;
+    sha256 = "02f8amc6iq2clxxmrz8hirbb57sizaxijp0higqy16shk63ibalw";
+  };
+
+  checkInputs = [
+    pytest
+    mock
+  ];
+
+  checkPhase = ''
+    pytest tests
+  '';
+
+  propagatedBuildInputs = [
+    pyyaml
+    jsonschema
+    six
+  ];
+
+  meta = with lib; {
+    homepage = "https://github.com/Yelp/swagger_spec_validator";
+    license = licenses.asl20;
+    description = "Validation of Swagger specifications";
+    maintainers = with maintainers; [ vanschelven ];
+  };
+}
+
+
diff --git a/nixpkgs/pkgs/development/python-modules/telethon/default.nix b/nixpkgs/pkgs/development/python-modules/telethon/default.nix
index 09d944c80883..334163114a18 100644
--- a/nixpkgs/pkgs/development/python-modules/telethon/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/telethon/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "telethon";
-  version = "1.6.2";
+  version = "1.9.0";
 
   src = fetchPypi {
     inherit version;
     pname = "Telethon";
-    sha256 = "074h5gj0c330rb1nxzpqm31fp1vw7calh1cdkapbjx90j769iz18";
+    sha256 = "a8797ad5bfee2b350cfc9b73cbb30fc19c8f73c0db42471e0df1371b1a269edc";
   };
 
   propagatedBuildInputs = [
diff --git a/nixpkgs/pkgs/development/python-modules/thinc/default.nix b/nixpkgs/pkgs/development/python-modules/thinc/default.nix
index 9cb25af7a92e..ebca1346dfb3 100644
--- a/nixpkgs/pkgs/development/python-modules/thinc/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/thinc/default.nix
@@ -28,11 +28,11 @@
 
 buildPythonPackage rec {
   pname = "thinc";
-  version = "7.0.4";
+  version = "7.0.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "14v8ygjrkj63dwd4pi490ld6i2d8n8wzcf15hnacjjfwij93pa1q";
+    sha256 = "12d0766z7ksqpqrvldi46mx0z4zsbgncda4fpvxra1d6vbchf8ba";
   };
 
   buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
@@ -81,6 +81,6 @@ buildPythonPackage rec {
     description = "Practical Machine Learning for NLP in Python";
     homepage = https://github.com/explosion/thinc;
     license = licenses.mit;
-    maintainers = with maintainers; [ aborsu sdll ];
+    maintainers = with maintainers; [ aborsu danieldk sdll ];
     };
 }
diff --git a/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix b/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix
index 78033633b963..a1dfd91c29fe 100644
--- a/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ jre ];
 
-  unpackPhase = ":";
+  dontUnpack = true;
 
   installPhase = ''
     runHook preInstall
diff --git a/nixpkgs/pkgs/development/tools/analysis/egypt/default.nix b/nixpkgs/pkgs/development/tools/analysis/egypt/default.nix
index 7db46005f453..6259756794df 100644
--- a/nixpkgs/pkgs/development/tools/analysis/egypt/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/egypt/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perlPackages }:
 
 perlPackages.buildPerlPackage rec {
-  name = "egypt-${version}";
+  pname = "egypt";
   version = "1.10";
 
   src = fetchurl {
     sha256 = "0r0wj6v8z9fzlh9pb5617kyjdf92ppmlbzajaarrq729bbb6ln5m";
-    url = "https://www.gson.org/egypt/download/${name}.tar.gz";
+    url = "https://www.gson.org/egypt/download/${pname}-${version}.tar.gz";
   };
 
   outputs = [ "out" ];
diff --git a/nixpkgs/pkgs/development/tools/build-managers/cmake/application-services.patch b/nixpkgs/pkgs/development/tools/build-managers/cmake/application-services.patch
index 2107dcdfbc66..0373ca2d67cd 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/cmake/application-services.patch
+++ b/nixpkgs/pkgs/development/tools/build-managers/cmake/application-services.patch
@@ -47,3 +47,14 @@ index d7af6e2..d4808fc 100644
  add_subdirectory(libarchive)
  
  install(FILES COPYING DESTINATION ${CMAKE_DOC_DIR}/cmlibarchive)
+index e505bdd..f45557d 100644
+--- a/Utilities/cmlibuv/src/unix/darwin-proctitle.c
++++ b/Utilities/cmlibuv/src/unix/darwin-proctitle.c
+@@ -30,7 +30,6 @@
+
+ #if !TARGET_OS_IPHONE
+ # include <CoreFoundation/CoreFoundation.h>
+-# include <ApplicationServices/ApplicationServices.h>
+ #endif
+
+ #define S(s) pCFStringCreateWithCString(NULL, (s), kCFStringEncodingUTF8)
diff --git a/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix
index 290860a0d9c3..4761d8dc5b11 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig
+{ stdenv, lib, fetchurl, pkgconfig
 , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash
 , buildPackages
 # darwin attributes
@@ -13,25 +13,18 @@
 assert withQt5 -> useQt4 == false;
 assert useQt4 -> withQt5 == false;
 
-with stdenv.lib;
-
-let
-  os = stdenv.lib.optionalString;
-  majorVersion = "3.13";
-  minorVersion = "4";
-  # from https://cmake.org/files/v3.13/cmake-3.13.4-SHA-256.txt for cmake-3.13.4.tar.gz
-  sha256 = "fdd928fee35f472920071d1c7f1a6a2b72c9b25e04f7a37b409349aef3f20e9b";
-  version = "${majorVersion}.${minorVersion}";
-in
-
 stdenv.mkDerivation rec {
-  name = "cmake-${os isBootstrap "boot-"}${os useNcurses "cursesUI-"}${os withQt5 "qt5UI-"}${os useQt4 "qt4UI-"}${version}";
-
-  inherit majorVersion;
+  pname = "cmake"
+          + lib.optionalString isBootstrap "-boot"
+          + lib.optionalString useNcurses "-cursesUI"
+          + lib.optionalString withQt5 "-qt5UI"
+          + lib.optionalString useQt4 "-qt4UI";
+  version = "3.14.5";
 
   src = fetchurl {
-    url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    inherit sha256;
+    url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
+    # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt
+    sha256 = "505ae49ebe3c63c595fa5f814975d8b72848447ee13b6613b0f8b96ebda18c06";
   };
 
   patches = [
@@ -43,7 +36,7 @@ stdenv.mkDerivation rec {
 
     # Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d
     ./libuv-application-services.patch
-  ] ++ optional stdenv.isCygwin ./3.2.2-cygwin.patch;
+  ] ++ lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch;
 
   outputs = [ "out" ];
   setOutputFlags = false;
@@ -52,21 +45,21 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ setupHook pkgconfig ]
-    ++ optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ]
-    ++ optional useNcurses ncurses
-    ++ optional useQt4 qt4
-    ++ optional withQt5 qtbase;
+    ++ lib.optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ]
+    ++ lib.optional useNcurses ncurses
+    ++ lib.optional useQt4 qt4
+    ++ lib.optional withQt5 qtbase;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
-  propagatedBuildInputs = optional stdenv.isDarwin ps;
+  propagatedBuildInputs = lib.optional stdenv.isDarwin ps;
 
   preConfigure = ''
     fixCmakeFiles .
     substituteInPlace Modules/Platform/UnixPaths.cmake \
-      --subst-var-by libc_bin ${getBin stdenv.cc.libc} \
-      --subst-var-by libc_dev ${getDev stdenv.cc.libc} \
-      --subst-var-by libc_lib ${getLib stdenv.cc.libc}
+      --subst-var-by libc_bin ${lib.getBin stdenv.cc.libc} \
+      --subst-var-by libc_dev ${lib.getDev stdenv.cc.libc} \
+      --subst-var-by libc_lib ${lib.getLib stdenv.cc.libc}
     substituteInPlace Modules/FindCxxTest.cmake \
       --replace "$""{PYTHON_EXECUTABLE}" ${stdenv.shell}
     # BUILD_CC and BUILD_CXX are used to bootstrap cmake
@@ -74,9 +67,9 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-    "--docdir=share/doc/${name}"
+    "--docdir=share/doc/${pname}${version}"
   ] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup
-    ++ optional (useQt4 || withQt5) "--qt-gui"
+    ++ lib.optional (useQt4 || withQt5) "--qt-gui"
     ++ [
     "--"
     # We should set the proper `CMAKE_SYSTEM_NAME`.
@@ -87,15 +80,15 @@ stdenv.mkDerivation rec {
     # package being built.
     "-DCMAKE_CXX_COMPILER=${stdenv.cc.targetPrefix}c++"
     "-DCMAKE_C_COMPILER=${stdenv.cc.targetPrefix}cc"
-    "-DCMAKE_AR=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar"
-    "-DCMAKE_RANLIB=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib"
-    "-DCMAKE_STRIP=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip"
+    "-DCMAKE_AR=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar"
+    "-DCMAKE_RANLIB=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib"
+    "-DCMAKE_STRIP=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip"
   ]
     # Avoid depending on frameworks.
-    ++ optional (!useNcurses) "-DBUILD_CursesDialog=OFF";
+    ++ lib.optional (!useNcurses) "-DBUILD_CursesDialog=OFF";
 
   # make install attempts to use the just-built cmake
-  preInstall = optional (stdenv.hostPlatform != stdenv.buildPlatform) ''
+  preInstall = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ''
     sed -i 's|bin/cmake|${buildPackages.cmake}/bin/cmake|g' Makefile
   '';
 
@@ -108,7 +101,7 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # fails
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = http://www.cmake.org/;
     description = "Cross-Platform Makefile Generator";
     platforms = if useQt4 then qt4.meta.platforms else platforms.all;
diff --git a/nixpkgs/pkgs/development/tools/build-managers/cmake/libuv-application-services.patch b/nixpkgs/pkgs/development/tools/build-managers/cmake/libuv-application-services.patch
index 08899f5c241f..c5b9cdff1d07 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/cmake/libuv-application-services.patch
+++ b/nixpkgs/pkgs/development/tools/build-managers/cmake/libuv-application-services.patch
@@ -24,36 +24,6 @@ diff -ur cmake-3.12.1/Utilities/cmlibuv/CMakeLists.txt cmake-3.12.1-patched/Util
  endif()
  
  if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-diff -ur cmake-3.12.1/Utilities/cmlibuv/src/unix/darwin-proctitle.c cmake-3.12.1-patched/Utilities/cmlibuv/src/unix/darwin-proctitle.c
---- cmake-3.12.1/Utilities/cmlibuv/src/unix/darwin-proctitle.c	2018-08-09 21:14:08.000000000 +0900
-+++ cmake-3.12.1-patched/Utilities/cmlibuv/src/unix/darwin-proctitle.c	2018-08-13 10:01:29.000000000 +0900
-@@ -26,9 +26,7 @@
- #include <stdlib.h>
- #include <string.h>
- 
--#include <TargetConditionals.h>
--
--#if !TARGET_OS_IPHONE
-+#if HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H
- # include <CoreFoundation/CoreFoundation.h>
- # include <ApplicationServices/ApplicationServices.h>
- #endif
-@@ -58,7 +56,7 @@
- 
- 
- int uv__set_process_title(const char* title) {
--#if TARGET_OS_IPHONE
-+#if !HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H
-   return uv__pthread_setname_np(title);
- #else
-   CFStringRef (*pCFStringCreateWithCString)(CFAllocatorRef,
-@@ -205,5 +203,5 @@
-     dlclose(application_services_handle);
- 
-   return err;
--#endif  /* !TARGET_OS_IPHONE */
-+#endif  /* HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H */
- }
 diff -ur cmake-3.12.1/Utilities/cmlibuv/src/unix/fsevents.c cmake-3.12.1-patched/Utilities/cmlibuv/src/unix/fsevents.c
 --- cmake-3.12.1/Utilities/cmlibuv/src/unix/fsevents.c	2018-08-09 21:14:08.000000000 +0900
 +++ cmake-3.12.1-patched/Utilities/cmlibuv/src/unix/fsevents.c	2018-08-13 10:01:29.000000000 +0900
diff --git a/nixpkgs/pkgs/development/tools/build-managers/cmake/search-path.patch b/nixpkgs/pkgs/development/tools/build-managers/cmake/search-path.patch
index 6213138402b1..2f5e4d62c86d 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/cmake/search-path.patch
+++ b/nixpkgs/pkgs/development/tools/build-managers/cmake/search-path.patch
@@ -38,12 +38,27 @@ diff -ur cmake-3.9.1/Modules/Platform/UnixPaths.cmake cmake-3.9.1-mod/Modules/Pl
 +  @libc_lib@/lib
    )
  
- list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
--  /usr/include
+ if(CMAKE_SYSROOT_COMPILE)
+   set(_cmake_sysroot_compile "${CMAKE_SYSROOT_COMPILE}")
+ else()
+   set(_cmake_sysroot_compile "${CMAKE_SYSROOT}")
+ endif()
+ 
+ # Default per-language values.  These may be later replaced after
+ # parsing the implicit directory information from compiler output.
+ set(_CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES_INIT
+   ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}
+-  "${_cmake_sysroot_compile}/usr/include"
++  @libc_dev@/include
+   )
+ set(_CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES_INIT
+   ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}
+-  "${_cmake_sysroot_compile}/usr/include"
 +  @libc_dev@/include
    )
- list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
--  /usr/include
+ set(_CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES_INIT
+   ${CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES}
+-  "${_cmake_sysroot_compile}/usr/include"
 +  @libc_dev@/include
    )
  
diff --git a/nixpkgs/pkgs/development/tools/build-managers/doit/default.nix b/nixpkgs/pkgs/development/tools/build-managers/doit/default.nix
index e2689f2c2652..6fc03a550940 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/doit/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/doit/default.nix
@@ -25,7 +25,7 @@ in python3Packages.buildPythonApplication {
   checkPhase = "py.test";
 
   meta = with stdenv.lib; {
-    homepage = http://pydoit.org/;
+    homepage = https://pydoit.org/;
     description = "A task management & automation tool";
     license = licenses.mit;
     longDescription = ''
diff --git a/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix b/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix
index 99692d1ef50c..d73683287a1e 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   JARNAME = "${name}-standalone.jar";
 
-  unpackPhase = "true";
+  dontUnpack = true;
 
   buildInputs = [ makeWrapper ];
   propagatedBuildInputs = [ jdk ];
diff --git a/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix b/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix
index 638fd2eaa43f..b5ee5d758170 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix
@@ -11,12 +11,12 @@ let
   };
 in
 python3Packages.buildPythonApplication rec {
-  version = "0.49.2";
   pname = "meson";
+  version = "0.50.1";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "0ckkzq0kbnnk4rwv20lggm9a4fb5054jbv99i9pwjhid23qy7059";
+    sha256 = "05k3wsxjcnnq7a8n5kzxh2cdh5jdkh13xagigz5axs48j36zfai4";
   };
 
   postFixup = ''
diff --git a/nixpkgs/pkgs/development/tools/build-managers/meson/setup-hook.sh b/nixpkgs/pkgs/development/tools/build-managers/meson/setup-hook.sh
index 06375c1528e0..6e8d94523e14 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/meson/setup-hook.sh
+++ b/nixpkgs/pkgs/development/tools/build-managers/meson/setup-hook.sh
@@ -17,10 +17,11 @@ mesonConfigurePhase() {
         --includedir=${!outputInclude}/include \
         --mandir=${!outputMan}/share/man --infodir=${!outputInfo}/share/info \
         --localedir=${!outputLib}/share/locale \
-        -Dauto_features=disabled \
+        -Dauto_features=${mesonAutoFeatures:-enabled} \
+        -Dwrap_mode=${mesonWrapMode:-nodownload} \
         $mesonFlags"
 
-    mesonFlags="${crossMesonFlags+$crossMesonFlags }--buildtype=${mesonBuildType:-release} $mesonFlags"
+    mesonFlags="${crossMesonFlags+$crossMesonFlags }--buildtype=${mesonBuildType:-plain} $mesonFlags"
 
     echo "meson flags: $mesonFlags ${mesonFlagsArray[@]}"
 
diff --git a/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix b/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix
index 7b472c1c4e3a..ff49bea526a1 100644
--- a/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix
+++ b/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ makeWrapper ];
 
-  unpackPhase = "true";
+  dontUnpack = true;
   dontConfigure = true;
   dontBuild = true;
 
diff --git a/nixpkgs/pkgs/development/tools/clang-tools/default.nix b/nixpkgs/pkgs/development/tools/clang-tools/default.nix
index bd8401ac80dd..0fcaee574681 100644
--- a/nixpkgs/pkgs/development/tools/clang-tools/default.nix
+++ b/nixpkgs/pkgs/development/tools/clang-tools/default.nix
@@ -7,7 +7,7 @@ in
 
 stdenv.mkDerivation {
   name = "clang-tools-${version}";
-  unpackPhase = ":";
+  dontUnpack = true;
   installPhase = ''
     mkdir -p $out/bin
     for tool in \
diff --git a/nixpkgs/pkgs/development/tools/database/schemaspy/default.nix b/nixpkgs/pkgs/development/tools/database/schemaspy/default.nix
index ab62fdf3d523..128921a67d7a 100644
--- a/nixpkgs/pkgs/development/tools/database/schemaspy/default.nix
+++ b/nixpkgs/pkgs/development/tools/database/schemaspy/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0ph1l62hy163m2hgybhkccqbcj6brna1vdbr7536zc37lzjxq9rn";
   };
 
-  unpackPhase = "true";
+  dontUnpack = true;
 
   buildInputs = [
     jre
diff --git a/nixpkgs/pkgs/development/tools/gotools/default.nix b/nixpkgs/pkgs/development/tools/gotools/default.nix
index 9bb57bfe5029..d83f0ec40149 100644
--- a/nixpkgs/pkgs/development/tools/gotools/default.nix
+++ b/nixpkgs/pkgs/development/tools/gotools/default.nix
@@ -2,16 +2,26 @@
 
 buildGoModule rec {
   name = "gotools-unstable-${version}";
-  version = "2019-06-03";
-  rev = "8aaa1484dc108aa23dcf2d4a09371c0c9e280f6b";
+  version = "2019-07-06";
+  rev = "72ffa07ba3db8d09f5215feec0f89464f3028f8e";
 
   src = fetchgit {
     inherit rev;
     url = "https://go.googlesource.com/tools";
-    sha256 = "0sa41fi38b6pvz7jjr6vqrd152qjvmbcagm1qdxw41vqcdw3ljx3";
+    sha256 = "0c0s5aiwj807vxfzwrah32spwq8cnxvy0j117i5cbsqw2df80pgv";
   };
 
-  modSha256 = "0cm7fwb1k5hvbhh86kagzsw5vwgkr6dr7glhbjxg5xaahlhx2w5w";
+  # Build of golang.org/x/tools/gopls fails with:
+  #   can't load package: package golang.org/x/tools/gopls: unknown import path "golang.org/x/tools/gopls": cannot find module providing package golang.org/x/tools/gopls
+  # That is most probably caused by golang.org/x/tools/gopls containing a separate Go module.
+  # In order to fix this, we simply remove the module.
+  # Note that build of golang.org/x/tools/cmd/gopls provides identical binary as golang.org/x/tools/gopls.
+  # See https://github.com/NixOS/nixpkgs/pull/64335.
+  postPatch = ''
+    rm -rf gopls
+  '';
+
+  modSha256 = "16nkrpki9fnxsrxxxs9ljz49plcz393z0sqq2knkk30pmncpwd3q";
 
   postConfigure = ''
     # Make the builtin tools available here
diff --git a/nixpkgs/pkgs/development/tools/java/jhiccup/default.nix b/nixpkgs/pkgs/development/tools/java/jhiccup/default.nix
index 6fb34588cd0b..4577de0cde4c 100644
--- a/nixpkgs/pkgs/development/tools/java/jhiccup/default.nix
+++ b/nixpkgs/pkgs/development/tools/java/jhiccup/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1hsvi8wjh615fnjf75h7b5afp04chqcgvini30vfcn3m9a5icbgy";
   };
 
-  configurePhase = ":";
+  dontConfigure = true;
   buildPhase     = ":";
   installPhase = ''
     mkdir -p $out/bin $out/share/java
diff --git a/nixpkgs/pkgs/development/tools/misc/bossa/default.nix b/nixpkgs/pkgs/development/tools/misc/bossa/default.nix
index bb81a461188a..0d78cfbbab8c 100644
--- a/nixpkgs/pkgs/development/tools/misc/bossa/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/bossa/default.nix
@@ -7,7 +7,7 @@ let
   bin2c = stdenv.mkDerivation {
     name = "bossa-bin2c";
     src = ./bin2c.c;
-    unpackPhase = "true";
+    dontUnpack = true;
     buildPhase = ''cc $src -o bin2c'';
     installPhase = ''mkdir -p $out/bin; cp bin2c $out/bin/'';
   };
diff --git a/nixpkgs/pkgs/development/tools/misc/checkbashisms/default.nix b/nixpkgs/pkgs/development/tools/misc/checkbashisms/default.nix
index 2564b42731b3..5f98df54c0a0 100644
--- a/nixpkgs/pkgs/development/tools/misc/checkbashisms/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/checkbashisms/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ perl ];
 
   # The link returns directly the script. No need for unpacking
-  unpackPhase = "true";
+  dontUnpack = true;
 
   installPhase = ''
     install -D -m755 $src $out/bin/checkbashisms
diff --git a/nixpkgs/pkgs/development/tools/misc/ninka/default.nix b/nixpkgs/pkgs/development/tools/misc/ninka/default.nix
index df793866cbb8..af3b45a8e62c 100644
--- a/nixpkgs/pkgs/development/tools/misc/ninka/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/ninka/default.nix
@@ -3,7 +3,7 @@
 assert stdenv ? glibc;
 
 perlPackages.buildPerlPackage rec {
-  name = "ninka-${version}";
+  pname = "ninka";
   version = "2.0-pre";
 
   src = fetchFromGitHub {
diff --git a/nixpkgs/pkgs/development/tools/misc/pahole/default.nix b/nixpkgs/pkgs/development/tools/misc/pahole/default.nix
index 3864ad945835..5b17f111b45a 100644
--- a/nixpkgs/pkgs/development/tools/misc/pahole/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/pahole/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, cmake, elfutils, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "pahole-${version}";
-  version = "1.12";
+  pname = "pahole";
+  version = "1.15";
   src = fetchgit {
     url = https://git.kernel.org/pub/scm/devel/pahole/pahole.git;
-    sha256 = "1a8xfwqdc2j3ydh9bk2pkvsaf3lrkbxj66vj991c7knc31ix8kpw";
     rev = "v${version}";
+    sha256 = "10af9mh3qxbx0hgjcmh0vjbg22bgxzhbpd9395ymasyw4npg6l9x";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix b/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix
index 062f90e3389d..2e67da18ae9a 100644
--- a/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/ycmd/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     ${python.interpreter} build.py --system-libclang --clang-completer --system-boost
   '';
 
-  configurePhase = ":";
+  dontConfigure = true;
 
   # remove the tests
   #
diff --git a/nixpkgs/pkgs/development/tools/parsing/antlr/3.4.nix b/nixpkgs/pkgs/development/tools/parsing/antlr/3.4.nix
index ad0ebbdebba0..b53116b888e1 100644
--- a/nixpkgs/pkgs/development/tools/parsing/antlr/3.4.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/antlr/3.4.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1xqbam8vf04q5fasb0m2n1pn5dbp2yw763sj492ncq04c5mqcglx";
   };
 
-  unpackPhase = "true";
+  dontUnpack = true;
 
   installPhase = ''
     mkdir -p "$out"/{lib/antlr,bin}
diff --git a/nixpkgs/pkgs/development/tools/parsing/antlr/3.5.nix b/nixpkgs/pkgs/development/tools/parsing/antlr/3.5.nix
index cf37287beff8..4c213ed1c4c2 100644
--- a/nixpkgs/pkgs/development/tools/parsing/antlr/3.5.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/antlr/3.5.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0srjwxipwsfzmpi0v32d1l5lzk9gi5in8ayg33sq8wyp8ygnbji6";
   };
 
-  unpackPhase = "true";
+  dontUnpack = true;
 
   installPhase = ''
     mkdir -p "$out"/{lib/antlr,bin}
diff --git a/nixpkgs/pkgs/development/tools/parsing/antlr/4.7.nix b/nixpkgs/pkgs/development/tools/parsing/antlr/4.7.nix
index 40f9bf74ac40..e6e54f8dab92 100644
--- a/nixpkgs/pkgs/development/tools/parsing/antlr/4.7.nix
+++ b/nixpkgs/pkgs/development/tools/parsing/antlr/4.7.nix
@@ -41,7 +41,7 @@ let
       sha256 = "1236gwnzchama92apb2swmklnypj01m7bdwwfvwvl8ym85scw7gl";
     };
 
-    unpackPhase = "true";
+    dontUnpack = true;
 
     installPhase = ''
       mkdir -p "$out"/{share/java,bin}
diff --git a/nixpkgs/pkgs/development/tools/phantomjs/default.nix b/nixpkgs/pkgs/development/tools/phantomjs/default.nix
index 43fdeff9090b..2c37d71e75ce 100644
--- a/nixpkgs/pkgs/development/tools/phantomjs/default.nix
+++ b/nixpkgs/pkgs/development/tools/phantomjs/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
       - Network Monitoring
     '';
 
-    homepage = http://phantomjs.org/;
+    homepage = https://phantomjs.org/;
     license = lib.licenses.bsd3;
 
     maintainers = [ lib.maintainers.bluescreen303 ];
diff --git a/nixpkgs/pkgs/development/tools/phantomjs2/default.nix b/nixpkgs/pkgs/development/tools/phantomjs2/default.nix
index 51cecd81ecac..a37de2a3f628 100644
--- a/nixpkgs/pkgs/development/tools/phantomjs2/default.nix
+++ b/nixpkgs/pkgs/development/tools/phantomjs2/default.nix
@@ -105,7 +105,7 @@ in stdenv.mkDerivation rec {
       - Network Monitoring
     '';
 
-    homepage = http://phantomjs.org/;
+    homepage = https://phantomjs.org/;
     license = licenses.bsd3;
 
     maintainers = [ maintainers.aflatter ];
diff --git a/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock b/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock
index 314daff01c26..91fca663bf28 100644
--- a/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock
+++ b/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock
@@ -2,12 +2,12 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.0)
-    jaro_winkler (1.5.2)
+    jaro_winkler (1.5.3)
     parallel (1.17.0)
     parser (2.6.3.0)
       ast (~> 2.4.0)
     rainbow (3.0.0)
-    rubocop (0.71.0)
+    rubocop (0.72.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.6)
diff --git a/nixpkgs/pkgs/development/tools/rubocop/default.nix b/nixpkgs/pkgs/development/tools/rubocop/default.nix
index 288ccfa1524b..b91a36cb0613 100644
--- a/nixpkgs/pkgs/development/tools/rubocop/default.nix
+++ b/nixpkgs/pkgs/development/tools/rubocop/default.nix
@@ -11,7 +11,7 @@ bundlerEnv rec {
     description = "Automatic Ruby code style checking tool";
     homepage = "https://docs.rubocop.org/";
     license = licenses.mit;
-    maintainers = with maintainers; [ leemachin ];
+    maintainers = with maintainers; [ marsam leemachin ];
     platforms = platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/tools/rubocop/gemset.nix b/nixpkgs/pkgs/development/tools/rubocop/gemset.nix
index 89428cdab0b9..1f83bbf96b78 100644
--- a/nixpkgs/pkgs/development/tools/rubocop/gemset.nix
+++ b/nixpkgs/pkgs/development/tools/rubocop/gemset.nix
@@ -14,10 +14,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zz27z88qznix4r65gd9h56gl177snlfpgv10b0s69vi8qpl909l";
+      sha256 = "1930v0chc1q4fr7hn0y1j34mw0v032a8kh0by4d4sbz8ksy056kf";
       type = "gem";
     };
-    version = "1.5.2";
+    version = "1.5.3";
   };
   parallel = {
     groups = ["default"];
@@ -56,10 +56,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0mjyrf1dmf58i40izs8rp2j4mqnyd4qpah9svmkwhs33ckxsjh6b";
+      sha256 = "192vmm9ah6b4wyabawaszpr8n3z93y3ymykp3m4pncrbwngmn3m2";
       type = "gem";
     };
-    version = "0.71.0";
+    version = "0.72.0";
   };
   ruby-progressbar = {
     groups = ["default"];
diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix
index 413e1c2debff..b349fbc6bd99 100644
--- a/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/cargo-xbuild/default.nix
@@ -2,13 +2,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-xbuild";
-  version = "0.5.12";
+  version = "0.5.14";
 
   src = fetchFromGitHub {
     owner = "rust-osdev";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "1vjsss2zrja4kpr83vw6g0hf9xdx658wjhdiymzndbcf32qrx7x1";
+    rev = version;
+    sha256 = "1f87rz17bdpdipc9x2j4gq1zq181gcshhn7vc9pnn6f487hz0bgq";
   };
 
   cargoSha256 = "1r9i79lymfwpbcx2lp509v435qpkl9bqly1ya369p41n5yprrcjv";
diff --git a/nixpkgs/pkgs/development/tools/rust/pyo3-pack/default.nix b/nixpkgs/pkgs/development/tools/rust/pyo3-pack/default.nix
index 91d25fe68071..a17d50262a0e 100644
--- a/nixpkgs/pkgs/development/tools/rust/pyo3-pack/default.nix
+++ b/nixpkgs/pkgs/development/tools/rust/pyo3-pack/default.nix
@@ -5,16 +5,16 @@ let
   inherit (darwin.apple_sdk.frameworks) Security;
 in rustPlatform.buildRustPackage rec {
   name = "pyo3-pack-${version}";
-  version = "0.5.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "PyO3";
     repo = "pyo3-pack";
     rev = "v${version}";
-    sha256 = "0577v8nqjbb7l7fqvac706bg9zrcp8fbh9ca1mkj44db12v02kgb";
+    sha256 = "0zk0jhr7lnl9z6c8pbk7si3wa8b1kqzj3wrslc1n5fjla7xx8fzn";
   };
 
-  cargoSha256 = "1prwgkgvg11cbpx086irrafg59mfvnykadagcp3qgyry6d82blsv";
+  cargoSha256 = "13gycipxc17baxg8nvjzkw96i1pxgncx7qjcrm9aab7p9vi2vrih";
 
   nativeBuildInputs = [ pkgconfig ];
 
diff --git a/nixpkgs/pkgs/development/tools/selenium/htmlunit-driver/default.nix b/nixpkgs/pkgs/development/tools/selenium/htmlunit-driver/default.nix
index 03c3c23c7559..a8085399b3db 100644
--- a/nixpkgs/pkgs/development/tools/selenium/htmlunit-driver/default.nix
+++ b/nixpkgs/pkgs/development/tools/selenium/htmlunit-driver/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1sd3cwpamcbq9pv0mvcm8x6minqrlb4i0r12q3jg91girqswm2dp";
   };
 
-  unpackPhase = "true";
+  dontUnpack = true;
 
   installPhase = "install -D $src $out/share/lib/${name}/${name}.jar";
 
diff --git a/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix b/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix
index dcc3893ee0de..82b6d7e1161a 100644
--- a/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix
+++ b/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   inherit name;
   inherit version;
 
-  unpackPhase = "true";
+  dontUnpack = true;
 
   buildInputs = [ jdk makeWrapper ];
 
diff --git a/nixpkgs/pkgs/development/tools/selenium/server/default.nix b/nixpkgs/pkgs/development/tools/selenium/server/default.nix
index 48bfbdd689b8..61b74ce108d6 100644
--- a/nixpkgs/pkgs/development/tools/selenium/server/default.nix
+++ b/nixpkgs/pkgs/development/tools/selenium/server/default.nix
@@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
     sha256 = "11v340nm8vzqc2bkmbjfm9a7j4dj0bi9bfk8wdpfan0fb8prf772";
   };
 
-  unpackPhase = "true";
+  dontUnpack = true;
 
   buildInputs = [ jre makeWrapper ];
 
diff --git a/nixpkgs/pkgs/development/web/wml/default.nix b/nixpkgs/pkgs/development/web/wml/default.nix
index 44ce36b76ddc..82faf32a3210 100644
--- a/nixpkgs/pkgs/development/web/wml/default.nix
+++ b/nixpkgs/pkgs/development/web/wml/default.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl, perlPackages, ncurses, lynx, makeWrapper }:
 
 perlPackages.buildPerlPackage rec {
-  name = "wml-2.0.11";
+  pname = "wml";
+  version = "2.0.11";
 
   src = fetchurl {
-    url = "http://thewml.org/distrib/${name}.tar.gz";
+    url = "http://thewml.org/distrib/wml-2.0.11.tar.gz";
     sha256 = "0jjxpq91x7y2mgixz7ghqp01m24qa37wl3zz515rrzv7x8cyy4cf";
   };