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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2020-12-21 18:23:29 +00:00 committed by GitHub
commit 85b7955180
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 176 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
pkgs/applications/networking/cluster/waypoint/default.nix Normal file
View File

@ -0,0 +1,46 @@
{ lib, buildGoModule, fetchFromGitHub, go-bindata }:
buildGoModule rec {
pname = "waypoint";
version = "0.1.5";
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
rev = "v${version}";
sha256 = "115cak87kpfjckqgn8ws09z1w8x8l9bch9xrm29k4r0zi71xparn";
};
deleteVendor = true;
vendorSha256 = "1xdari6841jp6lpjwydv19v3wafj17hmnwsa2b55iw6dysm4yxdr";
subPackages = ["."];
nativeBuildInputs = [ go-bindata ];
buildPhase = ''
CGO_ENABLED=0 go build -ldflags '-s -w -extldflags "-static"' -o ./internal/assets/ceb/ceb ./cmd/waypoint-entrypoint
cd internal/assets
go-bindata -pkg assets -o prod.go -tags assetsembedded ./ceb
cd ../../
CGO_ENABLED=0 go build -ldflags '-s -w -X github.com/hashicorp/waypoint/version.GitDescribe=v${version}' -tags assetsembedded -o ./waypoint ./cmd/waypoint
CGO_ENABLED=0 go build -ldflags '-s -w' -tags assetsembedded -o ./waypoint-entrypoint ./cmd/waypoint-entrypoint
'';
installPhase = ''
mkdir -p $out/bin
mv waypoint{,-entrypoint} $out/bin/
'';
meta = with lib; {
description = "A tool to build, deploy, and release any application on any platform";
longDescription = ''
Waypoint allows developers to define their application build, deploy, and release lifecycle as code, reducing the
time to deliver deployments through a consistent and repeatable workflow.
'';
homepage = "https://waypointproject.io";
platforms = platforms.linux;
license = licenses.mpl20;
maintainers = with maintainers; [ winpat jk ];
};
}

16
pkgs/applications/office/libreoffice/src-fresh/download.nix
View File

@ -469,11 +469,11 @@
md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz";
}
{
name = "language-subtag-registry-2020-04-01.tar.bz2";
url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2020-04-01.tar.bz2";
sha256 = "fb1ee0dabfd956a445fbe9f351e86a52767808558f20f4256e67fbbb3768e9da";
name = "language-subtag-registry-2020-09-29.tar.bz2";
url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2020-09-29.tar.bz2";
sha256 = "cbe9fca811a37056560aab73e9fc9d3522b46b6785cb02db165f521bf42c230f";
md5 = "";
md5name = "fb1ee0dabfd956a445fbe9f351e86a52767808558f20f4256e67fbbb3768e9da-language-subtag-registry-2020-04-01.tar.bz2";
md5name = "cbe9fca811a37056560aab73e9fc9d3522b46b6785cb02db165f521bf42c230f-language-subtag-registry-2020-09-29.tar.bz2";
}
{
name = "JLanguageTool-1.7.0.tar.bz2";
@ -700,11 +700,11 @@
md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz";
}
{
name = "pdfium-4137.tar.bz2";
url = "https://dev-www.libreoffice.org/src/pdfium-4137.tar.bz2";
sha256 = "9a2f9bddca935a263f06c81003483473a525ccd0f4e517bc75fceb914d4c54b6";
name = "pdfium-4306.tar.bz2";
url = "https://dev-www.libreoffice.org/src/pdfium-4306.tar.bz2";
sha256 = "eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8";
md5 = "";
md5name = "9a2f9bddca935a263f06c81003483473a525ccd0f4e517bc75fceb914d4c54b6-pdfium-4137.tar.bz2";
md5name = "eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8-pdfium-4306.tar.bz2";
}
{
name = "pixman-0.34.0.tar.gz";

10
pkgs/applications/office/libreoffice/src-fresh/primary.nix
View File

@ -8,8 +8,8 @@ rec {
major = "7";
minor = "0";
patch = "3";
tweak = "1";
patch = "4";
tweak = "2";
subdir = "${major}.${minor}.${patch}";
@ -17,13 +17,13 @@ rec {
src = fetchurl {
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
sha256 = "0b998k2dxbbj7hn3srn07fgsah236h14ncyyahamdff6h3hvqrk5";
sha256 = "1g9akxvm7fh6lnprnc3g184qdy8gbinhb4rb60gjpw82ip6d5acz";
};
# FIXME rename
translations = fetchSrc {
name = "translations";
sha256 = "0s3ic79q0c16hbd6r06mwkyqhw4fdfy9z3xbqvdxp7jl64cjlaj4";
sha256 = "1v3kpk56fm783d5wihx41jqidpclizkfxrg4n0pq95d79hdiljsl";
};
# the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
@ -31,6 +31,6 @@ rec {
help = fetchSrc {
name = "help";
sha256 = "14wjkcdmcflfcc7264jx64s6clk5rdsprx7nkbv08z0bp6ff677b";
sha256 = "1np9f799ww12kggl5az6piv5fi9rf737il5a5r47r4wl2li56qqb";
};
}

4
pkgs/applications/science/biology/spades/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, zlib, bzip2, cmake }:
{ stdenv, fetchurl, zlib, bzip2, cmake, python3 }:
stdenv.mkDerivation rec {
pname = "SPAdes";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ zlib bzip2 ];
buildInputs = [ zlib bzip2 python3 ];
doCheck = true;

16
pkgs/applications/science/math/mathematica/l10ns.nix
View File

@ -8,22 +8,10 @@ let allVersions = with lib; flip map
# N.B. Versions in this list should be ordered from newest to oldest.
[
{
version = "12.1.1";
version = "12.2.0";
lang = "en";
language = "English";
sha256 = "02mk8gmv8idnakva1nc7r7mx8ld02lk7jgsj1zbn962aps3bhixd";
}
{
version = "12.1.0";
lang = "en";
language = "English";
sha256 = "15m9l20jvkxh5w6mbp81ys7mx2lx5j8acw5gz0il89lklclgb8z7";
}
{
version = "12.0.0";
lang = "en";
language = "English";
sha256 = "b9fb71e1afcc1d72c200196ffa434512d208fa2920e207878433f504e58ae9d7";
sha256 = "3b6676a203c6adb7e9c418a5484b037974287b5be09c64e7dfea74ddc0e400d7";
}
{
version = "11.3.0";

4
pkgs/applications/terminal-emulators/kitty/default.nix
View File

@ -21,14 +21,14 @@
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
version = "0.19.2";
version = "0.19.3";
format = "other";
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
rev = "v${version}";
sha256 = "06mlrc283k5f75y36fmmaxnj29jfc1s8vaykjph6a86m1gcl5wgi";
sha256 = "0r49bybqy6c0n1lz6yc85py80wb40w757m60f5rszjf200wnyl6s";
};
buildInputs = [

4
pkgs/development/interpreters/rakudo/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "rakudo";
version = "2020.11";
version = "2020.12";
src = fetchurl {
url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz";
sha256 = "107sskgf0p6npm3vjpv5wrqgfa007af6bxxiv1wgiyzx7maqdw5n";
sha256 = "1g3ciwhlac85d6l2kqslw8pm4bjjd1z79m1c5ll0fxmr6awgpk67";
};
buildInputs = [ icu zlib gmp perl ];

4
pkgs/development/interpreters/rakudo/moarvm.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "moarvm";
version = "2020.11";
version = "2020.12";
src = fetchurl {
url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz";
sha256 = "1163zv1fglgwbk6pppzbjwcgzpp13ilg5cz7fawsfnzdnrrq40kd";
sha256 = "18iys1bdb92asggrsz7sg1hh76j7kq63c3fgg33fnla18qf4z488";
};
buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];

4
pkgs/development/interpreters/rakudo/nqp.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "nqp";
version = "2020.11";
version = "2020.12";
src = fetchurl {
url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz";
sha256 = "03whmlc6bmwmwrddwd5vqmir0gzwnmf0apvl2q1na09qqj3zb1br";
sha256 = "13h64d41fwggc3lg4bpllg4jrp64clm7nmnw4g2jyjl47cy5ni7x";
};
buildInputs = [ perl ];

2
pkgs/development/libraries/libcryptui/default.nix
View File

@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
buildInputs = [ glib gtk3 gnupg22 gpgme dbus-glib libgnome-keyring ];
propagatedBuildInputs = [ dbus-glib ];
enableParallelBuilding = true;
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;

4
pkgs/development/python-modules/boto3/default.nix
View File

@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "boto3";
version = "1.16.39"; # N.B: if you change this, change botocore too
version = "1.16.40"; # N.B: if you change this, change botocore too
src = fetchPypi {
inherit pname version;
sha256 = "0j1qhfz2fi8hnfm5lhl6b3k0lh5r0vhr5bjm5aawf16l1wq18mm0";
sha256 = "sha256-dTJogqpo4ANFLc2PD87gM5/2NiQRWSf7caa10VU1rOU=";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];

4
pkgs/development/python-modules/botocore/default.nix
View File

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "botocore";
version = "1.19.39"; # N.B: if you change this, change boto3 and awscli to a matching version
version = "1.19.40"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
sha256 = "1h7skfzglnrz3ghfn8x8d74pfwwrklafd1y0nvbsnwm0k1h3il70";
sha256 = "sha256-6/qICsjLgTLcZleQK/VG9SzyxDJ4Vw9gyPig+JRVZVU=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/discordpy/default.nix
View File

@ -23,8 +23,8 @@ buildPythonPackage rec {
propagatedBuildInputs = [ aiohttp websockets ];
patchPhase = ''
substituteInPlace "requirements.txt" \
--replace "aiohttp>=3.6.0,<3.7.0" "aiohttp~=3.6.0" \
--replace "websockets>=6.0,!=7.0,!=8.0,!=8.0.1,<9.0" "websockets>=6"
--replace "aiohttp>=3.6.0,<3.7.0" "aiohttp" \
--replace "websockets>=6.0,!=7.0,!=8.0,!=8.0.1,<9.0" "websockets"
'' + lib.optionalString withVoice ''
substituteInPlace "discord/opus.py" \
--replace "ctypes.util.find_library('opus')" "'${libopus}/lib/libopus.so.0'"

6
pkgs/development/python-modules/transformers/default.nix
View File

@ -7,6 +7,7 @@
, regex
, requests
, numpy
, pandas
, parameterized
, protobuf
, sacremoses
@ -18,14 +19,14 @@
buildPythonPackage rec {
pname = "transformers";
version = "4.0.1";
version = "4.1.1";
disabled = isPy39;
src = fetchFromGitHub {
owner = "huggingface";
repo = pname;
rev = "v${version}";
sha256 = "1h53a3n6fdrx3ns1h1ip273hzd9pkm9m1qh41si75csb8mi1dq3d";
sha256 = "1l1gxdsakjmzsgggypq45pnwm87brhlccjfzafs43460pz0wbd6k";
};
propagatedBuildInputs = [
@ -41,6 +42,7 @@ buildPythonPackage rec {
];
checkInputs = [
pandas
parameterized
pytestCheckHook
timeout-decorator

4
pkgs/os-specific/linux/kernel/linux-5.10.nix
View File

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "5.10.1";
version = "5.10.2";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0p2fl7kl4ckphq17xir7n7vgrzlhbdqmyd2yyp4yilwvih9625pd";
sha256 = "18l1ywp99inm90434fm74w8rjfl4yl974kfcpizg2sp2p8xf311v";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-5.4.nix
View File

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "5.4.84";
version = "5.4.85";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "058mhczv6whjwxn7jjh1c6n5zrqjdnvbl2mp7jkfrg6frpvgr189";
sha256 = "0220k327aa7gg48fqw171mcng8h717c4a1v14r3q36ksirnmiqqx";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-5.9.nix
View File

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "5.9.15";
version = "5.9.16";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1vhaayqjv1ha3nsxy9zbsz497ba4d4a1g0gfhgxcvci8dp8djh2p";
sha256 = "11mbnjvb5d5gwbrwlkqvzpg1ij4m19l5wr3wca9iiyg5i2papmxh";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
View File

@ -6,7 +6,7 @@
, ... } @ args:
let
version = "5.10.1-rt19"; # updated by ./update-rt.sh
version = "5.10.1-rt20"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@ -25,7 +25,7 @@ in buildLinux (args // {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "0hihi7p866alh03ziz8q1l0p3sxi437h4a45c5dlv9lrg6f177qb";
sha256 = "0z8ljfcn908hzjl11fkmwrx2r7j0hcgpx07g21ag162qrn6g5qby";
};
}; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;

68
pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix
View File

@ -1,46 +1,52 @@
{ stdenv, fetchpatch, fetchurl, pam, openssl, perl }:
{ stdenv, fetchpatch, fetchFromGitHub, pam, openssl, perl }:
stdenv.mkDerivation rec {
name = "pam_ssh_agent_auth-0.10.3";
pname = "pam_ssh_agent_auth";
version = "0.10.4";
src = fetchurl {
url = "mirror://sourceforge/pamsshagentauth/${name}.tar.bz2";
sha256 = "0qx78x7nvqdscyp04hfijl4rgyf64xy03prr28hipvgasrcd6lrw";
src = fetchFromGitHub {
owner = "jbeverly";
repo = "pam_ssh_agent_auth";
rev = "pam_ssh_agent_auth-${version}";
sha256 = "YD1R8Cox0UoNiuWleKGzWSzxJ5lhDRCB2mZPp9OM6Cs=";
};
patches =
[ # Allow multiple colon-separated authorized keys files to be
# specified in the file= option.
./multiple-key-files.patch
(fetchpatch {
name = "openssl-1.1.1-1.patch";
url = "https://sources.debian.org/data/main/p/pam-ssh-agent-auth/0.10.3-3/debian/patches/openssl-1.1.1-1.patch";
sha256 = "1ndp5j4xfhzshhnl345gb4mkldx6vjfa7284xgng6ikhzpc6y7pf";
})
(fetchpatch {
name = "openssl-1.1.1-2.patch";
url = "https://sources.debian.org/data/main/p/pam-ssh-agent-auth/0.10.3-3/debian/patches/openssl-1.1.1-2.patch";
sha256 = "0ksrs4xr417by8klf7862n3dircvnw30an1akq4pnsd3ichscmww";
})
];
ed25519-donna = fetchFromGitHub {
owner = "floodyberry";
repo = "ed25519-donna";
rev = "8757bd4cd209cb032853ece0ce413f122eef212c";
sha256 = "ETFpIaWQnlYG8ZuDG2dNjUJddlvibB4ukHquTFn3NZM=";
};
buildInputs = [ pam openssl perl ];
# It's not clear to me why this is necessary, but without it, you see:
#
# checking OpenSSL header version... 1010104f (OpenSSL 1.1.1d 10 Sep 2019)
# checking OpenSSL library version... 1010104f (OpenSSL 1.1.1d 10 Sep 2019)
# checking whether OpenSSL's headers match the library... no
# configure: WARNING: Your OpenSSL headers do not match your
# library. Check config.log for details.
#
# ...despite the fact that clearly the values match
configureFlags = [ "--without-openssl-header-check" ];
patches = [
# Allow multiple colon-separated authorized keys files to be
# specified in the file= option.
./multiple-key-files.patch
];
configureFlags = [
# It's not clear to me why this is necessary, but without it, you see:
#
# checking OpenSSL header version... 1010108f (OpenSSL 1.1.1h 22 Sep 2020)
# checking OpenSSL library version... 1010108f (OpenSSL 1.1.1h 22 Sep 2020)
# checking whether OpenSSL's headers match the library... no
# configure: WARNING: Your OpenSSL headers do not match your
# library. Check config.log for details.
#
# ...despite the fact that clearly the values match
"--without-openssl-header-check"
# Make sure it can find ed25519-donna
"--with-cflags=-I$PWD"
];
prePatch = "cp -r ${ed25519-donna}/. ed25519-donna/.";
enableParallelBuilding = true;
meta = {
homepage = "http://pamsshagentauth.sourceforge.net/";
homepage = "https://github.com/jbeverly/pam_ssh_agent_auth";
description = "PAM module for authentication through the SSH agent";
maintainers = [ stdenv.lib.maintainers.eelco ];
platforms = stdenv.lib.platforms.linux;

12
pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch
View File

@ -87,21 +87,27 @@ diff -u pam_ssh_agent_auth-0.10.3-orig/pam_ssh_agent_auth.c pam_ssh_agent_auth-0
/*
* PAM_USER and PAM_RUSER do not necessarily have to get set by the calling application, and we may be unable to divine the latter.
@@ -187,16 +184,17 @@
@@ -184,5 +181,5 @@
*/
if(user && strlen(ruser) > 0) {
- pamsshagentauth_verbose("Attempting authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file);
+ pamsshagentauth_verbose("Attempting authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file_input);
@@ -201,3 +197,3 @@
retval = PAM_SUCCESS;
- pamsshagentauth_logit("Authenticated (sshd): `%s' as `%s' using %s", ruser, user, authorized_keys_file);
+ pamsshagentauth_logit("Authenticated (sshd): `%s' as `%s' using %s", ruser, user, authorized_keys_file_input);
@@ -211,11 +208,12 @@
/*
* this pw_uid is used to validate the SSH_AUTH_SOCK, and so must be the uid of the ruser invoking the program, not the target-user
*/
- if(pamsshagentauth_find_authorized_keys(user, ruser, servicename)) { /* getpwnam(ruser)->pw_uid)) { */
- pamsshagentauth_logit("Authenticated: `%s' as `%s' using %s", ruser, user, authorized_keys_file);
- pamsshagentauth_logit("Authenticated (agent): `%s' as `%s' using %s", ruser, user, authorized_keys_file);
+ const char *key_file;
+ if((key_file = pamsshagentauth_find_authorized_keys(user, ruser, servicename))) { /* getpwnam(ruser)->pw_uid)) { */
+ pamsshagentauth_logit("Authenticated: `%s' as `%s' using %s", ruser, user, key_file);
+ pamsshagentauth_logit("Authenticated (agent): `%s' as `%s' using %s", ruser, user, key_file);
retval = PAM_SUCCESS;
} else {
- pamsshagentauth_logit("Failed Authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file);

4
pkgs/tools/admin/awscli/default.nix
View File

@ -28,11 +28,11 @@ let
in with py.pkgs; buildPythonApplication rec {
pname = "awscli";
version = "1.18.199"; # N.B: if you change this, change botocore to a matching version too
version = "1.18.200"; # N.B: if you change this, change botocore to a matching version too
src = fetchPypi {
inherit pname version;
sha256 = "09ncnglxy3ph0i4zh93cxgwsxy3hgsy6pvnln1845p2nwvjsw434";
sha256 = "sha256-UgG9fY7WqHMHpJYXQ7VEkiv9htcqP36OVXlE95eWsZg=";
};
postPatch = ''

30
pkgs/tools/networking/qr-filetransfer/default.nix
View File

@ -1,30 +0,0 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage {
pname = "qr-filetransfer-unstable";
version = "2018-10-22";
goPackagePath = "github.com/claudiodangelis/qr-filetransfer";
src = fetchFromGitHub {
rev = "b1e5b91aa2aa469f870c62074e879d46e353edae";
owner = "claudiodangelis";
repo = "qr-filetransfer";
sha256 = "04cl3v6bzpaxp1scpsa42xxa1c1brbplq408bb7nixa98bacj4x1";
};
goDeps = ./deps.nix;
meta = with stdenv.lib; {
homepage = "https://github.com/claudiodangelis/qr-filetransfer";
description = "Transfer files over wifi by scanning a QR code from your terminal";
longDescription = ''
qr-filetransfer binds a web server to the address of your Wi-Fi network
interface on a random port and creates a handler for it. The default
handler serves the content and exits the program when the transfer is
complete.
'';
license = licenses.mit;
maintainers = with maintainers; [ fgaz ];
};
}

66
pkgs/tools/networking/qr-filetransfer/deps.nix generated
View File

@ -1,66 +0,0 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
[
{
goPackagePath = "github.com/mattn/go-colorable";
fetch = {
type = "git";
url = "https://github.com/mattn/go-colorable";
rev = "efa589957cd060542a26d2dd7832fd6a6c6c3ade";
sha256 = "0kshi4hvm0ayrsxqxy0599iv81kryhd2fn9lwjyczpj593cq069r";
};
}
{
goPackagePath = "github.com/mattn/go-isatty";
fetch = {
type = "git";
url = "https://github.com/mattn/go-isatty";
rev = "3fb116b820352b7f0c281308a4d6250c22d94e27";
sha256 = "084hplr4n4g5nvp70clljk428hc963460xz0ggcj3xdi4w7hhsvv";
};
}
{
goPackagePath = "github.com/mattn/go-runewidth";
fetch = {
type = "git";
url = "https://github.com/mattn/go-runewidth";
rev = "c88d7e5f2e24de48a200a2655ac8a0910be9a0f7";
sha256 = "14prmzjlv9z31n6caaaq1kwi4p0mp3x4pv5r7d0575lcampa41jw";
};
}
{
goPackagePath = "github.com/mdp/qrterminal";
fetch = {
type = "git";
url = "https://github.com/mdp/qrterminal";
rev = "6967d3624af633162b77160078e12a4c14174470";
sha256 = "1f2zrdv9sw2a6ni1712d27cayr3f8whqagx6f0yglc5gdd9f3i2n";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "a5c9d58dba9a56f97aaa86f55e638b718c5a6c42";
sha256 = "02qv5i7yps35p7fa81345qz7k8i73gkigj69anwmpw9rhpmzayf9";
};
}
{
goPackagePath = "gopkg.in/cheggaaa/pb.v1";
fetch = {
type = "git";
url = "https://gopkg.in/cheggaaa/pb.v1";
rev = "007b75a044e968336a69a6c0c617251ab62ac14c";
sha256 = "0l8m5cy6fbir7nrsk985ap7dxp9qlfmh8r73g7j9zg7pfq3lkhad";
};
}
{
goPackagePath = "rsc.io/qr";
fetch = {
type = "git";
url = "https://github.com/rsc/qr";
rev = "ca9a01fc2f9505024045632c50e5e8cd6142fafe";
sha256 = "04yx493g0fqp8i59zjxnl4k3s0cl0kr5m8xh0ph8m10r1hkw0xr3";
};
}
]

33
pkgs/tools/networking/qrcp/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "qrcp";
version = "0.6.4";
src = fetchFromGitHub {
owner = "claudiodangelis";
repo = "qrcp";
rev = version;
sha256 = "08fjy9mskf6n1zldc63fjm5x617qqx987a58cjav03apzfwzvvhg";
};
vendorSha256 = "0iffy43x3njcahrxl99a71v8p7im102nzv8iqbvd5c6m14rsckqa";
subPackages = [ "." ];
meta = with lib; {
homepage = "https://claudiodangelis.com/qrcp/";
description = "Transfer files over wifi by scanning a QR code from your terminal";
longDescription = ''
qrcp binds a web server to the address of your Wi-Fi network
interface on a random port and creates a handler for it. The default
handler serves the content and exits the program when the transfer is
complete.
'';
license = licenses.mit;
maintainers = with maintainers; [ fgaz ];
};
}

1
pkgs/top-level/aliases.nix
View File

@ -483,6 +483,7 @@ mapAliases ({
pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd."; # added 2020-10-24
qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19
qcsxcad = libsForQt5.qcsxcad; # added 2020-11-05
qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # added 2020-12-02
quake3game = ioquake3; # added 2016-01-14
qvim = throw "qvim has been removed."; # added 2020-08-31
qwt6 = libsForQt5.qwt; # added 2015-12-19

4
pkgs/top-level/all-packages.nix
View File

@ -1347,6 +1347,8 @@ in
wiimms-iso-tools = callPackage ../tools/filesystems/wiimms-iso-tools { };
waypoint = callPackage ../applications/networking/cluster/waypoint { };
xcodeenv = callPackage ../development/mobile/xcodeenv { };
ssh-agents = callPackage ../tools/networking/ssh-agents { };
@ -6844,7 +6846,7 @@ in
qshowdiff = callPackage ../tools/text/qshowdiff { };
qr-filetransfer = callPackage ../tools/networking/qr-filetransfer { };
qrcp = callPackage ../tools/networking/qrcp { };
qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { };