diff --git a/maintainers/scripts/haskell/hydra-report.hs b/maintainers/scripts/haskell/hydra-report.hs index 471447e60d5..3772b230f86 100755 --- a/maintainers/scripts/haskell/hydra-report.hs +++ b/maintainers/scripts/haskell/hydra-report.hs @@ -155,7 +155,7 @@ getMaintainerMap = do get c p i e = readProcess c p i <&> \x -> either (error . (<> " Raw:'" <> take 1000 x <> "'") . (e <>)) Prelude.id . eitherDecodeStrict' . encodeUtf8 . Text.pack $ x -- BuildStates are sorted by subjective importance/concerningness -data BuildState = Failed | DependencyFailed | OutputLimitExceeded | Unknown (Maybe Int) | TimedOut | Canceled | Unfinished | Success deriving (Show, Eq, Ord) +data BuildState = Failed | DependencyFailed | OutputLimitExceeded | Unknown (Maybe Int) | TimedOut | Canceled | HydraFailure | Unfinished | Success deriving (Show, Eq, Ord) icon :: BuildState -> Text icon = \case @@ -166,6 +166,7 @@ icon = \case TimedOut -> ":hourglass::no_entry_sign:" Canceled -> ":no_entry_sign:" Unfinished -> ":hourglass_flowing_sand:" + HydraFailure -> ":construction:" Success -> ":heavy_check_mark:" platformIcon :: Platform -> Text @@ -199,10 +200,11 @@ buildSummary maintainerMap = foldl (Map.unionWith unionSummary) Map.empty . fmap state = case (finished, buildstatus) of (0, _) -> Unfinished (_, Just 0) -> Success + (_, Just 1) -> Failed + (_, Just 2) -> DependencyFailed + (_, Just 3) -> HydraFailure (_, Just 4) -> Canceled (_, Just 7) -> TimedOut - (_, Just 2) -> DependencyFailed - (_, Just 1) -> Failed (_, Just 11) -> OutputLimitExceeded (_, i) -> Unknown i packageName = fromMaybe job (Text.stripSuffix ("." <> system) job) diff --git a/pkgs/applications/misc/megacmd/default.nix b/pkgs/applications/misc/megacmd/default.nix index 23d34f30d64..95b4838e3e7 100644 --- a/pkgs/applications/misc/megacmd/default.nix +++ b/pkgs/applications/misc/megacmd/default.nix @@ -1,11 +1,12 @@ -{ lib, stdenv +{ lib +, stdenv , autoconf , automake , c-ares , cryptopp , curl , fetchFromGitHub -, ffmpeg_3 +, ffmpeg_3 # build fails with latest ffmpeg, see https://github.com/meganz/MEGAcmd/issues/523 , freeimage , gcc-unwrapped , libmediainfo @@ -22,13 +23,13 @@ stdenv.mkDerivation rec { pname = "megacmd"; - version = "1.2.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAcmd"; rev = "${version}_Linux"; - sha256 = "0czyhsms0a0237d6h9b21n9p4nm4zkjanhhbvw26k6266g6c1nyr"; + sha256 = "sha256-Q1SZSDTPGgBA/W/ZVYfTQsiP41RE1LJ+esQ3PK9EjIc="; fetchSubmodules = true; }; @@ -49,7 +50,6 @@ stdenv.mkDerivation rec { libmediainfo libraw libsodium - libtool libuv libzen pcre-cpp @@ -80,9 +80,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "MEGA Command Line Interactive and Scriptable Application"; - homepage = "https://mega.nz/"; - license = licenses.unfree; - platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = [ maintainers.wedens ]; + homepage = "https://mega.nz/cmd"; + license = with licenses; [ bsd2 gpl3Only ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ lunik1 ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index e1f070eaa9a..45a03ef1fe5 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "src/electron-main.js", - "version": "1.7.26", + "version": "1.7.27", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -12,6 +12,9 @@ "license": "Apache-2.0", "files": [], "scripts": { + "i18n": "matrix-gen-i18n", + "prunei18n": "matrix-prune-i18n", + "diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && matrix-gen-i18n && matrix-compare-i18n-files src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json", "mkdirs": "mkdirp packages deploys", "fetch": "yarn run mkdirs && node scripts/fetch-package.js", "asar-webapp": "asar p webapp webapp.asar", @@ -31,6 +34,7 @@ }, "dependencies": { "auto-launch": "^5.0.5", + "counterpart": "^0.18.6", "electron-store": "^6.0.1", "electron-window-state": "^5.0.3", "minimist": "^1.2.3", @@ -48,6 +52,7 @@ "find-npm-prefix": "^1.0.2", "fs-extra": "^8.1.0", "glob": "^7.1.6", + "matrix-web-i18n": "github:matrix-org/matrix-web-i18n", "mkdirp": "^1.0.3", "needle": "^2.5.0", "node-pre-gyp": "^0.15.0", diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix index 2c254f78372..7d26fbbbff7 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix @@ -33,6 +33,14 @@ sha1 = "168da1a36e90da68ae8d49c0f1b48c7c6249213a"; }; } + { + name = "_babel_code_frame___code_frame_7.12.13.tgz"; + path = fetchurl { + name = "_babel_code_frame___code_frame_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz"; + sha1 = "dcfc826beef65e75c50e21d3837d7d95798dd658"; + }; + } { name = "_babel_generator___generator_7.10.5.tgz"; path = fetchurl { @@ -41,6 +49,14 @@ sha1 = "1b903554bc8c583ee8d25f1e8969732e6b829a69"; }; } + { + name = "_babel_generator___generator_7.13.16.tgz"; + path = fetchurl { + name = "_babel_generator___generator_7.13.16.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.16.tgz"; + sha1 = "0befc287031a201d84cdfc173b46b320ae472d14"; + }; + } { name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz"; path = fetchurl { @@ -49,6 +65,14 @@ sha1 = "d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"; }; } + { + name = "_babel_helper_function_name___helper_function_name_7.12.13.tgz"; + path = fetchurl { + name = "_babel_helper_function_name___helper_function_name_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz"; + sha1 = "93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a"; + }; + } { name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz"; path = fetchurl { @@ -57,6 +81,14 @@ sha1 = "98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"; }; } + { + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz"; + path = fetchurl { + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz"; + sha1 = "bc63451d403a3b3082b97e1d8b3fe5bd4091e583"; + }; + } { name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.10.4.tgz"; path = fetchurl { @@ -65,6 +97,14 @@ sha1 = "2c70576eaa3b5609b24cb99db2888cc3fc4251d1"; }; } + { + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.12.13.tgz"; + path = fetchurl { + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz"; + sha1 = "e9430be00baf3e88b0e13e6f9d4eaf2136372b05"; + }; + } { name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz"; path = fetchurl { @@ -73,6 +113,14 @@ sha1 = "a78c7a7251e01f616512d31b10adcf52ada5e0d2"; }; } + { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; + path = fetchurl { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz"; + sha1 = "c9a1f021917dcb5ccf0d4e453e399022981fc9ed"; + }; + } { name = "_babel_highlight___highlight_7.5.0.tgz"; path = fetchurl { @@ -89,6 +137,14 @@ sha1 = "7d1bdfd65753538fabe6c38596cdb76d9ac60143"; }; } + { + name = "_babel_highlight___highlight_7.13.10.tgz"; + path = fetchurl { + name = "_babel_highlight___highlight_7.13.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.13.10.tgz"; + sha1 = "a8b2a66148f5b27d666b15d81774347a731d52d1"; + }; + } { name = "_babel_parser___parser_7.10.5.tgz"; path = fetchurl { @@ -97,6 +153,14 @@ sha1 = "e7c6bf5a7deff957cec9f04b551e2762909d826b"; }; } + { + name = "_babel_parser___parser_7.13.16.tgz"; + path = fetchurl { + name = "_babel_parser___parser_7.13.16.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.16.tgz"; + sha1 = "0f18179b0448e6939b1f3f5c4c355a3a9bcdfd37"; + }; + } { name = "_babel_runtime___runtime_7.11.2.tgz"; path = fetchurl { @@ -113,6 +177,22 @@ sha1 = "3251996c4200ebc71d1a8fc405fba940f36ba278"; }; } + { + name = "_babel_template___template_7.12.13.tgz"; + path = fetchurl { + name = "_babel_template___template_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz"; + sha1 = "530265be8a2589dbb37523844c5bcb55947fb327"; + }; + } + { + name = "_babel_traverse___traverse_7.13.17.tgz"; + path = fetchurl { + name = "_babel_traverse___traverse_7.13.17.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.17.tgz"; + sha1 = "c85415e0c7d50ac053d758baec98b28b2ecfeea3"; + }; + } { name = "_babel_traverse___traverse_7.10.5.tgz"; path = fetchurl { @@ -129,6 +209,14 @@ sha1 = "d88ae7e2fde86bfbfe851d4d81afa70a997b5d15"; }; } + { + name = "_babel_types___types_7.13.17.tgz"; + path = fetchurl { + name = "_babel_types___types_7.13.17.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.13.17.tgz"; + sha1 = "48010a115c9fba7588b4437dd68c9469012b38b4"; + }; + } { name = "_develar_schema_utils___schema_utils_2.6.5.tgz"; path = fetchurl { @@ -1665,6 +1753,14 @@ sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; } + { + name = "counterpart___counterpart_0.18.6.tgz"; + path = fetchurl { + name = "counterpart___counterpart_0.18.6.tgz"; + url = "https://registry.yarnpkg.com/counterpart/-/counterpart-0.18.6.tgz"; + sha1 = "cf6b60d8ef99a4b44b8bf6445fa99b4bd1b2f9dd"; + }; + } { name = "crc_32___crc_32_1.2.0.tgz"; path = fetchurl { @@ -1761,6 +1857,14 @@ sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; }; } + { + name = "date_names___date_names_0.1.13.tgz"; + path = fetchurl { + name = "date_names___date_names_0.1.13.tgz"; + url = "https://registry.yarnpkg.com/date-names/-/date-names-0.1.13.tgz"; + sha1 = "c4358f6f77c8056e2f5ea68fdbb05f0bf1e53bd0"; + }; + } { name = "debounce_fn___debounce_fn_4.0.0.tgz"; path = fetchurl { @@ -2521,6 +2625,14 @@ sha1 = "74d2eb4de0b8da1293711910d50775b9b710ef64"; }; } + { + name = "except___except_0.1.3.tgz"; + path = fetchurl { + name = "except___except_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/except/-/except-0.1.3.tgz"; + sha1 = "98261c91958551536b44482238e9783fb73d292a"; + }; + } { name = "execa___execa_0.7.0.tgz"; path = fetchurl { @@ -2610,11 +2722,11 @@ }; } { - name = "figgy_pudding___figgy_pudding_3.5.1.tgz"; + name = "figgy_pudding___figgy_pudding_3.5.2.tgz"; path = fetchurl { - name = "figgy_pudding___figgy_pudding_3.5.1.tgz"; - url = "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz"; - sha1 = "862470112901c727a0e495a80744bd5baa1d6790"; + name = "figgy_pudding___figgy_pudding_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz"; + sha1 = "b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"; }; } { @@ -2697,6 +2809,14 @@ sha1 = "8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"; }; } + { + name = "foreachasync___foreachasync_3.0.0.tgz"; + path = fetchurl { + name = "foreachasync___foreachasync_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/foreachasync/-/foreachasync-3.0.0.tgz"; + sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6"; + }; + } { name = "forever_agent___forever_agent_0.6.1.tgz"; path = fetchurl { @@ -3265,6 +3385,14 @@ sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; }; } + { + name = "indexof___indexof_0.0.1.tgz"; + path = fetchurl { + name = "indexof___indexof_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz"; + sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; + }; + } { name = "infer_owner___infer_owner_1.0.4.tgz"; path = fetchurl { @@ -4217,6 +4345,14 @@ sha1 = "aa8387104f2687edca01c8687ee45013d02d19bd"; }; } + { + name = "63f9119bc0bc304e83d4e8e22364caa7850e7671"; + path = fetchurl { + name = "63f9119bc0bc304e83d4e8e22364caa7850e7671"; + url = "https://codeload.github.com/matrix-org/matrix-web-i18n/tar.gz/63f9119bc0bc304e83d4e8e22364caa7850e7671"; + sha1 = "17709c5ad5da065d2718fffe873b8d0a1a53a4cd"; + }; + } { name = "meant___meant_1.0.3.tgz"; path = fetchurl { @@ -4425,6 +4561,14 @@ sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; }; } + { + name = "ms___ms_2.1.3.tgz"; + path = fetchurl { + name = "ms___ms_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz"; + sha1 = "574c8138ce1d2b5861f0b44579dbadd60c6615b2"; + }; + } { name = "mute_stream___mute_stream_0.0.8.tgz"; path = fetchurl { @@ -5129,6 +5273,14 @@ sha1 = "74bbf011124b90421c22d15779cee60060ba95bc"; }; } + { + name = "pluralizers___pluralizers_0.1.7.tgz"; + path = fetchurl { + name = "pluralizers___pluralizers_0.1.7.tgz"; + url = "https://registry.yarnpkg.com/pluralizers/-/pluralizers-0.1.7.tgz"; + sha1 = "8d38dd0a1b660e739b10ab2eab10b684c9d50142"; + }; + } { name = "png_to_ico___png_to_ico_2.1.1.tgz"; path = fetchurl { @@ -6001,6 +6153,14 @@ sha1 = "f610afeee3b12bce1d0c30425e76398b78249a5f"; }; } + { + name = "sprintf_js___sprintf_js_1.1.2.tgz"; + path = fetchurl { + name = "sprintf_js___sprintf_js_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz"; + sha1 = "da1765262bf8c0f571749f2ad6c26300207ae673"; + }; + } { name = "sprintf_js___sprintf_js_1.0.3.tgz"; path = fetchurl { @@ -6018,11 +6178,11 @@ }; } { - name = "ssri___ssri_6.0.1.tgz"; + name = "ssri___ssri_6.0.2.tgz"; path = fetchurl { - name = "ssri___ssri_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz"; - sha1 = "2a3c41b28dd45b62b63676ecb74001265ae9edd8"; + name = "ssri___ssri_6.0.2.tgz"; + url = "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz"; + sha1 = "157939134f20464e7301ddba3e90ffa8f7728ac5"; }; } { @@ -6801,6 +6961,14 @@ sha1 = "1c233064202ee742afc9d56e21da3b2e15260acf"; }; } + { + name = "walk___walk_2.3.14.tgz"; + path = fetchurl { + name = "walk___walk_2.3.14.tgz"; + url = "https://registry.yarnpkg.com/walk/-/walk-2.3.14.tgz"; + sha1 = "60ec8631cfd23276ae1e7363ce11d626452e1ef3"; + }; + } { name = "wcwidth___wcwidth_1.0.1.tgz"; path = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 2a7e01e5291..ad319fcaede 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -8,12 +8,12 @@ let executableName = "element-desktop"; - version = "1.7.26"; + version = "1.7.27"; src = fetchFromGitHub { owner = "vector-im"; repo = "element-desktop"; rev = "v${version}"; - sha256 = "1iflsvzn36mywpzags55kjmyq71c3i7f1hgcdcp2ijmnrjk8fy3n"; + sha256 = "0rgsc2cc1v6gjsklwvsjlqq9a8j9j80h9ac0jkvf9lhq33f3c57k"; }; in mkYarnPackage rec { name = "element-desktop-${version}"; diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 9f077c83377..8fcb9bcd2b2 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.7.26"; + version = "1.7.27"; src = fetchurl { url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; - sha256 = "17y6wq6w1yk7r1rfply549kpilfraizahf67p00ra7cws66iqkwg"; + sha256 = "004b1cjw8fqk0ixm0wnbk4y51cby1i7avsas95sfm2zsbnbwg519"; }; installPhase = '' diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/pkgs/applications/window-managers/sway/wrapper.nix index 319023eb2e5..964828fdaba 100644 --- a/pkgs/applications/window-managers/sway/wrapper.nix +++ b/pkgs/applications/window-managers/sway/wrapper.nix @@ -14,6 +14,7 @@ let baseWrapper = writeShellScriptBin "sway" '' set -o errexit if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then + export XDG_CURRENT_DESKTOP=sway ${extraSessionCommands} export _SWAY_WRAPPER_ALREADY_EXECUTED=1 fi diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 5b720404385..66830ea017c 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "3d54acea35f6f709fa96c87696b845b3044dcab5", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3d54acea35f6f709fa96c87696b845b3044dcab5.tar.gz", - "sha256": "1zlkjs9d8r5k803wbsz5fmsrs76150chcnz2jaapmq32riyvm21g", - "msg": "Update from Hackage at 2021-05-07T19:29:19Z" + "commit": "b963dde27c24394c4be0031039dae4cb6a363aed", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/b963dde27c24394c4be0031039dae4cb6a363aed.tar.gz", + "sha256": "1yr9j4ldpi2p2zgdq4mky6y5yh7nilasdmskapbdxp9fxwba2r0x", + "msg": "Update from Hackage at 2021-05-10T22:01:59Z" } diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7668d854bb2..a7a72f09cf8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1783,10 +1783,6 @@ self: super: { ihaskell-display = doJailbreak super.ihaskell-display; ihaskell-basic = doJailbreak super.ihaskell-basic; - # too strict bounds on QuickCheck - # https://github.com/HeinrichApfelmus/hyper-haskell/issues/42 - hyper-extra = doJailbreak super.hyper-extra; - # Fixes too strict version bounds on regex libraries # Presumably to be removed at the next release yi-language = appendPatch super.yi-language (pkgs.fetchpatch { @@ -1844,8 +1840,6 @@ self: super: { }; }; - phonetic-languages-phonetics-basics = appendPatch super.phonetic-languages-phonetics-basics ./patches/phonetic-languages-phonetics-basics-haddock.patch; - # 2021-05-09: Restrictive bound on hspec-golden. Dep removed in newer versions. tomland = assert super.tomland.version == "1.3.2.0"; doJailbreak super.tomland; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 87fdeb4da2d..256857b033c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4183,6 +4183,7 @@ broken-packages: - simple-ui - simple-units - simple-vec3 + - simplexmq - simple-zipper - singleton-dict - singletons-th diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index cc33944d1ee..e1031bc7255 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -77,6 +77,14 @@ default-package-overrides: - gi-javascriptcore < 4.0.23 # - gi-soup < 2.4.24 # - gi-webkit2 < 4.0.27 # + # 2021-05-11: the diagrams libraries still depends on pre 0.6, + # e. g. https://github.com/diagrams/diagrams-core/issues/115 + # We can keep this pin presumably until base 4.15 + - monoid-extras < 0.6 + # 2021-05-11: Pin for hls 1.1.0 + - ghcide == 1.2.* + - hls-plugin-api == 1.1.0.0 + - hls-explicit-imports-plugin < 1.0.0.2 extra-packages: - base16-bytestring < 1 # required for cabal-install etc. diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index cdae5528cc2..bb66df5b155 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage Nightly 2021-05-07 +# Stackage Nightly 2021-05-10 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -355,6 +355,7 @@ default-package-overrides: - cayley-client ==0.4.15 - cborg ==0.2.5.0 - cborg-json ==0.2.2.0 + - cdar-mBound ==0.1.0.1 - cereal ==0.5.8.1 - cereal-conduit ==0.8.0 - cereal-text ==0.1.0.2 @@ -408,7 +409,7 @@ default-package-overrides: - cmdargs ==0.10.21 - codec-beam ==0.2.0 - code-page ==0.2.1 - - collect-errors ==0.1.0.0 + - collect-errors ==0.1.1.0 - co-log-concurrent ==0.5.0.0 - co-log-core ==0.2.1.1 - Color ==0.3.1 @@ -985,7 +986,7 @@ default-package-overrides: - hashmap ==1.3.3 - hashtables ==1.2.4.1 - haskeline ==0.8.1.2 - - haskell-awk ==1.2 + - haskell-awk ==1.2.0.1 - haskell-gi ==0.24.7 - haskell-gi-base ==0.24.5 - haskell-gi-overloading ==1.0 @@ -1044,7 +1045,7 @@ default-package-overrides: - hint ==0.9.0.4 - hjsmin ==0.2.0.4 - hkd-default ==1.1.0.0 - - hkgr ==0.2.7 + - hkgr ==0.3 - hlibcpuid ==0.2.0 - hlibgit2 ==0.18.0.16 - hlibsass ==0.1.10.1 @@ -1106,7 +1107,7 @@ default-package-overrides: - hspec-expectations-json ==1.0.0.3 - hspec-expectations-lifted ==0.10.0 - hspec-expectations-pretty-diff ==0.7.2.5 - - hspec-golden ==0.2.0.0 + - hspec-golden ==0.1.0.3 - hspec-golden-aeson ==0.7.0.0 - hspec-hedgehog ==0.0.1.2 - hspec-junit-formatter ==1.0.0.2 @@ -1200,7 +1201,7 @@ default-package-overrides: - hxt-tagsoup ==9.1.4 - hxt-unicode ==9.0.2.4 - hybrid-vectors ==0.2.2 - - hyper ==0.2.1.0 + - hyper ==0.2.1.1 - hyperloglog ==0.4.4 - hyphenation ==0.8.1 - iconv ==0.4.1.3 @@ -1317,7 +1318,7 @@ default-package-overrides: - kind-generics ==0.4.1.0 - kind-generics-th ==0.2.2.2 - kmeans ==0.1.3 - - koji ==0.0.1 + - koji ==0.0.2 - koofr-client ==1.0.0.3 - krank ==0.2.2 - kubernetes-webhook-haskell ==0.2.0.3 @@ -1491,7 +1492,7 @@ default-package-overrides: - mintty ==0.1.2 - missing-foreign ==0.1.1 - MissingH ==1.4.3.0 - - mixed-types-num ==0.4.1 + - mixed-types-num ==0.5.0.3 - mltool ==0.2.0.1 - mmap ==0.5.9 - mmark ==0.0.7.2 @@ -1570,7 +1571,7 @@ default-package-overrides: - mwc-random-monad ==0.7.3.1 - mx-state-codes ==1.0.0.0 - mysql ==0.2.0.1 - - mysql-simple ==0.4.5 + - mysql-simple ==0.4.6 - n2o ==0.11.1 - nagios-check ==0.3.2 - names-th ==0.3.0.1 @@ -1755,7 +1756,7 @@ default-package-overrides: - phantom-state ==0.2.1.2 - pid1 ==0.1.2.0 - pinboard ==0.10.2.0 - - pipes ==4.3.15 + - pipes ==4.3.16 - pipes-aeson ==0.4.1.8 - pipes-attoparsec ==0.5.1.5 - pipes-binary ==0.4.2 @@ -1864,7 +1865,7 @@ default-package-overrides: - pureMD5 ==2.1.3 - purescript-bridge ==0.14.0.0 - pushbullet-types ==0.4.1.0 - - pusher-http-haskell ==2.1.0.1 + - pusher-http-haskell ==2.1.0.2 - pvar ==1.0.0.0 - PyF ==0.9.0.3 - qchas ==1.1.0.1 @@ -2179,7 +2180,7 @@ default-package-overrides: - splint ==1.0.1.4 - split ==0.2.3.4 - splitmix ==0.1.0.3 - - splitmix-distributions ==0.7.0.0 + - splitmix-distributions ==0.8.0.0 - spoon ==0.3.1 - spreadsheet ==0.1.3.8 - sqlcli ==0.2.2.0 @@ -2187,9 +2188,9 @@ default-package-overrides: - sqlite-simple ==0.4.18.0 - sql-words ==0.1.6.4 - squeal-postgresql ==0.7.0.1 - - squeather ==0.6.0.0 + - squeather ==0.8.0.0 - srcloc ==0.6 - - stache ==2.2.1 + - stache ==2.3.0 - stackcollapse-ghc ==0.0.1.3 - stack-templatizer ==0.1.0.2 - stateref ==0.3 @@ -2491,7 +2492,7 @@ default-package-overrides: - unix-bytestring ==0.3.7.3 - unix-compat ==0.5.3 - unix-time ==0.4.7 - - unliftio ==0.2.14 + - unliftio ==0.2.15 - unliftio-core ==0.2.0.1 - unliftio-pool ==0.2.1.1 - unliftio-streams ==0.1.1.1 @@ -2665,7 +2666,7 @@ default-package-overrides: - yesod-newsfeed ==1.7.0.0 - yesod-page-cursor ==2.0.0.6 - yesod-paginator ==1.1.1.0 - - yesod-persistent ==1.6.0.6 + - yesod-persistent ==1.6.0.7 - yesod-sitemap ==1.6.0 - yesod-static ==1.6.1.0 - yesod-test ==1.6.12 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d04023b09e8..472730a45f1 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -6430,24 +6430,18 @@ self: { }) {}; "Frames-streamly" = callPackage - ({ mkDerivation, base, binary, bytestring - , bytestring-strict-builder, cereal, clock, exceptions - , fast-builder, foldl, Frames, mtl, primitive, relude, streamly - , streamly-bytestring, strict, text, vector, vinyl + ({ mkDerivation, base, exceptions, Frames, primitive, relude + , streamly, strict, text, vinyl }: mkDerivation { pname = "Frames-streamly"; - version = "0.1.1.0"; - sha256 = "16cxgar58q9gfbs8apl4a9z3ghdxb6m042di7hwhldqy0gn584fp"; + version = "0.1.1.1"; + sha256 = "05al2v7wivvpwxq0gxypbm30ch4ssxmxw1wl4k9az3dqfvr0xgal"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base exceptions Frames primitive relude streamly strict text vinyl ]; - testHaskellDepends = [ - base binary bytestring bytestring-strict-builder cereal clock - fast-builder foldl Frames mtl primitive relude streamly - streamly-bytestring strict text vector vinyl - ]; + testHaskellDepends = [ base Frames streamly text vinyl ]; description = "A streamly layer for Frames I/O"; license = lib.licenses.bsd3; }) {}; @@ -10966,8 +10960,8 @@ self: { }: mkDerivation { pname = "I1M"; - version = "0.0.3"; - sha256 = "0lk34g47iid2cfcj9zfdwbkpvhfhanh83jzh64r9sdrqgw9p25w3"; + version = "0.1.0"; + sha256 = "0a5bh9hlsn6hmdqinc47hxlav1isv9jh2i4x3zfyfp4y4xrp2h93"; libraryHaskellDepends = [ array base QuickCheck ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Code for the Haskell course taught at the University of Seville"; @@ -21763,8 +21757,8 @@ self: { }: mkDerivation { pname = "Z-Data"; - version = "0.8.1.0"; - sha256 = "19w5g5flsjnhjpvnmw7s8b5jg5nlpg0md99zgp3by8gjyigappc7"; + version = "0.8.2.0"; + sha256 = "0xjy5689ck23fyas52qrfrl716fpgmnahp7pln54yyz106hxqj4p"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq ghc-prim @@ -23832,8 +23826,8 @@ self: { }: mkDerivation { pname = "adblock2privoxy"; - version = "2.0.1"; - sha256 = "048l78mf3ccb7l0p1zg1wsvqmvpsaqwgik29xm333y7fjlcm0kq6"; + version = "2.0.2"; + sha256 = "0klw0rbxp5g240igrv10808inqmlh3wr3d46zphy5xjxjih07yf3"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -47267,17 +47261,17 @@ self: { }) {}; "bytestring-encoding" = callPackage - ({ mkDerivation, base, bytestring, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, tasty-th, text + ({ mkDerivation, base, bytestring, deepseq, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck, tasty-th, text }: mkDerivation { pname = "bytestring-encoding"; - version = "0.1.0.0"; - sha256 = "05pjx59xxpi27j3qfh2cwy9ibfdsc7g0zcsfkdhsj33yxpls363d"; + version = "0.1.1.0"; + sha256 = "0m2w1nvj5izmb4j08c57lk89i3rnhhb0n0rz511pb6s75ijqrb71"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ - base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck - tasty-th text + base bytestring deepseq QuickCheck tasty tasty-hunit + tasty-quickcheck tasty-th text ]; description = "ByteString ↔ Text converter based on GHC.IO.Encoding"; license = lib.licenses.bsd3; @@ -47738,10 +47732,11 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "c-enum"; - version = "0.1.0.0"; - sha256 = "02jxhscf8ibzqkhyvsgb04wxl3a02n2qipi3gmdppi6jffk2a1sj"; + version = "0.1.0.1"; + sha256 = "1mg01qzmwaks9ix0269kpvjsa60fkvfc5hjn4wb47c7a6zam2rx0"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base template-haskell ]; + description = "To make a type corresponding to an enum of C language"; license = lib.licenses.bsd3; }) {}; @@ -51898,8 +51893,8 @@ self: { pname = "cborg-json"; version = "0.2.2.0"; sha256 = "0ysilz7rrjk94sqr3a61s98hr9qfi1xg13bskmlpc6mpgi2s4s5b"; - revision = "2"; - editedCabalFile = "1hbabjvmyqha75v2ivyvj6yzrnj9vs3h9988j4p68x9bcwmgyjyd"; + revision = "3"; + editedCabalFile = "1sn2f9nfjcbr0n62n4kklbdi3pzpwrcy7ilg7m3v41nwrk53ifwy"; libraryHaskellDepends = [ aeson aeson-pretty base cborg scientific text unordered-containers vector @@ -51977,6 +51972,30 @@ self: { hydraPlatforms = lib.platforms.none; }) {dttools = null;}; + "cdar-mBound" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, integer-gmp + , parallel, QuickCheck, smallcheck, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "cdar-mBound"; + version = "0.1.0.1"; + sha256 = "1a31rjs1if69987xi15qpyl2m21qscsxpyrq4jhfk3j87ilpx5zg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers deepseq integer-gmp ]; + executableHaskellDepends = [ base containers deepseq integer-gmp ]; + testHaskellDepends = [ + base containers deepseq integer-gmp QuickCheck smallcheck tasty + tasty-hunit tasty-quickcheck tasty-smallcheck + ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq integer-gmp parallel + ]; + description = "Exact real arithmetic using Centred Dyadic Approximations"; + license = lib.licenses.bsd3; + }) {}; + "cdeps" = callPackage ({ mkDerivation, alex, array, base, bytestring, criterion , directory, filepath, hspec, optparse-applicative, text @@ -58020,8 +58039,8 @@ self: { ({ mkDerivation, base, containers, QuickCheck }: mkDerivation { pname = "collect-errors"; - version = "0.1.0.0"; - sha256 = "1zspgncbnn8zqixlxm3hrck3mk4j3n91515456w8dy220a0bzbhc"; + version = "0.1.1.0"; + sha256 = "0zk7iw1fx50dzm55rcxpd8rwqm7jsb057q8hrf7c8b0jjbrx5b9v"; libraryHaskellDepends = [ base containers QuickCheck ]; description = "Error monad with a Float instance"; license = lib.licenses.bsd3; @@ -66069,6 +66088,8 @@ self: { pname = "cryptonite"; version = "0.28"; sha256 = "1nx568qv25dxhbii7lzf1hbv0dyz95z715mmxjnnrkgpwdm8ibbl"; + revision = "1"; + editedCabalFile = "0hqbpdsj1b4fgisr11a9gmin5r7bqr3f83wc2xxc18dr01xhrw7d"; libraryHaskellDepends = [ base basement bytestring deepseq ghc-prim integer-gmp memory ]; @@ -66082,6 +66103,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "cryptonite_0_29" = callPackage + ({ mkDerivation, base, basement, bytestring, deepseq, gauge + , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit + , tasty-kat, tasty-quickcheck + }: + mkDerivation { + pname = "cryptonite"; + version = "0.29"; + sha256 = "13xhp3hshb8x06bw37kp16c9jpjmgfn06nkj9drz745fv8f04fnq"; + libraryHaskellDepends = [ + base basement bytestring deepseq ghc-prim integer-gmp memory + ]; + testHaskellDepends = [ + base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring deepseq gauge memory random + ]; + description = "Cryptography Primitives sink"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "cryptonite-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators , conduit-extra, cryptonite, exceptions, memory, resourcet, tasty @@ -88074,6 +88118,34 @@ self: { broken = true; }) {}; + "faktory_1_0_2_2" = callPackage + ({ mkDerivation, aeson, aeson-casing, async, base, bytestring + , connection, cryptonite, hspec, markdown-unlit, megaparsec, memory + , mtl, network, random, safe-exceptions, scanner, semigroups, text + , time, unix, unordered-containers + }: + mkDerivation { + pname = "faktory"; + version = "1.0.2.2"; + sha256 = "0w1wk40c7drdpm6wzm3hxhbgpznq8275fajb5c3z4pl8cav6hc61"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-casing base bytestring connection cryptonite megaparsec + memory mtl network random safe-exceptions scanner semigroups text + time unix unordered-containers + ]; + executableHaskellDepends = [ aeson base safe-exceptions ]; + testHaskellDepends = [ + aeson async base hspec markdown-unlit time + ]; + testToolDepends = [ markdown-unlit ]; + description = "Faktory Worker for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "fallible" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -90107,6 +90179,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "file-embed_0_0_14_0" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath + , template-haskell + }: + mkDerivation { + pname = "file-embed"; + version = "0.0.14.0"; + sha256 = "1b45yk17339zw53zgp8zb5sjg5xn76kryrb6dkqk747vnbdnf0h5"; + libraryHaskellDepends = [ + base bytestring directory filepath template-haskell + ]; + testHaskellDepends = [ base bytestring filepath ]; + description = "Use Template Haskell to embed file contents directly"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "file-embed-lzma" = callPackage ({ mkDerivation, base, base-compat, bytestring, directory, filepath , lzma, template-haskell, text, th-lift-instances, transformers @@ -91908,8 +91997,8 @@ self: { }: mkDerivation { pname = "flatparse"; - version = "0.2.0.0"; - sha256 = "0f7nhspfj90ypylwvya3c3dzvipvc462zyc6191xd1x40wn7qms9"; + version = "0.2.1.0"; + sha256 = "19vwh9fqda7fp7nv7sgxafvvc5kckaayizjw2vvmd634ka0bsyrr"; libraryHaskellDepends = [ base bytestring containers template-haskell ]; @@ -101588,6 +101677,73 @@ self: { license = lib.licenses.asl20; }) {}; + "ghcide_1_3_0_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, async, base + , base16-bytestring, binary, bytestring, bytestring-encoding + , case-insensitive, containers, cryptohash-sha1, data-default + , deepseq, dependent-map, dependent-sum, Diff, directory, dlist + , extra, filepath, fingertree, fuzzy, ghc, ghc-boot, ghc-boot-th + , ghc-check, ghc-exactprint, ghc-paths, ghc-trace-events + , ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable + , heapsize, hie-bios, hie-compat, hiedb, hls-graph, hls-plugin-api + , hp2pretty, hslogger, implicit-hie, implicit-hie-cradle, lens, lsp + , lsp-test, lsp-types, mtl, network-uri, opentelemetry + , optparse-applicative, parallel, prettyprinter + , prettyprinter-ansi-terminal, process, QuickCheck + , quickcheck-instances, record-dot-preprocessor, record-hasfield + , regex-tdfa, retrie, rope-utf16-splay, safe, safe-exceptions + , shake, shake-bench, sorted-list, sqlite-simple, stm, syb, tasty + , tasty-expected-failure, tasty-hunit, tasty-quickcheck + , tasty-rerun, text, time, transformers, unix, unliftio + , unliftio-core, unordered-containers, utf8-string, vector, yaml + }: + mkDerivation { + pname = "ghcide"; + version = "1.3.0.0"; + sha256 = "1rmgrf4is669k5h5hbc9ryp2fc26fcacikzccjyg47jsc967ls9i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array async base base16-bytestring binary bytestring + bytestring-encoding case-insensitive containers cryptohash-sha1 + data-default deepseq dependent-map dependent-sum Diff directory + dlist extra filepath fingertree fuzzy ghc ghc-boot ghc-boot-th + ghc-check ghc-exactprint ghc-paths ghc-trace-events Glob + haddock-library hashable heapsize hie-bios hie-compat hiedb + hls-graph hls-plugin-api hslogger implicit-hie-cradle lens lsp + lsp-types mtl network-uri opentelemetry optparse-applicative + parallel prettyprinter prettyprinter-ansi-terminal regex-tdfa + retrie rope-utf16-splay safe safe-exceptions sorted-list + sqlite-simple stm syb text time transformers unix unliftio + unliftio-core unordered-containers utf8-string vector + ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring containers data-default + directory extra filepath ghc gitrev hashable heapsize hie-bios + hiedb hls-graph hls-plugin-api lens lsp lsp-test lsp-types + optparse-applicative process safe-exceptions shake text + unordered-containers + ]; + testHaskellDepends = [ + aeson async base binary bytestring containers data-default + directory extra filepath ghc ghc-typelits-knownnat haddock-library + hls-graph hls-plugin-api lens lsp lsp-test lsp-types network-uri + optparse-applicative process QuickCheck quickcheck-instances + record-dot-preprocessor record-hasfield regex-tdfa rope-utf16-splay + safe safe-exceptions shake tasty tasty-expected-failure tasty-hunit + tasty-quickcheck tasty-rerun text unordered-containers + ]; + testToolDepends = [ implicit-hie ]; + benchmarkHaskellDepends = [ + aeson base directory extra filepath optparse-applicative shake + shake-bench text yaml + ]; + benchmarkToolDepends = [ hp2pretty implicit-hie ]; + description = "The core of an IDE"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghcjs-ajax" = callPackage ({ mkDerivation, aeson, base, http-types, text }: mkDerivation { @@ -114902,22 +115058,25 @@ self: { "hal" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, conduit, conduit-extra, containers, envy - , exceptions, hspec, http-client, http-types, mtl, text, time - , unordered-containers + , exceptions, hashable, hedgehog, hspec, hspec-hedgehog + , http-client, http-types, mtl, scientific, text, time + , transformers, unordered-containers, vector }: mkDerivation { pname = "hal"; - version = "0.4.7"; - sha256 = "1bf2d4djbw8gpkcgrvjm52hsyw8hv20rsk0qdxfi8aml6mp152k5"; + version = "0.4.8"; + sha256 = "1j3prf81ni5v003byl992dxvvkv8prgmsqmnpkwpd0365ilxyv2y"; revision = "1"; - editedCabalFile = "19hic5cgxyk2nz8nnrz091hv79al49q7ah9pv9d7fwagjzi027ch"; + editedCabalFile = "0jz54lz3wd05b2vabwlid31pyhvjrwbdr35nbqb9kdf13jfdgahr"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive conduit - conduit-extra containers envy exceptions http-client http-types mtl - text time unordered-containers + conduit-extra containers envy exceptions hashable http-client + http-types mtl text time unordered-containers ]; testHaskellDepends = [ - aeson base containers hspec http-client http-types time + aeson base base64-bytestring bytestring case-insensitive containers + hedgehog hspec hspec-hedgehog http-client http-types scientific + text time transformers unordered-containers vector ]; description = "A runtime environment for Haskell applications running on AWS Lambda"; license = lib.licenses.bsd3; @@ -115064,8 +115223,8 @@ self: { }: mkDerivation { pname = "halma"; - version = "0.3.0.1"; - sha256 = "1bmc7s4vl1k2i66q1ir6mkzn67j5gycshkkwp4d2v1dd86sswf28"; + version = "0.3.0.2"; + sha256 = "1fs2095hp8m5k0iq0ilhxc6qmlasdygx9wjdb6288jssdjbvvpyq"; libraryHaskellDepends = [ aeson base containers data-default diagrams-lib grid ]; @@ -117767,10 +117926,8 @@ self: { }: mkDerivation { pname = "haskell-awk"; - version = "1.2"; - sha256 = "14jfw5s3xw7amwasw37mxfinzwvxd6pr64iypmy65z7bkx3l01cj"; - revision = "1"; - editedCabalFile = "1d6smaalvf66h0d9d1vq9q8ldxcvg11m05wg70cbsq3s2vh6iz4p"; + version = "1.2.0.1"; + sha256 = "1r4hsvzbqagk06fc81cr1awfz0zqgs4hmbwl99mip47z578wrw9l"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -117778,15 +117935,15 @@ self: { base bytestring containers ghc list-t stringsearch ]; executableHaskellDepends = [ - base bytestring containers directory exceptions extra filelock - filepath ghc haskell-src-exts hint list-t mtl process stringsearch - template-haskell time transformers + base bytestring containers directory extra filelock filepath ghc + haskell-src-exts hint list-t mtl process template-haskell + transformers ]; testHaskellDepends = [ aeson attoparsec base bytestring containers directory doctest easy-file exceptions extra filelock filepath ghc haskell-src-exts - hint hspec HUnit list-t mtl process stringsearch template-haskell - temporary test-framework test-framework-hunit time transformers + hint hspec HUnit list-t mtl process template-haskell temporary + test-framework test-framework-hunit time transformers ]; description = "Transform text from the command-line using Haskell expressions"; license = lib.licenses.asl20; @@ -120689,8 +120846,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.52.8"; - sha256 = "14qwdh0fwyqhb3pgykprgp1vs78y4ixn2dn55bsi9x53cjjvp1qp"; + version = "0.52.9"; + sha256 = "12zpjb42j048afaz1ay8ay8j35dhpgiv58cfnm69j8lndcb71q4g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120735,8 +120892,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.52.6"; - sha256 = "0npiib582rnbk3w9f0m71y84xpk7akzkypfxrd9n1s4h3dh0qsfw"; + version = "0.52.9"; + sha256 = "1hh3yxxnwxqvjjcl45k7cpr25imnl9sghzv85i4l1n1vgs10p0nd"; libraryHaskellDepends = [ aeson base binary bytes bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl @@ -127220,8 +127377,8 @@ self: { }: mkDerivation { pname = "hierarchical-env"; - version = "0.2.0.0"; - sha256 = "1hslf8wppwbs9r40kfvxwnw6vxwa4fm2fjdfmxn0grpbpwz1qvf5"; + version = "0.2.0.1"; + sha256 = "162d54hxsflhns09d35nz4wyy3im45z8rsra8fjypxdr9z3j38hf"; libraryHaskellDepends = [ base method microlens microlens-mtl microlens-th rio template-haskell th-abstraction @@ -128798,25 +128955,6 @@ self: { }) {}; "hkgr" = callPackage - ({ mkDerivation, base, bytestring, directory, extra, filepath - , simple-cabal, simple-cmd-args, typed-process, xdg-basedir - }: - mkDerivation { - pname = "hkgr"; - version = "0.2.7"; - sha256 = "1p03qigrfkjj0q8ps9gx50pnz6s2rdmn2lqnybhfz8pifsqj0z7k"; - isLibrary = false; - isExecutable = true; - enableSeparateDataOutput = true; - executableHaskellDepends = [ - base bytestring directory extra filepath simple-cabal - simple-cmd-args typed-process xdg-basedir - ]; - description = "Simple Hackage release workflow for package maintainers"; - license = lib.licenses.gpl3Only; - }) {}; - - "hkgr_0_3" = callPackage ({ mkDerivation, base, bytestring, directory, extra, filepath , simple-cabal, simple-cmd-args, typed-process, xdg-basedir }: @@ -128833,7 +128971,6 @@ self: { ]; description = "Simple Hackage release workflow for package maintainers"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "hkt" = callPackage @@ -129662,6 +129799,37 @@ self: { license = lib.licenses.asl20; }) {}; + "hls-explicit-imports-plugin_1_0_0_2" = callPackage + ({ mkDerivation, aeson, base, containers, deepseq, ghc, ghcide + , hls-graph, hls-plugin-api, lsp, lsp-types, text + , unordered-containers + }: + mkDerivation { + pname = "hls-explicit-imports-plugin"; + version = "1.0.0.2"; + sha256 = "1ga7phiy7i6kmin0zi0dykbkv29vh46hzrn0bkvfqjkrb41mbi8q"; + libraryHaskellDepends = [ + aeson base containers deepseq ghc ghcide hls-graph hls-plugin-api + lsp lsp-types text unordered-containers + ]; + description = "Explicit imports plugin for Haskell Language Server"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + + "hls-graph" = callPackage + ({ mkDerivation, base, bytestring, shake, unordered-containers }: + mkDerivation { + pname = "hls-graph"; + version = "1.3.0.0"; + sha256 = "0mz9443jljwgi2zd6gafixfp2k8gpnrn5269qb9bjd5p4ai0bbp7"; + libraryHaskellDepends = [ + base bytestring shake unordered-containers + ]; + description = "Haskell Language Server internal graph API"; + license = lib.licenses.asl20; + }) {}; + "hls-haddock-comments-plugin" = callPackage ({ mkDerivation, base, bytestring, containers, filepath, ghc , ghc-exactprint, ghcide, hls-plugin-api, hls-test-utils, lsp-types @@ -129722,6 +129890,26 @@ self: { license = lib.licenses.asl20; }) {}; + "hls-plugin-api_1_1_0_1" = callPackage + ({ mkDerivation, aeson, base, containers, data-default + , dependent-map, dependent-sum, Diff, dlist, hashable, hls-graph + , hslogger, lens, lsp, opentelemetry, process, regex-tdfa, text + , unix, unordered-containers + }: + mkDerivation { + pname = "hls-plugin-api"; + version = "1.1.0.1"; + sha256 = "0xxkpaqnzm39blgaa2f9v35pwnp8rx3jbmgysnsnb9nchnjprg9z"; + libraryHaskellDepends = [ + aeson base containers data-default dependent-map dependent-sum Diff + dlist hashable hls-graph hslogger lens lsp opentelemetry process + regex-tdfa text unix unordered-containers + ]; + description = "Haskell Language Server API for plugin communication"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "hls-retrie-plugin" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, directory, extra , ghc, ghcide, hashable, hls-plugin-api, lsp, lsp-types, retrie @@ -129731,6 +129919,8 @@ self: { pname = "hls-retrie-plugin"; version = "1.0.0.2"; sha256 = "0jw1q0dk5jl80wbyvi1a6vszj9x3s7d2bnsbnyycbh4zgl33agwb"; + revision = "1"; + editedCabalFile = "03r3cb93493hr4rbd8n1ip63myssfycyijg2507kcmsly39i2qkz"; libraryHaskellDepends = [ aeson base containers deepseq directory extra ghc ghcide hashable hls-plugin-api lsp lsp-types retrie safe-exceptions shake text @@ -136935,6 +137125,23 @@ self: { }) {}; "hspec-golden" = callPackage + ({ mkDerivation, base, directory, hspec, hspec-core + , optparse-applicative, silently + }: + mkDerivation { + pname = "hspec-golden"; + version = "0.1.0.3"; + sha256 = "1d5ab34n0f1wk1q86qlb7x2b49abzzh08jh7j52nbrvnxld2j64l"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory hspec-core ]; + executableHaskellDepends = [ base directory optparse-applicative ]; + testHaskellDepends = [ base directory hspec hspec-core silently ]; + description = "Golden tests for hspec"; + license = lib.licenses.mit; + }) {}; + + "hspec-golden_0_2_0_0" = callPackage ({ mkDerivation, base, directory, filepath, hspec, hspec-core , optparse-applicative, silently }: @@ -136949,6 +137156,7 @@ self: { testHaskellDepends = [ base directory hspec hspec-core silently ]; description = "Golden tests for hspec"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "hspec-golden-aeson" = callPackage @@ -143264,8 +143472,8 @@ self: { ({ mkDerivation, base, blaze-html, deepseq, text }: mkDerivation { pname = "hyper"; - version = "0.2.1.0"; - sha256 = "14vl52v4qshdyp45qrg8ii8xzpi6n05qdgz3ri59wis8hdw1v06z"; + version = "0.2.1.1"; + sha256 = "14p7r57g75ny8l9h4ilbm6mhdsfiysfs3rd56300dl0jkpgrh8r2"; libraryHaskellDepends = [ base blaze-html deepseq text ]; description = "Display class for the HyperHaskell graphical Haskell interpreter"; license = lib.licenses.bsd3; @@ -143277,8 +143485,8 @@ self: { }: mkDerivation { pname = "hyper-extra"; - version = "0.2.0.0"; - sha256 = "1zcbs9cpr6rfzhsqrv867j79gb3521pyrl32qbp5jwqiy1iyddm5"; + version = "0.2.0.1"; + sha256 = "13ipxwhxrndl505zzxcq7gz874l0r2g0ma1yhq14bihvlwh3qr8d"; libraryHaskellDepends = [ base diagrams-lib diagrams-svg hyper QuickCheck svg-builder text ]; @@ -147682,17 +147890,19 @@ self: { }) {}; "interval-algebra" = callPackage - ({ mkDerivation, base, containers, hspec, QuickCheck, time + ({ mkDerivation, base, containers, hspec, QuickCheck, safe, time , witherable }: mkDerivation { pname = "interval-algebra"; - version = "0.6.2"; - sha256 = "0rfx5li74s160i64rjzl1p8gjj3aqxc1hml2n0c1jrair7l1g2iy"; + version = "0.6.3"; + sha256 = "10nrba4q2pyfa028ih079fzyc4l2gp5kfvbmh43lw739mh8kp5aa"; libraryHaskellDepends = [ - base containers QuickCheck time witherable + base containers QuickCheck safe time witherable + ]; + testHaskellDepends = [ + base containers hspec QuickCheck safe time ]; - testHaskellDepends = [ base containers hspec QuickCheck time ]; description = "An implementation of Allen's interval algebra for temporal logic"; license = lib.licenses.bsd3; }) {}; @@ -148187,6 +148397,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "io-streams_1_5_2_1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, deepseq, directory + , filepath, HUnit, mtl, network, primitive, process, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, time, transformers, vector, zlib, zlib-bindings + }: + mkDerivation { + pname = "io-streams"; + version = "1.5.2.1"; + sha256 = "1y3sqmxrwiksz7pl4hf3vzvg8p8n00qnv98nj5xbpcadlh468rny"; + configureFlags = [ "-fnointeractivetests" ]; + libraryHaskellDepends = [ + attoparsec base bytestring network primitive process text time + transformers vector zlib-bindings + ]; + testHaskellDepends = [ + attoparsec base bytestring deepseq directory filepath HUnit mtl + network primitive process QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 text time + transformers vector zlib zlib-bindings + ]; + description = "Simple, composable, and easy-to-use stream I/O"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "io-streams-haproxy" = callPackage ({ mkDerivation, attoparsec, base, bytestring, HUnit, io-streams , network, test-framework, test-framework-hunit, transformers @@ -152765,8 +153001,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.5.2"; - sha256 = "1nhz7rf8sczrhph0h9hia1vqxig1bcpc8v6zvxgrywmacl1mnky6"; + version = "0.5.3"; + sha256 = "00774gby970jxa69zw8baki40r6nw7vrprc670n8skmlp03p38j2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155199,17 +155435,6 @@ self: { }) {}; "koji" = callPackage - ({ mkDerivation, base, haxr, mtl }: - mkDerivation { - pname = "koji"; - version = "0.0.1"; - sha256 = "0yxx6xk5xld7jf7ph4x0r7k4bqcg02yl7597awbgbq82x97gyfb8"; - libraryHaskellDepends = [ base haxr mtl ]; - description = "Koji buildsystem XML-RPC API bindings"; - license = lib.licenses.gpl2Only; - }) {}; - - "koji_0_0_2" = callPackage ({ mkDerivation, base, haxr, mtl }: mkDerivation { pname = "koji"; @@ -155218,7 +155443,6 @@ self: { libraryHaskellDepends = [ base haxr mtl ]; description = "Koji buildsystem XML-RPC API bindings"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "kontra-config" = callPackage @@ -171614,6 +171838,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "memory_0_16_0" = callPackage + ({ mkDerivation, base, basement, bytestring, deepseq, foundation + , ghc-prim + }: + mkDerivation { + pname = "memory"; + version = "0.16.0"; + sha256 = "0zzxyr2b7gj92h3jzaq1lfqfyfkfj4l636ry35191i9bp3wa0v8l"; + libraryHaskellDepends = [ + base basement bytestring deepseq ghc-prim + ]; + testHaskellDepends = [ base basement bytestring foundation ]; + description = "memory and related abstraction stuff"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "memorypool" = callPackage ({ mkDerivation, base, containers, transformers, unsafe, vector }: mkDerivation { @@ -172711,6 +172952,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "microlens-th_0_4_3_10" = callPackage + ({ mkDerivation, base, containers, microlens, tagged + , template-haskell, th-abstraction, transformers + }: + mkDerivation { + pname = "microlens-th"; + version = "0.4.3.10"; + sha256 = "1dg2xhj85fy8q39m5dd94kjlabjyxgc0336vzkg0174l6l110l1c"; + libraryHaskellDepends = [ + base containers microlens template-haskell th-abstraction + transformers + ]; + testHaskellDepends = [ base microlens tagged ]; + description = "Automatic generation of record lenses for microlens"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "micrologger" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec, lens , text, text-format, time, transformers @@ -174217,30 +174476,13 @@ self: { }) {}; "mixed-types-num" = callPackage - ({ mkDerivation, base, hspec, hspec-smallcheck, mtl, QuickCheck - , smallcheck, template-haskell - }: - mkDerivation { - pname = "mixed-types-num"; - version = "0.4.1"; - sha256 = "159zx9b5p3g1ywhnbihjbxkpxylgrkhhrswmazymqbh49f4s758y"; - libraryHaskellDepends = [ - base hspec hspec-smallcheck mtl QuickCheck smallcheck - template-haskell - ]; - testHaskellDepends = [ base hspec hspec-smallcheck QuickCheck ]; - description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; - license = lib.licenses.bsd3; - }) {}; - - "mixed-types-num_0_5_0_0" = callPackage ({ mkDerivation, base, collect-errors, hspec, hspec-smallcheck, mtl , QuickCheck, smallcheck, template-haskell }: mkDerivation { pname = "mixed-types-num"; - version = "0.5.0.0"; - sha256 = "17jfrhlcc86qw0zg997hsd11dc97vrqfkylhwb5ii9ls14j5qxfl"; + version = "0.5.0.3"; + sha256 = "0pi91nwnqm2mb2dhyl1l0nq81dlaw9ar538d4n948k2r9lwf56cd"; libraryHaskellDepends = [ base collect-errors hspec hspec-smallcheck mtl QuickCheck smallcheck template-haskell @@ -174250,7 +174492,6 @@ self: { ]; description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "mixpanel-client" = callPackage @@ -174779,6 +175020,22 @@ self: { license = lib.licenses.lgpl3Only; }) {}; + "mnist-idx-conduit" = callPackage + ({ mkDerivation, base, binary, bytestring, conduit, containers + , exceptions, resourcet, vector + }: + mkDerivation { + pname = "mnist-idx-conduit"; + version = "0.2.0.0"; + sha256 = "1m6xxw59yyf60zp0s3qd2pmsps482qws2vlnfqjz2wgr4rj0cp1x"; + libraryHaskellDepends = [ + base binary bytestring conduit containers exceptions resourcet + vector + ]; + description = "conduit utilities for MNIST IDX files"; + license = lib.licenses.bsd3; + }) {}; + "moan" = callPackage ({ mkDerivation, base, binary, bytestring, containers, dawg , regex-tdfa, regex-tdfa-text, tagset-positional, text, zlib @@ -177139,6 +177396,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "monoid-extras_0_6" = callPackage + ({ mkDerivation, base, criterion, groups, semigroupoids, semigroups + }: + mkDerivation { + pname = "monoid-extras"; + version = "0.6"; + sha256 = "0ki1d3b1xpf653qj7brlqdgngghwrnmapy5gja75iiydfx2506a1"; + libraryHaskellDepends = [ base groups semigroupoids ]; + benchmarkHaskellDepends = [ base criterion semigroups ]; + description = "Various extra monoid-related definitions and utilities"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "monoid-owns" = callPackage ({ mkDerivation, base, bytestring, containers }: mkDerivation { @@ -181317,8 +181588,8 @@ self: { }: mkDerivation { pname = "mysql-simple"; - version = "0.4.5"; - sha256 = "1cbwdsxysz6a4182fgkkd869hm44v834lqv2igwsfbx6v0p44g5h"; + version = "0.4.6"; + sha256 = "1am8ck092s9cv4x1ambalil4mlazkp8w5qhjbl4nq0j2hpy73rby"; libraryHaskellDepends = [ attoparsec base base16-bytestring blaze-builder blaze-textual bytestring containers mysql old-locale pcre-light text time @@ -187741,6 +188012,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "nvfetcher" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, extra, free + , neat-interpolation, shake, text, tomland, transformers + , unordered-containers, validation-selective + }: + mkDerivation { + pname = "nvfetcher"; + version = "0.1.0.0"; + sha256 = "1flzivh84fxik5zw3n8j4b65lh8cxd15mjh72y4622rnlnfn2xvv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary bytestring extra free neat-interpolation shake + text transformers unordered-containers + ]; + executableHaskellDepends = [ + aeson base binary bytestring extra free neat-interpolation shake + text tomland transformers unordered-containers validation-selective + ]; + description = "Generate nix sources expr for the latest version of packages"; + license = lib.licenses.mit; + }) {}; + "nvim-hs" = callPackage ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit , containers, data-default, deepseq, foreign-store, hslogger, hspec @@ -195252,8 +195546,8 @@ self: { }: mkDerivation { pname = "passman"; - version = "0.3.0"; - sha256 = "1m3g4ah1wvga3kq9krvg13niisq4rqkb7i6f6lil39v6lplq5drq"; + version = "0.3.0.2"; + sha256 = "0iy5x8v3liclzh3qczkzmql9l6sq5mvplk4xhpnqqhwx3bkik47w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195332,6 +195626,8 @@ self: { pname = "password"; version = "3.0.0.0"; sha256 = "0x6f4zkqqsa6vi5dvy5sj0f7pqkqq9zw3ph9f0d8vl631zcs2inb"; + revision = "1"; + editedCabalFile = "0083j7wnq6dv663i22n0lmrgq8df5pl96xlyad3jv9l27r4z4gdk"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base64 bytestring cryptonite memory password-types @@ -195378,6 +195674,8 @@ self: { pname = "password-types"; version = "1.0.0.0"; sha256 = "090aqq2xs6m5djvr9zfdj7rxafbmj8d05vij5rchj1f9c46dclb5"; + revision = "1"; + editedCabalFile = "1nw1fskhr42xmhdc1bp290333vzgmc3fkfvydfwjvlw0962lxzvy"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring memory text ]; testHaskellDepends = [ @@ -197835,8 +198133,8 @@ self: { }: mkDerivation { pname = "persistent-migration"; - version = "0.2.0"; - sha256 = "0xqzgfzxv8xskyaivar6mnb9qp9s3fq0lh17sajrxa59fi7h8xjw"; + version = "0.2.1"; + sha256 = "0jxhd9bkzcak48nz02g1s8rmbc9fkylf13p4vxkn3x26g2qlig7i"; libraryHaskellDepends = [ base containers fgl mtl persistent text time unordered-containers ]; @@ -199247,8 +199545,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-phonetics-basics"; - version = "0.6.1.0"; - sha256 = "0pa55mkw70f20bw90qc8lballa89zgk6b185038i4p3piipsymrn"; + version = "0.6.2.0"; + sha256 = "1vzx21pp9hkksbw5vpl8rarxpnbhmj04xys3qx0xk0zqf2p1f86q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -199402,14 +199700,42 @@ self: { license = lib.licenses.mit; }) {}; + "phonetic-languages-simplified-generalized-examples-array" = callPackage + ({ mkDerivation, base, heaps, mmsyn2-array, parallel + , phonetic-languages-constraints-array + , phonetic-languages-filters-array + , phonetic-languages-permutations-array + , phonetic-languages-phonetics-basics, phonetic-languages-plus + , phonetic-languages-simplified-base + , phonetic-languages-simplified-generalized-examples-common + , phonetic-languages-simplified-generalized-properties-array, subG + }: + mkDerivation { + pname = "phonetic-languages-simplified-generalized-examples-array"; + version = "0.1.1.0"; + sha256 = "04b65k6jjrlfx93m7625f991vll136y0lbh82f9qgxlmwv1vwmm8"; + libraryHaskellDepends = [ + base heaps mmsyn2-array parallel + phonetic-languages-constraints-array + phonetic-languages-filters-array + phonetic-languages-permutations-array + phonetic-languages-phonetics-basics phonetic-languages-plus + phonetic-languages-simplified-base + phonetic-languages-simplified-generalized-examples-common + phonetic-languages-simplified-generalized-properties-array subG + ]; + description = "Helps to create texts with the given phonetic properties (e. g. poetic)."; + license = lib.licenses.mit; + }) {}; + "phonetic-languages-simplified-generalized-examples-common" = callPackage ({ mkDerivation, base, heaps, phonetic-languages-phonetics-basics , subG }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-common"; - version = "0.1.0.1"; - sha256 = "07rqfnz2rkx6rwfgrv97yiww2d1086av60pri5qcp5l44xwlqdy5"; + version = "0.1.1.0"; + sha256 = "0yhpw7bpfag5d6cbm385dy5jxll2vn8104ypqngdv0qlxqx25m9l"; libraryHaskellDepends = [ base heaps phonetic-languages-phonetics-basics subG ]; @@ -199424,8 +199750,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-properties-array"; - version = "0.1.0.2"; - sha256 = "1hm9yz0ibfrzmmm70qff0bsghiscigp9843i9nhk41yfxlrmbsp3"; + version = "0.1.1.0"; + sha256 = "04jg2b2qzm3yhbckbpn7zarfdy921lryx8d5r3cx9vcp55xvain0"; libraryHaskellDepends = [ base phonetic-languages-phonetics-basics phonetic-languages-rhythmicity phonetic-languages-simplified-base @@ -200224,13 +200550,15 @@ self: { }) {}; "pinned-warnings" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, ghc }: + ({ mkDerivation, base, bytestring, containers, directory, ghc, time + , transformers + }: mkDerivation { pname = "pinned-warnings"; - version = "0.1.0.1"; - sha256 = "0yrd4lqr1sklswalpx7j1bmqjsc19y080wcgq4qd0fmc3qhcixjc"; + version = "0.1.0.2"; + sha256 = "0mm7d185syrbksl751hx0541qdin064ixm7bbqq3ji8jcgbg42x5"; libraryHaskellDepends = [ - base bytestring containers directory ghc + base bytestring containers directory ghc time transformers ]; description = "Preserve warnings in a GHCi session"; license = lib.licenses.bsd3; @@ -200332,29 +200660,6 @@ self: { }) {}; "pipes" = callPackage - ({ mkDerivation, base, criterion, exceptions, mmorph, mtl - , optparse-applicative, QuickCheck, test-framework - , test-framework-quickcheck2, transformers, void - }: - mkDerivation { - pname = "pipes"; - version = "4.3.15"; - sha256 = "01hvzm7cp6y3wrdhca3wlb99y0az0rjy5lscmnds0v6i767kyxk1"; - libraryHaskellDepends = [ - base exceptions mmorph mtl transformers void - ]; - testHaskellDepends = [ - base mtl QuickCheck test-framework test-framework-quickcheck2 - transformers - ]; - benchmarkHaskellDepends = [ - base criterion mtl optparse-applicative transformers - ]; - description = "Compositional pipelines"; - license = lib.licenses.bsd3; - }) {}; - - "pipes_4_3_16" = callPackage ({ mkDerivation, base, criterion, exceptions, mmorph, mtl , optparse-applicative, QuickCheck, test-framework , test-framework-quickcheck2, transformers, void @@ -200375,7 +200680,6 @@ self: { ]; description = "Compositional pipelines"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "pipes-aeson" = callPackage @@ -202725,8 +203029,8 @@ self: { }: mkDerivation { pname = "pointfree"; - version = "1.1.1.7"; - sha256 = "19yvkh4akcsiy0blmrwy7ayirg729s3vs4w0qkb2w171aas34090"; + version = "1.1.1.8"; + sha256 = "0jfl6sp0kv2fdjdhzn85j3hb7a83w9g64girs67v6j53yljqx8vz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -209973,10 +210277,8 @@ self: { }: mkDerivation { pname = "pseudo-boolean"; - version = "0.1.9.0"; - sha256 = "00n5mf7abprhr9xvh3k1mw40jn4l94wwxpc2h0546h0n9v7srb1b"; - revision = "3"; - editedCabalFile = "0x0a5rjylmh4pdmr9iyadywzh06qxypq48b78skvm09bkkvrxghq"; + version = "0.1.10.0"; + sha256 = "1p9w1d80d2kp7wp7wp6xf9dz1iv9knhy8b75mklz7zq3cf5gvnrh"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder containers deepseq dlist hashable megaparsec parsec void @@ -211096,8 +211398,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "2.1.0.1"; - sha256 = "19mdq0piyvqvw2nfcb164narj6d9wgp1as75ri2w21i5qmm1jhi8"; + version = "2.1.0.2"; + sha256 = "0xrmjdika7y2hkp67kzh7xqc3v9j6db1rq2ksih1j9yypa1iihka"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite hashable http-client http-client-tls http-types memory text time @@ -216125,6 +216427,17 @@ self: { broken = true; }) {}; + "realworldhaskell" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "realworldhaskell"; + version = "0.0.1.0"; + sha256 = "0695y4af42vm50njpldx3i03ia4bws0lx3yhw6p2rv032jhmp5w6"; + libraryHaskellDepends = [ base ]; + description = "The Real World Haskell Book"; + license = lib.licenses.publicDomain; + }) {}; + "reanimate" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, attoparsec, base , base64-bytestring, bytestring, cassava, cereal, colour @@ -221999,28 +222312,28 @@ self: { }) {}; "ribosome" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base-noprelude, bytestring - , cereal, cereal-conduit, chiasma, composition, composition-extra - , conduit, conduit-extra, containers, cornea, data-default, deepseq - , directory, either, exceptions, filepath, free, hslogger, lens - , lifted-async, lifted-base, messagepack, MissingH, monad-control - , monad-loops, mtl, nvim-hs, path, path-io, pretty-terminal - , prettyprinter, prettyprinter-ansi-terminal, process, relude - , resourcet, safe, split, stm, stm-chans, stm-conduit - , template-haskell, text, th-abstraction, time, transformers - , transformers-base, typed-process, unix, unliftio, unliftio-core - , utf8-string + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cereal + , cereal-conduit, chiasma, composition, composition-extra, conduit + , conduit-extra, containers, cornea, data-default, deepseq + , directory, either, exceptions, filepath, free, fuzzy, hourglass + , hslogger, lens, lifted-async, lifted-base, messagepack + , monad-control, monad-loops, mtl, nvim-hs, path, path-io + , pretty-terminal, prettyprinter, prettyprinter-ansi-terminal + , process, relude, resourcet, safe, split, stm, stm-chans + , stm-conduit, template-haskell, text, th-abstraction, time + , transformers, transformers-base, typed-process, unix, unliftio + , unliftio-core, utf8-string }: mkDerivation { pname = "ribosome"; - version = "0.3.0.1"; - sha256 = "1dka9hqh48nib7y0rz4bxr6d3iqavzw0163q64xwcjxaib293kks"; + version = "0.4.0.0"; + sha256 = "1h8x9gwm5g0jwf8zgpjb0wm76nj54x664l78v58n8cl5kwykr8ig"; libraryHaskellDepends = [ - aeson ansi-terminal base-noprelude bytestring cereal cereal-conduit - chiasma composition composition-extra conduit conduit-extra - containers cornea data-default deepseq directory either exceptions - filepath free hslogger lens lifted-async lifted-base messagepack - MissingH monad-control monad-loops mtl nvim-hs path path-io + aeson ansi-terminal base bytestring cereal cereal-conduit chiasma + composition composition-extra conduit conduit-extra containers + cornea data-default deepseq directory either exceptions filepath + free fuzzy hourglass hslogger lens lifted-async lifted-base + messagepack monad-control monad-loops mtl nvim-hs path path-io pretty-terminal prettyprinter prettyprinter-ansi-terminal process relude resourcet safe split stm stm-chans stm-conduit template-haskell text th-abstraction time transformers @@ -222028,7 +222341,7 @@ self: { utf8-string ]; description = "api extensions for nvim-hs"; - license = "unknown"; + license = "BSD-2-Clause-Patent"; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222066,24 +222379,39 @@ self: { }) {}; "ribosome-test" = callPackage - ({ mkDerivation, base-noprelude, bytestring, chiasma, cornea - , data-default, directory, exceptions, filepath, free, hslogger - , HTF, lifted-base, messagepack, monad-control, mtl, nvim-hs - , process, relude, resourcet, ribosome, text, transformers - , typed-process, unix, unliftio, unliftio-core + ({ mkDerivation, aeson, base, bytestring, chiasma, composition + , composition-extra, conduit, containers, cornea, data-default + , directory, either, exceptions, filepath, free, hedgehog, hslogger + , lens, lifted-async, lifted-base, messagepack, monad-control, mtl + , nvim-hs, path, path-io, prettyprinter + , prettyprinter-ansi-terminal, process, relude, resourcet, ribosome + , tasty, tasty-hedgehog, template-haskell, text, transformers + , typed-process, unix, unliftio }: mkDerivation { pname = "ribosome-test"; - version = "0.3.0.1"; - sha256 = "18pmb6db23ak29y5vqzvblvq3yqpi2zn8qk0cp7825sbahqxn320"; + version = "0.4.0.0"; + sha256 = "1kjs1h4qvgal67xg177dfbc4zcinjsjvjvbkdv3zilxsc6scfq1n"; libraryHaskellDepends = [ - base-noprelude bytestring chiasma cornea data-default directory - exceptions filepath free hslogger HTF lifted-base messagepack - monad-control mtl nvim-hs process relude resourcet ribosome text - transformers typed-process unix unliftio unliftio-core + aeson base bytestring chiasma composition composition-extra conduit + containers cornea data-default directory either exceptions filepath + free hedgehog hslogger lens lifted-async lifted-base messagepack + monad-control mtl nvim-hs path path-io prettyprinter + prettyprinter-ansi-terminal process relude resourcet ribosome tasty + tasty-hedgehog template-haskell text transformers typed-process + unix unliftio + ]; + testHaskellDepends = [ + aeson base bytestring chiasma composition composition-extra conduit + containers cornea data-default directory either exceptions filepath + free hedgehog hslogger lens lifted-async lifted-base messagepack + monad-control mtl nvim-hs path path-io prettyprinter + prettyprinter-ansi-terminal process relude resourcet ribosome tasty + tasty-hedgehog template-haskell text transformers typed-process + unix unliftio ]; description = "test helpers for ribosome"; - license = "unknown"; + license = "BSD-2-Clause-Patent"; hydraPlatforms = lib.platforms.none; }) {}; @@ -223866,6 +224194,34 @@ self: { broken = true; }) {}; + "rp-tree" = callPackage + ({ mkDerivation, base, boxes, bytestring, conduit, containers + , deepseq, exceptions, hspec, microlens, microlens-th, mtl + , QuickCheck, serialise, splitmix-distributions, transformers + , vector, vector-algorithms + }: + mkDerivation { + pname = "rp-tree"; + version = "0.1.0.0"; + sha256 = "02ws7i6qgixpfr0pw623sz99wr7q605n1hacpdw1il8h8fdzy0r5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base boxes bytestring conduit containers deepseq exceptions hspec + microlens microlens-th mtl serialise splitmix-distributions + transformers vector vector-algorithms + ]; + executableHaskellDepends = [ + base conduit containers exceptions splitmix-distributions + transformers vector + ]; + testHaskellDepends = [ + base hspec QuickCheck splitmix-distributions + ]; + description = "Random projection trees"; + license = lib.licenses.bsd3; + }) {}; + "rpc" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, derive , network-fancy, template-haskell, th-lift @@ -236683,6 +237039,50 @@ self: { license = lib.licenses.bsd3; }) {}; + "simplexmq" = callPackage + ({ mkDerivation, ansi-terminal, asn1-encoding, asn1-types, async + , attoparsec, base, base64-bytestring, bytestring, containers + , cryptonite, cryptostore, directory, filepath, generic-random + , hspec, hspec-core, HUnit, ini, iso8601-time, memory, mtl, network + , network-transport, optparse-applicative, QuickCheck, random + , simple-logger, sqlite-simple, stm, template-haskell, text, time + , timeit, transformers, unliftio, unliftio-core, x509 + }: + mkDerivation { + pname = "simplexmq"; + version = "0.3.1"; + sha256 = "0rc443nq4m1ghi5wbsaj6ravqs488lb2si0xmisg9h5ghsh204bf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal asn1-encoding asn1-types async attoparsec base + base64-bytestring bytestring containers cryptonite directory + filepath generic-random iso8601-time memory mtl network + network-transport QuickCheck random simple-logger sqlite-simple stm + template-haskell text time transformers unliftio unliftio-core x509 + ]; + executableHaskellDepends = [ + ansi-terminal asn1-encoding asn1-types async attoparsec base + base64-bytestring bytestring containers cryptonite cryptostore + directory filepath generic-random ini iso8601-time memory mtl + network network-transport optparse-applicative QuickCheck random + simple-logger sqlite-simple stm template-haskell text time + transformers unliftio unliftio-core x509 + ]; + testHaskellDepends = [ + ansi-terminal asn1-encoding asn1-types async attoparsec base + base64-bytestring bytestring containers cryptonite directory + filepath generic-random hspec hspec-core HUnit iso8601-time memory + mtl network network-transport QuickCheck random simple-logger + sqlite-simple stm template-haskell text time timeit transformers + unliftio unliftio-core x509 + ]; + description = "SimpleXMQ message broker"; + license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "simplistic-generics" = callPackage ({ mkDerivation, base, containers, deepseq, kind-apply, mtl , template-haskell @@ -242517,15 +242917,15 @@ self: { }) {}; "splitmix-distributions" = callPackage - ({ mkDerivation, base, containers, erf, hspec, mtl, splitmix - , transformers + ({ mkDerivation, base, containers, erf, exceptions, hspec, mtl + , splitmix, transformers }: mkDerivation { pname = "splitmix-distributions"; - version = "0.7.0.0"; - sha256 = "1zidzdfyk0rc5hijai99i2k4vh1nlqp42l2m3z92d2qmqkk8nzdl"; + version = "0.8.0.0"; + sha256 = "1l7fh6nycsxy15m2w60pq6zp4iq811wzbklkyrc7z3wlghskqrmk"; libraryHaskellDepends = [ - base containers erf mtl splitmix transformers + base containers erf exceptions mtl splitmix transformers ]; testHaskellDepends = [ base erf hspec mtl splitmix transformers ]; description = "Random samplers for some common distributions, based on splitmix"; @@ -243137,23 +243537,6 @@ self: { }) {}; "squeather" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, hedgehog - , lifted-base, temporary, text - }: - mkDerivation { - pname = "squeather"; - version = "0.6.0.0"; - sha256 = "05cs67xcvfq0497kddmvzrccf7ihav87mv4hmi8kgl2jp8hqmk7p"; - libraryHaskellDepends = [ base bytestring text ]; - testHaskellDepends = [ - base bytestring directory filepath hedgehog lifted-base temporary - text - ]; - description = "Use databases with the version 3 series of the SQLite C library"; - license = lib.licenses.bsd3; - }) {}; - - "squeather_0_8_0_0" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, hedgehog , lifted-base, temporary, text }: @@ -243168,7 +243551,6 @@ self: { ]; description = "Use databases with the version 3 series of the SQLite C library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "squeeze" = callPackage @@ -243597,8 +243979,8 @@ self: { }: mkDerivation { pname = "stache"; - version = "2.2.1"; - sha256 = "1vkvi9rrf15a8lbihvcmrslykby4qc4jmc5zaqm1ikxsid9x5704"; + version = "2.3.0"; + sha256 = "1gfmr9gcq9zm7ljp2nqmc41lpig11d19xsqzazr2mvm5ddsi69cr"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -243644,8 +244026,8 @@ self: { }: mkDerivation { pname = "stack"; - version = "2.5.1.1"; - sha256 = "0fdm4wc8hxawfab7dv2ayr853mna93gznb7g162gw4h4zxnyzwyc"; + version = "2.7.1"; + sha256 = "09mw5jwgcmbkwsgvg1ls114hq9v2vl49pdvix8ir7vvgicvdhnv0"; configureFlags = [ "-fdisable-git-info" "-fhide-dependency-versions" "-fsupported-build" @@ -244479,6 +244861,31 @@ self: { broken = true; }) {}; + "stackcollapse-ghc_0_0_1_4" = callPackage + ({ mkDerivation, base, bytestring, containers, extra, filepath + , foldl, hspec, hspec-golden, recursion-schemes, rosezipper, safe + , text, transformers, utf8-string + }: + mkDerivation { + pname = "stackcollapse-ghc"; + version = "0.0.1.4"; + sha256 = "1scqjjp1cpz3zzvqa6wmfz11qrhsbqwgq7h8qjg0d8ri3r9z82lb"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring containers extra foldl recursion-schemes rosezipper + safe text transformers + ]; + testHaskellDepends = [ + base bytestring containers extra filepath foldl hspec hspec-golden + recursion-schemes rosezipper safe text transformers utf8-string + ]; + description = "Program to fold GHC prof files into flamegraph input"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "stacked-dag" = callPackage ({ mkDerivation, base, containers, doctest, graphviz , optparse-applicative, text @@ -268108,14 +268515,16 @@ self: { }) {}; "unicode-tricks" = callPackage - ({ mkDerivation, base, data-default, hspec, hspec-discover - , QuickCheck, text + ({ mkDerivation, base, containers, data-default, hspec + , hspec-discover, QuickCheck, text }: mkDerivation { pname = "unicode-tricks"; - version = "0.8.0.0"; - sha256 = "1ilbl1f5kigb09n1a8nkm484sjyvi7k3wnga6gj5jgss00xj4xfb"; - libraryHaskellDepends = [ base data-default QuickCheck text ]; + version = "0.9.1.0"; + sha256 = "1jqljawh6xvavp9g8mjlw4pkiagd59yybbizr9vcg70dd8pnanv2"; + libraryHaskellDepends = [ + base containers data-default QuickCheck text + ]; testHaskellDepends = [ base hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; description = "Functions to work with unicode blocks more convenient"; @@ -269251,8 +269660,8 @@ self: { }: mkDerivation { pname = "unliftio"; - version = "0.2.14"; - sha256 = "0gwifnzfcpjhzch06vkx1jkl7jf6j844grd4frl7w513bipb7w0r"; + version = "0.2.15"; + sha256 = "08yclgvk6slaisqc08b8bblh4fl77qicj0w90l46q419ya3drixd"; libraryHaskellDepends = [ async base bytestring deepseq directory filepath process stm time transformers unix unliftio-core @@ -269269,15 +269678,15 @@ self: { license = lib.licenses.mit; }) {}; - "unliftio_0_2_15" = callPackage + "unliftio_0_2_16" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , directory, filepath, gauge, hspec, process, QuickCheck, stm, time , transformers, unix, unliftio-core }: mkDerivation { pname = "unliftio"; - version = "0.2.15"; - sha256 = "08yclgvk6slaisqc08b8bblh4fl77qicj0w90l46q419ya3drixd"; + version = "0.2.16"; + sha256 = "1zawfyjr8immg5sqvwknwqp3xym0acjhlqm0y6xs63wjvp72wb3r"; libraryHaskellDepends = [ async base bytestring deepseq directory filepath process stm time transformers unix unliftio-core @@ -272230,6 +272639,31 @@ self: { broken = true; }) {}; + "vcs-ignore" = callPackage + ({ mkDerivation, base, containers, directory, doctest, exceptions + , filepath, Glob, hspec, hspec-discover, optparse-applicative, text + }: + mkDerivation { + pname = "vcs-ignore"; + version = "0.0.1.0"; + sha256 = "0zz4vwvzxgdqpi30ncp82irdwjyam23z0bdz834xxghfg70q2b5m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory exceptions filepath Glob text + ]; + executableHaskellDepends = [ + base containers directory exceptions filepath optparse-applicative + text + ]; + testHaskellDepends = [ + base containers directory doctest exceptions filepath hspec text + ]; + testToolDepends = [ hspec-discover ]; + description = "Library for handling files ignored by VCS systems"; + license = lib.licenses.bsd3; + }) {}; + "vcs-revision" = callPackage ({ mkDerivation, base, process }: mkDerivation { @@ -286000,27 +286434,6 @@ self: { }) {}; "yesod-persistent" = callPackage - ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent - , persistent-sqlite, persistent-template, resource-pool, resourcet - , text, transformers, wai-extra, yesod-core - }: - mkDerivation { - pname = "yesod-persistent"; - version = "1.6.0.6"; - sha256 = "169bwdnaxw926yr5wbcgf7n6v914sgv2vw6ywc95b5xpm0i0dyph"; - libraryHaskellDepends = [ - base blaze-builder conduit persistent persistent-template - resource-pool resourcet transformers yesod-core - ]; - testHaskellDepends = [ - base blaze-builder conduit hspec persistent persistent-sqlite text - wai-extra yesod-core - ]; - description = "Some helpers for using Persistent from Yesod"; - license = lib.licenses.mit; - }) {}; - - "yesod-persistent_1_6_0_7" = callPackage ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent , persistent-sqlite, persistent-template, resource-pool, resourcet , text, transformers, wai-extra, yesod-core @@ -286039,7 +286452,6 @@ self: { ]; description = "Some helpers for using Persistent from Yesod"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-platform" = callPackage diff --git a/pkgs/development/haskell-modules/patches/phonetic-languages-phonetics-basics-haddock.patch b/pkgs/development/haskell-modules/patches/phonetic-languages-phonetics-basics-haddock.patch deleted file mode 100644 index 39c1f98298b..00000000000 --- a/pkgs/development/haskell-modules/patches/phonetic-languages-phonetics-basics-haddock.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -ru phonetic-languages-phonetics-basics-0.5.1.0/Data/Phonetic/Languages/SpecificationsRead.hs phonetic-languages-phonetics-basics-0.5.1.0/Data/Phonetic/Languages/SpecificationsRead.hs ---- phonetic-languages-phonetics-basics-0.5.1.0/Data/Phonetic/Languages/SpecificationsRead.hs 2021-04-30 17:45:52.000000000 +0200 -+++ phonetic-languages-phonetics-basics-0.5.1.0/Data/Phonetic/Languages/SpecificationsRead.hs 2021-05-08 18:16:15.054951952 +0200 -@@ -1,11 +1,11 @@ ---- | ---- Module : Data.Phonetic.Languages.SpecificationsRead ---- Copyright : (c) OleksandrZhabenko 2021 ---- License : MIT ---- Stability : Experimental ---- Maintainer : olexandr543@yahoo.com ---- --{-| Provides functions to read data specifications for other modules from textual files. -+{-| -+Module : Data.Phonetic.Languages.SpecificationsRead -+Copyright : (c) OleksandrZhabenko 2021 -+License : MIT -+Stability : Experimental -+Maintainer : olexandr543@yahoo.com -+ -+Provides functions to read data specifications for other modules from textual files. - -} - - module Data.Phonetic.Languages.SpecificationsRead where -diff -ru phonetic-languages-phonetics-basics-0.5.1.0/Main.hs phonetic-languages-phonetics-basics-0.5.1.0/Main.hs ---- phonetic-languages-phonetics-basics-0.5.1.0/Main.hs 2021-04-30 17:45:52.000000000 +0200 -+++ phonetic-languages-phonetics-basics-0.5.1.0/Main.hs 2021-05-08 18:14:06.344145599 +0200 -@@ -1,11 +1,11 @@ ---- | ---- Module : Main ---- Copyright : (c) OleksandrZhabenko 2020-2021 ---- License : MIT ---- Stability : Experimental ---- Maintainer : olexandr543@yahoo.com ---- --{-| Can be used to calculate the durations of the approximations of the phonemes -+{-| -+Module : Main -+Copyright : (c) OleksandrZhabenko 2020-2021 -+License : MIT -+Stability : Experimental -+Maintainer : olexandr543@yahoo.com -+ -+Can be used to calculate the durations of the approximations of the phonemes - using some prepared text with its correct (at least mostly) pronunciation. - The prepared text is located in the same directory and contains lines -the - phonetic language word and its duration in seconds separated with whitespace. diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 842d08473c1..a5c0752b9ae 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -11,19 +11,19 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.54.0"; + version = "1.55.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - sha256 = "02hvsfv1yar8bdpkfrfiiicq9qqnfhp46v6qqph9ar6khz3f1kim"; + sha256 = "sha256-D30usAVpyiqXQMrTvmdaGFig7jhyb3rMTBQL/E2UL50="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "1p5yrhczp9nfijbvkmkmx1rabk5k3c1ni4k1vc0mw4jgl26lslcm"; + sha256 = "1hf7lrqbv0ba9c0kmnjn5x1fispyyjip1gmllq77z6nsjpn0f9w8"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 7b7bce8ac42..5ef9092fe96 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -22,12 +22,13 @@ buildPythonPackage rec { "aiohue.discovery" ]; - # has no tests + # Project has no tests doCheck = false; meta = with lib; { - description = "asyncio package to talk to Philips Hue"; - homepage = "https://github.com/balloob/aiohue"; - license = licenses.asl20; + description = "Python package to talk to Philips Hue"; + homepage = "https://github.com/home-assistant-libs/aiohue"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index dadfc41c68b..0f1c7ec6bdc 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -17,19 +17,19 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.63.0"; + version = "0.65.0"; format = "flit"; src = fetchFromGitHub { owner = "tiangolo"; repo = "fastapi"; rev = version; - sha256 = "0l3imrcs42pqf9d6k8c1q15k5sqcnapl5zk71xl52mrxhz49lgpi"; + sha256 = "sha256-DPfijCGORF3ThZblqaYTKN0H8+wlhtdIS8lfKfJl/bY="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "starlette ==0.13.6" "starlette" + --replace "starlette ==" "starlette >=" ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/json-logging/default.nix b/pkgs/development/python-modules/json-logging/default.nix index 3d34cb2475a..1f4425a3e11 100644 --- a/pkgs/development/python-modules/json-logging/default.nix +++ b/pkgs/development/python-modules/json-logging/default.nix @@ -30,10 +30,8 @@ buildPythonPackage rec { ]; # - Quart is not packaged for Nixpkgs. - # - FastAPI is broken, see #112701 and tiangolo/fastapi#2335. - checkInputs = [ wheel flask /*quart*/ sanic /*fastapi*/ uvicorn requests pytestCheckHook ]; - disabledTests = [ "quart" "fastapi" ]; - disabledTestPaths = [ "tests/test_fastapi.py" ]; + checkInputs = [ wheel flask /*quart*/ sanic fastapi uvicorn requests pytestCheckHook ]; + disabledTests = [ "quart" ]; # Tests spawn servers and try to connect to them. __darwinAllowLocalNetworking = true; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index b0d7f1048bc..290fce257f1 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -1,5 +1,18 @@ { lib, buildGoModule, fetchFromGitHub, nixosTests }: +let + # The web client verifies, that the server version is a valid datetime string: + # https://github.com/minio/minio/blob/3a0e7347cad25c60b2e51ff3194588b34d9e424c/browser/app/js/web.js#L51-L53 + # + # Example: + # versionToTimestamp "2021-04-22T15-44-28Z" + # => "2021-04-22T15:44:28Z" + versionToTimestamp = version: + let + splitTS = builtins.elemAt (builtins.split "(.*)(T.*)" version) 1; + in + builtins.concatStringsSep "" [ (builtins.elemAt splitTS 0) (builtins.replaceStrings [ "-" ] [ ":" ] (builtins.elemAt splitTS 1)) ]; +in buildGoModule rec { pname = "minio"; version = "2021-04-22T15-44-28Z"; @@ -18,7 +31,7 @@ buildGoModule rec { subPackages = [ "." ]; patchPhase = '' - sed -i "s/Version.*/Version = \"${version}\"/g" cmd/build-constants.go + sed -i "s/Version.*/Version = \"${versionToTimestamp version}\"/g" cmd/build-constants.go sed -i "s/ReleaseTag.*/ReleaseTag = \"RELEASE.${version}\"/g" cmd/build-constants.go sed -i "s/CommitID.*/CommitID = \"${src.rev}\"/g" cmd/build-constants.go ''; diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix new file mode 100644 index 00000000000..e3ea1a80251 --- /dev/null +++ b/pkgs/servers/monitoring/icinga2/default.nix @@ -0,0 +1,101 @@ +{ stdenv, lib, fetchFromGitHub, cmake, flex, bison, systemd +, boost, openssl, patchelf, mariadb-connector-c, postgresql, zlib +# Databases +, withMysql ? true, withPostgresql ? false +# Features +, withChecker ? true, withCompat ? false, withLivestatus ? false +, withNotification ? true, withPerfdata ? true, withIcingadb ? true +, nameSuffix ? "" }: + +stdenv.mkDerivation rec { + pname = "icinga2${nameSuffix}"; + version = "2.12.3"; + + src = fetchFromGitHub { + owner = "icinga"; + repo = "icinga2"; + rev = "v${version}"; + sha256 = "0pq6ixv7d9bqys8qjxqq0jki3zncj8jdfavkp7qw125iyfjq48xk"; + }; + + patches = [ + ./etc-icinga2.patch # Makes /etc/icinga2 relative to / instead of the store path + ./no-systemd-service.patch # Prevent systemd service from being written to /usr + ./no-var-directories.patch # Prevent /var directories from being created + ]; + + cmakeFlags = let + mkFeatureFlag = label: value: "-DICINGA2_WITH_${label}=${if value then "ON" else "OFF"}"; + in [ + # Paths + "-DCMAKE_INSTALL_SYSCONFDIR=etc" + "-DCMAKE_INSTALL_LOCALSTATEDIR=/var" + "-DCMAKE_INSTALL_FULL_SBINDIR=bin" + "-DICINGA2_RUNDIR=/run" + "-DMYSQL_INCLUDE_DIR=${mariadb-connector-c.dev}/include/mariadb" + "-DMYSQL_LIB=${mariadb-connector-c.out}/lib/mariadb/libmysqlclient.a" + "-DICINGA2_PLUGINDIR=bin" + "-DICINGA2_UNITY_BUILD=no" + # Features + (mkFeatureFlag "MYSQL" withMysql) + (mkFeatureFlag "PGSQL" withPostgresql) + (mkFeatureFlag "CHECKER" withChecker) + (mkFeatureFlag "COMPAT" withCompat) + (mkFeatureFlag "LIVESTATUS" withLivestatus) + (mkFeatureFlag "NOTIFICATION" withNotification) + (mkFeatureFlag "PERFDATA" withPerfdata) + (mkFeatureFlag "ICINGADB" withIcingadb) + # Misc. + "-DICINGA2_USER=icinga2" + "-DICINGA2_GROUP=icinga2" + "-DICINGA2_GIT_VERSION_INFO=OFF" + "-DICINGA2_WITH_TESTS=OFF" + "-DUSE_SYSTEMD=ON" + ]; + + buildInputs = [ boost openssl systemd ] + ++ lib.optional withPostgresql postgresql; + + nativeBuildInputs = [ cmake flex bison patchelf ]; + + postFixup = '' + rm -r $out/etc/logrotate.d $out/etc/sysconfig $out/lib/icinga2/prepare-dirs + + # Fix hardcoded paths + sed -i 's:/usr/bin/::g' $out/etc/icinga2/scripts/* + + # Cleanup sbin + sed -i 's/sbin/bin/g' $out/lib/icinga2/safe-reload + rm $out/sbin + + ${lib.optionalString withMysql '' + # Add dependencies of the MySQL shim to the shared library + patchelf --add-needed ${zlib.out}/lib/libz.so $(readlink -f $out/lib/icinga2/libmysql_shim.so) + + # Make Icinga find the MySQL shim + icinga2Bin=$out/lib/icinga2/sbin/icinga2 + patchelf --set-rpath $out/lib/icinga2:$(patchelf --print-rpath $icinga2Bin) $icinga2Bin + ''} + ''; + + vim = stdenv.mkDerivation { + pname = "vim-icinga2"; + inherit version src; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + mkdir -p $out/share/vim-plugins + cp -r tools/syntax/vim $out/share/vim-plugins/icinga2 + ''; + }; + + meta = { + description = "Open source monitoring system"; + homepage = "https://www.icinga.com"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ das_j ]; + }; +} diff --git a/pkgs/servers/monitoring/icinga2/etc-icinga2.patch b/pkgs/servers/monitoring/icinga2/etc-icinga2.patch new file mode 100644 index 00000000000..a08f7ba979c --- /dev/null +++ b/pkgs/servers/monitoring/icinga2/etc-icinga2.patch @@ -0,0 +1,13 @@ +diff --git a/config.h.cmake b/config.h.cmake +index 16fa190..152bf43 100644 +--- a/config.h.cmake ++++ b/config.h.cmake +@@ -13,7 +13,7 @@ + + #cmakedefine ICINGA2_UNITY_BUILD + +-#define ICINGA_CONFIGDIR "${ICINGA2_FULL_CONFIGDIR}" ++#define ICINGA_CONFIGDIR "/etc/icinga2" + #define ICINGA_DATADIR "${ICINGA2_FULL_DATADIR}" + #define ICINGA_LOGDIR "${ICINGA2_FULL_LOGDIR}" + #define ICINGA_CACHEDIR "${ICINGA2_FULL_CACHEDIR}" diff --git a/pkgs/servers/monitoring/icinga2/no-systemd-service.patch b/pkgs/servers/monitoring/icinga2/no-systemd-service.patch new file mode 100644 index 00000000000..a032a90647d --- /dev/null +++ b/pkgs/servers/monitoring/icinga2/no-systemd-service.patch @@ -0,0 +1,15 @@ +diff --git a/etc/initsystem/CMakeLists.txt b/etc/initsystem/CMakeLists.txt +index e702c83..c23cabb 100644 +--- a/etc/initsystem/CMakeLists.txt ++++ b/etc/initsystem/CMakeLists.txt +@@ -50,10 +50,5 @@ if(NOT WIN32) + + if (USE_SYSTEMD OR INSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT) + configure_file(icinga2.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/initsystem/icinga2.service @ONLY) +- install( +- FILES ${CMAKE_CURRENT_BINARY_DIR}/initsystem/icinga2.service +- DESTINATION ${DESTDIR}/usr/lib/systemd/system +- PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- ) + endif() + endif() diff --git a/pkgs/servers/monitoring/icinga2/no-var-directories.patch b/pkgs/servers/monitoring/icinga2/no-var-directories.patch new file mode 100644 index 00000000000..3a1d4805585 --- /dev/null +++ b/pkgs/servers/monitoring/icinga2/no-var-directories.patch @@ -0,0 +1,66 @@ +diff --git a/icinga-app/CMakeLists.txt b/icinga-app/CMakeLists.txt +index 87993df..819c87b 100644 +--- a/icinga-app/CMakeLists.txt ++++ b/icinga-app/CMakeLists.txt +@@ -106,7 +106,3 @@ install( + TARGETS icinga-app + RUNTIME DESTINATION ${InstallPath} + ) +- +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_LOGDIR}\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_INITRUNDIR}\")") +diff --git a/lib/base/CMakeLists.txt b/lib/base/CMakeLists.txt +index 5dda179..22cf69f 100644 +--- a/lib/base/CMakeLists.txt ++++ b/lib/base/CMakeLists.txt +@@ -125,7 +125,4 @@ set_target_properties ( + FOLDER Lib + ) + +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_CACHEDIR}\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_LOGDIR}/crash\")") +- + set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}" PARENT_SCOPE) +diff --git a/lib/perfdata/CMakeLists.txt b/lib/perfdata/CMakeLists.txt +index ab963f7..3d9d506 100644 +--- a/lib/perfdata/CMakeLists.txt ++++ b/lib/perfdata/CMakeLists.txt +@@ -74,7 +74,4 @@ install_if_not_exists( + ${ICINGA2_CONFIGDIR}/features-available + ) + +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_SPOOLDIR}/perfdata\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_SPOOLDIR}/tmp\")") +- + set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}" PARENT_SCOPE) +diff --git a/lib/remote/CMakeLists.txt b/lib/remote/CMakeLists.txt +index 65113d2..5e4398f 100644 +--- a/lib/remote/CMakeLists.txt ++++ b/lib/remote/CMakeLists.txt +@@ -55,12 +55,3 @@ set_target_properties ( + remote PROPERTIES + FOLDER Lib + ) +- +-#install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/log\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/zones\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/zones-stage\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/certs\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/certificate-requests\")") +- +- +diff --git a/lib/compat/CMakeLists.txt b/lib/compat/CMakeLists.txt +index 1438626..d882ae2 100644 +--- a/lib/compat/CMakeLists.txt ++++ b/lib/compat/CMakeLists.txt +@@ -55,8 +55,4 @@ install_if_not_exists( + ${ICINGA2_CONFIGDIR}/features-available + ) + +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_LOGDIR}/compat/archives\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_SPOOLDIR}\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_INITRUNDIR}/cmd\")") +- + set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}" PARENT_SCOPE) diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index b9f5ad1be24..64698415e50 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,7 +1,7 @@ generic: { v50 = generic { - version = "5.0.10"; - sha256 = "15kbbj1vclsys1z3ghcz9j5faz67k3z8yl81bn7bhmqaflavgicb"; + version = "5.0.11"; + sha256 = "0xrh0l8wr0q903a1swz9anvzkb5hlbl2win5xns55cmbw0ygbwfa"; }; v40 = generic { diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 4dfdb7075a5..a16e74819a6 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -227,6 +227,12 @@ in rec { inherit storeDir stateDir confDir boehmgc; }); - nixFlakes = nixUnstable; + nixExperimental = nixUnstable.overrideAttrs (prev: { + patches = (prev.patches or []) ++ [ ./enable-all-experimental.patch ]; + }); + + nixFlakes = nixUnstable.overrideAttrs (prev: { + patches = (prev.patches or []) ++ [ ./enable-flakes.patch ]; + }); } diff --git a/pkgs/tools/package-management/nix/enable-all-experimental.patch b/pkgs/tools/package-management/nix/enable-all-experimental.patch new file mode 100644 index 00000000000..1712b7295a5 --- /dev/null +++ b/pkgs/tools/package-management/nix/enable-all-experimental.patch @@ -0,0 +1,14 @@ +diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc +index d3b27d7be..e7d002e1d 100644 +--- a/src/libstore/globals.cc ++++ b/src/libstore/globals.cc +@@ -172,8 +172,7 @@ MissingExperimentalFeature::MissingExperimentalFeature(std::string feature) + + void Settings::requireExperimentalFeature(const std::string & name) + { +- if (!isExperimentalFeatureEnabled(name)) +- throw MissingExperimentalFeature(name); ++ return; + } + + bool Settings::isWSL1() diff --git a/pkgs/tools/package-management/nix/enable-flakes.patch b/pkgs/tools/package-management/nix/enable-flakes.patch new file mode 100644 index 00000000000..998067449b7 --- /dev/null +++ b/pkgs/tools/package-management/nix/enable-flakes.patch @@ -0,0 +1,14 @@ +diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh +index 3e4ead76c..81d407236 100644 +--- a/src/libstore/globals.hh ++++ b/src/libstore/globals.hh +@@ -923,7 +923,8 @@ public: + value. + )"}; + +- Setting experimentalFeatures{this, {}, "experimental-features", ++ Setting experimentalFeatures{ ++ this, {"flakes", "nix-command"}, "experimental-features", + "Experimental Nix features to enable."}; + + bool isExperimentalFeatureEnabled(const std::string & name); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a0f57c13d18..92d1bed017d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19219,10 +19219,19 @@ in miniflux = callPackage ../servers/miniflux { }; - nagios = callPackage ../servers/monitoring/nagios { }; + icinga2 = callPackage ../servers/monitoring/icinga2 { }; + + icinga2-agent = callPackage ../servers/monitoring/icinga2 { + nameSuffix = "-agent"; + withMysql = false; + withNotification = false; + withIcingadb = false; + }; munin = callPackage ../servers/monitoring/munin { }; + nagios = callPackage ../servers/monitoring/nagios { }; + monitoring-plugins = callPackage ../servers/monitoring/plugins { }; inherit (callPackage ../servers/monitoring/plugins/labs_consol_de.nix { }) @@ -30192,7 +30201,8 @@ in nix nixStable nixUnstable - nixFlakes; + nixFlakes + nixExperimental; nixStatic = pkgsStatic.nix;