pkgs/setlocale.nix

@@ -3,8 +3,8 @@ mkDerivation {
   pname = "setlocale";
   version = "1.0.0.10";
   sha256 = "3972ff10c22318f5451215dc886c1535fea5ab7dfefe5ce461b1603865423ba7";
-  revision = "4";
-  editedCabalFile = "0lpr3lrn28ig0q2cd5xgggzgf917xdpx1zq2q523r0qin6vbb44n";
+  revision = "5";
+  editedCabalFile = "16p23y8hkixxm9z1plnrsql0x264vkcrfgw516z05axc4l3xbkhg";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;

pkgs/shake-bench.nix

-{ mkDerivation, Chart, Chart-diagrams, aeson, base, bytestring
-, diagrams-contrib, diagrams-core, diagrams-lib, diagrams-svg
-, directory, extra, filepath, lens, lens-aeson, lib, mtl, shake
-, text
-}:
-mkDerivation {
-  pname = "shake-bench";
-  version = "0.2.0.0";
-  sha256 = "21f159e881e3bc71406877a51fc40e1c9e7b553bbf376b0400087222f90ddd4b";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    aeson base bytestring Chart Chart-diagrams diagrams-contrib
-    diagrams-core diagrams-lib diagrams-svg directory extra filepath
-    lens lens-aeson mtl shake text
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Build rules for historical benchmarking";
-  license = lib.licenses.asl20;
-  broken = false;
-}
\ No newline at end of file

pkgs/shake.nix

-{ mkDerivation, QuickCheck, base, binary, bytestring, deepseq
-, directory, extra, filepath, filepattern, hashable, heaps
-, js-dgtable, js-flot, js-jquery, lib, primitive, process, random
-, time, transformers, unix, unordered-containers, utf8-string
-}:
-mkDerivation {
-  pname = "shake";
-  version = "0.19.7";
-  sha256 = "352a56af12f70b50d564dcb61131555577281957ee196f1702a3723c0a3699d1";
-  revision = "1";
-  editedCabalFile = "1hz57kw5pp5cpbicbi7x8sz8c6qy58dzyiljz9b9f2r1rr683d9w";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = true;
-  libraryHaskellDepends = [
-    base binary bytestring deepseq directory extra filepath filepattern
-    hashable heaps js-dgtable js-flot js-jquery primitive process
-    random time transformers unix unordered-containers utf8-string
-  ];
-  executableHaskellDepends = [
-    base binary bytestring deepseq directory extra filepath filepattern
-    hashable heaps js-dgtable js-flot js-jquery primitive process
-    random time transformers unix unordered-containers utf8-string
-  ];
-  testHaskellDepends = [
-    base binary bytestring deepseq directory extra filepath filepattern
-    hashable heaps js-dgtable js-flot js-jquery primitive process
-    QuickCheck random time transformers unix unordered-containers
-    utf8-string
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://shakebuild.com";
-  description = "Build system library, like Make, but more accurate dependencies";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file

pkgs/shakespeare.nix

-{ mkDerivation, HUnit, aeson, base, blaze-html, blaze-markup
-, bytestring, containers, directory, exceptions, file-embed
-, ghc-prim, hspec, lib, parsec, process, scientific
-, template-haskell, text, th-lift, time, transformers
-, unordered-containers, vector
-}:
-mkDerivation {
-  pname = "shakespeare";
-  version = "2.1.0.1";
-  sha256 = "6cb655f3734de1b920faf67f313d45e31fc7f8fcf0a2e00a45f986d8e107d22f";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    aeson base blaze-html blaze-markup bytestring containers directory
-    exceptions file-embed ghc-prim parsec process scientific
-    template-haskell text th-lift time transformers
-    unordered-containers vector
-  ];
-  testHaskellDepends = [
-    aeson base blaze-html blaze-markup bytestring containers directory
-    exceptions ghc-prim hspec HUnit parsec process template-haskell
-    text time transformers
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://www.yesodweb.com/book/shakespearean-templates";
-  description = "A toolkit for making compile-time interpolated templates";
-  license = lib.licenses.mit;
-  broken = false;
-}
\ No newline at end of file

pkgs/shelly.nix

@@ -7,6 +7,8 @@ mkDerivation {
   pname = "shelly";
   version = "1.12.1";
   sha256 = "135a264422228c9b13232c28206ee9fb0498dd15767d6a9f857bb30202f80c77";
+  revision = "1";
+  editedCabalFile = "0f71dbh0a3xb82y578z95wchspm2r4i38wiv1s5ls6p6vchk7phm";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;

pkgs/shh.nix

-{ mkDerivation, Cabal, PyF, async, base, bytestring, cabal-doctest
-, containers, deepseq, directory, doctest, filepath, lib
-, markdown-unlit, mtl, process, split, stringsearch, tasty
-, tasty-hunit, tasty-quickcheck, template-haskell, temporary, unix
-, utf8-string
-}:
-mkDerivation {
-  pname = "shh";
-  version = "0.7.2.2";
-  sha256 = "919a6708671820d8adb9c89347aba33bf81b80041bcd4470bc6212c78b5122f8";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  setupHaskellDepends = [ base Cabal cabal-doctest ];
-  libraryHaskellDepends = [
-    async base bytestring containers deepseq directory filepath mtl
-    process split stringsearch template-haskell unix utf8-string
-  ];
-  executableHaskellDepends = [
-    async base bytestring deepseq directory temporary unix
-  ];
-  testHaskellDepends = [
-    async base bytestring directory doctest filepath PyF tasty
-    tasty-hunit tasty-quickcheck utf8-string
-  ];
-  testToolDepends = [ markdown-unlit ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "Simple shell scripting from Haskell";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file

pkgs/should-not-typecheck.nix

-{ mkDerivation, HUnit, base, deepseq, hspec, hspec-expectations
-, lib
-}:
-mkDerivation {
-  pname = "should-not-typecheck";
-  version = "2.1.0";
-  sha256 = "f538ac70ce07679bc2e6c1651db82a86866664ab995665fdc78e6cb12bd8d591";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base deepseq HUnit ];
-  testHaskellDepends = [
-    base deepseq hspec hspec-expectations HUnit
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://github.com/CRogers/should-not-typecheck";
-  description = "A HUnit/hspec assertion library to verify that an expression does not typecheck";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file

pkgs/freer-simple.nix → pkgs/shower.nix

-{ mkDerivation, QuickCheck, base, criterion, extensible-effects
-, free, lib, mtl, natural-transformation, tasty, tasty-hunit
-, tasty-quickcheck, template-haskell, transformers-base
+{ mkDerivation, QuickCheck, aeson, base, containers, directory
+, filepath, lib, megaparsec, pretty, process, tasty, tasty-golden
+, tasty-quickcheck, temporary, text, unordered-containers
+, utf8-string, vector
 }:
 mkDerivation {
-  pname = "freer-simple";
-  version = "1.2.1.2";
-  sha256 = "9c02bb4930ef245525e6ff8b548f77814c0b69acdecc48e100acab3b9b73d787";
+  pname = "shower";
+  version = "0.2.0.3";
+  sha256 = "39e492fad7f6f6b08707866b5906d6b7d0431b013a3044aa0df296b72442af2f";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    base natural-transformation template-haskell transformers-base
-  ];
+  libraryHaskellDepends = [ base megaparsec pretty ];
   executableHaskellDepends = [ base ];
   testHaskellDepends = [
-    base QuickCheck tasty tasty-hunit tasty-quickcheck
-  ];
-  benchmarkHaskellDepends = [
-    base criterion extensible-effects free mtl
+    aeson base containers directory filepath process QuickCheck tasty
+    tasty-golden tasty-quickcheck temporary text unordered-containers
+    utf8-string vector
   ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
@@ -26,8 +24,8 @@ mkDerivation {
   doCheck = false;
   doBenchmark = false;
   hyperlinkSource = false;
-  homepage = "https://github.com/lexi-lambda/freer-simple";
-  description = "A friendly effect system for Haskell";
+  homepage = "https://monadfix.com/shower";
+  description = "Clean up the formatting of 'show' output";
   license = lib.licenses.bsd3;
   broken = false;
 }
\ No newline at end of file

pkgs/singleton-bool.nix

-{ mkDerivation, base, boring, dec, deepseq, lib, some }:
-mkDerivation {
-  pname = "singleton-bool";
-  version = "0.1.7";
-  sha256 = "1c2d196386c3697e884fcc8bef530506045a4860a5f669cc8416358b473bb29b";
-  revision = "1";
-  editedCabalFile = "1aqdd1bzccj8fb2fy1la9gqxvgaa2prba4wig0bnrr5vz13f487c";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base boring dec deepseq some ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/phadej/singleton-bool#readme";
-  description = "Type level booleans";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file

pkgs/singletons.nix

 { mkDerivation, base, lib }:
 mkDerivation {
   pname = "singletons";
-  version = "3.0.2";
-  sha256 = "f568ee129ef6438a4325f145f17fa4a3074b3564c72fd35ba1f68dcee14d5e82";
-  revision = "2";
-  editedCabalFile = "040hwa1r4vx64v62ffw2nfn29h91ns082zqc47jsp5ciwl69821p";
+  version = "3.0.3";
+  sha256 = "99600410644fd8331f0fd546b8ce2b5c4b399321d43c3047542a609bca0a1c7e";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;

pkgs/skylighting-core.nix

@@ -6,8 +6,8 @@
 }:
 mkDerivation {
   pname = "skylighting-core";
-  version = "0.14";
-  sha256 = "1223bd508d2e8dbd98db371c8ebbbe70449856d984934f54fa33d3040fe8cb91";
+  version = "0.14.1.2";
+  sha256 = "e532fc3bdafb155117df9a4dc37ca7115b31bba9783f84eff60b8ce12395c18f";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;

pkgs/skylighting-format-blaze-html.nix

@@ -3,8 +3,8 @@
 }:
 mkDerivation {
   pname = "skylighting-format-blaze-html";
-  version = "0.1.1.1";
-  sha256 = "8eec82eb8535e4e1c2887d3b83a6ffd8866a0cffac4aa0e50ea229a175415791";
+  version = "0.1.1.2";
+  sha256 = "125fe5367aef04b1bc720bdff07802e5db288cb3634ac0ba2796ed5cedd98f79";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;

pkgs/skylighting.nix

@@ -5,8 +5,8 @@
 }:
 mkDerivation {
   pname = "skylighting";
-  version = "0.14";
-  sha256 = "ffa6cd93a645d259cf9b04e5751ffcb7c045a8452ef3c4e2512365126fae7ca7";
+  version = "0.14.1.2";
+  sha256 = "178f7421bb661000722d3894ec2d07560ab73d04ae53fd4d838c3721ecb2ed8b";
   configureFlags = [ "-fexecutable" ];
   isLibrary = true;
   isExecutable = true;

pkgs/snap-core.nix

-{ mkDerivation, HUnit, QuickCheck, attoparsec, base, bytestring
-, bytestring-builder, case-insensitive, containers, deepseq
-, directory, filepath, hashable, io-streams, lib, lifted-base
-, monad-control, mtl, network, network-uri, old-locale, parallel
-, random, readable, regex-posix, test-framework
-, test-framework-hunit, test-framework-quickcheck2, text, time
-, transformers, transformers-base, unix-compat
-, unordered-containers, vector, zlib
-}:
-mkDerivation {
-  pname = "snap-core";
-  version = "1.0.5.1";
-  sha256 = "a704c1a0e2c4ebfdcc8baf6feab09dd7715bdc9d750f7efb63d06e3965ec0502";
-  revision = "3";
-  editedCabalFile = "0knsdp65pvj7nxsid6ais24h902k8ag480r1661wy9grkv2i8kp8";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    attoparsec base bytestring bytestring-builder case-insensitive
-    containers directory filepath hashable HUnit io-streams lifted-base
-    monad-control mtl network network-uri old-locale random readable
-    regex-posix text time transformers transformers-base unix-compat
-    unordered-containers vector
-  ];
-  testHaskellDepends = [
-    attoparsec base bytestring bytestring-builder case-insensitive
-    containers deepseq directory filepath hashable HUnit io-streams
-    lifted-base monad-control mtl network network-uri old-locale
-    parallel QuickCheck random readable regex-posix test-framework
-    test-framework-hunit test-framework-quickcheck2 text time
-    transformers transformers-base unix-compat unordered-containers
-    vector zlib
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://snapframework.com/";
-  description = "Snap: A Haskell Web Framework (core interfaces and types)";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file

pkgs/snap-server.nix

-{ mkDerivation, HUnit, HsOpenSSL, QuickCheck, attoparsec, base
-, base16-bytestring, blaze-builder, bytestring, bytestring-builder
-, case-insensitive, clock, containers, criterion, deepseq
-, directory, filepath, http-common, http-streams, io-streams
-, io-streams-haproxy, lib, lifted-base, monad-control, mtl, network
-, old-locale, openssl-streams, parallel, random, snap-core
-, test-framework, test-framework-hunit, test-framework-quickcheck2
-, text, threads, time, transformers, unix, unix-compat, vector
-}:
-mkDerivation {
-  pname = "snap-server";
-  version = "1.1.2.1";
-  sha256 = "a47457fd746db202711b6a6b34a8575daa291a01a99cd0900e639aadc06fca7e";
-  revision = "3";
-  editedCabalFile = "0adjcah7hx47cg066jbjjgn7wz8pvkm0fc87fyz8c7lc0sdmp84f";
-  configureFlags = [ "-fopenssl" ];
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    attoparsec base blaze-builder bytestring case-insensitive clock
-    containers filepath HsOpenSSL io-streams io-streams-haproxy
-    lifted-base mtl network old-locale openssl-streams snap-core text
-    time transformers unix unix-compat vector
-  ];
-  testHaskellDepends = [
-    attoparsec base base16-bytestring blaze-builder bytestring
-    case-insensitive clock containers deepseq directory filepath
-    HsOpenSSL http-common http-streams HUnit io-streams
-    io-streams-haproxy lifted-base monad-control mtl network old-locale
-    openssl-streams parallel QuickCheck random snap-core test-framework
-    test-framework-hunit test-framework-quickcheck2 text threads time
-    transformers unix unix-compat vector
-  ];
-  benchmarkHaskellDepends = [
-    attoparsec base blaze-builder bytestring bytestring-builder
-    criterion io-streams io-streams-haproxy snap-core transformers
-    vector
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "http://snapframework.com/";
-  description = "A web server for the Snap Framework";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file

pkgs/sop-core.nix

-{ mkDerivation, base, deepseq, lib }:
-mkDerivation {
-  pname = "sop-core";
-  version = "0.5.0.2";
-  sha256 = "87bffd2254b98ded822d449fcd1c33dbd74d2ce96bf35e7a6714abc5a2297265";
-  revision = "3";
-  editedCabalFile = "0rlrf4whfkqf200916d02r0s4zqlimb3d4z6gd3f5czayncp31cx";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base deepseq ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  description = "True Sums of Products";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file

pkgs/souffle-haskell.nix

 { mkDerivation, array, base, bytestring, criterion, deepseq
-, directory, filepath, hedgehog, hspec, hspec-hedgehog, lib, mtl
-, process, profunctors, temporary, text, text-short, vector
+, directory, fetchgit, filepath, hedgehog, hspec, hspec-hedgehog
+, lib, mtl, process, profunctors, temporary, text, vector
 }:
 mkDerivation {
   pname = "souffle-haskell";
-  version = "3.5.1";
-  sha256 = "70b9b8fb6e58609675c5b29137557f1cbe599443dd0ab31ca33b1f66815ebc6f";
+  version = "4.0.0";
+  src = fetchgit {
+    url = "https://github.com/luc-tielen/souffle-haskell";
+    sha256 = "03kn2ap5wkiiqajln48gn70pq5dsypivvb6n3nl3i4gqdh8l2xnm";
+    rev = "e441c84f1d64890e31c92fbb278c074ae8bcaff5";
+    fetchSubmodules = true;
+  };
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
     array base bytestring deepseq directory filepath mtl process
-    profunctors temporary text text-short vector
+    profunctors temporary text vector
   ];
   testHaskellDepends = [
     array base directory hedgehog hspec hspec-hedgehog profunctors
-    temporary text text-short vector
+    temporary text vector
   ];
   benchmarkHaskellDepends = [ base criterion deepseq text vector ];
   enableLibraryProfiling = true;

pkgs/openssl-streams.nix → pkgs/sourcemap.nix

-{ mkDerivation, HUnit, HsOpenSSL, base, bytestring, io-streams, lib
-, network, test-framework, test-framework-hunit
+{ mkDerivation, aeson, attoparsec, base, bytestring, criterion, lib
+, process, random, text, unordered-containers, utf8-string
 }:
 mkDerivation {
-  pname = "openssl-streams";
-  version = "1.2.3.0";
-  sha256 = "55f20bd8970e5ce4d0ff16fae8c584c63e26e0990d27364340b997f5feb5f682";
-  revision = "2";
-  editedCabalFile = "0xxbx82ksjnphi7vl93ymm3wp8kib5svqcnd6xamqmywrny08qfq";
+  pname = "sourcemap";
+  version = "0.1.7";
+  sha256 = "50645eb9707ce73fea8c4f43d86e6dcf5bfad01960b1e4bd2ad1d10f2b202326";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
-    base bytestring HsOpenSSL io-streams network
+    aeson attoparsec base bytestring process text unordered-containers
+    utf8-string
   ];
   testHaskellDepends = [
-    base bytestring HsOpenSSL HUnit io-streams network test-framework
-    test-framework-hunit
+    aeson base bytestring process text unordered-containers utf8-string
   ];
+  benchmarkHaskellDepends = [ base bytestring criterion random ];
   enableLibraryProfiling = true;
   enableExecutableProfiling = true;
   doHaddock = true;
@@ -24,7 +23,7 @@ mkDerivation {
   doCheck = false;
   doBenchmark = false;
   hyperlinkSource = false;
-  description = "OpenSSL network support for io-streams";
+  description = "Implementation of source maps as proposed by Google and Mozilla";
   license = lib.licenses.bsd3;
   broken = false;
 }
\ No newline at end of file

pkgs/sqlite-simple.nix

 { mkDerivation, HUnit, Only, attoparsec, base, base16-bytestring
 , blaze-builder, blaze-textual, bytestring, containers
-, direct-sqlite, lib, template-haskell, text, time, transformers
+, direct-sqlite, exceptions, lib, template-haskell, text, time
+, transformers
 }:
 mkDerivation {
   pname = "sqlite-simple";
-  version = "0.4.18.2";
-  sha256 = "dc15b1a7dd5428f218d40cd8b3e51d4b559d5d86c52639ba3f0f811813735d91";
+  version = "0.4.19.0";
+  sha256 = "38727d16060909a2b65c15914ba58a68d88fe9919c547078e701e50635e9323a";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;
   libraryHaskellDepends = [
     attoparsec base blaze-builder blaze-textual bytestring containers
-    direct-sqlite Only template-haskell text time transformers
+    direct-sqlite exceptions Only template-haskell text time
+    transformers
   ];
   testHaskellDepends = [
     base base16-bytestring bytestring direct-sqlite HUnit text time

pkgs/statestack.nix

@@ -3,8 +3,8 @@ mkDerivation {
   pname = "statestack";
   version = "0.3.1.1";
   sha256 = "cd55733032b34d671852c7b6d05c1645cea2f280ac35221d480cf721d5c7879c";
-  revision = "1";
-  editedCabalFile = "0rxndmrq4gj1bc9cf20477n8d6kpri31dyl6x8f4h57yiwhblg55";
+  revision = "2";
+  editedCabalFile = "1k60fkszxxyya6amqyjkz5dsxri3c07kgdr6mb1hw4b3dnvq6gwa";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;