Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
9908dfacfa
@ -11807,6 +11807,12 @@
|
||||
githubId = 11016164;
|
||||
name = "Fedor Pakhomov";
|
||||
};
|
||||
pallix = {
|
||||
email = "pierre.allix.work@gmail.com";
|
||||
github = "pallix";
|
||||
githubId = 676838;
|
||||
name = "Pierre Allix";
|
||||
};
|
||||
paluh = {
|
||||
email = "paluho@gmail.com";
|
||||
github = "paluh";
|
||||
|
||||
@ -70,7 +70,12 @@ in
|
||||
};
|
||||
passwordFile = mkOption {
|
||||
type = types.str;
|
||||
description = lib.mdDoc "Password file for the postgresql connection. Must be readable by user `nginx`. Ignored if `database.host` is set to `localhost`, as peer authentication will be used.";
|
||||
description = lib.mdDoc ''
|
||||
Password file for the postgresql connection.
|
||||
Must be formated according to PostgreSQL .pgpass standard (see https://www.postgresql.org/docs/current/libpq-pgpass.html)
|
||||
but only one line, no comments and readable by user `nginx`.
|
||||
Ignored if `database.host` is set to `localhost`, as peer authentication will be used.
|
||||
'';
|
||||
};
|
||||
dbname = mkOption {
|
||||
type = types.str;
|
||||
@ -123,7 +128,13 @@ in
|
||||
environment.etc."roundcube/config.inc.php".text = ''
|
||||
<?php
|
||||
|
||||
${lib.optionalString (!localDB) "$password = file_get_contents('${cfg.database.passwordFile}');"}
|
||||
${lib.optionalString (!localDB) ''
|
||||
$password = file('${cfg.database.passwordFile}')[0];
|
||||
$password = preg_split('~\\\\.(*SKIP)(*FAIL)|\:~s', $password);
|
||||
$password = end($password);
|
||||
$password = str_replace("\\:", ":", $password);
|
||||
$password = str_replace("\\\\", "\\", $password);
|
||||
''}
|
||||
|
||||
$config = array();
|
||||
$config['db_dsnw'] = 'pgsql://${cfg.database.username}${lib.optionalString (!localDB) ":' . $password . '"}@${if localDB then "unix(/run/postgresql)" else cfg.database.host}/${cfg.database.dbname}';
|
||||
@ -223,6 +234,7 @@ in
|
||||
path = [ config.services.postgresql.package ];
|
||||
})
|
||||
{
|
||||
after = [ "network-online.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
script = let
|
||||
psql = "${lib.optionalString (!localDB) "PGPASSFILE=${cfg.database.passwordFile}"} ${pkgs.postgresql}/bin/psql ${lib.optionalString (!localDB) "-h ${cfg.database.host} -U ${cfg.database.username} "} ${cfg.database.dbname}";
|
||||
|
||||
@ -28,6 +28,7 @@
|
||||
# output plugins
|
||||
, alsaSupport ? true, alsa-lib
|
||||
, pulseSupport ? config.pulseaudio or true, libpulseaudio
|
||||
, pipewireSupport ? true, pipewire
|
||||
# effect plugins
|
||||
, resamplerSupport ? true, libsamplerate
|
||||
, overloadSupport ? true, zlib
|
||||
@ -40,7 +41,7 @@ assert gtk2Support || gtk3Support;
|
||||
let
|
||||
inherit (lib) optionals;
|
||||
|
||||
version = "1.9.4";
|
||||
version = "1.9.5";
|
||||
in clangStdenv.mkDerivation {
|
||||
pname = "deadbeef";
|
||||
inherit version;
|
||||
@ -50,7 +51,7 @@ in clangStdenv.mkDerivation {
|
||||
repo = "deadbeef";
|
||||
fetchSubmodules = true;
|
||||
rev = version;
|
||||
sha256 = "sha256-ow+Aw/lp+oe9GhbOWM7XcX/tJjfAAu7KOUY1us7+f84=";
|
||||
hash = "sha256-dSSIaJxHYUVOmuJN2t5UZSC3ZP5732/qVXSZAuWYr0Q=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@ -92,6 +93,8 @@ in clangStdenv.mkDerivation {
|
||||
alsa-lib
|
||||
] ++ optionals pulseSupport [
|
||||
libpulseaudio
|
||||
] ++ optionals pipewireSupport [
|
||||
pipewire
|
||||
] ++ optionals resamplerSupport [
|
||||
libsamplerate
|
||||
] ++ optionals overloadSupport [
|
||||
@ -121,6 +124,7 @@ in clangStdenv.mkDerivation {
|
||||
meta = with lib; {
|
||||
description = "Ultimate Music Player for GNU/Linux";
|
||||
homepage = "http://deadbeef.sourceforge.net/";
|
||||
downloadPage = "https://github.com/DeaDBeeF-Player/deadbeef";
|
||||
license = licenses.gpl2;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
maintainers = [ maintainers.abbradar ];
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
let
|
||||
pname = "deadbeef-mpris2-plugin";
|
||||
version = "1.14";
|
||||
version = "1.16";
|
||||
in stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
@ -17,7 +17,7 @@ in stdenv.mkDerivation {
|
||||
owner = "DeaDBeeF-Player";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-w7ccIhcPjbjs18kb3ZdM9JtSail9ik3uyAc40T8lHho=";
|
||||
hash = "sha256-f6iHgwLdzQJJEquyuUQGWFfOfpjH/Hxh9IqQ5HkYrog=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify
|
||||
, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curlWithGnuTls, zlib, gnome
|
||||
, at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon
|
||||
, pname, meta
|
||||
, pname, meta, harfbuzz
|
||||
# High-DPI support: Spotify's --force-device-scale-factor argument
|
||||
# not added if `null`, otherwise, should be a number.
|
||||
, deviceScaleFactor ? null
|
||||
@ -14,14 +14,14 @@ let
|
||||
# If an update breaks things, one of those might have valuable info:
|
||||
# https://aur.archlinux.org/packages/spotify/
|
||||
# https://community.spotify.com/t5/Desktop-Linux
|
||||
version = "1.1.99.878.g1e4ccc6e";
|
||||
version = "1.2.9.743.g85d9593d";
|
||||
# To get the latest stable revision:
|
||||
# curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
|
||||
# To get general information:
|
||||
# curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
|
||||
# More examples of api usage:
|
||||
# https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
|
||||
rev = "62";
|
||||
rev = "64";
|
||||
|
||||
deps = [
|
||||
alsa-lib
|
||||
@ -39,6 +39,7 @@ let
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gtk3
|
||||
harfbuzz
|
||||
libdrm
|
||||
libgcrypt
|
||||
libnotify
|
||||
@ -83,7 +84,7 @@ stdenv.mkDerivation {
|
||||
# https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
|
||||
src = fetchurl {
|
||||
url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
|
||||
sha512 = "339r2q13nnpwi7gjd1axc6z2gycfm9gwz3x9dnqyaqd1g3rw7nk6nfbp6bmpkr68lfq1jfgvqwnimcgs84rsi7nmgsiabv3cz0673wv";
|
||||
sha512 = "5e8f4a1901c26e9bb5986e048226d8a15f5bc4c2acf16b20a404f228ef142e4d21c6a88a4a54c8d9e654ba5b15cb1fea1cdc50c21fbe8e3c374e241a44adf12d";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook makeShellWrapper squashfsTools ];
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "komikku";
|
||||
version = "1.18.0";
|
||||
version = "1.19.0";
|
||||
|
||||
format = "other";
|
||||
|
||||
@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
owner = "valos";
|
||||
repo = "Komikku";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-suqoYV+YsbCB7sUNzds6OoEMH9KO3bt2udok6oXXyls=";
|
||||
hash = "sha256-4XhcmK9Dgk82ExzugY4SGRfWYC+IgCAxWS+cBURgT2o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "4.3.4";
|
||||
version = "4.4.0";
|
||||
|
||||
libsecp256k1_name =
|
||||
if stdenv.isLinux then "libsecp256k1.so.0"
|
||||
@ -28,7 +28,7 @@ let
|
||||
owner = "spesmilo";
|
||||
repo = "electrum";
|
||||
rev = version;
|
||||
sha256 = "sha256-0xYGTCk+Sk7LP+E9r2Y7UJZsfbobLe6Yb+x5ZRCN40Y=";
|
||||
sha256 = "sha256-lXMz0U7zgtCApBCGZcpOHvLcyOeGG0yJE/gr7Gv+yBQ=";
|
||||
|
||||
postFetch = ''
|
||||
mv $out ./all
|
||||
@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
|
||||
sha256 = "sha256-+Z4NZK/unFN6mxCuMleHBxAoD+U1PzVk3/ZnZRmOOxo=";
|
||||
sha256 = "sha256-SHV+fCDhfgIh7s8L7eDbKj8bkHSVm7J2PPQ4CQpp6cI=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
@ -72,6 +72,7 @@ python3.pkgs.buildPythonApplication {
|
||||
tlslite-ng
|
||||
# plugins
|
||||
btchip-python
|
||||
ledger-bitcoin
|
||||
ckcc-protocol
|
||||
keepkey
|
||||
trezor
|
||||
@ -83,7 +84,7 @@ python3.pkgs.buildPythonApplication {
|
||||
postPatch = ''
|
||||
# make compatible with protobuf4 by easing dependencies ...
|
||||
substituteInPlace ./contrib/requirements/requirements.txt \
|
||||
--replace "protobuf>=3.12,<4" "protobuf>=3.12"
|
||||
--replace "protobuf>=3.20,<4" "protobuf>=3.20"
|
||||
# ... and regenerating the paymentrequest_pb2.py file
|
||||
protoc --python_out=. electrum/paymentrequest.proto
|
||||
|
||||
|
||||
@ -6,6 +6,8 @@
|
||||
, ninja
|
||||
, pkg-config
|
||||
, cli11
|
||||
, eigen
|
||||
, fmt
|
||||
, hidrd
|
||||
, inih
|
||||
, microsoft_gsl
|
||||
@ -15,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "iptsd";
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linux-surface";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-IwvoqmqJTM6xtEp7AzLgT4dZgRsmXYmu6Zivx3oSm+Q=";
|
||||
hash = "sha256-8RE93pIg5fVAYOOq8zHlWy0uTxep7hrJlowPu48beTs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -35,6 +37,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
cli11
|
||||
eigen
|
||||
fmt
|
||||
hidrd
|
||||
inih
|
||||
microsoft_gsl
|
||||
@ -47,7 +51,7 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace etc/meson.build \
|
||||
--replace "install_dir: unitdir" "install_dir: '$out/etc/systemd/system'" \
|
||||
--replace "install_dir: rulesdir" "install_dir: '$out/etc/udev/rules.d'"
|
||||
substituteInPlace etc/udev/50-ipts.rules \
|
||||
substituteInPlace etc/udev/50-iptsd.rules.in \
|
||||
--replace "/bin/systemd-escape" "${systemd}/bin/systemd-escape"
|
||||
'';
|
||||
|
||||
|
||||
@ -1,23 +1,31 @@
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, meson, pkg-config, ninja
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
, glib, appstream-glib , desktop-file-utils
|
||||
, gobject-introspection, gtk3
|
||||
, wrapGAppsHook
|
||||
, libhandy, webkitgtk, glib-networking
|
||||
, gnome, dconf
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
, gobject-introspection
|
||||
, wrapGAppsHook4
|
||||
, glib
|
||||
, gtk4
|
||||
, librsvg
|
||||
, libadwaita
|
||||
, glib-networking
|
||||
, webkitgtk_6_0
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "wike";
|
||||
version = "1.7.1";
|
||||
version = "2.0.1";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hugolabe";
|
||||
repo = "Wike";
|
||||
rev = version;
|
||||
sha256 = "sha256-QLhfzGRrc2En0Hu+UdtPM572PdtXqOFL0W3LoAki4jI=";
|
||||
hash = "sha256-R8Zg/2tr9MrmtTdbvqD+Ra8+MEBJdgMqC3ptx1VgkeA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -27,17 +35,16 @@ python3.pkgs.buildPythonApplication rec {
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
gobject-introspection
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
libhandy
|
||||
webkitgtk
|
||||
gtk4
|
||||
librsvg
|
||||
libadwaita
|
||||
glib-networking
|
||||
gnome.adwaita-icon-theme
|
||||
dconf
|
||||
webkitgtk_6_0
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
@ -47,13 +54,21 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs build-aux/meson/postinstall.py
|
||||
substituteInPlace build-aux/meson/postinstall.py \
|
||||
--replace gtk-update-icon-cache gtk4-update-icon-cache
|
||||
'';
|
||||
|
||||
# prevent double wrapping
|
||||
dontWrapGApps = true;
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Wikipedia Reader for the GNOME Desktop";
|
||||
homepage = "https://github.com/hugolabe/Wike";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = webkitgtk.meta.platforms;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ samalws ];
|
||||
};
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -3,10 +3,10 @@
|
||||
rec {
|
||||
firefox = buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "112.0.1";
|
||||
version = "112.0.2";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "23a5cd9c1f165275d8ca7465bebce86018441c72292421f4ed56d7ad8ada9402dc8d22a08467d9d0ef3ef8c62338006dfa3bcbddf12cb8a59eafa0bd7d0cda50";
|
||||
sha512 = "2cd7adeb6c9a39ad4c5366982e0e58382d7f205e6f2cee02b8ec2867034d1c0c884eeeb870a35db35cba60fa9c84aea73f8c77cfd9f36b5146dde06464aaabd1";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
, cargoSetupHook
|
||||
, cargo
|
||||
, cargo-auditable
|
||||
, cargo-auditable-cargo-wrapper
|
||||
, buildPackages
|
||||
, rustc
|
||||
, libiconv
|
||||
, windows
|
||||
@ -121,7 +121,7 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg
|
||||
patchRegistryDeps = ./patch-registry-deps;
|
||||
|
||||
nativeBuildInputs = nativeBuildInputs ++ lib.optionals auditable [
|
||||
(cargo-auditable-cargo-wrapper.override {
|
||||
(buildPackages.cargo-auditable-cargo-wrapper.override {
|
||||
inherit cargo cargo-auditable;
|
||||
})
|
||||
] ++ [
|
||||
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eigenpy";
|
||||
version = "2.9.2";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stack-of-tasks";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-h088il9gih1rJJKOI09qq2180DxbxCAVZcgBXWh8aVk=";
|
||||
hash = "sha256-xaeMsn3G4x5DS6gXc6mbZvi96K1Yu8CuzjcGnYJYrvs=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
40
pkgs/development/python-modules/ledger-bitcoin/default.nix
Normal file
40
pkgs/development/python-modules/ledger-bitcoin/default.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, setuptools
|
||||
, ledgercomm
|
||||
, packaging
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ledger-bitcoin";
|
||||
version = "0.2.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "ledger_bitcoin";
|
||||
hash = "sha256-AWl/q2MzzspNIo6yf30S92PgM/Ygsb+1lJsg7Asztso=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ledgercomm
|
||||
packaging
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"ledger_bitcoin"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Client library for Ledger Bitcoin application.";
|
||||
homepage = "https://github.com/LedgerHQ/app-bitcoin-new/tree/develop/bitcoin_client/ledger_bitcoin";
|
||||
license = licenses.asl20;
|
||||
};
|
||||
}
|
||||
30
pkgs/development/python-modules/ledgercomm/default.nix
Normal file
30
pkgs/development/python-modules/ledgercomm/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ledgercomm";
|
||||
version = "1.1.2";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-izOPbwv+34Xq8mpq9+QRIGhd+z4pVnGJSMnYOktRVbs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"ledgercomm"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library to send and receive APDU through HID or TCP socket. It can be used with a Ledger Nano S/X or with the Speculos emulator.";
|
||||
homepage = "https://github.com/LedgerHQ/ledgercomm";
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
@ -31,7 +31,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyunifiprotect";
|
||||
version = "4.8.1";
|
||||
version = "4.8.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -40,7 +40,7 @@ buildPythonPackage rec {
|
||||
owner = "briis";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+fZtzSUTObWkLQ7Nq6pCP+vN1+OUFi3d8AJdr5FGI+k=";
|
||||
hash = "sha256-NjoTUK1Tg2RqREI2DDT86mDO4rS5iZk+cffaGWLVSyc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -40,7 +40,7 @@ let
|
||||
};
|
||||
|
||||
pname = "torchvision";
|
||||
version = "0.14.1";
|
||||
version = "0.15.1";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
@ -49,7 +49,7 @@ buildPythonPackage {
|
||||
owner = "pytorch";
|
||||
repo = "vision";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-lKkEJolJQaLr1TVm44CizbJQedGa1wyy0cFWg2LTJN0=";
|
||||
hash = "sha256-CQS2IXb8YSLrrkn/7BsO4Me5Cv0eXgMAKXM4rGzr0Bw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ libpng ninja which ] ++ lib.optionals cudaSupport [ cuda-native-redist ];
|
||||
|
||||
46
pkgs/tools/networking/gp-saml-gui/default.nix
Normal file
46
pkgs/tools/networking/gp-saml-gui/default.nix
Normal file
@ -0,0 +1,46 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, buildPythonPackage
|
||||
, webkitgtk
|
||||
, wrapGAppsHook
|
||||
, glib-networking
|
||||
, gobject-introspection
|
||||
, openconnect
|
||||
, pygobject3
|
||||
, requests
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "gp-saml-gui";
|
||||
version = "0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dlenski";
|
||||
repo = "gp-saml-gui";
|
||||
rev = "085d3276e17e1094e22e5d49545e273147598eb4";
|
||||
sha256 = "sha256-5vIfgDaHE3T+euLliEyXe+Xikf5VyW3b9C2GapWx278=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional stdenv.isLinux glib-networking;
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook gobject-introspection glib-networking ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
pygobject3
|
||||
openconnect
|
||||
] ++ lib.optional stdenv.isLinux webkitgtk;
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--set WEBKIT_DISABLE_COMPOSITING_MODE "1"
|
||||
)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Interactively authenticate to GlobalProtect VPNs that require SAML";
|
||||
homepage = "https://github.com/dlenski/gp-saml-gui";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = [ maintainers.pallix ];
|
||||
};
|
||||
}
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "vale";
|
||||
version = "2.24.3";
|
||||
version = "2.24.4";
|
||||
|
||||
subPackages = [ "cmd/vale" ];
|
||||
outputs = [ "out" "data" ];
|
||||
@ -11,7 +11,7 @@ buildGoModule rec {
|
||||
owner = "errata-ai";
|
||||
repo = "vale";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8sJdt7lM/Ut/mtCoN2QZjtqh1fiWbI9taiLlnnx66PE=";
|
||||
hash = "sha256-gX37n1h/O7CqgXgWBndBHLtIeUWJaIJVJLyIb3Sd9YY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZgBt4BgZWViNqYCuqb/Wt1zVjFM9h1UsmsYox7kMJ1A=";
|
||||
|
||||
@ -1544,6 +1544,8 @@ with pkgs;
|
||||
|
||||
godspeed = callPackage ../tools/networking/godspeed { };
|
||||
|
||||
gp-saml-gui = python3Packages.callPackage ../tools/networking/gp-saml-gui { };
|
||||
|
||||
guestfs-tools = callPackage ../tools/virtualization/guestfs-tools { };
|
||||
|
||||
fabs = callPackage ../tools/backup/fabs { };
|
||||
|
||||
@ -5430,8 +5430,12 @@ self: super: with self; {
|
||||
|
||||
ledger_agent = callPackage ../development/python-modules/ledger_agent { };
|
||||
|
||||
ledger-bitcoin = callPackage ../development/python-modules/ledger-bitcoin { };
|
||||
|
||||
ledgerblue = callPackage ../development/python-modules/ledgerblue { };
|
||||
|
||||
ledgercomm = callPackage ../development/python-modules/ledgercomm { };
|
||||
|
||||
ledgerwallet = callPackage ../development/python-modules/ledgerwallet {
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) AppKit;
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user