Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-03-23 06:18:05 +00:00 committed by GitHub
commit 8ef8f6b43c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
54 changed files with 316 additions and 760 deletions

10
.github/CODEOWNERS vendored
View File

@ -79,11 +79,11 @@
/pkgs/development/tools/poetry2nix @adisbladis
# Haskell
/pkgs/development/compilers/ghc @cdepillabout
/pkgs/development/haskell-modules @cdepillabout
/pkgs/development/haskell-modules/default.nix @cdepillabout
/pkgs/development/haskell-modules/generic-builder.nix @cdepillabout
/pkgs/development/haskell-modules/hoogle.nix @cdepillabout
/pkgs/development/compilers/ghc @cdepillabout @sternenseemann
/pkgs/development/haskell-modules @cdepillabout @sternenseemann
/pkgs/development/haskell-modules/default.nix @cdepillabout @sternenseemann
/pkgs/development/haskell-modules/generic-builder.nix @cdepillabout @sternenseemann
/pkgs/development/haskell-modules/hoogle.nix @cdepillabout @sternenseemann
# Perl
/pkgs/development/interpreters/perl @volth @stigtsp

View File

@ -176,8 +176,10 @@ let
"timers.target.wants"
];
upstreamUserUnits =
[ "basic.target"
upstreamUserUnits = [
"app.slice"
"background.slice"
"basic.target"
"bluetooth.target"
"default.target"
"exit.target"
@ -185,6 +187,7 @@ let
"graphical-session.target"
"paths.target"
"printer.target"
"session.slice"
"shutdown.target"
"smartcard.target"
"sockets.target"
@ -194,6 +197,7 @@ let
"systemd-tmpfiles-clean.timer"
"systemd-tmpfiles-setup.service"
"timers.target"
"xdg-desktop-autostart.target"
];
makeJobScript = name: text:

View File

@ -34,13 +34,13 @@ self: super: {
kak-ansi = stdenv.mkDerivation rec {
pname = "kak-ansi";
version = "0.2.1";
version = "0.2.3";
src = fetchFromGitHub {
owner = "eraserhd";
repo = "kak-ansi";
rev = "v${version}";
sha256 = "0ddjih8hfyf6s4g7y46p1355kklaw1ydzzh61141i0r45wyb2d0d";
sha256 = "pO7M3MjKMJQew9O20KALEvsXLuCKPYGGTtuN/q/kj8Q=";
};
installPhase = ''

View File

@ -1,6 +1,5 @@
{ lib, stdenv
, fetchFromGitHub
, fetchpatch
, boost
, cmake
, ilmbase
@ -11,26 +10,20 @@
, openexr
, robin-map
, unzip
, fmt
}:
stdenv.mkDerivation rec {
pname = "openimageio";
version = "2.1.9.0";
version = "2.2.12.0";
src = fetchFromGitHub {
owner = "OpenImageIO";
repo = "oiio";
rev = "Release-${version}";
sha256 = "1bbxx3bcc5jlb90ffxbk29gb8227097rdr8vg97vj9axw2mjd5si";
sha256 = "16z8lnsqhljbfaarfwx9rc95p0a9wxf4p271j6kxdfknjb88p56i";
};
patches = [
(fetchpatch {
url = "https://github.com/OpenImageIO/oiio/pull/2441/commits/e9bdd69596103edf41b659ad8ab0ca4ce002f6f5.patch";
sha256 = "0x1wmjf1jrm19d1izhs1cs3y1if9al1zx48lahkfswyjag3r5dn0";
})
];
outputs = [ "bin" "out" "dev" "doc" ];
nativeBuildInputs = [
@ -47,6 +40,7 @@ stdenv.mkDerivation rec {
opencolorio
openexr
robin-map
fmt
];
cmakeFlags = [

View File

@ -0,0 +1,31 @@
diff --git a/src/libOpenImageIO/exif.cpp b/src/libOpenImageIO/exif.cpp
index 10b75c21..0287d9c5 100644
--- a/src/libOpenImageIO/exif.cpp
+++ b/src/libOpenImageIO/exif.cpp
@@ -213,6 +213,9 @@ static const EXIF_tag_info exif_tag_table[] = {
+// libtiff > 4.1.0 defines these in tiff.h. For older libtiff, let's define
+// them ourselves.
+#ifndef GPSTAG_VERSIONID
enum GPSTag {
GPSTAG_VERSIONID = 0,
GPSTAG_LATITUDEREF = 1, GPSTAG_LATITUDE = 2,
@@ -237,6 +240,7 @@ enum GPSTag {
GPSTAG_DIFFERENTIAL = 30,
GPSTAG_HPOSITIONINGERROR = 31
};
+#endif
static const EXIF_tag_info gps_tag_table[] = {
{ GPSTAG_VERSIONID, "GPS:VersionID", TIFF_BYTE, 4 },
@@ -270,7 +274,7 @@ static const EXIF_tag_info gps_tag_table[] = {
{ GPSTAG_AREAINFORMATION, "GPS:AreaInformation", TIFF_UNDEFINED, 1 },
{ GPSTAG_DATESTAMP, "GPS:DateStamp", TIFF_ASCII, 0 },
{ GPSTAG_DIFFERENTIAL, "GPS:Differential", TIFF_SHORT, 1 },
- { GPSTAG_HPOSITIONINGERROR, "GPS:HPositioningError",TIFF_RATIONAL, 1 },
+ { GPSTAG_GPSHPOSITIONINGERROR, "GPS:HPositioningError",TIFF_RATIONAL, 1 },
{ -1, NULL } // signal end of table
};

View File

@ -33,6 +33,11 @@ stdenv.mkDerivation rec {
"dist_dir="
];
patches = [
# Backported from https://github.com/OpenImageIO/oiio/pull/2539 for 1.8.17
./2539_backport.patch
];
meta = with lib; {
homepage = "http://www.openimageio.org";
description = "A library and tools for reading and writing images";

View File

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
patches = lib.optional stdenv.isDarwin ./darwin.patch;
nativeBuildInputs = [ cmake ] ++ optional cudaSupport addOpenGLRunpath;
nativeBuildInputs = [ cmake makeWrapper ] ++ optional cudaSupport addOpenGLRunpath;
buildInputs =
[ boost ffmpeg gettext glew ilmbase
freetype libjpeg libpng libsamplerate libsndfile libtiff
@ -41,9 +41,9 @@ stdenv.mkDerivation rec {
alembic
(opensubdiv.override { inherit cudaSupport; })
tbb
makeWrapper
embree
gmp
pugixml
]
++ (if (!stdenv.isDarwin) then [
libXi libX11 libXext libXrender
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
openvdb
]
else [
pugixml llvmPackages.openmp SDL Cocoa CoreGraphics ForceFeedback OpenAL OpenGL
llvmPackages.openmp SDL Cocoa CoreGraphics ForceFeedback OpenAL OpenGL
])
++ optional jackaudioSupport libjack2
++ optional cudaSupport cudatoolkit

View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "dasel";
version = "1.13.4";
version = "1.13.5";
src = fetchFromGitHub {
owner = "TomWright";
repo = pname;
rev = "v${version}";
sha256 = "sha256-4/67GwNIRcbC6qYe5s8DD16b2uVcG0DI1ScQk31Ffk0=";
sha256 = "sha256-Fy202w1lUrymnpnCmWwnbpMsda7JrZ3B0c+a9UtKsSA=";
};
vendorSha256 = "sha256-BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY=";

View File

@ -17,10 +17,10 @@ let
pname = "simplenote";
version = "2.5.0";
version = "2.8.0";
sha256 = {
x86_64-linux = "sha256-Mn1oie+YHNtYKriIAIHdO+tUQDqaA34dkAJgZvQy76I=";
x86_64-linux = "sha256-W8+LzWMPDCrFZCm9p/Gcj7OXqJw/gs7lMxTKjOQChQY=";
}.${system} or throwSystem;
meta = with lib; {

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "xchm";
version = "1.31";
version = "1.32";
src = fetchFromGitHub {
owner = "rzvncj";
repo = "xCHM";
rev = version;
sha256 = "1mzafbpc1c211byf8bnwl13by7vi8xvxlaykyrajb1bj0ynbmmgp";
sha256 = "sha256-Ss8kdfUAMC8v05rdt2SoO6vPyssG5v8gOzdf/v18cdg=";
};
nativeBuildInputs = [ autoreconfHook ];

View File

@ -5,7 +5,7 @@ let rev = "f6e19140201d6bf2f1274bf6567087bc25154210";
in
buildGoModule rec {
pname = "sonobuoy";
version = "0.20.0"; # Do not forget to update `rev` above
version = "0.50.0"; # Do not forget to update `rev` above
buildFlagsArray =
let t = "github.com/vmware-tanzu/sonobuoy";
@ -17,13 +17,13 @@ buildGoModule rec {
'';
src = fetchFromGitHub {
sha256 = "11qawsv82i1pl4mwfc85wb4fbq961bplvmygnjfm79m8z87863ri";
sha256 = "sha256-LhprsDlWZjNRE6pu7V9WBszy/+bNpn5KoRopIoWvdsg=";
rev = "v${version}";
repo = "sonobuoy";
owner = "vmware-tanzu";
};
vendorSha256 = "1kxzd4czv8992y7y47la5jjrbhk76sxcj3v5sx0k4xplgki7np6i";
vendorSha256 = "sha256-0Vx74nz0djJB12UPybo2Z8KVpSyKHuKPFymh/Rlpv88=";
subPackages = [ "." ];

View File

@ -7,18 +7,18 @@
buildGoModule rec {
pname = "shellhub-agent";
version = "0.5.2";
version = "0.6.0";
src = fetchFromGitHub {
owner = "shellhub-io";
repo = "shellhub";
rev = "v${version}";
sha256 = "1g3sjkc6p9w3mm7lnr513zwjh7y945hx311b6g068q2lywisqf0x";
sha256 = "0vdasz3qph73xb9y831bnr1hpcw0669n9zckqn95v1bsjc936313";
};
modRoot = "./agent";
vendorSha256 = "1l8x9cvisjb8smnsg91v04j1vvawpjzp0lcq0ahw8slz8rfdm80c";
vendorSha256 = "059772rd1l7zyf2vlqjm35hg8ibmjc1p6cfazqd47n8mqqlqkilw";
buildFlagsArray = [ "-ldflags=-s -w -X main.AgentVersion=v${version}" ];

View File

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "gleam";
version = "0.14.2";
version = "0.14.3";
src = fetchFromGitHub {
owner = "gleam-lang";
repo = pname;
rev = "v${version}";
sha256 = "sha256-C56aM3FFnjtTQawQOnITVGXK5XSA/Pk7surt8MJHZK0=";
sha256 = "sha256-NCLPatJWpvYKM+QdJB/Gfldlz5MQynWZB8o4x4cf5cA=";
};
nativeBuildInputs = [ pkg-config ];
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++
lib.optionals stdenv.isDarwin [ Security ];
cargoSha256 = "sha256-AkkXV1cOM5YFvG5dUt7VarSzWyBZmvFMW08n1KqSAxY=";
cargoSha256 = "sha256-Tvb6QJubV8FS8UER++bEhst7Z0hVw42TCl+wOzZzi8Y=";
meta = with lib; {
description = "A statically typed language for the Erlang VM";

View File

@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
pname = "bctoolbox";
version = "4.4.24";
version = "4.4.34";
nativeBuildInputs = [ cmake bcunit ];
buildInputs = [ mbedtls ];
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
group = "BC";
repo = pname;
rev = version;
sha256 = "sha256-RfjD+E8FLFNBkwpOohNAKDINHAhSNEkeVArqtjfn2i0=";
sha256 = "0bfswwvvdshaahg4jd2j10f0sci8809s4khajd0m6b059zwc7y25";
};
# Do not build static libraries

View File

@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
pname = "belcard";
version = "4.4.24";
version = "4.4.34";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
group = "BC";
repo = pname;
rev = version;
sha256 = "sha256-FTHtd93LOnRek9fqvI+KBkk/+53Bwy9GKCEo0NDtops=";
sha256 = "16x2xp8d0a115132zhy1kpxkyj86ia7vrsnpjdg78fnbvmvysc8m";
};
buildInputs = [ bctoolbox belr ];

View File

@ -2,15 +2,16 @@
, bctoolbox
, cmake
, fetchFromGitLab
, lib
, libantlr3c
, mbedtls
, lib, stdenv
, stdenv
, zlib
}:
stdenv.mkDerivation rec {
pname = "belle-sip";
version = "4.4.26";
version = "4.4.34";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";
@ -18,7 +19,7 @@ stdenv.mkDerivation rec {
group = "BC";
repo = pname;
rev = version;
sha256 = "sha256-30w5X/S5VY4zSHs2G4KXOP8mEvC78xakwrcd/Bm1ds4=";
sha256 = "1kknnlczq7dpqaj1dwxvy092dzrqjy11ndkv90rqwmdryigkjk6z";
};
nativeBuildInputs = [ antlr3_4 cmake ];

View File

@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
pname = "belr";
version = "4.3.2";
version = "4.4.34";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
group = "BC";
repo = pname;
rev = version;
sha256 = "1lda0f89vas38xgmc4yvnrigmrbril3dyqxgb5jh1zfx1xczfh1q";
sha256 = "0w2canwwm0qb99whnangvaybvjzq8xg6vksqxykgr8fbx7clw03h";
};
buildInputs = [ bctoolbox ];

View File

@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
pname = "bzrtp";
version = "4.4.9";
version = "4.4.34";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";

View File

@ -15,5 +15,12 @@ stdenv.mkDerivation {
license = licenses.bsd3;
platforms = platforms.unix;
maintainers = with maintainers; [ vbgl ];
# The package failed to build with error:
# gcc: error: unrecognized command line option '-m64'
#
# See:
# https://gist.github.com/r-rmcgibbo/15bf2ca9b297e8357887e146076fff7d
# https://gist.github.com/r-rmcgibbo/a362535e4b174d4bfb68112503a49fcd
broken = stdenv.hostPlatform.isAarch64;
};
}

View File

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "libcint";
version = "4.1.0";
version = "4.1.1";
src = fetchFromGitHub {
owner = "sunqm";
repo = "libcint";
rev = "v${version}";
sha256 = "sha256-ZDPDJXvSAqCkhxUSzlcWBAMrCI6mjA8rXxX65Cw5nYI=";
sha256 = "sha256-HBZ/VMuTLAYpqcIPzQ4JbsMSXsI/sKc14ZFpbVhQF/g=";
};
nativeBuildInputs = [ cmake ];

View File

@ -49,7 +49,7 @@
stdenv.mkDerivation rec {
pname = "liblinphone";
version = "4.4.21";
version = "4.4.35";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
group = "BC";
repo = pname;
rev = version;
sha256 = "sha256-vs65lBRTYYhx2F90n32qnf0CvcPJUIXc16hmggTF/JI=";
sha256 = "1sysr8wnf1kvq87h2ymr5qk9qcjapayvlmcmzcx3zxk8vhqp83d8";
};
# Do not build static libraries

View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "libplctag";
version = "2.3.5";
version = "2.3.6";
src = fetchFromGitHub {
owner = "libplctag";
repo = "libplctag";
rev = "v${version}";
sha256 = "0brmzr863chybm5y0q5hld5mhf6kx0bl4dddr7j69adlraak7x6s";
sha256 = "sha256-mrNEUNYxnRyKhUCz+exp6Upf2g/L6WnYJ8alcIx5wMc=";
};
nativeBuildInputs = [ cmake ];

View File

@ -2,14 +2,15 @@
, belle-sip
, cmake
, fetchFromGitLab
, lib
, soci
, sqlite
, lib, stdenv
, stdenv
}:
stdenv.mkDerivation rec {
pname = "lime";
version = "4.4.21";
version = "4.4.34";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";
@ -17,7 +18,7 @@ stdenv.mkDerivation rec {
group = "BC";
repo = pname;
rev = version;
sha256 = "sha256-3whr2KSAULRe3McgOtJlA3NEPF8NO6YHp+4vqeMPT5I=";
sha256 = "14jg1zisjbzflw3scfqdbwy48wq3cp93l867vigb8l40lkc6n26z";
};
buildInputs = [ bctoolbox soci belle-sip sqlite ];

View File

@ -33,7 +33,7 @@
stdenv.mkDerivation rec {
pname = "mediastreamer2";
version = "4.4.32";
version = "4.4.35";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
group = "BC";
repo = pname;
rev = version;
sha256 = "sha256-kaNQuhxsUx74hBhfpB76NuNTT+8h74nfiv1re43tHps=";
sha256 = "18qmg678m087k7qsaxwfcv2p875z2kpy91pqryiv955km40drl0g";
};
patches = [

View File

@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
pname = "ortp";
version = "4.4.32";
version = "4.4.34";
src = fetchFromGitLab {
domain = "gitlab.linphone.org";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
group = "BC";
repo = pname;
rev = version;
sha256 = "sha256-tcSrDfo1AZM7yQarwfV4n6p1UOShXGKjMW5u57/cM+Q=";
sha256 = "1r1kvjzyfvkf66in4p51wi87balzg3sw3aq6r4xr609mz86spi5m";
};
# Do not build static libraries

View File

@ -1,20 +1,33 @@
{ fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config }:
{ fetchFromGitHub
, lib
, stdenv
, cmake
}:
stdenv.mkDerivation rec {
pname = "libupnp";
version = "1.14.0";
version = "1.14.1";
outputs = [ "out" "dev" ];
src = fetchFromGitHub {
owner = "mrjimenez";
repo = "pupnp";
rev = "release-${version}";
sha256 = "1wp9sz2ld4g6ak9v59i3s5mbsraxsphi9k91vw9xgrbzfmg8w0a6";
sha256 = "sha256-QWwgtfgO+7zGW1M5qdfrIilVw6D/A/Er3l2bZ8V35kE=";
};
outputs = [ "dev" "out" ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
nativeBuildInputs = [
cmake
];
hardeningDisable = [ "fortify" ];
postPatch = ''
# Wrong paths in pkg-config file generated by CMake
# https://github.com/pupnp/pupnp/pull/205/files#r588946478
substituteInPlace CMakeLists.txt \
--replace '\''${exec_prefix}/' "" \
--replace '\''${prefix}/' ""
'';
meta = {
description = "An open source UPnP development kit for Linux";
@ -26,9 +39,9 @@ stdenv.mkDerivation rec {
UPnP Device Architecture Specification.
'';
license = "BSD-style";
license = lib.licenses.bsd3;
homepage = "http://pupnp.sourceforge.net/";
homepage = "https://pupnp.github.io/pupnp/";
platforms = lib.platforms.unix;
};
}

View File

@ -4,7 +4,7 @@
, curl
}:
let
version = "2020.3.4";
version = "2020.3.6";
shortVersion = builtins.substring 0 6 version;
in
stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2";
sha256 = "1laa8dllpvf2z0cjxx22ravdf1d7a18bm708gd2ny35fhjfibm0h";
sha256 = "sha256-7D7KRNIffgUr6vwbni1XwW+8GtXwM6vJZ7V6/QLDVmk=";
};
nativeBuildInputs = [ cmake ];

View File

@ -6,17 +6,17 @@
stdenv.mkDerivation rec {
pname = "soci";
version = "4.0.0";
version = "4.0.1";
src = fetchFromGitHub {
owner = "SOCI";
repo = pname;
rev = version;
sha256 = "06faswdxd2frqr9xnx6bxc7zwarlzsbdi3bqpz7kwdxsjvq41rnb";
sha256 = "sha256-d4GtxDaB+yGfyCnbvnLRUYcrPSMkUF7Opu6+SZd8opM=";
};
# Do not build static libraries
cmakeFlags = [ "-DSOCI_STATIC=OFF" ];
cmakeFlags = [ "-DSOCI_STATIC=OFF" "-DCMAKE_CXX_STANDARD=11" ];
nativeBuildInputs = [ cmake ];
buildInputs = [ sqlite ];

View File

@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "boto3";
version = "1.17.30"; # N.B: if you change this, change botocore and awscli to a matching version
version = "1.17.33"; # N.B: if you change this, change botocore and awscli to a matching version
src = fetchPypi {
inherit pname version;
sha256 = "sha256-05wEtR5gGX9VA/hInwQ7yQSYFWfMhDHTiTZ3Z9w/1a4=";
sha256 = "sha256-DKwv/8G6kV97tezuU5MYUy21HyGMkooij6/j5QHpRy4=";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];

View File

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "botocore";
version = "1.20.30"; # N.B: if you change this, change boto3 and awscli to a matching version
version = "1.20.33"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
sha256 = "sha256-mP8eshDTlKH/5zazPIp75o8w8KA1ULVZxbtv3wwpMo0=";
sha256 = "sha256-41UwUwlpnTrKHgBQ/CHUhZW0DbBGyw0kkc1X/1smkgs=";
};
propagatedBuildInputs = [

View File

@ -1,41 +1,35 @@
{ buildPythonPackage
, fetchPypi
, fetchFromGitHub
, lib
, coveralls
, gevent
, six
, pytestCheckHook
, mock
, pytest-asyncio
, pytest-benchmark
, pytestcov
, six
}:
buildPythonPackage rec {
pname = "promise";
version = "2.3";
version = "2.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "1l4kknj97dj5pxfpsz3ln78x9a843561c740b1m4pfi3qlvq7lfz";
src = fetchFromGitHub {
owner = "syrusakbary";
repo = "promise";
rev = "v${version}";
sha256 = "17mq1bm78xfl0x1g50ng502m5ldq6421rzz35hlqafsj0cq8dkp6";
};
patchPhase = ''
substituteInPlace setup.py \
--replace '"futures",' ""
'';
propagatedBuildInputs = [
gevent
six
];
checkInputs = [
coveralls
pytestCheckHook
mock
pytest-asyncio
pytest-benchmark
pytestcov
];
disabledTestPaths = [
"tests/test_benchmark.py"
];
meta = with lib; {

View File

@ -0,0 +1,41 @@
{ lib
, aiohttp
, aioresponses
, buildPythonPackage
, fetchFromGitHub
, pytest-asyncio
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "pydeconz";
version = "77";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "Kane610";
repo = "deconz";
rev = "v${version}";
sha256 = "0qpipw3si3a23c3nafagfx3zl3v481ha8yakcz1d42mbwsc6hkk4";
};
propagatedBuildInputs = [
aiohttp
];
checkInputs = [
aioresponses
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [ "pydeconz" ];
meta = with lib; {
description = "Python library wrapping the Deconz REST API";
homepage = "https://github.com/Kane610/deconz";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

View File

@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "pysma";
version = "0.3.5";
version = "0.4";
src = fetchPypi {
inherit pname version;
sha256 = "1awcsbk14i2aw01f7b7hrmpn9q6vr9v6la0i9n7ldv1h8rzq6j16";
sha256 = "sha256-BOVALVFb/p2q3A4NkvgtwmL5fNvwMCk0hb1L5MRWzHY=";
};
propagatedBuildInputs = [

View File

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, pythonAtLeast, nose }:
{ lib, buildPythonPackage, fetchPypi, fetchpatch, nose }:
buildPythonPackage rec {
pname = "rope";
@ -9,6 +9,15 @@ buildPythonPackage rec {
sha256 = "786b5c38c530d4846aa68a42604f61b4e69a493390e3ca11b88df0fbfdc3ed04";
};
patches = [
# Python 3.9 ast changes
(fetchpatch {
url = "https://github.com/python-rope/rope/pull/333.patch";
excludes = [ ".github/workflows/main.yml" ];
sha256 = "1gq7n1zs18ndmv0p8jg1h5pawabi1m9m9z2w5hgidvqmpmcziky0";
})
];
checkInputs = [ nose ];
checkPhase = ''
# tracked upstream here https://github.com/python-rope/rope/issues/247
@ -19,6 +28,6 @@ buildPythonPackage rec {
description = "Python refactoring library";
homepage = "https://github.com/python-rope/rope";
maintainers = with maintainers; [ goibhniu ];
license = licenses.gpl2;
license = licenses.gpl3Plus;
};
}

View File

@ -6,6 +6,7 @@
, pandas
, setuptools
, isPy3k
, setuptools-scm
}:
buildPythonPackage rec {
@ -18,6 +19,7 @@ buildPythonPackage rec {
sha256 = "sha256-OOhDnWyRvNW3wPyjSdr44GQ6xohQyYcmLVNSbp19AeQ=";
};
nativeBuildInputs = [ setuptools-scm ];
propagatedBuildInputs = [ numpy pandas setuptools ];
checkInputs = [ pytestCheckHook ];

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "cppcheck";
version = "2.3";
version = "2.4";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
sha256 = "0mlw0z20qf0g9qrmdmbykzf87wlcgmah8bacmp4mk6dwfzr9g9n3";
sha256 = "sha256-mGJPqOmz1/siAVkwDP5WXFvx3TtD5KT/klciqnaEoCo=";
};
buildInputs = [ pcre ] ++ lib.optionals withZ3 [ z3 ];

View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "drm_info";
version = "2.2.0";
version = "2.3.0";
src = fetchFromGitHub {
owner = "ascent12";
repo = "drm_info";
rev = "v${version}";
sha256 = "0s4zp8xz21zcpinbcwdvg48rf0xr7rs0dqri28q093vfmllsk36f";
sha256 = "sha256-UTDYLe3QezPCyG9CIp+O+KX716JDTL9mn+OEjjyTwlg=";
};
nativeBuildInputs = [ meson ninja pkg-config ];

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "go-task";
version = "3.2.2";
version = "3.3.0";
src = fetchFromGitHub {
owner = pname;
repo = "task";
rev = "v${version}";
sha256 = "0x94z023rsl7h9prw0i4zkwb5xf2frjz8f15mmcknw48r9ymw598";
sha256 = "sha256-+JhU0DXSUbpaHWJYEgiUwsR8DucGRwkiNiKDyhJroqk=";
};
vendorSha256 = "05sh4jbva23ggg2viknl49bwgkhf8dfvsv3rqkl4wwi9ag64qgha";
vendorSha256 = "sha256-pNKzqUtEIQs0TP387ACHfCv1RsMjZi7O8P1A8df+QtI=";
doCheck = false;

View File

@ -8,18 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-valgrind";
version = "1.3.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "jfrimmel";
repo = "cargo-valgrind";
# repo lacks the 1.3.0 tag
# https://github.com/jfrimmel/cargo-valgrind/issues/33
rev = "d47dd810e3971d676cde5757df8b2e05ed563e41";
sha256 = "163ch5bpwny1di758rpfib1ddqclxm48j0lmmv741ji3l4nqid32";
rev = version;
sha256 = "0knsq6n3wrsd3ir2r1wpxm6ks7rgkw33bk008s8fq33m3bq2yvm7";
};
cargoSha256 = "008s1y3pkn8613kp1gqf494fs93ix0nrwhrkqi5q9bim2mixgccb";
cargoSha256 = "09mhdi12wgg7s4wdnn0vfxhj7hwj5hjrq32mjgjr2hwm6yzhkzr2";
passthru = {
updateScript = nix-update-script {
@ -33,6 +31,9 @@ rustPlatform.buildRustPackage rec {
wrapProgram $out/bin/cargo-valgrind --prefix PATH : ${lib.makeBinPath [ valgrind ]}
'';
# Disable check phase as there are failures (2 tests fail)
doCheck = false;
meta = with lib; {
description = ''Cargo subcommand "valgrind": runs valgrind and collects its output in a helpful manner'';
homepage = "https://github.com/jfrimmel/cargo-valgrind";

View File

@ -16,13 +16,13 @@ let
in stdenv.mkDerivation rec {
pname = "osu-lazer";
version = "2021.312.0";
version = "2021.320.0";
src = fetchFromGitHub {
owner = "ppy";
repo = "osu";
rev = version;
sha256 = "xMq4KrEfSNuXpi4h+BDaHOuWBBPcWNByiKxxsR6EJwA=";
sha256 = "jFroWbNvJRD+r5w6BPj8QBnHJ9uXJZdx4kzmu5gmVSY=";
};
patches = [ ./bypass-tamper-detection.patch ];

View File

@ -19,6 +19,11 @@
version = "4.3.0.1";
sha256 = "0n6x57mnnvcjnrs8zyvy07h5zm4bcfy9gh4n4bvd9fx5ys4pxkvv";
})
(fetchNuGet {
name = "HidSharpCore";
version = "1.2.1.1";
sha256 = "1zkndglmz0s8rblfhnqcvv90rkq2i7lf4bc380g7z8h1avf2ikll";
})
(fetchNuGet {
name = "Humanizer";
version = "2.8.26";
@ -426,18 +431,13 @@
})
(fetchNuGet {
name = "Microsoft.CSharp";
version = "4.0.1";
sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj";
})
(fetchNuGet {
name = "Microsoft.CSharp";
version = "4.5.0";
sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l";
version = "4.7.0";
sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j";
})
(fetchNuGet {
name = "Microsoft.Data.Sqlite.Core";
version = "2.2.6";
sha256 = "0fx8698k71vzr8pdc6q8bsbzg6r8a42s4hkzmiyv13ibmyb5q68k";
version = "5.0.4";
sha256 = "0cpcw1mgxm47s6bn181iswrd41c7jyqxv1zwk0xw0hag0jy80xwm";
})
(fetchNuGet {
name = "Microsoft.Diagnostics.NETCore.Client";
@ -451,89 +451,64 @@
})
(fetchNuGet {
name = "Microsoft.DotNet.PlatformAbstractions";
version = "2.1.0";
sha256 = "1qydvyyinj3b5mraazjal3n2k7jqhn05b6n1a2f3qjkqkxi63dmy";
version = "3.1.6";
sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5";
})
(fetchNuGet {
name = "Microsoft.EntityFrameworkCore";
version = "2.2.6";
sha256 = "18j2cr50wsikwv7gy3vrjvmpdxckvv537qma8afdpr3yn2klayh5";
version = "5.0.4";
sha256 = "17r5knq984j6mgbv7w4lyl12ma15pii09zmvf7zw651k46a7lmdz";
})
(fetchNuGet {
name = "Microsoft.EntityFrameworkCore.Abstractions";
version = "2.2.6";
sha256 = "1dyxb5ibx24frlgbqy7zch0falq9p1189zvlbxgl94m0hvpml5j3";
version = "5.0.4";
sha256 = "0ilj2625nmr8l9al7xk1q1kxcx5p52wlsh8x3qvs8kf2dgvvckn6";
})
(fetchNuGet {
name = "Microsoft.EntityFrameworkCore.Analyzers";
version = "2.2.6";
sha256 = "10f2lxxmh0xrdjvnam31fqfnjkaick23mpfvahj3ca5l07bph0rc";
version = "5.0.4";
sha256 = "193c63kqgrdiy0wwsbd5hc9b7cjmngiy6rbam24cilafm68nhiif";
})
(fetchNuGet {
name = "Microsoft.EntityFrameworkCore.Design";
version = "2.2.6";
sha256 = "0kjjkh1yfb56wnkmciqzfn9vymqfjap364y5amia0lmqmhfz8g7f";
version = "5.0.4";
sha256 = "1xb50lrdyrxa6yi2a8k71znqw2cpjr6qpwx7z5wa5fabdjlywdxh";
})
(fetchNuGet {
name = "Microsoft.EntityFrameworkCore.Relational";
version = "2.2.6";
sha256 = "0c0z4mrqldjfslyxywb2ydk8hn9ybhkvz6lxx3idrfalq3ni5f1z";
version = "5.0.4";
sha256 = "0by7is7h3i3w4a1bsffls81dyklp2k4jlysjv1wh3l2wp76c42xa";
})
(fetchNuGet {
name = "Microsoft.EntityFrameworkCore.Sqlite";
version = "2.2.6";
sha256 = "0z8k5ns841imaqha5abb1ka0rsfzy90k6qkrvix11sp6k9i7lsam";
version = "5.0.4";
sha256 = "0pf55yqjlrjmh8hdcd55awxykhqwzzi5cc447232sa0fdn8a2yh8";
})
(fetchNuGet {
name = "Microsoft.EntityFrameworkCore.Sqlite.Core";
version = "2.2.6";
sha256 = "0jzqw4672mzxjvzas09sl0zyzzayfgkv003a7bw5g2gjyiphf630";
version = "5.0.4";
sha256 = "0ma6y292hgh7bgaancmvvyv0fl6hibjbcbfhn35h01dg6bnz00wr";
})
(fetchNuGet {
name = "Microsoft.Extensions.Caching.Abstractions";
version = "2.2.0";
sha256 = "0hhxc5dp52faha1bdqw0k426zicsv6x1kfqi30m9agr0b2hixj52";
version = "5.0.0";
sha256 = "0j83zapqhgqb4v5f6kn891km095pfhvsqha357a86ccclmv2czvb";
})
(fetchNuGet {
name = "Microsoft.Extensions.Caching.Memory";
version = "2.2.0";
sha256 = "0bzrsn5vas86w66bd04xilnlb21nx4l6lz7d3acvy6y8ir2vb5dv";
})
(fetchNuGet {
name = "Microsoft.Extensions.Configuration";
version = "2.2.0";
sha256 = "02250qrs3jqqbggfvd0mkim82817f79x6jh8fx2i7r58d0m66qkl";
})
(fetchNuGet {
name = "Microsoft.Extensions.Configuration.Abstractions";
version = "2.2.0";
sha256 = "1fv5277hyhfqmc0gqszyqb1ilwnijm8kc9606yia6hwr8pxyg674";
version = "5.0.0";
sha256 = "0l8spndl3kvccjlay202msm31iy5iig0i9ddbsdy92wbcjr97lca";
})
(fetchNuGet {
name = "Microsoft.Extensions.Configuration.Abstractions";
version = "5.0.0";
sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k";
})
(fetchNuGet {
name = "Microsoft.Extensions.Configuration.Binder";
version = "2.2.0";
sha256 = "10qyjdkymdmag3r807kvbnwag4j3nz65i4cwikbd77jjvz92ya3j";
})
(fetchNuGet {
name = "Microsoft.Extensions.DependencyInjection";
version = "2.2.0";
sha256 = "0lvv45rvq1xbf47lz818rjydc776zk8mf7svpzh1dml4qwlx9zck";
})
(fetchNuGet {
name = "Microsoft.Extensions.DependencyInjection";
version = "5.0.1";
sha256 = "06xig49mwyp3b2dvdx98j079ncg6p4c9x8yj4pzs6ppmi3jgaaqk";
})
(fetchNuGet {
name = "Microsoft.Extensions.DependencyInjection.Abstractions";
version = "2.2.0";
sha256 = "1jyzfdr9651h3x6pxwhpfbb9mysfh8f8z1jvy4g117h9790r9zx5";
})
(fetchNuGet {
name = "Microsoft.Extensions.DependencyInjection.Abstractions";
version = "5.0.0";
@ -541,24 +516,14 @@
})
(fetchNuGet {
name = "Microsoft.Extensions.DependencyModel";
version = "2.1.0";
sha256 = "0dl4qhjgifm6v3jsfzvzkvddyic77ggp9fq49ah661v45gk6ilgd";
})
(fetchNuGet {
name = "Microsoft.Extensions.Logging";
version = "2.2.0";
sha256 = "0bx3ljyvvcbikradq2h583rl72h8bxdz33aghk026cxzpv2mm3wm";
version = "5.0.0";
sha256 = "1mma1zxi0b40972cwfvkj9y0w9r7vjbi74784jzcb22pric00k5x";
})
(fetchNuGet {
name = "Microsoft.Extensions.Logging";
version = "5.0.0";
sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3";
})
(fetchNuGet {
name = "Microsoft.Extensions.Logging.Abstractions";
version = "2.2.0";
sha256 = "02w7hp6jicr7cl5p456k2cmrjvvhm6spg5kxnlncw3b72358m5wl";
})
(fetchNuGet {
name = "Microsoft.Extensions.Logging.Abstractions";
version = "5.0.0";
@ -569,21 +534,11 @@
version = "5.0.3";
sha256 = "1slfc4ncl83dl2g1xm95qb04bkyir26zhvz26lkph1jff0ycx2wb";
})
(fetchNuGet {
name = "Microsoft.Extensions.Options";
version = "2.2.0";
sha256 = "1b20yh03fg4nmmi3vlf6gf13vrdkmklshfzl3ijygcs4c2hly6v0";
})
(fetchNuGet {
name = "Microsoft.Extensions.Options";
version = "5.0.0";
sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay";
})
(fetchNuGet {
name = "Microsoft.Extensions.Primitives";
version = "2.2.0";
sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c";
})
(fetchNuGet {
name = "Microsoft.Extensions.Primitives";
version = "5.0.0";
@ -614,21 +569,11 @@
version = "5.0.0";
sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc";
})
(fetchNuGet {
name = "Microsoft.NETCore.Targets";
version = "3.1.0";
sha256 = "04cc2wl90p7g9zscnxgyj55vzl7srrrjwadl2dxgicfb2x2499ca";
})
(fetchNuGet {
name = "Microsoft.NETCore.Targets";
version = "5.0.0";
sha256 = "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6";
})
(fetchNuGet {
name = "Microsoft.Win32.Primitives";
version = "4.0.1";
sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7";
})
(fetchNuGet {
name = "Microsoft.Win32.Primitives";
version = "4.3.0";
@ -644,11 +589,6 @@
version = "0.9.6.1";
sha256 = "1fr7969h5q611l5227xw6nvv5rzap76vbpk0wg9hxbcxk3hn7szf";
})
(fetchNuGet {
name = "NETStandard.Library";
version = "1.6.0";
sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k";
})
(fetchNuGet {
name = "NETStandard.Library";
version = "1.6.1";
@ -669,11 +609,6 @@
version = "12.0.3";
sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x";
})
(fetchNuGet {
name = "Newtonsoft.Json";
version = "9.0.1";
sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r";
})
(fetchNuGet {
name = "NuGet.Common";
version = "5.8.0";
@ -724,10 +659,20 @@
version = "3.13.1";
sha256 = "07156gr0yl9rqhyj44cp1xz9jpngbl5kb7ci3qfy9fcp01dczmm9";
})
(fetchNuGet {
name = "OpenTabletDriver";
version = "0.5.2.1";
sha256 = "0czbgxjkc5ryrnn9hl68wp464p4xp0883517iq87d1f7qb32gppl";
})
(fetchNuGet {
name = "OpenTabletDriver.Plugin";
version = "0.5.2.1";
sha256 = "199yasnq5dsb5c37vl8vry8lf536gpgclsk402sxdw9lz11xmmqd";
})
(fetchNuGet {
name = "ppy.osu.Framework";
version = "2021.309.0";
sha256 = "1da0jgdcxd4zq0fzqhbm31gg66l8sgdgypis8xlch2xny1g854z6";
version = "2021.317.0";
sha256 = "1nych95lrxs2hb3bcnw9h0f843k9lrn1f4hwdnaf5q3p8ny1pmph";
})
(fetchNuGet {
name = "ppy.osu.Framework.NativeLibs";
@ -754,11 +699,6 @@
version = "1.9.0.5";
sha256 = "0nmhrg3q6izapfpwdslq80fqkvjj12ad9r94pd0nr2xx1zw0x1zl";
})
(fetchNuGet {
name = "Remotion.Linq";
version = "2.2.0";
sha256 = "1y46ni0xswmmiryp8sydjgryafwn458dr91f9xn653w73kdyk4xf";
})
(fetchNuGet {
name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl";
version = "4.3.0";
@ -774,41 +714,21 @@
version = "4.3.0";
sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa";
})
(fetchNuGet {
name = "runtime.native.System";
version = "4.0.0";
sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf";
})
(fetchNuGet {
name = "runtime.native.System";
version = "4.3.0";
sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4";
})
(fetchNuGet {
name = "runtime.native.System.IO.Compression";
version = "4.1.0";
sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk";
})
(fetchNuGet {
name = "runtime.native.System.IO.Compression";
version = "4.3.0";
sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d";
})
(fetchNuGet {
name = "runtime.native.System.Net.Http";
version = "4.0.1";
sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6";
})
(fetchNuGet {
name = "runtime.native.System.Net.Http";
version = "4.3.0";
sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk";
})
(fetchNuGet {
name = "runtime.native.System.Security.Cryptography";
version = "4.0.0";
sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9";
})
(fetchNuGet {
name = "runtime.native.System.Security.Cryptography.Apple";
version = "4.3.0";
@ -890,55 +810,40 @@
sha256 = "154w9q0z8697rcpqs4x233crx5ap1z4pl4xc21hsd3csbhw13ykf";
})
(fetchNuGet {
name = "SQLitePCLRaw.bundle_green";
version = "1.1.12";
sha256 = "0jbyd25ag15fyn9nawjikv0v5ylk2zh5pxgr6gm4kpbpqys86sq9";
name = "SQLitePCLRaw.bundle_e_sqlite3";
version = "2.0.4";
sha256 = "1l3vbkwismsx5jcy3d5bj4bzh8bni8bk2gq4lqplz82pz5phjpxm";
})
(fetchNuGet {
name = "SQLitePCLRaw.core";
version = "1.1.12";
sha256 = "03gflsn2wl6v0a8zvh6y5xdhx0xxmfrn6jfldiy829x3fx74zgdl";
version = "2.0.4";
sha256 = "0lb5vwfl1hd24xzzdaj2p4k2hv2k0i3mgdri6fjj0ssb37mcyir1";
})
(fetchNuGet {
name = "SQLitePCLRaw.lib.e_sqlite3.linux";
version = "1.1.12";
sha256 = "10mlq914d3zggdjf4bv27w6jx0gqqjf6f91y5ri6pbvaqyhi28h5";
name = "SQLitePCLRaw.lib.e_sqlite3";
version = "2.0.4";
sha256 = "0kmx1w5qllmwxldr8338qxwmpfzc6g2lmyrah7wfaxd3mvfzky5c";
})
(fetchNuGet {
name = "SQLitePCLRaw.lib.e_sqlite3.osx";
version = "1.1.12";
sha256 = "1hixg6n9sqllfrcihj145lh1l38inv827808difvazd4zr3mi0z1";
name = "SQLitePCLRaw.provider.dynamic_cdecl";
version = "2.0.4";
sha256 = "084r98kilpm0q1aw41idq8slncpd7cz65g0m1wr0p8d12x8z5g6j";
})
(fetchNuGet {
name = "SQLitePCLRaw.lib.e_sqlite3.v110_xp";
version = "1.1.12";
sha256 = "107sivk5p38dg1kyvqrxgp67dj89s8l6brf9l52k6s4vrn4hrrk7";
})
(fetchNuGet {
name = "SQLitePCLRaw.provider.e_sqlite3.netstandard11";
version = "1.1.12";
sha256 = "0qr2d7ka6f5c7bybdhiyq7nl90c9575szmi0nfpknd9c0w024if4";
name = "SQLitePCLRaw.provider.e_sqlite3";
version = "2.0.4";
sha256 = "1vm8w8xvqi11sihdz5s6y4w7ghq4pp5f2ksixdhlbycvs6m4h7i7";
})
(fetchNuGet {
name = "StbiSharp";
version = "1.0.13";
sha256 = "0yaspwlh4x93d7xnqj5w5pxlwzlv9lixvksyvdh176krfa4mjw3q";
})
(fetchNuGet {
name = "System.AppContext";
version = "4.1.0";
sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz";
})
(fetchNuGet {
name = "System.AppContext";
version = "4.3.0";
sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya";
})
(fetchNuGet {
name = "System.Buffers";
version = "4.0.0";
sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr";
})
(fetchNuGet {
name = "System.Buffers";
version = "4.3.0";
@ -964,11 +869,6 @@
version = "4.3.0";
sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9";
})
(fetchNuGet {
name = "System.Collections.Concurrent";
version = "4.0.12";
sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc";
})
(fetchNuGet {
name = "System.Collections.Concurrent";
version = "4.3.0";
@ -989,11 +889,6 @@
version = "5.0.0";
sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r";
})
(fetchNuGet {
name = "System.ComponentModel.Annotations";
version = "4.5.0";
sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p";
})
(fetchNuGet {
name = "System.ComponentModel.Annotations";
version = "5.0.0";
@ -1029,11 +924,6 @@
version = "1.0.31";
sha256 = "1m4j19zx50lbbdx1xxbgpsd1dai2r3kzkyapw47kdvkb89qjkl63";
})
(fetchNuGet {
name = "System.Console";
version = "4.0.0";
sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf";
})
(fetchNuGet {
name = "System.Console";
version = "4.3.0";
@ -1049,51 +939,31 @@
version = "4.3.0";
sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y";
})
(fetchNuGet {
name = "System.Diagnostics.DiagnosticSource";
version = "4.0.0";
sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m";
})
(fetchNuGet {
name = "System.Diagnostics.DiagnosticSource";
version = "4.3.0";
sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq";
})
(fetchNuGet {
name = "System.Diagnostics.DiagnosticSource";
version = "4.5.0";
sha256 = "1y8m0p3127nak5yspapfnz25qc9x53gqpvwr3hdpsvrcd2r1pgyj";
})
(fetchNuGet {
name = "System.Diagnostics.DiagnosticSource";
version = "5.0.0";
sha256 = "0phd2qizshjvglhzws1jd0cq4m54gscz4ychzr3x6wbgl4vvfrga";
})
(fetchNuGet {
name = "System.Diagnostics.Tools";
version = "4.0.1";
sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x";
name = "System.Diagnostics.DiagnosticSource";
version = "5.0.1";
sha256 = "0mzw44wsm87vpslb9sn7rirxynpq9m3b00l7gl0q71m8shfh66qs";
})
(fetchNuGet {
name = "System.Diagnostics.Tools";
version = "4.3.0";
sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1";
})
(fetchNuGet {
name = "System.Diagnostics.Tracing";
version = "4.1.0";
sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394";
})
(fetchNuGet {
name = "System.Diagnostics.Tracing";
version = "4.3.0";
sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4";
})
(fetchNuGet {
name = "System.Dynamic.Runtime";
version = "4.0.11";
sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9";
})
(fetchNuGet {
name = "System.Globalization";
version = "4.0.11";
@ -1104,31 +974,16 @@
version = "4.3.0";
sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki";
})
(fetchNuGet {
name = "System.Globalization.Calendars";
version = "4.0.1";
sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh";
})
(fetchNuGet {
name = "System.Globalization.Calendars";
version = "4.3.0";
sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq";
})
(fetchNuGet {
name = "System.Globalization.Extensions";
version = "4.0.1";
sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc";
})
(fetchNuGet {
name = "System.Globalization.Extensions";
version = "4.3.0";
sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls";
})
(fetchNuGet {
name = "System.Interactive.Async";
version = "3.2.0";
sha256 = "0y5r5y7dlccjpgg17rjrrzi3jya4ysyydamxs33qckkv4jb3534d";
})
(fetchNuGet {
name = "System.IO";
version = "4.1.0";
@ -1139,41 +994,21 @@
version = "4.3.0";
sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f";
})
(fetchNuGet {
name = "System.IO.Compression";
version = "4.1.0";
sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji";
})
(fetchNuGet {
name = "System.IO.Compression";
version = "4.3.0";
sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz";
})
(fetchNuGet {
name = "System.IO.Compression.ZipFile";
version = "4.0.1";
sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82";
})
(fetchNuGet {
name = "System.IO.Compression.ZipFile";
version = "4.3.0";
sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar";
})
(fetchNuGet {
name = "System.IO.FileSystem";
version = "4.0.1";
sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1";
})
(fetchNuGet {
name = "System.IO.FileSystem";
version = "4.3.0";
sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw";
})
(fetchNuGet {
name = "System.IO.FileSystem.Primitives";
version = "4.0.1";
sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612";
})
(fetchNuGet {
name = "System.IO.FileSystem.Primitives";
version = "4.3.0";
@ -1199,26 +1034,11 @@
version = "4.3.0";
sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7";
})
(fetchNuGet {
name = "System.Linq.Expressions";
version = "4.1.0";
sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg";
})
(fetchNuGet {
name = "System.Linq.Expressions";
version = "4.3.0";
sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv";
})
(fetchNuGet {
name = "System.Linq.Queryable";
version = "4.0.1";
sha256 = "11jn9k34g245yyf260gr3ldzvaqa9477w2c5nhb1p8vjx4xm3qaw";
})
(fetchNuGet {
name = "System.Memory";
version = "4.5.1";
sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c";
})
(fetchNuGet {
name = "System.Memory";
version = "4.5.3";
@ -1229,31 +1049,16 @@
version = "4.5.4";
sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y";
})
(fetchNuGet {
name = "System.Net.Http";
version = "4.1.0";
sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb";
})
(fetchNuGet {
name = "System.Net.Http";
version = "4.3.0";
sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j";
})
(fetchNuGet {
name = "System.Net.Primitives";
version = "4.0.11";
sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r";
})
(fetchNuGet {
name = "System.Net.Primitives";
version = "4.3.0";
sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii";
})
(fetchNuGet {
name = "System.Net.Sockets";
version = "4.1.0";
sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls";
})
(fetchNuGet {
name = "System.Net.Sockets";
version = "4.3.0";
@ -1269,11 +1074,6 @@
version = "4.5.0";
sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59";
})
(fetchNuGet {
name = "System.ObjectModel";
version = "4.0.12";
sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj";
})
(fetchNuGet {
name = "System.ObjectModel";
version = "4.3.0";
@ -1289,11 +1089,6 @@
version = "4.3.0";
sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m";
})
(fetchNuGet {
name = "System.Reflection.Emit";
version = "4.0.1";
sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp";
})
(fetchNuGet {
name = "System.Reflection.Emit";
version = "4.3.0";
@ -1304,21 +1099,11 @@
version = "4.6.0";
sha256 = "18h375q5bn9h7swxnk4krrxym1dxmi9bm26p89xps9ygrj4q6zqw";
})
(fetchNuGet {
name = "System.Reflection.Emit.ILGeneration";
version = "4.0.1";
sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0";
})
(fetchNuGet {
name = "System.Reflection.Emit.ILGeneration";
version = "4.3.0";
sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q";
})
(fetchNuGet {
name = "System.Reflection.Emit.Lightweight";
version = "4.0.1";
sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr";
})
(fetchNuGet {
name = "System.Reflection.Emit.Lightweight";
version = "4.3.0";
@ -1329,11 +1114,6 @@
version = "4.6.0";
sha256 = "0hry2k6b7kicg4zxnq0hhn0ys52711pxy7l9v5sp7gvp9cicwpgp";
})
(fetchNuGet {
name = "System.Reflection.Extensions";
version = "4.0.1";
sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn";
})
(fetchNuGet {
name = "System.Reflection.Extensions";
version = "4.3.0";
@ -1359,11 +1139,6 @@
version = "4.3.0";
sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276";
})
(fetchNuGet {
name = "System.Reflection.TypeExtensions";
version = "4.1.0";
sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7";
})
(fetchNuGet {
name = "System.Reflection.TypeExtensions";
version = "4.3.0";
@ -1389,11 +1164,6 @@
version = "4.3.0";
sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7";
})
(fetchNuGet {
name = "System.Runtime.CompilerServices.Unsafe";
version = "4.5.1";
sha256 = "1xcrjx5fwg284qdnxyi2d0lzdm5q4frlpkp0nf6vvkx1kdz2prrf";
})
(fetchNuGet {
name = "System.Runtime.CompilerServices.Unsafe";
version = "4.5.2";
@ -1444,51 +1214,26 @@
version = "4.3.0";
sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j";
})
(fetchNuGet {
name = "System.Runtime.InteropServices.RuntimeInformation";
version = "4.0.0";
sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6";
})
(fetchNuGet {
name = "System.Runtime.InteropServices.RuntimeInformation";
version = "4.3.0";
sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii";
})
(fetchNuGet {
name = "System.Runtime.Numerics";
version = "4.0.1";
sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn";
})
(fetchNuGet {
name = "System.Runtime.Numerics";
version = "4.3.0";
sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z";
})
(fetchNuGet {
name = "System.Runtime.Serialization.Primitives";
version = "4.1.1";
sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k";
})
(fetchNuGet {
name = "System.Security.AccessControl";
version = "5.0.0";
sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r";
})
(fetchNuGet {
name = "System.Security.Cryptography.Algorithms";
version = "4.2.0";
sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85";
})
(fetchNuGet {
name = "System.Security.Cryptography.Algorithms";
version = "4.3.0";
sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml";
})
(fetchNuGet {
name = "System.Security.Cryptography.Cng";
version = "4.2.0";
sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc";
})
(fetchNuGet {
name = "System.Security.Cryptography.Cng";
version = "4.3.0";
@ -1499,31 +1244,16 @@
version = "5.0.0-preview.3.20214.6";
sha256 = "050xx94ki5zmclplfns1v463wlf97ha2knwnxp08vqkgy0bdg1mv";
})
(fetchNuGet {
name = "System.Security.Cryptography.Csp";
version = "4.0.0";
sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q";
})
(fetchNuGet {
name = "System.Security.Cryptography.Csp";
version = "4.3.0";
sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1";
})
(fetchNuGet {
name = "System.Security.Cryptography.Encoding";
version = "4.0.0";
sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4";
})
(fetchNuGet {
name = "System.Security.Cryptography.Encoding";
version = "4.3.0";
sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32";
})
(fetchNuGet {
name = "System.Security.Cryptography.OpenSsl";
version = "4.0.0";
sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q";
})
(fetchNuGet {
name = "System.Security.Cryptography.OpenSsl";
version = "4.3.0";
@ -1534,11 +1264,6 @@
version = "5.0.0-preview.3.20214.6";
sha256 = "1q38rzpzhzpc8l75m06g6swq23qbl22ijzd9k76jfq08px3wq09k";
})
(fetchNuGet {
name = "System.Security.Cryptography.Primitives";
version = "4.0.0";
sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh";
})
(fetchNuGet {
name = "System.Security.Cryptography.Primitives";
version = "4.3.0";
@ -1549,11 +1274,6 @@
version = "4.4.0";
sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6";
})
(fetchNuGet {
name = "System.Security.Cryptography.X509Certificates";
version = "4.1.0";
sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh";
})
(fetchNuGet {
name = "System.Security.Cryptography.X509Certificates";
version = "4.3.0";
@ -1584,11 +1304,6 @@
version = "5.0.0";
sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0";
})
(fetchNuGet {
name = "System.Text.Encoding.Extensions";
version = "4.0.11";
sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs";
})
(fetchNuGet {
name = "System.Text.Encoding.Extensions";
version = "4.3.0";
@ -1609,11 +1324,6 @@
version = "5.0.1";
sha256 = "1j7via4spxy73ipng754wdz1nb882gsb9qh26jqlql66vzbbm3j3";
})
(fetchNuGet {
name = "System.Text.RegularExpressions";
version = "4.1.0";
sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7";
})
(fetchNuGet {
name = "System.Text.RegularExpressions";
version = "4.3.0";
@ -1644,11 +1354,6 @@
version = "4.3.0";
sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7";
})
(fetchNuGet {
name = "System.Threading.Tasks.Extensions";
version = "4.0.0";
sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr";
})
(fetchNuGet {
name = "System.Threading.Tasks.Extensions";
version = "4.3.0";
@ -1669,31 +1374,16 @@
version = "4.0.0";
sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc";
})
(fetchNuGet {
name = "System.Threading.Timer";
version = "4.0.1";
sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6";
})
(fetchNuGet {
name = "System.Threading.Timer";
version = "4.3.0";
sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56";
})
(fetchNuGet {
name = "System.Xml.ReaderWriter";
version = "4.0.11";
sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5";
})
(fetchNuGet {
name = "System.Xml.ReaderWriter";
version = "4.3.0";
sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1";
})
(fetchNuGet {
name = "System.Xml.XDocument";
version = "4.0.11";
sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18";
})
(fetchNuGet {
name = "System.Xml.XDocument";
version = "4.3.0";

View File

@ -151,7 +151,7 @@
"datadog" = ps: with ps; [ datadog ];
"ddwrt" = ps: with ps; [ ];
"debugpy" = ps: with ps; [ debugpy ];
"deconz" = ps: with ps; [ ]; # missing inputs: pydeconz
"deconz" = ps: with ps; [ pydeconz ];
"decora" = ps: with ps; [ bluepy ]; # missing inputs: decora
"decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi
"default_config" = ps: with ps; [ pynacl aiohttp-cors async-upnp-client defusedxml distro emoji hass-nabucasa netdisco pillow scapy sqlalchemy zeroconf ];

View File

@ -193,6 +193,7 @@ in with py.pkgs; buildPythonApplication rec {
"conversation"
"counter"
"cover"
"deconz"
"default_config"
"demo"
"derivative"
@ -293,6 +294,7 @@ in with py.pkgs; buildPythonApplication rec {
"shopping_list"
"simplisafe"
"simulated"
"sma"
"sensor"
"smarttub"
"smtp"

View File

@ -28,11 +28,11 @@ let
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli";
version = "1.19.30"; # N.B: if you change this, change botocore and boto3 to a matching version too
version = "1.19.33"; # N.B: if you change this, change botocore and boto3 to a matching version too
src = fetchPypi {
inherit pname version;
sha256 = "sha256-XD0CwBTDUvCTSL7JrcQCAd8zq+Ve0zSDpfz0Vzi8oeM=";
sha256 = "sha256-Rz0aZTsFV3RAdH04d3jvvqi1wFuIIx3SFddONhM8c8E=";
};
# https://github.com/aws/aws-cli/issues/4837

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "eksctl";
version = "0.40.0";
version = "0.41.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
sha256 = "sha256-2kxJcQ0kzIbXUSecDR5CRlgp0y59wftFPUwU1MSHOn0=";
sha256 = "sha256-f4DkmIi4Uf4qJ3zkDWcpuN6nqXAwa91lj9Jd1MIskJ8=";
};
vendorSha256 = "sha256-m+qldNgY3+DKTFjxwKo4Sbi0F7y4xomiIuR+apek61Q=";
vendorSha256 = "sha256-G6rOmI1Q+bMRqOrkByff2q1AtuUN4hBfFzYaFq4TsxY=";
doCheck = false;

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "chezmoi";
version = "1.8.11";
version = "2.0.3";
src = fetchFromGitHub {
owner = "twpayne";
repo = "chezmoi";
rev = "v${version}";
sha256 = "sha256-aWq36wQFxAyORifi5/9MOnqmR5FRyDAQj1tVFqoiFvA=";
sha256 = "sha256-kOxA9FtVfS1lFSsV5E1+eGQF7D9C7TzhzLGw2r7LlOY=";
};
vendorSha256 = "sha256-ASTPb8Va3Gl/VtmPJIdlnlU3OspAxzZ5iSHVcZOh8CY=";
vendorSha256 = "sha256-V05cCKQeqw6BEjLIYDeHeDePkA7rs7kjqPCys5eLefA=";
doCheck = false;

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "goreleaser";
version = "0.159.0";
version = "0.160.0";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
sha256 = "sha256-02uM37tulJ78IwOAqXm5Ym30kHVepnMBVg+eTMj34qQ=";
sha256 = "sha256-XrZlDYHGexBGxEhpFVjovUYE9Cpu/QaYp11JmBnqT8o=";
};
vendorSha256 = "sha256-whcHI/qkNBPYcR5WLWQCPdHiwYdLEOgorbAKTTYIWDk=";
vendorSha256 = "sha256-mzT9PLthx08Hil0DBxtw6/ouZrZZSfyElWro1iyJsTY=";
buildFlagsArray = [
"-ldflags="

View File

@ -35,7 +35,7 @@ let
canEfi = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild);
inPCSystems = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) pcSystems);
version = "2.04";
version = "2.06-rc1";
in (
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = "git://git.savannah.gnu.org/grub.git";
rev = "${pname}-${version}";
sha256 = "02gly3xw88pj4zzqjniv1fxa1ilknbq1mdk30bj6qy8n44g90i8w";
sha256 = "1ngc960g4w91rg13l724v6nlj6fq1adxp6is2mrq4bnp7sm9mysa";
};
patches = [

View File

@ -1,27 +1,17 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoPackage rec {
buildGoModule rec {
pname = "microplane";
version = "0.0.26";
version = "0.0.28";
src = fetchFromGitHub {
owner = "Clever";
repo = "microplane";
rev = "v${version}";
sha256 = "0dba8cz13ljcsfibcwycd9vb759fzlllh2bv31vgbs2pjgcinzvm";
sha256 = "00ayci0a4lv67sg2bb4fw5wpdlps4pjqiiam595dar82lsjwj63j";
};
goPackagePath = "github.com/Clever/microplane";
subPackages = ["."];
# Regenerate deps.nix with the following steps:
# git clone git@github.com:Clever/microplane.git
# cd microplane
# git checkout v<version>
# dep2nix
goDeps = ./deps.nix;
vendorSha256 = "0hn2gsm9bgmrm620fn2cx28l2gj1yfgvjix9ds50m7kwkx6q0dga";
buildFlagsArray = ''
-ldflags="-s -w -X main.version=v${version}"

View File

@ -1,228 +0,0 @@
# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
[
{
goPackagePath = "github.com/cpuguy83/go-md2man";
fetch = {
type = "git";
url = "https://github.com/cpuguy83/go-md2man";
rev = "1d903dcb749992f3741d744c0f8376b4bd7eb3e1";
sha256 = "1p1ncq4vv244w9v144vplsb2vbl3369wdxn4gc7xbfafkjwn8bxc";
};
}
{
goPackagePath = "github.com/davecgh/go-spew";
fetch = {
type = "git";
url = "https://github.com/davecgh/go-spew";
rev = "346938d642f2ec3594ed81d874461961cd0faa76";
sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
};
}
{
goPackagePath = "github.com/facebookgo/errgroup";
fetch = {
type = "git";
url = "https://github.com/facebookgo/errgroup";
rev = "779c8d7ef069c522bc72ee5f31a98d89a37f3fb6";
sha256 = "1kyqrnvr158f5lgb1pbianjd8xnmxxvpgz7qilmp7zvr69gykbas";
};
}
{
goPackagePath = "github.com/fatih/color";
fetch = {
type = "git";
url = "https://github.com/fatih/color";
rev = "570b54cabe6b8eb0bc2dfce68d964677d63b5260";
sha256 = "1hw9hgkfzbzqjhy29pqpk20xggxaqjv45wx8yn69488mw5ph7khh";
};
}
{
goPackagePath = "github.com/golang/protobuf";
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
rev = "130e6b02ab059e7b717a096f397c5b60111cae74";
sha256 = "0zk4d7gcykig9ld8f5h86fdxshm2gs93a2xkpf52jd5m4z59q26s";
};
}
{
goPackagePath = "github.com/google/go-github";
fetch = {
type = "git";
url = "https://github.com/google/go-github";
rev = "e881974953e6ab6d1a6a1610e98ed6401a3aa1ba";
sha256 = "0qaxcm2p655r1jd59rv1hd58driadw5hxlfy7h53c7pzcsmf2546";
};
}
{
goPackagePath = "github.com/google/go-querystring";
fetch = {
type = "git";
url = "https://github.com/google/go-querystring";
rev = "53e6ce116135b80d037921a7fdd5138cf32d7a8a";
sha256 = "0lkbm067nhmxk66pyjx59d77dbjjzwyi43gdvzyx2f8m1942rq7f";
};
}
{
goPackagePath = "github.com/inconshreveable/mousetrap";
fetch = {
type = "git";
url = "https://github.com/inconshreveable/mousetrap";
rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
};
}
{
goPackagePath = "github.com/juju/errors";
fetch = {
type = "git";
url = "https://github.com/juju/errors";
rev = "c7d06af17c68cd34c835053720b21f6549d9b0ee";
sha256 = "1dmj8wkpmkw4z4c7wmnscs4ykrcv7p8lgwb75g5akahwqjaf9zcp";
};
}
{
goPackagePath = "github.com/mattn/go-colorable";
fetch = {
type = "git";
url = "https://github.com/mattn/go-colorable";
rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072";
sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
};
}
{
goPackagePath = "github.com/mattn/go-isatty";
fetch = {
type = "git";
url = "https://github.com/mattn/go-isatty";
rev = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39";
sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n";
};
}
{
goPackagePath = "github.com/nathanleiby/diffparser";
fetch = {
type = "git";
url = "https://github.com/nathanleiby/diffparser";
rev = "936553ce5db1b73e63cbcd7546416d13538e8d85";
sha256 = "0qlxkbda4l1glwxdy52fhk3bqkyyc55si4xplf54jpi2x9khi2v4";
};
}
{
goPackagePath = "github.com/pmezard/go-difflib";
fetch = {
type = "git";
url = "https://github.com/pmezard/go-difflib";
rev = "792786c7400a136282c1664665ae0a8db921c6c2";
sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
};
}
{
goPackagePath = "github.com/russross/blackfriday";
fetch = {
type = "git";
url = "https://github.com/russross/blackfriday";
rev = "4048872b16cc0fc2c5fd9eacf0ed2c2fedaa0c8c";
sha256 = "17zg26ia43c8axrxp5q2bxh1asiqfhin4ah7h5d8ibil6pv7xbx4";
};
}
{
goPackagePath = "github.com/spf13/cobra";
fetch = {
type = "git";
url = "https://github.com/spf13/cobra";
rev = "7b2c5ac9fc04fc5efafb60700713d4fa609b777b";
sha256 = "0k4xswdfd2ridj7m48ijb4klq9mxpw03g8h2rvq99yddi8vmlbvn";
};
}
{
goPackagePath = "github.com/spf13/pflag";
fetch = {
type = "git";
url = "https://github.com/spf13/pflag";
rev = "e57e3eeb33f795204c1ca35f56c44f83227c6e66";
sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2";
};
}
{
goPackagePath = "github.com/stretchr/testify";
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
rev = "69483b4bd14f5845b5a1e55bca19e954e827f1d0";
sha256 = "11lzrwkdzdd8yyag92akncc008h2f9d1bpc489mxiwp0jrmz4ivb";
};
}
{
goPackagePath = "github.com/xanzy/go-gitlab";
fetch = {
type = "git";
url = "https://github.com/xanzy/go-gitlab";
rev = "ee3313ca5478c4786248d63dd75e4cd8e1fad2db";
sha256 = "0xbn94rb9ihpw1g698xbz9vdl7393z9zbb0lck52nxs838gkr4mb";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "5c72a883971a4325f8c62bf07b6d38c20ea47a6a";
sha256 = "1cimmqpajys001x6yq8ycklc4w34y7iwrksv7ayv7m7fgzhcjn3d";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "aabf50738bcdd9b207582cbe796b59ed65d56680";
sha256 = "0gq60lfzbyc6ggp5v3vbl6li818nmv0n32l9qf80ckpqpqkknkh5";
};
}
{
goPackagePath = "golang.org/x/oauth2";
fetch = {
type = "git";
url = "https://go.googlesource.com/oauth2";
rev = "bb50c06baba3d0c76f9d125c0719093e315b5b44";
sha256 = "19fkbykwjhwa0833cqcphv7sfwc1538ad5wlsdkgdwr59qb9d32i";
};
}
{
goPackagePath = "golang.org/x/sync";
fetch = {
type = "git";
url = "https://go.googlesource.com/sync";
rev = "09787c993a3ab68e3d1f5c9b2394ab9433f391be";
sha256 = "1nv4mwi9njkkyc7lwmxrjr8ggfh2cf1c67a9bq85dnss81vpj61y";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "28a7276518d399b9634904daad79e18b44d481bc";
sha256 = "0qsj394qyy27iaf8srl7bkbsx7sp4aifrv3z2xllkydya8y18rv8";
};
}
{
goPackagePath = "google.golang.org/appengine";
fetch = {
type = "git";
url = "https://github.com/golang/appengine";
rev = "150dc57a1b433e64154302bdc40b6bb8aefa313a";
sha256 = "0w3knznv39k8bm85ri62f83czcrxknql7dv6p9hk1a5jx3xljgxq";
};
}
{
goPackagePath = "gopkg.in/yaml.v2";
fetch = {
type = "git";
url = "https://github.com/go-yaml/yaml";
rev = "eb3733d160e74a9c7e442f435eb3bea458e1d19f";
sha256 = "1srhvcaa9db3a6xj29mkjr5kg33y71pclrlx4vcwz5m1lgb5c7q6";
};
}
]

View File

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "getmail6";
version = "6.14";
version = "6.15";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "1a3bw4wwdapd9n051dgwqldd8gwiipb5shaz08qwp1jndpvylm7d";
sha256 = "0cvwvlhilrqlcvza06lsrm5l1yazzvym3s5kcjxcm9cminfaf4qb";
};
doCheck = false;

View File

@ -1,6 +1,7 @@
{ lib, stdenv, fetchFromGitHub, sqlite, pkg-config, autoreconfHook, pmccabe
, xapian, glib, gmime3, texinfo , emacs, guile
, xapian, glib, gmime3, texinfo, emacs, guile
, gtk3, webkitgtk, libsoup, icu
, makeWrapper
, withMug ? false
, batchSize ? null }:
@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
++ lib.optional (!stdenv.isDarwin) guile
++ lib.optionals withMug [ gtk3 webkitgtk ];
nativeBuildInputs = [ pkg-config autoreconfHook pmccabe ];
nativeBuildInputs = [ pkg-config autoreconfHook pmccabe makeWrapper ];
enableParallelBuilding = true;
@ -37,8 +38,12 @@ stdenv.mkDerivation rec {
--replace "@abs_top_builddir@" "$out"
'';
# Install mug
postInstall = lib.optionalString withMug ''
# Make sure included scripts can find their dependencies & optionally install mug
postInstall = ''
wrapProgram "$out/bin/mu" \
--prefix LD_LIBRARY_PATH : "$out/lib" \
--prefix GUILE_LOAD_PATH : "$out/share/guile/site/2.2"
'' + lib.optionalString withMug ''
for f in mug ; do
install -m755 toys/$f/$f $out/bin/$f
done

View File

@ -10976,19 +10976,11 @@ let
libapreq2 = buildPerlPackage {
pname = "libapreq2";
version = "2.13";
version = "2.16";
src = fetchurl {
url = "mirror://cpan/authors/id/I/IS/ISAAC/libapreq2-2.13.tar.gz";
sha256 = "5731e6833b32d88e4a5c690e45ddf20fcf969ce3da666c5627d775e92da0cf6e";
url = "mirror://cpan/authors/id/S/SH/SHAY/libapreq2-2.16.tar.gz";
sha256 = "e04c855a3ea070b8863569fbae02fe828f534ac88755b23e24d3863cc9598349";
};
patches = [
(fetchpatch {
name = "CVE-2019-12412.patch";
url = "https://svn.apache.org/viewvc/httpd/apreq/trunk/library/parser_multipart.c?r1=1866760&r2=1866759&pathrev=1866760&view=patch";
sha256 = "08zaw5pb2i4w1y8crhxmlf0d8gzpvi9z49x4nwlkg4j87x7gjvaa";
stripLen = 2;
})
];
outputs = [ "out" ];
buildInputs = [ pkgs.apacheHttpd pkgs.apr pkgs.aprutil ApacheTest ExtUtilsXSBuilder ];
propagatedBuildInputs = [ (pkgs.apacheHttpdPackages.mod_perl.override { inherit perl; }) ];

View File

@ -5612,6 +5612,8 @@ in {
pydbus = callPackage ../development/python-modules/pydbus { };
pydeconz = callPackage ../development/python-modules/pydeconz { };
pydenticon = callPackage ../development/python-modules/pydenticon { };
pydexcom = callPackage ../development/python-modules/pydexcom { };