public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-01-20 01:20:09 +00:00
committed by GitHub
parent c0ca873751 35b89f31e3
commit ebdf4f426a
177 changed files with 767 additions and 603 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/networking/openconnect_pa/default.nix
+3 -3
View File
@@ -5,14 +5,14 @@ assert (openssl != null) == (gnutls == null);
stdenv.mkDerivation {
version = "unstable-2018-10-08";
pname = "openconnect_pa";
outputs = [ "out" "dev" ];
src = fetchFromGitHub {
owner = "dlenski";
repo = "openconnect";
rev = "e5fe063a087385c5b157ad7a9a3fa874181f6e3b";
sha256 = "0ywacqs3nncr2gpjjcz2yc9c6v4ifjssh0vb07h0qff06whqhdax";
sha256 = "0ywacqs3nncr2gpjjcz2yc9c6v4ifjssh0vb07h0qff06whqhdax";
};
preConfigure = ''
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkg-config autoreconfHook ];
propagatedBuildInputs = [ vpnc openssl gnutls gmp libxml2 stoken zlib ];
meta = with lib; {
description = "OpenConnect client extended to support Palo Alto Networks' GlobalProtect VPN";
homepage = "https://github.com/dlenski/openconnect/";
pkgs/tools/networking/sshoogr/default.nix
+3 -3
View File
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
'';
longDescription = ''
The sshoogr (pronounced [ʃʊgə]) is a Groovy-based DSL library for working
with remote servers through SSH. The DSL allows: connecting, executing
remote commands, copying files and directories, creating tunnels in a
with remote servers through SSH. The DSL allows: connecting, executing
remote commands, copying files and directories, creating tunnels in a
simple and concise way.
'';
homepage = "https://github.com/aestasit/sshoogr";
@@ -33,4 +33,4 @@ stdenv.mkDerivation rec {
platforms = platforms.all;
maintainers = with maintainers; [ moaxcp ];
};
}
}
pkgs/tools/networking/uget-integrator/default.nix
+5 -5
View File
@@ -20,11 +20,11 @@ stdenv.mkDerivation rec {
substituteInPlace $f --replace "/usr" "$out"
done
install -D -t $out/bin bin/uget-integrator
install -D -t $out/etc/opt/chrome/native-messaging-hosts conf/com.ugetdm.chrome.json
install -D -t $out/etc/chromium/native-messaging-hosts conf/com.ugetdm.chrome.json
install -D -t $out/etc/opera/native-messaging-hosts conf/com.ugetdm.chrome.json
install -D -t $out/lib/mozilla/native-messaging-hosts conf/com.ugetdm.firefox.json
install -D -t $out/bin bin/uget-integrator
install -D -t $out/etc/opt/chrome/native-messaging-hosts conf/com.ugetdm.chrome.json
install -D -t $out/etc/chromium/native-messaging-hosts conf/com.ugetdm.chrome.json
install -D -t $out/etc/opera/native-messaging-hosts conf/com.ugetdm.chrome.json
install -D -t $out/lib/mozilla/native-messaging-hosts conf/com.ugetdm.firefox.json
wrapPythonPrograms
'';
pkgs/tools/networking/wolfebin/default.nix
+1 -1
View File
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
version = "5.4";
pname = "wolfebin";
src = fetchFromGitHub {
owner = "thejoshwolfe";
repo = "wolfebin";