github-actions[bot]
2 years ago
committed by
GitHub
commit
4490401513
@ -0,0 +1,57 @@ |
||||
diff --git a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
|
||||
index 7641579aa..3c195e397 100644
|
||||
--- a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
|
||||
+++ b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
|
||||
@@ -9,10 +9,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||
|
||||
#include "base/platform/base_platform_info.h"
|
||||
|
||||
-#include <connection_thread.h>
|
||||
-#include <registry.h>
|
||||
-#include <surface.h>
|
||||
-#include <plasmashell.h>
|
||||
+#include <KWayland/Client/connection_thread.h>
|
||||
+#include <KWayland/Client/registry.h>
|
||||
+#include <KWayland/Client/surface.h>
|
||||
+#include <KWayland/Client/plasmashell.h>
|
||||
|
||||
using namespace KWayland::Client;
|
||||
|
||||
Submodule Telegram/lib_base contains modified content
|
||||
diff --git a/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp b/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp
|
||||
index 32f0de6..30a087f 100644
|
||||
--- a/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp
|
||||
+++ b/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp
|
||||
@@ -13,11 +13,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||
#include <QtCore/QPointer>
|
||||
#include <QtGui/QWindow>
|
||||
|
||||
-#include <connection_thread.h>
|
||||
-#include <registry.h>
|
||||
-#include <surface.h>
|
||||
-#include <xdgforeign.h>
|
||||
-#include <idleinhibit.h>
|
||||
+#include <KWayland/Client/connection_thread.h>
|
||||
+#include <KWayland/Client/registry.h>
|
||||
+#include <KWayland/Client/surface.h>
|
||||
+#include <KWayland/Client/xdgforeign.h>
|
||||
+#include <KWayland/Client/idleinhibit.h>
|
||||
|
||||
using namespace KWayland::Client;
|
||||
|
||||
Submodule Telegram/lib_ui contains modified content
|
||||
diff --git a/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp b/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp
|
||||
index 01f1e80..163cb6a 100644
|
||||
--- a/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp
|
||||
+++ b/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp
|
||||
@@ -24,8 +24,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||
#include <private/qwaylandwindow_p.h>
|
||||
#include <private/qwaylandshellsurface_p.h>
|
||||
|
||||
-#include <connection_thread.h>
|
||||
-#include <registry.h>
|
||||
+#include <KWayland/Client/connection_thread.h>
|
||||
+#include <KWayland/Client/registry.h>
|
||||
|
||||
Q_DECLARE_METATYPE(QMargins);
|
||||
|
||||
@ -1,46 +0,0 @@ |
||||
{ lib, stdenv, fetchurl, unzip, pkg-config, libixp_hg, txt2tags, dash, python2, which |
||||
, libX11 , libXrender, libXext, libXinerama, libXrandr, libXft }: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
rev = "2823"; |
||||
version = "hg-2012-12-09"; |
||||
pname = "wmii"; |
||||
|
||||
src = fetchurl { |
||||
url = "https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/wmii/source-archive.zip"; |
||||
sha256 = "1wmkq14zvmfrmydl8752xz852cy7agrx3qp4fy2cc5asb2r9abaz"; |
||||
}; |
||||
|
||||
# for dlopen-ing |
||||
patchPhase = '' |
||||
substituteInPlace lib/libstuff/x11/xft.c --replace "libXft.so" "$(pkg-config --variable=libdir xft)/libXft.so.2" |
||||
substituteInPlace cmd/wmii.sh.sh --replace "\$(which which)" "${which}/bin/which" |
||||
''; |
||||
|
||||
configurePhase = '' |
||||
for file in $(grep -lr '#!.*sh'); do |
||||
sed -i 's|#!.*sh|#!${dash}/bin/dash|' $file |
||||
done |
||||
|
||||
cat <<EOF >> config.mk |
||||
PREFIX = $out |
||||
LIBIXP = ${libixp_hg}/lib/libixp.a |
||||
BINSH = ${dash}/bin/dash |
||||
EOF |
||||
''; |
||||
|
||||
nativeBuildInputs = [ pkg-config unzip ]; |
||||
buildInputs = [ libixp_hg txt2tags dash python2 which |
||||
libX11 libXrender libXext libXinerama libXrandr libXft ]; |
||||
|
||||
# For some reason including mercurial in buildInputs did not help |
||||
makeFlags = [ "WMII_HGVERSION=hg${rev}" ]; |
||||
|
||||
meta = { |
||||
homepage = "https://suckless.org/"; # https://wmii.suckless.org/ does not exist anymore |
||||
description = "A small window manager controlled by a 9P filesystem"; |
||||
maintainers = with lib.maintainers; [ kovirobi ]; |
||||
license = lib.licenses.mit; |
||||
platforms = with lib.platforms; linux; |
||||
}; |
||||
} |
||||
@ -0,0 +1,72 @@ |
||||
{ lib, stdenv |
||||
, fetchFromGitHub |
||||
, dash |
||||
, libX11 |
||||
, libXext |
||||
, libXft |
||||
, libXinerama |
||||
, libXrandr |
||||
, libXrender |
||||
, libixp |
||||
, pkg-config |
||||
, txt2tags |
||||
, unzip |
||||
, which |
||||
}: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
pname = "wmii"; |
||||
version = "unstable-2022-04-04"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "0intro"; |
||||
repo = "wmii"; |
||||
rev = "ff120c7fee6e1b3a30a4a800074394327fb1da9d"; |
||||
hash = "sha256-KEmWnobpT/5TdgT2HGPCpG1duz9Q6Z6PFSEBs2Ce+7g="; |
||||
}; |
||||
|
||||
# for dlopen-ing |
||||
postPatch = '' |
||||
substituteInPlace lib/libstuff/x11/xft.c --replace "libXft.so" "$(pkg-config --variable=libdir xft)/libXft.so.2" |
||||
substituteInPlace cmd/wmii.sh.sh --replace "\$(which which)" "${which}/bin/which" |
||||
''; |
||||
|
||||
postConfigure = '' |
||||
for file in $(grep -lr '#!.*sh'); do |
||||
sed -i 's|#!.*sh|#!${dash}/bin/dash|' $file |
||||
done |
||||
|
||||
cat <<EOF >> config.mk |
||||
PREFIX = $out |
||||
LIBIXP = ${libixp}/lib/libixp.a |
||||
BINSH = ${dash}/bin/dash |
||||
EOF |
||||
''; |
||||
|
||||
# Remove optional python2 functionality |
||||
postInstall = '' |
||||
rm -rf $out/lib/python* $out/etc/wmii-hg/python |
||||
''; |
||||
|
||||
nativeBuildInputs = [ pkg-config unzip ]; |
||||
buildInputs = [ |
||||
dash |
||||
libX11 |
||||
libXext |
||||
libXft |
||||
libXinerama |
||||
libXrandr |
||||
libXrender |
||||
libixp |
||||
txt2tags |
||||
which |
||||
]; |
||||
|
||||
meta = { |
||||
homepage = "https://github.com/0intro/wmii"; |
||||
description = "A small, scriptable window manager, with a 9P filesystem interface and an acme-like layout"; |
||||
maintainers = with lib.maintainers; [ kovirobi ]; |
||||
license = lib.licenses.mit; |
||||
platforms = with lib.platforms; linux; |
||||
}; |
||||
} |
||||
@ -0,0 +1,22 @@ |
||||
{ fetchzip, lib }: |
||||
|
||||
let |
||||
version = "2.01"; |
||||
in |
||||
fetchzip { |
||||
name = "kacst-${version}"; |
||||
url = "mirror://debian/pool/main/f/fonts-kacst/fonts-kacst_${version}+mry.orig.tar.bz2"; |
||||
sha256 = "sha256-pIO58CXfmKYRKYJ1oI+tjTwlKBRnkZ/CpIM2Xa0CDA4="; |
||||
|
||||
postFetch = '' |
||||
mkdir -p $out/share/fonts |
||||
tar xjf $downloadedFile --strip-components=1 -C $out/share/fonts |
||||
''; |
||||
|
||||
meta = with lib; { |
||||
description = "KACST Latin-Arabic TrueType fonts"; |
||||
license = licenses.gpl2Only; |
||||
maintainers = with lib.maintainers; [ serge ]; |
||||
platforms = platforms.all; |
||||
}; |
||||
} |
||||
@ -1,27 +0,0 @@ |
||||
{ lib, stdenv, fetchurl, unzip, txt2tags }: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
rev = "148"; |
||||
version = "hg-2012-12-02"; |
||||
pname = "libixp"; |
||||
|
||||
src = fetchurl { |
||||
url = "https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/libixp/source-archive.zip"; |
||||
sha256 = "0kcdvdcrkw6q39v563ncis6d7ini64xbgn5fd3b4aa95fp9sj3is"; |
||||
}; |
||||
|
||||
configurePhase = '' |
||||
sed -i -e "s|^PREFIX.*=.*$|PREFIX = $out|" config.mk |
||||
''; |
||||
|
||||
nativeBuildInputs = [ unzip ]; |
||||
buildInputs = [ txt2tags ]; |
||||
|
||||
meta = { |
||||
homepage = "http://repo.cat-v.org/libixp/"; # see also https://libs.suckless.org/deprecated/libixp |
||||
description = "Portable, simple C-language 9P client and server libary"; |
||||
maintainers = with lib.maintainers; [ kovirobi ]; |
||||
license = lib.licenses.mit; |
||||
platforms = with lib.platforms; unix; |
||||
}; |
||||
} |
||||
@ -0,0 +1,28 @@ |
||||
{ lib, stdenv, fetchFromGitHub, unzip, txt2tags }: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
pname = "libixp"; |
||||
version = "unstable-2022-04-04"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "0intro"; |
||||
repo = "libixp"; |
||||
rev = "ca2acb2988e4f040022f0e2094c69ab65fa6ec53"; |
||||
hash = "sha256-S25DmXJ7fN0gXLV0IzUdz8hXPTYEHmaSG7Mnli6GQVc="; |
||||
}; |
||||
|
||||
postConfigure = '' |
||||
sed -i -e "s|^PREFIX.*=.*$|PREFIX = $out|" config.mk |
||||
''; |
||||
|
||||
nativeBuildInputs = [ unzip ]; |
||||
buildInputs = [ txt2tags ]; |
||||
|
||||
meta = { |
||||
homepage = "https://github.com/0intro/libixp"; |
||||
description = "Portable, simple C-language 9P client and server libary"; |
||||
maintainers = with lib.maintainers; [ kovirobi ]; |
||||
license = lib.licenses.mit; |
||||
platforms = with lib.platforms; unix; |
||||
}; |
||||
} |
||||
@ -1,88 +0,0 @@ |
||||
{ lib |
||||
, callPackage |
||||
, buildPythonPackage |
||||
, fetchPypi |
||||
, installShellFiles |
||||
, cryptography |
||||
, jinja2 |
||||
, junit-xml |
||||
, lxml |
||||
, ncclient |
||||
, packaging |
||||
, paramiko |
||||
, pexpect |
||||
, psutil |
||||
, pycrypto |
||||
, pyyaml |
||||
, requests |
||||
, scp |
||||
, windowsSupport ? false, pywinrm |
||||
, xmltodict |
||||
}: |
||||
|
||||
let |
||||
ansible-collections = callPackage ./collections.nix { |
||||
version = "3.4.0"; # must be < 4.0 |
||||
sha256 = "096rbgz730njk0pg8qnc27mmz110wqrw354ca9gasb7rqg0f4d6a"; |
||||
}; |
||||
in |
||||
buildPythonPackage rec { |
||||
pname = "ansible-base"; |
||||
version = "2.10.17"; |
||||
|
||||
src = fetchPypi { |
||||
inherit pname version; |
||||
sha256 = "sha256-75JYgsqNTDwszQkc3hmeDIaQJMytDQejN9zyB7/zLzQ="; |
||||
}; |
||||
|
||||
# ansible_connection is already wrapped, so don't pass it through |
||||
# the python interpreter again, as it would break execution of |
||||
# connection plugins. |
||||
postPatch = '' |
||||
substituteInPlace lib/ansible/executor/task_executor.py \ |
||||
--replace "[python," "[" |
||||
''; |
||||
|
||||
nativeBuildInputs = [ |
||||
installShellFiles |
||||
]; |
||||
|
||||
propagatedBuildInputs = [ |
||||
# depend on ansible-collections instead of the other way around |
||||
ansible-collections |
||||
# from requirements.txt |
||||
cryptography |
||||
jinja2 |
||||
packaging |
||||
pyyaml |
||||
# optional dependencies |
||||
junit-xml |
||||
lxml |
||||
ncclient |
||||
paramiko |
||||
pexpect |
||||
psutil |
||||
pycrypto |
||||
requests |
||||
scp |
||||
xmltodict |
||||
] ++ lib.optional windowsSupport pywinrm; |
||||
|
||||
postInstall = '' |
||||
installManPage docs/man/man1/*.1 |
||||
''; |
||||
|
||||
# internal import errors, missing dependencies |
||||
doCheck = false; |
||||
|
||||
passthru = { |
||||
collections = ansible-collections; |
||||
}; |
||||
|
||||
meta = with lib; { |
||||
description = "Radically simple IT automation"; |
||||
homepage = "https://www.ansible.com"; |
||||
license = licenses.gpl3Plus; |
||||
maintainers = with maintainers; [ hexa ]; |
||||
}; |
||||
} |
||||
@ -1,55 +0,0 @@ |
||||
{ lib |
||||
, fetchPypi |
||||
, buildPythonPackage |
||||
, pycrypto |
||||
, paramiko |
||||
, jinja2 |
||||
, pyyaml |
||||
, httplib2 |
||||
, six |
||||
, netaddr |
||||
, dnspython |
||||
, jmespath |
||||
, dopy |
||||
, ncclient |
||||
, windowsSupport ? false |
||||
, pywinrm |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "ansible"; |
||||
version = "2.9.27"; |
||||
|
||||
src = fetchPypi { |
||||
inherit pname version; |
||||
sha256 = "sha256-R5FZ5Qs72Qkg0GvFlBDDpR0/m+m04QKeEdHkotBwVzY="; |
||||
}; |
||||
|
||||
prePatch = '' |
||||
# ansible-connection is wrapped, so make sure it's not passed |
||||
# through the python interpreter. |
||||
sed -i "s/\[python, /[/" lib/ansible/executor/task_executor.py |
||||
''; |
||||
|
||||
postInstall = '' |
||||
for m in docs/man/man1/*; do |
||||
install -vD $m -t $out/share/man/man1 |
||||
done |
||||
''; |
||||
|
||||
propagatedBuildInputs = [ |
||||
pycrypto paramiko jinja2 pyyaml httplib2 |
||||
six netaddr dnspython jmespath dopy ncclient |
||||
] ++ lib.optional windowsSupport pywinrm; |
||||
|
||||
# dificult to test |
||||
doCheck = false; |
||||
|
||||
meta = with lib; { |
||||
homepage = "https://www.ansible.com"; |
||||
description = "Radically simple IT automation"; |
||||
license = [ licenses.gpl3 ] ; |
||||
maintainers = with maintainers; [ joamaki costrouc hexa ]; |
||||
platforms = platforms.linux ++ platforms.darwin; |
||||
}; |
||||
} |
||||
@ -0,0 +1,30 @@ |
||||
{ lib, buildGoModule, fetchFromGitLab, nix, subversion }: |
||||
|
||||
buildGoModule rec { |
||||
pname = "wp4nix"; |
||||
version = "1.0.0"; |
||||
|
||||
src = fetchFromGitLab { |
||||
domain = "git.helsinki.tools"; |
||||
owner = "helsinki-systems"; |
||||
repo = "wp4nix"; |
||||
rev = "v${version}"; |
||||
sha256 = "sha256-WJteeFUMr684yZEtUP13MqRjJ1UAeo48AzOPdLEE65w="; |
||||
}; |
||||
|
||||
vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; |
||||
|
||||
postPatch = '' |
||||
substituteInPlace main.go --replace nix-hash ${nix}/bin/nix-hash |
||||
substituteInPlace svn.go --replace '"svn"' '"${subversion}/bin/svn"' |
||||
''; |
||||
|
||||
meta = with lib; { |
||||
description = "Packaging helper for Wordpress themes and plugins"; |
||||
homepage = "https://git.helsinki.tools/helsinki-systems/wp4nix"; |
||||
license = licenses.mit; |
||||
maintainers = with maintainers; [ onny ]; |
||||
platforms = platforms.linux; |
||||
}; |
||||
} |
||||
|
||||
@ -0,0 +1,13 @@ |
||||
diff --git a/configure.ac b/configure.ac
|
||||
index c215f3bf..f5aa25d8 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -67,7 +67,7 @@ AC_C_BIGENDIAN
|
||||
AC_PROG_CPP
|
||||
AC_PROG_INSTALL
|
||||
AC_PROG_LIBTOOL
|
||||
-AC_PATH_PROG([AR], [ar])
|
||||
+AC_PATH_TOOL([AR], [ar])
|
||||
AC_PATH_PROG([CAT], [cat])
|
||||
AC_PATH_PROG([CHMOD], [chmod])
|
||||
AC_PATH_PROG([CHOWN], [chown])
|
||||
@ -1,24 +0,0 @@ |
||||
{ python3Packages, fetchFromGitHub }: |
||||
|
||||
rec { |
||||
ansible = ansible_2_12; |
||||
|
||||
ansible_2_12 = python3Packages.toPythonApplication python3Packages.ansible-core; |
||||
|
||||
ansible_2_11 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (old: rec { |
||||
pname = "ansible-core"; |
||||
version = "2.11.6"; |
||||
|
||||
src = python3Packages.fetchPypi { |
||||
inherit pname version; |
||||
sha256 = "sha256-k9UCg8fFtHbev4PcCJs/Z5uTmouae11ijSjar7s9MDo="; |
||||
}; |
||||
})); |
||||
|
||||
ansible_2_10 = python3Packages.toPythonApplication python3Packages.ansible-base; |
||||
|
||||
# End of support 2021/10/02, End of life 2021/12/31 |
||||
ansible_2_9 = python3Packages.toPythonApplication python3Packages.ansible; |
||||
|
||||
ansible_2_8 = throw "Ansible 2.8 went end of life on 2021/01/03 and has subsequently been dropped"; |
||||
} |
||||
Loading…
Reference in new issue