From b8ab4451b53e3f8282ff3cbd8dde763e8b5e1d28 Mon Sep 17 00:00:00 2001 From: Uri Baghin Date: Wed, 11 Sep 2019 15:17:07 +1000 Subject: [PATCH 01/38] bazel-buildtools: 0.28.0 -> 0.29.0 --- .../build-managers/bazel/buildtools/default.nix | 6 +++--- .../tools/build-managers/bazel/buildtools/deps.nix | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index b606e547036..fc5f98a8ccb 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { pname = "bazel-buildtools"; - version = "0.28.0"; - rev = "d7ccc5507c6c16e04f5e362e558d70b8b179b052"; + version = "0.29.0"; + rev = "5bcc31df55ec1de770cb52887f2e989e7068301f"; goPackagePath = "github.com/bazelbuild/buildtools"; src = fetchgit { inherit rev; url = "https://github.com/bazelbuild/buildtools"; - sha256 = "1d8zjgbg77sk27cz9pjz1h6ajwxqmvdzqgwa2jbh6iykibhpadq0"; + sha256 = "0p2kgyawh3l46h7dzglqh9c7i16zr5mhmqlhy7qvr4skwif1l089"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix b/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix index 5bae5b40653..4aaa37aa9a7 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix @@ -5,17 +5,17 @@ fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "6c65a5562fc06764971b7c5d05c76c75e84bdbf7"; - sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; + rev = "4c88cc3f1a34ffade77b79abc53335d1e511f25b"; + sha256 = "0chbdc4q55z7myiwnbvhryc5ihf6cxh8p4w3c1imy2gyzjn9sf4r"; }; } { - goPackagePath = "github.com/google/skylark"; + goPackagePath = "go.starlark.net"; fetch = { type = "git"; - url = "https://github.com/google/skylark"; - rev = "a5f7082aabed29c0e429c722292c66ec8ecf9591"; - sha256 = "16vsa6ngsby27n6indj441r1glcdfgipjcwcb0rs6zl2dqlqr286"; + url = "https://github.com/google/starlark-go"; + rev = "988906f77f657477aa7ebf4d8fb5f12d6c50b767"; + sha256 = "0ivmbcq3avaxj8ixbc60h706d6wk9wi2mnsid6a483ia4yn7w9k8"; }; } ] From f77b4c564e1d977acfd2e11365c971563860c751 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Thu, 12 Sep 2019 11:43:56 +1000 Subject: [PATCH 02/38] brlaser: 4 -> 5 --- pkgs/misc/cups/drivers/brlaser/default.nix | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix index 948e5ed72ab..bf0f4ef8279 100644 --- a/pkgs/misc/cups/drivers/brlaser/default.nix +++ b/pkgs/misc/cups/drivers/brlaser/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "brlaser"; - version = "4"; + version = "5"; src = fetchFromGitHub { owner = "pdewacht"; repo = "brlaser"; rev = "v${version}"; - sha256 = "1yy4mpf68c82h245srh2sd1yip29w6kx14gxk4hxkv496gf55lw5"; + sha256 = "133fx49wkg1v8r4kcishd035hlsscv8kc2q4jnln5qmyhpyygjyy"; }; nativeBuildInputs = [ cmake ]; @@ -25,13 +25,29 @@ stdenv.mkDerivation rec { This driver is known to work with these printers: Brother DCP-1510 + Brother DCP-1602 Brother DCP-7030 Brother DCP-7040 Brother DCP-7055 Brother DCP-7055W + Brother DCP-7060D Brother DCP-7065DN - Brother HL-L2300D + Brother DCP-7080 + Brother DCP-L2500D + Brother DCP-L2540DW + Brother HL-1110 series + Brother HL-1200 series + Brother HL-L2300D series + Brother HL-L2320D series + Brother HL-L2340D series + Brother HL-L2360D series + Brother MFC-1910W + Brother MFC-7240 Brother MFC-7360N + Brother MFC-7365DN + Brother MFC-7840W + Brother MFC-L2710DW + Lenovo M7605D ''; homepage = https://github.com/pdewacht/brlaser; license = licenses.gpl2; From bbf0e8aa3cae7bec88ba28b8db6402d066dacf5a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 16 Sep 2019 09:05:14 -0500 Subject: [PATCH 03/38] mediainfo,mediainfo-gui,libmediainfo: 19.07 -> 19.09 --- pkgs/applications/misc/mediainfo-gui/default.nix | 4 ++-- pkgs/applications/misc/mediainfo/default.nix | 4 ++-- pkgs/development/libraries/libmediainfo/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 9eb4a0897d4..b84bc08ddb3 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -2,11 +2,11 @@ , desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "19.07"; + version = "19.09"; pname = "mediainfo-gui"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "0b2ypdlpj5v64ggqk628mgqraba27z725sa0zf0fa4agxhf9ka44"; + sha256 = "1a2ssklg12sjsw09y8my9kf35mizi3zj7w002nspcmw28apb1x82"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index 98d5ef72b22..f084d17e389 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "19.07"; + version = "19.09"; pname = "mediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "0b2ypdlpj5v64ggqk628mgqraba27z725sa0zf0fa4agxhf9ka44"; + sha256 = "1a2ssklg12sjsw09y8my9kf35mizi3zj7w002nspcmw28apb1x82"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index adf856544c4..92fe81c73f4 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "19.07"; + version = "19.09"; pname = "libmediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "0k3d7mha1lay2s09crc9z9zr970l617lb0c3b35wl44flkqf7jss"; + sha256 = "13j7by2czapzi6qznxj4nmn3hwiyglcf2ypja4n6zgnz96jf21pz"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From be3dae2e3ac9a088d23b7770ef42ca6d35510a2d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 17 Sep 2019 08:37:56 +0200 Subject: [PATCH 04/38] nixos: improve the example that shows how to include nvidia_x11 in boot.extraModulePackages Fixes https://github.com/NixOS/nixpkgs/issues/68931. --- nixos/modules/system/boot/kernel.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 50dbf2f8365..8a309f3bc5f 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -108,7 +108,7 @@ in boot.extraModulePackages = mkOption { type = types.listOf types.package; default = []; - example = literalExample "[ pkgs.linuxPackages.nvidia_x11 ]"; + example = literalExample "[ config.boot.kernelPackages.nvidia_x11 ]"; description = "A list of additional packages supplying kernel modules."; }; From dd5eb4dbc2d34f8ef2e4c85286e43bcd7cc003f9 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Fri, 20 Sep 2019 13:28:34 +0200 Subject: [PATCH 05/38] libgdiplus: split package to reduce dependencies closure size nix path-info -rSh on mono: Before: /nix/store/p7zix8ypkqdwz86jvirzn0hmqhkbfhf7-mono-5.20.1.27 1.2G After: /nix/store/zwg8d5m2d7hbi1ylh6rq00wyghyyzpsp-mono-5.20.1.27 881.3M Mostly due to not dragging in cairo-dev, mesa-dev, etc. --- pkgs/development/libraries/libgdiplus/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index 9ba3cdbd09a..558da91fcbf 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation { }) ]; + outputs = [ "out" "dev" ]; + hardeningDisable = [ "format" ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From dc5085e6b06b5b05f66b8ebc8bfb7f308ccf5258 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Fri, 20 Sep 2019 15:25:27 +0200 Subject: [PATCH 06/38] mono: remove dontStrip from derivation This was introduced in 2010 in 9e16b812 and as far as I can tell the issue mentioned in the comment does not exist anymore. In a stripped mono build, I was able to: - Run "mcs --version" without trouble (original test case) - Run "keepass" (mono app) - Build packages that depend on mono (e.g. f# and others). $ nix path-info -sh Before: 537.8M After: 304.3M $ nix path-info -Sh Before: 1.2G After: 867.0M (Transitive closure size decreases more than the package size itself because mono ended up depending on gcc through leaked paths in .so files before.) --- pkgs/development/compilers/mono/generic.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index 9a2f01b9f3d..e0cfe247b23 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -42,10 +42,6 @@ stdenv.mkDerivation rec { ./autogen.sh --prefix $out $configureFlags ''; - # Attempt to fix this error when running "mcs --version": - # The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image - dontStrip = true; - # We want pkg-config to take priority over the dlls in the Mono framework and the GAC # because we control pkg-config patches = [ ./pkgconfig-before-gac.patch ]; From 28b8d6b1720a4e9d845e3ee8a230651d2e3413a0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 21 Sep 2019 14:53:00 +0200 Subject: [PATCH 07/38] postgresql: bump the attribute from PostgreSQL 9.6 to version 11 This change affects packages that refers to postgres in order to get access to the client code, libpq, and these packages will now be compiled supporting the latest version. This change does not affect NixOS, i.e. people who want to run a PostgreSQL server. The NixOS module always refers to specific versions of 'postgres', so if you want to use the latest version there, too, then you'll have to configure your system appropriately in configuration.nix. See https://github.com/NixOS/nixpkgs/pull/69194 for an effort to update the NixOS module, too. Fixes https://github.com/NixOS/nixpkgs/issues/69141. --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30944855831..0d9ddb6919e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14994,9 +14994,9 @@ in postgresql_10 postgresql_11 ; - postgresql = postgresql_9_6.override { this = postgresql; }; + postgresql = postgresql_11.override { this = postgresql; }; postgresqlPackages = recurseIntoAttrs postgresql.pkgs; - postgresql11Packages = recurseIntoAttrs postgresql_11.pkgs; + postgresql11Packages = pkgs.postgresqlPackages; postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; From fd90f361f7df83406312fb25d3a6451763eae4f6 Mon Sep 17 00:00:00 2001 From: Lucio Delelis Date: Wed, 21 Aug 2019 01:23:49 -0300 Subject: [PATCH 08/38] vimPlugins.defx-nvim: init at 2019-08-19 --- pkgs/misc/vim-plugins/generated.nix | 11 +++++++++++ pkgs/misc/vim-plugins/overrides.nix | 4 ++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 3 files changed, 16 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index c82e7dcf8d4..401fa1eac80 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -775,6 +775,17 @@ let }; }; + defx-nvim = buildVimPluginFrom2Nix { + pname = "defx-nvim"; + version = "2019-08-19"; + src = fetchFromGitHub { + owner = "Shougo"; + repo = "defx.nvim"; + rev = "dbd2dceea914ecaa71d24a1d6036f1981becdca5"; + sha256 = "1gl18s39v7k1p6z7hchq1k16f6f1i2ccq76as562c0nvn68jdqi8"; + }; + }; + delimitMate = buildVimPluginFrom2Nix { pname = "delimitMate"; version = "2017-06-19"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index d5a1ed67665..2b44d2a3b27 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -166,6 +166,10 @@ self: super: { ''; }); + defx-nvim = super.defx-nvim.overrideAttrs(old: { + dependencies = with super; [ nvim-yarp ]; + }); + deoplete-fish = super.deoplete-fish.overrideAttrs(old: { dependencies = with super; [ deoplete-nvim vim-fish ]; }); diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 67dd2db4a9f..f3c7c7d4a0e 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -339,6 +339,7 @@ sebastianmarkow/deoplete-rust sheerun/vim-polyglot Shougo/context_filetype.vim Shougo/denite.nvim +Shougo/defx.nvim Shougo/deol.nvim Shougo/deoplete-lsp Shougo/deoplete.nvim From 8d49679f554b8147a8241606ac7944a87c5d5640 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Sun, 22 Sep 2019 08:47:11 +0300 Subject: [PATCH 09/38] janet: 1.2.0 -> 1.3.1 --- pkgs/development/interpreters/janet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 197127d8b6d..d00e37733f2 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "1m34j4h8gh5d773hbw55gs1gimli7ccqpwddn4dd59hzhpihwgqz"; + sha256 = "160wd3436cl50wkvqpaf6mbb69qlzzammcg5yb07wx9yw31g399p"; }; nativeBuildInputs = [ meson ninja ]; - mesonFlags = ["-Dgit_hash=release"]; + mesonFlags = [ "-Dgit_hash=release" ]; doCheck = true; From b7efd50e837103e047021c22c42a5f52a402c11f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 22 Sep 2019 07:48:46 +0200 Subject: [PATCH 10/38] drawio: 11.1.4 -> 11.3.0 Changelogs: https://github.com/jgraph/drawio-desktop/releases/tag/v11.3.0 https://github.com/jgraph/drawio-desktop/releases/tag/v11.3.0 Most salient change: fixes crash after print --- pkgs/applications/graphics/drawio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 3f922530e73..88cff0035c7 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "11.1.4"; + version = "11.3.0"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - sha256 = "0ca8wkkdr7kbb8il84nq05qgd5ykjq15fdv9432wr5p9xmqixz1q"; + sha256 = "00xq2pi84nbdnlbsaj4k9i93skz1nknxvhd2f2cgdm0b3sp86qbk"; }; nativeBuildInputs = [ From 8769547280545e55b124cc98ad5bf17af15902bb Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Sun, 22 Sep 2019 10:40:04 +0200 Subject: [PATCH 11/38] pythonPackages.flask_sqlalchemy: 2.3.2 -> 2.4.0 --- .../python-modules/flask-sqlalchemy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/pkgs/development/python-modules/flask-sqlalchemy/default.nix index aa7b40675b8..2ff84f2531b 100644 --- a/pkgs/development/python-modules/flask-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/flask-sqlalchemy/default.nix @@ -1,16 +1,16 @@ -{ stdenv, buildPythonPackage, fetchPypi, flask, sqlalchemy, pytest }: +{ stdenv, buildPythonPackage, fetchPypi, flask, mock, sqlalchemy, pytest }: buildPythonPackage rec { pname = "Flask-SQLAlchemy"; - version = "2.3.2"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0lvfynbk9y0whpkhqz7kf3hk342sfa3lwqyv25gnb22q5f2vjwar"; + sha256 = "0nnllf0ddbh9jlhngnyjj98lbxgxr1csaplllx0caw98syq0k5hc"; }; propagatedBuildInputs = [ flask sqlalchemy ]; - checkInputs = [ pytest ]; + checkInputs = [ mock pytest ]; checkPhase = '' pytest From 7dfe7aa137b7239d888921ce0f5980b6fbc1901d Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Sun, 22 Sep 2019 10:40:51 +0200 Subject: [PATCH 12/38] pythonPackages.pdf2image: 1.4.2 -> 1.9.0 --- pkgs/development/python-modules/pdf2image/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pdf2image/default.nix b/pkgs/development/python-modules/pdf2image/default.nix index 6d0cafd5f80..1fbddca8cc4 100644 --- a/pkgs/development/python-modules/pdf2image/default.nix +++ b/pkgs/development/python-modules/pdf2image/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pdf2image"; - version = "1.4.2"; + version = "1.9.0"; propagatedBuildInputs = [ pillow poppler_utils ]; src = fetchPypi { inherit pname version; - sha256 = "694f8014f4c3722e5913f1c378c7056b1330db070ff7cb8196a80d24b80fa61e"; + sha256 = "186g36dcfv83iranyd8gqw2zinhpcvmq86zd7sbsn237gcqk43rn"; }; meta = with stdenv.lib; { From 08e1ce73f593d9caeacf7eb41ebb8805d66563e5 Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Sun, 22 Sep 2019 10:41:51 +0200 Subject: [PATCH 13/38] cargo-release: 0.10.5 -> 0.12.4 --- pkgs/tools/package-management/cargo-release/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index 0251e6acf81..eb3977e84e6 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.10.5"; + version = "0.12.4"; src = fetchFromGitHub { owner = "sunng87"; repo = "cargo-release"; - rev = version; - sha256 = "14l5znr1nl69v2v3mdrlas85krq9jn280ssflmd0dz7i4fxiaflc"; + rev = "v${version}"; + sha256 = "02rx25dd3klprwr1qmn5vn4vz4244amk2ky4nqfmi4vq3ygrhd1c"; }; - cargoSha256 = "1l1rvd3i3d7jn3crwc194i5qm3f0jaw7ksb4bvqn3v8rf44chmrs"; + cargoSha256 = "18nbmq8j58jlka1lsrx2y0bhb9l5f3wyvcr1zmmda3hvc3vm7kla"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; From 20de44845d3ec233e9a1d40579aef9e5108ca7d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20NICOLE?= Date: Sun, 22 Sep 2019 10:54:45 +0000 Subject: [PATCH 14/38] bingrep: init at 0.7.0 (#69021) --- .../tools/analysis/bingrep/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/tools/analysis/bingrep/default.nix diff --git a/pkgs/development/tools/analysis/bingrep/default.nix b/pkgs/development/tools/analysis/bingrep/default.nix new file mode 100644 index 00000000000..5fd6b402e0b --- /dev/null +++ b/pkgs/development/tools/analysis/bingrep/default.nix @@ -0,0 +1,23 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "bingrep"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "m4b"; + repo = pname; + # Currently doesn't tag versions so we're using the raw revision + rev = "33d56a4b020c4a3c111294fe41c613d5e8e9c7af"; + sha256 = "0lg92wqknr584b44i5v4f97js56j89z7n8p2zpm8j1pfhjmgcigs"; + }; + + cargoSha256 = "1yxm7waldhilx7wh1ag79rkp8kypb9k1px4ynmzq11r72yl2p4m7"; + + meta = with stdenv.lib; { + description = "Greps through binaries from various OSs and architectures, and colors them"; + homepage = "https://github.com/m4b/bingrep"; + license = licenses.mit; + maintainers = with maintainers; [ minijackson ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2874d1613fa..a2fbc80a9c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9222,6 +9222,8 @@ in bin_replace_string = callPackage ../development/tools/misc/bin_replace_string { }; + bingrep = callPackage ../development/tools/analysis/bingrep { }; + binutils-unwrapped = callPackage ../development/tools/misc/binutils { # FHS sys dirs presumably only have stuff for the build platform noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs; From 53489b496e313bd3ef3f6dd17ef4d28e278c3eb3 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 21 Sep 2019 21:23:48 -0400 Subject: [PATCH 15/38] dtc: fix Python support --- pkgs/development/compilers/dtc/default.nix | 8 ++++---- pkgs/top-level/python-packages.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix index d92d712a3ff..eea75c5ace1 100644 --- a/pkgs/development/compilers/dtc/default.nix +++ b/pkgs/development/compilers/dtc/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchgit, flex, bison, pkgconfig, which -, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform, python2, swig +, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform, python, swig }: stdenv.mkDerivation rec { @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { sha256 = "1jhhfrg22h53lvm2lqhd66pyk20pil08ry03wcwyx1c3ln27k73z"; }; - nativeBuildInputs = [ flex bison pkgconfig which ] ++ lib.optionals pythonSupport [ python2 swig ]; - buildInputs = lib.optionals pythonSupport [ python2 ]; + nativeBuildInputs = [ flex bison pkgconfig which ] ++ lib.optionals pythonSupport [ python swig ]; + buildInputs = lib.optionals pythonSupport [ python ]; postPatch = '' patchShebangs pylibfdt/ ''; - makeFlags = lib.optionals (!pythonSupport) [ "NO_PYTHON=1" ]; + makeFlags = [ "PYTHON=python" ]; installFlags = [ "INSTALL=install" "PREFIX=$(out)" "SETUP_PREFIX=$(out)" ]; meta = with lib; { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3e40a1e6737..035d0d0aba2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2145,9 +2145,9 @@ in { libais = callPackage ../development/python-modules/libais { }; - libfdt = disabledIf isPy3k (toPythonModule (pkgs.dtc.override { - python2 = python; - })); + libfdt = toPythonModule (pkgs.dtc.override { + inherit python; + }); libtmux = callPackage ../development/python-modules/libtmux { }; From 6ceb7a128582a851420524ccb200b69dc75ef217 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Giraudeau Date: Thu, 19 Sep 2019 13:52:14 +0200 Subject: [PATCH 16/38] haskellPackages: unbreak amazonka (and other packages that use it) Closes https://github.com/NixOS/nixpkgs/pull/68944. --- .../haskell-modules/configuration-common.nix | 6 + .../configuration-hackage2nix.yaml | 147 ------------------ .../amazonka-Allow-http-client-0.6.patch | 24 +++ .../amazonka-core-Allow-http-client-0.6.patch | 26 ++++ 4 files changed, 56 insertions(+), 147 deletions(-) create mode 100644 pkgs/development/haskell-modules/patches/amazonka-Allow-http-client-0.6.patch create mode 100644 pkgs/development/haskell-modules/patches/amazonka-core-Allow-http-client-0.6.patch diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index dde4092327b..294fd3949ad 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1231,4 +1231,10 @@ self: super: { # The LTS-14.x version of optparse-applicative is too old. cabal-plan = super.cabal-plan.override { optparse-applicative = self.optparse-applicative_0_15_1_0; }; + # https://github.com/brendanhay/amazonka/commit/657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b + amazonka = appendPatch super.amazonka ./patches/amazonka-Allow-http-client-0.6.patch; + + # https://github.com/brendanhay/amazonka/commit/657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b + amazonka-core = appendPatch super.amazonka-core ./patches/amazonka-core-Allow-http-client-0.6.patch; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index dcfc40ef5ed..84ce4c156ee 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2871,146 +2871,6 @@ broken-packages: - amazon-emailer - amazon-emailer-client-snap - amazon-products - - amazonka - - amazonka-alexa-business - - amazonka-apigateway - - amazonka-application-autoscaling - - amazonka-appstream - - amazonka-appsync - - amazonka-athena - - amazonka-autoscaling - - amazonka-autoscaling-plans - - amazonka-batch - - amazonka-budgets - - amazonka-certificatemanager - - amazonka-certificatemanager-pca - - amazonka-cloud9 - - amazonka-clouddirectory - - amazonka-cloudformation - - amazonka-cloudfront - - amazonka-cloudhsm - - amazonka-cloudhsmv2 - - amazonka-cloudsearch - - amazonka-cloudsearch-domains - - amazonka-cloudtrail - - amazonka-cloudwatch - - amazonka-cloudwatch-events - - amazonka-cloudwatch-logs - - amazonka-codebuild - - amazonka-codecommit - - amazonka-codedeploy - - amazonka-codepipeline - - amazonka-codestar - - amazonka-cognito-identity - - amazonka-cognito-idp - - amazonka-cognito-sync - - amazonka-comprehend - - amazonka-config - - amazonka-connect - - amazonka-core - - amazonka-cost-explorer - - amazonka-cur - - amazonka-datapipeline - - amazonka-devicefarm - - amazonka-directconnect - - amazonka-discovery - - amazonka-dms - - amazonka-ds - - amazonka-dynamodb - - amazonka-dynamodb-dax - - amazonka-dynamodb-streams - - amazonka-ec2 - - amazonka-ecr - - amazonka-ecs - - amazonka-efs - - amazonka-elasticache - - amazonka-elasticbeanstalk - - amazonka-elasticsearch - - amazonka-elastictranscoder - - amazonka-elb - - amazonka-elbv2 - - amazonka-emr - - amazonka-fms - - amazonka-gamelift - - amazonka-glacier - - amazonka-glue - - amazonka-greengrass - - amazonka-guardduty - - amazonka-health - - amazonka-iam - - amazonka-importexport - - amazonka-inspector - - amazonka-iot - - amazonka-iot-analytics - - amazonka-iot-dataplane - - amazonka-iot-jobs-dataplane - - amazonka-kinesis - - amazonka-kinesis-analytics - - amazonka-kinesis-firehose - - amazonka-kinesis-video - - amazonka-kinesis-video-archived-media - - amazonka-kinesis-video-media - - amazonka-kms - - amazonka-lambda - - amazonka-lex-models - - amazonka-lex-runtime - - amazonka-lightsail - - amazonka-marketplace-analytics - - amazonka-marketplace-entitlement - - amazonka-marketplace-metering - - amazonka-mechanicalturk - - amazonka-mediaconvert - - amazonka-medialive - - amazonka-mediapackage - - amazonka-mediastore - - amazonka-mediastore-dataplane - - amazonka-migrationhub - - amazonka-ml - - amazonka-mobile - - amazonka-mq - - amazonka-opsworks - - amazonka-opsworks-cm - - amazonka-organizations - - amazonka-pinpoint - - amazonka-polly - - amazonka-pricing - - amazonka-rds - - amazonka-redshift - - amazonka-rekognition - - amazonka-resourcegroups - - amazonka-resourcegroupstagging - - amazonka-route53 - - amazonka-route53-autonaming - - amazonka-route53-domains - - amazonka-s3 - - amazonka-s3-streaming - - amazonka-sagemaker - - amazonka-sagemaker-runtime - - amazonka-sdb - - amazonka-secretsmanager - - amazonka-serverlessrepo - - amazonka-servicecatalog - - amazonka-ses - - amazonka-shield - - amazonka-sms - - amazonka-snowball - - amazonka-sns - - amazonka-sqs - - amazonka-ssm - - amazonka-stepfunctions - - amazonka-storagegateway - - amazonka-sts - - amazonka-support - - amazonka-swf - - amazonka-test - - amazonka-transcribe - - amazonka-translate - - amazonka-waf - - amazonka-waf-regional - - amazonka-workdocs - - amazonka-workmail - - amazonka-workspaces - - amazonka-xray - amby - AMI - ampersand @@ -3211,7 +3071,6 @@ broken-packages: - aws-configuration-tools - aws-dynamodb-conduit - aws-dynamodb-streams - - aws-easy - aws-ec2 - aws-ec2-knownhosts - aws-elastic-transcoder @@ -3227,7 +3086,6 @@ broken-packages: - aws-sdk - aws-sdk-text-converter - aws-sdk-xml-unordered - - aws-ses-easy - aws-sign4 - aws-simple - aws-sns @@ -3933,7 +3791,6 @@ broken-packages: - conduit-throttle - conduit-tokenize-attoparsec - conf - - confcrypt - conffmt - confide - config-parser @@ -4503,7 +4360,6 @@ broken-packages: - easyplot - ebeats - ebnf-bff - - ec2-unikernel - ecma262 - ecu - eddie @@ -4530,7 +4386,6 @@ broken-packages: - Eight-Ball-Pool-Hack-Cheats - either-list-functions - EitherT - - ekg-cloudwatch - ekg-elastic - ekg-elasticsearch - ekg-influxdb @@ -5732,7 +5587,6 @@ broken-packages: - heartbeat-streams - heatitup - heatitup-complete - - heavy-logger-amazon - hecc - heckle - hedgehog-checkers @@ -8848,7 +8702,6 @@ broken-packages: - servant-zeppelin-server - servant-zeppelin-swagger - server-generic - - serverless-haskell - serversession-backend-redis - serversession-frontend-snap - serversession-frontend-yesod diff --git a/pkgs/development/haskell-modules/patches/amazonka-Allow-http-client-0.6.patch b/pkgs/development/haskell-modules/patches/amazonka-Allow-http-client-0.6.patch new file mode 100644 index 00000000000..9e1eeb75160 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/amazonka-Allow-http-client-0.6.patch @@ -0,0 +1,24 @@ +From 657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b Mon Sep 17 00:00:00 2001 +From: Mikhail Glushenkov +Date: Wed, 10 Apr 2019 17:42:57 +0100 +Subject: [PATCH] Allow http-client 0.6.*. + +Changelog doesn't list any silently breaking semantic changes. +--- + amazonka/amazonka.cabal | 2 +- + core/amazonka-core.cabal | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/amazonka/amazonka.cabal b/amazonka/amazonka.cabal +index e86713f11c..81c4cb7e48 100644 +--- a/amazonka.cabal ++++ b/amazonka.cabal +@@ -67,7 +67,7 @@ library + , conduit-extra >= 1.1 + , directory >= 1.2 + , exceptions >= 0.6 +- , http-client >= 0.4 && < 0.6 ++ , http-client >= 0.4 && < 0.7 + , http-conduit >= 2.1.7 && < 3 + , http-types >= 0.8 + , ini >= 0.3.5 diff --git a/pkgs/development/haskell-modules/patches/amazonka-core-Allow-http-client-0.6.patch b/pkgs/development/haskell-modules/patches/amazonka-core-Allow-http-client-0.6.patch new file mode 100644 index 00000000000..d99072d79c6 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/amazonka-core-Allow-http-client-0.6.patch @@ -0,0 +1,26 @@ +From 657b70d174fe5cb61e56cb8b9c5e57f1ec216f2b Mon Sep 17 00:00:00 2001 +From: Mikhail Glushenkov +Date: Wed, 10 Apr 2019 17:42:57 +0100 +Subject: [PATCH] Allow http-client 0.6.*. + +Changelog doesn't list any silently breaking semantic changes. +--- + amazonka/amazonka.cabal | 2 +- + core/amazonka-core.cabal | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/core/amazonka-core.cabal b/core/amazonka-core.cabal +index 9796e007cf..eccb24e5bd 100644 +--- a/amazonka-core.cabal ++++ b/amazonka-core.cabal +@@ -90,7 +90,7 @@ library + , deepseq >= 1.4 + , exceptions >= 0.6 + , hashable >= 1.2 +- , http-client >= 0.4 && < 0.6 ++ , http-client >= 0.4 && < 0.7 + , http-conduit >= 2.1.4 && < 3 + , http-types >= 0.8 && (<0.11 || >=0.12) + , lens >= 4.4 +-- +2.23.0 From b5344ae807478cc0336bf14ca82284389aba6584 Mon Sep 17 00:00:00 2001 From: Luke Clifton Date: Thu, 19 Sep 2019 19:11:35 +0800 Subject: [PATCH 17/38] haskellPackages.shh: mark not broken --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 84ce4c156ee..9eccd6e1e91 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -8758,8 +8758,6 @@ broken-packages: - shellish - shellmate - shellmate-extras - - shh - - shh-extras - shivers-cfg - shoap - shopify From 348656cea85d8e1f4df6429091ffb92cd05e92a3 Mon Sep 17 00:00:00 2001 From: Travis Whitaker Date: Tue, 17 Sep 2019 15:16:11 -0700 Subject: [PATCH 18/38] haskell.compiler.ghcjs86: Bump ghc-8.6 branch, fix build. --- .../development/compilers/ghcjs-ng/8.6/dep-overrides.nix | 4 ++++ pkgs/development/compilers/ghcjs-ng/8.6/git.json | 4 ++-- pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix | 9 +++++---- pkgs/development/compilers/ghcjs-ng/common-overrides.nix | 3 +-- pkgs/development/compilers/ghcjs-ng/default.nix | 1 - 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix b/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix index 53b6dd43134..c54c782fafa 100644 --- a/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix +++ b/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix @@ -2,6 +2,10 @@ let inherit (haskellLib) doJailbreak dontHaddock; in self: super: { + ghc-api-ghcjs = super.ghc-api-ghcjs.override + { + happy = self.happy_1_19_5; + }; haddock-library-ghcjs = doJailbreak super.haddock-library-ghcjs; haddock-api-ghcjs = doJailbreak (dontHaddock super.haddock-api-ghcjs); } diff --git a/pkgs/development/compilers/ghcjs-ng/8.6/git.json b/pkgs/development/compilers/ghcjs-ng/8.6/git.json index 37861b96e7a..1114e1a1290 100644 --- a/pkgs/development/compilers/ghcjs-ng/8.6/git.json +++ b/pkgs/development/compilers/ghcjs-ng/8.6/git.json @@ -1,6 +1,6 @@ { "url": "https://github.com/ghcjs/ghcjs", - "rev": "75c61af32d73def4409d1fe7b64659c1d28cd075", - "sha256": "18pixn6xdz6qp941yhxfnmwi463jnpskmg473lv07vvgy4hpgjhj", + "rev": "e87195eaa2bc7e320e18cf10386802bc90b7c874", + "sha256": "02mwkf7aagxqi142gcmq048244apslrr72p568akcab9s0fn2gvy", "fetchSubmodules": true } diff --git a/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix b/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix index a89ab15c55f..b957a6aa9e1 100644 --- a/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix +++ b/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix @@ -59,20 +59,21 @@ }) {}; ghc-api-ghcjs = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers + ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghc-heap - , ghci-ghcjs, hpc, process, stdenv, template-haskell-ghcjs + , ghci-ghcjs, happy, hpc, process, stdenv, template-haskell-ghcjs , terminfo, time, transformers, unix }: mkDerivation { pname = "ghc-api-ghcjs"; - version = "8.6.2"; + version = "8.6.5"; src = configuredSrc + /lib/ghc-api-ghcjs; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath ghc-boot ghc-boot-th ghc-heap ghci-ghcjs hpc process template-haskell-ghcjs terminfo time transformers unix ]; + libraryToolDepends = [ alex happy ]; homepage = "http://www.haskell.org/ghc/"; description = "The GHC API (customized for GHCJS)"; license = stdenv.lib.licenses.bsd3; @@ -107,7 +108,7 @@ base binary bytestring containers ghc-prim ghci-ghcjs template-haskell-ghcjs ]; - homepage = "https://github.com/ghcjs"; + homepage = "http://github.com/ghcjs"; license = stdenv.lib.licenses.mit; }) {}; diff --git a/pkgs/development/compilers/ghcjs-ng/common-overrides.nix b/pkgs/development/compilers/ghcjs-ng/common-overrides.nix index 52f3ad497ad..00a071651ed 100644 --- a/pkgs/development/compilers/ghcjs-ng/common-overrides.nix +++ b/pkgs/development/compilers/ghcjs-ng/common-overrides.nix @@ -1,8 +1,7 @@ -{ haskellLib, alex, happy }: +{ haskellLib }: let inherit (haskellLib) addBuildTools appendConfigureFlag dontHaddock doJailbreak; in self: super: { - ghc-api-ghcjs = addBuildTools super.ghc-api-ghcjs [alex happy]; ghcjs = dontHaddock (appendConfigureFlag (doJailbreak super.ghcjs) "-fno-wrapper-install"); haddock-library-ghcjs = dontHaddock super.haddock-library-ghcjs; system-fileio = doJailbreak super.system-fileio; diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index 068d7b578df..e668be8e074 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -34,7 +34,6 @@ let (callPackage ./common-overrides.nix { inherit haskellLib; - inherit (bootPkgs) alex happy; }) ghcjsDepOverrides ]); From d383a4cd9154f5952919feac86bb7fc0e566a245 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Sun, 15 Sep 2019 20:00:33 +0200 Subject: [PATCH 19/38] Revert "haskell-hakyll: patch Cabal file from upstream" This reverts commit fe366d43e85df82739756ec16fcb5a0d3b77f681. --- .../development/haskell-modules/configuration-common.nix | 9 ++------- .../haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 294fd3949ad..fd8bfef030a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -146,16 +146,11 @@ self: super: { else super.halive; # Hakyll's tests are broken on Darwin (3 failures); and they require util-linux - hakyll = appendPatch - (if pkgs.stdenv.isDarwin + hakyll = if pkgs.stdenv.isDarwin then dontCheck (overrideCabal super.hakyll (drv: { testToolDepends = []; })) - else super.hakyll) - (pkgs.fetchpatch { - url = https://github.com/jaspervdj/hakyll/commit/25a4460b75b3c9f3ce339b3311b084d92994f5f1.patch; - sha256 = "sha256-F59WHt52LOKGsGoaD3LAIZFEMe9s9WHfGxQgSh9Q8uQ="; - }); + else super.hakyll; double-conversion = if !pkgs.stdenv.isDarwin then super.double-conversion diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 9eccd6e1e91..d76fb9a9535 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5236,7 +5236,6 @@ broken-packages: - hakismet - hakka - hako - - hakyll - hakyll-agda - hakyll-blaze-templates - hakyll-contrib From 27d01d77129af6ee19547fdfd9c7af7fc22bebe1 Mon Sep 17 00:00:00 2001 From: Benjamin Esham Date: Sat, 21 Sep 2019 08:58:44 -0700 Subject: [PATCH 20/38] haskellPackages.pinboard-notes-backup: mark not broken --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index d76fb9a9535..b56d2c7ae2d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -7824,7 +7824,6 @@ broken-packages: - pier-core - piet - pig - - pinboard-notes-backup - pinchot - ping - pinpon From da2e9d26ef8383f0c170e39e0ca444fa89f4d52a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Sep 2019 15:13:27 +0000 Subject: [PATCH 21/38] haskell-HStringTemplate: jailbreak when building with ghc-8.8.x --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 41925d89550..9e613c6f933 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -163,4 +163,8 @@ self: super: { url = "https://github.com/simonmar/alex/commit/deaae6eddef5186bfd0e42e2c3ced39e26afa4d6.patch"; sha256 = "1v40gmnw4lqyk271wngdwz8whpfdhmza58srbkka8icwwwrck3l5"; }); + + # break out of 'time >=1.4.2 && <1.9' + HStringTemplate = doJailbreak super.HStringTemplate; + } From fbd700b12824ea644801b4b709f2a6aac458e95e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Sep 2019 15:13:27 +0000 Subject: [PATCH 22/38] haskell-X11: patch the build to succeed with ghc-8.8.x --- .../development/haskell-modules/configuration-ghc-8.8.x.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 9e613c6f933..cead355b145 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -167,4 +167,10 @@ self: super: { # break out of 'time >=1.4.2 && <1.9' HStringTemplate = doJailbreak super.HStringTemplate; + # don't use obsolete "defaultUserHooks" in Setup.hs + X11 = appendPatch super.X11 (pkgs.fetchpatch { + url = "https://github.com/xmonad/X11/commit/8d817617afa1b54e6c50a9cc552dc1c0804c1794.patch"; + sha256 = "0zsgzn0nvdxvqi5z0za3gzlhql2x5d5cr0kkr19j5c67fy177w6b"; + }); + } From ec49ae6fe19785940424ba2e2ae00c50883b2d2f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Sep 2019 15:13:27 +0000 Subject: [PATCH 23/38] haskell-HStringTemplate: drop obsolete override --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index cead355b145..aaef02f058f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -164,9 +164,6 @@ self: super: { sha256 = "1v40gmnw4lqyk271wngdwz8whpfdhmza58srbkka8icwwwrck3l5"; }); - # break out of 'time >=1.4.2 && <1.9' - HStringTemplate = doJailbreak super.HStringTemplate; - # don't use obsolete "defaultUserHooks" in Setup.hs X11 = appendPatch super.X11 (pkgs.fetchpatch { url = "https://github.com/xmonad/X11/commit/8d817617afa1b54e6c50a9cc552dc1c0804c1794.patch"; From e3488760a10be1981c779325f4d033a7b93c341f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Sep 2019 15:13:27 +0000 Subject: [PATCH 24/38] hackage2nix: disable broken builds that cause evaluation errors on Hydra --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index b56d2c7ae2d..68a05ff9411 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2910,6 +2910,7 @@ broken-packages: - antiope-messages - antiope-optparse-applicative - antiope-s3 + - antiope-shell - antiope-sns - antiope-sqs - antiope-swf @@ -8610,6 +8611,7 @@ broken-packages: - selenium - selenium-server - selinux + - semantic-source - Semantique - semdoc - semi-iso From c464e35b69ac60fef29ed90e9499557c8e66856e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Sep 2019 15:13:27 +0000 Subject: [PATCH 25/38] haskell-lens: use the latest version when building with ghc-8.8.x --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index aaef02f058f..3db1f35bf11 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -113,10 +113,7 @@ self: super: { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/socks-0.6.0.patch"; sha256 = "1dsqmx0sw62x4glh43c0sbizd2y00v5xybiqadn96v6pmfrap5cp"; }); - lens = appendPatch (doJailbreak super.lens) (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/lens-4.17.1.patch"; - sha256 = "0w89ipi6dfkx5vlw4a64hh6fd0bm9hg33mwpghliyyxik5jmilv1"; - }); + lens = self.lens_4_18_1; polyparse = appendPatch (doJailbreak super.polyparse) (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/polyparse-1.12.1.patch"; sha256 = "01b2gnsq0x4fd9na8zpk6pajym55mbz64hgzawlwxdw0y6681kr5"; From a0ac8c878465e34ca4576ca077ed78ebf3633387 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Sep 2019 15:13:27 +0000 Subject: [PATCH 26/38] haskell-xmonad-contrib: use the latest version when building with ghc-8.8.x --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 3db1f35bf11..0e9097db5ce 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -114,6 +114,7 @@ self: super: { sha256 = "1dsqmx0sw62x4glh43c0sbizd2y00v5xybiqadn96v6pmfrap5cp"; }); lens = self.lens_4_18_1; + xmonad-contrib = self.xmonad-contrib_0_16; polyparse = appendPatch (doJailbreak super.polyparse) (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/polyparse-1.12.1.patch"; sha256 = "01b2gnsq0x4fd9na8zpk6pajym55mbz64hgzawlwxdw0y6681kr5"; From cab7cea53cae57a769fbf073dcf69fb40e6596d6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Sep 2019 15:13:27 +0000 Subject: [PATCH 27/38] haskell-cassava: use the latest version when building with ghc-8.8.x --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 0e9097db5ce..8ff184cb280 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -101,10 +101,6 @@ self: super: { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-tdfa-1.2.3.1.patch"; sha256 = "1lhas4s2ms666prb475gaw2bqw1v4y8cxi66sy20j727sx7ppjs7"; }); - cassava = appendPatch super.cassava (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/cassava-0.5.1.0.patch"; - sha256 = "11scwwjp94si90vb8v5yr291g9qwv5l223z8y0g0lc63932bp63g"; - }); shakespeare = appendPatch super.shakespeare (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/shakespeare-2.0.20.patch"; sha256 = "1dgx41ylahj4wk8r422aik0d7qdpawdga4gqz905nvlnhqjla58y"; From 4f21e87fbe32f9aa260eb0cdf576e47d1e321892 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Sep 2019 15:13:27 +0000 Subject: [PATCH 28/38] haskell-aeson-diff: jailbreak when building with ghc-8.8.x --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 8ff184cb280..93dd837b106 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -164,4 +164,7 @@ self: super: { sha256 = "0zsgzn0nvdxvqi5z0za3gzlhql2x5d5cr0kkr19j5c67fy177w6b"; }); + # over-specified version constraints + aeson-diff = doJailbreak super.aeson-diff; + } From a62a68e1253278f4a308861a4df677f74a66ec8c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Sep 2019 15:13:27 +0000 Subject: [PATCH 29/38] haskell-hpack: mark the build as broken when compiling with ghc-8.8.x --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 93dd837b106..314c11e245d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -167,4 +167,7 @@ self: super: { # over-specified version constraints aeson-diff = doJailbreak super.aeson-diff; + # https://github.com/sol/hpack/issues/371 + hpack = markBrokenVersion "0.32.0" super.hpack; + } From 9b4cd7c36b8e9fb19bcfc21e48016eac6ab7174c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Sep 2019 15:13:27 +0000 Subject: [PATCH 30/38] haskell-csv: patch the build to succeed when compiling with ghc-8.8.x --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 314c11e245d..9626c9f8920 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -170,4 +170,7 @@ self: super: { # https://github.com/sol/hpack/issues/371 hpack = markBrokenVersion "0.32.0" super.hpack; + # Upstream ships a broken Setup.hs file. + csv = overrideCabal super.csv (drv: { prePatch = "rm Setup.hs"; }); + } From 373796c4112fcacca3688f1825d327f012388328 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Sep 2019 15:13:27 +0000 Subject: [PATCH 31/38] haskell-shakespeare: drop obsolete patch to fix the build with ghc-8.8.x --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 9626c9f8920..49ccfbaf8e5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -101,10 +101,6 @@ self: super: { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-tdfa-1.2.3.1.patch"; sha256 = "1lhas4s2ms666prb475gaw2bqw1v4y8cxi66sy20j727sx7ppjs7"; }); - shakespeare = appendPatch super.shakespeare (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/shakespeare-2.0.20.patch"; - sha256 = "1dgx41ylahj4wk8r422aik0d7qdpawdga4gqz905nvlnhqjla58y"; - }); socks = appendPatch (doJailbreak super.socks) (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/socks-0.6.0.patch"; sha256 = "1dsqmx0sw62x4glh43c0sbizd2y00v5xybiqadn96v6pmfrap5cp"; From 7832aefa8064aeca26c0a2249897a785067d6aad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Sep 2019 15:13:27 +0000 Subject: [PATCH 32/38] haskell-monad-par: disable the test suite when building with ghc-8.8.x --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 49ccfbaf8e5..799f8cc37b4 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -147,6 +147,7 @@ self: super: { }); tls = self.tls_1_5_1; vault = dontHaddock super.vault; + monad-par = dontCheck super.monad-par; # test suite does not compile in monad-par-0.3.4.8 # TODO dont fetch patch if https://github.com/simonmar/alex/issues/140 is resolved alex = appendPatch super.alex (pkgs.fetchpatch { From 666dac71ac18e313912525733a74d7c995dcdec6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Sep 2019 15:13:27 +0000 Subject: [PATCH 33/38] haskell-string-qq: patch the build to succeed when compiling with ghc-8.8.x --- .../haskell-modules/configuration-ghc-8.8.x.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 799f8cc37b4..143e7259d58 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -170,4 +170,14 @@ self: super: { # Upstream ships a broken Setup.hs file. csv = overrideCabal super.csv (drv: { prePatch = "rm Setup.hs"; }); + # Upstream ships a broken Setup.hs file. + string-qq = overrideSrc (dontCheck super.string-qq) { + src = pkgs.fetchFromGitHub { + owner = "dmwit"; + repo = "string-qq"; + rev = "b396f5ef36a9b23f1d3fafcc91f2222cd1ad24fe"; + sha256 = "1z2f1yry8wi0jb38dgz7rl89zl63fhngf7xk4ljw240vn315jj8s"; + }; + }; + } From ad9d8b7aad7fc609d64bb7e0dd1667046225ecb3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 19 Sep 2019 13:57:56 +0200 Subject: [PATCH 34/38] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.14.4-12-gd19721c from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/c0f0a4b290db5872b3d7e003af0cd0958a3d42f6. --- .../haskell-modules/hackage-packages.nix | 1230 +++++++++++------ 1 file changed, 783 insertions(+), 447 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d71a1c65a24..f929844f55b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -4407,6 +4407,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Diff_0_4_0" = callPackage + ({ mkDerivation, array, base, directory, pretty, process + , QuickCheck, test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "Diff"; + version = "0.4.0"; + sha256 = "1is9y5rlqyxacnj6kbi6h9laym5shp699r0hkj5p9d6qi84sr43j"; + libraryHaskellDepends = [ array base pretty ]; + testHaskellDepends = [ + array base directory pretty process QuickCheck test-framework + test-framework-quickcheck2 + ]; + description = "O(ND) diff algorithm in haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "DifferenceLogic" = callPackage ({ mkDerivation, base, containers, fgl, FirstOrderTheory, HUnit }: mkDerivation { @@ -9085,6 +9103,8 @@ self: { pname = "HStringTemplate"; version = "0.8.7"; sha256 = "03kbmyh0713j3qhhrl7jqbmsvyq1q82h2yxq45cc9rs55sma8kjg"; + revision = "1"; + editedCabalFile = "0s7y606q2q0vnbg9c51kypawyvapva60i2lw1dg1bij50aiv5d3i"; libraryHaskellDepends = [ array base blaze-builder bytestring containers deepseq directory filepath mtl old-locale parsec pretty semigroups syb @@ -10617,6 +10637,28 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "HsYAML_0_2_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, mtl, parsec + , QuickCheck, tasty, tasty-quickcheck, text + }: + mkDerivation { + pname = "HsYAML"; + version = "0.2.0.0"; + sha256 = "1x8zrnaqvfkap4q2gldj0y4q63kbjka8383s5k4mb0ka1n3dfqhq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers deepseq mtl parsec text + ]; + testHaskellDepends = [ + base bytestring containers mtl QuickCheck tasty tasty-quickcheck + text + ]; + description = "Pure Haskell YAML 1.2 processor"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HsYAML-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, HsYAML, mtl, text, vector }: @@ -12711,8 +12753,8 @@ self: { }: mkDerivation { pname = "Map"; - version = "0.1.1.0"; - sha256 = "0x5sy115f5yx580g8pl8jkjwzd0ih2n4fbvh5f5ch2i749l4dyq1"; + version = "0.1.2.0"; + sha256 = "1fvs9im82ylfij01cn2pb21wycvb6wsj8dayaj34g3av82g9dagw"; libraryHaskellDepends = [ base containers either-both filtrable util ]; @@ -21140,6 +21182,18 @@ self: { broken = true; }) {}; + "abides" = callPackage + ({ mkDerivation, base, comonad, tasty, tasty-quickcheck }: + mkDerivation { + pname = "abides"; + version = "0.0.0"; + sha256 = "0bksprm776xqxvizmwxaq996kvwj4gvd4ckwalr72aa2082vzs17"; + libraryHaskellDepends = [ base comonad ]; + testHaskellDepends = [ base comonad tasty tasty-quickcheck ]; + description = "Simple boolean tests to see if a value abides by certain properties"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "abnf" = callPackage ({ mkDerivation, attoparsec, base, containers, HUnit, megaparsec , tasty, tasty-hunit, test-framework, test-framework-hunit, text @@ -23594,6 +23648,28 @@ self: { broken = true; }) {}; + "aeson-schemas" = callPackage + ({ mkDerivation, aeson, base, bytestring, first-class-families + , megaparsec, raw-strings-qq, tasty, tasty-golden, template-haskell + , text, th-test-utils, unordered-containers + }: + mkDerivation { + pname = "aeson-schemas"; + version = "1.0.2"; + sha256 = "1f75fk4775gri6qvgkcsfx9v7f832zy76z61wl63q8h0yh6lapxl"; + libraryHaskellDepends = [ + aeson base bytestring first-class-families megaparsec + template-haskell text unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring first-class-families megaparsec + raw-strings-qq tasty tasty-golden template-haskell text + th-test-utils unordered-containers + ]; + description = "Easily consume JSON data on-demand with type-safety"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aeson-serialize" = callPackage ({ mkDerivation, aeson, base, cereal, hspec, HUnit }: mkDerivation { @@ -25290,8 +25366,6 @@ self: { testHaskellDepends = [ base tasty tasty-hunit ]; description = "Comprehensive Amazon Web Services SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-alexa-business" = callPackage @@ -25309,8 +25383,6 @@ self: { ]; description = "Amazon Alexa For Business SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-apigateway" = callPackage @@ -25328,8 +25400,6 @@ self: { ]; description = "Amazon API Gateway SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-application-autoscaling" = callPackage @@ -25347,8 +25417,6 @@ self: { ]; description = "Amazon Application Auto Scaling SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-appstream" = callPackage @@ -25366,8 +25434,6 @@ self: { ]; description = "Amazon AppStream SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-appsync" = callPackage @@ -25385,8 +25451,6 @@ self: { ]; description = "Amazon AppSync SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-athena" = callPackage @@ -25404,8 +25468,6 @@ self: { ]; description = "Amazon Athena SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-autoscaling" = callPackage @@ -25423,8 +25485,6 @@ self: { ]; description = "Amazon Auto Scaling SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-autoscaling-plans" = callPackage @@ -25442,8 +25502,6 @@ self: { ]; description = "Amazon Auto Scaling Plans SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-batch" = callPackage @@ -25461,8 +25519,6 @@ self: { ]; description = "Amazon Batch SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-budgets" = callPackage @@ -25480,8 +25536,6 @@ self: { ]; description = "Amazon Budgets SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-certificatemanager" = callPackage @@ -25499,8 +25553,6 @@ self: { ]; description = "Amazon Certificate Manager SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-certificatemanager-pca" = callPackage @@ -25518,8 +25570,6 @@ self: { ]; description = "Amazon Certificate Manager Private Certificate Authority SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cloud9" = callPackage @@ -25537,8 +25587,6 @@ self: { ]; description = "Amazon Cloud9 SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-clouddirectory" = callPackage @@ -25556,8 +25604,6 @@ self: { ]; description = "Amazon CloudDirectory SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cloudformation" = callPackage @@ -25575,8 +25621,6 @@ self: { ]; description = "Amazon CloudFormation SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cloudfront" = callPackage @@ -25594,8 +25638,6 @@ self: { ]; description = "Amazon CloudFront SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cloudhsm" = callPackage @@ -25613,8 +25655,6 @@ self: { ]; description = "Amazon CloudHSM SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cloudhsmv2" = callPackage @@ -25632,8 +25672,6 @@ self: { ]; description = "Amazon CloudHSM V2 SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cloudsearch" = callPackage @@ -25651,8 +25689,6 @@ self: { ]; description = "Amazon CloudSearch SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cloudsearch-domains" = callPackage @@ -25670,8 +25706,6 @@ self: { ]; description = "Amazon CloudSearch Domain SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cloudtrail" = callPackage @@ -25689,8 +25723,6 @@ self: { ]; description = "Amazon CloudTrail SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cloudwatch" = callPackage @@ -25708,8 +25740,6 @@ self: { ]; description = "Amazon CloudWatch SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cloudwatch-events" = callPackage @@ -25727,8 +25757,6 @@ self: { ]; description = "Amazon CloudWatch Events SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cloudwatch-logs" = callPackage @@ -25746,8 +25774,6 @@ self: { ]; description = "Amazon CloudWatch Logs SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-codebuild" = callPackage @@ -25765,8 +25791,6 @@ self: { ]; description = "Amazon CodeBuild SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-codecommit" = callPackage @@ -25784,8 +25808,6 @@ self: { ]; description = "Amazon CodeCommit SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-codedeploy" = callPackage @@ -25803,8 +25825,6 @@ self: { ]; description = "Amazon CodeDeploy SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-codepipeline" = callPackage @@ -25822,8 +25842,6 @@ self: { ]; description = "Amazon CodePipeline SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-codestar" = callPackage @@ -25841,8 +25859,6 @@ self: { ]; description = "Amazon CodeStar SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cognito-identity" = callPackage @@ -25860,8 +25876,6 @@ self: { ]; description = "Amazon Cognito Identity SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cognito-idp" = callPackage @@ -25879,8 +25893,6 @@ self: { ]; description = "Amazon Cognito Identity Provider SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cognito-sync" = callPackage @@ -25898,8 +25910,6 @@ self: { ]; description = "Amazon Cognito Sync SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-comprehend" = callPackage @@ -25917,8 +25927,6 @@ self: { ]; description = "Amazon Comprehend SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-config" = callPackage @@ -25936,8 +25944,6 @@ self: { ]; description = "Amazon Config SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-connect" = callPackage @@ -25955,8 +25961,6 @@ self: { ]; description = "Amazon Connect Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-core" = callPackage @@ -25987,8 +25991,6 @@ self: { ]; description = "Core data types and functionality for Amazonka libraries"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cost-explorer" = callPackage @@ -26006,8 +26008,6 @@ self: { ]; description = "Amazon Cost Explorer Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-cur" = callPackage @@ -26025,8 +26025,6 @@ self: { ]; description = "Amazon Cost and Usage Report Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-datapipeline" = callPackage @@ -26044,8 +26042,6 @@ self: { ]; description = "Amazon Data Pipeline SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-devicefarm" = callPackage @@ -26063,8 +26059,6 @@ self: { ]; description = "Amazon Device Farm SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-directconnect" = callPackage @@ -26082,8 +26076,6 @@ self: { ]; description = "Amazon Direct Connect SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-discovery" = callPackage @@ -26101,8 +26093,6 @@ self: { ]; description = "Amazon Application Discovery Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-dms" = callPackage @@ -26120,8 +26110,6 @@ self: { ]; description = "Amazon Database Migration Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-ds" = callPackage @@ -26139,8 +26127,6 @@ self: { ]; description = "Amazon Directory Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-dynamodb" = callPackage @@ -26158,8 +26144,6 @@ self: { ]; description = "Amazon DynamoDB SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-dynamodb-dax" = callPackage @@ -26177,8 +26161,6 @@ self: { ]; description = "Amazon DynamoDB Accelerator (DAX) SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-dynamodb-streams" = callPackage @@ -26196,8 +26178,6 @@ self: { ]; description = "Amazon DynamoDB Streams SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-ec2" = callPackage @@ -26215,8 +26195,6 @@ self: { ]; description = "Amazon Elastic Compute Cloud SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-ecr" = callPackage @@ -26234,8 +26212,6 @@ self: { ]; description = "Amazon EC2 Container Registry SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-ecs" = callPackage @@ -26253,8 +26229,6 @@ self: { ]; description = "Amazon EC2 Container Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-efs" = callPackage @@ -26272,8 +26246,6 @@ self: { ]; description = "Amazon Elastic File System SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-elasticache" = callPackage @@ -26291,8 +26263,6 @@ self: { ]; description = "Amazon ElastiCache SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-elasticbeanstalk" = callPackage @@ -26310,8 +26280,6 @@ self: { ]; description = "Amazon Elastic Beanstalk SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-elasticsearch" = callPackage @@ -26329,8 +26297,6 @@ self: { ]; description = "Amazon Elasticsearch Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-elastictranscoder" = callPackage @@ -26348,8 +26314,6 @@ self: { ]; description = "Amazon Elastic Transcoder SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-elb" = callPackage @@ -26367,8 +26331,6 @@ self: { ]; description = "Amazon Elastic Load Balancing SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-elbv2" = callPackage @@ -26386,8 +26348,6 @@ self: { ]; description = "Amazon Elastic Load Balancing SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-emr" = callPackage @@ -26405,8 +26365,6 @@ self: { ]; description = "Amazon Elastic MapReduce SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-fms" = callPackage @@ -26424,8 +26382,6 @@ self: { ]; description = "Amazon Firewall Management Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-gamelift" = callPackage @@ -26443,8 +26399,6 @@ self: { ]; description = "Amazon GameLift SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-glacier" = callPackage @@ -26462,8 +26416,6 @@ self: { ]; description = "Amazon Glacier SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-glue" = callPackage @@ -26481,8 +26433,6 @@ self: { ]; description = "Amazon Glue SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-greengrass" = callPackage @@ -26500,8 +26450,6 @@ self: { ]; description = "Amazon Greengrass SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-guardduty" = callPackage @@ -26519,8 +26467,6 @@ self: { ]; description = "Amazon GuardDuty SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-health" = callPackage @@ -26538,8 +26484,6 @@ self: { ]; description = "Amazon Health APIs and Notifications SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-iam" = callPackage @@ -26557,8 +26501,6 @@ self: { ]; description = "Amazon Identity and Access Management SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-iam-policy" = callPackage @@ -26597,8 +26539,6 @@ self: { ]; description = "Amazon Import/Export SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-inspector" = callPackage @@ -26616,8 +26556,6 @@ self: { ]; description = "Amazon Inspector SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-iot" = callPackage @@ -26635,8 +26573,6 @@ self: { ]; description = "Amazon IoT SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-iot-analytics" = callPackage @@ -26654,8 +26590,6 @@ self: { ]; description = "Amazon IoT Analytics SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-iot-dataplane" = callPackage @@ -26673,8 +26607,6 @@ self: { ]; description = "Amazon IoT Data Plane SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-iot-jobs-dataplane" = callPackage @@ -26692,8 +26624,6 @@ self: { ]; description = "Amazon IoT Jobs Data Plane SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-kinesis" = callPackage @@ -26711,8 +26641,6 @@ self: { ]; description = "Amazon Kinesis SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-kinesis-analytics" = callPackage @@ -26730,8 +26658,6 @@ self: { ]; description = "Amazon Kinesis Analytics SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-kinesis-firehose" = callPackage @@ -26749,8 +26675,6 @@ self: { ]; description = "Amazon Kinesis Firehose SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-kinesis-video" = callPackage @@ -26768,8 +26692,6 @@ self: { ]; description = "Amazon Kinesis Video Streams SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-kinesis-video-archived-media" = callPackage @@ -26787,8 +26709,6 @@ self: { ]; description = "Amazon Kinesis Video Streams Archived Media SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-kinesis-video-media" = callPackage @@ -26806,8 +26726,6 @@ self: { ]; description = "Amazon Kinesis Video Streams Media SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-kms" = callPackage @@ -26825,8 +26743,6 @@ self: { ]; description = "Amazon Key Management Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-lambda" = callPackage @@ -26844,8 +26760,6 @@ self: { ]; description = "Amazon Lambda SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-lex-models" = callPackage @@ -26863,8 +26777,6 @@ self: { ]; description = "Amazon Lex Model Building Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-lex-runtime" = callPackage @@ -26882,8 +26794,6 @@ self: { ]; description = "Amazon Lex Runtime Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-lightsail" = callPackage @@ -26901,8 +26811,6 @@ self: { ]; description = "Amazon Lightsail SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-marketplace-analytics" = callPackage @@ -26920,8 +26828,6 @@ self: { ]; description = "Amazon Marketplace Commerce Analytics SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-marketplace-entitlement" = callPackage @@ -26939,8 +26845,6 @@ self: { ]; description = "Amazon Marketplace Entitlement Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-marketplace-metering" = callPackage @@ -26958,8 +26862,6 @@ self: { ]; description = "Amazon Marketplace Metering SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-mechanicalturk" = callPackage @@ -26977,8 +26879,6 @@ self: { ]; description = "Amazon Mechanical Turk SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-mediaconvert" = callPackage @@ -26996,8 +26896,6 @@ self: { ]; description = "Amazon Elemental MediaConvert SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-medialive" = callPackage @@ -27015,8 +26913,6 @@ self: { ]; description = "Amazon Elemental MediaLive SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-mediapackage" = callPackage @@ -27034,8 +26930,6 @@ self: { ]; description = "Amazon Elemental MediaPackage SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-mediastore" = callPackage @@ -27053,8 +26947,6 @@ self: { ]; description = "Amazon Elemental MediaStore SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-mediastore-dataplane" = callPackage @@ -27072,8 +26964,6 @@ self: { ]; description = "Amazon Elemental MediaStore Data Plane SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-migrationhub" = callPackage @@ -27091,8 +26981,6 @@ self: { ]; description = "Amazon Migration Hub SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-ml" = callPackage @@ -27110,8 +26998,6 @@ self: { ]; description = "Amazon Machine Learning SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-mobile" = callPackage @@ -27129,8 +27015,6 @@ self: { ]; description = "Amazon Mobile SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-mq" = callPackage @@ -27148,8 +27032,6 @@ self: { ]; description = "Amazon MQ SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-opsworks" = callPackage @@ -27167,8 +27049,6 @@ self: { ]; description = "Amazon OpsWorks SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-opsworks-cm" = callPackage @@ -27186,8 +27066,6 @@ self: { ]; description = "Amazon OpsWorks for Chef Automate SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-organizations" = callPackage @@ -27205,8 +27083,6 @@ self: { ]; description = "Amazon Organizations SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-pinpoint" = callPackage @@ -27224,8 +27100,6 @@ self: { ]; description = "Amazon Pinpoint SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-polly" = callPackage @@ -27243,8 +27117,6 @@ self: { ]; description = "Amazon Polly SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-pricing" = callPackage @@ -27262,8 +27134,6 @@ self: { ]; description = "Amazon Price List Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-rds" = callPackage @@ -27281,8 +27151,6 @@ self: { ]; description = "Amazon Relational Database Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-redshift" = callPackage @@ -27300,8 +27168,6 @@ self: { ]; description = "Amazon Redshift SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-rekognition" = callPackage @@ -27319,8 +27185,6 @@ self: { ]; description = "Amazon Rekognition SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-resourcegroups" = callPackage @@ -27338,8 +27202,6 @@ self: { ]; description = "Amazon Resource Groups SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-resourcegroupstagging" = callPackage @@ -27357,8 +27219,6 @@ self: { ]; description = "Amazon Resource Groups Tagging API SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-route53" = callPackage @@ -27376,8 +27236,6 @@ self: { ]; description = "Amazon Route 53 SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-route53-autonaming" = callPackage @@ -27395,8 +27253,6 @@ self: { ]; description = "Amazon Route 53 Auto Naming SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-route53-domains" = callPackage @@ -27414,8 +27270,6 @@ self: { ]; description = "Amazon Route 53 Domains SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-s3" = callPackage @@ -27433,8 +27287,6 @@ self: { ]; description = "Amazon Simple Storage Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-s3-streaming" = callPackage @@ -27454,8 +27306,6 @@ self: { ]; description = "Provides conduits to upload data to S3 using the Multipart API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-sagemaker" = callPackage @@ -27473,8 +27323,6 @@ self: { ]; description = "Amazon SageMaker Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-sagemaker-runtime" = callPackage @@ -27492,8 +27340,6 @@ self: { ]; description = "Amazon SageMaker Runtime SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-sdb" = callPackage @@ -27511,8 +27357,6 @@ self: { ]; description = "Amazon SimpleDB SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-secretsmanager" = callPackage @@ -27530,8 +27374,6 @@ self: { ]; description = "Amazon Secrets Manager SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-serverlessrepo" = callPackage @@ -27549,8 +27391,6 @@ self: { ]; description = "Amazon ServerlessApplicationRepository SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-servicecatalog" = callPackage @@ -27568,8 +27408,6 @@ self: { ]; description = "Amazon Service Catalog SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-ses" = callPackage @@ -27587,8 +27425,6 @@ self: { ]; description = "Amazon Simple Email Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-shield" = callPackage @@ -27606,8 +27442,6 @@ self: { ]; description = "Amazon Shield SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-sms" = callPackage @@ -27625,8 +27459,6 @@ self: { ]; description = "Amazon Server Migration Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-snowball" = callPackage @@ -27644,8 +27476,6 @@ self: { ]; description = "Amazon Import/Export Snowball SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-sns" = callPackage @@ -27663,8 +27493,6 @@ self: { ]; description = "Amazon Simple Notification Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-sqs" = callPackage @@ -27682,8 +27510,6 @@ self: { ]; description = "Amazon Simple Queue Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-ssm" = callPackage @@ -27701,8 +27527,6 @@ self: { ]; description = "Amazon Simple Systems Manager (SSM) SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-stepfunctions" = callPackage @@ -27720,8 +27544,6 @@ self: { ]; description = "Amazon Step Functions SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-storagegateway" = callPackage @@ -27739,8 +27561,6 @@ self: { ]; description = "Amazon Storage Gateway SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-sts" = callPackage @@ -27758,8 +27578,6 @@ self: { ]; description = "Amazon Security Token Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-support" = callPackage @@ -27777,8 +27595,6 @@ self: { ]; description = "Amazon Support SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-swf" = callPackage @@ -27796,8 +27612,6 @@ self: { ]; description = "Amazon Simple Workflow Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-test" = callPackage @@ -27819,8 +27633,6 @@ self: { ]; description = "Common functionality for Amazonka library test-suites"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-transcribe" = callPackage @@ -27838,8 +27650,6 @@ self: { ]; description = "Amazon Transcribe Service SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-translate" = callPackage @@ -27857,8 +27667,6 @@ self: { ]; description = "Amazon Translate SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-waf" = callPackage @@ -27876,8 +27684,6 @@ self: { ]; description = "Amazon WAF SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-waf-regional" = callPackage @@ -27895,8 +27701,6 @@ self: { ]; description = "Amazon WAF Regional SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-workdocs" = callPackage @@ -27914,8 +27718,6 @@ self: { ]; description = "Amazon WorkDocs SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-workmail" = callPackage @@ -27933,8 +27735,6 @@ self: { ]; description = "Amazon WorkMail SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-workspaces" = callPackage @@ -27952,8 +27752,6 @@ self: { ]; description = "Amazon WorkSpaces SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amazonka-xray" = callPackage @@ -27971,8 +27769,6 @@ self: { ]; description = "Amazon X-Ray SDK"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "amby" = callPackage @@ -28854,8 +28650,8 @@ self: { }: mkDerivation { pname = "antiope-athena"; - version = "7.3.4"; - sha256 = "1d4pm1fb8iwfhb2f57n6kkzm27nj9fqgn3m14zzdbxk2l63q41h3"; + version = "7.4.2"; + sha256 = "0mbxg2d5hwd7v17wdqdg61rkhag30pvp84a12bwhjr5ijqhfwbf8"; libraryHaskellDepends = [ amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core @@ -28875,8 +28671,8 @@ self: { ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }: mkDerivation { pname = "antiope-contract"; - version = "7.3.4"; - sha256 = "0006g261khirldmsbnggnb9fmn9z6m9j7hi9cggpgmxc5ird16p6"; + version = "7.4.2"; + sha256 = "0p5lahs7vmah0ww87wxrd7pp579zijyb9n2wh4mys8i0qiqq7fq0"; libraryHaskellDepends = [ aeson antiope-s3 avro base bytestring text ]; @@ -28894,8 +28690,8 @@ self: { }: mkDerivation { pname = "antiope-core"; - version = "7.3.4"; - sha256 = "07zf2a0vpzcn5f9rr0k13w2pljybb8glc149wymhkjjfhhgb2ylh"; + version = "7.4.2"; + sha256 = "13s6shrhm2d17dialmpyi40vrdq5qw1zy960hl0g8d1fyg954ipx"; libraryHaskellDepends = [ aeson amazonka amazonka-core base bytestring exceptions generic-lens http-client http-types lens mtl resourcet text @@ -28921,8 +28717,8 @@ self: { }: mkDerivation { pname = "antiope-dynamodb"; - version = "7.3.4"; - sha256 = "0smsb7s7ymsdhkvawlbv9j67i1vr9i58qad9m4d5ir43pxi1bmvh"; + version = "7.4.2"; + sha256 = "1wmxq228wr18j4qpxqhrnv8y3yzhy3gpa1daa2zbq5zflbkxjcvf"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-dynamodb antiope-core base generic-lens lens text unliftio-core unordered-containers @@ -28946,8 +28742,8 @@ self: { }: mkDerivation { pname = "antiope-messages"; - version = "7.3.4"; - sha256 = "0n9s18fmqp22r857yybd3ddm5m6ijr0a1vydll9qqaia951s2a6a"; + version = "7.4.2"; + sha256 = "0xlzz9dr06s03pqfra8agy80a3r8593kjcfs0w7b1v6m0ahwi9ip"; libraryHaskellDepends = [ aeson amazonka amazonka-core base bytestring generic-lens lens lens-aeson monad-loops network-uri text unliftio-core @@ -28971,8 +28767,8 @@ self: { }: mkDerivation { pname = "antiope-optparse-applicative"; - version = "7.3.4"; - sha256 = "1l21xgis1rzzbziz403wl4inilnn52ly4w1lp1cbcj7hnykaxa1i"; + version = "7.4.2"; + sha256 = "0nvmv0db1v0iw446cy2hfczpsll2if3w0cjmhgr5zgj9l5ja9x1c"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-s3 base optparse-applicative text ]; @@ -28996,8 +28792,8 @@ self: { }: mkDerivation { pname = "antiope-s3"; - version = "7.3.4"; - sha256 = "14k5w7s30rqygf6df309h90p9d5fgvw9wxwgz0sisi1mzvbb7wry"; + version = "7.4.2"; + sha256 = "1gpsc6y18h63wwkawvzwz8qmpw21pqhgpvgnb7apl9jc06xp2v0h"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 antiope-core antiope-messages attoparsec base bytestring conduit conduit-extra @@ -29017,6 +28813,37 @@ self: { broken = true; }) {}; + "antiope-shell" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 + , antiope-core, antiope-messages, antiope-s3, attoparsec, base + , bytestring, conduit, conduit-extra, exceptions, generic-lens + , hedgehog, hspec, hspec-discover, http-types, hw-hspec-hedgehog + , lens, mtl, network-uri, process, resourcet, text, time + , unliftio-core + }: + mkDerivation { + pname = "antiope-shell"; + version = "7.4.2"; + sha256 = "1xg98dg52qmp8sz2r4b0srh7kasvd411i6wl3cj9m3nngignbab8"; + libraryHaskellDepends = [ + aeson amazonka amazonka-core amazonka-s3 antiope-core + antiope-messages antiope-s3 attoparsec base bytestring exceptions + generic-lens http-types lens mtl network-uri process resourcet text + time unliftio-core + ]; + testHaskellDepends = [ + aeson amazonka amazonka-core amazonka-s3 antiope-core attoparsec + base bytestring conduit conduit-extra exceptions generic-lens + hedgehog hspec http-types hw-hspec-hedgehog lens mtl network-uri + resourcet text time unliftio-core + ]; + testToolDepends = [ hspec-discover ]; + description = "Please see the README on Github at "; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "antiope-sns" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base , bytestring, generic-lens, hedgehog, hspec, hspec-discover @@ -29024,8 +28851,8 @@ self: { }: mkDerivation { pname = "antiope-sns"; - version = "7.3.4"; - sha256 = "0vcns4p0agni4afdw4cr3hz2xq54d3wam6mkaggd5zyf974x7c7c"; + version = "7.4.2"; + sha256 = "09g6jsdi20xa43ipb31y5i3afn75gldm0xyr2mqkfyhb8ay6simx"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sns base bytestring generic-lens lens text time unliftio-core @@ -29051,8 +28878,8 @@ self: { }: mkDerivation { pname = "antiope-sqs"; - version = "7.3.4"; - sha256 = "1y1kgppnc47wprd3sjw8qbjh5dvfr4i7mczi70s88i8apkqlxrbn"; + version = "7.4.2"; + sha256 = "044sa2skvbr492bal52ncbsybr9wrkkq5kcvsdaiqwvkpfwq66v0"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sqs base bytestring conduit generic-lens lens lens-aeson monad-loops mtl network-uri split text @@ -29076,8 +28903,8 @@ self: { }: mkDerivation { pname = "antiope-swf"; - version = "7.3.4"; - sha256 = "1rn31vdjfs7jrx87a44vg36kwkcxx7sp3mx54f494srwa3cv1di5"; + version = "7.4.2"; + sha256 = "1zp63q8dd400ll6cl9wsp6rhghzm56rsak8sh5p860adlk49y9il"; libraryHaskellDepends = [ amazonka-swf base lens text ]; testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ]; testToolDepends = [ hspec-discover ]; @@ -32672,12 +32499,13 @@ self: { , dependency, dhall, directory, file-embed, filemanip, filepath , http-client, http-client-tls, lzma, microlens, mtl , optparse-applicative, parallel-io, process, shake, shake-ats - , shake-c, shake-ext, tar, temporary, text, unix, zip-archive, zlib + , shake-c, shake-ext, tar, temporary, text, unix, unix-compat + , zip-archive, zlib }: mkDerivation { pname = "ats-pkg"; - version = "3.2.5.18"; - sha256 = "16v3308zap5jhpd9xsvjdgp28330iscaikdl76jqf5jhb175pxzr"; + version = "3.2.6.0"; + sha256 = "1jxs3rfv9nrigwnshanc90dm3nzimr7zmfln1la5nv098prdkakr"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -32686,7 +32514,7 @@ self: { composition-prelude containers dependency dhall directory file-embed filemanip filepath http-client http-client-tls lzma microlens mtl parallel-io process shake shake-ats shake-c shake-ext - tar text unix zip-archive zlib + tar text unix unix-compat zip-archive zlib ]; libraryToolDepends = [ cpphs ]; executableHaskellDepends = [ @@ -34109,8 +33937,6 @@ self: { ]; description = "Helper function and types for working with amazonka"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "aws-ec2" = callPackage @@ -34536,8 +34362,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Wrapper over Amazonka's SES"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "aws-sign4" = callPackage @@ -37843,8 +37667,8 @@ self: { pname = "binary-orphans"; version = "1.0.1"; sha256 = "0gbmn5rpvyxhw5bxjmxwld6918lslv03b2f6hshssaw1il5x86j3"; - revision = "1"; - editedCabalFile = "0sww1904gn3sxvj94ac8l1g50v0j3fgpfiynbpvg0yhqsbfazi3n"; + revision = "2"; + editedCabalFile = "0b4fafgwhrp4i7vxcynzk5678kn6jvraanmbmf14mxlkipl2fff3"; libraryHaskellDepends = [ base binary transformers ]; testHaskellDepends = [ base binary QuickCheck quickcheck-instances tagged tasty @@ -45137,6 +44961,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cabal-flatpak" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cabal-plan + , containers, http-client, http-client-tls, http-types + , optparse-applicative, pathtype, shell-utility, text, utility-ht + }: + mkDerivation { + pname = "cabal-flatpak"; + version = "0.0"; + sha256 = "0ci55nzlp1hqx31m7pw37ms8pb053gb85126pszpsd8n7yvlra9w"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring cabal-plan containers + http-client http-client-tls http-types optparse-applicative + pathtype shell-utility text utility-ht + ]; + description = "Generate a FlatPak manifest from a Cabal package description"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cabal-fmt" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , filepath, mtl, optparse-applicative, parsec, pretty, process @@ -52911,8 +52755,8 @@ self: { pname = "co-log"; version = "0.3.0.0"; sha256 = "0rrxgc3qs10lj94d0v42fd6979znvmzxd7dmffp2lxpzmnymnsha"; - revision = "2"; - editedCabalFile = "12h6rgqgqd1wcm2ahl6b3wglsgq4ynjacrz9m0wkyry3k0jwzd8f"; + revision = "3"; + editedCabalFile = "0z2456b49k0qfd4fzvbwndvdvnwfvsmhyxd5gmbiz7l7b458dq3s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53841,18 +53685,17 @@ self: { }) {}; "colour-space" = callPackage - ({ mkDerivation, base, colour, constrained-categories, JuicyPixels - , linear, linearmap-category, manifolds, semigroups, vector-space + ({ mkDerivation, base, call-stack, colour, constrained-categories + , JuicyPixels, lens, linear, linearmap-category, manifolds + , semigroups, vector-space }: mkDerivation { pname = "colour-space"; - version = "0.1.4.0"; - sha256 = "0sr341chqhngm7ihyy3ym3w345sk101gznw80iksjwxjg3iiqxmq"; - revision = "2"; - editedCabalFile = "0qldxm84rk344h4wgk3bqsxfhkmvj8psm0sqgfnjh34a4fy5hjzg"; + version = "0.1.5.0"; + sha256 = "13xmn8l11r06xna575sw6sdhp2rj25q8qd9ljbjpl37fr1qbc8xs"; libraryHaskellDepends = [ - base colour constrained-categories JuicyPixels linear - linearmap-category manifolds semigroups vector-space + base call-stack colour constrained-categories JuicyPixels lens + linear linearmap-category manifolds semigroups vector-space ]; description = "Instances of the manifold-classes for colour types"; license = stdenv.lib.licenses.gpl3; @@ -55952,6 +55795,42 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit-algorithms_0_0_11_0" = callPackage + ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit + , conduit-combinators, conduit-extra, conduit-zstd, containers + , criterion, deepseq, directory, exceptions, HUnit, lzma-conduit + , monad-control, mtl, pqueue, resourcet, stm, stm-conduit + , streaming-commons, test-framework, test-framework-hunit + , test-framework-th, transformers, unliftio-core, vector + }: + mkDerivation { + pname = "conduit-algorithms"; + version = "0.0.11.0"; + sha256 = "0c1jwz30kkvimx7lb61782yk0kyfamrf5bqc3g1h7g51lk8bbv9i"; + libraryHaskellDepends = [ + async base bytestring bzlib-conduit conduit conduit-combinators + conduit-extra conduit-zstd containers deepseq exceptions + lzma-conduit monad-control mtl pqueue resourcet stm stm-conduit + streaming-commons transformers unliftio-core vector + ]; + testHaskellDepends = [ + async base bytestring bzlib-conduit conduit conduit-combinators + conduit-extra conduit-zstd containers deepseq directory exceptions + HUnit lzma-conduit monad-control mtl pqueue resourcet stm + stm-conduit streaming-commons test-framework test-framework-hunit + test-framework-th transformers unliftio-core vector + ]; + benchmarkHaskellDepends = [ + async base bytestring bzlib-conduit conduit conduit-combinators + conduit-extra conduit-zstd containers criterion deepseq exceptions + lzma-conduit monad-control mtl pqueue resourcet stm stm-conduit + streaming-commons transformers unliftio-core vector + ]; + description = "Conduit-based algorithms"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-audio" = callPackage ({ mkDerivation, base, conduit, vector }: mkDerivation { @@ -56439,8 +56318,6 @@ self: { text transformers ]; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "conferer" = callPackage @@ -56449,8 +56326,8 @@ self: { }: mkDerivation { pname = "conferer"; - version = "0.1.0.1"; - sha256 = "1g5kyvy067lll181xqd1lxpzl5965yj847kh6z2r0wvq01i4k467"; + version = "0.1.0.4"; + sha256 = "0zzc6m52a3rsd6cs7ns95rk1bl1gf9dyrz7lx0kakibxpb11sgsy"; libraryHaskellDepends = [ base bytestring containers directory text ]; @@ -56461,6 +56338,71 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "conferer-hspec" = callPackage + ({ mkDerivation, base, conferer, hspec, hspec-core, text }: + mkDerivation { + pname = "conferer-hspec"; + version = "0.1.0.1"; + sha256 = "1wjn4my0grb62vkswvxa4674s0fid6kskvxz1qll14gqw6wlkx19"; + libraryHaskellDepends = [ base conferer hspec-core text ]; + testHaskellDepends = [ base conferer hspec hspec-core text ]; + description = "conferer's FromConfig instances for hspec Config"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "conferer-provider-json" = callPackage + ({ mkDerivation, aeson, base, bytestring, conferer, directory + , hspec, text, unordered-containers, vector + }: + mkDerivation { + pname = "conferer-provider-json"; + version = "0.1.0.2"; + sha256 = "1iww8w6d7710b58yqiap10jkbgb08ah3szc259p7wn4lnv96cic0"; + libraryHaskellDepends = [ + aeson base bytestring conferer directory text unordered-containers + vector + ]; + testHaskellDepends = [ + aeson base bytestring conferer directory hspec text + unordered-containers vector + ]; + description = "Configuration for reading json files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "conferer-snap" = callPackage + ({ mkDerivation, base, conferer, hspec, snap-core, snap-server + , text + }: + mkDerivation { + pname = "conferer-snap"; + version = "0.1.0.3"; + sha256 = "07x1grjqq5dsz7w8vrkzdaknfvqkvjqkmjwjiixn51jxfg6011zq"; + libraryHaskellDepends = [ + base conferer snap-core snap-server text + ]; + testHaskellDepends = [ + base conferer hspec snap-core snap-server text + ]; + description = "conferer's FromConfig instances for snap Config"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "conferer-warp" = callPackage + ({ mkDerivation, base, conferer, hspec, http-types, text, wai, warp + }: + mkDerivation { + pname = "conferer-warp"; + version = "0.1.0.1"; + sha256 = "1alzbcm4bkp2a5p53b3vpnl0zgnz8bm2rpn2aljs24wz3vapgzsa"; + libraryHaskellDepends = [ base conferer http-types text wai warp ]; + testHaskellDepends = [ + base conferer hspec http-types text wai warp + ]; + description = "conferer's FromConfig instances for warp settings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "confetti" = callPackage ({ mkDerivation, base, cmdargs, directory, filepath, MissingH , tasty, tasty-hunit, tasty-smallcheck, text, time, unix, yaml @@ -58938,6 +58880,8 @@ self: { pname = "cpkg"; version = "0.2.3.2"; sha256 = "0dwcahc8m2mj3jm0hwx13wzhlnyiby4sds8pc70fv54zp0ccbq6r"; + revision = "1"; + editedCabalFile = "1c38aadl6lfnid8ipmpvm78mlvb0rgqr5sdjg86y1ks4q45nqw3g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70811,8 +70755,8 @@ self: { }: mkDerivation { pname = "distribution-nixpkgs"; - version = "1.2"; - sha256 = "0123plf001136q5gd9brq6vhpnx7db6gixx5sagp5l8jd2qpb244"; + version = "1.3.0"; + sha256 = "192r9aizcjvnm0s57v056x42mvlq79fk8630g73ps6qqnb2mjy9h"; libraryHaskellDepends = [ aeson base bytestring Cabal containers deepseq language-nix lens pretty process split @@ -71071,6 +71015,8 @@ self: { pname = "dl-fedora"; version = "0.7"; sha256 = "00fkjlggax5l9qk2dlgh3plkqrvxrwfipdcfpq8d5kfw7l5wdxsv"; + revision = "1"; + editedCabalFile = "1njib3nnknqpa4kmrrrfabkrh1iaqx8xsw7jn4qrhlnqhh0mqwqd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -74237,8 +74183,6 @@ self: { ]; description = "A handy tool for uploading unikernels to Amazon's EC2"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "eccrypto" = callPackage @@ -75105,8 +75049,6 @@ self: { ]; description = "An ekg backend for Amazon Cloudwatch"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ekg-core" = callPackage @@ -79341,8 +79283,8 @@ self: { }: mkDerivation { pname = "exhaustive"; - version = "1.1.7"; - sha256 = "02kv3vv7gz8lqwm5iz4nddyzxp17cgsb6j12lc5kf51l481vpb1z"; + version = "1.1.8"; + sha256 = "1nnylpjrrb6smmgl3d481wpkxpdw26yfa3jlw98p3xgm8k907486"; libraryHaskellDepends = [ base generics-sop template-haskell transformers ]; @@ -81634,10 +81576,8 @@ self: { }: mkDerivation { pname = "fcm-client"; - version = "0.1.0.0"; - sha256 = "1qv43pfwgi7d7bx445z3q3zr7szv6y7ky9gb6g7f1chxs4q6mcdl"; - revision = "1"; - editedCabalFile = "1rvb99gh2m1j2bd9x6vc58kvkwdcxl5wwypvnj3c62zcqmdln03l"; + version = "0.2.0.0"; + sha256 = "151lm6g08bwqfdi25zmsv99wri8x75fi1svwsgm2ar2hd8zjngnj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -83353,8 +83293,8 @@ self: { }: mkDerivation { pname = "finitary"; - version = "1.0.0.1"; - sha256 = "1va895ijk7sb5zn6zf1bfi8w0bqxjx4631iwnijh9f4d3dsnpqcv"; + version = "1.1.0.1"; + sha256 = "13rvwymzsl91zwvc565ysakn8lznwwfnrg0d4vxvlqqrrkbkca1p"; libraryHaskellDepends = [ base bitvec coercible-utils finite-typelits ghc-typelits-knownnat ghc-typelits-natnormalise mtl primitive template-haskell @@ -83375,8 +83315,8 @@ self: { }: mkDerivation { pname = "finitary-derive"; - version = "1.0.0.0"; - sha256 = "0ns61aylidrkdf4qkfz1r1vjfzlmgbqar1dq068xg1pvnkpsrvlc"; + version = "1.0.0.1"; + sha256 = "1wv9jjvv1jd5y39pybfawb19pxzwb6r3p69ajyh2f7m8nn81kcim"; libraryHaskellDepends = [ base binary coercible-utils deepseq finitary finite-typelits ghc-typelits-extra ghc-typelits-knownnat hashable mtl vector @@ -88749,6 +88689,22 @@ self: { license = "GPL"; }) {}; + "fvars" = callPackage + ({ mkDerivation, async, base, exceptions, hspec, monad-control, mtl + , transformers + }: + mkDerivation { + pname = "fvars"; + version = "1.0.0.0"; + sha256 = "0iwlmr388wv98n244wdzwk5l7j6p669pq3vwavpnk37wfanahvxj"; + libraryHaskellDepends = [ + base exceptions monad-control mtl transformers + ]; + testHaskellDepends = [ async base hspec ]; + description = "Fast Mutable Vars"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fwgl" = callPackage ({ mkDerivation, base, hashable, transformers, unordered-containers , vect, vector, Yampa @@ -92806,8 +92762,8 @@ self: { }: mkDerivation { pname = "ghcide"; - version = "0.0.2"; - sha256 = "0ivq4j4i7cb8k7h2rkc9kpki39zl1nc63ba6hpfdlyl5vg5x3qy7"; + version = "0.0.3"; + sha256 = "0czmgw2wfsycxs3lbs838xmgdvk52ry0dnb0dgxmafqgdi0l7xi3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92823,7 +92779,7 @@ self: { haskell-lsp hie-bios optparse-applicative shake text ]; testHaskellDepends = [ - base containers extra filepath haskell-lsp-types lens lsp-test + base containers extra filepath ghc haskell-lsp-types lens lsp-test parser-combinators tasty tasty-hunit text ]; description = "The core of an IDE"; @@ -95211,6 +95167,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "github-webhooks_0_11_0" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , cryptonite, deepseq, deepseq-generics, hspec, memory, text, time + , vector + }: + mkDerivation { + pname = "github-webhooks"; + version = "0.11.0"; + sha256 = "1x9vwx7k8xyblfxqny7almqlzzncnm315x6dq6y2bzsl9sxwvnkg"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring cryptonite deepseq + deepseq-generics memory text time vector + ]; + testHaskellDepends = [ aeson base bytestring hspec text vector ]; + description = "Aeson instances for GitHub Webhook payloads"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "githud" = callPackage ({ mkDerivation, base, bytestring, daemons, data-default, directory , mtl, network, parsec, process, tasty, tasty-hunit @@ -100047,14 +100022,14 @@ self: { "grammatical-parsers" = callPackage ({ mkDerivation, base, checkers, containers, criterion, deepseq - , doctest, monoid-subclasses, parsers, QuickCheck, rank2classes - , size-based, tasty, tasty-quickcheck, testing-feat, text - , transformers + , doctest, markdown-unlit, monoid-subclasses, parsers, QuickCheck + , rank2classes, size-based, tasty, tasty-quickcheck, testing-feat + , text, transformers }: mkDerivation { pname = "grammatical-parsers"; - version = "0.4"; - sha256 = "0cn912rq65k234y12wwbh07wfps107i43s374lddajb853jq3wr6"; + version = "0.4.0.1"; + sha256 = "049xz8gscqxn5k5vy34zc97w4in4scv89jvd71kxf24yvxblzayz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100068,6 +100043,7 @@ self: { QuickCheck rank2classes size-based tasty tasty-quickcheck testing-feat ]; + testToolDepends = [ markdown-unlit ]; benchmarkHaskellDepends = [ base containers criterion deepseq monoid-subclasses parsers rank2classes text @@ -103598,6 +103574,8 @@ self: { pname = "hackage-db"; version = "2.0.1"; sha256 = "13ggj72i8dxwh3qwznnqxbr00nvsbapyyhzx5zybfacddnpw3aph"; + revision = "1"; + editedCabalFile = "0l2zdajacqibwkjs5pif6a3mxns9jpc6iry7xxqcfis4n9ks404a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103609,6 +103587,28 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "hackage-db_2_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, containers + , directory, exceptions, filepath, tar, time, utf8-string + }: + mkDerivation { + pname = "hackage-db"; + version = "2.1.0"; + sha256 = "1vsc0lrbrb525frycqq0c5z846whymgcjl888gnlqd16nknbsn3l"; + revision = "1"; + editedCabalFile = "1h3x5a8xmqkkcd3h1m7z0il1vbsh2c77685y68zmyp21zb1y88hy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring Cabal containers directory exceptions + filepath tar time utf8-string + ]; + description = "Access cabal-install's Hackage database via Data.Map"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "hackage-diff" = callPackage ({ mkDerivation, ansi-terminal, async, attoparsec, base, Cabal , cpphs, directory, filepath, haskell-src-exts, HTTP, mtl, process @@ -104803,8 +104803,6 @@ self: { testToolDepends = [ utillinux ]; description = "A static website compiler library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) utillinux;}; "hakyll-R" = callPackage @@ -107057,8 +107055,8 @@ self: { }: mkDerivation { pname = "hasbolt-extras"; - version = "0.0.0.21"; - sha256 = "1fq96j9hrfvjffjqz938fql40h15mb7dhfzjfbryd5qip4k45435"; + version = "0.0.0.22"; + sha256 = "06bad2hbzmrrav1f7fsszrspxghziy6jpmgr39nbs375fbqib4kp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -110977,8 +110975,8 @@ self: { }: mkDerivation { pname = "haskseg"; - version = "0.1.0.1"; - sha256 = "0m9226wwkkvfqr2nfhf2gxymav3fp6klvzilsrkx502dqlll25qc"; + version = "0.1.0.2"; + sha256 = "0p9z71gbrgssjs1zgbjfqn2g4k4i6ahs9lj1x82mjqppvc4gr0n3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113778,8 +113776,6 @@ self: { ]; description = "heavy-logger compatibility with amazonka-core logging"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "heavy-logger-instances" = callPackage @@ -113849,6 +113845,35 @@ self: { broken = true; }) {}; + "hedgehog_0_6_1" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring + , concurrent-output, containers, directory, exceptions + , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive + , random, resourcet, semigroups, stm, template-haskell, text + , th-lift, time, transformers, transformers-base, unix + , wl-pprint-annotated + }: + mkDerivation { + pname = "hedgehog"; + version = "0.6.1"; + sha256 = "0xz10ycdm5vk9nrcym1fi83k19frfwqz18bz8bnpzwvaj0j41yfj"; + revision = "5"; + editedCabalFile = "0kwmxjb1y3gk85njacw5wcvmq3bzp1649dbjzgzpiba2w342f7il"; + libraryHaskellDepends = [ + ansi-terminal async base bytestring concurrent-output containers + directory exceptions lifted-async mmorph monad-control mtl + pretty-show primitive random resourcet semigroups stm + template-haskell text th-lift time transformers transformers-base + unix wl-pprint-annotated + ]; + testHaskellDepends = [ + base containers pretty-show semigroups text transformers + ]; + description = "Hedgehog will eat all your bugs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hedgehog" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring , concurrent-output, containers, directory, exceptions, fail @@ -116370,8 +116395,8 @@ self: { }: mkDerivation { pname = "hie-bios"; - version = "0.2.0"; - sha256 = "0sr0drw0kyf4f77cg25x4scjzqg597yr5xl4dzqdnjz5vv0p1znm"; + version = "0.2.1"; + sha256 = "12gqchrqscf7qnmid3k8wizxax4157dggg6kr1dipbwn36dczhrv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -119836,8 +119861,8 @@ self: { pname = "hoist-error"; version = "0.2.1.0"; sha256 = "028lczd80nhj3yj5dq9qixzdzkyisl34qpi6bb28r8b9nj2i2nss"; - revision = "1"; - editedCabalFile = "0abzpyxr46kk9vh5yxy8wawmyn1x1zrhl9mdxwfz0s938z4s7nr5"; + revision = "2"; + editedCabalFile = "1wk9a58ychqfabbrh8zdzzd7cfvwgf8xyfi6ynsckh1yb5xa4f7j"; libraryHaskellDepends = [ base either mtl ]; description = "Some convenience facilities for hoisting errors into a monad"; license = stdenv.lib.licenses.mit; @@ -122449,8 +122474,8 @@ self: { }: mkDerivation { pname = "hs-ix"; - version = "0.1.0.0"; - sha256 = "1hn4i5j4wyi4n1cb7w9165k0dwkvzy4n9vi2j12p65m9bai8p4zm"; + version = "0.1.1.0"; + sha256 = "1a1plgzbqk4jhf5lyfx82yillcmy38lzlqwsfhnlka5h6f9j10hx"; libraryHaskellDepends = [ base base-unicode-symbols hs-functors util ]; @@ -140167,8 +140192,8 @@ self: { }: mkDerivation { pname = "jvm-binary"; - version = "0.6.1"; - sha256 = "0pz7md5y422mh7lcsshllqwhk6zsxl2szqw44css4m40gr196wnx"; + version = "0.7.0"; + sha256 = "1ism2fq66qdh72nm9cq4km9yn7v79j2qq6glpyf9yk10549kv7dv"; libraryHaskellDepends = [ attoparsec base binary bytestring containers data-binary-ieee754 deepseq deriving-compat mtl template-haskell text vector @@ -143809,6 +143834,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-c_0_8_3" = callPackage + ({ mkDerivation, alex, array, base, bytestring, containers, deepseq + , directory, filepath, happy, pretty, process, syb + }: + mkDerivation { + pname = "language-c"; + version = "0.8.3"; + sha256 = "0bi02jdirkys8v7flf39vrpla2a74z1z0sdhy9lb9v7cmcc6rmpk"; + libraryHaskellDepends = [ + array base bytestring containers deepseq directory filepath pretty + process syb + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ base directory filepath process ]; + description = "Analysis and generation of C code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-c-comments" = callPackage ({ mkDerivation, alex, array, base, language-c }: mkDerivation { @@ -144467,22 +144511,17 @@ self: { }) {}; "language-nix" = callPackage - ({ mkDerivation, base, base-compat, Cabal, deepseq, doctest, lens - , pretty, QuickCheck + ({ mkDerivation, base, deepseq, lens, parsec-class, pretty + , QuickCheck }: mkDerivation { pname = "language-nix"; - version = "2.1.0.1"; - sha256 = "1kqsw0hk03wdn7mszyjgi38nxk1wmhbxfv6di3irrhsaf807657h"; - revision = "1"; - editedCabalFile = "1zv12p4ralrks0517zs52rzmzmsxxkcxkqz7zijfgcsvh6bsmafi"; + version = "2.2.0"; + sha256 = "1lq07311dg4a32zdp5bc20bw94g0c7pdzxdiwi2y4zbhd1944rzx"; libraryHaskellDepends = [ - base base-compat Cabal deepseq lens pretty QuickCheck + base deepseq lens parsec-class pretty QuickCheck ]; - testHaskellDepends = [ - base base-compat Cabal deepseq doctest lens pretty QuickCheck - ]; - description = "Data types and useful functions to represent and manipulate the Nix language"; + description = "Data types and functions to represent the Nix language"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -145483,6 +145522,8 @@ self: { pname = "lazy-io-streams"; version = "0.1.0.0"; sha256 = "022x0sikvdsvpp0gh7q82sdpd5kxd2zmprdpmf7z4c3hf4xk9vxy"; + revision = "1"; + editedCabalFile = "0pn446g45naqh92g9mib98fw5xznbp6r4x27acmnqrmlcqjz9jsm"; libraryHaskellDepends = [ base bytestring io-streams ]; description = "Get lazy with your io-streams"; license = stdenv.lib.licenses.bsd3; @@ -145494,8 +145535,8 @@ self: { ({ mkDerivation, base, containers, doctest, lens, markdown-unlit }: mkDerivation { pname = "lazy-priority-queue"; - version = "0.1"; - sha256 = "0cjp9pvwrgldkrkg72xyq2mrr4yqzzsb4ng5as0b56zq4dgzvlib"; + version = "0.1.0.1"; + sha256 = "1v0jxf56wxlncw0nppmnm89j14hn8a81swr1y2sbk7gsqf73qd8v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -145503,7 +145544,7 @@ self: { testHaskellDepends = [ base doctest lens ]; testToolDepends = [ markdown-unlit ]; description = "Lazy-Spined Monadic Priority Queues"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.bsd3; }) {}; "lazy-search" = callPackage @@ -146589,6 +146630,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens-regex-pcre_1_0_0_0" = callPackage + ({ mkDerivation, base, bytestring, gauge, hspec, lens, pcre-heavy + , template-haskell, text + }: + mkDerivation { + pname = "lens-regex-pcre"; + version = "1.0.0.0"; + sha256 = "02am0q60nhn93jlrxskcc33mcgn0la8y4074vv0rbxxshbxz6k4h"; + libraryHaskellDepends = [ + base bytestring lens pcre-heavy template-haskell text + ]; + testHaskellDepends = [ + base bytestring hspec lens pcre-heavy template-haskell text + ]; + benchmarkHaskellDepends = [ + base bytestring gauge lens pcre-heavy template-haskell text + ]; + description = "A lensy interface to regular expressions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lens-simple" = callPackage ({ mkDerivation, base, lens-family, lens-family-core , lens-family-th, mtl, transformers @@ -147122,8 +147185,8 @@ self: { pname = "libarchive"; version = "1.0.5.1"; sha256 = "1fchnvs03hg513v7a45a3qbfr3kbh3nmqjqljzr2y1mg2ghkr7cz"; - revision = "4"; - editedCabalFile = "0wzw962gl9lm5faaa86z4q7s9cbzqn346cmlbhr518dbnw7nv31d"; + revision = "5"; + editedCabalFile = "1fmsrrg8q46fwv6zgg5afc5jyd9y1qz193ypyh2kb4zf9psl3bdc"; libraryHaskellDepends = [ base bytestring composition-prelude dlist filepath ]; @@ -151330,7 +151393,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "logging-effect_1_3_5" = callPackage + "logging-effect_1_3_6" = callPackage ({ mkDerivation, async, base, bytestring, criterion, exceptions , fast-logger, free, lifted-async, monad-control, monad-logger, mtl , prettyprinter, semigroups, stm, stm-delay, text, time @@ -151338,8 +151401,8 @@ self: { }: mkDerivation { pname = "logging-effect"; - version = "1.3.5"; - sha256 = "1ydkgjq3xpl7bqyax8ff6kvd9hjbyddgayrw43afdzbky1d0qawq"; + version = "1.3.6"; + sha256 = "1bcc7m2r4hhl03s91qixfc5w26pbdb7hy9dp6lzdahw6q7pn0hkw"; libraryHaskellDepends = [ async base exceptions free monad-control mtl prettyprinter semigroups stm stm-delay text time transformers transformers-base @@ -152122,6 +152185,19 @@ self: { broken = true; }) {}; + "louis" = callPackage + ({ mkDerivation, base, bytestring, JuicyPixels, text, vector }: + mkDerivation { + pname = "louis"; + version = "0.1.0.2"; + sha256 = "0bw07idhhnyxfsry5qq8hs5fdbp810j7i2syd1vfqdsbm2krq816"; + libraryHaskellDepends = [ + base bytestring JuicyPixels text vector + ]; + description = "Turning images into text using Braille font"; + license = stdenv.lib.licenses.mit; + }) {}; + "loup" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-swf, base, bytestring , conduit, lifted-async, lifted-base, optparse-generic, preamble @@ -152971,10 +153047,8 @@ self: { }: mkDerivation { pname = "lzlib"; - version = "0.2.0.0"; - sha256 = "0m0kx2drrxy01rf7a231pjqk783gcqqkjn831bcx0dbqksaz6fvm"; - revision = "1"; - editedCabalFile = "0jjl1rdlh8cms7pbd9y258s817l77nql4ayq12qy8c9vvxdyamh8"; + version = "0.2.0.1"; + sha256 = "0cp33l990na6wz9yb0kx2nzq3hqxpyc7s47xg0bvia8sajrkzdw6"; libraryHaskellDepends = [ base bytestring ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base bytestring directory hspec ]; @@ -156891,6 +156965,8 @@ self: { pname = "meminfo"; version = "0.2.0.0"; sha256 = "1mxk57qr4d1k6sz4qld09d61nc15hixggc5klfj5xr0n8rw1za3x"; + revision = "1"; + editedCabalFile = "10r7ji1xb8zv7a1ilyp626chly9y8m1i67adxqrj8lwgkqxpl8nk"; libraryHaskellDepends = [ attoparsec base bytestring containers ]; description = "Library for reading `/proc/meminfo`"; license = stdenv.lib.licenses.bsd3; @@ -159461,6 +159537,17 @@ self: { broken = true; }) {}; + "mm2" = callPackage + ({ mkDerivation, base, vector }: + mkDerivation { + pname = "mm2"; + version = "0.1.1.0"; + sha256 = "0zn629lm41z6b59snnjkqdk41ryimjhd5yapiwykl5fg0f7wmap3"; + libraryHaskellDepends = [ base vector ]; + description = "The library that can be used for optimization of multiple (Ord a) => a -> b transformations"; + license = stdenv.lib.licenses.mit; + }) {}; + "mmap" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -161813,8 +161900,10 @@ self: { }: mkDerivation { pname = "monoid-statistics"; - version = "1.0.0"; - sha256 = "0n3q8izk197lrkvm6hmdzg7dl1mzji2z09b1wkz02pm4y0gganv3"; + version = "1.0.1.0"; + sha256 = "1krgyvshvw28ld89hb1qpjx8jiz40a8yq2q3zglrir4vfch5cyx9"; + revision = "1"; + editedCabalFile = "14p36fz2yssx92imqggv5xrsnqqhhh3xj2ba96v47fm2dglgfsrv"; libraryHaskellDepends = [ base math-functions vector vector-th-unbox ]; @@ -166633,17 +166722,19 @@ self: { }: mkDerivation { pname = "net-mqtt"; - version = "0.5.0.2"; - sha256 = "1dq1f9kkdrz8yf6yj9xzfyna6rnkzv0vmsrzg92vbkyqfhkw6fga"; + version = "0.5.1.0"; + sha256 = "0wqrzp39d9c04j1lqsk8kn727bymcq8jk12v330l527lm5g76adj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async attoparsec attoparsec-binary base binary bytestring conduit - conduit-extra containers network-conduit-tls network-uri stm text + conduit-extra containers network-conduit-tls network-uri QuickCheck + stm text ]; executableHaskellDepends = [ async attoparsec attoparsec-binary base binary bytestring conduit - conduit-extra containers network-conduit-tls network-uri stm text + conduit-extra containers network-conduit-tls network-uri QuickCheck + stm text ]; testHaskellDepends = [ async attoparsec attoparsec-binary base binary bytestring conduit @@ -168647,6 +168738,21 @@ self: { broken = true; }) {}; + "newtype-zoo" = callPackage + ({ mkDerivation, base, data-default, deepseq, pointed, profunctors + , QuickCheck, random + }: + mkDerivation { + pname = "newtype-zoo"; + version = "1.1.0.0"; + sha256 = "0sw476mmczq6gfgbbbrybrna472p5bjrimsbblw9rlyzcg2szqrp"; + libraryHaskellDepends = [ + base data-default deepseq pointed profunctors QuickCheck random + ]; + description = "Newtype Wrapper Zoo"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "newtyper" = callPackage ({ mkDerivation, base, Kleislify, newtype }: mkDerivation { @@ -174301,29 +174407,26 @@ self: { }) {}; "otp-authenticator" = callPackage - ({ mkDerivation, aeson, base, bifunctors, binary, bytestring + ({ mkDerivation, aeson, base, base-compat, binary, bytestring , containers, cryptonite, dependent-sum, filepath, h-gpgme - , haskeline, microlens, one-time-password, optparse-applicative - , sandi, singletons, text, time, transformers, trifecta - , type-combinators, unix, uri-encode, witherable, yaml + , haskeline, megaparsec, microlens, optparse-applicative, sandi + , text, time, transformers, unix, uri-encode, vinyl, yaml }: mkDerivation { pname = "otp-authenticator"; - version = "0.1.0.1"; - sha256 = "1f30mr512rwbx58wkfqk3cyw471mw1lyz0jmcjj4lhknhf0agvhm"; + version = "0.1.1.0"; + sha256 = "0hmyq7ris01gnkydxi9i2p5v2c5cps4mg4zmxbzlyjrkyn7d5la4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bifunctors binary bytestring containers cryptonite - dependent-sum filepath h-gpgme haskeline microlens - one-time-password optparse-applicative sandi singletons text time - transformers trifecta type-combinators unix uri-encode witherable - yaml + aeson base base-compat binary bytestring containers cryptonite + dependent-sum filepath h-gpgme haskeline megaparsec microlens + optparse-applicative sandi text time transformers unix uri-encode + vinyl yaml ]; executableHaskellDepends = [ aeson base binary bytestring h-gpgme text yaml ]; - testHaskellDepends = [ base ]; description = "OTP Authenticator (a la google) command line client"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -178776,14 +178879,14 @@ self: { }) {}; "perceptual-hash" = callPackage - ({ mkDerivation, base, containers, cpphs, criterion, filepath, hip - , hspec, optparse-applicative, par-traverse, primitive, repa, stm - , vector, vector-algorithms + ({ mkDerivation, base, containers, cpphs, criterion, deepseq + , filepath, hip, hspec, optparse-applicative, par-traverse + , primitive, repa, stm, vector, vector-algorithms }: mkDerivation { pname = "perceptual-hash"; - version = "0.1.2.0"; - sha256 = "0wj5bnm4f2n2fd1ykf0n5cbf974x34nzy16dh7z2wxv2yn7b4f9r"; + version = "0.1.3.0"; + sha256 = "1g7hp5ijfqc2b3jacgabhq1mza9lqlxid309cvcm0jgppm4lvdpp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -178794,7 +178897,7 @@ self: { base containers filepath optparse-applicative par-traverse stm ]; testHaskellDepends = [ base hspec ]; - benchmarkHaskellDepends = [ base criterion filepath ]; + benchmarkHaskellDepends = [ base criterion deepseq filepath ]; benchmarkToolDepends = [ cpphs ]; description = "Find duplicate images"; license = stdenv.lib.licenses.bsd3; @@ -181153,8 +181256,6 @@ self: { ]; description = "Back up the notes you've saved to Pinboard"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pinch" = callPackage @@ -190333,8 +190434,8 @@ self: { }: mkDerivation { pname = "purebred-email"; - version = "0.2.0.0"; - sha256 = "1jjdia8qlwdibmfrqasyvm6qq01pxc9r66qmbyjmhz9bhdkqdd61"; + version = "0.3.0.0"; + sha256 = "0c2qmw29pbnh5kz9pkl7h4gvcs0nc671y2pjfdj3vsj0av3xqz9n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -193737,6 +193838,27 @@ self: { broken = true; }) {}; + "rank2classes_1_3_1" = callPackage + ({ mkDerivation, base, distributive, doctest, markdown-unlit, tasty + , tasty-hunit, template-haskell, transformers + }: + mkDerivation { + pname = "rank2classes"; + version = "1.3.1"; + sha256 = "07ykacy93c1rgh9a5ndkkhaviyfr61xfhi430rpwamk4h6i6qiy3"; + libraryHaskellDepends = [ + base distributive template-haskell transformers + ]; + testHaskellDepends = [ + base distributive doctest tasty tasty-hunit + ]; + testToolDepends = [ markdown-unlit ]; + description = "standard type constructor class hierarchy, only with methods of rank 2 types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "rapid" = callPackage ({ mkDerivation, async, base, containers, foreign-store, stm }: mkDerivation { @@ -195246,6 +195368,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "reanimate-svg_0_9_2_1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, hspec + , JuicyPixels, lens, linear, mtl, scientific, svg-tree, text + , transformers, vector, xml + }: + mkDerivation { + pname = "reanimate-svg"; + version = "0.9.2.1"; + sha256 = "018jkgiry2yaq7nl8sks4ahjdx5pjgdj99gc6k4l3rfmd1zxvsng"; + libraryHaskellDepends = [ + attoparsec base bytestring containers JuicyPixels lens linear mtl + scientific text transformers vector xml + ]; + testHaskellDepends = [ + attoparsec base hspec linear scientific svg-tree + ]; + description = "SVG file loader and serializer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "reason-export" = callPackage ({ mkDerivation, base, bytestring, containers, Diff, directory , formatting, hashable, hspec, hspec-core, HUnit, mtl, QuickCheck @@ -203108,6 +203251,8 @@ self: { pname = "safecopy"; version = "0.9.4.3"; sha256 = "020z2cdarpy8crz6b871lprgacwi6zsmmwml35ban93hdfjv2zbq"; + revision = "1"; + editedCabalFile = "060yxbk2fy5gddnpf6kxppc9fwkhiyldm39bj7873wggnpdc2xds"; libraryHaskellDepends = [ array base bytestring cereal containers old-time template-haskell text time vector @@ -206144,6 +206289,30 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {inherit (pkgs) secp256k1;}; + "secp256k1-haskell_0_1_5" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, cereal + , entropy, hashable, hspec, hspec-discover, HUnit, mtl, QuickCheck + , secp256k1, string-conversions + }: + mkDerivation { + pname = "secp256k1-haskell"; + version = "0.1.5"; + sha256 = "1s989dk7zncz68zl3k13dk8ap7dq5k4m2kwimpbicizxfnl7gzfg"; + libraryHaskellDepends = [ + base base16-bytestring bytestring cereal entropy hashable + QuickCheck string-conversions + ]; + librarySystemDepends = [ secp256k1 ]; + testHaskellDepends = [ + base base16-bytestring bytestring cereal entropy hashable hspec + HUnit mtl QuickCheck string-conversions + ]; + testToolDepends = [ hspec-discover ]; + description = "Bindings for secp256k1 library from Bitcoin Core"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) secp256k1;}; + "secp256k1-legacy" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, Cabal, cereal , cryptohash, entropy, HUnit, mtl, QuickCheck, string-conversions @@ -206298,6 +206467,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "selda_0_5_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, exceptions, mtl + , random, text, time, uuid-types + }: + mkDerivation { + pname = "selda"; + version = "0.5.0.0"; + sha256 = "1dsyc69fvqqhq9a9n97dnp81vvxxpf4dg4f5yan3fdr7zn9qgx3f"; + libraryHaskellDepends = [ + base bytestring containers exceptions mtl random text time + uuid-types + ]; + description = "Multi-backend, high-level EDSL for interacting with SQL databases"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "selda-json" = callPackage ({ mkDerivation, aeson, base, bytestring, selda, text }: mkDerivation { @@ -206311,6 +206497,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "selda-json_0_1_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, selda, text }: + mkDerivation { + pname = "selda-json"; + version = "0.1.1.0"; + sha256 = "1ai24qmz5nkpqx0zd24ix0ci5aqiccfy57fkf8f87swrv28101l8"; + libraryHaskellDepends = [ aeson base bytestring selda text ]; + description = "JSON support for the Selda database library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "selda-postgresql" = callPackage ({ mkDerivation, base, bytestring, exceptions, postgresql-binary , postgresql-libpq, selda, selda-json, text, time, uuid-types @@ -206489,6 +206687,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "semantic-source" = callPackage + ({ mkDerivation, aeson, base, bytestring, deepseq, doctest + , generic-monoid, hashable, hedgehog, QuickCheck, semilattices + , tasty, tasty-hedgehog, tasty-hunit, text + }: + mkDerivation { + pname = "semantic-source"; + version = "0.0.0.0"; + sha256 = "1zvqr8a5pm32hcwxxgnbyp773ld4c29m20v7hghcmkgfdayps5r1"; + libraryHaskellDepends = [ + aeson base bytestring deepseq generic-monoid hashable semilattices + text + ]; + testHaskellDepends = [ + base doctest hedgehog QuickCheck tasty tasty-hedgehog tasty-hunit + text + ]; + description = "Types and functionality for working with source code"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "semaphore-plus" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -210032,8 +210253,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.8.10"; - sha256 = "1gvswqkdk5awnvjqzvhbrvdmsyj73kiph872fvplmmdyvq8hb8gy"; + version = "0.8.11"; + sha256 = "1jvfjq7qlyqyprvhlk0licr8mrnc7xn5l4g3l95g3x4qii48j4s0"; libraryHaskellDepends = [ aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-types iproute @@ -210048,8 +210269,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Deploying Haskell code onto AWS Lambda using Serverless"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "serversession" = callPackage @@ -210511,6 +210730,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "setlocale_1_0_0_9" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "setlocale"; + version = "1.0.0.9"; + sha256 = "18b6xafspzxrmz5m9r9nzy3z053crqi59xc8n8aqd4gw0pvqdcrv"; + revision = "1"; + editedCabalFile = "01i087l8v129q90jf09khaw5p4iqix5s17gzgfz2pbi030zhb82h"; + libraryHaskellDepends = [ base ]; + description = "Haskell bindings to setlocale"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "setoid" = callPackage ({ mkDerivation, base, containers, mtl, smallcheck, tasty , tasty-discover, tasty-hunit, tasty-quickcheck, tasty-smallcheck @@ -212017,8 +212250,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "Simple shell scripting from Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "shh-extras" = callPackage @@ -212031,8 +212262,6 @@ self: { testHaskellDepends = [ base tasty ]; description = "Utility functions for using shh"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "shift" = callPackage @@ -212258,6 +212487,8 @@ self: { pname = "show-combinators"; version = "0.1.1.0"; sha256 = "02h2fvmw22v1mpxlxn9c6p7as3xspvspdphybxapac4s50mvyfnm"; + revision = "1"; + editedCabalFile = "1zr6xw4fvgx187yiqy7n0r9mnasyv1hxg2q9xzw3lmsf4z3xz6y7"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Combinators to write Show instances"; @@ -213402,8 +213633,8 @@ self: { ({ mkDerivation, base, mtl, parsec, pretty, tasty, tasty-hunit }: mkDerivation { pname = "simple-sql-parser"; - version = "0.5.0"; - sha256 = "0d063wyrz8qynngy499i00hjkacd0xg01qni1wx2cbrcxg0xwcpd"; + version = "0.6.0"; + sha256 = "11jpqh00nfdldpanrcy01jd6xyg4xvz3b8g4csc8kswc47wff82i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec pretty ]; @@ -225676,6 +225907,8 @@ self: { pname = "svfactor"; version = "0.1"; sha256 = "1vjdv7xgd33z3iwwlh8xwp9za06jvqxpbssc4m5bmcx1wihsnn35"; + revision = "1"; + editedCabalFile = "1ffm727zmg402s0v2mbcxjng6b0s1idci6x01njfw4s6zwl144fv"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring charset deepseq lens parsec parsers semigroupoids semigroups text transformers trifecta @@ -231793,16 +232026,19 @@ self: { }) {}; "text-format-heavy" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default, parsec - , text, time + ({ mkDerivation, base, bytestring, containers, data-default, hspec + , labels, parsec, template-haskell, text, th-lift + , th-lift-instances, time }: mkDerivation { pname = "text-format-heavy"; - version = "0.1.5.2"; - sha256 = "1rzzdbi16zndbsbsc83zd24ni2z1g6ndvjn3ylwagxr9xhh0iwp5"; + version = "0.1.5.3"; + sha256 = "00fz6s190jpqffx2i89rbmmc7959gh70bk3w8wcflcxkzcmf3wiv"; libraryHaskellDepends = [ - base bytestring containers data-default parsec text time + base bytestring containers data-default labels parsec + template-haskell text th-lift th-lift-instances time ]; + testHaskellDepends = [ base hspec time ]; description = "Full-weight string formatting library, analog of Python's string.format"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -238014,8 +238250,8 @@ self: { ({ mkDerivation, base, template-haskell, tree-sitter }: mkDerivation { pname = "tree-sitter-tsx"; - version = "0.2.0.0"; - sha256 = "16ql8b2dcp461182rsj2fdgz3z82jh351n436hl61jfja8dc15m8"; + version = "0.2.1.0"; + sha256 = "1lj2mmgqkswn8n5p4j4zdd0fw3syvg8v4d0ahnipvv1b05g1y1f4"; libraryHaskellDepends = [ base template-haskell tree-sitter ]; doHaddock = false; description = "Tree-sitter grammar/parser for TSX"; @@ -238028,8 +238264,8 @@ self: { ({ mkDerivation, base, template-haskell, tree-sitter }: mkDerivation { pname = "tree-sitter-typescript"; - version = "0.2.0.0"; - sha256 = "0pcxxgqz0w58fnfy1cbqwj7mmqj8nnkm2rkpp6h6agawsiswi8kz"; + version = "0.2.1.0"; + sha256 = "1dgb5b1yhpwrr8qd18l4jlxx3g5c34zaxffh934pssyldckfbid6"; libraryHaskellDepends = [ base template-haskell tree-sitter ]; doHaddock = false; description = "Tree-sitter grammar/parser for TypeScript"; @@ -238800,6 +239036,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ttl-hashtables_1_4_0_0" = callPackage + ({ mkDerivation, base, clock, containers, data-default, failable + , hashable, hashtables, hspec, mtl, transformers + }: + mkDerivation { + pname = "ttl-hashtables"; + version = "1.4.0.0"; + sha256 = "0s8ia8sd3j5k05gv57agbxar6bnpigwcy53ypz3j3pml90sdm820"; + libraryHaskellDepends = [ + base clock containers data-default failable hashable hashtables mtl + transformers + ]; + testHaskellDepends = [ + base clock containers data-default failable hashable hashtables + hspec mtl transformers + ]; + description = "Extends hashtables so that entries added can be expired after a TTL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ttn" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, hspec-expectations , raw-strings-qq, text, time, timerep @@ -239226,6 +239483,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "turtle_1_5_15" = callPackage + ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock + , containers, criterion, directory, doctest, exceptions, fail + , foldl, hostname, managed, optional-args, optparse-applicative + , process, semigroups, stm, streaming-commons, system-fileio + , system-filepath, temporary, text, time, transformers, unix + , unix-compat + }: + mkDerivation { + pname = "turtle"; + version = "1.5.15"; + sha256 = "0yckgsc2a4g5x867gni80ldp226bsnhncfbil4ql6v2zwm4r8p7f"; + libraryHaskellDepends = [ + ansi-wl-pprint async base bytestring clock containers directory + exceptions foldl hostname managed optional-args + optparse-applicative process semigroups stm streaming-commons + system-fileio system-filepath temporary text time transformers unix + unix-compat + ]; + testHaskellDepends = [ + base doctest fail system-filepath temporary + ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "Shell programming, Haskell-style"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "turtle-options" = callPackage ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle }: @@ -243777,15 +244062,16 @@ self: { }) {}; "urbit-hob" = callPackage - ({ mkDerivation, base, bytestring, hspec, hspec-core, murmur3 - , QuickCheck, text, vector + ({ mkDerivation, base, bytestring, criterion, deepseq, hspec + , hspec-core, murmur3, QuickCheck, text, vector }: mkDerivation { pname = "urbit-hob"; - version = "0.2.0"; - sha256 = "1wyvlwhc8pv4iv2dgkl5a7vz8pyykp42fmsr3ar08q58y7k269fg"; + version = "0.3.0"; + sha256 = "00ldbja79h5alf1wwxvrsah9v8fxam47cm2ypap9sni4w9kan5gk"; libraryHaskellDepends = [ base bytestring murmur3 text vector ]; testHaskellDepends = [ base hspec hspec-core QuickCheck text ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Hoon-style atom manipulation and printing functions"; license = stdenv.lib.licenses.mit; }) {}; @@ -247726,8 +248012,8 @@ self: { }: mkDerivation { pname = "waargonaut"; - version = "0.8.0.0"; - sha256 = "1pvs379s1w5nzr5hb1c5fbbbjgvsnvggj3l1l5j6klm0zf1y7x4h"; + version = "0.8.0.1"; + sha256 = "1rfmj9c87ql6mfqspx58qpqx6k1pvvfvgngzbjfpdx62xknxflkf"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ attoparsec base bifunctors bytestring containers contravariant @@ -249710,7 +249996,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "warp_3_3_1" = callPackage + "warp_3_3_2" = callPackage ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked , bytestring, case-insensitive, containers, directory, gauge , ghc-prim, hashable, hspec, http-client, http-date, http-types @@ -249720,8 +250006,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.3.1"; - sha256 = "0qay9h5cby5vcb1nkbrn4ch5xmj2i01g8f3psmvbgs854w2x0ygn"; + version = "3.3.2"; + sha256 = "1sh1jp27azf8zdzhaqg5ab8mky4wgdacwd5cd9zrk3dbbarkf94i"; libraryHaskellDepends = [ array async auto-update base bsb-http-chunked bytestring case-insensitive containers ghc-prim hashable http-date http-types @@ -250561,8 +250847,8 @@ self: { }: mkDerivation { pname = "webby"; - version = "0.1.1"; - sha256 = "0415vhp8h3lr8wlfkg6a7njq19ka1wyi9klcmsd117phd9m46whb"; + version = "0.1.3"; + sha256 = "1ry3cbi9awpxvj8f84b65ml9f73n5c1nw0ckc32hg55cq84yva9f"; libraryHaskellDepends = [ aeson base binary bytestring fast-logger formatting http-api-data http-types monad-logger protolude resourcet text unliftio @@ -252027,6 +252313,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "witherable_0_3_4" = callPackage + ({ mkDerivation, base, base-orphans, containers, hashable, lens + , monoidal-containers, transformers, transformers-compat + , unordered-containers, vector + }: + mkDerivation { + pname = "witherable"; + version = "0.3.4"; + sha256 = "19qkb8ww3vp446jr1yd4x4wxqm725lc6n2f3d1n3hb925x2djcd6"; + libraryHaskellDepends = [ + base base-orphans containers hashable lens monoidal-containers + transformers transformers-compat unordered-containers vector + ]; + description = "filterable traversable"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "witness" = callPackage ({ mkDerivation, base, constraints, semigroupoids, transformers }: mkDerivation { @@ -252290,6 +252594,17 @@ self: { broken = true; }) {}; + "woe" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "woe"; + version = "0.1.0.3"; + sha256 = "0f0pa2vlp56j35llhzq1qqkwkfpm7r96av8jw22jngd0kcpc185b"; + libraryHaskellDepends = [ base ]; + description = "Convenient typeclass for defining arbitrary-index enums"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "woffex" = callPackage ({ mkDerivation, base, binary, bytestring, filepath, zlib }: mkDerivation { @@ -255426,6 +255741,27 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "xmonad-contrib_0_16" = callPackage + ({ mkDerivation, base, bytestring, containers, directory + , extensible-exceptions, filepath, mtl, old-locale, old-time + , process, random, semigroups, unix, utf8-string, X11, X11-xft + , xmonad + }: + mkDerivation { + pname = "xmonad-contrib"; + version = "0.16"; + sha256 = "1pddgkvnbww28wykncc7j0yb0lv15bk7xnnhdcbrwkxzw66w6wmd"; + libraryHaskellDepends = [ + base bytestring containers directory extensible-exceptions filepath + mtl old-locale old-time process random semigroups unix utf8-string + X11 X11-xft xmonad + ]; + description = "Third party extensions for xmonad"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "xmonad-contrib-bluetilebranch" = callPackage ({ mkDerivation, base, containers, directory, extensible-exceptions , mtl, old-locale, old-time, process, random, unix, utf8-string From 38a0df1867f7ad330741fee9d2386feb67bc740a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Sep 2019 15:13:27 +0000 Subject: [PATCH 35/38] haskell-easytest: mark the build as broken when compiling with ghc-8.8.x --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 143e7259d58..a233185cf4b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -96,7 +96,8 @@ self: super: { url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/hedgehog-1.0.patch"; sha256 = "16gadh1hb74jqvzc9c893sffb1y2vjglblyrqjwp7xfhccq7g8yw"; }); - easytest = self.easytest_0_3; + easytest = markBroken super.easytest; + easytest_0_3 = markBroken super.easytest_0_3; regex-tdfa = appendPatch super.regex-tdfa (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-tdfa-1.2.3.1.patch"; sha256 = "1lhas4s2ms666prb475gaw2bqw1v4y8cxi66sy20j727sx7ppjs7"; From 67202a95bafe821402b6b0c6486059faf2a0b2cb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 22 Sep 2019 14:09:50 +0200 Subject: [PATCH 36/38] python-mailmanclient: this package builds only with Python 3.x (cherry picked from commit df74899305f863ba4f2956ebf64a9e84687aaaa7) --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 035d0d0aba2..6cc85b1e855 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -721,7 +721,7 @@ in { mailman-web = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/web.nix { }); - mailmanclient = callPackage ../development/python-modules/mailmanclient { }; + mailmanclient = disabledIf (!isPy3k) (callPackage ../development/python-modules/mailmanclient { }); mailman-hyperkitty = callPackage ../development/python-modules/mailman-hyperkitty { }; From 6a42202beb2637a9c2f70f2a1e462e9a53c9a496 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Sun, 22 Sep 2019 13:35:24 +0200 Subject: [PATCH 37/38] wordpress: 5.2.2 -> 5.2.3 https://wordpress.org/news/2019/09/wordpress-5-2-3-security-and-maintenance-release/ --- pkgs/servers/web-apps/wordpress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 4a9af9d329c..9dbf060aa9a 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wordpress"; - version = "5.2.2"; + version = "5.2.3"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "08iilbvf1gam2nmacj0a8fgldnd2gighmslf9sny8dsdlqlwjgvq"; + sha256 = "07gqdzhnqivyfah386lwyz984y9k2bc0hmji1y2pbvv0a60r63wr"; }; installPhase = '' From 2adb03fdaea6186299c6ff578bb6814d8f3bb30b Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Sun, 22 Sep 2019 13:29:03 +0200 Subject: [PATCH 38/38] nixos/wordpress: generate secrets locally Use /dev/urandom to generate keys and salts instead of downloading them from https://api.wordpress.org/secret-key/1.1/salt/ --- nixos/modules/services/web-apps/wordpress.nix | 22 ++++++++++++------- nixos/tests/wordpress.nix | 11 +++++----- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/nixos/modules/services/web-apps/wordpress.nix b/nixos/modules/services/web-apps/wordpress.nix index 88475437058..e311dd917dd 100644 --- a/nixos/modules/services/web-apps/wordpress.nix +++ b/nixos/modules/services/web-apps/wordpress.nix @@ -61,6 +61,19 @@ let ?> ''; + secretsVars = [ "AUTH_KEY" "SECURE_AUTH_KEY" "LOOGGED_IN_KEY" "NONCE_KEY" "AUTH_SALT" "SECURE_AUTH_SALT" "LOGGED_IN_SALT" "NONCE_SALT" ]; + secretsScript = hostStateDir: '' + if ! test -e "${hostStateDir}/secret-keys.php"; then + umask 0177 + echo "> "${hostStateDir}/secret-keys.php" + ${concatMapStringsSep "\n" (var: '' + echo "define('${var}', '`tr -dc a-zA-Z0-9 > "${hostStateDir}/secret-keys.php" + '') secretsVars} + echo "?>" >> "${hostStateDir}/secret-keys.php" + chmod 440 "${hostStateDir}/secret-keys.php" + fi + ''; + siteOpts = { lib, name, ... }: { options = { @@ -340,14 +353,7 @@ in wantedBy = [ "multi-user.target" ]; before = [ "phpfpm-wordpress-${hostName}.service" ]; after = optional cfg.database.createLocally "mysql.service"; - script = '' - if ! test -e "${stateDir hostName}/secret-keys.php"; then - echo "> "${stateDir hostName}/secret-keys.php" - ${pkgs.curl}/bin/curl -s https://api.wordpress.org/secret-key/1.1/salt/ >> "${stateDir hostName}/secret-keys.php" - echo "?>" >> "${stateDir hostName}/secret-keys.php" - chmod 440 "${stateDir hostName}/secret-keys.php" - fi - ''; + script = secretsScript (stateDir hostName); serviceConfig = { Type = "oneshot"; diff --git a/nixos/tests/wordpress.nix b/nixos/tests/wordpress.nix index 774ef6293b5..c6acfa6c1f3 100644 --- a/nixos/tests/wordpress.nix +++ b/nixos/tests/wordpress.nix @@ -20,12 +20,6 @@ import ./make-test.nix ({ pkgs, ... }: }; networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ]; - - # required for wordpress-init.service to succeed - systemd.tmpfiles.rules = [ - "F /var/lib/wordpress/site1.local/secret-keys.php 0440 wordpress wwwrun - -" - "F /var/lib/wordpress/site2.local/secret-keys.php 0440 wordpress wwwrun - -" - ]; }; testScript = '' @@ -37,6 +31,11 @@ import ./make-test.nix ({ pkgs, ... }: $machine->succeed("curl -L site1.local | grep 'Welcome to the famous'"); $machine->succeed("curl -L site2.local | grep 'Welcome to the famous'"); + + $machine->succeed("systemctl --no-pager show wordpress-init-site1.local.service | grep 'ExecStart=.*status=0'"); + $machine->succeed("systemctl --no-pager show wordpress-init-site2.local.service | grep 'ExecStart=.*status=0'"); + $machine->succeed("grep -E '^define.*NONCE_SALT.{64,};\$' /var/lib/wordpress/site1.local/secret-keys.php"); + $machine->succeed("grep -E '^define.*NONCE_SALT.{64,};\$' /var/lib/wordpress/site2.local/secret-keys.php"); ''; })