From 2ac764de78a1e63009143e2ecd88aa378002190f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 5 Mar 2019 16:28:29 +0100
Subject: [PATCH] Revert "hackage-packages.nix: automatic Haskell package set
 update"

This reverts commit fe0f47110f710af501e04631621e8f313e36ae2e.
---
 .../haskell-modules/hackage-packages.nix      | 259 +++---------------
 1 file changed, 45 insertions(+), 214 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 2d816f26b36..2606fecdff2 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1861,8 +1861,8 @@ self: {
      }:
      mkDerivation {
        pname = "BlogLiterately";
-       version = "0.8.6.3";
-       sha256 = "02a4mjz9lbx19plkanmdlm730dwphkdi79a5b5hcnrbilcy8k71n";
+       version = "0.8.6.2";
+       sha256 = "0prk58bxmy0va5i1blc02w8szspavnj4jz6dv9pjg7z64cs863jy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -1880,18 +1880,17 @@ self: {
   "BlogLiterately-diagrams" = callPackage
     ({ mkDerivation, base, BlogLiterately, containers, diagrams-builder
      , diagrams-lib, diagrams-rasterific, directory, filepath
-     , JuicyPixels, pandoc, safe, split
+     , JuicyPixels, pandoc, safe
      }:
      mkDerivation {
        pname = "BlogLiterately-diagrams";
-       version = "0.2.1";
-       sha256 = "0ki56kc51p1b9zkvs91adgj140pchnbdwfmhsvb4qzzf9sz90kjb";
+       version = "0.2.0.6";
+       sha256 = "1ps9k7x0s7w0pbf8v7fphm1nyfh5dbxjm3zc1bfjxry4ciqljfyq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base BlogLiterately containers diagrams-builder diagrams-lib
          diagrams-rasterific directory filepath JuicyPixels pandoc safe
-         split
        ];
        executableHaskellDepends = [ base BlogLiterately ];
        description = "Include images in blog posts with inline diagrams code";
@@ -37819,7 +37818,7 @@ self: {
        description = "Proof-of-concept tool for writing using binary choices";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) gtk2; inherit (pkgs.gnome2) pango;};
+     }) {inherit (pkgs) gtk2; inherit (pkgs) pango;};
 
   "bitstream" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, bytestring, QuickCheck
@@ -43315,23 +43314,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "cached" = callPackage
-    ({ mkDerivation, base, containers, directory, doctest, filepath
-     , protolude, QuickCheck, quickcheck-assertions, shake, text
-     }:
-     mkDerivation {
-       pname = "cached";
-       version = "0.1.0.0";
-       sha256 = "19x5pwcdkhmk32w9ccb2ixc73k2hhqki61yi39lahda5k86jisdv";
-       libraryHaskellDepends = [ base containers protolude shake text ];
-       testHaskellDepends = [
-         base containers directory doctest filepath protolude QuickCheck
-         quickcheck-assertions shake text
-       ];
-       description = "Cache values to disk";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
   "cached-io" = callPackage
     ({ mkDerivation, base, stm, time, transformers }:
      mkDerivation {
@@ -43363,39 +43345,36 @@ self: {
 
   "cachix" = callPackage
     ({ mkDerivation, async, base, base16-bytestring, base64-bytestring
-     , bytestring, cachix-api, conduit, conduit-extra, cookie
-     , cryptonite, data-default, dhall, directory, ed25519, filepath
-     , fsnotify, here, hspec, hspec-discover, http-client
+     , bifunctors, bytestring, cachix-api, conduit, conduit-extra
+     , cookie, cryptonite, data-default, dhall, directory, ed25519
+     , filepath, fsnotify, here, hspec, hspec-discover, http-client
      , http-client-tls, http-conduit, http-types, lzma-conduit
-     , megaparsec, memory, mmorph, netrc, optparse-applicative, process
-     , protolude, retry, safe-exceptions, servant, servant-auth
-     , servant-auth-client, servant-client, servant-client-core
-     , servant-conduit, temporary, text, unix, uri-bytestring, versions
+     , megaparsec, memory, mmorph, optparse-applicative, process
+     , protolude, resourcet, retry, safe-exceptions, servant
+     , servant-auth, servant-auth-client, servant-client
+     , servant-client-core, servant-streaming-client, streaming, text
+     , unix, uri-bytestring, versions
      }:
      mkDerivation {
        pname = "cachix";
-       version = "0.2.0";
-       sha256 = "0nk6ay0vdq656bwkbnd16y95ivjbi34k8k58gcabr91bgypp1fhn";
-       revision = "1";
-       editedCabalFile = "103ypqp0kclc1814q2ci5fi2jpfbxwmjqfsnkvwf3c1vr8cqplmh";
+       version = "0.1.3";
+       sha256 = "0vhgkdrrj8wmnzqsjwyrhflwprnizjibgjwcwn5771mjv38amyx0";
        isLibrary = true;
        isExecutable = true;
-       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         async base base16-bytestring base64-bytestring bytestring
-         cachix-api conduit conduit-extra cookie cryptonite data-default
-         dhall directory ed25519 filepath fsnotify here http-client
-         http-client-tls http-conduit http-types lzma-conduit megaparsec
-         memory mmorph netrc optparse-applicative process protolude retry
-         safe-exceptions servant servant-auth servant-auth-client
-         servant-client servant-client-core servant-conduit text unix
-         uri-bytestring versions
+         async base base16-bytestring base64-bytestring bifunctors
+         bytestring cachix-api conduit conduit-extra cookie cryptonite
+         data-default dhall directory ed25519 filepath fsnotify here
+         http-client http-client-tls http-conduit http-types lzma-conduit
+         megaparsec memory mmorph optparse-applicative process protolude
+         resourcet retry safe-exceptions servant servant-auth
+         servant-auth-client servant-client servant-client-core
+         servant-streaming-client streaming text unix uri-bytestring
+         versions
        ];
        executableHaskellDepends = [ base cachix-api ];
        executableToolDepends = [ hspec-discover ];
-       testHaskellDepends = [
-         base cachix-api directory here hspec protolude temporary
-       ];
+       testHaskellDepends = [ base cachix-api here hspec protolude ];
        description = "Command line client for Nix binary cache hosting https://cachix.org";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -43436,42 +43415,6 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cachix-api_0_2_0" = callPackage
-    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
-     , conduit, cookie, cryptonite, deepseq, exceptions, hspec
-     , hspec-discover, http-api-data, http-media, lens, memory
-     , protolude, resourcet, servant, servant-auth, servant-auth-server
-     , servant-auth-swagger, servant-client, servant-swagger
-     , servant-swagger-ui-core, string-conv, swagger2, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "cachix-api";
-       version = "0.2.0";
-       sha256 = "1wmyxknd5fliqfsavngpj01i34jcl39rsm1lx0nf13vlsf279wkk";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base base16-bytestring bytestring conduit cookie cryptonite
-         deepseq exceptions http-api-data http-media lens memory resourcet
-         servant servant-auth servant-auth-server servant-auth-swagger
-         servant-client servant-swagger string-conv swagger2 text
-         transformers
-       ];
-       executableHaskellDepends = [ aeson base ];
-       testHaskellDepends = [
-         aeson base base16-bytestring bytestring conduit cookie cryptonite
-         hspec http-api-data http-media lens memory protolude servant
-         servant-auth servant-auth-server servant-auth-swagger
-         servant-swagger servant-swagger-ui-core string-conv swagger2 text
-         transformers
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Servant HTTP API specification for https://cachix.org";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "cacophony" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring
      , bytestring, criterion, cryptonite, deepseq, directory, exceptions
@@ -49381,7 +49324,7 @@ self: {
        description = "Bindings to the Clutter animation library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) clutter; inherit (pkgs.gnome2) pango;};
+     }) {inherit (pkgs) clutter; inherit (pkgs) pango;};
 
   "cmaes" = callPackage
     ({ mkDerivation, base, doctest, doctest-prop, mtl, process, random
@@ -73735,42 +73678,6 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "eventstore_1_2_2" = callPackage
-    ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring
-     , cereal, clock, connection, containers, dns, dotnet-timespan
-     , ekg-core, exceptions, fast-logger, file-embed, hashable
-     , http-client, interpolate, lifted-async, lifted-base, machines
-     , monad-control, monad-logger, mono-traversable, mtl, protobuf
-     , random, safe, safe-exceptions, semigroups, stm, stm-chans
-     , streaming, tasty, tasty-hspec, tasty-hunit, text, time
-     , transformers-base, unordered-containers, uuid, vector
-     }:
-     mkDerivation {
-       pname = "eventstore";
-       version = "1.2.2";
-       sha256 = "0p2qz8z44mdlswan9cp9xpxwbbq345g9r4kh777q18x1k5jbf61j";
-       libraryHaskellDepends = [
-         aeson array base bifunctors bytestring cereal clock connection
-         containers dns dotnet-timespan ekg-core exceptions fast-logger
-         hashable http-client interpolate lifted-async lifted-base machines
-         monad-control monad-logger mono-traversable mtl protobuf random
-         safe safe-exceptions semigroups stm stm-chans streaming text time
-         transformers-base unordered-containers uuid vector
-       ];
-       testHaskellDepends = [
-         aeson async base bytestring cereal connection containers
-         dotnet-timespan exceptions fast-logger file-embed hashable
-         lifted-async lifted-base monad-control mono-traversable protobuf
-         safe safe-exceptions semigroups stm stm-chans streaming tasty
-         tasty-hspec tasty-hunit text time transformers-base
-         unordered-containers uuid vector
-       ];
-       description = "EventStore TCP Client";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "x86_64-darwin" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "every" = callPackage
     ({ mkDerivation, async, base, stm }:
      mkDerivation {
@@ -86969,7 +86876,7 @@ self: {
        doHaddock = false;
        description = "GIRepository (gobject-introspection) bindings";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs.gnome3) gobject-introspection;};
+     }) {inherit (pkgs) gobject-introspection;};
 
   "gi-glib" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, glib
@@ -87272,7 +87179,7 @@ self: {
        description = "JavaScriptCore bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome3) webkitgtk;};
+     }) {inherit (pkgs) webkitgtk;};
 
   "gi-notify" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf
@@ -87337,7 +87244,7 @@ self: {
        '';
        description = "Pango bindings";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;};
+     }) {inherit (pkgs) cairo; inherit (pkgs) pango;};
 
   "gi-pangocairo" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, containers
@@ -87362,7 +87269,7 @@ self: {
        '';
        description = "PangoCairo bindings";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;};
+     }) {inherit (pkgs) cairo; inherit (pkgs) pango;};
 
   "gi-poppler" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
@@ -87423,7 +87330,7 @@ self: {
        doHaddock = false;
        description = "Libsoup bindings";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs.gnome2) libsoup;};
+     }) {inherit (pkgs) libsoup;};
 
   "gi-vte" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
@@ -87490,7 +87397,7 @@ self: {
        description = "WebKit2 bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome3) webkitgtk;};
+     }) {inherit (pkgs) webkitgtk;};
 
   "gi-webkit2webextension" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
@@ -87536,7 +87443,7 @@ self: {
        description = "Wnck bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome2) libwnck;};
+     }) {inherit (pkgs) libwnck;};
 
   "gi-xlib" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
@@ -97989,8 +97896,6 @@ self: {
        pname = "halipeto";
        version = "2.4.1";
        sha256 = "1anyf6mh13rmj5a0lsayrcxzvm3zk0a2943pzkgz06y3aqgmcbdb";
-       revision = "1";
-       editedCabalFile = "0x30z8l7kfxvw4qzva7qgqair76v2ml8lgmd7lh4pkihq11f678q";
        libraryHaskellDepends = [ base directory HaXml pandoc ];
        description = "Haskell Static Web Page Generator";
        license = "GPL";
@@ -100948,7 +100853,7 @@ self: {
        description = "Generate Haskell bindings for GObject Introspection capable libraries";
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib; 
-         inherit (pkgs.gnome3) gobject-introspection;};
+         inherit (pkgs) gobject-introspection;};
 
   "haskell-gi-base" = callPackage
     ({ mkDerivation, base, bytestring, containers, glib, text }:
@@ -110013,8 +109918,6 @@ self: {
        pname = "hledger-interest";
        version = "1.5.3";
        sha256 = "1ff113z2ir07ihdvfa5fca4x326zwm2jd7sjy6hjpr4qgi1mszvs";
-       revision = "1";
-       editedCabalFile = "1myqv7hci32hvm98d4fn2zqdvkxsdx1g821n1fwr6814yn89kwjj";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -112236,8 +112139,6 @@ self: {
        pname = "hopenssl";
        version = "2.2.4";
        sha256 = "0wbnibaffpmk453jbvh95r1d1scz1ivkj59ddrbd3hf4iwr6rx4x";
-       revision = "1";
-       editedCabalFile = "14bs0wjrqnnn1v8c4yznfzggvmgypm2lssgl0cr498kmp54if0lf";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ openssl ];
        testHaskellDepends = [ base bytestring HUnit ];
@@ -115541,8 +115442,6 @@ self: {
        pname = "hsdns";
        version = "1.8";
        sha256 = "0jxnfgzsshhaf3n8ywhxy84l6ldhz5cdwaayr61v26iqgm3c3qk0";
-       revision = "1";
-       editedCabalFile = "09ixj0xywmbigfhqmq58dwqns8l3w6wprykafg52fx69bvhg9yph";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers network ];
@@ -117998,8 +117897,6 @@ self: {
        pname = "hsyslog";
        version = "5.0.2";
        sha256 = "1kkypn0dd92aqv8dr112bhkr9k9r9mchnyyvy41kvhj2zg447v1y";
-       revision = "1";
-       editedCabalFile = "0k1j46nk3z64zw4bqmvw5lgy16ih200m66rv4b6ygjqv7nglqq0b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -162686,7 +162583,7 @@ self: {
        description = "Binding to the Pango text rendering engine";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome2) pango;};
+     }) {inherit (pkgs) pango;};
 
   "pangraph" = callPackage
     ({ mkDerivation, algebraic-graphs, attoparsec, base, bytestring
@@ -168452,18 +168349,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pipes-ordered-zip" = callPackage
-    ({ mkDerivation, base, foldl, pipes }:
-     mkDerivation {
-       pname = "pipes-ordered-zip";
-       version = "1.0.0.1";
-       sha256 = "18qm08h5mq8pyn7cx1dabvmj63mhykm4cqsxhqsb7qf1kv70nqc8";
-       libraryHaskellDepends = [ base pipes ];
-       testHaskellDepends = [ base foldl pipes ];
-       description = "merge two ordered Producers into a new Producer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
   "pipes-p2p" = callPackage
     ({ mkDerivation, async, base, binary, bytestring, errors
      , exceptions, mtl, network, network-simple-sockaddr, pipes
@@ -170598,8 +170483,8 @@ self: {
        description = "Binding to the Poppler";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) gdk_pixbuf; inherit (pkgs) gtk2; 
-         inherit (pkgs.gnome2) pango; inherit (pkgs) poppler;};
+     }) {inherit (pkgs) gdk_pixbuf; inherit (pkgs) gtk2;
+         inherit (pkgs) pango; inherit (pkgs) poppler;};
 
   "populate-setup-exe-cache" = callPackage
     ({ mkDerivation, base }:
@@ -171688,8 +171573,6 @@ self: {
        pname = "postmaster";
        version = "0.3.3";
        sha256 = "05608xvaig1d67j3h8ykw7a11yr1mqkw98p0ii7gbp4mp3d9kncd";
-       revision = "1";
-       editedCabalFile = "00rp6mdds4kssvcyc9n6iz1asgkhv96050x50jwvg3wp3pp69fg2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -180587,8 +180470,8 @@ self: {
      }:
      mkDerivation {
        pname = "reanimate-svg";
-       version = "0.8.0.0";
-       sha256 = "1wh6hgwqd7kdx9mdajjwys5lyydipj572mr5w23bf3jsnqrgvvab";
+       version = "0.7.0.0";
+       sha256 = "0rwzk6i1pmydijhjs2s2v9qivgccqlfxps3622i5plkss9b8zcqm";
        libraryHaskellDepends = [
          attoparsec base bytestring containers JuicyPixels lens linear mtl
          scientific text transformers vector xml
@@ -191351,26 +191234,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "sequence-formats" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers
-     , data-memocombinators, errors, exceptions, foldl, hslogger
-     , lens-family, MissingH, pipes, pipes-attoparsec, pipes-bytestring
-     , pipes-safe, pipes-text, split, text, transformers, turtle, vector
-     }:
-     mkDerivation {
-       pname = "sequence-formats";
-       version = "1.1.4.1";
-       sha256 = "1zh2n1ksyvqzk2w35nsyj3sxdf7ni2iqv2ksrk8xs64n0j25c7ac";
-       libraryHaskellDepends = [
-         attoparsec base bytestring containers data-memocombinators errors
-         exceptions foldl hslogger lens-family MissingH pipes
-         pipes-attoparsec pipes-bytestring pipes-safe pipes-text split text
-         transformers turtle vector
-       ];
-       description = "A package with basic parsing utilities for several Bioinformatic data formats";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
   "sequent-core" = callPackage
     ({ mkDerivation, base, bytestring, containers, ghc, transformers }:
      mkDerivation {
@@ -192154,8 +192017,6 @@ self: {
        pname = "servant-checked-exceptions";
        version = "2.0.0.0";
        sha256 = "127nav7z2zkgfgzpjjprqb6s55mbdj9z2p05knjx3mangs2q5wm7";
-       revision = "1";
-       editedCabalFile = "0h18x8gimmczgml4rj74kx3463pwrsyxl2vnd13ra5hj0q44d683";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -192182,8 +192043,6 @@ self: {
        pname = "servant-checked-exceptions-core";
        version = "2.0.0.0";
        sha256 = "0j5j7ai1b7nnsvzal27jy6hamwx5i2pyc1f6mmmb06r40cs53lxa";
-       revision = "1";
-       editedCabalFile = "1q2y4cri4h33cfdpgz95dczhvhmyrqajm7k6ypl3b8rw953qlzy7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -192881,32 +192740,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "servant-kotlin_0_1_1_7" = callPackage
-    ({ mkDerivation, aeson, base, containers, directory, formatting
-     , hspec, http-api-data, lens, servant, servant-foreign, shelly
-     , text, time, wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "servant-kotlin";
-       version = "0.1.1.7";
-       sha256 = "138xx3jn2ay38fradssi7biff5cc6g1g3wk003bid349irmgvid4";
-       libraryHaskellDepends = [
-         base containers directory formatting lens servant servant-foreign
-         text time wl-pprint-text
-       ];
-       testHaskellDepends = [
-         aeson base containers directory formatting hspec http-api-data lens
-         servant servant-foreign text time wl-pprint-text
-       ];
-       benchmarkHaskellDepends = [
-         aeson base containers directory formatting http-api-data lens
-         servant servant-foreign shelly text time wl-pprint-text
-       ];
-       description = "Automatically derive Kotlin class to query servant webservices";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "servant-lucid" = callPackage
     ({ mkDerivation, base, http-media, lucid, servant, servant-server
      , text, wai, warp
@@ -202329,7 +202162,7 @@ self: {
        description = "Experimental web browser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome2) libsoup;};
+     }) {inherit (pkgs) libsoup;};
 
   "spine" = callPackage
     ({ mkDerivation, base }:
@@ -206658,8 +206491,6 @@ self: {
        pname = "streamproc";
        version = "1.6.2";
        sha256 = "1wl44n4nav4h203mzfdf1bd5nh4v23dib54lvxka1rl3zymgyvp7";
-       revision = "1";
-       editedCabalFile = "19c51gks028x8mnywkx1nz0s6bwn2mxs5ddmaj2q8n9l5pvfkcgs";
        libraryHaskellDepends = [ base ];
        description = "Stream Processer Arrow";
        license = stdenv.lib.licenses.bsd3;
@@ -216479,7 +216310,7 @@ self: {
        description = "A desktop bar based on WebKit";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) gtk3; inherit (pkgs.gnome3) webkitgtk;};
+     }) {inherit (pkgs) gtk3; inherit (pkgs) webkitgtk;};
 
   "tibetan-utils" = callPackage
     ({ mkDerivation, base, composition-prelude, either, hspec
@@ -218582,8 +218413,8 @@ self: {
      }:
      mkDerivation {
        pname = "tonatona-servant";
-       version = "0.1.0.2";
-       sha256 = "1r0xh69wzzj8h846vi7kp8gkd9i0xfyrcjj8ggliz5h7pvrfwvbl";
+       version = "0.1.0.1";
+       sha256 = "1202fxvjkmvj9sgy576y0ghpcqdca1bhagsxrrz3hcdkyvd2lr9s";
        libraryHaskellDepends = [
          base exceptions http-types monad-logger rio servant servant-server
          tonaparser tonatona tonatona-logger wai wai-extra warp
@@ -232046,7 +231877,7 @@ self: {
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome3) webkitgtk;};
+     }) {inherit (pkgs) webkitgtk;};
 
   "webkitgtk3" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, glib