Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-03-15 00:40:27 +00:00 committed by GitHub
commit 8fa4dca9b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
42 changed files with 412 additions and 220 deletions

View file

@ -36,6 +36,7 @@ let
only_admins_can_pause_the_game = true;
autosave_only_on_server = true;
admins = [];
non_blocking_saving = cfg.nonBlockingSaving;
} // cfg.extraSettings;
serverSettingsFile = pkgs.writeText "server-settings.json" (builtins.toJSON (filterAttrsRecursive (n: v: v != null) serverSettings));
modDir = pkgs.factorio-utils.mkModDirDrv cfg.mods;
@ -193,6 +194,15 @@ in
Autosave interval in minutes.
'';
};
nonBlockingSaving = mkOption {
type = types.bool;
default = false;
description = ''
Highly experimental feature, enable only at your own risk of losing your saves.
On UNIX systems, server will fork itself to create an autosave.
Autosaving on connected Windows clients will be disabled regardless of autosave_only_on_server option.
'';
};
};
};

View file

@ -16,13 +16,13 @@ in
stdenv.mkDerivation rec {
pname = "imagemagick";
version = "6.9.12-1";
version = "6.9.12-3";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick6";
rev = version;
sha256 = "1s1zr0fqnm9jl1ni07if2klvf2lfg26dgxdbspksq5xdhsxxn841";
sha256 = "sha256-h9c0N9AcFVpNYpKl+95q1RVJWuacN4N4kbAJIKJp8Jc=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
@ -81,6 +81,7 @@ stdenv.mkDerivation rec {
changelog = "https://legacy.imagemagick.org/script/changelog.php";
description = "A software suite to create, edit, compose, or convert bitmap images";
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ erictapen ];
license = licenses.asl20;
};
}

View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "gphoto2";
version = "2.5.26";
version = "2.5.27";
src = fetchFromGitHub {
owner = "gphoto";
repo = "gphoto2";
rev = "v${version}";
sha256 = "1w01j3qvjl2nlfs38rnsmjvn3r0r2xf7prxz1i6yarbpj3fzwqqc";
sha256 = "sha256-zzlyA2IedyBZ4/TdSmrqbe2le8rFMQ6tY6jF5skJ7l4=";
};
nativeBuildInputs = [

View file

@ -1,6 +1,6 @@
{ lib, buildGoPackage, fetchFromGitHub, ... }:
let version = "0.17.0"; in
let version = "0.18.0"; in
buildGoPackage {
pname = "kubecfg";
@ -10,7 +10,7 @@ buildGoPackage {
owner = "bitnami";
repo = "kubecfg";
rev = "v${version}";
sha256 = "sha256-/91im204vBS3NjrMOvwTVO6tEBgdpirqJFqCnbIB+iQ=";
sha256 = "sha256-TJbuJZDj9ZwEaN8LV/M30+5+IgN8EZCTTBBDB0OgdEE=";
};
goPackagePath = "github.com/bitnami/kubecfg";

View file

@ -14,13 +14,13 @@ let
in stdenv.mkDerivation rec {
pname = "svxlink";
version = "19.09.1";
version = "19.09.2";
src = fetchFromGitHub {
owner = "sm0svx";
repo = pname;
rev = version;
sha256 = "0xmbac821w9kl7imlz0mra19mlhi0rlpbyyay26w1y7h98j4g4yp";
sha256 = "sha256-riyFEuEmJ7+jYT3UoTTsMUwFdO3y5mjo4z0fcC3O8gY=";
};
cmakeFlags = [

View file

@ -13,13 +13,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "mkvtoolnix";
version = "53.0.0";
version = "55.0.0";
src = fetchFromGitLab {
owner = "mbunkus";
repo = "mkvtoolnix";
rev = "release-${version}";
sha256 = "04wjs3sgb3gn85gl8y1svx177d1213hswx37zdsj80giw1k5df79";
sha256 = "129azp4cpdd05f6072gkxdjj811aqs29nbw6v6qm8vv47gfvjcf7";
};
nativeBuildInputs = [
@ -51,6 +51,7 @@ stdenv.mkDerivation rec {
];
CXXFLAGS = optional stdenv.cc.isClang "-std=c++17";
LDFLAGS = optional stdenv.cc.isClang "-lc++fs";
dontWrapQtApps = true;
postFixup = optionalString withGUI ''
@ -60,7 +61,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Cross-platform tools for Matroska";
homepage = "http://www.bunkus.org/videotools/mkvtoolnix/";
license = licenses.gpl2;
license = licenses.gpl2Only;
maintainers = with maintainers; [ codyopel rnhmjoj ];
platforms = platforms.linux
++ optionals (!withGUI) platforms.darwin;

View file

@ -15,11 +15,11 @@ with lib;
buildGoPackage rec {
pname = "singularity";
version = "3.7.1";
version = "3.7.2";
src = fetchurl {
url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz";
sha256 = "sha256-gtLGUGNWAZXsNFUZMb48MluV6OIAnpJ1X9farTRuCDw=";
sha256 = "sha256-NpFiIuJvuTRATwdm4P82jtrDbX/DHKVx9fYJRmYJBms=";
};
goPackagePath = "github.com/sylabs/singularity";

View file

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "luna-icons";
version = "1.0";
version = "1.1";
src = fetchFromGitHub {
owner = "darkomarko42";
repo = pname;
rev = version;
sha256 = "1gggsd7scf15vrpgzvskx4p3jifnjdx0aqndqhvpc6ksdbh3nzqd";
sha256 = "11g740x1asy7jbfn52gp1zx7hzhklw6f97m469wgyi9yf954js15";
};
nativeBuildInputs = [

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "osinfo-db";
version = "20210215";
version = "20210312";
src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
sha256 = "sha256-HIM3sq47+0nImiaw+CjjjgYnBIorwmA6UxaNefjYNZg=";
sha256 = "sha256-dUjsCeRFynN4xc65njntyohX+Ck4MeCzy1WPQjCHDhA=";
};
nativeBuildInputs = [ osinfo-db-tools gettext libxml2 ];

View file

@ -0,0 +1,78 @@
{ lib, gccStdenv, fetchzip, boost, cmake, ncurses, python3, coreutils
, z3Support ? true, z3 ? null, cvc4Support ? true, cvc4 ? null
, cln ? null, gmp ? null
}:
# compiling source/libsmtutil/CVC4Interface.cpp breaks on clang on Darwin,
# general commandline tests fail at abiencoderv2_no_warning/ on clang on NixOS
assert z3Support -> z3 != null && lib.versionAtLeast z3.version "4.6.0";
assert cvc4Support -> cvc4 != null && cln != null && gmp != null;
let
jsoncppVersion = "1.9.4";
jsoncppUrl = "https://github.com/open-source-parsers/jsoncpp/archive/${jsoncppVersion}.tar.gz";
jsoncpp = fetchzip {
url = jsoncppUrl;
sha256 = "0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv";
};
in
gccStdenv.mkDerivation rec {
pname = "solc";
version = "0.7.4";
# upstream suggests avoid using archive generated by github
src = fetchzip {
url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz";
sha256 = "02261l54jdbvxk612z7zsyvmchy1rx4lf27b3f616sd7r56krpkg";
};
postPatch = ''
substituteInPlace cmake/jsoncpp.cmake \
--replace "${jsoncppUrl}" ${jsoncpp}
'';
cmakeFlags = [
"-DBoost_USE_STATIC_LIBS=OFF"
] ++ lib.optionals (!z3Support) [
"-DUSE_Z3=OFF"
] ++ lib.optionals (!cvc4Support) [
"-DUSE_CVC4=OFF"
];
nativeBuildInputs = [ cmake ];
buildInputs = [ boost ]
++ lib.optionals z3Support [ z3 ]
++ lib.optionals cvc4Support [ cvc4 cln gmp ];
checkInputs = [ ncurses python3 ];
# Test fails on darwin for unclear reason
doCheck = gccStdenv.hostPlatform.isLinux;
checkPhase = ''
while IFS= read -r -d ''' dir
do
LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$(pwd)/$dir
export LD_LIBRARY_PATH
done < <(find . -type d -print0)
pushd ..
# IPC tests need aleth avaliable, so we disable it
sed -i "s/IPC_ENABLED=true/IPC_ENABLED=false\nIPC_FLAGS=\"--no-ipc\"/" ./scripts/tests.sh
for i in ./scripts/*.sh ./scripts/*.py ./test/*.sh; do
patchShebangs "$i"
done
TERM=xterm ./scripts/tests.sh
popd
'';
meta = with lib; {
description = "Compiler for Ethereum smart contract language Solidity";
homepage = "https://github.com/ethereum/solidity";
license = licenses.gpl3;
platforms = with platforms; linux; # darwin is currently broken
maintainers = with maintainers; [ dbrock akru lionello sifmelcara ];
inherit version;
};
}

View file

@ -1,6 +1,16 @@
{ lib, gccStdenv, fetchzip, boost, cmake, ncurses, python3, coreutils
, z3Support ? true, z3 ? null, cvc4Support ? true, cvc4 ? null
, cln ? null, gmp ? null
{ lib, gccStdenv, fetchzip
, boost
, cmake
, coreutils
, fetchpatch
, ncurses
, python3
, z3Support ? true
, z3 ? null
, cvc4Support ? true
, cvc4 ? null
, cln ? null
, gmp ? null
}:
# compiling source/libsmtutil/CVC4Interface.cpp breaks on clang on Darwin,
@ -10,69 +20,88 @@ assert z3Support -> z3 != null && lib.versionAtLeast z3.version "4.6.0";
assert cvc4Support -> cvc4 != null && cln != null && gmp != null;
let
jsoncppVersion = "1.9.4";
jsoncppVersion = "1.9.3";
jsoncppUrl = "https://github.com/open-source-parsers/jsoncpp/archive/${jsoncppVersion}.tar.gz";
jsoncpp = fetchzip {
url = jsoncppUrl;
sha256 = "0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv";
sha256 = "1vbhi503rgwarf275ajfdb8vpdcbn1f7917wjkf8jghqwb1c24lq";
};
range3Version = "0.11.0";
range3Url = "https://github.com/ericniebler/range-v3/archive/${range3Version}.tar.gz";
range3 = fetchzip {
url = range3Url;
sha256 = "18230bg4rq9pmm5f8f65j444jpq56rld4fhmpham8q3vr1c1bdjh";
};
solc = gccStdenv.mkDerivation rec {
pname = "solc";
version = "0.8.2";
# upstream suggests avoid using archive generated by github
src = fetchzip {
url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz";
sha256 = "11w7sa1y2dirzh84k04fkwbfc6xpjp5jr65w1pmb2pnkjvvf46xq";
};
postPatch = ''
substituteInPlace cmake/jsoncpp.cmake \
--replace "${jsoncppUrl}" ${jsoncpp}
substituteInPlace cmake/range-v3.cmake \
--replace "${range3Url}" ${range3}
'';
cmakeFlags = [
"-DBoost_USE_STATIC_LIBS=OFF"
] ++ lib.optionals (!z3Support) [
"-DUSE_Z3=OFF"
] ++ lib.optionals (!cvc4Support) [
"-DUSE_CVC4=OFF"
];
nativeBuildInputs = [ cmake ];
buildInputs = [ boost ]
++ lib.optionals z3Support [ z3 ]
++ lib.optionals cvc4Support [ cvc4 cln gmp ];
checkInputs = [ ncurses python3 ];
# tests take 60+ minutes to complete, only run as part of passthru tests
doCheck = false;
checkPhase = ''
while IFS= read -r -d ''' dir
do
LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$(pwd)/$dir
export LD_LIBRARY_PATH
done < <(find . -type d -print0)
pushd ..
# IPC tests need aleth avaliable, so we disable it
sed -i "s/IPC_ENABLED=true/IPC_ENABLED=false\nIPC_FLAGS=\"--no-ipc\"/" ./scripts/tests.sh
for i in ./scripts/*.sh ./scripts/*.py ./test/*.sh ./test/*.py; do
patchShebangs "$i"
done
TERM=xterm ./scripts/tests.sh
popd
'';
doInstallCheck = true;
installCheckPhase = ''
$out/bin/solc --version > /dev/null
'';
passthru.tests = {
solcWithTests = solc.overrideAttrs (attrs: { doCheck = true; });
};
meta = with lib; {
description = "Compiler for Ethereum smart contract language Solidity";
homepage = "https://github.com/ethereum/solidity";
license = licenses.gpl3;
platforms = with platforms; linux; # darwin is currently broken
maintainers = with maintainers; [ dbrock akru lionello sifmelcara ];
inherit version;
};
};
in
gccStdenv.mkDerivation rec {
pname = "solc";
version = "0.7.4";
# upstream suggests avoid using archive generated by github
src = fetchzip {
url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz";
sha256 = "02261l54jdbvxk612z7zsyvmchy1rx4lf27b3f616sd7r56krpkg";
};
postPatch = ''
substituteInPlace cmake/jsoncpp.cmake \
--replace "${jsoncppUrl}" ${jsoncpp}
'';
cmakeFlags = [
"-DBoost_USE_STATIC_LIBS=OFF"
] ++ lib.optionals (!z3Support) [
"-DUSE_Z3=OFF"
] ++ lib.optionals (!cvc4Support) [
"-DUSE_CVC4=OFF"
];
nativeBuildInputs = [ cmake ];
buildInputs = [ boost ]
++ lib.optionals z3Support [ z3 ]
++ lib.optionals cvc4Support [ cvc4 cln gmp ];
checkInputs = [ ncurses python3 ];
# Test fails on darwin for unclear reason
doCheck = gccStdenv.hostPlatform.isLinux;
checkPhase = ''
while IFS= read -r -d ''' dir
do
LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$(pwd)/$dir
export LD_LIBRARY_PATH
done < <(find . -type d -print0)
pushd ..
# IPC tests need aleth avaliable, so we disable it
sed -i "s/IPC_ENABLED=true/IPC_ENABLED=false\nIPC_FLAGS=\"--no-ipc\"/" ./scripts/tests.sh
for i in ./scripts/*.sh ./scripts/*.py ./test/*.sh; do
patchShebangs "$i"
done
TERM=xterm ./scripts/tests.sh
popd
'';
meta = with lib; {
description = "Compiler for Ethereum smart contract language Solidity";
homepage = "https://github.com/ethereum/solidity";
license = licenses.gpl3;
platforms = with platforms; linux ++ darwin;
maintainers = with maintainers; [ dbrock akru lionello sifmelcara ];
inherit version;
};
}
solc

View file

@ -2,19 +2,20 @@
stdenv.mkDerivation rec {
pname = "libebml";
version = "1.4.1";
version = "1.4.2";
src = fetchFromGitHub {
owner = "Matroska-Org";
repo = "libebml";
rev = "release-${version}";
sha256 = "04bn1i7g4vwmkv3hv26rmcb59zkl2rh37qnfjm52j560bjlyd7im";
sha256 = "1hiilnabar826lfxsaflqjhgsdli6hzzhjv8q2nmw36fvvlyks25";
};
nativeBuildInputs = [ cmake pkg-config ];
cmakeFlags = [
"-DBUILD_SHARED_LIBS=YES"
"-DCMAKE_INSTALL_PREFIX="
];
meta = with lib; {

View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "libmatroska";
version = "1.6.2";
version = "1.6.3";
src = fetchFromGitHub {
owner = "Matroska-Org";
repo = "libmatroska";
rev = "release-${version}";
sha256 = "0yhr9hhgljva1fx3b0r4s3wkkypdfgsysbl35a4g3krkbhaa9rsd";
sha256 = "01dg12ndxfdqgjx5v2qy4mff6xjdxglywyg82sr3if5aw6rp3dji";
};
nativeBuildInputs = [ cmake pkg-config ];
@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DBUILD_SHARED_LIBS=YES"
"-DCMAKE_INSTALL_PREFIX="
];
meta = with lib; {

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libpostal";
version = "1.0.0";
version = "1.1";
src = fetchFromGitHub {
owner = "openvenues";
repo = "libpostal";
rev = "v${version}";
sha256 = "0qf5nkfkfjl2ylkrnw7kzax71y85gkr8i24glyp9rflyzmpj6giy";
sha256 = "sha256-gQTD2LQibaB2TK0SbzoILAljAGExURvDcF3C/TfDXqk=";
};
nativeBuildInputs = [ autoreconfHook ];

View file

@ -3,19 +3,22 @@
stdenv.mkDerivation rec {
pname = "prime-server";
version = "0.6.7";
version = "0.7.0";
src = fetchFromGitHub {
owner = "kevinkreiser";
repo = "prime_server";
rev = version;
sha256 = "027w3cqfnciyy2x78hfclpb77askn773fab37mzwf6r3mcc7vyl5";
sha256 = "0izmmvi3pvidhlrgfpg4ccblrw6fil3ddxg5cfxsz4qbh399x83w";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ curl zeromq czmq libsodium ];
# https://github.com/kevinkreiser/prime_server/issues/95
NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-variable" ];
meta = with lib; {
description = "Non-blocking (web)server API for distributed computing and SOA based on zeromq";
homepage = "https://github.com/kevinkreiser/prime_server";

View file

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "Adafruit-PlatformDetect";
version = "3.3.0";
version = "3.4.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-F5p3RO9847YQ7tDzb0r3+6dSCEAWoyxtMGBwhywR3/0=";
sha256 = "sha256-+rZUIZA2P7NZ4jbJsenGlD0OZi5fXFQ/Y5vJo4bmvMo=";
};
nativeBuildInputs = [ setuptools-scm ];

View file

@ -14,14 +14,14 @@
}:
buildPythonPackage rec {
version = "1.10.0";
version = "1.12.0";
pname = "azure-core";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "b9cddf3eb239e32b14cf44750b21d7bc8d78b82aa53d57628523598dcd006803";
sha256 = "adf2b1c6ef150a92295b4b405f982a9d2c55c4846728cb14760ca592acbb09ec";
};
propagatedBuildInputs = [

View file

@ -3,23 +3,25 @@
, fetchPypi
, msrest
, azure-common
, azure-core
, msrestazure
}:
buildPythonPackage rec {
pname = "azure-eventgrid";
version = "1.3.0";
version = "2.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "c82c4bf6ea59aeec69ce8f95f1b6a4edc6d733874aeb056669c9d2806168c86e";
sha256 = "bdaeead61458e90f3e36e30692689da9f9f67bbef075a526f446c2d0228b0cd1";
};
propagatedBuildInputs = [
azure-common
azure-core
msrest
msrestazure
azure-common
];
# has no tests

View file

@ -1,28 +1,29 @@
{ lib
, buildPythonPackage
, python
, fetchPypi
, msrest
, msrestazure
, azure-common
, azure-mgmt-core
, azure-mgmt-nspkg
, isPy3k
}:
buildPythonPackage rec {
pname = "azure-mgmt-applicationinsights";
version = "0.3.0";
version = "1.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "3c788a54db4fbca1a8850151462ec1471ff59c86b3a10d6082952bbdaa7e6651";
sha256 = "c287a2c7def4de19f92c0c31ba02867fac6f5b8df71b5dbdab19288bb455fc5b";
};
propagatedBuildInputs = [
azure-common
azure-mgmt-core
msrest
msrestazure
azure-common
] ++ lib.optionals (!isPy3k) [
azure-mgmt-nspkg
];

View file

@ -1,20 +1,18 @@
{ lib
, buildPythonPackage
, fetchPypi
, python
, azure-mgmt-common
, azure-mgmt-core
, isPy3k
}:
buildPythonPackage rec {
version = "18.1.0";
version = "19.0.0";
pname = "azure-mgmt-compute";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "02de691c5ce7237993e65b0ae6154b3bf8ec32bcb15f13ade72bc7f3cb3183d4";
sha256 = "65afe759c6ee87dd89d65d59c8da4b2c04d197c07c1fbfdc56ef1aea468e4525";
};
propagatedBuildInputs = [

View file

@ -1,21 +1,27 @@
{ lib, buildPythonPackage, fetchPypi, isPy27
, azure-common
, azure-mgmt-core
, msrest
, msrestazure
}:
buildPythonPackage rec {
version = "0.10.0";
version = "1.0.0";
pname = "azure-mgmt-kusto";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "09e8d4928e19d12feb374adb47651b474f3ee3bc6a12704e4b70c9b38e3bcd9e";
sha256 = "fa3ede0ebd6489bbf993f420bcb5fc63d9fad2a1e945c3c49b26fa012bb3534e";
extension = "zip";
};
propagatedBuildInputs = [ azure-common msrest msrestazure ];
propagatedBuildInputs = [
azure-common
azure-mgmt-core
msrest
msrestazure
];
# no tests included
doCheck = false;

View file

@ -1,5 +1,4 @@
{ lib, python, buildPythonPackage, fetchPypi, isPy27
, fetchpatch
{ lib, buildPythonPackage, fetchPypi, isPy27
, azure-common
, azure-core
, msrest
@ -8,13 +7,13 @@
}:
buildPythonPackage rec {
version = "0.4.1";
version = "0.6.0";
pname = "azure-multiapi-storage";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "0h7bzaqwyl3j9xqzjbnwxp59kmg6shxk76pml9kvvqbwsq9w6fx3";
sha256 = "d805a91b295edf52057ffab26b714160905406bdd5d7a1a3f93f6cdc3ede8412";
};
propagatedBuildInputs = [
@ -25,14 +24,6 @@ buildPythonPackage rec {
requests
];
# Fix to actually install the package
patches = [
(fetchpatch {
url = "https://github.com/Azure/azure-multiapi-storage-python/pull/29/commits/1c8b08dfc9c5445498de3475dec8820eafbd0ca1.patch";
sha256 = "1f80sdbw4pagrlp9dhcimhp23sdmy0whiba07aa84agkpv4df9ny";
})
];
# fix namespace
pythonNamespaces = [ "azure.multiapi" ];

View file

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-storage-blob";
version = "12.7.1";
version = "12.8.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "c6249f211684929ea6c9d34b5151b06d039775344f0d48fcf479736ed4c11b9e";
sha256 = "36b85a3423379d4a93f663022487cf53aa3043a355f8414321dde878c00cb577";
};
propagatedBuildInputs = [

View file

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "bitarray";
version = "1.7.0";
version = "1.7.1";
src = fetchPypi {
inherit pname version;
sha256 = "e31b472ac92e04ea943723cf781ec168e15049d91a3052203defb81652d2b086";
sha256 = "e4de977d708b7024760266d827b8285e4405dce4293f25508c4556970139018a";
};
pythonImportsCheck = [ "bitarray" ];

View file

@ -0,0 +1,34 @@
{ lib
, aiohttp
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
}:
buildPythonPackage rec {
pname = "evohome-async";
version = "0.3.8";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "zxdavb";
repo = pname;
rev = version;
sha256 = "04xy72k79cnb8pc19v5jzkc0djazfm6pbm10ysphx06ndwvxr9mn";
};
propagatedBuildInputs = [
aiohttp
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "evohomeasync2" ];
meta = with lib; {
description = "Python client for connecting to Honeywell's TCC RESTful API";
homepage = "https://github.com/zxdavb/evohome-async";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -0,0 +1,34 @@
{ lib
, aiohttp
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
}:
buildPythonPackage rec {
pname = "incomfort-client";
version = "0.4.5";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "zxdavb";
repo = pname;
rev = version;
sha256 = "0r9f15fcjwhrq6ldji1dzbb76wsvinpkmyyaj7n55rl6ibnsyrwp";
};
propagatedBuildInputs = [
aiohttp
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "incomfortclient" ];
meta = with lib; {
description = "Python module to poll Intergas boilers via a Lan2RF gateway";
homepage = "https://github.com/zxdavb/incomfort-client";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View file

@ -22,16 +22,18 @@
buildPythonPackage rec {
pname = "labgrid";
version = "0.3.1";
version = "0.3.2";
src = fetchFromGitHub {
owner = "labgrid-project";
repo = "labgrid";
rev = "v${version}";
sha256 = "15298prs2f4wiyn8lf475qicp3y22lcjdcpwp2fmrya642vnr6w5";
sha256 = "sha256-wMYsgZXNP8kTt/x8c4e96BXrbjIZZ6RsH04BfD0zGwo=";
};
patches = [
# Pyserial within Nixpkgs already includes the necessary fix, remove the
# pyserial version check from labgrid.
./0001-serialdriver-remove-pyserial-version-check.patch
];

View file

@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "msal";
version = "1.8.0";
version = "1.10.0";
src = fetchPypi {
inherit pname version;
sha256 = "1dcc737ca517df53438bc9a3fae97f17d93d7a93fa1389e6bc44e82eee81ab83";
sha256 = "582e92e3b9fa68084dca6ecfd8db866ddc75cd9043de267c79d6b6277dd27f55";
};
propagatedBuildInputs = [

View file

@ -18,7 +18,7 @@
}:
buildPythonPackage rec {
version = "0.6.19";
version = "0.6.21";
pname = "msrest";
# no tests in PyPI tarball
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "Azure";
repo = "msrest-for-python";
rev = "v${version}";
sha256 = "sha256-hcUJrWw5EU0aO5Gyhn5+LmuRQN9Bom59cTz3maQ0jvw=";
sha256 = "sha256-IlBwlVQ/v+vJmCWNbFZKGL6a9K09z4AYrPm3kwaA/nI=";
};
propagatedBuildInputs = [

View file

@ -19,13 +19,13 @@
buildPythonPackage rec {
pname = "plugwise";
version = "0.8.5";
version = "0.9.3";
src = fetchFromGitHub {
owner = pname;
repo = "python-plugwise";
rev = version;
sha256 = "1gviyy31l1j8z0if2id3m13r43kw4mcgd8921813yfhmf174piq4";
sha256 = "sha256-MZ4R55vGUyWmR0Md83eNerzsgtYMch1vfQ3sqbm12bM=";
};
propagatedBuildInputs = [

View file

@ -1,12 +1,12 @@
{ stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }:
stdenv.mkDerivation rec {
version = "0.66.1";
version = "0.67.1";
pname = "jbang";
src = fetchzip {
url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar";
sha256 = "sha256-D7xZbuxSdE1zcyVZ9hqNOgq1oZDSFjBeITNqKXEpjyU=";
sha256 = "sha256-ZwjgdOmpLl2kTpQU1mqfwq0nBLmK/Ej5ckDItQWeDKY=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "nexus";
version = "3.29.2-02";
version = "3.30.0-01";
src = fetchurl {
url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-unix.tar.gz";
sha256 = "sha256-vHy7V32xlYaPJdc8oi3j98weOdc4R5S64Dwo9YI8o6c=";
sha256 = "sha256-axhuw1FNut+JqS1WCxyQmP08qh0tXn9UAvz2Gj1kGPs=";
};
preferLocalBuild = true;

View file

@ -10,12 +10,12 @@
"version": "1.1.27"
},
"stable": {
"name": "factorio_alpha_x64-1.1.26.tar.xz",
"name": "factorio_alpha_x64-1.1.27.tar.xz",
"needsAuth": true,
"sha256": "0wv1yv5v77h09nk2skfabqmxys40d806x09kac3jja1lhhr4hzl2",
"sha256": "0s8qnr2p819r4pjby71jp5in679yvsz235iy1csmjjm2d2q6igln",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.26/alpha/linux64",
"version": "1.1.26"
"url": "https://factorio.com/get-download/1.1.27/alpha/linux64",
"version": "1.1.27"
}
},
"demo": {
@ -28,12 +28,12 @@
"version": "1.1.27"
},
"stable": {
"name": "factorio_demo_x64-1.1.26.tar.xz",
"name": "factorio_demo_x64-1.1.27.tar.xz",
"needsAuth": false,
"sha256": "1b6rjyhjvdhdb0d3drjpjc1v8398amcz8wmh3d84gl3aafflfl1x",
"sha256": "0cgnv6w8bxxskf0gxqcg9hq0zl4idnwh5d61b0510axah1m6i57z",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.26/demo/linux64",
"version": "1.1.26"
"url": "https://factorio.com/get-download/1.1.27/demo/linux64",
"version": "1.1.27"
}
},
"headless": {
@ -46,12 +46,12 @@
"version": "1.1.27"
},
"stable": {
"name": "factorio_headless_x64-1.1.26.tar.xz",
"name": "factorio_headless_x64-1.1.27.tar.xz",
"needsAuth": false,
"sha256": "08hnyycwsj6srp2kcvnh5rixlcifk17r2814fr1g7jbdx7rp14mj",
"sha256": "08bny927jiph0zj101yx2wirm16194sap3ifk9rs582s506i1p2w",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.26/headless/linux64",
"version": "1.1.26"
"url": "https://factorio.com/get-download/1.1.27/headless/linux64",
"version": "1.1.27"
}
}
}

View file

@ -143,10 +143,10 @@ in buildFHSUserEnv rec {
vulkan-loader
expat
wayland
xlibs.libxcb
xlibs.libXdamage
xlibs.libxshmfence
xlibs.libXxf86vm
xorg.libxcb
xorg.libXdamage
xorg.libxshmfence
xorg.libXxf86vm
llvm_11.lib
libelf
] ++ (if (!nativeOnly) then [

View file

@ -236,7 +236,7 @@
"etherscan" = ps: with ps; [ ]; # missing inputs: python-etherscan-api
"eufy" = ps: with ps; [ ]; # missing inputs: lakeside
"everlights" = ps: with ps; [ pyeverlights ];
"evohome" = ps: with ps; [ ]; # missing inputs: evohome-async
"evohome" = ps: with ps; [ evohome-async ];
"ezviz" = ps: with ps; [ ]; # missing inputs: pyezviz
"faa_delays" = ps: with ps; [ faadelays ];
"facebook" = ps: with ps; [ ];
@ -385,7 +385,7 @@
"image_processing" = ps: with ps; [ aiohttp-cors ];
"imap" = ps: with ps; [ aioimaplib ];
"imap_email_content" = ps: with ps; [ ];
"incomfort" = ps: with ps; [ ]; # missing inputs: incomfort-client
"incomfort" = ps: with ps; [ incomfort-client ];
"influxdb" = ps: with ps; [ influxdb-client influxdb ];
"input_boolean" = ps: with ps; [ ];
"input_datetime" = ps: with ps; [ ];

View file

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "traefik";
version = "2.4.6";
version = "2.4.7";
src = fetchzip {
url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
sha256 = "1f2gj9axmdisp4yza5pa60x2s79vdybgsb5ddyfwkl5m89sh0r2z";
sha256 = "sha256-K1uSfsi/uC41ukDGaWaYIKX6A+SU59x3a/DYip9/LPI=";
stripRoot = false;
};
vendorSha256 = "1w9crp4bk5dk0ph558w9mj8cylm2z6bc81hghmv86ild524a0l9v";
vendorSha256 = "sha256-MCQbSy2TOSkZoqC2POIq8mDRld4fe245m0Xe0drxEq8=";
doCheck = false;

View file

@ -1,7 +1,7 @@
{ stdenv, lib, python3, fetchFromGitHub, installShellFiles }:
let
version = "2.18.0";
version = "2.20.0";
srcName = "azure-cli-${version}-src";
src = fetchFromGitHub {
@ -9,7 +9,7 @@ let
owner = "Azure";
repo = "azure-cli";
rev = "azure-cli-${version}";
sha256 = "sha256-3qQKQePyLYwIS3yO3exHNd0uoPr7y4iZ12+GaiHfqz8=";
sha256 = "sha256-unG17oiqZZJNGg8QCg7xY0GzuMu2gaAIIgGF8TlMBQQ=";
};
# put packages that needs to be overriden in the py package scope
@ -137,6 +137,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
psutil
requests
scp
semver
six
sshtunnel
urllib3

View file

@ -61,6 +61,7 @@ let
azure-mgmt-core
azure-mgmt-resource
colorama
cryptography
humanfriendly
jmespath
knack
@ -85,7 +86,8 @@ let
postPatch = ''
substituteInPlace setup.py \
--replace "azure-mgmt-core==1.2.1" "azure-mgmt-core~=1.2"
--replace "azure-mgmt-core==1.2.1" "azure-mgmt-core~=1.2" \
--replace "cryptography>=3.2,<3.4" "cryptography"
'';
doCheck = stdenv.isLinux;
@ -136,8 +138,8 @@ let
azure-mgmt-billing = overrideAzureMgmtPackage super.azure-mgmt-billing "1.0.0" "zip"
"8b55064546c8e94839d9f8c98e9ea4b021004b3804e192bf39fa65b603536ad0";
azure-mgmt-botservice = overrideAzureMgmtPackage super.azure-mgmt-botservice "0.2.0" "zip"
"sha256-sh2IWOaaoW0luQjEARah93PBJ+xN1gLLuFQuvzmlXYM=";
azure-mgmt-botservice = overrideAzureMgmtPackage super.azure-mgmt-botservice "0.3.0" "zip"
"f8318878a66a0685a01bf27b7d1409c44eb90eb72b0a616c1a2455c72330f2f1";
azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.5.0" "zip"
"1wxh7mgrknnhqyafdd7sbwx8plx0zga2af21vs6yhxy48lw9w8pd";
@ -148,8 +150,8 @@ let
azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "0.4.0" "zip"
"0v0ycyjnnx09jqf958hj2q6zfpsn80bxxm98jf59y8rj09v99rz1";
azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.6.0" "zip"
"13s2k4jl8570bj6jkqzm0w29z29rl7h5i7czd3kr6vqar5wj9xjd";
azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.11.0" "zip"
"f2b85d1d7d7db2af106000910ea5f8b95639874176a5de2f7ab37a2caa67af6b";
azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "12.0.0" "zip"
"sha256-h3nif64OgekSh4mjOSTbom8qDXVrIVNksbQ3LwILnx8=";
@ -160,8 +162,8 @@ let
azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "6.3.0" "zip"
"059lhbxqx1r1717s8xz5ahpxwphq5fgy0h7k6b63cahm818rs0hx";
azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "18.0.0" "zip"
"34815c91193640ad8ff0c4dad7f2d997548c853d2e8b10250329ed516e55879e";
azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "19.0.0" "zip"
"34815c91193640ad8ff0c4dad7f2d997548c853d2e8b10250329ed516e55879a";
azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip"
"12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs";
@ -175,8 +177,8 @@ let
azure-mgmt-core = overrideAzureMgmtPackage super.azure-mgmt-core "1.2.0" "zip"
"8fe3b59446438f27e34f7b24ea692a982034d9e734617ca1320eedeee1939998";
azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "1.0.0" "zip"
"08xp04mkl5ajwyr0l62c8bfb4n8p9s9fp6szynb2bdp6m2p3g2z0";
azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "3.0.0" "zip"
"sha256-/WV5vxXOg9CUT+NAnhpOG7f+QBGfUlTNVO26LTtuIoM=";
azure-mgmt-deploymentmanager = overrideAzureMgmtPackage super.azure-mgmt-deploymentmanager "0.2.0" "zip"
"0c6pyr36n9snx879vas5r6l25db6nlp2z96xn759mz4kg4i45qs6";
@ -190,8 +192,8 @@ let
azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "0.12.0" "zip"
"187z0w5by7d9a2zsz3kidmzjw591akpc6dwhps4jyb4skcmyw86s";
azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "3.0.0" "zip"
"0iq04hvivq3fvg2lhax95gx0x35avk5hps42227z3qna5i2cznpn";
azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "4.1.0" "zip"
"e6d4810f454c0d63a5e816eaa7e54a073a3f70b2256162ff1c234cfe91783ae6";
azure-mgmt-kusto = overrideAzureMgmtPackage super.azure-mgmt-kusto "0.3.0" "zip"
"1pmcdgimd66h964a3d5m2j2fbydshcwhrk87wblhwhfl3xwbgf4y";
@ -199,23 +201,23 @@ let
azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip"
"1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r";
azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.14.0" "zip"
"0f8m7j8sdm1rfrwizz3qfk4lyb2x02af3v66as5yqjriipk1bnbg";
azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.15.0" "zip"
"sha256-XpjDYGCad7RDsv5DHgM35ctwW08C0CBHkfmYX3zmiDY=";
azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "2.1.0" "zip"
"1l55py4fzzwhxlmnwa41gpmqk9v2ncc79w7zq11sm9a5ynrv2c1p";
azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "0.7.0" "zip"
"18n2lqvrhq40gdqhlzzg8mc03571i02c7qq7jv771lc58rqpzysh";
azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "8.0.0" "zip"
"3e7a93186594c328a6f34f0e0d9209a05021228baa85aa4c1c4ffdbf8005a45f";
azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "17.0.0" "zip"
"3694f2675e152afccb1588a6cc7bb4b4795d442a4e5d7082cdf1f4e32a779199";
azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "17.1.0" "zip"
"f47852836a5960447ab534784a9285696969f007744ba030828da2eab92621ab";
azure-mgmt-marketplaceordering = overrideAzureMgmtPackage super.azure-mgmt-marketplaceordering "0.1.0" "zip"
"sha256-baEkJcurDMYvJG5yZrTWev9r3QMey+UMdULC8rJECtQ=";
azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "2.1.0" "zip"
"1py0hch0wghzfxazdrrs7p0kln2zn9jh3fmkzwd2z8qggj38q6gm";
azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "3.0.0" "zip"
"sha256-iUR3VyXFJTYU0ldXbYQe5or6NPVwsFwJJKf3Px2yiiQ=";
azure-mgmt-msi = overrideAzureMgmtPackage super.azure-mgmt-msi "0.2.0" "zip"
"0rvik03njz940x2hvqg6iiq8k0d88gyygsr86w8s0sa12sdbq8l6";
@ -232,8 +234,8 @@ let
azure-mgmt-reservations = overrideAzureMgmtPackage super.azure-mgmt-reservations "0.6.0" "zip"
"16ycni3cjl9c0mv419gy5rgbrlg8zp0vnr6aj8z8p2ypdw6sgac3";
azure-mgmt-search = overrideAzureMgmtPackage super.azure-mgmt-search "2.0.0" "zip"
"14v8ja8har2xrb00v98610pqvakcdvnzw8hkd6wbr1np3f3dxi8f";
azure-mgmt-search = overrideAzureMgmtPackage super.azure-mgmt-search "8.0.0" "zip"
"a96d50c88507233a293e757202deead980c67808f432b8e897c4df1ca088da7e";
azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "0.6.0" "zip"
"9f37d0151d730801222af111f0830905634795dbfd59ad1b89c35197421e74d3";
@ -241,14 +243,14 @@ let
azure-mgmt-signalr = overrideAzureMgmtPackage super.azure-mgmt-signalr "0.4.0" "zip"
"09n12ligh301z4xwixl50n8f1rgd2k6lpsxqzr6n6jvgkpdds0v5";
azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "0.21.0" "zip"
"0023q32z4vn94l5aqf7h6ld4ai12a703y7glnl02lls25qfs9xvv";
azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "0.26.0" "zip"
"sha256-tmsxhHt6mRWNOXDebckZSXt4L8+757NRKSDu6wVMqRE=";
azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "0.5.0" "zip"
"1b9am8raa17hxnz7d5pk2ix0309wsnhnchq1mi22icd728sl5adm";
azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "0.5.0" "zip"
"0dr8xml9zlsnag761zx7ifvdkhsv4syzxpmdn4gbf9c5qcq65dsf";
azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "0.6.0" "zip"
"sha256-+By1KyIHdKq5P/zyW9wX4D/YS2kWg2ZAeJ+G+/Y2uYQ=";
azure-mgmt-datamigration = overrideAzureMgmtPackage super.azure-mgmt-datamigration "4.1.0" "zip"
"c33d1deb0ee173a15c8ec21a1e714ba544fe5f4895d3b1d8b0581f3c1b2e8ce4";
@ -262,14 +264,14 @@ let
azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "8.0.0" "zip"
"2c974c6114d8d27152642c82a975812790a5e86ccf609bf370a476d9ea0d2e7d";
azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "5.2.0" "zip"
"10b8y1b5qlyr666x7yimnwis9386ciphrxdnmmyzk90qg6h0niry";
azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "7.0.0" "zip"
"sha256-6abJoZs5cbodve75bApaLDWUYzp1R6YOa/y4Azhk7jg=";
azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc16" "zip"
"eT5gH0K4q2Qr1lEpuqjxQhOUrA6bEsAktj+PKsfMXTo=";
azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "0.11.0" "zip"
"05jhn66d4sl1qi6w34rqd8wl500jndismiwhdmzzmprdvn1zxqf6";
azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "2.0.0" "zip"
"e7f7943fe8f0efe98b3b1996cdec47c709765257a6e09e7940f7838a0f829e82";
azure-mgmt-advisor = overrideAzureMgmtPackage super.azure-mgmt-advisor "2.0.1" "zip"
"1wsfkprdrn22mwm24y2zlcms8ppp7jwq3s86r3ymbl29pbaxca8r";
@ -280,8 +282,8 @@ let
azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.61.0" "zip"
"0xfvx2dvfj3fbz4ngn860ipi4v6gxqajyjc8x92r8knhmniyxk7m";
azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "16.0.0" "zip"
"2f9d714d9722b1ef4bac6563676612e6e795c4e90f6f3cd323616fdadb0a99e5";
azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "17.0.0" "zip"
"c0e3fd99028d98c80dddabe1c22dfeb3d694e5c1393c6de80766eb240739e4bc";
azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "0.6.0" "zip"
"1c88pj8diijciizw4c6g1g6liz54cp3xmlm4xnmz97hizfw202gj";
@ -289,11 +291,11 @@ let
azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.5.0" "zip"
"0x6wxb9zrvcayg3yw0nm99p10vvgc0x3zwk9amzs5m682r2z4wap";
azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "2.0.0" "zip"
"fd47029f2423e45ec4d311f651dc972043b98e960f186f5c6508c6fdf6eb2fe8";
azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "2.2.0" "zip"
"sha256-Myxg3G0+OAk/bh4k5TOEGGJuyEBtYA2edNlbIXnWE4M=";
azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.5.2" "tar.gz"
"09y075mc7kig4dlb0xdvdvl9xbr931bi7kv60xaqnf31pf4pb7gf";
azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.6.0" "tar.gz"
"sha256-2AWpGyle31IFf/qya3FBYJBUBr3V16Gj+T9s3D7ehBI=";
azure-graphrbac = super.azure-graphrbac.overrideAttrs(oldAttrs: rec {
version = "0.60.0";
@ -371,12 +373,12 @@ let
});
azure-keyvault-administration = super.azure-keyvault-administration.overridePythonAttrs(oldAttrs: rec {
version = "4.0.0b1";
version = "4.0.0b3";
src = super.fetchPypi {
inherit (oldAttrs) pname;
inherit version;
extension = "zip";
sha256 = "1kmf2x3jdmfm9c7ldvajzckkm79gxxvl1l2968lizjwiyjbbsih5";
sha256 = "sha256-d3tJWObM3plRurzfqWmHkn5CqVL9ekQfn9AeDc/KxLQ=";
};
});
@ -415,6 +417,17 @@ let
'';
});
semver = super.semver.overridePythonAttrs(oldAttrs: rec {
version = "2.13.0";
src = super.fetchPypi {
inherit (oldAttrs) pname;
inherit version;
sha256 = "sha256-+g/ici7hw/V+rEeIIMOlri9iSvgmTL35AAyYD/f3Xj8=";
};
});
knack = super.knack.overridePythonAttrs(oldAttrs: rec {
version = "0.8.0rc2";
@ -425,26 +438,6 @@ let
};
});
msal = super.msal.overridePythonAttrs(oldAttrs: rec {
version = "1.0.0";
src = super.fetchPypi {
inherit (oldAttrs) pname;
inherit version;
sha256 = "0h33wayvakggr684spdyhiqvrwraavcbk3phmcbavb3zqxd3zgpc";
};
});
msal-extensions = super.msal-extensions.overridePythonAttrs(oldAttrs: rec {
version = "0.1.3";
src = super.fetchPypi {
inherit (oldAttrs) pname;
inherit version;
sha256 = "1p05cbfksnhijx1il7s24js2ydzgxbpiasf607qdpb5sljlp3qar";
};
});
sshtunnel = super.sshtunnel.overridePythonAttrs(oldAttrs: rec {
name = "sshtunnel-${version}";
version = "0.1.5";

View file

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "pcb2gcode";
version = "2.2.3";
version = "2.3.0";
src = fetchFromGitHub {
owner = "pcb2gcode";
repo = "pcb2gcode";
rev = "v${version}";
sha256 = "sha256-CIhhwUsnX+Wx4hLNE8uQf17QbDDm4vCbv/XZVuCrWdw=";
sha256 = "sha256-BELugmnnedqXTnSwiQN3XbqkWKTKF27ElQAwrEWNSao=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "keepalived";
version = "2.2.1";
version = "2.2.2";
src = fetchFromGitHub {
owner = "acassen";
repo = "keepalived";
rev = "v${version}";
sha256 = "sha256-Cupi5arScECKmHCBcC0Cmm/64JhidMyNUB75YmGMJag=";
sha256 = "sha256-qugEEbOQ4bemzelIOaNFvo3piMZpKUZGjR+4XF8aLHw=";
};
buildInputs = [

View file

@ -11100,7 +11100,9 @@ in
smlpkg = callPackage ../tools/package-management/smlpkg { };
solc = callPackage ../development/compilers/solc { };
solc = solc_0_8;
solc_0_8 = callPackage ../development/compilers/solc { };
solc_0_7 = callPackage ../development/compilers/solc/0.7.nix { };
souffle = callPackage ../development/compilers/souffle {
autoreconfHook = buildPackages.autoreconfHook269;

View file

@ -2200,6 +2200,8 @@ in {
evernote = callPackage ../development/python-modules/evernote { };
evohome-async = callPackage ../development/python-modules/evohome-async { };
ewmh = callPackage ../development/python-modules/ewmh { };
exdown = callPackage ../development/python-modules/exdown { };
@ -3270,6 +3272,8 @@ in {
imutils = callPackage ../development/python-modules/imutils { };
incomfort-client = callPackage ../development/python-modules/incomfort-client { };
incremental = callPackage ../development/python-modules/incremental { };
inflect = callPackage ../development/python-modules/inflect { };