Update gajim
This commit is contained in:
parent
30bb872ed9
commit
c252c831b5
80
flake.lock
80
flake.lock
@ -24,11 +24,11 @@
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1680944922,
|
||||
"narHash": "sha256-Lkt2uvLOzPzz65uKf0ljpU95mRIgCeONqjjpelIVGCw=",
|
||||
"lastModified": 1681550392,
|
||||
"narHash": "sha256-2ZC8ZDGZ4SCgN0jXStY6ScwcgR9KjN3DFJImVdTLhI8=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "1195f952f1d610244a4b1b8b0b9dbd13ef6d553c",
|
||||
"rev": "0dfa16169942b7e524a353b07f8643d57524a6e6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -74,12 +74,15 @@
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"inputs": {
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1680946745,
|
||||
"narHash": "sha256-KqGlwg9UTDsFBZZB8wzXgMnc8XQm95LtSbFvBsnqkPI=",
|
||||
"lastModified": 1681202837,
|
||||
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "946da791763db1c306b86a8bd3828bf5814a1247",
|
||||
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -165,15 +168,14 @@
|
||||
},
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"utils": "utils"
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1680667162,
|
||||
"narHash": "sha256-2vgxK4j42y73S3XB2cThz1dSEyK9J9tfu4mhuEfAw68=",
|
||||
"lastModified": 1681468923,
|
||||
"narHash": "sha256-+X2oO4juRVhQRs002mn8km6PODccIRiz09c2K1xtSpY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "440faf5ae472657ef2d8cc7756d77b6ab0ace68d",
|
||||
"rev": "17198cf5ae27af5b647c7dac58d935a7d0dbd189",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -211,7 +213,7 @@
|
||||
"ostylk-home",
|
||||
"pkg-stable"
|
||||
],
|
||||
"utils": "utils_3"
|
||||
"utils": "utils_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1679067101,
|
||||
@ -234,7 +236,7 @@
|
||||
"ostylk-home",
|
||||
"pkg-unstable"
|
||||
],
|
||||
"utils": "utils_4"
|
||||
"utils": "utils_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1680597706,
|
||||
@ -461,11 +463,11 @@
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1680758185,
|
||||
"narHash": "sha256-sCVWwfnk7zEX8Z+OItiH+pcSklrlsLZ4TJTtnxAYREw=",
|
||||
"lastModified": 1681465517,
|
||||
"narHash": "sha256-EasJh15/jcJNAHtq2SGbiADRXteURAnQbj1NqBoKkzU=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0e19daa510e47a40e06257e205965f3b96ce0ac9",
|
||||
"rev": "abe7316dd51a313ce528972b104f4f04f56eefc4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -567,11 +569,11 @@
|
||||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1680932643,
|
||||
"narHash": "sha256-vHkZJnPfA788UQ0zsfj4P09pVqBsn4niMp5qhN3ue28=",
|
||||
"lastModified": 1681541221,
|
||||
"narHash": "sha256-lt+iea1TlHzWGfbShveXj6FOE8FXC5nHnBOjz8ftfHM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nur",
|
||||
"rev": "c468956d1604fb0182d24448a1cb45ab948bf4ca",
|
||||
"rev": "425b65fc5dca82de0d628b43638ee93599660f57",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -690,7 +692,7 @@
|
||||
"ostylk",
|
||||
"nixpkgs"
|
||||
],
|
||||
"utils": "utils_2"
|
||||
"utils": "utils"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1640347520,
|
||||
@ -711,7 +713,7 @@
|
||||
"inputs": {
|
||||
"naersk": "naersk_2",
|
||||
"nixpkgs": "nixpkgs_8",
|
||||
"utils": "utils_5"
|
||||
"utils": "utils_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1669555118,
|
||||
@ -758,6 +760,21 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"tablet-mode": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_4",
|
||||
@ -797,21 +814,6 @@
|
||||
}
|
||||
},
|
||||
"utils": {
|
||||
"locked": {
|
||||
"lastModified": 1678901627,
|
||||
"narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"utils_2": {
|
||||
"locked": {
|
||||
"lastModified": 1629481132,
|
||||
"narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
|
||||
@ -826,7 +828,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"utils_3": {
|
||||
"utils_2": {
|
||||
"locked": {
|
||||
"lastModified": 1667395993,
|
||||
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
||||
@ -841,7 +843,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"utils_4": {
|
||||
"utils_3": {
|
||||
"locked": {
|
||||
"lastModified": 1678901627,
|
||||
"narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
|
||||
@ -856,7 +858,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"utils_5": {
|
||||
"utils_4": {
|
||||
"locked": {
|
||||
"lastModified": 1656928814,
|
||||
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
|
||||
|
||||
@ -200,6 +200,12 @@
|
||||
};
|
||||
};
|
||||
};
|
||||
programs = {
|
||||
cdemu = {
|
||||
enable = true;
|
||||
gui = true;
|
||||
};
|
||||
};
|
||||
|
||||
hardware = {
|
||||
opentabletdriver.enable = true;
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
config = lib.mkIf (config.ptw.system.singleUser == "alexander") {
|
||||
users.users.alexander = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" "audio" "video" "kvm" "input" "libvirtd" "scanner" "lp" "alexander" ];
|
||||
extraGroups = [ "wheel" "audio" "video" "kvm" "input" "libvirtd" "scanner" "lp" "alexander" "cdrom" ];
|
||||
hashedPassword = "$y$j9T$xhnK648hF0yzDnRy0rTT/.$HbDKvNetiGeY3Xjt6/YPIzoxSmdQ0SzhXengOT1Ga01";
|
||||
shell = pkgs.zsh;
|
||||
useDefaultShell = false;
|
||||
|
||||
@ -1,18 +1,4 @@
|
||||
final: prev: {
|
||||
gajim = prev.gajim.overrideAttrs (old: {
|
||||
# version = "1.7";
|
||||
|
||||
# format = "pyproject";
|
||||
|
||||
# src = builtins.fetchurl {
|
||||
# url = "https://gajim.org/downloads/1.7/gajim-1.7.1.tar.gz";
|
||||
# sha256 = "sha256:1ij3fnfpyjnb84haqwjy23bjpi6bk37k1h8bbvk9y6296lsnm8mr";
|
||||
# };
|
||||
|
||||
# Enable notification sounds
|
||||
propagatedBuildInputs = old.propagatedBuildInputs ++ [ prev.gsound ];
|
||||
});
|
||||
|
||||
animedl = prev.animedl.overrideAttrs (old: {
|
||||
extraPkgs = pkgs: with final; [ mpv ];
|
||||
});
|
||||
|
||||
@ -0,0 +1,68 @@
|
||||
{ lib
|
||||
, python3, nbxmpp
|
||||
, gettext
|
||||
, fetchgit
|
||||
, wrapGAppsHook
|
||||
, gobject-introspection
|
||||
, libsoup_3
|
||||
, gtksourceview4
|
||||
, libappindicator-gtk3
|
||||
, farstream
|
||||
, gst_all_1
|
||||
, gsound
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "gajim";
|
||||
version = "1.7.3";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://dev.gajim.org/gajim/gajim";
|
||||
rev = version;
|
||||
hash = "sha256-47CzJwmPRl+DggxwI63sp/JJAnEvnNUS1MxFrRIBAw8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3.pkgs.setuptools
|
||||
gettext
|
||||
wrapGAppsHook
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
setuptools
|
||||
pygobject3
|
||||
cryptography
|
||||
css-parser
|
||||
keyring
|
||||
nbxmpp
|
||||
packaging
|
||||
pillow
|
||||
precis-i18n
|
||||
pycairo
|
||||
gobject-introspection
|
||||
|
||||
# Omemo
|
||||
python-axolotl
|
||||
qrcode
|
||||
|
||||
# Additional features
|
||||
gsound
|
||||
libappindicator-gtk3
|
||||
farstream gst_all_1.gstreamer gst_all_1.gst-libav gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
|
||||
|
||||
# Gtk dependencies
|
||||
libsoup_3
|
||||
gtksourceview4
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "gajim" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "";
|
||||
homepage = "https://dev.gajim.org/gajim/gajim";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,52 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchgit
|
||||
, setuptools
|
||||
, pygobject3
|
||||
, idna
|
||||
, packaging
|
||||
, precis-i18n
|
||||
, gssapi
|
||||
, pyopenssl
|
||||
, libsoup_3
|
||||
, gobject-introspection
|
||||
, glib
|
||||
, glib-networking
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-nbxmpp";
|
||||
version = "4.2.2";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://dev.gajim.org/gajim/python-nbxmpp";
|
||||
rev = version;
|
||||
hash = "sha256-ZTX8plcsO4zE7ruLtWIvsagQUvwPHuKdPKRwCrFwvgc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pygobject3
|
||||
idna
|
||||
packaging
|
||||
precis-i18n
|
||||
libsoup_3
|
||||
glib glib-networking
|
||||
pyopenssl
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "nbxmpp" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "";
|
||||
homepage = "https://dev.gajim.org/gajim/python-nbxmpp";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
@ -119,4 +119,8 @@ in {
|
||||
|
||||
#obs-websocket = prev.libsForQt5.callPackage obs/obs-websocket {};
|
||||
obs-cli = prev.callPackage obs/obs-cli {};
|
||||
|
||||
gajim = prev.callPackage ./applications/networking/instant-messengers/gajim/default.nix {
|
||||
nbxmpp = prev.python3.pkgs.callPackage ./applications/networking/instant-messengers/gajim/nbxmpp.nix {};
|
||||
};
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user