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

Merge branch 'master' into staging-next

Browse Source 
Conflicts:
	pkgs/development/python-modules/jenkins-job-builder/default.nix
	pkgs/development/python-modules/snowflake-connector-python/default.nix
This commit is contained in:
Dmitry Kalinkin 2021-12-11 13:59:09 -05:00
commit c71b1bb92c
No known key found for this signature in database
GPG Key ID: 5157B3EC8B2CA333
28 changed files with 167 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/modules/services/networking/xrdp.nix
View File

@ -97,6 +97,11 @@ in
'';
};
confDir = mkOption {
type = types.path;
default = confDir;
description = "The location of the config files for xrdp.";
};
};
};
@ -149,7 +154,7 @@ in
User = "xrdp";
Group = "xrdp";
PermissionsStartOnly = true;
ExecStart = "${cfg.package}/bin/xrdp --nodaemon --port ${toString cfg.port} --config ${confDir}/xrdp.ini";
ExecStart = "${cfg.package}/bin/xrdp --nodaemon --port ${toString cfg.port} --config ${cfg.confDir}/xrdp.ini";
};
};
@ -159,7 +164,7 @@ in
description = "xrdp session manager";
restartIfChanged = false; # do not restart on "nixos-rebuild switch". like "display-manager", it can have many interactive programs as children
serviceConfig = {
ExecStart = "${cfg.package}/bin/xrdp-sesman --nodaemon --config ${confDir}/sesman.ini";
ExecStart = "${cfg.package}/bin/xrdp-sesman --nodaemon --config ${cfg.confDir}/sesman.ini";
ExecStop = "${pkgs.coreutils}/bin/kill -INT $MAINPID";
};
};

4
pkgs/applications/video/obs-studio/plugins/obs-websocket.nix
View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "obs-websocket";
version = "4.9.0";
version = "4.9.1";
src = fetchFromGitHub {
owner = "Palakis";
repo = "obs-websocket";
rev = version;
sha256 = "1dxih5czcfs1vczbq48784jvmgs8awbsrwk8mdfi4pg8n577cr1w";
sha256 = "sha256-XCiSNWTiA/u+3IbYlhIc5bCjKjLHDRVjYIG5MEoYnr0=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/development/compilers/chicken/5/chicken.nix
View File

@ -10,13 +10,13 @@ let
in
stdenv.mkDerivation rec {
pname = "chicken";
version = "5.2.0";
version = "5.3.0";
binaryVersion = 11;
src = fetchurl {
url = "https://code.call-cc.org/releases/${version}/chicken-${version}.tar.gz";
sha256 = "1yl0hxm9cirgcp8jgxp6vv29lpswfvaw3zfkh6rsj0vkrv44k4c1";
sha256 = "sha256-w62Z2PnhftgQkS75gaw7DC4vRvsOzAM7XDttyhvbDXY=";
};
setupHook = lib.optional (bootstrap-chicken != null) ./setup-hook.sh;

4
pkgs/development/libraries/kddockwidgets/default.nix
View File

@ -8,13 +8,13 @@
mkDerivation rec {
pname = "KDDockWidgets";
version = "1.4.0";
version = "1.5.0";
src = fetchFromGitHub {
owner = "KDAB";
repo = pname;
rev = "v${version}";
sha256 = "sha256-lgNRuRoJhBw0n/Hb58uxpa+4aXoOrK4bRldtIXYIKLI=";
sha256 = "sha256-7jC0zl5ESwqZXzvFJYmPvRhwFitse05NuYoTgFWiHac=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/development/libraries/kronosnet/default.nix
View File

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "kronosnet";
version = "1.21";
version = "1.23";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "14i4fl3g60gn5ay3dbwjcay3dnmnqr16zcp3g0wv9a3hjwh1if28";
sha256 = "sha256-+uQXV5tOLsBPFzfFHqwV1Oz4+KwZMkdjO8zfIljV+ro=";
};
nativeBuildInputs = [ autoreconfHook pkg-config doxygen ];

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

@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "ABI Generic Analysis and Instrumentation Library";
homepage = "https://sourceware.org/libabigail/";
license = licenses.lgpl3Plus;
license = with licenses; [ asl20 llvm-exception ];
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.linux;
};

4
pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
View File

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-datafactory";
version = "2.0.0";
version = "2.1.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "df14272a1835f743d1889f901e972ed6ec9ea9d6f8966ba2865bf10306a621cc";
sha256 = "d2a3cfe844bd9e51499b81bba7510e2c8df4fc3a40a7059e6224ed043d65a786";
};
propagatedBuildInputs = [

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

@ -4,12 +4,12 @@
}:
buildPythonPackage rec {
version = "0.5.2";
version = "1.0.0";
pname = "grappelli_safe";
src = fetchPypi {
inherit pname version;
sha256 = "35b7ccaf9acc54684c73aeefbeaddc63b8a16143bd981bd5b3ebef253def07df";
sha256 = "84c03ec5373341d980a76480d992389e286fbc50048e91bc2e5c876d02873cc5";
};
meta = with lib; {

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

@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "kajiki";
version = "0.8.3";
version = "0.9.0";
src = fetchPypi {
inherit pname version;
sha256 = "c7a1f033b5cfaafa97bda5a475f58a7abcd76b348494995428fdcf6c8f648ad9";
sha256 = "f0d6dfa27eb2b6c0d2a28ae21d69dceb5363cc0432f4045bcc98aac42a662ccb";
};
propagatedBuildInputs = [ Babel pytz nine ];

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

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "python-ldap";
version = "3.3.1";
version = "3.4.0";
src = fetchPypi {
inherit pname version;
sha256 = "198as30xy6p760niqps2zdvq2xcmr765h06pmda8fa9y077wl4a7";
sha256 = "60464c8fc25e71e0fd40449a24eae482dcd0fb7fcf823e7de627a6525b3e0d12";
};
propagatedBuildInputs = [ pyasn1 pyasn1-modules ];

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

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "maestral";
version = "1.5.1";
version = "1.5.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "SamSchott";
repo = "maestral";
rev = "v${version}";
sha256 = "sha256-R6zacpJkSWppodrb0SD4lglFmGVtPaloeDMBPL+ztuU=";
sha256 = "sha256-nFXgvFLw6ru/Sw3+LoZ7V09dyn0L21We/Dlwib2gZB8=";
};
propagatedBuildInputs = [

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

@ -1,12 +1,12 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k, funcsigs, pytest, numpy }:
buildPythonPackage rec {
version = "1.2.2";
version = "1.3.0";
pname = "mockito";
src = fetchPypi {
inherit pname version;
sha256 = "d6b3aca6cdb92bbd47e19ebdb1a0b84ef23ab874eae5c6d505323c8657257c06";
sha256 = "5d41a5f6ec0b8fc32b6d796480d4849ee5fb0ac75d12f13862f1622684f5f578";
};
propagatedBuildInputs = lib.optionals (!isPy3k) [ funcsigs ];

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

@ -24,7 +24,7 @@
buildPythonPackage rec {
pname = "pikepdf";
version = "4.1.0";
version = "4.2.0";
disabled = ! isPy3k;
src = fetchFromGitHub {
@ -37,7 +37,7 @@ buildPythonPackage rec {
extraPostFetch = ''
rm "$out/.git_archival.txt"
'';
sha256 = "sha256-8l3IDC2EhoNTImaTTjkBYhwbSBDC3PVLbdgs4txZOKc=";
sha256 = "sha256-8ForstZzRpr2TnOgK/+y4aF3R7XMEYfcSQhntA765Co=";
};
patches = [

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

@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "precis-i18n";
version = "1.0.2";
version = "1.0.3";
disabled = !isPy3k;
@ -10,7 +10,7 @@ buildPythonPackage rec {
owner = "byllyfish";
repo = "precis_i18n";
rev = "v${version}";
hash = "sha256:1r9pah1kgik6valf15ac7ybw0szr92cq84kwjvm6mq3z46j1pmkr";
hash = "sha256-pBmllX1RVdFnZsDSW7Hh5uVqK2d++kcp1NQLN/phXdU=";
};
meta = {

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

@ -6,12 +6,12 @@
}:
buildPythonPackage rec {
version = "1.0.3";
version = "1.0.4";
pname = "pytest-annotate";
src = fetchPypi {
inherit pname version;
sha256 = "1ef5924aca93a7b47edaf46a38284fb5a173eed5e3b1a93ec00c8e35f0dd76ab";
sha256 = "d0da4c3d872a7d5796ac85016caa1da38ae902bebdc759e1b6c0f6f8b5802741";
};
buildInputs = [

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

@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "schema";
version = "0.7.4";
version = "0.7.5";
src = fetchPypi {
inherit pname version;
sha256 = "fbb6a52eb2d9facf292f233adcc6008cffd94343c63ccac9a1cb1f3e6de1db17";
sha256 = "f06717112c61895cabc4707752b88716e8420a8819d71404501e114f91043197";
};
preConfigure = ''

5
pkgs/development/python-modules/simple-rest-client/default.nix
View File

@ -12,7 +12,8 @@
buildPythonPackage rec {
pname = "simple-rest-client";
version = "1.1.1";
version = "1.1.2";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -20,7 +21,7 @@ buildPythonPackage rec {
owner = "allisson";
repo = "python-simple-rest-client";
rev = version;
sha256 = "sha256-oJXP2/lChlzzKyNiTgJMHkcNkFyy92kTPxgDkon54g8=";
sha256 = "sha256-kyoFtPa94c5EAT7wBEXdkPEg8Bp3hJQQoFsutap1qvs=";
};
propagatedBuildInputs = [

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

@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "sphinxcontrib-blockdiag";
version = "2.0.0";
version = "3.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "91fd35b64f1f25db59d80b8a5196ed4ffadf57a81f63ee207e34d53ec36d8f97";
sha256 = "aa49bf924516f5de8a479994c7be81e077df5599c9da2a082003d5b388e1d450";
};
buildInputs = [ mock sphinx-testing ];

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

@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "sphinxcontrib-seqdiag";
version = "2.0.0";
version = "3.0.0";
src = fetchPypi {
inherit pname version;
hash = "sha256-THJ1ra/W2X/lQaDjGbL27VMn0lWPJApwgKMrPhL0JY0=";
hash = "sha256-QH5IeXZz9x2Ujp/6BHFsrB2ZqeyPYW3jdk1C0DNBZXQ=";
};
propagatedBuildInputs = [ sphinx blockdiag seqdiag ];

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

@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "sphinxcontrib-spelling";
version = "7.2.1";
version = "7.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "f2578653014931b32c8c30d1a9930d998ae053b0d8b7adfbea0eb95a63e7a737";
sha256 = "a11799366f02fbd3390abf6aa2d4f0fe34df9be6e5ac0b1c8139dbd6c7fb0c99";
};
propagatedBuildInputs = [ sphinx pyenchant pbr ]

39
pkgs/development/python-modules/spur/default.nix Normal file
View File

@ -0,0 +1,39 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, paramiko
, pythonOlder
}:
buildPythonPackage rec {
pname = "spur";
version = "0.3.22";
format = "setuptools";
disabled = pythonOlder "3.4";
src = fetchFromGitHub {
owner = "mwilliamson";
repo = "spur.py";
rev = version;
sha256 = "sha256-YlwezAE7V4ykFsp+bJ2nYRp6HG4I9Bk7Lhq6f1Inn0s=";
};
propagatedBuildInputs = [
paramiko
];
# Tests require a running SSH server
doCheck = false;
pythonImportsCheck = [
"spur"
];
meta = with lib; {
description = "Python module to run commands and manipulate files locally or over SSH";
homepage = "https://github.com/mwilliamson/spur.py";
license = with licenses; [ bsd2 ];
maintainers = with maintainers; [ fab ];
};
}

37
pkgs/development/python-modules/stickytape/default.nix Normal file
View File

@ -0,0 +1,37 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, nose
, pytestCheckHook
, pythonOlder
, spur
}:
buildPythonPackage rec {
pname = "stickytape";
version = "0.2.1";
format = "setuptools";
disabled = pythonOlder "3.4";
src = fetchFromGitHub {
owner = "mwilliamson";
repo = pname;
rev = version;
sha256 = "sha256-KOZN9oxPb91l8QVU07I49UMNXqox8j+oekA1fMtj6l8=";
};
# Tests have additional requirements
doCheck = false;
pythonImportsCheck = [
"stickytape"
];
meta = with lib; {
description = "Python module to convert Python packages into a single script";
homepage = "https://github.com/mwilliamson/stickytape";
license = with licenses; [ bsd2 ];
maintainers = with maintainers; [ fab ];
};
}

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

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "vt-py";
version = "0.9.0";
version = "0.11.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "VirusTotal";
repo = pname;
rev = version;
rev = "v${version}";
sha256 = "sha256-PpgN9adGNZOorOUigsBVOb//ZafUaYHfo/Fv1IZf/XA=";
};

4
pkgs/servers/corosync/default.nix
View File

@ -10,11 +10,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "corosync";
version = "3.1.5";
version = "3.1.6";
src = fetchurl {
url = "http://build.clusterlabs.org/corosync/releases/${pname}-${version}.tar.gz";
sha256 = "sha256-O7o+PtgasrCAcRsu4kEC+7530GCwXUvi2jEAgghPC7w=";
sha256 = "sha256-ym7TK01/M+1hSvzodg/ljQ3pLGi1ddSWnrrNiS89Hic=";
};
nativeBuildInputs = [ makeWrapper pkg-config ];

4
pkgs/tools/games/minecraft/fabric-installer/default.nix
View File

@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "fabric-installer";
version = "0.7.4";
version = "0.10.2";
src = fetchurl {
url = "https://maven.fabricmc.net/net/fabricmc/fabric-installer/${version}/fabric-installer-${version}.jar";
sha256 = "0s3nmwpq1qg90c27qh4anvvsg4yzsgcp6kwsb35fsiaaakxn0b8r";
sha256 = "sha256-xjnL1nURAr4z2OZKEqiC/E6+rSvDpxrfGwm/5Bvxxno=";
};
dontUnpack = true;

34
pkgs/tools/security/inql/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ lib
, fetchFromGitHub
, python3
}:
python3.pkgs.buildPythonApplication rec {
pname = "inql";
version = "4.0.5";
src = fetchFromGitHub {
owner = "doyensec";
repo = pname;
rev = "v${version}";
sha256 = "sha256-0LPJMCg7F9kcPcq4jkADdCPNLfRThXu8QHy4qOn7+QU=";
};
propagatedBuildInputs = with python3.pkgs; [
stickytape
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [
"inql"
];
meta = with lib; {
description = "Security testing tool for GraphQL";
homepage = "https://github.com/doyensec/inql";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

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

@ -6538,6 +6538,8 @@ with pkgs;
input-utils = callPackage ../os-specific/linux/input-utils { };
inql = callPackage ../tools/security/inql { };
intecture-agent = callPackage ../tools/admin/intecture/agent.nix { };
intecture-auth = callPackage ../tools/admin/intecture/auth.nix { };

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

@ -9060,6 +9060,8 @@ in {
spotipy = callPackage ../development/python-modules/spotipy { };
spur = callPackage ../development/python-modules/spur { };
spyder = callPackage ../development/python-modules/spyder { };
spyder-kernels = callPackage ../development/python-modules/spyder-kernels { };
@ -9154,6 +9156,8 @@ in {
stevedore = callPackage ../development/python-modules/stevedore { };
stickytape = callPackage ../development/python-modules/stickytape { };
stm32loader = callPackage ../development/python-modules/stm32loader { };
stone = callPackage ../development/python-modules/stone { };