Merge master into staging-next
This commit is contained in:
@@ -816,6 +816,12 @@
|
||||
githubId = 7112447;
|
||||
name = "Andre S. Ramos";
|
||||
};
|
||||
andrevmatos = {
|
||||
email = "andrevmatos@gmail.com";
|
||||
github = "andrevmatos";
|
||||
githubId = 587021;
|
||||
name = "André V L Matos";
|
||||
};
|
||||
andrew-d = {
|
||||
email = "andrew@du.nham.ca";
|
||||
github = "andrew-d";
|
||||
|
||||
@@ -3,27 +3,31 @@
|
||||
, fetchzip
|
||||
, autoPatchelfHook
|
||||
, makeWrapper
|
||||
, alsa-lib
|
||||
, gtk-sharp-2_0
|
||||
, glib
|
||||
, gtk2
|
||||
, mono
|
||||
, openal
|
||||
, libGL
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "famistudio";
|
||||
version = "3.3.1";
|
||||
version = "4.0.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/BleuBleu/FamiStudio/releases/download/${version}/FamiStudio${lib.strings.concatStrings (lib.splitVersion version)}-LinuxAMD64.zip";
|
||||
stripRoot = false;
|
||||
sha256 = "sha256-Bgry+cRsmC+aBff6EaeHoGBygpiZS5SmgICPU32zO+c=";
|
||||
sha256 = "sha256-pAULW2aIaKiA61rARpL+hSoffnQO6hfqVpOcEMwD7oo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [ alsa-lib gtk-sharp-2_0 glib gtk2 mono openal ];
|
||||
buildInputs = [
|
||||
mono
|
||||
openal
|
||||
libGL
|
||||
];
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
@@ -36,16 +40,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
makeWrapper ${mono}/bin/mono $out/bin/famistudio \
|
||||
--add-flags $out/lib/famistudio/FamiStudio.exe \
|
||||
--prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gtk2 gtk-sharp-2_0 ]}
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]}
|
||||
|
||||
# Fails to find openal32.dll on its own, needs abit of help
|
||||
# Bundled openal lib freezes the application
|
||||
rm $out/lib/famistudio/libopenal32.so
|
||||
cat <<EOF >$out/lib/famistudio/OpenTK.dll.config
|
||||
<configuration>
|
||||
<dllmap dll="openal32.dll" target="${openal}/lib/libopenal.so"/>
|
||||
</configuration>
|
||||
EOF
|
||||
ln -s ${openal}/lib/libopenal.so $out/lib/famistudio/libopenal32.so
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{ alsa-lib
|
||||
, cmake
|
||||
, copyDesktopItems
|
||||
, curl
|
||||
, fetchFromBitbucket
|
||||
@@ -23,7 +24,6 @@
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, pkg-config
|
||||
, rtaudio
|
||||
, rtmidi
|
||||
, speex
|
||||
, stdenv
|
||||
@@ -75,13 +75,35 @@ let
|
||||
fundamental-source = fetchFromGitHub {
|
||||
owner = "VCVRack";
|
||||
repo = "Fundamental";
|
||||
rev = "533397cdcad5c6401ebd3937d6c1663de2473627"; # tip of branch v2
|
||||
sha256 = "QnwOgrYxiCa/7t/u6F63Ks8C9E8k6T+hia4JZFhp1LI=";
|
||||
rev = "03bd00b96ad19e0575939bb7a0b8b08eff22f076"; # tip of branch v2
|
||||
sha256 = "1rd5yvdr6k03mc3r2y7wxhmiqd69jfvqmpqagxb83y1mn0zfv0pr";
|
||||
};
|
||||
vcv-rtaudio = stdenv.mkDerivation rec {
|
||||
pname = "vcv-rtaudio";
|
||||
version = "unstable-2020-01-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VCVRack";
|
||||
repo = "rtaudio";
|
||||
rev = "ece277bd839603648c80c8a5f145678e13bc23f3"; # tip of master branch
|
||||
sha256 = "11gpl0ak757ilrq4fi0brj0chmlcr1hihc32yd7qza4fxjw2yx2v";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [ alsa-lib libjack2 libpulseaudio ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DRTAUDIO_API_ALSA=ON"
|
||||
"-DRTAUDIO_API_PULSE=ON"
|
||||
"-DRTAUDIO_API_JACK=ON"
|
||||
"-DRTAUDIO_API_CORE=OFF"
|
||||
];
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "VCV-Rack";
|
||||
version = "2.0.6";
|
||||
version = "2.1.2";
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
@@ -101,7 +123,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "VCVRack";
|
||||
repo = "Rack";
|
||||
rev = "v${version}";
|
||||
sha256 = "vvGx8tnE7gMiboVUTywIzBB1q/IfiJ8TPnSHvmfHUQg=";
|
||||
sha256 = "0583izk3j36mg7wm30ss2387j9dqsbbxkxrdh3993azb4q5naf02";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -137,8 +159,6 @@ stdenv.mkDerivation rec {
|
||||
--replace 'zenityBin[] = "zenity"' 'zenityBin[] = "${gnome.zenity}/bin/zenity"'
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
imagemagick
|
||||
@@ -161,9 +181,9 @@ stdenv.mkDerivation rec {
|
||||
libjack2
|
||||
libpulseaudio
|
||||
libsamplerate
|
||||
rtaudio
|
||||
rtmidi
|
||||
speex
|
||||
vcv-rtaudio
|
||||
zstd
|
||||
];
|
||||
|
||||
|
||||
@@ -1626,6 +1626,21 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
mkhl.direnv = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "direnv";
|
||||
publisher = "mkhl";
|
||||
version = "0.6.1";
|
||||
sha256 = "sha256-5/Tqpn/7byl+z2ATflgKV1+rhdqj+XMEZNbGwDmGwLQ=";
|
||||
};
|
||||
meta = with lib; {
|
||||
description = "direnv support for Visual Studio Code";
|
||||
license = licenses.bsd0;
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=mkhl.direnv";
|
||||
maintainers = with maintainers; [ nullx76 ];
|
||||
};
|
||||
};
|
||||
|
||||
mskelton.one-dark-theme = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "one-dark-theme";
|
||||
|
||||
@@ -186,6 +186,7 @@ let
|
||||
kreversi = callPackage ./kreversi.nix {};
|
||||
krfb = callPackage ./krfb.nix {};
|
||||
kruler = callPackage ./kruler.nix {};
|
||||
ksanecore = callPackage ./ksanecore.nix {};
|
||||
kshisen = callPackage ./kshisen.nix {};
|
||||
ksmtp = callPackage ./ksmtp {};
|
||||
kspaceduel = callPackage ./kspaceduel.nix {};
|
||||
|
||||
@@ -1 +1 @@
|
||||
WGET_ARGS=( https://download.kde.org/stable/release-service/22.04.3/src -A '*.tar.xz' )
|
||||
WGET_ARGS=( https://download.kde.org/stable/release-service/22.08.0/src -A '*.tar.xz' )
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
mkDerivation, lib,
|
||||
extra-cmake-modules, kdoctools,
|
||||
kio, kparts, kxmlgui, qtbase, qtscript, solid
|
||||
kio, kparts, kxmlgui, qtbase, qtscript, solid, qtquickcontrols2, kdeclarative
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@@ -15,7 +15,7 @@ mkDerivation {
|
||||
};
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
propagatedBuildInputs = [
|
||||
kio kparts kxmlgui qtscript solid
|
||||
kio kparts kxmlgui qtscript solid qtquickcontrols2 kdeclarative
|
||||
];
|
||||
outputs = [ "out" "dev" ];
|
||||
}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{
|
||||
mkDerivation, lib,
|
||||
extra-cmake-modules, kdoctools,
|
||||
exiv2, lcms2,
|
||||
exiv2, lcms2, cfitsio,
|
||||
baloo, kactivities, kio, kipi-plugins, kitemmodels, kparts, libkdcraw, libkipi,
|
||||
phonon, qtimageformats, qtsvg, qtx11extras, kinit
|
||||
phonon, qtimageformats, qtsvg, qtx11extras, kinit, kpurpose, kcolorpicker, kimageannotator
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@@ -17,8 +17,8 @@ mkDerivation {
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [
|
||||
baloo kactivities kio kitemmodels kparts libkdcraw libkipi phonon
|
||||
exiv2 lcms2
|
||||
qtimageformats qtsvg qtx11extras
|
||||
exiv2 lcms2 cfitsio
|
||||
qtimageformats qtsvg qtx11extras kpurpose kcolorpicker kimageannotator
|
||||
];
|
||||
propagatedUserEnvPkgs = [ kipi-plugins libkipi (lib.getBin kinit) ];
|
||||
}
|
||||
|
||||
@@ -20,9 +20,9 @@ mkDerivation {
|
||||
# kwrite defaults for anything considered text/plain. Resetting to
|
||||
# 1, which is the default.
|
||||
postPatch = ''
|
||||
substituteInPlace kate/data/org.kde.kate.desktop \
|
||||
substituteInPlace apps/kate/data/org.kde.kate.desktop \
|
||||
--replace InitialPreference=9 InitialPreference=1
|
||||
substituteInPlace kwrite/data/org.kde.kwrite.desktop \
|
||||
substituteInPlace apps/kwrite/data/org.kde.kwrite.desktop \
|
||||
--replace InitialPreference=8 InitialPreference=1
|
||||
'';
|
||||
|
||||
|
||||
@@ -28,6 +28,7 @@
|
||||
, sshfs
|
||||
, wayland
|
||||
, wayland-scanner
|
||||
, plasma-wayland-protocols
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@@ -56,6 +57,7 @@ mkDerivation {
|
||||
qtx11extras
|
||||
wayland
|
||||
wayland-scanner
|
||||
plasma-wayland-protocols
|
||||
# otherwise buttons are blank on non-kde
|
||||
breeze-icons
|
||||
];
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
{
|
||||
mkDerivation, lib,
|
||||
extra-cmake-modules, qtbase,
|
||||
ki18n, sane-backends
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
pname = "ksanecore";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ qtbase ki18n sane-backends ];
|
||||
meta = with lib; {
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ andrevmatos ];
|
||||
};
|
||||
}
|
||||
@@ -2,7 +2,7 @@
|
||||
mkDerivation, lib,
|
||||
extra-cmake-modules, qtbase,
|
||||
ki18n, ktextwidgets, kwallet, kwidgetsaddons,
|
||||
sane-backends
|
||||
ksanecore, sane-backends
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@@ -12,5 +12,6 @@ mkDerivation {
|
||||
maintainers = with maintainers; [ polendri ];
|
||||
};
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ qtbase ki18n ktextwidgets kwallet kwidgetsaddons sane-backends ];
|
||||
buildInputs = [ qtbase ki18n ktextwidgets kwallet kwidgetsaddons ];
|
||||
propagatedBuildInputs = [ ksanecore sane-backends ];
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
grantleetheme, karchive, kcodecs, kconfig, kconfigwidgets, kcontacts,
|
||||
kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap,
|
||||
kmailtransport, kmbox, kmime, kwindowsystem, libgravatar, libkdepim, libkleo,
|
||||
pimcommon, qca-qt5, qtwebengine, syntax-highlighting, fetchpatch
|
||||
pimcommon, qca-qt5, qtwebengine, syntax-highlighting
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@@ -14,17 +14,6 @@ mkDerivation {
|
||||
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
|
||||
maintainers = kdepimTeam;
|
||||
};
|
||||
patches = [
|
||||
# fix compatibility with cmake 3.24
|
||||
(fetchpatch {
|
||||
url = "https://invent.kde.org/pim/messagelib/-/commit/6eaef36d42bdb05f3.patch";
|
||||
hash = "sha256-H0ayU81HxX5moHOQ3hDW7tg824oqK1p9atrBhuvZ8K8=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://invent.kde.org/pim/messagelib/-/commit/3edc93673f94604c2.patch";
|
||||
hash = "sha256-tBFWCfttjDjyQyWnKdhVfLY6QsixzqqYuvD77GVH080=";
|
||||
})
|
||||
];
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [
|
||||
akonadi-notes akonadi-search gpgme grantlee grantleetheme karchive kcodecs
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
|
||||
kdbusaddons, kdegraphics-mobipocket, kiconthemes, kjs, khtml, kio, kparts,
|
||||
kpty, kpurpose, kwallet, kwindowsystem, libkexiv2, libspectre, libzip, phonon, poppler,
|
||||
qca-qt5, qtdeclarative, qtsvg, threadweaver, kcrash
|
||||
qca-qt5, qtdeclarative, qtsvg, threadweaver, kcrash, qtspeech
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@@ -16,7 +16,7 @@ mkDerivation {
|
||||
kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons
|
||||
kdegraphics-mobipocket kiconthemes kjs khtml kio kparts kpty kpurpose kwallet
|
||||
kwindowsystem libkexiv2 libspectre libzip phonon poppler qca-qt5
|
||||
qtdeclarative qtsvg threadweaver kcrash
|
||||
qtdeclarative qtsvg threadweaver kcrash qtspeech
|
||||
] ++ lib.optional (!stdenv.isAarch64) chmlib;
|
||||
|
||||
# InitialPreference values are too high and end up making okular
|
||||
|
||||
+941
-933
File diff suppressed because it is too large
Load Diff
@@ -84,13 +84,13 @@ let
|
||||
in
|
||||
buildPythonApplication rec {
|
||||
pname = "lutris-original";
|
||||
version = "0.5.10.1";
|
||||
version = "0.5.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lutris";
|
||||
repo = "lutris";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-Bf8UEGEM6M4PKoX/qKQNb9XxrxLcjKZD1vR3R2/PykI=";
|
||||
sha256 = "sha256-D2qMKYmi5TC8jEAECcz2V0rUrmp5kjXJ5qyW6C4re3w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
|
||||
@@ -19,9 +19,9 @@
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "105.0.5195.37",
|
||||
"sha256": "0ffzphr66z3g3l695b5liswpfp0577knn06mzdmwq9x1lk87cwiq",
|
||||
"sha256bin64": "1cfkjzqwj4s5djzl2rka9kbc28i6zph0xqv1534cb68hzgwy171a",
|
||||
"version": "105.0.5195.52",
|
||||
"sha256": "0hkwjilzy0x28knm6nrkywnsmldhz4kgpnxka2iaghihkjzb4wfw",
|
||||
"sha256bin64": "155w4h4py3pn337060csfia9xxbjlxvhw7s7ljb9mz6qvpijd434",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-07-11",
|
||||
@@ -32,15 +32,15 @@
|
||||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "106.0.5231.2",
|
||||
"sha256": "0cygann80jmc2vk83kpc7kprhw75yf7qqfi1208ksyp6m94cxnp6",
|
||||
"sha256bin64": "1p7hq5vsmwgkyjam7blm1gxa246dg5plhk2f0vbvlnycwj54cvjm",
|
||||
"version": "106.0.5245.0",
|
||||
"sha256": "1hpp5gcajmjf2wvgrnsrfwl879gj8w8b6asn79raqj1qf2pa7wxg",
|
||||
"sha256bin64": "1d4v2mwpbn3h533lkh8270hmj71ag9ivh7ns03qifsqsl9jv4zdv",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-08-08",
|
||||
"version": "2022-08-11",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "3d773bba0927e67eae8fdaee5e28b0f6203d3bee",
|
||||
"sha256": "1pfv6iq04r5lbg5b6xa6d5vn6mzyqksmspris7cgq5lihwq825ld"
|
||||
"rev": "0bcd37bd2b83f1a9ee17088037ebdfe6eab6d31a",
|
||||
"sha256": "13zks2z65kg7fzzsysq4mswd4bhhy3h7ycdrpxfilcvixx2n2gac"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
callPackage ./generic.nix {
|
||||
inherit buildGoModule;
|
||||
version = "1.2.9";
|
||||
sha256 = "05pd4y5aq91ac73447aqr0pk56rx5qhqzzp5cw4w06yh5iry0bmn";
|
||||
vendorSha256 = "08nqqd3dz8bzxnh729kckvg59wnvmixmsh8g74nlxk90gq07zsn4";
|
||||
version = "1.2.11";
|
||||
sha256 = "sha256-mBaqTiPCPNjhdBKv4ydlNuJxGwFCcJTj4khaOJs9LQM=";
|
||||
vendorSha256 = "sha256-2Draoydjsu15GK1QMHiZCB9ldTrAb0FwhO7MUH3s1Q8=";
|
||||
}
|
||||
|
||||
@@ -1,25 +1,16 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, openssl, sqlite }:
|
||||
{ lib, stdenv, fetchFromGitHub, openssl, sqlite }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signalbackup-tools";
|
||||
version = "20220810";
|
||||
version = "20220825";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bepaald";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-z/RAvNUss9rNuBQvxjJQl66ZMrlxvmS9at8L/vSG0XU=";
|
||||
sha256 = "sha256-dqP30or4UvtnzUW6r0FqQxt1S6Y61Q1CljpAFGq2gSM=";
|
||||
};
|
||||
|
||||
# TODO: Remove when updating to next release.
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-platform-checks.patch";
|
||||
url = "https://github.com/bepaald/signalbackup-tools/compare/20220810..a81baf25b6ba63da7d30d9a239e5b4bbc8d1ab4f.patch";
|
||||
sha256 = "sha256-i7fuPBil8zB+V3wHHdcbmP79OZoTfG2ZpXPQ3m7X06c=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs BUILDSCRIPT_MULTIPROC.bash44
|
||||
'';
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution-ews";
|
||||
version = "3.44.3";
|
||||
version = "3.44.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "hcysooh6+FvwSORzx7bELF9WQasFpbxM/Oo04rb1vhc=";
|
||||
sha256 = "TxgrBaE6wbezOwj7Bm6DlcqpW6fagIiGqpGxQp1tfbM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake gettext intltool pkg-config ];
|
||||
|
||||
@@ -46,11 +46,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution";
|
||||
version = "3.44.3";
|
||||
version = "3.44.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "U2sR9BM99vIW8nr5okgaGe164Ivi1KE7EoBhwmKjZJk=";
|
||||
sha256 = "8LFuerrTx5RaKcMi8X2rSgjWHpm9fMkbjfNQU8XBLow=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "morgen";
|
||||
version = "2.5.9";
|
||||
version = "2.5.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb";
|
||||
sha256 = "sha256-WGBn4ZLERGXNPBRDoxhsOcnRT07wEdCO6+sUq/l7Hok=";
|
||||
sha256 = "sha256-uKHLKZtvaaklJMYqAHtu4ULwcfbut1L2h6bjZkqI91o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -26,16 +26,21 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "haruna";
|
||||
version = "0.8.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "multimedia";
|
||||
repo = "haruna";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Lom9iQUKH3lQHrVK4dJzo+FG79xSCg0b4gY/KAevL6I=";
|
||||
hash = "sha256-pkskrzpKDsMg7DOC335zXknEIKh9Ku2NgyeinawQtiY=";
|
||||
domain = "invent.kde.org";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/application.cpp \
|
||||
--replace '"yt-dlp"' '"${lib.getExe yt-dlp}"'
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
breeze-icons
|
||||
breeze-qt5
|
||||
|
||||
@@ -14,21 +14,21 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.16.7";
|
||||
version = "1.17.1";
|
||||
# Using two URLs as the first one will break as soon as a new version is released
|
||||
src_bin = fetchurl {
|
||||
urls = [
|
||||
"http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz"
|
||||
"http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz"
|
||||
];
|
||||
sha256 = "sha256-YjsYW2MmzDZqOMdYlqE0dZ399Qq8hJRQ9BCViNexLHs=";
|
||||
sha256 = "sha256-B4SQiwf5/Icweg+VgQW34tN/XxDA7xoSgIVOfXwGsfM=";
|
||||
};
|
||||
src_oss = fetchurl {
|
||||
urls = [
|
||||
"http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz"
|
||||
"http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz"
|
||||
];
|
||||
sha256 = "sha256-TL0PRP/pDg16qsbYi9RYyD0egNDaxuApmR86hiR/Rq8=";
|
||||
sha256 = "sha256-DVcrG5N9lydct11xoUKz1VVCiuvVOmQWGlAP2nrnZv4=";
|
||||
};
|
||||
|
||||
in mkDerivation {
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "runc";
|
||||
version = "1.1.3";
|
||||
version = "1.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencontainers";
|
||||
repo = "runc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-s0VRj/hjevtTZ9rUQsAsI2pg4ygahlrBIfFdETWy9W0=";
|
||||
sha256 = "sha256-ougJHW1Z+qZ324P8WpZqawY1QofKnn8WezP7orzRTdA=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ddccontrol-db";
|
||||
version = "20220414";
|
||||
version = "20220720";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddccontrol";
|
||||
repo = "ddccontrol-db";
|
||||
rev = version;
|
||||
sha256 = "sha256-HlzwtcrnPnAAa3C1AwfS6P13mfXKXlwdlDDtVLcHPCA=";
|
||||
sha256 = "sha256-A681Q0VSBUzxpTq+Dl4/ug+d0O134+Pc1LlcVPsWxmI=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@@ -45,13 +45,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution-data-server";
|
||||
version = "3.44.3";
|
||||
version = "3.44.4";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "kEOrU/NB2hAxXFUDhKazIEMBk/yNeGHdJcTpsuC+Qls=";
|
||||
sha256 = "wMZliDjVi6RgQqS55Qo7sRKWkeTNuEteugvzMLLMsus=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper
|
||||
, stdenv, writeScript, lib }:
|
||||
let
|
||||
version = "0.35.0";
|
||||
version = "0.41.2";
|
||||
owner = "erlang-ls";
|
||||
repo = "erlang_ls";
|
||||
deps = import ./rebar-deps.nix {
|
||||
@@ -11,6 +11,11 @@ let
|
||||
proper = super.proper.overrideAttrs (_: {
|
||||
configurePhase = "true";
|
||||
});
|
||||
redbug = super.redbug.overrideAttrs (_: {
|
||||
patchPhase = ''
|
||||
substituteInPlace rebar.config --replace ", warnings_as_errors" ""
|
||||
'';
|
||||
});
|
||||
});
|
||||
};
|
||||
in
|
||||
@@ -19,7 +24,7 @@ rebar3Relx {
|
||||
inherit version;
|
||||
src = fetchFromGitHub {
|
||||
inherit owner repo;
|
||||
sha256 = "sha256-5pGFLatcNqxpQZtu/qgwX88C8TZvk+U8ez2IGf+jgRA=";
|
||||
sha256 = "sha256-LUgiQtK0OsdTmg1jEdxJ0x+39U3PXoFYsGlOv4l7/Ig=";
|
||||
rev = version;
|
||||
};
|
||||
releaseType = "escript";
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bobcat";
|
||||
version = "5.09.01";
|
||||
version = "5.10.01";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
sha256 = "sha256-kaz15mNn/bq1HUknUJqXoLYxPRPX4w340sv9be0M+kQ=";
|
||||
sha256 = "sha256-QhjUIaPSDAvOt0ZCzQWASpG+GJaTviosGDrzrckhuhs=";
|
||||
domain = "gitlab.com";
|
||||
rev = version;
|
||||
repo = "bobcat";
|
||||
|
||||
@@ -26,13 +26,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "mlt";
|
||||
version = "7.0.1";
|
||||
version = "7.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mltframework";
|
||||
repo = "mlt";
|
||||
rev = "v${version}";
|
||||
sha256 = "13c5miph9jjbz69dhy0zvbkk5zbb05dr3vraaci0d5fdbrlhyscf";
|
||||
sha256 = "sha256-r8lvzz083WWlDtjvlsPwvOgplx2lPPkDDf3t0G9PqAQ=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -17,14 +17,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bellows";
|
||||
version = "0.32.0";
|
||||
version = "0.33.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zigpy";
|
||||
repo = "bellows";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-+kD1V0SfRm0yYi64ciwtFK7YSVXnED6fBzQcGj6KKbo=";
|
||||
sha256 = "sha256-cpWQdsuW3CA/8HowhMoVV++rrDnjFQcgp+A5CCElj6o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydeconz";
|
||||
version = "103";
|
||||
version = "104";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "Kane610";
|
||||
repo = "deconz";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-nxM9airO1/CF4g9CeyV2WMxh22fBtu0fjz1R3X1zm+o=";
|
||||
hash = "sha256-bG2dhWa+KnSsigmOHE4wShaS56M9z6vqrFNek3PLbic=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xknx";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "XKNX";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-gJw/PtPwXo1FJcEH8SYRyQNaJoWQIfH2Mnxu52CqI8s=";
|
||||
sha256 = "sha256-QocUkY4wbEw0RCfKxOn14889pN1s67p0pGIR1rO4H5E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zigpy-zigate";
|
||||
version = "0.9.1";
|
||||
version = "0.9.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "zigpy";
|
||||
repo = "zigpy-zigate";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-H1R+wNUo/J5ATINHrkC4mJ8KKnBxVZUvF6X7y54aiVQ=";
|
||||
hash = "sha256-89e9QkFxBdw5YujL73zR7jys0sCJz5r/jNaVmLxv37g=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zigpy-znp";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "zigpy";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-GKdhzmSQZ+D7o9OJZ5880mRI1mIcckW+dY5DnP7zIuo=";
|
||||
sha256 = "sha256-90D8MP8p0zFvmxtWXxfPzLuRACeVk4vGdUYxh6cZb08=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
, buildPythonPackage
|
||||
, crccheck
|
||||
, cryptography
|
||||
, freezegun
|
||||
, fetchFromGitHub
|
||||
, pycryptodome
|
||||
, pytest-aiohttp
|
||||
@@ -16,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zigpy";
|
||||
version = "0.49.1";
|
||||
version = "0.50.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -25,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "zigpy";
|
||||
repo = "zigpy";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-ai0qWKgsh8kIS4juvzpE+amsnIbEOJbhGutV75yRGog=";
|
||||
hash = "sha256-0Ha2CgJLLLZjMEEj07GL6kbKcM+x0YblVIjABiaAhXg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@@ -38,6 +39,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
freezegun
|
||||
pytest-aiohttp
|
||||
pytest-timeout
|
||||
pytestCheckHook
|
||||
@@ -45,13 +47,6 @@ buildPythonPackage rec {
|
||||
asynctest
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# RuntimeError: coroutine 'test_remigrate_forcibly_downgraded_v4' was never awaited
|
||||
#"test_remigrate_forcibly_downgraded_v4"
|
||||
# RuntimeError: Event loop is closed
|
||||
#"test_startup"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"zigpy.application"
|
||||
"zigpy.config"
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dagger";
|
||||
version = "0.2.30";
|
||||
version = "0.2.31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dagger";
|
||||
repo = "dagger";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-D/BamTjhAopoiQoEa9rqk25sGU7ZTTkze/tIKICTx5o=";
|
||||
sha256 = "sha256-G4SittUyh0vqpDWi9vRxTB2Be+gwluYaLCSHDoV8uMg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-IOLZ15Mr+IGWIE4nvMOyjbtYBYOhDMXFYFbOp8beD5w=";
|
||||
vendorSha256 = "sha256-kQ40tydh3CpXupqDE5DRpnj4Xb36jpHAeTRvZf5ZNus=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/dagger"
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "golangci-lint";
|
||||
version = "1.48.0";
|
||||
version = "1.49.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golangci";
|
||||
repo = "golangci-lint";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6nXn1+LsjiXjCeHhvVjyU1F6IJ8YP1Oj+5tDRhiMuUc=";
|
||||
sha256 = "sha256-L2PtDiMtT+vcMU4uW3GYZexLtDqnHRuUts7bIh/g0YA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-4ZqO4NEZfIhl/hWcB0HeRbp2jQ/WhMBpTLmP2W7X7xM=";
|
||||
vendorSha256 = "sha256-VPkOFUwp0Bm/YyBCbfQTa+R1bjau7Ai+p/TbgNxeejc=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2022.8.6";
|
||||
version = "2022.8.7";
|
||||
components = {
|
||||
"abode" = ps: with ps; [
|
||||
abodepy
|
||||
|
||||
@@ -195,13 +195,6 @@ let
|
||||
|
||||
(self: super: {
|
||||
pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "102";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kane610";
|
||||
repo = "deconz";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Dbhp/+xyyWhFcYp2VRnivn5d1JMR5hBctdArIzLKIjM=";
|
||||
};
|
||||
doCheck = false; # requires pytest-aiohttp>=1.0.0
|
||||
});
|
||||
})
|
||||
@@ -307,7 +300,7 @@ let
|
||||
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2022.8.6";
|
||||
hassVersion = "2022.8.7";
|
||||
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@@ -325,7 +318,7 @@ in python.pkgs.buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = version;
|
||||
hash = "sha256-SRvdBHVGFlbRWiaZJ1gN0C4uOdHmWaAmwGAgihpkUL0=";
|
||||
hash = "sha256-FkI0EHO+M3dpt5xt73QkneQlCqgYUGKuO9MT3bRK2jI=";
|
||||
};
|
||||
|
||||
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "monetdb";
|
||||
version = "11.43.9";
|
||||
version = "11.43.21";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2";
|
||||
sha256 = "sha256-DTpuL5caf4fmJMGq+1L3iyiSkLZYIUnejgJ/4LOk6kQ=";
|
||||
sha256 = "sha256-1JfwRMpsEbK+HELwp5BFDkJoJ2yIgHwWvwhGfeaBGsA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,30 +1,30 @@
|
||||
{ lib, stdenv, fetchurl, autoPatchelfHook, installShellFiles }:
|
||||
|
||||
let
|
||||
version = "6.11";
|
||||
version = "6.12";
|
||||
downloadVersion = lib.replaceStrings [ "." ] [ "" ] version;
|
||||
srcUrl = {
|
||||
i686-linux = {
|
||||
url = "https://www.rarlab.com/rar/rarlinux-x32-${downloadVersion}.tar.gz";
|
||||
sha256 = "sha256-7mpKkOEspGskt9yfSDrdK7CieJ0AectJKTi8TxLnbtk=";
|
||||
hash = "sha256-Vh8Hyd3Y2tDapXY+xZ+6W+X7SQGDsy1x61L28sieYKw=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
url = "https://www.rarlab.com/rar/rarlinux-x64-${downloadVersion}.tar.gz";
|
||||
sha256 = "sha256-pb3QdLqdxIf3ybLfPao3MdilTHYjCB1BujYsTQuEMtE=";
|
||||
hash = "sha256-ZaGn5OzqVzDojJn8bTrbRh1wvYXM7SK91jl96mbNAeA=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://www.rarlab.com/rar/rarmacos-arm-${downloadVersion}.tar.gz";
|
||||
sha256 = "sha256-q2fC4w2/tJ+GaD3ETPP+V3SAApdlLDgr3eE2YcERQXA=";
|
||||
hash = "sha256-SR80VxKgLrJqO0JGWMMGUuIuIgGgxcVH+5fCWnVqJks=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://www.rarlab.com/rar/rarmacos-x64-${downloadVersion}.tar.gz";
|
||||
sha256 = "sha256-yHWxAscqnLKrG9Clsaiy6wSbyVz4gpvN6AjyirCmIKQ=";
|
||||
hash = "sha256-9gfKEr3DE4hMWm9QT79mKgURvzn+BKmyppTJhs00u2c=";
|
||||
};
|
||||
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
|
||||
manSrc = fetchurl {
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/rar.1?h=rar&id=8e39a12e88d8a3b168c496c44c18d443c876dd10";
|
||||
name = "rar.1";
|
||||
sha256 = "sha256-93cSr9oAsi+xHUtMsUvICyHJe66vAImS2tLie7nt8Uw=";
|
||||
hash = "sha256-93cSr9oAsi+xHUtMsUvICyHJe66vAImS2tLie7nt8Uw=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@@ -3,13 +3,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "restic";
|
||||
version = "0.13.1";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "restic";
|
||||
repo = "restic";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jQgUPZumcIDkZ4s7R8o5F/p/b4ilPJGMPFKvUU30WaY=";
|
||||
hash = "sha256-DwXAifXXQNnbzj2XngCyqPABzB9PS/T9U2/T4/z7wm0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -17,7 +17,7 @@ buildGoModule rec {
|
||||
./0001-Skip-testing-restore-with-permission-failure.patch
|
||||
];
|
||||
|
||||
vendorSha256 = "sha256-DWfCjGXjZnZa2mXPmXQmvGDtXb0H1wJqCgVsDjdVy9U=";
|
||||
vendorSha256 = "sha256-FakmnQ8RkBYjmj3piA1lDV61FdYIyBmFLY2XXN3AyIQ=";
|
||||
|
||||
subPackages = [ "cmd/restic" ];
|
||||
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "packwiz";
|
||||
version = "unstable-2022-06-08";
|
||||
version = "unstable-2022-08-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "packwiz";
|
||||
repo = "packwiz";
|
||||
rev = "d051932bbbeb7b16cd21a1897019428e71f63bfd";
|
||||
sha256 = "sha256-H1v5pY9hJYGP0ZiE/GrsATf1ljw69085t6PQhPOfYCs=";
|
||||
rev = "11671421acff9794b9ca5c7e083a514f8a3f55a4";
|
||||
sha256 = "sha256-A+DVRi0YByF4WP/okqhWrKRmci2ybAvbXYmODScIrYg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-M9u7N4IrL0B4pPRQwQG5TlMaGT++w3ZKHZ0RdxEHPKk=";
|
||||
vendorSha256 = "sha256-09S8RFdCvtE50EICLIKCTnTjG/0XsGf+yq9SNObKmRA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -9146,7 +9146,7 @@ with pkgs;
|
||||
# Upstream partially documents used Go versions here
|
||||
# https://github.com/hashicorp/nomad/blob/master/contributing/golang.md
|
||||
nomad_1_2 = callPackage ../applications/networking/cluster/nomad/1.2.nix {
|
||||
buildGoModule = buildGo117Module;
|
||||
buildGoModule = buildGo119Module;
|
||||
};
|
||||
nomad_1_3 = callPackage ../applications/networking/cluster/nomad/1.3.nix {
|
||||
buildGoModule = buildGo119Module;
|
||||
|
||||
Reference in New Issue
Block a user