b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-05-12 00:50:10 +00:00 committed by GitHub
parent ec97081437 9c19ef7cf2
commit 5a513ae14b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 1171 additions and 374 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
maintainers/scripts/haskell/hydra-report.hs
View file

@ -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 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 -- 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 :: BuildState -> Text
icon = \case icon = \case
@ -166,6 +166,7 @@ icon = \case
TimedOut -> ":hourglass::no_entry_sign:" TimedOut -> ":hourglass::no_entry_sign:"
Canceled -> ":no_entry_sign:" Canceled -> ":no_entry_sign:"
Unfinished -> ":hourglass_flowing_sand:" Unfinished -> ":hourglass_flowing_sand:"
HydraFailure -> ":construction:"
Success -> ":heavy_check_mark:" Success -> ":heavy_check_mark:"
platformIcon :: Platform -> Text platformIcon :: Platform -> Text
@ -199,10 +200,11 @@ buildSummary maintainerMap = foldl (Map.unionWith unionSummary) Map.empty . fmap
state = case (finished, buildstatus) of state = case (finished, buildstatus) of
(0, _) -> Unfinished (0, _) -> Unfinished
(_, Just 0) -> Success (_, Just 0) -> Success
(_, Just 1) -> Failed
(_, Just 2) -> DependencyFailed
(_, Just 3) -> HydraFailure
(_, Just 4) -> Canceled (_, Just 4) -> Canceled
(_, Just 7) -> TimedOut (_, Just 7) -> TimedOut
(_, Just 2) -> DependencyFailed
(_, Just 1) -> Failed
(_, Just 11) -> OutputLimitExceeded (_, Just 11) -> OutputLimitExceeded
(_, i) -> Unknown i (_, i) -> Unknown i
packageName = fromMaybe job (Text.stripSuffix ("." <> system) job) packageName = fromMaybe job (Text.stripSuffix ("." <> system) job)

18
pkgs/applications/misc/megacmd/default.nix
View file

@ -1,11 +1,12 @@
{ lib, stdenv { lib
, stdenv
, autoconf , autoconf
, automake , automake
, c-ares , c-ares
, cryptopp , cryptopp
, curl , curl
, fetchFromGitHub , fetchFromGitHub
, ffmpeg_3 , ffmpeg_3 # build fails with latest ffmpeg, see https://github.com/meganz/MEGAcmd/issues/523
, freeimage , freeimage
, gcc-unwrapped , gcc-unwrapped
, libmediainfo , libmediainfo
@ -22,13 +23,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "megacmd"; pname = "megacmd";
version = "1.2.0"; version = "1.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "meganz"; owner = "meganz";
repo = "MEGAcmd"; repo = "MEGAcmd";
rev = "${version}_Linux"; rev = "${version}_Linux";
sha256 = "0czyhsms0a0237d6h9b21n9p4nm4zkjanhhbvw26k6266g6c1nyr"; sha256 = "sha256-Q1SZSDTPGgBA/W/ZVYfTQsiP41RE1LJ+esQ3PK9EjIc=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -49,7 +50,6 @@ stdenv.mkDerivation rec {
libmediainfo libmediainfo
libraw libraw
libsodium libsodium
libtool
libuv libuv
libzen libzen
pcre-cpp pcre-cpp
@ -80,9 +80,9 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "MEGA Command Line Interactive and Scriptable Application"; description = "MEGA Command Line Interactive and Scriptable Application";
homepage = "https://mega.nz/"; homepage = "https://mega.nz/cmd";
license = licenses.unfree; license = with licenses; [ bsd2 gpl3Only ];
platforms = [ "i686-linux" "x86_64-linux" ]; platforms = [ "i686-linux" "x86_64-linux" ];
maintainers = [ maintainers.wedens ]; maintainers = with maintainers; [ lunik1 ];
}; };
} }

7
pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
View file

@ -2,7 +2,7 @@
"name": "element-desktop", "name": "element-desktop",
"productName": "Element", "productName": "Element",
"main": "src/electron-main.js", "main": "src/electron-main.js",
"version": "1.7.26", "version": "1.7.27",
"description": "A feature-rich client for Matrix.org", "description": "A feature-rich client for Matrix.org",
"author": "Element", "author": "Element",
"repository": { "repository": {
@ -12,6 +12,9 @@
"license": "Apache-2.0", "license": "Apache-2.0",
"files": [], "files": [],
"scripts": { "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", "mkdirs": "mkdirp packages deploys",
"fetch": "yarn run mkdirs && node scripts/fetch-package.js", "fetch": "yarn run mkdirs && node scripts/fetch-package.js",
"asar-webapp": "asar p webapp webapp.asar", "asar-webapp": "asar p webapp webapp.asar",
@ -31,6 +34,7 @@
}, },
"dependencies": { "dependencies": {
"auto-launch": "^5.0.5", "auto-launch": "^5.0.5",
"counterpart": "^0.18.6",
"electron-store": "^6.0.1", "electron-store": "^6.0.1",
"electron-window-state": "^5.0.3", "electron-window-state": "^5.0.3",
"minimist": "^1.2.3", "minimist": "^1.2.3",
@ -48,6 +52,7 @@
"find-npm-prefix": "^1.0.2", "find-npm-prefix": "^1.0.2",
"fs-extra": "^8.1.0", "fs-extra": "^8.1.0",
"glob": "^7.1.6", "glob": "^7.1.6",
"matrix-web-i18n": "github:matrix-org/matrix-web-i18n",
"mkdirp": "^1.0.3", "mkdirp": "^1.0.3",
"needle": "^2.5.0", "needle": "^2.5.0",
"node-pre-gyp": "^0.15.0", "node-pre-gyp": "^0.15.0",

184
pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix
View file

@ -33,6 +33,14 @@
sha1 = "168da1a36e90da68ae8d49c0f1b48c7c6249213a"; 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"; name = "_babel_generator___generator_7.10.5.tgz";
path = fetchurl { path = fetchurl {
@ -41,6 +49,14 @@
sha1 = "1b903554bc8c583ee8d25f1e8969732e6b829a69"; 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"; name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz";
path = fetchurl { path = fetchurl {
@ -49,6 +65,14 @@
sha1 = "d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"; 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"; name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz";
path = fetchurl { path = fetchurl {
@ -57,6 +81,14 @@
sha1 = "98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"; 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"; name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.10.4.tgz";
path = fetchurl { path = fetchurl {
@ -65,6 +97,14 @@
sha1 = "2c70576eaa3b5609b24cb99db2888cc3fc4251d1"; 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"; name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz";
path = fetchurl { path = fetchurl {
@ -73,6 +113,14 @@
sha1 = "a78c7a7251e01f616512d31b10adcf52ada5e0d2"; 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"; name = "_babel_highlight___highlight_7.5.0.tgz";
path = fetchurl { path = fetchurl {
@ -89,6 +137,14 @@
sha1 = "7d1bdfd65753538fabe6c38596cdb76d9ac60143"; 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"; name = "_babel_parser___parser_7.10.5.tgz";
path = fetchurl { path = fetchurl {
@ -97,6 +153,14 @@
sha1 = "e7c6bf5a7deff957cec9f04b551e2762909d826b"; 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"; name = "_babel_runtime___runtime_7.11.2.tgz";
path = fetchurl { path = fetchurl {
@ -113,6 +177,22 @@
sha1 = "3251996c4200ebc71d1a8fc405fba940f36ba278"; 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"; name = "_babel_traverse___traverse_7.10.5.tgz";
path = fetchurl { path = fetchurl {
@ -129,6 +209,14 @@
sha1 = "d88ae7e2fde86bfbfe851d4d81afa70a997b5d15"; 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"; name = "_develar_schema_utils___schema_utils_2.6.5.tgz";
path = fetchurl { path = fetchurl {
@ -1665,6 +1753,14 @@
sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; 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"; name = "crc_32___crc_32_1.2.0.tgz";
path = fetchurl { path = fetchurl {
@ -1761,6 +1857,14 @@
sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; 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"; name = "debounce_fn___debounce_fn_4.0.0.tgz";
path = fetchurl { path = fetchurl {
@ -2521,6 +2625,14 @@
sha1 = "74d2eb4de0b8da1293711910d50775b9b710ef64"; 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"; name = "execa___execa_0.7.0.tgz";
path = fetchurl { 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 { path = fetchurl {
name = "figgy_pudding___figgy_pudding_3.5.1.tgz"; name = "figgy_pudding___figgy_pudding_3.5.2.tgz";
url = "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz"; url = "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz";
sha1 = "862470112901c727a0e495a80744bd5baa1d6790"; sha1 = "b4eee8148abb01dcf1d1ac34367d59e12fa61d6e";
}; };
} }
{ {
@ -2697,6 +2809,14 @@
sha1 = "8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"; 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"; name = "forever_agent___forever_agent_0.6.1.tgz";
path = fetchurl { path = fetchurl {
@ -3265,6 +3385,14 @@
sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; 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"; name = "infer_owner___infer_owner_1.0.4.tgz";
path = fetchurl { path = fetchurl {
@ -4217,6 +4345,14 @@
sha1 = "aa8387104f2687edca01c8687ee45013d02d19bd"; 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"; name = "meant___meant_1.0.3.tgz";
path = fetchurl { path = fetchurl {
@ -4425,6 +4561,14 @@
sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; 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"; name = "mute_stream___mute_stream_0.0.8.tgz";
path = fetchurl { path = fetchurl {
@ -5129,6 +5273,14 @@
sha1 = "74bbf011124b90421c22d15779cee60060ba95bc"; 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"; name = "png_to_ico___png_to_ico_2.1.1.tgz";
path = fetchurl { path = fetchurl {
@ -6001,6 +6153,14 @@
sha1 = "f610afeee3b12bce1d0c30425e76398b78249a5f"; 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"; name = "sprintf_js___sprintf_js_1.0.3.tgz";
path = fetchurl { path = fetchurl {
@ -6018,11 +6178,11 @@
}; };
} }
{ {
name = "ssri___ssri_6.0.1.tgz"; name = "ssri___ssri_6.0.2.tgz";
path = fetchurl { path = fetchurl {
name = "ssri___ssri_6.0.1.tgz"; name = "ssri___ssri_6.0.2.tgz";
url = "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz"; url = "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz";
sha1 = "2a3c41b28dd45b62b63676ecb74001265ae9edd8"; sha1 = "157939134f20464e7301ddba3e90ffa8f7728ac5";
}; };
} }
{ {
@ -6801,6 +6961,14 @@
sha1 = "1c233064202ee742afc9d56e21da3b2e15260acf"; 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"; name = "wcwidth___wcwidth_1.0.1.tgz";
path = fetchurl { path = fetchurl {

4
pkgs/applications/networking/instant-messengers/element/element-desktop.nix
View file

@ -8,12 +8,12 @@
let let
executableName = "element-desktop"; executableName = "element-desktop";
version = "1.7.26"; version = "1.7.27";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vector-im"; owner = "vector-im";
repo = "element-desktop"; repo = "element-desktop";
rev = "v${version}"; rev = "v${version}";
sha256 = "1iflsvzn36mywpzags55kjmyq71c3i7f1hgcdcp2ijmnrjk8fy3n"; sha256 = "0rgsc2cc1v6gjsklwvsjlqq9a8j9j80h9ac0jkvf9lhq33f3c57k";
}; };
in mkYarnPackage rec { in mkYarnPackage rec {
name = "element-desktop-${version}"; name = "element-desktop-${version}";

4
pkgs/applications/networking/instant-messengers/element/element-web.nix
View file

@ -12,11 +12,11 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "element-web"; pname = "element-web";
version = "1.7.26"; version = "1.7.27";
src = fetchurl { src = fetchurl {
url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz";
sha256 = "17y6wq6w1yk7r1rfply549kpilfraizahf67p00ra7cws66iqkwg"; sha256 = "004b1cjw8fqk0ixm0wnbk4y51cby1i7avsas95sfm2zsbnbwg519";
}; };
installPhase = '' installPhase = ''

1
pkgs/applications/window-managers/sway/wrapper.nix
View file

@ -14,6 +14,7 @@ let
baseWrapper = writeShellScriptBin "sway" '' baseWrapper = writeShellScriptBin "sway" ''
set -o errexit set -o errexit
if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then
export XDG_CURRENT_DESKTOP=sway
${extraSessionCommands} ${extraSessionCommands}
export _SWAY_WRAPPER_ALREADY_EXECUTED=1 export _SWAY_WRAPPER_ALREADY_EXECUTED=1
fi fi

8
pkgs/data/misc/hackage/pin.json
View file

@ -1,6 +1,6 @@
{ {
"commit": "3d54acea35f6f709fa96c87696b845b3044dcab5", "commit": "b963dde27c24394c4be0031039dae4cb6a363aed",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3d54acea35f6f709fa96c87696b845b3044dcab5.tar.gz", "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/b963dde27c24394c4be0031039dae4cb6a363aed.tar.gz",
"sha256": "1zlkjs9d8r5k803wbsz5fmsrs76150chcnz2jaapmq32riyvm21g", "sha256": "1yr9j4ldpi2p2zgdq4mky6y5yh7nilasdmskapbdxp9fxwba2r0x",
"msg": "Update from Hackage at 2021-05-07T19:29:19Z" "msg": "Update from Hackage at 2021-05-10T22:01:59Z"
} }

6
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -1783,10 +1783,6 @@ self: super: {
ihaskell-display = doJailbreak super.ihaskell-display; ihaskell-display = doJailbreak super.ihaskell-display;
ihaskell-basic = doJailbreak super.ihaskell-basic; 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 # Fixes too strict version bounds on regex libraries
# Presumably to be removed at the next release # Presumably to be removed at the next release
yi-language = appendPatch super.yi-language (pkgs.fetchpatch { 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. # 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; tomland = assert super.tomland.version == "1.3.2.0"; doJailbreak super.tomland;

1
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
View file

@ -4183,6 +4183,7 @@ broken-packages:
- simple-ui - simple-ui
- simple-units - simple-units
- simple-vec3 - simple-vec3
- simplexmq
- simple-zipper - simple-zipper
- singleton-dict - singleton-dict
- singletons-th - singletons-th

8
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
View file

@ -77,6 +77,14 @@ default-package-overrides:
- gi-javascriptcore < 4.0.23 # - gi-javascriptcore < 4.0.23 #
- gi-soup < 2.4.24 # - gi-soup < 2.4.24 #
- gi-webkit2 < 4.0.27 # - 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: extra-packages:
- base16-bytestring < 1 # required for cabal-install etc. - base16-bytestring < 1 # required for cabal-install etc.

33
pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
View file

@ -1,4 +1,4 @@
# Stackage Nightly 2021-05-07 # Stackage Nightly 2021-05-10
# This file is auto-generated by # This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh # maintainers/scripts/haskell/update-stackage.sh
default-package-overrides: default-package-overrides:
@ -355,6 +355,7 @@ default-package-overrides:
- cayley-client ==0.4.15 - cayley-client ==0.4.15
- cborg ==0.2.5.0 - cborg ==0.2.5.0
- cborg-json ==0.2.2.0 - cborg-json ==0.2.2.0
- cdar-mBound ==0.1.0.1
- cereal ==0.5.8.1 - cereal ==0.5.8.1
- cereal-conduit ==0.8.0 - cereal-conduit ==0.8.0
- cereal-text ==0.1.0.2 - cereal-text ==0.1.0.2
@ -408,7 +409,7 @@ default-package-overrides:
- cmdargs ==0.10.21 - cmdargs ==0.10.21
- codec-beam ==0.2.0 - codec-beam ==0.2.0
- code-page ==0.2.1 - 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-concurrent ==0.5.0.0
- co-log-core ==0.2.1.1 - co-log-core ==0.2.1.1
- Color ==0.3.1 - Color ==0.3.1
@ -985,7 +986,7 @@ default-package-overrides:
- hashmap ==1.3.3 - hashmap ==1.3.3
- hashtables ==1.2.4.1 - hashtables ==1.2.4.1
- haskeline ==0.8.1.2 - haskeline ==0.8.1.2
- haskell-awk ==1.2 - haskell-awk ==1.2.0.1
- haskell-gi ==0.24.7 - haskell-gi ==0.24.7
- haskell-gi-base ==0.24.5 - haskell-gi-base ==0.24.5
- haskell-gi-overloading ==1.0 - haskell-gi-overloading ==1.0
@ -1044,7 +1045,7 @@ default-package-overrides:
- hint ==0.9.0.4 - hint ==0.9.0.4
- hjsmin ==0.2.0.4 - hjsmin ==0.2.0.4
- hkd-default ==1.1.0.0 - hkd-default ==1.1.0.0
- hkgr ==0.2.7 - hkgr ==0.3
- hlibcpuid ==0.2.0 - hlibcpuid ==0.2.0
- hlibgit2 ==0.18.0.16 - hlibgit2 ==0.18.0.16
- hlibsass ==0.1.10.1 - hlibsass ==0.1.10.1
@ -1106,7 +1107,7 @@ default-package-overrides:
- hspec-expectations-json ==1.0.0.3 - hspec-expectations-json ==1.0.0.3
- hspec-expectations-lifted ==0.10.0 - hspec-expectations-lifted ==0.10.0
- hspec-expectations-pretty-diff ==0.7.2.5 - 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-golden-aeson ==0.7.0.0
- hspec-hedgehog ==0.0.1.2 - hspec-hedgehog ==0.0.1.2
- hspec-junit-formatter ==1.0.0.2 - hspec-junit-formatter ==1.0.0.2
@ -1200,7 +1201,7 @@ default-package-overrides:
- hxt-tagsoup ==9.1.4 - hxt-tagsoup ==9.1.4
- hxt-unicode ==9.0.2.4 - hxt-unicode ==9.0.2.4
- hybrid-vectors ==0.2.2 - hybrid-vectors ==0.2.2
- hyper ==0.2.1.0 - hyper ==0.2.1.1
- hyperloglog ==0.4.4 - hyperloglog ==0.4.4
- hyphenation ==0.8.1 - hyphenation ==0.8.1
- iconv ==0.4.1.3 - iconv ==0.4.1.3
@ -1317,7 +1318,7 @@ default-package-overrides:
- kind-generics ==0.4.1.0 - kind-generics ==0.4.1.0
- kind-generics-th ==0.2.2.2 - kind-generics-th ==0.2.2.2
- kmeans ==0.1.3 - kmeans ==0.1.3
- koji ==0.0.1 - koji ==0.0.2
- koofr-client ==1.0.0.3 - koofr-client ==1.0.0.3
- krank ==0.2.2 - krank ==0.2.2
- kubernetes-webhook-haskell ==0.2.0.3 - kubernetes-webhook-haskell ==0.2.0.3
@ -1491,7 +1492,7 @@ default-package-overrides:
- mintty ==0.1.2 - mintty ==0.1.2
- missing-foreign ==0.1.1 - missing-foreign ==0.1.1
- MissingH ==1.4.3.0 - MissingH ==1.4.3.0
- mixed-types-num ==0.4.1 - mixed-types-num ==0.5.0.3
- mltool ==0.2.0.1 - mltool ==0.2.0.1
- mmap ==0.5.9 - mmap ==0.5.9
- mmark ==0.0.7.2 - mmark ==0.0.7.2
@ -1570,7 +1571,7 @@ default-package-overrides:
- mwc-random-monad ==0.7.3.1 - mwc-random-monad ==0.7.3.1
- mx-state-codes ==1.0.0.0 - mx-state-codes ==1.0.0.0
- mysql ==0.2.0.1 - mysql ==0.2.0.1
- mysql-simple ==0.4.5 - mysql-simple ==0.4.6
- n2o ==0.11.1 - n2o ==0.11.1
- nagios-check ==0.3.2 - nagios-check ==0.3.2
- names-th ==0.3.0.1 - names-th ==0.3.0.1
@ -1755,7 +1756,7 @@ default-package-overrides:
- phantom-state ==0.2.1.2 - phantom-state ==0.2.1.2
- pid1 ==0.1.2.0 - pid1 ==0.1.2.0
- pinboard ==0.10.2.0 - pinboard ==0.10.2.0
- pipes ==4.3.15 - pipes ==4.3.16
- pipes-aeson ==0.4.1.8 - pipes-aeson ==0.4.1.8
- pipes-attoparsec ==0.5.1.5 - pipes-attoparsec ==0.5.1.5
- pipes-binary ==0.4.2 - pipes-binary ==0.4.2
@ -1864,7 +1865,7 @@ default-package-overrides:
- pureMD5 ==2.1.3 - pureMD5 ==2.1.3
- purescript-bridge ==0.14.0.0 - purescript-bridge ==0.14.0.0
- pushbullet-types ==0.4.1.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 - pvar ==1.0.0.0
- PyF ==0.9.0.3 - PyF ==0.9.0.3
- qchas ==1.1.0.1 - qchas ==1.1.0.1
@ -2179,7 +2180,7 @@ default-package-overrides:
- splint ==1.0.1.4 - splint ==1.0.1.4
- split ==0.2.3.4 - split ==0.2.3.4
- splitmix ==0.1.0.3 - splitmix ==0.1.0.3
- splitmix-distributions ==0.7.0.0 - splitmix-distributions ==0.8.0.0
- spoon ==0.3.1 - spoon ==0.3.1
- spreadsheet ==0.1.3.8 - spreadsheet ==0.1.3.8
- sqlcli ==0.2.2.0 - sqlcli ==0.2.2.0
@ -2187,9 +2188,9 @@ default-package-overrides:
- sqlite-simple ==0.4.18.0 - sqlite-simple ==0.4.18.0
- sql-words ==0.1.6.4 - sql-words ==0.1.6.4
- squeal-postgresql ==0.7.0.1 - squeal-postgresql ==0.7.0.1
- squeather ==0.6.0.0 - squeather ==0.8.0.0
- srcloc ==0.6 - srcloc ==0.6
- stache ==2.2.1 - stache ==2.3.0
- stackcollapse-ghc ==0.0.1.3 - stackcollapse-ghc ==0.0.1.3
- stack-templatizer ==0.1.0.2 - stack-templatizer ==0.1.0.2
- stateref ==0.3 - stateref ==0.3
@ -2491,7 +2492,7 @@ default-package-overrides:
- unix-bytestring ==0.3.7.3 - unix-bytestring ==0.3.7.3
- unix-compat ==0.5.3 - unix-compat ==0.5.3
- unix-time ==0.4.7 - unix-time ==0.4.7
- unliftio ==0.2.14 - unliftio ==0.2.15
- unliftio-core ==0.2.0.1 - unliftio-core ==0.2.0.1
- unliftio-pool ==0.2.1.1 - unliftio-pool ==0.2.1.1
- unliftio-streams ==0.1.1.1 - unliftio-streams ==0.1.1.1
@ -2665,7 +2666,7 @@ default-package-overrides:
- yesod-newsfeed ==1.7.0.0 - yesod-newsfeed ==1.7.0.0
- yesod-page-cursor ==2.0.0.6 - yesod-page-cursor ==2.0.0.6
- yesod-paginator ==1.1.1.0 - yesod-paginator ==1.1.1.0
- yesod-persistent ==1.6.0.6 - yesod-persistent ==1.6.0.7
- yesod-sitemap ==1.6.0 - yesod-sitemap ==1.6.0
- yesod-static ==1.6.1.0 - yesod-static ==1.6.1.0
- yesod-test ==1.6.12 - yesod-test ==1.6.12

926
pkgs/development/haskell-modules/hackage-packages.nix generated
View file

File diff suppressed because it is too large Load diff

46
pkgs/development/haskell-modules/patches/phonetic-languages-phonetics-basics-haddock.patch
View file

@ -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.

6
pkgs/development/libraries/libdeltachat/default.nix
View file

@ -11,19 +11,19 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libdeltachat"; pname = "libdeltachat";
version = "1.54.0"; version = "1.55.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "deltachat"; owner = "deltachat";
repo = "deltachat-core-rust"; repo = "deltachat-core-rust";
rev = version; rev = version;
sha256 = "02hvsfv1yar8bdpkfrfiiicq9qqnfhp46v6qqph9ar6khz3f1kim"; sha256 = "sha256-D30usAVpyiqXQMrTvmdaGFig7jhyb3rMTBQL/E2UL50=";
}; };
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit src; inherit src;
name = "${pname}-${version}"; name = "${pname}-${version}";
sha256 = "1p5yrhczp9nfijbvkmkmx1rabk5k3c1ni4k1vc0mw4jgl26lslcm"; sha256 = "1hf7lrqbv0ba9c0kmnjn5x1fispyyjip1gmllq77z6nsjpn0f9w8";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

9
pkgs/development/python-modules/aiohue/default.nix
View file

@ -22,12 +22,13 @@ buildPythonPackage rec {
"aiohue.discovery" "aiohue.discovery"
]; ];
# has no tests # Project has no tests
doCheck = false; doCheck = false;
meta = with lib; { meta = with lib; {
description = "asyncio package to talk to Philips Hue"; description = "Python package to talk to Philips Hue";
homepage = "https://github.com/balloob/aiohue"; homepage = "https://github.com/home-assistant-libs/aiohue";
license = licenses.asl20; license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
}; };
} }

6
pkgs/development/python-modules/fastapi/default.nix
View file

@ -17,19 +17,19 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "fastapi"; pname = "fastapi";
version = "0.63.0"; version = "0.65.0";
format = "flit"; format = "flit";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tiangolo"; owner = "tiangolo";
repo = "fastapi"; repo = "fastapi";
rev = version; rev = version;
sha256 = "0l3imrcs42pqf9d6k8c1q15k5sqcnapl5zk71xl52mrxhz49lgpi"; sha256 = "sha256-DPfijCGORF3ThZblqaYTKN0H8+wlhtdIS8lfKfJl/bY=";
}; };
postPatch = '' postPatch = ''
substituteInPlace pyproject.toml \ substituteInPlace pyproject.toml \
--replace "starlette ==0.13.6" "starlette" --replace "starlette ==" "starlette >="
''; '';
propagatedBuildInputs = [ propagatedBuildInputs = [

6
pkgs/development/python-modules/json-logging/default.nix
View file

@ -30,10 +30,8 @@ buildPythonPackage rec {
]; ];
# - Quart is not packaged for Nixpkgs. # - Quart is not packaged for Nixpkgs.
# - FastAPI is broken, see #112701 and tiangolo/fastapi#2335. checkInputs = [ wheel flask /*quart*/ sanic fastapi uvicorn requests pytestCheckHook ];
checkInputs = [ wheel flask /*quart*/ sanic /*fastapi*/ uvicorn requests pytestCheckHook ]; disabledTests = [ "quart" ];
disabledTests = [ "quart" "fastapi" ];
disabledTestPaths = [ "tests/test_fastapi.py" ];
# Tests spawn servers and try to connect to them. # Tests spawn servers and try to connect to them.
__darwinAllowLocalNetworking = true; __darwinAllowLocalNetworking = true;

15
pkgs/servers/minio/default.nix
View file

@ -1,5 +1,18 @@
{ lib, buildGoModule, fetchFromGitHub, nixosTests }: { 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 { buildGoModule rec {
pname = "minio"; pname = "minio";
version = "2021-04-22T15-44-28Z"; version = "2021-04-22T15-44-28Z";
@ -18,7 +31,7 @@ buildGoModule rec {
subPackages = [ "." ]; subPackages = [ "." ];
patchPhase = '' 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/ReleaseTag.*/ReleaseTag = \"RELEASE.${version}\"/g" cmd/build-constants.go
sed -i "s/CommitID.*/CommitID = \"${src.rev}\"/g" cmd/build-constants.go sed -i "s/CommitID.*/CommitID = \"${src.rev}\"/g" cmd/build-constants.go
''; '';

101
pkgs/servers/monitoring/icinga2/default.nix Normal file
View file

@ -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 ];
};
}

13
pkgs/servers/monitoring/icinga2/etc-icinga2.patch Normal file
View file

@ -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}"

15
pkgs/servers/monitoring/icinga2/no-systemd-service.patch Normal file
View file

@ -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()

66
pkgs/servers/monitoring/icinga2/no-var-directories.patch Normal file
View file

@ -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)

4
pkgs/servers/monitoring/zabbix/versions.nix
View file

@ -1,7 +1,7 @@
generic: { generic: {
v50 = generic { v50 = generic {
version = "5.0.10"; version = "5.0.11";
sha256 = "15kbbj1vclsys1z3ghcz9j5faz67k3z8yl81bn7bhmqaflavgicb"; sha256 = "0xrh0l8wr0q903a1swz9anvzkb5hlbl2win5xns55cmbw0ygbwfa";
}; };
v40 = generic { v40 = generic {

8
pkgs/tools/package-management/nix/default.nix
View file

@ -227,6 +227,12 @@ in rec {
inherit storeDir stateDir confDir boehmgc; 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 ];
});
} }

14
pkgs/tools/package-management/nix/enable-all-experimental.patch Normal file
View file

@ -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()

14
pkgs/tools/package-management/nix/enable-flakes.patch Normal file
View file

@ -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<Strings> experimentalFeatures{this, {}, "experimental-features",
+ Setting<Strings> experimentalFeatures{
+ this, {"flakes", "nix-command"}, "experimental-features",
"Experimental Nix features to enable."};
bool isExperimentalFeatureEnabled(const std::string & name);

14
pkgs/top-level/all-packages.nix
View file

@ -19219,10 +19219,19 @@ in
miniflux = callPackage ../servers/miniflux { }; 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 { }; munin = callPackage ../servers/monitoring/munin { };
nagios = callPackage ../servers/monitoring/nagios { };
monitoring-plugins = callPackage ../servers/monitoring/plugins { }; monitoring-plugins = callPackage ../servers/monitoring/plugins { };
inherit (callPackage ../servers/monitoring/plugins/labs_consol_de.nix { }) inherit (callPackage ../servers/monitoring/plugins/labs_consol_de.nix { })
@ -30192,7 +30201,8 @@ in
nix nix
nixStable nixStable
nixUnstable nixUnstable
nixFlakes; nixFlakes
nixExperimental;
nixStatic = pkgsStatic.nix; nixStatic = pkgsStatic.nix;