mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 12:59:04 +02:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
f66386e3b1
|
|
@ -1,16 +1,32 @@
|
|||
{ lib, stdenv, fetchFromGitLab, vala, python3, pkg-config, meson, ninja, gtk3
|
||||
, json-glib, libsoup, webkitgtk, geocode-glib, nix-update-script
|
||||
, libappindicator, desktop-file-utils, appstream, wrapGAppsHook }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, nix-update-script
|
||||
, appstream
|
||||
, desktop-file-utils
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, vala
|
||||
, wrapGAppsHook
|
||||
, glib
|
||||
, gtk3
|
||||
, json-glib
|
||||
, libappindicator
|
||||
, libsoup
|
||||
, webkitgtk
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "meteo";
|
||||
version = "0.9.8";
|
||||
version = "0.9.9";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "bitseater";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1ll5fja0dqxcr6hrh2dk4hgw9gf8ms9bcp1ifznd21byxzyhdlr0";
|
||||
sha256 = "sha256-8v6lg66QEVFMNO8sMkh/H6ouS8359Z7gjRQQnJs+lEE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -25,7 +41,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
geocode-glib
|
||||
glib
|
||||
gtk3
|
||||
json-glib
|
||||
libappindicator
|
||||
|
|
@ -44,12 +60,12 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
};
|
||||
|
||||
|
||||
meta = with lib; {
|
||||
description = "Know the forecast of the next hours & days";
|
||||
homepage = "https://gitlab.com/bitseater/meteo";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ bobby285271 ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "com.gitlab.bitseater.meteo";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,14 +4,14 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.2.6";
|
||||
version = "3.3.0";
|
||||
pname = "hal-hardware-analyzer";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emsec";
|
||||
repo = "hal";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-GRHRrAxZ10hmAXkGGSQEwNJTbnMbJ9jMyKnOUq+KoWo=";
|
||||
sha256 = "sha256-uNpELHhSAVRJL/4iypvnl3nX45SqB419r37lthd2WmQ=";
|
||||
};
|
||||
# make sure bundled dependencies don't get in the way - install also otherwise
|
||||
# copies them in full to the output, bloating the package
|
||||
|
|
|
|||
|
|
@ -12,6 +12,12 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1jx3854zxvfhxrdshbipxfgyq1yxb9ll9agjc2n0cj4vxkjyh9mn";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# musl las no ldconfig, create symlinks explicitly
|
||||
./linux-no-ldconfig.patch
|
||||
];
|
||||
postPatch = "patchShebangs tests/regress/check.sh";
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [ cudd gmp-static gperf libpoly ];
|
||||
configureFlags =
|
||||
|
|
@ -23,22 +29,6 @@ stdenv.mkDerivation rec {
|
|||
enableParallelBuilding = true;
|
||||
doCheck = true;
|
||||
|
||||
# Usual shenanigans
|
||||
patchPhase = "patchShebangs tests/regress/check.sh";
|
||||
|
||||
# Includes a fix for the embedded soname being libyices.so.X.Y, but
|
||||
# only installing the libyices.so.X.Y.Z file.
|
||||
installPhase = let
|
||||
ver_XdotY = lib.versions.majorMinor version;
|
||||
in ''
|
||||
make install LDCONFIG=true
|
||||
# guard against packaging of unstable versions: they
|
||||
# have a soname of hext (not current) release.
|
||||
echo "Checking expected library version to be ${version}"
|
||||
[ -f $out/lib/libyices.so.${version} ]
|
||||
ln -sfr $out/lib/libyices.so.{${version},${ver_XdotY}}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A high-performance theorem prover and SMT solver";
|
||||
homepage = "http://yices.csl.sri.com";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
--- a/Makefile.build
|
||||
+++ b/Makefile.build
|
||||
@@ -474,8 +474,9 @@ install-darwin: install-default
|
||||
install-solaris: install-default
|
||||
$(LDCONFIG) -n $(DESTDIR)$(libdir) && (cd $(DESTDIR)$(libdir) && $(LN_S) -f libyices.so.$(YICES_VERSION) libyices.so)
|
||||
|
||||
+# avoid ldconfig as it's not present on musl
|
||||
install-linux install-unix: install-default
|
||||
- $(LDCONFIG) -n $(DESTDIR)$(libdir) && (cd $(DESTDIR)$(libdir) && $(LN_S) -f libyices.so.$(YICES_VERSION) libyices.so)
|
||||
+ (cd $(DESTDIR)$(libdir) && $(LN_S) -f libyices.so.$(YICES_VERSION) libyices.so.$(MAJOR).$(MINOR) && $(LN_S) -f libyices.so.$(MAJOR).$(MINOR) libyices.so)
|
||||
|
||||
# on FreeBSD: the library file is libyices.so.X.Y and ldconfig does not take -n
|
||||
# TODO: fix this. We must also create a symbolic link: libyices.so.X in libdir
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, fetchzip }:
|
||||
|
||||
let
|
||||
version = "5.1.3";
|
||||
version = "6.0.0";
|
||||
|
||||
in fetchzip {
|
||||
name = "ibm-plex-${version}";
|
||||
|
|
@ -10,14 +10,15 @@ in fetchzip {
|
|||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts
|
||||
unzip -j $downloadedFile "OpenType/*/*.otf" -d $out/share/fonts/opentype
|
||||
unzip -j $downloadedFile "OpenType/*/*.otf" -x "OpenType/IBM-Plex-Sans-JP/unhinted/*" -d $out/share/fonts/opentype
|
||||
'';
|
||||
|
||||
sha256 = "0w07fkhav2lqdyki7ipnkpji5ngwarlhsyliy0ip7cd29x24ys5h";
|
||||
sha256 = "0zv9kw4hmchf374pl0iajzybmx5wklsplg56j115m46i4spij6mr";
|
||||
|
||||
meta = with lib; {
|
||||
description = "IBM Plex Typeface";
|
||||
homepage = "https://www.ibm.com/plex/";
|
||||
changelog = "https://github.com/IBM/plex/raw/v${version}/CHANGELOG.md";
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "numix-icon-theme";
|
||||
version = "21.04.14";
|
||||
version = "21.10.31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "numixproject";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1ilzqh9f7skdfg5sl97zfgwrzvwa1zna22dpq0954gyyzvy7k7lg";
|
||||
sha256 = "sha256-wyVvXifdbKR2aiBMrki8y/H0khH4eFD1RHVSC+jAT28=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 ];
|
||||
|
|
|
|||
|
|
@ -9,7 +9,8 @@ mkCoqDerivation {
|
|||
repo = "coq-dpdgraph";
|
||||
inherit version;
|
||||
defaultVersion = switch coq.coq-version [
|
||||
{ case = "8.13"; out = "0.6.9"; }
|
||||
{ case = "8.14"; out = "1.0+8.14"; }
|
||||
{ case = "8.13"; out = "1.0+8.13"; }
|
||||
{ case = "8.12"; out = "0.6.8"; }
|
||||
{ case = "8.11"; out = "0.6.7"; }
|
||||
{ case = "8.10"; out = "0.6.6"; }
|
||||
|
|
@ -20,6 +21,8 @@ mkCoqDerivation {
|
|||
{ case = "8.5"; out = "0.6"; }
|
||||
] null;
|
||||
|
||||
release."1.0+8.14".sha256 = "sha256:01pmi7jcc77431jii6x6nd4m8jg4vycachiyi1h6dx9rp3a2508s";
|
||||
release."1.0+8.13".sha256 = "sha256:0f8lj8b99n8nsq2jf5m0snblfs8yz50hmlqqq9nlw4qklq7j4z5z";
|
||||
release."0.6.9".sha256 = "11mbydpcgk7y8pqzickbzx0ig7g9k9al71i9yfrcscd2xj8fwj8z";
|
||||
release."0.6.8".sha256 = "1mj6sknsd53xfb387sp3kdwvl4wn80ck24bfzf3s6mgw1a12vyps";
|
||||
release."0.6.7".sha256 = "01vpi7scvkl4ls1z2k2x9zd65wflzb667idj759859hlz3ps9z09";
|
||||
|
|
|
|||
59
pkgs/development/python-modules/angrcli/default.nix
Normal file
59
pkgs/development/python-modules/angrcli/default.nix
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
{ lib
|
||||
, angr
|
||||
, buildPythonPackage
|
||||
, cmd2
|
||||
, coreutils
|
||||
, fetchFromGitHub
|
||||
, pygments
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "angrcli";
|
||||
version = "1.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fmagin";
|
||||
repo = "angr-cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "0mz3yzsw08xwpj6188rxmr7darilh4ismcnh8nhp9945wjyzl4kr";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
angr
|
||||
cmd2
|
||||
pygments
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
coreutils
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Version mismatch, https://github.com/fmagin/angr-cli/pull/11
|
||||
substituteInPlace setup.py \
|
||||
--replace "version='1.1.0'," "version='${version}',"
|
||||
substituteInPlace tests/test_derefs.py \
|
||||
--replace "/bin/ls" "${coreutils}/bin/ls"
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
"test_sims"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"angrcli"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python modules to allow easier interactive use of angr";
|
||||
homepage = "https://github.com/fmagin/angr-cli";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "async-upnp-client";
|
||||
version = "0.22.8";
|
||||
version = "0.22.10";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StevenLooman";
|
||||
repo = "async_upnp_client";
|
||||
rev = version;
|
||||
sha256 = "sha256-0McLH5iNiA6aIyk6OaN57JAs97R+/4M7xaUDmh+xV6c=";
|
||||
sha256 = "sha256-aWxZP/QsjA6kcSWW6vHpEcX2drV+gTvDQItl7IT7wxY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,23 +6,29 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pex";
|
||||
version = "2.1.52";
|
||||
version = "2.1.53";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "6ab60a316892e6e7c6a39cdcbd324d2c3d763b2fe60f381a6fe34b671f24b6e0";
|
||||
sha256 = "802cd39468b4bf27ff23d9911f76a6c66689cc906e12b9102aeace6491a8d084";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
# A few more dependencies I don't want to handle right now...
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pex"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A library and tool for generating .pex (Python EXecutable) files";
|
||||
description = "Python library and tool for generating .pex (Python EXecutable) files";
|
||||
homepage = "https://github.com/pantsbuild/pex";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ copumpkin ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "phonenumbers";
|
||||
version = "8.12.35";
|
||||
version = "8.12.36";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f426d419aabf6366c27ef1193918cc55217ef0e8be8f09cbf0667131037ca229";
|
||||
sha256 = "e29717fcf86d68082fc6e42ca07e52bff863b6e0b354edd1644ba15c35ef213d";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-didl-lite";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
disabled = pythonOlder "3.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StevenLooman";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-NsZ/VQlKEp4p3JRSNQKTGvzLrKgDCkkT81NzgS3UHos=";
|
||||
sha256 = "sha256-qOhpS53isHP0IuM0E0oh2pm2naQjVU6MPHVUcI3vKo8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "regenmaschine";
|
||||
version = "3.2.0";
|
||||
version = "2021.10.0";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-H3ZTts9tk0D53IcnmROCgylhVerctUg/AQCjFo5iJZY=";
|
||||
sha256 = "sha256-vMXDnnIQiRuyLvem1JKop6FJ0fhwR8xP0276PdZi/QI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "smbprotocol";
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jborean93";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NY2eE6hacRd0v8Ij0P13Zw6SRiUNhhd0kMhsg5CRTeM=";
|
||||
sha256 = "sha256-HhyOGRwDnLwrXPjvF04MlgSxGZc0w3nDek9Mnv49cG4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "tuya-iot-py-sdk";
|
||||
version = "0.5.0";
|
||||
version = "0.6.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "tuya";
|
||||
repo = "tuya-iot-python-sdk";
|
||||
rev = "v${version}";
|
||||
sha256 = "1qfjq4h62phsrmrfb11xwd6gjc28vhs90g3mmx7d8ikgsgnqlvza";
|
||||
sha256 = "sha256-i3VECGGpnvbogZ46PJh4Eto7neSZOJCUdOmAU/sMKEw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -39,6 +39,16 @@ let
|
|||
doCheck = false;
|
||||
});
|
||||
|
||||
cyclonedx-python-lib = super.cyclonedx-python-lib.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.6.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "CycloneDX";
|
||||
repo = "cyclonedx-python-lib";
|
||||
rev = "v${version}";
|
||||
sha256 = "10cmp2aqbnbiyrsq5r9p7ppghqj3zyg612d2dldk6m85li3jr500";
|
||||
};
|
||||
});
|
||||
|
||||
};
|
||||
};
|
||||
in
|
||||
|
|
@ -46,7 +56,7 @@ with py.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.0.509";
|
||||
version = "2.0.528";
|
||||
|
||||
disabled = python3.pythonOlder "3.7";
|
||||
|
||||
|
|
@ -54,7 +64,7 @@ buildPythonApplication rec {
|
|||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-dds01scC93d/WdQTTL/JvXvfbiFAF3nEESL/zdFpOYA=";
|
||||
sha256 = "sha256-RcQVm3ppe3c4G/32Dgf6UhwtxJyQWgS4vD5wMYIfwKY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "esbuild";
|
||||
version = "0.13.10";
|
||||
version = "0.13.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RWt8PevKpn/HUX7FUsIxLwmkSyvtVCTyGEWxci7ZVMY=";
|
||||
sha256 = "sha256-QaSH3TgUgfBrmryAFwxjqCMORu3VwcDkqEHNQ0nX73o=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs=";
|
||||
|
|
|
|||
|
|
@ -3,16 +3,22 @@ let
|
|||
callPackage = newScope args;
|
||||
in
|
||||
{
|
||||
discourse-assign = callPackage ./discourse-assign {};
|
||||
discourse-calendar = callPackage ./discourse-calendar {};
|
||||
discourse-canned-replies = callPackage ./discourse-canned-replies {};
|
||||
discourse-chat-integration = callPackage ./discourse-chat-integration {};
|
||||
discourse-checklist = callPackage ./discourse-checklist {};
|
||||
discourse-data-explorer = callPackage ./discourse-data-explorer {};
|
||||
discourse-docs = callPackage ./discourse-docs {};
|
||||
discourse-github = callPackage ./discourse-github {};
|
||||
discourse-ldap-auth = callPackage ./discourse-ldap-auth {};
|
||||
discourse-math = callPackage ./discourse-math {};
|
||||
discourse-migratepassword = callPackage ./discourse-migratepassword {};
|
||||
discourse-openid-connect = callPackage ./discourse-openid-connect {};
|
||||
discourse-prometheus = callPackage ./discourse-prometheus {};
|
||||
discourse-saved-searches = callPackage ./discourse-saved-searches {};
|
||||
discourse-solved = callPackage ./discourse-solved {};
|
||||
discourse-spoiler-alert = callPackage ./discourse-spoiler-alert {};
|
||||
discourse-voting = callPackage ./discourse-voting {};
|
||||
discourse-yearly-review = callPackage ./discourse-yearly-review {};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,17 @@
|
|||
{ lib, mkDiscoursePlugin, fetchFromGitHub }:
|
||||
|
||||
mkDiscoursePlugin {
|
||||
name = "discourse-assign";
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-assign";
|
||||
rev = "5124ba0f67e26a075f0a0fc8993273f1211d1c28";
|
||||
sha256 = "1zd2irp5siza0vd5rlwzmjfvcdfw785988jc526xc741flazk1lr";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-docs";
|
||||
maintainers = with maintainers; [ dpausp ];
|
||||
license = licenses.mit;
|
||||
description = "Discourse Plugin for assigning users to a topic";
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
{ lib, mkDiscoursePlugin, fetchFromGitHub }:
|
||||
|
||||
mkDiscoursePlugin {
|
||||
name = "discourse-chat-integration";
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-chat-integration";
|
||||
rev = "8ade892b387f0ce843d5e78ef4a271b0d35847ff";
|
||||
sha256 = "1qn1bm09i9gzmh74ws32zgc89hrqzyhmh63qvmv0h00r52rmgxvx";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-chat-integration";
|
||||
maintainers = with maintainers; [ dpausp ];
|
||||
license = licenses.mit;
|
||||
description = "This plugin integrates Discourse with a number of external chatroom systems";
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
{ lib, mkDiscoursePlugin, fetchFromGitHub }:
|
||||
|
||||
mkDiscoursePlugin {
|
||||
name = "discourse-docs";
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-docs";
|
||||
rev = "72cdd8d415ae3f797c0d5e2c857370714a42c54a";
|
||||
sha256 = "07hvw8lpg8873vhwh8rrbml3s5hq606b7sw93r2xv38gxfhmx5lq";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-docs";
|
||||
maintainers = with maintainers; [ dpausp ];
|
||||
license = licenses.mit;
|
||||
description = "Find and filter knowledge base topics";
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
source "https://rubygems.org"
|
||||
|
||||
git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
|
||||
|
||||
# gem "rails"
|
||||
gem 'prometheus_exporter', '0.5.0'
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
prometheus_exporter (0.5.0)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
prometheus_exporter (= 0.5.0)
|
||||
|
||||
BUNDLED WITH
|
||||
2.1.4
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
{ lib, stdenv, mkDiscoursePlugin, fetchFromGitHub }:
|
||||
|
||||
mkDiscoursePlugin {
|
||||
bundlerEnvArgs.gemdir = ./.;
|
||||
name = "discourse-prometheus";
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-prometheus";
|
||||
rev = "46260710e8770344af438f86b47409d864a1c499";
|
||||
sha256 = "0nmpi0nysp59x4hyn1c3niypvxw1jkz86acb6m8acacw0c6682k2";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# The metrics collector tries to run git to get the commit id but fails
|
||||
# because we don't run Discourse from a Git repository.
|
||||
./no-git-version.patch
|
||||
./spec-import-fix-abi-version.patch
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-prometheus";
|
||||
maintainers = with maintainers; [ dpausp ];
|
||||
license = licenses.mit;
|
||||
description = "Official Discourse Plugin for Prometheus Monitoring";
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
{
|
||||
prometheus_exporter = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1kmabnxz466zqnyqlzc693ny4l7i0rxvmc0znswvizc0zg4pri80";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.5.0";
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
diff --git a/lib/internal_metric/global.rb b/lib/internal_metric/global.rb
|
||||
index 682571b..7bdd431 100644
|
||||
--- a/lib/internal_metric/global.rb
|
||||
+++ b/lib/internal_metric/global.rb
|
||||
@@ -30,30 +30,7 @@ module DiscoursePrometheus::InternalMetric
|
||||
@active_app_reqs = 0
|
||||
@queued_app_reqs = 0
|
||||
@fault_logged = {}
|
||||
-
|
||||
- begin
|
||||
- @@version = nil
|
||||
-
|
||||
- out, error, status = Open3.capture3('git rev-parse HEAD')
|
||||
-
|
||||
- if status.success?
|
||||
- @@version ||= out.chomp
|
||||
- else
|
||||
- raise error
|
||||
- end
|
||||
- rescue => e
|
||||
- if defined?(::Discourse)
|
||||
- Discourse.warn_exception(e, message: "Failed to calculate discourse_version_info metric")
|
||||
- else
|
||||
- STDERR.puts "Failed to calculate discourse_version_info metric: #{e}\n#{e.backtrace.join("\n")}"
|
||||
- end
|
||||
-
|
||||
- @@retries ||= 10
|
||||
- @@retries -= 1
|
||||
- if @@retries < 0
|
||||
- @@version = -1
|
||||
- end
|
||||
- end
|
||||
+ @@version = -1
|
||||
end
|
||||
|
||||
def collect
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
diff --git a/bin/collector b/bin/collector
|
||||
index 4fec65e..e59eac7 100755
|
||||
--- a/bin/collector
|
||||
+++ b/bin/collector
|
||||
@@ -3,8 +3,10 @@
|
||||
|
||||
Process.setproctitle("discourse prometheus-collector")
|
||||
|
||||
+# We need the ABI version {MAJOR}.{MINOR}.0 here.
|
||||
+abi_version = ENV['GEM_PATH'].split("/")[-1]
|
||||
version = File.read(File.expand_path("../../prometheus_exporter_version", __FILE__)).strip
|
||||
-spec_file = File.expand_path("../../gems/#{RUBY_VERSION}/specifications/prometheus_exporter-#{version}.gemspec", __FILE__)
|
||||
+spec_file = File.expand_path("../../gems/#{abi_version}/specifications/prometheus_exporter-#{version}.gemspec", __FILE__)
|
||||
|
||||
spec = Gem::Specification.load spec_file
|
||||
spec.activate
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
{ lib, mkDiscoursePlugin, fetchFromGitHub }:
|
||||
|
||||
mkDiscoursePlugin {
|
||||
name = "discourse-saved-searches";
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-saved-searches";
|
||||
rev = "b59e0b60afdd5133e60c5cc6169f42f1edd746be";
|
||||
sha256 = "0yhr7gx35q2nshvfxkplplkq73l7sgqlm8r3g1apniqicpk5flqy";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-saved-searches";
|
||||
maintainers = with maintainers; [ dpausp ];
|
||||
license = licenses.mit;
|
||||
description = "Allow users to save searches and be notified of new results";
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
{ lib, mkDiscoursePlugin, fetchFromGitHub }:
|
||||
|
||||
mkDiscoursePlugin {
|
||||
name = "discourse-voting";
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-voting";
|
||||
rev = "fc4d23174eba1a57ddcba93eaf4a4e75d469d4a4";
|
||||
sha256 = "07mj667qn387kaafg475f36pgnannsrb2bdqi0zj487av43252qb";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-voting";
|
||||
maintainers = with maintainers; [ dpausp ];
|
||||
license = licenses.gpl2Only;
|
||||
description = "Adds the ability for voting on a topic within a specified category in Discourse";
|
||||
};
|
||||
}
|
||||
|
|
@ -201,16 +201,24 @@ def update_plugins():
|
|||
|
||||
"""
|
||||
plugins = [
|
||||
{'name': 'discourse-assign'},
|
||||
{'name': 'discourse-calendar'},
|
||||
{'name': 'discourse-canned-replies'},
|
||||
{'name': 'discourse-chat-integration'},
|
||||
{'name': 'discourse-checklist'},
|
||||
{'name': 'discourse-data-explorer'},
|
||||
{'name': 'discourse-docs'},
|
||||
{'name': 'discourse-github'},
|
||||
{'name': 'discourse-ldap-auth', 'owner': 'jonmbake'},
|
||||
{'name': 'discourse-math'},
|
||||
{'name': 'discourse-migratepassword', 'owner': 'discoursehosting'},
|
||||
# We can't update this automatically at the moment because the plugin.rb
|
||||
# tries to load a version number which breaks bundler called by this script.
|
||||
# {'name': 'discourse-prometheus'},
|
||||
{'name': 'discourse-saved-searches'},
|
||||
{'name': 'discourse-solved'},
|
||||
{'name': 'discourse-spoiler-alert'},
|
||||
{'name': 'discourse-voting'},
|
||||
{'name': 'discourse-yearly-review'},
|
||||
]
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "trash-cli";
|
||||
version = "0.21.7.24";
|
||||
version = "0.21.10.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "andreafrancia";
|
||||
repo = "trash-cli";
|
||||
rev = version;
|
||||
sha256 = "082mfl4mza4xkm3fdn5aka9rsbd8c149qj3cqqk62idrnszmgzg5";
|
||||
sha256 = "01is32lk6prwhajvlmgn3xs4fcpmiqivizcqkj9k80jx6mqjifzs";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ python3Packages.psutil ];
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dalfox";
|
||||
version = "2.5.2";
|
||||
version = "2.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hahwul";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/tS9/VxH5r4CSmxZ7uZOgAMLRtmPs+bgPtvljOhLALc=";
|
||||
sha256 = "sha256-zwDdOj6/YcZQZW5WWMZztTVl5QsYMCcqtaAFsM+1bn0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-AZbzcGqje2u9waH2NGWITXpax2GCFqbIEd4uNiDmcIY=";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2021-10-23";
|
||||
version = "2021-10-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "offensive-security";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-gNvpNs+fYETB3zKMX7pJbMEW79vH6yTX8LxvLHw9X3I=";
|
||||
sha256 = "sha256-GwyqtoRxiijF4lewKXX8d/pmO4r+BWn8mfmApGum8/w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# frozen_string_literal: true
|
||||
source "https://rubygems.org"
|
||||
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.11"
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.12"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
GIT
|
||||
remote: https://github.com/rapid7/metasploit-framework
|
||||
revision: 341b0cd1cdf69fe22345aea6c84ae11ba45e0d98
|
||||
ref: refs/tags/6.1.11
|
||||
revision: bde342fd8293e49a45ba837ca9a1fdea505bc919
|
||||
ref: refs/tags/6.1.12
|
||||
specs:
|
||||
metasploit-framework (6.1.11)
|
||||
metasploit-framework (6.1.12)
|
||||
actionpack (~> 6.0)
|
||||
activerecord (~> 6.0)
|
||||
activesupport (~> 6.0)
|
||||
|
|
@ -128,13 +128,13 @@ GEM
|
|||
arel-helpers (2.12.1)
|
||||
activerecord (>= 3.1.0, < 7)
|
||||
aws-eventstream (1.2.0)
|
||||
aws-partitions (1.518.0)
|
||||
aws-sdk-core (3.121.3)
|
||||
aws-partitions (1.521.0)
|
||||
aws-sdk-core (3.121.5)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
aws-partitions (~> 1, >= 1.239.0)
|
||||
aws-partitions (~> 1, >= 1.520.1)
|
||||
aws-sigv4 (~> 1.1)
|
||||
jmespath (~> 1.0)
|
||||
aws-sdk-ec2 (1.271.0)
|
||||
aws-sdk-ec2 (1.275.0)
|
||||
aws-sdk-core (~> 3, >= 3.121.2)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-iam (1.62.0)
|
||||
|
|
@ -360,9 +360,9 @@ GEM
|
|||
metasm
|
||||
rex-core
|
||||
rex-text
|
||||
rex-socket (0.1.33)
|
||||
rex-socket (0.1.34)
|
||||
rex-core
|
||||
rex-sslscan (0.1.6)
|
||||
rex-sslscan (0.1.7)
|
||||
rex-core
|
||||
rex-socket
|
||||
rex-text
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@ let
|
|||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "metasploit-framework";
|
||||
version = "6.1.11";
|
||||
version = "6.1.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rapid7";
|
||||
repo = "metasploit-framework";
|
||||
rev = version;
|
||||
sha256 = "sha256-0C93rxVWHHZha2oRKanTm4S0qig3qZreFV08PLwShSw=";
|
||||
sha256 = "sha256-I7wk8DBN7i4zE4bEIMVGcZi4OMIsbh0Ay2RsAh0VRrw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -104,30 +104,30 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "18jjc7sxpdip10iyg0sn89ywvi2iqnhi225df7j6gs0fm25azkfw";
|
||||
sha256 = "0zfwynw6d4lbq63lwk94insrjmgxwfp1lic4913a9ik00wnf90wd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.518.0";
|
||||
version = "1.521.0";
|
||||
};
|
||||
aws-sdk-core = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "15x3qcmh81hf92x0gcj0h0h7yhnlzdqs6wdml56i3cq0nz9kxhs4";
|
||||
sha256 = "0akv0jyr4crs4r5vdzc18j5drqgpcckm0gnpgi0bzpqyyk6m16hq";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.121.3";
|
||||
version = "3.121.5";
|
||||
};
|
||||
aws-sdk-ec2 = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0k85khm2c53y2sq29c9rg5kmjm1fnw2glgpjsl6hbh8cq3ciaain";
|
||||
sha256 = "13kbrl8r9cm7i9cb6w5ayji1vqaca6h0inxpyx8bhbrwkscrbh2s";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.271.0";
|
||||
version = "1.275.0";
|
||||
};
|
||||
aws-sdk-iam = {
|
||||
groups = ["default"];
|
||||
|
|
@ -664,12 +664,12 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
fetchSubmodules = false;
|
||||
rev = "341b0cd1cdf69fe22345aea6c84ae11ba45e0d98";
|
||||
sha256 = "0b452ay3qg2x2pg9ma9p52mb914vsfljj4baddhpc72n2nppfbyh";
|
||||
rev = "bde342fd8293e49a45ba837ca9a1fdea505bc919";
|
||||
sha256 = "1g262lfh4v34rc01svicq8wbi63i8v2j1i462crjxvjd63q29g13";
|
||||
type = "git";
|
||||
url = "https://github.com/rapid7/metasploit-framework";
|
||||
};
|
||||
version = "6.1.11";
|
||||
version = "6.1.12";
|
||||
};
|
||||
metasploit-model = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1237,20 +1237,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1kl221lsf1dk62vsf6fsgcx54crav0wgqsb9rwjxl7gfd7kmyz04";
|
||||
sha256 = "1rsgssbnnl5frxgnq17xq0n6rpxns6xdmxpya9852c2n72nm5ac0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.33";
|
||||
version = "0.1.34";
|
||||
};
|
||||
rex-sslscan = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0r58n1ifbay1gq3kln9yg5iqjwp69l0pmb9sqakhqwhjlhzqx2kr";
|
||||
sha256 = "128y9xrb2nv8ccs85lav8wcydp8239y04ad7mjkc43r59hhkx74p";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.6";
|
||||
version = "0.1.7";
|
||||
};
|
||||
rex-struct2 = {
|
||||
groups = ["default"];
|
||||
|
|
|
|||
|
|
@ -461,6 +461,10 @@ in {
|
|||
|
||||
angr = callPackage ../development/python-modules/angr { };
|
||||
|
||||
angrcli = callPackage ../development/python-modules/angrcli {
|
||||
inherit (pkgs) coreutils;
|
||||
};
|
||||
|
||||
angrop = callPackage ../development/python-modules/angrop { };
|
||||
|
||||
aniso8601 = callPackage ../development/python-modules/aniso8601 { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue