cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2021-10-29 00:01:50 +00:00 committed by GitHub
commit 158ae17beb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 2708 additions and 5778 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.github/workflows/backport.yml vendored
View file

@ -10,18 +10,13 @@ jobs:
steps:
- uses: actions/checkout@v2
with:
# required to find all branches
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}
- name: Create backport PRs
# should be kept in sync with `version`
uses: zeebe-io/backport-action@v0.0.5
uses: zeebe-io/backport-action@v0.0.6
with:
# Config README: https://github.com/zeebe-io/backport-action#backport-action
github_token: ${{ secrets.GITHUB_TOKEN }}
github_workspace: ${{ github.workspace }}
# should be kept in sync with `uses`
version: v0.0.5
pull_description: |-
Bot-based backport to `${target_branch}`, triggered by a label in #${pull_number}.

8
lib/systems/platforms.nix
View file

@ -20,15 +20,17 @@ rec {
name = "PowerNV";
baseConfig = "powernv_defconfig";
target = "zImage";
installTarget = "install";
file = "vmlinux";
target = "vmlinux";
autoModules = true;
# avoid driver/FS trouble arising from unusual page size
extraConfig = ''
PPC_64K_PAGES n
PPC_4K_PAGES y
IPV6 y
ATA_BMDMA y
ATA_SFF y
VIRTIO_MENU y
'';
};
};

4
pkgs/applications/blockchains/exodus/default.nix
View file

@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }:
stdenv.mkDerivation rec {
pname = "exodus";
version = "21.8.19";
version = "21.10.25";
src = fetchurl {
url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip";
sha256 = "1ssacadx5hdxq0cljb869ds3d11i4fyy3qd5hzh8wk5mlpdnba6k";
sha256 = "a85ddda4e73dfadddbb77cf9bc84c30fc6b893ead46367d702976bbf4da5afa4";
};
sourceRoot = ".";

4
pkgs/applications/misc/spicetify-cli/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "spicetify-cli";
version = "2.2.6";
version = "2.7.1";
src = fetchFromGitHub {
owner = "khanhas";
repo = pname;
rev = "v${version}";
sha256 = "sha256-9g6rkSDjE7x/YprPX0dkzqgpjgED5qBpUUQoVv6fGkk=";
sha256 = "sha256-fWh345J2fD9uoGrDiVZyEBiOlMy8giEGKHGMujT0mjo=";
};
vendorSha256 = "sha256-g0RYIVIq4oMXdRZDBDnVYg7ombN5WEo/6O9hChQvOYs=";

7
pkgs/applications/networking/instant-messengers/gajim/default.nix
View file

@ -21,11 +21,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "gajim";
version = "1.3.2";
version = "1.3.3";
src = fetchurl {
url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz";
sha256 = "1vjzv8zg9s393xw81klcgbkn4h6j2blzla9iil5kqfrw7wmldskh";
sha256 = "1337qkpcv7j0fgws9scnk82mn2l7s17060vmrbh3ihinmxmbxg6x";
};
buildInputs = [
@ -57,9 +57,6 @@ python3.pkgs.buildPythonApplication rec {
checkInputs = [ xvfb-run dbus.daemon ];
checkPhase = ''
# https://dev.gajim.org/gajim/gajim/-/issues/10478
rm test/lib/gajim_mocks.py test/unit/test_gui_interface.py
xvfb-run dbus-run-session \
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
${python3.interpreter} setup.py test

42
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
View file

@ -10,6 +10,7 @@
, hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE"
# For a full list of available languages:
# $ cat pkgs/development/libraries/hunspell/dictionaries.nix | grep "dictFileName =" | awk '{ print $3 }'
, sqlcipher
}:
let
@ -21,6 +22,40 @@ let
in lib.optionalString (spellcheckerLanguage != null) ''
--set HUNSPELL_DICTIONARIES "${hunspellDicts.${hunspellDict}}/share/hunspell" \
--set LC_MESSAGES "${spellcheckerLanguage}"'');
sqlcipher-signal = sqlcipher.overrideAttrs (_: {
# Using the same features as the upstream signal sqlcipher build
# https://github.com/signalapp/better-sqlite3/blob/2fa02d2484e9f9a10df5ac7ea4617fb2dff30006/deps/defines.gypi
CFLAGS = [
"-DSQLITE_LIKE_DOESNT_MATCH_BLOBS"
"-DSQLITE_THREADSAFE=2"
"-DSQLITE_USE_URI=0"
"-DSQLITE_DEFAULT_MEMSTATUS=0"
"-DSQLITE_OMIT_DEPRECATED"
"-DSQLITE_OMIT_GET_TABLE"
"-DSQLITE_OMIT_TCL_VARIABLE"
"-DSQLITE_OMIT_PROGRESS_CALLBACK"
"-DSQLITE_OMIT_SHARED_CACHE"
"-DSQLITE_TRACE_SIZE_LIMIT=32"
"-DSQLITE_DEFAULT_CACHE_SIZE=-16000"
"-DSQLITE_DEFAULT_FOREIGN_KEYS=1"
"-DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1"
"-DSQLITE_ENABLE_COLUMN_METADATA"
"-DSQLITE_ENABLE_UPDATE_DELETE_LIMIT"
"-DSQLITE_ENABLE_STAT4"
"-DSQLITE_ENABLE_FTS5"
"-DSQLITE_ENABLE_JSON1"
"-DSQLITE_ENABLE_RTREE"
"-DSQLITE_INTROSPECTION_PRAGMAS"
# SQLCipher-specific options
"-DSQLITE_HAS_CODEC"
"-DSQLITE_TEMP_STORE=2"
"-DSQLITE_SECURE_DELETE"
];
LDFLAGS = [ "-lm" ];
});
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "5.21.0"; # Please backport all updates to the stable channel.
@ -115,15 +150,10 @@ in stdenv.mkDerivation rec {
runHook postInstall
'';
# Required for $SQLCIPHER_LIB which contains "/build/" inside the path:
noAuditTmpdir = true;
preFixup = ''
export SQLCIPHER_LIB="$out/lib/Signal/resources/app.asar.unpacked/node_modules/better-sqlite3/build/Release/better_sqlite3.node"
test -x "$SQLCIPHER_LIB" # To ensure the location hasn't changed
gappsWrapperArgs+=(
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }"
--prefix LD_PRELOAD : "$SQLCIPHER_LIB"
--prefix LD_PRELOAD : "${sqlcipher-signal}/lib/libsqlcipher.so"
${customLanguageWrapperArgs}
)

98
pkgs/applications/networking/protonvpn-gui/default.nix
View file

@ -1,90 +1,54 @@
{ lib, fetchFromGitHub, makeDesktopItem, makeWrapper, imagemagick
, python3Packages, wrapGAppsHook, protonvpn-cli, gtk3, pango
, gobject-introspection, libnotify, libappindicator-gtk3
, procps, openvpn }:
{ lib, fetchFromGitHub, gobject-introspection, imagemagick,
wrapGAppsHook, python3Packages, gtk3, networkmanager, webkitgtk }:
let
extraPath = lib.makeBinPath [ procps openvpn ];
in python3Packages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "protonvpn-linux-gui";
version = "2.1.1";
version = "1.4.1";
src = fetchFromGitHub {
owner = "protonvpn";
repo = "linux-gui";
rev = "v${version}";
sha256 = "avo5/2eq53HSHCnnjtxrsmpURtHvxmLZn2BxActImGY=";
owner = "ProtonVPN";
repo = "linux-app";
rev = version;
sha256 = "sha256-08gXEKm8udgNltRdqvAMFL0pDCWZu/kfl1xGQtZPBCc=";
};
desktopItem = makeDesktopItem {
name = "ProtonVPN";
desktopName = "ProtonVPN GUI";
type = "Application";
exec = "protonvpn-gui";
icon = "protonvpn";
categories = "Network;";
terminal = "false";
};
strictDeps = false;
trayDesktopItem = makeDesktopItem {
name = "ProtonVPN Tray";
desktopName = "ProtonVPN Tray";
type = "Application";
exec = "protonvpn-tray";
icon = "protonvpn";
categories = "Network;";
terminal = "false";
};
nativeBuildInputs = [
gobject-introspection imagemagick wrapGAppsHook
];
nativeBuildInputs = [ wrapGAppsHook makeWrapper imagemagick ];
propagatedBuildInputs = with python3Packages; [
protonvpn-nm-lib
psutil
];
propagatedBuildInputs = (with python3Packages; [
pygobject3
pycairo
requests
configparser
]) ++ [
protonvpn-cli
gtk3
gobject-introspection
libnotify
libappindicator-gtk3
];
buildInputs = [
gtk3 networkmanager webkitgtk
];
prePatch = ''
# if pkexec is used, we want to have more time to enter password
substituteInPlace linux_gui/services/login_service.py --replace 'timeout=8' 'timeout=30'
'';
postInstall = ''
# wrap binaries with extra required path
wrapProgram "$out/bin/protonvpn-tray" --prefix PATH ":" ${extraPath}
wrapProgram "$out/bin/protonvpn-gui" --prefix PATH ":" ${extraPath}
# install desktop files
mkdir -p $out/share/applications
cp "$desktopItem/share/applications/ProtonVPN.desktop" $out/share/applications/protonvpn-gui.desktop
cp "$trayDesktopItem/share/applications/ProtonVPN Tray.desktop" $out/share/applications/protonvpn-tray.desktop
# create icons
postFixup = ''
# Setting icons
for size in 16 32 48 64 72 96 128 192 512 1024; do
mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
convert -resize "$size"x"$size" \
linux_gui/resources/img/logo/protonvpn_logo.png \
$out/share/icons/hicolor/"$size"x"$size"/apps/protonvpn.png
convert -resize $size'x'$size \
protonvpn_gui/assets/icons/protonvpn-logo.png \
$out/share/icons/hicolor/$size'x'$size/apps/protonvpn.png
done
install -Dm644 protonvpn.desktop -t $out/share/applications/
substituteInPlace $out/share/applications/protonvpn.desktop \
--replace 'protonvpn-logo' protonvpn
'';
# no tests
# Project has a dummy test
doCheck = false;
meta = with lib; {
description = "Linux GUI for ProtonVPN, written in Python";
homepage = "https://github.com/ProtonVPN/linux-gui";
maintainers = with maintainers; [ offline ];
homepage = "https://github.com/ProtonVPN/linux-app";
maintainers = with maintainers; [ offline wolfangaukang ];
license = licenses.gpl3Plus;
platforms = platforms.linux;
mainProgram = "protonvpn-gui";
};
}

9
pkgs/applications/terminal-emulators/alacritty/default.nix
View file

@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, rustPlatform
, cmake
@ -87,6 +88,14 @@ rustPlatform.buildRustPackage rec {
outputs = [ "out" "terminfo" ];
patches = [
# Handle PTY EIO error for Rust 1.55+
(fetchpatch {
url = "https://github.com/alacritty/alacritty/commit/58985a4dcbe464230b5d2566ee68e2d34a1788c8.patch";
sha256 = "sha256-Z6589yRrQtpx3/vNqkMiGgGsLysd/QyfaX7trqX+k5c=";
})
];
postPatch = ''
substituteInPlace alacritty/src/config/ui_config.rs \
--replace xdg-open ${xdg-utils}/bin/xdg-open

1
pkgs/development/node-packages/node-packages.json
View file

@ -173,6 +173,7 @@
, "livedown"
, "lodash"
, {"lumo-build-deps": "../interpreters/clojurescript/lumo" }
, "lua-fmt"
, "madoko"
, "markdownlint-cli"
, "markdown-link-check"

8173
pkgs/development/node-packages/node-packages.nix generated
View file

File diff suppressed because it is too large Load diff

4
pkgs/development/python-modules/nbxmpp/default.nix
View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "nbxmpp";
version = "2.0.3";
version = "2.0.4";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "gajim";
repo = "python-nbxmpp";
rev = "nbxmpp-${version}";
sha256 = "0gzyd25sja7n49f1ihyg6gch1b0r409r0p3qpwn8w8xy7jgn6ysc";
sha256 = "1c2ncx1k93gxndaw183x0vlqgjnippl3v6sknklj3z2yjcj0l1ks";
};
buildInputs = [

50
pkgs/development/python-modules/proton-client/default.nix Normal file
View file

@ -0,0 +1,50 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, bcrypt
, pyopenssl
, python-gnupg
, requests
, openssl
}:
buildPythonPackage rec {
pname = "proton-client";
version = "0.7.0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "ProtonMail";
repo = "proton-python-client";
rev = version;
sha256 = "sha256-98tEL3DUYtx27JcI6pPFS2iDJXS8K3yyvCU9UVrg1EM=";
};
propagatedBuildInputs = [
bcrypt
pyopenssl
python-gnupg
requests
];
buildInputs = [ openssl ];
# This patch is supposed to indicate where to load OpenSSL library,
# but it is not working as intended.
#patchPhase = ''
# substituteInPlace proton/srp/_ctsrp.py --replace \
# "ctypes.cdll.LoadLibrary('libssl.so.10')" "'${openssl.out}/lib/libssl.so'"
#'';
# Regarding the issue above, I'm disabling tests for now
doCheck = false;
pythonImportsCheck = [ "proton" ];
meta = with lib; {
description = "Python Proton client module";
homepage = "https://github.com/ProtonMail/proton-python-client";
license = licenses.gpl3Only;
maintainers = with maintainers; [ wolfangaukang ];
};
}

47
pkgs/development/python-modules/protonvpn-nm-lib/default.nix Normal file
View file

@ -0,0 +1,47 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, distro
, jinja2
, keyring
, proton-client
, pygobject3
, pyxdg
, systemd
}:
buildPythonPackage rec {
pname = "protonvpn-nm-lib";
version = "3.5.0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "ProtonVPN";
repo = pname;
rev = version;
sha256 = "sha256-E75toza++l5UFdOLGgolH8pL5xvoUkLE7u+8L5RDFbI=";
};
propagatedBuildInputs = [
distro
jinja2
keyring
proton-client
pygobject3
pyxdg
systemd
];
# Project has a dummy test.
doCheck = false;
pythonImportsCheck = [ "protonvpn_nm_lib" ];
meta = with lib; {
description = "ProtonVPN NetworkManager Library intended for every ProtonVPN service user";
homepage = "https://github.com/ProtonVPN/protonvpn-nm-lib";
license = licenses.gpl3Only;
maintainers = with maintainers; [ wolfangaukang ];
};
}

4
pkgs/development/python-modules/qcs-api-client/default.nix
View file

@ -18,13 +18,13 @@
buildPythonPackage rec {
pname = "qcs-api-client";
version = "0.8.0";
version = "0.14.0";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "1c0g3aa2pk4zd40banap2j797080qivd42q7imla2yvv6cvq24b8";
sha256 = "sha256-CoiLMpaPRTISc0EO0jIMw/daTW8MyXQqaeGq0zaykmc=";
};
propagatedBuildInputs = [

6
pkgs/tools/graphics/shotgun/default.nix
View file

@ -2,7 +2,7 @@
rustPlatform.buildRustPackage rec {
pname = "shotgun";
version = "2.2.0";
version = "2.2.1";
nativeBuildInputs = [ pkg-config ];
@ -12,10 +12,10 @@ rustPlatform.buildRustPackage rec {
owner = "neXromancers";
repo = pname;
rev = "v${version}";
sha256 = "0fpc09yvxjcvjkai7afyig4gyc7inaqxxrwzs17mh8wdgzawb6dl";
sha256 = "sha256-ClQP/iNs9b4foDUVpH37YCZyjVSgweHLKnSwnpkRwZI=";
};
cargoSha256 = "06zplpy480965lhgav984m6wkfijv7cqa49kpramp8b6ws62pikl";
cargoSha256 = "sha256-w5s9I7lXO8HN9zHqZQCeqBXSd7jmbsaqMZRwPLnbqNk=";
meta = with lib; {
description = "Minimal X screenshot utility";

10
pkgs/tools/misc/kak-lsp/default.nix
View file

@ -1,19 +1,19 @@
{ stdenv, lib, fetchFromGitHub, rustPlatform, Security }:
{ stdenv, lib, fetchFromGitHub, rustPlatform, Security, SystemConfiguration }:
rustPlatform.buildRustPackage rec {
pname = "kak-lsp";
version = "11.0.0";
version = "11.0.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "198y2k3vi8dh9kfqgl7vpgkxvjlfvryi9c8hmb43m0lpwsja0010";
sha256 = "sha256-rSUXMQF4V+ToYw3RIfEZd2AfAiHoRPDC3DZBAg2zeKo=";
};
cargoSha256 = "0sv1a2k5rcf4hl1w50mh041r3w3nir6avyl6xa3rlcc7cy19q21y";
cargoSha256 = "sha256-vcq+WVHmGFrZFLzNWyHU7qN6cDSKP9pAzxZNs2+8jR8=";
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
meta = with lib; {
description = "Kakoune Language Server Protocol Client";

6
pkgs/tools/networking/tendermint/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tendermint";
version = "0.34.13";
version = "0.34.14";
src = fetchFromGitHub {
owner = "tendermint";
repo = pname;
rev = "v${version}";
sha256 = "sha256-z3rbDdk68PTvJ/LPnAx8kOjCGXMfxQA0LK9GLYgaiUY=";
sha256 = "sha256-/FYkwHamJTty/h80KaNAmyNg0wCqiOAA3o2whouAOZc=";
};
vendorSha256 = "sha256-bwDyis/dHKSqBFw5jFWSZip5YjBe1bq/ieg6Jg0P/TM=";
vendorSha256 = "sha256-9wjiL8/fhWLuGglFkS8OH026zwbrmuadB3goBqFqnvc=";
subPackages = [ "cmd/tendermint" ];

2
pkgs/top-level/all-packages.nix
View file

@ -6632,7 +6632,7 @@ with pkgs;
kakouneUtils = callPackage ../applications/editors/kakoune/plugins/kakoune-utils.nix { };
kak-lsp = callPackage ../tools/misc/kak-lsp {
inherit (darwin.apple_sdk.frameworks) Security;
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
kbdd = callPackage ../applications/window-managers/kbdd { };

4
pkgs/top-level/python-packages.nix
View file

@ -5950,8 +5950,12 @@ in {
protobuf3-to-dict = callPackage ../development/python-modules/protobuf3-to-dict { };
proton-client = callPackage ../development/python-modules/proton-client { };
protonup = callPackage ../development/python-modules/protonup { };
protonvpn-nm-lib = callPackage ../development/python-modules/protonvpn-nm-lib { };
prov = callPackage ../development/python-modules/prov { };
prox-tv = callPackage ../development/python-modules/prox-tv { };