Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-06-30 00:08:54 +00:00 committed by GitHub
commit b987968536
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
59 changed files with 292 additions and 120 deletions

View file

@ -2562,7 +2562,7 @@
name = "Diego Lelis"; name = "Diego Lelis";
}; };
diffumist = { diffumist = {
email = "diffumist@gmail.com"; email = "git@diffumist.me";
github = "diffumist"; github = "diffumist";
githubId = 32810399; githubId = 32810399;
name = "Diffumist"; name = "Diffumist";
@ -7228,10 +7228,10 @@
name = "Marko Poikonen"; name = "Marko Poikonen";
}; };
mtreca = { mtreca = {
email = "maxime@treca.dev"; email = "maxime.treca@gmail.com";
name = "Maxime Tréca";
github = "mtreca"; github = "mtreca";
githubId = 16440823; githubId = 16440823;
name = "Maxime Tréca";
}; };
mtreskin = { mtreskin = {
email = "zerthurd@gmail.com"; email = "zerthurd@gmail.com";

View file

@ -40,7 +40,7 @@ let
}; };
nixos-option = nixos-option =
if lib.versionAtLeast (lib.getVersion pkgs.nix) "2.4pre" if lib.versionAtLeast (lib.getVersion config.nix.package) "2.4pre"
then null then null
else pkgs.callPackage ./nixos-option { }; else pkgs.callPackage ./nixos-option { };

View file

@ -189,6 +189,7 @@ in
# manually paste it in place. Just symlink. # manually paste it in place. Just symlink.
# otherwise, create the target file, ready for users to insert the token # otherwise, create the target file, ready for users to insert the token
mkdir -p $(dirname ${certmgrAPITokenPath})
if [ -f "${cfsslAPITokenPath}" ]; then if [ -f "${cfsslAPITokenPath}" ]; then
ln -fs "${cfsslAPITokenPath}" "${certmgrAPITokenPath}" ln -fs "${cfsslAPITokenPath}" "${certmgrAPITokenPath}"
else else

View file

@ -59,7 +59,7 @@ in
description = "Kubernetes Proxy Service"; description = "Kubernetes Proxy Service";
wantedBy = [ "kubernetes.target" ]; wantedBy = [ "kubernetes.target" ];
after = [ "kube-apiserver.service" ]; after = [ "kube-apiserver.service" ];
path = with pkgs; [ iptables conntrack_tools ]; path = with pkgs; [ iptables conntrack-tools ];
serviceConfig = { serviceConfig = {
Slice = "kubernetes.slice"; Slice = "kubernetes.slice";
ExecStart = ''${top.package}/bin/kube-proxy \ ExecStart = ''${top.package}/bin/kube-proxy \

View file

@ -4,7 +4,7 @@ with lib;
let let
cfg = config.services.xserver.windowManager.fvwm; cfg = config.services.xserver.windowManager.fvwm;
fvwm = pkgs.fvwm.override { gestures = cfg.gestures; }; fvwm = pkgs.fvwm.override { enableGestures = cfg.gestures; };
in in
{ {

View file

@ -40,7 +40,7 @@ let
allowedTCPPorts = [ allowedTCPPorts = [
10250 # kubelet 10250 # kubelet
]; ];
trustedInterfaces = ["docker0"]; trustedInterfaces = ["mynet"];
extraCommands = concatMapStrings (node: '' extraCommands = concatMapStrings (node: ''
iptables -A INPUT -s ${node.config.networking.primaryIPAddress} -j ACCEPT iptables -A INPUT -s ${node.config.networking.primaryIPAddress} -j ACCEPT
@ -61,6 +61,13 @@ let
advertiseAddress = master.ip; advertiseAddress = master.ip;
}; };
masterAddress = "${masterName}.${config.networking.domain}"; masterAddress = "${masterName}.${config.networking.domain}";
# workaround for:
# https://github.com/kubernetes/kubernetes/issues/102676
# (workaround from) https://github.com/kubernetes/kubernetes/issues/95488
kubelet.extraOpts = ''\
--cgroups-per-qos=false \
--enforce-node-allocatable="" \
'';
}; };
} }
(optionalAttrs (any (role: role == "master") machine.roles) { (optionalAttrs (any (role: role == "master") machine.roles) {

View file

@ -7,18 +7,18 @@
buildGoModule rec { buildGoModule rec {
pname = "expenses"; pname = "expenses";
version = "0.2.1"; version = "0.2.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "manojkarthick"; owner = "manojkarthick";
repo = "expenses"; repo = "expenses";
rev = "v${version}"; rev = "v${version}";
sha256 = "11wxaqbnrrg0rykx5905chi6rhmai1nqggdbhh6hiappr5rksl0j"; sha256 = "sha256-CaIbLtP7ziv9UBQE+QsNnqX65OV+6GIvkLwKm1G++iY=";
}; };
vendorSha256 = "1kwj63wl4kb16zl3lmi9bzj1az7vi453asdy52na0mjx4ymmjyk1"; vendorSha256 = "sha256-NWTFxF4QCH1q1xx+hmVmpvDeOlqH5Ai2+0ParE5px9M=";
# package does not contain any tests as of v0.2.1 # package does not contain any tests as of v0.2.2
doCheck = false; doCheck = false;
buildInputs = [ sqlite ]; buildInputs = [ sqlite ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "logseq"; pname = "logseq";
version = "0.2.0"; version = "0.2.2";
src = fetchurl { src = fetchurl {
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
sha256 = "uFINB8WXFbtI/WMFvqirAygzwK7I/8+8YPeyCd+xQ5w="; sha256 = "03l5w0fg3laiz85k4g4w98ngaziyfr9s24xshjrfl71q6r9s813m";
name = "${pname}-${version}.AppImage"; name = "${pname}-${version}.AppImage";
}; };

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sfm"; pname = "sfm";
version = "0.1"; version = "0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "afify"; owner = "afify";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-i4WzYaJKityIt+LPWCbd6UsPBaYoaS397l5BInOXQQA="; hash = "sha256-DwXKrSqcebNI5N9REXyMV16W2kr72IH9+sKSVehc5zw=";
}; };
configFile = lib.optionalString (conf!=null) (lib.writeText "config.def.h" conf); configFile = lib.optionalString (conf!=null) (lib.writeText "config.def.h" conf);

View file

@ -12,9 +12,9 @@
buildGoModule rec { buildGoModule rec {
pname = "minikube"; pname = "minikube";
version = "1.20.0"; version = "1.21.0";
vendorSha256 = "sha256-ncgf2C4PZMoVMZIMDn9LwP2EDqg7T/WbUPRd/SqGGnU="; vendorSha256 = "sha256-3G9QO5OMnMkMCsGIze/E9bvx6fvlXtOqiv8lGTkLN3s=";
doCheck = false; doCheck = false;
@ -22,7 +22,7 @@ buildGoModule rec {
owner = "kubernetes"; owner = "kubernetes";
repo = "minikube"; repo = "minikube";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-TnvbO8OLjnI5WGy3QR4OZbesOBat2VsL7ElCnj2Tkmk="; sha256 = "sha256-PbCwGPJZvnJCIVK7FYa1gI4aO4sIeh8iQtYOHAQBaZE=";
}; };
nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ]; nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ];

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "tektoncd-cli"; pname = "tektoncd-cli";
version = "0.19.0"; version = "0.19.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tektoncd"; owner = "tektoncd";
repo = "cli"; repo = "cli";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-fWcHjpfbpj2lrJ0FawhQJuSxAEX1WwOY7m+CAgag4qk="; sha256 = "sha256-duJSTk5LmJWbaVYybZZHWDe8E/ZqZLCCsdPIiH5d/G4=";
}; };
vendorSha256 = null; vendorSha256 = null;

View file

@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "maestral-qt"; pname = "maestral-qt";
version = "1.4.4"; version = "1.4.5";
disabled = python3.pkgs.pythonOlder "3.6"; disabled = python3.pkgs.pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SamSchott"; owner = "SamSchott";
repo = "maestral-qt"; repo = "maestral-qt";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-4IrLwpdMepXBxjgR6euENuVKaPRU0dLiApJO45DB2C4="; sha256 = "sha256-HaEQTmpyM1r/+rTkki93aStdzdnhNmkfNJTZRTPehTw=";
}; };
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [

View file

@ -1,16 +1,16 @@
{ lib, fetchurl, mkDerivation, cmake, pkg-config, qtbase, qtkeychain, sqlite, libsecret }: { lib, fetchurl, mkDerivation, cmake, extra-cmake-modules, pkg-config, qtbase, qtkeychain, sqlite, libsecret }:
mkDerivation rec { mkDerivation rec {
pname = "owncloud-client"; pname = "owncloud-client";
version = "2.6.3.14058"; version = "2.8.2.4246";
src = fetchurl { src = fetchurl {
url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz"; url = "https://download.owncloud.com/desktop/ownCloud/stable/${version}/source/ownCloud-${version}.tar.xz";
sha256 = "1xcklhvbyg34clm9as2rjnjfwxpwq77lmdxj6qc0w7q43viqvlz3"; sha256 = "0cc2e5154a1349bd21941ac3c32e8621778a9ff150730a19de2710e22d32fc43";
}; };
nativeBuildInputs = [ pkg-config cmake ]; nativeBuildInputs = [ pkg-config cmake extra-cmake-modules ];
buildInputs = [ qtbase qtkeychain sqlite ]; buildInputs = [ qtbase qtkeychain sqlite libsecret ];
qtWrapperArgs = [ qtWrapperArgs = [
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}" "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}"

View file

@ -2,11 +2,11 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "fava"; pname = "fava";
version = "1.18"; version = "1.19";
src = python3.pkgs.fetchPypi { src = python3.pkgs.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "21336b695708497e6f00cab77135b174c51feb2713b657e0e208282960885bf5"; sha256 = "def7c0210bf0ce8dfffdb46ce21b3efcf71eba5a4e903565258419e4c53c2d43";
}; };
nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; nativeBuildInputs = with python3.pkgs; [ setuptools-scm ];

View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sumo"; pname = "sumo";
version = "1.8.0"; version = "1.9.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "eclipse"; owner = "eclipse";
repo = "sumo"; repo = "sumo";
rev = "v${lib.replaceStrings ["."] ["_"] version}"; rev = "v${lib.replaceStrings ["."] ["_"] version}";
sha256 = "1w9im1zz8xnkdwmv4v11kn1xcqm889268g1fw4y2s9f6shi41mxx"; sha256 = "0zpd331vy1kfi4hfiszv3m8wl4m0wdfr3zzza200kkaakw5hjxhs";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -33,7 +33,6 @@ stdenv.mkDerivation rec {
jdk jdk
libGL libGL
libGLU libGLU
libX11
libjpeg libjpeg
libpng libpng
libtiff libtiff
@ -44,6 +43,7 @@ stdenv.mkDerivation rec {
zlib zlib
python3 python3
] ++ (with xorg; [ ] ++ (with xorg; [
libX11
libXcursor libXcursor
libXext libXext
libXfixes libXfixes

View file

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "delta"; pname = "delta";
version = "0.8.1"; version = "0.8.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dandavison"; owner = "dandavison";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-YS4XuP5V7HLhz6PTwbz4mqVdzRDQvpwwL7oYeQW8Xcs="; sha256 = "sha256-ztRwUf73ioygkgmE9t/EKJPerJJscJYG4YNeNdzXH1g=";
}; };
cargoSha256 = "sha256-wX7x6SbbEWFBo5HeXTjb3r4IJ2leP4T0nVqf43Bl94k="; cargoSha256 = "sha256-cCMHMGHfI0JyIL8+q2fyzamBGGHZx3mc2FpwTUa4S9Y=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "gh"; pname = "gh";
version = "1.11.0"; version = "1.12.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cli"; owner = "cli";
repo = "cli"; repo = "cli";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-rUGhKiTB5uVMbW0HdOEvubGkWh1ARUXCnGR7ezmsT3g="; sha256 = "sha256-b0pbcRcdfkHrqlALHcUzmVujkeKNFHdWd3ENPXZ5WYk=";
}; };
vendorSha256 = "sha256-ndsjmY/UCFyegm8yP7BopYMh5eZ8/fftWfxW4r5los0="; vendorSha256 = "sha256-ndsjmY/UCFyegm8yP7BopYMh5eZ8/fftWfxW4r5los0=";

View file

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "A tiling window manager based on binary space partitioning"; description = "A tiling window manager based on binary space partitioning";
homepage = "https://github.com/baskerville/bspwm"; homepage = "https://github.com/baskerville/bspwm";
maintainers = with maintainers; [ meisternu epitrochoid rvolosatovs ]; maintainers = with maintainers; [ meisternu epitrochoid ];
license = licenses.bsd2; license = licenses.bsd2;
platforms = platforms.linux; platforms = platforms.linux;
}; };

View file

@ -1,14 +1,14 @@
{ stdenv, lib, fetchFromGitHub }: { stdenvNoCC, lib, fetchFromGitHub }:
stdenv.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "spdx-license-list-data"; pname = "spdx-license-list-data";
version = "3.12"; version = "3.13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "spdx"; owner = "spdx";
repo = "license-list-data"; repo = "license-list-data";
rev = "v${version}"; rev = "v${version}";
sha256 = "09xci8dzblg3d30jf7s43zialbcxlxly03zrkiymcvnzixg8v48f"; sha256 = "184qfz8jifkd4jvqkdfmcgplf12cdx83gynb7mxzmkfg2xymlr0g";
}; };
installPhase = '' installPhase = ''

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "materia-kde-theme"; pname = "materia-kde-theme";
version = "20210612"; version = "20210624";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "PapirusDevelopmentTeam"; owner = "PapirusDevelopmentTeam";
repo = "materia-kde"; repo = "materia-kde";
rev = version; rev = version;
sha256 = "P76rLj7x4KpYb3hdHBSUM8X/RcxKoJl1THIXHdfPoAY="; sha256 = "jmUJAWoQ/GVPNQOjlyZBg4rIIo+rhzr5imnCFAWOtrA=";
}; };
makeFlags = [ "PREFIX=$(out)" ]; makeFlags = [ "PREFIX=$(out)" ];

View file

@ -11,7 +11,7 @@
let let
major = "11"; major = "11";
minor = "0"; minor = "0";
update = "10"; update = "11";
build = "9"; build = "9";
openjdk = stdenv.mkDerivation rec { openjdk = stdenv.mkDerivation rec {
@ -22,7 +22,7 @@ let
owner = "openjdk"; owner = "openjdk";
repo = "jdk${major}u"; repo = "jdk${major}u";
rev = "jdk-${version}"; rev = "jdk-${version}";
sha256 = "06pm3hpz4ggiqwvkgzxr39y9kga7vk4flakfznz5979bvgb926vw"; sha256 = "0jncsj424340xjfwv6sx5hy9sas80qa3ymkx0ng3by3z01y5rgfx";
}; };
nativeBuildInputs = [ pkg-config autoconf unzip ]; nativeBuildInputs = [ pkg-config autoconf unzip ];

View file

@ -71,6 +71,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/evaleev/libint"; homepage = "https://github.com/evaleev/libint";
license = with licenses; [ lgpl3Only gpl3Only ]; license = with licenses; [ lgpl3Only gpl3Only ];
maintainers = [ maintainers.markuskowa ]; maintainers = [ maintainers.markuskowa ];
platforms = platforms.linux; platforms = [ "x86_64-linux" ];
}; };
} }

View file

@ -6,12 +6,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "adafruit-platformdetect"; pname = "adafruit-platformdetect";
version = "3.14.0"; version = "3.14.2";
src = fetchPypi { src = fetchPypi {
pname = "Adafruit-PlatformDetect"; pname = "Adafruit-PlatformDetect";
inherit version; inherit version;
sha256 = "1v33546cflsbm6k8mhmi1r5c8fqjlirvzmf62a604xns8wrxb88h"; sha256 = "sha256-SFqSTNKZMETRf9RxSD6skzAVpxepmW+JG/gqZgFX06A=";
}; };
nativeBuildInputs = [ setuptools-scm ]; nativeBuildInputs = [ setuptools-scm ];

View file

@ -15,13 +15,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "hass-nabucasa"; pname = "hass-nabucasa";
version = "0.43.1"; version = "0.44.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nabucasa"; owner = "nabucasa";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-eQdbAQRKqnJGxnSTkk3gld9TX9MpP3J8LFNYH6peVIY="; sha256 = "sha256-cfKuqkIgmbo7/kUIpJFbckyQ0uDrxXmdsI7qORX0PWc=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -0,0 +1,35 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, requests
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "hikvision";
version = "2.0.4";
src = fetchFromGitHub {
owner = "fbradyirl";
repo = pname;
rev = "v${version}";
sha256 = "1l0zvir4hf1pcwwcmrhkspbdljzmi4lknxar5bkipdanpsm588mn";
};
propagatedBuildInputs = [
requests
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "hikvision.api" ];
meta = with lib; {
description = "Python module for interacting with Hikvision IP Cameras";
homepage = "https://github.com/fbradyirl/hikvision";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -9,14 +9,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "maestral"; pname = "maestral";
version = "1.4.4"; version = "1.4.5";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SamSchott"; owner = "SamSchott";
repo = "maestral"; repo = "maestral";
rev = "v${version}"; rev = "v${version}";
sha256 = "03scg4y13jbi8n454hc4vq8p02isbhppqx0zhbady639p7l3ggfg"; sha256 = "sha256-kyOBF+qsl/+9u0P+EmfxbuJNGMqPSLCWJUlcZMyKJH4=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -28,14 +28,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "matrix-nio"; pname = "matrix-nio";
version = "0.18.1"; version = "0.18.3";
format = "pyproject"; format = "pyproject";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "poljar"; owner = "poljar";
repo = "matrix-nio"; repo = "matrix-nio";
rev = version; rev = version;
sha256 = "QHNirglqSxGMmbST96LUp9MHoGj0yAwLoTRlsbMqwaM="; sha256 = "1sjdqzlk8vgv0748ayhnadw1bip3i4bfga4knb94cfkd3s4rgb39";
}; };
postPatch = '' postPatch = ''

View file

@ -13,13 +13,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pubnub"; pname = "pubnub";
version = "5.1.3"; version = "5.1.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = "python"; repo = "python";
rev = "v${version}"; rev = "v${version}";
sha256 = "0mpw2wzbpb60lnrsnw8mc88mxxhslpnc5nvkjyc3v2dbqs5cnmy5"; sha256 = "sha256-aDmmF3T5v6NX3kut7cydEJNRw4mkrGt4X0+WOm/ZCVo=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -0,0 +1,33 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pyserial
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pyrfxtrx";
version = "0.27.0";
src = fetchFromGitHub {
owner = "Danielhiversen";
repo = "pyRFXtrx";
rev = version;
sha256 = "0nzgy56b2v3bnn9idlb67qkzj4cj5j9v1436ri1y305fqwjy48nm";
};
propagatedBuildInputs = [
pyserial
];
checkInputs = [
pytestCheckHook
];
meta = with lib; {
description = "Library to communicate with the RFXtrx family of devices";
homepage = "https://github.com/Danielhiversen/pyRFXtrx";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ dotlambda ];
};
}

View file

@ -17,13 +17,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pytenable"; pname = "pytenable";
version = "1.3.0"; version = "1.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tenable"; owner = "tenable";
repo = "pyTenable"; repo = "pyTenable";
rev = version; rev = version;
sha256 = "sha256-APwBC1fL5JtYL5E/pabQpwGD1OtFMNPeWi/b9+hbhBE="; sha256 = "sha256-9qkNQ3+yDplPHIXDwlghpJP1f+UoDYObWpPhl6UVtHU=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -7,13 +7,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "requests-pkcs12"; pname = "requests-pkcs12";
version = "1.9"; version = "1.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "m-click"; owner = "m-click";
repo = "requests_pkcs12"; repo = "requests_pkcs12";
rev = version; rev = version;
sha256 = "09nm3c6v911d1vwwi0f7mzapbkq7rnsl7026pb13j6ma8pkxznms"; sha256 = "sha256-HIUCzHxOsbk1OmcxkRK9GQ+SZ6Uf1xDylOe2pUYz3Hk=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -0,0 +1,43 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, aiohttp
, python-dateutil
, tenacity
}:
buildPythonPackage rec {
pname = "smart-meter-texas";
version = "0.4.3";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "grahamwetzler";
repo = "smart-meter-texas";
rev = "v${version}";
sha256 = "09n03wbyjh1b1gsiibf17fg86x7k1i1r1kpp94p7w1lcdbmn8v5c";
};
postPatch = ''
substituteInPlace setup.py \
--replace "pytest-runner" ""
'';
propagatedBuildInputs = [
aiohttp
python-dateutil
tenacity
];
# no tests implemented
doCheck = false;
meta = with lib; {
description = "Connect to and retrieve data from the unofficial Smart Meter Texas API";
homepage = "https://github.com/grahamwetzler/smart-meter-texas";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

View file

@ -0,0 +1,31 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
}:
buildPythonPackage rec {
pname = "somfy-mylink-synergy";
version = "1.0.6";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "bendews";
repo = "somfy-mylink-synergy";
rev = "v${version}";
sha256 = "1aa178b5lxdzfa4z7sjw6ky39dkfazp7dqs9dq78z2zay2sqgmgr";
};
# no tests implemented
doCheck = false;
pythonImportsCheck = [ "somfy_mylink_synergy" ];
meta = with lib; {
description = "Python API to utilise the Somfy Synergy JsonRPC API";
homepage = "https://github.com/bendews/somfy-mylink-synergy";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

View file

@ -33,6 +33,7 @@ buildPythonPackage rec {
preCheck = '' preCheck = ''
export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf
export HOME=$TMPDIR
''; '';
meta = with lib; { meta = with lib; {

View file

@ -9,7 +9,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "zwave-js-server-python"; pname = "zwave-js-server-python";
version = "0.26.1"; version = "0.27.0";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs"; owner = "home-assistant-libs";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1rh6wim5hr9lygvgria7lr6x61sdyrv3drrrirgv9p9gl3rxcj6m"; sha256 = "sha256-ClZ9B20NphN5XewqEtHpUMNHuuVxs1RJBcxWi6TzT1Y=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "sqlfluff"; pname = "sqlfluff";
version = "0.6.0a2"; version = "0.6.0";
disabled = python3.pythonOlder "3.6"; disabled = python3.pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "13hzr0jialzi2nlvqwvff3w0h6jikqvcg0p2p4irwlisg4db8w7w"; sha256 = "sha256-RW3+NpKZns3Jo1b3GfTymUE74pVoJi9f0zi4j4mUGiY=";
}; };
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [

View file

@ -28,7 +28,7 @@ buildPythonApplication rec {
homepage = "https://github.com/ARMmbed/mbed-cli"; homepage = "https://github.com/ARMmbed/mbed-cli";
description = "Arm Mbed Command Line Interface"; description = "Arm Mbed Command Line Interface";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ rvolosatovs ]; maintainers = with maintainers; [ ];
}; };
} }

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "protoc-gen-go"; pname = "protoc-gen-go";
version = "1.27.0"; version = "1.27.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "protocolbuffers"; owner = "protocolbuffers";
repo = "protobuf-go"; repo = "protobuf-go";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-1L0GYXrtTYkk5eLXkfVxzbZMZKgyzSpkDaI8itb6NnA="; sha256 = "sha256-wkUvMsoJP38KMD5b3Fz65R1cnpeTtDcVqgE7tNlZXys=";
}; };
vendorSha256 = "sha256-yb8l4ooZwqfvenlxDRg95rqiL+hmsn0weS/dPv/oD2Y="; vendorSha256 = "sha256-yb8l4ooZwqfvenlxDRg95rqiL+hmsn0weS/dPv/oD2Y=";

View file

@ -30,7 +30,7 @@ in stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "https://beta.unity3d.com/download/6e9a27477296/LinuxEditorInstaller/Unity.tar.xz"; url = "https://beta.unity3d.com/download/6e9a27477296/LinuxEditorInstaller/Unity.tar.xz";
sha1 = "083imikkrgha5w9sihjvv1m74naxm5yv"; sha256 = "10gppnqacs1qzahj077nkcgbfz2lryd0dxnfcmvyc64xpxnj9nlk";
}; };
nosuidLib = ./unity-nosuid.c; nosuidLib = ./unity-nosuid.c;

View file

@ -17,15 +17,15 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "deno"; pname = "deno";
version = "1.11.2"; version = "1.11.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "denoland"; owner = "denoland";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-/dy+jAm9TioDF8rZtLNFlKcu7ASzvvoVq4dun4gkiCA="; sha256 = "sha256-Ru75eyyyaaFDD71AzDE5kgLsiB7thjqrJvvnA/PdvrA=";
}; };
cargoSha256 = "sha256-AUNDwbiGHiA+GADnLo/CmKAMhv68BPnvXsZaWacDJ2Y="; cargoSha256 = "sha256-8UnsmIDdFEKp4diJ6Cr/fsbPKlw7wGHmGjXu5oqh2HI=";
# Install completions post-install # Install completions post-install
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View file

@ -1,12 +1,13 @@
{ lib, stdenv, SDL, fetchurl, gzip, libvorbis, libmad }: { lib, stdenv, SDL, fetchurl, gzip, libvorbis, libmad }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "quakespasm"; pname = "quakespasm";
majorVersion = "0.93"; majorVersion = "0.93";
version = "${majorVersion}.1"; version = "${majorVersion}.2";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/quakespasm/quakespasm-${version}.tgz"; url = "mirror://sourceforge/quakespasm/quakespasm-${version}.tgz";
sha256 = "1bimv18f6rzhyjz78yvw2vqr5n0kdqbcqmq7cb3m951xgsxfcgpd"; sha256 = "0qm0j5drybvvq8xadfyppkpk3rxqsxbywzm6iwsjwdf0iia3gss5";
}; };
sourceRoot = "${pname}-${version}/Quake"; sourceRoot = "${pname}-${version}/Quake";
@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
meta = { meta = with lib; {
description = "An engine for iD software's Quake"; description = "An engine for iD software's Quake";
homepage = "http://quakespasm.sourceforge.net/"; homepage = "http://quakespasm.sourceforge.net/";
longDescription = '' longDescription = ''
@ -36,7 +37,7 @@ stdenv.mkDerivation rec {
and smoother mouse input - though no CD support. and smoother mouse input - though no CD support.
''; '';
platforms = lib.platforms.linux; platforms = platforms.linux;
maintainers = [ lib.maintainers.m3tti ]; maintainers = with maintainers; [ m3tti ];
}; };
} }

View file

@ -2,16 +2,17 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "irqbalance"; pname = "irqbalance";
version = "1.7.0"; version = "1.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "irqbalance"; owner = "irqbalance";
repo = "irqbalance"; repo = "irqbalance";
rev = "v${version}"; rev = "v${version}";
sha256 = "1677ap6z4hvwga0vb8hrvpc0qggyarg9mlg11pxywz7mq94vdx19"; sha256 = "sha256-K+Nv6HqBZb0pwfNV127QDq+suaUD7TTV413S6j8NdUU=";
}; };
nativeBuildInputs = [ autoreconfHook pkg-config ]; nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ glib ncurses libcap_ng ]; buildInputs = [ glib ncurses libcap_ng ];
LDFLAGS = "-lncurses"; LDFLAGS = "-lncurses";
@ -26,10 +27,12 @@ stdenv.mkDerivation rec {
--replace ' $IRQBALANCE_ARGS' "" --replace ' $IRQBALANCE_ARGS' ""
''; '';
meta = { meta = with lib; {
homepage = "https://github.com/Irqbalance/irqbalance"; homepage = "https://github.com/Irqbalance/irqbalance";
changelog = "https://github.com/Irqbalance/irqbalance/releases/tag/v${version}";
description = "A daemon to help balance the cpu load generated by interrupts across all of a systems cpus"; description = "A daemon to help balance the cpu load generated by interrupts across all of a systems cpus";
license = lib.licenses.gpl2; license = licenses.gpl2Only;
platforms = lib.platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ fortuneteller2k ];
}; };
} }

View file

@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null);
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "atlassian-confluence"; pname = "atlassian-confluence";
version = "7.11.0"; version = "7.12.2";
src = fetchurl { src = fetchurl {
url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz";
sha256 = "sha256-/D/fMg+WRkGGV4NG73gvVDZwwi/8BB0w6IWK/OQ3caA="; sha256 = "sha256-SZFyHU6Uy/opwfW0B+hnp+3wQkf+6w2/P25JH+BfLGY=";
}; };
buildPhase = '' buildPhase = ''

View file

@ -347,7 +347,7 @@
"heos" = ps: with ps; [ pyheos ]; "heos" = ps: with ps; [ pyheos ];
"here_travel_time" = ps: with ps; [ herepy ]; "here_travel_time" = ps: with ps; [ herepy ];
"hikvision" = ps: with ps; [ ]; # missing inputs: pyhik "hikvision" = ps: with ps; [ ]; # missing inputs: pyhik
"hikvisioncam" = ps: with ps; [ ]; # missing inputs: hikvision "hikvisioncam" = ps: with ps; [ hikvision ];
"hisense_aehw4a1" = ps: with ps; [ pyaehw4a1 ]; "hisense_aehw4a1" = ps: with ps; [ pyaehw4a1 ];
"history" = ps: with ps; [ aiohttp-cors sqlalchemy ]; "history" = ps: with ps; [ aiohttp-cors sqlalchemy ];
"history_stats" = ps: with ps; [ sqlalchemy ]; "history_stats" = ps: with ps; [ sqlalchemy ];
@ -696,7 +696,7 @@
"rest" = ps: with ps; [ jsonpath xmltodict ]; "rest" = ps: with ps; [ jsonpath xmltodict ];
"rest_command" = ps: with ps; [ ]; "rest_command" = ps: with ps; [ ];
"rflink" = ps: with ps; [ rflink ]; "rflink" = ps: with ps; [ rflink ];
"rfxtrx" = ps: with ps; [ ]; # missing inputs: pyRFXtrx "rfxtrx" = ps: with ps; [ pyrfxtrx ];
"ring" = ps: with ps; [ ha-ffmpeg ring-doorbell ]; "ring" = ps: with ps; [ ha-ffmpeg ring-doorbell ];
"ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api "ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api
"risco" = ps: with ps; [ pyrisco ]; "risco" = ps: with ps; [ pyrisco ];
@ -767,7 +767,7 @@
"slide" = ps: with ps; [ ]; # missing inputs: goslide-api "slide" = ps: with ps; [ ]; # missing inputs: goslide-api
"sma" = ps: with ps; [ pysma ]; "sma" = ps: with ps; [ pysma ];
"smappee" = ps: with ps; [ aiohttp-cors pysmappee ]; "smappee" = ps: with ps; [ aiohttp-cors pysmappee ];
"smart_meter_texas" = ps: with ps; [ ]; # missing inputs: smart-meter-texas "smart_meter_texas" = ps: with ps; [ smart-meter-texas ];
"smarthab" = ps: with ps; [ smarthab ]; "smarthab" = ps: with ps; [ smarthab ];
"smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa pysmartapp pysmartthings ]; "smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa pysmartapp pysmartthings ];
"smarttub" = ps: with ps; [ python-smarttub ]; "smarttub" = ps: with ps; [ python-smarttub ];
@ -785,7 +785,7 @@
"solax" = ps: with ps; [ solax ]; "solax" = ps: with ps; [ solax ];
"soma" = ps: with ps; [ pysoma ]; "soma" = ps: with ps; [ pysoma ];
"somfy" = ps: with ps; [ aiohttp-cors pymfy ]; "somfy" = ps: with ps; [ aiohttp-cors pymfy ];
"somfy_mylink" = ps: with ps; [ ]; # missing inputs: somfy-mylink-synergy "somfy_mylink" = ps: with ps; [ somfy-mylink-synergy ];
"sonarr" = ps: with ps; [ sonarr ]; "sonarr" = ps: with ps; [ sonarr ];
"songpal" = ps: with ps; [ python-songpal ]; "songpal" = ps: with ps; [ python-songpal ];
"sonos" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos ]; "sonos" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos ];

View file

@ -625,6 +625,7 @@ in with py.pkgs; buildPythonApplication rec {
"rest" "rest"
"rest_command" "rest_command"
"rflink" "rflink"
"rfxtrx"
"ring" "ring"
"risco" "risco"
"rituals_perfume_genie" "rituals_perfume_genie"
@ -657,6 +658,7 @@ in with py.pkgs; buildPythonApplication rec {
"sleepiq" "sleepiq"
"sma" "sma"
"smappee" "smappee"
"smart_meter_texas"
"smarthab" "smarthab"
"smartthings" "smartthings"
"smarttub" "smarttub"
@ -666,6 +668,7 @@ in with py.pkgs; buildPythonApplication rec {
"solaredge" "solaredge"
"soma" "soma"
"somfy" "somfy"
"somfy_mylink"
"sonarr" "sonarr"
"songpal" "songpal"
"sonos" "sonos"

View file

@ -12,11 +12,11 @@ let
in in
buildPythonApplication rec { buildPythonApplication rec {
pname = "matrix-synapse"; pname = "matrix-synapse";
version = "1.36.0"; version = "1.37.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-OMbSd64mD2+6GVUxGL4lvQlKAiBuen0PjvyVdk/ePbI="; sha256 = "sha256-BWGbfDBB1jX0PJSR8WCZE3FE1pDs0fRg8/fML3FsJHA=";
}; };
patches = [ patches = [

View file

@ -20,6 +20,6 @@ buildGoModule rec {
description = "A reverse proxy that provides authentication with Google, Github, or other providers"; description = "A reverse proxy that provides authentication with Google, Github, or other providers";
homepage = "https://github.com/oauth2-proxy/oauth2-proxy/"; homepage = "https://github.com/oauth2-proxy/oauth2-proxy/";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; teams.serokell.members ++ [ knl ]; maintainers = teams.serokell.members;
}; };
} }

View file

@ -65,6 +65,6 @@ buildGoPackage rec {
description = "A scalable, survivable, strongly-consistent SQL database"; description = "A scalable, survivable, strongly-consistent SQL database";
license = licenses.bsl11; license = licenses.bsl11;
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
maintainers = with maintainers; [ rushmorem thoughtpolice rvolosatovs ]; maintainers = with maintainers; [ rushmorem thoughtpolice ];
}; };
} }

View file

@ -83,8 +83,8 @@ stdenv.mkDerivation rec {
zlib zlib
]; ];
mesonFlags = [ mesonFlags = [
"-Dxwayland-eglstream=true" "-Dxwayland_eglstream=true"
"-Ddefault-font-path=${defaultFontPath}" "-Ddefault_font-path=${defaultFontPath}"
"-Dxkb_bin_dir=${xkbcomp}/bin" "-Dxkb_bin_dir=${xkbcomp}/bin"
"-Dxkb_dir=${xkeyboard_config}/etc/X11/xkb" "-Dxkb_dir=${xkeyboard_config}/etc/X11/xkb"
"-Dxkb_output_dir=${placeholder "out"}/share/X11/xkb/compiled" "-Dxkb_output_dir=${placeholder "out"}/share/X11/xkb/compiled"

View file

@ -134,7 +134,7 @@ let
fish = stdenv.mkDerivation rec { fish = stdenv.mkDerivation rec {
pname = "fish"; pname = "fish";
version = "3.2.2"; version = "3.3.0";
src = fetchurl { src = fetchurl {
# There are differences between the release tarball and the tarball GitHub # There are differences between the release tarball and the tarball GitHub
@ -144,7 +144,7 @@ let
# --version`), as well as the local documentation for all builtins (and # --version`), as well as the local documentation for all builtins (and
# maybe other things). # maybe other things).
url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz"; url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "WUTaGoiT0RsIKKT9kTbuF0VJ2v+z0K392JF4Vv5rQAk="; sha256 = "sha256-pCFeTKsqWxAbC4hDcgvaPH65jooU3KCVC47xfpQoL6o=";
}; };
# Fix FHS paths in tests # Fix FHS paths in tests

View file

@ -2,15 +2,23 @@
buildFishPlugin rec { buildFishPlugin rec {
pname = "pure"; pname = "pure";
version = "3.4.2"; version = "4.1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rafaelrinaldi"; owner = "pure-fish";
repo = "pure"; repo = "pure";
rev = "v${version}"; rev = "v${version}";
sha256 = "134sz3f98gb6z2vgd5kkm6dd8pka5gijk843c32s616w35y07sga"; sha256 = "1x1h65l8582p7h7w5986sc9vfd7b88a7hsi68dbikm090gz8nlxx";
}; };
# The tests aren't passing either on the project's CI.
# The release notes of the program for v3.5.0 say:
# > Tests are going crazy at the moment, should be fixed once fishtape 3.0
# > is released, and we do the switch.
# This is tracked in https://github.com/pure-fish/pure/issues/272
# and https://github.com/pure-fish/pure/pull/275.
doCheck = false;
checkInputs = [ git ]; checkInputs = [ git ];
checkPlugins = [ fishtape ]; checkPlugins = [ fishtape ];
checkPhase = '' checkPhase = ''

View file

@ -21,7 +21,7 @@ buildGoPackage rec {
meta = with lib; { meta = with lib; {
description = "Color temperature setting library and CLI that operates in a similar way to f.lux and Redshift"; description = "Color temperature setting library and CLI that operates in a similar way to f.lux and Redshift";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ rvolosatovs cstrahan ]; maintainers = with maintainers; [ cstrahan ];
platforms = platforms.linux ++ platforms.windows; platforms = platforms.linux ++ platforms.windows;
}; };
} }

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "abcMIDI"; pname = "abcMIDI";
version = "2021.06.24"; version = "2021.06.27";
src = fetchzip { src = fetchzip {
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
sha256 = "sha256-FaB1QTl4xCTz/sbgptXQHtD0wadXG3UCgdZoOPCOH0U="; sha256 = "sha256-tLKxs1p1CIU/2XV1fMgWrwdtePeXOBZUMjz46kgp9C0=";
}; };
meta = with lib; { meta = with lib; {

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "exploitdb"; pname = "exploitdb";
version = "2021-06-25"; version = "2021-06-29";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "offensive-security"; owner = "offensive-security";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-xaRk/H2jITtU+93+7KxrYTTl0cCObvqcd+F9NNhjMjo="; sha256 = "sha256-RF7+fo6I7rz7PTSHRDikeRpM0f4Bugn+Tt5Z7mjIKIM=";
}; };
installPhase = '' installPhase = ''

View file

@ -5,30 +5,28 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "knockpy"; pname = "knockpy";
version = "5.0.0"; version = "5.1.0";
disabled = python3.pythonOlder "3.6"; disabled = python3.pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "guelfoweb"; owner = "guelfoweb";
repo = "knock"; repo = "knock";
rev = version; rev = version;
sha256 = "1h7sibdxx8y53xm1wydyng418n4j6baiys257msq03cs04jlm7h9"; sha256 = "sha256-4W6/omGPmQFuZ/2AVNgCs2q0ti/P8OY4o7b4/g9q+Rc=";
}; };
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
beautifulsoup4 beautifulsoup4
colorama colorama
matplotlib
networkx
pyqt5
requests requests
]; ];
postPatch = ''
# https://github.com/guelfoweb/knock/pull/95
substituteInPlace setup.py \
--replace "bs4" "beautifulsoup4"
'';
# Project has no tests # Project has no tests
doCheck = false; doCheck = false;
pythonImportsCheck = [ "knockpy" ]; pythonImportsCheck = [ "knockpy" ];
meta = with lib; { meta = with lib; {

View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "stegseek"; pname = "stegseek";
version = "0.5"; version = "0.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "RickdeJager"; owner = "RickdeJager";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "19hzr5533b607ihmjj71x682qjr45s75cqxh9zap21z16346ahqn"; sha256 = "sha256-B5oJffYOYfsH0YRq/Bq0ciIlCsCONyScFBjP7a1lIzo=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View file

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "terrascan"; pname = "terrascan";
version = "1.6.0"; version = "1.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "accurics"; owner = "accurics";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-AIHfG5Z5I91zcogHxGRP7pLauYHICX6NL0bJTp982sQ="; sha256 = "sha256-P16CS1W42Q/glsB9G0kagB5oSgwLb5cGMvKFc9jzd8s=";
}; };
vendorSha256 = "sha256-XzZ3RudyD6YKyc3e3HvUrkXToXs2aFSSCScQgmCfxgQ="; vendorSha256 = "sha256-22T7C4/ph3z+O1c9uC1p2xzg0JFV+TEdfy4iiIS4Y40=";
# tests want to download a vulnerable Terraform project # tests want to download a vulnerable Terraform project
doCheck = false; doCheck = false;

View file

@ -5,13 +5,13 @@
buildGoModule rec { buildGoModule rec {
pname = "traitor"; pname = "traitor";
version = "0.0.3"; version = "0.0.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "liamg"; owner = "liamg";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0mffh4k87ybl0mpglgi2yfwksygrh62mcmkcmfcbszlh5pagsch1"; sha256 = "sha256-UuWJe4nVr87ab3yskqKxnclMg9EywlcgaM/WOREXD/c=";
}; };
vendorSha256 = null; vendorSha256 = null;

View file

@ -3260,6 +3260,8 @@ in {
hijri-converter = callPackage ../development/python-modules/hijri-converter { }; hijri-converter = callPackage ../development/python-modules/hijri-converter { };
hikvision = callPackage ../development/python-modules/hikvision { };
hiredis = callPackage ../development/python-modules/hiredis { }; hiredis = callPackage ../development/python-modules/hiredis { };
hiro = callPackage ../development/python-modules/hiro { }; hiro = callPackage ../development/python-modules/hiro { };
@ -5341,6 +5343,8 @@ in {
pynx584 = callPackage ../development/python-modules/pynx584 { }; pynx584 = callPackage ../development/python-modules/pynx584 { };
pyrfxtrx = callPackage ../development/python-modules/pyrfxtrx { };
pyrogram = callPackage ../development/python-modules/pyrogram { }; pyrogram = callPackage ../development/python-modules/pyrogram { };
pysbd = callPackage ../development/python-modules/pysbd { }; pysbd = callPackage ../development/python-modules/pysbd { };
@ -7986,6 +7990,8 @@ in {
sly = callPackage ../development/python-modules/sly { }; sly = callPackage ../development/python-modules/sly { };
smart-meter-texas = callPackage ../development/python-modules/smart-meter-texas { };
smart-open = callPackage ../development/python-modules/smart-open { }; smart-open = callPackage ../development/python-modules/smart-open { };
smarthab = callPackage ../development/python-modules/smarthab { }; smarthab = callPackage ../development/python-modules/smarthab { };
@ -8060,6 +8066,8 @@ in {
somecomfort = callPackage ../development/python-modules/somecomfort { }; somecomfort = callPackage ../development/python-modules/somecomfort { };
somfy-mylink-synergy = callPackage ../development/python-modules/somfy-mylink-synergy { };
sonarr = callPackage ../development/python-modules/sonarr { }; sonarr = callPackage ../development/python-modules/sonarr { };
sopel = callPackage ../development/python-modules/sopel { }; sopel = callPackage ../development/python-modules/sopel { };